r23784: use the GPLv3 boilerplate as recommended by the FSF and the license text

[vlendec/samba-autobuild/.git] / source3 / libads / ads_struct.c

diff --git a/source3/libads/ads_struct.c b/source3/libads/ads_struct.c
index dd31439d830209aa9610afdd3c1d139a4771d7e1..b01e0879ef9cab970a7537b33064abd87656ccb7 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"
@@ -31,7 +30,7 @@ char *ads_build_path(const char *realm, const char *sep, const char *field, int
        char *ret;
        int len;
        
-       r = strdup(realm);
+       r = SMB_STRDUP(realm);
 
        if (!r || !*r)
                return r;
@@ -42,22 +41,24 @@ char *ads_build_path(const char *realm, const char *sep, const char *field, int
 
        len = (numbits+1)*(strlen(field)+1) + strlen(r) + 1;
 
-       ret = malloc(len);
+       ret = (char *)SMB_MALLOC(len);
        if (!ret)
                return NULL;
 
        strlcpy(ret,field, len);
        p=strtok(r,sep); 
-       strlcat(ret, p, len);
-
-       while ((p=strtok(NULL,sep))) {
-               char *s;
-               if (reverse)
-                       asprintf(&s, "%s%s,%s", field, p, ret);
-               else
-                       asprintf(&s, "%s,%s%s", ret, field, p);
-               free(ret);
-               ret = s;
+       if (p) {
+               strlcat(ret, p, len);
+       
+               while ((p=strtok(NULL,sep))) {
+                       char *s;
+                       if (reverse)
+                               asprintf(&s, "%s%s,%s", field, p, ret);
+                       else
+                               asprintf(&s, "%s,%s%s", ret, field, p);
+                       free(ret);
+                       ret = s;
+               }
        }
 
        free(r);
@@ -73,6 +74,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
@@ -87,28 +110,25 @@ ADS_STRUCT *ads_init(const char *realm,
 {
        ADS_STRUCT *ads;
        
-       ads = (ADS_STRUCT *)smb_xmalloc(sizeof(*ads));
+       ads = SMB_XMALLOC_P(ADS_STRUCT);
        ZERO_STRUCTP(ads);
        
-       ads->server.realm = realm? strdup(realm) : NULL;
-       ads->server.workgroup = workgroup ? strdup(workgroup) : NULL;
-       ads->server.ldap_server = ldap_server? strdup(ldap_server) : NULL;
+       ads->server.realm = realm? SMB_STRDUP(realm) : NULL;
+       ads->server.workgroup = workgroup ? SMB_STRDUP(workgroup) : NULL;
+       ads->server.ldap_server = ldap_server? SMB_STRDUP(ldap_server) : NULL;
 
        /* we need to know if this is a foreign realm */
-       if (realm && *realm && strcasecmp(lp_realm(), realm) != 0) {
+       if (realm && *realm && !strequal(lp_realm(), realm)) {
                ads->server.foreign = 1;
        }
-       if (workgroup && *workgroup && strcasecmp(lp_workgroup(), workgroup) != 0) {
+       if (workgroup && *workgroup && !strequal(lp_workgroup(), workgroup)) {
                ads->server.foreign = 1;
        }
 
-       return ads;
-}
+       /* the caller will own the memory by default */
+       ads->is_mine = 1;
 
-/* a simpler ads_init() interface using all defaults */
-ADS_STRUCT *ads_init_simple(void)
-{
-       return ads_init(NULL, NULL, NULL);
+       return ads;
 }
 
 /*
@@ -117,13 +137,17 @@ ADS_STRUCT *ads_init_simple(void)
 void ads_destroy(ADS_STRUCT **ads)
 {
        if (ads && *ads) {
+               BOOL is_mine;
+
+               is_mine = (*ads)->is_mine;
 #if HAVE_LDAP
-               if ((*ads)->ld) ldap_unbind((*ads)->ld);
+               if ((*ads)->ld) {
+                       ldap_unbind((*ads)->ld);
+               }
 #endif
                SAFE_FREE((*ads)->server.realm);
                SAFE_FREE((*ads)->server.workgroup);
                SAFE_FREE((*ads)->server.ldap_server);
-               SAFE_FREE((*ads)->server.ldap_uri);
 
                SAFE_FREE((*ads)->auth.realm);
                SAFE_FREE((*ads)->auth.password);
@@ -133,8 +157,12 @@ void ads_destroy(ADS_STRUCT **ads)
                SAFE_FREE((*ads)->config.realm);
                SAFE_FREE((*ads)->config.bind_path);
                SAFE_FREE((*ads)->config.ldap_server_name);
-
+               SAFE_FREE((*ads)->config.server_site_name);
+               SAFE_FREE((*ads)->config.client_site_name);
+               
                ZERO_STRUCTP(*ads);
-               SAFE_FREE(*ads);
+
+               if ( is_mine )
+                       SAFE_FREE(*ads);
        }
 }