diff options
author | Andrew Bartlett <abartlet@samba.org> | 2011-06-09 15:31:03 +1000 |
---|---|---|
committer | Andrew Bartlett <abartlet@samba.org> | 2011-06-09 12:40:09 +0200 |
commit | 74eed8f3ed5c333728350df1d23a4318e9104909 (patch) | |
tree | c0e4d64d876400e711bf252b73f4bdb43f0e55c1 /source3/utils/ntlm_auth.c | |
parent | 0e95311c235929e07fdcfd7153b91ae795a979b9 (diff) | |
download | samba-74eed8f3ed5c333728350df1d23a4318e9104909.tar.gz samba-74eed8f3ed5c333728350df1d23a4318e9104909.tar.bz2 samba-74eed8f3ed5c333728350df1d23a4318e9104909.zip |
s3-param Remove special case for global_myname(), rename to lp_netbios_name()
There is no reason this can't be a normal constant string in the
loadparm system, now that we have lp_set_cmdline() to handle overrides
correctly.
Andrew Bartlett
Diffstat (limited to 'source3/utils/ntlm_auth.c')
-rw-r--r-- | source3/utils/ntlm_auth.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source3/utils/ntlm_auth.c b/source3/utils/ntlm_auth.c index 3a5ba223da..ba11ec7368 100644 --- 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, |