rpms/autofs/devel autofs-5.0.0_beta4-misc-fixes.patch, NONE, 1.1 autofs.spec, 1.97, 1.98

[fedora-cvs-commits at redhat.com]

Author: ikent

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

Modified Files:
	autofs.spec 
Added Files:
	autofs-5.0.0_beta4-misc-fixes.patch 
Log Message:
* Wed Jun 8 2006 Ian Kent <ikent at redhat.com> - 5.0.0_beta4-5
- misc fixes for things found while investigating map re-read problem.


autofs-5.0.0_beta4-misc-fixes.patch:
 CHANGELOG              |    4 ++++
 daemon/automount.c     |    6 +++---
 lib/rpc_subs.c         |    4 +++-
 modules/lookup_hosts.c |   15 ++++++++++++---
 4 files changed, 22 insertions(+), 7 deletions(-)

--- NEW FILE autofs-5.0.0_beta4-misc-fixes.patch ---
diff --git a/CHANGELOG b/CHANGELOG
index 4d9d6e5..6259741 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -13,6 +13,10 @@
   fails lookup.
 - correct indirect mount expire broken by the wildcard lookup fix.
 - fix up multi-mount handling when wildcard map entry present.
+- fix mutex not being unlocked on map read.
+- fix rpc routines not logging errors.
+- fix handling of invalid directory for nobrowse hosts map
+  lookup.
 
 2/6/2006 autofs-5.0.0_beta4
 ---------------------------
diff --git a/daemon/automount.c b/daemon/automount.c
index d455a62..52f1ceb 100644
--- a/daemon/automount.c
+++ b/daemon/automount.c
@@ -1031,13 +1031,10 @@ static int do_hup_signal(struct master *
 		status = pthread_cond_wait(&mc.cond, &mc.mutex);
 		if (status)
 			fatal(status);
-		return 0;
 	}
 
 	pthread_cleanup_pop(1);
 
-	debug(master->default_logging, "started master map read"); 
-
 	return 1;
 }
 
@@ -1154,6 +1151,9 @@ static void handle_mounts_cleanup(void *
 
 	ap = (struct autofs_point *) arg;
 
+	/* Make sure alarms are cleared */
+	alarm_delete(ap);
+
 	umount_autofs(ap, 1);
 
 	/* If we have been canceled then we may hold the state mutex. */
diff --git a/lib/rpc_subs.c b/lib/rpc_subs.c
index c681563..bd12dae 100644
--- a/lib/rpc_subs.c
+++ b/lib/rpc_subs.c
@@ -33,9 +33,11 @@ #include <errno.h>
 #include "mount.h"
 #include "rpc_subs.h"
 
-#define STANDALONE
+/* #define STANDALONE */
 #ifdef STANDALONE
 #define error(logopt, msg, args...)	fprintf(stderr, msg "\n", ##args)
+#else
+#include "log.h"
 #endif
 
 /*
diff --git a/modules/lookup_hosts.c b/modules/lookup_hosts.c
index cbcdc4f..55e9fd1 100644
--- a/modules/lookup_hosts.c
+++ b/modules/lookup_hosts.c
@@ -115,15 +115,24 @@ int lookup_mount(struct autofs_point *ap
 		 * We haven't read the list of hosts into the
 		 * cache so go straight to the lookup.
 		 */
-		if (!ap->ghost)
+		if (!ap->ghost) {
+			/*
+			 * If name contains a '/' we're searching for an
+			 * offset that doesn't exist in the export list
+			 * so it's NOTFOUND otherwise this could be a
+			 * lookup for a new host.
+			 */
+			if (strchr(name, '/'))
+				status = NSS_STATUS_NOTFOUND;
 			goto done;
+		}
 
 		pthread_cleanup_push(cache_lock_cleanup, mc);
 		if (*name == '/')
-			error(ap->logopt, MODPREFIX
+			msg(MODPREFIX
 			      "can't find path in hosts map %s", name);
 		else
-			error(ap->logopt, MODPREFIX
+			msg(MODPREFIX
 			      "can't find path in hosts map %s/%s",
 			      ap->path, name);
 		pthread_cleanup_pop(0);


Index: autofs.spec
===================================================================
RCS file: /cvs/dist/rpms/autofs/devel/autofs.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- autofs.spec	7 Jun 2006 06:42:50 -0000	1.97
+++ autofs.spec	8 Jun 2006 10:48:30 -0000	1.98
@@ -4,7 +4,7 @@
 Summary: A tool for automatically mounting and unmounting filesystems.
 Name: autofs
 %define version 5.0.0_beta4
-%define release 4
+%define release 5
 Version: %{version}
 Release: %{release}
 Epoch: 1
@@ -20,6 +20,7 @@
 Patch6: autofs-5.0.0_beta4-expire-base-mount-fix.patch
 Patch7: autofs-5.0.0_beta4-wildcard-handling.patch
 Patch8: autofs-5.0.0_beta4-master_parse-redeclare.patch
+Patch9: autofs-5.0.0_beta4-misc-fixes.patch
 Buildroot: /var/tmp/autofs-tmp
 BuildPrereq: autoconf, hesiod-devel, openldap-devel, bison, flex
 Prereq: chkconfig
@@ -67,6 +68,7 @@
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
 
 %build
 #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir}
@@ -122,6 +124,9 @@
 %{_libdir}/autofs/*
 
 %changelog
+* Wed Jun 8 2006 Ian Kent <ikent at redhat.com> - 5.0.0_beta4-5
+- misc fixes for things found while investigating map re-read problem.
+
 * Wed Jun 7 2006 Ian Kent <ikent at redhat.com> - 5.0.0_beta4-4
 - check base of offset mount tree is not a mount before umounting
   its offsets.