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

This reverts commit 1f1c04010a55e67d8dc2110276eed4cf2a8a0afa.

diff --git a/source3/auth/auth_winbind.c b/source3/auth/auth_winbind.c
index b111a2ae75b1f055f494a3139eb296a852738ac8..beaba7d4c0ff071ae318f2f94a34b3dcfb475c94 100644 (file)
--- 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();

diff --git a/source4/torture/rap/rap.c b/source4/torture/rap/rap.c
index 34036f0ae72778e3246c01deb0febe3e0a88b1fa..33d67156a3004bc26cb41cdea30efd35f318c38a 100644 (file)
--- a/source4/torture/rap/rap.c
+++ b/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);