From 71399143ef783ab2ad39dd3486d7b5dcaae45015 Mon Sep 17 00:00:00 2001
From: Tomas Mraz <tmraz@fedoraproject.org>
Date: Aug 21 2014 16:04:03 +0000
Subject: fix traceback when backing up LDAP (#1131168)


---

diff --git a/authconfig-6.2.9-ldapuri-traceback.patch b/authconfig-6.2.9-ldapuri-traceback.patch
new file mode 100644
index 0000000..577d271
--- /dev/null
+++ b/authconfig-6.2.9-ldapuri-traceback.patch
@@ -0,0 +1,20 @@
+# HG changeset patch
+# User Tomas Mraz <tmraz@redhat.com>
+# Date 1408636566 -7200
+#      Thu Aug 21 17:56:06 2014 +0200
+# Node ID a3da1d6a0d306ece4a9be7ac9de70a151e7f5987
+# Parent  cc798f4d1bac5c50d92566e5bae50ddde5ddb437
+Add missing parameter.
+
+diff -r cc798f4d1bac -r a3da1d6a0d30 authinfo.py
+--- a/authinfo.py	Fri Jul 25 18:13:58 2014 +0200
++++ b/authinfo.py	Thu Aug 21 17:56:06 2014 +0200
+@@ -1664,7 +1664,7 @@
+ 			# We'll pull MD5/DES crypt ("pam_password") from the config
+ 			# file, or from the pam_unix PAM config lines.
+ 
+-		self.ldapServer = self.ldapHostsToURIs(cleanList(self.ldapServer))
++		self.ldapServer = self.ldapHostsToURIs(cleanList(self.ldapServer), False)
+ 		f.close()
+ 		return True
+ 
diff --git a/authconfig.spec b/authconfig.spec
index c96afb8..4a10cbb 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.9
-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-gdm-nolastlog.patch
+Patch2: authconfig-6.2.9-ldapuri-traceback.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 .nolastlog
+%patch2 -p1 -b .ldapuri
 
 %build
 %configure
@@ -119,6 +121,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/icons/hicolor/256x256/apps/system-config-authentication.*
 
 %changelog
+* Thu Aug 21 2014 Tomáš Mráz <tmraz@redhat.com> - 6.2.9-3
+- fix traceback when backing up LDAP (#1131168)
+
 * Fri Aug 15 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 6.2.9-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild