Deleted Added
full compact
jailp.h (256387) jailp.h (278484)
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: stable/10/usr.sbin/jail/jailp.h 256387 2013-10-12 17:46:13Z hrs $
26 * $FreeBSD: stable/10/usr.sbin/jail/jailp.h 278484 2015-02-10 01:05:51Z 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

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

91 IP_EXEC_TIMEOUT, /* Time to wait for a command to complete */
92#if defined(INET) || defined(INET6)
93 IP_INTERFACE, /* Add IP addresses to this interface */
94 IP_IP_HOSTNAME, /* Get jail IP address(es) from hostname */
95#endif
96 IP_MOUNT, /* Mount points in fstab(5) form */
97 IP_MOUNT_DEVFS, /* Mount /dev under prison root */
98 IP_MOUNT_FDESCFS, /* Mount /dev/fd under prison root */
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

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

91 IP_EXEC_TIMEOUT, /* Time to wait for a command to complete */
92#if defined(INET) || defined(INET6)
93 IP_INTERFACE, /* Add IP addresses to this interface */
94 IP_IP_HOSTNAME, /* Get jail IP address(es) from hostname */
95#endif
96 IP_MOUNT, /* Mount points in fstab(5) form */
97 IP_MOUNT_DEVFS, /* Mount /dev under prison root */
98 IP_MOUNT_FDESCFS, /* Mount /dev/fd under prison root */
99 IP_MOUNT_PROCFS, /* Mount /proc under prison root */
99 IP_MOUNT_FSTAB, /* A standard fstab(5) file */
100 IP_STOP_TIMEOUT, /* Time to wait after sending SIGTERM */
101 IP_VNET_INTERFACE, /* Assign interface(s) to vnet jail */
102#ifdef INET
103 IP__IP4_IFADDR, /* Copy of ip4.addr with interface/netmask */
104#endif
105#ifdef INET6
106 IP__IP6_IFADDR, /* Copy of ip6.addr with interface/prefixlen */

--- 129 unchanged lines hidden ---
100 IP_MOUNT_FSTAB, /* A standard fstab(5) file */
101 IP_STOP_TIMEOUT, /* Time to wait after sending SIGTERM */
102 IP_VNET_INTERFACE, /* Assign interface(s) to vnet jail */
103#ifdef INET
104 IP__IP4_IFADDR, /* Copy of ip4.addr with interface/netmask */
105#endif
106#ifdef INET6
107 IP__IP6_IFADDR, /* Copy of ip6.addr with interface/prefixlen */

--- 129 unchanged lines hidden ---