[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  94b0f8f s3: Slightly simplify print_kdc_line()
       via  9411b8e s3: Slightly simplify print_kdc_line()
       via  01eb3136 s3: Slightly simplify print_kdc_line()
      from  b35d80a s3: Remove the smbd_server_conn ref from create_junction

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 94b0f8f7feceb8f1119ffdb46ebe62c4afcd5403
Author: Volker Lendecke <vl at samba.org>
Date:   Mon Sep 26 16:28:05 2011 +0200

    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 at samba.org>
    Autobuild-Date: Mon Sep 26 18:24:25 CEST 2011 on sn-devel-104

commit 9411b8e49dc81856f6f34550b81045f83efbe548
Author: Volker Lendecke <vl at samba.org>
Date:   Mon Sep 26 16:28:05 2011 +0200

    s3: Slightly simplify print_kdc_line()
    
    No code change except for an early "return talloc_asprintf(..)" making an else
    branch obsolete.

commit 01eb3136b6e22adf1860deabba5232a82644388b
Author: Volker Lendecke <vl at samba.org>
Date:   Mon Sep 26 16:28:05 2011 +0200

    s3: Slightly simplify print_kdc_line()
    
    No code change except for an early "return talloc_asprintf(..)" making an else
    branch obsolete.

-----------------------------------------------------------------------

Summary of changes:
 source3/libads/kerberos.c |  106 ++++++++++++++++++++++----------------------
 1 files changed, 53 insertions(+), 53 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/libads/kerberos.c b/source3/libads/kerberos.c
index a64e729..5c62ead 100644
--- a/source3/libads/kerberos.c
+++ b/source3/libads/kerberos.c
@@ -668,63 +668,63 @@ 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);
 
 	if (pss->ss_family == AF_INET) {
-		kdc_str = talloc_asprintf(mem_ctx, "%s\tkdc = %s\n",
-					prev_line,
-                                        print_canonical_sockaddr(mem_ctx, pss));
-	} else {
-		char addr[INET6_ADDRSTRLEN];
-		uint16_t port = get_sockaddr_port(pss);
-
-		DEBUG(10,("print_kdc_line: IPv6 case for kdc_name: %s, port: %d\n",
-			kdc_name, port));
-
-		if (port != 0 && port != DEFAULT_KRB5_PORT) {
-			/* Currently for IPv6 we can't specify a non-default
-			   krb5 port with an address, as this requires a ':'.
-			   Resolve to a name. */
-			char hostname[MAX_DNS_NAME_LENGTH];
-			int ret = sys_getnameinfo((const struct sockaddr *)pss,
-					sizeof(*pss),
-					hostname, sizeof(hostname),
-					NULL, 0,
-					NI_NAMEREQD);
-			if (ret) {
-				DEBUG(0,("print_kdc_line: can't resolve name "
-					"for kdc with non-default port %s. "
-					"Error %s\n.",
-					print_canonical_sockaddr(mem_ctx, pss),
-					gai_strerror(ret)));
-				return NULL;
-			}
-			/* Success, use host:port */
-			kdc_str = talloc_asprintf(mem_ctx,
-					"%s\tkdc = %s:%u\n",
-					prev_line,
-					hostname,
-					(unsigned int)port);
-		} else {
+		return talloc_asprintf(mem_ctx, "%s\tkdc = %s\n",
+				       prev_line,
+				       print_canonical_sockaddr(mem_ctx, pss));
+	}
 
-			/* no krb5 lib currently supports "kdc = ipv6 address"
-			 * at all, so just fill in just the kdc_name if we have
-			 * it and let the krb5 lib figure out the appropriate
-			 * 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));
-			}
+	/*
+	 * IPv6 starts here
+	 */
+
+	DEBUG(10, ("print_kdc_line: IPv6 case for kdc_name: %s, port: %d\n",
+		   kdc_name, port));
+
+	if (port != 0 && port != DEFAULT_KRB5_PORT) {
+		/* Currently for IPv6 we can't specify a non-default
+		   krb5 port with an address, as this requires a ':'.
+		   Resolve to a name. */
+		char hostname[MAX_DNS_NAME_LENGTH];
+		int ret = sys_getnameinfo((const struct sockaddr *)pss,
+					  sizeof(*pss),
+					  hostname, sizeof(hostname),
+					  NULL, 0,
+					  NI_NAMEREQD);
+		if (ret) {
+			DEBUG(0,("print_kdc_line: can't resolve name "
+				 "for kdc with non-default port %s. "
+				 "Error %s\n.",
+				 print_canonical_sockaddr(mem_ctx, pss),
+				 gai_strerror(ret)));
+			return NULL;
 		}
+		/* Success, use host:port */
+		return talloc_asprintf(mem_ctx,
+				       "%s\tkdc = %s:%u\n",
+				       prev_line,
+				       hostname,
+				       (unsigned int)port);
 	}
-	return kdc_str;
+
+	/* no krb5 lib currently supports "kdc = ipv6 address"
+	 * at all, so just fill in just the kdc_name if we have
+	 * it and let the krb5 lib figure out the appropriate
+	 * ipv6 address - gd */
+
+	if (kdc_name) {
+		return talloc_asprintf(mem_ctx, "%s\tkdc = %s\n",
+				       prev_line, kdc_name);
+	}
+
+	return talloc_asprintf(mem_ctx, "%s\tkdc = %s\n",
+			       prev_line,
+			       print_sockaddr(addr,
+					      sizeof(addr),
+					      pss));
 }
 
 /************************************************************************


-- 
Samba Shared Repository