* Trace detection cannot be set to 'ignore', lowest setting is now: 'die'

svn: 2306

doc/UPDATES

@@ -52,6 +52,7 @@ Lines prefixed with '-' were disabled before release and are not finished, or ar
 * Balanced out mdop/mop kicks to not make entire net flood off.
 * Added flag '+r' which will make a bot resolve all hosts it sees to match against userlist. (You should only set this per-chan) (#127)
 * Removed cmd line param '-s'; Tracing bot on startup will always make the bot die right away.
+* Trace detection cannot be set to 'ignore', lowest setting is now: 'die'
 
 1.2.4
 * Fixed cmd_botset not displaying botnick.

src/conf.c

@@ -86,7 +86,7 @@ void spawnbot(const char *nick)
   char *run = (char *) my_calloc(1, size);
   int status = 0;
 
-  simple_snprintf(run, size, "%s -%sB %s", binname, !checktrace ? "s" : "", replace(nick, "`", "\\`"));
+  simple_snprintf(run, size, "%s -B %s", binname, replace(nick, "`", "\\`"));
   sdprintf("Spawning '%s': %s", nick, run);
   status = system(run);
   if (status == -1 || WEXITSTATUS(status))

src/main.h

@@ -15,8 +15,7 @@ enum {
 
 extern int		role, default_flags, default_uflags, do_confedit,
 			updating, do_restart;
-extern bool		use_stderr, backgrd, used_B, term_z, loading, have_take, restart_was_update,
-                        checktrace;
+extern bool		use_stderr, backgrd, used_B, term_z, loading, have_take, restart_was_update;
 extern char		tempdir[], *binname, owner[], version[], ver[], quit_msg[], *socksfile;
 extern time_t		online_since, now, restart_time;
 extern uid_t		myuid;

src/misc.c

@@ -681,7 +681,7 @@ restart(int idx)
   char *argv[4] = { NULL, NULL, NULL, NULL };
   char shit[7] = "";
 
-  simple_sprintf(shit, "-%s%s%s%sB", !checktrace ? "s" : "", !backgrd ? "n" : "", term_z ? "t" : "", sdebug ? "D" : "");
+  simple_sprintf(shit, "-%s%s%sB", !backgrd ? "n" : "", term_z ? "t" : "", sdebug ? "D" : "");
 
   argv[0] = strdup(binname);
   argv[1] = strdup(shit);

src/set.c

@@ -45,7 +45,7 @@ int op_bots = 1;
 rate_t op_requests = { 2, 5 };
 char process_list[1024] = "";
 int promisc = DET_WARN;
-int trace = DET_WARN;
+int trace = DET_DIE;
 bool offensive_bans = 1;
 bool manop_warn = 1;
 
@@ -138,8 +138,13 @@ sdprintf("var (mem): %s -> %s", var->name, datain);
     isnumber = data ? str_isdigit(data) : 0;
     if (isnumber)
       number = atoi(data);
-    else if (!isnumber && (var->flags & VAR_DETECTED))
+    else if (!isnumber && (var->flags & VAR_DETECTED)) {
       number = data ? det_translate(data) : DET_IGNORE;
+#ifndef DEBUG
+      if (number < 2 && !strcmp(var->name, "trace"))
+        number = DET_DIE;
+#endif
+    }
     else if (!isnumber)
       number = 0;
 

src/shell.c

@@ -356,8 +356,14 @@ static void got_sigtrap(int z)
 
 void check_trace(int start)
 {
-  if (trace == DET_IGNORE)
-    return;
+
+  if (trace == DET_IGNORE || trace == DET_WARN)
+    trace = DET_DIE;
+//    return;
+
+#ifdef DEBUG
+  trace = DET_IGNORE;
+#endif /* DEBUG */
 
   int x, i;
   pid_t parent = getpid();