svn commit: r291328 - head/usr.sbin/syslogd

[Kurt Lidl]

Author: lidl
Date: Wed Nov 25 20:01:11 2015
New Revision: 291328
URL: https://svnweb.freebsd.org/changeset/base/291328

Log:
  Have syslogd honor 'mesg' status when logging to users.
  
  PR:		bin/196742
  Submitted by:	jef at mail acme com
  Approved by:	rpaulo (mentor)
  Differential Revision:	https://reviews.freebsd.org/D4270

Modified:
  head/usr.sbin/syslogd/syslogd.c

Modified: head/usr.sbin/syslogd/syslogd.c
==============================================================================
--- head/usr.sbin/syslogd/syslogd.c	Wed Nov 25 19:49:55 2015	(r291327)
+++ head/usr.sbin/syslogd/syslogd.c	Wed Nov 25 20:01:11 2015	(r291328)
@@ -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 *i
 			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 *i
 	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)
 {