diff options
| author | Volker Lendecke <vl@samba.org> | 2010-09-14 00:02:01 +0200 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2010-09-13 22:02:44 -0700 |
| commit | 9271570516087e006cf167895d51550a4ee858ab (patch) | |
| tree | 43cd1258d83b5c10f7e6c72a544bba8bc1464e9b | |
| parent | b3fccd10a63058f982082887cefd77af633f516c (diff) | |
| download | samba-9271570516087e006cf167895d51550a4ee858ab.tar.gz samba-9271570516087e006cf167895d51550a4ee858ab.tar.bz2 samba-9271570516087e006cf167895d51550a4ee858ab.zip | |
s3: Remove some unnecessary if-statements
| -rw-r--r-- | source3/utils/ntlm_auth.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/source3/utils/ntlm_auth.c b/source3/utils/ntlm_auth.c index 0fa0c297df..241dc56e60 100644 --- a/source3/utils/ntlm_auth.c +++ b/source3/utils/ntlm_auth.c @@ -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 */ @@ -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 */ @@ -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); @@ -1225,8 +1221,7 @@ static void manage_gss_spnego_request(struct ntlm_auth_state *state, } 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 { |