[authconfig] enable/start sssd only when config exists or enabled

Tue Feb 11 12:25:38 UTC 2014

commit cc8e4da44a17de3bfb57224fff2f5bb9bedcab97
Author: Tomas Mraz <tmraz at fedoraproject.org>
Date:   Tue Feb 11 13:26:10 2014 +0100

    enable/start sssd only when config exists or enabled
    
      for both pam and nsswitch.conf
    - updated translations

 authconfig-6.2.8-sssd-enable.patch           |   26 +++
 authconfig-6.2.8-translation-updates-2.patch |  228 ++++++++++++++++++++++++++
 authconfig.spec                              |   11 +-
 3 files changed, 264 insertions(+), 1 deletions(-)
---

diff --git a/authconfig-6.2.8-sssd-enable.patch b/authconfig-6.2.8-sssd-enable.patch
new file mode 100644
index 0000000..c4028ef
--- /dev/null
+++ b/authconfig-6.2.8-sssd-enable.patch
@@ -0,0 +1,26 @@
+diff -r dfd1d988ce4b authinfo.py
+--- a/authinfo.py	Tue Feb 11 11:49:42 2014 +0100
++++ b/authinfo.py	Tue Feb 11 13:01:44 2014 +0100
+@@ -1218,7 +1218,7 @@
+ 	FileBackup("libuser.conf", SYSCONFDIR+"/libuser.conf"),
+ 	FileBackup("pwquality.conf", SYSCONFDIR+"/security/pwquality.conf"),
+ 	FileBackup("login.defs", SYSCONFDIR+"/login.defs"),
+-	FileBackup("sssd.conf", SYSCONFDIR+"/sssd/sssd.conf"),
++	FileBackup("sssd.conf", PATH_SSSD_CONFIG),
+ 	FileBackup("shadow", SYSCONFDIR+"/shadow"),
+ 	FileBackup("passwd", SYSCONFDIR+"/passwd"),
+ 	FileBackup("gshadow", SYSCONFDIR+"/gshadow"),
+@@ -4346,8 +4346,12 @@
+ 			"winbind", nostart)
+ 
+ 	def toggleSSSDService(self, nostart):
++		
++		explicitenable = ((self.enableSSSD and self.enableSSSDAuth) or
++			(self.enableSSSD and os.path.exists(PATH_SSSD_CONFIG)) or
++			(self.enableSSSDAuth and os.path.exists(PATH_SSSD_CONFIG)))
+ 		toggleSplatbindService(self.implicitSSSD or self.implicitSSSDAuth or
+-			self.enableIPAv2 or self.enableSSSD or self.enableSSSDAuth,
++			self.enableIPAv2 or explicitenable,
+ 			PATH_SSSD,
+ 			"sssd", nostart or not (self.implicitSSSD or self.implicitSSSDAuth
+ 			or self.enableIPAv2))
diff --git a/authconfig-6.2.8-translation-updates-2.patch b/authconfig-6.2.8-translation-updates-2.patch
new file mode 100644
index 0000000..201bc51
--- /dev/null
+++ b/authconfig-6.2.8-translation-updates-2.patch
@@ -0,0 +1,228 @@
+# HG changeset patch
+# User Tomas Mraz <tmraz at redhat.com>
+# Date 1392115782 -3600
+#      Tue Feb 11 11:49:42 2014 +0100
+# Node ID dfd1d988ce4bc19be21f278a5726e87c1a28e12c
+# Parent  b9ff806764b2ec152735629fc6819979dd0338f7
+Add missing translation.
+
+diff -r b9ff806764b2 -r dfd1d988ce4b po/as.po
+--- a/po/as.po	Wed Jan 29 14:59:58 2014 +0100
++++ b/po/as.po	Tue Feb 11 11:49:42 2014 +0100
+@@ -1259,3 +1259,7 @@
+ #: ../authinfo.py:4397
+ msgid "Error downloading CA certificate"
+ msgstr "CA প্ৰমাণপত্ৰ ডাউনল'ড কৰোঁতে সমস্যা"
++
++#: ../authconfig.py:538
++msgid "The passminclass value must not be higher than 4"
++msgstr "passminclass মান 4 ৰ অধিক হব নোৱাৰিব"
+diff -r b9ff806764b2 -r dfd1d988ce4b po/bn_IN.po
+--- a/po/bn_IN.po	Wed Jan 29 14:59:58 2014 +0100
++++ b/po/bn_IN.po	Tue Feb 11 11:49:42 2014 +0100
+@@ -1260,3 +1260,7 @@
+ #: ../authinfo.py:4397
+ msgid "Error downloading CA certificate"
+ msgstr "CA সার্টিফিকেট ডাউনলোড করতে সমস্যা"
++
++#: ../authconfig.py:538
++msgid "The passminclass value must not be higher than 4"
++msgstr "passminclass মান 4 এর বেশি হলে চলবে না"
+diff -r b9ff806764b2 -r dfd1d988ce4b po/de.po
+--- a/po/de.po	Wed Jan 29 14:59:58 2014 +0100
++++ b/po/de.po	Tue Feb 11 11:49:42 2014 +0100
+@@ -1268,3 +1268,7 @@
+ #: ../authinfo.py:4397
+ msgid "Error downloading CA certificate"
+ msgstr "Error downloading CA certificate"
++
++#: ../authconfig.py:538
++msgid "The passminclass value must not be higher than 4"
++msgstr "Der passminclass Wert darf nicht größer als 4 sein"
+diff -r b9ff806764b2 -r dfd1d988ce4b po/es.po
+--- a/po/es.po	Wed Jan 29 14:59:58 2014 +0100
++++ b/po/es.po	Tue Feb 11 11:49:42 2014 +0100
+@@ -1263,3 +1263,7 @@
+ #: ../authinfo.py:4397
+ msgid "Error downloading CA certificate"
+ msgstr "Error al descargar el certificado CA"
++
++#: ../authconfig.py:538
++msgid "The passminclass value must not be higher than 4"
++msgstr "El valor de passminclass no debe ser mayor que 4"
+diff -r b9ff806764b2 -r dfd1d988ce4b po/fr.po
+--- a/po/fr.po	Wed Jan 29 14:59:58 2014 +0100
++++ b/po/fr.po	Tue Feb 11 11:49:42 2014 +0100
+@@ -1267,3 +1267,7 @@
+ #: ../authinfo.py:4397
+ msgid "Error downloading CA certificate"
+ msgstr "Erreur lors de la récupération du certificat du CA"
++
++#: ../authconfig.py:538
++msgid "The passminclass value must not be higher than 4"
++msgstr "La valeur passminclass ne doit pas être plus élevée que 4"
+diff -r b9ff806764b2 -r dfd1d988ce4b po/gu.po
+--- a/po/gu.po	Wed Jan 29 14:59:58 2014 +0100
++++ b/po/gu.po	Tue Feb 11 11:49:42 2014 +0100
+@@ -1260,3 +1260,7 @@
+ #: ../authinfo.py:4397
+ msgid "Error downloading CA certificate"
+ msgstr "CA પ્રમાણપત્ર ડાઉનલોડ કરવામાં ભૂલ"
++
++#: ../authconfig.py:538
++msgid "The passminclass value must not be higher than 4"
++msgstr "passminclass કિંમત એ 4 કરતા વધારે ન હોવી જોઇએ"
+diff -r b9ff806764b2 -r dfd1d988ce4b po/hi.po
+--- a/po/hi.po	Wed Jan 29 14:59:58 2014 +0100
++++ b/po/hi.po	Tue Feb 11 11:49:42 2014 +0100
+@@ -1259,3 +1259,7 @@
+ #: ../authinfo.py:4397
+ msgid "Error downloading CA certificate"
+ msgstr "CA प्रमाणपत्र डाउनलोड में त्रुटि"
++
++#: ../authconfig.py:538
++msgid "The passminclass value must not be higher than 4"
++msgstr "passminclass मान को 4 से अधिक नहीं होना चाहिए"
+diff -r b9ff806764b2 -r dfd1d988ce4b po/it.po
+--- a/po/it.po	Wed Jan 29 14:59:58 2014 +0100
++++ b/po/it.po	Tue Feb 11 11:49:42 2014 +0100
+@@ -1268,3 +1268,7 @@
+ #: ../authinfo.py:4397
+ msgid "Error downloading CA certificate"
+ msgstr "Errore nell'acquisizione del certificato CA"
++
++#: ../authconfig.py:538
++msgid "The passminclass value must not be higher than 4"
++msgstr "Il valore di passminclass non deve essere maggiore di 4"
+diff -r b9ff806764b2 -r dfd1d988ce4b po/ja.po
+--- a/po/ja.po	Wed Jan 29 14:59:58 2014 +0100
++++ b/po/ja.po	Tue Feb 11 11:49:42 2014 +0100
+@@ -1269,3 +1269,7 @@
+ #: ../authinfo.py:4397
+ msgid "Error downloading CA certificate"
+ msgstr "CA証明書のダウンロードでエラー"
++
++#: ../authconfig.py:538
++msgid "The passminclass value must not be higher than 4"
++msgstr "passminclass の値は 4 より大きい数値にしないでください"
+diff -r b9ff806764b2 -r dfd1d988ce4b po/kn.po
+--- a/po/kn.po	Wed Jan 29 14:59:58 2014 +0100
++++ b/po/kn.po	Tue Feb 11 11:49:42 2014 +0100
+@@ -1258,3 +1258,7 @@
+ #: ../authinfo.py:4397
+ msgid "Error downloading CA certificate"
+ msgstr "CA ಪ್ರಮಾಣಪತ್ರವನ್ನು ಡೌನ್-ಲೋಡ್ ಮಾಡುವಾಗ ದೋಷ"
++
++#: ../authconfig.py:538
++msgid "The passminclass value must not be higher than 4"
++msgstr "passminclass ಮೌಲ್ಯವು 4 ಕ್ಕಿಂತ ದೊಡ್ಡದಾಗಿರಬಾರದು"
+diff -r b9ff806764b2 -r dfd1d988ce4b po/ko.po
+--- a/po/ko.po	Wed Jan 29 14:59:58 2014 +0100
++++ b/po/ko.po	Tue Feb 11 11:49:42 2014 +0100
+@@ -1263,3 +1263,7 @@
+ #: ../authinfo.py:4397
+ msgid "Error downloading CA certificate"
+ msgstr "CA 인증서를 다운로드 하는 중 오류 발생"
++
++#: ../authconfig.py:538
++msgid "The passminclass value must not be higher than 4"
++msgstr "passminclass 값은 4 보다 커서는 안됩니다 "
+diff -r b9ff806764b2 -r dfd1d988ce4b po/ml.po
+--- a/po/ml.po	Wed Jan 29 14:59:58 2014 +0100
++++ b/po/ml.po	Tue Feb 11 11:49:42 2014 +0100
+@@ -1256,3 +1256,7 @@
+ #: ../authinfo.py:4397
+ msgid "Error downloading CA certificate"
+ msgstr "CA സര്‍ട്ടിഫിക്കേറ്റ് ഡൌണ്‍ലോട് ചെയ്യുന്നതില്‍ പിശക്"
++
++#: ../authconfig.py:538
++msgid "The passminclass value must not be higher than 4"
++msgstr "passminclass മൂല്ല്യം 4-ല്‍ കൂടുവാന്‍ പാടില്ല"
+diff -r b9ff806764b2 -r dfd1d988ce4b po/or.po
+--- a/po/or.po	Wed Jan 29 14:59:58 2014 +0100
++++ b/po/or.po	Tue Feb 11 11:49:42 2014 +0100
+@@ -1259,3 +1259,7 @@
+ #: ../authinfo.py:4397
+ msgid "Error downloading CA certificate"
+ msgstr "ସି.ଏ. ପ୍ରାମାଣପତ୍ରକୁ ଆହରଣ କରିବା ସମୟରେ ତ୍ରୁଟି"
++
++#: ../authconfig.py:538
++msgid "The passminclass value must not be higher than 4"
++msgstr "passminclass ର ମୂଲ୍ୟ 4 ରୁ ଅଧିକ ହେବା ଉଚିତ ନୁହଁ"
+diff -r b9ff806764b2 -r dfd1d988ce4b po/pa.po
+--- a/po/pa.po	Wed Jan 29 14:59:58 2014 +0100
++++ b/po/pa.po	Tue Feb 11 11:49:42 2014 +0100
+@@ -1263,3 +1263,7 @@
+ #: ../authinfo.py:4397
+ msgid "Error downloading CA certificate"
+ msgstr "CA ਸਰਟੀਫਿਕੇਟ ਡਾਊਨਲੋਡ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ"
++
++#: ../authconfig.py:538
++msgid "The passminclass value must not be higher than 4"
++msgstr "passminclass ਮੁੱਲ 4 ਤੋਂ ਵੱਡਾ ਨਹੀਂ ਹੋਣਾ ਚਾਹੀਦਾ"
+diff -r b9ff806764b2 -r dfd1d988ce4b po/pt_BR.po
+--- a/po/pt_BR.po	Wed Jan 29 14:59:58 2014 +0100
++++ b/po/pt_BR.po	Tue Feb 11 11:49:42 2014 +0100
+@@ -1272,3 +1272,7 @@
+ #: ../authinfo.py:4397
+ msgid "Error downloading CA certificate"
+ msgstr "Erro ao baixar o certificado CA"
++
++#: ../authconfig.py:538
++msgid "The passminclass value must not be higher than 4"
++msgstr "O valor do passminclass não pode ser maior do que 4"
+diff -r b9ff806764b2 -r dfd1d988ce4b po/ru.po
+--- a/po/ru.po	Wed Jan 29 14:59:58 2014 +0100
++++ b/po/ru.po	Tue Feb 11 11:49:42 2014 +0100
+@@ -1264,3 +1264,7 @@
+ #: ../authinfo.py:4397
+ msgid "Error downloading CA certificate"
+ msgstr "Ошибка при загрузке сертификата CA"
++
++#: ../authconfig.py:538
++msgid "The passminclass value must not be higher than 4"
++msgstr "Значение passminclass не может быть больше 4"
+diff -r b9ff806764b2 -r dfd1d988ce4b po/ta.po
+--- a/po/ta.po	Wed Jan 29 14:59:58 2014 +0100
++++ b/po/ta.po	Tue Feb 11 11:49:42 2014 +0100
+@@ -1262,3 +1262,7 @@
+ #: ../authinfo.py:4397
+ msgid "Error downloading CA certificate"
+ msgstr "CA சான்றிதழை பதிவிறக்கும் போது பிழை"
++
++#: ../authconfig.py:538
++msgid "The passminclass value must not be higher than 4"
++msgstr "passminclass மதிப்பு 4 க்கு அதிகமாக இருக்கக்கூடாது"
+diff -r b9ff806764b2 -r dfd1d988ce4b po/te.po
+--- a/po/te.po	Wed Jan 29 14:59:58 2014 +0100
++++ b/po/te.po	Tue Feb 11 11:49:42 2014 +0100
+@@ -1259,3 +1259,7 @@
+ #: ../authinfo.py:4397
+ msgid "Error downloading CA certificate"
+ msgstr "CA ధృవీకరణ పత్రాన్ని దిగుమతిచేయటంలో దోషం"
++
++#: ../authconfig.py:538
++msgid "The passminclass value must not be higher than 4"
++msgstr "passminclass విలువ 4 కన్నా ఎక్కువ కాకూడదు"
+diff -r b9ff806764b2 -r dfd1d988ce4b po/zh_CN.po
+--- a/po/zh_CN.po	Wed Jan 29 14:59:58 2014 +0100
++++ b/po/zh_CN.po	Tue Feb 11 11:49:42 2014 +0100
+@@ -1266,3 +1266,7 @@
+ #: ../authinfo.py:4397
+ msgid "Error downloading CA certificate"
+ msgstr "下载 CA 证书时出错"
++
++#: ../authconfig.py:538
++msgid "The passminclass value must not be higher than 4"
++msgstr "passmincalss 值不得大于 4"
+diff -r b9ff806764b2 -r dfd1d988ce4b po/zh_TW.po
+--- a/po/zh_TW.po	Wed Jan 29 14:59:58 2014 +0100
++++ b/po/zh_TW.po	Tue Feb 11 11:49:42 2014 +0100
+@@ -1262,3 +1262,7 @@
+ #: ../authinfo.py:4397
+ msgid "Error downloading CA certificate"
+ msgstr "下載 CA 憑證時發生錯誤"
++
++#: ../authconfig.py:538
++msgid "The passminclass value must not be higher than 4"
++msgstr "passminclass 的值不能大於 4"
diff --git a/authconfig.spec b/authconfig.spec
index 7f81342..ab2b11a 100644
--- a/authconfig.spec
+++ b/authconfig.spec
@@ -1,7 +1,7 @@
 Summary: Command line tool for setting up authentication from network services
 Name: authconfig
 Version: 6.2.8
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2+
 ExclusiveOS: Linux
 Group: System Environment/Base
