[SCM] Samba Shared Repository - branch v3-0-stable updated -
release-3-0-28-146-g4861aef
Gerald Carter
jerry at samba.org
Sat Mar 8 15:30:42 GMT 2008
The branch, v3-0-stable has been updated
via 4861aef29f84a051b4592b1616e40f010b612420 (commit)
via 29df57a5aadc208514f82875ef489e42cffad471 (commit)
via e8b8884198c32816d1bf35185c0f0583148cd072 (commit)
via 97cc5e316a4eacbf0fb6ac01228eea6688144a57 (commit)
via b214365ec32c1904ea763cccd0b2b49f5f6f0869 (commit)
via 20971d829d7ae2c1b31ebc872da787f3467fa6b0 (commit)
via 91703434550c8d539258f4eac45edbc4d0b9f2b9 (commit)
via c439013ef99971907bfc9d01c01f4a680960bb11 (commit)
via b605b169e659ee0c84f7d807e8dfb25e9723a2bf (commit)
via 555c9c0702666e56f0cda61441f786d41c2ab6b4 (commit)
via 5cd0c8a8d2323986907c8a3cec2b7955136fe230 (commit)
via a68e574edbce99ebe1a2eee11304c76520fd46b2 (commit)
via 51f315065bfccc155aa19feaf5b65110b639f8d1 (commit)
via 81b392b353b0d4812adc0ee8c767251a5bd738e4 (commit)
via 698f63cc3adc652c20cfd84a0b2eab72076b7e8a (commit)
via 7d4b9b46a01dc4139d6d29dc3feb747d0991ebea (commit)
via eff92e2ff0893eecbfc7c66ca4700429df5dc6bc (commit)
via 3f6c025526b2595081535c86b29a372bc6343c88 (commit)
via eb52363673c6c8e478477ee0a10a83d7c4e79d3d (commit)
via 05d5895a3bb0d8b001ed164c5720f10607dfbaca (commit)
via 99c5baf380c05a3852b6df6bb1eddf1ae080ccdf (commit)
via 3eb2d427a9319199e862e6f6af5db32de6330b34 (commit)
via d0d9e485b505e7f75a844631a4c77316fc684ac0 (commit)
via 086eaf20574264f24230301565f16347c5d2738e (commit)
via 3fcef06e4fdf375f4b07e953a5d707dfc226415b (commit)
via 63b3f2cb410688d2705f53090e7f9638a106daa4 (commit)
via 55c7aaff897cde9dc9a40a07c96297a232539e81 (commit)
via d15d99da3a1a6bcb1be196de0a193b75151006e9 (commit)
via dd3441022775f24cf66bd75daf899e92492eaeec (commit)
via 8957254118832d07440bf244006f216ac5b38dc2 (commit)
via 6e66512d5beb256a44c6703cdb8c7fa7e0fd8537 (commit)
via 83b04c60fac76ccd2d5aecb14f8896a07d488b1f (commit)
via 945bbd14bb1c8ec11365d52a7897ca17e95c9053 (commit)
via 2ced9b906fe9044edf6efbca6175aa481c2a4451 (commit)
via 69b745ec32672762c89fffc77b860eab17c95761 (commit)
via 2c01540a763f19c2d4c658607efb16285a1e25a5 (commit)
via f04810e9f216ad43b45b69e6e0c6792cc93076a1 (commit)
via 485cedadb0e61775e6cb152f42f4dfdf17e82666 (commit)
via fc0508922417e9ef9a4450067d29d15121b52902 (commit)
via 0e7886a3ceb8406c5e331a66c0e6fb6ab4493a3e (commit)
via 938f78546a4706f25d7b07efbca97a6b2d12d4b9 (commit)
via 6b594996a8dff0c6c663752f06a994c95020d869 (commit)
via b83dfaf09679b0bbd7341230e1e96b53ae5289cb (commit)
via 7a529c43181eb9b3926b214b2fe84aea06be7a3c (commit)
via a3e3e2fc30c98b3daaea8ae9888ddc681847e8b4 (commit)
via b2127d271a1396c37727a57503db8dd130482b87 (commit)
via 00845002a60b541e290aee40626af4b5d522f553 (commit)
via dd2489a178e0760082695904e75b75d57528f953 (commit)
via db905d9c4248c0051266ef0995dce077c1a33dd3 (commit)
via 7ff5a123b4fd80d66da92f34062174573a4f9725 (commit)
via 83ac4555a07a2c64a2cb94801e4cf56a602b43d4 (commit)
via f073f8bb8249274adeae9f43af1dbb49dcf6e755 (commit)
via 0cbc43562e358e30ba5d431ca54c42bb2d09dc44 (commit)
via 1a1fe0094dad0c66a26c87941760ad66c389cc50 (commit)
via 73647214ae96f1ecd244b71d35048685f8c7ea8a (commit)
via 3953f4081cd5ced82885de49c30a9144e7ad8fe7 (commit)
via 1a861aa94ed247e31d4f7b1038945d5ed87fe6c6 (commit)
via 27874d2c960ad56a53bf84e1480f4963fa3ab25c (commit)
via 18c2be399c5a62746794301b9619490480314fb9 (commit)
via 3e175d791785b3b6dc1dbbed6db07cbfe3cdb89b (commit)
via 6ce07b63f119aceb8af3740c024fde1df9121a4c (commit)
via 514991a4acc55c721e6ad8b5a27106ab35ea5d45 (commit)
via b65a166132e6834f8111c3e41579f5e1e68e0ec6 (commit)
via b3bb276682a2202b6cb1b6f8628cfd7de302f6c6 (commit)
via 8265f4dc604584d92632db49a9fa9352ad9cd457 (commit)
via 6f57b52a5e314747be1c5f51c7264724523fff00 (commit)
via 380e957edde3c2318b99fa072019cfa4f5493f96 (commit)
via 98b709262da4429079564bf6bc03b9ecdbdff6be (commit)
via eeed0c16f0d6a8afb0096dae6501826ec422b56a (commit)
via c7bf932a80676457e1a9982c5e05157746c5545d (commit)
via ca61ba5e1ac4935036b9419290453d82c161cfbd (commit)
via fa25c239e7624a863088008f58ed2b2f82a1cd1b (commit)
via 30f0fb4c35f88ad3b490d52f142305e5c30f7308 (commit)
via f76f994e471ff8f62714a51bdc15469e08aa7062 (commit)
via bce6c238edbbfe54807b549d17a07366feff2497 (commit)
via 18b3960ba9b3e07ca1c2abf1de24ef07f9f9dab3 (commit)
via a5d2a6fc40e033f2f8342269a6169d23b1bb4542 (commit)
via 10a8cf19d6a3d77dbf6c94748bfb3038f9b5ef8a (commit)
via fb04894949ef7fa54b3c1870ead7ea171c3f735b (commit)
via 88a04cf19a0d521d8d1bf0f3b8cf8273b42c0bdd (commit)
via a4337966e29cd67f542e2604117ca1c4be60ff42 (commit)
via c9b7bfbdcebd4ed892becfc291df9160bb101151 (commit)
via 3f15bbc8cf38ecfe58ad9b0711aa93201971dfd0 (commit)
via 9f2dcc2d6123fdb710eb2920c3158f38f67e1549 (commit)
via 0bdb00df8287779e75cfbb7b9e239a04442509d7 (commit)
via 63d27ae58658653b93178169ed74e2c96bfd5f56 (commit)
via 45d0b0db8aa92f56584bb8fab4ea525ea2b449c7 (commit)
via 0b850e805479dbed71589ba414c77539b78995b6 (commit)
via 263092d3541a2d33e3ac8ddc5088e66aa9d1ccfb (commit)
via c733a29f15eb6dfda6f3199839e714a58b778f20 (commit)
via cbb2ad1b1d3b388c6d4a4612338e9cc4eea351e1 (commit)
via de85ada7c3bb0cd1a0972682b1c4d99190549904 (commit)
via 2ccab1b3fa733199cbc382b63ba683de4e4ad596 (commit)
via 3cf02ba9781ff8c841f56945d70241a3c11f0f28 (commit)
via 01b5cdaac8a92635886a920772f2168734048e16 (commit)
via 4795fd7d0f7d2eb1528e28f7c5512c24932936eb (commit)
via 0b98572fa3e7854be8dcb709b85c78c1aea26111 (commit)
via 9d93ec1cdd7ef3a6a02a8095bb1c487fd6310863 (commit)
via c5e3c7778e5b0ee24fe0ff5623e37d9574b9a7d7 (commit)
via b620f7c3ec04116023fe0dcb0ea0d0b9fb2560db (commit)
via f94e4619d1b2985881ec7ed76587057f00fbf1f7 (commit)
via e8f569735e2c0523efa175ca44dd919f838ae49e (commit)
via 76dcbbd1213ebf0212997d9a0599c894076d77bb (commit)
via 49d06710962d267610b94af2f2c2ea52066abb1b (commit)
via 3d3119a2e746f64c8f52cb67f970ed7d185383f6 (commit)
via 920c8a9d5496e81aa0661ffb92cb484aafe94831 (commit)
via 0cdc3e73bbe6ae592833b6e1f4ace0d04107b4b2 (commit)
via 2cf54d5f41f55897c94e9a0b7cb1ffe4e26f2c50 (commit)
via 02b5280a8b35346dc41279bab80a4cec8a7515eb (commit)
via 38eca7a2d0d4b899c3ff94dc3ec51e103ac49cdd (commit)
via e2c4d91a331001b4cae82e9820323036812b5bcd (commit)
via 44ba475acc854258e83d26d45dc35c69da69aed8 (commit)
via 24502927471a183c86ea3ef5d5fc4712bd32323e (commit)
via 21b062162f9d4781eda776e181c78e315fc71d94 (commit)
via f5476c93c73a0757bfa154d8fb360184ed29e00f (commit)
via 882437445f5bfc89c1b00eb49a14b616e499aa96 (commit)
via 6deaedd1f357787c28d77bb42065eb683f382c43 (commit)
via 1af37afb844f7cc387ded8fbbdb0a9cecff7d5e9 (commit)
via 244230eb619c6699e962bb24f8f6e4dd2a1235c7 (commit)
via 03ad8c0ef748352960415e7d5a1f5516b89c0cec (commit)
via c2583c01982197221e4dc054eea12872b1d2ba99 (commit)
via eaaf5c7ad00a821d1c4c2fb17295d8d51809707e (commit)
via e7e5a7c613b73ca5832d18ccd1c2660d012c7b13 (commit)
via 6ba54521aa9628346fcfa28ba27713fc97b5863a (commit)
via dc80d5264949da4e9c91035851a6f8c19e546ed2 (commit)
via f652ce4ab63ba24b298142099efd751d270d1e07 (commit)
via 821de8a047eea10fefb0851792a9e4633c16d871 (commit)
via 120f2c05a36a59fe6829cc73f20c269ffef134ad (commit)
via 864175b3dc671e95afa2b6007b7f78778766384b (commit)
via 46a780679b87132dbf76af3e684c2124b33a1edc (commit)
via 452e964995afe5a43040c8bdcadc9c45a1e1d007 (commit)
via f5afd08483dec2bd1c53c10550e512e12ebe4ab1 (commit)
via 9c0590cbca8128a76300d0e5b3f5b8e479d8080f (commit)
via 191dc2bfd22a4a4d55779281c63e4b570ac6f24b (commit)
via f62fe6ed60f1b9806d58c19df809ce85d596933f (commit)
via 54adb86890eb22b6bcf0bc1163662c3f9c075777 (commit)
via 040db1ce851909704d093538ba063863fa11f73e (commit)
via 33860a8434b7892c0d2f4f50effc448fa4a6e160 (commit)
via 6415923e26a2d7b5a672a39cf179944302966d8b (commit)
via b3af0a03aa101b3839904ca236d907f62cba25f0 (commit)
via 47025144922011d9f2d6754a7a540e41dff4d56f (commit)
via 8b83ddcce126c8a2c36b535c86f4a5b8c25a92f8 (commit)
via 1ae55fe5c2a54fc65a95c3d6c62b355bab380e33 (commit)
via b73a7419cb655ba4fe0699591aee7a57d725c24c (commit)
via 9082329241d23665770ad82c77c2707bf434d126 (commit)
via 761876cdfd3805575de422a51fa1514edefea160 (commit)
from 06160682fba61e97c9837d1c074bb73d449f6e72 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-0-stable
- Log -----------------------------------------------------------------
commit 4861aef29f84a051b4592b1616e40f010b612420
Author: Volker Lendecke <vl at samba.org>
Date: Sat Mar 8 10:27:03 2008 +0100
Work around a handle leak in XP 64 bit
We have to tell XP64 that we store unicode, otherwise some library will to a
findfirst before each createfile, leaking a directory handle each time.
commit 29df57a5aadc208514f82875ef489e42cffad471
Author: Jeremy Allison <jra at samba.org>
Date: Thu Mar 6 17:44:00 2008 -0800
Emit debug message at 0 (already fixed for 3.2).
Jeremy.
commit e8b8884198c32816d1bf35185c0f0583148cd072
Author: Jeremy Allison <jra at samba.org>
Date: Thu Mar 6 17:40:53 2008 -0800
Fix bug #5267 - nmbd shuts down when network interfaces go down.
Cause nmbd to wait for an interface, in a mode where SIGTERM
will kills us (same way we wait on startup for an interface).
Jeremy.
commit 97cc5e316a4eacbf0fb6ac01228eea6688144a57
Author: Volker Lendecke <vl at samba.org>
Date: Thu Mar 6 07:19:46 2008 +0100
Respect FAMChanged -- attempt to fix bug 5307
Thanks to Ricardo Santos
commit b214365ec32c1904ea763cccd0b2b49f5f6f0869
Author: Jeremy Allison <jra at samba.org>
Date: Fri Feb 29 06:55:48 2008 -0800
Patch to fix the "Invalid read of size 4" errors. Bug #3617.
Jeremy.
commit 20971d829d7ae2c1b31ebc872da787f3467fa6b0
Author: Jeremy Allison <jra at samba.org>
Date: Fri Feb 29 05:56:32 2008 -0800
Fix part of bug #3617 from valgrind trace.
"Invalid read of size 1" errors.
Jeremy.
commit 91703434550c8d539258f4eac45edbc4d0b9f2b9
Author: Andreas Schneider <anschneider at suse.de>
Date: Thu Feb 28 14:19:51 2008 +0100
Rename the 'hidden' variable to 'administrative share'.
commit c439013ef99971907bfc9d01c01f4a680960bb11
Author: Jeremy Allison <jra at samba.org>
Date: Thu Feb 28 02:41:01 2008 -0800
Fix possible uninitialized variable use.
Jeremy.
commit b605b169e659ee0c84f7d807e8dfb25e9723a2bf
Author: Jeremy Allison <jra at samba.org>
Date: Thu Feb 28 02:26:16 2008 -0800
Fix from Guenter Kukkukk <linux at kukkukk.com> to fix listing against
OS/2 servers. OS/2 returns eclass == ERRDOS && ecode == ERRnofiles
for a zero entry directory listing.
Jeremy.
commit 555c9c0702666e56f0cda61441f786d41c2ab6b4
Author: Steven Danneman <steven.danneman at isilon.com>
Date: Tue Feb 26 20:33:30 2008 -0800
Closed memory leak on error path.
commit 5cd0c8a8d2323986907c8a3cec2b7955136fe230
Author: Andreas Schneider <anschneider at suse.de>
Date: Fri Feb 22 17:06:24 2008 +0100
Add variable to define if a share should be hidden.
If you create a share on a Windows machine called foo$ then this share is
of the type STYPE_DISKTREE. So it is possible to administrate this kind of
share. Tested on Windows NT and 2003.
In samba we assume that if a share with a $ at the end must be of the type
STYPE_DISKTREE_HIDDEN. This is wrong, so we need a variable in the config
to define if the share should be hidden or not.
commit a68e574edbce99ebe1a2eee11304c76520fd46b2
Author: Volker Lendecke <vl at samba.org>
Date: Mon Feb 25 13:00:24 2008 +0100
Correctly check return of rename(2)
Bug 5279 -- Thanks to Max Matveev
commit 51f315065bfccc155aa19feaf5b65110b639f8d1
Author: Volker Lendecke <vl at samba.org>
Date: Mon Feb 25 12:52:55 2008 +0100
Fix inotify detection
Bug 5271 -- thanks to Tiziano Müller
commit 81b392b353b0d4812adc0ee8c767251a5bd738e4
Author: Volker Lendecke <vl at samba.org>
Date: Mon Feb 25 09:51:33 2008 +0100
Fix confusing error message -- bug 5252
Thanks to Walter Franzini
commit 698f63cc3adc652c20cfd84a0b2eab72076b7e8a
Author: Karolin Seeger <kseeger at samba.org>
Date: Fri Feb 8 13:48:23 2008 +0100
Fix typo.
Karolin
commit 7d4b9b46a01dc4139d6d29dc3feb747d0991ebea
Author: Karolin Seeger <kseeger at samba.org>
Date: Tue Feb 19 11:36:35 2008 +0100
Change ldap search filter. This function is also used to search machine accounts which may be located in a different ou.
Karolin
commit eff92e2ff0893eecbfc7c66ca4700429df5dc6bc
Author: Jeremy Allison <jra at samba.org>
Date: Thu Feb 14 17:43:34 2008 -0800
Ensure we call nt_status_squash() on returns. Smnall whitespace cleanup.
Jeremy.
commit 3f6c025526b2595081535c86b29a372bc6343c88
Author: Jeremy Allison <jra at samba.org>
Date: Thu Feb 14 17:42:03 2008 -0800
Ensure we call auth_ntlmssp_end in invalidate_vuid and invalidate_partical_vuid.
Jeremy.
commit eb52363673c6c8e478477ee0a10a83d7c4e79d3d
Author: Jeremy Allison <jra at samba.org>
Date: Thu Feb 14 17:41:06 2008 -0800
Allow a *NULL to be passed to auth_ntlmssp_end().
Jeremy.
commit 05d5895a3bb0d8b001ed164c5720f10607dfbaca
Author: Simo Sorce <idra at samba.org>
Date: Thu Feb 14 11:53:59 2008 -0500
Revert "mount.cifs: fix several problems when mounting subdirectories of shares"
This reverts commit e8f569735e2c0523efa175ca44dd919f838ae49e.
We found that this patch does not play well with currently released cifs.ko
code, so after discussions with Jeff Layton and Steve french we decided it
is best to back it off and re-think a better approach. Jeff will send new
patches later, but for now it is better to just revert to the previous code
commit 99c5baf380c05a3852b6df6bb1eddf1ae080ccdf
Author: Jeremy Allison <jra at samba.org>
Date: Wed Feb 13 19:21:12 2008 -0800
Fix obscure bug where if client sends us the krb5 part
of a SPNEGO packet we could drop into the NTLMSSP
part of the processing. This fix only for 3.0.28a,
I have a proper SPNEGO negotiate fix for 3.2.
Jeremy
commit 3eb2d427a9319199e862e6f6af5db32de6330b34
Author: Jeremy Allison <jra at samba.org>
Date: Mon Feb 11 09:53:31 2008 -0800
Back-port from vl.
Author: Volker Lendecke <vl at samba.org>
Date: Mon Feb 11 18:36:06 2008 +0100
Add a missing return
If I'm not completely blind, we should return here. Not doing it here seems not
to be a major flaw, as far as I can see we're only missing the error code. This
might account for some of the very unhelpful NT_STATUS_UNSUCCESSFUL error
messages people see during joins.
All with stake in Samba client, please check!
commit d0d9e485b505e7f75a844631a4c77316fc684ac0
Author: Jeremy Allison <jra at samba.org>
Date: Fri Feb 8 16:05:08 2008 -0800
Fix bug #5247 "Wildcard expansion in mget is broken"
by making cur_dir an invarient ending in '\\' or '/'.
Will forward-port to 3.2 as the code is different here.
Jeremy.
commit 086eaf20574264f24230301565f16347c5d2738e
Author: Michael Adam <obnox at samba.org>
Date: Wed Feb 6 18:16:03 2008 +0100
Add configure check for LBER_LOG_PRINT_FN - to intercept ldap debug.
Use the resulting HAVE_LBER_LOG_PRINT_FN to determine whether we can
use it in init_ldap_debugging to intercept LDAP debug output and print
it out in the samba logs (controlled with "ldap debug level").
Michael
commit 3fcef06e4fdf375f4b07e953a5d707dfc226415b
Author: Michael Adam <obnox at samba.org>
Date: Mon Jan 28 14:47:01 2008 +0100
Add support for LDAP debug output in Samba log file.
Logging of the ldap libraries appears with a [LDAP] prefix
inside the samba logs. This is controlled by two new parameters:
* "ldap debug level" sets the debug level of the ldap libraries.
It is the bit-field as understood by the openldap server.
* "ldap debug threshold" is the samba debug level at which ldap
logging appears inside the samba logs.
This probably needs some configure tests since it makes
use of the LBER_OPT_LOG_PRINT_FN option to redirect the
debug output of the ldap libraries.
Michael
commit 63b3f2cb410688d2705f53090e7f9638a106daa4
Author: Jeremy Allison <jra at samba.org>
Date: Wed Feb 6 15:24:01 2008 -0800
Move libads/util.o into the standard ADS list
from the server list.
Jeremy
commit 55c7aaff897cde9dc9a40a07c96297a232539e81
Author: Jeremy Allison <jra at samba.org>
Date: Tue Feb 5 17:06:25 2008 -0800
Back-ported fix from 3.2 (mainly from Bo Yang <boyang at novell.com>)
to fix bad private_data pointer in winbindd_lookupname_async().
Jeremy.
commit d15d99da3a1a6bcb1be196de0a193b75151006e9
Author: Volker Lendecke <vl at samba.org>
Date: Sun Feb 3 11:18:02 2008 +0100
Fix two memleaks
Thanks to Andreas Schneider <anschneider at suse.de> for nagging :-)
commit dd3441022775f24cf66bd75daf899e92492eaeec
Author: Jeremy Allison <jra at samba.org>
Date: Fri Feb 1 14:54:19 2008 -0800
Ensure that convert_string_allocate() allocates 2 extra
bytes and null terminates them to ensure NDR wire-reads
of string types are always null terminated. Bug found by
Volker after great pain :-).
Jeremy.
commit 8957254118832d07440bf244006f216ac5b38dc2
Author: Herb Lewis <hlewis at chomps2.(none)>
Date: Fri Feb 1 12:47:01 2008 -0800
use correct path for ignored file
commit 6e66512d5beb256a44c6703cdb8c7fa7e0fd8537
Author: Simo Sorce <idra at samba.org>
Date: Fri Feb 1 13:50:04 2008 -0500
Fix winbindd running on a Samba DC,
This patch make sure we do not try to contact smbd in the main dameon
to avoid deadlocks.
All the operations that require connecting to smbd are performed in
the domain child anyway.
commit 83b04c60fac76ccd2d5aecb14f8896a07d488b1f
Author: Günther Deschner <gd at samba.org>
Date: Thu Jan 31 13:05:36 2008 +0100
Enable v3-0-test to successfully join a windows 2008 domain controller.
This is hand-merged from a couple of commits from 3-2-test, cherry-picking was
hardly possible without importing all the ldap sign/seal work from metze.
Guenther
commit 945bbd14bb1c8ec11365d52a7897ca17e95c9053
Author: Gerald W. Carter <jerry at samba.org>
Date: Mon Jan 28 11:32:09 2008 -0600
Restrict the enctypes in the generated krb5.conf files to Win2003 types.
This fixes the failure observed on FC8 when joining a Windows 2008 RC1
domain. We currently do not handle user session keys correctly
when the KDC uses AES in the ticket replies.
commit 2ced9b906fe9044edf6efbca6175aa481c2a4451
Author: Rafal Szczesniak <mimir at samba.org>
Date: Wed Aug 29 11:02:04 2007 +0000
r24771: Use infolevel 25 to set the machine account's password (just like winxp).
This correctly updates pwdLastSet field on win2k3 server.
rafal
commit 69b745ec32672762c89fffc77b860eab17c95761
Author: Günther Deschner <gd at samba.org>
Date: Tue Jan 29 23:53:49 2008 +0100
Fix build warning.
Guenther
commit 2c01540a763f19c2d4c658607efb16285a1e25a5
Author: Kai Blin <kai at samba.org>
Date: Mon Jan 28 16:52:37 2008 +0100
idmap: Fix an incompatible pointer type warning.
Thanks to Simo for pointing me at the easier solution
commit f04810e9f216ad43b45b69e6e0c6792cc93076a1
Author: Volker Lendecke <vl at samba.org>
Date: Sat Jan 26 21:35:01 2008 +0100
Port SMB_FS_OBJECTID_INFORMATION from 3.2
Patch by Corinna Vinschen -- Thanks
commit 485cedadb0e61775e6cb152f42f4dfdf17e82666
Author: Jeremy Allison <jra at samba.org>
Date: Thu Jan 24 18:22:41 2008 -0800
Fix the same bug with user -> user_obj.
Jeremy.
commit fc0508922417e9ef9a4450067d29d15121b52902
Author: Jeremy Allison <jra at samba.org>
Date: Thu Jan 24 18:17:59 2008 -0800
Back port : Correctly set flags in ACE's inherited from parent.
Jeremy.
commit 0e7886a3ceb8406c5e331a66c0e6fb6ab4493a3e
Author: Jeremy Allison <jra at samba.org>
Date: Thu Jan 24 18:13:20 2008 -0800
Fix a really subtle old, old bug :-). When canonicalizing the
NT ACL into a POSIX one, if the group being set is the primary group
of the file, map it into a SMB_ACL_GROUP_OBJ, not a SMB_ACL_GROUP.
Otherwise we get an extra bogus group entry in the POSIX ACL.
Jeremy.
commit 938f78546a4706f25d7b07efbca97a6b2d12d4b9
Author: Jeremy Allison <jra at samba.org>
Date: Thu Jan 24 16:18:50 2008 -0800
Make explicit in debug we're ignoring flags from the parent SD.
Jeremy
commit 6b594996a8dff0c6c663752f06a994c95020d869
Author: Jeremy Allison <jra at samba.org>
Date: Thu Jan 24 13:29:00 2008 -0800
Add debug messages to trace this if needed.
Jeremy.
commit b83dfaf09679b0bbd7341230e1e96b53ae5289cb
Author: Jeremy Allison <jra at samba.org>
Date: Thu Jan 24 13:27:51 2008 -0800
The checks for OI and CI were just wrong.... Fix them. Thanks to
Jim for testing this.
Jeremy.
commit 7a529c43181eb9b3926b214b2fe84aea06be7a3c
Author: Jeremy Allison <jra at samba.org>
Date: Thu Jan 24 13:27:26 2008 -0800
First part of fix for bug #4929 - worked out by jmcd.
Cope with protected ACL set correctly.
Jeremy.
commit a3e3e2fc30c98b3daaea8ae9888ddc681847e8b4
Author: Jeremy Allison <jra at samba.org>
Date: Wed Jan 23 16:27:30 2008 -0800
Missed one flags change.
Jeremy.
commit b2127d271a1396c37727a57503db8dd130482b87
Author: Jeremy Allison <jra at samba.org>
Date: Wed Jan 23 15:24:57 2008 -0800
Added :
Author: Jeremy Allison <jra at samba.org>
Date: Wed Jan 23 15:23:16 2008 -0800
Don't leak memory in error path.
Jeremy.
Author: Jeremy Allison <jra at samba.org>
Date: Wed Jan 23 15:00:40 2008 -0800
Use strchr_m in seaching for '.' in the hostname to make sure we're mb safe.
Jeremy.
Author: Andreas Schneider <anschneider at suse.de>
Date: Thu Jan 17 11:35:40 2008 +0100
Fix Windows 2008 (Longhorn) join.
During 'net ads join' the cli->desthost is a hostname (e.g.
rupert.galaxy.site). Check if we have a hostname and use only the
first part, the machine name, of the string.
Author: Andreas Schneider <anschneider at suse.de>
Date: Thu Jan 17 10:11:11 2008 +0100
Windows 2008 (Longhorn) auth2 flag fixes.
Interop fixes for AD specific flags. Original patch from Todd Stetcher.
commit 00845002a60b541e290aee40626af4b5d522f553
Author: Jeremy Allison <jra at samba.org>
Date: Wed Jan 23 13:55:13 2008 -0800
Version of Matt Geddes <musicalcarrion at gmail.com>
patch for adding acct_flags to rpccli_samr_create_dom_user().
Jerry please test.
Jeremy.
commit dd2489a178e0760082695904e75b75d57528f953
Author: Günther Deschner <gd at samba.org>
Date: Wed Jan 23 12:03:51 2008 +0100
Fix get_trust_creds() to return always an upper-cased krb5 principal (this
fixes winbind krb5 session at least with heimdal).
Guenther
commit db905d9c4248c0051266ef0995dce077c1a33dd3
Author: Volker Lendecke <vl at samba.org>
Date: Tue Jan 22 11:54:31 2008 +0100
Copy the 3.2 version of string_replace to 3.0
There are several callers in 3.0 that don't give a pstring to string_replace,
thus it will end up in segfaults like the one reported by Sergio Pires
<suporte at grupovdl.com.br> on samba at samba.org. The 3.2 version of string_replace
does not have the pstring assumption anymore.
Jeremy, Jerry, please check!
Thanks,
Volker
commit 7ff5a123b4fd80d66da92f34062174573a4f9725
Author: Günther Deschner <gd at samba.org>
Date: Mon Jan 21 16:33:40 2008 +0100
Fix build warning.
Guenther
commit 83ac4555a07a2c64a2cb94801e4cf56a602b43d4
Author: Jeremy Allison <jra at samba.org>
Date: Fri Jan 18 18:39:29 2008 -0800
Actually test vl's new code and make it work to fix the build farm :-).
Jeremy.
commit f073f8bb8249274adeae9f43af1dbb49dcf6e755
Author: Jeremy Allison <jra at samba.org>
Date: Fri Jan 18 17:57:31 2008 -0800
Back port vl's fix for nlink counts.
Jeremy.
commit 0cbc43562e358e30ba5d431ca54c42bb2d09dc44
Author: Volker Lendecke <vl at samba.org>
Date: Thu Jan 17 17:17:52 2008 +0100
Fix two uninitialized variables in vfs_hpuxacl.c
Thanks to David Leonard <David.Leonard at quest.com>, this fixes bug 5208.
Volker
commit 1a1fe0094dad0c66a26c87941760ad66c389cc50
Author: Kai Blin <kai at samba.org>
Date: Tue Jan 15 19:28:23 2008 +0100
libsmb: Do not upper-case target name on NTLMv2 hash generation
This makes our NTLMv2 hash generation compatible to the Davenport example
and fixes a bug when ntlm_auth is called with a non-upper-case --domain
parameter and client ntlmv2 auth = yes
Jerry, please consider for 3.0.28a
commit 73647214ae96f1ecd244b71d35048685f8c7ea8a
Author: Michael Adam <obnox at samba.org>
Date: Mon Jan 14 15:45:46 2008 +0100
Fix bug #5171 (perl syntax error) found by Jason Filley <jason at snakelegs.org>.
Michael
commit 3953f4081cd5ced82885de49c30a9144e7ad8fe7
Author: Michael Adam <obnox at samba.org>
Date: Thu Jan 10 00:47:10 2008 +0100
Enable building the notify_fam module.
Found by Timur I. Bakeyev <timur at com.bat.ru>.
Michael
commit 1a861aa94ed247e31d4f7b1038945d5ed87fe6c6
Author: Karolin Seeger <ks at samba.org>
Date: Tue Jan 8 19:21:26 2008 +0100
Correct comment. Default debug level of smbclient is 1, not 0.
commit 27874d2c960ad56a53bf84e1480f4963fa3ab25c
Author: Volker Lendecke <vl at samba.org>
Date: Wed Jan 9 07:59:12 2008 +0100
ensure uni_name.buffer is initialised
merge from http://samba.org/~tridge/3_0-ctdb
commit 18c2be399c5a62746794301b9619490480314fb9
Author: Jeremy Allison <jra at samba.org>
Date: Tue Jan 8 18:47:29 2008 -0800
Fix coverity resource leak on error.
Jeremy.
commit 3e175d791785b3b6dc1dbbed6db07cbfe3cdb89b
Author: Jeremy Allison <jra at samba.org>
Date: Tue Jan 8 18:43:48 2008 -0800
Fix resource leak on error found by coverity.
Jeremy.
commit 6ce07b63f119aceb8af3740c024fde1df9121a4c
Merge: b65a166132e6834f8111c3e41579f5e1e68e0ec6 514991a4acc55c721e6ad8b5a27106ab35ea5d45
Author: Jeremy Allison <jra at samba.org>
Date: Tue Jan 8 17:59:46 2008 -0800
Merge branch 'v3-0-test' of ssh://jra@git.samba.org/data/git/samba into v3-0-test
commit 514991a4acc55c721e6ad8b5a27106ab35ea5d45
Author: Karolin Seeger <ks at samba.org>
Date: Tue Jan 8 12:23:25 2008 +0100
Add missing quote. Fix bug 5172. Thanks to Jason Filley <jason at snakelegs.org> for reporting!
Karolin
commit b65a166132e6834f8111c3e41579f5e1e68e0ec6
Author: Jeremy Allison <jra at samba.org>
Date: Fri Jan 4 23:18:42 2008 -0800
Using a bool with a logical operation. IBM checker caught.
Jeremy.
commit b3bb276682a2202b6cb1b6f8628cfd7de302f6c6
Merge: 8265f4dc604584d92632db49a9fa9352ad9cd457 6f57b52a5e314747be1c5f51c7264724523fff00
Author: Jeremy Allison <jra at samba.org>
Date: Fri Jan 4 17:15:50 2008 -0800
Merge branch 'v3-0-test' of ssh://jra@git.samba.org/data/git/samba into v3-0-test
commit 8265f4dc604584d92632db49a9fa9352ad9cd457
Author: Jeremy Allison <jra at samba.org>
Date: Fri Jan 4 17:15:06 2008 -0800
Add missing patch to allow smbcacls to do krb5 auth, bug #5175
from Tom Maher <tmaher at watson.org>.
Jeremy.
commit 6f57b52a5e314747be1c5f51c7264724523fff00
Author: Stefan Metzmacher <metze at samba.org>
Date: Thu Jan 3 20:55:42 2008 +0100
Revert "no-atime-on-mtime"
This reverts commit 54adb86890eb22b6bcf0bc1163662c3f9c075777.
Sorry I didn't want to push that...
metze
commit 380e957edde3c2318b99fa072019cfa4f5493f96
Author: Günther Deschner <gd at samba.org>
Date: Wed Jan 2 12:55:53 2008 +0100
Happy new year !
Guenther
(cherry picked from commit 9a58cd57953d6aead14789daa47a3badef19496d)
commit 98b709262da4429079564bf6bc03b9ecdbdff6be
Merge: 21b062162f9d4781eda776e181c78e315fc71d94 eeed0c16f0d6a8afb0096dae6501826ec422b56a
Author: Stefan Metzmacher <metze at samba.org>
Date: Thu Jan 3 20:49:06 2008 +0100
Merge remote branch 'origin/v3-0-test' of /home/People/metze/devel/samba/samba-bare into v3-0-test
commit eeed0c16f0d6a8afb0096dae6501826ec422b56a
Author: Jeremy Allison <jra at samba.org>
Date: Wed Jan 2 18:20:25 2008 -0800
Fix for bug #5163 from Laurent Pinchart <pinchart at skynet.be>
Failure to change password in ldap is mapped to NT_STATUS_UNSUCCESSFUL unconditionally.
Jeremy.
commit c7bf932a80676457e1a9982c5e05157746c5545d
Author: Jeremy Allison <jra at samba.org>
Date: Wed Jan 2 11:57:37 2008 -0800
Attempt to fix bug #3617. Mix of patches from Volker and
myself. Use standard dlinklist macros.
Jeremy.
commit ca61ba5e1ac4935036b9419290453d82c161cfbd
Author: Jeremy Allison <jra at samba.org>
Date: Sat Dec 29 14:48:20 2007 -0800
Make send_getdc_request match 3.2.x codebase.
Jeremy.
commit fa25c239e7624a863088008f58ed2b2f82a1cd1b
Author: Jeremy Allison <jra at samba.org>
Date: Fri Dec 28 15:38:42 2007 -0800
Port 2135dfe91bf1ae114a18c15286b535662200677d from 3.2.
From Volker :
Fix setting the initial permission bits
This fixes a make test failure on Solaris. When creating a new file,
file_set_dosmode() called from open_file_ntcreate calculates a new permission
mask, very likely different from what had been calculated in
open_file_ntcreate. Further down we overwrote the newly calculated value with
SMB_FCHMOD_ACL, ignoring what file_set_dosmode had calculated.
Why did Linux not see this? fchmod_acl on a newly created file without acls
would not retrieve an acl at all, whereas under Solaris acl(2) returns
something even for files with just posix permissions returns something.
Jeremy, given that we have very similar code in 3.0.28 this might also explain
some of the bug reports that people have concerning ACLs on new files.
Volker
P.S: This one took a while to find...
commit 30f0fb4c35f88ad3b490d52f142305e5c30f7308
Author: Herb Lewis <hlewis at chomps2.(none)>
Date: Thu Dec 20 15:55:44 2007 -0800
fix dump printout when byte >= 0x80
commit f76f994e471ff8f62714a51bdc15469e08aa7062
Author: Michael Adam <obnox at samba.org>
Date: Wed Dec 19 18:18:30 2007 +0100
Only retrieve password policies in pam_auth when WBFLAG_PAM_GET_PWD is set.
This essentially re-establishes r14496 (2155bb0535656f294bd054d6a0a7d16a9a71c31b)
which was undone in r17723 (43bd8c00abb38eb23a1497a255d194fb1bbffffb) for
reasons that are unclear to me. Maybe I am being too naive.
Now we do again only retrieve the password policy when called from
the pam_winbind module. This fixes logons delegated to AD trusted
domain controllers: We need to connect to the sam to retrieve the
password policy. But auhtenticated session setup is not possible
when contacting the trusted domain dc and afterwards, SamrConnect
also fails with whatever credentials and method used.
Michael
commit bce6c238edbbfe54807b549d17a07366feff2497
Author: Michael Adam <obnox at samba.org>
Date: Tue Dec 18 07:58:38 2007 +0100
Fix a debug message: add missing space.
Michael
commit 18b3960ba9b3e07ca1c2abf1de24ef07f9f9dab3
Author: Michael Adam <obnox at samba.org>
Date: Tue Dec 18 01:55:32 2007 +0100
Fix logic error in cm_connect_sam().
Don't fall back to schannel when trust creds could be obtained.
This is still not complete, but I am getting closer.
Michael
commit a5d2a6fc40e033f2f8342269a6169d23b1bb4542
Author: Michael Adam <obnox at samba.org>
Date: Tue Dec 18 01:32:02 2007 +0100
Fix another segfault.
Michael
commit 10a8cf19d6a3d77dbf6c94748bfb3038f9b5ef8a
Author: Gerald (Jerry) Carter <jerry at samba.org>
Date: Mon Dec 17 17:33:48 2007 -0600
Fix a segv in winbindd caused by trying to free an fstring. Make a copy of the machine_password and machine_account strings in all conditional paths so that SAFE_FREE() will always be valid.
commit fb04894949ef7fa54b3c1870ead7ea171c3f735b
Author: Michael Adam <obnox at samba.org>
Date: Mon Dec 17 23:26:48 2007 +0100
Make cm_connect_sam() try harder to connect autheticated.
Even if the session setup was anonymous, try and collect
trust creds with get_trust_creds() and use these before
falling back to schannel.
This is the first attempt to fix interdomain trusts.
(get password policy and stuff)
Michael
commit 88a04cf19a0d521d8d1bf0f3b8cf8273b42c0bdd
Author: Michael Adam <obnox at samba.org>
Date: Mon Dec 17 23:24:36 2007 +0100
Refactor out assembling of trust creds (pw, account name, principal).
Michael
commit a4337966e29cd67f542e2604117ca1c4be60ff42
Author: Michael Adam <obnox at samba.org>
Date: Mon Dec 17 23:22:28 2007 +0100
Streamline and fix logic of cm_prepare_connection().
Do not attempt to do a session setup when in a trusted domain
situation (this gives STATUS_NOLOGON_TRUSTED_DOMAIN_ACCOUNT).
Use get_trust_pw_clear to get machine trust account.
Only call this when the results is really used.
Use the proper domain and account name for session setup.
Michael
commit c9b7bfbdcebd4ed892becfc291df9160bb101151
Author: Michael Adam <obnox at samba.org>
Date: Mon Dec 17 23:11:31 2007 +0100
Refactor out get_schannel_session_key logic.
Refactor the actual retrieval of the session key through the
established netlogon pipe out of get_schannel_session_key()
and get_schannel_session_key_auth_ntlmssp() into a new
function get_schannel_session_key_common().
(To avoid code duplication.)
Michael
commit 3f15bbc8cf38ecfe58ad9b0711aa93201971dfd0
Author: Michael Adam <obnox at samba.org>
Date: Mon Dec 17 22:37:29 2007 +0100
Pass NULL instead of unneeded &sid: secrets_fetch_trusted_domain_password() checks.
Michael
commit 9f2dcc2d6123fdb710eb2920c3158f38f67e1549
Author: Michael Adam <obnox at samba.org>
Date: Mon Dec 17 22:29:54 2007 +0100
Rename get_trust_pw() to get_trust_pw_hash().
Michael
commit 0bdb00df8287779e75cfbb7b9e239a04442509d7
Author: Michael Adam <obnox at samba.org>
Date: Mon Dec 17 22:26:52 2007 +0100
Export logic of get_trust_pw() to new function get_trust_pw_clear().
get_trust_pw() just now computes the md4 hash of the result of
get_trust_pw_clear() if that was successful. As a last resort,
in the non-trusted-domain-situation, get_trust_pw() now tries to
directly obtain the hashed version of the password out of secrets.tdb.
Michael
commit 63d27ae58658653b93178169ed74e2c96bfd5f56
Author: Michael Adam <obnox at samba.org>
Date: Mon Dec 17 17:49:13 2007 +0100
Refactor the lagacy part of secrets_fetch_trust_account_password() out
into a new function secrets_fetch_trust_account_password_legacy() that
does only try to obtain the hashed version of the machine password directly
from secrets.tdb.
Michael
commit 45d0b0db8aa92f56584bb8fab4ea525ea2b449c7
Author: Michael Adam <obnox at samba.org>
Date: Mon Dec 17 17:42:05 2007 +0100
Let get_trust_pw() determine the machine_account_name to use.
Up to now each caller used its own logic.
This eliminates code paths where there was a special treatment
of the following situation: the domain given is not our workgroup
(i.e. our own domain) and we are not a DC (i.e. it is not a typical
trusted domain situation). In situation the given domain name was
previously used as the machine account name, resulting in an account
name of DOMAIN\\DOMAIN$, which does not seem very reasonable to me.
get_trust_pw would not have obtained a password in this situation
anyways.
I hope I have not missed an important point here!
Michael
commit 0b850e805479dbed71589ba414c77539b78995b6
Author: Michael Adam <obnox at samba.org>
Date: Mon Dec 17 17:38:06 2007 +0100
Remove silly amounts of trailing white spaces.
Michael
commit 263092d3541a2d33e3ac8ddc5088e66aa9d1ccfb
Author: Michael Adam <obnox at samba.org>
Date: Tue Dec 11 12:47:28 2007 +0100
Streamline logic in cm_connect_netlogon()
by retrieving trust password only, when it will be used.
Michael
commit c733a29f15eb6dfda6f3199839e714a58b778f20
Author: Michael Adam <obnox at samba.org>
Date: Tue Sep 11 16:15:36 2007 +0000
r25086: Fix interdomain trusts (this povides the fix expected in r22709):
Fix winbindd on a Samba DC talking to a trusted domain DC by
making it use the trusted domain password...
Michael
I hope this does not brake any other setup.
commit cbb2ad1b1d3b388c6d4a4612338e9cc4eea351e1
Author: Gerald Carter <jerry at samba.org>
Date: Sun May 6 19:48:13 2007 +0000
r22709: we can only use tschannel when commectcing to our primary (might need some fixing here for a Samba DC)
commit de85ada7c3bb0cd1a0972682b1c4d99190549904
Author: Michael Adam <obnox at samba.org>
Date: Tue Dec 11 08:52:20 2007 +0100
In cm_prepare_connection(), only get auth user creds if we need to.
Michael
commit 2ccab1b3fa733199cbc382b63ba683de4e4ad596
Author: Michael Adam <obnox at samba.org>
Date: Mon Dec 17 15:19:38 2007 +0100
Remove two unneeded functions.
secrets_store_trust_account_password() and trust_password_delete()
are the write access functions to the SECRETS/$MACHINE.ACC/domain keys
in secrets.tdb, the md4 hashed machine passwords. These are not used
any more: Current code always writes the clear text password.
Michael
commit 3cf02ba9781ff8c841f56945d70241a3c11f0f28
Author: Volker Lendecke <vl at sernet.de>
Date: Wed Dec 19 17:05:26 2007 +0100
packet_struct is used in several places as raw memory
-> Fix more uninitialized variable warnings
commit 01b5cdaac8a92635886a920772f2168734048e16
Author: Volker Lendecke <vl at sernet.de>
Date: Wed Dec 19 16:48:18 2007 +0100
Some paranoia checks
commit 4795fd7d0f7d2eb1528e28f7c5512c24932936eb
Author: Volker Lendecke <vl at sernet.de>
Date: Wed Dec 19 16:48:04 2007 +0100
Zero the tdb key, there might be padding
This leads to uninitialized variable warnings if nmbd is run under valgrind.
commit 0b98572fa3e7854be8dcb709b85c78c1aea26111
Author: Jeremy Allison <jra at samba.org>
Date: Tue Dec 18 18:08:18 2007 -0800
Ensure we can't pass -1 to smb_fn_name(). Fixes bug #4612.
This is not used in 3.2 code.
Jeremy.
commit 9d93ec1cdd7ef3a6a02a8095bb1c487fd6310863
Author: Jeremy Allison <jra at samba.org>
Date: Mon Dec 17 15:09:59 2007 -0800
Fix socket_wrapper build for 3.0.x.
Jeremy.
commit c5e3c7778e5b0ee24fe0ff5623e37d9574b9a7d7
Author: Simo Sorce <idra at samba.org>
Date: Mon Dec 17 15:21:38 2007 -0500
While 'data' is usually 0 terminated, nothing in the spec requires that.
The correct way is to copy only 'length' bytes.
Simo.
commit b620f7c3ec04116023fe0dcb0ea0d0b9fb2560db
Author: Jeremy Allison <jra at samba.org>
Date: Mon Dec 17 10:44:01 2007 -0800
Fix bug #5121 (unix passwd sync bnot working on a streams based
system).
Jeremy.
commit f94e4619d1b2985881ec7ed76587057f00fbf1f7
Merge: e8f569735e2c0523efa175ca44dd919f838ae49e 76dcbbd1213ebf0212997d9a0599c894076d77bb
Author: Simo Sorce <idra at samba.org>
Date: Mon Dec 17 09:40:10 2007 -0500
Resolve conflict of merging in J.Layton patch
Merge branch 'v3-0-test' of ssh://git.samba.org/data/git/samba into v3-0-simo
Conflicts:
source/client/mount.cifs.c
commit e8f569735e2c0523efa175ca44dd919f838ae49e
Author: Jeff Layton <jlayton at redhat.com>
Date: Tue Nov 13 09:04:33 2007 -0500
mount.cifs: fix several problems when mounting subdirectories of shares
This is essentially the same patch as I posted yesterday. The only
difference is that I added the replace_char helper function and now
have the code call it instead of doing the conversion internally.
Thoughts?
-------[snip]-------
CIFS has a few problems when mounting subdirectories of shares:
a) mount.cifs assumes that the prefixpath will always begin with a
forward slash. If it begins with a backslash, then it fails to parse out
the prefixpath and leaves it appended to the sharename. This causes the
mount to fail.
b) if the prefixpath uses '/' as a delimiter, it doesn't convert that to
a "native" prefixpath ('\\' delimiter). The kernel will blindly stuff
this prefix into the beginning of a path when it builds one from a dentry,
and this confuses windows servers (samba doesn't seem to care).
c) When you mount a subdir of a share, mount.cifs munges the device string
so that you can't tell what the prefixpath is. So if I mount:
//server/share/p1/p2/p3
..then /proc/mounts and mtab will show only:
//server/share
d) If the client has to retry the mount with an uppercase sharename, it
doesn't also uppercase the prefixpath (not sure if that's a real issue,
but it seems inconsistent).
The following patch fixes all of these problems. It separates the
"share_name" from the "device_name", and passes the share_name as the
unc= string, and the device_name as the first arg to mount(), and to
setmntent().
It also changes mount.cifs to use '\\' exclusively as a delimiter for
the unc= and prefixpath= options, and to use '/' exclusively as a
delimiter in the device string (seemingly necessary since the kernel
doesn't deal well with backslashes in the device string).
Signed-off-by: Jeff Layton <jlayton at redhat.com>
commit 76dcbbd1213ebf0212997d9a0599c894076d77bb
Author: Michael Adam <obnox at samba.org>
Date: Mon Dec 17 12:15:21 2007 +0100
Fix flags in all callers of lookup_name() in net_sam.c.
Michael
commit 49d06710962d267610b94af2f2c2ea52066abb1b
Author: Michael Adam <obnox at samba.org>
Date: Mon Dec 17 12:14:28 2007 +0100
Fix flags in call of lookup_name() in srv_samr_nt.c:can_create().
Use LOOKUP_NAME_LOCAL instead of LOOKUP_NAME_ISOLATED.
Michael
commit 3d3119a2e746f64c8f52cb67f970ed7d185383f6
Author: Michael Adam <obnox at samba.org>
Date: Mon Dec 17 12:14:01 2007 +0100
Fix flags in call of lookup_name() in pdb_default_create_alias().
Use new flag LOOKUP_NAME_LOCAL.
Michael
commit 920c8a9d5496e81aa0661ffb92cb484aafe94831
Author: Michael Adam <obnox at samba.org>
Date: Mon Dec 17 12:11:41 2007 +0100
Add combined flag LOOKUP_NAME_LOCAL.
Presence of LOOKUP_NAME_ISOLATED as the only flag is not the sign
for doing local lookups only but the sign for allowing lookups
of unqualified names. The correct sign is absence of the flag
LOOKUP_NAME_REMOTE.
Michael
commit 0cdc3e73bbe6ae592833b6e1f4ace0d04107b4b2
Author: Michael Adam <obnox at samba.org>
Date: Mon Dec 17 12:10:46 2007 +0100
Fix flags in caller of lookup_name() in create_builtin_administrators().
Michael
commit 2cf54d5f41f55897c94e9a0b7cb1ffe4e26f2c50
Author: Jeremy Allison <jra at samba.org>
Date: Sat Dec 15 23:32:22 2007 -0800
Doh, fix typo in error exit.
Jeremy.
commit 02b5280a8b35346dc41279bab80a4cec8a7515eb
Author: Jeremy Allison <jra at samba.org>
Date: Sat Dec 15 23:22:17 2007 -0800
Added patch originally by Andreas Schneider <anschneider at suse.de>
to cause us to behave like Vista when looking for remote
machine principal. Modified by me.
Jeremy.
commit 38eca7a2d0d4b899c3ff94dc3ec51e103ac49cdd
Author: Jeremy Allison <jra at samba.org>
Date: Sat Dec 15 23:05:37 2007 -0800
Cope with valgrind > 3.2.x.
Jeremy.
commit e2c4d91a331001b4cae82e9820323036812b5bcd
Author: Jeremy Allison <jra at samba.org>
Date: Sat Dec 15 22:28:46 2007 -0800
More work on bug #5082, use LC_ALL as this takes
precedence.
Jeremy.
commit 44ba475acc854258e83d26d45dc35c69da69aed8
Author: Jeremy Allison <jra at samba.org>
Date: Fri Dec 14 17:03:04 2007 -0800
Fix for bug #5082 from Mathias Gug <mathiaz at ubuntu.com>, Steve Langasek <vorlon at debian.org>.
Recent versions of Linux-PAM support localization of user prompts,
so Samba must use the C locale when invoking PAM (directly or via
/usr/bin/passwd) to ensure that password chat values match the prompts in a
locale-invariant fashion.
Jeremy.
commit 24502927471a183c86ea3ef5d5fc4712bd32323e
Author: Jeremy Allison <jra at samba.org>
Date: Fri Dec 14 16:32:44 2007 -0800
Fix bug #5141, patch from Hans Mayer <hans.mayer at ages.at>.
Already fixed in 3.2 code.
Jeremy.
commit 21b062162f9d4781eda776e181c78e315fc71d94
Merge: 54adb86890eb22b6bcf0bc1163662c3f9c075777 f5476c93c73a0757bfa154d8fb360184ed29e00f
Author: Stefan Metzmacher <metze at samba.org>
Date: Fri Dec 14 11:42:00 2007 +0100
Merge remote branch 'origin/v3-0-test' of /home/People/metze/devel/samba/samba-bare into v3-0-test
commit f5476c93c73a0757bfa154d8fb360184ed29e00f
Author: Jeremy Allison <jra at samba.org>
Date: Thu Dec 13 17:25:28 2007 -0800
We don't need to call endpwent if we never call getpwent.
Jeremy.
commit 882437445f5bfc89c1b00eb49a14b616e499aa96
Author: Jeremy Allison <jra at samba.org>
Date: Thu Dec 13 17:18:44 2007 -0800
Add a varient of Steve Langasek <vorlon at debian.org> patch
for bug #4780. Cause user mounts to inherit uid= and gid= from the
calling user when called as non-root, except when overridden on the
commandline.
Jeremy.
commit 6deaedd1f357787c28d77bb42065eb683f382c43
Author: Jeremy Allison <jra at samba.org>
Date: Wed Dec 12 19:12:24 2007 -0800
Missed one strcpy call.
Jeremy.
commit 1af37afb844f7cc387ded8fbbdb0a9cecff7d5e9
Author: Jeremy Allison <jra at samba.org>
Date: Wed Dec 12 19:11:26 2007 -0800
Add a portable version of strlcpy and strlcat and convert
all strncpy/strcat calls to them.
Convert all sprintf calls to snprintf. Safety first !
Jeremy.
commit 244230eb619c6699e962bb24f8f6e4dd2a1235c7
Author: Jeremy Allison <jra at samba.org>
Date: Wed Dec 12 18:45:20 2007 -0800
Fix bug #4784. Patch from Steve Langasek <vorlon at debian.org>.
Jeremy.
commit 03ad8c0ef748352960415e7d5a1f5516b89c0cec
Author: Jeremy Allison <jra at samba.org>
Date: Wed Dec 12 18:23:17 2007 -0800
Merge debian patch for distclean.
Jeremy.
commit c2583c01982197221e4dc054eea12872b1d2ba99
Author: Jeremy Allison <jra at samba.org>
Date: Wed Dec 12 18:17:34 2007 -0800
Merge debian fix for smbstatus locking error message.
Already fixed differently for 3.2.
Jeremy.
commit eaaf5c7ad00a821d1c4c2fb17295d8d51809707e
Author: Jeremy Allison <jra at samba.org>
Date: Wed Dec 12 18:07:04 2007 -0800
Only add the non-root escape on !developer.
Jeremy.
commit e7e5a7c613b73ca5832d18ccd1c2660d012c7b13
Author: Jeremy Allison <jra at samba.org>
Date: Wed Dec 12 17:26:45 2007 -0800
Fix bug #3727 with patch from Steve Langasek <vorlon at debian.org>
Jeremy.
commit 6ba54521aa9628346fcfa28ba27713fc97b5863a
Author: Jeremy Allison <jra at samba.org>
Date: Wed Dec 12 13:00:41 2007 -0800
Make sure this is fixed for both MIT and Heimdal.
Jeremy.
commit dc80d5264949da4e9c91035851a6f8c19e546ed2
Merge: f652ce4ab63ba24b298142099efd751d270d1e07 821de8a047eea10fefb0851792a9e4633c16d871
Author: Jeremy Allison <jra at samba.org>
Date: Wed Dec 12 09:49:26 2007 -0800
Merge branch 'v3-0-test' of ssh://jra@git.samba.org/data/git/samba into v3-0-test
commit f652ce4ab63ba24b298142099efd751d270d1e07
Author: Guenther Deschner <gd at samba.org>
Date: Wed Dec 12 13:38:28 2007 +0100
Vista SP1-rc1 appears to break against Samba-3.0.27a
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Hi Jason,
Jason Haar wrote:
> Patched 3.0.28, compiled, installed and here's the log file.
>
> Hope it helps. BTW I don't think it matters, but this is on 32bit
> CentOS4.5 systems.
yes, it helps. Thanks for that.
Very interesting, there are two auth data structures where the first one
is a PAC and the second something unknown (yet).
Can you please try the attached fix ? It should make it work again.
Guenther
- --
Günther Deschner GPG-ID: 8EE11688
Red Hat gdeschner at redhat.com
Samba Team gd at samba.org
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (GNU/Linux)
Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org
iD8DBQFHX9ZESOk3aI7hFogRAivSAJ9bMcD+PcsIzjYYLtAUoLNfVVEl1QCfV/Qd
MPsZW4G31VOVu64SPjgnJiI=
=Co+H
-----END PGP SIGNATURE-----
commit 821de8a047eea10fefb0851792a9e4633c16d871
Author: Michael Adam <obnox at samba.org>
Date: Fri Nov 30 16:11:43 2007 +0100
Fix for bug #4801: Correctly implement lsa lookup levels for lookupnames.
This is a first patch aimed at fixing bug #4801.
It is still incomplete in that winbindd does not walk
the the trusted domains to lookup unqualified names here.
Apart from that this fix should be pretty much complete.
Michael
commit 120f2c05a36a59fe6829cc73f20c269ffef134ad
Author: Michael Adam <obnox at samba.org>
Date: Fri Nov 30 16:11:43 2007 +0100
Add flags for correctly implementing lsa_lookup_name levels.
This is in preparation of the upcoming fix for bug #4801
(correct implementation of lsa lookup name levels.)
Michael
commit 864175b3dc671e95afa2b6007b7f78778766384b
Author: Jeremy Allison <jra at samba.org>
Date: Tue Dec 11 12:12:48 2007 -0800
Add patches for bug #4866 from jiri sasek - Sun Microsystems - Prague Czech Republic <Jiri.Sasek at Sun.COM>
to allow Solaris to get passwords > 8 chars.
Jeremy.
commit 46a780679b87132dbf76af3e684c2124b33a1edc
Merge: 452e964995afe5a43040c8bdcadc9c45a1e1d007 06160682fba61e97c9837d1c074bb73d449f6e72
Author: Gerald (Jerry) Carter <jerry at samba.org>
Date: Mon Dec 10 09:59:46 2007 -0600
Merge branch 'v3-0-stable' into v3-0-test
commit 452e964995afe5a43040c8bdcadc9c45a1e1d007
Merge: f5afd08483dec2bd1c53c10550e512e12ebe4ab1 5cc2baea238b49b99d69099a12c3c02ac4860a52
Author: Gerald (Jerry) Carter <jerry at samba.org>
Date: Mon Dec 10 09:30:23 2007 -0600
Merge branch 'v3-0-stable' into v3-0-test
commit f5afd08483dec2bd1c53c10550e512e12ebe4ab1
Merge: 9c0590cbca8128a76300d0e5b3f5b8e479d8080f e1abd8c2265dd63d5de388e7d8047c80204bb36e
Author: Gerald (Jerry) Carter <jerry at samba.org>
Date: Mon Dec 10 08:34:15 2007 -0600
Merge branch 'v3-0-stable' into v3-0-test
Resolved conflicts in source/VERSION.
commit 9c0590cbca8128a76300d0e5b3f5b8e479d8080f
Author: Volker Lendecke <vl at samba.org>
Date: Mon Dec 10 11:47:17 2007 +0100
Correctly unbecome_root() on error
commit 191dc2bfd22a4a4d55779281c63e4b570ac6f24b
Author: Michael Adam <obnox at samba.org>
Date: Thu Dec 6 01:13:07 2007 +0100
Fix a debug message (add a newline).
Michael
commit f62fe6ed60f1b9806d58c19df809ce85d596933f
Author: Andreas Schneider <anschneider at suse.de>
Date: Thu Dec 6 12:29:52 2007 +0100
Remove trailing slashes from service name
commit 54adb86890eb22b6bcf0bc1163662c3f9c075777
Author: Stefan Metzmacher <metze at samba.org>
Date: Wed Dec 5 16:02:48 2007 +0100
no-atime-on-mtime
commit 040db1ce851909704d093538ba063863fa11f73e
Author: Jeremy Allison <jra at samba.org>
Date: Tue Dec 4 13:30:29 2007 -0800
Fix signing bug found by Volker. That one was *subtle*.
Jeremy
commit 33860a8434b7892c0d2f4f50effc448fa4a6e160
Author: Volker Lendecke <vl at sernet.de>
Date: Tue Dec 4 13:16:37 2007 +0100
Correctly invalidate intermediate vuids
Because of the "&& usp->server_info" test in get_valid_user_struct,
invalidate_vuid() called for an intermediate vuid would never do what it was
supposed to do. There is no server_info in the intermediate vuids.
This fixes a memleak, it was found for a client that does silly sequences of
sesssionsetup/ulogoff for every operation.
commit 6415923e26a2d7b5a672a39cf179944302966d8b
Author: Volker Lendecke <vl at sernet.de>
Date: Tue Dec 4 13:13:45 2007 +0100
When allocating a new vuid, also avoid partial ones
commit b3af0a03aa101b3839904ca236d907f62cba25f0
Author: Volker Lendecke <vl at sernet.de>
Date: Tue Dec 4 11:38:57 2007 +0100
add SESSSETUP_BENCH
commit 47025144922011d9f2d6754a7a540e41dff4d56f
Author: Michael Adam <obnox at samba.org>
Date: Fri Nov 30 16:10:32 2007 +0100
Prevent net getdomainsid from panicing when called as non-root.
(Unable to open secrets.tdb.)
Michael
commit 8b83ddcce126c8a2c36b535c86f4a5b8c25a92f8
Author: Jeremy Allison <jra at samba.org>
Date: Tue Nov 27 17:42:46 2007 -0800
Fix old cut-and-paste bug where the wrong field was being written to.
Jerry please check.
Jeremy.
commit 1ae55fe5c2a54fc65a95c3d6c62b355bab380e33
Author: Michael Adam <obnox at samba.org>
Date: Fri Nov 23 16:52:45 2007 +0100
Adapt VERSION to use SAMBA_VERSION_VENDOR_PATCH instead of
SAMBA_VENDOR_PATCH as expected by mkversion.sh.
Thanks to Thomas Bork for noticing this.
Michael
commit b73a7419cb655ba4fe0699591aee7a57d725c24c
Author: Stefan Metzmacher <metze at samba.org>
Date: Fri Nov 23 11:51:33 2007 +0100
printing: fix default printing subsystem detection
"system/printing.h" includes an outdated copy of
the stuff in samba3's includes.h, so we should not use it.
metze
(cherry picked from commit 0a7338abfabaf31c2cbd81fb4ac8f1ce45735bed)
commit 9082329241d23665770ad82c77c2707bf434d126
Merge: 761876cdfd3805575de422a51fa1514edefea160 2b4189175a4e54c922136dbfb35c276730a4039a
Author: Stefan Metzmacher <metze at samba.org>
Date: Wed Nov 21 15:47:21 2007 +0100
Merge commit 'origin/v3-0-stable' into v3-0-test
commit 761876cdfd3805575de422a51fa1514edefea160
Author: Gerald (Jerry) Carter <jerry at samba.org>
Date: Wed Nov 21 07:13:14 2007 -0600
Set version to 3.0.27b-GIT-XXXX-test
-----------------------------------------------------------------------
Summary of changes:
.gitignore | 2 +-
examples/logon/genlogon/genlogon.pl | 2 +-
packaging/Example/setup.sh | 2 +-
source/Makefile.in | 8 +-
source/VERSION | 6 +-
source/auth/auth_domain.c | 9 +-
source/auth/auth_ntlmssp.c | 8 +-
source/auth/auth_server.c | 1 +
source/auth/auth_util.c | 2 +-
source/client/client.c | 41 +++----
source/client/mount.cifs.c | 181 ++++++++++++++++++++++--------
source/client/umount.cifs.c | 2 +-
source/configure.in | 42 +++++++-
source/groupdb/mapping.c | 2 +-
source/include/ads.h | 3 +
source/include/includes.h | 1 -
source/include/rpc_dce.h | 2 +
source/include/rpc_samr.h | 27 +++++-
source/include/smb.h | 39 ++++++-
source/lib/charcnv.c | 20 +++-
source/lib/clobber.c | 4 +
source/lib/ldap_debug_handler.c | 52 +++++++++
source/lib/replace/getpass.c | 15 +++
source/lib/replace/getpass.m4 | 10 ++
source/lib/replace/libreplace.m4 | 2 +-
source/lib/replace/system/network.h | 4 +
source/lib/system.c | 9 +-
source/lib/util_str.c | 24 +++-
source/libads/kerberos.c | 69 +++++++++++-
source/libads/sasl.c | 140 +++++++++++++++++------
source/libads/util.c | 57 ++++++++++
source/libmsrpc/cac_samr.c | 12 ++-
source/libsmb/cliconnect.c | 65 ++++++++++--
source/libsmb/clierror.c | 12 ++
source/libsmb/clikrb5.c | 10 +-
source/libsmb/clilist.c | 16 +++-
source/libsmb/clitrans.c | 14 ---
source/libsmb/nmblib.c | 2 +
source/libsmb/smb_signing.c | 79 +------------
source/libsmb/smbencrypt.c | 2 +-
source/libsmb/trusts_util.c | 2 +-
source/libsmb/unexpected.c | 10 ++
source/modules/vfs_default.c | 2 +-
source/modules/vfs_hpuxacl.c | 4 +-
source/modules/vfs_notify_fam.c | 3 +
source/nmbd/nmbd.c | 64 +++++++----
source/nmbd/nmbd_namelistdb.c | 1 -
source/nmbd/nmbd_nameregister.c | 6 +-
source/nmbd/nmbd_packets.c | 5 +
source/nmbd/nmbd_responserecordsdb.c | 40 +++----
source/nsswitch/idmap.c | 4 +-
source/nsswitch/pam_winbind.c | 4 +-
source/nsswitch/winbind_nss_config.h | 2 +-
source/nsswitch/winbindd.c | 2 +-
source/nsswitch/winbindd_async.c | 57 +++++++---
source/nsswitch/winbindd_cm.c | 184 +++++++++++++++++++++----------
source/nsswitch/winbindd_cred_cache.c | 2 +-
source/nsswitch/winbindd_dual.c | 11 ++
source/nsswitch/winbindd_nss.h | 2 +-
source/nsswitch/winbindd_pam.c | 10 +-
source/nsswitch/winbindd_util.c | 6 -
source/pam_smbpass/pam_smb_acct.c | 5 +
source/pam_smbpass/pam_smb_auth.c | 6 +
source/pam_smbpass/pam_smb_passwd.c | 5 +
source/param/loadparm.c | 24 ++++
source/passdb/lookup_sid.c | 46 ++++++---
source/passdb/pdb_ldap.c | 10 +-
source/passdb/secrets.c | 157 ++++++++++++++++++---------
source/python/py_samr.c | 9 +-
source/rpc_client/cli_pipe.c | 136 ++++++++---------------
source/rpc_parse/parse_samr.c | 25 ++++-
source/rpc_server/srv_lsa_nt.c | 37 +++++--
source/rpc_server/srv_samr_nt.c | 4 +-
source/rpc_server/srv_spoolss_nt.c | 4 +-
source/rpc_server/srv_srvsvc_nt.c | 5 +-
source/rpcclient/cmd_samr.c | 11 +-
source/rpcclient/rpcclient.c | 2 +-
source/smbd/chgpasswd.c | 24 +++--
source/smbd/dosmode.c | 18 +++-
source/smbd/notify.c | 2 +
source/smbd/notify_inotify.c | 8 +-
source/smbd/open.c | 14 ++-
source/smbd/password.c | 30 +++++-
source/smbd/posix_acls.c | 196 +++++++++++++++++----------------
source/smbd/reply.c | 2 +
source/smbd/server.c | 2 +-
source/smbd/sesssetup.c | 41 ++++---
source/smbd/trans2.c | 69 ++++++++++--
source/tdb/common/io.c | 7 +-
source/tdb/tools/tdbtool.c | 2 +-
source/torture/torture.c | 42 +++++++
source/utils/net.c | 10 ++
source/utils/net_domain.c | 90 ++++++++-------
source/utils/net_rpc.c | 24 +++--
source/utils/net_rpc_join.c | 12 ++-
source/utils/net_rpc_samsync.c | 2 +-
source/utils/net_sam.c | 20 ++--
source/utils/smbcacls.c | 3 +-
source/utils/smbpasswd.c | 6 +
source/utils/status.c | 10 ++
100 files changed, 1738 insertions(+), 801 deletions(-)
create mode 100644 source/lib/ldap_debug_handler.c
Changeset truncated at 500 lines:
diff --git a/.gitignore b/.gitignore
index d5e5177..4d39d12 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,4 +28,4 @@ source/config.cache
source/library-versions
source/nsswitch/*.so
source/proto_exists
-source/winbindd/winbindd_proto.h
+source/nsswitch/winbindd_proto.h
diff --git a/examples/logon/genlogon/genlogon.pl b/examples/logon/genlogon/genlogon.pl
index 8ebf392..4799ac8 100644
--- a/examples/logon/genlogon/genlogon.pl
+++ b/examples/logon/genlogon/genlogon.pl
@@ -45,7 +45,7 @@ if ($ARGV[1] eq "SUPPORT" || $ARGV[0] eq "support")
}
# Connect shares just used by Administration staff
-If ($ARGV[1] eq "ADMIN" || $ARGV[0] eq "admin")
+if ($ARGV[1] eq "ADMIN" || $ARGV[0] eq "admin")
{
print LOGON "NET USE L: \\\\$ARGV[2]\\ADMIN\r\n";
print LOGON "NET USE K: \\\\$ARGV[2]\\MKTING\r\n";
diff --git a/packaging/Example/setup.sh b/packaging/Example/setup.sh
index 994b16d..7fd8fc4 100755
--- a/packaging/Example/setup.sh
+++ b/packaging/Example/setup.sh
@@ -24,4 +24,4 @@ echo "Done. Now settting up samba command"
ln /sbin/init.d/samba.init /sbin/samba
echo "Done."
echo "To start / stop samba:"
-echo " execute: samba [start | stop]
+echo " execute: samba [start | stop]"
diff --git a/source/Makefile.in b/source/Makefile.in
index ee6d6ed..f37a94e 100644
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -270,7 +270,7 @@ READLINE_OBJ = lib/readline.o
# Be sure to include them into your application
POPT_LIB_OBJ = lib/popt_common.o
-PARAM_OBJ = dynconfig.o param/loadparm.o param/params.o lib/sharesec.o
+PARAM_OBJ = dynconfig.o param/loadparm.o param/params.o lib/sharesec.o lib/ldap_debug_handler.o
KRBCLIENT_OBJ = libads/kerberos.o libads/ads_status.o
@@ -286,9 +286,9 @@ LIBADS_OBJ = libads/ldap.o libads/ldap_printer.o libads/sasl.o \
libads/krb5_setpw.o libads/ldap_user.o \
libads/ads_struct.o libads/kerberos_keytab.o \
libads/disp_sec.o libads/ads_utils.o libads/ldap_utils.o \
- libads/authdata.o libads/cldap.o
+ libads/authdata.o libads/cldap.o libads/util.o
-LIBADS_SERVER_OBJ = libads/util.o libads/kerberos_verify.o \
+LIBADS_SERVER_OBJ = libads/kerberos_verify.o \
libads/ldap_schema.o
SECRETS_OBJ = passdb/secrets.o passdb/machine_sid.o
@@ -1681,6 +1681,7 @@ python_install: $(PYTHON_OBJ)
python_clean:
@-if test -n "$(PYTHON)"; then $(PYTHON) python/setup.py clean; fi
+ @-rm -rf build/
# revert to the previously installed version
revert:
@@ -1869,6 +1870,7 @@ realclean: clean delheaders
distclean: realclean
-rm -f include/stamp-h
+ -rm -f smbadduser
-rm -f include/config.h Makefile
-rm -f config.status config.cache so_locations
-rm -rf .deps TAGS
diff --git a/source/VERSION b/source/VERSION
index d80ff13..4095e11 100644
--- a/source/VERSION
+++ b/source/VERSION
@@ -36,7 +36,7 @@ SAMBA_VERSION_RELEASE=28
# e.g. SAMBA_VERSION_REVISION=a #
# -> "2.2.8a" #
########################################################
-SAMBA_VERSION_REVISION=
+SAMBA_VERSION_REVISION=a
########################################################
# For 'pre' releases the version will be #
@@ -68,7 +68,7 @@ SAMBA_VERSION_RC_RELEASE=
# e.g. SAMBA_VERSION_IS_SVN_SNAPSHOT=yes #
# -> "3.0.0-SVN-build-199" #
########################################################
-SAMBA_VERSION_IS_GIT_SNAPSHOT=
+SAMBA_VERSION_IS_GIT_SNAPSHOT=yes
########################################################
# This can be set by vendors if they want... #
@@ -95,5 +95,5 @@ SAMBA_VERSION_IS_GIT_SNAPSHOT=
# e.g. SAMBA_VERSION_VENDOR_SUFFIX=vendor_version() #
# -> "CVS 3.0.0rc2-VendorVersion" #
########################################################
-SAMBA_VERSION_VENDOR_SUFFIX=
+SAMBA_VERSION_VENDOR_SUFFIX="test"
SAMBA_VERSION_VENDOR_PATCH=
diff --git a/source/auth/auth_domain.c b/source/auth/auth_domain.c
index a32677d..115c57f 100644
--- a/source/auth/auth_domain.c
+++ b/source/auth/auth_domain.c
@@ -125,11 +125,14 @@ machine %s. Error was : %s.\n", dc_name, nt_errstr(result)));
if (!lp_client_schannel()) {
/* We need to set up a creds chain on an unauthenticated netlogon pipe. */
- uint32 neg_flags = NETLOGON_NEG_AUTH2_FLAGS;
+ uint32 neg_flags = NETLOGON_NEG_SELECT_AUTH2_FLAGS;
uint32 sec_chan_type = 0;
unsigned char machine_pwd[16];
+ const char *account_name;
- if (!get_trust_pw(domain, machine_pwd, &sec_chan_type)) {
+ if (!get_trust_pw_hash(domain, machine_pwd, &account_name,
+ &sec_chan_type))
+ {
DEBUG(0, ("connect_to_domain_password_server: could not fetch "
"trust account password for domain '%s'\n",
domain));
@@ -143,7 +146,7 @@ machine %s. Error was : %s.\n", dc_name, nt_errstr(result)));
dc_name, /* server name */
domain, /* domain */
global_myname(), /* client name */
- global_myname(), /* machine account name */
+ account_name, /* machine account name */
machine_pwd,
sec_chan_type,
&neg_flags);
diff --git a/source/auth/auth_ntlmssp.c b/source/auth/auth_ntlmssp.c
index 51b145a..a49b36a 100644
--- a/source/auth/auth_ntlmssp.c
+++ b/source/auth/auth_ntlmssp.c
@@ -187,7 +187,13 @@ NTSTATUS auth_ntlmssp_start(AUTH_NTLMSSP_STATE **auth_ntlmssp_state)
void auth_ntlmssp_end(AUTH_NTLMSSP_STATE **auth_ntlmssp_state)
{
- TALLOC_CTX *mem_ctx = (*auth_ntlmssp_state)->mem_ctx;
+ TALLOC_CTX *mem_ctx;
+
+ if (*auth_ntlmssp_state == NULL) {
+ return;
+ }
+
+ mem_ctx = (*auth_ntlmssp_state)->mem_ctx;
if ((*auth_ntlmssp_state)->ntlmssp_state) {
ntlmssp_end(&(*auth_ntlmssp_state)->ntlmssp_state);
diff --git a/source/auth/auth_server.c b/source/auth/auth_server.c
index d490b1a..ba2a714 100644
--- a/source/auth/auth_server.c
+++ b/source/auth/auth_server.c
@@ -71,6 +71,7 @@ static struct cli_state *server_cryptkey(TALLOC_CTX *mem_ctx)
connection (tridge) */
if (!grab_server_mutex(desthost)) {
+ cli_shutdown(cli);
return NULL;
}
diff --git a/source/auth/auth_util.c b/source/auth/auth_util.c
index 32224fa..b3a3d39 100644
--- a/source/auth/auth_util.c
+++ b/source/auth/auth_util.c
@@ -811,7 +811,7 @@ static NTSTATUS create_builtin_administrators( void )
return NT_STATUS_NO_MEMORY;
}
fstr_sprintf( root_name, "%s\\root", get_global_sam_name() );
- ret = lookup_name( ctx, root_name, 0, NULL, NULL, &root_sid, &type );
+ ret = lookup_name( ctx, root_name, LOOKUP_NAME_DOMAIN, NULL, NULL, &root_sid, &type );
TALLOC_FREE( ctx );
if ( ret ) {
diff --git a/source/client/client.c b/source/client/client.c
index 0cc1433..3f96f63 100644
--- a/source/client/client.c
+++ b/source/client/client.c
@@ -279,9 +279,11 @@ static int do_cd(char *newdir)
pstrcpy(cur_dir,p);
} else {
pstrcat(cur_dir,p);
- if ((cur_dir[0] != '\0') && (*(cur_dir+strlen(cur_dir)-1) != CLI_DIRSEP_CHAR)) {
- pstrcat(cur_dir, CLI_DIRSEP_STR);
- }
+ }
+
+ /* Ensure cur_dir ends in a DIRSEP */
+ if ((cur_dir[0] != '\0') && (*(cur_dir+strlen(cur_dir)-1) != CLI_DIRSEP_CHAR)) {
+ pstrcat(cur_dir, CLI_DIRSEP_STR);
}
clean_name(cur_dir);
@@ -699,18 +701,12 @@ static int cmd_dir(void)
int rc;
dir_total = 0;
- if (strcmp(cur_dir, CLI_DIRSEP_STR) != 0) {
- pstrcpy(mask,cur_dir);
- if ((mask[0] != '\0') && (mask[strlen(mask)-1]!=CLI_DIRSEP_CHAR))
- pstrcat(mask,CLI_DIRSEP_STR);
- } else {
- pstrcpy(mask, CLI_DIRSEP_STR);
- }
+ pstrcpy(mask,cur_dir);
if (next_token_nr(NULL,buf,NULL,sizeof(buf))) {
dos_format(p);
if (*p == CLI_DIRSEP_CHAR)
- pstrcpy(mask,p + 1);
+ pstrcpy(mask,p);
else
pstrcat(mask,p);
} else {
@@ -745,9 +741,7 @@ static int cmd_du(void)
dir_total = 0;
pstrcpy(mask,cur_dir);
- if ((mask[0] != '\0') && (mask[strlen(mask)-1]!=CLI_DIRSEP_CHAR))
- pstrcat(mask,CLI_DIRSEP_STR);
-
+
if (next_token_nr(NULL,buf,NULL,sizeof(buf))) {
dos_format(p);
if (*p == CLI_DIRSEP_CHAR)
@@ -912,7 +906,6 @@ static int cmd_get(void)
char *p;
pstrcpy(rname,cur_dir);
- pstrcat(rname,CLI_DIRSEP_STR);
p = rname + strlen(rname);
@@ -1007,7 +1000,6 @@ static int cmd_more(void)
int rc = 0;
pstrcpy(rname,cur_dir);
- pstrcat(rname,CLI_DIRSEP_STR);
slprintf(lname,sizeof(lname)-1, "%s/smbmore.XXXXXX",tmpdir());
fd = smb_mkstemp(lname);
@@ -1056,8 +1048,6 @@ static int cmd_mget(void)
while (next_token_nr(NULL,p,NULL,sizeof(buf))) {
pstrcpy(mget_mask,cur_dir);
- if ((mget_mask[0] != '\0') && (mget_mask[strlen(mget_mask)-1]!=CLI_DIRSEP_CHAR))
- pstrcat(mget_mask,CLI_DIRSEP_STR);
if (*p == CLI_DIRSEP_CHAR)
pstrcpy(mget_mask,p);
@@ -1068,8 +1058,6 @@ static int cmd_mget(void)
if (!*mget_mask) {
pstrcpy(mget_mask,cur_dir);
- if(mget_mask[strlen(mget_mask)-1]!=CLI_DIRSEP_CHAR)
- pstrcat(mget_mask,CLI_DIRSEP_STR);
pstrcat(mget_mask,"*");
do_list(mget_mask, attribute,do_mget,False,True);
}
@@ -1348,7 +1336,6 @@ static int cmd_put(void)
char *p=buf;
pstrcpy(rname,cur_dir);
- pstrcat(rname,CLI_DIRSEP_STR);
if (!next_token_nr(NULL,p,NULL,sizeof(buf))) {
d_printf("put <filename>\n");
@@ -1997,6 +1984,7 @@ static int cmd_posix(void)
CLI_DIRSEP_CHAR = '/';
*CLI_DIRSEP_STR = '/';
pstrcpy(cur_dir, CLI_DIRSEP_STR);
+ do_cd(cur_dir);
}
return 0;
@@ -2902,7 +2890,6 @@ static int cmd_reget(void)
char *p;
pstrcpy(remote_name, cur_dir);
- pstrcat(remote_name, CLI_DIRSEP_STR);
p = remote_name + strlen(remote_name);
@@ -2931,7 +2918,6 @@ static int cmd_reput(void)
SMB_STRUCT_STAT st;
pstrcpy(remote_name, cur_dir);
- pstrcat(remote_name, CLI_DIRSEP_STR);
if (!next_token_nr(NULL, p, NULL, sizeof(buf))) {
d_printf("reput <filename>\n");
@@ -3857,6 +3843,7 @@ static int do_message_op(void)
int main(int argc,char *argv[])
{
pstring base_directory;
+ int len = 0;
int opt;
pstring query_host;
BOOL message = False;
@@ -3907,7 +3894,7 @@ static int do_message_op(void)
set_global_myworkgroup( "" );
set_global_myname( "" );
- /* set default debug level to 0 regardless of what smb.conf sets */
+ /* set default debug level to 1 regardless of what smb.conf sets */
setup_logging( "smbclient", True );
DEBUGLEVEL_CLASS[DBGC_ALL] = 1;
if ((dbf = x_fdup(x_stderr))) {
@@ -4068,6 +4055,12 @@ static int do_message_op(void)
poptPrintUsage(pc, stderr, 0);
exit(1);
}
+ /* Remove trailing slashes */
+ len = strlen(service);
+ while(len > 0 && service[len - 1] == '\\') {
+ --len;
+ service[len] = '\0';
+ }
}
if ( strlen(new_workgroup) != 0 )
diff --git a/source/client/mount.cifs.c b/source/client/mount.cifs.c
index 2e48a42..4385412 100755
--- a/source/client/mount.cifs.c
+++ b/source/client/mount.cifs.c
@@ -80,6 +80,40 @@ static char * mountpassword = NULL;
char * domain_name = NULL;
char * prefixpath = NULL;
+/* glibc doesn't have strlcpy, strlcat. Ensure we do. JRA. We
+ * don't link to libreplace so need them here. */
+
+/* like strncpy but does not 0 fill the buffer and always null
+ * terminates. bufsize is the size of the destination buffer */
+size_t strlcpy(char *d, const char *s, size_t bufsize)
+{
+ size_t len = strlen(s);
+ size_t ret = len;
+ if (bufsize <= 0) return 0;
+ if (len >= bufsize) len = bufsize-1;
+ memcpy(d, s, len);
+ d[len] = 0;
+ return ret;
+}
+
+/* like strncat but does not 0 fill the buffer and always null
+ * terminates. bufsize is the length of the buffer, which should
+ * be one more than the maximum resulting string length */
+size_t strlcat(char *d, const char *s, size_t bufsize)
+{
+ size_t len1 = strlen(d);
+ size_t len2 = strlen(s);
+ size_t ret = len1 + len2;
+
+ if (len1+len2 >= bufsize) {
+ len2 = bufsize - (len1+1);
+ }
+ if (len2 > 0) {
+ memcpy(d+len1, s, len2);
+ d[len1+len2] = 0;
+ }
+ return ret;
+}
/* BB finish BB
@@ -169,8 +203,10 @@ static int open_cred_file(char * file_name)
/* go past equals sign */
temp_val++;
for(length = 0;length<4087;length++) {
- if(temp_val[length] == '\n')
+ if ((temp_val[length] == '\n')
+ || (temp_val[length] == '\0')) {
break;
+ }
}
if(length > 4086) {
printf("mount.cifs failed due to malformed username in credentials file");
@@ -193,8 +229,10 @@ static int open_cred_file(char * file_name)
/* go past equals sign */
temp_val++;
for(length = 0;length<65;length++) {
- if(temp_val[length] == '\n')
+ if ((temp_val[length] == '\n')
+ || (temp_val[length] == '\0')) {
break;
+ }
}
if(length > 64) {
printf("mount.cifs failed: password in credentials file too long\n");
@@ -222,8 +260,10 @@ static int open_cred_file(char * file_name)
if(verboseflag)
printf("\nDomain %s\n",temp_val);
for(length = 0;length<65;length++) {
- if(temp_val[length] == '\n')
- break;
+ if ((temp_val[length] == '\n')
+ || (temp_val[length] == '\0')) {
+ break;
+ }
}
if(length > 64) {
printf("mount.cifs failed: domain in credentials file too long\n");
@@ -321,6 +361,8 @@ static int parse_options(char ** optionsp, int * filesys_flags)
int out_len = 0;
int word_len;
int rc = 0;
+ char user[32];
+ char group[32];
if (!optionsp || !*optionsp)
return 1;
@@ -331,6 +373,13 @@ static int parse_options(char ** optionsp, int * filesys_flags)
/* BB fixme check for separator override BB */
+ if (getuid()) {
+ got_uid = 1;
+ snprintf(user,sizeof(user),"%u",getuid());
+ got_gid = 1;
+ snprintf(group,sizeof(group),"%u",getgid());
+ }
+
/* while ((data = strsep(&options, ",")) != NULL) { */
while(data != NULL) {
/* check if ends with trailing comma */
@@ -493,33 +542,33 @@ static int parse_options(char ** optionsp, int * filesys_flags)
got_uid = 1;
if (!isdigit(*value)) {
struct passwd *pw;
- static char temp[32];
if (!(pw = getpwnam(value))) {
printf("bad user name \"%s\"\n", value);
exit(1);
}
- sprintf(temp, "%u", pw->pw_uid);
- value = temp;
- endpwent();
+ snprintf(user, sizeof(user), "%u", pw->pw_uid);
+ } else {
+ strlcpy(user,value,sizeof(user));
}
}
+ goto nocopy;
} else if (strncmp(data, "gid", 3) == 0) {
if (value && *value) {
got_gid = 1;
if (!isdigit(*value)) {
struct group *gr;
- static char temp[32];
if (!(gr = getgrnam(value))) {
printf("bad group name \"%s\"\n", value);
exit(1);
}
- sprintf(temp, "%u", gr->gr_gid);
- value = temp;
- endpwent();
+ snprintf(group, sizeof(group), "%u", gr->gr_gid);
+ } else {
+ strlcpy(group,value,sizeof(group));
}
}
+ goto nocopy;
/* fmask and dmask synonyms for people used to smbfs syntax */
} else if (strcmp(data, "file_mode") == 0 || strcmp(data, "fmask")==0) {
if (!value || !*value) {
@@ -610,17 +659,55 @@ static int parse_options(char ** optionsp, int * filesys_flags)
exit(1);
}
- if (out_len)
- out[out_len++] = ',';
+ if (out_len) {
+ strlcat(out, ",", out_len + word_len + 2);
+ out_len++;
+ }
+
if (value)
- sprintf(out + out_len, "%s=%s", data, value);
+ snprintf(out + out_len, word_len + 1, "%s=%s", data, value);
else
- sprintf(out + out_len, "%s", data);
+ snprintf(out + out_len, word_len + 1, "%s", data);
out_len = strlen(out);
nocopy:
data = next_keyword;
}
+
+ /* special-case the uid and gid */
+ if (got_uid) {
+ word_len = strlen(user);
+
+ out = (char *)realloc(out, out_len + word_len + 6);
+ if (out == NULL) {
--
Samba Shared Repository
More information about the samba-cvs
mailing list