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 130d86b8dc8a10b3be30cd588eaec7200d802827..2d9ea17faac8147c44e988359ddea3a40cc32ff3 100644 (file)
--- a/source3/libads/ads_struct.c
+++ b/source3/libads/ads_struct.c
@@ -6,7 +6,7 @@
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
    
    This program is distributed in the hope that it will be useful,
@@ -15,8 +15,7 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
@@ -30,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);
                }
        }
 
@@ -75,6 +86,28 @@ char *ads_build_dn(const char *realm)
        return ads_build_path(realm, ".", "dc=", 0);
 }
 
+/* return a DNS name in the for aa.bb.cc from the DN  
+   "dc=AA,dc=BB,dc=CC".  caller must free
+*/
+char *ads_build_domain(const char *dn)
+{
+       char *dnsdomain = NULL;
+       
+       /* result should always be shorter than the DN */
+
+       if ( (dnsdomain = SMB_STRDUP( dn )) == NULL ) {
+               DEBUG(0,("ads_build_domain: malloc() failed!\n"));              
+               return NULL;            
+       }       
+
+       strlower_m( dnsdomain );        
+       all_string_sub( dnsdomain, "dc=", "", 0);
+       all_string_sub( dnsdomain, ",", ".", 0 );
+
+       return dnsdomain;       
+}
+
+
 
 #ifndef LDAP_PORT
 #define LDAP_PORT 389
@@ -88,6 +121,7 @@ ADS_STRUCT *ads_init(const char *realm,
                     const char *ldap_server)
 {
        ADS_STRUCT *ads;
+       int wrap_flags;
        
        ads = SMB_XMALLOC_P(ADS_STRUCT);
        ZERO_STRUCTP(ads);
@@ -107,6 +141,17 @@ ADS_STRUCT *ads_init(const char *realm,
        /* the caller will own the memory by default */
        ads->is_mine = 1;
 
+       wrap_flags = lp_client_ldap_sasl_wrapping();
+       if (wrap_flags == -1) {
+               wrap_flags = 0;
+       }
+
+       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;
 }
 
@@ -116,13 +161,11 @@ 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
-               if ((*ads)->ld) {
-                       ldap_unbind((*ads)->ld);
-               }
+               ads_disconnect(*ads);
 #endif
                SAFE_FREE((*ads)->server.realm);
                SAFE_FREE((*ads)->server.workgroup);
@@ -138,12 +181,8 @@ void ads_destroy(ADS_STRUCT **ads)
                SAFE_FREE((*ads)->config.ldap_server_name);
                SAFE_FREE((*ads)->config.server_site_name);
                SAFE_FREE((*ads)->config.client_site_name);
-               
-               SAFE_FREE((*ads)->schema.posix_uidnumber_attr);
-               SAFE_FREE((*ads)->schema.posix_gidnumber_attr);
-               SAFE_FREE((*ads)->schema.posix_shell_attr);
-               SAFE_FREE((*ads)->schema.posix_homedir_attr);
-               SAFE_FREE((*ads)->schema.posix_gecos_attr);
+               SAFE_FREE((*ads)->config.schema_path);
+               SAFE_FREE((*ads)->config.config_path);
                
                ZERO_STRUCTP(*ads);