diff --git a/Makefile b/Makefile index 92ca7a7..6c24f74 100644 --- a/Makefile +++ b/Makefile @@ -106,7 +106,7 @@ cmdline.o: cmdline.h nsjail.h caps.h config.h logs.h macros.h mnt.h user.h cmdline.o: util.h config.o: config.h nsjail.h caps.h cmdline.h config.pb.h logs.h macros.h config.o: mnt.h user.h util.h -contain.o: contain.h nsjail.h caps.h cgroup.h cgroup2.h cpu.h logs.h macros.h mnt.h +contain.o: contain.h nsjail.h caps.h cgroup.h cpu.h logs.h macros.h mnt.h contain.o: net.h pid.h user.h util.h uts.h cpu.o: cpu.h nsjail.h logs.h util.h logs.o: logs.h macros.h util.h nsjail.h @@ -115,8 +115,8 @@ net.o: net.h nsjail.h logs.h subproc.h nsjail.o: nsjail.h cmdline.h logs.h macros.h net.h sandbox.h subproc.h util.h pid.o: pid.h nsjail.h logs.h subproc.h sandbox.o: sandbox.h nsjail.h kafel/include/kafel.h logs.h util.h -subproc.o: subproc.h nsjail.h cgroup.h cgroup2.h contain.h logs.h macros.h net.h -subproc.o: sandbox.h user.h util.h +subproc.o: subproc.h nsjail.h cgroup.h cgroup2.h contain.h logs.h macros.h +subproc.o: net.h sandbox.h user.h util.h uts.o: uts.h nsjail.h logs.h user.o: user.h nsjail.h logs.h macros.h subproc.h util.h util.o: util.h nsjail.h logs.h macros.h diff --git a/config.proto b/config.proto index eb8aa6d..29b9821 100644 --- a/config.proto +++ b/config.proto @@ -4,14 +4,14 @@ package nsjail; enum Mode { LISTEN = 0; /* Listening on a TCP port */ - ONCE = 1; /* Running the command once only */ - RERUN = 2; /* Re-executing the command (forever) */ + ONCE = 1; /* Running the command once only */ + RERUN = 2; /* Re-executing the command (forever) */ EXECVE = 3; /* Executing command w/o the supervisor */ } /* Should be self explanatory */ enum LogLevel { - DEBUG = 0; /* Equivalent to the '-v' cmd-line option */ - INFO = 1; /* Default level */ + DEBUG = 0; /* Equivalent to the '-v' cmd-line option */ + INFO = 1; /* Default level */ WARNING = 2; /* Equivalent to the '-q' cmd-line option */ ERROR = 3; FATAL = 4;