mischief/openbsd-src
1
0
Fork 0
mirror of https://github.com/openbsd/src.git synced 2024-12-22 16:42:56 -08:00
Code

use warnx and not logerror in monitor, logerror is for the slave;

Browse Source 
ok henning@ while in lock
This commit is contained in:
djm 2007-03-15 05:18:32 +00:00
parent 63dc3a22d6
commit 19f1151807
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
usr.sbin/syslogd/privsep.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: privsep.c,v 1.29 2007/02/20 11:24:32 henning Exp $ */
/* $OpenBSD: privsep.c,v 1.30 2007/03/15 05:18:32 djm Exp $ */
/*
* Copyright (c) 2003 Anil Madhavapeddy <anil@recoil.org>
@ -395,24 +395,24 @@ open_pipe(char *cmd)
argp[2] = cmd;
if (socketpair(AF_UNIX, SOCK_STREAM, PF_UNSPEC, fd) == -1) {
logerror("open_pipe");
warnx("open_pipe");
return (-1);
}
/* make the fd on syslogd's side nonblocking */
if ((flags = fcntl(fd[1], F_GETFL, 0)) == -1) {
logerror("fcntl");
warnx("fcntl");
return (-1);
}
flags |= O_NONBLOCK;
if ((flags = fcntl(fd[1], F_SETFL, flags)) == -1) {
logerror("fcntl");
warnx("fcntl");
return (-1);
}
switch (pid = fork()) {
case -1:
logerror("fork error");
warnx("fork error");
return (-1);
case 0:
break;
@ -441,6 +441,8 @@ open_pipe(char *cmd)
err(1, "dup2 failed");
if (execv("/bin/sh", argp) == -1)
err(1, "execv %s", cmd);
/* NOTREACHED */
return (-1);
}
/* Check that the terminal device is ok, and if not, rewrite to /dev/null.