From daaa73b51f74354d91ffe007e0f34d778f866f0b Mon Sep 17 00:00:00 2001 From: Robert Watson Date: Fri, 8 Mar 2002 15:34:23 +0000 Subject: [PATCH] Synchronize NOTES with -STABLE LINT with respects to the placement and commenting of NETSMB, NETWMBCRYPTO, and SMBFS. In NOTES, they had all floated to the bottom of the file with the list of seemingly random and unclassified kernel options. This change moves them back up to the network protocol and file system areas, and also documents the dependencies. --- sys/conf/NOTES | 12 +++++++++--- sys/i386/conf/NOTES | 12 +++++++++--- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/sys/conf/NOTES b/sys/conf/NOTES index 6f7f572e8440..7406b3781cad 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -464,6 +464,14 @@ options NETATALKDEBUG #Appletalk debugging #options NS #Xerox NS protocols #options NSIP #XNS over IP +# +# SMB/CIFS requester +# NETSMB enables support for SMB protocol, it requires LIBMCHAIN and LIBICONV +# options. +# NETSMBCRYPTO enables support for encrypted passwords. +options NETSMB #SMB/CIFS requester +options NETSMBCRYPTO #encrypted password support for SMB + # mchain library. It can be either loaded as KLD or compiled into kernel options LIBMCHAIN @@ -737,6 +745,7 @@ options NULLFS #NULL filesystem options PORTALFS #Portal filesystem options PROCFS #Process filesystem (requires PSEUDOFS) options PSEUDOFS #Pseudo-filesystem framework +options SMBFS #SMB/CIFS filesystem options UMAPFS #UID map filesystem options UNIONFS #Union filesystem # options NODEVFS #disable devices filesystem @@ -3043,12 +3052,9 @@ options METEOR_TEST_VIDEO options NDEVFSINO=1025 options NDEVFSOVERFLOW=32769 options NETGRAPH_BRIDGE -options NETSMB -options NETSMBCRYPTO # PFIL_HOOKS has no effect here since it is a subset of IPFILTER. options PFIL_HOOKS # SIMOS is broken since it is alpha-only but not ifdefed. ##options SIMOS -options SMBFS options VESA_DEBUG options VGA_DEBUG diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES index 6f7f572e8440..7406b3781cad 100644 --- a/sys/i386/conf/NOTES +++ b/sys/i386/conf/NOTES @@ -464,6 +464,14 @@ options NETATALKDEBUG #Appletalk debugging #options NS #Xerox NS protocols #options NSIP #XNS over IP +# +# SMB/CIFS requester +# NETSMB enables support for SMB protocol, it requires LIBMCHAIN and LIBICONV +# options. +# NETSMBCRYPTO enables support for encrypted passwords. +options NETSMB #SMB/CIFS requester +options NETSMBCRYPTO #encrypted password support for SMB + # mchain library. It can be either loaded as KLD or compiled into kernel options LIBMCHAIN @@ -737,6 +745,7 @@ options NULLFS #NULL filesystem options PORTALFS #Portal filesystem options PROCFS #Process filesystem (requires PSEUDOFS) options PSEUDOFS #Pseudo-filesystem framework +options SMBFS #SMB/CIFS filesystem options UMAPFS #UID map filesystem options UNIONFS #Union filesystem # options NODEVFS #disable devices filesystem @@ -3043,12 +3052,9 @@ options METEOR_TEST_VIDEO options NDEVFSINO=1025 options NDEVFSOVERFLOW=32769 options NETGRAPH_BRIDGE -options NETSMB -options NETSMBCRYPTO # PFIL_HOOKS has no effect here since it is a subset of IPFILTER. options PFIL_HOOKS # SIMOS is broken since it is alpha-only but not ifdefed. ##options SIMOS -options SMBFS options VESA_DEBUG options VGA_DEBUG