Add some harmless use of talloc_tos() in ntlm_auth
authorAndrew Bartlett <abartlet@samba.org>
Tue, 14 Apr 2009 02:43:34 +0000 (12:43 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Tue, 14 Apr 2009 02:54:12 +0000 (12:54 +1000)
source3/utils/ntlm_auth.c
source3/utils/ntlm_auth_diagnostics.c

index 7899bd0d07690c1f56fc0781bcaa2d75fed9b52d..e8bd9fbd2bac2e8092bd9d4ccc2ff6e289319382 100644 (file)
@@ -2275,7 +2275,7 @@ static bool check_auth_crap(void)
        if (request_lm_key 
            && (memcmp(zeros, lm_key, 
                       sizeof(lm_key)) != 0)) {
-               hex_lm_key = hex_encode_talloc(NULL, (const unsigned char *)lm_key,
+               hex_lm_key = hex_encode_talloc(talloc_tos(), (const unsigned char *)lm_key,
                                        sizeof(lm_key));
                x_fprintf(x_stdout, "LM_KEY: %s\n", hex_lm_key);
                TALLOC_FREE(hex_lm_key);
@@ -2283,7 +2283,7 @@ static bool check_auth_crap(void)
        if (request_user_session_key 
            && (memcmp(zeros, user_session_key, 
                       sizeof(user_session_key)) != 0)) {
-               hex_user_session_key = hex_encode_talloc(NULL, (const unsigned char *)user_session_key, 
+               hex_user_session_key = hex_encode_talloc(talloc_tos(), (const unsigned char *)user_session_key, 
                                                  sizeof(user_session_key));
                x_fprintf(x_stdout, "NT_KEY: %s\n", hex_user_session_key);
                TALLOC_FREE(hex_user_session_key);
index 17801b2a805624426a0fffa0a2159596de4daccb..cea4b084f705d3d1dc6dad45ba77944fc3e0f500 100644 (file)
@@ -458,7 +458,7 @@ static bool test_plaintext(enum ntlm_break break_which)
        flags |= WBFLAG_PAM_LMKEY;
        flags |= WBFLAG_PAM_USER_SESSION_KEY;
 
-       if (!push_ucs2_talloc(NULL, &nt_response_ucs2, opt_password,
+       if (!push_ucs2_talloc(talloc_tos(), &nt_response_ucs2, opt_password,
                                &converted_size))
        {
                DEBUG(0, ("push_ucs2_talloc failed!\n"));
@@ -468,12 +468,12 @@ static bool test_plaintext(enum ntlm_break break_which)
        nt_response.data = (unsigned char *)nt_response_ucs2;
        nt_response.length = strlen_w(nt_response_ucs2)*sizeof(smb_ucs2_t);
 
-       if ((password = strupper_talloc(NULL, opt_password)) == NULL) {
+       if ((password = strupper_talloc(talloc_tos(), opt_password)) == NULL) {
                DEBUG(0, ("strupper_talloc() failed!\n"));
                exit(1);
        }
 
-       if (!convert_string_talloc(NULL, CH_UNIX,
+       if (!convert_string_talloc(talloc_tos(), CH_UNIX,
                                   CH_DOS, password,
                                   strlen(password)+1, 
                                   &lm_response.data,