* Removed CONFEDIT define

svn: 1153

config.h.in

@@ -339,7 +339,6 @@
 #undef S_AUTHHASH
 #undef S_AUTOAWAY
 #undef S_AUTOLOCK
-#undef S_CONFEDIT
 #undef S_DCCAUTH
 #undef S_DCCPASS
 #undef S_GARBLESTRINGS

doc/UPDATES

@@ -4,7 +4,7 @@ This is a summary of ChangeLog basically.
 * No longer displaying SATLS on ./bin -v
 * Wrote new 'response' code for misc stuff like kick reasons, and dcc responses...
 * Removed many unnecesary compile defines: (.config controlling them makes more sense)
-  ANTITRACE, HIJACKCHECK, LASTCHECK, NODELAY, PROCESSCHECK, PROMISC, AUTHCMDS
+  ANTITRACE, HIJACKCHECK, LASTCHECK, NODELAY, PROCESSCHECK, PROMISC, AUTHCMDS, CONFEDIT
 
 1.1.9
 

src/conf.c

@@ -18,9 +18,7 @@
 #include <errno.h>
 #include <paths.h>
 #include <sys/types.h>
-#ifdef S_CONFEDIT
-#  include <sys/wait.h>
-#endif /* S_CONFEDIT */
+#include <sys/wait.h>
 #include <sys/stat.h>
 #include <signal.h>
 
@@ -83,7 +81,6 @@ killbot(char *botnick)
 }
 #endif /* LEAF */
 
-#ifdef S_CONFEDIT
 #ifndef CYGWIN_HACKS
 static uid_t save_euid, save_egid;
 static int
@@ -214,7 +211,6 @@ fatal:
   exit(1);
 }
 #endif /* !CYGWIN_HACKS */
-#endif /* S_CONFEDIT */
 
 void
 init_conf()

src/conf.h

@@ -53,9 +53,7 @@ enum {
 void spawnbots();
 int killbot(char *);
 #endif /* LEAF */
-#ifdef S_CONFEDIT
 void confedit(char *) __attribute__((noreturn));
-#endif /* S_CONFEDIT */
 #ifdef LEAF
 void conf_addbot(char *, char *, char *, char *);
 int conf_delbot(char *);

src/main.c

@@ -87,9 +87,7 @@ char	quit_msg[1024];		/* quit message */
 time_t	now;			/* duh, now :) */
 
 #define fork_interval atoi( CFG_FORKINTERVAL.ldata ? CFG_FORKINTERVAL.ldata : CFG_FORKINTERVAL.gdata ? CFG_FORKINTERVAL.gdata : "0")
-#ifdef S_CONFEDIT
 static int	do_confedit = 0;		/* show conf menu if -C */
-#endif /* S_CONFEDIT */
 #ifdef LEAF
 static char    do_killbot[21] = "";
 #endif /* LEAF */
@@ -285,11 +283,9 @@ static void dtx_arg(int argc, char *argv[])
         strncpyz(origbotname, optarg, NICKLEN + 1);
         break;
 #endif /* LEAF */
-#ifdef S_CONFEDIT
       case 'C':
         do_confedit = 1;
         break;
-#endif /* S_CONFEDIT */
       case 'h':
         show_help();
 #ifdef LEAF
@@ -564,12 +560,10 @@ static void startup_checks() {
   if (can_stat(cfile))
     readconf(cfile, enc);
       
-#ifdef S_CONFEDIT
 #ifndef CYGWIN_HACKS
   if (do_confedit)
     confedit(cfile);		/* this will exit() */
 #endif /* !CYGWIN_HACKS */
-#endif /* S_CONFEDIT */
   parseconf();
 
 #ifdef LEAF