s3: Slightly simplify print_kdc_line()

No code change except for an early "return talloc_asprintf(..)" making an else
branch obsolete.

Autobuild-User: Volker Lendecke <vlendec@samba.org>
Autobuild-Date: Mon Sep 26 18:24:25 CEST 2011 on sn-devel-104

diff --git a/source3/libads/kerberos.c b/source3/libads/kerberos.c
index e729918b705b83028cb716ea6d2882b8f6fba3cd..5c62ead68904b6df5ca7f2631e7d20c2c5a4b8e7 100644 (file)
--- a/source3/libads/kerberos.c
+++ b/source3/libads/kerberos.c
@@ -668,7 +668,6 @@ static char *print_kdc_line(char *mem_ctx,
                        const struct sockaddr_storage *pss,
                        const char *kdc_name)
 {
-       char *kdc_str = NULL;
        char addr[INET6_ADDRSTRLEN];
        uint16_t port = get_sockaddr_port(pss);
 
@@ -717,16 +716,15 @@ static char *print_kdc_line(char *mem_ctx,
         * ipv6 address - gd */
 
        if (kdc_name) {
-               kdc_str = talloc_asprintf(mem_ctx, "%s\tkdc = %s\n",
-                                         prev_line, kdc_name);
-       } else {
-               kdc_str = talloc_asprintf(mem_ctx, "%s\tkdc = %s\n",
-                                         prev_line,
-                                         print_sockaddr(addr,
-                                                        sizeof(addr),
-                                                        pss));
+               return talloc_asprintf(mem_ctx, "%s\tkdc = %s\n",
+                                      prev_line, kdc_name);
        }
-       return kdc_str;
+
+       return talloc_asprintf(mem_ctx, "%s\tkdc = %s\n",
+                              prev_line,
+                              print_sockaddr(addr,
+                                             sizeof(addr),
+                                             pss));
 }
 
 /************************************************************************