Attachment 678558 Details for Bug 895307 – Updated patch to fix the issue

[patch] Updated patch to fix the issue

ngircd-18-syslog.patch (text/plain), 2.18 KB, created by CJ Kucera on 2013-01-15 02:42:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: CJ Kucera

Created: 2013-01-15 02:42:36 UTC

Size: 2.18 KB

patch

obsolete

>diff -ruN ngircd-18-orig/src/ngircd/log.c ngircd-18/src/ngircd/log.c
>--- ngircd-18-orig/src/ngircd/log.c	2011-02-13 10:54:34.000000000 -0600
>+++ ngircd-18/src/ngircd/log.c	2013-01-14 20:29:45.067639758 -0600
>@@ -65,6 +65,12 @@
> }
> 
> 
>+/**
>+ * Initialitze logging.
>+ * This function is called before the configuration file is read in.
>+ *
>+ * @param Daemon_Mode Set to true if ngIRCd is running as daemon.
>+ */
> GLOBAL void
> Log_Init( bool Daemon_Mode )
> {
>@@ -108,6 +114,23 @@
> } /* Log_Init */
> 
> 
>+/**
>+ * Re-init logging after reading the configuration file.
>+ */
>+GLOBAL void
>+Log_ReInit(void)
>+{
>+#ifdef SYSLOG
>+#ifndef LOG_CONS     /* Kludge: mips-dec-ultrix4.5 has no LOG_CONS */
>+#define LOG_CONS 0
>+#endif
>+	closelog();
>+	openlog(PACKAGE_NAME, LOG_CONS|LOG_PID, Conf_SyslogFacility);
>+#endif
>+	Log(LOG_NOTICE, "%s started.", NGIRCd_Version);
>+}
>+
>+
> GLOBAL void
> Log_Exit( void )
> {
>diff -ruN ngircd-18-orig/src/ngircd/log.h ngircd-18/src/ngircd/log.h
>--- ngircd-18-orig/src/ngircd/log.h	2011-02-13 10:54:34.000000000 -0600
>+++ ngircd-18/src/ngircd/log.h	2013-01-14 20:29:45.068640684 -0600
>@@ -1,6 +1,6 @@
> /*
>  * ngIRCd -- The Next Generation IRC Daemon
>- * Copyright (c)2001-2010 Alexander Barton (alex@barton.de)
>+ * Copyright (c)2001-2012 Alexander Barton (alex@barton.de)
>  *
>  * This program is free software; you can redistribute it and/or modify
>  * it under the terms of the GNU General Public License as published by
>@@ -36,6 +36,7 @@
> GLOBAL void Log_Exit PARAMS(( void ));
> 
> GLOBAL void Log PARAMS(( int Level, const char *Format, ... ));
>+GLOBAL void Log_ReInit PARAMS((void));
> 
> GLOBAL void Log_ServerNotice PARAMS((char UserMode, const char *Format, ...));
> 
>diff -ruN ngircd-18-orig/src/ngircd/ngircd.c ngircd-18/src/ngircd/ngircd.c
>--- ngircd-18-orig/src/ngircd/ngircd.c	2011-06-26 16:34:00.000000000 -0500
>+++ ngircd-18/src/ngircd/ngircd.c	2013-01-14 20:29:45.070639816 -0600
>@@ -264,11 +264,11 @@
> 		NGIRCd_SignalRestart = false;
> 		NGIRCd_SignalQuit = false;
> 
>-		Random_Init();
>-
> 		/* Initialize modules, part I */
> 		Log_Init( ! NGIRCd_NoDaemon );
>+		Random_Init();
> 		Conf_Init( );
>+        Log_ReInit();
> 
> 		/* Initialize the "main program": chroot environment, user and
> 		 * group ID, ... */

Actions: View | Diff

Attachments on bug 895307: 678558