diff options
| author |   millert <millert@openbsd.org> | 2015-07-06 15:42:20 +0000 |
|---|---|---|
| committer | millert <millert@openbsd.org> | 2015-07-06 15:42:20 +0000 |
| commit | fcc8672b35869d332f106bc98ef89d039e8f6f69 (patch) | |
| tree | c5ed70f3c367717e0f7155217c1fbaa4642adf38 | |
| parent | Add support for IPv6 by using getaddrinfo(). Our inetd.conf ships (diff) | |
| download | wireguard-openbsd-fcc8672b35869d332f106bc98ef89d039e8f6f69.tar.xz wireguard-openbsd-fcc8672b35869d332f106bc98ef89d039e8f6f69.zip | |
Trim trailing whitespace from the comsat message before calling
strtonum() to parse the offset since mail.local writes a trailing
newline. Otherwise comsat just discards the message. OK deraadt@
| -rw-r--r-- | libexec/comsat/comsat.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/libexec/comsat/comsat.c b/libexec/comsat/comsat.c index 855221b756c..d83b18b6432 100644 --- a/libexec/comsat/comsat.c +++ b/libexec/comsat/comsat.c @@ -1,4 +1,4 @@ -/* $OpenBSD: comsat.c,v 1.39 2015/04/18 18:28:37 deraadt Exp $ */ +/* $OpenBSD: comsat.c,v 1.40 2015/07/06 15:42:20 millert Exp $ */ /* * Copyright (c) 1980, 1993 @@ -191,6 +191,7 @@ doreadutmp(void) } (void)lseek(uf, 0, SEEK_SET); nutmp = read(uf, utmp, statbf.st_size)/sizeof(struct utmp); + dsyslog(LOG_DEBUG, "read %d utmp entries", nutmp); } (void)alarm(15); } @@ -204,15 +205,20 @@ mailfor(char *name) char *cp; off_t offset; + dsyslog(LOG_DEBUG, "mail for '%s'", name); if (!(cp = strchr(name, '@'))) return; - *cp = '\0'; - offset = strtonum(cp + 1, 0, LLONG_MAX, &errstr); - if (errstr) + *cp++ = '\0'; + cp[strcspn(cp, " \t\n")] = '\0'; + offset = strtonum(cp, 0, LLONG_MAX, &errstr); + if (errstr) { + syslog(LOG_ERR, "'%s' is %s", cp + 1, errstr); return; + } while (--utp >= utmp) { memcpy(utname, utp->ut_name, UT_NAMESIZE); utname[UT_NAMESIZE] = '\0'; + dsyslog(LOG_DEBUG, "check %s against %s", name, utname); if (!strncmp(utname, name, UT_NAMESIZE)) notify(utp, offset); } |