Add a sandbox fallback mechanism, so that behaviour on Linux depends on

whether the running system's kernel has seccomp_filter support, not the
build system's kernel (forwarded upstream as
https://bugzilla.mindrot.org/show_bug.cgi?id=2011).

1 files changed, 23 insertions, 12 deletions

diff --git a/sandbox-null.c b/sandbox-null.c
index 29fa9669f..f62ac4b07 100644
--- a/sandbox-null.c
+++ b/sandbox-null.c
@@ -17,8 +17,6 @@
 
 #include "includes.h"
 
-#ifdef SANDBOX_NULL
-
 #include <sys/types.h>
 
 #include <errno.h>
@@ -38,8 +36,14 @@ struct ssh_sandbox {
         int junk;
 };
 
-struct ssh_sandbox *
-ssh_sandbox_init(void)
+static int
+sandbox_null_probe(void)
+{
+        return 1;
+}
+
+static void *
+sandbox_null_init(void)
 {
         struct ssh_sandbox *box;
 
@@ -51,22 +55,29 @@ ssh_sandbox_init(void)
         return box;
 }
 
-void
-ssh_sandbox_child(struct ssh_sandbox *box)
+static void
+sandbox_null_child(void *vbox)
 {
         /* Nothing to do here */
 }
 
-void
-ssh_sandbox_parent_finish(struct ssh_sandbox *box)
+static void
+sandbox_null_parent_finish(void *vbox)
 {
-        free(box);
+        free(vbox);
 }
 
-void
-ssh_sandbox_parent_preauth(struct ssh_sandbox *box, pid_t child_pid)
+static void
+sandbox_null_parent_preauth(void *box, pid_t child_pid)
 {
         /* Nothing to do here */
 }
 
-#endif /* SANDBOX_NULL */
+Sandbox ssh_sandbox_null = {
+        "null",
+        sandbox_null_probe,
+        sandbox_null_init,
+        sandbox_null_child,
+        sandbox_null_parent_finish,
+        sandbox_null_parent_preauth
+};