sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-27 22:50:26 +03:00
Code

Revert "s4-smbtorture: only pull info when status code indicates success in smbcli_rap_netprintqgetinfo()."

Browse Source 
This reverts commit 1f1c04010a55e67d8dc2110276eed4cf2a8a0afa.
This commit is contained in:
Günther Deschner 2010-06-16 12:18:32 +02:00
parent bd4bbd9beb
commit 185adc4c81
2 changed files with 6 additions and 16 deletions
source3/auth
auth_winbind.c
source4/torture/rap
rap.c

14
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();

8
source4/torture/rap/rap.c

@ -719,12 +719,10 @@ NTSTATUS smbcli_rap_netprintqgetinfo(struct smbcli_tree *tree,
NDR_GOTO(ndr_pull_uint16(call->ndr_pull_param, NDR_SCALARS, &r->out.convert));
NDR_GOTO(ndr_pull_uint16(call->ndr_pull_param, NDR_SCALARS, &r->out.available));
if (r->out.status == 0) {
call->ndr_pull_data->relative_rap_convert = r->out.convert;
call->ndr_pull_data->relative_rap_convert = r->out.convert;
NDR_GOTO(ndr_pull_set_switch_value(call->ndr_pull_data, &r->out.info, r->in.level));
NDR_GOTO(ndr_pull_rap_printq_info(call->ndr_pull_data, NDR_SCALARS|NDR_BUFFERS, &r->out.info));
}
NDR_GOTO(ndr_pull_set_switch_value(call->ndr_pull_data, &r->out.info, r->in.level));
NDR_GOTO(ndr_pull_rap_printq_info(call->ndr_pull_data, NDR_SCALARS|NDR_BUFFERS, &r->out.info));
if (DEBUGLEVEL >= 10) {
NDR_PRINT_OUT_DEBUG(rap_NetPrintQGetInfo, r);