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

diff --git a/mac/mtcpnet.c b/mac/mtcpnet.c
index 543caa14..5c256655 100644
--- a/mac/mtcpnet.c
+++ b/mac/mtcpnet.c
@@ -270,18 +270,20 @@ void mactcp_cleanup(void)
 
 static ResultUPP mactcp_lookupdone_upp;
 
-SockAddr mactcp_namelookup(char *host, char **canonicalname)
+SockAddr mactcp_namelookup(char const *host, char **canonicalname)
 {
     SockAddr ret = smalloc(sizeof(struct SockAddr_tag));
     OSErr err;
     volatile int done = FALSE;
     char *realhost;
+    int realhostlen;
 
     /* Clear the structure. */
     memset(ret, 0, sizeof(struct SockAddr_tag));
     if (mactcp_lookupdone_upp == NULL)
 	mactcp_lookupdone_upp = NewResultUPP(&mactcp_lookupdone);
-    err = StrToAddr(host, &ret->hostinfo, mactcp_lookupdone_upp,
+    /* Casting away const -- hope StrToAddr is sensible */
+    err = StrToAddr((char *)host, &ret->hostinfo, mactcp_lookupdone_upp,
 		    (char *)&done);
     /*
      * PuTTY expects DNS lookups to be synchronous (see bug
@@ -292,9 +294,13 @@ SockAddr mactcp_namelookup(char *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);
@@ -308,7 +314,7 @@ static pascal void mactcp_lookupdone(struct hostInfo *hi, char *cookie)
     *donep = TRUE;
 }
 
-SockAddr mactcp_nonamelookup(char *host)
+SockAddr mactcp_nonamelookup(char const *host)
 {
     SockAddr ret = smalloc(sizeof(struct SockAddr_tag));