rpms/nfs4-acl-tools/devel nfs4acl-0.3.3-ace.patch, NONE, 1.1 nfs4-acl-tools.spec, 1.8, 1.9

[Steve Dickson]

Author: steved

Update of /cvs/pkgs/rpms/nfs4-acl-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11771

Modified Files:
	nfs4-acl-tools.spec 
Added Files:
	nfs4acl-0.3.3-ace.patch 
Log Message:
Fixes segfaulting issues with ACEs that have empty mask fields



nfs4acl-0.3.3-ace.patch:
 nfs4_ace_from_string.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE nfs4acl-0.3.3-ace.patch ---
commit 75053cc0be7c4d78ef0c6b5e9954ee30b85705bc
Author: Brian De Wolf <bldewolf at csupomona.edu>
Date:   Tue Sep 15 14:33:55 2009 -0700

    allow parsing ACEs with empty masks
    
    After upgrading from 0.3.2 to 0.3.3 to fix some segfaulting issues we
    had, 0.3.3 now rejects ACEs that have empty mask fields.  This is
    because the function parse_alloc_fields checks whether the three strings
    are zero length.  Having a zero length "type" or "who" definitely
    doesn't make sense, but having an empty mask is entirely possible.  It's
    allowed in the old versions and the ZFS back-end in our setup allows
    them too.  Even nfs4_getfacl prints them out, producing the frustrating
    situation where nfs4_getfacl can produce ACLs that you can't apply with
    nfs4_setfacl.
    
    This patch modifies the function to not check if the mask is an empty
    string.
    
    Signed-off-by: J. Bruce Fields <bfields at citi.umich.edu>

diff --git a/libnfs4acl/nfs4_ace_from_string.c b/libnfs4acl/nfs4_ace_from_string.c
index 036d9b8..9d877fb 100644
--- a/libnfs4acl/nfs4_ace_from_string.c
+++ b/libnfs4acl/nfs4_ace_from_string.c
@@ -120,7 +120,7 @@ parse_alloc_fields(char *buf, char *fields[NUMFIELDS])
 		fields[i][len] = 0;
 	}
 
-	if (!fields[TYPE_INDEX][0] || !fields[WHO_INDEX][0] || !fields[MASK_INDEX][0])
+	if (!fields[TYPE_INDEX][0] || !fields[WHO_INDEX][0])
 		goto out_free;
 
 	return 0;


Index: nfs4-acl-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nfs4-acl-tools/devel/nfs4-acl-tools.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- nfs4-acl-tools.spec	30 Jul 2009 17:38:55 -0000	1.8
+++ nfs4-acl-tools.spec	16 Nov 2009 19:12:42 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           nfs4-acl-tools
 Version:        0.3.3
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        The nfs4 ACL tools
 Group:          Applications/System
 License:        BSD
@@ -12,6 +12,8 @@ Source0:        http://www.citi.umich.ed
 BuildRequires: libtool
 BuildRequires: libattr-devel
 
+Patch001: nfs4acl-0.3.3-ace.patch
+
 Patch100: nfs4acl-0.2.0-compile.patch
 
 %description
@@ -21,6 +23,8 @@ NFSv4 client.
 %prep
 %setup -q
 
+%patch001 -p1
+
 %patch100 -p1
 
 %build
@@ -52,6 +56,9 @@ rm -rf %{buildroot}
 %{_mandir}/man5/*
 
 %changelog
+* Mon Nov 16 2009 Steve Dickson <steved at redhat.com> - 0.3.3-5
+- Fixes segfaulting issues with ACEs that have empty mask fields
+
 * Thu Jul 30 2009 Steve Dickson <steved at redhat.com> - 0.3.3-4
 - Change Group in spec file (bz 512580)