s3-libads: Use a reducing page size to try and cope with a slow LDAP server

[samba.git] / source3 / libads / ads_struct.c

diff --git a/source3/libads/ads_struct.c b/source3/libads/ads_struct.c
index aac57d41fe23dc61ba299bbf3a1d867904dac880..2d9ea17faac8147c44e988359ddea3a40cc32ff3 100644 (file)
--- a/source3/libads/ads_struct.c
+++ b/source3/libads/ads_struct.c
@@ -29,35 +29,47 @@ char *ads_build_path(const char *realm, const char *sep, const char *field, int
        int numbits = 0;
        char *ret;
        int len;
-       
+       char *saveptr;
+
        r = SMB_STRDUP(realm);
 
-       if (!r || !*r)
+       if (!r || !*r) {
                return r;
+       }
 
-       for (p=r; *p; p++)
-               if (strchr(sep, *p))
+       for (p=r; *p; p++) {
+               if (strchr(sep, *p)) {
                        numbits++;
+               }
+       }
 
        len = (numbits+1)*(strlen(field)+1) + strlen(r) + 1;
 
        ret = (char *)SMB_MALLOC(len);
-       if (!ret)
+       if (!ret) {
+               free(r);
                return NULL;
+       }
 
        strlcpy(ret,field, len);
-       p=strtok(r,sep); 
+       p=strtok_r(r, sep, &saveptr);
        if (p) {
                strlcat(ret, p, len);
        
-               while ((p=strtok(NULL,sep))) {
-                       char *s;
+               while ((p=strtok_r(NULL, sep, &saveptr)) != NULL) {
+                       int retval;
+                       char *s = NULL;
                        if (reverse)
-                               asprintf(&s, "%s%s,%s", field, p, ret);
+                               retval = asprintf(&s, "%s%s,%s", field, p, ret);
                        else
-                               asprintf(&s, "%s,%s%s", ret, field, p);
+                               retval = asprintf(&s, "%s,%s%s", ret, field, p);
                        free(ret);
-                       ret = s;
+                       if (retval == -1) {
+                               free(r);
+                               return NULL;
+                       }
+                       ret = SMB_STRDUP(s);
+                       free(s);
                }
        }
 
@@ -136,6 +148,10 @@ ADS_STRUCT *ads_init(const char *realm,
 
        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;
 }
 
@@ -145,7 +161,7 @@ ADS_STRUCT *ads_init(const char *realm,
 void ads_destroy(ADS_STRUCT **ads)
 {
        if (ads && *ads) {
-               BOOL is_mine;
+               bool is_mine;
 
                is_mine = (*ads)->is_mine;
 #if HAVE_LDAP