s3: Fix some debug msgs in ntlm_auth

[samba.git] / source3 / utils / ntlm_auth.c

diff --git a/source3/utils/ntlm_auth.c b/source3/utils/ntlm_auth.c
index 0fa0c297df2a0f401a8d97dc30deb3b6e5148de5..82819cf1455f02282061dbaadcb947142a8a3777 100644 (file)
--- a/source3/utils/ntlm_auth.c
+++ b/source3/utils/ntlm_auth.c
@@ -817,7 +817,7 @@ static void manage_squid_ntlmssp_request(struct ntlm_auth_state *state,
        NTSTATUS nt_status;
 
        if (strlen(buf) < 2) {
-               DEBUG(1, ("NTLMSSP query [%s] invalid", buf));
+               DEBUG(1, ("NTLMSSP query [%s] invalid\n", buf));
                x_fprintf(x_stdout, "BH NTLMSSP query invalid\n");
                return;
        }
@@ -856,8 +856,7 @@ static void manage_squid_ntlmssp_request(struct ntlm_auth_state *state,
        }
 
        if (strncmp(buf, "YR", 2) == 0) {
-               if (state->ntlmssp_state)
-                       TALLOC_FREE(state->ntlmssp_state);
+               TALLOC_FREE(state->ntlmssp_state);
                state->svr_state = SERVER_INITIAL;
        } else if (strncmp(buf, "KK", 2) == 0) {
                /* No special preprocessing required */
@@ -886,7 +885,7 @@ static void manage_squid_ntlmssp_request(struct ntlm_auth_state *state,
                data_blob_free(&request);
                return;
        } else {
-               DEBUG(1, ("NTLMSSP query [%s] invalid", buf));
+               DEBUG(1, ("NTLMSSP query [%s] invalid\n", buf));
                x_fprintf(x_stdout, "BH NTLMSSP query invalid\n");
                return;
        }
@@ -953,7 +952,7 @@ static void manage_client_ntlmssp_request(struct ntlm_auth_state *state,
        }
 
        if (strlen(buf) < 2) {
-               DEBUG(1, ("NTLMSSP query [%s] invalid", buf));
+               DEBUG(1, ("NTLMSSP query [%s] invalid\n", buf));
                x_fprintf(x_stdout, "BH NTLMSSP query invalid\n");
                return;
        }
@@ -1012,8 +1011,7 @@ static void manage_client_ntlmssp_request(struct ntlm_auth_state *state,
        }
 
        if (strncmp(buf, "YR", 2) == 0) {
-               if (state->ntlmssp_state)
-                       TALLOC_FREE(state->ntlmssp_state);
+               TALLOC_FREE(state->ntlmssp_state);
                state->cli_state = CLIENT_INITIAL;
        } else if (strncmp(buf, "TT", 2) == 0) {
                /* No special preprocessing required */
@@ -1045,7 +1043,7 @@ static void manage_client_ntlmssp_request(struct ntlm_auth_state *state,
                data_blob_free(&request);
                return;
        } else {
-               DEBUG(1, ("NTLMSSP query [%s] invalid", buf));
+               DEBUG(1, ("NTLMSSP query [%s] invalid\n", buf));
                x_fprintf(x_stdout, "BH NTLMSSP query invalid\n");
                return;
        }
@@ -1104,14 +1102,12 @@ static void manage_client_ntlmssp_request(struct ntlm_auth_state *state,
 
                DEBUG(10, ("NTLMSSP OK!\n"));
                state->cli_state = CLIENT_FINISHED;
-               if (state->ntlmssp_state)
-                       TALLOC_FREE(state->ntlmssp_state);
+               TALLOC_FREE(state->ntlmssp_state);
        } else {
                x_fprintf(x_stdout, "BH %s\n", nt_errstr(nt_status));
                DEBUG(0, ("NTLMSSP BH: %s\n", nt_errstr(nt_status)));
                state->cli_state = CLIENT_ERROR;
-               if (state->ntlmssp_state)
-                       TALLOC_FREE(state->ntlmssp_state);
+               TALLOC_FREE(state->ntlmssp_state);
        }
 
        data_blob_free(&request);
@@ -1219,18 +1215,17 @@ static void manage_gss_spnego_request(struct ntlm_auth_state *state,
        char *reply_argument = NULL;
 
        if (strlen(buf) < 2) {
-               DEBUG(1, ("SPENGO query [%s] invalid", buf));
+               DEBUG(1, ("SPENGO query [%s] invalid\n", buf));
                x_fprintf(x_stdout, "BH SPENGO query invalid\n");
                return;
        }
 
        if (strncmp(buf, "YR", 2) == 0) {
-               if (ntlmssp_state)
-                       TALLOC_FREE(ntlmssp_state);
+               TALLOC_FREE(ntlmssp_state);
        } else if (strncmp(buf, "KK", 2) == 0) {
                ;
        } else {
-               DEBUG(1, ("SPENGO query [%s] invalid", buf));
+               DEBUG(1, ("SPENGO query [%s] invalid\n", buf));
                x_fprintf(x_stdout, "BH SPENGO query invalid\n");
                return;
        }
@@ -1257,7 +1252,7 @@ static void manage_gss_spnego_request(struct ntlm_auth_state *state,
        data_blob_free(&token);
 
        if (len == -1) {
-               DEBUG(1, ("GSS-SPNEGO query [%s] invalid", buf));
+               DEBUG(1, ("GSS-SPNEGO query [%s] invalid\n", buf));
                x_fprintf(x_stdout, "BH GSS-SPNEGO query invalid\n");
                return;
        }
@@ -1269,7 +1264,7 @@ static void manage_gss_spnego_request(struct ntlm_auth_state *state,
 
                if ( (request.negTokenInit.mechTypes == NULL) ||
                     (request.negTokenInit.mechTypes[0] == NULL) ) {
-                       DEBUG(1, ("Client did not offer any mechanism"));
+                       DEBUG(1, ("Client did not offer any mechanism\n"));
                        x_fprintf(x_stdout, "BH Client did not offer any "
                                            "mechanism\n");
                        return;