STABLE14-linux-allow-disabling-syscall-probing-20090602

LICENSE IPL10

give a configure switch to allow disabling syscall probing

(cherry picked from commit 091139b3e2160e1f56b11820d59589de9ccd9c40)

diff --git a/acinclude.m4 b/acinclude.m4
index 774bcc684402a6de91806d7ab67b87eb39deb708..bf59b5b65df4f38001077f7595700312712d98d3 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -175,6 +175,9 @@ AC_ARG_ENABLE(optimize-lwp,
 AC_ARG_ENABLE(warnings,
 [  --enable-warnings                   enable compilation warnings when building with gcc (defaults to disabled)],, enable_warnings="no"
 )
+AC_ARG_ENABLE(linux-syscall-probing,
+[--disable-linux-syscall-probing        disabling Linux syscall probing (defaults to enabled)],, enable_probing="yes"
+)
 
 enable_login="no"
 
@@ -1375,6 +1378,10 @@ else
 fi
 AC_SUBST(HAVE_PAM)
 
+if test "$enable_probing" = yes; then
+        AC_DEFINE(ENABLE_LINUX_SYSCALL_PROBING, 1, [define to enable syscall table probes])
+fi
+
 if test "$enable_login" = yes; then
        BUILD_LOGIN="yes"
 else

diff --git a/src/afs/LINUX/osi_probe.c b/src/afs/LINUX/osi_probe.c
index 91b95f6fe3a58978794fc595d2e013c92cce6c29..727000417ecc321ae9a5f7b858a16040682364ff 100644 (file)
--- a/src/afs/LINUX/osi_probe.c
+++ b/src/afs/LINUX/osi_probe.c
@@ -52,7 +52,7 @@
 #include <afsconfig.h>
 #include "afs/param.h"
 #endif
-#if defined(EXPORTED_INIT_MM)
+#if defined(ENABLE_LINUX_SYSCALL_PROBING) && defined(EXPORTED_INIT_MM)
 #ifdef AFS_LINUX24_ENV
 #include <linux/module.h> /* early to avoid printf->printk mapping */
 #ifndef OSI_PROBE_STANDALONE