summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--doc/status.html13
-rw-r--r--runtime/cfsysline.c2
-rw-r--r--runtime/ctok.c2
-rw-r--r--runtime/sysvar.c2
-rw-r--r--tools/syslogd.c7
6 files changed, 16 insertions, 14 deletions
diff --git a/ChangeLog b/ChangeLog
index 71766d1d..5bcc3d50 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,8 @@ Version 3.19.0 (rgerhards), 2008-04-??
runtime
- changed directory structure, files are now better organized
- a lot of cleanup in regard to modularization
+- -c option no longer must be the first option - thanks to varmjofekoj
+ for the patch
---------------------------------------------------------------------------
Version 3.17.2 (rgerhards), 2008-04-??
- this version is the new beta
@@ -65,7 +67,7 @@ Version 3.17.0 (rgerhards), 2008-04-08
Plus a number of bugfixes that were applied to v3-stable and beta
branches (not mentioned here in detail).
---------------------------------------------------------------------------
-Version 3.16.0 (rgerhards), 2008-04-??
+Version 3.16.0 (rgerhards), 2008-04-24
- new v3-stable (3.16.x) based on beta 3.15.x (RELP support)
- bugfix: omsnmp had a too-small sized buffer for hostname+port. This
could not lead to a segfault, as snprintf() was used, but could cause
diff --git a/doc/status.html b/doc/status.html
index 63a3f588..3ff8a625 100644
--- a/doc/status.html
+++ b/doc/status.html
@@ -2,19 +2,20 @@
<html><head><title>rsyslog status page</title></head>
<body>
<h2>rsyslog status page</h2>
-<p>This page reflects the status as of 2008-04-15.</p>
+<p>This page reflects the status as of 2008-04-24.</p>
<h2>Current Releases</h2>
<p><b>development:</b> 3.17.1 -
<a href="http://www.rsyslog.com/Article213.phtml">change log</a> -
<a href="http://www.rsyslog.com/Downloads-req-viewdownloaddetails-lid-98.phtml">download</a>
-<br><b>beta:</b> 3.15.1 -
-<a href="http://www.rsyslog.com/Article210.phtml">change log</a> -
-<a href="http://www.rsyslog.com/Downloads-req-viewdownloaddetails-lid-97.phtml">download</a></p>
+<!--<br><b>beta:</b> 3.17.2 -
+<a href="http://www.rsyslog.com/Article213.phtml">change log</a> -
+<a href="http://www.rsyslog.com/Downloads-req-viewdownloaddetails-lid-98.phtml">download</a></p>
+-->
-<p><b>v3 stable:</b> 3.14.2 - <a href="http://www.rsyslog.com/Article209.phtml">change log</a> -
-<a href="http://www.rsyslog.com/Downloads-req-viewdownloaddetails-lid-96.phtml">download</a>
+<p><b>v3 stable:</b> 3.16.0 - <a href="http://www.rsyslog.com/Article215.phtml">change log</a> -
+<a href="http://www.rsyslog.com/Downloads-req-viewdownloaddetails-lid-99.phtml">download</a>
<br><b>v2 stable:</b> 2.0.4 - <a href="http://www.rsyslog.com/Article197.phtml">change log</a> -
<a href="http://www.rsyslog.com/Downloads-index-req-getit-lid-90.phtml">download</a>
diff --git a/runtime/cfsysline.c b/runtime/cfsysline.c
index ffc49057..2124f11e 100644
--- a/runtime/cfsysline.c
+++ b/runtime/cfsysline.c
@@ -3,6 +3,8 @@
*
* File begun on 2007-07-30 by RGerhards
*
+ * Copyright (C) 2007, 2008 by Rainer Gerhards and Adiscon GmbH
+ *
* This file is part of the rsyslog runtime library.
*
* The rsyslog runtime library is free software: you can redistribute it and/or modify
diff --git a/runtime/ctok.c b/runtime/ctok.c
index 98d5b63b..2a92e285 100644
--- a/runtime/ctok.c
+++ b/runtime/ctok.c
@@ -8,6 +8,8 @@
*
* Module begun 2008-02-19 by Rainer Gerhards
*
+ * Copyright (C) 2008 by Rainer Gerhards and Adiscon GmbH
+ *
* This file is part of the rsyslog runtime library.
*
* The rsyslog runtime library is free software: you can redistribute it and/or modify
diff --git a/runtime/sysvar.c b/runtime/sysvar.c
index 14e32b96..d59f2623 100644
--- a/runtime/sysvar.c
+++ b/runtime/sysvar.c
@@ -5,6 +5,8 @@
*
* Module begun 2008-02-25 by Rainer Gerhards
*
+ * Copyright (C) 2008 by Rainer Gerhards and Adiscon GmbH
+ *
* This file is part of the rsyslog runtime library.
*
* The rsyslog runtime library is free software: you can redistribute it and/or modify
diff --git a/tools/syslogd.c b/tools/syslogd.c
index 634794ef..835a020d 100644
--- a/tools/syslogd.c
+++ b/tools/syslogd.c
@@ -2951,7 +2951,6 @@ int realMain(int argc, char **argv)
extern int optind;
extern char *optarg;
struct sigaction sigAct;
- int bIsFirstOption = 1;
int bEOptionWasGiven = 0;
int bImUxSockLoaded = 0; /* already generated a $ModLoad imuxsock? */
char *arg; /* for command line option processing */
@@ -2996,11 +2995,6 @@ int realMain(int argc, char **argv)
CHKiRet(bufOptAdd(ch, optarg));
break;
case 'c': /* compatibility mode */
- if(!bIsFirstOption) {
- fprintf(stderr, "-c option MUST be specified as the first option - aborting...\n");
- usage();
- exit(1);
- }
iCompatibilityMode = atoi(optarg);
break;
case 'd': /* debug - must be handled now, so that debug is active during init! */
@@ -3041,7 +3035,6 @@ int realMain(int argc, char **argv)
default:
usage();
}
- bIsFirstOption = 0; /* we already saw an option character */
}
if ((argc -= optind))