X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/2e96d5041e9e7a241d14305ae3e89637476c4968..2dadaea5bcd47f319fef38fc0854af9e82664933:/mac/mtcpnet.c

diff --git a/mac/mtcpnet.c b/mac/mtcpnet.c
index 6cddc108..5c256655 100644
--- a/mac/mtcpnet.c
+++ b/mac/mtcpnet.c
@@ -276,6 +276,7 @@ SockAddr mactcp_namelookup(char const *host, char **canonicalname)
     OSErr err;
     volatile int done = FALSE;
     char *realhost;
+    int realhostlen;
 
     /* Clear the structure. */
     memset(ret, 0, sizeof(struct SockAddr_tag));
@@ -293,9 +294,13 @@ SockAddr mactcp_namelookup(char const *host, char **canonicalname)
 	    continue;
     ret->resolved = TRUE;
     
-    if (ret->hostinfo.rtnCode == noErr)
+    if (ret->hostinfo.rtnCode == noErr) {
 	realhost = ret->hostinfo.cname;
-    else
+	/* MacTCP puts trailing dots on canonical names. */
+	realhostlen = strlen(realhost);
+	if (realhost[realhostlen - 1] == '.')
+	    realhost[realhostlen - 1] = '\0';
+    } else
 	realhost = "";
     *canonicalname = smalloc(1+strlen(realhost));
     strcpy(*canonicalname, realhost);