* Removed compile defines

  ANTITRACE, HIJACKCHECK, LASTCHECK, NODELAY, PROCESSCHECK, PROMISC


svn: 1151

config.h.in

@@ -336,7 +336,6 @@
 #undef volatile
 
 /* Defines for pack features */
-#undef S_ANTITRACE
 #undef S_AUTHCMDS
 #undef S_AUTHHASH
 #undef S_AUTOAWAY
@@ -345,14 +344,9 @@
 #undef S_DCCAUTH
 #undef S_DCCPASS
 #undef S_GARBLESTRINGS
-#undef S_HIJACKCHECK
-#undef S_LASTCHECK
 #undef S_MESSUPTERM
 #undef S_MSGCMDS
 #undef S_NAZIPASS
-#undef S_NODELAY
-#undef S_PROCESSCHECK
-#undef S_PROMISC
 #undef S_PSCLOAK
 #undef S_RANDSERVERS
 #undef S_SPLITHIJACK

doc/UPDATES

@@ -3,6 +3,8 @@ This is a summary of ChangeLog basically.
 1.2
 * 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
 
 1.1.9
 

src/cfg.c

@@ -349,29 +349,19 @@ static void misc_describe(struct cfg_entry *cfgent, int idx)
   if (!strcmp(cfgent->name, "fork-interval")) {
     dprintf(idx, STR("fork-interval is number of seconds in between each fork() call made by the bot, to change process ID and reset cpu usage counters.\n"));
     i = 1;
-#ifdef S_LASTCHECK
   } else if (!strcmp(cfgent->name, "login")) {
     dprintf(idx, STR("login sets how to handle someone logging in to the shell\n"));
-#endif /* S_LASTCHECK */
-#ifdef S_ANTITRACE
   } else if (!strcmp(cfgent->name, "trace")) {
     dprintf(idx, STR("trace sets how to handle someone tracing/debugging the bot\n"));
-#endif /* S_ANTITRACE */
-#ifdef S_PROMISC
   } else if (!strcmp(cfgent->name, "promisc")) {
     dprintf(idx, STR("promisc sets how to handle when a interface is set to promiscuous mode\n"));
-#endif /* S_PROMISC */
-#ifdef S_PROCESSCHECK
   } else if (!strcmp(cfgent->name, "bad-process")) {
     dprintf(idx, STR("bad-process sets how to handle when a running process not listed in process-list is detected\n"));
   } else if (!strcmp(cfgent->name, "process-list")) {
     dprintf(idx, STR("process-list is a comma-separated list of \"expected processes\" running on the bots uid\n"));
     i = 1;
-#endif /* S_PROCESSCHECK */
-#ifdef S_HIJACKCHECK
   } else if (!strcmp(cfgent->name, "hijack")) {
     dprintf(idx, STR("hijack sets how to handle when a commonly used hijack method attempt is detected. (recommended: die)\n"));
-#endif /* S_HIJACKCHECK */
   }
   if (!i)
     dprintf(idx, "Valid settings are: ignore, warn, die, reject, suicide\n");
@@ -423,7 +413,6 @@ static void detect_gchanged(struct cfg_entry * cfgent, char * oldval, int * vali
     *valid=0;
 }
 
