libads: Remove "foreign" from ads_struct

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

diff --git a/source3/libads/ads_struct.c b/source3/libads/ads_struct.c
index fd7e417bad57317ab29fa0fb3b0dfa93f173fc77..27af4d6c7556a98762993ae1ab076d5212fe6a28 100644 (file)
--- a/source3/libads/ads_struct.c
+++ b/source3/libads/ads_struct.c
@@ -55,12 +55,14 @@ char *ads_build_path(const char *realm, const char *sep, const char *field, int
        if (strlcpy(ret,field, len) >= len) {
                /* Truncate ! */
                free(r);
+               free(ret);
                return NULL;
        }
        p=strtok_r(r, sep, &saveptr);
        if (p) {
                if (strlcat(ret, p, len) >= len) {
                        free(r);
+                       free(ret);
                        return NULL;
                }
 
@@ -142,14 +144,6 @@ ADS_STRUCT *ads_init(const char *realm,
        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 && !strequal(lp_realm(), realm)) {
-               ads->server.foreign = 1;
-       }
-       if (workgroup && *workgroup && !strequal(lp_workgroup(), workgroup)) {
-               ads->server.foreign = 1;
-       }
-
        /* the caller will own the memory by default */
        ads->is_mine = 1;