* Port [3704] to 1.2.15

 * Fix the bot not starting up when it is not allowed to run ptrace() (FreeBSD: security.bsd.unprivileged_proc_debug=0)



svn: 3705

doc/UPDATES

@@ -20,6 +20,7 @@
 * Fix segfault in cmd_mmode (fixes #399)
 * Fix segfault from receiving from non-recursive dns servers. (fixes #401)
 * Fix some cases where the bot would pointlessly do WHO on users instead of on the channel to resolve a desync.
+* Fix the bot not starting up when it is not allowed to run ptrace() (FreeBSD: security.bsd.unprivileged_proc_debug=0)
 
 1.2.14 - http://wraith.botpack.net/milestone/1.2.14
 * Fix another bug in shell functions. (fixes #321)

src/shell.c

@@ -416,7 +416,8 @@ void check_trace(int start)
         return;
       case 0:		//child
         i = ptrace(PT_ATTACH, parent, 0, 0);
-        if (i == -1) {
+        /* EPERM is given on fbsd when security.bsd.unprivileged_proc_debug=0 */
+        if (i == -1 && errno != EPERM) {
           if (start) {
             kill(parent, SIGKILL);
             exit(1);
@@ -1114,7 +1115,7 @@ void crazy_trace()
     /* child */
     int i;
     i = ptrace(PTRACE_ATTACH, parent, (char *) 1, 0);
-    if (i == (-1) && errno == EPERM) {
+    if (i == -1) {
       printf("CANT PTRACE PARENT: errno: %d %s, i: %d\n", errno, strerror(errno), i);
       waitpid(parent, &i, 0);
       kill(parent, SIGCHLD);