diff options
| author | joerg <joerg@FreeBSD.org> | 1997-01-27 15:38:46 +0000 |
|---|---|---|
| committer | joerg <joerg@FreeBSD.org> | 1997-01-27 15:38:46 +0000 |
| commit | f1bacc34bc8e442e34977738cf95f0151839ea6f (patch) | |
| tree | 4960b8bcb0cf382879fb0a62043a66c4445b024e | |
| parent | b14d8837e19510b67c879f1fe1f05c4c5e4d6032 (diff) | |
| download | FreeBSD-src-f1bacc34bc8e442e34977738cf95f0151839ea6f.zip FreeBSD-src-f1bacc34bc8e442e34977738cf95f0151839ea6f.tar.gz | |
Make even more copies of hostnames obtained by inet_ntoa(). iruserok()
could still clobber the static storage, yielding an error message with
a wrong hostname.
| -rw-r--r-- | libexec/rshd/rshd.c | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/libexec/rshd/rshd.c b/libexec/rshd/rshd.c index ae3d661..5170ef0 100644 --- a/libexec/rshd/rshd.c +++ b/libexec/rshd/rshd.c @@ -202,6 +202,7 @@ doit(fromp) char *cp, sig, buf[BUFSIZ]; char cmdbuf[NCARGS+1], locuser[16], remuser[16]; char remotehost[2 * MAXHOSTNAMELEN + 1]; + char fromhost[2 * MAXHOSTNAMELEN + 1]; #ifdef KERBEROS AUTH_DAT *kdata = (AUTH_DAT *) NULL; @@ -333,7 +334,9 @@ doit(fromp) * in a remote net; look up the name and check that this * address corresponds to the name. */ - hostname = hp->h_name; + strncpy(fromhost, hp->h_name, sizeof(fromhost) - 1); + fromhost[sizeof(fromhost) - 1] = 0; + hostname = fromhost; #ifdef KERBEROS if (!use_kerberos) #endif @@ -348,7 +351,10 @@ doit(fromp) remotehost); errorstr = "Couldn't look up address for your host (%s)\n"; - hostname = inet_ntoa(fromp->sin_addr); + strncpy(fromhost, inet_ntoa(fromp->sin_addr), + sizeof(fromhost) - 1); + fromhost[sizeof(fromhost) - 1] = 0; + hostname = fromhost; } else for (; ; hp->h_addr_list++) { if (hp->h_addr_list[0] == NULL) { syslog(LOG_NOTICE, @@ -357,7 +363,10 @@ doit(fromp) hp->h_name); errorstr = "Host address mismatch for %s\n"; - hostname = inet_ntoa(fromp->sin_addr); + strncpy(fromhost, inet_ntoa(fromp->sin_addr), + sizeof(fromhost) - 1); + fromhost[sizeof(fromhost) - 1] = 0; + hostname = fromhost; break; } if (!bcmp(hp->h_addr_list[0], @@ -368,8 +377,12 @@ doit(fromp) } } } - } else - errorhost = hostname = inet_ntoa(fromp->sin_addr); + } else { + strncpy(fromhost, inet_ntoa(fromp->sin_addr), + sizeof(fromhost) - 1); + fromhost[sizeof(fromhost) - 1] = 0; + errorhost = hostname = fromhost; + } #ifdef KERBEROS if (use_kerberos) { |
