s3:libads: Allocate ads->config.client_site_name under ADS_STRUCT talloc context

Signed-off-by: Samuel Cabrero <scabrero@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

diff --git a/source3/libads/ads_struct.c b/source3/libads/ads_struct.c
index 2a583efb685ccab30fcd60a729a23a9e676a4a79..941f216359d5ff4546af919d8b9bbb93f867b989 100644 (file)
--- a/source3/libads/ads_struct.c
+++ b/source3/libads/ads_struct.c
@@ -153,7 +153,6 @@ static void ads_destroy(ADS_STRUCT **ads)
 #ifdef HAVE_LDAP
                ads_disconnect(*ads);
 #endif
-               SAFE_FREE((*ads)->config.client_site_name);
                SAFE_FREE((*ads)->config.schema_path);
                SAFE_FREE((*ads)->config.config_path);
        }

diff --git a/source3/libads/ldap.c b/source3/libads/ldap.c
index 0a9a59447bbb21000578defb254872f21bb46dc3..8a76b8c7d328c6e5164145570f96a6e554c1ff1f 100755 (executable)
--- a/source3/libads/ldap.c
+++ b/source3/libads/ldap.c
@@ -296,7 +296,7 @@ static bool ads_try_connect(ADS_STRUCT *ads, bool gc,
        TALLOC_FREE(ads->config.bind_path);
        TALLOC_FREE(ads->config.ldap_server_name);
        TALLOC_FREE(ads->config.server_site_name);
-       SAFE_FREE(ads->config.client_site_name);
+       TALLOC_FREE(ads->config.client_site_name);
        TALLOC_FREE(ads->server.workgroup);
 
        if (!check_cldap_reply_required_flags(cldap_reply.server_type,
@@ -342,7 +342,12 @@ static bool ads_try_connect(ADS_STRUCT *ads, bool gc,
 
        if (*cldap_reply.client_site) {
                ads->config.client_site_name =
-                       SMB_STRDUP(cldap_reply.client_site);
+                       talloc_strdup(ads, cldap_reply.client_site);
+               if (ads->config.client_site_name == NULL) {
+                       DBG_WARNING("Out of memory\n");
+                       ret = false;
+                       goto out;
+               }
        }
 
        ads->server.workgroup = talloc_strdup(ads, cldap_reply.domain_name);