- definition of CONFIG_FILE and MOTD_FILE is now compatible with -Wtraditional.

diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c
index 65e51a96b92a880fb2c7fdcf4c55f31230957603..08c4e9ae550c287344a146c1148018dc0348148d 100644 (file)
--- a/src/ngircd/conf.c
+++ b/src/ngircd/conf.c
@@ -14,7 +14,7 @@
 
 #include "portab.h"
 
-static char UNUSED id[] = "$Id: conf.c,v 1.47 2002/12/18 02:53:36 alex Exp $";
+static char UNUSED id[] = "$Id: conf.c,v 1.48 2002/12/26 13:17:56 alex Exp $";
 
 #include "imp.h"
 #include <assert.h>
@@ -178,7 +178,8 @@ Set_Defaults( VOID )
        strcpy( Conf_ServerAdmin2, "" );
        strcpy( Conf_ServerAdminMail, "" );
 
-       strcpy( Conf_MotdFile, MOTD_FILE );
+       strcpy( Conf_MotdFile, SYSCONFDIR );
+       strcat( Conf_MotdFile, MOTD_FILE );
 
        Conf_ListenPorts_Count = 0;
 

diff --git a/src/ngircd/defines.h b/src/ngircd/defines.h
index 7db4788a13270587c588cf4fb9322446e15aaf9c..dcc84c19be4af3e694078e7d096b4274b7c715e2 100644 (file)
--- a/src/ngircd/defines.h
+++ b/src/ngircd/defines.h
@@ -8,7 +8,7 @@
  * (at your option) any later version.
  * Please read the file COPYING, README and AUTHORS for more information.
  *
- * $Id: defines.h,v 1.40 2002/12/16 23:10:56 alex Exp $
+ * $Id: defines.h,v 1.41 2002/12/26 13:17:56 alex Exp $
  *
  * Global defines of ngIRCd.
  */
@@ -83,13 +83,9 @@
 
 #define DEFAULT_AWAY_MSG "Away"                /* Away-Meldung fuer User von anderen Servern */
 
-#ifdef PROTOTYPES
-# define CONFIG_FILE SYSCONFDIR"/ngircd.conf"
-# define MOTD_FILE SYSCONFDIR"/ngircd.motd"
-#else
-# define CONFIG_FILE "ngircd.conf"
-# define MOTD_FILE "ngircd.motd"
-#endif
+#define CONFIG_FILE "/ngircd.conf"
+#define MOTD_FILE "/ngircd.motd"
+
 #define ERROR_DIR "/tmp"
 
 #define MAX_LOG_MSG_LEN 256            /* max. Laenge einer Log-Meldung */

diff --git a/src/ngircd/ngircd.c b/src/ngircd/ngircd.c
index 20db13ed94c96a5bb2a4e02df2e398c5e37f3751..4690e7dd5c8d6c340781238d62294473fabd373e 100644 (file)
--- a/src/ngircd/ngircd.c
+++ b/src/ngircd/ngircd.c
@@ -14,7 +14,7 @@
 
 #include "portab.h"
 
-static char UNUSED id[] = "$Id: ngircd.c,v 1.65 2002/12/19 04:29:59 alex Exp $";
+static char UNUSED id[] = "$Id: ngircd.c,v 1.66 2002/12/26 13:17:57 alex Exp $";
 
 #include "imp.h"
 #include <assert.h>
@@ -73,7 +73,8 @@ main( int argc, const char *argv[] )
 #ifdef SNIFFER
        NGIRCd_Sniffer = FALSE;
 #endif
-       strcpy( NGIRCd_ConfFile, CONFIG_FILE );
+       strcpy( NGIRCd_ConfFile, SYSCONFDIR );
+       strcat( NGIRCd_ConfFile, CONFIG_FILE );
 
        /* Kommandozeile parsen */
        for( i = 1; i < argc; i++ )