summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2004-07-07 18:15:24 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 10:52:09 -0500
commit959da6e176da9f6a687265e50489b7db3d6712c0 (patch)
tree38dafc2635f375d9a9d7dec58754e532eb856a84
parentc6e73ff091b4d87111b33735400fdd10d4c8671c (diff)
downloadsamba-959da6e176da9f6a687265e50489b7db3d6712c0.tar.gz
samba-959da6e176da9f6a687265e50489b7db3d6712c0.tar.xz
samba-959da6e176da9f6a687265e50489b7db3d6712c0.zip
r1381: fixing behavior found by gd@sernet.de; we must use the userPrincipalName value (host/hostname@REALM) and not the servicePrincipalName (host/fqdn@REALM) in the SASL binds
-rw-r--r--source/libads/ldap.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/source/libads/ldap.c b/source/libads/ldap.c
index 6b9792ec4c6..78ea9f1497d 100644
--- a/source/libads/ldap.c
+++ b/source/libads/ldap.c
@@ -255,10 +255,10 @@ got_connection:
ldap_set_option(ads->ld, LDAP_OPT_PROTOCOL_VERSION, &version);
if (!ads->auth.user_name) {
- fstring my_fqdn;
- name_to_fqdn(my_fqdn, global_myname());
- strlower_m(my_fqdn);
- asprintf(&ads->auth.user_name, "host/%s", my_fqdn);
+ /* have to use the userPrincipalName value here and
+ not servicePrincipalName; found by Guenther Deschner @ Sernet */
+
+ asprintf(&ads->auth.user_name, "host/%s", global_myname() );
}
if (!ads->auth.realm) {