6955216 Negotiate Protocol fails with latest NetApp server

6962072 Tree connect may fail if addr-to-name lookup fails
6962091 Log messages like: ... smb_maperr32: no direct map for...
6962125 Tree connect failed with latest Isilon server
6972321 improve some error messages

1 files changed, 1 insertions, 26 deletions

diff --git a/usr/src/lib/libsmbfs/smb/getaddr.c b/usr/src/lib/libsmbfs/smb/getaddr.c
index 2847d858cb..67e61567a1 100644
--- a/usr/src/lib/libsmbfs/smb/getaddr.c
+++ b/usr/src/lib/libsmbfs/smb/getaddr.c
@@ -20,8 +20,7 @@
  */
 
 /*
- * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
  */
 
 /*
@@ -142,8 +141,6 @@ smb_ctx_getaddr(struct smb_ctx *ctx)
 	/*
 	 * Default the server name we'll use in the
 	 * protocol (i.e. NTLM, tree connect).
-	 * If we get a canonical name, we'll
-	 * overwrite this below.
 	 */
 	strlcpy(ctx->ct_srvname, ctx->ct_fullserver,
 	    sizeof (ctx->ct_srvname));
@@ -159,25 +156,6 @@ smb_ctx_getaddr(struct smb_ctx *ctx)
 	hints.ai_socktype = SOCK_STREAM;
 	gaierr = getaddrinfo(srvaddr_str, NULL, &hints, &res);
 	if (gaierr == 0) {
-#if 1
-		/*
-		 * XXX Temporarily work-around CR 6831339:
-		 * getaddrinfo() sets ai_canonname incorrectly
-		 */
-		char tmphost[256];
-		gaierr2 = getnameinfo(res->ai_addr, res->ai_addrlen,
-		    tmphost, sizeof (tmphost),
-		    NULL, 0, NI_NAMEREQD);
-		if (gaierr2 == 0) {
-			DPRINT("cname: %s", tmphost);
-			strlcpy(ctx->ct_srvname, tmphost,
-			    sizeof (ctx->ct_srvname));
-		}
-#else
-		if (res->ai_canonname)
-			strlcpy(ctx->ct_srvname, res->ai_canonname,
-			    sizeof (ctx->ct_srvname));
-#endif
 		ctx->ct_addrinfo = res;
 		return (0);
 	}
@@ -186,9 +164,6 @@ smb_ctx_getaddr(struct smb_ctx *ctx)
 	 * If regular IP name lookup failed, try NetBIOS,
 	 * but only if given a valid NetBIOS name and if
 	 * NetBIOS name lookup is enabled.
-	 *
-	 * Note: we only have ssn_srvname if the full name
-	 * was also a valid NetBIOS name.
 	 */
 	if (nbc->nb_flags & NBCF_NS_ENABLE) {
 		gaierr2 = nbns_getaddrinfo(ctx->ct_fullserver, nbc, &res);