syslogd: Drop -r flag, to be replaced with BSD -s (secure) flag

Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
This commit is contained in:
Joachim Nilsson 2019-11-12 09:19:54 +01:00
parent c66411e8c2
commit a4c1acbca8
2 changed files with 3 additions and 21 deletions

View File

@ -13,7 +13,7 @@
.Nd System Log Daemon .Nd System Log Daemon
.Sh SYNOPSIS .Sh SYNOPSIS
.Nm .Nm
.Op Fl ?46Adhnrv .Op Fl ?46Adhnv
.Op Fl b Ar :SVC .Op Fl b Ar :SVC
.Op Fl f Ar FILE .Op Fl f Ar FILE
.Op Fl l Ar HOST[:HOST] .Op Fl l Ar HOST[:HOST]
@ -178,15 +178,6 @@ The size argument takes optional modifiers; k, M, G. E.g., 100M is
The optional number of files kept include both gzipped files and the The optional number of files kept include both gzipped files and the
first rotated (not zipped) file. The default for this, when omitted, first rotated (not zipped) file. The default for this, when omitted,
is 5. is 5.
.It Fl r
This option enables support for receiving syslog messages over the
network using an internet domain socket with the
.Ql syslog
(514/udp) service, see
.Xr services 5 .
The default is to not listen for incoming network connections. Use the
.Fl b
option to override the default listening port.
.It Fl s NAME .It Fl s NAME
Specify domain name(s) to be stripped off before logging. Multiple Specify domain name(s) to be stripped off before logging. Multiple
domains may be specified using the colon (':') separator. Note, no domains may be specified using the colon (':') separator. Note, no
@ -300,11 +291,6 @@ to another node running
.Nm .Nm
where they will be actually logged to a disk file. where they will be actually logged to a disk file.
.Pp .Pp
This feature is enabled using the
.Fl r
option on the command line. The default behavior to not listen to
network connections.
.Pp
The strategy is to have syslogd listen on a UNIX domain socket for The strategy is to have syslogd listen on a UNIX domain socket for
locally generated log messages. This behavior will allow syslogd to locally generated log messages. This behavior will allow syslogd to
inter-operate with the syslog found in the standard C library. At the inter-operate with the syslog found in the standard C library. At the

View File

@ -141,7 +141,7 @@ static int KeepKernFac; /* Keep remotely logged kernel facility */
static int LastAlarm = 0; /* last value passed to alarm() (seconds) */ static int LastAlarm = 0; /* last value passed to alarm() (seconds) */
static int DupesPending = 0; /* Number of unflushed duplicate messages */ static int DupesPending = 0; /* Number of unflushed duplicate messages */
static int AcceptRemote = 0; /* receive messages that come via UDP */ static int AcceptRemote = 1; /* receive messages that come via UDP */
static char **StripDomains = NULL; /* these domains may be stripped before writing logs */ static char **StripDomains = NULL; /* these domains may be stripped before writing logs */
static char **LocalHosts = NULL; /* these hosts are logged with their hostname */ static char **LocalHosts = NULL; /* these hosts are logged with their hostname */
static int NoHops = 1; /* Can we bounce syslog messages through an intermediate host. */ static int NoHops = 1; /* Can we bounce syslog messages through an intermediate host. */
@ -242,7 +242,7 @@ int main(int argc, char *argv[])
KeepKernFac = 1; KeepKernFac = 1;
#endif #endif
while ((ch = getopt(argc, argv, "46Ab:dhHf:l:m:nP:p:R:rs:v?")) != EOF) { while ((ch = getopt(argc, argv, "46Ab:dhHf:l:m:nP:p:R:s:v?")) != EOF) {
switch ((char)ch) { switch ((char)ch) {
case '4': case '4':
family = PF_INET; family = PF_INET;
@ -309,10 +309,6 @@ int main(int argc, char *argv[])
parse_rotation(optarg, &RotateSz, &RotateCnt); parse_rotation(optarg, &RotateSz, &RotateCnt);
break; break;
case 'r': /* accept remote messages */
AcceptRemote = 1;
break;
case 's': case 's':
if (StripDomains) { if (StripDomains) {
fprintf(stderr, "Only one -s argument allowed," fprintf(stderr, "Only one -s argument allowed,"