rpms/autofs/FC-6 autofs-5.0.1-rc3-network_match-fix.patch, NONE, 1.1 autofs.spec, 1.175, 1.176

[fedora-cvs-commits at redhat.com]

Author: ikent

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

Modified Files:
	autofs.spec 
Added Files:
	autofs-5.0.1-rc3-network_match-fix.patch 
Log Message:
* Thu Mar 8 2007 Ian Kent <ikent at redhat.com> - 5.0.1-0.rc3.26
- fixed numeric export match (bz 231188).


autofs-5.0.1-rc3-network_match-fix.patch:
 rpc_subs.c |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

--- NEW FILE autofs-5.0.1-rc3-network_match-fix.patch ---
diff --git a/lib/rpc_subs.c b/lib/rpc_subs.c
index 2c5b5d5..5151a1e 100644
--- a/lib/rpc_subs.c
+++ b/lib/rpc_subs.c
@@ -1072,18 +1072,23 @@ static char *inet_fill_net(const char *net_num, char *net)
 	if (strlen(net_num) > INET_ADDRSTRLEN)
 		return NULL;
 
+	if (!isdigit(*net_num))
+		return NULL;
+
 	*net = '\0';
 	strcpy(net, net_num);
 
 	np = net;
-	while (*np) {
-		if (*np++ == '.') {
+	while (*np++) {
+		if (*np == '.') {
+			np++;
 			dots--;
 			if (!*np && dots)
 				strcat(net, "0");
+			continue;
 		}
 
-		if (!isdigit(*np) || dots < 0) {
+		if ((*np && !isdigit(*np)) || dots < 0) {
 			*net = '\0';
 			return NULL;
 		}


Index: autofs.spec
===================================================================
RCS file: /cvs/dist/rpms/autofs/FC-6/autofs.spec,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -r1.175 -r1.176
--- autofs.spec	1 Mar 2007 07:17:46 -0000	1.175
+++ autofs.spec	8 Mar 2007 06:40:55 -0000	1.176
@@ -4,7 +4,7 @@
 Summary: A tool for automatically mounting and unmounting filesystems
 Name: autofs
 %define version 5.0.1
-%define release 0.rc3.25
+%define release 0.rc3.26
 Version: %{version}
 Release: %{release}
 Epoch: 1
@@ -28,6 +28,7 @@
 Patch15: autofs-5.0.1-rc3-check-user-info-return.patch
 Patch16: autofs-5.0.1-rc3-file-map-allow-white-space-only-line.patch
 Patch17: autofs-5.0.1-rc3-export-check-network-fix-2.patch
+Patch18: autofs-5.0.1-rc3-network_match-fix.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: autoconf, hesiod-devel, openldap-devel, bison, flex, libxml2-devel, cyrus-sasl-devel, openssl-devel
 Conflicts: kernel < 2.6.17
@@ -87,6 +88,7 @@
 %patch15 -p1
 %patch16 -p1
 %patch17 -p1
+%patch18 -p1
 
 %build
 #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir}
@@ -143,6 +145,9 @@
 %{_libdir}/autofs/*
 
 %changelog
+* Thu Mar 8 2007 Ian Kent <ikent at redhat.com> - 5.0.1-0.rc3.26
+- fixed numeric export match (bz 231188).
+
 * Thu Mar 1 2007 Ian Kent <ikent at redhat.com> - 5.0.1-0.rc3.25
 - change file map lexer to allow white-space only blank lines (bz 229434).
 - fix return check for getpwuid_r and getgrgid_r (bz 229344).