diff --git a/ChangeLog.md b/ChangeLog.md index efa2bfd..149b99b 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -29,9 +29,10 @@ and a replacement for `syslog.h` to enable new features in RFC5424. RFC5424 features like MsgID or structured data - Incompatible changes to command line options for `syslogd` and `klogd`, e.g; - - In syslogd: `-b` and `-c` have been replaced with `-R` for global - log rotation, `-a` has been replaced with the new `-p` support. - The `-r` flag and `-s HOST` has also been dropped + - In syslogd: `-b` and `-c` have been replaced with `-r` for global + log rotation, `-a` has been replaced with the new `-p` support. The + `-r` flag and `-s HOST` has also been dropped in favor of the BSD + `-s` flag to control two levels of _secure mode_ - In klogd: `-i` and `-I` have been removed - Update COPYING file to GPL 2 rev 2, with new FSF address and other minor stuff - Update license header in all files: diff --git a/man/syslogd.8 b/man/syslogd.8 index 56f296d..8f1e572 100644 --- a/man/syslogd.8 +++ b/man/syslogd.8 @@ -20,7 +20,7 @@ .Op Fl m Ar sec .Op Fl P Ar file .Op Fl p Ar sock -.Op Fl R Ar size[:count] +.Op Fl r Ar size[:count] .Sh DESCRIPTION .Nm support RFC3164 and RFC5424 style log messages for both local and remote @@ -158,7 +158,7 @@ log sockets. This might be needed when running applications in containers or a .Xr chroot 8 environment. -.It Fl R Ar size[:count] +.It Fl r Ar size[:count] Enable built-in support for log rotation of files listed in .Pa /etc/syslog.conf . This feature is particulary useful for small and embedded systems that diff --git a/src/syslogd.c b/src/syslogd.c index 95fce49..ef0afc3 100644 --- a/src/syslogd.c +++ b/src/syslogd.c @@ -210,7 +210,7 @@ int usage(int code) " -P FILE File in which to store the process ID, default: %s\n" " -p PATH Path to UNIX domain socket, multiple -p create multiple sockets. If\n" " no -p argument is given the default %s is used\n" - " -R S[:R] Enable log rotation. The size argument (S) takes k/M/G qualifiers,\n" + " -r S[:R] Enable log rotation. The size argument (S) takes k/M/G qualifiers,\n" " e.g. 2M for 2 MiB. The optional rotations argument default to 5.\n" " Rotation can also be defined per log file in syslog.conf\n" " -s Operate in secure mode, do not log messages from remote machines.\n" @@ -246,7 +246,7 @@ int main(int argc, char *argv[]) KeepKernFac = 1; #endif - while ((ch = getopt(argc, argv, "46Ab:dhHf:m:nP:p:R:sv?")) != EOF) { + while ((ch = getopt(argc, argv, "46Ab:dhHf:m:nP:p:r:sv?")) != EOF) { switch ((char)ch) { case '4': family = PF_INET; @@ -312,7 +312,7 @@ int main(int argc, char *argv[]) }); break; - case 'R': + case 'r': parse_rotation(optarg, &RotateSz, &RotateCnt); break;