- mbbsd: clean trailing stuff when fromd is enabled.

git-svn-id: http://opensvn.csie.org/pttbbs/trunk/pttbbs@4303 63ad8ddf-47c3-0310-b6dd-a9e9d9715204

1 files changed, 6 insertions, 2 deletions

diff --git a/mbbsd/mbbsd.c b/mbbsd/mbbsd.c
index 6a5337f5..5c661139 100644
--- a/mbbsd/mbbsd.c
+++ b/mbbsd/mbbsd.c
@@ -1012,9 +1012,13 @@ setup_utmp(int mode)
 	int fd;
 	if ( (fd = toconnect(FROMD_ADDR)) >= 0 ) {
 	    write(fd, fromhost, strlen(fromhost));
-	    // uinfo.from is zerod, so we don't care about read length
-	    read(fd, currutmp->from, sizeof(currutmp->from) - 1);
+	    // zero and reuse uinfo.from to check real data
+	    memset(uinfo.from, 0, sizeof(uinfo.from));
+	    read(fd, uinfo.from,  sizeof(uinfo.from) - 1); // keep trailing zero
 	    close(fd);
+	    // copy back to currutmp
+	    if (uinfo.from[0])
+		strlcpy(currutmp->from, uinfo.from, sizeof(currutmp->from));
 	}
     }
 # else  // !FROMD