s3-param Remove special case for global_myname(), rename to lp_netbios_name()

[samba.git] / source3 / utils / ntlm_auth.c

diff --git a/source3/utils/ntlm_auth.c b/source3/utils/ntlm_auth.c
index 3a5ba223da496b1cc68ebc982b31dd6942b82ee0..ba11ec736852d9a9eb4b1c854bbd4844083326a1 100644 (file)
--- a/source3/utils/ntlm_auth.c
+++ b/source3/utils/ntlm_auth.c
@@ -217,7 +217,7 @@ const char *get_winbind_netbios_name(void)
        if (winbindd_request_response(WINBINDD_NETBIOS_NAME, NULL, &response) !=
            NSS_STATUS_SUCCESS) {
                DEBUG(0, ("could not obtain winbind netbios name!\n"));
-               return global_myname();
+               return lp_netbios_name();
        }
 
        fstrcpy(winbind_netbios_name, response.data.netbios_name);
@@ -657,7 +657,7 @@ static NTSTATUS ntlm_auth_start_ntlmssp_client(struct ntlmssp_state **client_ntl
        }
 
        status = ntlmssp_client_start(NULL,
-                                     global_myname(),
+                                     lp_netbios_name(),
                                      lp_workgroup(),
                                      lp_client_ntlmv2_auth(),
                                      client_ntlmssp_state);
@@ -711,7 +711,7 @@ static NTSTATUS ntlm_auth_start_ntlmssp_server(struct ntlmssp_state **ntlmssp_st
        bool is_standalone = false;
 
        if (opt_password) {
-               netbios_name = global_myname();
+               netbios_name = lp_netbios_name();
                netbios_domain = lp_workgroup();
        } else {
                netbios_name = get_winbind_netbios_name();
@@ -1182,7 +1182,7 @@ static void offer_gss_spnego_mechs(void) {
 
        ZERO_STRUCT(spnego);
 
-       myname_lower = talloc_strdup(ctx, global_myname());
+       myname_lower = talloc_strdup(ctx, lp_netbios_name());
        if (!myname_lower) {
                return;
        }
@@ -2063,7 +2063,7 @@ static void manage_ntlm_server_1_request(struct ntlm_auth_state *state,
                        if (!NT_STATUS_IS_OK(
                                    contact_winbind_auth_crap(username, 
                                                              domain, 
-                                                             global_myname(),
+                                                             lp_netbios_name(),
                                                              &challenge, 
                                                              &lm_response, 
                                                              &nt_response,