From 27fb14bfbe9d49bacd80fc033132c254267aeb34 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Mon, 28 May 2012 15:00:12 +1000 Subject: s3-loadparm: Swap synonyms of max/min protocol to server max/min protocol This matches the lib/param code, as is a seperate parameter for the client there. Andrew Bartlett Autobuild-User: Andrew Bartlett Autobuild-Date: Wed May 30 06:04:41 CEST 2012 on sn-devel-104 --- docs-xml/smbdotconf/protocol/maxprotocol.xml | 67 ---------------------- docs-xml/smbdotconf/protocol/minprotocol.xml | 22 ------- docs-xml/smbdotconf/protocol/servermaxprotocol.xml | 67 ++++++++++++++++++++++ docs-xml/smbdotconf/protocol/serverminprotocol.xml | 25 ++++++++ 4 files changed, 92 insertions(+), 89 deletions(-) delete mode 100644 docs-xml/smbdotconf/protocol/maxprotocol.xml delete mode 100644 docs-xml/smbdotconf/protocol/minprotocol.xml create mode 100644 docs-xml/smbdotconf/protocol/servermaxprotocol.xml create mode 100644 docs-xml/smbdotconf/protocol/serverminprotocol.xml (limited to 'docs-xml') diff --git a/docs-xml/smbdotconf/protocol/maxprotocol.xml b/docs-xml/smbdotconf/protocol/maxprotocol.xml deleted file mode 100644 index 2ecf84675d..0000000000 --- a/docs-xml/smbdotconf/protocol/maxprotocol.xml +++ /dev/null @@ -1,67 +0,0 @@ - - - The value of the parameter (a string) is the highest - protocol level that will be supported by the server. - - Possible values are : - - - CORE: Earliest version. No - concept of user names. - - - - COREPLUS: Slight improvements on - CORE for efficiency. - - - - LANMAN1: First - modern version of the protocol. Long filename - support. - - - - LANMAN2: Updates to Lanman1 protocol. - - - - NT1: Current up to date version of the protocol. - Used by Windows NT. Known as CIFS. - - - SMB2: Re-implementation of the SMB protocol. - Used by Windows Vista and later versions of Windows. SMB2 has sub protocols available. - - - SMB2_02: The earliest SMB2 version. - - - SMB2_10: Windows 7 SMB2 version. - - - SMB2_22: Early Windows 8 SMB2 version. - - - SMB2_24: Windows 8 SMB2 version. - - - By default SMB2 selects the SMB2_02 varient. - - - - Normally this option should not be set as the automatic - negotiation phase in the SMB protocol takes care of choosing - the appropriate protocol. - - -min protocol -protocol - -SMB2 -LANMAN1 - diff --git a/docs-xml/smbdotconf/protocol/minprotocol.xml b/docs-xml/smbdotconf/protocol/minprotocol.xml deleted file mode 100644 index 0bec282467..0000000000 --- a/docs-xml/smbdotconf/protocol/minprotocol.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - The value of the parameter (a string) is the - lowest SMB protocol dialect than Samba will support. Please refer - to the - parameter for a list of valid protocol names and a brief description - of each. You may also wish to refer to the C source code in - source/smbd/negprot.c for a listing of known protocol - dialects supported by clients. - - If you are viewing this parameter as a security measure, you should - also refer to the parameter. Otherwise, you should never need - to change this parameter. - - -CORE -NT1 - diff --git a/docs-xml/smbdotconf/protocol/servermaxprotocol.xml b/docs-xml/smbdotconf/protocol/servermaxprotocol.xml new file mode 100644 index 0000000000..459bce878c --- /dev/null +++ b/docs-xml/smbdotconf/protocol/servermaxprotocol.xml @@ -0,0 +1,67 @@ + + + The value of the parameter (a string) is the highest + protocol level that will be supported by the server. + + Possible values are : + + + CORE: Earliest version. No + concept of user names. + + + + COREPLUS: Slight improvements on + CORE for efficiency. + + + + LANMAN1: First + modern version of the protocol. Long filename + support. + + + + LANMAN2: Updates to Lanman1 protocol. + + + + NT1: Current up to date version of the protocol. + Used by Windows NT. Known as CIFS. + + + SMB2: Re-implementation of the SMB protocol. + Used by Windows Vista and later versions of Windows. SMB2 has sub protocols available. + + + SMB2_02: The earliest SMB2 version. + + + SMB2_10: Windows 7 SMB2 version. + + + SMB2_22: Early Windows 8 SMB2 version. + + + SMB2_24: Windows 8 SMB2 version. + + + By default SMB2 selects the SMB2_02 varient. + + + + Normally this option should not be set as the automatic + negotiation phase in the SMB protocol takes care of choosing + the appropriate protocol. + + +server min protocol +max protocol + +SMB2 +LANMAN1 + diff --git a/docs-xml/smbdotconf/protocol/serverminprotocol.xml b/docs-xml/smbdotconf/protocol/serverminprotocol.xml new file mode 100644 index 0000000000..1fbb7dcf3f --- /dev/null +++ b/docs-xml/smbdotconf/protocol/serverminprotocol.xml @@ -0,0 +1,25 @@ + + + The value of the parameter (a string) is the + lowest SMB protocol dialect than Samba will support. Please refer + to the + parameter for a list of valid protocol names and a brief description + of each. You may also wish to refer to the C source code in + source/smbd/negprot.c for a listing of known protocol + dialects supported by clients. + + If you are viewing this parameter as a security measure, you should + also refer to the parameter. Otherwise, you should never need + to change this parameter. + + +server min protocol +min protocol + +CORE +NT1 + -- cgit