- djm@cvs.openbsd.org 2011/06/23 09:34:13

     [sshd.c ssh-sandbox.h sandbox.h sandbox-rlimit.c sandbox-systrace.c]
     [sandbox-null.c]
     rename sandbox.h => ssh-sandbox.h to make things easier for portable

diff --git a/ChangeLog b/ChangeLog
index 9a6724225bd211400efacf4db4f996ce94bdae78..f9f9efcef2a6dac2a5fcf5738eefa8aa9ac53858 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -27,6 +27,10 @@
      [channels.c channels.h clientloop.c clientloop.h mux.c ssh.c]
      hook up a channel confirm callback to warn the user then requested X11
      forwarding was refused by the server; ok markus@
+   - djm@cvs.openbsd.org 2011/06/23 09:34:13
+     [sshd.c ssh-sandbox.h sandbox.h sandbox-rlimit.c sandbox-systrace.c]
+     [sandbox-null.c]
+     rename sandbox.h => ssh-sandbox.h to make things easier for portable
  - (djm) [sandbox-null.c] Dummy sandbox for platforms that don't support
    setrlimit(2)
 

diff --git a/sandbox-null.c b/sandbox-null.c
index eadaee2da937d725970c01dc8dfcbee89e693231..29fa9669fd85b7ad7448cd997aeca14f1c47bf60 100644 (file)
--- a/sandbox-null.c
+++ b/sandbox-null.c
@@ -1,3 +1,4 @@
+/* $OpenBSD$ */
 /*
  * Copyright (c) 2011 Damien Miller <djm@mindrot.org>
  *
@@ -28,7 +29,7 @@
 #include <unistd.h>
 
 #include "log.h"
-#include "sandbox.h"
+#include "ssh-sandbox.h"
 #include "xmalloc.h"
 
 /* dummy sandbox */

diff --git a/sandbox-rlimit.c b/sandbox-rlimit.c
index 4d832fc3df3d32320de3936c157fc60c7692dbf3..761e9284f8385de2bc219929f1b051fa8ca7772c 100644 (file)
--- a/sandbox-rlimit.c
+++ b/sandbox-rlimit.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: sandbox-rlimit.c,v 1.3 2011/06/23 09:34:13 djm Exp $ */
 /*
  * Copyright (c) 2011 Damien Miller <djm@mindrot.org>
  *
@@ -31,7 +32,7 @@
 #include <unistd.h>
 
 #include "log.h"
-#include "sandbox.h"
+#include "ssh-sandbox.h"
 #include "xmalloc.h"
 
 /* Minimal sandbox that sets zero nfiles, nprocs and filesize rlimits */

diff --git a/sandbox-systrace.c b/sandbox-systrace.c
index 5d0b7fb868a083017f3143bc8be61a39ed5e6347..8058b7d40557a3b470d5e831f648cb0b273a5cdb 100644 (file)
--- a/sandbox-systrace.c
+++ b/sandbox-systrace.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: sandbox-systrace.c,v 1.3 2011/06/23 09:34:13 djm Exp $ */
 /*
  * Copyright (c) 2011 Damien Miller <djm@mindrot.org>
  *
@@ -37,7 +38,7 @@
 
 #include "atomicio.h"
 #include "log.h"
-#include "sandbox.h"
+#include "ssh-sandbox.h"
 #include "xmalloc.h"
 
 static const int preauth_policy[] = {

diff --git a/sandbox.h b/ssh-sandbox.h
old mode 100755 (executable)
new mode 100644 (file)
similarity index 93%
rename from sandbox.h
rename to ssh-sandbox.h
index 5fe3064..dfecd5a
--- a/sandbox.h
+++ b/ssh-sandbox.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: sandbox.h,v 1.2 2011/06/22 22:14:05 djm Exp $ */
+/* $OpenBSD: ssh-sandbox.h,v 1.1 2011/06/23 09:34:13 djm Exp $ */
 /*
  * Copyright (c) 2011 Damien Miller <djm@mindrot.org>
  *

diff --git a/sshd.c b/sshd.c
index bebcb9bf5fb992a3881789ac58dd63a2c1a07132..cc10395588b73818cec694f5aa1a7c69b247f719 100644 (file)
--- a/sshd.c
+++ b/sshd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshd.c,v 1.384 2011/06/22 21:57:01 djm Exp $ */
+/* $OpenBSD: sshd.c,v 1.385 2011/06/23 09:34:13 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -118,7 +118,7 @@
 #endif
 #include "monitor_wrap.h"
 #include "roaming.h"
-#include "sandbox.h"
+#include "ssh-sandbox.h"
 #include "version.h"
 
 #ifdef LIBWRAP