[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-1368-gb35c627

[Günther Deschner]

The branch, master has been updated
       via  b35c627b92c0585f4fa3a1d92385a908f0e0cd5b (commit)
       via  d9bdf2a02f2966720a573cfa933edb112bf6fe64 (commit)
      from  bdc7bdb0d3e02d04477906dbda8995bc5789ce22 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit b35c627b92c0585f4fa3a1d92385a908f0e0cd5b
Author: Günther Deschner <g...@samba.org>
Date:   Fri Sep 4 00:02:13 2009 +0200

    wbinfo: fix various valgrind warnings and an invalid free.
    
    Kai, please check.
    
    Guenther

commit d9bdf2a02f2966720a573cfa933edb112bf6fe64
Author: Günther Deschner <g...@samba.org>
Date:   Thu Sep 3 23:49:50 2009 +0200

    s3-ntlm_auth: fix two segfaults in diagnostics mode.
    
    Guenther

-----------------------------------------------------------------------

Summary of changes:
 nsswitch/wbinfo.c                     |    8 +-------
 source3/utils/ntlm_auth_diagnostics.c |    4 ++--
 2 files changed, 3 insertions(+), 9 deletions(-)


Changeset truncated at 500 lines:

diff --git a/nsswitch/wbinfo.c b/nsswitch/wbinfo.c
index 813846f..a80b69f 100644
--- a/nsswitch/wbinfo.c
+++ b/nsswitch/wbinfo.c
@@ -1318,7 +1318,6 @@ static bool wbinfo_auth_krb5(char *username, const char 
*cctype, uint32_t flags)
        }
  done:
 
-       TALLOC_FREE(frame);
        wbcFreeMemory(params.blobs);
 
        return WBC_ERROR_IS_OK(wbc_status);
@@ -1363,8 +1362,6 @@ static bool wbinfo_auth(char *username)
                         response.data.auth.error_string);
 #endif
 
-       TALLOC_FREE(frame);
-
        return WBC_ERROR_IS_OK(wbc_status);
 }
 
@@ -1424,7 +1421,7 @@ static bool wbinfo_auth_crap(char *username, bool 
use_ntlmv2, bool use_lanman)
                                      &lm, &nt, NULL, NULL)) {
                        data_blob_free(&names_blob);
                        data_blob_free(&server_chal);
-                       SAFE_FREE(pass);
+                       TALLOC_FREE(pass);
                        return false;
                }
                data_blob_free(&names_blob);
@@ -1471,7 +1468,6 @@ static bool wbinfo_auth_crap(char *username, bool 
use_ntlmv2, bool use_lanman)
 
        data_blob_free(&nt);
        data_blob_free(&lm);
-       TALLOC_FREE(frame);
 
        return WBC_ERROR_IS_OK(wbc_status);
 }
@@ -1650,8 +1646,6 @@ static bool wbinfo_change_user_password(const char 
*username)
        d_printf("Password change for user %s %s\n", username,
                WBC_ERROR_IS_OK(wbc_status) ? "succeeded" : "failed");
 
-       TALLOC_FREE(frame);
-
        return WBC_ERROR_IS_OK(wbc_status);
 }
 
diff --git a/source3/utils/ntlm_auth_diagnostics.c 
b/source3/utils/ntlm_auth_diagnostics.c
index 0178823..3ee4acd 100644
--- a/source3/utils/ntlm_auth_diagnostics.c
+++ b/source3/utils/ntlm_auth_diagnostics.c
@@ -495,11 +495,11 @@ static bool test_plaintext(enum ntlm_break break_which)
                nt_response.data[0]++;
                break;
        case NO_LM:
-               SAFE_FREE(lm_response.data);
+               TALLOC_FREE(lm_response.data);
                lm_response.length = 0;
                break;
        case NO_NT:
-               SAFE_FREE(nt_response.data);
+               TALLOC_FREE(nt_response.data);
                nt_response.length = 0;
                break;
        }


-- 
Samba Shared Repository