lib: Use GUID_buf_string in discover_dc_dns
authorVolker Lendecke <vl@samba.org>
Sat, 5 Dec 2015 17:46:34 +0000 (18:46 +0100)
committerJeremy Allison <jra@samba.org>
Tue, 8 Dec 2015 22:01:27 +0000 (23:01 +0100)
One talloc call less..

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
source3/libsmb/dsgetdcname.c

index ca968119cafd94730c79b381a16e16f3ed5a9b4a..a63ba5a0ce7dbb078efaf1df450d19a3f7ce1314 100644 (file)
@@ -543,7 +543,6 @@ static NTSTATUS discover_dc_dns(TALLOC_CTX *mem_ctx,
        int numaddrs = 0;
        struct ip_service_name *dclist = NULL;
        int count = 0;
-       char *guid_string;
 
        if (flags & DS_PDC_REQUIRED) {
                status = ads_dns_query_pdc(mem_ctx,
@@ -569,17 +568,14 @@ static NTSTATUS discover_dc_dns(TALLOC_CTX *mem_ctx,
                                           &dcs,
                                           &numdcs);
        } else if (domain_guid) {
-               guid_string = GUID_string(mem_ctx, domain_guid);
-               if (!guid_string) {
-                       return NT_STATUS_NO_MEMORY;
-               }
+               struct GUID_txt_buf buf;
+               GUID_buf_string(domain_guid, &buf);
 
                status = ads_dns_query_dcs_guid(mem_ctx,
                                                domain_name,
-                                               guid_string,
+                                               buf.buf,
                                                &dcs,
                                                &numdcs);
-               TALLOC_FREE(guid_string);
        } else {
                status = ads_dns_query_dcs(mem_ctx,
                                           domain_name,