From f986dbf31b7062ceb618b26d874447997a7e9939 Mon Sep 17 00:00:00 2001 From: Christian Heimes Date: Apr 26 2018 09:02:00 +0000 Subject: Don't disable oddjobd.service (RHBZ #1571844) --- diff --git a/0001-Don-t-disable-oddjobd.service.patch b/0001-Don-t-disable-oddjobd.service.patch new file mode 100644 index 0000000..00b9402 --- /dev/null +++ b/0001-Don-t-disable-oddjobd.service.patch @@ -0,0 +1,38 @@ +From fb7477d0a9e5077adf328163fb83bb8aad8242ca Mon Sep 17 00:00:00 2001 +From: Christian Heimes +Date: Wed, 25 Apr 2018 15:59:22 +0200 +Subject: [PATCH] Don't disable oddjobd.service + +authselect disables oddjobd.service unless the mkhomedir option is +supplied. This breaks other services that depend on oddjobd, e.g. +FreeIPA. + +Enable oddjobd.service with mkhomedir. Don't touch oddjobd.service +otherwise. + +See: https://pagure.io/freeipa/issue/7465 +Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1571844 +Signed-off-by: Christian Heimes +--- + src/compat/authcompat.py.in.in | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/compat/authcompat.py.in.in b/src/compat/authcompat.py.in.in +index e83c36e..95fd07f 100755 +--- a/src/compat/authcompat.py.in.in ++++ b/src/compat/authcompat.py.in.in +@@ -437,10 +437,10 @@ class AuthCompat: + config.cleanup() + self.disableService(config.service) + ++ # Enable oddjobd for mkhomedir, but don't disable the service in ++ # case it's already running. + if self.options.getBool("mkhomedir"): + self.enableService("oddjobd") +- else: +- self.disableService("oddjobd") + + + def main(): +-- +2.14.3 diff --git a/authselect.spec b/authselect.spec index 66a32f1..391aaf8 100644 --- a/authselect.spec +++ b/authselect.spec @@ -1,12 +1,14 @@ Name: authselect Version: 0.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Configures authentication and identity sources from supported profiles URL: https://github.com/pbrezina/authselect License: GPLv3+ Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz +Patch1: 0001-Don-t-disable-oddjobd.service.patch + BuildRequires: autoconf BuildRequires: automake BuildRequires: libtool @@ -71,6 +73,7 @@ you develop a front-end for the authselect library. %prep %setup -q +%patch1 -p1 %build @@ -172,6 +175,9 @@ fi exit 0 %changelog +* Wed Apr 25 2018 Christian Heimes - 0.4-2 +- Don't disable oddjobd.service (RHBZ #1571844) + * Mon Apr 9 2018 Pavel Březina - 0.4-1 - rebasing to 0.4