[PATCH] Generic infrastructure for acls

[pandora-kernel.git] / fs / Kconfig

diff --git a/fs/Kconfig b/fs/Kconfig
index 6c50518..deb9eec 100644 (file)
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -325,8 +325,8 @@ config FS_POSIX_ACL
 source "fs/xfs/Kconfig"
 
 config OCFS2_FS
 source "fs/xfs/Kconfig"
 
 config OCFS2_FS

-       tristate "OCFS2 file system support (EXPERIMENTAL)"
-       depends on NET && EXPERIMENTAL
+       tristate "OCFS2 file system support"
+       depends on NET && SYSFS

        select CONFIGFS_FS
        select JBD
        select CRC32
        select CONFIGFS_FS
        select JBD
        select CRC32


@@ -356,6 +356,16 @@ config OCFS2_FS
                  - POSIX ACLs
                  - readpages / writepages (not user visible)
 
                  - POSIX ACLs
                  - readpages / writepages (not user visible)
 

+config OCFS2_DEBUG_MASKLOG
+       bool "OCFS2 logging support"
+       depends on OCFS2_FS
+       default y
+       help
+         The ocfs2 filesystem has an extensive logging system.  The system
+         allows selection of events to log via files in /sys/o2cb/logmask/.
+         This option will enlarge your kernel, but it allows debugging of
+         ocfs2 filesystem issues.
+

 config MINIX_FS
        tristate "Minix fs support"
        help
 config MINIX_FS
        tristate "Minix fs support"
        help


@@ -816,6 +826,25 @@ config PROC_VMCORE
         help
         Exports the dump image of crashed kernel in ELF format.
 
         help
         Exports the dump image of crashed kernel in ELF format.
 

+config PROC_SYSCTL
+       bool "Sysctl support (/proc/sys)" if EMBEDDED
+       depends on PROC_FS
+       select SYSCTL
+       default y
+       ---help---
+         The sysctl interface provides a means of dynamically changing
+         certain kernel parameters and variables on the fly without requiring
+         a recompile of the kernel or reboot of the system.  The primary
+         interface is through /proc/sys.  If you say Y here a tree of
+         modifiable sysctl entries will be generated beneath the
+          /proc/sys directory. They are explained in the files
+         in <file:Documentation/sysctl/>.  Note that enabling this
+         option will enlarge the kernel by at least 8 KB.
+
+         As it is generally a good thing, you should say Y here unless
+         building a kernel for install/rescue disks or your system is very
+         limited in memory.
+

 config SYSFS
        bool "sysfs file system support" if EMBEDDED
        default y
 config SYSFS
        bool "sysfs file system support" if EMBEDDED
        default y


@@ -1116,7 +1145,7 @@ config JFFS2_SUMMARY
 
 config JFFS2_FS_XATTR
        bool "JFFS2 XATTR support (EXPERIMENTAL)"
 
 config JFFS2_FS_XATTR
        bool "JFFS2 XATTR support (EXPERIMENTAL)"

-       depends on JFFS2_FS && EXPERIMENTAL && !JFFS2_FS_WRITEBUFFER
+       depends on JFFS2_FS && EXPERIMENTAL

        default n
        help
          Extended attributes are name:value pairs associated with inodes by
        default n
        help
          Extended attributes are name:value pairs associated with inodes by


@@ -1461,8 +1490,8 @@ config NFS_V4
          If unsure, say N.
 
 config NFS_DIRECTIO
          If unsure, say N.
 
 config NFS_DIRECTIO

-       bool "Allow direct I/O on NFS files (EXPERIMENTAL)"
-       depends on NFS_FS && EXPERIMENTAL
+       bool "Allow direct I/O on NFS files"
+       depends on NFS_FS

        help
          This option enables applications to perform uncached I/O on files
          in NFS file systems using the O_DIRECT open() flag.  When O_DIRECT
        help
          This option enables applications to perform uncached I/O on files
          in NFS file systems using the O_DIRECT open() flag.  When O_DIRECT


