Changeset 221 for branches/samba-3.3.x/source/libads/ldap.c

Timestamp:

May 24, 2009, 7:17:10 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update Samba 3.3 to 3.3.1

File:

• branches/samba-3.3.x/source/libads/ldap.c (modified) (3 diffs)

branches/samba-3.3.x/source/libads/ldap.c

@@ -300 +300 @@
                 got_realm = True;
 
+ again:
+
         /* we need to try once with the realm name and fallback to the
            netbios domain name if we fail (if netbios has not been disabled */
@@ -350 +352 @@
 
         sitename = sitename_fetch(realm);
-
- again:
 
         DEBUG(6,("ads_find_dc: (cldap) looking for %s '%s'\n",
@@ -673 +673 @@
         ldap_set_option(ads->ldap.ld, LDAP_OPT_PROTOCOL_VERSION, &version);
 
-        status = ADS_ERROR(smb_ldap_start_tls(ads->ldap.ld, version));
-        if (!ADS_ERR_OK(status)) {
-                goto out;
+        if ( lp_ldap_ssl_ads() ) {
+                status = ADS_ERROR(smb_ldap_start_tls(ads->ldap.ld, version));
+                if (!ADS_ERR_OK(status)) {
+                        goto out;
+                }
         }