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

Timestamp:

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

Author:

Herwig Bauernfeind

Message:

Update Samba 3.3 to 3.3.1

Location:

branches/samba-3.3.x/source/libads

Files:

• ldap.c (modified) (3 diffs)
• ldap_printer.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;
+                }
         }
 

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

@@ -329 +329 @@
                 DEBUG(3, ("Unable to open printer %s, error is %s.\n",
                           printername, dos_errstr(result)));
+                SAFE_FREE(printername);
                 return result;
         }
         
-        if ( !(dsdriver_ctr = TALLOC_ZERO_P( mem_ctx, REGVAL_CTR )) ) 
+        if ( !(dsdriver_ctr = TALLOC_ZERO_P( mem_ctx, REGVAL_CTR )) ) {
+                SAFE_FREE(printername);
                 return WERR_NOMEM;
+        }
 
         result = rpccli_spoolss_enumprinterdataex(cli, mem_ctx, &pol, SPOOL_DSDRIVER_KEY, dsdriver_ctr);
@@ -349 +352 @@
         }
         
-        if ( !(dsspooler_ctr = TALLOC_ZERO_P( mem_ctx, REGVAL_CTR )) )
+        if ( !(dsspooler_ctr = TALLOC_ZERO_P( mem_ctx, REGVAL_CTR )) ) {
+                SAFE_FREE(printername);
                 return WERR_NOMEM;
+        }
 
         result = rpccli_spoolss_enumprinterdataex(cli, mem_ctx, &pol, SPOOL_DSSPOOLER_KEY, dsspooler_ctr);
@@ -371 +376 @@
 
         rpccli_spoolss_close_printer(cli, mem_ctx, &pol);
+        SAFE_FREE(printername);
 
         return result;