repo: ngircd
action: commit
revision: 
path_from: 
revision_from: 3c738ed46d1116553813261d2025ec2957a7662d:
path_to: 
revision_to: 

commit 3c738ed46d1116553813261d2025ec2957a7662d
Author: Alexander Barton 
Date:   Thu Dec 26 13:17:56 2002 +0000

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

diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c

--- 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 
@@ -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

--- 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

--- 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 
@@ -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++ )

-----END OF PAGE-----