From 7a9a45867ce82364faf257a222307a5359144e67 Mon Sep 17 00:00:00 2001
From: Tomas Mraz <tmraz@fedoraproject.org>
Date: Dec 05 2012 16:50:59 +0000
Subject: New upstream release.


- fix missing cache_credentials option when saving sssd.conf
- do not try to start/restart sssd with incomplete default domain
- add autofs to sssd.conf activated services
- add pam_winbind to session pam modules

---

diff --git a/.gitignore b/.gitignore
index 007d90b..01f01ca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@ authconfig-6.1.8.tar.bz2
 /authconfig-6.2.2.tar.bz2
 /authconfig-6.2.3.tar.bz2
 /authconfig-6.2.4.tar.bz2
+/authconfig-6.2.5.tar.bz2
diff --git a/authconfig-6.2.4-cachecreds.patch b/authconfig-6.2.4-cachecreds.patch
deleted file mode 100644
index 3ac6749..0000000
--- a/authconfig-6.2.4-cachecreds.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-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 b0bbdb4..aa7eeba 100644
--- a/authconfig.spec
+++ b/authconfig.spec
@@ -1,14 +1,13 @@
 Summary: Command line tool for setting up authentication from network services
 Name: authconfig
-Version: 6.2.4
-Release: 2%{?dist}
+Version: 6.2.5
+Release: 1%{?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
@@ -37,7 +36,6 @@ authentication schemes.
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch1 -p 1 -b .cachecreds
 
 %build
 %configure
@@ -127,8 +125,11 @@ authconfig --update --nostart >/dev/null 2>&1 || :
 %{_datadir}/icons/hicolor/256x256/apps/system-config-authentication.*
 
 %changelog
-* Mon Oct  1 2012 Tomas Mraz <tmraz@redhat.com> - 6.2.4-2
+* Wed Dec  5 2012 Tomas Mraz <tmraz@redhat.com> - 6.2.5-1
 - fix missing cache_credentials option when saving sssd.conf
+- do not try to start/restart sssd with incomplete default domain
+- add autofs to sssd.conf activated services
+- add pam_winbind to session pam modules
 
 * Tue Sep 25 2012 Tomas Mraz <tmraz@redhat.com> - 6.2.4-1
 - backup also passwd and friends when toggling enableshadow (#853074)
diff --git a/sources b/sources
index ec15c79..9b0184b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-65bff117005bfdad75ef145b8f9ad933  authconfig-6.2.4.tar.bz2
+2cb7da0c41cb8e418dddb8e0e1de6003  authconfig-6.2.5.tar.bz2