Группа :: Система/Ядро и оборудование
Пакет: rsyslog
навигация по пакетам
Главная Изменения Спек Патчи Sources Загрузить Gear Bugs and FR Repocop
Патч: rsyslog-3.20.2-alt2.patch
Скачать
Скачать
.gear/rules | 2 +
.../tags/0e01f4d117b19e53f8ee00c128d9f3a477eaf548 | 11 ++
.gear/tags/list | 1 +
ChangeLog | 28 +++++-
doc/v3compatibility.html | 6 +-
rsyslog.conf.alt | 87 ++++++++++++++
rsyslog.spec | 120 +++++++++++++++++++
rsyslogd.alt | 6 +
rsyslogd.init | 123 ++++++++++++++++++++
runtime/net.c | 29 +++++
tools/omfile.c | 42 ++++---
tools/rsyslogd.8 | 18 ++--
tools/syslogd.c | 7 +-
13 files changed, 445 insertions(+), 35 deletions(-)
diff --git a/.gear/rules b/.gear/rules
new file mode 100644
index 0000000..4b0460c
--- /dev/null
+++ b/.gear/rules
@@ -0,0 +1,2 @@
+tar: v@version@:.
+diff: v@version@:. .
diff --git a/.gear/tags/0e01f4d117b19e53f8ee00c128d9f3a477eaf548 b/.gear/tags/0e01f4d117b19e53f8ee00c128d9f3a477eaf548
new file mode 100644
index 0000000..be27ae6
--- /dev/null
+++ b/.gear/tags/0e01f4d117b19e53f8ee00c128d9f3a477eaf548
@@ -0,0 +1,11 @@
+object afdccceefa30306cf720a27efd5a29bcc5a916c9
+type commit
+tag v3.20.2
+tagger Rainer Gerhards <rgerhards@adiscon.com> 1228398212 +0100
+
+v3.20.2 (v3-stable)
+
+This is effectively a re-release of 3.20.1 because of one fix
+that was missing. Unfortunately, I needed to increase the version
+number as few downloads already had happend when I noticed the
+issue.
diff --git a/.gear/tags/list b/.gear/tags/list
new file mode 100644
index 0000000..3bc1365
--- /dev/null
+++ b/.gear/tags/list
@@ -0,0 +1 @@
+0e01f4d117b19e53f8ee00c128d9f3a477eaf548 v3.20.2
diff --git a/ChangeLog b/ChangeLog
index 501c9ff..d086ea2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+- doc bugfix: v3-compatiblity document had typo in config directive
+ thanks to Andrej for reporting this
+- fixed a potential segfault condition with $AllowedSender directive
+ On HUP, the root pointers were not properly cleaned up. Thanks to
+ Michael Biebel, olgoat, and Juha Koho for reporting and analyzing
+ the bug.
---------------------------------------------------------------------------
Version 3.20.2 [v3-stable] (rgerhards), 2008-12-04
- re-release of 3.20.1 with an additional fix, that could also lead
@@ -206,6 +212,23 @@ Version 3.19.0 (rgerhards), 2008-05-06
- -c option no longer must be the first option - thanks to varmjofekoj
for the patch
---------------------------------------------------------------------------
+Version 3.18.7 (rgerhards), 2008-12-??
+=======
+- fixed a potential segfault condition with $AllowedSender directive
+ On HUP, the root pointers were not properly cleaned up. Thanks to
+ Michael Biebel, olgoat, and Juha Koho for reporting and analyzing
+ the bug.
+- some legacy options were not correctly processed.
+ Thanks to varmojfekoj for the patch.
+- doc bugfix: some spelling errors in man pages corrected. Thanks to
+ Geoff Simmons for the patch.
+---------------------------------------------------------------------------
+Version 3.18.6 (rgerhards), 2008-12-08
+- security bugfix: $AllowedSender was not honored, all senders were
+ permitted instead (see http://www.rsyslog.com/Article322.phtml)
+ (backport from v3-stable, v3.20.9)
+- minor bugfix: dual close() call on tcp session closure
+---------------------------------------------------------------------------
Version 3.18.5 (rgerhards), 2008-10-09
- bugfix: imudp input module could cause segfault on HUP
It did not properly de-init a variable acting as a linked list head.
@@ -877,10 +900,13 @@ Version 3.10.0 (rgerhards), 2008-01-07
mode
---------------------------------------------------------------------------
Version 2.0.7 V2-STABLE (rgerhards), 2008-??-??
+- bugfix: "$CreateDirs off" also disabled file creation
+ Thanks to William Tisater for analyzing this bug and providing a patch.
+ The actual code change is heavily based on William's patch.
- bugfix: memory leak in ompgsql
Thanks to Ken for providing the patch
---------------------------------------------------------------------------
-Version 2.0.6 V2-STABLE (rgerhards), 2008-??-??
+Version 2.0.6 V2-STABLE (rgerhards), 2008-08-07
- bugfix: memory leaks in rsyslogd, primarily in singlethread mode
Thanks to Frederico Nunez for providing the fix
- bugfix: copy&paste error lead to dangling if - this caused a very minor
diff --git a/doc/v3compatibility.html b/doc/v3compatibility.html
index 5161994..ad8776b 100644
--- a/doc/v3compatibility.html
+++ b/doc/v3compatibility.html
@@ -95,7 +95,7 @@ set the local address the server should listen to via <b>$UDPServerAddress
<p>The following example configures an UDP syslog server at the
local address 192.0.2.1 on port 514:</p>
<p><b>$ModLoad imudp<br>
-$UDPSeverAddress 192.0.2.1 # this MUST be before the $UDPServerRun
+$UDPServerAddress 192.0.2.1 # this MUST be before the $UDPServerRun
directive!<br>
$UDPServerRun 514</b></p>
<p>"$UDPServerAddress *" means listen on all local interfaces.
@@ -103,10 +103,10 @@ This is the default if no directive is specified.</p>
<p>Please note that now multiple listeners are supported. For
example, you can do the following:</p>
<p><b>$ModLoad imudp<br>
-$UDPSeverAddress 192.0.2.1 # this MUST be before the $UDPServerRun
+$UDPServerAddress 192.0.2.1 # this MUST be before the $UDPServerRun
directive!<br>
$UDPServerRun 514<br>
-$UDPSeverAddress * # all local interfaces<br>
+$UDPServerAddress * # all local interfaces<br>
$UDPServerRun 1514</b></p>
<p>These config file settings run two listeners: one
at 192.0.2.1:514 and one on port 1514, which listens on all local
diff --git a/rsyslog.conf.alt b/rsyslog.conf.alt
new file mode 100644
index 0000000..71c0a7a
--- /dev/null
+++ b/rsyslog.conf.alt
@@ -0,0 +1,87 @@
+# rsyslog v3: load input modules
+# If you do not load inputs, nothing happens!
+# You may need to set the module load path if modules are not found.
+
+$ModLoad immark.so # provides --MARK-- message capability
+$ModLoad imuxsock.so # provides support for local system logging (e.g. via logger command)
+$ModLoad imklog.so # kernel logging (formerly provided by rklogd)
+
+###
+# Facilities
+###
+
+# Kernel
+kern.=debug;kern.=info;kern.=notice -/var/log/kernel/info
+kern.=warning -/var/log/kernel/warnings
+kern.err /var/log/kernel/errors
+
+# User
+user.=debug;user.=info;user.=notice -/var/log/user/info
+user.=warning -/var/log/user/warnings
+user.err /var/log/user/errors
+
+mail.=debug;mail.=info;mail.=notice -/var/log/mail/info
+mail.=warning -/var/log/mail/warnings
+mail.err /var/log/mail/errors
+mail.* -/var/log/mail/all
+
+# Daemons
+daemon.=debug;daemon.=info;daemon.=notice -/var/log/daemons/info
+daemon.=warning -/var/log/daemons/warnings
+daemon.err /var/log/daemons/errors
+
+# Auth
+auth.* /var/log/auth/messages
+authpriv.* /var/log/auth/secure
+auth,authpriv.* -/var/log/auth/all
+
+# Printer
+lpr.=debug;lpr.=info;lpr.=notice -/var/log/lpr/info
+lpr.=warning -/var/log/lpr/warnings
+lpr.err /var/log/lpr/errors
+
+# News
+news.=debug;news.=info;news.=notice -/var/log/news/info
+news.=warning -/var/log/news/warnings
+news.err /var/log/news/errors
+
+# UUCP
+uucp.=debug;uucp.=info;uucp.=notice -/var/log/uucp/info
+uucp.=warning -/var/log/uucp/warnings
+uucp.err /var/log/uucp/errors
+
+# Cron
+cron.=debug;cron.=info;cron.=notice -/var/log/cron/info
+cron.=warning -/var/log/cron/warnings
+cron.err /var/log/cron/errors
+
+# FTP
+ftp.=debug;ftp.=info;ftp.=notice -/var/log/ftp/info
+ftp.=warning -/var/log/ftp/warnings
+ftp.err /var/log/ftp/errors
+
+###
+# Various
+###
+
+# Log anything of level info or higher.
+# Don't log mail and private authentication messages!
+*.info;mail.none;authpriv.none -/var/log/syslog/messages
+
+# Log all alerts
+*.alert /var/log/syslog/alert
+
+# Everybody gets emergency messages
+*.emerg *
+
+# Save mail and news errors of level err and higher in a special file.
+uucp,news.crit -/var/log/syslog/spooler
+
+# Save boot messages also to boot.log
+local7.* -/var/log/syslog/boot
+
+# Log all to the console.
+*.* /dev/tty12
+
+$IncludeConfig /etc/rsyslog.d/
diff --git a/rsyslog.spec b/rsyslog.spec
new file mode 100644
index 0000000..e00bade
--- /dev/null
+++ b/rsyslog.spec
@@ -0,0 +1,120 @@
+Name: rsyslog
+Version: 3.20.2
+Release: alt2
+
+Summary: Rsyslog is an enhanced syslogd suitable both for small systems as well as large enterprises
+License: GPLv3
+Group: System/Kernel and hardware
+Url: http://www.rsyslog.com
+Provides: syslogd-daemon
+PreReq: syslog-common
+
+Packager: Ivan Fedorov <ns@altlinux.org>
+
+Source: %name-%version.tar
+Patch: %name-%version-%release.patch
+
+# Automatically added by buildreq on Sun Nov 02 2008
+BuildRequires: gcc-c++ glibc-devel-static librelp-devel postgresql-devel zlib-devel
+
+%description
+This package contains rsyslogd wich provide support for system logging.
+syslogd runs as daemon (background process) and logs system messages to
+different places according to a configuration file.
+
+%package pgsql
+Summary: %name output module for PgSQL
+Group: System/Kernel and hardware
+
+%description pgsql
+%summary
+
+%package docs-html
+Summary: html docs for %name
+Group: System/Kernel and hardware
+
+%description docs-html
+%summary
+
+%prep
+%setup -q
+%patch -p1
+
+%build
+%autoreconf
+%configure \
+ --libdir=/%_lib \
+ --sbindir=/sbin \
+ --enable-pgsql \
+ --enable-mail \
+ --enable-relp \
+ --enable-imfile \
+ --enable-imtemplate \
+ --with-gnu-ld \
+ --with-pic \
+
+%make_build
+
+%install
+%makeinstall prefix=%buildroot libdir=%buildroot/%_lib sbindir=%buildroot/sbin
+rm -f %buildroot/%_lib/rsyslog/*.la
+
+mkdir -p %buildroot{%_docdir/%name-%version/html/,%_sysconfdir/{sysconfig,%name.d},%_initdir}+
+install -m644 doc/*html %buildroot%_docdir/%name-%version/html/
+install -m644 doc/*png %buildroot%_docdir/%name-%version/html/
+install -m644 doc/*jpg %buildroot%_docdir/%name-%version/html/
+
+install -m644 plugins/ompgsql/createDB.sql %buildroot%_docdir/%name-%version/ompgsql-createDB.sql
+
+install -m644 doc/rsyslog-example.conf %buildroot%_docdir/%name-%version/
+install -m644 rsyslog.conf %buildroot%_docdir/%name-%version/
+install -m644 sample.conf %buildroot%_docdir/%name-%version/
+
+install -m644 rsyslog.conf.alt %buildroot%_sysconfdir/%name.conf
+install -m644 rsyslogd.alt %buildroot%_sysconfdir/sysconfig/rsyslogd
+install -m644 rsyslogd.init %buildroot%_initdir/rsyslogd
+
+
+%files
+%config(noreplace) %attr(640,root,adm) %_sysconfdir/%name.conf
+%dir %_sysconfdir/%name.d/
+%config(noreplace) %_sysconfdir/sysconfig/rsyslogd
+%config %_initdir/rsyslogd
+
+%dir /%_lib/rsyslog
+/%_lib/rsyslog/*.so
+%exclude /%_lib/rsyslog/ompgsql.so
+/sbin/rsyslogd
+
+%_mandir/man?/rsyslog*
+
+%dir %_docdir/%name-%version
+%_docdir/%name-%version/*
+%exclude %_docdir/%name-%version/html
+%exclude %_docdir/%name-%version/ompgsql-createDB.sql
+
+%files pgsql
+/%_lib/rsyslog/ompgsql.so
+%_docdir/%name-%version/ompgsql-createDB.sql
+
+%files docs-html
+%dir %_docdir/%name-%version/html
+%_docdir/%name-%version/html/*
+
+%changelog
+* Tue Jan 13 2009 Ivan Fedorov <ns@altlinux.org> 3.20.2-alt2
+- add configs & init-script
+- update from upstream
+- extract pgsql support to subpackage
+
+* Sat Dec 20 2008 Ivan Fedorov <ns@altlinux.org> 3.20.2-alt1
+- 3.20.2
+ + security fix
+- change prefix from /usr to /.
+
+* Fri Nov 07 2008 Ivan Fedorov <ns@altlinux.org> 3.20.0-alt1
+- 3.20.0
+
+* Sun Nov 02 2008 Ivan Fedorov <ns@altlinux.org> 3.18.5-alt1
+- Initial build for ALT Linux
diff --git a/rsyslogd.alt b/rsyslogd.alt
new file mode 100644
index 0000000..dd0263e
--- /dev/null
+++ b/rsyslogd.alt
@@ -0,0 +1,6 @@
+
+RSYSLOGD_OPTIONS='-c3'
+
+# use extra sockets from /etc/syslog.d/. rsyslog deletes all sockets
+# on stopping, so we use 'NO' by default.
+RSYSLOGD_EXTRASOCKETS=no
diff --git a/rsyslogd.init b/rsyslogd.init
new file mode 100755
index 0000000..5816dab
--- /dev/null
+++ b/rsyslogd.init
@@ -0,0 +1,123 @@
+#!/bin/sh
+#
+# rsyslogd Starts rsyslogd.
+#
+#
+# chkconfig: 2345 30 99
+# description: Syslog is the facility by which many daemons use to log \
+# messages to various system log files. It is a good idea to always \
+# run syslog.
+
+WITHOUT_RC_COMPAT=1
+
+# Source function library.
+. /etc/init.d/functions
+
+SourceIfNotEmpty /etc/sysconfig/rsyslogd
+
+RSYSLOGD=/sbin/rsyslogd
+[ -x "$RSYSLOGD" ] || exit
+
+PIDFILE=/var/run/rsyslogd.pid
+LOCKFILE=/var/lock/subsys/rsyslogd
+RETVAL=0
+
+extrasockets()
+{+ is_yes "$RSYSLOGD_EXTRASOCKETS" || return 0
+
+ local CONF="/etc/rsyslog.d/010-extrasockets.conf"
+ local STRING="Generating list of extra sockets in /etc/syslog.d/"
+
+ echo -n "$STRING "
+
+ echo '# Do not edit manually. This file is autogenerated.' > $CONF
+ echo >> $CONF
+
+ for LOGSOCK in $(ls -1 /etc/syslog.d/); do
+ echo '$AddUnixListenSocket ' $(readlink /etc/syslog.d/$LOGSOCK) >> $CONF
+ done
+
+ RETVAL=$?
+ [ $RETVAL -eq 0 ] && success "$STRING" || failure "$STRING"
+ echo
+
+ return $RETVAL
+}
+
+start()
+{+ extrasockets
+ msg_starting $"system logger"
+ start_daemon --pidfile "$PIDFILE" --lockfile "$LOCKFILE" --no-announce -- rsyslogd $RSYSLOGD_OPTIONS
+ RETVAL=$?
+ return $RETVAL
+}
+
+stop()
+{+ msg_stopping $"system logger"
+ stop_daemon --pidfile "$PIDFILE" --lockfile "$LOCKFILE" --no-announce rsyslogd
+ RETVAL=$?
+ return $RETVAL
+}
+
+restart()
+{+ stop
+ start
+}
+
+reload()
+{+ extrasockets
+ msg_reloading $"system logger"
+ stop_daemon --pidfile "$PIDFILE" -HUP rsyslogd
+ RETVAL=$?
+ return $RETVAL
+}
+
+# See how we were called.
+case "$1" in
+ start)
+ start
+ ;;
+ stop)
+ stop
+ ;;
+ status)
+ status --pidfile "$PIDFILE" rsyslogd
+ RETVAL=$?
+ ;;
+ restart)
+ restart
+ ;;
+ reload)
+ reload
+ ;;
+ condstart)
+ if [ ! -e "$LOCKFILE" ]; then
+ start
+ fi
+ ;;
+ condstop)
+ if [ -e "$LOCKFILE" ]; then
+ stop
+ fi
+ ;;
+ condrestart)
+ if [ -e "$LOCKFILE" ]; then
+ restart
+ fi
+ ;;
+ condreload)
+ if [ -e "$LOCKFILE" ]; then
+ reload
+ fi
+ ;;
+ *)
+ msg_usage "${0##*/} {start|stop|status|restart|reload|condstart|condstop|condrestart|condreload}"+ RETVAL=1
+esac
+
+exit $RETVAL
diff --git a/runtime/net.c b/runtime/net.c
index ac13597..c5fa771 100644
--- a/runtime/net.c
+++ b/runtime/net.c
@@ -116,6 +116,30 @@ setAllowRoot(struct AllowedSenders **ppAllowRoot, uchar *pszType)
finalize_it:
RETiRet;
}
+/* re-initializes (sets to NULL) the correct allow root pointer
+ * rgerhards, 2009-01-12
+ */
+static inline rsRetVal
+reinitAllowRoot(uchar *pszType)
+{+ DEFiRet;
+
+ if(!strcmp((char*)pszType, "UDP"))
+ pAllowedSenders_UDP = NULL;
+ else if(!strcmp((char*)pszType, "TCP"))
+ pAllowedSenders_TCP = NULL;
+#ifdef USE_GSSAPI
+ else if(!strcmp((char*)pszType, "GSS"))
+ pAllowedSenders_GSS = NULL;
+#endif
+ else {+ dbgprintf("program error: invalid allowed sender ID '%s', denying...\n", pszType);+ ABORT_FINALIZE(RS_RET_CODE_ERR); /* everything is invalid for an invalid type */
+ }
+
+finalize_it:
+ RETiRet;
+}
/* add a wildcard entry to this permitted peer. Entries are always
@@ -556,6 +580,11 @@ clearAllowedSenders(uchar *pszType)
free(pPrev->allowedSender.addr.NetAddr);
free(pPrev);
}
+
+ /* indicate root pointer is de-init (was forgotten previously, resulting in
+ * all kinds of interesting things) -- rgerhards, 2009-01-12
+ */
+ reinitAllowRoot(pszType);
}
diff --git a/tools/omfile.c b/tools/omfile.c
index 8144386..d76e24a 100644
--- a/tools/omfile.c
+++ b/tools/omfile.c
@@ -385,26 +385,30 @@ static void prepareFile(instanceData *pData, uchar *newFileName)
*/
if(makeFileParentDirs(newFileName, strlen((char*)newFileName),
pData->fDirCreateMode, pData->dirUID,
- pData->dirGID, pData->bFailOnChown) == 0) {- pData->fd = open((char*) newFileName, O_WRONLY|O_APPEND|O_CREAT|O_NOCTTY,
- pData->fCreateMode);
- if(pData->fd != -1) {- /* check and set uid/gid */
- if(pData->fileUID != (uid_t)-1 || pData->fileGID != (gid_t) -1) {- /* we need to set owner/group */
- if(fchown(pData->fd, pData->fileUID,
- pData->fileGID) != 0) {- if(pData->bFailOnChown) {- int eSave = errno;
- close(pData->fd);
- pData->fd = -1;
- errno = eSave;
- }
- /* we will silently ignore the chown() failure
- * if configured to do so.
- */
- }
+ pData->dirGID, pData->bFailOnChown) != 0) {+ return; /* we give up */
+ }
+ }
+ /* no matter if we needed to create directories or not, we now try to create
+ * the file. -- rgerhards, 2008-12-18 (based on patch from William Tisater)
+ */
+ pData->fd = open((char*) newFileName, O_WRONLY|O_APPEND|O_CREAT|O_NOCTTY,
+ pData->fCreateMode);
+ if(pData->fd != -1) {+ /* check and set uid/gid */
+ if(pData->fileUID != (uid_t)-1 || pData->fileGID != (gid_t) -1) {+ /* we need to set owner/group */
+ if(fchown(pData->fd, pData->fileUID,
+ pData->fileGID) != 0) {+ if(pData->bFailOnChown) {+ int eSave = errno;
+ close(pData->fd);
+ pData->fd = -1;
+ errno = eSave;
}
+ /* we will silently ignore the chown() failure
+ * if configured to do so.
+ */
}
}
}
diff --git a/tools/rsyslogd.8 b/tools/rsyslogd.8
index fd7a537..ecf2635 100644
--- a/tools/rsyslogd.8
+++ b/tools/rsyslogd.8
@@ -68,7 +68,7 @@ are in order. First of all there has been a systematic attempt to
ensure that rsyslogd follows its default, standard BSD behavior. Of course,
some configuration file changes are necessary in order to support the
template system. However, rsyslogd should be able to use a standard
-syslog.conf and act like the orginal syslogd. However, an original syslogd
+syslog.conf and act like the original syslogd. However, an original syslogd
will not work correctly with a rsyslog-enhanced configuration file. At
best, it will generate funny looking file names.
The second important concept to note is that this version of rsyslogd
@@ -92,13 +92,13 @@ the error element is ignored. It is tried to parse the rest of the line.
.B -c option controls the backward compatibility mode in use.
.TP
.BI "\-A"
-When sending UDP messages, there are potentially multiple pathes to
+When sending UDP messages, there are potentially multiple paths to
the target destination. By default,
.B rsyslogd
only sends to the first target it can successfully send to. If -A
is given, messages are sent to all targets. This may improve
-reliability, but may also cause message duplicaton. This option
-should enabled only if it is fully understood.
+reliability, but may also cause message duplication. This option
+should be enabled only if it is fully understood.
.TP
.BI "\-4"
Causes
@@ -129,7 +129,7 @@ to sysklogd, which is the default if -c is not given.
.B Please note that rsyslogd issues warning messages if the -c3
.B command line option is not given.
This is to alert you that your are running in compatibility
-mode. Compatibility mode interfers with you rsyslog.conf commands and
+mode. Compatibility mode interferes with your rsyslog.conf commands and
may cause some undesired side-effects. It is meant to be used with a
plain old rsyslog.conf - if you use new features, things become
messy. So the best advice is to work through this document, convert
@@ -167,7 +167,7 @@ is started and controlled by
.BR init (8).
.TP
.BI "\-q " "add hostname if DNS fails during ACL processing"
-During ACL processing, hostnames are resolved to IP addreses for
+During ACL processing, hostnames are resolved to IP addresses for
performance reasons. If DNS fails during that process, the hostname
is added as wildcard text, which results in proper, but somewhat
slower operation once DNS is up again.
@@ -190,7 +190,7 @@ no domain would be cut, you will have to specify two domains like:
Print version and exit.
.TP
.B "\-w"
-Supress warnings issued when messages are received from non-authorized
+Suppress warnings issued when messages are received from non-authorized
machines (those, that are in no AllowedSender list).
.TP
.B "\-x"
@@ -344,7 +344,7 @@ you can't access the documentation...
.TP
.B RSYSLOG_DEBUGLOG
-If set, writes (allmost) all debug message to the specified log file
+If set, writes (almost) all debug message to the specified log file
in addition to stdout.
.TP
.B RSYSLOG_MODDIR
@@ -352,7 +352,7 @@ Provides the default directory in which loadable modules reside.
.PD
.SH BUGS
Please review the file BUGS for up-to-date information on known
-bugs and annouyances.
+bugs and annoyances.
.SH Further Information
Please visit
.BR http://www.rsyslog.com/doc
diff --git a/tools/syslogd.c b/tools/syslogd.c
index 439ca30..b32ce02 100644
--- a/tools/syslogd.c
+++ b/tools/syslogd.c
@@ -417,8 +417,9 @@ static void processImInternal(void);
static int usage(void)
{- fprintf(stderr, "usage: rsyslogd [-cversion] [-46AdnqQvwx] [-lhostlist] [-sdomainlist]\n"
- " [-fconffile] [-ipidfile]\n"
+ fprintf(stderr, "usage: rsyslogd [-c<version>] [-46AdnqQvwx] [-l<hostlist>] [-s<domainlist>]\n"
+ " [-f<conffile>] [-i<pidfile>] [-M<module load path>]\n"
+ " [-u<number>]\n"
"To run rsyslogd in native mode, use \"rsyslogd -c3 <other options>\"\n\n"
"For further information see http://www.rsyslog.com/doc\n");
exit(1); /* "good" exit - done to terminate usage() */
@@ -3008,7 +3009,7 @@ int realMain(int argc, char **argv)
* only when actually neeeded.
* rgerhards, 2008-04-04
*/
- while ((ch = getopt(argc, argv, "46a:Ac:def:g:hi:l:m:M:nopqQr::s:t:u:vwx")) != EOF) {+ while ((ch = getopt(argc, argv, "46a:Ac:def:g:hi:l:m:M:nop:qQr::s:t:u:vwx")) != EOF) { switch((char)ch) {case '4':
case '6':