rpms/autofs/devel autofs-5.0.0_beta4-directory-cleanup.patch, NONE, 1.1 autofs.spec, 1.108, 1.109

[fedora-cvs-commits at redhat.com]

Author: ikent

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

Modified Files:
	autofs.spec 
Added Files:
	autofs-5.0.0_beta4-directory-cleanup.patch 
Log Message:
* Tue Jun 20 2006 Ian Kent <ikent at redhat.com> - 5.0.0_beta4-14
- fix directory cleanup at exit.


autofs-5.0.0_beta4-directory-cleanup.patch:
 CHANGELOG          |    1 +
 daemon/automount.c |   15 +++++++++++++++
 2 files changed, 16 insertions(+)

--- NEW FILE autofs-5.0.0_beta4-directory-cleanup.patch ---
diff --git a/CHANGELOG b/CHANGELOG
index d801858..ca28b79 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -29,6 +29,7 @@
 - add export access list matching to "hosts" lookup module.
 - add check for key length to long (Jeff Moyer).
 - add patch to restrict /proc lookup to pid directories (Jeff Moyer).
+- fix directory cleanup at exit.
 
 2/6/2006 autofs-5.0.0_beta4
 ---------------------------
diff --git a/daemon/automount.c b/daemon/automount.c
index ee69006..aeece1b 100644
--- a/daemon/automount.c
+++ b/daemon/automount.c
@@ -1190,9 +1190,16 @@ static void mutex_operation_wait(pthread
 static void handle_mounts_cleanup(void *arg)
 {
 	struct autofs_point *ap;
+	char path[PATH_MAX + 1];
+	char buf[MAX_ERR_BUF];
 
 	ap = (struct autofs_point *) arg;
 
+	if (!ap->submount && strcmp(ap->path, "/-") && ap->dir_created)
+		strcpy(path, ap->path);
+	else
+		*path = '\0';
+
 	/* Make sure alarms are cleared */
 	alarm_delete(ap);
 
@@ -1211,6 +1218,14 @@ static void handle_mounts_cleanup(void *
 	if (master_list_empty(master))
 		kill(getpid(), SIGTERM);
 
+	if (*path) {
+		if (rmdir(path) == -1) {
+			char *estr = strerror_r(errno, buf, MAX_ERR_BUF);
+			warn(LOGOPT_NONE, "failed to remove dir %s: %s",
+			     path, estr);
+		}
+	}
+
 	return;
 }
 


Index: autofs.spec
===================================================================
RCS file: /cvs/dist/rpms/autofs/devel/autofs.spec,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- autofs.spec	19 Jun 2006 09:10:11 -0000	1.108
+++ autofs.spec	20 Jun 2006 04:15:26 -0000	1.109
@@ -4,7 +4,7 @@
 Summary: A tool for automatically mounting and unmounting filesystems.
 Name: autofs
 %define version 5.0.0_beta4
-%define release 13
+%define release 14
 Version: %{version}
 Release: %{release}
 Epoch: 1
@@ -35,6 +35,7 @@
 Patch21: autofs-5.0.0_beta4-proc-pid-only.patch
 Patch22: autofs-5.0.0_beta4-bad-key-length-fix.patch
 Patch23: autofs-5.0.0_beta4-bad-key-length-fix-fix.patch
+Patch24: autofs-5.0.0_beta4-directory-cleanup.patch
 Buildroot: /var/tmp/autofs-tmp
 BuildRequires: autoconf, hesiod-devel, openldap-devel, bison, flex, libxml2-devel, cyrus-sasl-devel
 Prereq: chkconfig
@@ -97,6 +98,7 @@
 %patch21 -p1
 %patch22 -p1
 %patch23 -p1
+%patch24 -p1
 
 %build
 #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir}
@@ -152,7 +154,10 @@
 %{_libdir}/autofs/*
 
 %changelog
-* Mon Jun 19 2006 Ian Kent <jikent at redhat.com> - 5.0.0_beta4-13
+* Tue Jun 20 2006 Ian Kent <ikent at redhat.com> - 5.0.0_beta4-14
+- fix directory cleanup at exit.
+
+* Mon Jun 19 2006 Ian Kent <ikent at redhat.com> - 5.0.0_beta4-13
 - Change LDAP message severity from crit to degug (bz# 183893).
 - Corrections to INSTALL and README.v5.release.
 - Add patch to fix segv on overlength map keys in file maps (Jeff Moter).