---

yaml --- r: 305991 b: refs/heads/master c: 5673a94 h: refs/heads/master i: 305989: 50eb4e0 305987: 83aa864 305983: e919b40 v: v3
git-mirror · Apr 8, 2012 · b26a2dc · b26a2dc
1 parent 0eb334d
commit b26a2dc
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7a4e7408c5cadb240e068a662251754a562355e3
+refs/heads/master: 5673a94c14574d7c6495c320c6b0e480673d54bd
diff --git a/trunk/include/linux/uidgid.h b/trunk/include/linux/uidgid.h
@@ -17,7 +17,7 @@
 struct user_namespace;
 extern struct user_namespace init_user_ns;
 
-#if defined(NOTYET)
+#ifdef CONFIG_UIDGID_STRICT_TYPE_CHECKS
 
 typedef struct {
 	uid_t val;

diff --git a/trunk/init/Kconfig b/trunk/init/Kconfig
@@ -828,7 +828,8 @@ config IPC_NS
 config USER_NS
 	bool "User namespace (EXPERIMENTAL)"
 	depends on EXPERIMENTAL
-	default y
+	select UIDGID_STRICT_TYPE_CHECKS
+	default n
 	help
 	  This allows containers, i.e. vservers, to use user namespaces
 	  to provide different user info for different servers.
@@ -852,6 +853,15 @@ config NET_NS
 
 endif # NAMESPACES
 
+config UIDGID_STRICT_TYPE_CHECKS
+	bool "Require conversions between uid/gids and their internal representation"
+	default n
+	help
+	 While the nececessary conversions are being added to all subsystems this option allows
+	 the code to continue to build for unconverted subsystems.
+
+	 Say Y here if you want the strict type checking enabled
+
 config SCHED_AUTOGROUP
 	bool "Automatic process group scheduling"
 	select EVENTFD