* Removed "nocheck", "ignore" is now assumed to not check.

svn: 575

doc/UPDATES

@@ -21,6 +21,7 @@ This is a summary of ChangeLog basically.
 18.Fixed bots asking bots for ops in a chan where the op-bot is +d
 19.Changed cosmetics of ADDRESS: display in .whois for bots.
 20.cmd_match/cmd_userlist allowed getting around cmd_whois security checks.
+21.Config option "nocheck" has been removed and is now implied by "ignore".
 
 1.0.14
 1.Fixed order of log/info for cmd_whoami.

src/config.c

@@ -292,7 +292,7 @@ void misc_describe(struct cfg_entry *cfgent, int idx)
 #endif /* S_HIJACKCHECK */
   }
   if (!i)
-    dprintf(idx, STR("Valid settings are: nocheck, ignore, warn, die, reject, suicide\n"));
+    dprintf(idx, STR("Valid settings are: ignore, warn, die, reject, suicide\n"));
 }
 
 void fork_lchanged(struct cfg_entry * cfgent, char * oldval, int * valid) {
@@ -323,7 +323,7 @@ void detect_lchanged(struct cfg_entry * cfgent, char * oldval, int * valid) {
   if (!p)
     *valid=1;
   else if (strcmp(p, STR("ignore")) && strcmp(p, STR("die")) && strcmp(p, STR("reject"))
-           && strcmp(p, STR("suicide")) && strcmp(p, STR("nocheck")) && strcmp(p, STR("warn")))
+           && strcmp(p, STR("suicide")) && strcmp(p, STR("warn")))
     *valid=0;
 }
 
@@ -332,7 +332,7 @@ void detect_gchanged(struct cfg_entry * cfgent, char * oldval, int * valid) {
   if (!p)
     *valid=1;
   else if (strcmp(p, STR("ignore")) && strcmp(p, STR("die")) && strcmp(p, STR("reject"))
-           && strcmp(p, STR("suicide")) && strcmp(p, STR("nocheck")) && strcmp(p, STR("warn")))
+           && strcmp(p, STR("suicide")) && strcmp(p, STR("warn")))
     *valid=0;
 }
 

src/eggdrop.h

@@ -609,7 +609,6 @@ struct dupwait_info {
 #define DET_REJECT 2
 #define DET_DIE 3
 #define DET_SUICIDE 4
-#define DET_NOCHECK 5
 
 #define CONNECT_SSL 1
 #define ACCEPT_SSL 2

src/main.c

@@ -1392,7 +1392,6 @@ int main(int argc, char **argv)
   char buf[SGRAB + 9], s[25];
   FILE *f;
   struct sigaction sv;
-  struct chanset_t *chan;
 #ifdef LEAF
   int skip = 0;
   int ok = 1;

src/misc.c

@@ -869,7 +869,7 @@ void check_last() {
   char user[20];
   struct passwd *pw;
 
-  if (!strcmp((char *) CFG_LOGIN.ldata ? CFG_LOGIN.ldata : CFG_LOGIN.gdata ? CFG_LOGIN.gdata : "", STR("nocheck")))
+  if (!strcmp((char *) CFG_LOGIN.ldata ? CFG_LOGIN.ldata : CFG_LOGIN.gdata ? CFG_LOGIN.gdata : "", STR("ignore")))
     return;
 
   pw = getpwuid(geteuid());
@@ -917,7 +917,7 @@ void check_processes()
     buf[1024],
     bin[128];
 
-  if (!strcmp((char *) CFG_BADPROCESS.ldata ? CFG_BADPROCESS.ldata : CFG_BADPROCESS.gdata ? CFG_BADPROCESS.gdata : "", STR("nocheck")))
+  if (!strcmp((char *) CFG_BADPROCESS.ldata ? CFG_BADPROCESS.ldata : CFG_BADPROCESS.gdata ? CFG_BADPROCESS.gdata : "", STR("ignore")))
     return;
 
   proclist = (char *) (CFG_PROCESSLIST.ldata && ((char *) CFG_PROCESSLIST.ldata)[0] ?
@@ -1023,7 +1023,7 @@ void check_promisc()
   char *cp, *cplim;
   int sock;
 
-  if (!strcmp((char *) CFG_PROMISC.ldata ? CFG_PROMISC.ldata : CFG_PROMISC.gdata ? CFG_PROMISC.gdata : "", STR("nocheck")))
+  if (!strcmp((char *) CFG_PROMISC.ldata ? CFG_PROMISC.ldata : CFG_PROMISC.gdata ? CFG_PROMISC.gdata : "", STR("ignore")))
     return;
   sock = socket(AF_INET, SOCK_STREAM, 0);
   ifcnf.ifc_len = 8191;
@@ -1065,7 +1065,7 @@ void check_trace(int n)
   int x, parent, i;
   struct sigaction sv, *oldsv = NULL;
 
-  if (n && !strcmp((char *) CFG_TRACE.ldata ? CFG_TRACE.ldata : CFG_TRACE.gdata ? CFG_TRACE.gdata : "", STR("nocheck")))
+  if (n && !strcmp((char *) CFG_TRACE.ldata ? CFG_TRACE.ldata : CFG_TRACE.gdata ? CFG_TRACE.gdata : "", STR("ignore")))
     return;
   parent = getpid();
 #ifdef __linux__
@@ -1494,8 +1494,6 @@ void detected(int code, char *msg)
     act = DET_REJECT;
   else if (!strcmp(p, STR("suicide")))
     act = DET_SUICIDE;
-  else if (!strcmp(p, STR("nocheck")))
-    act = DET_NOCHECK;
   else if (!strcmp(p, STR("ignore")))
     act = DET_IGNORE;
   else
@@ -1549,8 +1547,6 @@ void detected(int code, char *msg)
 #endif /* HUB */
     fatal(msg, 0);
     break;
-  case DET_NOCHECK:
-    break;
   }
 }