diff options
| author | Günther Deschner <gd@samba.org> | 2011-03-02 16:11:00 +0100 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2011-03-30 01:13:06 +0200 |
| commit | 96487959e90b1aeec071d94e7f2c744af17fb5d0 (patch) | |
| tree | e819cf118d777e88dd8497d533df75ba673955e0 /lib/util | |
| parent | 64421129b672d0ce55c5aa235e5038dd2ea1b32b (diff) | |
| download | samba-96487959e90b1aeec071d94e7f2c744af17fb5d0.tar.gz samba-96487959e90b1aeec071d94e7f2c744af17fb5d0.tar.bz2 samba-96487959e90b1aeec071d94e7f2c744af17fb5d0.zip | |
lib/util/util_pw: share more code between lib/util/util_pw.c and source3/lib/username.c
Guenther
Diffstat (limited to 'lib/util')
| -rw-r--r-- | lib/util/util_pw.c | 16 | ||||
| -rw-r--r-- | lib/util/util_pw.h | 4 |
2 files changed, 12 insertions, 8 deletions
diff --git a/lib/util/util_pw.c b/lib/util/util_pw.c index cb7b45c135..c6e4680ec3 100644 --- a/lib/util/util_pw.c +++ b/lib/util/util_pw.c @@ -71,8 +71,8 @@ struct group *sys_getgrgid(gid_t gid) return getgrgid(gid); } -static struct passwd *alloc_copy_passwd(TALLOC_CTX *mem_ctx, - const struct passwd *from) +struct passwd *tcopy_passwd(TALLOC_CTX *mem_ctx, + const struct passwd *from) { struct passwd *ret = talloc_zero(mem_ctx, struct passwd); @@ -90,7 +90,7 @@ static struct passwd *alloc_copy_passwd(TALLOC_CTX *mem_ctx, return ret; } -struct passwd *_getpwnam_alloc(TALLOC_CTX *mem_ctx, const char *name) +struct passwd *getpwnam_alloc(TALLOC_CTX *mem_ctx, const char *name) { struct passwd *temp; @@ -105,10 +105,14 @@ struct passwd *_getpwnam_alloc(TALLOC_CTX *mem_ctx, const char *name) return NULL; } - return alloc_copy_passwd(mem_ctx, temp); + return tcopy_passwd(mem_ctx, temp); } -struct passwd *_getpwuid_alloc(TALLOC_CTX *mem_ctx, uid_t uid) +/**************************************************************************** + talloc'ed version of getpwuid. +****************************************************************************/ + +struct passwd *getpwuid_alloc(TALLOC_CTX *mem_ctx, uid_t uid) { struct passwd *temp; @@ -123,5 +127,5 @@ struct passwd *_getpwuid_alloc(TALLOC_CTX *mem_ctx, uid_t uid) return NULL; } - return alloc_copy_passwd(mem_ctx, temp); + return tcopy_passwd(mem_ctx, temp); } diff --git a/lib/util/util_pw.h b/lib/util/util_pw.h index fa212b9c61..2967963459 100644 --- a/lib/util/util_pw.h +++ b/lib/util/util_pw.h @@ -33,7 +33,7 @@ struct group *sys_getgrnam(const char *name); struct group *sys_getgrgid(gid_t gid); struct passwd *tcopy_passwd(TALLOC_CTX *mem_ctx, const struct passwd *from); -struct passwd *_getpwnam_alloc(TALLOC_CTX *mem_ctx, const char *name); -struct passwd *_getpwuid_alloc(TALLOC_CTX *mem_ctx, uid_t uid); +struct passwd *getpwnam_alloc(TALLOC_CTX *mem_ctx, const char *name); +struct passwd *getpwuid_alloc(TALLOC_CTX *mem_ctx, uid_t uid); #endif /* __LIB_UTIL_UTIL_PW_H__ */ |