Changeset 736 for branches/samba-3.5.x/source3/libads

Timestamp:

Nov 12, 2012, 5:38:52 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server 3.5: update branche to 3.5.16

Location:

branches/samba-3.5.x/source3/libads

Files:

• ads_status.c (modified) (1 diff)
• ads_struct.c (modified) (1 diff)
• ldap.c (modified) (1 diff)
• ldap_utils.c (modified) (1 diff)

branches/samba-3.5.x/source3/libads/ads_status.c

@@ -80 +80 @@
                         return NT_STATUS_OK;
                 }
+                if (status.err.rc == LDAP_TIMELIMIT_EXCEEDED) {
+                        return NT_STATUS_IO_TIMEOUT;
+                }
                 return NT_STATUS_LDAP(status.err.rc);
 #endif

branches/samba-3.5.x/source3/libads/ads_struct.c

@@ -149 +149 @@
         ads->auth.flags = wrap_flags;
 
+        /* Start with a page size of 1000 when the connection is new,
+         * we will drop it by half we get a timeout.   */
+        ads->config.ldap_page_size     = 1000;
+
         return ads;
 }

branches/samba-3.5.x/source3/libads/ldap.c

@@ -925 +925 @@
         cookie_be = ber_alloc_t(LBER_USE_DER);
         if (*cookie) {
-                ber_printf(cookie_be, "{iO}", (ber_int_t) 1000, *cookie);
+                ber_printf(cookie_be, "{iO}", (ber_int_t) ads->config.ldap_page_size, *cookie);
                 ber_bvfree(*cookie); /* don't need it from last time */
                 *cookie = NULL;
         } else {
-                ber_printf(cookie_be, "{io}", (ber_int_t) 1000, "", 0);
+                ber_printf(cookie_be, "{io}", (ber_int_t) ads->config.ldap_page_size, "", 0);
         }
         ber_flatten(cookie_be, &cookie_bv);

branches/samba-3.5.x/source3/libads/ldap_utils.c

@@ -69 +69 @@
         while (--count) {
 
+                if (NT_STATUS_EQUAL(ads_ntstatus(status), NT_STATUS_IO_TIMEOUT) && ads->config.ldap_page_size >= 250) {
+                        int new_page_size = (ads->config.ldap_page_size / 2);
+                        DEBUG(1, ("Reducing LDAP page size from %d to %d due to IO_TIMEOUT\n",
+                                  ads->config.ldap_page_size, new_page_size));
+                        ads->config.ldap_page_size = new_page_size;
+                }
+
                 if (*res) 
                         ads_msgfree(ads, *res);