emo/sysklogd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

syslogd: Adopt FreeBSD -F instead of -n to run in foreground

Browse Source 
This change will probably break most installations.  We do this to free
up '-n' for use as disabling DNS lookups, from FreeBSD *and* NetBSD.

Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
This commit is contained in:
Joachim Nilsson
2019-11-13 17:05:42 +01:00
parent 9d415f313f
commit cf9d281e5b
5 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/syslogd.c
View File

@ -194,7 +194,7 @@ static int addpeer(struct peer *pe0)
int usage(int code)
{
printf("Usage:\n"
" syslogd [-46Adknrsv?] [-a PEER] [-b :PORT] [-b ADDR[:PORT]] [-f FILE] [-m SEC]\n"
" syslogd [-46AdFkrsv?] [-a PEER] [-b :PORT] [-b ADDR[:PORT]] [-f FILE] [-m SEC]\n"
" [-P PID_FILE] [-p SOCK_PATH] [-R SIZE[:NUM]]\n"
"Options:\n"
" -4 Force IPv4 only\n"
@ -221,10 +221,10 @@ int usage(int code)
" service name, default is 'syslog', port 514.\n"
"\n"
" -d Enable debug mode\n"
" -F Run in foreground, required when run from a modern init/supervisor\n"
" -f FILE Alternate .conf file, default: /etc/syslog.conf\n"
" -k Allow logging with facility 'kernel', otherwise remapped to 'user'.\n"
" -m SEC Interval between MARK messages in log, 0 to disable, default: 20 min\n"
" -n Run in foreground, required when run from a modern init/supervisor\n"
" -P FILE File 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"
@ -263,7 +263,7 @@ int main(int argc, char *argv[])
KeepKernFac = 1;
#endif
while ((ch = getopt(argc, argv, "46Aa:b:dHf:m:nP:p:r:sv?")) != EOF) {
while ((ch = getopt(argc, argv, "46Aa:b:dHFf:m:P:p:r:sv?")) != EOF) {
switch ((char)ch) {
case '4':
family = PF_INET;
@ -297,6 +297,10 @@ int main(int argc, char *argv[])
Debug = 1;
break;
case 'F': /* don't fork */
Foreground = 1;
break;
case 'f': /* configuration file */
ConfFile = optarg;
break;
@ -313,10 +317,6 @@ int main(int argc, char *argv[])
MarkInterval = atoi(optarg) * 60;
break;
case 'n': /* don't fork */
Foreground = 1;
break;
case 'P':
PidFile = optarg;
break;