diff options
| -rw-r--r-- | lib/util/util_pw.c | 9 | ||||
| -rw-r--r-- | lib/util/util_pw.h | 1 | ||||
| -rw-r--r-- | source3/auth/token_util.c | 4 | ||||
| -rw-r--r-- | source3/passdb/pdb_interface.c | 2 | ||||
| -rw-r--r-- | source3/torture/cmd_vfs.c | 6 |
5 files changed, 8 insertions, 14 deletions
diff --git a/lib/util/util_pw.c b/lib/util/util_pw.c index 981e017ab2..5ee4456759 100644 --- a/lib/util/util_pw.c +++ b/lib/util/util_pw.c @@ -29,14 +29,9 @@ #include "lib/util/util_pw.h" /************************************************************************** - Wrappers for getpwuid(), getgrnam(), getgrgid() + Wrappers for getgrnam(), getgrgid() ****************************************************************************/ -struct passwd *sys_getpwuid(uid_t uid) -{ - return getpwuid(uid); -} - struct group *sys_getgrnam(const char *name) { return getgrnam(name); @@ -92,7 +87,7 @@ struct passwd *getpwuid_alloc(TALLOC_CTX *mem_ctx, uid_t uid) { struct passwd *temp; - temp = sys_getpwuid(uid); + temp = getpwuid(uid); if (!temp) { #if 0 diff --git a/lib/util/util_pw.h b/lib/util/util_pw.h index ffbb4c0691..b46197b9ce 100644 --- a/lib/util/util_pw.h +++ b/lib/util/util_pw.h @@ -24,7 +24,6 @@ #ifndef __LIB_UTIL_UTIL_PW_H__ #define __LIB_UTIL_UTIL_PW_H__ -struct passwd *sys_getpwuid(uid_t uid); struct group *sys_getgrnam(const char *name); struct group *sys_getgrgid(gid_t gid); struct passwd *tcopy_passwd(TALLOC_CTX *mem_ctx, diff --git a/source3/auth/token_util.c b/source3/auth/token_util.c index a84bcc1247..4a88a6bb72 100644 --- a/source3/auth/token_util.c +++ b/source3/auth/token_util.c @@ -93,9 +93,9 @@ struct security_token *get_root_nt_token( void ) cache_data, struct security_token); } - if ( !(pw = sys_getpwuid(0)) ) { + if ( !(pw = getpwuid(0)) ) { if ( !(pw = getpwnam("root")) ) { - DEBUG(0,("get_root_nt_token: both sys_getpwuid(0) " + DEBUG(0,("get_root_nt_token: both getpwuid(0) " "and getpwnam(\"root\") failed!\n")); return NULL; } diff --git a/source3/passdb/pdb_interface.c b/source3/passdb/pdb_interface.c index 410ea77037..c5fe56c87d 100644 --- a/source3/passdb/pdb_interface.c +++ b/source3/passdb/pdb_interface.c @@ -1387,7 +1387,7 @@ static bool pdb_default_uid_to_sid(struct pdb_methods *methods, uid_t uid, struct passwd *unix_pw; bool ret; - unix_pw = sys_getpwuid( uid ); + unix_pw = getpwuid( uid ); if ( !unix_pw ) { DEBUG(4,("pdb_default_uid_to_sid: host has no idea of uid " diff --git a/source3/torture/cmd_vfs.c b/source3/torture/cmd_vfs.c index 779601a90b..11d19184e4 100644 --- a/source3/torture/cmd_vfs.c +++ b/source3/torture/cmd_vfs.c @@ -607,7 +607,7 @@ static NTSTATUS cmd_stat(struct vfs_state *vfs, TALLOC_CTX *mem_ctx, int argc, c st = smb_fname->st; TALLOC_FREE(smb_fname); - pwd = sys_getpwuid(st.st_ex_uid); + pwd = getpwuid(st.st_ex_uid); if (pwd != NULL) user = pwd->pw_name; else user = null_string; grp = sys_getgrgid(st.st_ex_gid); @@ -678,7 +678,7 @@ static NTSTATUS cmd_fstat(struct vfs_state *vfs, TALLOC_CTX *mem_ctx, int argc, return NT_STATUS_UNSUCCESSFUL; } - pwd = sys_getpwuid(st.st_ex_uid); + pwd = getpwuid(st.st_ex_uid); if (pwd != NULL) user = pwd->pw_name; else user = null_string; grp = sys_getgrgid(st.st_ex_gid); @@ -747,7 +747,7 @@ static NTSTATUS cmd_lstat(struct vfs_state *vfs, TALLOC_CTX *mem_ctx, int argc, st = smb_fname->st; TALLOC_FREE(smb_fname); - pwd = sys_getpwuid(st.st_ex_uid); + pwd = getpwuid(st.st_ex_uid); if (pwd != NULL) user = pwd->pw_name; else user = null_string; grp = sys_getgrgid(st.st_ex_gid); |