浏览代码

Allow 'set trace ignore' again. Undoes a change from 2005.

Bryan Drewery 11 年之前
父节点
当前提交
aecea23d34
共有 2 个文件被更改,包括 4 次插入7 次删除
  1. 1 0
      doc/UPDATES
  2. 3 7
      src/shell.cc

+ 1 - 0
doc/UPDATES

@@ -1,6 +1,7 @@
 maint
   * Disable demo TCL support by default to prevent confusion during build.
   * Avoid apparmor ptrace(2) warnings on Ubuntu
+  * Allow 'set trace ignore' again. Undoes a change from 2005.
 
 1.4.5
   * Remove ahbl as it now positively identifies all hosts as abusive

+ 3 - 7
src/shell.cc

@@ -268,15 +268,11 @@ static void got_sigtrap(int z)
 
 void check_trace(int start)
 {
-  if (trace == DET_IGNORE || trace == DET_WARN)
-    trace = DET_DIE;
-//    return;
-
 #ifdef DEBUG
-  trace = DET_IGNORE;
-#endif /* DEBUG */
+  return;
+#endif
 
-  if (trace == DET_IGNORE)
+  if (start == 0 && trace == DET_IGNORE)
     return;
 
   pid_t parent = getpid();