@@ -1722,7 +1751,7 @@ config CIFS_STATS
          mounted by the cifs client to be displayed in /proc/fs/cifs/Stats
 
 config CIFS_STATS2
          mounted by the cifs client to be displayed in /proc/fs/cifs/Stats
 
 config CIFS_STATS2

-       bool "CIFS extended statistics"
+       bool "Extended statistics"

        depends on CIFS_STATS
        help
          Enabling this option will allow more detailed statistics on SMB
        depends on CIFS_STATS
        help
          Enabling this option will allow more detailed statistics on SMB


@@ -1735,6 +1764,32 @@ config CIFS_STATS2
          Unless you are a developer or are doing network performance analysis
          or tuning, say N.
 
          Unless you are a developer or are doing network performance analysis
          or tuning, say N.
 

+config CIFS_WEAK_PW_HASH
+       bool "Support legacy servers which use weaker LANMAN security"
+       depends on CIFS
+       help
+         Modern CIFS servers including Samba and most Windows versions
+         (since 1997) support stronger NTLM (and even NTLMv2 and Kerberos)
+         security mechanisms. These hash the password more securely
+         than the mechanisms used in the older LANMAN version of the
+          SMB protocol needed to establish sessions with old SMB servers.
+
+         Enabling this option allows the cifs module to mount to older
+         LANMAN based servers such as OS/2 and Windows 95, but such
+         mounts may be less secure than mounts using NTLM or more recent
+         security mechanisms if you are on a public network.  Unless you
+         have a need to access old SMB servers (and are on a private 
+         network) you probably want to say N.  Even if this support
+         is enabled in the kernel build, they will not be used
+         automatically. At runtime LANMAN mounts are disabled but
+         can be set to required (or optional) either in
+         /proc/fs/cifs (see fs/cifs/README for more detail) or via an
+         option on the mount command. This support is disabled by 
+         default in order to reduce the possibility of a downgrade
+         attack.
+ 
+         If unsure, say N.
+

 config CIFS_XATTR
         bool "CIFS extended attributes"
         depends on CIFS
 config CIFS_XATTR
         bool "CIFS extended attributes"
         depends on CIFS


@@ -1763,6 +1818,17 @@ config CIFS_POSIX
          (such as Samba 3.10 and later) which can negotiate
          CIFS POSIX ACL support.  If unsure, say N.
 
          (such as Samba 3.10 and later) which can negotiate
          CIFS POSIX ACL support.  If unsure, say N.
 

+config CIFS_DEBUG2
+       bool "Enable additional CIFS debugging routines"
+       depends on CIFS
+       help
+          Enabling this option adds a few more debugging routines
+          to the cifs code which slightly increases the size of
+          the cifs module and can cause additional logging of debug
+          messages in some error paths, slowing performance. This
+          option can be turned off unless you are debugging
+          cifs problems.  If unsure, say N.
+          

 config CIFS_EXPERIMENTAL
          bool "CIFS Experimental Features (EXPERIMENTAL)"
          depends on CIFS && EXPERIMENTAL
 config CIFS_EXPERIMENTAL
          bool "CIFS Experimental Features (EXPERIMENTAL)"
          depends on CIFS && EXPERIMENTAL


@@ -1778,7 +1844,7 @@ config CIFS_EXPERIMENTAL
            If unsure, say N.
 
 config CIFS_UPCALL
            If unsure, say N.
 
 config CIFS_UPCALL

-         bool "CIFS Kerberos/SPNEGO advanced session setup (EXPERIMENTAL)"
+         bool "Kerberos/SPNEGO advanced session setup (EXPERIMENTAL)"

          depends on CIFS_EXPERIMENTAL
          select CONNECTOR
          help
          depends on CIFS_EXPERIMENTAL
          select CONNECTOR
          help


@@ -1874,6 +1940,10 @@ config 9P_FS
 
          If unsure, say N.
 
 
          If unsure, say N.
 

+config GENERIC_ACL
+       bool
+       select FS_POSIX_ACL
+

 endmenu
 
 menu "Partition Types"
 endmenu
 
 menu "Partition Types"