diff options
| author | jamie <jamie@FreeBSD.org> | 2010-11-01 21:37:28 +0000 |
|---|---|---|
| committer | jamie <jamie@FreeBSD.org> | 2010-11-01 21:37:28 +0000 |
| commit | 94aa5f72213aae7248f78420b16afc320dd93e4b (patch) | |
| tree | 13d527af45d79158fed1a9c056342705e7780a0b /usr.sbin/jail/jail.c | |
| parent | 0cc1eb58369550147e49374b59c58673074f2b21 (diff) | |
| download | FreeBSD-src-94aa5f72213aae7248f78420b16afc320dd93e4b.zip FreeBSD-src-94aa5f72213aae7248f78420b16afc320dd93e4b.tar.gz | |
Combine check_intparams() and ip_params(), JF_CHECKINT and JF_IPPARAMS.
Diffstat (limited to 'usr.sbin/jail/jail.c')
| -rw-r--r-- | usr.sbin/jail/jail.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/usr.sbin/jail/jail.c b/usr.sbin/jail/jail.c index bea0322..fbfa28c 100644 --- a/usr.sbin/jail/jail.c +++ b/usr.sbin/jail/jail.c @@ -311,23 +311,17 @@ main(int argc, char **argv) dep_done(j, 0); continue; } - if (!(j->flags & JF_CHECKINT)) + if (!(j->flags & JF_PARAMS)) { - j->flags |= JF_CHECKINT; + j->flags |= JF_PARAMS; if (dflag) add_param(j, NULL, IP_ALLOW_DYING, NULL); if (check_intparams(j) < 0) continue; - } - if (!(j->flags & JF_IPPARAMS) && (!JF_DO_STOP(j->flags) || - j->intparams[IP_INTERFACE] != NULL)) { - j->flags |= JF_IPPARAMS; - if (ip_params(j) < 0) + if ((j->flags & (JF_START | JF_SET)) && + import_params(j) < 0) continue; } - if (j->jp == NULL && (j->flags & (JF_START | JF_SET)) && - import_params(j) < 0) - continue; if (!j->jid) running_jid(j, (j->flags & (JF_SET | JF_DEPEND)) == JF_SET |
