Page MenuHomeFreeBSD
Files F163160693

D56703.diff
No OneTemporary
Actions

D56703.diff
View Options

diff --git a/usr.sbin/jail/config.c b/usr.sbin/jail/config.c
--- a/usr.sbin/jail/config.c
+++ b/usr.sbin/jail/config.c
@@ -359,8 +359,6 @@
// Set the argument list:
// <jail_conf> <jail_conf> <jail_dir> <jail_base> <jail_name>
- const struct cfjail *const current_jail =
- TAILQ_LAST(&cfjails, cfjails);
char *const jail_conf = __DECONST(char *, cfname);
char *const jail_dir =
dirname(memcpy(dir_buf, cfname, cfname_size));
diff --git a/usr.sbin/jail/jailp.h b/usr.sbin/jail/jailp.h
--- a/usr.sbin/jail/jailp.h
+++ b/usr.sbin/jail/jailp.h
@@ -35,6 +35,9 @@
#include <jail.h>
#include <stdio.h>
+extern struct cfjail *current_jail;
+extern struct cfjail *global_jail;
+
#define CONF_FILE "/etc/jail.conf"
#define DEP_FROM 0
diff --git a/usr.sbin/jail/jailparse.y b/usr.sbin/jail/jailparse.y
--- a/usr.sbin/jail/jailparse.y
+++ b/usr.sbin/jail/jailparse.y
@@ -38,8 +38,8 @@
#define YYDEBUG 1
#endif
-static struct cfjail *current_jail;
-static struct cfjail *global_jail;
+struct cfjail *current_jail = NULL;
+struct cfjail *global_jail = NULL;
%}
%union {

File Metadata

Mime Type
text/plain
Expires
Tue, Jul 21, 3:38 PM (6 h, 21 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
35323134
Default Alt Text
D56703.diff (1 KB)

Event Timeline