diff options
| author | Andrew Tridgell <tridge@samba.org> | 2004-08-03 05:47:24 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:57:45 -0500 |
| commit | 94fb514376e7cb1c3ba4f89e10289350052d1294 (patch) | |
| tree | d4eca2537847fa1a391b0777f0d834151fbe8f81 /source4/libcli/auth | |
| parent | 2d9adf1ea5f7928c1f4f14f3f885d688ba5fa744 (diff) | |
| download | samba-94fb514376e7cb1c3ba4f89e10289350052d1294.tar.gz samba-94fb514376e7cb1c3ba4f89e10289350052d1294.tar.bz2 samba-94fb514376e7cb1c3ba4f89e10289350052d1294.zip | |
r1630: - fixed the replacement timegm() function to work correctly for DST changes
- got rid of global_myname(), using lp_netbios_name() instead
(This used to be commit e8d4b390884e487163d81f66a5a7ac1de1305d9a)
Diffstat (limited to 'source4/libcli/auth')
| -rw-r--r-- | source4/libcli/auth/kerberos_verify.c | 2 | ||||
| -rw-r--r-- | source4/libcli/auth/ntlmssp.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source4/libcli/auth/kerberos_verify.c b/source4/libcli/auth/kerberos_verify.c index 76e98cb39a..5cd22b3749 100644 --- a/source4/libcli/auth/kerberos_verify.c +++ b/source4/libcli/auth/kerberos_verify.c @@ -230,7 +230,7 @@ static BOOL ads_secrets_verify_ticket(krb5_context context, krb5_auth_context au like. We have to go through all this to allow us to store the secret internally, instead of using /etc/krb5.keytab */ - myname = name_to_fqdn(mem_ctx, global_myname()); + myname = name_to_fqdn(mem_ctx, lp_netbios_name()); strlower_m(myname); asprintf(&host_princ_s, "host/%s@%s", myname, lp_realm()); ret = krb5_parse_name(context, host_princ_s, &host_princ); diff --git a/source4/libcli/auth/ntlmssp.c b/source4/libcli/auth/ntlmssp.c index 75c1e30f56..9579f3612c 100644 --- a/source4/libcli/auth/ntlmssp.c +++ b/source4/libcli/auth/ntlmssp.c @@ -915,7 +915,7 @@ NTSTATUS ntlmssp_server_start(struct ntlmssp_state **ntlmssp_state) (*ntlmssp_state)->set_challenge = set_challenge; (*ntlmssp_state)->may_set_challenge = may_set_challenge; - (*ntlmssp_state)->get_global_myname = global_myname; + (*ntlmssp_state)->get_global_myname = lp_netbios_name; (*ntlmssp_state)->get_domain = lp_workgroup; (*ntlmssp_state)->server_role = ROLE_DOMAIN_MEMBER; /* a good default */ @@ -1268,7 +1268,7 @@ NTSTATUS ntlmssp_client_start(struct ntlmssp_state **ntlmssp_state) (*ntlmssp_state)->mem_ctx = mem_ctx; - (*ntlmssp_state)->get_global_myname = global_myname; + (*ntlmssp_state)->get_global_myname = lp_netbios_name; (*ntlmssp_state)->get_domain = lp_workgroup; (*ntlmssp_state)->unicode = lp_parm_bool(-1, "ntlmssp_client", "unicode", True); |