The branch, master has been updated via 6d9b2e6... s3: Make check_info3_in_group static via cf4a8f7... s3-winbind: Make append_auth_data() static from eb60833... Fix bug 7310 - DOS attribute inconsistency with MS Office
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 6d9b2e62cbd7712fe8cfe99c9d596a375a0abfad Author: Volker Lendecke <v...@samba.org> Date: Wed Mar 31 20:57:01 2010 +0200 s3: Make check_info3_in_group static commit cf4a8f7639ee869270dc99ed791752de03882edc Author: Volker Lendecke <v...@samba.org> Date: Mon Mar 29 15:44:38 2010 +0200 s3-winbind: Make append_auth_data() static ----------------------------------------------------------------------- Summary of changes: source3/winbindd/winbindd_pam.c | 12 ++++++------ source3/winbindd/winbindd_proto.h | 6 ------ 2 files changed, 6 insertions(+), 12 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/winbindd/winbindd_pam.c b/source3/winbindd/winbindd_pam.c index 62f3e54..74b8237 100644 --- a/source3/winbindd/winbindd_pam.c +++ b/source3/winbindd/winbindd_pam.c @@ -234,8 +234,8 @@ static NTSTATUS append_afs_token(TALLOC_CTX *mem_ctx, return NT_STATUS_OK; } -NTSTATUS check_info3_in_group(struct netr_SamInfo3 *info3, - const char *group_sid) +static NTSTATUS check_info3_in_group(struct netr_SamInfo3 *info3, + const char *group_sid) /** * Check whether a user belongs to a group or list of groups. * @@ -733,10 +733,10 @@ bool check_request_flags(uint32_t flags) /**************************************************************** ****************************************************************/ -NTSTATUS append_auth_data(struct winbindd_cli_state *state, - struct netr_SamInfo3 *info3, - const char *name_domain, - const char *name_user) +static NTSTATUS append_auth_data(struct winbindd_cli_state *state, + struct netr_SamInfo3 *info3, + const char *name_domain, + const char *name_user) { NTSTATUS result; uint32_t flags = state->request->flags; diff --git a/source3/winbindd/winbindd_proto.h b/source3/winbindd/winbindd_proto.h index 7567eea..255e79e 100644 --- a/source3/winbindd/winbindd_proto.h +++ b/source3/winbindd/winbindd_proto.h @@ -383,12 +383,6 @@ void ndr_print_winbindd_domain(struct ndr_print *ndr, bool check_request_flags(uint32_t flags); struct winbindd_domain *find_auth_domain(uint8_t flags, const char *domain_name); -NTSTATUS check_info3_in_group(struct netr_SamInfo3 *info3, - const char *group_sid); -NTSTATUS append_auth_data(struct winbindd_cli_state *state, - struct netr_SamInfo3 *info3, - const char *name_domain, - const char *name_user); void winbindd_pam_auth(struct winbindd_cli_state *state); enum winbindd_result winbindd_dual_pam_auth(struct winbindd_domain *domain, struct winbindd_cli_state *state) ; -- Samba Shared Repository