summaryrefslogtreecommitdiff
path: root/source4/libads
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2004-08-03 05:47:24 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:57:45 -0500
commit94fb514376e7cb1c3ba4f89e10289350052d1294 (patch)
treed4eca2537847fa1a391b0777f0d834151fbe8f81 /source4/libads
parent2d9adf1ea5f7928c1f4f14f3f885d688ba5fa744 (diff)
downloadsamba-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/libads')
-rw-r--r--source4/libads/ldap.c2
-rw-r--r--source4/libads/sasl.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/source4/libads/ldap.c b/source4/libads/ldap.c
index 2954c286ab..f038b23d23 100644
--- a/source4/libads/ldap.c
+++ b/source4/libads/ldap.c
@@ -228,7 +228,7 @@ got_connection:
if (!ads->auth.user_name) {
/* by default use the machine account */
fstring myname;
- fstrcpy(myname, global_myname());
+ fstrcpy(myname, lp_netbios_name());
strlower_m(myname);
asprintf(&ads->auth.user_name, "HOST/%s", myname);
}
diff --git a/source4/libads/sasl.c b/source4/libads/sasl.c
index ce787400f7..b79f54c86d 100644
--- a/source4/libads/sasl.c
+++ b/source4/libads/sasl.c
@@ -96,7 +96,7 @@ static ADS_STATUS ads_sasl_spnego_ntlmssp_bind(ADS_STRUCT *ads)
nthash, 24,
lp_workgroup(),
ads->auth.user_name,
- global_myname(),
+ lp_netbios_name(),
sess_key, 16,
neg_flags);