@@ -14,6 +14,8 @@ Patch4: authconfig-6.2.8-translation-updates.patch
 Patch5: authconfig-6.2.8-norestart.patch
 Patch6: authconfig-6.2.8-notraceback.patch
 Patch7: authconfig-6.2.8-restorecon.patch
+Patch8: authconfig-6.2.8-sssd-enable.patch
+Patch9: authconfig-6.2.8-translation-updates-2.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
@@ -49,6 +51,8 @@ authentication schemes.
 %patch5 -p1 -b .norestart
 %patch6 -p1 -b .notraceback
 %patch7 -p1 -b .restorecon
+%patch8 -p1 -b .sssd-enable
+%patch9 -p1 -b .translations2
 
 %build
 %configure
@@ -131,6 +135,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/icons/hicolor/256x256/apps/system-config-authentication.*
 
 %changelog
+* Tue Feb 11 2014 Tomáš Mráz <tmraz at redhat.com> - 6.2.8-7
+- enable/start sssd only when config exists or enabled
+  for both pam and nsswitch.conf
+- updated translations
+
 * Wed Jan 29 2014 Tomáš Mráz <tmraz at redhat.com> - 6.2.8-6
 - check nslcd for restart when --enableforcelegacy is used
 - call restorecon on newly created configuration files