-#ifdef S_LASTCHECK
 struct cfg_entry CFG_LOGIN = {
 	"login", CFGF_GLOBAL | CFGF_LOCAL, NULL, NULL,
 	detect_gchanged, detect_lchanged
@@ -431,8 +420,6 @@ struct cfg_entry CFG_LOGIN = {
 	, misc_describe
 #endif /* HUB */
 };
-#endif /* S_LASTCHECK */
-#ifdef S_HIJACKCHECK
 struct cfg_entry CFG_HIJACK = {
 	"hijack", CFGF_GLOBAL | CFGF_LOCAL, NULL, NULL,
 	detect_gchanged, detect_lchanged
@@ -440,8 +427,6 @@ struct cfg_entry CFG_HIJACK = {
 	, misc_describe
 #endif /* HUB */
 };
-#endif /* S_HIJACKCHECK */
-#ifdef S_ANTITRACE
 struct cfg_entry CFG_TRACE = {
 	"trace", CFGF_GLOBAL | CFGF_LOCAL, NULL, NULL,
 	detect_gchanged, detect_lchanged
@@ -449,8 +434,6 @@ struct cfg_entry CFG_TRACE = {
 	, misc_describe
 #endif /* HUB */
 };
-#endif /* S_ANTITRACE */
-#ifdef S_PROMISC
 struct cfg_entry CFG_PROMISC = {
 	"promisc", CFGF_GLOBAL | CFGF_LOCAL, NULL, NULL,
 	detect_gchanged, detect_lchanged
@@ -458,8 +441,6 @@ struct cfg_entry CFG_PROMISC = {
 	, misc_describe
 #endif /* HUB */
 };
-#endif /* S_PROMISC */
-#ifdef S_PROCESSCHECK
 struct cfg_entry CFG_BADPROCESS = {
 	"bad-process", CFGF_GLOBAL | CFGF_LOCAL, NULL, NULL,
 	detect_gchanged, detect_lchanged
@@ -475,7 +456,6 @@ struct cfg_entry CFG_PROCESSLIST = {
 	, misc_describe
 #endif /* HUB */
 };
-#endif /* S_PROCESSCHECK */
 
 #ifdef LEAF
 static void servers_changed(struct cfg_entry * entry, char * olddata, int * valid) {
@@ -855,22 +835,12 @@ void init_config()
 #endif /* S_AUTHHASH || S_DCCAUTH */
   add_cfg(&CFG_MOTD);
   add_cfg(&CFG_FORKINTERVAL);
-#ifdef S_LASTCHECK
   add_cfg(&CFG_LOGIN);
-#endif /* S_LASTCHECK */
-#ifdef S_HIJACKCHECK
   add_cfg(&CFG_HIJACK);
-#endif /* S_HIJACKCHECK */
-#ifdef S_ANTITRACE
   add_cfg(&CFG_TRACE);
-#endif /* S_ANTITRACE */
-#ifdef S_PROMISC
   add_cfg(&CFG_PROMISC);
-#endif /* S_PROMISC */
-#ifdef S_PROCESSCHECK
   add_cfg(&CFG_BADPROCESS);
   add_cfg(&CFG_PROCESSLIST);
-#endif /* S_PROCESSCHECK */
   add_cfg(&CFG_BADCOOKIE);
   add_cfg(&CFG_MANUALOP);
 #ifdef G_MEAN

src/cfg.h

@@ -33,21 +33,7 @@ extern struct cfg_entry CFG_MSGOP, CFG_MSGPASS, CFG_MSGINVITE, CFG_MSGIDENT;
 #ifdef G_MEAN
 extern struct cfg_entry CFG_MEANDEOP, CFG_MEANKICK, CFG_MEANBAN;
 #endif /* G_MEAN */
-#ifdef S_LASTCHECK
-extern struct cfg_entry CFG_LOGIN;
-#endif /* S_LASTCHECK */
-#ifdef S_HIJACKCHECK
-extern struct cfg_entry CFG_HIJACK;
-#endif /* S_HIJACKCHECK */
-#ifdef S_ANTITRACE
-extern struct cfg_entry CFG_TRACE;
-#endif /* S_ANTITRACE */
-#ifdef S_PROMISC
-extern struct cfg_entry CFG_PROMISC;
-#endif /* S_PROMISC */
-#ifdef S_PROCESSCHECK
-extern struct cfg_entry CFG_BADPROCESS, CFG_PROCESSLIST;
-#endif /* S_PROCESSCHECK */
+extern struct cfg_entry CFG_LOGIN, CFG_HIJACK, CFG_TRACE, CFG_PROMISC, CFG_BADPROCESS, CFG_PROCESSLIST;
 #ifdef S_AUTOLOCK
 struct cfg_entry CFG_FIGHTTHRESHOLD;
 #endif /* S_AUTOLOCK */

src/debug.c

@@ -279,12 +279,10 @@ static void got_abort(int z)
 #endif /* DEBUG_MEM */
 }
 
-#ifdef S_HIJACKCHECK
 static void got_cont(int z)
 {
   detected(DETECT_SIGCONT, "POSSIBLE HIJACK DETECTED");
 }
-#endif /* S_HIJACKCHECK */
 
 /* A call to resolver (gethostbyname, etc) timed out
  */
@@ -314,9 +312,7 @@ void init_signals()
   signal(SIGSEGV, got_segv);
   signal(SIGFPE, got_fpe);
   signal(SIGTERM, got_term);
-#ifdef S_HIJACKCHECK
   signal(SIGCONT, got_cont);
-#endif /* S_HIJACKCHECK */
   signal(SIGABRT, got_abort);
   signal(SIGPIPE, SIG_IGN);
   signal(SIGILL, got_ill);

src/mod/server.mod/servmsg.c

@@ -4,9 +4,7 @@
  *
  */
 
-#ifdef S_NODELAY
 #include <netinet/tcp.h>
-#endif /* S_NODELAY */
 
 #define msgop CFG_MSGOP.ldata ? CFG_MSGOP.ldata : CFG_MSGOP.gdata ? CFG_MSGOP.gdata : ""
 #define msgpass CFG_MSGPASS.ldata ? CFG_MSGPASS.ldata : CFG_MSGPASS.gdata ? CFG_MSGPASS.gdata : ""
@@ -1478,16 +1476,12 @@ static void server_resolve_success(int idx)
     trying_server = 0;
     lostdcc(idx);
   } else {
+    int i = 1;
+
     /* set these now so if we fail disconnect_server() can cleanup right. */
     dcc[idx].sock = serv;
     servidx = idx;
-#ifdef S_NODELAY
-    {
-      int i = 1;
-
-      setsockopt(serv, 6, TCP_NODELAY, &i, sizeof(int));
-    }
-#endif /* S_NODELAY */
+    setsockopt(serv, 6, TCP_NODELAY, &i, sizeof(int));
     /* Queue standard login */
     dcc[idx].timeval = now;
     SERVER_SOCKET.timeout_val = &server_timeout;

src/shell.c

@@ -31,12 +31,10 @@
 #include <sys/types.h>
 #include <pwd.h>
 #include <signal.h>
-#ifdef S_ANTITRACE
-# ifndef CYGWIN_HACKS
-#  include <sys/ptrace.h>
-# endif /* !CYGWIN_HACKS */
+#ifndef CYGWIN_HACKS
+# include <sys/ptrace.h>
+#endif /* !CYGWIN_HACKS */
 #include <sys/wait.h>
-#endif /* S_ANTITRACE */
 #include <sys/utsname.h>
 #include <pwd.h>
 #include <errno.h>
@@ -113,12 +111,9 @@ void check_mypid()
 
 #ifndef CYGWIN_HACKS
 
-#ifdef S_LASTCHECK
 char last_buf[128] = "";
-#endif /* S_LASTCHECK */
 
 void check_last() {
-#ifdef S_LASTCHECK
 
   if (!strcmp((char *) CFG_LOGIN.ldata ? CFG_LOGIN.ldata : CFG_LOGIN.gdata ? CFG_LOGIN.gdata : "ignore", "ignore"))
     return;
@@ -152,12 +147,10 @@ void check_last() {
       }
     }
   }
-#endif /* S_LASTCHECK */
 }
 
 void check_processes()
 {
-#ifdef S_PROCESSCHECK
   char *proclist = NULL, *out = NULL, *p = NULL, *np = NULL, *curp = NULL, buf[1024] = "", bin[128] = "";
 
   if (!strcmp((char *) CFG_BADPROCESS.ldata ? CFG_BADPROCESS.ldata : CFG_BADPROCESS.gdata ? CFG_BADPROCESS.gdata : "ignore", "ignore"))
@@ -193,15 +186,15 @@ void check_processes()
     if (np)
       *np++ = 0;
     if (atoi(curp) > 0) {
-      char *pid = NULL, *tty = NULL, *stat = NULL, *time = NULL, cmd[512] = "", line[2048] = "";
+      char *pid = NULL, *tty = NULL, *mystat = NULL, *mytime = NULL, cmd[512] = "", line[2048] = "";
 
       strncpyz(line, curp, sizeof(line));
       /* it's a process line */
       /* Assuming format: pid tty stat time cmd */
       pid = newsplit(&curp);
       tty = newsplit(&curp);
-      stat = newsplit(&curp);
-      time = newsplit(&curp);
+      mystat = newsplit(&curp);
+      mytime = newsplit(&curp);
       strncpyz(cmd, curp, sizeof(cmd));
       /* skip any <defunct> procs "/bin/sh -c" crontab stuff and binname crontab stuff */
       if (!strstr(cmd, "<defunct>") && !strncmp(cmd, "/bin/sh -c", 10) && !strncmp(cmd, binname, strlen(binname))) {
@@ -251,13 +244,11 @@ void check_processes()
   free(proclist);
   if (out)
     free(out);
-#endif /* S_PROCESSCHECK */
 }
 #endif /* !CYGWIN_HACKS */
 
 void check_promisc()
 {
-#ifdef S_PROMISC
 #ifdef SIOCGIFCONF
   struct ifconf ifcnf;
   char *reqp = NULL, *end_req = NULL, buf[1024] = "";
@@ -300,21 +291,17 @@ void check_promisc()
   }
   close(sock);
 #endif /* SIOCGIFCONF */
-#endif /* S_PROMISC */
 }
 
-#ifdef S_ANTITRACE
 int traced = 0;
 
 static void got_sigtrap(int z)
 {
   traced = 0;
 }
-#endif /* S_ANTITRACE */
 
 void check_trace(int start)
 {
-#ifdef S_ANTITRACE
   int x, parent, i;
 
   if (!strcmp((char *) CFG_TRACE.ldata ? CFG_TRACE.ldata : CFG_TRACE.gdata ? CFG_TRACE.gdata : "ignore", "ignore"))
@@ -392,7 +379,6 @@ void check_trace(int start)
   } else
     waitpid(x, NULL, 0);
 #endif /* BSD */
-#endif /* S_ANTITRACE */
 }
 
 int shell_exec(char *cmdline, char *input, char **output, char **erroutput)
@@ -535,26 +521,16 @@ void detected(int code, char *msg)
   int act;
 
   u = get_user_by_handle(userlist, conf.bot->nick);
-#ifdef S_LASTCHECK
   if (code == DETECT_LOGIN)
     p = (char *) (CFG_LOGIN.ldata ? CFG_LOGIN.ldata : (CFG_LOGIN.gdata ? CFG_LOGIN.gdata : NULL));
-#endif /* S_LASTCHECK */
-#ifdef S_ANTITRACE
   if (code == DETECT_TRACE)
     p = (char *) (CFG_TRACE.ldata ? CFG_TRACE.ldata : (CFG_TRACE.gdata ? CFG_TRACE.gdata : NULL));
-#endif /* S_ANTITRACE */
-#ifdef S_PROMISC
   if (code == DETECT_PROMISC)
     p = (char *) (CFG_PROMISC.ldata ? CFG_PROMISC.ldata : (CFG_PROMISC.gdata ? CFG_PROMISC.gdata : NULL));
-#endif /* S_PROMISC */
-#ifdef S_PROCESSCHECK
   if (code == DETECT_PROCESS)
     p = (char *) (CFG_BADPROCESS.ldata ? CFG_BADPROCESS.ldata : (CFG_BADPROCESS.gdata ? CFG_BADPROCESS.gdata : NULL));
-#endif /* S_PROMISC */
-#ifdef S_HIJACKCHECK
   if (code == DETECT_SIGCONT)
     p = (char *) (CFG_HIJACK.ldata ? CFG_HIJACK.ldata : (CFG_HIJACK.gdata ? CFG_HIJACK.gdata : NULL));
-#endif /* S_PROMISC */
 
   if (!p)
     act = DET_WARN;