- 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
This commit is contained in:
Damien Miller 2011-06-23 19:45:51 +10:00
parent 80b62e3738
commit dcbd41e7af
6 changed files with 13 additions and 6 deletions

View File

@ -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)

View File

@ -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 */

View File

@ -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 */

View File

@ -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[] = {

2
sandbox.h → ssh-sandbox.h Executable file → Normal file
View File

@ -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>
*

4
sshd.c
View File

@ -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