[SCM] Samba Shared Repository - branch master updated
Jelmer Vernooij
jelmer at samba.org
Wed Sep 26 20:36:02 MDT 2012
The branch, master has been updated
via ee0012d samba-tool domain provision: DNS forwarder default
via ba70755 smb.conf(5): List 'protocol' as alias for 'server max protocol'.
via 3dc6daf smb.conf(5): Add documentation for 'client max protocol'.
via 60b93c3 smb.conf(5): Add basic documentation for 'client min protocol'.
via b6cb0b6 smb.conf(5): Document 'share backend' parameter.
via b97c257 smb.conf(5): Add basic documentation for 'server min protocol'.
via d184555 smb.conf(5): Extend 'server min protocol' description.
via bc9d5cb smb.conf(5): Consistent spelling of parameter names.
from 4544c52 s3: For read-only shares, filter out write bits from conn->access_mask
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit ee0012de1af1a3899856bcdb80033d1a82d5b174
Author: Ricky Nance <ricky.nance at weaubleau.k12.mo.us>
Date: Wed Sep 26 17:24:40 2012 -0700
samba-tool domain provision: DNS forwarder default
Provision would break with an exception if there was no value given for the DNS forwarder, this simply sets a default to "none".
Signed-off-by: Jelmer Vernooij <jelmer at samba.org>
Autobuild-User(master): Jelmer Vernooij <jelmer at samba.org>
Autobuild-Date(master): Thu Sep 27 04:35:33 CEST 2012 on sn-devel-104
commit ba7075597e5c28f50f3695c59a5050d1c2c98ae4
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Wed Sep 26 16:06:14 2012 -0700
smb.conf(5): List 'protocol' as alias for 'server max protocol'.
commit 3dc6daf6a950d7059daa8df40e31b51617310496
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Wed Sep 26 16:11:05 2012 -0700
smb.conf(5): Add documentation for 'client max protocol'.
commit 60b93c314cc204ae0a4e2598100674cf2ff5bf51
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Wed Sep 26 16:12:16 2012 -0700
smb.conf(5): Add basic documentation for 'client min protocol'.
commit b6cb0b65e08aee972321220ae54cdf2d181356a8
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Wed Sep 26 15:44:46 2012 -0700
smb.conf(5): Document 'share backend' parameter.
commit b97c257f3af942d0767226793fa705940caad8dd
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Wed Sep 26 15:55:04 2012 -0700
smb.conf(5): Add basic documentation for 'server min protocol'.
Conflicts:
docs-xml/smbdotconf/protocol/serverminprotocol.xml
commit d1845558e09fd227338d06831f1ea1cf68d2e6fa
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Wed Sep 26 16:02:40 2012 -0700
smb.conf(5): Extend 'server min protocol' description.
Conflicts:
docs-xml/smbdotconf/protocol/serverminprotocol.xml
commit bc9d5cb13f51be7feac96b754f875d2b33775160
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Wed Sep 26 13:20:42 2012 -0700
smb.conf(5): Consistent spelling of parameter names.
This includes spacing and casing.
Conflicts:
source4/scripting/python/samba/tests/docs.py
-----------------------------------------------------------------------
Summary of changes:
docs-xml/smbdotconf/base/sharebackend.xml | 18 +++++++++++++++++
docs-xml/smbdotconf/misc/nishomedir.xml | 2 +-
docs-xml/smbdotconf/printing/addportcommand.xml | 2 +-
...servermaxprotocol.xml => clientmaxprotocol.xml} | 8 +++---
docs-xml/smbdotconf/protocol/clientminprotocol.xml | 19 ++++++++++++++++++
docs-xml/smbdotconf/protocol/rpcbigendian.xml | 2 +-
docs-xml/smbdotconf/protocol/servermaxprotocol.xml | 1 +
docs-xml/smbdotconf/protocol/serverminprotocol.xml | 21 +++++--------------
docs-xml/smbdotconf/security/clientntlmv2auth.xml | 2 +-
source4/scripting/python/samba/netcmd/domain.py | 2 +
10 files changed, 54 insertions(+), 23 deletions(-)
create mode 100644 docs-xml/smbdotconf/base/sharebackend.xml
copy docs-xml/smbdotconf/protocol/{servermaxprotocol.xml => clientmaxprotocol.xml} (92%)
create mode 100644 docs-xml/smbdotconf/protocol/clientminprotocol.xml
Changeset truncated at 500 lines:
diff --git a/docs-xml/smbdotconf/base/sharebackend.xml b/docs-xml/smbdotconf/base/sharebackend.xml
new file mode 100644
index 0000000..10958fa
--- /dev/null
+++ b/docs-xml/smbdotconf/base/sharebackend.xml
@@ -0,0 +1,18 @@
+<samba:parameter name="share backend"
+ context="G"
+ type="choice"
+ xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+<description>
+ <para>
+ This option specifies the backend that will be used to access the configuration of
+ file shares.
+ </para>
+
+ <para>Traditionally, Samba file shares have been configured in the
+ <option>smb.conf</option> file and this is still the default.
+ </para>
+
+ <para>At the moment there are no other supported backends.</para>
+</description>
+<value type="default">classic</value>
+</samba:parameter>
diff --git a/docs-xml/smbdotconf/misc/nishomedir.xml b/docs-xml/smbdotconf/misc/nishomedir.xml
index 45c4511..c617563 100644
--- a/docs-xml/smbdotconf/misc/nishomedir.xml
+++ b/docs-xml/smbdotconf/misc/nishomedir.xml
@@ -1,4 +1,4 @@
-<samba:parameter name="nis homedir"
+<samba:parameter name="NIS homedir"
context="G"
type="boolean"
advanced="1" developer="1"
diff --git a/docs-xml/smbdotconf/printing/addportcommand.xml b/docs-xml/smbdotconf/printing/addportcommand.xml
index 17c899e..80e56c9 100644
--- a/docs-xml/smbdotconf/printing/addportcommand.xml
+++ b/docs-xml/smbdotconf/printing/addportcommand.xml
@@ -1,4 +1,4 @@
-<samba:parameter name="add port command"
+<samba:parameter name="addport command"
context="G"
type="string"
advanced="1" developer="1"
diff --git a/docs-xml/smbdotconf/protocol/servermaxprotocol.xml b/docs-xml/smbdotconf/protocol/clientmaxprotocol.xml
similarity index 92%
copy from docs-xml/smbdotconf/protocol/servermaxprotocol.xml
copy to docs-xml/smbdotconf/protocol/clientmaxprotocol.xml
index 57e82d1..06fda5a 100644
--- a/docs-xml/smbdotconf/protocol/servermaxprotocol.xml
+++ b/docs-xml/smbdotconf/protocol/clientmaxprotocol.xml
@@ -1,11 +1,11 @@
-<samba:parameter name="server max protocol"
+<samba:parameter name="client max protocol"
context="G"
type="enum"
developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>The value of the parameter (a string) is the highest
- protocol level that will be supported by the server.</para>
+ protocol level that will be supported by the client.</para>
<para>Possible values are :</para>
<itemizedlist>
@@ -70,8 +70,8 @@
the appropriate protocol.</para>
</description>
-<related>server min protocol</related>
-<synonym>max protocol</synonym>
+<related>server max protocol</related>
+<related>client mn protocol</related>
<value type="default">SMB3</value>
<value type="example">LANMAN1</value>
diff --git a/docs-xml/smbdotconf/protocol/clientminprotocol.xml b/docs-xml/smbdotconf/protocol/clientminprotocol.xml
new file mode 100644
index 0000000..3bcccec
--- /dev/null
+++ b/docs-xml/smbdotconf/protocol/clientminprotocol.xml
@@ -0,0 +1,19 @@
+<samba:parameter name="client min protocol"
+ context="G"
+ type="enum"
+ developer="1"
+ xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+<description>
+ <para>This setting controls the minimum protocol version that the client
+ will attempt to use.</para>
+
+ <para>Normally this option should not be set as the automatic
+ negotiation phase in the SMB protocol takes care of choosing
+ the appropriate protocol.</para>
+</description>
+
+<related>client max protocol</related>
+<related>server min protocol</related>
+<value type="default">CORE</value>
+<value type="example">NT1</value>
+</samba:parameter>
diff --git a/docs-xml/smbdotconf/protocol/rpcbigendian.xml b/docs-xml/smbdotconf/protocol/rpcbigendian.xml
index ae12f71..7d1d864 100644
--- a/docs-xml/smbdotconf/protocol/rpcbigendian.xml
+++ b/docs-xml/smbdotconf/protocol/rpcbigendian.xml
@@ -1,4 +1,4 @@
-<samba:parameter name="rpc bigendian"
+<samba:parameter name="rpc big endian"
context="G"
type="bool"
advanced="1" developer="1"
diff --git a/docs-xml/smbdotconf/protocol/servermaxprotocol.xml b/docs-xml/smbdotconf/protocol/servermaxprotocol.xml
index 57e82d1..94184c8 100644
--- a/docs-xml/smbdotconf/protocol/servermaxprotocol.xml
+++ b/docs-xml/smbdotconf/protocol/servermaxprotocol.xml
@@ -72,6 +72,7 @@
<related>server min protocol</related>
<synonym>max protocol</synonym>
+<synonym>protocol</synonym>
<value type="default">SMB3</value>
<value type="example">LANMAN1</value>
diff --git a/docs-xml/smbdotconf/protocol/serverminprotocol.xml b/docs-xml/smbdotconf/protocol/serverminprotocol.xml
index d313908..ba08665 100644
--- a/docs-xml/smbdotconf/protocol/serverminprotocol.xml
+++ b/docs-xml/smbdotconf/protocol/serverminprotocol.xml
@@ -1,25 +1,16 @@
<samba:parameter name="server min protocol"
context="G"
- type="string"
- developer="1"
+ type="enum"
+ developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+<synonym>min protocol</synonym>
<description>
- <para>The value of the parameter (a string) is the
- lowest SMB protocol dialect than Samba will support. Please refer
- to the <smbconfoption name="server max protocol"/>
- 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
- <filename moreinfo="none">source/smbd/negprot.c</filename> for a listing of known protocol
- dialects supported by clients.</para>
-
- <para>If you are viewing this parameter as a security measure, you should
- also refer to the <smbconfoption name="lanman auth"/> parameter. Otherwise, you should never need
- to change this parameter.</para>
+ <para>This setting controls the minimum protocol version that the server will allow the client to use.</para>
</description>
-<related>server min protocol</related>
+<related>server max protocol</related>
<synonym>min protocol</synonym>
-<value type="default">LANMAN1</value>
+<value type="default">CORE</value>
<value type="example">NT1</value>
</samba:parameter>
diff --git a/docs-xml/smbdotconf/security/clientntlmv2auth.xml b/docs-xml/smbdotconf/security/clientntlmv2auth.xml
index b151df2..7f30356 100644
--- a/docs-xml/smbdotconf/security/clientntlmv2auth.xml
+++ b/docs-xml/smbdotconf/security/clientntlmv2auth.xml
@@ -1,4 +1,4 @@
-<samba:parameter name="client ntlmv2 auth"
+<samba:parameter name="client NTLMv2 auth"
context="G"
type="boolean"
advanced="1" developer="1"
diff --git a/source4/scripting/python/samba/netcmd/domain.py b/source4/scripting/python/samba/netcmd/domain.py
index 43e9259..ba4165a 100644
--- a/source4/scripting/python/samba/netcmd/domain.py
+++ b/source4/scripting/python/samba/netcmd/domain.py
@@ -269,6 +269,8 @@ class cmd_domain_provision(Command):
suggested_forwarder = dns_forwarder
else:
suggested_forwarder = self._get_nameserver_ip()
+ if suggested_forwarder is None:
+ suggested_forwarder = "none"
if len(self.raw_argv) == 1:
interactive = True
--
Samba Shared Repository
More information about the samba-cvs
mailing list