diff options
| author | erdgeist <> | 2013-03-30 21:23:13 +0000 |
|---|---|---|
| committer | erdgeist <> | 2013-03-30 21:23:13 +0000 |
| commit | d5c18232d1ca4e8106ad924d3bd574500c2fab8a (patch) | |
| tree | 3fbdcef24fbf8b5e157cbe72167925b24fd5764f | |
| parent | deece32718b2103d9230134a6ee9082f86eeee70 (diff) | |
Allow specifying the jailname instead of jid with the -j parameter
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | jaildaemon.c | 3 |
2 files changed, 3 insertions, 2 deletions
| @@ -1,7 +1,7 @@ | |||
| 1 | # $Id$ | 1 | # $Id$ |
| 2 | 2 | ||
| 3 | CFLAGS+=-Wall -Wextra -pedantic -Os | 3 | CFLAGS+=-Wall -Wextra -pedantic -Os |
| 4 | LDFLAGS+=-s -lutil | 4 | LDFLAGS+=-s -lutil -ljail |
| 5 | PREFIX?=/usr/local | 5 | PREFIX?=/usr/local |
| 6 | 6 | ||
| 7 | all: jaildaemon | 7 | all: jaildaemon |
diff --git a/jaildaemon.c b/jaildaemon.c index 62dcc51..0843b37 100644 --- a/jaildaemon.c +++ b/jaildaemon.c | |||
| @@ -10,6 +10,7 @@ | |||
| 10 | #include <sys/param.h> | 10 | #include <sys/param.h> |
| 11 | #include <sys/jail.h> | 11 | #include <sys/jail.h> |
| 12 | #include <sys/wait.h> | 12 | #include <sys/wait.h> |
| 13 | #include <jail.h> | ||
| 13 | #include <err.h> | 14 | #include <err.h> |
| 14 | #include <errno.h> | 15 | #include <errno.h> |
| 15 | #include <stdio.h> | 16 | #include <stdio.h> |
| @@ -425,7 +426,7 @@ int main( int argc, char **argv ) { | |||
| 425 | case 'R': o_respawn = TASK_RESPAWN_IMMEDIATE; break; | 426 | case 'R': o_respawn = TASK_RESPAWN_IMMEDIATE; break; |
| 426 | case 't': o_proctitle = optarg; break; | 427 | case 't': o_proctitle = optarg; break; |
| 427 | case 'c': o_command = optarg; break; | 428 | case 'c': o_command = optarg; break; |
| 428 | case 'j': o_jid = strtol( optarg, 0, 0 ); break; | 429 | case 'j': o_jid = jail_getid(optarg); break; |
| 429 | case 'u': o_uid = strtol( optarg, 0, 0 ); break; | 430 | case 'u': o_uid = strtol( optarg, 0, 0 ); break; |
| 430 | case 'p': o_pidfile = optarg; break; | 431 | case 'p': o_pidfile = optarg; break; |
| 431 | case 'f': g_uds_path = optarg; break; | 432 | case 'f': g_uds_path = optarg; break; |
