[authconfig] keep altfiles in nsswitch.conf (patch by Colin Walters) (#1084204)

[Tomáš Mráz]

commit 009c167153374799531ac3a447aedd079bf69581
Author: Tomas Mraz <tmraz at fedoraproject.org>
Date:   Mon Jun 30 16:19:14 2014 +0200

    keep altfiles in nsswitch.conf (patch by Colin Walters) (#1084204)

 authconfig-6.2.8-altfiles.patch |   45 +++++++++++++++++++++++++++++++++++++++
 authconfig.spec                 |    7 +++++-
 2 files changed, 51 insertions(+), 1 deletions(-)
---
diff --git a/authconfig-6.2.8-altfiles.patch b/authconfig-6.2.8-altfiles.patch
new file mode 100644
index 0000000..014adee
--- /dev/null
+++ b/authconfig-6.2.8-altfiles.patch
@@ -0,0 +1,45 @@
+From 4ec25a42ac08853710e52d6b309a47bfd8fd4d21 Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters at verbum.org>
+Date: Thu, 17 Apr 2014 16:25:25 -0700
+Subject: [PATCH] authinfo: Preserve altfiles in passwd data if we see it
+
+See https://bugzilla.redhat.com/show_bug.cgi?id=1084204
+---
+ authinfo.py | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/authinfo.py b/authinfo.py
+index e272a70..55627d7 100644
+--- a/authinfo.py
++++ b/authinfo.py
+@@ -1306,6 +1306,9 @@ class AuthInfo:
+ 		self.preferDNSinHosts = None
+ 		self.enableSSSD = None
+ 		self.enableIPAv2 = None
++                # This one we don't have a config entry, we just
++                # preserve the entry if we see it.
++		self.enableAltfiles = None
+ 
+ 		# Authentication setup.
+ 		self.enableAFS = None
+@@ -2015,7 +2018,7 @@ class AuthInfo:
+ 		if nssconfig:
+ 			nssmap = (('Compat', 'compat'), ('DB', 'db'),
+ 				  ('Directories', 'directories'), ('Hesiod', 'hesiod'),
+-				  ('LDAP', 'ldap'), ('NIS', 'nis'),
++				  ('LDAP', 'ldap'), ('NIS', 'nis'), ('Altfiles', 'altfiles'),
+ 				  ('NIS3', 'nisplus'), ('Winbind', 'winbind'))
+ 			for attr, nssentry in nssmap:
+ 				if checkNSS(nssconfig, nssentry):
+@@ -3556,6 +3559,8 @@ class AuthInfo:
+ 			if self.enableDB:
+ 				normal += " db"
+ 			normal += " files"
++                        if self.enableAltfiles:
++                                normal += " altfiles"
+ 			services = normal
+ 			if self.enableDirectories:
+ 				normal += " directories"
+-- 
+1.8.3.1
+
diff --git a/authconfig.spec b/authconfig.spec
index c21b319..262b9ca 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: 8%{?dist}
+Release: 9%{?dist}
 License: GPLv2+
 ExclusiveOS: Linux
 Group: System Environment/Base
@@ -16,6 +16,7 @@ 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
+Patch10: authconfig-6.2.8-altfiles.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
@@ -53,6 +54,7 @@ authentication schemes.
 %patch7 -p1 -b .restorecon
 %patch8 -p1 -b .sssd-enable
 %patch9 -p1 -b .translations2
+%patch10 -p1 -b .altfiles
 
 %build
 %configure
@@ -135,6 +137,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/icons/hicolor/256x256/apps/system-config-authentication.*
 
 %changelog
+* Mon Jun 30 2014 Tomáš Mráz <tmraz at redhat.com> - 6.2.8-9
+- keep altfiles in nsswitch.conf (patch by Colin Walters) (#1084204)
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.2.8-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild