[SCM] SAMBA-CTDB repository - branch obnox-ctdb updated -
2e501de00f4b7415a0cfbfc7993096be8e585ca7
Andrew Tridgell
tridge at samba.org
Wed Jun 25 11:26:09 GMT 2008
The branch, obnox-ctdb has been updated
via 2e501de00f4b7415a0cfbfc7993096be8e585ca7 (commit)
via e53c7d7fc22d1df88f53fcfe51a6cacaeffc6283 (commit)
via 20b92c62329daf0060534d253a0bd2bd2a112c70 (commit)
via 44031107568fae0afe501bf218b48aa74598f132 (commit)
via ffb695ddbbfa558f45b34382eb7e2b810c0cad3f (commit)
via 60e974da0ea186745dc5e23a1bcab4f8fede0f8c (commit)
via c173375d9122c98f1f4f81a910fa8b805fba65a5 (commit)
via cd56e0ea2023e5025e09acfd9d2720caf87452df (commit)
via 766c12bc485d04c143079afca93b8ebba3f77f67 (commit)
via e8611cb56675259749dcaa51645f9956d1612caa (commit)
via e59cffb75e29270ba0f566d743e18090132c85ea (commit)
via b993a35f1bdd3ac79a08c197276474d7bd885cf5 (commit)
via f4efe290b509222c3607745edc62fe8627ffad09 (commit)
via fdd6c691c7eec6354326b9cacb1f525d1f9c8716 (commit)
via a680400b24e9a9f9a195cfabb8b7a31b2dabbbc9 (commit)
via 6bfc7ab20fbb569d12660bb67da96d87ace3d236 (commit)
via 6b9a33a0413a9643716dbee5eceb9166a81abc0d (commit)
via 1244128a6a536e01fb27ba382ab48c653aac0209 (commit)
via 78c2912d5f57c120898769fec2cd5cc72ba666a7 (commit)
via 7289712cf741b5e45f59f180f9ac6584cccb7ced (commit)
via 68472fa4e29e2ac059197b0b212f890f4cc8f522 (commit)
via 17345a0fb56723104ec0e28a991a8fd424bdc48b (commit)
via 698912b4c55f76964bbcfed70d427d7363c2ef02 (commit)
via 62e485eebd8a40b5692caa79bb3ed6108f0b835b (commit)
via 9fd1d784cf6044c5c03cf7ab0f2373e08df64295 (commit)
via e4d03d3aede0cd611283a041eafdcd1e836aad33 (commit)
via a7531f4964ac8f861a41e9fa446e5a3aa69eaaa2 (commit)
via 8522db2075f8c9e869c6224f2852ce355bba987d (commit)
via 59bb2b0c9a6397bb0202055d7b00dce30d7bf03b (commit)
via 92912142993bb2b6b9203ad70343dd299c20f6bc (commit)
via 2c1213b38cdabc58dd9a6a3587bb30cf1fe77e3c (commit)
via e9f57680b16e18f56e396746c82a7245cbcf5701 (commit)
via 8804baefaa2f422a3e4235579eb580fe7d0ed9cc (commit)
via 7705cb9f0910192139baba6de2e12b71267494fc (commit)
via 78e7005c87603625e7d02b83af4a790277737806 (commit)
via 5b439ea7cf94fdce24eaae62c2a772361ad5b422 (commit)
via bb787ab32aaae91c170ec30b0a126d390703ef1c (commit)
via 23f096504fa53ee9957dce1c2b2902cf4f8ab937 (commit)
via 4580a491d2341a70a7e8e869e2fb249be2d25dcd (commit)
via baa359a6e613c48ad6aa6d4a0d33a078d5d06b8b (commit)
via ece9a659dee5e7f97125053745df7d1095bdb6ec (commit)
via 0f468b9821c5b2bfb2c0fdcb8853103cfa71fc9c (commit)
via 01675653728c0f0b3a45356f0fee0d7648da7af4 (commit)
via bf45ab0a1fc948d6372e39e856dc2f9ad2249989 (commit)
via bde03141678ed997578943bbf64b6d73a54b941d (commit)
via cc94d1cedaf11e8cb58ce53c4e39ee860daa2262 (commit)
via a50892e6c70fcbbb753db3776b6d6af49ef52cc7 (commit)
via 70a36270ebcd51e8df79228e97394d1889a71916 (commit)
via 1c4fcee99fbb2a84234207851c366d5c8141d699 (commit)
via 2dc66cb5813ef138ccea70fd7b9c9599a893e33a (commit)
via e41d7aa1d5bacf4ed95fb4a6be801db0aa1b15dd (commit)
via 067ab1f0f8b5829922586da4d5bb0ae9f181e9dc (commit)
via 962dd1d88156bc91604f156a1a4f248554dc3694 (commit)
via a36269082df58f7894f9c49596cf0b2bb6809b70 (commit)
via 61608cc9cb14a45cd3bb492c94026a5f2eb631e6 (commit)
via 68e0b79c2a7c17cabb0771a37b34dc32af33f265 (commit)
via 628b750b4366a5806cf159232e4204fd1602e191 (commit)
via 97a3d510d562f276d2bfe5f9bfd8c0e6d26ac9cd (commit)
via f457d6e07e8e2359406dc2a81e13b80dadeb4672 (commit)
via db2a5df6f8eb97906c3a80c47fc0ae1e3153489a (commit)
via f286e8eec7dab5aaeb45a4092ebbbdcd7f9aab84 (commit)
via c6d6a60f0c253ee3f9d5f6a38c3f8bb7621df0ae (commit)
via 668a49ac1f07231d3a3874f6e79cca7ddd32c2f9 (commit)
via c1ceeb7eefe14e506c8e365836bed17ccbc05955 (commit)
via 4a3d6be3b968d3b54edc4ee22eb9e95cc81452b8 (commit)
via 174a6f11a9839958ce549f7ac845ddbc088a9681 (commit)
via e14c43571fe184ceb065dec684d0aa4209df7668 (commit)
via 22958731c720c98823a3b39438948133dae32fa8 (commit)
via 3d2792ad269ce07d03f6891ac2f1a3a6d19fe8f2 (commit)
via 16f9c081757e64749184d0c719dcbe4b045064c4 (commit)
via 3f7ab6f52c2da40056e85441e01ed4d413f388ff (commit)
via 9b52e702d96a552f68e1af451ccdaf052b8c49a1 (commit)
via f2042c94b8ab7fbbdaf7f7ca954a0b3e1b11b964 (commit)
via eae0effad439c1e3735e11261aee26d0a43c96ea (commit)
from 848570856efb3cbe0bee9881769cd35163c4570f (commit)
http://gitweb.samba.org/?p=tridge/samba-ctdb.git;a=shortlog;h=obnox-ctdb
- Log -----------------------------------------------------------------
commit 2e501de00f4b7415a0cfbfc7993096be8e585ca7
Author: Michael Adam <obnox at samba.org>
Date: Thu Jun 19 17:21:04 2008 +0200
loadparm: use the return value of the special handlers in lp_load().
Up to now, the bool return value was silently ignored.
Michael
(cherry picked from commit c65d425fec964bc0b8778b596615a8bcce0378aa)
commit e53c7d7fc22d1df88f53fcfe51a6cacaeffc6283
Author: Michael Adam <obnox at samba.org>
Date: Thu Jun 19 17:20:22 2008 +0200
loadparm: don't treat a missing include file as an error in handle_include().
Michael
(cherry picked from commit a8ef8870beb91fcd2745aa59de6c59b49ea00e39)
commit 20b92c62329daf0060534d253a0bd2bd2a112c70
Merge: baa359a6e613c48ad6aa6d4a0d33a078d5d06b8b 44031107568fae0afe501bf218b48aa74598f132
Author: Michael Adam <obnox at samba.org>
Date: Mon Jun 23 16:58:34 2008 +0200
Merge commit 'origin/v3-2-stable' into v3-2-ctdb
commit 44031107568fae0afe501bf218b48aa74598f132
Author: Michael Adam <obnox at samba.org>
Date: Thu Jun 19 17:19:21 2008 +0200
testsuite: enable the testparm_s3 tests.
Michael
(cherry picked from commit 0f5c13e5735990f4325f98156a7dc410276372fe)
(cherry picked from commit 784e9e6b9ce4cc043bdeba8ca396f59de51cd294)
commit ffb695ddbbfa558f45b34382eb7e2b810c0cad3f
Author: Michael Adam <obnox at samba.org>
Date: Thu Jun 19 17:14:39 2008 +0200
testsuite: add a testparm_s3 test script.
This is a first testparm/lp_load test that runs testparm on a couple
of configuration files. The main purpose for now is to test the options
that have special handlers (to check whether the handlers succeed).
In particular, all the Macro expansions that are available via
alloc_sub_basic() are tested with the include handler. This is to
catch such crashbugs as #5548 where %m expansion led to a segfault.
The tests now are very simple. Just check if testparm completes
successfully on the given config files. This can (and should) be
elaborated in the future.
Michael
(cherry picked from commit eb28146d40b8a8bc2c20b8d222abf191ea178d5a)
(cherry picked from commit eff6a48cee0fa6a320728f3bb44c3894dd3f6044)
commit 60e974da0ea186745dc5e23a1bcab4f8fede0f8c
Author: Michael Adam <obnox at samba.org>
Date: Thu Jun 19 13:52:49 2008 +0200
testsuite: update introductory comment to test_net_regsistry.sh
This is now used to test rpc and local access depending on
command line parameters.
Michael
(cherry picked from commit 73c17b630317b5019e5d5f2b989b8de081a73e07)
(cherry picked from commit febf046fc47dd3de3bbb6c0da5b218d73ef0487c)
commit c173375d9122c98f1f4f81a910fa8b805fba65a5
Author: Volker Lendecke <vl at samba.org>
Date: Thu Jun 19 11:59:55 2008 +0200
Fix typo
(cherry picked from commit 2eef2c682c18ad37b78214c755b9dd7c8b607cb8)
(cherry picked from commit b517b0c0f20127876c63cc726afe7f902421af15)
commit cd56e0ea2023e5025e09acfd9d2720caf87452df
Author: Michael Adam <obnox at samba.org>
Date: Tue Jun 17 23:54:15 2008 +0200
testsuite: give admin rights to testuser only for the "net rpc registry" test.
Remove the user from BUILTIN\Administrators at the end of the tests.
Note: BUILTIN\Administrators is not deletet at the end because that
functionality is not implemented.
Michael
(cherry picked from commit 1734f9305a38eff05f0147d9c7391ef34085e7b2)
(cherry picked from commit 1df339954b1dcc120195b26a6b3a08268dd0041c)
commit 766c12bc485d04c143079afca93b8ebba3f77f67
Author: Michael Adam <obnox at samba.org>
Date: Tue Jun 17 23:51:23 2008 +0200
testsuite: don't give the testuser administrative rights globally.
It breaks RPC-SAMBA3-GETUSERNAME for reasons I have not quite
understood yet. Somhow loosing rights fails when the user
belogns to BUILTIN\Administrators at some point.
Michael
(cherry picked from commit 9fe99c69f35b005b66c1eacb5d999cc73f1bb521)
(cherry picked from commit cebe6225d5bc584b24c2bebf30db353653df34b0)
commit e8611cb56675259749dcaa51645f9956d1612caa
Author: Karolin Seeger <kseeger at samba.org>
Date: Tue May 13 14:01:52 2008 +0200
tests_all.sh: Do not execute $SMB4TORTURE --version if it is not available.
Improve error message if no SMB4TORTURE is available.
Karolin
(cherry picked from commit 443691eb2614919043406f94e9c71b49230612d5)
(cherry picked from commit 4de981e5174dffd9a21431017cfa75fc73910b48)
commit e59cffb75e29270ba0f566d743e18090132c85ea
Author: Michael Adam <obnox at samba.org>
Date: Tue May 6 23:43:37 2008 +0200
testsuite: allow selection of posix_s3 subtests by env var POSIX_SUBTESTS.
This allows for calling e.g.
TESTS=posix_s3 POSIX_SUBTESTS="RPC-SAMBA3-GETUSERNAME" make test
Michael
(cherry picked from commit 7418d89b2941fff307e0980d1f71f106aed8cbce)
(cherry picked from commit 3fdce53f72242381eeda15ad6c3817a4cc88b323)
commit b993a35f1bdd3ac79a08c197276474d7bd885cf5
Author: Michael Adam <obnox at samba.org>
Date: Tue May 6 12:09:59 2008 +0200
testsuite: make structuring output of net_s3 tests stand out more.
say "RUNNING SUBTESTS ..." instead of "Running ... tests"
Michael
(cherry picked from commit 0b879817ba20861c7d0b239d7f7199b0a5ed2ca1)
(cherry picked from commit 370295aef1f8ee7cf8b5126de4629b69d1559578)
commit f4efe290b509222c3607745edc62fe8627ffad09
Author: Michael Adam <obnox at samba.org>
Date: Tue May 6 12:08:27 2008 +0200
testsuite: make diagnostic output more appropriate in tests_all.sh
Say "RUNNING TESTS ..." instead of "RUNNING SUBTESTS ..."
Michael
(cherry picked from commit b73821c392a23c213e4b1ad25a8a2d0c845cee3a)
(cherry picked from commit c9f82b175c2f38eeec77cab2906ef480ae558861)
commit fdd6c691c7eec6354326b9cacb1f525d1f9c8716
Author: Michael Adam <obnox at samba.org>
Date: Fri Apr 4 18:29:44 2008 +0200
testsuite: give the testuser administrative rights in selftest.sh
(by adding him to builtin\administrators)
Michael
(cherry picked from commit baea0615003cc2db8b27872e87064364f2deb079)
(cherry picked from commit 5d564b25e946e3a57fa251271711937e938cd22d)
commit a680400b24e9a9f9a195cfabb8b7a31b2dabbbc9
Author: Michael Adam <obnox at samba.org>
Date: Tue May 6 12:01:49 2008 +0200
testsuite: run the net rpc registry tests from the net_s3 tests.
Michael
(cherry picked from commit dcf39078cf0524a7450db3f67c8e004eb42690c2)
(cherry picked from commit 3b09034bd9ad7a95d0d74302c953a5983ff4a417)
commit 6bfc7ab20fbb569d12660bb67da96d87ace3d236
Author: Michael Adam <obnox at samba.org>
Date: Fri Apr 4 18:26:34 2008 +0200
testsuite: add the ability to test "net rpc registry" with the net_registry tests
by specifying a parameter "rpc" on the commandline.
Michael
(cherry picked from commit 110c26374ef3e0bdefe2e54db2b8ffd4544780ef)
(cherry picked from commit 6cdeb832bd11c0a12ce577ce10e30cc098bca729)
commit 6b9a33a0413a9643716dbee5eceb9166a81abc0d
Author: Michael Adam <obnox at samba.org>
Date: Tue May 6 11:43:27 2008 +0200
testsuite: adapt informative message to say "Running _local_ registry tests".
The plan is to also test remote registry with "net rpc registry".
Michael
(cherry picked from commit b5507f8a95399193099a0474fb8b8bc95ba04a48)
(cherry picked from commit 1580941cb7718eec3931893ec8ac7a2c0c62c363)
commit 1244128a6a536e01fb27ba382ab48c653aac0209
Author: Michael Adam <obnox at samba.org>
Date: Tue May 6 11:40:05 2008 +0200
testsuite: use domain==workgroup in wbinfo tests now that we are PDC.
Previously domain==netbios name was the right thing to use.
Michael
(cherry picked from commit a5fc47c2457ce370a4f6150b9f2a417dac7589bf)
(cherry picked from commit b211b576cc1287aeb2b541ae6575a3230350d044)
commit 78c2912d5f57c120898769fec2cd5cc72ba666a7
Author: Kai Blin <kai at samba.org>
Date: Sat May 3 01:50:20 2008 +0200
tests: Add a net_misc test.
(cherry picked from commit 026d701aff2c035359894786ec22b4ed829cfb31)
(cherry picked from commit 09fe8019a7b688312892be96eacec55fd1f059e7)
commit 7289712cf741b5e45f59f180f9ac6584cccb7ced
Author: Kai Blin <kai at samba.org>
Date: Mon May 5 15:26:11 2008 +0200
selftest: Advertise as PDC and time server during make test
(cherry picked from commit 65c619b36d08ac2f24b622c71b7e05d50bdeea50)
(cherry picked from commit 1b24a06502a910909cf889916423c94aca92b1cf)
commit 68472fa4e29e2ac059197b0b212f890f4cc8f522
Author: Kai Blin <kai at samba.org>
Date: Sat May 3 01:45:33 2008 +0200
selftest: Use TESTS env var to specify tests to run like Samba4 does.
(cherry picked from commit 6fb1fe803ccbd3af2946fcbe4586c11d394d5dc2)
(cherry picked from commit 11252c8faff0373bf16b7bc42d65dbc5cf5ec57d)
commit 17345a0fb56723104ec0e28a991a8fd424bdc48b
Author: Karolin Seeger <kseeger at samba.org>
Date: Mon Jun 23 13:11:11 2008 +0200
WHATSNEW: Fix typo.
Karolin
(cherry picked from commit c434b3e2131b0d5e68d00f887412372e9192a39f)
commit 698912b4c55f76964bbcfed70d427d7363c2ef02
Author: Karolin Seeger <kseeger at samba.org>
Date: Mon Jun 23 12:10:18 2008 +0200
WHATSNEW: Update changes since 3.2.0rc2.
Karolin
(cherry picked from commit 769d9434349d4c683e92cea34cb5bd177273fe40)
commit 62e485eebd8a40b5692caa79bb3ed6108f0b835b
Author: Karolin Seeger <kseeger at samba.org>
Date: Mon Jun 23 10:15:53 2008 +0200
Samba3 HOWTO: Remove trailing whitespaces.
Karolin
(cherry picked from commit c7a9c903acbba9c70211e6f3c25964533bbc1622)
commit 9fd1d784cf6044c5c03cf7ab0f2373e08df64295
Author: Karolin Seeger <kseeger at samba.org>
Date: Mon Jun 23 10:28:09 2008 +0200
man pages: Correct version in man winbindd again.
Karolin
(cherry picked from commit ef44968276bfde2fdd3370e2558fb469357414be)
commit e4d03d3aede0cd611283a041eafdcd1e836aad33
Author: John H Terpstra <jht at samba.org>
Date: Wed May 28 11:02:26 2008 -0500
Fixed publishing date info.
(cherry picked from commit b96c9d54cfd29ec87d59655839a4136977a98032)
commit a7531f4964ac8f861a41e9fa446e5a3aa69eaaa2
Author: John H Terpstra <jht at samba.org>
Date: Wed May 28 11:00:49 2008 -0500
Added TDB File documentation requested by some users.
(cherry picked from commit 5035311af639336fdc51fa9829e984ff281216f9)
commit 8522db2075f8c9e869c6224f2852ce355bba987d
Author: John H Terpstra <jht at samba.org>
Date: Mon May 19 13:02:08 2008 -0500
Clarification that hosts resolution is done by winbind only on IRIX, all other systems use libnss_wins.so.
(cherry picked from commit 3a8ea6be389bedbcdb5668664d862768c026f669)
commit 59bb2b0c9a6397bb0202055d7b00dce30d7bf03b
Author: John H Terpstra <jht at samba.org>
Date: Mon May 19 13:00:01 2008 -0500
Clarification that hosts resolution is done by winbind only on IRIX, all other systems use libnss_wins.so.
(cherry picked from commit 2a953d6ba252e5ba4e28b7fae5979e7c47fe9bd0)
commit 92912142993bb2b6b9203ad70343dd299c20f6bc
Author: Volker Lendecke <vl at samba.org>
Date: Mon Jun 23 07:14:46 2008 +0200
init_shared_module -> init_samba_module
(cherry picked from commit 1b12e5f9ed28ac57c06d9597a8f3c57cde01beef)
commit 2c1213b38cdabc58dd9a6a3587bb30cf1fe77e3c
Author: Volker Lendecke <vl at samba.org>
Date: Sun Jun 22 13:06:35 2008 +0200
Fix a crash in _dfs_Enum
(cherry picked from commit 4a996476297963d4cb300b4d45c23e83a493c339)
commit e9f57680b16e18f56e396746c82a7245cbcf5701
Author: Volker Lendecke <vl at samba.org>
Date: Sun Jun 22 12:50:30 2008 +0200
Fix an uninitialized variable access in callers of parse_msdfs_symlink
At least form_junctions() does not initialize refcount, and I don't see it in
get_referred_path(). For the latters, the callers might initialize it. But even
if they did, I think parse_msdfs_symlink() should unconditionally return the
number of referrals it found. I don't think it makes sense to count them up
from somewhere else.
(cherry picked from commit d75905ad66e96d4967eb8780d3a980eccb796898)
commit 8804baefaa2f422a3e4235579eb580fe7d0ed9cc
Author: Volker Lendecke <vl at samba.org>
Date: Sat Jun 21 16:48:07 2008 +0200
Fix a double-closedir() in form_junctions()
(cherry picked from commit 394f4509bc5dd31801ef83ee9cc29c1e3a9f1078)
commit 7705cb9f0910192139baba6de2e12b71267494fc
Author: Volker Lendecke <vl at samba.org>
Date: Sat Jun 21 16:15:02 2008 +0200
Attempt to fix the darwin build
(cherry picked from commit 9a4b5591a40e9150fdd3fc706ebb520d65eb1989)
commit 78e7005c87603625e7d02b83af4a790277737806
Author: Volker Lendecke <vl at samba.org>
Date: Fri Jun 20 14:30:02 2008 +0200
Use "init_shared_module" instead of "init_module" for initializing .so's
(cherry picked from commit eabea09243d164c03b9fdfc0d569054c03e67edf)
commit 5b439ea7cf94fdce24eaae62c2a772361ad5b422
Author: Volker Lendecke <vl at samba.org>
Date: Thu Jun 19 09:50:34 2008 +0200
Fix the build on FreeBSD 4.6.2
(cherry picked from commit a475dee8036156d4c8330bae97208ec546342f42)
commit bb787ab32aaae91c170ec30b0a126d390703ef1c
Author: Jeremy Allison <jra at samba.org>
Date: Fri Jun 20 13:23:31 2008 -0700
Fix bug #5531 - fix conversion of ns units when converting from nttime to timespec.
Fix from hkurma at datadomain.com.
Jeremy.
(cherry picked from commit c8471dd5793924d482af662706deb92f3fad0bdf)
commit 23f096504fa53ee9957dce1c2b2902cf4f8ab937
Author: Jeremy Allison <jra at samba.org>
Date: Fri Jun 20 12:49:14 2008 -0700
Fix bug #5533. Winbindd fails to cope correctly with a workgroup name containing a '.'.
Jeremy.
(cherry picked from commit fae027e937c2f0078193b8cc27af6db2d7c233f5)
commit 4580a491d2341a70a7e8e869e2fb249be2d25dcd
Author: John H Terpstra <jht at samba.org>
Date: Thu Jun 19 16:11:31 2008 -0500
Fixing net help info.
(cherry picked from commit f62909d2b457f3494c9536c994a9209f8cc0c331)
commit baa359a6e613c48ad6aa6d4a0d33a078d5d06b8b
Merge: bf45ab0a1fc948d6372e39e856dc2f9ad2249989 ece9a659dee5e7f97125053745df7d1095bdb6ec
Author: Michael Adam <obnox at samba.org>
Date: Fri Jun 20 11:21:31 2008 +0200
Merge commit 'origin/v3-2-stable' into v3-2-ctdb
commit ece9a659dee5e7f97125053745df7d1095bdb6ec
Author: Volker Lendecke <vl at samba.org>
Date: Wed Jun 18 16:30:37 2008 +0200
Revert "Fix a memleak in svcctl_init_keys()"
This reverts commit b1afb31f3cadd4749bf6e3eb5d8935588bf8ebfc.
This one is very strange: I need to investigate why valgrind showed it as
leaking, and why in my initial tests this did not fail.
(cherry picked from commit 24730f5981efb920811e7929a9483bd72bb0984c)
commit 0f468b9821c5b2bfb2c0fdcb8853103cfa71fc9c
Author: Michael Adam <obnox at samba.org>
Date: Wed Jun 18 14:50:53 2008 +0200
Fix Bug #5548 (segfauls in handle_include with %m macro expansion).
In alloc_sub_basic, when expanding '%m', substitute "" instead of
NULL for remote_machine when this is NULL. Else a NULL string
is returned.
Michael
(cherry picked from commit c65b456c6a145d15b7fd27a2a3440a0709fc3277)
(cherry picked from commit ffaed197d8cb261e2765b2de6cad17cac7d49672)
commit 01675653728c0f0b3a45356f0fee0d7648da7af4
Author: Volker Lendecke <vl at samba.org>
Date: Tue Jun 17 21:08:56 2008 +0200
Fix a brown paper bag segfault in clitar
Thanks to "No Body is Perfect" from gmail, whoever that is :-)
Volker
(cherry picked from commit 679d8dfa390601f777bfb43c02cd921eae5edcf4)
commit bf45ab0a1fc948d6372e39e856dc2f9ad2249989
Author: Michael Adam <obnox at samba.org>
Date: Wed Jun 18 18:45:01 2008 +0200
packaging(RHEL-CTDB): bump Release number to ctdb.34 for the next RPM.
Michael
commit bde03141678ed997578943bbf64b6d73a54b941d
Author: Volker Lendecke <vl at samba.org>
Date: Wed Jun 18 16:30:37 2008 +0200
Revert "Fix a memleak in svcctl_init_keys()"
This reverts commit b1afb31f3cadd4749bf6e3eb5d8935588bf8ebfc.
This one is very strange: I need to investigate why valgrind showed it as
leaking, and why in my initial tests this did not fail.
(cherry picked from commit 24730f5981efb920811e7929a9483bd72bb0984c)
commit cc94d1cedaf11e8cb58ce53c4e39ee860daa2262
Author: Michael Adam <obnox at samba.org>
Date: Wed Jun 18 14:50:53 2008 +0200
Fix Bug #5548 (segfauls in handle_include with %m macro expansion).
In alloc_sub_basic, when expanding '%m', substitute "" instead of
NULL for remote_machine when this is NULL. Else a NULL string
is returned.
Michael
(cherry picked from commit c65b456c6a145d15b7fd27a2a3440a0709fc3277)
commit a50892e6c70fcbbb753db3776b6d6af49ef52cc7
Author: Volker Lendecke <vl at samba.org>
Date: Tue Jun 17 16:22:43 2008 +0200
RWX on a file does not imply DELETE access
Without this the changed checks in can_delete_file_in_directory give DELETE
access where there is none. So we can end up granting the ntcreate&x preparing
the unlink where we should not, which leads to a NT_STATUS_ACCESS_DENIED at
close time later, which in turn does *not* give the access denied error message
in the Windows GUI.
can_delete_file_in_directory in a second check will grant access now by looking
at the directory permissions.
commit 70a36270ebcd51e8df79228e97394d1889a71916
Author: Volker Lendecke <vl at samba.org>
Date: Mon Jun 16 17:35:00 2008 +0200
Fix checks in can_delete_file_in_directory()
With at least NFSv4 ACLs around the write permission for the owner is a bogus
check if we can delete a file in a directory. Like in Windows, there are two
ways which can grant us such: First, the DELETE permission on the file itself,
or if that does not help, the DELETE_CHILD permission on the directory. It
might be a bit more code that runs, but essentially we should end up with the
same set of syscalls in the non-acl case.
commit 1c4fcee99fbb2a84234207851c366d5c8141d699
Merge: 68e0b79c2a7c17cabb0771a37b34dc32af33f265 2dc66cb5813ef138ccea70fd7b9c9599a893e33a
Author: Michael Adam <obnox at samba.org>
Date: Tue Jun 17 17:30:41 2008 +0200
Merge commit 'origin/v3-2-stable' into v3-2-ctdb
commit 2dc66cb5813ef138ccea70fd7b9c9599a893e33a
Author: Volker Lendecke <vl at samba.org>
Date: Tue Jun 17 16:06:42 2008 +0200
Fix a memleak in svcctl_init_keys()
(cherry picked from commit 675bb53398ba29c53d2dcf3c7122cf4770c2f938)
commit e41d7aa1d5bacf4ed95fb4a6be801db0aa1b15dd
Author: Volker Lendecke <vl at samba.org>
Date: Tue Jun 17 14:53:07 2008 +0200
Fix a segfault in wbcLookupSid
If the BAIL_ON_WBC_ERROR directly after wbcRequestResponse kicks in, *domain
and *name have not been initialized yet. So the cleanup routine in the done:
part of the routine (which did not check for domain!=NULL etc) would access
uninitialized memory.
Jerry, please check!
Thanks,
Volker
(cherry picked from commit 3d7e0cc40b1992f4555807acec4f00450e30e2de)
commit 067ab1f0f8b5829922586da4d5bb0ae9f181e9dc
Author: Volker Lendecke <vl at samba.org>
Date: Tue Jun 17 15:17:22 2008 +0200
Fix a segfault in wbcLookupRids
The done: part could access uninitialized memory if intermediate
BAIL_ON_WBC_ERROR fire.
Jerry, please check!
Thanks,
Volker
(cherry picked from commit 31f4c33dcc744e81be54389756378e25aa2bb75e)
commit 962dd1d88156bc91604f156a1a4f248554dc3694
Author: Volker Lendecke <vl at samba.org>
Date: Tue Jun 17 14:31:07 2008 +0200
Replace a very unusual variable declaration by a more conventional one
(cherry picked from commit b37030644e32249706d431ad93881d540f351c50)
commit a36269082df58f7894f9c49596cf0b2bb6809b70
Author: Karolin Seeger <kseeger at samba.org>
Date: Tue Jun 17 13:18:17 2008 +0200
man pages: Move 'smbsh' man page to the examples directory.
smbsh.c is located in the examples directory. It does not make sense
to install a man page without installing the tool itself.
This fixes bug #4724.
Karolin
(cherry picked from commit 797ed744b15c94fa4831d9796b40bb0ab5df55b7)
(cherry picked from commit 23981be7a009dc9e056ba2e12c5df6e3a13ab193)
commit 61608cc9cb14a45cd3bb492c94026a5f2eb631e6
Author: Volker Lendecke <vl at samba.org>
Date: Tue Jun 17 13:00:13 2008 +0200
Fix a memleak in wbcAuthenticateUserEx()
(cherry picked from commit 72b381689af9cae83ab08532cffd0188f2da4807)
commit 68e0b79c2a7c17cabb0771a37b34dc32af33f265
Author: Michael Adam <obnox at samba.org>
Date: Tue Jun 17 12:44:07 2008 +0200
packaging(RHEL-CTDB): update the build instructions in the README.
Michael
commit 628b750b4366a5806cf159232e4204fd1602e191
Author: Volker Lendecke <vl at samba.org>
Date: Tue Jun 17 12:14:49 2008 +0200
Revert "Fix a memleak in ads_find_dc() in case get_sorted_dc_list() fails"
This reverts commit 6bcfa82ff15531c64e0db27dcc58e5847c513aa6.
(cherry picked from commit 6f3183d0c4880dcf243239cd1ed018b9d10a4249)
commit 97a3d510d562f276d2bfe5f9bfd8c0e6d26ac9cd
Author: Volker Lendecke <vl at samba.org>
Date: Tue Jun 17 12:15:05 2008 +0200
Revert "Fix a memleak caused by a crappy get_sorted_dc_list() API"
This reverts commit ba10b9c077272c521504b3a638bba73446efc61c.
(cherry picked from commit 4b3690a730895f6a19b14ee09ca0a2a131c3ba21)
commit f457d6e07e8e2359406dc2a81e13b80dadeb4672
Author: Jeremy Allison <jra at samba.org>
Date: Thu Jun 5 14:28:28 2008 -0700
More correct fix (hopefully :-) for any memory leaks.
Jerry promised to check :-). Vl also please review.
Jeremy.
Okay -- I have to admit that this is the better fix. With my fixes I got a
double-free when using security=domain. Sorry...
Volker
(cherry picked from commit 3b0d688b1b16c9054340d08986d0fa91f7fff9ad)
commit db2a5df6f8eb97906c3a80c47fc0ae1e3153489a
Merge: f286e8eec7dab5aaeb45a4092ebbbdcd7f9aab84 c6d6a60f0c253ee3f9d5f6a38c3f8bb7621df0ae
Author: Michael Adam <obnox at samba.org>
Date: Tue Jun 17 12:00:28 2008 +0200
Merge commit 'origin/v3-2-stable' into v3-2-ctdb
commit f286e8eec7dab5aaeb45a4092ebbbdcd7f9aab84
Author: Michael Adam <obnox at samba.org>
Date: Tue Jun 17 11:36:21 2008 +0200
packaging(RHEL-CTDB): bump Release to ctdb.33 for the next build
Michael
commit c6d6a60f0c253ee3f9d5f6a38c3f8bb7621df0ae
Author: Günther Deschner <gd at samba.org>
Date: Tue Jun 17 11:10:37 2008 +0200
net_vampire: fix samsync_process_database(). Final fix for Bug #5542.
Turns out the password hashes are not rid encrypted in the samsync reply.
Guenther
(cherry picked from commit 55259f408b7bc356367d872a38a54174d364fd2b)
commit 668a49ac1f07231d3a3874f6e79cca7ddd32c2f9
Author: Michael Adam <obnox at samba.org>
Date: Wed May 28 13:25:31 2008 +0200
packaging(RHEL-CTDB): remove the libnss_wins modules to reduce deps.
Michael
commit c1ceeb7eefe14e506c8e365836bed17ccbc05955
Author: Günther Deschner <gd at samba.org>
Date: Tue Jun 17 10:36:53 2008 +0200
net_vampire: fix build warning.
Guenther
(cherry picked from commit eb4232fec05cd87ea85a781b84a3fbe85f469703)
(cherry picked from commit 28b85a92160c7880253725cd247e064020f8be41)
commit 4a3d6be3b968d3b54edc4ee22eb9e95cc81452b8
Author: Günther Deschner <gd at samba.org>
Date: Tue Jun 17 10:31:44 2008 +0200
netapi: Fix Bug #5545 (libnetapi_init without $USER)
Based on patch from Erik van Pienbroek.
Guenther
(cherry picked from commit 71f4cf773022525ba617f09c495dbff97f8eb2d5)
(cherry picked from commit 7602a4dbfb1b2ae9963f017be62c999af0c2e043)
commit 174a6f11a9839958ce549f7ac845ddbc088a9681
Author: Karolin Seeger <kseeger at samba.org>
Date: Mon Jun 16 15:58:51 2008 +0200
WHATSNEW: Updates changes since 3.2.0rc2.
Karolin
(cherry picked from commit 83dfdfccfa9a07075912caeafde7355f4e7ce1ec)
commit e14c43571fe184ceb065dec684d0aa4209df7668
Author: Karolin Seeger <kseeger at samba.org>
Date: Fri Jun 13 21:31:34 2008 +0200
net: Fix several typos in comments.
-argc -> argv (where argv is meant)
-destoyed -> destroyed
-compleation -> completion
-aquired -> acquired
-Unify spelling of some words like rpc-server -> RPC server.
-Add missing punctuation marks.
Karolin
(cherry picked from commit 7c22fc6ebaa1a83213cbb7c08bea108264f89486)
commit 22958731c720c98823a3b39438948133dae32fa8
Author: Volker Lendecke <vl at samba.org>
Date: Fri Jun 13 16:05:31 2008 +0200
Fix a handle leak for error returns in ldb_try_load_dso
Coverity ID 464
(cherry picked from commit 496d44d2f21661c85bf07e8eb7cae6298fefd900)
commit 3d2792ad269ce07d03f6891ac2f1a3a6d19fe8f2
Author: Volker Lendecke <vl at samba.org>
Date: Sun Jun 15 00:14:27 2008 +0200
Fix group parsing in libwbclient's copy_group_entry()
This (also) fixes a flaw pointed out by the IBM checker. When verifying that I
found out that the parsing was not working as I would have expected it to.
Jerry, please check!
(cherry picked from commit c2c7790155ab02e1e351caf2bed192ce72913663)
commit 16f9c081757e64749184d0c719dcbe4b045064c4
Author: Volker Lendecke <vl at samba.org>
Date: Sun Jun 15 00:22:47 2008 +0200
Fix an uninitialized variable found by the IBM checker
BAIL_ON_PTR_ERROR jumps to done: which will access extra_data before it's
initialized.
Stefan, please check!
Volker
(cherry picked from commit b59636f78d351ed6d52c4a9fdccdb7850388526c)
commit 3f7ab6f52c2da40056e85441e01ed4d413f388ff
Author: Volker Lendecke <vl at samba.org>
Date: Mon Jun 16 13:27:16 2008 +0200
Fix bug 5500 -- thanks to mathion at thorrovydeti.com for reporting
(cherry picked from commit 996c3ce6f0dbe79b0679ae30afd873c24fe5b1eb)
commit 9b52e702d96a552f68e1af451ccdaf052b8c49a1
Author: Volker Lendecke <vl at samba.org>
Date: Fri Jun 13 15:30:08 2008 +0200
Fix a crash in _winreg_QueryValue
Coverity ID 474, value_length and type are both unique, not ref pointers and
can thus be NULL.
Karolin, please merge this to -stable.
Thanks,
Volker
(cherry picked from commit 999533c0ccced59141d8baff5bc248d63e2a966f)
commit f2042c94b8ab7fbbdaf7f7ca954a0b3e1b11b964
Author: Günther Deschner <gd at samba.org>
Date: Fri Jun 13 12:20:01 2008 +0200
net: Fix bug #5542 (samsync contains empty passwords).
Guenther
(cherry picked from commit 1a22e975dd1255f3557c1cd873d877aa35822afc)
commit eae0effad439c1e3735e11261aee26d0a43c96ea
Author: Günther Deschner <gd at samba.org>
Date: Fri Jun 13 11:57:09 2008 +0200
samsync: add samsync_fix_delta_array()
This code is vastly based on samba4 code.
Guenther
(cherry picked from commit 5b68be96996a710988b1fd1c176cd5dff0f2c6af)
-----------------------------------------------------------------------
Summary of changes:
WHATSNEW.txt | 57 ++-
docs-xml/Samba3-HOWTO/TOSHARG-TDBFiles.xml | 152 +++++
docs-xml/Samba3-HOWTO/index.xml | 2 +
docs-xml/manpages-3/smbsh.1.xml | 164 ------
docs-xml/manpages-3/winbindd.8.xml | 11 +-
examples/libsmbclient/smbwrapper/smbsh.1 | 203 +++++++
examples/libsmbclient/smbwrapper/smbsh.1.html | 108 ++++
examples/libsmbclient/smbwrapper/smbsh.1.xml | 164 ++++++
packaging/RHEL-CTDB/README | 24 +-
packaging/RHEL-CTDB/samba.spec | 12 +-
source/Makefile.in | 1 +
source/client/client.c | 2 +-
source/client/clitar.c | 2 +-
source/exports/modules-darwin.syms | 2 +-
source/include/msdfs.h | 2 +-
source/lib/dbwrap_rbt.c | 9 +-
source/lib/ldb/common/ldb_modules.c | 14 +-
source/lib/module.c | 6 +-
source/lib/netapi/netapi.c | 8 +-
source/lib/substitute.c | 5 +-
source/lib/time.c | 8 +-
source/libads/ldap.c | 1 -
source/libnet/libnet_samsync.c | 187 +++++++
source/libsmb/namequery.c | 18 +-
source/m4/aclocal.m4 | 2 +-
source/nsswitch/libwbclient/wbc_pam.c | 2 +
source/nsswitch/libwbclient/wbc_pwd.c | 20 +-
source/nsswitch/libwbclient/wbc_sid.c | 87 ++--
source/param/loadparm.c | 6 +-
source/rpc_server/srv_lsa_nt.c | 2 +
source/rpc_server/srv_winreg_nt.c | 4 +
source/script/tests/selftest.sh | 9 +-
source/script/tests/test_net_misc.sh | 50 ++
source/script/tests/test_net_registry.sh | 53 ++-
source/script/tests/test_net_s3.sh | 33 ++
source/script/tests/test_posix_s3.sh | 4 +
source/script/tests/test_testparm_s3.sh | 90 +++
source/script/tests/test_wbinfo_s3.sh | 4 +-
source/script/tests/tests_all.sh | 40 +-
source/smbd/file_access.c | 11 +-
source/smbd/msdfs.c | 6 +-
source/smbd/posix_acls.c | 2 +-
source/utils/net.h | 1 +
source/utils/net_ads.c | 2 -
source/utils/net_help.c | 7 +-
source/utils/net_rpc.c | 744 ++++++++++++------------
source/utils/net_rpc_samsync.c | 27 +
source/winbindd/winbindd_cm.c | 15 +-
source/winbindd/winbindd_util.c | 12 +-
49 files changed, 1716 insertions(+), 679 deletions(-)
create mode 100644 docs-xml/Samba3-HOWTO/TOSHARG-TDBFiles.xml
delete mode 100644 docs-xml/manpages-3/smbsh.1.xml
create mode 100644 examples/libsmbclient/smbwrapper/smbsh.1
create mode 100644 examples/libsmbclient/smbwrapper/smbsh.1.html
create mode 100644 examples/libsmbclient/smbwrapper/smbsh.1.xml
create mode 100644 source/libnet/libnet_samsync.c
create mode 100755 source/script/tests/test_net_misc.sh
create mode 100755 source/script/tests/test_net_s3.sh
create mode 100755 source/script/tests/test_testparm_s3.sh
Changeset truncated at 500 lines:
diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 6085d71..e94f5ba 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -1,9 +1,9 @@
=================================
- Release Notes for Samba 3.2.0rc2
- June 10, 2008
+ Release Notes for Samba 3.2.0rc3
+ July 1, 2008
=================================
-This is the second release candidate of Samba 3.2.0. This is *not*
+This is the third release candidate of Samba 3.2.0. This is *not*
intended for production environments and is designed for testing
purposes only. Please report any defects via the Samba bug reporting
system at https://bugzilla.samba.org/.
@@ -209,6 +209,57 @@ smb.conf changes
New special meaning of "include = registry".
+Changes since 3.2.0rc2:
+-----------------------
+
+
+o Jeremy Allison <jra at samba.org>
+ * BUG 5531: Fix conversion of ns units when converting
+ from nttime to timespec.
+ * BUG 5533: Fix handling of workgroup names containing a '.' in Winbindd.
+
+
+o Michael Adam <obnox at samba.org>
+ * BUG 5548: Fix segfaults in handle_include with %m macro expansion.
+
+
+o Volker Lendecke <vl at samba.org>
+ * BUG 5500: Add missing become_root to enable access to LDAP DB.
+ * Fix coverity IDs 464, 474.
+ * Fix an uninitialized variable found by the IBM checker.
+ * Fix group parsing in libwbclient's copy_group_entry().
+ * Fix max_fd calculation in event_loop_once.
+ * Fix warnings on Fedory Core 9.
+ * Fix several memleaks.
+ * Fix a segfaults in wbcLookupRids.
+ * Fix a segfault in clitar
+ * Fix the build on FreeBSD 4.6.2 and Darwin.
+ * Fix a double-closedir() in form_junctions().
+ * Fix a crash in _dfs_Enum.
+
+
+o Günther Deschner <gd at samba.org>
+ * BUG 5542: Fix empty passwords of samsync.
+
+
+o William Jojo <jojowil at hvcc.edu>
+ * Fix several AIX build issues.
+ * Add -brtl to the AIX linker flags.
+
+
+o John H Terpstra <jht at samba.org>
+ * Fix net help info.
+ * Add documentation for TDB file.
+
+
+o Bo Yang <boyang at novell.com>
+ * Fix update of cached credentials during password change in pam_winbind.
+
+
+o Christoph Zauner <christoph.zauner at sernet.de>
+ * Fix several typos in the man pages and the Samba3 HowTo Collection.
+
+
Changes since 3.2.0rc1:
-----------------------
diff --git a/docs-xml/Samba3-HOWTO/TOSHARG-TDBFiles.xml b/docs-xml/Samba3-HOWTO/TOSHARG-TDBFiles.xml
new file mode 100644
index 0000000..cc8b105
--- /dev/null
+++ b/docs-xml/Samba3-HOWTO/TOSHARG-TDBFiles.xml
@@ -0,0 +1,152 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE chapter PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
+<chapter id="msdfs">
+
+<chapterinfo>
+ &author.jht;
+
+ <pubdate>May 28, 2008</pubdate>
+</chapterinfo>
+
+<title>Managing TDB Files</title>
+
+<sect1>
+<title>Features and Benefits</title>
+
+ <para>
+<indexterm><primary>tdb</primary></indexterm>
+<indexterm><primary>Trivial Database</primary></indexterm>
+ Samba uses a lightweight database called Trivial Database (tdb) in which it stores persistent and transient data.
+ Some tdb files can be disposed of before restarting Samba, but others are used to store information that is vital
+ to Samba configuration and behavior. The following information is provided to help administrators who are seeking
+ to better manage their Samba installations.
+ </para>
+
+ <para>
+<indexterm><primary>tdb</primary></indexterm>
+<indexterm><primary>currupted</primary></indexterm>
+<indexterm><primary>backup</primary></indexterm>
+<indexterm><primary>restore</primary></indexterm>
+ Those who package Samba for commercial distribution with operating systems and appliances would do well to take
+ note that tdb files can get corrupted, and for this reason ought to be backed up regularly. An appropriate time
+ is at system shutdown (backup) and startup (restore from backup).
+ </para>
+
+<table frame="all" id="TOSH-TDB">
+ <title>Samba's Trivial Database Files</title>
+ <tgroup align="center" cols="2">
+ <thead>
+ <row><entry>File name</entry><entry>Preserve</entry><entry>Description</entry></row>
+ </thead>
+
+ <tbody>
+ <row><entry>account_policy.tdb</entry><entry>Y</entry>
+ <entry><para>NT account policy settings such as pw expiration, etc...</para></entry></row>
+ <row><entry>brlock.tdb</entry><entry>N</entry>
+ <entry><para>Byte range locks.</para></entry></row>
+ <row><entry>browse.dat</entry><entry>N</entry>
+ <entry><para>Browse lists - gets rebuilt automatically.</para></entry></row>
+ <row><entry>connections.tdb</entry><entry>N</entry>
+ <entry><para>Share connections. Used to enforce max connections, etc.</para></entry></row>
+ <row><entry>gencache.tdb</entry><entry>N</entry>
+ <entry><para>Generic caching database.</para></entry></row>
+ <row><entry>group_mapping.tdb</entry><entry>Y</entry>
+ <entry><para>Stores group mapping information. Not used when using LDAP backend.</para></entry></row>
+ <row><entry> lang_en.tdb</entry><entry>Y</entry>
+ <entry><para>Stores language encoding information.</para></entry></row>
+ <row><entry>locking.tdb</entry><entry>N</entry>
+ <entry><para>Stores share mode and oplock information.</para></entry></row>
+ <row><entry>login_cache.tdb</entry><entry>N</entry>
+ <entry><para>Keeps a log of bad pw attempts.</para></entry></row>
+ <row><entry>messages.tdb</entry><entry>N</entry>
+ <entry><para>Used to keep track of Samba internal messaging.</para></entry></row>
+ <row><entry>netsamlogon_cache.tdb</entry><entry>Y</entry>
+ <entry><para>
+ Cache of user net_info_3 struct from <emphasis>net_samlogon()</emphasis>
+ requests from domain member machines.
+ </para></entry></row>
+ <row><entry>ntdrivers.tdb</entry><entry>Y</entry>
+ <entry><para>Stores installed printer driver information.</para></entry></row>
+ <row><entry>ntforms.tdb</entry><entry>Y</entry>
+ <entry><para>Stores installed printer forms information.</para></entry></row>
+ <row><entry>ntprinters.tdb</entry><entry>Y</entry>
+ <entry><para>Stores installed printers information.</para></entry></row>
+ <row><entry>printing directory</entry><entry>Y</entry>
+ <entry><para>Directory containing tdb per print queue of cached lpq output.</para></entry></row>
+ <row><entry>registry.tdb</entry><entry>Y</entry>
+ <entry><para>Windows registry skeleton (connect via regedit.exe).</para></entry></row>
+ <row><entry>sessionid.tdb</entry><entry>N</entry>
+ <entry><para>Session information to support <literal>utmp = yes</literal> capabilities.</para></entry></row>
+ <row><entry>share_info.tdb</entry><entry>Y</entry>
+ <entry><para>Stores share-level ACL configuration settings.
+ Default ACL is <emphasis>Everyone - Full Control</emphasis>.
+ </para></entry></row>
+ <row><entry>unexpected.tdb</entry><entry>N</entry>
+ <entry><para>
+ Unexpected packet queue needed to support windows clients that respond on a
+ different port that the originating reques.
+ </para></entry></row>
+ <row><entry>winbindd_cache.tdb</entry><entry>N</entry>
+ <entry><para>Winbind's cache of user lists.</para></entry></row>
+ <row><entry>winbindd_idmap.tdb</entry><entry>Y</entry>
+ <entry><para>Winbind's local IDMAP database.</para></entry></row>
+ <row><entry>wins.dat</entry><entry>N</entry>
+ <entry><para>
+ WINS database iused only when <parameter>wins support = yes</parameter>
+ has been set. This gets rebuilt or updated at every restart.
+ </para></entry></row>
+ <row><entry>wins.tdb</entry><entry>Y</entry>
+ <entry><para>
+ The working permanent storage for all WINS data. This database is used only
+ when <parameter>wins support = yes</parameter> has been set in the &smb.conf; file.
+ Note: This retains all manually configured WINS entries. Manual setting can be done use the net utility.
+ </para></entry></row>
+ <row><entry>secrets.tdb</entry><entry>Y</entry>
+ <entry><para>
+ This tdb file stores internal settings such as the machine and the domain SID, secret passwords
+ that are used with LDAP, the machine secret token, etc. This is an essential file that is stored
+ in a secure area. Vendors locate this in various folders. Check <command>smbd -b</command> to
+ find its location on your system.
+ </para></entry></row>
+ <row><entry>schannel_store.tdb</entry><entry>Y</entry>
+ <entry><para>
+ This stores secure channel access token information used with SMB signing.
+ </para></entry></row>
+ <row><entry>passdb.tdb</entry><entry>Y</entry>
+ <entry><para>
+ This stores the Samba SAM account information when using a tdbsam password backend.
+ </para></entry></row>
+ </tbody>
+ </tgroup>
+ </table>
+
+</sect1>
+
+<sect1>
+<title>Managing TDB Files</title>
+
+ <para>
+ The <command>tdbbackup</command> utility is a tool that may be used to backup samba tdb files.
+ This tool may also be used to verify the integrity of the tdb files prior to Samba startup or
+ during normal operation. If it finds file damage it will search for a prior backup the backup
+ file from which the damaged tdb file will be restored. The <command>tdbbackup</command>
+ utility can safely be run at any time. It was designed so that it can be used at any time to
+ validate the integrity of tdb files, even during Samba operation.
+ </para>
+
+ <para>
+ It is recommended to backup all tdb files as part of the Samba start-up scripts on a Samba
+ server. The following command syntax can be used:
+ </para>
+<screen>
+myserver# > cd /var/lib/samba
+myserver@ > tdbbackup *.tdb
+</screen>
+ <para>
+ The default extension is <filename>.bak</filename>. Any alternate extension can be specified
+ by executing <literal>tdbbackup -s 'new_extension' *.tdb</literal> as part of your startup script.
+ </para>
+
+</sect1>
+
+</chapter>
diff --git a/docs-xml/Samba3-HOWTO/index.xml b/docs-xml/Samba3-HOWTO/index.xml
index 1253b03..87b0795 100644
--- a/docs-xml/Samba3-HOWTO/index.xml
+++ b/docs-xml/Samba3-HOWTO/index.xml
@@ -193,6 +193,8 @@ The chapters in this part each cover specific Samba features.
<?latex \cleardoublepage ?>
<xi:include href="TOSHARG-Bugs.xml"/>
<?latex \cleardoublepage ?>
+ <xi:include href="TOSHARG-TDBFiles.xml"/>
+ <?latex \cleardoublepage ?>
</part>
diff --git a/docs-xml/manpages-3/smbsh.1.xml b/docs-xml/manpages-3/smbsh.1.xml
deleted file mode 100644
index 5494f35..0000000
--- a/docs-xml/manpages-3/smbsh.1.xml
+++ /dev/null
@@ -1,164 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
-<refentry id="smbsh.1">
-
-<refmeta>
- <refentrytitle>smbsh</refentrytitle>
- <manvolnum>1</manvolnum>
- <refmiscinfo class="source">Samba</refmiscinfo>
- <refmiscinfo class="manual">User Commands</refmiscinfo>
- <refmiscinfo class="version">3.2</refmiscinfo>
-</refmeta>
-
-
-<refnamediv>
- <refname>smbsh</refname>
- <refpurpose>Allows access to remote SMB shares
- using UNIX commands</refpurpose>
-</refnamediv>
-
-<refsynopsisdiv>
- <cmdsynopsis>
- <command>smbsh</command>
- <arg choice="opt">-W workgroup</arg>
- <arg choice="opt">-U username</arg>
- <arg choice="opt">-P prefix</arg>
- <arg choice="opt">-R <name resolve order></arg>
- <arg choice="opt">-d <debug level></arg>
- <arg choice="opt">-l logdir</arg>
- <arg choice="opt">-L libdir</arg>
- </cmdsynopsis>
-</refsynopsisdiv>
-
-<refsect1>
- <title>DESCRIPTION</title>
-
- <para>This tool is part of the <citerefentry><refentrytitle>samba</refentrytitle>
- <manvolnum>7</manvolnum></citerefentry> suite.</para>
-
- <para><command>smbsh</command> allows you to access an NT filesystem
- using UNIX commands such as <command>ls</command>, <command>
- egrep</command>, and <command>rcp</command>. You must use a
- shell that is dynamically linked in order for <command>smbsh</command>
- to work correctly.</para>
-</refsect1>
-
-<refsect1>
- <title>OPTIONS</title>
-
- <variablelist>
- <varlistentry>
- <term>-W WORKGROUP</term>
- <listitem><para>Override the default workgroup specified in the
- workgroup parameter of the <citerefentry><refentrytitle>smb.conf</refentrytitle>
- <manvolnum>5</manvolnum></citerefentry> file
- for this session. This may be needed to connect to some
- servers. </para></listitem>
- </varlistentry>
-
- <varlistentry>
- <term>-U username[%pass]</term>
- <listitem><para>Sets the SMB username or username and password.
- If this option is not specified, the user will be prompted for
- both the username and the password. If %pass is not specified,
- the user will be prompted for the password.
- </para></listitem>
- </varlistentry>
-
- <varlistentry>
- <term>-P prefix</term>
- <listitem><para>This option allows
- the user to set the directory prefix for SMB access. The
- default value if this option is not specified is
- <emphasis>smb</emphasis>.
- </para></listitem>
- </varlistentry>
-
- &stdarg.configfile;
- &stdarg.server.debug;
- &stdarg.resolve.order;
-
- <varlistentry>
- <term>-L libdir</term>
- <listitem><para>This parameter specifies the location of the
- shared libraries used by <command>smbsh</command>. The default
- value is specified at compile time.
- </para></listitem>
- </varlistentry>
-
- </variablelist>
-</refsect1>
-
-<refsect1>
- <title>EXAMPLES</title>
-
- <para>To use the <command>smbsh</command> command, execute <command>
- smbsh</command> from the prompt and enter the username and password
- that authenticates you to the machine running the Windows NT
- operating system.
-<programlisting>
-<prompt>system% </prompt><userinput>smbsh</userinput>
-<prompt>Username: </prompt><userinput>user</userinput>
-<prompt>Password: </prompt><userinput>XXXXXXX</userinput>
-</programlisting></para>
-
-
- <para>Any dynamically linked command you execute from
- this shell will access the <filename>/smb</filename> directory
- using the smb protocol. For example, the command <command>ls /smb
- </command> will show a list of workgroups. The command
- <command>ls /smb/MYGROUP </command> will show all the machines in
- the workgroup MYGROUP. The command
- <command>ls /smb/MYGROUP/<machine-name></command> will show the share
- names for that machine. You could then, for example, use the <command>
- cd</command> command to change directories, <command>vi</command> to
- edit files, and <command>rcp</command> to copy files.</para>
-</refsect1>
-
-<refsect1>
- <title>VERSION</title>
-
- <para>This man page is correct for version 3 of the Samba suite.</para>
-</refsect1>
-
-<refsect1>
- <title>BUGS</title>
-
- <para><command>smbsh</command> works by intercepting the standard
- libc calls with the dynamically loaded versions in <filename>
- smbwrapper.o</filename>. Not all calls have been "wrapped", so
- some programs may not function correctly under <command>smbsh
- </command>.</para>
-
- <para>Programs which are not dynamically linked cannot make
- use of <command>smbsh</command>'s functionality. Most versions
- of UNIX have a <command>file</command> command that will
- describe how a program was linked.</para>
-</refsect1>
-
-
-<refsect1>
- <title>SEE ALSO</title>
- <para><citerefentry><refentrytitle>smbd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>smb.conf</refentrytitle>
- <manvolnum>5</manvolnum></citerefentry></para>
-</refsect1>
-
-<refsect1>
- <title>AUTHOR</title>
-
- <para>The original Samba software and related utilities
- were created by Andrew Tridgell. Samba is now developed
- by the Samba Team as an Open Source project similar
- to the way the Linux kernel is developed.</para>
-
- <para>The original Samba man pages were written by Karl Auer.
- The man page sources were converted to YODL format (another
- excellent piece of Open Source software, available at <ulink url="ftp://ftp.icce.rug.nl/pub/unix/">
- ftp://ftp.icce.rug.nl/pub/unix/</ulink>) and updated for the Samba 2.0
- release by Jeremy Allison. The conversion to DocBook for
- Samba 2.2 was done by Gerald Carter. The conversion to DocBook XML 4.2
- for Samba 3.0 was done by Alexander Bokovoy.</para>
-</refsect1>
-
-</refentry>
diff --git a/docs-xml/manpages-3/winbindd.8.xml b/docs-xml/manpages-3/winbindd.8.xml
index 8e981fd..a449096 100644
--- a/docs-xml/manpages-3/winbindd.8.xml
+++ b/docs-xml/manpages-3/winbindd.8.xml
@@ -119,12 +119,17 @@
resolve user and group information from <filename>/etc/passwd
</filename> and <filename>/etc/group</filename> and then from the
Windows NT server.
+ </para>
+
<programlisting>
passwd: files winbind
group: files winbind
-## only available on IRIX; Linux users should us libnss_wins.so
-hosts: files dns winbind
-</programlisting></para>
+## only available on IRIX: use winbind to resolve hosts:
+# hosts: files dns winbind
+## All other NSS enabled systems should use libnss_wins.so like this:
+hosts: files dns wins
+
+</programlisting>
<para>The following simple configuration in the
<filename>/etc/nsswitch.conf</filename> file can be used to initially
diff --git a/examples/libsmbclient/smbwrapper/smbsh.1 b/examples/libsmbclient/smbwrapper/smbsh.1
new file mode 100644
index 0000000..368a245
--- /dev/null
+++ b/examples/libsmbclient/smbwrapper/smbsh.1
@@ -0,0 +1,203 @@
+.\" Title: smbsh
+.\" Author:
+.\" Generator: DocBook XSL Stylesheets v1.73.1 <http://docbook.sf.net/>
+.\" Date: 06/12/2008
+.\" Manual: User Commands
+.\" Source: Samba 3.2
+.\"
+.TH "SMBSH" "1" "06/12/2008" "Samba 3\.2" "User Commands"
+.\" disable hyphenation
+.nh
+.\" disable justification (adjust text to left margin only)
+.ad l
+.SH "NAME"
+smbsh - Allows access to remote SMB shares using UNIX commands
+.SH "SYNOPSIS"
+.HP 1
+smbsh [\-W\ workgroup] [\-U\ username] [\-P\ prefix] [\-R\ <name\ resolve\ order>] [\-d\ <debug\ level>] [\-l\ logdir] [\-L\ libdir]
+.SH "DESCRIPTION"
+.PP
+This tool is part of the
+\fBsamba\fR(7)
+suite\.
+.PP
+smbsh
+allows you to access an NT filesystem using UNIX commands such as
+ls,
+egrep, and
+rcp\. You must use a shell that is dynamically linked in order for
+smbsh
+to work correctly\.
+.SH "OPTIONS"
+.PP
+\-W WORKGROUP
+.RS 4
+Override the default workgroup specified in the workgroup parameter of the
+\fBsmb.conf\fR(5)
+file for this session\. This may be needed to connect to some servers\.
+.RE
+.PP
+\-U username[%pass]
+.RS 4
+Sets the SMB username or username and password\. If this option is not specified, the user will be prompted for both the username and the password\. If %pass is not specified, the user will be prompted for the password\.
+.RE
+.PP
+\-P prefix
+.RS 4
+This option allows the user to set the directory prefix for SMB access\. The default value if this option is not specified is
+\fIsmb\fR\.
+.RE
+.PP
+\-s <configuration file>
+.RS 4
+The file specified contains the configuration details required by the server\. The information in this file includes server\-specific information such as what printcap file to use, as well as descriptions of all the services that the server is to provide\. See
--
SAMBA-CTDB repository
More information about the samba-cvs
mailing list