rpms/autofs/devel autofs-5.0.1-rc3-nsswitch-ignore-winbind.patch, NONE, 1.1 autofs.spec, 1.175, 1.176

[fedora-cvs-commits redhat com]

Author: ikent

Update of /cvs/dist/rpms/autofs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16179

Modified Files:
	autofs.spec 
Added Files:
	autofs-5.0.1-rc3-nsswitch-ignore-winbind.patch 
Log Message:
* Mon Jan 15 2007 Ian Kent <ikent redhat com> - 5.0.1-0.rc3.7
- ignore "winbind" if it appears in "automount" nsswitch.conf (bz 214632).


autofs-5.0.1-rc3-nsswitch-ignore-winbind.patch:
 CHANGELOG       |    1 +
 lib/nss_parse.y |   27 ++++++++++++++++++++-------
 lib/nss_tok.l   |    2 +-
 3 files changed, 22 insertions(+), 8 deletions(-)

--- NEW FILE autofs-5.0.1-rc3-nsswitch-ignore-winbind.patch ---
diff --git a/CHANGELOG b/CHANGELOG
index b043e7e..011da35 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,7 @@
 ---------------------
 - fix typo in Fix typo in var when removing temp directory.
 - remove redundant rpath link option.
+- ignore "winbind" if it appears in "automount" nsswitch.conf.
 
 4/1/2007 autofs-5.0.1 rc3
 -------------------------
diff --git a/lib/nss_parse.y b/lib/nss_parse.y
index bc12c73..6be243e 100644
--- a/lib/nss_parse.y
+++ b/lib/nss_parse.y
@@ -51,6 +51,7 @@ extern int nss_lineno;
 extern int nss_lex(void);
 extern FILE *nss_in;
 
+static int nss_ignore(const char *s);
 static int nss_error(const char *s);
 
 %}
@@ -82,18 +83,24 @@ sources: nss_source
 
 nss_source: SOURCE
 {
-	src = add_source(nss_list, $1);
+	if (strcmp($1, "winbind"))
+		src = add_source(nss_list, $1);
+	else
+		nss_ignore($1);
 } | SOURCE LBRACKET status_exp_list RBRACKET
 {
 	enum nsswitch_status a;
 
-	src = add_source(nss_list, $1);
-	for (a = 0; a < NSS_STATUS_MAX; a++) {
-		if (act[a].action != NSS_ACTION_UNKNOWN) {
-			src->action[a].action = act[a].action;
-			src->action[a].negated = act[a].negated;
+	if (strcmp($1, "winbind")) {
+		src = add_source(nss_list, $1);
+		for (a = 0; a < NSS_STATUS_MAX; a++) {
+			if (act[a].action != NSS_ACTION_UNKNOWN) {
+				src->action[a].action = act[a].action;
+				src->action[a].negated = act[a].negated;
+			}
 		}
-	}
+	} else
+		nss_ignore($1);
 } | SOURCE LBRACKET status_exp_list SOURCE { nss_error($4); YYABORT; }
   | SOURCE LBRACKET status_exp_list OTHER { nss_error($4); YYABORT; }
   | SOURCE LBRACKET status_exp_list NL { nss_error("no closing bracket"); YYABORT; }
@@ -118,6 +125,12 @@ status_exp: STATUS EQUAL ACTION
 
 %%
 
+static int nss_ignore(const char *s)
+{
+	msg("ignored invalid nsswitch config near [ %s ]", s);
+	return(0);
+}
+
 static int nss_error(const char *s)
 {
 	msg("syntax error in nsswitch config near [ %s ]\n", s);
diff --git a/lib/nss_tok.l b/lib/nss_tok.l
index dea8203..597fc76 100644
--- a/lib/nss_tok.l
+++ b/lib/nss_tok.l
@@ -68,7 +68,7 @@ WS		[[:blank:]]+
 
 automount	([Aa][Uu][Tt][Oo][Mm][Oo][Uu][Nn][Tt])
 
-source		files|yp|nis|nisplus|ldap|hesiod
+source		files|yp|nis|nisplus|ldap|hesiod|winbind
 
 success		([Ss][Uu][Cc][Cc][Ee][Ss][Ss])
 notfound	([Nn][Oo][Tt][Ff][Oo][Uu][Nn][Dd])


Index: autofs.spec
===================================================================
RCS file: /cvs/dist/rpms/autofs/devel/autofs.spec,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -r1.175 -r1.176
--- autofs.spec	10 Jan 2007 04:12:32 -0000	1.175
+++ autofs.spec	15 Jan 2007 04:04:28 -0000	1.176
@@ -4,7 +4,7 @@
 Summary: A tool for automatically mounting and unmounting filesystems
 Name: autofs
 %define version 5.0.1
-%define release 0.rc3.5
+%define release 0.rc3.7
 Version: %{version}
 Release: %{release}
 Epoch: 1
@@ -13,6 +13,7 @@
 Source: ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/autofs-%{version}-rc3.tar.bz2
 Patch1: autofs-5.0.1-rc3-fix-typo-rmdir-temp.patch
 Patch2: autofs-5.0.1-rc3-remove-rpath-link-option.patch
+Patch3: autofs-5.0.1-rc3-nsswitch-ignore-winbind.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: autoconf, hesiod-devel, openldap-devel, bison, flex, libxml2-devel, cyrus-sasl-devel, openssl-devel
 Conflicts: kernel < 2.6.17
@@ -57,6 +58,7 @@
 echo %{version}-%{release} > .version
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir}
@@ -113,6 +115,9 @@
 %{_libdir}/autofs/*
 
 %changelog
+* Mon Jan 15 2007 Ian Kent <ikent redhat com> - 5.0.1-0.rc3.7
+- ignore "winbind" if it appears in "automount" nsswitch.conf (bz 214632).
+
 * Tue Jan 10 2007 Ian Kent <ikent redhat com> - 5.0.1-0.rc3.5
 - remove fullstop from Summary tag.
 - change Buildroot to recommended form.