[SCM] Samba Shared Repository - branch master updated
Jelmer Vernooij
jelmer at samba.org
Fri Oct 19 03:38:02 MDT 2012
The branch, master has been updated
via e3a48bb samba-tool user test: Fix expected output.
via 364ed82 samba.tests.docs: Ignore removed parameters.
via 4b4e8e2 smb.conf(5): Mark four removed parameters as such.
via ed37b8a samba.tests.docs: Assume docs are generated by waf.
via cfa72bc samba.tests.docs: Write error output from xsltproc to standard out.
via 8412b57 samba.tests.docs: Skip tests if xsltproc is not present.
via 2a31f0b smb.conf(5): Consistent spelling of parameter names.
via 32fad2b samba.tests.docs: Support spaces before synonyms.
via be4dea4 samba.tests.docs: Support synonyms.
via d0e644e samba.tests.docs: Distinguish between unknown and undocumened parameters.
via d2f8fe8 tests: Convert find_missing_doc into a unit test.
via 4790270 smb.conf(5): Fix mixing of tabs and spaces.
via aad30c0 smb.conf(5): Add basic documentation for 'nsupdate command'.
via 0cea6da smb.conf(5): Add basic documentation for 'afs token lifetime'.
via 695df86 smb.conf(5): Add 'ldap password sync' as synonym for 'ldap passwd sync'.
via 6c160e3 smb.conf(5): Add 'socket address' as alias for 'nbt client socket address'.
via 03b48e2 smb.conf(5): Add basic documentation for 'tls dh params file'.
via 946a873 smb.conf(5): Add basic documentation for 'tls enabled'.
via 2e4f054 smb.conf(5): Add basic documentation for 'tls crlfile'.
via 008dfb9 smb.conf(5): Add basic documentation for 'tls certfile'.
via 0f5e45b smb.conf(5): Add basic documentation for 'tls keyfile'.
via 4e1a06d smb.conf(5): Add basic documentation for 'tls cafile'.
via e27e8f4 smb.conf(5): Add basic documentation for 'log nt token command'.
via 7341dca smb.conf(5): Add basic documentation for 'ntp signd socket directory'.
via 6f36bde smb.conf(5): Add basic documentation for 'spn update command'.
via 68fdcaa smb.conf(5): Add basic documentation for 'allow dns updates'.
via b0b0266 smb.conf(5): Add basic documentation for 'rndc command'.
via 4ccea7f smb.conf(5): Add basic documentation for 'dns update command'.
via 3cc61af7 smb.conf(5): Add basic documentation for 'server services'.
via a63d6a9 smb.conf(5): Add basic documentation for 'samba kcc command'.
via d09f151 samba-tool user: Fix typos, improve messages.
via e7c8fca smb.conf(5): Add basic documentation 'winbind sealed pipes'.
via e9d91cd smb.conf(5): Add basic documentation for 'dns forwarder'.
via 394258a smb.conf(5): Add basic documentation for 'ntvfs handler'.
via c6ba857 smb.conf(5): Add : to idmap config description to mark it as parametric.
via 3cea625 smb.conf(5): Add basic documentation for 'winbindd privileged socket directory'.
via d0b3875 smb.conf(5): Add basic documentation for 'winbindd socket directory'.
via dfe75c2f smb.conf(5): Extend 'server min protocol' description.
from bea7a25 build: Assert that auth_domain, auth_builtin, auth_sam, auth_winbind are builtin
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit e3a48bb5f65bf9f5b77df010dcb75fcc9721cf3b
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Fri Oct 19 09:53:02 2012 +0200
samba-tool user test: Fix expected output.
Autobuild-User(master): Jelmer Vernooij <jelmer at samba.org>
Autobuild-Date(master): Fri Oct 19 11:37:44 CEST 2012 on sn-devel-104
commit 364ed82d22bbcd69ae237098ba8d6946969bd390
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Fri Oct 19 09:21:01 2012 +0200
samba.tests.docs: Ignore removed parameters.
commit 4b4e8e21235615af94788fa0ebfa0b0bc09f14fd
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Fri Oct 19 09:20:44 2012 +0200
smb.conf(5): Mark four removed parameters as such.
commit ed37b8ad14d496114654017d394fa18d63456aee
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Fri Oct 19 09:16:55 2012 +0200
samba.tests.docs: Assume docs are generated by waf.
commit cfa72bcc5e93a840fc07f5d419216443ef8f7599
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Fri Sep 28 21:40:32 2012 -0700
samba.tests.docs: Write error output from xsltproc to standard out.
commit 8412b57f5ce40901a0a4e2e66c5f9bcbdcb4b46e
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Fri Sep 28 09:52:41 2012 -0700
samba.tests.docs: Skip tests if xsltproc is not present.
commit 2a31f0b50976dc5b6770639b60184a8ef9158b8b
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.
commit 32fad2b910a9e4f9b753b43cb818c72829236a88
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Wed Sep 26 13:09:01 2012 -0700
samba.tests.docs: Support spaces before synonyms.
commit be4dea45daca51a817a7c383a4092bf69650c6cd
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Wed Sep 26 12:40:00 2012 -0700
samba.tests.docs: Support synonyms.
commit d0e644e0c83636b4e4c6b52ce0f861ffe38cedeb
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Wed Sep 26 18:41:19 2012 +0200
samba.tests.docs: Distinguish between unknown and undocumened parameters.
commit d2f8fe855d0705faf216714cf147038563c0ba7e
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Wed Sep 26 02:57:16 2012 +0200
tests: Convert find_missing_doc into a unit test.
commit 47902702b3e6390de05f8fca2bc457936af9f5c1
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Fri Oct 19 08:33:31 2012 +0200
smb.conf(5): Fix mixing of tabs and spaces.
commit aad30c062fd176fa15994a44a0178d51764cdbf7
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Fri Sep 28 21:25:50 2012 -0700
smb.conf(5): Add basic documentation for 'nsupdate command'.
commit 0cea6daffe42f5b9b6ee61eb430da3f86bea31df
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Fri Sep 28 13:05:07 2012 -0700
smb.conf(5): Add basic documentation for 'afs token lifetime'.
commit 695df863eddd6ee323229fe29a4a40712f3553b4
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Fri Sep 28 13:01:39 2012 -0700
smb.conf(5): Add 'ldap password sync' as synonym for 'ldap passwd sync'.
commit 6c160e3892eea219c50bbb2d1113460817bfad08
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Fri Sep 28 11:20:09 2012 -0700
smb.conf(5): Add 'socket address' as alias for 'nbt client socket address'.
commit 03b48e2bdbea30afad9b414fbab5dae67e57b5cf
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Fri Sep 28 11:13:13 2012 -0700
smb.conf(5): Add basic documentation for 'tls dh params file'.
commit 946a873e470ed4309bf56dae574b8f48a4dc629f
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Fri Sep 28 11:08:49 2012 -0700
smb.conf(5): Add basic documentation for 'tls enabled'.
commit 2e4f054e16aa9f67ec6bfb8ec7af6ebbba26db1d
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Fri Sep 28 11:05:47 2012 -0700
smb.conf(5): Add basic documentation for 'tls crlfile'.
commit 008dfb9a2167603c65fb4db56c8bd62cdd2447d0
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Fri Sep 28 11:00:09 2012 -0700
smb.conf(5): Add basic documentation for 'tls certfile'.
commit 0f5e45b84c9b54909294fc0ea48f7b6fb3ca2878
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Fri Sep 28 10:58:45 2012 -0700
smb.conf(5): Add basic documentation for 'tls keyfile'.
commit 4e1a06dc238c31a3b2343fcf4983c78fdc52f758
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Fri Sep 28 10:56:44 2012 -0700
smb.conf(5): Add basic documentation for 'tls cafile'.
commit e27e8f4f88dac6c938272ced6ca4b0fd3b20f8e0
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Fri Sep 28 10:52:13 2012 -0700
smb.conf(5): Add basic documentation for 'log nt token command'.
commit 7341dcac105baad0d06d112578fa3f12826bd4ef
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Fri Sep 28 10:42:55 2012 -0700
smb.conf(5): Add basic documentation for 'ntp signd socket directory'.
commit 6f36bde82f4a6329b97b400564e69928dffa0173
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Fri Sep 28 10:37:23 2012 -0700
smb.conf(5): Add basic documentation for 'spn update command'.
commit 68fdcaa6b7f69c622df958413ee3809e56861c04
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Fri Sep 28 10:35:06 2012 -0700
smb.conf(5): Add basic documentation for 'allow dns updates'.
commit b0b0266aa70721ebfea8dbc2602e81984a3b6023
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Fri Sep 28 10:31:08 2012 -0700
smb.conf(5): Add basic documentation for 'rndc command'.
commit 4ccea7f86796070ae6dbf404aa93ad4e5a7ae66e
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Fri Sep 28 10:16:08 2012 -0700
smb.conf(5): Add basic documentation for 'dns update command'.
commit 3cc61af7ff3b90026fdc6fc84ad905041154bfaf
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Fri Sep 28 10:09:41 2012 -0700
smb.conf(5): Add basic documentation for 'server services'.
commit a63d6a909406c2d0e04f6142f9614c3543ae2d1b
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Fri Sep 28 10:03:46 2012 -0700
smb.conf(5): Add basic documentation for 'samba kcc command'.
commit d09f15163843c5a027476e9087ae96700f6de003
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Thu Sep 27 18:44:43 2012 -0700
samba-tool user: Fix typos, improve messages.
commit e7c8fcaea5b06897603abb6f4f38ce39b400c9a7
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Thu Sep 27 17:57:54 2012 -0700
smb.conf(5): Add basic documentation 'winbind sealed pipes'.
commit e9d91cd4a133d7acb377341282230f99f5e10a12
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Thu Sep 27 13:38:31 2012 -0700
smb.conf(5): Add basic documentation for 'dns forwarder'.
commit 394258ad4c3413388e800800b2b1b941de037fa3
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Thu Sep 27 13:28:23 2012 -0700
smb.conf(5): Add basic documentation for 'ntvfs handler'.
commit c6ba8575ea7fe8b0fdc49d4f823ca441ae99070a
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Thu Sep 27 12:30:07 2012 -0700
smb.conf(5): Add : to idmap config description to mark it as parametric.
commit 3cea6257a9e4a3e1dc46e6c555d57992a73d6e6c
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Thu Sep 27 12:28:16 2012 -0700
smb.conf(5): Add basic documentation for 'winbindd privileged socket directory'.
commit d0b38752471dd870ad640fd39076bc51f84c57d1
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Thu Sep 27 12:24:15 2012 -0700
smb.conf(5): Add basic documentation for 'winbindd socket directory'.
commit dfe75c2f3591652a370a36f73f70e8055bda9d11
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Wed Sep 26 16:02:40 2012 -0700
smb.conf(5): Extend 'server min protocol' description.
-----------------------------------------------------------------------
Summary of changes:
docs-xml/Makefile | 3 +-
docs-xml/scripts/find_missing_doc | 83 -------------
docs-xml/smbdotconf/base/serverservices.xml | 18 +++
docs-xml/smbdotconf/domain/allowdnsupdates.xml | 18 +++
docs-xml/smbdotconf/domain/dnsforwarder.xml | 17 +++
docs-xml/smbdotconf/domain/dnsupdatecommand.xml | 15 +++
docs-xml/smbdotconf/domain/nsupdatecommand.xml | 13 ++
docs-xml/smbdotconf/domain/rndccommand.xml | 17 +++
docs-xml/smbdotconf/domain/spnupdatecommand.xml | 14 ++
docs-xml/smbdotconf/ldap/ldappasswdsync.xml | 1 +
docs-xml/smbdotconf/misc/afstokenlifetime.xml | 15 +++
.../smbdotconf/misc/nbtclientsocketaddress.xml | 1 +
docs-xml/smbdotconf/protocol/serverminprotocol.xml | 9 +-
.../smbdotconf/security/directorysecuritymask.xml | 1 +
.../security/forcedirectorysecuritymode.xml | 1 +
docs-xml/smbdotconf/security/forcesecuritymode.xml | 3 +-
docs-xml/smbdotconf/security/lognttokencommand.xml | 14 ++
.../security/ntpsigndsocketdirectory.xml | 17 +++
docs-xml/smbdotconf/security/sambakcccommand.xml | 19 +++
docs-xml/smbdotconf/security/securitymask.xml | 3 +-
docs-xml/smbdotconf/security/tlscafile.xml | 18 +++
docs-xml/smbdotconf/security/tlscertfile.xml | 17 +++
docs-xml/smbdotconf/security/tlscrlfile.xml | 17 +++
docs-xml/smbdotconf/security/tlsdhparamsfile.xml | 18 +++
docs-xml/smbdotconf/security/tlsenabled.xml | 11 ++
docs-xml/smbdotconf/security/tlskeyfile.xml | 18 +++
docs-xml/smbdotconf/vfs/ntvfshandler.xml | 16 +++
docs-xml/smbdotconf/winbind/idmapconfig.xml | 4 +-
.../winbind/winbinddprivilegedsocketdirectory.xml | 14 ++
.../smbdotconf/winbind/winbinddsocketdirectory.xml | 13 ++
docs-xml/smbdotconf/winbind/winbindsealedpipes.xml | 16 +++
selftest/tests.py | 1 +
source4/scripting/python/samba/netcmd/user.py | 16 ++-
source4/scripting/python/samba/tests/docs.py | 127 ++++++++++++++++++++
.../python/samba/tests/samba_tool/user.py | 2 +-
35 files changed, 492 insertions(+), 98 deletions(-)
delete mode 100755 docs-xml/scripts/find_missing_doc
create mode 100644 docs-xml/smbdotconf/base/serverservices.xml
create mode 100644 docs-xml/smbdotconf/domain/allowdnsupdates.xml
create mode 100644 docs-xml/smbdotconf/domain/dnsforwarder.xml
create mode 100644 docs-xml/smbdotconf/domain/dnsupdatecommand.xml
create mode 100644 docs-xml/smbdotconf/domain/nsupdatecommand.xml
create mode 100644 docs-xml/smbdotconf/domain/rndccommand.xml
create mode 100644 docs-xml/smbdotconf/domain/spnupdatecommand.xml
create mode 100644 docs-xml/smbdotconf/misc/afstokenlifetime.xml
create mode 100644 docs-xml/smbdotconf/security/lognttokencommand.xml
create mode 100644 docs-xml/smbdotconf/security/ntpsigndsocketdirectory.xml
create mode 100644 docs-xml/smbdotconf/security/sambakcccommand.xml
create mode 100644 docs-xml/smbdotconf/security/tlscafile.xml
create mode 100644 docs-xml/smbdotconf/security/tlscertfile.xml
create mode 100644 docs-xml/smbdotconf/security/tlscrlfile.xml
create mode 100644 docs-xml/smbdotconf/security/tlsdhparamsfile.xml
create mode 100644 docs-xml/smbdotconf/security/tlsenabled.xml
create mode 100644 docs-xml/smbdotconf/security/tlskeyfile.xml
create mode 100644 docs-xml/smbdotconf/vfs/ntvfshandler.xml
create mode 100644 docs-xml/smbdotconf/winbind/winbinddprivilegedsocketdirectory.xml
create mode 100644 docs-xml/smbdotconf/winbind/winbinddsocketdirectory.xml
create mode 100644 docs-xml/smbdotconf/winbind/winbindsealedpipes.xml
create mode 100644 source4/scripting/python/samba/tests/docs.py
Changeset truncated at 500 lines:
diff --git a/docs-xml/Makefile b/docs-xml/Makefile
index b322bed..f9c60d0 100644
--- a/docs-xml/Makefile
+++ b/docs-xml/Makefile
@@ -263,8 +263,7 @@ $(PEARSONDIR)/%.report.html: $(PEARSONDIR)/%.xml
cd $(<D) && $(XMLLINT) --xinclude --noent --postvalid --noout $(<F)
# Find undocumented parameters
-undocumented: $(SMBDOTCONFDOC)/parameters.all.xml scripts/find_missing_doc scripts/find_missing_manpages
- $(PERL) scripts/find_missing_doc $(SRCDIR)
+undocumented: $(SMBDOTCONFDOC)/parameters.all.xml scripts/find_missing_manpages
$(PERL) scripts/find_missing_manpages $(SRCDIR)/source3
samples: $(DOCBOOKDIR)/Samba3-HOWTO.xml xslt/extract-examples.xsl scripts/indent-smb.conf.pl
diff --git a/docs-xml/scripts/find_missing_doc b/docs-xml/scripts/find_missing_doc
deleted file mode 100755
index d75ef8d..0000000
--- a/docs-xml/scripts/find_missing_doc
+++ /dev/null
@@ -1,83 +0,0 @@
-#!/usr/bin/python
-
-# Copyright (C) 2007,2012 Jelmer Vernooij <jelmer at samba.org>
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-
-import optparse
-import os
-import re
-
-parser = optparse.OptionParser("source_dir")
-
-(opts, args) = parser.parse_args()
-
-if len(args) == 1:
- topdir = args[0]
-else:
- topdir = "."
-
-# Reading links from manpage
-
-curdir = os.getcwd()
-doc = {}
-
-os.chdir("smbdotconf");
-
-f = os.popen("xsltproc --xinclude --param smb.context ALL generate-context.xsl parameters.all.xml", "r")
-try:
- for l in f.readlines():
- m = re.match('<samba:parameter .*?name="([^"]*?)"', l)
- if m:
- name = m.group(1).replace(" ", "")
- doc[name] = False
-finally:
- f.close()
-
-os.chdir(curdir)
-
-# Reading entries from source code
-
-f = open(os.path.join(topdir, "lib/param/param_table.c"), "r")
-
-# burn through the preceding lines
-while True:
- l = f.readline()
- if l.startswith("static struct parm_struct parm_table"):
- break
-
-for l in f.readlines():
- if re.match("^\s*\}\;\s*$", l):
- break
- # pull in the param names only
- if re.match(".*P_SEPARATOR.*", l):
- continue
- m = re.match("\s*\.label\s*=\s*\"(.*)\".*", l)
- if not m:
- continue
-
- name = m.group(1)
- name = name.replace(" ", "")
-
- if name.lower() in doc:
- doc[name.lower()] = True
- else:
- print "'%s' is not documented" % name
-f.close()
-
-# Try to find missing references
-for key in doc.keys():
- if doc[key] == "FOUND":
- print "'$_' is documented but is not a configuration option"
diff --git a/docs-xml/smbdotconf/base/serverservices.xml b/docs-xml/smbdotconf/base/serverservices.xml
new file mode 100644
index 0000000..503938a
--- /dev/null
+++ b/docs-xml/smbdotconf/base/serverservices.xml
@@ -0,0 +1,18 @@
+<samba:parameter name="server services"
+ context="G"
+ type="list"
+ advanced="1"
+ xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+<description>
+ <para>This option contains the services that the Samba daemon will
+ run.</para>
+
+ <para>An entry in the <filename>smb.conf</filename> file can either
+ override the previous value completely or entries can be removed from
+ or added to it by prefixing them with <constant>+</constant> or
+ <constant>-</constant>. </para>
+</description>
+
+<value type="default">s3fs rpc nbt wrepl ldap cldap kdc drepl winbind ntp_signd kcc dnsupdate dns</value>
+<value type="example">-s3fs +smb</value>
+</samba:parameter>
diff --git a/docs-xml/smbdotconf/domain/allowdnsupdates.xml b/docs-xml/smbdotconf/domain/allowdnsupdates.xml
new file mode 100644
index 0000000..fc7d3e8
--- /dev/null
+++ b/docs-xml/smbdotconf/domain/allowdnsupdates.xml
@@ -0,0 +1,18 @@
+<samba:parameter name="allow dns updates"
+ context="G"
+ type="enum"
+ xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+<description>
+ <para>This option determines what kind of updates to the DNS are allowed.
+ </para>
+
+ <para>DNS updates can either be disallowed completely by setting it to
+ <constant>disabled</constant>, enabled over secure connections only by
+ setting it to <constant>secure</constant> or allowed in all cases
+ by setting it to <constant>enabled</constant> or <constant>nonsecure</constant>.
+ </para>
+</description>
+
+<value type="default">secure only</value>
+<value type="example">disabled</value>
+</samba:parameter>
diff --git a/docs-xml/smbdotconf/domain/dnsforwarder.xml b/docs-xml/smbdotconf/domain/dnsforwarder.xml
new file mode 100644
index 0000000..23a3886
--- /dev/null
+++ b/docs-xml/smbdotconf/domain/dnsforwarder.xml
@@ -0,0 +1,17 @@
+<samba:parameter name="dns forwarder"
+ context="G"
+ type="string"
+ xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+<description>
+ <para>This option specifies the DNS server that DNS requests will be
+ forwarded to if they can not be handled by Samba itself.
+ </para>
+
+ <para>The DNS forwarder is only used if the internal DNS server
+ in Samba is used.
+ </para>
+</description>
+
+<value type="default"></value>
+<value type="example">192.168.0.1</value>
+</samba:parameter>
diff --git a/docs-xml/smbdotconf/domain/dnsupdatecommand.xml b/docs-xml/smbdotconf/domain/dnsupdatecommand.xml
new file mode 100644
index 0000000..08ff90a
--- /dev/null
+++ b/docs-xml/smbdotconf/domain/dnsupdatecommand.xml
@@ -0,0 +1,15 @@
+<samba:parameter name="dns update command"
+ context="G"
+ type="string"
+ advanced="1"
+ xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+<description>
+ <para>This option sets the command that is called when there are
+ DNS updates. It should update the local machines DNS names using
+ TSIG-GSS.
+ </para>
+</description>
+
+<value type="default">$prefix/sbin/samba_dnsupdate</value>
+<value type="example">/usr/local/sbin/dnsupdate</value>
+</samba:parameter>
diff --git a/docs-xml/smbdotconf/domain/nsupdatecommand.xml b/docs-xml/smbdotconf/domain/nsupdatecommand.xml
new file mode 100644
index 0000000..3cf02f1
--- /dev/null
+++ b/docs-xml/smbdotconf/domain/nsupdatecommand.xml
@@ -0,0 +1,13 @@
+<samba:parameter name="nsupdate command"
+ context="G"
+ type="string"
+ advanced="1"
+ xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+<description>
+ <para>This option sets the path to the <filename>nsupdate</filename>
+ command which is used for GSS-TSIG dynamic DNS updates.
+ </para>
+</description>
+
+<value type="default">$prefix/sbin/nsupdate -g</value>
+</samba:parameter>
diff --git a/docs-xml/smbdotconf/domain/rndccommand.xml b/docs-xml/smbdotconf/domain/rndccommand.xml
new file mode 100644
index 0000000..b407ff2
--- /dev/null
+++ b/docs-xml/smbdotconf/domain/rndccommand.xml
@@ -0,0 +1,17 @@
+<samba:parameter name="rndc command"
+ context="G"
+ type="string"
+ advanced="1" developer="1"
+ xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+<description>
+ <para>This option specifies the path to the name server control utility.
+ </para>
+
+ <para>The <filename>rndc</filename> utility should be a part of the
+ bind installation.
+ </para>
+</description>
+
+<value type="default">/usr/sbin/rndc</value>
+<value type="example">/usr/local/bind9/sbin/rndc</value>
+</samba:parameter>
diff --git a/docs-xml/smbdotconf/domain/spnupdatecommand.xml b/docs-xml/smbdotconf/domain/spnupdatecommand.xml
new file mode 100644
index 0000000..f63be84
--- /dev/null
+++ b/docs-xml/smbdotconf/domain/spnupdatecommand.xml
@@ -0,0 +1,14 @@
+<samba:parameter name="spn update command"
+ context="G"
+ type="string"
+ advanced="1"
+ xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+<description>
+ <para>This option sets the command that for updating
+ servicePrincipalName names from <filename>spn_update_list</filename>.
+ </para>
+</description>
+
+<value type="default">$prefix/sbin/samba_spnupdate</value>
+<value type="example">/usr/local/sbin/spnupdate</value>
+</samba:parameter>
diff --git a/docs-xml/smbdotconf/ldap/ldappasswdsync.xml b/docs-xml/smbdotconf/ldap/ldappasswdsync.xml
index 864bfc4..8c7dea6 100644
--- a/docs-xml/smbdotconf/ldap/ldappasswdsync.xml
+++ b/docs-xml/smbdotconf/ldap/ldappasswdsync.xml
@@ -5,6 +5,7 @@
type="enum"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+<synonym>ldap password sync</synonym>
<description>
<para>
This option is used to define whether or not Samba should sync the LDAP password with the NT
diff --git a/docs-xml/smbdotconf/misc/afstokenlifetime.xml b/docs-xml/smbdotconf/misc/afstokenlifetime.xml
new file mode 100644
index 0000000..cbf9574
--- /dev/null
+++ b/docs-xml/smbdotconf/misc/afstokenlifetime.xml
@@ -0,0 +1,15 @@
+<samba:parameter name="afs token lifetime"
+ context="G"
+ type="integer"
+ advanced="1"
+ xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+<description>
+ <para>This parameter controls the lifetime of tokens that the AFS
+ fake-kaserver claims. In reality these never expire but this lifetime
+ controls when the afs client will forget the token. </para>
+
+ <para>Set this parameter to 0 to get <constant>NEVERDATE</constant>.</para>
+</description>
+
+<value type="default">604800</value>
+</samba:parameter>
diff --git a/docs-xml/smbdotconf/misc/nbtclientsocketaddress.xml b/docs-xml/smbdotconf/misc/nbtclientsocketaddress.xml
index f6784c3..7ef05a2 100644
--- a/docs-xml/smbdotconf/misc/nbtclientsocketaddress.xml
+++ b/docs-xml/smbdotconf/misc/nbtclientsocketaddress.xml
@@ -3,6 +3,7 @@
type="string"
developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+<synonym>socket address</synonym>
<description>
<para>This option allows you to control what address Samba
will send NBT client packets from, and process replies using,
diff --git a/docs-xml/smbdotconf/protocol/serverminprotocol.xml b/docs-xml/smbdotconf/protocol/serverminprotocol.xml
index 58323b5..4edecc4 100644
--- a/docs-xml/smbdotconf/protocol/serverminprotocol.xml
+++ b/docs-xml/smbdotconf/protocol/serverminprotocol.xml
@@ -1,11 +1,16 @@
<samba:parameter name="server min protocol"
context="G"
type="enum"
- developer="1"
+ developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<synonym>min protocol</synonym>
<description>
- <para>This setting controls the minimum protocol version that the server will allow the client to use.</para>
+ <para>This setting controls the minimum protocol version that the server
+ will allow the client 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>server max protocol</related>
diff --git a/docs-xml/smbdotconf/security/directorysecuritymask.xml b/docs-xml/smbdotconf/security/directorysecuritymask.xml
index 47feaf0..c5c8c65 100644
--- a/docs-xml/smbdotconf/security/directorysecuritymask.xml
+++ b/docs-xml/smbdotconf/security/directorysecuritymask.xml
@@ -1,5 +1,6 @@
<samba:parameter name="directory security mask"
context="S"
+ removed="1"
type="string"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
diff --git a/docs-xml/smbdotconf/security/forcedirectorysecuritymode.xml b/docs-xml/smbdotconf/security/forcedirectorysecuritymode.xml
index 51c5de1..3ea3b5c 100644
--- a/docs-xml/smbdotconf/security/forcedirectorysecuritymode.xml
+++ b/docs-xml/smbdotconf/security/forcedirectorysecuritymode.xml
@@ -1,6 +1,7 @@
<samba:parameter name="force directory security mode"
context="S"
type="string"
+ removed="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>
diff --git a/docs-xml/smbdotconf/security/forcesecuritymode.xml b/docs-xml/smbdotconf/security/forcesecuritymode.xml
index b6713b1..2568bcc 100644
--- a/docs-xml/smbdotconf/security/forcesecuritymode.xml
+++ b/docs-xml/smbdotconf/security/forcesecuritymode.xml
@@ -1,6 +1,7 @@
<samba:parameter name="force security mode"
context="S"
- type="string"
+ type="string"
+ removed="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>
diff --git a/docs-xml/smbdotconf/security/lognttokencommand.xml b/docs-xml/smbdotconf/security/lognttokencommand.xml
new file mode 100644
index 0000000..33ec23b
--- /dev/null
+++ b/docs-xml/smbdotconf/security/lognttokencommand.xml
@@ -0,0 +1,14 @@
+<samba:parameter name="log nt token command"
+ context="G"
+ type="string"
+ advanced="1" developer="1"
+ xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+<description>
+ <para>This option can be set to a command that will be called when new nt
+ tokens are created.</para>
+
+ <para>This is only useful for development purposes.</para>
+</description>
+
+<value type="default"></value>
+</samba:parameter>
diff --git a/docs-xml/smbdotconf/security/ntpsigndsocketdirectory.xml b/docs-xml/smbdotconf/security/ntpsigndsocketdirectory.xml
new file mode 100644
index 0000000..718626d
--- /dev/null
+++ b/docs-xml/smbdotconf/security/ntpsigndsocketdirectory.xml
@@ -0,0 +1,17 @@
+<samba:parameter name="ntp signd socket directory"
+ context="G"
+ type="string"
+ advanced="1"
+ xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+<description>
+ <para>This setting controls the location of the socket that
+ the NTP daemon uses to communicate with Samba for
+ signing packets.</para>
+
+ <para>If a non-default path is specified here, then it is also necessary
+ to make NTP aware of the new path using the <constant>ntpsigndsocket</constant>
+ directive in <filename>ntp.conf</filename>.</para>
+</description>
+
+<value type="default">$prefix/run/samba/ntp_signd</value>
+</samba:parameter>
diff --git a/docs-xml/smbdotconf/security/sambakcccommand.xml b/docs-xml/smbdotconf/security/sambakcccommand.xml
new file mode 100644
index 0000000..9621792
--- /dev/null
+++ b/docs-xml/smbdotconf/security/sambakcccommand.xml
@@ -0,0 +1,19 @@
+<samba:parameter name="samba kcc command"
+ context="G"
+ type="string"
+ advanced="1"
+ xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+<description>
+ <para>This option specifies the path to the Samba KCC command.
+ This script is used for replication topology replication.
+ </para>
+
+ <para>It should not be necessary to modify this option except
+ for testing purposes or if the <filename>samba_kcc</filename>
+ was installed in a non-default location.
+ </para>
+</description>
+
+<value type="default">$prefix/sbin/samba_kcc</value>
+<value type="example">/usr/local/bin/kcc</value>
+</samba:parameter>
diff --git a/docs-xml/smbdotconf/security/securitymask.xml b/docs-xml/smbdotconf/security/securitymask.xml
index d1e78be..cb7fcfa 100644
--- a/docs-xml/smbdotconf/security/securitymask.xml
+++ b/docs-xml/smbdotconf/security/securitymask.xml
@@ -1,6 +1,7 @@
<samba:parameter name="security mask"
context="S"
- type="string"
+ type="string"
+ removed="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>
diff --git a/docs-xml/smbdotconf/security/tlscafile.xml b/docs-xml/smbdotconf/security/tlscafile.xml
new file mode 100644
index 0000000..ea2a595
--- /dev/null
+++ b/docs-xml/smbdotconf/security/tlscafile.xml
@@ -0,0 +1,18 @@
+<samba:parameter name="tls cafile"
+ type="string"
+ context="G"
+ basic="1" advanced="1" developer="1"
+ xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+ <description>
+ <para>This option can be set to a file (PEM format)
+ containing CA certificates of root CAs to trust to sign
+ certificates or intermediate CA certificates.</para>
+ </description>
+
+ <related>tls certfile</related>
+ <related>tls crlfile</related>
+ <related>tls dh params file</related>
+ <related>tls enabled</related>
+ <related>tls keyfile</related>
+ <value type="default"></value>
+</samba:parameter>
diff --git a/docs-xml/smbdotconf/security/tlscertfile.xml b/docs-xml/smbdotconf/security/tlscertfile.xml
new file mode 100644
index 0000000..317cb37
--- /dev/null
+++ b/docs-xml/smbdotconf/security/tlscertfile.xml
@@ -0,0 +1,17 @@
+<samba:parameter name="tls certfile"
+ type="string"
+ context="G"
+ basic="1" advanced="1" developer="1"
+ xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+ <description>
+ <para>This option can be set to a file (PEM format)
+ containing the RSA certificate. </para>
+ </description>
+
+ <related>tls keyfile</related>
+ <related>tls crlfile</related>
+ <related>tls dh params file</related>
+ <related>tls enabled</related>
+ <related>tls cafile</related>
+ <value type="default"></value>
+</samba:parameter>
diff --git a/docs-xml/smbdotconf/security/tlscrlfile.xml b/docs-xml/smbdotconf/security/tlscrlfile.xml
new file mode 100644
index 0000000..442ff84
--- /dev/null
+++ b/docs-xml/smbdotconf/security/tlscrlfile.xml
@@ -0,0 +1,17 @@
+<samba:parameter name="tls crlfile"
+ type="string"
+ context="G"
+ basic="1" advanced="1" developer="1"
+ xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
--
Samba Shared Repository
More information about the samba-cvs
mailing list