summaryrefslogtreecommitdiff
path: root/source3/include
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2010-10-20 08:16:23 -0700
committerJeremy Allison <jra@samba.org>2010-10-20 16:02:12 +0000
commite1cfca1e2e0f005ac9d73c6b0eb64bc99413aec6 (patch)
tree63aa4baa9b9260e466558bbde9a59c6c82c8c939 /source3/include
parentab01d6139fc7b2c4b651a0959a5816352d6bb49b (diff)
downloadsamba-e1cfca1e2e0f005ac9d73c6b0eb64bc99413aec6.tar.gz
samba-e1cfca1e2e0f005ac9d73c6b0eb64bc99413aec6.tar.bz2
samba-e1cfca1e2e0f005ac9d73c6b0eb64bc99413aec6.zip
Make getpwnam_alloc() static to lib/username.c, and ensure all username lookups go
through Get_Pwnam_alloc(), which is the correct wrapper function. We were using it *some* of the time anyway, so this just makes us properly consistent. Jeremy. Autobuild-User: Jeremy Allison <jra@samba.org> Autobuild-Date: Wed Oct 20 16:02:12 UTC 2010 on sn-devel-104
Diffstat (limited to 'source3/include')
-rw-r--r--source3/include/proto.h10
1 files changed, 3 insertions, 7 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 9a8cf67756..3e4655eeb5 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -1033,6 +1033,9 @@ bool nt_time_is_set(const NTTIME *nt);
/* The following definitions come from lib/username.c */
+struct passwd *tcopy_passwd(TALLOC_CTX *mem_ctx, const struct passwd *from) ;
+void flush_pwnam_cache(void);
+struct passwd *getpwuid_alloc(TALLOC_CTX *mem_ctx, uid_t uid) ;
char *get_user_home_dir(TALLOC_CTX *mem_ctx, const char *user);
struct passwd *Get_Pwnam_alloc(TALLOC_CTX *mem_ctx, const char *user);
@@ -1221,13 +1224,6 @@ NTSTATUS merge_nt_token(TALLOC_CTX *mem_ctx,
struct security_token **token_out);
bool token_sid_in_ace(const struct security_token *token, const struct security_ace *ace);
-/* The following definitions come from lib/util_pw.c */
-
-struct passwd *tcopy_passwd(TALLOC_CTX *mem_ctx, const struct passwd *from) ;
-void flush_pwnam_cache(void);
-struct passwd *getpwnam_alloc(TALLOC_CTX *mem_ctx, const char *name);
-struct passwd *getpwuid_alloc(TALLOC_CTX *mem_ctx, uid_t uid) ;
-
/* The following definitions come from ..libcli/registry/util_reg.c */
const char *str_regtype(int type);