d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Have syslogd honor 'mesg' status when logging to users.

Browse Source 
PR:		bin/196742
Submitted by:	jef at mail acme com
Approved by:	rpaulo (mentor)
Differential Revision:	https://reviews.freebsd.org/D4270
This commit is contained in:
Kurt Lidl 2015-11-25 20:01:11 +00:00
parent ebf076dfa5
commit 247027652e
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=291328
1 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
usr.sbin/syslogd/syslogd.c
View File

@ -341,6 +341,7 @@ static void printsys(char *);
static int p_open(const char *, pid_t *);
static void readklog(void);
static void reapchild(int);
static const char *ttymsg_check(struct iovec *, int, char *, int);
static void usage(void);
static int validate(struct sockaddr *, const char *);
static void unmapped(struct sockaddr *);
@ -1425,7 +1426,7 @@ wallmsg(struct filed *f, struct iovec *iov, const int iovlen)
if (!f->f_un.f_uname[i][0])
break;
if (!strcmp(f->f_un.f_uname[i], ut->ut_user)) {
if ((p = ttymsg(iov, iovlen, ut->ut_line,
if ((p = ttymsg_check(iov, iovlen, ut->ut_line,
TTYMSGTIME)) != NULL) {
errno = 0; /* already in msg */
logerror(p);
@ -1438,6 +1439,29 @@ wallmsg(struct filed *f, struct iovec *iov, const int iovlen)
reenter = 0;
}
/*
* Wrapper routine for ttymsg() that checks the terminal for messages enabled.
*/
static const char *
ttymsg_check(struct iovec *iov, int iovcnt, char *line, int tmout)
{
static char device[1024];
static char errbuf[1024];
struct stat sb;
(void) snprintf(device, sizeof(device), "%s%s", _PATH_DEV, line);
if (stat(device, &sb) < 0) {
(void) snprintf(errbuf, sizeof(errbuf),
"%s: %s", device, strerror(errno));
return (errbuf);
}
if ((sb.st_mode & S_IWGRP) == 0)
/* Messages disabled. */
return (NULL);
return ttymsg(iov, iovcnt, line, tmout);
}
static void
reapchild(int signo __unused)
{