Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

log to both syslog and stderr.

This commit is contained in:
christos 2011-09-17 01:50:54 +00:00
parent 3145fd5cc6
commit 8017e7237a
2 changed files with 55 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libexec/utmp_update/Makefile
View File

@ -1,8 +1,10 @@
# $NetBSD: Makefile,v 1.3 2002/12/16 22:45:15 wiz Exp $ # $NetBSD: Makefile,v 1.4 2011/09/17 01:50:54 christos Exp $
PROG= utmp_update PROG= utmp_update
MAN= utmp_update.8 MAN= utmp_update.8
BINOWN= root BINOWN= root
BINMODE=4555 BINMODE=4555
COPTS.utmp_update.c += -Wno-format-nonliteral
.include <bsd.prog.mk> .include <bsd.prog.mk>

76
libexec/utmp_update/utmp_update.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: utmp_update.c,v 1.9 2009/04/13 03:38:15 christos Exp $ */ /* $NetBSD: utmp_update.c,v 1.10 2011/09/17 01:50:54 christos Exp $ */
/*- /*-
* Copyright (c) 2002 The NetBSD Foundation, Inc. * Copyright (c) 2002 The NetBSD Foundation, Inc.
@ -30,7 +30,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__RCSID("$NetBSD: utmp_update.c,v 1.9 2009/04/13 03:38:15 christos Exp $"); __RCSID("$NetBSD: utmp_update.c,v 1.10 2011/09/17 01:50:54 christos Exp $");
#include <sys/types.h> #include <sys/types.h>
#include <sys/param.h> #include <sys/param.h>
@ -46,8 +46,28 @@ __RCSID("$NetBSD: utmp_update.c,v 1.9 2009/04/13 03:38:15 christos Exp $");
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#include <paths.h> #include <paths.h>
#include <stdarg.h>
#include <errno.h>
#include <syslog.h>
int main(int, char *[]); static __dead void
logerr(int e, const char *fmt, ...)
{
va_list sap, eap;
char *s = NULL;
if (e)
(void)asprintf(&s, "%s (%s)", fmt, strerror(e));
if (s)
fmt = s;
va_start(sap, fmt);
va_copy(eap, sap);
vsyslog(LOG_ERR, fmt, sap);
va_end(sap);
errx(1, fmt, eap);
va_end(eap);
}
int int
main(int argc, char *argv[]) main(int argc, char *argv[])
@ -63,42 +83,45 @@ main(int argc, char *argv[])
euid = geteuid(); euid = geteuid();
ruid = getuid(); ruid = getuid();
if (seteuid(ruid) == -1)
err(1, "seteuid");
if (argc != 2) { if (argc != 2) {
(void)fprintf(stderr, "Usage: %s <vis-utmpx-entry>\n", (void)fprintf(stderr, "Usage: %s <vis-utmpx-entry>\n",
getprogname()); getprogname());
exit(1); return 1;
} }
openlog(getprogname(), LOG_PID | LOG_NDELAY, LOG_AUTH);
if (seteuid(ruid) == -1)
logerr(errno, "Can't setuid %ld", (long)ruid);
len = strlen(argv[1]); len = strlen(argv[1]);
if (len > sizeof(*utx) * 4 + 1 || len < sizeof(*utx)) if (len > sizeof(*utx) * 4 + 1 || len < sizeof(*utx))
errx(1, "Bad argument"); logerr(0, "Bad argument size %zu", len);
if ((utx = malloc(len)) == NULL) if ((utx = malloc(len)) == NULL)
err(1, NULL); logerr(errno, "Can't allocate %zu", len);
res = strunvis((char *)utx, argv[1]); res = strunvis((char *)utx, argv[1]);
if (res != (int)sizeof(*utx)) if (res != (int)sizeof(*utx))
errx(1, "Decoding error %s %d != %zu", argv[1], res, sizeof(*utx)); logerr(0, "Decoding error %s %d != %zu", argv[1], res,
sizeof(*utx));
switch (utx->ut_type) { switch (utx->ut_type) {
case USER_PROCESS: case USER_PROCESS:
case DEAD_PROCESS: case DEAD_PROCESS:
break; break;
default: default:
errx(1, "Invalid utmpx type %d", (int)utx->ut_type); logerr(0, "Invalid utmpx type %d", (int)utx->ut_type);
} }
if (ruid != 0) { if (ruid != 0) {
if ((pwd = getpwuid(ruid)) == NULL) if ((pwd = getpwuid(ruid)) == NULL)
errx(1, "User %lu does not exist in password database", logerr(0, "User %ld does not exist in password"
(long)ruid); " database", (long)ruid);
if (strcmp(pwd->pw_name, utx->ut_name) != 0) if (strcmp(pwd->pw_name, utx->ut_name) != 0)
errx(1, "Current user `%s' does not match " logerr(0, "Current user `%s' does not match "
"`%s' in utmpx entry", pwd->pw_name, utx->ut_name); "`%s' in utmpx entry", pwd->pw_name, utx->ut_name);
} }
@ -106,34 +129,39 @@ main(int argc, char *argv[])
fd = open(tty, O_RDONLY|O_NONBLOCK, 0); fd = open(tty, O_RDONLY|O_NONBLOCK, 0);
if (fd != -1) { if (fd != -1) {
if (fstat(fd, &st) == -1) if (fstat(fd, &st) == -1)
err(1, "Cannot stat `%s'", tty); logerr(errno, "Cannot stat `%s'", tty);
if (ruid != 0 && st.st_uid != ruid) if (ruid != 0 && st.st_uid != ruid)
errx(1, "%s: Is not owned by you", tty); logerr(0, "%s: Is not owned by you", tty);
if (!isatty(fd)) if (!isatty(fd))
errx(1, "%s: Not a tty device", tty); logerr(0, "%s: Not a tty device", tty);
(void)close(fd); (void)close(fd);
if (access(tty, W_OK|R_OK) == -1) if (access(tty, W_OK|R_OK) == -1)
err(1, "%s", tty); logerr(errno, "Can't access `%s'", tty);
} else { } else {
struct utmpx utold, *utoldp; struct utmpx utold, *utoldp;
pid_t ppid;
/* /*
* A daemon like ftpd that does not use a tty line? * A daemon like ftpd that does not use a tty line?
* We only allow it to kill its own existing entries * We only allow it to kill its own existing entries
*/ */
if (utx->ut_type != DEAD_PROCESS) if (utx->ut_type != DEAD_PROCESS)
err(1, "Cannot open `%s'", tty); logerr(errno, "Cannot open `%s'", tty);
(void)memcpy(utold.ut_line, utx->ut_line, sizeof(utx->ut_line)); (void)memcpy(utold.ut_line, utx->ut_line, sizeof(utx->ut_line));
if ((utoldp = getutxline(&utold)) == NULL) if ((utoldp = getutxline(&utold)) == NULL)
err(1, "Cannot find existing entry for `%s'", logerr(0, "Cannot find existing entry for `%s'",
utx->ut_line); utx->ut_line);
if (utoldp->ut_pid != getppid()) if (utoldp->ut_pid != (ppid = getppid()))
err(1, "Cannot modify entry for `%s'", tty); logerr(0, "Cannot modify entry for `%s' "
"utmp pid %ld != parent %ld", tty,
(long)utoldp->ut_pid, (long)ppid);
} }
(void)seteuid(euid); if (seteuid(euid) == 1)
logerr(errno, "Can't setuid %ld", (long)euid);
if (pututxline(utx) == NULL) if (pututxline(utx) == NULL)
err(1, "Cannot update utmp entry"); logerr(errno, "Cannot update utmp entry");
return 0; return 0;
} }