From e1cfca1e2e0f005ac9d73c6b0eb64bc99413aec6 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Wed, 20 Oct 2010 08:16:23 -0700 Subject: 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 Autobuild-Date: Wed Oct 20 16:02:12 UTC 2010 on sn-devel-104 --- source3/include/proto.h | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'source3/include') 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); -- cgit