rpms/autofs/FC-5 autofs-4.1.4-dont-create-remote-dirs.patch, 1.2, 1.3 autofs.spec, 1.86, 1.87

[fedora-cvs-commits at redhat.com]

Author: ikent

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

Modified Files:
	autofs-4.1.4-dont-create-remote-dirs.patch autofs.spec 
Log Message:
* Tue Oct 25 2006 Ian Kent <ikent at redhat.com> - 1:4.1.4-33
- correction to patch for revision 32.


autofs-4.1.4-dont-create-remote-dirs.patch:
 daemon/automount.c  |   42 ++++++++++++++++++++++-----------
 include/automount.h |    4 +++
 lib/mounts.c        |   66 ++++++++++++++++++++++++++++++++++++++++++----------
 3 files changed, 87 insertions(+), 25 deletions(-)

Index: autofs-4.1.4-dont-create-remote-dirs.patch
===================================================================
RCS file: /cvs/dist/rpms/autofs/FC-5/autofs-4.1.4-dont-create-remote-dirs.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- autofs-4.1.4-dont-create-remote-dirs.patch	24 Oct 2006 08:02:47 -0000	1.2
+++ autofs-4.1.4-dont-create-remote-dirs.patch	25 Oct 2006 07:48:07 -0000	1.3
@@ -27,7 +27,7 @@
  int allow_owner_mount(const char *);
 --- autofs-4.1.4/daemon/automount.c.dont-create-remote-dirs	2006-10-04 04:06:20.000000000 +0800
 +++ autofs-4.1.4/daemon/automount.c	2006-10-04 04:07:47.000000000 +0800
-@@ -101,6 +101,29 @@
+@@ -101,6 +101,32 @@
  static int handle_packet_expire(const struct autofs_packet_expire *pkt);
  static int umount_all(int force);
  
@@ -46,8 +46,11 @@
 +	}
 +
 +	if (contained_in_local_fs(path)) {
-+		if (mkdir(path, mode) == -1)
++		if (mkdir(path, mode) == -1) {
++			if (errno == EEXIST)
++				return 1;
 +			return 0;
++		}
 +		return 1;
 +	}
 +
@@ -57,7 +60,7 @@
  int mkdir_path(const char *path, mode_t mode)
  {
  	char *buf = alloca(strlen(path) + 1);
-@@ -113,19 +136,9 @@
+@@ -113,19 +139,9 @@
  			bp += cp - lcp;
  			lcp = cp;
  			*bp = '\0';
@@ -98,7 +101,7 @@
  	int len;
  
  	if (!path || !pathlen || pathlen > PATH_MAX)
-@@ -91,6 +91,13 @@
+@@ -91,6 +91,14 @@
  		}
  		strcpy(ent->path, mnt->mnt_dir);
  
@@ -108,11 +111,12 @@
 +			free_mnt_list(list);
 +			return NULL;
 +		}
++		strcpy(ent->fs_name, mnt->mnt_fsname);
 +
  		ent->fs_type = malloc(strlen(mnt->mnt_type) + 1);
  		if (!ent->fs_type) {
  			endmntent(tab);
-@@ -105,16 +112,6 @@
+@@ -105,16 +113,6 @@
  	}
  	endmntent(tab);
  
@@ -129,7 +133,7 @@
  	return list;
  }
  
-@@ -242,6 +239,9 @@
+@@ -242,6 +240,9 @@
  		if (this->path)
  			free(this->path);
  
@@ -139,7 +143,7 @@
  		if (this->fs_type)
  			free(this->fs_type);
  
-@@ -282,7 +282,46 @@
+@@ -282,7 +283,48 @@
  
  	return ret;
  }
@@ -165,6 +169,8 @@
 +		size_t len = strlen(this->path);
 +
 +		if (!strncmp(path, this->path, len)) {
++			if (len > 1 && pathlen > len && path[len] != '/')
++				continue;
 +			rv = statfs(this->path, &fs);
 +			if (rv != -1 && fs.f_type == AUTOFS_SUPER_MAGIC)
 +				ret = 1;


Index: autofs.spec
===================================================================
RCS file: /cvs/dist/rpms/autofs/FC-5/autofs.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- autofs.spec	24 Oct 2006 08:02:48 -0000	1.86
+++ autofs.spec	25 Oct 2006 07:48:07 -0000	1.87
@@ -4,7 +4,7 @@
 Summary: A tool for automatically mounting and unmounting filesystems.
 Name: autofs
 %define version 4.1.4
-%define release 32
+%define release 33
 Version: %{version}
 Release: %{release}
 Epoch: 1
@@ -169,6 +169,9 @@
 %{_libdir}/autofs/*
 
 %changelog
+* Tue Oct 25 2006 Ian Kent <ikent at redhat.com> - 1:4.1.4-33
+- correction to patch for revision 32.
+
 * Tue Oct 24 2006 Ian Kent <ikent at redhat.com> - 1:4.1.4-32
 - correction to patch for revision 31.