diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-12-17 11:46:06 +0100 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-12-17 11:46:06 +0100 |
commit | d3da845a61129c256c3e96fe144ea1dd67bac7c6 (patch) | |
tree | dd33fccce6c88b0225c609c382bd6c0c211173ae /tools/syslogd.c | |
parent | da75472096c45dd136d41c6e9ad7bf740069d3a1 (diff) | |
parent | 2181515805e65c37b9db5e0badef2a0a86164234 (diff) | |
download | rsyslog-d3da845a61129c256c3e96fe144ea1dd67bac7c6.tar.gz rsyslog-d3da845a61129c256c3e96fe144ea1dd67bac7c6.tar.xz rsyslog-d3da845a61129c256c3e96fe144ea1dd67bac7c6.zip |
Merge branch 'v5-stable' into v5-devel
Conflicts:
ChangeLog
configure.ac
doc/manual.html
Diffstat (limited to 'tools/syslogd.c')
-rw-r--r-- | tools/syslogd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/syslogd.c b/tools/syslogd.c index 70d4cf2e..3c3c2f79 100644 --- a/tools/syslogd.c +++ b/tools/syslogd.c @@ -2592,7 +2592,7 @@ int realMain(int argc, char **argv) } } - if ((argc -= optind)) + if(argc - optind) usage(); DBGPRINTF("rsyslogd %s startup, compatibility mode %d, module path '%s', cwd:%s\n", |