diff options
| -rw-r--r-- | nsswitch/pam_winbind.c | 4 | ||||
| -rw-r--r-- | nsswitch/wbinfo.c | 24 | ||||
| -rw-r--r-- | source3/libsmb/ntlmssp.c | 4 |
3 files changed, 8 insertions, 24 deletions
diff --git a/nsswitch/pam_winbind.c b/nsswitch/pam_winbind.c index e651ce0e49..e640b711bd 100644 --- a/nsswitch/pam_winbind.c +++ b/nsswitch/pam_winbind.c @@ -1899,9 +1899,7 @@ static int winbind_auth_request(struct pwb_context *ctx, } done: - if (logon.blobs) { - wbcFreeMemory(logon.blobs); - } + wbcFreeMemory(logon.blobs); if (info && info->blobs && !p_info) { wbcFreeMemory(info->blobs); } diff --git a/nsswitch/wbinfo.c b/nsswitch/wbinfo.c index caa37f3c9e..150193d33c 100644 --- a/nsswitch/wbinfo.c +++ b/nsswitch/wbinfo.c @@ -463,12 +463,8 @@ static bool wbinfo_get_sidaliases(const char *domain, wbcFreeMemory(alias_rids); done: - if (domain_sid_str) { - wbcFreeMemory(domain_sid_str); - } - if (dinfo) { - wbcFreeMemory(dinfo); - } + wbcFreeMemory(domain_sid_str); + wbcFreeMemory(dinfo); return (WBC_ERR_SUCCESS == wbc_status); } @@ -1296,18 +1292,10 @@ static bool wbinfo_lookuprids(const char *domain, const char *arg) ret = true; done: - if (dinfo) { - wbcFreeMemory(dinfo); - } - if (domain_name) { - wbcFreeMemory(domain_name); - } - if (names) { - wbcFreeMemory(names); - } - if (types) { - wbcFreeMemory(types); - } + wbcFreeMemory(dinfo); + wbcFreeMemory(domain_name); + wbcFreeMemory(names); + wbcFreeMemory(types); TALLOC_FREE(mem_ctx); return ret; } diff --git a/source3/libsmb/ntlmssp.c b/source3/libsmb/ntlmssp.c index 477b94c1d0..7a006a373f 100644 --- a/source3/libsmb/ntlmssp.c +++ b/source3/libsmb/ntlmssp.c @@ -463,9 +463,7 @@ static NTSTATUS ntlmssp_client_challenge(struct ntlmssp_state *ntlmssp_state, params.blobs = &auth_blob; wbc_status = wbcCredentialCache(¶ms, &info, &error); - if (error != NULL) { - wbcFreeMemory(error); - } + wbcFreeMemory(error); if (!WBC_ERROR_IS_OK(wbc_status)) { goto noccache; } |