From 9771bd8ddcfa7544c16a91399c91d3673efa2cbd Mon Sep 17 00:00:00 2001
From: Tomas Mraz <tmraz@fedoraproject.org>
Date: Nov 04 2011 21:34:58 +0000
Subject: accommodate the addition of initgroups entry in nsswitch.conf (#750388)


---

diff --git a/authconfig-6.1.16-initgroups.patch b/authconfig-6.1.16-initgroups.patch
new file mode 100644
index 0000000..83b05ea
--- /dev/null
+++ b/authconfig-6.1.16-initgroups.patch
@@ -0,0 +1,34 @@
+diff -r d47e03cdd35f authinfo.py
+--- a/authinfo.py	Mon Sep 12 21:34:15 2011 +0200
++++ b/authinfo.py	Fri Nov 04 19:08:52 2011 +0100
+@@ -3171,6 +3171,7 @@
+ 		wrotenetgroup = False
+ 		wroteautomount = False
+ 		wrotehosts = False
++		wroteinitgroups = False
+ 		f = None
+ 		output = ""
+ 		all_configs[CFG_NSSWITCH].backup(self.backupDir)
+@@ -3268,6 +3269,13 @@
+ 						output += users
+ 						output += "\n"
+ 						wrotegroup = True
++				# If it's a 'initgroups' line, insert ours instead.
++				elif matchLine(ls, "initgroups:"):
++					if not wroteinitgroups:
++						output += "initgroups: "
++						output += users
++						output += "\n"
++						wroteinitgroups = True
+ 				# If it's a 'netgroup' line, insert ours instead.
+ 				elif matchLine(ls, "netgroup:"):
+ 					if not wrotenetgroup:
+@@ -3318,6 +3326,8 @@
+ 				output += "hosts:     "
+ 				output += hosts
+ 				output += "\n"
++			# For now we do not write initgroups
++			# line if not encountered
+ 
+ 			# Write it out and close it.
+ 			f.rewind()
diff --git a/authconfig.spec b/authconfig.spec
index f52d3fc..8218f5f 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.1.16
-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.1.16-initgroups.patch
 Requires: newt-python, pam >= 0.99.10.0, python
 Conflicts: pam_krb5 < 1.49, samba-common < 3.0, samba-client < 3.0
 Conflicts: nss_ldap < 254, sssd < 0.99.1
@@ -34,6 +35,7 @@ authentication schemes.
 
 %prep
 %setup -q -n %{name}-%{version}
+%patch1 -p 1 -b .initgroups
 
 %build
 CFLAGS="$RPM_OPT_FLAGS -fPIC"; export CFLAGS
@@ -124,6 +126,9 @@ authconfig --update --nostart >/dev/null 2>&1 || :
 %{_datadir}/icons/hicolor/256x256/apps/system-config-authentication.*
 
 %changelog
+* Fri Nov  4 2011 Tomas Mraz <tmraz@redhat.com> - 6.1.16-2
+- accommodate the addition of initgroups entry in nsswitch.conf (#750388)
+
 * Mon Sep 12 2011 Tomas Mraz <tmraz@redhat.com> - 6.1.16-1
 - fix broken --help output for languages without spaces (#734355)
 - enable translation of the --help option description (#734303)