PERFORCE change 147429 for review

[Edward Tomasz Napierala]

http://perforce.freebsd.org/chv.cgi?CH=147429

Change 147429 by trasz at trasz_traszkan on 2008/08/15 09:14:32

	Don't panic with null pointer dereference on setfacl -k.

Affected files ...

.. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ufs/ufs_acl.c#11 edit

Differences ...

==== //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ufs/ufs_acl.c#11 (text+ko) ====

@@ -479,6 +479,10 @@
 		    ap->a_cred, ap->a_td);
 		if (error != 0)
 			return (error);
+
+		error = acl_copy_acl_into_oldacl(ap->a_aclp, &old);
+		if (error)
+			return (error);
 	} else {
 		/*
 		 * Delete operation.
@@ -506,10 +510,6 @@
 	if ((error = VOP_ACCESS(ap->a_vp, VADMIN, ap->a_cred, ap->a_td)))
 		return (error);
 
-	error = acl_copy_acl_into_oldacl(ap->a_aclp, &old);
-	if (error)
-		return (error);
-
 	switch(ap->a_type) {
 	case ACL_TYPE_ACCESS:
 		error = vn_extattr_set(ap->a_vp, IO_NODELOCKED,