[SCM] Samba Shared Repository - branch v3-3-stable updated -
release-3-3-0pre2-56-g81b2f2c
Karolin Seeger
kseeger at samba.org
Wed Oct 15 16:38:14 GMT 2008
The branch, v3-3-stable has been updated
via 81b2f2cbbc4dc0a1f028c2fe4265faec763120b5 (commit)
via 8b73b0453e75e52fa50db75f29ce0a20420ba6d0 (commit)
via e39e30c0485794f2f11ed5f83d525815d5548e95 (commit)
via 0bbdc696d79b53fab84836c6e748aaf77c28bd75 (commit)
via 52f33afcfecdbe7b33cdacdfd5c771714609b4ad (commit)
via 35bb309d1b120851d987f762ca310673892df2c7 (commit)
via a862604b9c9afe48609a3c94c6c484baf19aea82 (commit)
via a374b59e9d0dbf71553434b430358f6a8ad99a79 (commit)
via ea739bf41b69f201f12aa652bbc5a97b81aaeadc (commit)
via 5de9c4cac67fe43dad091c1f986e4f8525e1e55f (commit)
via bc285aa770487412dd4c682d003c0bd3846adbf9 (commit)
via 3787abbb05c937a12dec0cb6a44e8dc319d0f513 (commit)
via 7d499fbe0750e288befdb2bd44dbbdf116d7bf8c (commit)
via a1c8ae0288938dd68a599568ad8ff916a77721a9 (commit)
via fa0d1dfefb3e8c31d60d0a6bcb3305558dc7ae78 (commit)
via 9e336e4cc46492110b8bdcd989d496bad88780a7 (commit)
via db945095c304644c8a3c8fdb316fe862a10f9278 (commit)
via 000cfd62ecf3e6b49beca6411a102ae9488a49b6 (commit)
via 30463e1c837f644f9ad73777cbca908fd96ed1a9 (commit)
via c28160497a00ba2647ea663d0c0783632f280364 (commit)
via 31670d786f3a67fc7803112f5206ef3414c10739 (commit)
via 3d8dcd1d5bcacf5512f39a19535c06a01aae798e (commit)
via 3fbab3358811648ae08f7a5eb86ca56f6b90551f (commit)
via 76d41cf383b097f5f61879ea1fed7291f98bbe14 (commit)
via bfea6268c1c39ef45313da955b829157fae3fb65 (commit)
via 94553dd1eb5774543fd3bf3c7a385be952d0ee72 (commit)
via 833a9f5f57933cab0ebf480212f016f70696a150 (commit)
via c62e2d9e7a5c2c4dc04c2b1d78af90c6d557a40f (commit)
via 846de0001337d5ca0dbb4263841bfebe46fef6b6 (commit)
via ff05bc131cd8375af307908a6a71eabb57140b81 (commit)
via 3226cba44f4e08f3eb74c491228b0c62d02b4993 (commit)
via 970995c86152ffc3a6d5bf4d3978e683137c6d68 (commit)
via 5fc1539699b22021e810f02008dfd07bbce92685 (commit)
via 727a899db47ec6b87f5c8ab9d826b33d63c2b72c (commit)
via feeca32d09b28bd5a731690f24e2e57df6496369 (commit)
via 1dde7f82892ae8eb1b0d7a89c18d654cdc0ea620 (commit)
via adc70a3f237874a4ce8b35d43e74839474f85d39 (commit)
via 2f25e5787808d38d780ec28351d0fd66925f7e4d (commit)
via 526af60ac39f010389f31603befa7e78eaddd99f (commit)
via 45714615716c95e6d8f67b261d5046b6d6253a92 (commit)
via 888b237432ab442711c9184e0da0b9b1bb09686d (commit)
via 539fec9256821f47524ad62a47b1425f853842f1 (commit)
via 4e78c05fa07d1830da66ffc78df3b3358009ea40 (commit)
via 4899be3fcb4a3f3dbb2b5732058005d7d5c85581 (commit)
via 6290c2f8647131df0f00d6d9d8fdcb3f73cbe2f2 (commit)
via 35bfa6eb2efaedb8d9b5a8fe4ff20da6596a6b71 (commit)
via 5f00a5abd268785f6a578aa8da383de5bbe82161 (commit)
via 81d811d7fc982ea64bcca18c7e5f3f22e6f2895e (commit)
via de96502f06512fcf8a7fd56d58767bc2c29b0951 (commit)
via ee191670cfa4bd3f3b911a7ed1d4dfabf9171b1d (commit)
via 6fa99bbd4b99d4a7bfcc6ab70efcc7b7244e2e27 (commit)
via 7a705572552e8470e04d9c20a76a464353d4a810 (commit)
via 50e546171c08a5a8e3608983d45ec02ec208b8d1 (commit)
via b45df44757f70d222e7b663690814c877ee6189e (commit)
from dae10eb02c4a9616728e9e456a47cd80367b72f0 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-stable
- Log -----------------------------------------------------------------
commit 81b2f2cbbc4dc0a1f028c2fe4265faec763120b5
Author: Jeremy Allison <jra at samba.org>
Date: Tue Oct 14 16:08:14 2008 -0700
Attempt to fix bug #5818 - "smbcacls: sorts ACEs improperly and loses inheritance", based on
a patch from Paul Fertser <fercerpav at gmail.com>. I also added the ability to get/set hex
and symbolic inheritance flag names on ACE flags. I'm still investigating the effects
of setting the "SEC_DESC_DACL_AUTO_INHERIT_REQ" flag as I don't yet see what effects
this is having on the ACE sent.
Jeremy.
(cherry picked from commit c780a666920a5efc06b29335d4ae78f1eca6b66a)
commit 8b73b0453e75e52fa50db75f29ce0a20420ba6d0
Author: Jeremy Allison <jra at samba.org>
Date: Tue Oct 14 15:37:40 2008 -0700
Note url explaining this code.
Jeremy.
(cherry picked from commit 9fd84b90bf783987d32aded9be98c9c7b7543b2b)
commit e39e30c0485794f2f11ed5f83d525815d5548e95
Author: Holger Hetterich <hhetter at novell.com>
Date: Tue Oct 14 11:39:15 2008 -0700
Fix the "Premature end of data in tag" error when buiding the manpage, fix a typo in the text, add an example for anonymization usage.
(cherry picked from commit 5f41f1c8192739b5b9c14f1e9967567d9d781851)
commit 0bbdc696d79b53fab84836c6e748aaf77c28bd75
Author: Holger Hetterich <hhetter at novell.com>
Date: Mon Oct 13 14:18:08 2008 -0700
Update the manpage for vfs_smb_traffic_analyzer to include the anonymize_prefix option
(cherry picked from commit 8e33baf4729a290fba26857e7b0a6ef9f9933b72)
commit 52f33afcfecdbe7b33cdacdfd5c771714609b4ad
Author: Jeremy Allison <jra at samba.org>
Date: Mon Oct 13 14:13:20 2008 -0700
Whitespace tidyup and an optimization to remove a talloc.
Jeremy.
(cherry picked from commit 2d063842365341ecbbbf0413e9870b1680d2e138)
commit 35bb309d1b120851d987f762ca310673892df2c7
Author: Holger Hetterich <hhetter at novell.com>
Date: Mon Oct 13 14:09:07 2008 -0700
Enable optional anonymization of user names,
if the configuration parameter anonymization_prefix is defined in
smb.conf, and use the prefix given there.
(cherry picked from commit 84355feee9a718e8ffe854df1129461d65d114dc)
commit a862604b9c9afe48609a3c94c6c484baf19aea82
Author: Volker Lendecke <vl at samba.org>
Date: Tue Oct 7 21:24:25 2008 +0200
Fix bug 5691: SIGBUS on Solaris
(cherry picked from commit 35a86c9d70a34440a8197c07e9a6427f5347beb5)
commit a374b59e9d0dbf71553434b430358f6a8ad99a79
Author: Volker Lendecke <vl at samba.org>
Date: Sun Oct 12 11:43:52 2008 +0200
Remove unused #defines
(cherry picked from commit 62f092d010313e8f3eb4e35ffb0b76de9539d8c9)
commit ea739bf41b69f201f12aa652bbc5a97b81aaeadc
Author: Volker Lendecke <vl at samba.org>
Date: Sun Oct 12 10:39:53 2008 +0200
Fix the build
(cherry picked from commit e160a19ffc0727c46a696335c9d140e236923cdb)
commit 5de9c4cac67fe43dad091c1f986e4f8525e1e55f
Author: Volker Lendecke <vl at samba.org>
Date: Fri Oct 10 23:40:50 2008 +0200
Make use of talloc_tos()
(cherry picked from commit d0f7261031f76965879036bd5c7d0a19eabf47cc)
commit bc285aa770487412dd4c682d003c0bd3846adbf9
Author: Volker Lendecke <vl at samba.org>
Date: Fri Oct 10 17:50:09 2008 +0200
Fix some nonempty blank lines
(cherry picked from commit 5f48a925a25a08d6c2077906eec439e49b51070a)
commit 3787abbb05c937a12dec0cb6a44e8dc319d0f513
Author: Volker Lendecke <vl at samba.org>
Date: Fri Oct 10 16:26:34 2008 +0200
Fix a "nexted extern declaration" warning
(cherry picked from commit 5822bb7458331c5d52a5a4cb0906777e1f7e3b8d)
commit 7d499fbe0750e288befdb2bd44dbbdf116d7bf8c
Author: Jeremy Allison <jra at samba.org>
Date: Fri Oct 10 16:47:28 2008 -0700
Initialize near creation of resource. Makes code clearer.
Jeremy.
(cherry picked from commit cb23dddc723084ca9f8d8eca6c78ee87d903e60c)
commit a1c8ae0288938dd68a599568ad8ff916a77721a9
Author: Jeremy Allison <jra at samba.org>
Date: Fri Oct 10 16:42:11 2008 -0700
Ensure we do reinit_after_fork().
Jeremy.
(cherry picked from commit 906e5bf4d2112777ab94ee3761b6376a2150d31a)
commit fa0d1dfefb3e8c31d60d0a6bcb3305558dc7ae78
Author: Jeremy Allison <jra at samba.org>
Date: Fri Oct 10 16:30:24 2008 -0700
Allow data flow to be debugged and only log on error. All seems ok now.
Jeremy.
(cherry picked from commit a2f989b783f417d6ed5c5d4fb737f61192d087ab)
commit 9e336e4cc46492110b8bdcd989d496bad88780a7
Author: Jeremy Allison <jra at samba.org>
Date: Fri Oct 10 15:54:20 2008 -0700
Async is trickier than it looks :-). Don't use a stack variable for a private data ptr.
Jeremy.
(cherry picked from commit b443507a0cc97821af0011b56bc971fea6839a98)
commit db945095c304644c8a3c8fdb316fe862a10f9278
Author: Jeremy Allison <jra at samba.org>
Date: Fri Oct 10 11:53:09 2008 -0700
If you have a large number of cups printers, then scanning for print info can cause a client to timeout
(it takes longer than 30 seconds to enumerate them). Make scanning for printers async with a callback
from the main loop. This fixes a bug that was irritating *me* :-).
Jeremy.
(cherry picked from commit d66f58ad1b5c7195ea09a55f733c6f6551f663c2)
commit 000cfd62ecf3e6b49beca6411a102ae9488a49b6
Author: Jeremy Allison <jra at samba.org>
Date: Thu Oct 9 15:40:30 2008 -0700
Ensure we handle signals correctly during the async calls.
Jeremy.
(cherry picked from commit eb5323a728e9df0be56b6f73a127aed011b250d0)
commit 30463e1c837f644f9ad73777cbca908fd96ed1a9
Author: Jeremy Allison <jra at samba.org>
Date: Thu Oct 9 09:49:18 2008 -0700
Remove SEC_ACCESS. It's a uint32_t.
Jeremy.
(cherry picked from commit 5e77ccaa866d422e56c28af610692b8167d630e8)
commit c28160497a00ba2647ea663d0c0783632f280364
Author: Volker Lendecke <vl at samba.org>
Date: Thu Oct 9 17:22:59 2008 +0200
Make use of ZERO_STRUCT (the first memset was actually wrong)
(cherry picked from commit 723fe06bf20e5f6e9c2075f66de01475ff8bfc68)
commit 31670d786f3a67fc7803112f5206ef3414c10739
Author: Jeff Layton <jlayton at redhat.com>
Date: Thu Oct 9 10:46:40 2008 -0400
mount.cifs: make return codes match the return codes for /bin/mount (try #3)
The manpage for /bin/mount specifies that the return code should be a
positive integer (actually, it's a bitfield). Clean up the return
codes from mount.cifs to make them match the expected return values
from /bin/mount. This necessary for proper integration with autofs.
This is the third attempt at this patch. The changes here are minor,
just changing some return's from main() into exit() calls for
consistency's sake.
Signed-off-by: Jeff Layton <jlayton at redhat.com>
(cherry picked from commit a6e250ad2f50ec1c083a86d0161c1c00c1c3129e)
commit 3d8dcd1d5bcacf5512f39a19535c06a01aae798e
Author: Jeff Layton <jlayton at redhat.com>
Date: Thu Oct 9 10:46:40 2008 -0400
mount.cifs: have uppercase_string return success on NULL pointer
We currently don't attempt to uppercase the device portion of the mount
string if there isn't a prefixpath. Fix that by making uppercase_string
return success without doing anything on a NULL pointer.
Signed-off-by: Jeff Layton <jlayton at redhat.com>
(cherry picked from commit 1c9f269280983119c7c906bbc2bf1ccaaba8c740)
commit 3fbab3358811648ae08f7a5eb86ca56f6b90551f
Author: Volker Lendecke <vl at samba.org>
Date: Wed Oct 8 17:42:22 2008 +0200
Remove a pointless level of indirection
(cherry picked from commit f953fd62f7e4d4d18eb4d713989eacce630c4949)
commit 76d41cf383b097f5f61879ea1fed7291f98bbe14
Author: Volker Lendecke <vl at samba.org>
Date: Wed Oct 8 17:24:24 2008 +0200
Fix a typo
(cherry picked from commit 7111d24f585643e92e5cd62cb339e771e7fcc8c4)
commit bfea6268c1c39ef45313da955b829157fae3fb65
Author: Jeremy Allison <jra at samba.org>
Date: Wed Oct 8 18:10:57 2008 -0700
For the vfs_acl_xattr.c module, make sure we map GENERIC file and directory bits
to specific bits every time a security descriptor is set. The S4 torture suite proves
that generic bits are not returned when querying an ACL set using them (ie. only
the specific bits are stored on disk).
Jeremy.
(cherry picked from commit 306b507c3ba1b864b6d66f9438f91f979b02030f)
commit 94553dd1eb5774543fd3bf3c7a385be952d0ee72
Author: Tim Prouty <tprouty at samba.org>
Date: Wed Oct 8 16:48:16 2008 -0700
Fixed "might be uninitialized" warning
(cherry picked from commit 1f95d82dd1b86e308d75e9f755f83c34e6ceb28d)
commit 833a9f5f57933cab0ebf480212f016f70696a150
Author: Jeremy Allison <jra at samba.org>
Date: Wed Oct 8 15:19:04 2008 -0700
Deal with inheritance from parent directory when setting Windows
ACLs.
Jeremy.
(cherry picked from commit efc3de5e2490be615121f7231cd1611df2163e78)
commit c62e2d9e7a5c2c4dc04c2b1d78af90c6d557a40f
Author: Jeremy Allison <jra at samba.org>
Date: Wed Oct 8 11:40:03 2008 -0700
Fix bug #5814 - Winbindd dumping core in a strange manner while doing "rescan_trusted_domain".
From analysis by hargagan <shargagan at novell.com> :
"The winbindd_child_died() is also getting called from process_loop() in case of
SIGCHLD signal. In this case it doesn't make the timeout_handler to NULL for
the first request. It then initiate a new request using
schedule_async_request() which installs a new timeout handler for the same
request. In such a case, for a badly unresponsive system both the timeout
handler can be called. For the first call the "private_data" will be cleared
and for another call the timeout handler will be detecting the double free. So,
for such a case as well, the winbindd_child_died() should make the
timeout_handler to NULL."
Jeremy.
(cherry picked from commit 6be98cbb23f4cdb65353a426ae5edbf0290774d8)
commit 846de0001337d5ca0dbb4263841bfebe46fef6b6
Author: Volker Lendecke <vl at samba.org>
Date: Wed Oct 8 12:56:04 2008 +0200
Remove unused CHECK_FSP macro
(cherry picked from commit 9bb057a7712393b1b699e25c5cab44401fd00005)
commit ff05bc131cd8375af307908a6a71eabb57140b81
Author: Jeremy Allison <jra at samba.org>
Date: Tue Oct 7 17:55:57 2008 -0700
Fix const warning.
Jeremy.
(cherry picked from commit 2b8c7a53860b43435f1b68235abd14e2f850a8f5)
commit 3226cba44f4e08f3eb74c491228b0c62d02b4993
Author: Jeremy Allison <jra at samba.org>
Date: Tue Oct 7 17:49:18 2008 -0700
Update vfs version as I've added a const to the security_descriptor paramter in fset_nt_acl().
Need to watch the build farm to make sure I haven't broken the AIX or Solaris ACL modules.
Jeremy.
(cherry picked from commit 3869464895d51588ed156606051812efb26755a9)
commit 970995c86152ffc3a6d5bf4d3978e683137c6d68
Author: Jeremy Allison <jra at samba.org>
Date: Tue Oct 7 14:44:42 2008 -0700
Make map_errno_from_nt_status() a generic call, not just a cli specific one.
Remove some unused calls from vfs_acl_xattr. Test for SD's on existing files.
Jeremy.
(cherry picked from commit acaaf6e2effd34a159ceb6ff1dbfd2cfb650e613)
commit 5fc1539699b22021e810f02008dfd07bbce92685
Author: Tim Prouty <tim.prouty at isilon.com>
Date: Tue Oct 7 09:47:46 2008 -0700
Fixed build warning "passing arg from incompatible pointer type"
The fix explicitly makes the conversion from timeval to time_t using the
existing time utility functions.
Compiling modules/vfs_smb_traffic_analyzer.c
modules/vfs_smb_traffic_analyzer.c: In function `smb_traffic_analyzer_send_data':
modules/vfs_smb_traffic_analyzer.c:173: warning: passing arg 1 of `localtime' from incompatible pointer type
(cherry picked from commit a1dd4fc647340238eac10d411f531e37dba901b9)
commit 727a899db47ec6b87f5c8ab9d826b33d63c2b72c
Author: Volker Lendecke <vl at samba.org>
Date: Mon Oct 6 14:10:56 2008 -0700
If name_to_fqdn fails, retry with the dns domain the DC gave us
This is a workaround for the cases where you want to join under a netbios name
that is different from your hostname, i.e. a name that can not be found in
/etc/hosts or dns. In these cases, name_to_fqdn fails or gives invalid results.
(cherry picked from commit 16e9a454404a5a70985caf15d1b987fe6332d195)
commit feeca32d09b28bd5a731690f24e2e57df6496369
Author: Volker Lendecke <vl at samba.org>
Date: Mon Oct 6 14:10:42 2008 -0700
Log in the parent winbind log where a request is going
(cherry picked from commit 8d82a75ec9875137928c69370bbaf621bf4fc3fb)
commit 1dde7f82892ae8eb1b0d7a89c18d654cdc0ea620
Author: Gerald (Jerry) Carter <jerry at samba.org>
Date: Mon Oct 6 11:47:57 2008 -0500
idmap_adex: Add more debugging to the basic search function.
Log the dn of all located entries in order to verify search results.
(cherry picked from commit 46627792a69fd6d5a24f4ca69ad26c1f9e2213ff)
commit adc70a3f237874a4ce8b35d43e74839474f85d39
Author: Gerald (Jerry) Carter <jerry at samba.org>
Date: Mon Oct 6 11:34:45 2008 -0500
idmap_adex: Add log messages to dc_add_domain for easier debugging.
Part of continue work on BUG 5806.
(cherry picked from commit e8f3a35193bcbdf69c5eebdac532cfaa7b44edc2)
commit 2f25e5787808d38d780ec28351d0fd66925f7e4d
Author: Volker Lendecke <vl at samba.org>
Date: Sun Oct 5 14:36:34 2008 -0700
Fix some nonempty blank lines
(cherry picked from commit b3735cfc098e27a2af29a4671bc4e40b47314585)
commit 526af60ac39f010389f31603befa7e78eaddd99f
Author: Volker Lendecke <vl at samba.org>
Date: Sun Oct 5 14:35:09 2008 -0700
Remove an unused variable
(cherry picked from commit a7ba58ebede769e944005adaecbeda237ba9b5e0)
commit 45714615716c95e6d8f67b261d5046b6d6253a92
Author: Volker Lendecke <vl at samba.org>
Date: Sun Oct 5 14:33:48 2008 -0700
Fix some missing error handlings
(cherry picked from commit 3a848570996c7df8c3230e0b3a9369b41658a650)
commit 888b237432ab442711c9184e0da0b9b1bb09686d
Author: Volker Lendecke <vl at samba.org>
Date: Sun Oct 5 14:30:01 2008 -0700
OS/X does not have rl_done in readline.h
(cherry picked from commit 02e303b3f08656e9bf1d59dc452c7f48f2cb0dea)
commit 539fec9256821f47524ad62a47b1425f853842f1
Author: Volker Lendecke <vl at samba.org>
Date: Sun Oct 5 14:28:02 2008 -0700
Fix an uninitialized variable warning
Not sure if we can ever not get domain and dns_domain, but gcc complained
(cherry picked from commit 50b86766442f27748d8d16223c8cd68fd162eabc)
commit 4e78c05fa07d1830da66ffc78df3b3358009ea40
Author: Volker Lendecke <vl at samba.org>
Date: Sat Oct 4 19:36:37 2008 -0700
Fix an unlikely memleak found by the IBM checker
(cherry picked from commit 09d76244a1e3eeeb1396a707e78325320e4e4f9e)
commit 4899be3fcb4a3f3dbb2b5732058005d7d5c85581
Author: Volker Lendecke <vl at samba.org>
Date: Sat Oct 4 19:35:51 2008 -0700
Fix an uninitialized variable found by the IBM Checker
(cherry picked from commit 2a4bf6cc1f7f20b9c95e4166b366990ed330604e)
commit 6290c2f8647131df0f00d6d9d8fdcb3f73cbe2f2
Author: Volker Lendecke <vl at samba.org>
Date: Sat Oct 4 19:34:42 2008 -0700
Fix a potential NULL deref in line 258 found by the IBM checker
(cherry picked from commit d1c213b23649172ed684a22d3095f5ac95685dac)
commit 35bfa6eb2efaedb8d9b5a8fe4ff20da6596a6b71
Author: Volker Lendecke <vl at samba.org>
Date: Sat Oct 4 19:34:02 2008 -0700
"gwen/cc" does not like the double const :-)
(cherry picked from commit ab37affd6edec0d80109a7b635bc7fdb3b84eb6b)
commit 5f00a5abd268785f6a578aa8da383de5bbe82161
Author: Jeremy Allison <jra at samba.org>
Date: Fri Oct 3 14:59:03 2008 -0700
Correctly fix smbclient to terminate on eof from server.
Jeremy.
(cherry picked from commit d8e629864a53d603c1bb2b08ec853d178d2d9dd3)
commit 81d811d7fc982ea64bcca18c7e5f3f22e6f2895e
Author: Jeremy Allison <jra at samba.org>
Date: Fri Oct 3 14:19:44 2008 -0700
Simply our main loop processing. A lot :-). Correctly use events for all the previous "special" cases.
A step on the way to adding signals to the events and being able to merge the S3 event system with
the S4 one.
Jeremy.
(cherry picked from commit 8674c683e37b13554b6f0f121198bd4746c78796)
commit de96502f06512fcf8a7fd56d58767bc2c29b0951
Author: Jeremy Allison <jra at samba.org>
Date: Fri Oct 3 14:03:59 2008 -0700
Document "cups connection timeout".
Jeremy.
(cherry picked from commit 3e5662bfda7856af5d6607c23397da0b18c9827a)
commit ee191670cfa4bd3f3b911a7ed1d4dfabf9171b1d
Author: Gerald (Jerry) Carter <jerry at samba.org>
Date: Fri Oct 3 10:51:54 2008 -0500
net_dns: Make "lwinet ads dns register" honor the "interfaces" parameter.
This is helpful on multihomed hosts that only require a subset
of IP addresses be registered with DNS.
(cherry picked from commit 17c9f8810598d8117befc896d12a597a52b0ac3b)
commit 6fa99bbd4b99d4a7bfcc6ab70efcc7b7244e2e27
Author: Gerald (Jerry) Carter <jerry at samba.org>
Date: Fri Oct 3 10:51:21 2008 -0500
libaddns: Use the same prerequisite for DDNS update as Windows XP.
Hostname, TYPE: CNAME, CLASS: NONE
This has to have been broken for ages. I cannot see
how it would have worked in any environment.
(cherry picked from commit 6b6402bce318a48b0890ed6fc23ed5b30440927b)
commit 7a705572552e8470e04d9c20a76a464353d4a810
Author: Jeremy Allison <jra at samba.org>
Date: Thu Oct 2 12:20:27 2008 -0700
Don't reject a successful alloc :-(.
Jeremy.
(cherry picked from commit 89df6afb7a16feb1a0b186965ff37a1f8990bcca)
commit 50e546171c08a5a8e3608983d45ec02ec208b8d1
Author: Derrell Lipman <derrell.lipman at unwireduniverse.com>
Date: Thu Oct 2 10:40:08 2008 -0700
Fix bug 5805: don't close stdout
- When calling setup_logging multiple times, the code was closing the debug
file descriptor before opening or assigning the new one. We don't, however,
want to close the debug file descriptor if it is stdout.
Derrell
(cherry picked from commit 475c9a7ff5a96f7d1392610066fdd1ae28b7e039)
commit b45df44757f70d222e7b663690814c877ee6189e
Author: Jeremy Allison <jra at samba.org>
Date: Wed Oct 1 16:39:29 2008 -0700
Fix bug #5080. Access to cups-printers via samba broken with cups 1.3.4, Unsupported character set.
Cups 1.3.4 expects utf8 to be used in all messages to/from the server. We may be using a
different character set so we need to use talloc utf8 push/pull functions in all communication.
Needs more testing. Don't release until I've done a thorough test. I also have a version for 3.2.x.
Jeremy.
(cherry picked from commit 2a2bb6b0757b1f2a6199474f93ea8d598575d650)
-----------------------------------------------------------------------
Summary of changes:
docs-xml/manpages-3/vfs_smb_traffic_analyzer.8.xml | 25 +-
.../smbdotconf/printing/cupsconnectiontimeout.xml | 20 +
examples/VFS/skel_opaque.c | 2 +-
examples/VFS/skel_transparent.c | 2 +-
source/auth/auth_domain.c | 65 +++
source/client/client.c | 13 +-
source/client/mount.cifs.c | 86 ++--
source/include/proto.h | 25 +-
source/include/rpc_secdes.h | 3 -
source/include/smb.h | 1 +
source/include/smb_macros.h | 16 -
source/include/vfs.h | 5 +-
source/lib/debug.c | 4 +-
source/lib/display_sec.c | 2 +-
source/lib/dummysmbd.c | 15 +
source/lib/errmap_unix.c | 136 +++++
source/lib/netapi/file.c | 3 +-
source/lib/netapi/getdc.c | 5 +
source/lib/netapi/share.c | 3 +-
source/lib/readline.c | 21 +-
source/lib/secace.c | 2 +-
source/lib/secdesc.c | 13 +-
source/lib/sharesec.c | 8 +-
source/lib/util_seaccess.c | 32 +-
source/libaddns/dnsmarshall.c | 1 +
source/libaddns/dnsrecord.c | 4 +-
source/libads/ldap.c | 1 +
source/libads/util.c | 2 +
source/libgpo/gpo_reg.c | 14 +-
source/libnet/libnet_join.c | 11 +-
source/libnet/libnet_proto.h | 2 +-
source/libsmb/async_smb.c | 4 +-
source/libsmb/clierror.c | 140 +-----
source/libsmb/cliquota.c | 50 +-
source/libsmb/dsgetdcname.c | 2 +
source/libsmb/libsmb_xattr.c | 2 +-
source/modules/nfs4_acls.c | 14 +-
source/modules/vfs_acl_xattr.c | 84 ++-
source/modules/vfs_afsacl.c | 16 +-
source/modules/vfs_aixacl2.c | 4 +-
source/modules/vfs_default.c | 2 +-
source/modules/vfs_full_audit.c | 4 +-
source/modules/vfs_gpfs.c | 10 +-
source/modules/vfs_smb_traffic_analyzer.c | 27 +-
source/modules/vfs_zfsacl.c | 4 +-
source/param/loadparm.c | 2 +-
source/printing/load.c | 2 +-
source/printing/notify.c | 26 +
source/printing/nt_printing.c | 10 +-
source/printing/pcap.c | 77 ++-
source/printing/print_cups.c | 603 +++++++++++++++++---
source/registry/reg_dispatcher.c | 10 +-
source/rpc_server/srv_lsa_nt.c | 10 +-
source/rpc_server/srv_pipe_hnd.c | 3 -
source/rpc_server/srv_samr_nt.c | 19 +-
source/rpc_server/srv_srvsvc_nt.c | 26 +-
source/rpc_server/srv_svcctl_nt.c | 9 +-
source/services/services_db.c | 16 +-
source/smbd/connection.c | 38 +-
source/smbd/fake_file.c | 8 -
source/smbd/files.c | 4 +-
source/smbd/ipc.c | 14 +-
source/smbd/nttrans.c | 5 +
source/smbd/open.c | 4 +
source/smbd/posix_acls.c | 83 ++--
source/smbd/process.c | 193 +------
source/smbd/reply.c | 8 +-
source/smbd/server.c | 31 +
source/smbd/session.c | 5 +-
source/utils/net_dns.c | 26 +-
source/utils/sharesec.c | 2 +-
source/utils/smbcacls.c | 185 +++++-
source/winbindd/idmap_adex/domain_util.c | 8 +
source/winbindd/idmap_adex/likewise_cell.c | 18 +
source/winbindd/winbindd_dual.c | 27 +
75 files changed, 1552 insertions(+), 825 deletions(-)
create mode 100644 docs-xml/smbdotconf/printing/cupsconnectiontimeout.xml
Changeset truncated at 500 lines:
diff --git a/docs-xml/manpages-3/vfs_smb_traffic_analyzer.8.xml b/docs-xml/manpages-3/vfs_smb_traffic_analyzer.8.xml
index 28c8413..556fa3e 100644
--- a/docs-xml/manpages-3/vfs_smb_traffic_analyzer.8.xml
+++ b/docs-xml/manpages-3/vfs_smb_traffic_analyzer.8.xml
@@ -103,7 +103,15 @@
<term>smb_traffic_analyzer:port = STRING</term>
<listitem>
<para>The module will send the data using the TCP port given
- in STRING
+ in STRING.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>smb_traffic_analyzer:anonymize_prefix = STRING</term>
+ <listitem>
+ <para>The module will replace the user names with a prefix
+ given by STRING and a simple hash number.
</para>
</listitem>
@@ -124,16 +132,27 @@
<smbconfoption name="smb_traffic_analyzer:mode">unix_domain_socket</smbconfoption>
</programlisting>
- <para>The module running on share "example_share", using an internet domain socket,
+ <para>The module running on share "example_share", using an internet socket,
connecting to host "examplehost" on port 3491.</para>
<programlisting>
<smbconfsection name="[example_share]"/>
<smbconfoption name="path">/data/example</smbconfoption>
<smbconfoption name="vfs objects">smb_traffic_analyzer</smbconfoption>
<smbconfoption name="smb_traffic_analyzer:host">examplehost</smbconfoption>
- <smbconfoption name="smb_traffic_analyzer:port">3490</smbconfoption>
+ <smbconfoption name="smb_traffic_analyzer:port">3491</smbconfoption>
</programlisting>
+ <para>The module running on share "example_share", using an internet socket,
+ connecting to host "examplehost" on port 3491, anonymizing user names with
+ the prefix "User".</para>
+ <programlisting>
+ <smbconfsection name="[example_share]"/>
+ <smbconfoption name="path">/data/example</smbconfoption>
+ <smbconfoption name="vfs objects">smb_traffic_analyzer</smbconfoption>
+ <smbconfoption name="smb_traffic_analyzer:host">examplehost</smbconfoption>
+ <smbconfoption name="smb_traffic_analyzer:port">3491</smbconfoption>
+ <smbconfoption name="smb_traffic_analyzer:anonymize_prefix">User</smbconfoption>
+ </programlisting>
</refsect1>
<refsect1>
diff --git a/docs-xml/smbdotconf/printing/cupsconnectiontimeout.xml b/docs-xml/smbdotconf/printing/cupsconnectiontimeout.xml
new file mode 100644
index 0000000..1c7df15
--- /dev/null
+++ b/docs-xml/smbdotconf/printing/cupsconnectiontimeout.xml
@@ -0,0 +1,20 @@
+<samba:parameter name="cups connection timeout"
+ context="G"
+ type="integer"
+ print="1"
+ xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+<description>
+ <para>
+ This parameter is only applicable if <smbconfoption name="printing"/> is set to <constant>cups</constant>.
+ </para>
+
+ <para>
+ If set, this option specifies the number of seconds that smbd will wait
+ whilst trying to contact to the CUPS server. The connection will fail
+ if it takes longer than this number of seconds.
+ </para>
+</description>
+
+<value type="default">30</value>
+<value type="example">60</value>
+</samba:parameter>
diff --git a/examples/VFS/skel_opaque.c b/examples/VFS/skel_opaque.c
index 89d8ce5..3df1fcd 100644
--- a/examples/VFS/skel_opaque.c
+++ b/examples/VFS/skel_opaque.c
@@ -315,7 +315,7 @@ static size_t skel_get_nt_acl(vfs_handle_struct *handle,
}
static NTSTATUS skel_fset_nt_acl(vfs_handle_struct *handle, files_struct *fsp,
- uint32 security_info_sent, SEC_DESC *psd)
+ uint32 security_info_sent, const SEC_DESC *psd)
{
errno = ENOSYS;
return NT_STATUS_NOT_IMPLEMENTED;
diff --git a/examples/VFS/skel_transparent.c b/examples/VFS/skel_transparent.c
index ea8530d..e6dee97 100644
--- a/examples/VFS/skel_transparent.c
+++ b/examples/VFS/skel_transparent.c
@@ -302,7 +302,7 @@ static NTSTATUS skel_get_nt_acl(vfs_handle_struct *handle,
}
static NTSTATUS skel_fset_nt_acl(vfs_handle_struct *handle, files_struct *fsp,
- uint32 security_info_sent, SEC_DESC *psd)
+ uint32 security_info_sent, const SEC_DESC *psd)
{
return SMB_VFS_NEXT_FSET_NT_ACL(handle, fsp, security_info_sent, psd);
}
diff --git a/source/auth/auth_domain.c b/source/auth/auth_domain.c
index c25e62a..f11dbe6 100644
--- a/source/auth/auth_domain.c
+++ b/source/auth/auth_domain.c
@@ -26,6 +26,71 @@
extern bool global_machine_password_needs_changing;
static struct named_mutex *mutex;
+/*
+ * Change machine password (called from main loop
+ * idle timeout. Must be done as root.
+ */
+
+void attempt_machine_password_change(void)
+{
+ unsigned char trust_passwd_hash[16];
+ time_t lct;
+ void *lock;
+
+ if (!global_machine_password_needs_changing) {
+ return;
+ }
+
+ if (lp_security() != SEC_DOMAIN) {
+ return;
+ }
+
+ /*
+ * We're in domain level security, and the code that
+ * read the machine password flagged that the machine
+ * password needs changing.
+ */
+
+ /*
+ * First, open the machine password file with an exclusive lock.
+ */
+
+ lock = secrets_get_trust_account_lock(NULL, lp_workgroup());
+
+ if (lock == NULL) {
+ DEBUG(0,("attempt_machine_password_change: unable to lock "
+ "the machine account password for machine %s in "
+ "domain %s.\n",
+ global_myname(), lp_workgroup() ));
+ return;
+ }
+
+ if(!secrets_fetch_trust_account_password(lp_workgroup(),
+ trust_passwd_hash, &lct, NULL)) {
+ DEBUG(0,("attempt_machine_password_change: unable to read the "
+ "machine account password for %s in domain %s.\n",
+ global_myname(), lp_workgroup()));
+ TALLOC_FREE(lock);
+ return;
+ }
+
+ /*
+ * Make sure someone else hasn't already done this.
+ */
+
+ if(time(NULL) < lct + lp_machine_password_timeout()) {
+ global_machine_password_needs_changing = false;
+ TALLOC_FREE(lock);
+ return;
+ }
+
+ /* always just contact the PDC here */
+
+ change_trust_account_password( lp_workgroup(), NULL);
+ global_machine_password_needs_changing = false;
+ TALLOC_FREE(lock);
+}
+
/**
* Connect to a remote server for (inter)domain security authenticaion.
*
diff --git a/source/client/client.c b/source/client/client.c
index f5207e4..3048d95 100644
--- a/source/client/client.c
+++ b/source/client/client.c
@@ -4343,6 +4343,8 @@ cleanup:
}
}
+static bool finished;
+
/****************************************************************************
Make sure we swallow keepalives during idle time.
****************************************************************************/
@@ -4389,6 +4391,8 @@ static void readline_callback(void)
DEBUG(0, ("Read from server failed, maybe it closed "
"the connection\n"));
+ finished = true;
+ smb_readline_done();
if (NT_STATUS_EQUAL(status, NT_STATUS_END_OF_FILE)) {
set_smb_read_error(&cli->smb_rw_error,
SMB_READ_EOF);
@@ -4417,7 +4421,12 @@ static void readline_callback(void)
{
unsigned char garbage[16];
memset(garbage, 0xf0, sizeof(garbage));
- cli_echo(cli, 1, garbage, sizeof(garbage));
+ if (!cli_echo(cli, 1, garbage, sizeof(garbage))) {
+ DEBUG(0, ("SMBecho failed. Maybe server has closed "
+ "the connection\n"));
+ smb_readline_done();
+ finished = true;
+ }
}
}
@@ -4429,7 +4438,7 @@ static int process_stdin(void)
{
int rc = 0;
- while (1) {
+ while (!finished) {
TALLOC_CTX *frame = talloc_stackframe();
char *tok = NULL;
char *the_prompt = NULL;
diff --git a/source/client/mount.cifs.c b/source/client/mount.cifs.c
index b7a76c6..fd8014c 100644
--- a/source/client/mount.cifs.c
+++ b/source/client/mount.cifs.c
@@ -79,6 +79,15 @@
#define MOUNT_PASSWD_SIZE 64
#define DOMAIN_SIZE 64
+/* exit status - bits below are ORed */
+#define EX_USAGE 1 /* incorrect invocation or permission */
+#define EX_SYSERR 2 /* out of memory, cannot fork, ... */
+#define EX_SOFTWARE 4 /* internal mount bug or wrong version */
+#define EX_USER 8 /* user interrupt */
+#define EX_FILEIO 16 /* problems writing, locking, ... mtab/fstab */
+#define EX_FAIL 32 /* mount failure */
+#define EX_SOMEOK 64 /* some mount succeeded */
+
const char *thisprogram;
int verboseflag = 0;
static int got_password = 0;
@@ -174,7 +183,7 @@ static void mount_cifs_usage(void)
printf("\n\t%s -V\n",thisprogram);
SAFE_FREE(mountpassword);
- exit(1);
+ exit(EX_USAGE);
}
/* caller frees username if necessary */
@@ -233,7 +242,7 @@ static int open_cred_file(char * file_name)
if(length > 4086) {
printf("mount.cifs failed due to malformed username in credentials file");
memset(line_buf,0,4096);
- exit(1);
+ exit(EX_USAGE);
} else {
got_user = 1;
user_name = (char *)calloc(1 + length,1);
@@ -257,7 +266,7 @@ static int open_cred_file(char * file_name)
if(length > MOUNT_PASSWD_SIZE) {
printf("mount.cifs failed: password in credentials file too long\n");
memset(line_buf,0, 4096);
- exit(1);
+ exit(EX_USAGE);
} else {
if(mountpassword == NULL) {
mountpassword = (char *)calloc(MOUNT_PASSWD_SIZE+1,1);
@@ -285,7 +294,7 @@ static int open_cred_file(char * file_name)
}
if(length > DOMAIN_SIZE) {
printf("mount.cifs failed: domain in credentials file too long\n");
- exit(1);
+ exit(EX_USAGE);
} else {
if(domain_name == NULL) {
domain_name = (char *)calloc(DOMAIN_SIZE+1,1);
@@ -318,7 +327,7 @@ static int get_password_from_file(int file_descript, char * filename)
if (mountpassword == NULL) {
printf("malloc failed\n");
- exit(1);
+ exit(EX_SYSERR);
}
if(filename != NULL) {
@@ -326,7 +335,7 @@ static int get_password_from_file(int file_descript, char * filename)
if(file_descript < 0) {
printf("mount.cifs failed. %s attempting to open password file %s\n",
strerror(errno),filename);
- exit(1);
+ exit(EX_SYSERR);
}
}
/* else file already open and fd provided */
@@ -337,7 +346,7 @@ static int get_password_from_file(int file_descript, char * filename)
printf("mount.cifs failed. Error %s reading password file\n",strerror(errno));
if(filename != NULL)
close(file_descript);
- exit(1);
+ exit(EX_SYSERR);
} else if(rc == 0) {
if(mountpassword[0] == 0) {
if(verboseflag)
@@ -563,7 +572,7 @@ static int parse_options(char ** optionsp, int * filesys_flags)
if (!(pw = getpwnam(value))) {
printf("bad user name \"%s\"\n", value);
- exit(1);
+ exit(EX_USAGE);
}
snprintf(user, sizeof(user), "%u", pw->pw_uid);
} else {
@@ -579,7 +588,7 @@ static int parse_options(char ** optionsp, int * filesys_flags)
if (!(gr = getgrnam(value))) {
printf("bad group name \"%s\"\n", value);
- exit(1);
+ exit(EX_USAGE);
}
snprintf(group, sizeof(group), "%u", gr->gr_gid);
} else {
@@ -674,7 +683,7 @@ static int parse_options(char ** optionsp, int * filesys_flags)
out = (char *)realloc(out, out_len + word_len + 2);
if (out == NULL) {
perror("malloc");
- exit(1);
+ exit(EX_SYSERR);
}
if (out_len) {
@@ -699,7 +708,7 @@ nocopy:
out = (char *)realloc(out, out_len + word_len + 6);
if (out == NULL) {
perror("malloc");
- exit(1);
+ exit(EX_SYSERR);
}
if (out_len) {
@@ -715,7 +724,7 @@ nocopy:
out = (char *)realloc(out, out_len + 1 + word_len + 6);
if (out == NULL) {
perror("malloc");
- exit(1);
+ exit(EX_SYSERR);
}
if (out_len) {
@@ -996,12 +1005,12 @@ static struct option longopts[] = {
};
/* convert a string to uppercase. return false if the string
- * wasn't ASCII or was a NULL ptr */
+ * wasn't ASCII. Return success on a NULL ptr */
static int
uppercase_string(char *string)
{
if (!string)
- return 0;
+ return 1;
while (*string) {
/* check for unicode */
@@ -1050,7 +1059,7 @@ int main(int argc, char ** argv)
thisprogram = argv[0];
} else {
mount_cifs_usage();
- exit(1);
+ exit(EX_USAGE);
}
if(thisprogram == NULL)
@@ -1067,12 +1076,12 @@ int main(int argc, char ** argv)
share_name = strndup(argv[1], MAX_UNC_LEN);
if (share_name == NULL) {
fprintf(stderr, "%s: %s", argv[0], strerror(ENOMEM));
- exit(1);
+ exit(EX_SYSERR);
}
mountpoint = argv[2];
} else {
mount_cifs_usage();
- exit(1);
+ exit(EX_USAGE);
}
/* add sharename in opts string as unc= parm */
@@ -1094,7 +1103,7 @@ int main(int argc, char ** argv)
case '?':
case 'h': /* help */
mount_cifs_usage ();
- exit(1);
+ exit(EX_USAGE);
case 'n':
++nomtab;
break;
@@ -1148,14 +1157,14 @@ int main(int argc, char ** argv)
uid = strtoul(optarg, &ep, 10);
if (*ep) {
printf("bad uid value \"%s\"\n", optarg);
- exit(1);
+ exit(EX_USAGE);
}
} else {
struct passwd *pw;
if (!(pw = getpwnam(optarg))) {
printf("bad user name \"%s\"\n", optarg);
- exit(1);
+ exit(EX_USAGE);
}
uid = pw->pw_uid;
endpwent();
@@ -1168,14 +1177,14 @@ int main(int argc, char ** argv)
gid = strtoul(optarg, &ep, 10);
if (*ep) {
printf("bad gid value \"%s\"\n", optarg);
- exit(1);
+ exit(EX_USAGE);
}
} else {
struct group *gr;
if (!(gr = getgrnam(optarg))) {
printf("bad user name \"%s\"\n", optarg);
- exit(1);
+ exit(EX_USAGE);
}
gid = gr->gr_gid;
endpwent();
@@ -1205,13 +1214,13 @@ int main(int argc, char ** argv)
default:
printf("unknown mount option %c\n",c);
mount_cifs_usage();
- exit(1);
+ exit(EX_USAGE);
}
}
if((argc < 3) || (dev_name == NULL) || (mountpoint == NULL)) {
mount_cifs_usage();
- exit(1);
+ exit(EX_USAGE);
}
if (getenv("PASSWD")) {
@@ -1228,13 +1237,13 @@ int main(int argc, char ** argv)
}
if (orgoptions && parse_options(&orgoptions, &flags)) {
- rc = -1;
+ rc = EX_USAGE;
goto mount_exit;
}
ipaddr = parse_server(&share_name);
if((ipaddr == NULL) && (got_ip == 0)) {
printf("No ip address specified and hostname not found\n");
- rc = -1;
+ rc = EX_USAGE;
goto mount_exit;
}
@@ -1249,19 +1258,19 @@ int main(int argc, char ** argv)
}
if(chdir(mountpoint)) {
printf("mount error: can not change directory into mount target %s\n",mountpoint);
- rc = -1;
+ rc = EX_USAGE;
goto mount_exit;
}
if(stat (".", &statbuf)) {
printf("mount error: mount point %s does not exist\n",mountpoint);
- rc = -1;
+ rc = EX_USAGE;
goto mount_exit;
}
if (S_ISDIR(statbuf.st_mode) == 0) {
printf("mount error: mount point %s is not a directory\n",mountpoint);
- rc = -1;
+ rc = EX_USAGE;
goto mount_exit;
}
@@ -1274,7 +1283,7 @@ int main(int argc, char ** argv)
#endif
} else {
printf("mount error: permission denied or not superuser and mount.cifs not installed SUID\n");
- return -1;
+ exit(EX_USAGE);
}
}
@@ -1289,7 +1298,7 @@ int main(int argc, char ** argv)
mountpassword = (char *)calloc(MOUNT_PASSWD_SIZE+1,1);
--
Samba Shared Repository
More information about the samba-cvs
mailing list