From d04af54d5b0bf34c71c4695716e480a171b5a32b Mon Sep 17 00:00:00 2001 From: Stef Walter Date: Wed, 18 Mar 2009 20:35:09 +0000 Subject: Changes that support FreeBSD 7.2 --- srcx/jkill.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'srcx/jkill.c') diff --git a/srcx/jkill.c b/srcx/jkill.c index 1d5fa0e..aa7f9b8 100644 --- a/srcx/jkill.c +++ b/srcx/jkill.c @@ -88,8 +88,8 @@ static void usage_hr(const char* name); int main(int argc, char* argv[]) { - struct xprison* sxp = NULL; struct xprison* xp = NULL; + jails jls; size_t len; int jid, r, ret = 0; pid_t child; @@ -128,12 +128,12 @@ int main(int argc, char* argv[]) argc -= optind; argv += optind; - len = get_jail_sysctl(&sxp); + jails_load(&jls); /* For each jail */ for(; argc > 0; argc--, argv++) { - xp = find_jail(argv[0], len, sxp); + xp = jails_find(&jls, argv[0]); if(xp == NULL) { @@ -164,7 +164,7 @@ int main(int argc, char* argv[]) jid = xp->pr_id; /* Always free jail info before going into jail */ - free_jail_sysctl(len, sxp); + jails_done(&jls); if(jail_attach(jid) == -1) err(1, "couldn't attach to jail"); @@ -189,7 +189,7 @@ int main(int argc, char* argv[]) argv++; } - free_jail_sysctl(len, sxp); + jails_done(&jls); return ret; } } -- cgit v1.2.3