diff options
| author | hrs <hrs@FreeBSD.org> | 2011-05-29 02:53:52 +0000 |
|---|---|---|
| committer | hrs <hrs@FreeBSD.org> | 2011-05-29 02:53:52 +0000 |
| commit | 8fe640108653f13042f1b15213769e338aa524f6 (patch) | |
| tree | 91f5675a7c792e61d68635707501027daa3f566f /lib/libc/posix1e/acl_from_text.c | |
| parent | 97f64b711efa9ff0011bef5d46cf9645638a38f9 (diff) | |
| parent | f3726238c8e8206eb1df4cfaf3f00947ceba3cce (diff) | |
| download | FreeBSD-src-8fe640108653f13042f1b15213769e338aa524f6.zip FreeBSD-src-8fe640108653f13042f1b15213769e338aa524f6.tar.gz | |
Merge from head@222434.
Diffstat (limited to 'lib/libc/posix1e/acl_from_text.c')
| -rw-r--r-- | lib/libc/posix1e/acl_from_text.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/lib/libc/posix1e/acl_from_text.c b/lib/libc/posix1e/acl_from_text.c index c600987..7f15463 100644 --- a/lib/libc/posix1e/acl_from_text.c +++ b/lib/libc/posix1e/acl_from_text.c @@ -44,7 +44,6 @@ __FBSDID("$FreeBSD$"); #include "acl_support.h" -static int _posix1e_acl_name_to_id(acl_tag_t tag, char *name, uid_t *id); static acl_tag_t acl_string_to_tag(char *tag, char *qualifier); int _nfs4_acl_entry_from_text(acl_t aclp, char *entry); @@ -148,8 +147,7 @@ _posix1e_acl_entry_from_text(acl_t aclp, char *entry) case ACL_USER: case ACL_GROUP: - error = _posix1e_acl_name_to_id(t, qualifier, - &id); + error = _acl_name_to_id(t, qualifier, &id); if (error == -1) return (-1); break; @@ -271,12 +269,9 @@ error_label: * XXX NOT THREAD SAFE, RELIES ON GETPWNAM, GETGRNAM * XXX USES *PW* AND *GR* WHICH ARE STATEFUL AND THEREFORE THIS ROUTINE * MAY HAVE SIDE-EFFECTS - * - * XXX currently doesn't deal correctly with a numeric uid being passed - * instead of a username. What is correct behavior here? Check chown. */ -static int -_posix1e_acl_name_to_id(acl_tag_t tag, char *name, uid_t *id) +int +_acl_name_to_id(acl_tag_t tag, char *name, uid_t *id) { struct group *g; struct passwd *p; |
