Sfoglia il codice sorgente

Merge branch 'maint'

* maint:
  Update docs
  Fix ptrace(3)/startup on OpenBSD after 868acbfc1a
Bryan Drewery 8 anni fa
parent
commit
77b5e758dc
2 ha cambiato i file con 3 aggiunte e 1 eliminazioni
  1. 2 0
      doc/UPDATES.md
  2. 1 1
      src/shell.cc

+ 2 - 0
doc/UPDATES.md

@@ -2,6 +2,8 @@
   * Require C++11 compiler support (G++ 4.7+, clang32+)
 
 # maint
+  * Fix various compile warnings
+  * Fix ptrace detection on OpenBSD (after 1.4.6 regression for the Linux fix)
 
 # 1.4.8
   * Support Debian/Ubuntu's libssl1.0.0[:i386] package.

+ 1 - 1
src/shell.cc

@@ -385,7 +385,7 @@ void check_trace(int start)
             /* Linux compat or otherwise removed syscall. Just ignore. */
             errno != ENOSYS &&
         /* EPERM is given on fbsd when security.bsd.unprivileged_proc_debug=0 */
-#ifdef __FreeBSD__
+#ifndef __linux__
             errno != EPERM &&
 #endif
             errno != EINVAL) {