Thu May 25 09:23:46 UTC 2006

Author: ikent

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

Modified Files:
	.cvsignore autofs.spec sources 
Added Files:
	autofs-5.0.0_beta3-dont-probe-nfs4.patch 
	autofs-5.0.0_beta3-pgrp-pid.patch 
	autofs-5.0.0_beta3-remove-extra-debug-print.patch 
	autofs-5.0.0_beta3-replicated-white-space.patch 
	autofs-5.0.0_beta3-underscore-to-dot.patch 
Removed Files:
	autofs-4.1.3-alt-master-ldap.patch 
	autofs-4.1.3-ldap-auto-master.patch 
	autofs-4.1.4-auto.smb-cifs.patch 
	autofs-4.1.4-auto_net-escape-hash.patch 
	autofs-4.1.4-cache-update-race-fix.patch 
	autofs-4.1.4-check-nsswitch-submount.patch 
	autofs-4.1.4-check-return-of-is-local-addr.patch 
	autofs-4.1.4-configureable-locking.patch 
	autofs-4.1.4-discard-bg-fg-options.patch 
	autofs-4.1.4-fix-sort-opts.patch 
	autofs-4.1.4-init-browse-as-non-first-option.patch 
	autofs-4.1.4-init-nsswitch-comment.patch 
	autofs-4.1.4-init-one-auto-master.patch 
	autofs-4.1.4-keylen-length-check.patch 
	autofs-4.1.4-ldap-depricated.patch 
	autofs-4.1.4-locking-fix.patch 
	autofs-4.1.4-multi-parse-fix.patch 
	autofs-4.1.4-no-slash-misc.patch 
	autofs-4.1.4-no-unlink-upstream.patch 
	autofs-4.1.4-non-replicated-ping.patch 
	autofs-4.1.4-reentrant-syslog-copyright.patch 
	autofs-4.1.4-reentrant-syslog.patch 
	autofs-4.1.4-sockopt-len-type.patch 
	autofs-4.1.4-sol10-schema.patch 
	autofs-4.1.4-solaris-hosts-in-auto-master.patch 
	autofs-4.1.4-sun-parse-fixes.patch 
	autofs-4.1.4-underscore_to_dot.patch 
	autofs-4.1.4-yp_order-order-type.patch 
Log Message:
* Thu May 25 2006 Ian Kent <ikent at redhat.com> - 5.0.0_beta3-1
- update source to version 5.0.0_beta3.
- add patch to remove extra debug print.
- add patch to
  - fix memory alloc error in nis lookup module.
  - add "_" to "." mapname translation to nis lookup module.
- add patch to add owner pid to mount list struct.
- add patch to disable NFSv4 when probing hosts (at least foe now).
- add patch to fix white space handling in replicated server selection code.


autofs-5.0.0_beta3-dont-probe-nfs4.patch:
 replicated.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE autofs-5.0.0_beta3-dont-probe-nfs4.patch ---

