Explorar o código

* Removed cmd line param '-s'; Tracing bot on startup will always make the bot die right away.

svn: 2305
Bryan Drewery %!s(int64=21) %!d(string=hai) anos
pai
achega
fdf8a74aa0
Modificáronse 2 ficheiros con 8 adicións e 10 borrados
  1. 1 0
      doc/UPDATES
  2. 7 10
      src/main.c

+ 1 - 0
doc/UPDATES

@@ -51,6 +51,7 @@ Lines prefixed with '-' were disabled before release and are not finished, or ar
 * Added CIDR/mask matching support for all user hosts, ie, '.+host user *!jerry@1.2.0.0/16' will match 'bob!jerry@1.2.3.4'
 * 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.
 
 1.2.4
 * Fixed cmd_botset not displaying botnick.

+ 7 - 10
src/main.c

@@ -99,7 +99,6 @@ int do_confedit = 0;		/* show conf menu if -C */
 static char do_killbot[21] = "";
 static int kill_sig;
 static char *update_bin = NULL;
-bool checktrace = 1;		/* Check for trace when starting up? */
 char *socksfile = NULL;
 
 static char *getfullbinname(const char *argv_zero)
@@ -274,7 +273,7 @@ static void show_help()
 }
 
 // leaf: BkLP
-#define PARSE_FLAGS STR("0234:aB:cCd:De:EH:k:hnr:stu:U:v")
+#define PARSE_FLAGS STR("0234:aB:cCd:De:EH:k:hnr:tu:U:v")
 #define FLAGS_CHECKPASS STR("cCdDeEhknrtuUv")
 static void dtx_arg(int argc, char *argv[])
 {
@@ -330,9 +329,6 @@ static void dtx_arg(int argc, char *argv[])
       case 'n':
 	backgrd = 0;
 	break;
-      case 's':
-        checktrace = 0;
-        break;
       case 't':
         term_z = 1;
         break;
@@ -638,6 +634,12 @@ int main(int argc, char **argv)
 {
   egg_timeval_t egg_timeval_now;
 
+#ifndef DEBUG
+#ifndef CYGWIN_HACKS
+  check_trace(1);
+#endif /* !CYGWIN_HACKS */
+#endif
+
   /* Initialize variables and stuff */
   timer_update_now(&egg_timeval_now);
   now = egg_timeval_now.sec;
@@ -716,11 +718,6 @@ printf("out: %s\n", out);
 
   sdprintf("my euid: %d my uuid: %d, my ppid: %d my pid: %d", myuid, getuid(), getppid(), mypid);
 
-#ifndef CYGWIN_HACKS
-  if (checktrace)
-    check_trace(1);
-#endif /* !CYGWIN_HACKS */
-
   /* Check and load conf file */
   startup_checks(0);