diff options
| author | jamie <jamie@FreeBSD.org> | 2011-06-20 23:04:13 +0000 |
|---|---|---|
| committer | jamie <jamie@FreeBSD.org> | 2011-06-20 23:04:13 +0000 |
| commit | 6811668a5f8d31f9754803ba22ad926b39c67e0c (patch) | |
| tree | 3722fb521d5a390da637c2798c9d3498b8340a42 /usr.sbin/jail/command.c | |
| parent | 6a72e94c3019b6332e3ceed20230b005217aaa55 (diff) | |
| download | FreeBSD-src-6811668a5f8d31f9754803ba22ad926b39c67e0c.zip FreeBSD-src-6811668a5f8d31f9754803ba22ad926b39c67e0c.tar.gz | |
Following r222465:
Check for IPv4 or IPv6 to be available by the kernel to not
provoke errors trying to query options not available.
Make it possible to compile out INET or INET6 only parts.
Diffstat (limited to 'usr.sbin/jail/command.c')
| -rw-r--r-- | usr.sbin/jail/command.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/usr.sbin/jail/command.c b/usr.sbin/jail/command.c index b8f7d72..eaaab15 100644 --- a/usr.sbin/jail/command.c +++ b/usr.sbin/jail/command.c @@ -247,12 +247,15 @@ run_command(struct cfjail *j) const struct cfstring *comstring, *s; login_cap_t *lcap; char **argv; - char *cs, *addr, *comcs, *devpath; + char *cs, *comcs, *devpath; const char *jidstr, *conslog, *path, *ruleset, *term, *username; enum intparam comparam; size_t comlen; pid_t pid; int argc, bg, clean, consfd, down, fib, i, injail, sjuser, timeout; +#if defined(INET) || defined(INET6) + char *addr; +#endif static char *cleanenv; @@ -295,6 +298,7 @@ run_command(struct cfjail *j) comstring = j->comstring; bg = 0; switch (comparam) { +#ifdef INET case IP__IP4_IFADDR: argv = alloca(8 * sizeof(char *)); *(const char **)&argv[0] = _PATH_IFCONFIG; @@ -326,6 +330,7 @@ run_command(struct cfjail *j) *(const char **)&argv[argc] = down ? "-alias" : "alias"; argv[argc + 1] = NULL; break; +#endif #ifdef INET6 case IP__IP6_IFADDR: |
