diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2012-03-24 15:24:15 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2012-03-24 15:24:15 +0100 |
| commit | 818e0722e1a730cfa30d911be510641ef23dc446 (patch) | |
| tree | 584a8e1a0682c8dbafd92139b1b51c0686d53681 | |
| parent | 3be6258912939fb538d7bcb492483ae2ab52391b (diff) | |
| download | samba-818e0722e1a730cfa30d911be510641ef23dc446.tar.gz samba-818e0722e1a730cfa30d911be510641ef23dc446.tar.bz2 samba-818e0722e1a730cfa30d911be510641ef23dc446.zip | |
lib/util: Remove dummy wrapper for getpwnam().
| -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/lib/username.c | 4 | ||||
| -rw-r--r-- | source3/rpc_server/srvsvc/srv_srvsvc_nt.c | 2 |
5 files changed, 7 insertions, 13 deletions
diff --git a/lib/util/util_pw.c b/lib/util/util_pw.c index 43ac0b3467..981e017ab2 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 getpwnam(), getpwuid(), getgrnam(), getgrgid() + Wrappers for getpwuid(), getgrnam(), getgrgid() ****************************************************************************/ -struct passwd *sys_getpwnam(const char *name) -{ - return getpwnam(name); -} - struct passwd *sys_getpwuid(uid_t uid) { return getpwuid(uid); @@ -75,7 +70,7 @@ struct passwd *getpwnam_alloc(TALLOC_CTX *mem_ctx, const char *name) { struct passwd *temp; - temp = sys_getpwnam(name); + temp = getpwnam(name); if (!temp) { #if 0 diff --git a/lib/util/util_pw.h b/lib/util/util_pw.h index b572502fc5..ffbb4c0691 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_getpwnam(const char *name); struct passwd *sys_getpwuid(uid_t uid); struct group *sys_getgrnam(const char *name); struct group *sys_getgrgid(gid_t gid); diff --git a/source3/auth/token_util.c b/source3/auth/token_util.c index 87f57b66ee..a84bcc1247 100644 --- a/source3/auth/token_util.c +++ b/source3/auth/token_util.c @@ -94,9 +94,9 @@ struct security_token *get_root_nt_token( void ) } if ( !(pw = sys_getpwuid(0)) ) { - if ( !(pw = sys_getpwnam("root")) ) { + if ( !(pw = getpwnam("root")) ) { DEBUG(0,("get_root_nt_token: both sys_getpwuid(0) " - "and sys_getpwnam(\"root\") failed!\n")); + "and getpwnam(\"root\") failed!\n")); return NULL; } } diff --git a/source3/lib/username.c b/source3/lib/username.c index 925b44bb06..5192004365 100644 --- a/source3/lib/username.c +++ b/source3/lib/username.c @@ -42,7 +42,7 @@ static struct passwd *getpwnam_alloc_cached(TALLOC_CTX *mem_ctx, const char *nam return tcopy_passwd(mem_ctx, pw); } - pw = sys_getpwnam(name); + pw = getpwnam(name); if (pw == NULL) { return NULL; } @@ -92,7 +92,7 @@ char *get_user_home_dir(TALLOC_CTX *mem_ctx, const char *user) } /**************************************************************************** - * A wrapper for sys_getpwnam(). The following variations are tried: + * A wrapper for getpwnam(). The following variations are tried: * - as transmitted * - in all lower case if this differs from transmitted * - in all upper case if this differs from transmitted diff --git a/source3/rpc_server/srvsvc/srv_srvsvc_nt.c b/source3/rpc_server/srvsvc/srv_srvsvc_nt.c index 4435b996da..c9f8ceb6f8 100644 --- a/source3/rpc_server/srvsvc/srv_srvsvc_nt.c +++ b/source3/rpc_server/srvsvc/srv_srvsvc_nt.c @@ -906,7 +906,7 @@ static WERROR init_srv_sess_info_1(struct pipes_struct *p, for (; resume_handle < *total_entries; resume_handle++) { uint32 num_files; uint32 connect_time; - struct passwd *pw = sys_getpwnam(session_list[resume_handle].username); + struct passwd *pw = getpwnam(session_list[resume_handle].username); bool guest; if ( !pw ) { |