diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-12-10 15:20:27 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-12-10 15:20:27 +0100 |
| commit | 6b1a023f256030d19e12bbaeaeb236e4d664d90a (patch) | |
| tree | 3b807b64f41681c51d92bc01143cbc9cb6154296 /tools | |
| parent | f716ff2349ba2d59d2540e5dd14fc08c67b68a0a (diff) | |
| parent | 054ae7bf174dbbf6721c0379d17383d0113dc90b (diff) | |
| download | rsyslog-6b1a023f256030d19e12bbaeaeb236e4d664d90a.tar.gz rsyslog-6b1a023f256030d19e12bbaeaeb236e4d664d90a.tar.xz rsyslog-6b1a023f256030d19e12bbaeaeb236e4d664d90a.zip | |
Merge branch 'debian_lenny' into v3-stable
Conflicts:
ChangeLog
configure.ac
doc/manual.html
net.h
plugins/imtcp/imtcp.c
plugins/imudp/imudp.c
runtime/net.c
runtime/rsyslog.h
tcps_sess.c
tcpsrv.c
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/syslogd.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tools/syslogd.c b/tools/syslogd.c index 439ca303..b32ce029 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': |