From: Noel Power <noel.power@suse.com>
Date: Fri, 4 Sep 2020 09:38:27 +0000 (+0100)
Subject: s3/libads: Only set result to kdc_str on success
X-Git-Tag: talloc-2.3.2~626
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9d62c3e98197d0c73c26a10545c39026b38f0fb7;p=thirdparty%2Fsamba.git

s3/libads: Only set result to kdc_str on success

Prior to this change result was set even when any or all errors
occured in the function.

Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-by: Jeremy Allison <jra@samba.org>
---

diff --git a/source3/libads/kerberos.c b/source3/libads/kerberos.c
index 63175bace08..49f942cdb96 100644
--- a/source3/libads/kerberos.c
+++ b/source3/libads/kerberos.c
@@ -590,10 +590,10 @@ static char *get_kdc_ip_string(char *mem_ctx,
 		kdc_str = new_kdc_str;
 	}
 
+	result = kdc_str;
 out:
 	DEBUG(10, ("get_kdc_ip_string: Returning %s\n", kdc_str));
 
-	result = kdc_str;
 	TALLOC_FREE(ip_srv_site);
 	TALLOC_FREE(ip_srv_nonsite);
 	TALLOC_FREE(frame);