rpms/autofs/devel autofs-5.0.4-easy-alloca-replacements-fix.patch, 1.1.2.1, 1.1.2.2 autofs.spec, 1.267.2.1, 1.267.2.2

[Ian Kent]

Author: iankent

Update of /cvs/pkgs/rpms/autofs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4800

Modified Files:
      Tag: private-autofs-segv-test-branch
	autofs-5.0.4-easy-alloca-replacements-fix.patch autofs.spec 
Log Message:
* Mon Feb 23 2009 Ian Kent <ikent at redhat.com> - 5.0.4-12
- Undo mistake in copy order for submount path introduced by rev 11 patch.


autofs-5.0.4-easy-alloca-replacements-fix.patch:

Index: autofs-5.0.4-easy-alloca-replacements-fix.patch
===================================================================
RCS file: /cvs/pkgs/rpms/autofs/devel/Attic/autofs-5.0.4-easy-alloca-replacements-fix.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- autofs-5.0.4-easy-alloca-replacements-fix.patch	19 Feb 2009 06:20:02 -0000	1.1.2.1
+++ autofs-5.0.4-easy-alloca-replacements-fix.patch	23 Feb 2009 04:10:36 -0000	1.1.2.2
@@ -8,13 +8,13 @@
 
  CHANGELOG               |    1 +
  modules/lookup_ldap.c   |    3 ---
- modules/mount_autofs.c  |   11 +++--------
+ modules/mount_autofs.c  |    9 ++-------
  modules/mount_bind.c    |    6 +++++-
  modules/mount_changer.c |    6 +++++-
  modules/mount_ext2.c    |    6 +++++-
  modules/mount_generic.c |    6 +++++-
  modules/mount_nfs.c     |   12 +++++++-----
- 8 files changed, 31 insertions(+), 20 deletions(-)
+ 8 files changed, 30 insertions(+), 19 deletions(-)
 
 
 --- autofs-5.0.4.orig/CHANGELOG
@@ -83,7 +83,7 @@
  		if (ap->flags & MOUNT_FLAG_REMOUNT) {
  			strcpy(mountpoint, name);
  			strcpy(realpath, name);
-@@ -81,12 +78,10 @@ int mount_mount(struct autofs_point *ap,
+@@ -81,8 +78,6 @@ int mount_mount(struct autofs_point *ap,
  			strcpy(realpath, name);
  		}
  	} else {
@@ -91,12 +91,7 @@
 -		mountpoint = alloca(len + name_len + 2);
  		strcpy(mountpoint, root);
  		strcat(mountpoint, "/");
--		strcpy(realpath, mountpoint);
- 		strcat(mountpoint, name);
-+		strcpy(realpath, mountpoint);
- 		strcat(realpath, name);
- 	}
- 
+ 		strcpy(realpath, mountpoint);
 --- autofs-5.0.4.orig/modules/mount_bind.c
 +++ autofs-5.0.4/modules/mount_bind.c
 @@ -81,8 +81,12 @@ int mount_mount(struct autofs_point *ap,


Index: autofs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/autofs/devel/autofs.spec,v
retrieving revision 1.267.2.1
retrieving revision 1.267.2.2
diff -u -r1.267.2.1 -r1.267.2.2
--- autofs.spec	19 Feb 2009 06:20:02 -0000	1.267.2.1
+++ autofs.spec	23 Feb 2009 04:10:37 -0000	1.267.2.2
@@ -4,7 +4,7 @@
 Summary: A tool for automatically mounting and unmounting filesystems
 Name: autofs
 Version: 5.0.4
-Release: 11
+Release: 12
 Epoch: 1
 License: GPLv2+
 Group: System Environment/Daemons
@@ -149,6 +149,9 @@
 %{_libdir}/autofs/
 
 %changelog
+* Mon Feb 23 2009 Ian Kent <ikent at redhat.com> - 5.0.4-12
+- Undo mistake in copy order for submount path introduced by rev 11 patch.
+
 * Thu Feb 19 2009 Ian Kent <ikent at redhat.com> - 5.0.4-11
 - fix array out of bounds accesses and cleanup couple of other alloca() calls.