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 <abartlet@samba.org>
Autobuild-Date: Wed May 30 06:04:41 CEST 2012 on sn-devel-104

diff --git a/docs-xml/smbdotconf/protocol/maxprotocol.xml b/docs-xml/smbdotconf/protocol/servermaxprotocol.xml
similarity index 94%
rename from docs-xml/smbdotconf/protocol/maxprotocol.xml
rename to docs-xml/smbdotconf/protocol/servermaxprotocol.xml
index 2ecf84675de3a2e952905250582798d564130ab6..459bce878ca85ff1a9cdd5e5f77c0f90770ab21c 100644 (file)
--- a/docs-xml/smbdotconf/protocol/maxprotocol.xml
+++ b/docs-xml/smbdotconf/protocol/servermaxprotocol.xml
@@ -1,4 +1,4 @@
-<samba:parameter name="max protocol"
+<samba:parameter name="server max protocol"
                  context="G"
                                 type="enum"
                  developer="1"
@@ -59,8 +59,8 @@
        the appropriate protocol.</para>
 </description>
 
-<related>min protocol</related>
-<synonym>protocol</synonym>
+<related>server min protocol</related>
+<synonym>max protocol</synonym>
 
 <value type="default">SMB2</value>
 <value type="example">LANMAN1</value>

diff --git a/docs-xml/smbdotconf/protocol/minprotocol.xml b/docs-xml/smbdotconf/protocol/serverminprotocol.xml
similarity index 89%
rename from docs-xml/smbdotconf/protocol/minprotocol.xml
rename to docs-xml/smbdotconf/protocol/serverminprotocol.xml
index 0bec282467c1d982a20d8ba88dd17fbc140273ea..1fbb7dcf3fcde86fd6aebf96291a8f3139d2e907 100644 (file)
--- a/docs-xml/smbdotconf/protocol/minprotocol.xml
+++ b/docs-xml/smbdotconf/protocol/serverminprotocol.xml
@@ -1,4 +1,4 @@
-<samba:parameter name="min protocol"
+<samba:parameter name="server min protocol"
                  context="G"
                                 type="string"
                  developer="1"
@@ -17,6 +17,9 @@
     to change this parameter.</para>
 </description>
 
+<related>server min protocol</related>
+<synonym>min protocol</synonym>
+
 <value type="default">CORE</value>
 <value type="example">NT1</value>
 </samba:parameter>

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 3c1a4effe4d554a8c11325c848364a91198ab78d..11ff646cb657e167cd291980a2e3d9a7fd9b2503 100644 (file)
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -1560,7 +1560,7 @@ static struct parm_struct parm_table[] = {
                .flags          = FLAG_ADVANCED,
        },
        {
-               .label          = "max protocol",
+               .label          = "server max protocol",
                .type           = P_ENUM,
                .p_class        = P_GLOBAL,
                .offset         = GLOBAL_VAR(srv_maxprotocol),
@@ -1569,7 +1569,7 @@ static struct parm_struct parm_table[] = {
                .flags          = FLAG_ADVANCED,
        },
        {
-               .label          = "server max protocol",
+               .label          = "max protocol",
                .type           = P_ENUM,
                .p_class        = P_GLOBAL,
                .offset         = GLOBAL_VAR(srv_maxprotocol),
@@ -1587,7 +1587,7 @@ static struct parm_struct parm_table[] = {
                .flags          = FLAG_ADVANCED,
        },
        {
-               .label          = "min protocol",
+               .label          = "server min protocol",
                .type           = P_ENUM,
                .p_class        = P_GLOBAL,
                .offset         = GLOBAL_VAR(srv_minprotocol),
@@ -1596,7 +1596,7 @@ static struct parm_struct parm_table[] = {
                .flags          = FLAG_ADVANCED,
        },
        {
-               .label          = "server min protocol",
+               .label          = "min protocol",
                .type           = P_ENUM,
                .p_class        = P_GLOBAL,
                .offset         = GLOBAL_VAR(srv_minprotocol),