Re: svn commit: r335059 - in stable/11: usr.bin/wall usr.sbin/syslogd
> Hi Rodney, > > 2018-06-13 15:57 GMT+02:00 Rodney W. Grimes : > >> Modified: > >> stable/11/usr.bin/wall/ttymsg.c > >> stable/11/usr.bin/wall/ttymsg.h > > > > I see no mention of any changes to wall in the commit, > > was this intentional? The changes don't seem to be > > related to syslogd directly. > > Good question. syslogd(8) reuses some code from wall(8) to write > syslog messages to terminals if configured to do so. In one of the RFC > 5424 support commits, I had to adjust this shared code slightly > (increase a limit). As the changes to wall(8) were committed together > with the syslogd(8) changes, I also had to merge them back in one go. > > In other words, this is intentional. :-) Thank you for the details. -- Rod Grimes rgri...@freebsd.org ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r335059 - in stable/11: usr.bin/wall usr.sbin/syslogd
Hi Rodney, 2018-06-13 15:57 GMT+02:00 Rodney W. Grimes : >> Modified: >> stable/11/usr.bin/wall/ttymsg.c >> stable/11/usr.bin/wall/ttymsg.h > > I see no mention of any changes to wall in the commit, > was this intentional? The changes don't seem to be > related to syslogd directly. Good question. syslogd(8) reuses some code from wall(8) to write syslog messages to terminals if configured to do so. In one of the RFC 5424 support commits, I had to adjust this shared code slightly (increase a limit). As the changes to wall(8) were committed together with the syslogd(8) changes, I also had to merge them back in one go. In other words, this is intentional. :-) -- Ed Schouten Nuxi, 's-Hertogenbosch, the Netherlands ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r335059 - in stable/11: usr.bin/wall usr.sbin/syslogd
> Author: ed
> Date: Wed Jun 13 13:41:23 2018
> New Revision: 335059
> URL: https://svnweb.freebsd.org/changeset/base/335059
>
> Log:
> MFC r309925, r309931, r309933, r310035, r310278, r310310, r310311,
> r310323, r310349, r310350, r310351, r310352, r310383, r310384,
> r310385, r310386, r310393, r310453, r310456, r310494, r310504,
> r310528, r310890, r310893, r310974, r311918, r312921, r313357,
> r314563, r314585, r314642, r315322, r315618, r315620, r315622,
> r315643, r316951, r316973, r326338, r326339, r326573, r331270,
> r332099, r332110, r332111, r332118, r332165, r332510 and r332511.
>
> This commit brings syslogd(8) in sync with the copy in HEAD. The key
> improvement of this change is that it adds support for RFC 5424 log
> ingestion and exposition (enabled by passing in -O rfc5424). This allows
> for saner logging in environments with multiple time zones.
>
> The list of changes to merge back were obtained by running:
>
> svn mergeinfo --show-revs eligible \
> ^/head/usr.sbin/syslogd ^/stable/11/usr.sbin/syslogd
>
> Of the commits listed, r314436, r325188 and r326025 were excluded, as
> they affect a significant number of unrelated files (SPDX and 4-clause
> license renumbering). Due to the large number of directly committed
Thank you very much for avoiding the SPDX area! I have pending
clean up in stable/11 around those.
> changes on this branch, I had no choice but to perform the merge as
> follows:
>
> svn merge --accept=theirs-full -c ^/head .
>
> This would, however, cause some unrelated changes, such as undoing the
> r56 (MFC of r332877) and still adding the SPDX tag to syslogd.c.
> These have been reverted manually.
>
> Requested by: Dave Cottlehuber
> Thanks to: dim@ for sharing his insight on hackers@
>
> Modified:
> stable/11/usr.bin/wall/ttymsg.c
> stable/11/usr.bin/wall/ttymsg.h
I see no mention of any changes to wall in the commit,
was this intentional? The changes don't seem to be
related to syslogd directly.
> stable/11/usr.sbin/syslogd/Makefile
> stable/11/usr.sbin/syslogd/syslogd.8
> stable/11/usr.sbin/syslogd/syslogd.c
> Directory Properties:
> stable/11/ (props changed)
>
> Modified: stable/11/usr.bin/wall/ttymsg.c
> ==
> --- stable/11/usr.bin/wall/ttymsg.c Wed Jun 13 13:15:04 2018
> (r335058)
> +++ stable/11/usr.bin/wall/ttymsg.c Wed Jun 13 13:41:23 2018
> (r335059)
> @@ -59,7 +59,7 @@ static const char sccsid[] = "@(#)ttymsg.c 8.2 (Berkel
> const char *
> ttymsg(struct iovec *iov, int iovcnt, const char *line, int tmout)
> {
> - struct iovec localiov[7];
> + struct iovec localiov[TTYMSG_IOV_MAX];
> ssize_t left, wret;
> int cnt, fd;
> char device[MAXNAMLEN] = _PATH_DEV;
>
> Modified: stable/11/usr.bin/wall/ttymsg.h
> ==
> --- stable/11/usr.bin/wall/ttymsg.h Wed Jun 13 13:15:04 2018
> (r335058)
> +++ stable/11/usr.bin/wall/ttymsg.h Wed Jun 13 13:41:23 2018
> (r335059)
> @@ -1,3 +1,5 @@
> /* $FreeBSD$ */
>
> +#define TTYMSG_IOV_MAX 32
> +
> const char *ttymsg(struct iovec *, int, const char *, int);
>
> Modified: stable/11/usr.sbin/syslogd/Makefile
> ==
> --- stable/11/usr.sbin/syslogd/Makefile Wed Jun 13 13:15:04 2018
> (r335058)
> +++ stable/11/usr.sbin/syslogd/Makefile Wed Jun 13 13:41:23 2018
> (r335059)
> @@ -11,8 +11,9 @@ SRCS= syslogd.c ttymsg.c
>
> LIBADD= util
>
> -WARNS?= 3
> -
> +.if ${MK_INET_SUPPORT} != "no"
> +CFLAGS+= -DINET
> +.endif
> .if ${MK_INET6_SUPPORT} != "no"
> CFLAGS+= -DINET6
> .endif
>
> Modified: stable/11/usr.sbin/syslogd/syslogd.8
> ==
> --- stable/11/usr.sbin/syslogd/syslogd.8 Wed Jun 13 13:15:04 2018
> (r335058)
> +++ stable/11/usr.sbin/syslogd/syslogd.8 Wed Jun 13 13:41:23 2018
> (r335059)
> @@ -28,7 +28,7 @@
> .\" @(#)syslogd.88.1 (Berkeley) 6/6/93
> .\" $FreeBSD$
> .\"
> -.Dd June 16, 2015
> +.Dd April 15, 2018
> .Dt SYSLOGD 8
> .Os
> .Sh NAME
> @@ -36,18 +36,22 @@
> .Nd log systems messages
> .Sh SYNOPSIS
> .Nm
> -.Op Fl 468ACcdFkNnosTuv
> +.Op Fl 468ACcdFHkNnosTuv
> .Op Fl a Ar allowed_peer
> .Op Fl b Ar bind_address
> .Op Fl f Ar config_file
> -.Op Fl l Oo Ar mode : Oc Ns Ar path
> +.Op Fl l Oo Ar mode Ns \&: Oc Ns Ar path
> .Op Fl m Ar mark_interval
> +.Op Fl O Ar format
> .Op Fl P Ar pid_file
> .Op Fl p Ar log_socket
> +.Op Fl S Ar logpriv_socket
> .Sh DESCRIPTION
> The
> .Nm
> -utility reads and logs messages to the system console, log files, other
> +utility reads and logs messages to the system console,
> +log
svn commit: r335059 - in stable/11: usr.bin/wall usr.sbin/syslogd
Author: ed
Date: Wed Jun 13 13:41:23 2018
New Revision: 335059
URL: https://svnweb.freebsd.org/changeset/base/335059
Log:
MFC r309925, r309931, r309933, r310035, r310278, r310310, r310311,
r310323, r310349, r310350, r310351, r310352, r310383, r310384,
r310385, r310386, r310393, r310453, r310456, r310494, r310504,
r310528, r310890, r310893, r310974, r311918, r312921, r313357,
r314563, r314585, r314642, r315322, r315618, r315620, r315622,
r315643, r316951, r316973, r326338, r326339, r326573, r331270,
r332099, r332110, r332111, r332118, r332165, r332510 and r332511.
This commit brings syslogd(8) in sync with the copy in HEAD. The key
improvement of this change is that it adds support for RFC 5424 log
ingestion and exposition (enabled by passing in -O rfc5424). This allows
for saner logging in environments with multiple time zones.
The list of changes to merge back were obtained by running:
svn mergeinfo --show-revs eligible \
^/head/usr.sbin/syslogd ^/stable/11/usr.sbin/syslogd
Of the commits listed, r314436, r325188 and r326025 were excluded, as
they affect a significant number of unrelated files (SPDX and 4-clause
license renumbering). Due to the large number of directly committed
changes on this branch, I had no choice but to perform the merge as
follows:
svn merge --accept=theirs-full -c ^/head .
This would, however, cause some unrelated changes, such as undoing the
r56 (MFC of r332877) and still adding the SPDX tag to syslogd.c.
These have been reverted manually.
Requested by: Dave Cottlehuber
Thanks to:dim@ for sharing his insight on hackers@
Modified:
stable/11/usr.bin/wall/ttymsg.c
stable/11/usr.bin/wall/ttymsg.h
stable/11/usr.sbin/syslogd/Makefile
stable/11/usr.sbin/syslogd/syslogd.8
stable/11/usr.sbin/syslogd/syslogd.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/usr.bin/wall/ttymsg.c
==
--- stable/11/usr.bin/wall/ttymsg.c Wed Jun 13 13:15:04 2018
(r335058)
+++ stable/11/usr.bin/wall/ttymsg.c Wed Jun 13 13:41:23 2018
(r335059)
@@ -59,7 +59,7 @@ static const char sccsid[] = "@(#)ttymsg.c8.2 (Berkel
const char *
ttymsg(struct iovec *iov, int iovcnt, const char *line, int tmout)
{
- struct iovec localiov[7];
+ struct iovec localiov[TTYMSG_IOV_MAX];
ssize_t left, wret;
int cnt, fd;
char device[MAXNAMLEN] = _PATH_DEV;
Modified: stable/11/usr.bin/wall/ttymsg.h
==
--- stable/11/usr.bin/wall/ttymsg.h Wed Jun 13 13:15:04 2018
(r335058)
+++ stable/11/usr.bin/wall/ttymsg.h Wed Jun 13 13:41:23 2018
(r335059)
@@ -1,3 +1,5 @@
/* $FreeBSD$ */
+#defineTTYMSG_IOV_MAX 32
+
const char *ttymsg(struct iovec *, int, const char *, int);
Modified: stable/11/usr.sbin/syslogd/Makefile
==
--- stable/11/usr.sbin/syslogd/Makefile Wed Jun 13 13:15:04 2018
(r335058)
+++ stable/11/usr.sbin/syslogd/Makefile Wed Jun 13 13:41:23 2018
(r335059)
@@ -11,8 +11,9 @@ SRCS= syslogd.c ttymsg.c
LIBADD=util
-WARNS?= 3
-
+.if ${MK_INET_SUPPORT} != "no"
+CFLAGS+= -DINET
+.endif
.if ${MK_INET6_SUPPORT} != "no"
CFLAGS+= -DINET6
.endif
Modified: stable/11/usr.sbin/syslogd/syslogd.8
==
--- stable/11/usr.sbin/syslogd/syslogd.8Wed Jun 13 13:15:04 2018
(r335058)
+++ stable/11/usr.sbin/syslogd/syslogd.8Wed Jun 13 13:41:23 2018
(r335059)
@@ -28,7 +28,7 @@
.\" @(#)syslogd.8 8.1 (Berkeley) 6/6/93
.\" $FreeBSD$
.\"
-.Dd June 16, 2015
+.Dd April 15, 2018
.Dt SYSLOGD 8
.Os
.Sh NAME
@@ -36,18 +36,22 @@
.Nd log systems messages
.Sh SYNOPSIS
.Nm
-.Op Fl 468ACcdFkNnosTuv
+.Op Fl 468ACcdFHkNnosTuv
.Op Fl a Ar allowed_peer
.Op Fl b Ar bind_address
.Op Fl f Ar config_file
-.Op Fl l Oo Ar mode : Oc Ns Ar path
+.Op Fl l Oo Ar mode Ns \&: Oc Ns Ar path
.Op Fl m Ar mark_interval
+.Op Fl O Ar format
.Op Fl P Ar pid_file
.Op Fl p Ar log_socket
+.Op Fl S Ar logpriv_socket
.Sh DESCRIPTION
The
.Nm
-utility reads and logs messages to the system console, log files, other
+utility reads and logs messages to the system console,
+log files,
+other
machines and/or users as specified by its configuration file.
.Pp
The options are as follows:
@@ -63,7 +67,8 @@ to use IPv6 addresses only.
.It Fl 8
Tells
.Nm
-not to interfere with 8-bit data. Normally
+not to interfere with 8-bit data.
+Normally
.Nm
will replace C1 control characters
.Pq ISO 8859 and Unicode characters
@@ -98,21 +103,23 @@ options may be specified.
The
.Ar allowed_peer
option may be any of the following:
-.Bl -tag -width "ipaddr/masklen[:service]XX"
+.Bl
