[SCM] Samba Shared Repository - branch v4-0-test updated
Karolin Seeger
kseeger at samba.org
Mon Oct 29 15:28:03 MDT 2012
The branch, v4-0-test has been updated
via f6b8919 WHATSNEW: Update changes since rc3.
via e83ad06 source3.selftest: Move last variables to selftesthelpers.
via ff52138 source3.selftest: Move more variables to be in common. (cherry picked from commit 66980989e5b28490cd7b04b576cf39d26f183b90)
via 23a6320 selftesthelpers: Fix detection of tap2subunit.
via d1deda0 selftest: Add --random-order option. (cherry picked from commit 67dd28f3605db4cbdc5feacc1121ec3d7dd075a6)
via cf1ede2 source4.selftest.tests: Add FIXME about database verification. (cherry picked from commit 1190f385f72f68f22277c8b380f2d4c461c413a4)
via 2008f37 selftesthelpers: Simplify detection of tap2subunit. (cherry picked from commit 05dc5a39a6ad4b1ffafc904faea3e8e40f6f5cde)
via 85bf826 source3.selftests.tests: Use common plansmbtorture4testsuite() function. (cherry picked from commit fd607e0a9eefb79130941e244435980afbbb4bf7)
via 81c796d source3.selftest.tests: Add suffix for smbclient3/ntlm_auth3. (cherry picked from commit efb27e29dadf58d2dec651ca3a0c108b4cf515ae)
via 020f3f4 source3.selftest.tests: Remove tabs. (cherry picked from commit a841f0fced7abfb0f6d98390c07becdf49a91af5)
via 5abde61 source4.selftest.tests: Add suffix for smbclient4/nmblookup4. (cherry picked from commit ea5e2b56c14072eeaa785d05f1da4d439667e8b6)
via a3d1446 selftesthelpers: Add function for printing smbtorture4 version. (cherry picked from commit 58345820c078f79fe7f67b8e6f947691f7237641)
via 4d2fc2a selftest: Move determining of smbtorture4 options to selftesthelpers. (cherry picked from commit 8237e2727da0d04b82cb3cf644dd337a4c77fe34)
via 244ca61 selftest/selftesthelpers: Share environment handling for extra smbtorture options. (cherry picked from commit fcb7926ce544a8d4b0e5aa6577fe21712b38bb53)
via e2adfe7 selftest/selftesthelpers.py: Share configuration variable, strip whitespace. (cherry picked from commit 6bcb25673bdc249f5a49ded912d90bc84b13809d)
via 5cdec48 selftesthelpers: Share code for listing smbtorture4 tests. (cherry picked from commit 4c4d3c86f0430d38f78d16dcb5d365b577ef4227)
via af3f83a source4.selftest.tests: Rename plansmbtorturesuite() to plansmbtorture4suite(). (cherry picked from commit 868c8c058306b66fb3baa4a36bfe91d6461805d5)
via 220b98d source4.selftest.tests: Consistent naming of smbtorture binary. (cherry picked from commit 55507d0612ecf2db34867eb6065fc5038ea81aa0)
via 76bbf16 samba.tests.docs: Ignore removed parameters. (cherry picked from commit 364ed82d22bbcd69ae237098ba8d6946969bd390)
via 7461d45 smb.conf(5): Mark four removed parameters as such. (cherry picked from commit 4b4e8e21235615af94788fa0ebfa0b0bc09f14fd)
via c7e9ab5 samba.tests.docs: Assume docs are generated by waf. (cherry picked from commit ed37b8ad14d496114654017d394fa18d63456aee)
via 87f45c8 samba.tests.docs: Write error output from xsltproc to standard out. (cherry picked from commit cfa72bcc5e93a840fc07f5d419216443ef8f7599)
via f31db3e samba.tests.docs: Skip tests if xsltproc is not present. (cherry picked from commit 8412b57f5ce40901a0a4e2e66c5f9bcbdcb4b46e)
via afd55f7 smb.conf(5): Consistent spelling of parameter names.
via a23aa34 samba.tests.docs: Support spaces before synonyms. (cherry picked from commit 32fad2b910a9e4f9b753b43cb818c72829236a88)
via 6a34a8a samba.tests.docs: Support synonyms. (cherry picked from commit be4dea45daca51a817a7c383a4092bf69650c6cd)
via a05c65f samba.tests.docs: Distinguish between unknown and undocumened parameters. (cherry picked from commit d0e644e0c83636b4e4c6b52ce0f861ffe38cedeb)
via 97ddb5c tests: Convert find_missing_doc into a unit test. (cherry picked from commit d2f8fe855d0705faf216714cf147038563c0ba7e)
via ccec37c smb.conf(5): Fix mixing of tabs and spaces. (cherry picked from commit 47902702b3e6390de05f8fca2bc457936af9f5c1)
via 6461f02 smb.conf(5): Add basic documentation for 'nsupdate command'. (cherry picked from commit aad30c062fd176fa15994a44a0178d51764cdbf7)
via d6bb051 smb.conf(5): Add basic documentation for 'afs token lifetime'. (cherry picked from commit 0cea6daffe42f5b9b6ee61eb430da3f86bea31df)
via 2a2efb9 smb.conf(5): Add 'ldap password sync' as synonym for 'ldap passwd sync'. (cherry picked from commit 695df863eddd6ee323229fe29a4a40712f3553b4)
via 2059769 smb.conf(5): Add 'socket address' as alias for 'nbt client socket address'. (cherry picked from commit 6c160e3892eea219c50bbb2d1113460817bfad08)
via b4eb7ff smb.conf(5): Add basic documentation for 'tls dh params file'. (cherry picked from commit 03b48e2bdbea30afad9b414fbab5dae67e57b5cf)
via b0cd55e smb.conf(5): Add basic documentation for 'tls enabled'. (cherry picked from commit 946a873e470ed4309bf56dae574b8f48a4dc629f)
via dbb47f3 smb.conf(5): Add basic documentation for 'tls crlfile'. (cherry picked from commit 2e4f054e16aa9f67ec6bfb8ec7af6ebbba26db1d)
via 43492de smb.conf(5): Add basic documentation for 'tls certfile'. (cherry picked from commit 008dfb9a2167603c65fb4db56c8bd62cdd2447d0)
via 3affc93 smb.conf(5): Add basic documentation for 'tls keyfile'. (cherry picked from commit 0f5e45b84c9b54909294fc0ea48f7b6fb3ca2878)
via 3341ad3 smb.conf(5): Add basic documentation for 'tls cafile'. (cherry picked from commit 4e1a06dc238c31a3b2343fcf4983c78fdc52f758)
via 2a7d50a smb.conf(5): Add basic documentation for 'log nt token command'. (cherry picked from commit e27e8f4f88dac6c938272ced6ca4b0fd3b20f8e0)
via 819815e smb.conf(5): Add basic documentation for 'ntp signd socket directory'. (cherry picked from commit 7341dcac105baad0d06d112578fa3f12826bd4ef)
via 3c880b0 smb.conf(5): Add basic documentation for 'spn update command'. (cherry picked from commit 6f36bde82f4a6329b97b400564e69928dffa0173)
via a2090ad smb.conf(5): Add basic documentation for 'allow dns updates'. (cherry picked from commit 68fdcaa6b7f69c622df958413ee3809e56861c04)
via b484ad5 smb.conf(5): Add basic documentation for 'rndc command'. (cherry picked from commit b0b0266aa70721ebfea8dbc2602e81984a3b6023)
via 20e41e6 smb.conf(5): Add basic documentation for 'dns update command'. (cherry picked from commit 4ccea7f86796070ae6dbf404aa93ad4e5a7ae66e)
via 08f35a1 smb.conf(5): Add basic documentation for 'server services'. (cherry picked from commit 3cc61af7ff3b90026fdc6fc84ad905041154bfaf)
via 932a919 smb.conf(5): Add basic documentation for 'samba kcc command'. (cherry picked from commit a63d6a909406c2d0e04f6142f9614c3543ae2d1b)
via c947d2e samba-tool user: Fix typos, improve messages. (cherry picked from commit d09f15163843c5a027476e9087ae96700f6de003)
via 74406c9 smb.conf(5): Add basic documentation 'winbind sealed pipes'. (cherry picked from commit e7c8fcaea5b06897603abb6f4f38ce39b400c9a7)
via 7a1584e smb.conf(5): Add basic documentation for 'dns forwarder'. (cherry picked from commit e9d91cd4a133d7acb377341282230f99f5e10a12)
via 14f4d98 smb.conf(5): Add basic documentation for 'ntvfs handler'. (cherry picked from commit 394258ad4c3413388e800800b2b1b941de037fa3)
via 35298b2 smb.conf(5): Add : to idmap config description to mark it as parametric. (cherry picked from commit c6ba8575ea7fe8b0fdc49d4f823ca441ae99070a)
via fab2bfb smb.conf(5): Add basic documentation for 'winbindd privileged socket directory'. (cherry picked from commit 3cea6257a9e4a3e1dc46e6c555d57992a73d6e6c)
via 0c93527 smb.conf(5): Add basic documentation for 'winbindd socket directory'. (cherry picked from commit d0b38752471dd870ad640fd39076bc51f84c57d1)
via 9193547 smb.conf(5): Extend 'server min protocol' description. (cherry picked from commit dfe75c2f3591652a370a36f73f70e8055bda9d11)
via 6d748c3 samba-tool user test: Fix expected output.
via e009ed6 selftest: Move more tests to common list script.
via d3f1efc samba.join: Fix multiple spaces.
via d57812b selftest: Move some tests to common test script. (cherry picked from commit 1aa291c331c29c2f5ee4572b660c4c2061755856)
via a6f33d7 selftests.tests: Remove reference to Samba 4. (cherry picked from commit 1080b6c2caf1191fd896f3caf38e576a00b01982)
via b74f803 samba4-tests: Move 'samba.tests.source' up.
via 66c8c1b samba.provision.sambadns: Use == to compare strings, not 'is'. (cherry picked from commit 2adf27a99b999a4fd0329d9fa398a9208b60e367)
via e0c3a50 wafsamba: Ignore some more symbols when checking for dupes. (cherry picked from commit 276460cf8afb4894fe1e980c7a75e866c14ba144)
via bcbf56c Fix bug #9329 - Directory listing with SeBackup can crash smbd.
from 6bd3066 WHATSNEW: Update changes since rc3.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test
- Log -----------------------------------------------------------------
commit f6b8919c44b379e83697a99c808c72e13d38b4b6
Author: Karolin Seeger <kseeger at samba.org>
Date: Mon Oct 29 21:48:02 2012 +0100
WHATSNEW: Update changes since rc3.
Karolin
Autobuild-User(v4-0-test): Karolin Seeger <kseeger at samba.org>
Autobuild-Date(v4-0-test): Mon Oct 29 22:27:53 CET 2012 on sn-devel-104
commit e83ad0684556516b4640a3c0812b3a9465a949b2
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sat Oct 27 05:31:06 2012 -0800
source3.selftest: Move last variables to selftesthelpers.
Autobuild-User(master): Jelmer Vernooij <jelmer at samba.org>
Autobuild-Date(master): Sat Oct 27 19:08:42 CEST 2012 on sn-devel-104
(cherry picked from commit a7b8d0260a55959c72614251db880fed04a48316)
The last 62 patches address bug #9274 - backport documentation changes.
commit ff52138d3f23aa0da0290f179f1df87103244427
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sat Oct 27 05:23:57 2012 -0800
source3.selftest: Move more variables to be in common. (cherry picked from commit 66980989e5b28490cd7b04b576cf39d26f183b90)
commit 23a63200a43e291ea27d0c05052de540b74430f9
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Fri Oct 26 17:31:40 2012 -0800
selftesthelpers: Fix detection of tap2subunit.
Autobuild-User(master): Jelmer Vernooij <jelmer at samba.org>
Autobuild-Date(master): Sat Oct 27 16:57:49 CEST 2012 on sn-devel-104
(cherry picked from commit 13269923585888912e2433c15c0ca010a9897595)
commit d1deda0249d58050df287148e590161c976cd94e
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Fri Oct 26 15:53:57 2012 -0800
selftest: Add --random-order option. (cherry picked from commit 67dd28f3605db4cbdc5feacc1121ec3d7dd075a6)
commit cf1ede2e0e28cce2c27496aa663588cdfca17c33
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Fri Oct 26 14:40:09 2012 -0800
source4.selftest.tests: Add FIXME about database verification. (cherry picked from commit 1190f385f72f68f22277c8b380f2d4c461c413a4)
commit 2008f379c299bd7dcdadec5620c276715cdfe95f
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Fri Oct 26 14:14:42 2012 -0800
selftesthelpers: Simplify detection of tap2subunit. (cherry picked from commit 05dc5a39a6ad4b1ffafc904faea3e8e40f6f5cde)
commit 85bf826410a5571f7448314663e043c2f268aa96
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Fri Oct 26 14:06:47 2012 -0800
source3.selftests.tests: Use common plansmbtorture4testsuite() function. (cherry picked from commit fd607e0a9eefb79130941e244435980afbbb4bf7)
commit 81c796d21a6c882f04552d709d9adb1beb3ccf2c
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Fri Oct 26 14:00:07 2012 -0800
source3.selftest.tests: Add suffix for smbclient3/ntlm_auth3. (cherry picked from commit efb27e29dadf58d2dec651ca3a0c108b4cf515ae)
commit 020f3f45ed1510ef02ed1f5972bdc15a78a351ac
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Fri Oct 26 13:56:30 2012 -0800
source3.selftest.tests: Remove tabs. (cherry picked from commit a841f0fced7abfb0f6d98390c07becdf49a91af5)
commit 5abde6197b4401c8e558cb60a087024bacea244d
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Fri Oct 26 13:52:55 2012 -0800
source4.selftest.tests: Add suffix for smbclient4/nmblookup4. (cherry picked from commit ea5e2b56c14072eeaa785d05f1da4d439667e8b6)
commit a3d14466ad8f8e8e55494ad5368199e8cabe9a5d
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Fri Oct 26 13:51:54 2012 -0800
selftesthelpers: Add function for printing smbtorture4 version. (cherry picked from commit 58345820c078f79fe7f67b8e6f947691f7237641)
commit 4d2fc2a8d87b889aa6b734ff815098eb3ace8519
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Fri Oct 26 13:38:32 2012 -0800
selftest: Move determining of smbtorture4 options to selftesthelpers. (cherry picked from commit 8237e2727da0d04b82cb3cf644dd337a4c77fe34)
commit 244ca61f88b05cc86f13efe40509378b33f5c7e0
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Fri Oct 26 13:12:54 2012 -0800
selftest/selftesthelpers: Share environment handling for extra smbtorture options. (cherry picked from commit fcb7926ce544a8d4b0e5aa6577fe21712b38bb53)
commit e2adfe74f3fb60c3f8e69bf0c163b6524398fffc
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Fri Oct 26 13:09:45 2012 -0800
selftest/selftesthelpers.py: Share configuration variable, strip whitespace. (cherry picked from commit 6bcb25673bdc249f5a49ded912d90bc84b13809d)
commit 5cdec48616963bb87b61191ce17caa9741f5c29c
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Fri Oct 26 13:03:32 2012 -0800
selftesthelpers: Share code for listing smbtorture4 tests. (cherry picked from commit 4c4d3c86f0430d38f78d16dcb5d365b577ef4227)
commit af3f83a1ec9e97e908d0366ef18576cad098d485
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Fri Oct 26 11:51:19 2012 -0800
source4.selftest.tests: Rename plansmbtorturesuite() to plansmbtorture4suite(). (cherry picked from commit 868c8c058306b66fb3baa4a36bfe91d6461805d5)
commit 220b98dfd623c3a4bc72b2b148e40ec03c45ba3d
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Fri Oct 26 11:50:41 2012 -0800
source4.selftest.tests: Consistent naming of smbtorture binary. (cherry picked from commit 55507d0612ecf2db34867eb6065fc5038ea81aa0)
commit 76bbf1662661e308bf554f36d8ef51a58622ea34
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Fri Oct 19 09:21:01 2012 +0200
samba.tests.docs: Ignore removed parameters. (cherry picked from commit 364ed82d22bbcd69ae237098ba8d6946969bd390)
commit 7461d45b4ea6719898f1b7411b7a657a3404d13f
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. (cherry picked from commit 4b4e8e21235615af94788fa0ebfa0b0bc09f14fd)
commit c7e9ab587577165b4721633b3296c3bfc3c89038
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. (cherry picked from commit ed37b8ad14d496114654017d394fa18d63456aee)
commit 87f45c84dc69c7cd8204a696a57607b69b8d7534
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. (cherry picked from commit cfa72bcc5e93a840fc07f5d419216443ef8f7599)
commit f31db3ee99d2abe8c2446477cb131a90ea4ddb40
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. (cherry picked from commit 8412b57f5ce40901a0a4e2e66c5f9bcbdcb4b46e)
commit afd55f72a92ef2c81076c2596af908f7f2fd7ab4
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.
(cherry picked from commit 2a31f0b50976dc5b6770639b60184a8ef9158b8b)
commit a23aa349f6de8f2549f4c69886ff57d95f603fcd
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Wed Sep 26 13:09:01 2012 -0700
samba.tests.docs: Support spaces before synonyms. (cherry picked from commit 32fad2b910a9e4f9b753b43cb818c72829236a88)
commit 6a34a8a2364ebea3f862d3a1a0c2702193c9db86
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Wed Sep 26 12:40:00 2012 -0700
samba.tests.docs: Support synonyms. (cherry picked from commit be4dea45daca51a817a7c383a4092bf69650c6cd)
commit a05c65f0e25dd053b9e73065d70fcd0c5b4c27c2
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. (cherry picked from commit d0e644e0c83636b4e4c6b52ce0f861ffe38cedeb)
commit 97ddb5c8dde2389ca316db0ce614688665559935
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. (cherry picked from commit d2f8fe855d0705faf216714cf147038563c0ba7e)
commit ccec37c858c220e580ce77b73e50c48ff4fc72dc
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. (cherry picked from commit 47902702b3e6390de05f8fca2bc457936af9f5c1)
commit 6461f02229ebf1bcac31f182f51042fa32877eb8
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'. (cherry picked from commit aad30c062fd176fa15994a44a0178d51764cdbf7)
commit d6bb051d85804889b32f266c24f143ad76be98bf
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'. (cherry picked from commit 0cea6daffe42f5b9b6ee61eb430da3f86bea31df)
commit 2a2efb973dc8b6f15bf98fd628f0296c57644855
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'. (cherry picked from commit 695df863eddd6ee323229fe29a4a40712f3553b4)
commit 205976921d98cbf511782a456b6ae4a3998f7da2
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'. (cherry picked from commit 6c160e3892eea219c50bbb2d1113460817bfad08)
commit b4eb7fffaa4cf081472fa9c0f24d4b4f0937dd28
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'. (cherry picked from commit 03b48e2bdbea30afad9b414fbab5dae67e57b5cf)
commit b0cd55ec2a612d21a7d68a78a000c0a366856293
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'. (cherry picked from commit 946a873e470ed4309bf56dae574b8f48a4dc629f)
commit dbb47f3983393a667280640ad3c70bd5c06d5811
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'. (cherry picked from commit 2e4f054e16aa9f67ec6bfb8ec7af6ebbba26db1d)
commit 43492decdb66e26d22a5fc19b3f598ef58357331
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'. (cherry picked from commit 008dfb9a2167603c65fb4db56c8bd62cdd2447d0)
commit 3affc933a4a50fe9f52cdb3d5e74d23b0d50d65b
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'. (cherry picked from commit 0f5e45b84c9b54909294fc0ea48f7b6fb3ca2878)
commit 3341ad3b971e65c7709ebb4cef727a369ca9c0ed
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'. (cherry picked from commit 4e1a06dc238c31a3b2343fcf4983c78fdc52f758)
commit 2a7d50a8452e91522d77ac5693932792a8551530
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'. (cherry picked from commit e27e8f4f88dac6c938272ced6ca4b0fd3b20f8e0)
commit 819815e31b98da9cada0c797a9285a0e8a803e38
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'. (cherry picked from commit 7341dcac105baad0d06d112578fa3f12826bd4ef)
commit 3c880b0136cfe47bc0dd13402016d9b142ba5c80
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'. (cherry picked from commit 6f36bde82f4a6329b97b400564e69928dffa0173)
commit a2090ad3f8c06ef66ddfbb123e7fd1e6eff278c3
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'. (cherry picked from commit 68fdcaa6b7f69c622df958413ee3809e56861c04)
commit b484ad5aca8a78e0405b2aa168dd86a85223b6c0
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'. (cherry picked from commit b0b0266aa70721ebfea8dbc2602e81984a3b6023)
commit 20e41e6bfaab2d38d904729754f83db25e7bf1dc
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'. (cherry picked from commit 4ccea7f86796070ae6dbf404aa93ad4e5a7ae66e)
commit 08f35a14e75db13c8f56f575da9072f5288534c4
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'. (cherry picked from commit 3cc61af7ff3b90026fdc6fc84ad905041154bfaf)
commit 932a919c0327ed95b5dfc6f76c33a65ff2942481
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'. (cherry picked from commit a63d6a909406c2d0e04f6142f9614c3543ae2d1b)
commit c947d2e5601f22dc4bf5f966ab09914349d933ee
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Thu Sep 27 18:44:43 2012 -0700
samba-tool user: Fix typos, improve messages. (cherry picked from commit d09f15163843c5a027476e9087ae96700f6de003)
commit 74406c979d48081b896abbdf16ce1f9b4f6bdb21
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'. (cherry picked from commit e7c8fcaea5b06897603abb6f4f38ce39b400c9a7)
commit 7a1584e353c729721d9c1825b22d30636f9ea62f
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'. (cherry picked from commit e9d91cd4a133d7acb377341282230f99f5e10a12)
commit 14f4d988a3058f2c00bd97957fcd94e52c5449ef
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'. (cherry picked from commit 394258ad4c3413388e800800b2b1b941de037fa3)
commit 35298b21fa9cef4dd47889fa2d00642309c8bc69
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. (cherry picked from commit c6ba8575ea7fe8b0fdc49d4f823ca441ae99070a)
commit fab2bfbb39791abf46bb6fe772bfde0f5d898426
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'. (cherry picked from commit 3cea6257a9e4a3e1dc46e6c555d57992a73d6e6c)
commit 0c93527c61b28cfc70dbc54e4b5c198df8e4a000
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'. (cherry picked from commit d0b38752471dd870ad640fd39076bc51f84c57d1)
commit 91935474eb8354d4891f6575f2839a6f4e496173
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Wed Sep 26 16:02:40 2012 -0700
smb.conf(5): Extend 'server min protocol' description. (cherry picked from commit dfe75c2f3591652a370a36f73f70e8055bda9d11)
commit 6d748c34f5f987e9dbfc14fbda963a2b210e4b18
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
(cherry picked from commit e3a48bb5f65bf9f5b77df010dcb75fcc9721cf3b)
commit e009ed6ea9896c0986de07e9be8c1fa3a5ac0b49
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Fri Oct 5 11:51:37 2012 +0200
selftest: Move more tests to common list script.
Autobuild-User(master): Jelmer Vernooij <jelmer at samba.org>
Autobuild-Date(master): Fri Oct 12 02:06:42 CEST 2012 on sn-devel-104
(cherry picked from commit ff82afb1f8ad3cf950277487aff05d442d03c969)
commit d3f1efc9f462874837342124cfc615c9cf094461
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Thu Oct 11 17:23:13 2012 +0200
samba.join: Fix multiple spaces.
Autobuild-User(master): Jelmer Vernooij <jelmer at samba.org>
Autobuild-Date(master): Thu Oct 11 20:30:43 CEST 2012 on sn-devel-104
(cherry picked from commit 21b58b5eacb67b4dee6e7efe90bd529bbfd6ef77)
commit d57812b34cf32a37a8c97b54debfaf45e0544bf1
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Fri Oct 5 11:46:25 2012 +0200
selftest: Move some tests to common test script. (cherry picked from commit 1aa291c331c29c2f5ee4572b660c4c2061755856)
commit a6f33d7d2ae0b624136e14b803d913605529b639
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Fri Oct 5 11:39:34 2012 +0200
selftests.tests: Remove reference to Samba 4. (cherry picked from commit 1080b6c2caf1191fd896f3caf38e576a00b01982)
commit b74f8035b70c607905b563fb63b9ff78c7676ef0
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Thu Sep 27 09:41:32 2012 -0700
samba4-tests: Move 'samba.tests.source' up.
We would like to run this as early as possible so we get a quick
failure when there is trailing whitespace.
Autobuild-User(master): Jelmer Vernooij <jelmer at samba.org>
Autobuild-Date(master): Thu Sep 27 20:26:27 CEST 2012 on sn-devel-104
(cherry picked from commit b7822a55c40c5c42356b263c3d7bc1998fb1a7d3)
commit 66c8c1b387b2c0dde2f99a8113a45d08edbd1ae1
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Thu Oct 11 17:11:44 2012 +0200
samba.provision.sambadns: Use == to compare strings, not 'is'. (cherry picked from commit 2adf27a99b999a4fd0329d9fa398a9208b60e367)
commit e0c3a50870e27a5fc4607ca2070c411d1e719cdf
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Thu Oct 11 14:39:50 2012 +0200
wafsamba: Ignore some more symbols when checking for dupes. (cherry picked from commit 276460cf8afb4894fe1e980c7a75e866c14ba144)
commit bcbf56c9d0acacd452e4943fc889d8c8c7209ac5
Author: Jeremy Allison <jra at samba.org>
Date: Thu Oct 25 17:07:29 2012 -0700
Fix bug #9329 - Directory listing with SeBackup can crash smbd.
When we do a become_root()/unbecome_root() pair to temporarily
raise privilege, this NULLs out the NT token. If we're within
a become_root()/unbecome_root() pair then return the previous
token on the stack as our NT token. This is what we should be
using to check against NT ACLs in the file server. This copes
with security context changing when removing a file on close
under the context of another user (when 2 users have a file
open, one sets delete on close and then the other user has
to actually do the delete).
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Michael Adam <obnox at samba.org>
-----------------------------------------------------------------------
Summary of changes:
WHATSNEW.txt | 5 +
buildtools/wafsamba/symbols.py | 2 +-
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/selftest.pl | 10 +-
selftest/selftesthelpers.py | 79 ++++++-
selftest/tests.py | 52 ++++
selftest/wscript | 7 +-
source3/selftest/tests.py | 259 +++++++++-----------
source3/smbd/proto.h | 1 +
source3/smbd/sec_ctx.c | 25 ++
source3/smbd/uid.c | 12 +-
source4/scripting/python/samba/join.py | 2 +-
source4/scripting/python/samba/netcmd/user.py | 16 +-
.../scripting/python/samba/provision/sambadns.py | 2 +-
source4/scripting/python/samba/tests/docs.py | 127 ++++++++++
.../python/samba/tests/samba_tool/user.py | 2 +-
source4/selftest/tests.py | 255 ++++++++------------
47 files changed, 895 insertions(+), 405 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 selftest/tests.py
create mode 100644 source4/scripting/python/samba/tests/docs.py
Changeset truncated at 500 lines:
diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 856a864..dc3b1e4 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -178,6 +178,7 @@ o Jeremy Allison <jra at samba.org>
* BUG 9190: Fix regression (change in behavior) of default acl masks.
Remove "security mask", "force security mode", "directory security mask"
"force directory" and "security mode" parameters.
+ * BUG 9329: Directory listing with SeBackup can crash smbd.
o Andrew Bartlett <abartlet at samba.org>
@@ -211,6 +212,10 @@ o Andreas Schneider <asn at samba.org>
* BUG 9301: Move 'smbprint' to a common location.
+o Jelmer Vernooij <jelmer at samba.org>
+ * BUG 9274: Add documentation and selftest fixes.
+
+
CHANGES SINCE 4.0.0rc2
======================
diff --git a/buildtools/wafsamba/symbols.py b/buildtools/wafsamba/symbols.py
index 13d84b9..daa18b9 100644
--- a/buildtools/wafsamba/symbols.py
+++ b/buildtools/wafsamba/symbols.py
@@ -569,7 +569,7 @@ def symbols_whyneeded(task):
def report_duplicate(bld, binname, sym, libs, fail_on_error):
'''report duplicated symbols'''
- if sym in ['_init', '_fini']:
+ if sym in ['_init', '_fini', '_edata', '_end', '__bss_start']:
return
libnames = []
for lib in libs:
diff --git a/docs-xml/Makefile b/docs-xml/Makefile
index 0b4e880..6cb069f 100644
--- a/docs-xml/Makefile
+++ b/docs-xml/Makefile
@@ -260,8 +260,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>
--
Samba Shared Repository
More information about the samba-cvs
mailing list