svn commit: samba r11875 - branches/SAMBA_3_0/source/libads trunk/source/libads

[gd at samba.org]

Author: gd
Date: 2005-11-23 11:21:16 +0000 (Wed, 23 Nov 2005)
New Revision: 11875

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=11875

Log:
Allow to use START_TLS (by manually setting "ldap ssl = start_tls") for
LDAP connections to ADS (Windows 2003).

Guenther

Modified:
   branches/SAMBA_3_0/source/libads/ldap.c
   trunk/source/libads/ldap.c


Changeset:
Modified: branches/SAMBA_3_0/source/libads/ldap.c
===================================================================
--- branches/SAMBA_3_0/source/libads/ldap.c	2005-11-23 11:17:04 UTC (rev 11874)
+++ branches/SAMBA_3_0/source/libads/ldap.c	2005-11-23 11:21:16 UTC (rev 11875)
@@ -292,6 +292,11 @@
 
 	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 */

Modified: trunk/source/libads/ldap.c
===================================================================
--- trunk/source/libads/ldap.c	2005-11-23 11:17:04 UTC (rev 11874)
+++ trunk/source/libads/ldap.c	2005-11-23 11:21:16 UTC (rev 11875)
@@ -292,6 +292,11 @@
 
 	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 */