summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
authormartin <martin@NetBSD.org>2020-06-30 18:48:00 +0000
committermartin <martin@NetBSD.org>2020-06-30 18:48:00 +0000
commit035d7141bdd4c1cdfa63e050a821b7869a43a7ed (patch)
tree68c74c57cc831504c6a3e5f133d284b927d723cb /usr.bin
parent577c3053e0a9e3613ce8632cd3842de2de65f5d7 (diff)
Pull up following revision(s) (requested by kim in ticket #979):
usr.bin/w/w.c: revision 1.86 usr.bin/w/w.c: revision 1.85 Compute a value for domain before comparing against it Remove local domain always, not just when looking up addresses
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/w/w.c54
1 files changed, 27 insertions, 27 deletions
diff --git a/usr.bin/w/w.c b/usr.bin/w/w.c
index 28d892ed67b..b6c6e22c86a 100644
--- a/usr.bin/w/w.c
+++ b/usr.bin/w/w.c
@@ -1,4 +1,4 @@
-/* $NetBSD: w.c,v 1.84 2018/10/30 21:15:09 kre Exp $ */
+/* $NetBSD: w.c,v 1.84.2.1 2020/06/30 18:48:00 martin Exp $ */
/*-
* Copyright (c) 1980, 1991, 1993, 1994
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1991, 1993, 1994\
#if 0
static char sccsid[] = "@(#)w.c 8.6 (Berkeley) 6/30/94";
#else
-__RCSID("$NetBSD: w.c,v 1.84 2018/10/30 21:15:09 kre Exp $");
+__RCSID("$NetBSD: w.c,v 1.84.2.1 2020/06/30 18:48:00 martin Exp $");
#endif
#endif /* not lint */
@@ -205,6 +205,18 @@ main(int argc, char **argv)
curtain = 0;
}
+ if (!nflag) {
+ int rv;
+ char *p;
+
+ rv = gethostname(domain, sizeof(domain));
+ domain[sizeof(domain) - 1] = '\0';
+ if (rv < 0 || (p = strchr(domain, '.')) == 0)
+ domain[0] = '\0';
+ else
+ memmove(domain, p, strlen(p) + 1);
+ }
+
#ifdef SUPPORT_UTMPX
setutxent();
#endif
@@ -388,18 +400,6 @@ main(int argc, char **argv)
}
#endif
- if (!nflag) {
- int rv;
- char *p;
-
- rv = gethostname(domain, sizeof(domain));
- domain[sizeof(domain) - 1] = '\0';
- if (rv < 0 || (p = strchr(domain, '.')) == 0)
- domain[0] = '\0';
- else
- memmove(domain, p, strlen(p) + 1);
- }
-
for (ep = ehead; ep != NULL; ep = ep->next) {
if (ep->tp != NULL)
kp = ep->tp;
@@ -652,23 +652,23 @@ fixhost(struct entry *ep)
int af = m ? AF_INET6 : AF_INET;
size_t alen = m ? sizeof(l.l6) : sizeof(l.l4);
if (!nflag && inet_pton(af, p, &l) &&
- (hp = gethostbyaddr((char *)&l, alen, af))) {
- if (domain[0] != '\0') {
- p = hp->h_name;
- p += strlen(hp->h_name);
- p -= strlen(domain);
- if (p > hp->h_name &&
- strcasecmp(p, domain) == 0)
- *p = '\0';
- }
- p = hp->h_name;
+ (hp = gethostbyaddr((char *)&l, alen, af)))
+ strlcpy(host_buf, hp->h_name, sizeof(host_buf));
+
+ if (domain[0] != '\0') {
+ p = host_buf;
+ p += strlen(host_buf);
+ p -= strlen(domain);
+ if (p > host_buf &&
+ strcasecmp(p, domain) == 0)
+ *p = '\0';
}
if (x)
- (void)snprintf(ep->host, sizeof(ep->host), "%s:%s", p, x);
+ (void)snprintf(ep->host, sizeof(ep->host), "%s:%s", host_buf,
+ x);
else
-
- strlcpy(ep->host, p, sizeof(ep->host));
+ strlcpy(ep->host, host_buf, sizeof(ep->host));
}
static void