[authconfig] do not disable sssd.service when --enablesssd is used (#953851)

[Tomáš Mráz]

commit 31aadd306adab58aac22f1f0efc5abb6ad3e8563
Author: Tomas Mraz <tmraz at fedoraproject.org>
Date:   Mon May 13 15:40:19 2013 +0200

    do not disable sssd.service when --enablesssd is used (#953851)

 authconfig-6.2.6-sssdservice.patch |   16 ++++++++++++++++
 authconfig.spec                    |    7 ++++++-
 2 files changed, 22 insertions(+), 1 deletions(-)
---
diff --git a/authconfig-6.2.6-sssdservice.patch b/authconfig-6.2.6-sssdservice.patch
new file mode 100644
index 0000000..bf9a9d6
--- /dev/null
+++ b/authconfig-6.2.6-sssdservice.patch
@@ -0,0 +1,16 @@
+diff -up authconfig-6.2.6/authinfo.py.sssdservice authconfig-6.2.6/authinfo.py
+--- authconfig-6.2.6/authinfo.py.sssdservice	2013-04-19 13:26:41.000000000 +0200
++++ authconfig-6.2.6/authinfo.py	2013-05-13 15:37:35.982137361 +0200
+@@ -4198,9 +4198,10 @@ class AuthInfo:
+ 			PATH_WINBIND,
+ 			"winbind", nostart, onlystart)
+ 		toggleSplatbindService(self.implicitSSSD or self.implicitSSSDAuth or
+-			self.enableIPAv2,
++			self.enableIPAv2 or self.enableSSSD or self.enableSSSDAuth,
+ 			PATH_SSSD,
+-			"sssd", nostart, onlystart)
++			"sssd", nostart or not (self.implicitSSSD or self.implicitSSSDAuth
++			or self.enableIPAv2), onlystart)
+ 		toggleSplatbindService((self.enableLDAP or self.enableLDAPAuth) and
+ 			not self.implicitSSSD,
+ 			PATH_NSLCD,
diff --git a/authconfig.spec b/authconfig.spec
index e728051..e77d67d 100644
--- a/authconfig.spec
+++ b/authconfig.spec
@@ -1,13 +1,14 @@
 Summary: Command line tool for setting up authentication from network services
 Name: authconfig
 Version: 6.2.6
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 ExclusiveOS: Linux
 Group: System Environment/Base
 URL: https://fedorahosted.org/authconfig
 Source: https://fedorahosted.org/releases/a/u/%{name}/%{name}-%{version}.tar.bz2
 Patch1: authconfig-6.2.6-use-first-pass-revert.patch
+Patch2: authconfig-6.2.6-sssdservice.patch
 Requires: newt-python, pam >= 0.99.10.0, python, libpwquality > 0.9
 Conflicts: pam_krb5 < 1.49, samba-common < 3.0, samba-client < 3.0
 Conflicts: nss_ldap < 254, sssd < 0.99.1
@@ -37,6 +38,7 @@ authentication schemes.
 %prep
 %setup -q -n %{name}-%{version}
 %patch1 -p1 -b .revert
+%patch2 -p1 -b .sssdservice
 
 %build
 %configure
@@ -119,6 +121,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/icons/hicolor/256x256/apps/system-config-authentication.*
 
 %changelog
+* Mon May 13 2013 Tomáš Mráz <tmraz at redhat.com> - 6.2.6-3
+- do not disable sssd.service when --enablesssd is used (#953851)
+
 * Fri Apr 19 2013 Tomáš Mráz <tmraz at redhat.com> - 6.2.6-2
 - revert use_first_pass addition to pam_sss in password stack (#953116)