From 6dc044b45b93f60d6d8baab4ae1058b538d43831 Mon Sep 17 00:00:00 2001 From: Maxim Konovalov Date: Thu, 11 May 2006 19:06:33 +0000 Subject: [PATCH] o Style(9) the previous commit a bit. --- usr.sbin/jail/jail.c | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/usr.sbin/jail/jail.c b/usr.sbin/jail/jail.c index 1116ed649ba3..4580bac7f9e1 100644 --- a/usr.sbin/jail/jail.c +++ b/usr.sbin/jail/jail.c @@ -29,7 +29,6 @@ __FBSDID("$FreeBSD$"); #include static void usage(void); -static void setsecurelevel(int level); extern char **environ; #define GET_USER_INFO do { \ @@ -136,8 +135,11 @@ main(int argc, char **argv) errx(1, "Could not write JidFile: %s", JidFile); } } - if (securelevel > 0) - setsecurelevel(securelevel); + if (securelevel > 0) { + if (sysctlbyname("kern.securelevel", NULL, 0, &securelevel, + sizeof(securelevel))) + err(1, "Can not set securelevel to %d", securelevel); + } if (username != NULL) { if (Uflag) GET_USER_INFO; @@ -177,16 +179,8 @@ usage(void) { (void)fprintf(stderr, "%s%s%s\n", - "usage: jail [-i] [-J jid_file] [-s securelevel] [-l -u ", - "username | -U username]", + "usage: jail [-i] [-J jid_file] [-s securelevel] [-l -u ", + "username | -U username]", " path hostname ip-number command ..."); exit(1); } - -static void -setsecurelevel(int level) { - if (sysctlbyname("kern.securelevel", NULL, 0, &level, sizeof(level))) - err(1, "Can not set securelevel to %d", level); - -} -