rpms/nfs-utils/devel nfs-utils-1.1.2-rmtab-fqdn.patch, NONE, 1.1 nfs-utils.spec, 1.175, 1.176

[Steve Dickson (steved)]

Author: steved

Update of /cvs/pkgs/rpms/nfs-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19500

Modified Files:
	nfs-utils.spec 
Added Files:
	nfs-utils-1.1.2-rmtab-fqdn.patch 
Log Message:
FQDNs in the rmtab causes exportfs to seg fault (bz 444275)


nfs-utils-1.1.2-rmtab-fqdn.patch:

--- NEW FILE nfs-utils-1.1.2-rmtab-fqdn.patch ---
commit 710765a87d599d95de51b79202ba3d82fd03ed95
Author: Steve Dickson <steved at redhat.com>
Date:   Wed Jun 25 09:23:45 2008 -0400

    When a FQDN exists in /var/lib/nfs/rmtab it causes
    the exportfs command to seg fault due to the nfs_export pointer
    not being allocated. Reworking the parentheses in rmtab_read()
    so the htype variable is evaluated correctly fix the problem.
    
    Signed-off-by: Steve Dickson <steved at redhat.com>

diff --git a/support/export/rmtab.c b/support/export/rmtab.c
index 0ce3682..e11a22a 100644
--- a/support/export/rmtab.c
+++ b/support/export/rmtab.c
@@ -31,10 +31,10 @@ rmtab_read(void)
 		int			htype;
 		
 		htype = client_gettype(rep->r_client);
-		if (htype == MCL_FQDN || (htype == MCL_SUBNETWORK
+		if ((htype == MCL_FQDN || htype == MCL_SUBNETWORK)
 		    && (hp = gethostbyname (rep->r_client))
 		    && (hp = hostent_dup (hp),
-			(exp = export_allowed (hp, rep->r_path))))) {
+			exp = export_allowed (hp, rep->r_path))) {
 			/* see if the entry already exists, otherwise this was an instantiated
 			 * wild card, and we must add it
 			 */


Index: nfs-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/devel/nfs-utils.spec,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -r1.175 -r1.176
--- nfs-utils.spec	23 Jun 2008 18:03:20 -0000	1.175
+++ nfs-utils.spec	25 Jun 2008 14:14:47 -0000	1.176
@@ -2,7 +2,7 @@
 Name: nfs-utils
 URL: http://sourceforge.net/projects/nfs
 Version: 1.1.2
-Release: 6%{?dist}
+Release: 8%{?dist}
 Epoch: 1
 
 # group all 32bit related archs
@@ -52,6 +52,7 @@
 Patch118: nfs-utils-1.1.2-mountstats-rdma.patch
 Patch119: nfs-utils-1.1.2-nfs-iostat.patch
 Patch120: nfs-utils-1.1.2-nfs-iostat-rdma.patch
+Patch121: nfs-utils-1.1.2-rmtab-fqdn.patch
 
 %if %{enablefscache}
 Patch90: nfs-utils-1.1.0-mount-fsc.patch
@@ -132,6 +133,7 @@
 %patch118 -p1
 %patch119 -p1
 %patch120 -p1
+%patch121 -p1
 
 %if %{enablefscache}
 %patch90 -p1
@@ -299,6 +301,9 @@
 %attr(4755,root,root)   /sbin/umount.nfs4
 
 %changelog
+* Wed Jun 25 2008 Steve Dickson <steved at redhat.com>  1.1.2-8
+- FQDNs in the rmtab causes exportfs to seg fault (bz 444275)
+
 * Mon Jun 23 2008 Steve Dickson <steved at redhat.com>  1.1.2-7
 - Added -D_FILE_OFFSET_BITS=64 to CFLAGS
 - make nfsstat read and print stats as unsigned integers