diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2012-05-28 15:00:12 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2012-05-30 06:04:41 +0200 |
| commit | 27fb14bfbe9d49bacd80fc033132c254267aeb34 (patch) | |
| tree | 12ceaac0734dddcf4ed57246dcb0e3d0095bff34 | |
| parent | 1d3e5eda038deebe7e3d2d122c8d9963b548edfb (diff) | |
| download | samba-27fb14bfbe9d49bacd80fc033132c254267aeb34.tar.gz samba-27fb14bfbe9d49bacd80fc033132c254267aeb34.tar.bz2 samba-27fb14bfbe9d49bacd80fc033132c254267aeb34.zip | |
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
| -rw-r--r-- | docs-xml/smbdotconf/protocol/servermaxprotocol.xml (renamed from docs-xml/smbdotconf/protocol/maxprotocol.xml) | 6 | ||||
| -rw-r--r-- | docs-xml/smbdotconf/protocol/serverminprotocol.xml (renamed from docs-xml/smbdotconf/protocol/minprotocol.xml) | 5 | ||||
| -rw-r--r-- | source3/param/loadparm.c | 8 |
3 files changed, 11 insertions, 8 deletions
diff --git a/docs-xml/smbdotconf/protocol/maxprotocol.xml b/docs-xml/smbdotconf/protocol/servermaxprotocol.xml index 2ecf84675d..459bce878c 100644 --- 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 index 0bec282467..1fbb7dcf3f 100644 --- 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 3c1a4effe4..11ff646cb6 100644 --- 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), |