[authconfig] fix missing cache_credentials option when saving sssd.conf
Tomáš Mráz
tmraz at fedoraproject.org
Mon Oct 1 18:32:01 UTC 2012
commit 778464126e6e1e89cdb64c729787347fd1ce73e5
Author: Tomas Mraz <tmraz at fedoraproject.org>
Date: Mon Oct 1 20:31:48 2012 +0200
fix missing cache_credentials option when saving sssd.conf
authconfig-6.2.4-cachecreds.patch | 50 +++++++++++++++++++++++++++++++++++++
authconfig.spec | 7 ++++-
2 files changed, 56 insertions(+), 1 deletions(-)
---
diff --git a/authconfig-6.2.4-cachecreds.patch b/authconfig-6.2.4-cachecreds.patch
new file mode 100644
index 0000000..3ac6749
--- /dev/null
+++ b/authconfig-6.2.4-cachecreds.patch
@@ -0,0 +1,50 @@
+diff -r 07efea0f862a authinfo.py
+--- a/authinfo.py Tue Sep 25 21:46:43 2012 +0200
++++ b/authinfo.py Mon Oct 01 20:28:48 2012 +0200
+@@ -1269,17 +1269,17 @@
+ FileBackup("gshadow", SYSCONFDIR+"/gshadow"),
+ FileBackup("group", SYSCONFDIR+"/group")]
+
+-sssdopt_map = {
+- 'ldapServer': 'ldap_uri',
+- 'ldapBaseDN': 'ldap_search_base',
+- 'enableLDAPS': 'ldap_id_use_start_tls',
+- 'ldapSchema': 'ldap_schema',
+- 'ldapCacertDir': 'ldap_tls_cacertdir',
+- 'kerberosKDC': 'krb5_server',
+- 'kerberosAdminServer': 'krb5_kpasswd',
+- 'kerberosRealm': 'krb5_realm',
+- 'enableCacheCreds': 'cache_credentials',
+- 'enableCacheCreds': 'krb5_store_password_if_offline'}
++sssd_options = [
++ ('ldapServer', 'ldap_uri'),
++ ('ldapBaseDN', 'ldap_search_base'),
++ ('enableLDAPS', 'ldap_id_use_start_tls'),
++ ('ldapSchema', 'ldap_schema'),
++ ('ldapCacertDir', 'ldap_tls_cacertdir'),
++ ('kerberosKDC', 'krb5_server'),
++ ('kerberosAdminServer', 'krb5_kpasswd'),
++ ('kerberosRealm', 'krb5_realm'),
++ ('enableCacheCreds', 'cache_credentials'),
++ ('enableCacheCreds', 'krb5_store_password_if_offline')]
+
+ class AuthInfo:
+ def __init__(self, msgcb):
+@@ -1870,7 +1870,7 @@
+ authprov = domain.get_option('auth_provider')
+ except SSSDConfig.NoOptionError:
+ authprov = None
+- for attr, opt in sssdopt_map.iteritems():
++ for (attr, opt) in sssd_options:
+ try:
+ val = domain.get_option(opt)
+ if opt == 'ldap_uri':
+@@ -3237,7 +3237,7 @@
+ self.changeProvider(domain, 'ldap', 'auth')
+ self.changeProvider(domain, 'ldap', 'chpass')
+
+- for attr, option in sssdopt_map.iteritems():
++ for (attr, option) in sssd_options:
+ try:
+ val = getattr(self, attr)
+ if option == 'ldap_uri':
diff --git a/authconfig.spec b/authconfig.spec
index c3749a9..b0bbdb4 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.4
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPLv2+
ExclusiveOS: Linux
Group: System Environment/Base
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
URL: https://fedorahosted.org/authconfig
Source: https://fedorahosted.org/releases/a/u/%{name}/%{name}-%{version}.tar.bz2
+Patch1: authconfig-6.2.4-cachecreds.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
@@ -36,6 +37,7 @@ authentication schemes.
%prep
%setup -q -n %{name}-%{version}
+%patch1 -p 1 -b .cachecreds
%build
%configure
@@ -125,6 +127,9 @@ authconfig --update --nostart >/dev/null 2>&1 || :
%{_datadir}/icons/hicolor/256x256/apps/system-config-authentication.*
%changelog
+* Mon Oct 1 2012 Tomas Mraz <tmraz at redhat.com> - 6.2.4-2
+- fix missing cache_credentials option when saving sssd.conf
+
* Tue Sep 25 2012 Tomas Mraz <tmraz at redhat.com> - 6.2.4-1
- backup also passwd and friends when toggling enableshadow (#853074)
- use the new smb.conf idmap config range syntax (#850824)
More information about the scm-commits
mailing list