import realmd-0.16.3-23.el8
This commit is contained in:
CentOS Sources
Stepan Oksanichenko
parent
608b8916a6
commit
0d7c3ad97e
@ -0,0 +1,61 @@
|
||||
From 4ef597d15df246f4121266aaf3e291e3f06f6f4a Mon Sep 17 00:00:00 2001
|
||||
From: Sumit Bose <sbose@redhat.com>
|
||||
Date: Wed, 10 Mar 2021 17:57:07 +0100
|
||||
Subject: [PATCH] build: add --with-vendor-error-message configure option
|
||||
|
||||
With the new configure option --with-vendor-error-message a packager or
|
||||
a distribution can add a message if realmd returns with an error.
|
||||
|
||||
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1889386
|
||||
---
|
||||
configure.ac | 15 +++++++++++++++
|
||||
tools/realm.c | 7 +++++++
|
||||
2 files changed, 22 insertions(+)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index ee067d9..05ec1bf 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -51,6 +51,21 @@ fi
|
||||
|
||||
AC_SUBST(DISTRO)
|
||||
|
||||
+# -----------------------------------------------------------------------------
|
||||
+# Vendor error message
|
||||
+
|
||||
+AC_ARG_WITH([vendor-error-message],
|
||||
+ [AS_HELP_STRING([--with-vendor-error-message=ARG],
|
||||
+ [Add a vendor specific error message shown if a realm command fails]
|
||||
+ )],
|
||||
+ [AS_IF([test "x$withval" != "x"],
|
||||
+ [AC_DEFINE_UNQUOTED([VENDOR_MSG],
|
||||
+ ["$withval"],
|
||||
+ [Vendor specific error message])],
|
||||
+ [AC_MSG_ERROR([--with-vendor-error-message requires an argument])]
|
||||
+ )],
|
||||
+ [])
|
||||
+
|
||||
# -----------------------------------------------------------------------------
|
||||
# Basic tools
|
||||
|
||||
diff --git a/tools/realm.c b/tools/realm.c
|
||||
index 1530f09..8fdca16 100644
|
||||
--- a/tools/realm.c
|
||||
+++ b/tools/realm.c
|
||||
@@ -287,6 +287,13 @@ main (int argc,
|
||||
ret = (realm_commands[i].function) (client, argc, argv);
|
||||
g_object_unref (client);
|
||||
|
||||
+#ifdef VENDOR_MSG
|
||||
+ if (ret != 0) {
|
||||
+ g_printerr (VENDOR_MSG"\n");
|
||||
+ }
|
||||
+
|
||||
+#endif
|
||||
+
|
||||
break;
|
||||
}
|
||||
}
|
||||
--
|
||||
2.31.1
|
||||
|
||||
36
SOURCES/0001-doc-add-computer-name-to-realm-man-page.patch
Normal file
36
SOURCES/0001-doc-add-computer-name-to-realm-man-page.patch
Normal file
@ -0,0 +1,36 @@
|
||||
From 05100771ea6bd775caae705bb53f76a0816f3b81 Mon Sep 17 00:00:00 2001
|
||||
From: Sumit Bose <sbose@redhat.com>
|
||||
Date: Tue, 11 May 2021 11:13:06 +0200
|
||||
Subject: [PATCH] doc: add computer-name to realm man page
|
||||
|
||||
---
|
||||
doc/manual/realm.xml | 13 +++++++++++++
|
||||
1 file changed, 13 insertions(+)
|
||||
|
||||
diff --git a/doc/manual/realm.xml b/doc/manual/realm.xml
|
||||
index 9160a8a..b4dc27c 100644
|
||||
--- a/doc/manual/realm.xml
|
||||
+++ b/doc/manual/realm.xml
|
||||
@@ -222,6 +222,19 @@ $ realm join --user=admin --computer-ou=OU=Special domain.example.com
|
||||
supported for all realms. By default the membership software
|
||||
is automatically selected.</para></listitem>
|
||||
</varlistentry>
|
||||
+ <varlistentry>
|
||||
+ <term><option>--computer-name=xxx</option></term>
|
||||
+ <listitem>
|
||||
+ <para>This option only applies to Active
|
||||
+ Directory realms. Specify this option to
|
||||
+ override the default name used when creating
|
||||
+ the computer account. The system's FQDN will
|
||||
+ still be saved in the dNSHostName attribute.</para>
|
||||
+ <para>Specify the name as a string of 15 or
|
||||
+ fewer characters that is a valid NetBIOS
|
||||
+ computer name.</para>
|
||||
+ </listitem>
|
||||
+ </varlistentry>
|
||||
<varlistentry>
|
||||
<term><option>--no-password</option></term>
|
||||
<listitem><para>Perform the join automatically without
|
||||
--
|
||||
2.31.1
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
Name: realmd
|
||||
Version: 0.16.3
|
||||
Release: 22%{?dist}
|
||||
Release: 23%{?dist}
|
||||
Summary: Kerberos realm enrollment service
|
||||
License: LGPLv2+
|
||||
URL: http://cgit.freedesktop.org/realmd/realmd/
|
||||
@ -64,6 +64,9 @@ Patch34: 0001-service-make-sure-use_ldaps-is-not-only-set-for-auto.patch
|
||||
Patch35: 0002-service-avoid-crash-if-LDAP-connection-fails.patch
|
||||
Patch36: 0003-service-make-TLS-check-more-releaxed.patch
|
||||
|
||||
Patch37: 0001-doc-add-computer-name-to-realm-man-page.patch
|
||||
Patch38: 0001-build-add-with-vendor-error-message-configure-option.patch
|
||||
|
||||
BuildRequires: gcc
|
||||
BuildRequires: automake
|
||||
BuildRequires: autoconf
|
||||
@ -100,7 +103,13 @@ applications that use %{name}.
|
||||
|
||||
%build
|
||||
autoreconf -fi
|
||||
%configure --disable-silent-rules
|
||||
%configure --disable-silent-rules \
|
||||
%if 0%{?rhel}
|
||||
--with-vendor-error-message='Please check\n https://red.ht/support_rhel_ad \nto get help for common issues.' \
|
||||
%endif
|
||||
%{nil}
|
||||
|
||||
|
||||
make %{?_smp_mflags}
|
||||
|
||||
%check
|
||||
@ -111,6 +120,15 @@ make install DESTDIR=%{buildroot}
|
||||
|
||||
%find_lang realmd
|
||||
|
||||
%post
|
||||
%systemd_post realmd.service
|
||||
|
||||
%preun
|
||||
%systemd_preun realmd.service
|
||||
|
||||
%postun
|
||||
%systemd_postun_with_restart realmd.service
|
||||
|
||||
%files -f realmd.lang
|
||||
%doc AUTHORS COPYING NEWS README
|
||||
%{_sysconfdir}/dbus-1/system.d/org.freedesktop.realmd.conf
|
||||
@ -131,6 +149,10 @@ make install DESTDIR=%{buildroot}
|
||||
%doc ChangeLog
|
||||
|
||||
%changelog
|
||||
* Tue May 11 2021 Sumit Bose <sbose@redhat.com> - 0.16.3-23
|
||||
- Add restart macro and vendor message to spec file
|
||||
Resolves: rhbz#1926046
|
||||
|
||||
* Thu Dec 03 2020 Sumit Bose <sbose@redhat.com> - 0.16.3-22
|
||||
- Add fixes LDAPS functionality
|
||||
Resolves: rhbz#1826964
|
||||
|
||||
Loading…
Reference in New Issue
Block a user