rpms/autofs/F-7 autofs-5.0.1-correct-logic-test-wild-lookup.patch, NONE, 1.1 autofs.spec, 1.201, 1.202

[Ian Kent (iankent)]

Author: iankent

Update of /cvs/pkgs/rpms/autofs/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24406

Modified Files:
	autofs.spec 
Added Files:
	autofs-5.0.1-correct-logic-test-wild-lookup.patch 
Log Message:
* Sun Jun 3 2007 Ian Kent <ikent at redhat.com> - 5.0.1-11
- correct mistake in logic test in wildcard lookup.


autofs-5.0.1-correct-logic-test-wild-lookup.patch:

--- NEW FILE autofs-5.0.1-correct-logic-test-wild-lookup.patch ---
diff --git a/modules/lookup_file.c b/modules/lookup_file.c
index cc1964f..6346602 100644
--- a/modules/lookup_file.c
+++ b/modules/lookup_file.c
@@ -979,12 +979,12 @@ static int check_map_indirect(struct autofs_point *ap,
 			}
 		} else {
 			/* Wildcard not in map but now is */
-			if (wild & (CHE_OK || CHE_UPDATED))
+			if (wild & (CHE_OK | CHE_UPDATED))
 				source->stale = 1;
 		}
 		pthread_cleanup_pop(1);
 
-		if (wild & (CHE_OK || CHE_UPDATED))
+		if (wild & (CHE_OK | CHE_UPDATED))
 			return NSS_STATUS_SUCCESS;
 	}
 
diff --git a/modules/lookup_nisplus.c b/modules/lookup_nisplus.c
index eae8702..83e99e0 100644
--- a/modules/lookup_nisplus.c
+++ b/modules/lookup_nisplus.c
@@ -438,12 +438,12 @@ static int check_map_indirect(struct autofs_point *ap,
 			}
 		} else {
 			/* Wildcard not in map but now is */
-			if (wild & (CHE_OK || CHE_UPDATED))
+			if (wild & (CHE_OK | CHE_UPDATED))
 				source->stale = 1;
 		}
 		pthread_cleanup_pop(1);
 
-		if (wild & (CHE_UPDATED || CHE_OK))
+		if (wild & (CHE_UPDATED | CHE_OK))
 			return NSS_STATUS_SUCCESS;
 	}
 
diff --git a/modules/lookup_yp.c b/modules/lookup_yp.c
index 5a154cd..da280cc 100644
--- a/modules/lookup_yp.c
+++ b/modules/lookup_yp.c
@@ -523,12 +523,12 @@ static int check_map_indirect(struct autofs_point *ap,
 			}
 		} else {
 			/* Wildcard not in map but now is */
-			if (wild & (CHE_OK || CHE_UPDATED))
+			if (wild & (CHE_OK | CHE_UPDATED))
 				source->stale = 1;
 		}
 		pthread_cleanup_pop(1);
 
-		if (wild & (CHE_OK || CHE_UPDATED))
+		if (wild & (CHE_OK | CHE_UPDATED))
 			return NSS_STATUS_SUCCESS;
 	}
 


Index: autofs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/autofs/F-7/autofs.spec,v
retrieving revision 1.201
retrieving revision 1.202
diff -u -r1.201 -r1.202
--- autofs.spec	7 May 2007 03:18:27 -0000	1.201
+++ autofs.spec	3 Jun 2007 15:17:27 -0000	1.202
@@ -4,7 +4,7 @@
 Summary: A tool for automatically mounting and unmounting filesystems
 Name: autofs
 Version: 5.0.1
-Release: 10
+Release: 11
 Epoch: 1
 License: GPL
 Group: System Environment/Daemons
@@ -28,6 +28,7 @@
 Patch16: autofs-5.0.1-disable-exports-check.patch
 Patch17: autofs-5.0.1-cmd-global-options-fix.patch
 Patch18: autofs-5.0.1-allow-dot-in-master-macro.patch
+Patch19: autofs-5.0.1-correct-logic-test-wild-lookup.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
@@ -87,6 +88,7 @@
 %patch16 -p1
 %patch17 -p1
 %patch18 -p1
+%patch19 -p1
 
 %build
 #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir}
@@ -139,6 +141,9 @@
 %{_libdir}/autofs/
 
 %changelog
+* Sun Jun 3 2007 Ian Kent <ikent at redhat.com> - 5.0.1-11
+- correct mistake in logic test in wildcard lookup.
+
 * Mon May 7 2007 Ian Kent <ikent at redhat.com> - 5.0.1-10
 - fix master map lexer to admit "." in macro values.