Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / kernel / vserver / Kconfig

diff --git a/kernel/vserver/Kconfig b/kernel/vserver/Kconfig
index 2658bc7..c665930 100644 (file)
--- a/kernel/vserver/Kconfig
+++ b/kernel/vserver/Kconfig
@@ -2,21 +2,6 @@
 # Linux VServer configuration
 #
 
 # Linux VServer configuration
 #
 

-config VSERVER
-       bool
-       default y
-
-config VSERVER_SECURITY
-       bool
-       depends on SECURITY
-       default y
-       select SECURITY_CAPABILITIES
-
-config VSERVER_LEGACYNET
-       bool
-       depends on !VSERVER_NGNET
-       default y
-

 menu "Linux VServer"
 
 config VSERVER_LEGACY
 menu "Linux VServer"
 
 config VSERVER_LEGACY


@@ -53,6 +38,15 @@ config       VSERVER_NGNET
          by the chbind tool. Do not disable it unless you exactly
          know what you are doing.
 
          by the chbind tool. Do not disable it unless you exactly
          know what you are doing.
 

+config VSERVER_REMAP_SADDR
+       bool    "Remap Source IP Address"
+       depends on EXPERIMENTAL && !VSERVER_LEGACY
+       default n
+       help
+         This allows to remap the source IP address of 'local'
+         connections from 127.0.0.1 to the first assigned
+         guest IP.
+

 config VSERVER_PROC_SECURE
        bool    "Enable Proc Security"
        depends on PROC_FS
 config VSERVER_PROC_SECURE
        bool    "Enable Proc Security"
        depends on PROC_FS


@@ -177,3 +171,19 @@ config     VSERVER_HISTORY_SIZE
 
 endmenu
 
 
 endmenu
 

+
+config VSERVER
+       bool
+       default y
+
+config VSERVER_SECURITY
+       bool
+       depends on SECURITY
+       default y
+       select SECURITY_CAPABILITIES
+
+config VSERVER_LEGACYNET
+       bool
+       depends on !VSERVER_NGNET
+       default y
+