moving towards autotools build system - config.h include forgotten & now

    fixed

11 files changed, 34 insertions, 12 deletions

diff --git a/klogd.c b/klogd.c
index 1cc1cc0d..d62d1c71 100644
--- a/klogd.c
+++ b/klogd.c
@@ -18,6 +18,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
+#include "config.h"
 
 #ifdef FEATURE_KLOGD
 /*
@@ -264,7 +265,6 @@
 #ifndef TESTING
 #include "pidfile.h"
 #endif
-#include "version.h"
 
 #define __LIBRARY__
 #include <linux/unistd.h>
@@ -521,8 +521,8 @@ static void ChangeLogging(void)
 		Terminate();
 
 	/* Indicate that something is happening. */
-	Syslog(LOG_INFO, "rklogd %s.%s, ---------- state change ----------\n", \
-	       VERSION, PATCHLEVEL);
+	Syslog(LOG_INFO, "rklogd %s, ---------- state change ----------\n", \
+	       VERSION);
 
 	/* Reload symbols. */
 	if ( reload_symbols > 0 )
@@ -591,11 +591,11 @@ static enum LOGSRC GetKernelLogSrc(void)
 	  	/* Initialize kernel logging. */
 	  	ksyslog(1, NULL, 0);
 #ifdef DEBRELEASE
-		Syslog(LOG_INFO, "rklogd %s.%s#%s, log source = ksyslog "
-		       "started.", VERSION, PATCHLEVEL, DEBRELEASE);
+		Syslog(LOG_INFO, "rklogd %s#%s, log source = ksyslog "
+		       "started.", VERSION, DEBRELEASE);
 #else
-		Syslog(LOG_INFO, "rklogd %s.%s, log source = ksyslog "
-		       "started.", VERSION, PATCHLEVEL);
+		Syslog(LOG_INFO, "rklogd %s, log source = ksyslog "
+		       "started.", VERSION);
 #endif
 		return(kernel);
 	}
@@ -613,11 +613,11 @@ static enum LOGSRC GetKernelLogSrc(void)
 #endif
 
 #ifdef DEBRELEASE
-	Syslog(LOG_INFO, "rklogd %s.%s#%s, log source = %s started.", \
-	       VERSION, PATCHLEVEL, DEBRELEASE, _PATH_KLOG);
+	Syslog(LOG_INFO, "rklogd %ss#%s, log source = %s started.", \
+	       VERSION, DEBRELEASE, _PATH_KLOG);
 #else
-	Syslog(LOG_INFO, "rklogd %s.%s, log source = %s started.", \
-	       VERSION, PATCHLEVEL, _PATH_KLOG);
+	Syslog(LOG_INFO, "rklogd %s, log source = %s started.", \
+	       VERSION, _PATH_KLOG);
 #endif
 	return(proc);
 }
@@ -993,7 +993,7 @@ int main(int argc, char *argv[])
 			use_syscall = 1;
 			break;
 		    case 'v':
-			printf("rklogd %s.%s\n", VERSION, PATCHLEVEL);
+			printf("rklogd %s\n", VERSION);
 			exit (1);
 		    case 'x':
 			symbol_lookup = 0;
diff --git a/ksym.c b/ksym.c
index feb45f63..8dff9ac7 100644
--- a/ksym.c
+++ b/ksym.c
@@ -1,3 +1,5 @@
+#include "config.h"
+
 #ifdef FEATURE_KLOGD
 /*
     ksym.c - functions for kernel address->symbol translation
diff --git a/ksym_mod.c b/ksym_mod.c
index 12f2c010..d84140e0 100644
--- a/ksym_mod.c
+++ b/ksym_mod.c
@@ -1,3 +1,5 @@
+#include "config.h"
+
 #ifdef FEATURE_KLOGD
 /*
     ksym_mod.c - functions for building symbol lookup tables for klogd
diff --git a/outchannel.c b/outchannel.c
index a0ee01b3..e89bd4cb 100644
--- a/outchannel.c
+++ b/outchannel.c
@@ -7,6 +7,8 @@
  * This code is placed under the GPL.
  * begun 2005-06-21 rgerhards
  */
+#include "config.h"
+
 #ifdef __FreeBSD__
 #define	BSD
 #endif
diff --git a/parse.c b/parse.c
index 0b26b0a2..06ed82e4 100644
--- a/parse.c
+++ b/parse.c
@@ -7,6 +7,8 @@
  *     Rainer Gerhards and Adiscon GmbH. All Rights Reserved.
  *     This code is placed under the GPL.
  */
+#include "config.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <assert.h>
diff --git a/pidfile.c b/pidfile.c
index 754ac532..8ab6f822 100644
--- a/pidfile.c
+++ b/pidfile.c
@@ -18,6 +18,8 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA
 */
+#include "config.h"
+
 
 /*
  * Sat Aug 19 13:24:33 MET DST 1995: Martin Schulze
diff --git a/srUtils.c b/srUtils.c
index 744ab283..fbc2a15a 100755
--- a/srUtils.c
+++ b/srUtils.c
@@ -25,6 +25,8 @@
  *

  * A copy of the GPL can be found in the file "COPYING" in this distribution.

  */

+#include "config.h"

+

 

 #include <stdlib.h>

 #include <string.h>

diff --git a/stringbuf.c b/stringbuf.c
index 656a3238..48c63b40 100755
--- a/stringbuf.c
+++ b/stringbuf.c
@@ -8,6 +8,8 @@
  * This code is placed under the GPL.
  * begun 2005-09-07 rgerhards
  */
+#include "config.h"
+
 #include <stdlib.h>
 #include <assert.h>
 #include <string.h>
diff --git a/syslog.c b/syslog.c
index 889b0057..f3ce13c9 100644
--- a/syslog.c
+++ b/syslog.c
@@ -28,6 +28,8 @@
  *
  * A copy of the GPL can be found in the file "COPYING" in this distribution.
  */
+#include "config.h"
+
 #include <stdio.h>
 #include <assert.h>
 #include <sys/socket.h>
diff --git a/syslog_tst.c b/syslog_tst.c
index ca786018..40896b31 100644
--- a/syslog_tst.c
+++ b/syslog_tst.c
@@ -14,6 +14,8 @@
  *	to be a problem with overrunning a UNIX domain socket with
  *	excessive amounts of input.
  */
+#include "config.h"
+
 
 #include <stdio.h>
 #include <string.h>
diff --git a/template.c b/template.c
index 1f51e225..19857866 100644
--- a/template.c
+++ b/template.c
@@ -3,6 +3,8 @@
  * This code is placed under the GPL.
  * begun 2004-11-17 rgerhards
  */
+#include "config.h"
+
 #ifdef __FreeBSD__
 #define	BSD
 #endif
@@ -669,6 +671,8 @@ void tplPrintList(void)
 				case tplFmtRFC3339Date:
 					dprintf("[Format as RFC3339-Date] ");
 					break;
+				default:
+					dprintf("[INVALID eDateFormat %d] ", pTpe->data.field.eDateFormat);
 				}
 				switch(pTpe->data.field.eCaseConv) {
 				case tplCaseConvNo: