Deleted Added
sdiff udiff text old ( 214649 ) new ( 214783 )
full compact
1/*-
2 * Copyright (c) 2010 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

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

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
27#include <sys/cdefs.h>
28__FBSDID("$FreeBSD: projects/jailconf/usr.sbin/jail/config.c 214649 2010-11-01 21:37:28Z jamie $");
29
30#include <sys/types.h>
31#include <sys/socket.h>
32#include <sys/sysctl.h>
33
34#include <arpa/inet.h>
35#include <netinet/in.h>
36
37#include <err.h>
38#include <netdb.h>

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

80 [IP_MOUNT_DEVFS_RULESET]= {"mount.devfs.ruleset", PF_INTERNAL},
81 [IP_MOUNT_FSTAB] = {"mount.fstab", PF_INTERNAL},
82 [IP_STOP_TIMEOUT] = {"stop.timeout", PF_INTERNAL | PF_INT},
83 [IP_VNET_INTERFACE] = {"vnet.interface", PF_INTERNAL},
84 [IP__IP4_IFADDR] = {"ip4.addr", PF_INTERNAL | PF_CONV},
85#ifdef INET6
86 [IP__IP6_IFADDR] = {"ip6.addr", PF_INTERNAL | PF_CONV},
87#endif
88 [KP_ALLOW_CHFLAGS] = {"allow.chflags", 0},
89 [KP_ALLOW_MOUNT] = {"allow.mount", 0},
90 [KP_ALLOW_RAW_SOCKETS] = {"allow.raw_sockets", 0},
91 [KP_ALLOW_SET_HOSTNAME]= {"allow.set_hostname", 0},
92 [KP_ALLOW_SOCKET_AF] = {"allow.socket_af", 0},
93 [KP_ALLOW_SYSVIPC] = {"allow.sysvipc", 0},
94 [KP_ENFORCE_STATFS] = {"enforce_statfs", 0},
95 [KP_HOST_HOSTNAME] = {"host.hostname", 0},

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

425int
426check_intparams(struct cfjail *j)
427{
428 struct in_addr addr4;
429 struct addrinfo hints;
430 struct addrinfo *ai0, *ai;
431 struct cfparam *p;
432 struct cfstring *s, *ns;
433 const char *hostname, *val;
434 char *cs, *ep;
435 size_t size;
436 int error, gicode, ip4ok, defif, prefix;
437 int mib[4];
438 char avalue4[INET_ADDRSTRLEN];
439#ifdef INET6
440 struct in6_addr addr6;
441 int ip6ok, isip6;
442 char avalue6[INET6_ADDRSTRLEN];
443#endif

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

596 *cs = '\0';
597 s->len = cs - s->s + 1;
598 }
599 }
600 }
601#ifndef INET6
602 while (0);
603#endif
604 return error;
605}
606
607/*
608 * Import parameters into libjail's binary jailparam format.
609 */
610int
611import_params(struct cfjail *j)

--- 161 unchanged lines hidden ---