[SCM] SAMBA-CTDB repository - branch v3-2-ctdb updated -
build_3.2.6_ctdb.52-3340-g31be3d3
Michael Adam
obnox at samba.org
Fri Jan 9 16:05:51 GMT 2009
The branch, v3-2-ctdb has been updated
via 31be3d3868e89f3a508c1013e92d16d6b1ce8577 (commit)
via 642532608bea788e174f15aabd13376847de106a (commit)
via 72bd55835fa853abb7ce960a53830a20f10ffa4d (commit)
via 1900233ede3083410eb3dc691d2d486c5340ccc4 (commit)
via f21a6d66f0bde933e5bf8cf673fc380e5dd52793 (commit)
via ab0359a19986f744075bf861dd43626210c2ecf7 (commit)
via 0e30f6d835016a73e89e3159d827a2703058d34b (commit)
via 097e9d64ade609da9f920156c98b466dc6c42dab (commit)
via a2042edb42e312d5b8fc5b4750bf5b91b5ee1b3c (commit)
via 3954c6965240836a467d16f447197681b7396a31 (commit)
via 9995378cf3f28af183030c3867513552d85bf935 (commit)
via c93a5131913a1a18645c4f972be6f6b2c1715f28 (commit)
via 4af1d077915c7bbe5268b78bde71b102861a2b98 (commit)
via 148437fcd0896591ebbf6c2808723575d025123f (commit)
via f420b5c2af7d46e88269d9ec89c5dcd37f1f8f46 (commit)
via c0877d14cb04956b29ca329897a7b4bface7f363 (commit)
via aef7ad9d2f65c5e2a3b9622b352cafd30be79663 (commit)
via 7045272e5436e3a24d187945e405cb3cc407ce73 (commit)
via 101ef64e3181335b66524296af08f7df04391b9a (commit)
via de41f0e9a08b796873bdd319fe784b6c90e28b23 (commit)
via fbee9f20b30a426d5c336066522d047a504914b9 (commit)
via 2ad41fedc50f764e77e2ba56b4d53d1045947a9c (commit)
via b4ffffc5c03b69ac2f8e0ed74fd7788549f7e822 (commit)
via 1f979334266706656874fdbe6cce14f17105360b (commit)
via cc70e0f88328e36410089a81f41c5b33fef24a10 (commit)
via e85526b184e66f86b7faa9d0a37288a09c12c19e (commit)
via 8275c3e7b1064dbf7b0922e0285dee28ff2eac3d (commit)
via b17132c61c22962fc30747f4619d32d0be608272 (commit)
via 6dbaf86ba4119a4fe2b2aea56994c3d3ea5d8428 (commit)
via b2ef64515d4a4876276d152ff2075546d2030d23 (commit)
via cd796359ec0c30a0204fe744805bfbea3550f57d (commit)
via 347f1b6dcc88e04307397ea965ca8d0412b7a8c8 (commit)
via 3577e583eeabb0555dc1ec1dd231ca835d90d307 (commit)
via ce0a7974c5e5032893fa80fbc710edfc29353413 (commit)
via f9f6bffc3763ddd8e19400616b6e5da962142e5e (commit)
via 783247bdce9268d44b14005ec3eb84c35e0cd71a (commit)
via 69e7a69c781a10fc64f8e4d40c6ad07cdc23e645 (commit)
via f03e6b8faf8f3222e3dcdaae906f48e2aa3eeba8 (commit)
via 228d0c9459e9187d671875eda03aaa1435ab8401 (commit)
via c0fc381ac7ad09fd454fd6802149c46b607069ee (commit)
via c364d44de2285cabb83a0c105f061b8640a3a431 (commit)
via 75b5b7b2664e4d55aa97418f42a415fd88d3d4bd (commit)
via 6bfcf1904ef50b74656d1cfb7f11b730481d2c6c (commit)
via 2d05db409e11443480c8cdc52e205f57aa512fba (commit)
via 9f6710abfaafa4b918b0c55547d5cd0823a26a56 (commit)
via b995677f9895ba7fa9744b079ebc905713e59d40 (commit)
via 7adf6961bfbbb3de07d40f397db5b5520d5f9d9f (commit)
via ccd63a202b7978af3d6fdb46d1c17f0e9ac0fef6 (commit)
via 5122f064d8d05b24c755506f4d7043c693670e80 (commit)
via fc86d348a41bf276c1863a0012bad3d3774bc12b (commit)
via 40c510097a43edd10f6b5cd376a2cf6eca1f7e8b (commit)
via 3a8ca8406e72c2029ccbe050069da010642baf14 (commit)
via c5d9ba5a377174e3a5b61eb17e2bbda1c9f31f84 (commit)
via 3356b95f72e26ede4ab16a12c334be90b8b1a639 (commit)
via 7f36de6906811d4f0428b75c79c72b17b8ccfcef (commit)
via 5c686419096362176d80f3d05339b8836d0178a4 (commit)
via 882ac5e5a79646754dfd1669ea6720ab52c9b6ee (commit)
via 2534619eedc3e9528d589cfee793a55b3cc62bed (commit)
via 9b5359f992e5ffac2cedc1360098c21f9c1d2f02 (commit)
via 0d6b3df8d9c8b5e777ac6717168a11455b2ad2ce (commit)
via b1727bbc7416f1a752cb1aadaff718e66f4a4381 (commit)
via bfc4c75c340e3182b5a9572763fcf8c004ec2eed (commit)
via 10e7d6b428c6e44f8b95c2794154dc1bfe4bde2d (commit)
via 3f47eb787f5b8499e5580407dc84c904db70b725 (commit)
via cb036772d09227f870c2fec3ecd8c3f53787dfbc (commit)
via 877951eea6e67273748aa9f56a56e41cf2dca00a (commit)
from f7d34eb3e18ae47a357726ea24f043b904f7327c (commit)
http://gitweb.samba.org/?p=obnox/samba-ctdb.git;a=shortlog;h=v3-2-ctdb
- Log -----------------------------------------------------------------
commit 31be3d3868e89f3a508c1013e92d16d6b1ce8577
Merge: f7d34eb3e18ae47a357726ea24f043b904f7327c 642532608bea788e174f15aabd13376847de106a
Author: Michael Adam <obnox at samba.org>
Date: Fri Jan 9 16:53:30 2009 +0100
Merge commit 'origin/v3-2-test' into v3-2-ctdb
Import Bugfixes from v3-2-test to v3-2-ctdb.
Michael
commit 642532608bea788e174f15aabd13376847de106a
Author: Karolin Seeger <kseeger at samba.org>
Date: Fri Dec 19 14:57:33 2008 +0100
WHATSNEW: Prepare WHATSNEW for 3.2.7.
Karolin
(cherry picked from commit 0730f4e464b249ffe2319e98902ed96089f3230b)
(cherry picked from commit e2ac74fb837a184ac01483199463bf623ee9a8ef)
Signed-off-by: Michael Adam <obnox at samba.org>
commit 72bd55835fa853abb7ce960a53830a20f10ffa4d
Author: Karolin Seeger <kseeger at samba.org>
Date: Fri Dec 19 14:45:36 2008 +0100
VERSION: Raise version number up to 3.2.7.
Karolin
(cherry picked from commit 33b904c7003e85362eb991c9475991f35b576fd1)
Signed-off-by: Michael Adam <obnox at samba.org>
commit 1900233ede3083410eb3dc691d2d486c5340ccc4
Author: Karolin Seeger <kseeger at samba.org>
Date: Fri Jan 9 11:22:00 2009 +0100
docs: Improve man mount.cifs.
Add hint about specifying the workgroup in the credentials file.
Whitespace cleanup.
This fixes bug #4541.
Patch based on proposed patch from Christian Perrier <bubulle at debian.org>.
Thanks for reporting and providing a patch!
Karolin
(cherry picked from commit 1f7e09ea542df3a2f5f553c0cb11a39c74712950)
(cherry picked from commit b99d98ff2ef5491979301656e7f516d3c8829f6e)
commit f21a6d66f0bde933e5bf8cf673fc380e5dd52793
Author: Jeremy Allison <jra at samba.org>
Date: Thu Jan 8 15:42:53 2009 -0800
Fix bug #6021 - smbclient du command does not recuse properly
Jeremy.
commit ab0359a19986f744075bf861dd43626210c2ecf7
Author: Jeremy Allison <jra at samba.org>
Date: Thu Jan 8 10:55:28 2009 -0800
Remove "strict allocate = partial" code that got accidentally committed.
Jeremy.
commit 0e30f6d835016a73e89e3159d827a2703058d34b
Author: Jeremy Allison <jra at samba.org>
Date: Thu Jan 8 10:38:44 2009 -0800
Fix race condition in alarm lock processing noticed by Richard Sharpe <realrichardsharpe at gmail.com>.
"It seems to me that if the lock is already held by another process when we
enter this code, there is a race between the timeout and the granting. If
the lock is subsequently granted, the process releasing the lock will signal
the wait variable (or whatever) and our process will be scheduled. However,
if the timeout occurs before we are scheduled, the timeout will be delivered
first.
We will have the lock but will forget we have the lock, and never release
it."
Jeremy.
commit 097e9d64ade609da9f920156c98b466dc6c42dab
Author: Karolin Seeger <kseeger at samba.org>
Date: Thu Jan 8 13:10:59 2009 +0100
packaging RHEL: Fix syntax error in samba.spec.tmpl.
Karolin
commit a2042edb42e312d5b8fc5b4750bf5b91b5ee1b3c
Author: Jeremy Allison <jra at samba.org>
Date: Wed Jan 7 14:55:51 2009 -0800
Fix bug #6016 - Alternate Data Streams / Extended Attributes seem to conflict.
Jeremy.
commit 3954c6965240836a467d16f447197681b7396a31
Author: boyang <boyang at suse.de>
Date: Wed Jan 7 11:07:42 2009 -0800
refresh sequence number as soon as possible when domain->sequence_number == -1 or domain->last_status is not ok.
commit 9995378cf3f28af183030c3867513552d85bf935
Author: Michael Adam <obnox at samba.org>
Date: Wed Dec 17 22:27:39 2008 +0100
packaging(RHEL): fix typo in [u]mount.cifs installation
Michael
(cherry picked from commit 835108bcf84a5f47f46d237c7a93c572348125a1)
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit 71c74725bce403e36e4dc38287802c95b8d4de66)
(cherry picked from commit cfc140d3924dd6be893d242ce5df22e2128f09f8)
(cherry picked from commit 8b4c199deffd724a4a2219ccb8ffb91524101cd9)
commit c93a5131913a1a18645c4f972be6f6b2c1715f28
Author: Michael Adam <obnox at samba.org>
Date: Wed Dec 17 18:56:34 2008 +0100
packaging(RHEL): fix build of [u]mount.cifs
mount.cifs is now built by make everything.
And it needs extra objects anyways (mtab.o),
which is why the build of mount.cifs failed.
Michael
(cherry picked from commit 96c811cf222be5463a6705feae73d6215685c5f1)
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit 308dbca653ce1d689b75f9b781237c67df4233a8)
(cherry picked from commit 9745e36c011a76669aad7a0a861ba1520ef8cec3)
(cherry picked from commit 1c1e196b648ae3ef241401f859842450c5153181)
commit 4af1d077915c7bbe5268b78bde71b102861a2b98
Author: Jeremy Allison <jra at samba.org>
Date: Tue Jan 6 16:06:43 2009 -0800
Fix bug #6017, - magic script does not work. based on a patch from monyo at samba.gr.jp.
Jeremy.
commit 148437fcd0896591ebbf6c2808723575d025123f
Author: Volker Lendecke <vl at samba.org>
Date: Tue Jan 6 15:13:43 2009 +0100
s3/swat: Fix creation of the first share using SWAT.
This fixes bug #5965.
(cherry picked from commit f76614169f1e0a932cf2895702cfa9e8a5735875)
commit f420b5c2af7d46e88269d9ec89c5dcd37f1f8f46
Author: Karolin Seeger <kseeger at samba.org>
Date: Tue Jan 6 12:26:23 2009 +0100
docs: Improve description of the share commands in man smb.conf.
-Correct the parameter names.
-Fix typos.
-Fix related parameters.
This fixes bug #6008.
Thanks to TAKAHASHI Motonobu <monyo at samba.gr.jp> for reporting!
Karolin
(cherry picked from commit 8b7f66c548ed170d2dab0c91ccff4aca00f4b52d)
(cherry picked from commit 6f38786aa878bd1a7fc10069773c19b28437fbbb)
commit c0877d14cb04956b29ca329897a7b4bface7f363
Author: Karolin Seeger <kseeger at samba.org>
Date: Tue Jan 6 10:26:37 2009 +0100
docs: Fix example in man vfs_recycle.
This fixes bug #6001.
Thanks to TAKAHASHI Motonobu <monyo at samba.gr.jp> for reporting!
Karolin
(cherry picked from commit 9f44a17c3bf36067d04cec036c3e529798932cd7)
(cherry picked from commit 5e073807f7c4679dd299a2b8f3e2643dc1c82405)
commit aef7ad9d2f65c5e2a3b9622b352cafd30be79663
Author: Jeremy Allison <jra at samba.org>
Date: Mon Jan 5 18:06:20 2009 -0800
Fix the build (event context init was different).
Jeremy.
commit 7045272e5436e3a24d187945e405cb3cc407ce73
Author: Bo Yang <boyang at novell.com>
Date: Mon Jan 5 17:55:22 2009 -0800
clean event context after child is forked.
Signed-off-by: Stefan Metzmacher <metze at samba.org>
commit 101ef64e3181335b66524296af08f7df04391b9a
Author: Jeremy Allison <jra at samba.org>
Date: Mon Jan 5 12:34:02 2009 -0800
Attempt to fix crash seen with new CUPS async printcap loading code.
Jeremy.
commit de41f0e9a08b796873bdd319fe784b6c90e28b23
Author: Karolin Seeger <kseeger at samba.org>
Date: Mon Jan 5 16:33:00 2009 +0100
examples: Avoid bashism in perfcount.init.
This fixes bug #6000.
Thanks to the Debian Samba package maintainers for providing the patch!
Remove trailing whitespaces.
Karolin
(cherry picked from commit 2e09746a4db4186c9d648370b9004971bc18e5c9)
(cherry picked from commit 9b17f7907bca32282d6e56fa28ca62ef84bf7afc)
commit fbee9f20b30a426d5c336066522d047a504914b9
Author: Karolin Seeger <kseeger at samba.org>
Date: Mon Jan 5 16:37:01 2009 +0100
Revert "examples: Avoid bashism in perfcount.init."
This reverts commit b4ffffc5c03b69ac2f8e0ed74fd7788549f7e822.
commit 2ad41fedc50f764e77e2ba56b4d53d1045947a9c
Author: Volker Lendecke <vl at samba.org>
Date: Mon Jan 5 15:47:19 2009 +0100
Fix bug 6014 -- mget shouldn't segfault without arguments
Thanks to kevin.paulus at mtm.kuleuven.be for the bug report
Volker
commit b4ffffc5c03b69ac2f8e0ed74fd7788549f7e822
Author: Karolin Seeger <kseeger at samba.org>
Date: Mon Jan 5 14:54:28 2009 +0100
examples: Avoid bashism in perfcount.init.
This fixes bug #6000.
Thanks to the Debian Samba package maintainers for providing the patch!
Remove trailing whitespaces.
Karolin
(cherry picked from commit 73875cd344608b591fa884ab99b5f3a10550c149)
(cherry picked from commit e273c07e94ee607bbf05b6fa66cf3cea13fe4502)
(cherry picked from commit a1bf1f1819ab184682327583d05b0258db8856ef)
commit 1f979334266706656874fdbe6cce14f17105360b
Author: Karolin Seeger <kseeger at samba.org>
Date: Mon Jan 5 14:39:59 2009 +0100
docs: Document the -g option of smbclient.
This fixes bug #6013.
Thanks to the Debian Samba packages maintainers for reporting!
Karolin
(cherry picked from commit 6752d78e946b2c4278e2deba325c76fb7ffbc06a)
(cherry picked from commit e6abdbde9b67801d46c9d331045d155717e8b241)
(cherry picked from commit 8a79b8796f98dd80b6e1f04d7302fb8342f0052d)
commit cc70e0f88328e36410089a81f41c5b33fef24a10
Author: Volker Lendecke <vl at samba.org>
Date: Mon Jan 5 13:36:34 2009 +0100
Fix a bad memleak in vfs_full_audit
commit e85526b184e66f86b7faa9d0a37288a09c12c19e
Author: Michael Adam <obnox at samba.org>
Date: Thu Dec 18 18:01:55 2008 +0100
smbd: prevent access to root filesystem when connecting with empty service name
This only applies to a setup with "registry shares = yes"
Michael
(cherry picked from commit 288fa94ac7cfdf7457b5098c33fc840bed3d5410)
commit 8275c3e7b1064dbf7b0922e0285dee28ff2eac3d
Author: Jeremy Allison <jra at samba.org>
Date: Sun Jan 4 11:47:44 2009 -0800
Fix bug #6009 - Setting "min receivefile size = 1" breaks writes.
Jeremy.
commit b17132c61c22962fc30747f4619d32d0be608272
Author: Karolin Seeger <kseeger at samba.org>
Date: Fri Jan 2 14:51:23 2009 +0100
Revert "packaging(RHEL): fix build of [u]mount.cifs"
This reverts commit cd796359ec0c30a0204fe744805bfbea3550f57d.
Applies only for 3.3 series.
Karolin
commit 6dbaf86ba4119a4fe2b2aea56994c3d3ea5d8428
Author: Karolin Seeger <kseeger at samba.org>
Date: Fri Jan 2 14:50:14 2009 +0100
Revert "packaging(RHEL): fix typo in [u]mount.cifs installation"
This reverts commit b2ef64515d4a4876276d152ff2075546d2030d23.
This issue does apply for 3.3 series only.
Karolin
commit b2ef64515d4a4876276d152ff2075546d2030d23
Author: Michael Adam <obnox at samba.org>
Date: Wed Dec 17 22:27:39 2008 +0100
packaging(RHEL): fix typo in [u]mount.cifs installation
Michael
(cherry picked from commit 835108bcf84a5f47f46d237c7a93c572348125a1)
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit 71c74725bce403e36e4dc38287802c95b8d4de66)
(cherry picked from commit cfc140d3924dd6be893d242ce5df22e2128f09f8)
(cherry picked from commit 8b4c199deffd724a4a2219ccb8ffb91524101cd9)
commit cd796359ec0c30a0204fe744805bfbea3550f57d
Author: Michael Adam <obnox at samba.org>
Date: Wed Dec 17 18:56:34 2008 +0100
packaging(RHEL): fix build of [u]mount.cifs
mount.cifs is now built by make everything.
And it needs extra objects anyways (mtab.o),
which is why the build of mount.cifs failed.
Michael
(cherry picked from commit 96c811cf222be5463a6705feae73d6215685c5f1)
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit 308dbca653ce1d689b75f9b781237c67df4233a8)
(cherry picked from commit 9745e36c011a76669aad7a0a861ba1520ef8cec3)
(cherry picked from commit 1c1e196b648ae3ef241401f859842450c5153181)
commit 347f1b6dcc88e04307397ea965ca8d0412b7a8c8
Author: Stefan Metzmacher <metze at samba.org>
Date: Fri Jan 2 09:46:17 2009 +0100
Happy New Year!
metze
commit 3577e583eeabb0555dc1ec1dd231ca835d90d307
Author: Volker Lendecke <vl at samba.org>
Date: Thu Jan 1 22:05:03 2009 +0100
Fix bug 5913.
Never seen this to be a problem, but it doesn't hurt either :-)
commit ce0a7974c5e5032893fa80fbc710edfc29353413
Author: Volker Lendecke <vl at samba.org>
Date: Wed Dec 31 18:37:39 2008 +0100
recvfile can't be used for printing so far
commit f9f6bffc3763ddd8e19400616b6e5da962142e5e
Author: Volker Lendecke <vl at samba.org>
Date: Tue Dec 30 22:24:04 2008 +0100
Fix an ancient uninitialized variable read
The callers of open_file_ntcreate expect *psbuf to be filled correctly
commit 783247bdce9268d44b14005ec3eb84c35e0cd71a
Author: Volker Lendecke <vl at samba.org>
Date: Tue Dec 30 15:47:06 2008 +0100
Fix a memory leak in cups_pull_comment_location
We allocated "request" with ippNew, so we also should ippDelete it.
commit 69e7a69c781a10fc64f8e4d40c6ad07cdc23e645
Author: Volker Lendecke <vl at samba.org>
Date: Mon Dec 29 23:24:43 2008 +0100
Don't increment twice
Thanks metze :-)
commit f03e6b8faf8f3222e3dcdaae906f48e2aa3eeba8
Author: Volker Lendecke <vl at samba.org>
Date: Mon Dec 29 22:06:08 2008 +0100
Second part of the bugfix for #5933
Incrementing the next vuid did not correctly overflow
Now we survive BENCH-SESSSETUP with -o 100000. Takes a while though :-)
Thanks a lot to Ofer Tal <otsmb at shmoop.org> for reporting #5933
commit 228d0c9459e9187d671875eda03aaa1435ab8401
Author: Volker Lendecke <vl at samba.org>
Date: Mon Dec 29 22:01:57 2008 +0100
First part of bugfix for #5933
Ofer Tal <otsmb at shmoop.org> fully correctly noted that we're incrementing
num_validated_vuids twice per session setup, but decrement it only once.
Looking at sesssetup.c we always call register_initial_vuid() before
register_existing_vuid(), so there's no point in incrementing it in
register_existing_vuid().
Jeremy, please check!
commit c0fc381ac7ad09fd454fd6802149c46b607069ee
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Dec 29 12:28:16 2008 +0100
s3:dbwrap: fix dbwrap_store_uint32() to match dbwrap_store_int32()
All callers expect 0 an success and -1 on error.
metze
(cherry picked from commit a255f9ce713b29552722ec73e4038226959e1c8e)
(cherry picked from commit 9aa543fee7ebcc95125d18868bdec7e4bf577d8a)
commit c364d44de2285cabb83a0c105f061b8640a3a431
Author: Volker Lendecke <vl at samba.org>
Date: Mon Dec 22 22:42:44 2008 +0100
Add code to test write_data_iov a bit
commit 75b5b7b2664e4d55aa97418f42a415fd88d3d4bd
Author: Volker Lendecke <vl at samba.org>
Date: Mon Dec 22 22:32:12 2008 +0100
Attempt to fix bug 5953: Make cli_send_smb_direct_writeX use writev
It seems there are SMB servers around which can't cope with the write header
being sent in a packet of its own. With writev we keep the advantage of direct
writes, giving the kernel the chance to coalesce the write calls.
commit 6bfcf1904ef50b74656d1cfb7f11b730481d2c6c
Author: Volker Lendecke <vl at samba.org>
Date: Mon Dec 22 22:17:59 2008 +0100
Make write_data use write_data_iov
commit 2d05db409e11443480c8cdc52e205f57aa512fba
Author: Volker Lendecke <vl at samba.org>
Date: Mon Dec 22 22:17:28 2008 +0100
Add write_data_iov
commit 9f6710abfaafa4b918b0c55547d5cd0823a26a56
Author: Volker Lendecke <vl at samba.org>
Date: Sun Dec 21 23:22:30 2008 +0100
Add sys_writev
commit b995677f9895ba7fa9744b079ebc905713e59d40
Author: Jeremy Allison <jra at samba.org>
Date: Thu Dec 25 12:14:44 2008 -0800
Fix bug #5990 - strict allocate should be checked before ftruncate
reported by and based on a patch by Yasuma Takeda <yasuma at osstech.co.jp>.
Jeremy.
commit 7adf6961bfbbb3de07d40f397db5b5520d5f9d9f
Author: Tim Prouty <tprouty at samba.org>
Date: Tue Dec 23 09:19:25 2008 -0800
s3: Fix stream marshalling to return the correct streaminfo status
When there are enough streams on a file to fill up the max_data_count
when responding to a trans2 streaminfo, samba is returning
NT_STATUS_BUFFER_TOO_SMALL. Windows handles this by returning
NT_STATUS_BUFFER_OVERFLOW while still sending as much of the data that
it can fit into the buffer. When the windows client sees
BUFFER_OVERFLOW, it retries the streaminfo with a larger buffer (2x).
The windows client starts at 2K and will continue increasing the
buffer size by two until it reaches 64K. If the streams don't fit in
64K the windows client seems to give up.
This patch fixes marshall_stream_info to overfill the buffer by 1
stream so that send_trans2_replies can properly detect the overflow
and return the correct status.
commit ccd63a202b7978af3d6fdb46d1c17f0e9ac0fef6
Author: Gerald (Jerry) Carter <jerry at samba.org>
Date: Mon Dec 22 11:07:08 2008 -0800
Fix "allow trusted domain" so it disables trusted domains.
commit 5122f064d8d05b24c755506f4d7043c693670e80
Author: Jeremy Allison <jra at samba.org>
Date: Fri Dec 19 13:58:55 2008 -0800
Fix bug #5986 - Editing a stream is broken (rename problems).
Jeremy.
commit fc86d348a41bf276c1863a0012bad3d3774bc12b
Author: Volker Lendecke <vl at samba.org>
Date: Fri Dec 19 12:04:59 2008 -0800
Fix a "ignoring function call result" warning
commit 40c510097a43edd10f6b5cd376a2cf6eca1f7e8b
Author: Björn Jacke <bj at sernet.de>
Date: Fri Dec 19 12:12:59 2008 +0100
correct the description of the "ldap timeout" parameter
(cherry picked from commit 1aff97bc48844afba5de48447fdcdcc02d163a97)
commit 3a8ca8406e72c2029ccbe050069da010642baf14
Author: Jeremy Allison <jra at samba.org>
Date: Thu Dec 18 13:28:18 2008 -0800
Fix bug #5980 - Race condition when granting level2 oplocks can cause break notify to be missed.
Jeremy.
commit c5d9ba5a377174e3a5b61eb17e2bbda1c9f31f84
Author: Jeremy Allison <jra at samba.org>
Date: Wed Dec 17 17:23:35 2008 -0800
Fix bug #5979 - Level 2 oplocks being granted improperly,
Jeremy.
commit 3356b95f72e26ede4ab16a12c334be90b8b1a639
Author: Volker Lendecke <vl at sernet.de>
Date: Wed Dec 17 18:14:09 2008 +0100
Fix a valgrind error
Reported by naga_kishore_kommuri at yahoo.com
Derrel, please check!
Thanks,
Volker
commit 7f36de6906811d4f0428b75c79c72b17b8ccfcef
Author: Karolin Seeger <kseeger at samba.org>
Date: Wed Dec 17 16:26:43 2008 +0100
s3/smb.h: Remove unused LDAP_SSL_ON.
LDAP_SSL_ON is not defined at all.
Ldaps can be used by specifying an ldaps URL using the "passdb backend"
parameter.
Karolin
(cherry picked from commit 0c6cf1f8793edfde924289aafbd174ce4a4fae0c)
commit 5c686419096362176d80f3d05339b8836d0178a4
Author: Karolin Seeger <kseeger at samba.org>
Date: Wed Dec 17 15:53:51 2008 +0100
s3/loadparm.c: Change default value for "ldap ssl".
LDAP_SSL_ON is not defined at all. That's why the actual default value
was "" for a long time. Set a more sensible default value without chnging the
default behaviour.
-----8<------------------snip--------------8<--------------
user at host:/data/git/samba/v3-0-test/source> git grep LDAP_SSL_ON | cat
include/smb.h:enum ldap_ssl_types {LDAP_SSL_ON, LDAP_SSL_OFF,
LDAP_SSL_START_TLS};
param/loadparm.c: Globals.ldap_ssl = LDAP_SSL_ON;
----->8------------------snap-------------->8--------------
It's the same in 3.2 and 3.3 series.
Karolin
(cherry picked from commit e6d883e003d4560c55259ae1cfdf7319602f76e3)
commit 882ac5e5a79646754dfd1669ea6720ab52c9b6ee
Author: Karolin Seeger <kseeger at samba.org>
Date: Wed Dec 17 16:18:38 2008 +0100
docs: Update section "ldap ssl" in man smb.conf.
Remove non-existent value "on".
Change default value to "no".
Add hint about ldaps.
Karolin
(cherry picked from commit 580461629bb88ce3b61770e7abfe2c942a121877)
(cherry picked from commit d74356627579fe7b9961844a77c4e6daa978d62b)
commit 2534619eedc3e9528d589cfee793a55b3cc62bed
Author: Karolin Seeger <kseeger at samba.org>
Date: Wed Dec 17 15:42:12 2008 +0100
docs: Fix some formatting issues in the "ldap ssl" section of man smb.conf.
Karolin
(cherry picked from commit 6ac36698e975649d26e3f2975c2101129c3ffe97)
(cherry picked from commit 655a1c7b05d56326d6cfffbc8e46e1d64565717a)
commit 9b5359f992e5ffac2cedc1360098c21f9c1d2f02
Author: Lars Müller <lars at samba.org>
Date: Wed Dec 17 15:39:35 2008 +0100
Tweak with pam defines of older Linux versions
PAM_AUTHTOK_RECOVERY_ERR is not defined by older Linux versions (SUSE
Linux Enterprise 9 and RedHat Enterprise 4).
Patch suggested by Philipp Thomas <pth at suse dot de>.
commit 0d6b3df8d9c8b5e777ac6717168a11455b2ad2ce
Author: Karolin Seeger <kseeger at samba.org>
Date: Wed Dec 17 09:17:26 2008 +0100
docs: Fix TOC of generated HTML docs.
This fixes bug #5968.
Thanks to Christian Perrier <bubulle at debian.org> for reporting!
Karolin
(cherry picked from commit 675b363b712e0b91b9b7d1189a819a36853db539)
(cherry picked from commit 3566615292f9cb2d00b03156e515274751e05969)
commit b1727bbc7416f1a752cb1aadaff718e66f4a4381
Author: Kai Blin <kai at samba.org>
Date: Tue Dec 16 13:43:28 2008 -0800
(Fixed) Final part of fix for bug #5953 - smbclient crashes: cli_list_new segmentation fault (with NAS-BASIC server).
commit bfc4c75c340e3182b5a9572763fcf8c004ec2eed
Author: Jeremy Allison <jra at samba.org>
Date: Tue Dec 16 13:34:11 2008 -0800
Revert "Final part of fix for bug #5953 - smbclient crashes: cli_list_new segmentation fault (with NASBASIC server)."
Error in commit !
This reverts commit 10e7d6b428c6e44f8b95c2794154dc1bfe4bde2d.
commit 10e7d6b428c6e44f8b95c2794154dc1bfe4bde2d
Author: Kai Blin <kai at samba.org>
Date: Tue Dec 16 13:14:25 2008 -0800
Final part of fix for bug #5953 - smbclient crashes: cli_list_new segmentation fault (with NASBASIC server).
commit 3f47eb787f5b8499e5580407dc84c904db70b725
Author: SATOH Fumiyasu <fumiyas at osstech.jp>
Date: Wed Dec 17 00:54:30 2008 +0900
commit b520befe6f51644d20434add9864d7a2fa30aa2e
Author: SATOH Fumiyasu <fumiyas at osstech.co.jp>
Date: Wed Dec 17 00:42:25 2008 +0900
libsmbclient: Fix SIGBUS on non-x86 CPUs
We must align the struct smbc_dirent in the struct
SMBC_internal_data because the struct smbc_dirent
has numeric values that require alignment.
Signed-off-by: Derrell Lipman <derrell.lipman at unwireduniverse.com>
commit cb036772d09227f870c2fec3ecd8c3f53787dfbc
Author: SATOH Fumiyasu <fumiyas at osstech.jp>
Date: Tue Dec 16 16:59:07 2008 +0100
nss_winbind: Solaris 64-bit fix and...
PATCH 1:
Fix gmem->numgids and gmem->maxgids breakage on Solaris 64-bit
because sizeof(int) != sizeof(long int).
PATCH 2:
This patch fixes a compile-time warning
"warning: implicit function declaration: _nss_winbind_initgroups_dyn".
commit 877951eea6e67273748aa9f56a56e41cf2dca00a
Author: Karolin Seeger <kseeger at samba.org>
Date: Tue Dec 16 15:10:29 2008 +0100
docs: "acl compatibility" is a global parameter.
This fixes bug #5866.
Thanks to TAKAHASHI Motonobu <monyo at samba.gr.jp> for reporting!
Karolin
(cherry picked from commit 9e64ed018e5aa84d802b01953b481fbb07eb00aa)
(cherry picked from commit 386b0fc4bdc0822ffbc51cfee536bea23df0a755)
-----------------------------------------------------------------------
Summary of changes:
docs-xml/htmldocs.html | 8 +-
docs-xml/manpages-3/mount.cifs.8.xml | 8 +-
docs-xml/manpages-3/smbclient.1.xml | 24 +++-
docs-xml/manpages-3/vfs_recycle.8.xml | 13 +-
docs-xml/smbdotconf/ldap/ldapssl.xml | 37 +++---
docs-xml/smbdotconf/ldap/ldaptimeout.xml | 4 +-
docs-xml/smbdotconf/misc/addsharecommand.xml | 20 ++-
docs-xml/smbdotconf/misc/changesharecommand.xml | 20 ++-
docs-xml/smbdotconf/misc/deletesharecommand.xml | 18 ++-
docs-xml/smbdotconf/vfs/aclcompatibility.xml | 2 +-
examples/perfcounter/perfcountd.init | 10 +-
packaging/RHEL/samba.spec.tmpl | 13 +--
source/Makefile.in | 2 +-
source/client/client.c | 13 ++-
source/include/libsmb_internal.h | 13 +-
source/include/smb.h | 4 +-
source/lib/dbwrap_util.c | 4 +-
source/lib/events.c | 29 ++++-
source/lib/ldb/include/ldb.h | 2 +-
source/lib/system.c | 25 ++++
source/lib/util.c | 3 +
source/lib/util_sock.c | 115 +++++++++++++---
source/lib/util_tdb.c | 2 +-
source/libsmb/clidfs.c | 3 +-
source/libsmb/clientgen.c | 40 ++----
source/libsmb/clilist.c | 9 +-
source/libsmb/libsmb_dir.c | 10 +-
source/libsmb/libsmb_xattr.c | 3 +-
source/locking/locking.c | 11 ++-
source/modules/vfs_default.c | 14 ++
source/modules/vfs_full_audit.c | 5 +-
source/nmbd/asyncdns.c | 3 +-
source/nmbd/nmbd.c | 3 +-
source/nsswitch/pam_winbind.h | 9 +-
source/nsswitch/winbind_nss_solaris.c | 9 +-
source/nsswitch/winbind_nss_solaris.h | 3 +
source/param/loadparm.c | 2 +-
source/printing/print_cups.c | 9 +-
source/printing/printfsp.c | 9 +-
source/printing/printing.c | 3 +-
source/smbd/close.c | 16 ++-
source/smbd/dosmode.c | 11 +-
source/smbd/open.c | 163 ++++++++++++++---------
source/smbd/oplock.c | 54 ++++++--
source/smbd/password.c | 23 ++--
source/smbd/process.c | 2 +-
source/smbd/reply.c | 11 ++-
source/smbd/server.c | 7 +-
source/smbd/trans2.c | 32 ++---
source/web/swat.c | 2 +-
source/winbindd/winbindd.c | 10 +-
source/winbindd/winbindd_cache.c | 11 +-
source/winbindd/winbindd_cm.c | 3 +-
source/winbindd/winbindd_dual.c | 37 ++++--
source/winbindd/winbindd_util.c | 13 ++-
55 files changed, 614 insertions(+), 315 deletions(-)
Changeset truncated at 500 lines:
diff --git a/docs-xml/htmldocs.html b/docs-xml/htmldocs.html
index d2be5ef..44fcc0f 100644
--- a/docs-xml/htmldocs.html
+++ b/docs-xml/htmldocs.html
@@ -23,19 +23,15 @@
<td valign="top">This book provides example configurations, it documents key aspects of Microsoft Windows networking, provides in-depth insight into the important configuration of Samba-3, and helps to put all of these into a useful framework.</td>
</tr>
<tr>
- <td valign="top"><a href="../using_samba/toc.html">Using Samba</a>, 2nd Edition</td>
+ <td valign="top"><a href="using_samba/toc.html">Using Samba</a>, 2nd Edition</td>
<td valign="top"><i>Using Samba</i>, Second Edition is a comprehensive guide to Samba administration. It covers all versions of Samba from 2.0 to 2.2, including selected features from an alpha version of 3.0, as well as the SWAT graphical configuration tool. Updated for Windows 2000, ME, and XP, the book also explores Samba's new role as a primary domain controller and domain member server, its support for the use of Windows NT/2000/XP authentication and filesystem security on the host Unix system, and accessing shared files and printers from Unix clients.</td>
</tr>
<tr>
- <td valign="top"><a href="manpages-3/index.html">Man pages</a></td>
+ <td valign="top"><a href="manpages/index.html">Man pages</a></td>
<td valign="top">The Samba man pages in HTML.</td>
</tr>
<tr>
<td valign="top"><a href="../../WHATSNEW.txt">WHATSNEW</a></td>
<td valign="top">Samba Release Notes.</td>
</tr>
-<tr>
- <td valign="top"><a href="../../README.VENDOR">README.VENDOR</a></td>
- <td valign="top">VENDOR specific information.</td>
-</tr>
</table></body></html>
diff --git a/docs-xml/manpages-3/mount.cifs.8.xml b/docs-xml/manpages-3/mount.cifs.8.xml
index 51a22b3..54fbc13 100644
--- a/docs-xml/manpages-3/mount.cifs.8.xml
+++ b/docs-xml/manpages-3/mount.cifs.8.xml
@@ -89,7 +89,7 @@ to be specified as part of the username.
<listitem><para>specifies the CIFS password. If this
option is not given then the environment variable
-<emphasis>PASSWD</emphasis> is used. If the password is not specified
+<emphasis>PASSWD</emphasis> is used. If the password is not specified
directly or indirectly via an argument to mount, <emphasis>mount.cifs</emphasis> will prompt
for a password, unless the guest option is specified.
</para>
@@ -106,14 +106,16 @@ below) or entered at the password prompt will be read correctly.
<listitem><para>
specifies a file that contains a username
- and/or password. The format of the file is:
+ and/or password and optionally the name of the
+ workgroup. The format of the file is:
</para>
<programlisting>
username=<replaceable>value</replaceable>
password=<replaceable>value</replaceable>
+ workgroup=<replaceable>value</replaceable>
</programlisting>
-
+
<para>
This is preferred over having passwords in plaintext in a
shared file, such as <filename>/etc/fstab</filename>. Be sure to protect any
diff --git a/docs-xml/manpages-3/smbclient.1.xml b/docs-xml/manpages-3/smbclient.1.xml
index e2662cc..188ff11 100644
--- a/docs-xml/manpages-3/smbclient.1.xml
+++ b/docs-xml/manpages-3/smbclient.1.xml
@@ -13,7 +13,7 @@
<refnamediv>
<refname>smbclient</refname>
- <refpurpose>ftp-like client to access SMB/CIFS resources
+ <refpurpose>ftp-like client to access SMB/CIFS resources
on servers</refpurpose>
</refnamediv>
@@ -30,6 +30,7 @@
<arg choice="opt">-m maxprotocol</arg>
<arg choice="opt">-A authfile</arg>
<arg choice="opt">-N</arg>
+ <arg choice="opt">-g</arg>
<arg choice="opt">-i scope</arg>
<arg choice="opt">-O <socket options></arg>
<arg choice="opt">-p port</arg>
@@ -39,7 +40,7 @@
<arg choice="opt">-P</arg>
<arg choice="opt">-c <command></arg>
</cmdsynopsis>
-
+
<cmdsynopsis>
<command>smbclient</command>
<arg choice="req">servicename</arg>
@@ -54,6 +55,7 @@
<arg choice="opt">-m maxprotocol</arg>
<arg choice="opt">-A authfile</arg>
<arg choice="opt">-N</arg>
+ <arg choice="opt">-g</arg>
<arg choice="opt">-l log-basename</arg>
<arg choice="opt">-I destinationIP</arg>
<arg choice="opt">-E</arg>
@@ -233,7 +235,7 @@
on your WfWg PCs if you want them to always be able to receive
messages. </para></listitem>
</varlistentry>
-
+
<varlistentry>
<term>-p port</term>
<listitem><para>This number is the TCP port number that will be used
@@ -241,19 +243,27 @@
TCP port number for an SMB/CIFS server is 139, which is the
default. </para></listitem>
</varlistentry>
-
+
+ <varlistentry>
+ <term>-g</term>
+ <listitem><para>This parameter provides combined with
+ <parameter>-L</parameter> easy parseable output that allows processing
+ with utilities such as grep and cut.
+ </para></listitem>
+ </varlistentry>
+
<varlistentry>
<term>-P</term>
<listitem><para>
Make queries to the external server using the machine account of the local server.
</para></listitem>
</varlistentry>
-
+
&stdarg.help;
-
+
<varlistentry>
<term>-I IP-address</term>
- <listitem><para><replaceable>IP address</replaceable> is the address of the server to connect to.
+ <listitem><para><replaceable>IP address</replaceable> is the address of the server to connect to.
It should be specified in standard "a.b.c.d" notation. </para>
<para>Normally the client would attempt to locate a named
diff --git a/docs-xml/manpages-3/vfs_recycle.8.xml b/docs-xml/manpages-3/vfs_recycle.8.xml
index ca95f88..d7890e7 100644
--- a/docs-xml/manpages-3/vfs_recycle.8.xml
+++ b/docs-xml/manpages-3/vfs_recycle.8.xml
@@ -185,14 +185,17 @@
<refsect1>
<title>EXAMPLES</title>
- <para>Log operations on all shares using the LOCAL1 facility
- and NOTICE priority:</para>
+ <para>Move files "deleted" on <parameter>share</parameter> to
+ <parameter>/data/share/.recycle</parameter> instead of deleting them:
+ </para>
<programlisting>
- <smbconfsection name="[global]"/>
+ <smbconfsection name="[share]"/>
+ <smbconfoption name="path">/data/share</smbconfoption>
<smbconfoption name="vfs objects">recycle</smbconfoption>
- <smbconfoption name="recycle:facility">LOCAL1</smbconfoption>
- <smbconfoption name="recycle:priority">NOTICE</smbconfoption>
+ <smbconfoption name="recycle:repository">.recycle</smbconfoption>
+ <smbconfoption name="recycle:keeptree">yes</smbconfoption>
+ <smbconfoption name="recycle:versions">yes</smbconfoption>
</programlisting>
</refsect1>
diff --git a/docs-xml/smbdotconf/ldap/ldapssl.xml b/docs-xml/smbdotconf/ldap/ldapssl.xml
index 39ed08f..d785071 100644
--- a/docs-xml/smbdotconf/ldap/ldapssl.xml
+++ b/docs-xml/smbdotconf/ldap/ldapssl.xml
@@ -3,36 +3,35 @@
type="enum"
advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
- <description>
+<description>
<para>This option is used to define whether or not Samba should
use SSL when connecting to the ldap server
This is <emphasis>NOT</emphasis> related to
- Samba's previous SSL support which was enabled by specifying the
- <command moreinfo="none">--with-ssl</command> option to the <filename moreinfo="none">configure</filename>
+ Samba's previous SSL support which was enabled by specifying the
+ <command moreinfo="none">--with-ssl</command> option to the
+ <filename moreinfo="none">configure</filename>
script.</para>
-
-<para>The <smbconfoption name="ldap ssl"/> can be set to one of three values:</para>
+
+ <para>LDAP connections should be secured where possible. This may be
+ done setting either this parameter to
+ <parameter moreinfo="none">Start_tls</parameter>
+ or by specifying <parameter moreinfo="none">ldaps://</parameter> in
+ the URL argument of <smbconfoption name="passdb backend"/>.</para>
+
+ <para>The <smbconfoption name="ldap ssl"/> can be set to one of
+ two values:</para>
<itemizedlist>
<listitem>
- <para><parameter moreinfo="none">Off</parameter> = Never
+ <para><parameter moreinfo="none">Off</parameter> = Never
use SSL when querying the directory.</para>
</listitem>
<listitem>
- <para><parameter moreinfo="none">Start_tls</parameter> = Use
- the LDAPv3 StartTLS extended operation (RFC2830) for
+ <para><parameter moreinfo="none">Start_tls</parameter> = Use
+ the LDAPv3 StartTLS extended operation (RFC2830) for
communicating with the directory server.</para>
</listitem>
-
- <listitem>
- <para><parameter moreinfo="none">On</parameter> = Use SSL
- on the ldaps port when contacting the <parameter
- moreinfo="none">ldap server</parameter>. Only available when the
- backwards-compatiblity <command
- moreinfo="none">--with-ldapsam</command> option is specified
- to configure. See <smbconfoption name="passdb backend"/></para>.
- </listitem>
- </itemizedlist>
+ </itemizedlist>
</description>
-<value type="default">start_tls</value>
+<value type="default">no</value>
</samba:parameter>
diff --git a/docs-xml/smbdotconf/ldap/ldaptimeout.xml b/docs-xml/smbdotconf/ldap/ldaptimeout.xml
index 9c34ac8..5bc2699 100644
--- a/docs-xml/smbdotconf/ldap/ldaptimeout.xml
+++ b/docs-xml/smbdotconf/ldap/ldaptimeout.xml
@@ -5,9 +5,7 @@
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>
- When Samba connects to an ldap server that server may be down or unreachable. To prevent Samba from hanging whilst
- waiting for the connection this parameter specifies in seconds how long Samba should wait before failing the
- connect. The default is to only wait fifteen seconds for the ldap server to respond to the connect request.
+ This parameter defines the number of seconds that Samba should use as timeout for LDAP operations.
</para>
</description>
<value type="default">15</value>
diff --git a/docs-xml/smbdotconf/misc/addsharecommand.xml b/docs-xml/smbdotconf/misc/addsharecommand.xml
index 9eb50f3..de8da7b 100644
--- a/docs-xml/smbdotconf/misc/addsharecommand.xml
+++ b/docs-xml/smbdotconf/misc/addsharecommand.xml
@@ -7,15 +7,19 @@
<para>
Samba 2.2.0 introduced the ability to dynamically add and delete shares via the Windows NT 4.0 Server
Manager. The <parameter moreinfo="none">add share command</parameter> is used to define an external program
- or script which will add a new service definition to <filename moreinfo="none">smb.conf</filename>. In order
- to successfully execute the <parameter moreinfo="none">add share command</parameter>, <command
- moreinfo="none">smbd</command> requires that the administrator be connected using a root account (i.e. uid == 0).
+ or script which will add a new service definition to
+ <filename moreinfo="none">smb.conf</filename>.
</para>
- <para>
- If the connected account has <literal>SeDiskOperatorPrivilege</literal>, scripts defined in
- <parameter moreinfo="none">change share</parameter> parameter are executed as root.
- </para>
+ <para>
+ In order to successfully execute the
+ <parameter moreinfo="none">add share command</parameter>,
+ <command moreinfo="none">smbd</command> requires that the administrator
+ connects using a root account (i.e. uid == 0) or has the
+ <literal>SeDiskOperatorPrivilege</literal>.
+ Scripts defined in the <parameter moreinfo="none">add share command</parameter>
+ parameter are executed as root.
+ </para>
<para>
When executed, <command moreinfo="none">smbd</command> will automatically invoke the
@@ -56,7 +60,7 @@
</itemizedlist>
<para>
- This parameter is only used for add file shares. To add printer shares, see the <smbconfoption
+ This parameter is only used to add file shares. To add printer shares, see the <smbconfoption
name="addprinter command"/>.
</para>
</description>
diff --git a/docs-xml/smbdotconf/misc/changesharecommand.xml b/docs-xml/smbdotconf/misc/changesharecommand.xml
index 5a42e22..2033fcf 100644
--- a/docs-xml/smbdotconf/misc/changesharecommand.xml
+++ b/docs-xml/smbdotconf/misc/changesharecommand.xml
@@ -8,14 +8,17 @@
Samba 2.2.0 introduced the ability to dynamically add and delete shares via the Windows NT 4.0 Server
Manager. The <parameter moreinfo="none">change share command</parameter> is used to define an external
program or script which will modify an existing service definition in <filename
-moreinfo="none">smb.conf</filename>. In order to successfully execute the <parameter moreinfo="none">change
-share command</parameter>, <command moreinfo="none">smbd</command> requires that the administrator be
-connected using a root account (i.e. uid == 0).
+moreinfo="none">smb.conf</filename>.
</para>
<para>
- If the connected account has <literal>SeDiskOperatorPrivilege</literal>, scripts defined in
- <parameter moreinfo="none">change share</parameter> parameter are executed as root.
+ In order to successfully execute the
+ <parameter moreinfo="none">change share command</parameter>,
+ <command moreinfo="none">smbd</command> requires that the administrator
+ connects using a root account (i.e. uid == 0) or has the
+ <literal>SeDiskOperatorPrivilege</literal>.
+ Scripts defined in the <parameter moreinfo="none">change share command</parameter>
+ parameter are executed as root.
</para>
<para>
@@ -58,13 +61,14 @@ connected using a root account (i.e. uid == 0).
</itemizedlist>
<para>
- This parameter is only used modify existing file shares definitions. To modify
- printer shares, use the "Printers..." folder as seen when browsing the Samba host.
+ This parameter is only used to modify existing file share definitions.
+ To modify printer shares, use the "Printers..." folder as seen
+ when browsing the Samba host.
</para>
</description>
<related>add share command</related>
<related>delete share command</related>
<value type="default"></value>
-<value type="example">/usr/local/bin/addshare</value>
+<value type="example">/usr/local/bin/changeshare</value>
</samba:parameter>
diff --git a/docs-xml/smbdotconf/misc/deletesharecommand.xml b/docs-xml/smbdotconf/misc/deletesharecommand.xml
index 40eb649..3def6b8 100644
--- a/docs-xml/smbdotconf/misc/deletesharecommand.xml
+++ b/docs-xml/smbdotconf/misc/deletesharecommand.xml
@@ -8,15 +8,17 @@
Samba 2.2.0 introduced the ability to dynamically add and delete shares via the Windows NT 4.0 Server
Manager. The <parameter moreinfo="none">delete share command</parameter> is used to define an external
program or script which will remove an existing service definition from
- <filename moreinfo="none">smb.conf</filename>. In order to successfully execute the
- <parameter moreinfo="none">delete share command</parameter>, <command moreinfo="none">smbd</command>
- requires that the administrator be connected using a root account (i.e. uid == 0).
+ <filename moreinfo="none">smb.conf</filename>.
</para>
- <para>
- If the connected account has <literal>SeDiskOperatorPrivilege</literal>, scripts defined in
- <parameter moreinfo="none">change share</parameter> parameter are executed as root.
- </para>
+ <para>In order to successfully execute the
+ <parameter moreinfo="none">delete share command</parameter>,
+ <command moreinfo="none">smbd</command> requires that the administrator
+ connects using a root account (i.e. uid == 0) or has the
+ <literal>SeDiskOperatorPrivilege</literal>.
+ Scripts defined in the <parameter moreinfo="none">delete share command</parameter>
+ parameter are executed as root.
+ </para>
<para>
When executed, <command moreinfo="none">smbd</command> will automatically invoke the
@@ -44,7 +46,7 @@
</description>
<related>add share command</related>
-<related>delete share command</related>
+<related>change share command</related>
<value type="default"></value>
<value type="example">/usr/local/bin/delshare</value>
</samba:parameter>
diff --git a/docs-xml/smbdotconf/vfs/aclcompatibility.xml b/docs-xml/smbdotconf/vfs/aclcompatibility.xml
index 7891adc..95f42cf 100644
--- a/docs-xml/smbdotconf/vfs/aclcompatibility.xml
+++ b/docs-xml/smbdotconf/vfs/aclcompatibility.xml
@@ -1,5 +1,5 @@
<samba:parameter name="acl compatibility"
- context="S"
+ context="G"
type="enum"
advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
diff --git a/examples/perfcounter/perfcountd.init b/examples/perfcounter/perfcountd.init
index 683e913..0beff96 100755
--- a/examples/perfcounter/perfcountd.init
+++ b/examples/perfcounter/perfcountd.init
@@ -21,17 +21,17 @@
PATH=/bin:/usr/bin:/sbin:/usr/sbin
-killproc()
+killproc()
{
pid=`ps aux | grep $1 | egrep -v '(grep|perfcountd)' | awk '{print $2}'`
- if [ "$pid" != "" ]; then
+ if [ x"$pid" != "x" ]; then
kill $pid
fi
}
-# Start/stop processes
+# Start/stop processes
-case "$1"
+case "$1"
in
start)
/opt/samba/bin/perfcount -d -f /var/lib/samba/perfmon 2> /dev/null
@@ -47,7 +47,7 @@ stop)
status)
pid=`ps aux | grep perfcount | egrep -v '(grep|perfcountd)' | awk '{print $2}'`
- if [ "$pid" == "" ]; then
+ if [ x"$pid" = "x" ]; then
echo "Dead!"
exit 2;
fi
diff --git a/packaging/RHEL/samba.spec.tmpl b/packaging/RHEL/samba.spec.tmpl
index 49a0109..e0e772c 100644
--- a/packaging/RHEL/samba.spec.tmpl
+++ b/packaging/RHEL/samba.spec.tmpl
@@ -179,12 +179,6 @@ fi
make CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" %{?_smp_mflags} \
all modules pam_smbpass
-## build the cifs fs mount helper
-cd client
-gcc -o mount.cifs $RPM_OPT_FLAGS -D_GNU_SOURCE -Wall -D_GNU_SOURCE -D_LARGEFILE64_SOURCE mount.cifs.c
-gcc -o umount.cifs $RPM_OPT_FLAGS -D_GNU_SOURCE -Wall -D_GNU_SOURCE -D_LARGEFILE64_SOURCE umount.cifs.c
-cd ..
-
# Remove some permission bits to avoid to many dependencies
cd ..
find examples docs -type f | xargs -r chmod -x
@@ -228,8 +222,7 @@ install -m 755 source/nsswitch/libnss_wins.so $RPM_BUILD_ROOT/%{_libarch}/libnss
# Samba 3.2.2 installs them into /usr/lib{,64}/samba/ .
# This step will become unnecessary in 3.3.0.
#
-for library in libsmbclient libsmbsharemodes libwbclient libtalloc libtdb
-libnetapi
+for library in libsmbclient libsmbsharemodes libwbclient libtalloc libtdb libnetapi
do
mv -f ${RPM_BUILD_ROOT}%{_libarchdir}/samba/${library}.* \
${RPM_BUILD_ROOT}%{_libarchdir}/
@@ -251,8 +244,8 @@ install -m644 setup/samba.pamd $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/samba
install -m755 setup/smbprint $RPM_BUILD_ROOT%{_bindir}
install -m644 setup/smbusers $RPM_BUILD_ROOT%{_sysconfdir}/samba/smbusers
install -m644 setup/smb.conf $RPM_BUILD_ROOT%{_sysconfdir}/samba/smb.conf
-install -m755 source/client/mount.cifs $RPM_BUILD_ROOT/sbin/mount.cifs
-install -m755 source/client/umount.cifs $RPM_BUILD_ROOT/sbin/umount.cifs
+install -m755 source/bin/mount.cifs $RPM_BUILD_ROOT/sbin/mount.cifs
+install -m755 source/bin/umount.cifs $RPM_BUILD_ROOT/sbin/umount.cifs
install -m755 source/script/mksmbpasswd.sh $RPM_BUILD_ROOT%{_bindir}
/bin/rm $RPM_BUILD_ROOT%{_sbindir}/*mount.cifs
diff --git a/source/Makefile.in b/source/Makefile.in
index 3c1adaa..487d847 100644
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -694,7 +694,7 @@ NMBD_OBJ = $(NMBD_OBJ1) $(PARAM_OBJ) $(LIBSMB_OBJ) $(KRBCLIENT_OBJ) \
SWAT_OBJ1 = web/cgi.o web/diagnose.o web/startstop.o web/statuspage.o \
web/swat.o web/neg_lang.o
-SWAT_OBJ = $(SWAT_OBJ1) $(PARAM_OBJ) $(PRINTING_OBJ) $(LIBSMB_OBJ) \
+SWAT_OBJ = $(SWAT_OBJ1) $(PARAM_OBJ) $(PRINTING_OBJ) $(PRINTBASE_OBJ) $(LIBSMB_OBJ) \
$(LOCKING_OBJ) $(PASSDB_OBJ) @LIBWBCLIENT_STATIC@ $(KRBCLIENT_OBJ) \
$(LIB_NONSMBD_OBJ) $(GROUPDB_OBJ) $(PLAINTEXT_AUTH_OBJ) \
$(POPT_LIB_OBJ) $(SMBLDAP_OBJ) $(RPC_PARSE_OBJ) $(LIBMSRPC_GEN_OBJ) $(LIBMSRPC_OBJ) \
diff --git a/source/client/client.c b/source/client/client.c
index 1954bef..9e11737 100644
--- a/source/client/client.c
+++ b/source/client/client.c
@@ -728,11 +728,11 @@ static void do_list_helper(const char *mntpoint, file_info *f, const char *mask,
return;
}
p = strrchr_m(mask2,CLI_DIRSEP_CHAR);
- if (!p) {
- TALLOC_FREE(dir);
- return;
+ if (p) {
+ p[1] = 0;
+ } else {
+ mask2[0] = '\0';
}
- p[1] = 0;
mask2 = talloc_asprintf_append(mask2,
"%s%s*",
f->name,
@@ -1326,6 +1326,11 @@ static int cmd_mget(void)
do_list(mget_mask, attribute, do_mget, false, true);
}
+ if (mget_mask == NULL) {
+ d_printf("nothing to mget\n");
+ return 0;
+ }
+
if (!*mget_mask) {
mget_mask = talloc_asprintf(ctx,
"%s*",
diff --git a/source/include/libsmb_internal.h b/source/include/libsmb_internal.h
index 6930812..7cf0330 100644
--- a/source/include/libsmb_internal.h
+++ b/source/include/libsmb_internal.h
@@ -113,18 +113,19 @@ struct SMBC_internal_data {
/* True when this handle is initialized */
bool initialized;
- /* dirent pointer location
- *
--
SAMBA-CTDB repository
More information about the samba-cvs
mailing list