diff options
| author | Gerald Carter <jerry@samba.org> | 2004-07-07 18:15:24 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 10:52:09 -0500 |
| commit | 02001dfb6c3ffe3091001aeaa17e3d0b48933cfd (patch) | |
| tree | 144557c7d9fd42e87756d45dc137b1b664eef8de | |
| parent | dda9d7626475d4d01b91ecd0dd31c80a88cb90bc (diff) | |
| download | samba-02001dfb6c3ffe3091001aeaa17e3d0b48933cfd.tar.gz samba-02001dfb6c3ffe3091001aeaa17e3d0b48933cfd.tar.bz2 samba-02001dfb6c3ffe3091001aeaa17e3d0b48933cfd.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
(This used to be commit 959da6e176da9f6a687265e50489b7db3d6712c0)
| -rw-r--r-- | source3/libads/ldap.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source3/libads/ldap.c b/source3/libads/ldap.c index 6b9792ec4c..78ea9f1497 100644 --- a/source3/libads/ldap.c +++ b/source3/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) { |