diff --git a/modules/replicated.c b/modules/replicated.c
index faa84dc..1ef2946 100644
--- a/modules/replicated.c
+++ b/modules/replicated.c
@@ -354,7 +354,7 @@ static unsigned int get_nfs_info(struct 
 		return 0;
 
 	parms.pm_prot = rpc_info->proto->p_proto;
-
+#if 0
 	if (!(version & NFS4_REQUESTED))
 		goto v3_ver;
 
@@ -375,6 +375,7 @@ static unsigned int get_nfs_info(struct 
 	}
 
 v3_ver:
+#endif
 	if (!(version & NFS3_REQUESTED))
 		goto v2_ver;
 

autofs-5.0.0_beta3-pgrp-pid.patch:
 include/automount.h |    1 +
 lib/mounts.c        |   20 ++++++++++++++++++++
 2 files changed, 21 insertions(+)

--- NEW FILE autofs-5.0.0_beta3-pgrp-pid.patch ---
diff --git a/include/automount.h b/include/automount.h
index ca90006..7fce4d2 100644
--- a/include/automount.h
+++ b/include/automount.h
@@ -312,6 +312,7 @@ struct mnt_list {
 	char *path;
 	char *fs_type;
 	char *opts;
+	pid_t owner;
 	/*
 	 * List operations ie. get_mnt_list.
 	 */
diff --git a/lib/mounts.c b/lib/mounts.c
index c5bae94..b932bb7 100644
--- a/lib/mounts.c
+++ b/lib/mounts.c
@@ -112,6 +112,7 @@ struct mnt_list *get_mnt_list(const char
 	struct mnt_list *ent, *mptr, *last;
 	struct mnt_list *list = NULL;
 	unsigned long count = 0;
+	char *pgrp;
 	int len;
 
 	if (!path || !pathlen || pathlen > PATH_MAX)
@@ -188,6 +189,15 @@ struct mnt_list *get_mnt_list(const char
 		}
 		strcpy(ent->opts, mnt->mnt_opts);
 
+		ent->owner = 0;
+		pgrp = strstr(mnt->mnt_opts);
+		if (pgrp) {
+			char *end = strchr(pgrp, ',');
+			if (end)
+				*end = '\0';
+			sscanf(pgrp, "pgrp=%d", &ent->owner);
+		}
+
 		if (count++ % 100)
 			sched_yield();
 	}
@@ -503,6 +513,7 @@ struct mnt_list *tree_make_mnt_tree(cons
 	struct mntent *mnt;
 	struct mnt_list *ent, *mptr;
 	struct mnt_list *tree = NULL;
+	char *pgrp;
 	int eq, plen;
 
 	tab = setmntent(table, "r");
@@ -564,6 +575,15 @@ struct mnt_list *tree_make_mnt_tree(cons
 		}
 		strcpy(ent->opts, mnt->mnt_opts);
 
+		ent->owner = 0;
+		pgrp = strstr(mnt->mnt_opts);
+		if (pgrp) {
+			char *end = strchr(pgrp, ',');
+			if (end)
+				*end = '\0';
+			sscanf(pgrp, "pgrp=%d", &ent->owner);
+		}
+
 		mptr = tree;
 		while (mptr) {
 			int elen = strlen(ent->path);

autofs-5.0.0_beta3-remove-extra-debug-print.patch:
 replicated.c |    2 --
 1 files changed, 2 deletions(-)

--- NEW FILE autofs-5.0.0_beta3-remove-extra-debug-print.patch ---
diff --git a/modules/replicated.c b/modules/replicated.c
index 69f03bc..faa84dc 100644
--- a/modules/replicated.c
+++ b/modules/replicated.c
@@ -82,8 +82,6 @@ static unsigned int get_proximity(const 
 	int sock, ret, i;
 	uint32_t mask, ha, ia;
 
-	debug("sizeof(h_addr) %d addr_len %d", sizeof(h_addr), addr_len);
-
 	memcpy(tmp, host_addr, addr_len);
 	h_addr = (struct in_addr *) tmp;
 

autofs-5.0.0_beta3-replicated-white-space.patch:
 CHANGELOG            |    1 +
 modules/replicated.c |   22 ++++++++++++++++------
 2 files changed, 17 insertions(+), 6 deletions(-)

--- NEW FILE autofs-5.0.0_beta3-replicated-white-space.patch ---
diff --git a/CHANGELOG b/CHANGELOG
index 370e302..a3b44f4 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,7 @@
 ---------------------
 - fix memory alloc error in nis lookup module.
 - add "_" to "." mapname translation to nis lookup module.
+- fix white space handling in replicated server selection code.
 
 23/5/2006 autofs-5.0.0_beta3
 ----------------------------
diff --git a/modules/replicated.c b/modules/replicated.c
index 1ef2946..cbc7c2e 100644
--- a/modules/replicated.c
+++ b/modules/replicated.c
@@ -808,21 +808,31 @@ int parse_location(struct host **hosts, 
 			}
 
 			if (*delim == ':') {
+				char *path;
 				int len;
 
 				*delim = '\0';
-				next = strpbrk(delim + 1, " ,\t");
-				if (next)
-					len = next - delim - 1;
-				else
-					len = strlen(delim + 1);
+				path = delim + 1;
+
+				/* Oh boy - might have spaces in the path */
+				next = path;
+				while (*next && *next != ':')
+					next++;
+
+				/* No spaces in host names at least */
+				if (*next == ':') {
+					while (*next &&
+					      (*next != ' ' || *next != '\t'))
+						next--;
+					*next++ = '\0';
+				}
 
 				if (!add_host_addrs(hosts, p, weight)) {
 					p = next;
 					continue;
 				}
 
-				if (!add_path(*hosts, delim + 1, len)) {
+				if (!add_path(*hosts, path, strlen(path))) {
 					free_host_list(hosts);
 					free(str);
 					return 0;

autofs-5.0.0_beta3-underscore-to-dot.patch:
 CHANGELOG           |    5 ++
 modules/lookup_yp.c |  104 ++++++++++++++++++++++++++++++++++++++++++++++------
 2 files changed, 98 insertions(+), 11 deletions(-)

--- NEW FILE autofs-5.0.0_beta3-underscore-to-dot.patch ---
diff --git a/CHANGELOG b/CHANGELOG
index ab204dd..370e302 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,8 @@
+?/?/2006 autofs-5.0.0
+---------------------
+- fix memory alloc error in nis lookup module.
+- add "_" to "." mapname translation to nis lookup module.
+
 23/5/2006 autofs-5.0.0_beta3
 ----------------------------
 - add config and compile time info to output of -V.
diff --git a/modules/lookup_yp.c b/modules/lookup_yp.c
index d2a35b0..d8dafa5 100644
--- a/modules/lookup_yp.c
+++ b/modules/lookup_yp.c
@@ -143,8 +143,15 @@ int lookup_read_master(struct master *ma
 	struct lookup_context *ctxt = (struct lookup_context *) context;
 	struct ypall_callback ypcb;
 	struct callback_master_data ypcb_data;
+	char *mapname;
 	int err;
 
+	mapname = alloca(strlen(ctxt->mapname) + 1);
+	if (!mapname)
+		return 0;
+
+	strcpy(mapname, ctxt->mapname);
+
 	ypcb_data.timeout = master->default_timeout;
 	ypcb_data.logging = master->default_logging;
 	ypcb_data.age = age;
@@ -152,11 +159,24 @@ int lookup_read_master(struct master *ma
 	ypcb.foreach = yp_all_master_callback;
 	ypcb.data = (char *) &ypcb_data;
 
-	err = yp_all((char *) ctxt->domainname, (char *) ctxt->mapname, &ypcb);
+	err = yp_all((char *) ctxt->domainname, mapname, &ypcb);
 
 	if (err != YPERR_SUCCESS) {
+		if (err == YPERR_MAP) {
+			char *usc;
+
+			while ((usc = strchr(mapname, '_')))
+				*usc = '.';
+
+			err = yp_all((char *) ctxt->domainname, mapname, &ypcb);
+		}
+
+		if (err == YPERR_SUCCESS)
+			return NSS_STATUS_SUCCESS;
+
 		warn(MODPREFIX "read of master map %s failed: %s",
-		       ctxt->mapname, yperr_string(err));
+		       mapname, yperr_string(err));
+
 		return NSS_STATUS_NOTFOUND;
 	}
 
@@ -213,19 +233,39 @@ int lookup_read_map(struct autofs_point 
 	struct lookup_context *ctxt = (struct lookup_context *) context;
 	struct ypall_callback ypcb;
 	struct callback_data ypcb_data;
+	char *mapname;
 	int err;
 
+	mapname = alloca(strlen(ctxt->mapname) + 1);
+	if (!mapname)
+		return 0;
+
+	strcpy(mapname, ctxt->mapname);
+
 	ypcb_data.ap = ap;
 	ypcb_data.age = age;
 
 	ypcb.foreach = yp_all_callback;
 	ypcb.data = (char *) &ypcb_data;
 
-	err = yp_all((char *) ctxt->domainname, (char *) ctxt->mapname, &ypcb);
+	err = yp_all((char *) ctxt->domainname, mapname, &ypcb);
 
 	if (err != YPERR_SUCCESS) {
+		if (err == YPERR_MAP) {
+			char *usc;
+
+			while ((usc = strchr(mapname, '_')))
+				*usc = '.';
+
+			err = yp_all((char *) ctxt->domainname, mapname, &ypcb);
+		}
+
+		if (err == YPERR_SUCCESS)
+			return NSS_STATUS_SUCCESS;
+
 		warn(MODPREFIX "read of map %s failed: %s",
 		       ap->path, yperr_string(err));
+
 		return NSS_STATUS_NOTFOUND;
 	}
 
@@ -238,25 +278,48 @@ static int lookup_one(struct autofs_poin
 {
 	struct map_source *source = ap->entry->current;
 	struct mapent_cache *mc = source->mc;
+	char *mapname;
 	char *mapent;
 	int mapent_len;
 	time_t age = time(NULL);
 	int ret;
 
+	mapname = alloca(strlen(ctxt->mapname) + 1);
+	if (!mapname)
+		return 0;
+
+	strcpy(mapname, ctxt->mapname);
+
+	mapent = alloca(MAPENT_MAX_LEN + 1);
+	if (!mapent)
+		return 0;
+
 	/*
 	 * For reasons unknown, the standard YP definitions doesn't
 	 * define input strings as const char *.  However, my
 	 * understanding is that they will not be modified by the
 	 * library.
 	 */
-	ret = yp_match((char *) ctxt->domainname, (char *) ctxt->mapname,
+	ret = yp_match((char *) ctxt->domainname, mapname,
 		       (char *) key, key_len, &mapent, &mapent_len);
 
 	if (ret != YPERR_SUCCESS) {
-		if (ret == YPERR_KEY)
-			return CHE_MISSING;
+		if (ret == YPERR_MAP) {
+			char *usc;
+
+			while ((usc = strchr(mapname, '_')))
+				*usc = '.';
+
+			ret = yp_match((char *) ctxt->domainname,
+				mapname, key, key_len, &mapent, &mapent_len);
+		}
+
+		if (ret != YPERR_SUCCESS) {
+			if (ret == YPERR_KEY)
+				return CHE_MISSING;
 
-		return -ret;
+			return -ret;
+		}
 	}
 
 	cache_writelock(mc);
@@ -270,23 +333,42 @@ static int lookup_wild(struct autofs_poi
 {
 	struct map_source *source = ap->entry->current;
 	struct mapent_cache *mc = source->mc;
+	char *mapname;
 	char *mapent;
 	int mapent_len;
 	time_t age = time(NULL);
 	int ret;
 
+	mapname = alloca(strlen(ctxt->mapname) + 1);
+	if (!mapname)
+		return 0;
+
+	strcpy(mapname, ctxt->mapname);
+
 	mapent = alloca(MAPENT_MAX_LEN + 1);
 	if (!mapent)
 		return 0;
 
 	ret = yp_match((char *) ctxt->domainname,
-		       (char *) ctxt->mapname, "*", 1, &mapent, &mapent_len);
+		       mapname, "*", 1, &mapent, &mapent_len);
 
 	if (ret != YPERR_SUCCESS) {
-		if (ret == YPERR_KEY)
-			return CHE_MISSING;
+		if (ret == YPERR_MAP) {
+			char *usc;
+
+			while ((usc = strchr(mapname, '_')))
+				*usc = '.';
 
-		return -ret;
+			ret = yp_match((char *) ctxt->domainname,
+				mapname, "*", 1, &mapent, &mapent_len);
+		}
+
+		if (ret != YPERR_SUCCESS) {
+			if (ret == YPERR_KEY)
+				return CHE_MISSING;
+
+			return -ret;
+		}
 	}
 
 	cache_writelock(mc);


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/autofs/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	13 Apr 2005 23:34:44 -0000	1.7
+++ .cvsignore	25 May 2006 09:23:43 -0000	1.8
@@ -1 +1 @@
-autofs-4.1.4.tar.bz2
+autofs-5.0.0_beta3.tar.gz


Index: autofs.spec
===================================================================
RCS file: /cvs/dist/rpms/autofs/devel/autofs.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- autofs.spec	16 May 2006 09:47:30 -0000	1.79
+++ autofs.spec	25 May 2006 09:23:44 -0000	1.80
@@ -3,45 +3,22 @@
 #
 Summary: A tool for automatically mounting and unmounting filesystems.
 Name: autofs
-%define version 4.1.4
-%define release 23
+%define version 5.0.0
+%define release 1
 Version: %{version}
 Release: %{release}
 Epoch: 1
 License: GPL
 Group: System Environment/Daemons
-Source: ftp://ftp.kernel.org/pub/linux/daemons/autofs/v4/autofs-%{version}.tar.bz2
-Patch1: autofs-4.1.4-reentrant-syslog.patch
-Patch2: autofs-4.1.4-reentrant-syslog-copyright.patch
-Patch3: autofs-4.1.4-init-nsswitch-comment.patch
-Patch4: autofs-4.1.4-init-one-auto-master.patch
-Patch5: autofs-4.1.4-init-browse-as-non-first-option.patch
-Patch6: autofs-4.1.4-hesiod-bind.patch
-Patch7: autofs-4.1.4-non-replicated-ping.patch
-Patch8: autofs-4.1.4-check-nsswitch-submount.patch
-Patch9: autofs-4.1.3-alt-master-ldap.patch
-Patch10: autofs-4.1.4-multi-parse-fix.patch
-Patch11: autofs-4.1.4-cache-update-race-fix.patch
-Patch12: autofs-4.1.4-solaris-hosts-in-auto-master.patch
-Patch13: autofs-4.1.4-keylen-length-check.patch
-Patch14: autofs-4.1.4-sun-parse-fixes.patch
-Patch15: autofs-4.1.4-check-return-of-is-local-addr.patch
-Patch16: autofs-4.1.4-fix-sort-opts.patch
-Patch17: autofs-4.1.4-no-slash-misc.patch
-Patch18: autofs-4.1.4-locking-fix.patch
-Patch19: autofs-4.1.4-configureable-locking.patch
-Patch20: autofs-4.1.4-sol10-schema.patch
-Patch21: autofs-4.1.4-sockopt-len-type.patch
-Patch22: autofs-4.1.4-yp_order-order-type.patch
-Patch23: autofs-4.1.4-ldap-depricated.patch
-Patch24: autofs-4.1.4-underscore_to_dot.patch
-Patch25: autofs-4.1.3-ldap-auto-master.patch
-Patch26: autofs-4.1.4-auto_net-escape-hash.patch
-Patch27: autofs-4.1.4-auto.smb-cifs.patch
-Patch28: autofs-4.1.4-discard-bg-fg-options.patch
+Source: ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/autofs-%{version}.tar.bz2
+Patch1: autofs-5.0.0_beta3-remove-extra-debug-print.patch
+Patch2: autofs-5.0.0_beta3-underscore-to-dot.patch
+Patch3: autofs-5.0.0_beta3-dont-probe-nfs4.patch
+Patch4: autofs-5.0.0_beta3-pgrp-pid.patch
+Patch5: autofs-5.0.0_beta3-replicated-white-space.patch
 
 Buildroot: /var/tmp/autofs-tmp
-BuildPrereq: autoconf, hesiod-devel, openldap-devel
+BuildPrereq: autoconf, hesiod-devel, openldap-devel, bison, flex, rpcgen
 Prereq: chkconfig
 Requires: /bin/bash mktemp sed gawk textutils sh-utils grep /bin/ps
 Obsoletes: autofs-ldap
@@ -83,33 +60,10 @@
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
-%patch14 -p1
-%patch15 -p1
-%patch16 -p1
-%patch17 -p1
-%patch18 -p1
-%patch19 -p1
-%patch20 -p1
-%patch21 -p1
-%patch22 -p1
-%patch23 -p1
-%patch24 -p1
-%patch25 -p1
-%patch26 -p1
-%patch27 -p1
-%patch28 -p1
 
 %build
 #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir}
-%configure
+%configure --disable-mount-locking --enable-ignore-busy
 make initdir=/etc/rc.d/init.d
 
 %install
@@ -159,6 +113,16 @@
 %{_libdir}/autofs/*
 
 %changelog
+* Thu May 25 2006 Ian Kent <ikent at redhat.com> - 5.0.0_beta3-1
+- update source to version 5.0.0_beta3.
+- add patch to remove extra debug print.
+- add patch to
+  - fix memory alloc error in nis lookup module.
+  - add "_" to "." mapname translation to nis lookup module.
+- add patch to add owner pid to mount list struct.
+- add patch to disable NFSv4 when probing hosts (at least foe now).
+- add patch to fix white space handling in replicated server selection code.
+
 * Tue May 16 2006 Ian Kent <ikent at redhat.com> - 1:4.1.4-23
 - add patch to ignore the "bg" and "fg" mount options as they
   aren't relevant for autofs mounts (bz #184386).


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/autofs/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	13 Apr 2005 23:34:44 -0000	1.7
+++ sources	25 May 2006 09:23:44 -0000	1.8
@@ -1 +1 @@
-7e3949114c00665b4636f0c318179657  autofs-4.1.4.tar.bz2
+c78377c5d5c6bdbcf741f901d00d5876  autofs-5.0.0_beta3.tar.gz


--- autofs-4.1.3-alt-master-ldap.patch DELETED ---


--- autofs-4.1.3-ldap-auto-master.patch DELETED ---


--- autofs-4.1.4-auto.smb-cifs.patch DELETED ---


--- autofs-4.1.4-auto_net-escape-hash.patch DELETED ---


--- autofs-4.1.4-cache-update-race-fix.patch DELETED ---


--- autofs-4.1.4-check-nsswitch-submount.patch DELETED ---


--- autofs-4.1.4-check-return-of-is-local-addr.patch DELETED ---


--- autofs-4.1.4-configureable-locking.patch DELETED ---


--- autofs-4.1.4-discard-bg-fg-options.patch DELETED ---


--- autofs-4.1.4-fix-sort-opts.patch DELETED ---


--- autofs-4.1.4-init-browse-as-non-first-option.patch DELETED ---


--- autofs-4.1.4-init-nsswitch-comment.patch DELETED ---


--- autofs-4.1.4-init-one-auto-master.patch DELETED ---


--- autofs-4.1.4-keylen-length-check.patch DELETED ---


--- autofs-4.1.4-ldap-depricated.patch DELETED ---


--- autofs-4.1.4-locking-fix.patch DELETED ---


--- autofs-4.1.4-multi-parse-fix.patch DELETED ---


--- autofs-4.1.4-no-slash-misc.patch DELETED ---


--- autofs-4.1.4-no-unlink-upstream.patch DELETED ---


--- autofs-4.1.4-non-replicated-ping.patch DELETED ---


--- autofs-4.1.4-reentrant-syslog-copyright.patch DELETED ---


--- autofs-4.1.4-reentrant-syslog.patch DELETED ---


--- autofs-4.1.4-sockopt-len-type.patch DELETED ---


--- autofs-4.1.4-sol10-schema.patch DELETED ---


--- autofs-4.1.4-solaris-hosts-in-auto-master.patch DELETED ---


--- autofs-4.1.4-sun-parse-fixes.patch DELETED ---


--- autofs-4.1.4-underscore_to_dot.patch DELETED ---


--- autofs-4.1.4-yp_order-order-type.patch DELETED ---


