Remove useless bool "upper_case_domain" parameter. (cherry picked from commit cbdf6c5...

diff --git a/libcli/auth/ntlm_check.c b/libcli/auth/ntlm_check.c
index f7c6cb4230e63d3cc62232d70f69d7ab44419998..31855586215a7d9294f1b2f8d7066fd83cf1d4c3 100644 (file)
--- a/libcli/auth/ntlm_check.c
+++ b/libcli/auth/ntlm_check.c
@@ -87,7 +87,6 @@ static bool smb_pwd_check_ntlmv2(TALLOC_CTX *mem_ctx,
                                 const uint8_t *part_passwd,
                                 const DATA_BLOB *sec_blob,
                                 const char *user, const char *domain,
-                                bool upper_case_domain, /* should the domain be transformed into upper case? */
                                 DATA_BLOB *user_sess_key)
 {
        /* Finish the encryption of part_passwd. */
@@ -122,7 +121,7 @@ static bool smb_pwd_check_ntlmv2(TALLOC_CTX *mem_ctx,
           but for NTLMv2 it is meant to contain the current time etc.
        */
 
-       if (!ntv2_owf_gen(part_passwd, user, domain, upper_case_domain, kr)) {
+       if (!ntv2_owf_gen(part_passwd, user, domain, false, kr)) {
                return false;
        }
 
@@ -161,7 +160,6 @@ static bool smb_sess_key_ntlmv2(TALLOC_CTX *mem_ctx,
                                const uint8_t *part_passwd,
                                const DATA_BLOB *sec_blob,
                                const char *user, const char *domain,
-                               bool upper_case_domain, /* should the domain be transformed into upper case? */
                                DATA_BLOB *user_sess_key)
 {
        /* Finish the encryption of part_passwd. */
@@ -192,7 +190,7 @@ static bool smb_sess_key_ntlmv2(TALLOC_CTX *mem_ctx,
 
        client_key_data = data_blob_talloc(mem_ctx, ntv2_response->data+16, ntv2_response->length-16);
 
-       if (!ntv2_owf_gen(part_passwd, user, domain, upper_case_domain, kr)) {
+       if (!ntv2_owf_gen(part_passwd, user, domain, false, kr)) {
                return false;
        }
 
@@ -363,7 +361,6 @@ NTSTATUS ntlm_password_check(TALLOC_CTX *mem_ctx,
                                         stored_nt->hash, challenge, 
                                         client_username, 
                                         client_domain,
-                                        false,
                                         user_sess_key)) {
                        if (user_sess_key->length) {
                                *lm_sess_key = data_blob_talloc(mem_ctx, user_sess_key->data, MIN(8, user_sess_key->length));
@@ -378,7 +375,6 @@ NTSTATUS ntlm_password_check(TALLOC_CTX *mem_ctx,
                                         stored_nt->hash, challenge, 
                                         client_username, 
                                         upper_client_domain,
-                                        false,
                                         user_sess_key)) {
                        if (user_sess_key->length) {
                                *lm_sess_key = data_blob_talloc(mem_ctx, user_sess_key->data, MIN(8, user_sess_key->length));
@@ -392,7 +388,6 @@ NTSTATUS ntlm_password_check(TALLOC_CTX *mem_ctx,
                                         stored_nt->hash, challenge, 
                                         client_username, 
                                         "",
-                                        false,
                                         user_sess_key)) {
                        if (user_sess_key->length) {
                                *lm_sess_key = data_blob_talloc(mem_ctx, user_sess_key->data, MIN(8, user_sess_key->length));
@@ -487,7 +482,6 @@ NTSTATUS ntlm_password_check(TALLOC_CTX *mem_ctx,
                                 stored_nt->hash, challenge, 
                                 client_username,
                                 client_domain,
-                                false,
                                 &tmp_sess_key)) {
                if (nt_response->length > 24) {
                        /* If NTLMv2 authentication has preceeded us
@@ -499,7 +493,6 @@ NTSTATUS ntlm_password_check(TALLOC_CTX *mem_ctx,
                                            stored_nt->hash, challenge, 
                                            client_username,
                                            client_domain,
-                                           false,
                                            user_sess_key);
                } else {
                        /* Otherwise, use the LMv2 session key */
@@ -518,7 +511,6 @@ NTSTATUS ntlm_password_check(TALLOC_CTX *mem_ctx,
                                 stored_nt->hash, challenge, 
                                 client_username,
                                 upper_client_domain,
-                                false,
                                 &tmp_sess_key)) {
                if (nt_response->length > 24) {
                        /* If NTLMv2 authentication has preceeded us
@@ -530,7 +522,6 @@ NTSTATUS ntlm_password_check(TALLOC_CTX *mem_ctx,
                                            stored_nt->hash, challenge, 
                                            client_username,
                                            upper_client_domain,
-                                           true,
                                            user_sess_key);
                } else {
                        /* Otherwise, use the LMv2 session key */
@@ -548,7 +539,6 @@ NTSTATUS ntlm_password_check(TALLOC_CTX *mem_ctx,
                                 stored_nt->hash, challenge, 
                                 client_username,
                                 "",
-                                false,
                                 &tmp_sess_key)) {
                if (nt_response->length > 24) {
                        /* If NTLMv2 authentication has preceeded us
@@ -560,7 +550,6 @@ NTSTATUS ntlm_password_check(TALLOC_CTX *mem_ctx,
                                            stored_nt->hash, challenge, 
                                            client_username,
                                            "",
-                                           false,
                                            user_sess_key);
                } else {
                        /* Otherwise, use the LMv2 session key */