From owner-svn-src-all@freebsd.org Thu Dec 10 23:23:43 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 504804BBF31; Thu, 10 Dec 2020 23:23:43 +0000 (UTC) (envelope-from jmg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CsVNH1qnMz4Trc; Thu, 10 Dec 2020 23:23:43 +0000 (UTC) (envelope-from jmg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 31AE020DF4; Thu, 10 Dec 2020 23:23:43 +0000 (UTC) (envelope-from jmg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0BANNhB8040339; Thu, 10 Dec 2020 23:23:43 GMT (envelope-from jmg@FreeBSD.org) Received: (from jmg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0BANNgN3040338; Thu, 10 Dec 2020 23:23:42 GMT (envelope-from jmg@FreeBSD.org) Message-Id: <202012102323.0BANNgN3040338@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jmg set sender to jmg@FreeBSD.org using -f From: John-Mark Gurney Date: Thu, 10 Dec 2020 23:23:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r368529 - head/usr.sbin/syslogd X-SVN-Group: head X-SVN-Commit-Author: jmg X-SVN-Commit-Paths: head/usr.sbin/syslogd X-SVN-Commit-Revision: 368529 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Dec 2020 23:23:43 -0000 Author: jmg Date: Thu Dec 10 23:23:42 2020 New Revision: 368529 URL: https://svnweb.freebsd.org/changeset/base/368529 Log: fix up documentation/comments: processname is not defined, but programname is.. a couple other minor documentation fixes that igor caught... MFC after: 1 week Modified: head/usr.sbin/syslogd/syslog.conf.5 head/usr.sbin/syslogd/syslogd.c Modified: head/usr.sbin/syslogd/syslog.conf.5 ============================================================================== --- head/usr.sbin/syslogd/syslog.conf.5 Thu Dec 10 22:26:51 2020 (r368528) +++ head/usr.sbin/syslogd/syslog.conf.5 Thu Dec 10 23:23:42 2020 (r368529) @@ -28,7 +28,7 @@ .\" @(#)syslog.conf.5 8.1 (Berkeley) 6/9/93 .\" $FreeBSD$ .\" -.Dd March 26, 2020 +.Dd December 10, 2020 .Dt SYSLOG.CONF 5 .Os .Sh NAME @@ -73,7 +73,7 @@ Note that if you use spaces as separators, your .Nm might be incompatible with other Unices or Unix-like systems. This functionality was added for ease of configuration -(e.g.\& it is possible to cut-and-paste into +(e.g.,\& it is possible to cut-and-paste into .Nm ) , and to avoid possible mistakes. This change however preserves @@ -547,11 +547,11 @@ A configuration file might appear as follows: # Log all kernel messages, authentication messages of # level notice or higher, and anything of level err or # higher to the console. -# Don't log private authentication messages! +# Do not log private authentication messages! *.err;kern.*;auth.notice;authpriv.none;mail.crit /dev/console # Log anything (except mail) of level info or higher. -# Don't log private authentication messages! +# Do not log private authentication messages! *.info;mail.none;authpriv.none /var/log/messages # Log daemon messages at debug level only @@ -600,7 +600,7 @@ console.* /var/log/console.log !* # Log messages from bird or bird6 into one file -:processname, regex, "^bird6?$" +:programname, regex, "^bird6?$" *.* /var/log/bird-all.log # Log messages from servers in racks 10-19 in multiple locations, case insensitive Modified: head/usr.sbin/syslogd/syslogd.c ============================================================================== --- head/usr.sbin/syslogd/syslogd.c Thu Dec 10 22:26:51 2020 (r368528) +++ head/usr.sbin/syslogd/syslogd.c Thu Dec 10 23:23:42 2020 (r368529) @@ -2761,7 +2761,7 @@ prop_filter_compile(struct prop_filter *pfilter, char /* * Here's some filter examples mentioned in syslog.conf(5) * 'msg, contains, ".*Deny.*"' - * 'processname, regex, "^bird6?$"' + * 'programname, regex, "^bird6?$"' * 'hostname, icase_ereregex, "^server-(dcA|podB)-rack1[0-9]{2}\\..*"' */