PERFORCE change 147293 for review

[Edward Tomasz Napierala]

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

Change 147293 by trasz at trasz_traszkan on 2008/08/13 12:59:43

	Small tweaks.

Affected files ...

.. //depot/projects/soc2008/trasz_nfs4acl/bin/setfacl/setfacl.c#8 edit
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_support.c#6 edit

Differences ...

==== //depot/projects/soc2008/trasz_nfs4acl/bin/setfacl/setfacl.c#8 (text+ko) ====

@@ -313,7 +313,8 @@
 		if (acl_type == ACL_TYPE_NFS4)
 			need_mask = 0;
 
-		if (need_mask && (set_acl_mask(&final_acl, filename) == -1)) {
+		if (need_mask && (set_acl_mask(&final_acl,
+		    file->filename) == -1)) {
 			warnx("%s: failed to set ACL mask", file->filename);
 			carried_error++;
 		} else if (h_flag) {

==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_support.c#6 (text+ko) ====

@@ -155,9 +155,6 @@
 
 	acl_int = &acl->ats_acl;
 
-	/* XXX: */
-	assert(_entry_brand(&(acl->ats_acl.acl_entry[3])) == ACL_BRAND_POSIX);
-
 	qsort(&acl_int->acl_entry[0], acl_int->acl_cnt,
 	    sizeof(struct acl_entry), (compare) _posix1e_acl_entry_compare);