diff options
| author | Günther Deschner <gd@samba.org> | 2005-11-23 11:21:16 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:05:33 -0500 |
| commit | f6b8327fac33a7758f1c66131238a1945807e535 (patch) | |
| tree | 65321f92d6b6fffd8910da6b5ef29667e8265645 | |
| parent | 092e3e514b092f228bfb7970a34b528a3df6d3d7 (diff) | |
| download | samba-f6b8327fac33a7758f1c66131238a1945807e535.tar.gz samba-f6b8327fac33a7758f1c66131238a1945807e535.tar.bz2 samba-f6b8327fac33a7758f1c66131238a1945807e535.zip | |
r11875: Allow to use START_TLS (by manually setting "ldap ssl = start_tls") for
LDAP connections to ADS (Windows 2003).
Guenther
(This used to be commit 95543fab0f6aa1c483b40247c16cde79cbc9c012)
| -rw-r--r-- | source3/libads/ldap.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/source3/libads/ldap.c b/source3/libads/ldap.c index 6d1ca24537..e4cfc456a2 100644 --- a/source3/libads/ldap.c +++ b/source3/libads/ldap.c @@ -292,6 +292,11 @@ got_connection: ldap_set_option(ads->ld, LDAP_OPT_PROTOCOL_VERSION, &version); + status = ADS_ERROR(smb_ldap_start_tls(ads->ld, version)); + if (!ADS_ERR_OK(status)) { + return status; + } + if (!ads->auth.user_name) { /* have to use the userPrincipalName value here and not servicePrincipalName; found by Guenther Deschner @ Sernet */ |