Deleted Added
full compact
jailp.h (223263) jailp.h (223351)
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: projects/jailconf/usr.sbin/jail/jailp.h 223263 2011-06-18 15:23:08Z jamie $
26 * $FreeBSD: projects/jailconf/usr.sbin/jail/jailp.h 223351 2011-06-20 23:04:13Z 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

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

82 IP_EXEC_POSTSTOP, /* Commands run outside jail after removing */
83 IP_EXEC_PRESTART, /* Commands run outside jail before creating */
84 IP_EXEC_PRESTOP, /* Commands run outside jail before removing */
85 IP_EXEC_START, /* Commands run inside jail on creation */
86 IP_EXEC_STOP, /* Commands run inside jail on removal */
87 IP_EXEC_SYSTEM_JAIL_USER,/* Get jail_user from system passwd file */
88 IP_EXEC_SYSTEM_USER, /* Run non-jailed commands as this user */
89 IP_EXEC_TIMEOUT, /* Time to wait for a command to complete */
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

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

82 IP_EXEC_POSTSTOP, /* Commands run outside jail after removing */
83 IP_EXEC_PRESTART, /* Commands run outside jail before creating */
84 IP_EXEC_PRESTOP, /* Commands run outside jail before removing */
85 IP_EXEC_START, /* Commands run inside jail on creation */
86 IP_EXEC_STOP, /* Commands run inside jail on removal */
87 IP_EXEC_SYSTEM_JAIL_USER,/* Get jail_user from system passwd file */
88 IP_EXEC_SYSTEM_USER, /* Run non-jailed commands as this user */
89 IP_EXEC_TIMEOUT, /* Time to wait for a command to complete */
90#if defined(INET) || defined(INET6)
90 IP_INTERFACE, /* Add IP addresses to this interface */
91 IP_IP_HOSTNAME, /* Get jail IP address(es) from hostname */
91 IP_INTERFACE, /* Add IP addresses to this interface */
92 IP_IP_HOSTNAME, /* Get jail IP address(es) from hostname */
93#endif
92 IP_MOUNT, /* Mount points in fstab(5) form */
93 IP_MOUNT_DEVFS, /* Mount /dev under prison root */
94 IP_MOUNT_DEVFS_RULESET, /* Ruleset for the devfs mount */
95 IP_MOUNT_FSTAB, /* A standard fstab(5) file */
96 IP_STOP_TIMEOUT, /* Time to wait after sending SIGTERM */
97 IP_VNET_INTERFACE, /* Assign interface(s) to vnet jail */
94 IP_MOUNT, /* Mount points in fstab(5) form */
95 IP_MOUNT_DEVFS, /* Mount /dev under prison root */
96 IP_MOUNT_DEVFS_RULESET, /* Ruleset for the devfs mount */
97 IP_MOUNT_FSTAB, /* A standard fstab(5) file */
98 IP_STOP_TIMEOUT, /* Time to wait after sending SIGTERM */
99 IP_VNET_INTERFACE, /* Assign interface(s) to vnet jail */
100#ifdef INET
98 IP__IP4_IFADDR, /* Copy of ip4.addr with interface/netmask */
101 IP__IP4_IFADDR, /* Copy of ip4.addr with interface/netmask */
102#endif
99#ifdef INET6
100 IP__IP6_IFADDR, /* Copy of ip6.addr with interface/prefixlen */
101#endif
102 IP__MOUNT_FROM_FSTAB, /* Line from mount.fstab file */
103 IP__OP, /* Placeholder for requested operation */
104 KP_ALLOW_CHFLAGS,
105 KP_ALLOW_MOUNT,
106 KP_ALLOW_RAW_SOCKETS,
107 KP_ALLOW_SET_HOSTNAME,
108 KP_ALLOW_SOCKET_AF,
109 KP_ALLOW_SYSVIPC,
110 KP_ENFORCE_STATFS,
111 KP_HOST_HOSTNAME,
103#ifdef INET6
104 IP__IP6_IFADDR, /* Copy of ip6.addr with interface/prefixlen */
105#endif
106 IP__MOUNT_FROM_FSTAB, /* Line from mount.fstab file */
107 IP__OP, /* Placeholder for requested operation */
108 KP_ALLOW_CHFLAGS,
109 KP_ALLOW_MOUNT,
110 KP_ALLOW_RAW_SOCKETS,
111 KP_ALLOW_SET_HOSTNAME,
112 KP_ALLOW_SOCKET_AF,
113 KP_ALLOW_SYSVIPC,
114 KP_ENFORCE_STATFS,
115 KP_HOST_HOSTNAME,
116#ifdef INET
112 KP_IP4_ADDR,
117 KP_IP4_ADDR,
118#endif
113#ifdef INET6
114 KP_IP6_ADDR,
115#endif
116 KP_JID,
117 KP_NAME,
118 KP_PATH,
119 KP_PERSIST,
120 KP_SECURELEVEL,

--- 105 unchanged lines hidden ---
119#ifdef INET6
120 KP_IP6_ADDR,
121#endif
122 KP_JID,
123 KP_NAME,
124 KP_PATH,
125 KP_PERSIST,
126 KP_SECURELEVEL,

--- 105 unchanged lines hidden ---