From owner-p4-projects@FreeBSD.ORG Sat May 23 18:07:37 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9C7041065673; Sat, 23 May 2009 18:07:37 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 44124106566C for ; Sat, 23 May 2009 18:07:37 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 288888FC1E for ; Sat, 23 May 2009 18:07:37 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4NI7bZk079333 for ; Sat, 23 May 2009 18:07:37 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4NI7bjE079331 for perforce@freebsd.org; Sat, 23 May 2009 18:07:37 GMT (envelope-from trasz@freebsd.org) Date: Sat, 23 May 2009 18:07:37 GMT Message-Id: <200905231807.n4NI7bjE079331@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 162590 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 May 2009 18:07:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=162590 Change 162590 by trasz@trasz_victim on 2009/05/23 18:07:06 Fix typos. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_add_flag_np.3#4 edit .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_support_nfs4.c#10 edit .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/acl.9#5 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_acl_nfs4.c#44 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_add_flag_np.3#4 (text+ko) ==== @@ -55,7 +55,7 @@ .Bd -literal -offset indent -compact ACL_ENTRY_FILE_INHERIT Will be inherited by files. ACL_ENTRY_DIRECTORY_INHERIT Will be inherited by directories. -ACL_ENRY_NO_PROPAGATE_INHERIT Will not propagate. +ACL_ENTRY_NO_PROPAGATE_INHERIT Will not propagate. ACL_ENTRY_INHERIT_ONLY Inherit-only. .Ed .Sh RETURN VALUES ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_support_nfs4.c#10 (text+ko) ==== @@ -45,7 +45,7 @@ {{ ACL_ENTRY_FILE_INHERIT, "file_inherit", 'f'}, { ACL_ENTRY_DIRECTORY_INHERIT, "dir_inherit", 'd'}, { ACL_ENTRY_INHERIT_ONLY, "inherit_only", 'i'}, - { ACL_ENRY_NO_PROPAGATE_INHERIT, "no_propagate", 'n'}, + { ACL_ENTRY_NO_PROPAGATE_INHERIT, "no_propagate", 'n'}, { ACL_ENTRY_SUCCESSFUL_ACCESS, "successfull_access", 'S'}, { ACL_ENTRY_FAILED_ACCESS, "failed_access", 'F'}, /* ==== //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/acl.9#5 (text+ko) ==== @@ -183,7 +183,7 @@ .Bl -tag -width ".Dv ACL_ENTRY_DIRECTORY_INHERIT" .It Dv ACL_ENTRY_FILE_INHERIT .It Dv ACL_ENTRY_DIRECTORY_INHERIT -.It Dv ACL_ENRY_NO_PROPAGATE_INHERIT +.It Dv ACL_ENTRY_NO_PROPAGATE_INHERIT .It Dv ACL_ENTRY_INHERIT_ONLY .El .El ==== //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_acl_nfs4.c#44 (text+ko) ==== @@ -391,11 +391,11 @@ * are cleared: * ACL_ENTRY_FILE_INHERIT, * ACL_ENTRY_DIRECTORY_INHERIT, - * ACL_ENRY_NO_PROPAGATE_INHERIT. + * ACL_ENTRY_NO_PROPAGATE_INHERIT. */ copy->ae_flags &= ~(ACL_ENTRY_FILE_INHERIT | ACL_ENTRY_DIRECTORY_INHERIT | - ACL_ENRY_NO_PROPAGATE_INHERIT); + ACL_ENTRY_NO_PROPAGATE_INHERIT); /* * The algorithm continues on with the second ACE. @@ -855,7 +855,7 @@ */ if (is_directory && (flags & ACL_ENTRY_DIRECTORY_INHERIT) == 0 && - (flags & ACL_ENRY_NO_PROPAGATE_INHERIT)) + (flags & ACL_ENTRY_NO_PROPAGATE_INHERIT)) continue; KASSERT(child_aclp->acl_cnt + 1 <= ACL_MAX_ENTRIES, @@ -875,21 +875,21 @@ * This is not in the specification, but SunOS * apparently does that. */ - if (((entry->ae_flags & ACL_ENRY_NO_PROPAGATE_INHERIT) || + if (((entry->ae_flags & ACL_ENTRY_NO_PROPAGATE_INHERIT) || !is_directory) && entry->ae_entry_type == ACL_ENTRY_TYPE_ALLOW) entry->ae_perm &= ~(ACL_WRITE_ACL | ACL_WRITE_OWNER); /* - * 2.A. If the ACL_ENRY_NO_PROPAGATE_INHERIT is set, or if the object + * 2.A. If the ACL_ENTRY_NO_PROPAGATE_INHERIT is set, or if the object * being created is not a directory, then clear the - * following flags: ACL_ENRY_NO_PROPAGATE_INHERIT, + * following flags: ACL_ENTRY_NO_PROPAGATE_INHERIT, * ACL_ENTRY_FILE_INHERIT, ACL_ENTRY_DIRECTORY_INHERIT, * ACL_ENTRY_INHERIT_ONLY. */ - if (entry->ae_flags & ACL_ENRY_NO_PROPAGATE_INHERIT || + if (entry->ae_flags & ACL_ENTRY_NO_PROPAGATE_INHERIT || !is_directory) { - entry->ae_flags &= ~(ACL_ENRY_NO_PROPAGATE_INHERIT | + entry->ae_flags &= ~(ACL_ENTRY_NO_PROPAGATE_INHERIT | ACL_ENTRY_FILE_INHERIT | ACL_ENTRY_DIRECTORY_INHERIT | ACL_ENTRY_INHERIT_ONLY); @@ -901,7 +901,7 @@ /* * 2.B. If the object is a directory and ACL_ENTRY_FILE_INHERIT - * is set, but ACL_ENRY_NO_PROPAGATE_INHERIT is not set, ensure + * is set, but ACL_ENTRY_NO_PROPAGATE_INHERIT is not set, ensure * that ACL_ENTRY_INHERIT_ONLY is set. Continue to the * next ACE. Otherwise... */ @@ -937,10 +937,10 @@ /* * 2.F. On the second ACE, clear the following flags: - * ACL_ENRY_NO_PROPAGATE_INHERIT, ACL_ENTRY_FILE_INHERIT, + * ACL_ENTRY_NO_PROPAGATE_INHERIT, ACL_ENTRY_FILE_INHERIT, * ACL_ENTRY_DIRECTORY_INHERIT, ACL_ENTRY_INHERIT_ONLY. */ - copy->ae_flags &= ~(ACL_ENRY_NO_PROPAGATE_INHERIT | + copy->ae_flags &= ~(ACL_ENTRY_NO_PROPAGATE_INHERIT | ACL_ENTRY_FILE_INHERIT | ACL_ENTRY_DIRECTORY_INHERIT | ACL_ENTRY_INHERIT_ONLY); @@ -1095,7 +1095,7 @@ if (!is_directory) { if (entry->ae_flags & (ACL_ENTRY_FILE_INHERIT | ACL_ENTRY_DIRECTORY_INHERIT | - ACL_ENRY_NO_PROPAGATE_INHERIT | ACL_ENTRY_INHERIT_ONLY)) + ACL_ENTRY_NO_PROPAGATE_INHERIT | ACL_ENTRY_INHERIT_ONLY)) return (EINVAL); } }