The branch, master has been updated via 8843eea... s4-smbtorture: only pull info when status code indicates success in smbcli_rap_netprintqgetinfo(). via 185adc4... Revert "s4-smbtorture: only pull info when status code indicates success in smbcli_rap_netprintqgetinfo()." from bd4bbd9... pidl: make sure to fill in cli->pipes_struct->hdr_req.opnum in s3 server dispatch tables.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 8843eea2e06736f27080eedab883ffc51feacb33 Author: Günther Deschner <g...@samba.org> Date: Wed Jun 16 11:03:31 2010 +0200 s4-smbtorture: only pull info when status code indicates success in smbcli_rap_netprintqgetinfo(). Guenther commit 185adc4c810eff3876727ed33b87c208aa09cb62 Author: Günther Deschner <g...@samba.org> Date: Wed Jun 16 12:18:32 2010 +0200 Revert "s4-smbtorture: only pull info when status code indicates success in smbcli_rap_netprintqgetinfo()." This reverts commit 1f1c04010a55e67d8dc2110276eed4cf2a8a0afa. ----------------------------------------------------------------------- Summary of changes: source3/auth/auth_winbind.c | 14 +++----------- 1 files changed, 3 insertions(+), 11 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/auth/auth_winbind.c b/source3/auth/auth_winbind.c index b111a2a..beaba7d 100644 --- a/source3/auth/auth_winbind.c +++ b/source3/auth/auth_winbind.c @@ -43,7 +43,7 @@ static NTSTATUS check_winbind_security(const struct auth_context *auth_context, return NT_STATUS_INVALID_PARAMETER; } - DEBUG(10, ("Check auth for: [%s]\n", user_info->mapped.account_name)); + DEBUG(10, ("Check auth for: [%s]", user_info->mapped.account_name)); if (!auth_context) { DEBUG(3,("Password for user %s cannot be checked because we have no auth_info to get the challenge from.\n", @@ -73,17 +73,9 @@ static NTSTATUS check_winbind_security(const struct auth_context *auth_context, sizeof(params.password.response.challenge)); params.password.response.nt_length = user_info->nt_resp.length; - if (params.password.response.nt_length) { - params.password.response.nt_data = user_info->nt_resp.data; - } else { - params.password.response.nt_data = NULL; - } + params.password.response.nt_data = user_info->nt_resp.data; params.password.response.lm_length = user_info->lm_resp.length; - if (params.password.response.lm_length) { - params.password.response.lm_data = user_info->lm_resp.data; - } else { - params.password.response.lm_data = NULL; - } + params.password.response.lm_data = user_info->lm_resp.data; /* we are contacting the privileged pipe */ become_root(); -- Samba Shared Repository