Deleted Added
full compact
jailp.h (234712) jailp.h (234988)
1/*-
2 * Copyright (c) 2011 James Gritton.
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 9 unchanged lines hidden (view full) ---

18 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
19 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 *
1/*-
2 * Copyright (c) 2011 James Gritton.
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 9 unchanged lines hidden (view full) ---

18 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
19 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 *
26 * $FreeBSD: head/usr.sbin/jail/jailp.h 234712 2012-04-26 17:36:05Z jamie $
26 * $FreeBSD: head/usr.sbin/jail/jailp.h 234988 2012-05-03 21:39:23Z jamie $
27 */
28
29#include <sys/param.h>
30#include <sys/types.h>
31#include <sys/jail.h>
32#include <sys/queue.h>
33#include <sys/time.h>
34

--- 31 unchanged lines hidden (view full) ---

66#define JF_OP_MASK (JF_START | JF_SET | JF_STOP)
67#define JF_RESTART (JF_START | JF_STOP)
68#define JF_START_SET (JF_START | JF_SET)
69#define JF_SET_RESTART (JF_SET | JF_STOP)
70#define JF_START_SET_RESTART (JF_START | JF_SET | JF_STOP)
71#define JF_DO_STOP(js) (((js) & (JF_SET | JF_STOP)) == JF_STOP)
72
73enum intparam {
27 */
28
29#include <sys/param.h>
30#include <sys/types.h>
31#include <sys/jail.h>
32#include <sys/queue.h>
33#include <sys/time.h>
34

--- 31 unchanged lines hidden (view full) ---

66#define JF_OP_MASK (JF_START | JF_SET | JF_STOP)
67#define JF_RESTART (JF_START | JF_STOP)
68#define JF_START_SET (JF_START | JF_SET)
69#define JF_SET_RESTART (JF_SET | JF_STOP)
70#define JF_START_SET_RESTART (JF_START | JF_SET | JF_STOP)
71#define JF_DO_STOP(js) (((js) & (JF_SET | JF_STOP)) == JF_STOP)
72
73enum intparam {
74 IP_ALLOW_DYING = 1, /* Allow making changes to a dying jail */
74 IP__NULL = 0, /* Null command */
75 IP_ALLOW_DYING, /* Allow making changes to a dying jail */
75 IP_COMMAND, /* Command run inside jail at creation */
76 IP_DEPEND, /* Jail starts after (stops before) another */
77 IP_EXEC_CLEAN, /* Run commands in a clean environment */
78 IP_EXEC_CONSOLELOG, /* Redirect optput for commands run in jail */
79 IP_EXEC_FIB, /* Run jailed commands with this FIB */
80 IP_EXEC_JAIL_USER, /* Run jailed commands as this user */
81 IP_EXEC_POSTSTART, /* Commands run outside jail after creating */
82 IP_EXEC_POSTSTOP, /* Commands run outside jail after removing */

--- 150 unchanged lines hidden ---
76 IP_COMMAND, /* Command run inside jail at creation */
77 IP_DEPEND, /* Jail starts after (stops before) another */
78 IP_EXEC_CLEAN, /* Run commands in a clean environment */
79 IP_EXEC_CONSOLELOG, /* Redirect optput for commands run in jail */
80 IP_EXEC_FIB, /* Run jailed commands with this FIB */
81 IP_EXEC_JAIL_USER, /* Run jailed commands as this user */
82 IP_EXEC_POSTSTART, /* Commands run outside jail after creating */
83 IP_EXEC_POSTSTOP, /* Commands run outside jail after removing */

--- 150 unchanged lines hidden ---