[SCM] Samba Shared Repository - branch v3-4-stable updated
Karolin Seeger
kseeger at samba.org
Tue Oct 20 07:01:56 MDT 2009
The branch, v3-4-stable has been updated
via 1b5efd6... s3:docs: Add info about how to obtain cifs module in cifs mount helper manpage (cherry picked from commit a224392649ffb81dc1d67f41a01dd983b76d513b)
via e979707... s3-spnego: Fix Bug #6815. Windows 2008 R2 SPNEGO negTokenTarg parsing failure.
via 6ed52d8... s3-spnego: avoid NULL talloc context in read_spnego_data().
via 8f9f562... WHATSNEW: Start release notes for Samba 3.4.3.
via 4d92448... VERSION: Raise version number up to 3.4.3.
via e82a147... s3:configure: fix avahi activation
via 76b4b06... Fix symlink calls in all vfs modules.
via ab0f214... s3:packaging: Fix building RHEL packages.
via b20aba3... cifs.upcall: do a brute-force search for KRB5 credcache
via d818cca... cifs.upcall: make using ip address conditional on new option
via d071bf5... cifs.upcall: switch to getopt_long
via f0cb229... cifs.upcall: fix IPv6 addrs sent to upcall to have colon delimiters
via 6344285... cifs.upcall: use ip address passed by kernel to get server's hostname
via 602bef6... cifs.upcall: clean up flag handling
via 9d1517e... cifs.upcall: try getting a "cifs/" principal and fall back to "host/"
via 9724c2e... cifs.upcall: declare a structure for holding decoded args
via 49b8601... cifs.upcall: formatting cleanup
via 8ecfe76... cifs.upcall: clean up logging and add debug messages
via 2342d8d... Attempt to fix the build -- jlayton, please check! (cherry picked from commit 78b53b878a7871ea0ef311317da561008ad07e08)
via 4231fc2... cifs.upcall: use pid value from kernel to determine KRB5CCNAME to use
via dc09f08... Final part of fix for bug 6793 - winbindd crash with "INTERNAL ERROR: Signal 6" Don't use mapped_user uninitialized. Jeremy. (cherry picked from commit 85ee2971db36455d908066eae2630925081792c9)
via 8f5fd3d... s3/aio: Correctly handle aio_error() and errno.
via 34ff542... Fix bug 6811 - pam_winbind references freed memory. s3: Fix reference to freed memory in pam_winbind. (cherry picked from commit 106e3d5bdb1683d53b5525e3fe2e9e2d9de27e2c)
via 616ca75... s3: Fix bug 6606
via 40156d9... s3:winbind: Fix a double-free
via 65f925c... s3:winbind: Fix bug 6793 -- segfault in winbindd_pam_auth (cherry picked from commit 2e478cc8c31bc60325a8e01885222d1db29ca21c)
via 53222f2... s3:net: Fix a segfault in "net rpc trustdom list" for overlong domain names
via 0068147... s3/loadparm: Fix hpux compiler issue.
via fe03743... s3: Fix a memleak reported by dmarkey (cherry picked from commit 5aeb954ba9382e1975c64ac96f1e377ed6af3ae0)
via 2ce7736... Fix bug 6796 - Deleting an event context on shutdown can cause smbd to crash.
via 21d70b5... Fix bug 6774 - smbd crashes if "aio write behind" is set.
via d4ee977... s3/aio: allow for outstanding_aio_calls to be decremented.
via bcb3641... s3/Makefile: BUG 6791: Fix link order for libwbclient.
via 4b3a41c... s3/Makefile: BUG 6791: Fix linking order in cifs.upcall.
via 70ed06d... Correct fix for bug 6781 - Cannot rename subfolders in Explorer view with recent versions of Samba. Without this fix, renaming a directory ./a to ./b, whilst a directory ./aa was already open would fail. Simplifies logic of earlier code. Jeremy. (cherry picked from commit 37f42ad6a1fff1e43bfd6dcaa8244b738ea37363)
via db2eedb... Fix bug 6769 - symlink unlink does nothing. Jeremy. (cherry picked from commit 9f7d155001bc4c2808b6d17e9cb5ce87173b6061)
via 4e458a6... s3:winbind: Only ever handle one event after a select call
via ede45f4... Fix bug 6776 - Running overlapping Byte Lock test will core dump Samba daemon. Re-write core of POSIX locking logic. Jeremy. (cherry picked from commit e3a41dd3167df58990d4b0f1f2ea6b6583826cf9)
via 3dbe67e... s3:smbd: Fix bug 6690, wrong error check (cherry picked from commit f1f6df1747164f3f57adc9c6912b27592baa0802)
via b6d335e... s3:winbindd: only notify the client when we exist, if the connection isn't dead already
via 3978090... s3:winbindd_cm: don't invalidate the whole connection when just samr gave ACCCESS_DENIED
via 04be26e... s3:rpc_client: don't randomly fragment rpc pdu's in developer mode
via 15ac512... s3:lib/select: don't overwrite errno in the signal handler
via c095ae5... tevent: make sure we don't set errno within the signal handler function.
via 58c05cf... s3:rpc_server: we need to make a copy of my_name in serverinfo_to_SamInfo_base()
via 6824cfb... s3:winbind: Fix an uninitialized variable (cherry picked from commit 0724649a8a7c04d015317d9dc2ae43ee87c1bd25) (cherry picked from commit d6af2a5ff4e4f723e521a3f708751b3155f870fc)
via 0f0d797... s3-winbindd: Fix Bug #6711: trusts to windows 2008 (2008 r2) not working.
via 742e7ff... s3-winbindd: add cm_connect_lsa_tcp().
via c8ab33d... s3-rpc_client: fix non initialized structure in rpccli_lsa_lookup_sids_noalloc.
via a073414... s3-rpc_client: add rpccli_lsa_lookup_sids3 wrapper.
via 96960d8... s3-rpc_client: add rpccli_lsa_lookup_names4 wrapper.
via cca9f6f... s3-winbindd: add and use winbindd_lookup_names().
via 42910c0... s3-winbindd: add and use winbindd_lookup_sids().
via 39bdbf0... s3-rpc_client: add dcerpc_transport_t to cli_rpc_pipe_open_schannel().
via 6d17737... s3-rpc_client: add dcerpc_transport_t to cli_rpc_pipe_open_spnego_ntlmssp and cli_rpc_pipe_open_ntlmssp.
via 38c3ff5... s3-rpc_client: add cli_rpc_pipe_open_noauth_transport.
via 5408dbe... s3-rpc_client: add enum dcerpc_transport_t to rpc_cli_transport struct.
via 93d2e0e... Second part of a fix for bug #6235.
via bcdac6c... Fix bug #6532.
via 57d15bb... Fixing timeval calculation
via 340077b... s3: Document the "share:fake_fscaps" parameter, fix bug 6765 (cherry picked from commit 21794b0dd28a80b149342b3218d7ebb4c8791e09) (cherry picked from commit d046ab32094caa9511862144df1c00e64c234487)
via 1245730... s3:smbd: Add a "hidden" parameter "share:fake_fscaps"
via ac8b7ec... Adjust regex to match variable names including underscores
via 909b717... s3: Don't overwrite password in pam_winbind, subsequent pam modules might use the old password and new password.
via a6c0602... s3: Fix reading beyond the end of a named stream in xattr_streams
via 2089484... s3: BSD needs sys/sysctl.h included to build properly
via 5ef2775... s3:smbstatus: Fix bug 6703, allow smbstatus as non-root
via 21cf908... s3: QNX doesn't know uint - replace with uint_t (cherry picked from commit a28596964b44f20d794999541d38fe4bae64b56b) (cherry picked from commit 47c2dc4eee5f7644601db0c24dca0ca30b482940)
via 02a5658... s3/libsmb: SIVAL should have been an SVAL.
via 46a716f... Fix bug 6707 - 3.4.1 segfault in parsing configs. Fixes an occasional segfault caused by an out-of-bounds reference in config file parsing. (cherry picked from commit 7c00227f00a83345035c4c0a6716b46864f2da8d) (cherry picked from commit 0241ba8ce2b6da049fb3cc512508a9e9c5732781)
via 418ebb4... Fix bug 6529 - Offline files conflict with Vista and Office 2003. Jeremy. (cherry picked from commit e971428f137dcb42e8b735386d79f1b3a6effe34)
via 83a18d1... Conditional install of the cifs.upcall man page
via 0155476... s3:configure: fix syntax error in avahi configure test (cherry picked from commit b54e48b830dbc3d66f9de5d2711a57a1630809e2)
via b80b062... umount.cifs: do not attempt to update /etc/mtab if it is symbolic link
from 7439cd5... Fix for CVE-2009-2906.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-stable
- Log -----------------------------------------------------------------
commit 1b5efd64b8ceb25e027db150fc9cb4da26b1b5a7
Author: Volker Lendecke <vl at samba.org>
Date: Wed Sep 9 23:08:28 2009 +0200
s3:docs: Add info about how to obtain cifs module in cifs mount helper manpage
(cherry picked from commit a224392649ffb81dc1d67f41a01dd983b76d513b)
Fixes bug #5129.
(cherry picked from commit 646f0534acf0c480a61e0a02d1d815347b5e6d52)
commit e9797070e29898d1ceb8caa6d591d16558acf834
Author: Günther Deschner <gd at samba.org>
Date: Thu Oct 15 16:01:36 2009 +0200
s3-spnego: Fix Bug #6815. Windows 2008 R2 SPNEGO negTokenTarg parsing failure.
When parsing a SPNEGO session setup retry (falling back from KRB5 to NTLMSSP),
we failed to parse the ASN1_ENUMERATED negResult in the negTokenTarg, thus
failing spnego_parse_auth() completely.
Guenther
(cherry picked from commit 78ba2e1b9e5a63443f4cd51d34c16bc7cc9c6941)
commit 6ed52d80565c5558a70a75cb634dff8b62b8794c
Author: Günther Deschner <gd at samba.org>
Date: Thu Oct 15 16:00:57 2009 +0200
s3-spnego: avoid NULL talloc context in read_spnego_data().
Guenther
(cherry picked from commit a830aa269f44e28a2390e162adbb2e26092f179b)
commit 8f9f5623d09dffedb3df902977081210b3b84ba1
Author: Karolin Seeger <kseeger at samba.org>
Date: Mon Oct 19 14:56:44 2009 +0200
WHATSNEW: Start release notes for Samba 3.4.3.
Karolin
(cherry picked from commit e97037236fb82bd990382301fbab20e8d44e9371)
commit 4d92448e2800483d5597e3d483ca1bcdd074a3db
Author: Karolin Seeger <kseeger at samba.org>
Date: Mon Oct 19 14:54:37 2009 +0200
VERSION: Raise version number up to 3.4.3.
Karolin
(cherry picked from commit de5151e59f2e060938b957b074e3d0dabd60161c)
commit e82a14728a24e3a23b3ac0969c05ed5e4b47881f
Author: Björn Jacke <bj at sernet.de>
Date: Sun Oct 18 17:01:57 2009 +0200
s3:configure: fix avahi activation
Avahi was correctly found but not activated since e4a26c942.
(cherry picked from commit 718d2801d6bafedfe91d7b475294d69e2d6a77a4)
Fix bug #6824.
(cherry picked from commit f1023e5f6252bc8efa732f519ec9588deed6c774)
commit 76b4b06985d1c0b285edbafdfb772b73a2035b4f
Author: Jeremy Allison <jra at samba.org>
Date: Mon Oct 19 08:39:23 2009 +0200
Fix symlink calls in all vfs modules.
Additional patch to fix bug #6769.
(cherry picked from commit d8c7a5aafe0c17c69013766022418edcec481f8c)
commit ab0f2141706520cec0d7d52ce7cc0a18055c4864
Author: Karolin Seeger <kseeger at samba.org>
Date: Fri Oct 16 16:00:26 2009 +0200
s3:packaging: Fix building RHEL packages.
Fix bug #6721.
Thanks to Eero Volotinen <eero.volotinen at medicel.com> for providing the patch!
Karolin
(cherry picked from commit 79c2c61b99eb7c47c8bfbbb479d9d2197d1ad1fb)
(cherry picked from commit 11a6d88ea387fa50690880561f0ffffefbeb8956)
(cherry picked from commit ece84bf7a8066999ac7198e7625a4d1a8fddb91b)
commit b20aba35fdee6a43fbceb0b656c803c451d3e13b
Author: Jeff Layton <jlayton at redhat.com>
Date: Wed Oct 14 10:59:00 2009 -0400
cifs.upcall: do a brute-force search for KRB5 credcache
A few weeks ago, I added some code to cifs.upcall to take the pid sent
by the kernel and use that to get the value of the $KRB5CCNAME
environment var for the process. That works fine on the initial mount,
but could be problematic on reconnect.
There's no guarantee on a reconnect that the process that initiates the
upcall will have $KRB5CCNAME pointed at the correct credcache. Because
of this, the current scheme isn't going to be reliable enough and we
need to use something different.
This patch replaces that scheme with one very similar to the one used by
rpc.gssd in nfs-utils. It searches the credcache dir (currently
hardcoded to /tmp) for a valid credcache for the given uid. If it finds
one then it uses that as the credentials cache. If it finds more than
one, it uses the one with the latest TGT expiration.
Signed-off-by: Jeff Layton <jlayton at redhat.com>
Addresses bug #6810.
(cherry picked from commit 5df191a5fdad480d00d278c7f5046c6f0b80e386)
commit d818ccafee4f494bec1cc29fbac2ea4f7a51a3af
Author: Jeff Layton <jlayton at redhat.com>
Date: Wed Oct 14 10:58:56 2009 -0400
cifs.upcall: make using ip address conditional on new option
Igor Mammedov pointed out that reverse resolving an IP address to get
the hostname portion of a principal could open a possible attack
vector. If an attacker were to gain control of DNS, then he could
redirect the mount to a server of his choosing, and fix the reverse
resolution to point to a hostname of his choosing (one where he has
the key for the corresponding cifs/ or host/ principal).
That said, we often trust DNS for other reasons and it can be useful
to do so. Make the code that allows trusting DNS to be enabled by
adding --trust-dns to the cifs.upcall invocation.
Signed-off-by: Jeff Layton <jlayton at redhat.com>
(cherry picked from commit f3b2402a737ff0a7e80a03ade9f57d65dabdc7eb)
commit d071bf5fe7f9d172ebe3cb388516bc36b348e633
Author: Jeff Layton <jlayton at redhat.com>
Date: Wed Oct 14 10:58:48 2009 -0400
cifs.upcall: switch to getopt_long
...to allow long option names.
Signed-off-by: Jeff Layton <jlayton at redhat.com>
(cherry picked from commit d95570b60832e980f0ff6bad96a3a45a7ba9789a)
commit f0cb229a329a9fc7eacdced3ff7bd2fb4eff4f63
Author: Jeff Layton <jlayton at redhat.com>
Date: Wed Oct 14 10:58:48 2009 -0400
cifs.upcall: fix IPv6 addrs sent to upcall to have colon delimiters
Current kernels don't send IPv6 addresses with the colon delimiters, add
a routine to add them when they're not present.
Signed-off-by: Jeff Layton <jlayton at redhat.com>
(cherry picked from commit 00f298804be8f561e6ed584fcd516634ec74c4d7)
commit 6344285167075baec4ebfee5e040965380379f9b
Author: Jeff Layton <jlayton at redhat.com>
Date: Wed Oct 14 10:58:48 2009 -0400
cifs.upcall: use ip address passed by kernel to get server's hostname
Instead of using the hostname given by the upcall to get the server's
principal, take the IP address given in the upcall and reverse resolve
it to a hostname.
Signed-off-by: Jeff Layton <jlayton at redhat.com>
(cherry picked from commit 95d7a6d7699604ec1b5b0e90b341c57c2d3c55c2)
commit 602bef625d3865064a2d399bd8ecf5a92c097221
Author: Jeff Layton <jlayton at redhat.com>
Date: Wed Oct 14 10:58:47 2009 -0400
cifs.upcall: clean up flag handling
Add a new stack var to hold the flags returned by the decoder routine
so that we don't need to worry so much about preserving "rc".
With this, we can drop privs before trying to find the location of
the credcache.
Signed-off-by: Jeff Layton <jlayton at redhat.com>
(cherry picked from commit 531a2f482d7519122f79d9d8049a96f63d361a2f)
commit 9d1517e8fa2e4252685a36e35b5efe60ff8bec39
Author: Jeff Layton <jlayton at redhat.com>
Date: Wed Oct 14 10:58:20 2009 -0400
cifs.upcall: try getting a "cifs/" principal and fall back to "host/"
cifs.upcall takes a "-c" flag that tells the upcall to get a principal
in the form of "cifs/hostname.example.com at REALM" instead of
"host/hostname.example.com at REALM". This has turned out to be a source of
great confusion for users.
Instead of requiring this flag, have the upcall try to get a "cifs/"
principal first. If that fails, fall back to getting a "host/"
principal.
Signed-off-by: Jeff Layton <jlayton at redhat.com>
(cherry picked from commit edca7df0dd43ee1d7ae2fc4954470efdf64a4d8e)
commit 9724c2e38497a87b078a163f68c5372886f90c60
Author: Jeff Layton <jlayton at redhat.com>
Date: Wed Oct 14 10:44:40 2009 -0400
cifs.upcall: declare a structure for holding decoded args
The argument list for the decoder is becoming rather long. Declare an
args structure and use that for holding the args. This also simplifies
pointer handling a bit.
Signed-off-by: Jeff Layton <jlayton at redhat.com>
(cherry picked from commit 3eac202b211b382ebe299538647cbbd7d0c803b1)
commit 49b8601024942b5ebaac11968f22eda78cf46481
Author: Jeff Layton <jlayton at redhat.com>
Date: Wed Oct 14 10:44:22 2009 -0400
cifs.upcall: formatting cleanup
Clean up some unneeded curly braces, and fix some indentation.
Signed-off-by: Jeff Layton <jlayton at redhat.com>
(cherry picked from commit 8bf083788bed03fdc7b535595eea8ce83a6f15f9)
commit 8ecfe76accf89128b2e4c8f67d1e4215e2c6b01e
Author: Jeff Layton <jlayton at redhat.com>
Date: Wed Oct 14 10:43:18 2009 -0400
cifs.upcall: clean up logging and add debug messages
Change the log levels to be more appropriate to the messages being
logged. Error messages should be LOG_ERR and not LOG_WARNING, for
instance.
Add some LOG_DEBUG messages that we can use to diagnose problems with
krb5 upcalls. With these, someone can set up syslog to log daemon.debug
and should be able to get more info when things aren't working.
Signed-off-by: Jeff Layton <jlayton at redhat.com>
(cherry picked from commit 7c7bb1572c86767658852426e6eb7de901b1cab2)
commit 2342d8d492f3af302c7d23ab07aea994b4c5fb3c
Author: Volker Lendecke <vl at samba.org>
Date: Wed Oct 14 10:42:46 2009 -0400
Attempt to fix the build -- jlayton, please check!
(cherry picked from commit 78b53b878a7871ea0ef311317da561008ad07e08)
commit 4231fc25d5b466d71e5fc4fc292270e4182252b2
Author: Jeff Layton <jlayton at redhat.com>
Date: Wed Oct 14 10:42:28 2009 -0400
cifs.upcall: use pid value from kernel to determine KRB5CCNAME to use
If the kernel sends the upcall a pid of the requesting process, we can
open that process' /proc/<pid>/environ file and scrape the KRB5CCNAME
value out of it.
Signed-off-by: Jeff Layton <jlayton at redhat.com>
(cherry picked from commit 416f92e3ae739d6ba6593c8e9c43192e4671fc77)
commit dc09f0815e17d565bd66e055b1a776c4375ae824
Author: Jeremy Allison <jra at samba.org>
Date: Wed Oct 14 11:11:26 2009 -0700
Final part of fix for bug 6793 - winbindd crash with "INTERNAL ERROR: Signal 6" Don't use mapped_user uninitialized. Jeremy.
(cherry picked from commit 85ee2971db36455d908066eae2630925081792c9)
commit 8f5fd3d4802e215d80919536a04dfe628fed7db7
Author: Olaf Flebbe <o.flebbe at science-computing.de>
Date: Tue Oct 6 11:09:28 2009 +0200
s3/aio: Correctly handle aio_error() and errno.
Fix bug #6805.
(cherry picked from commit dd28b7850c7ace008558571caee9679ff97a5e91)
commit 34ff5427413d2dba477538d9ab15cd44842c44ae
Author: Bo Yang <boyang at samba.org>
Date: Wed Oct 14 12:45:16 2009 -0700
Fix bug 6811 - pam_winbind references freed memory. s3: Fix reference to freed memory in pam_winbind.
(cherry picked from commit 106e3d5bdb1683d53b5525e3fe2e9e2d9de27e2c)
commit 616ca7544875b1c312397b8391a6ff5ceeacb806
Author: Volker Lendecke <vl at samba.org>
Date: Sat Oct 10 11:15:42 2009 +0200
s3: Fix bug 6606
This is a port of 1f34ffa0caae5 and 24309bdb2efc to 3.4.
Fix file corruption using smbclient with NT4 server.
(cherry picked from commit c685beb091cb0fedfb3f64bcc2ec2beb00fc9328)
commit 40156d9470ea7974d9c50f620fad516f10376d98
Author: Volker Lendecke <vl at samba.org>
Date: Tue Oct 13 20:56:28 2009 +0200
s3:winbind: Fix a double-free
Part of a fix for bug #6793.
(cherry picked from commit 0fc64947526f4eea896fd83b01194e40416d15f4)
commit 65f925cf47ac72c5aa28fbd3406273502336ba29
Author: Volker Lendecke <vl at samba.org>
Date: Fri Oct 9 22:05:37 2009 +0200
s3:winbind: Fix bug 6793 -- segfault in winbindd_pam_auth
(cherry picked from commit 2e478cc8c31bc60325a8e01885222d1db29ca21c)
commit 53222f23b3abb26d634e0b282310e7e34709b677
Author: Volker Lendecke <vl at samba.org>
Date: Tue Oct 13 15:56:00 2009 +0200
s3:net: Fix a segfault in "net rpc trustdom list" for overlong domain names
That was a complicated way to say "%-20.s"... But that code was from 2002 ...
(cherry picked from commit 8a27fdea89bc54aa35e363a376836662103c7cb7)
Fix Bug #6807.
(cherry picked from commit aa5a43143f26dee14dc1efe2a979a6701ddc650b)
commit 00681479d2f17a842cf77e35fd06f5af6cd5b543
Author: Olaf Flebbe <o.flebbe at science-computing.de>
Date: Tue Oct 13 11:39:49 2009 +0200
s3/loadparm: Fix hpux compiler issue.
Fixes bug #6804.
(cherry picked from commit bf64668cb114ca7afdc81545d229bcb73b59c8f6)
commit fe03743a71fe7069f8ebf8c2a291acf4da8ae379
Author: Volker Lendecke <vl at samba.org>
Date: Fri Oct 9 22:58:14 2009 +0200
s3: Fix a memleak reported by dmarkey
(cherry picked from commit 5aeb954ba9382e1975c64ac96f1e377ed6af3ae0)
Fix bug #6797.
(cherry picked from commit a5e71f765927de5aa2a8e6a21cc297d274e8a1c2)
commit 2ce7736058b58e337d42fc5e134096cc05cba4ed
Author: Jeremy Allison <jra at samba.org>
Date: Fri Oct 9 12:50:26 2009 -0700
Fix bug 6796 - Deleting an event context on shutdown can cause smbd to crash.
Sync's tevent signal code with 3.5.x tree.
Protects against ev pointer being NULL.
Jeremy
(cherry picked from commit 56290654c0c2056c31e0b348ba0d01e5c28ba89b)
commit 21d70b508b6e38a0659bc4ecfef7b360bce91b71
Author: Jeremy Allison <jra at samba.org>
Date: Fri Oct 9 10:01:29 2009 -0700
Fix bug 6774 - smbd crashes if "aio write behind" is set.
Don't dereference a talloc_move'd pointer.
Jeremy.
(cherry picked from commit 951991df2976b5f8f57c0418257d9d817ebda661)
commit d4ee9778ea8008faf4c1e06f2b105571f2521ea8
Author: Olaf Flebbe <o.flebbe at science-computing.de>
Date: Wed Sep 30 14:55:58 2009 +0200
s3/aio: allow for outstanding_aio_calls to be decremented.
Fixes bug #6772.
(cherry picked from commit a13f8bf949300079419cd86982012212323fcb65)
commit bcb3641a43892d27c35d32405ec7bed37b5be1b8
Author: Karolin Seeger <kseeger at samba.org>
Date: Fri Oct 9 08:58:55 2009 +0200
s3/Makefile: BUG 6791: Fix link order for libwbclient.
Patch was provided by Buchan Milne <bgmilne at mandriva.org>.
Signed-off-by: Björn Jacke <bj at sernet.de>
(cherry picked from commit c0cbfdef387bf70e589dec6a3bbd434d12cacc34)
commit 4b3a41cabf1a09e87e194ea8faeeb92674063c06
Author: Karolin Seeger <kseeger at samba.org>
Date: Fri Oct 9 08:55:53 2009 +0200
s3/Makefile: BUG 6791: Fix linking order in cifs.upcall.
Patch was originally provided by Buchan Milne <bgmilne at mandriva.org>.
Signed-off-by: Björn Jacke <bj at sernet.de>
(cherry picked from commit 7aea6adcede87a2389d933eedc50f836ba161f95)
commit 70ed06dcd73e0d8776a039d3475c1d5bf20cdab2
Author: Jeremy Allison <jra at samba.org>
Date: Wed Oct 7 15:46:57 2009 -0700
Correct fix for bug 6781 - Cannot rename subfolders in Explorer view with recent versions of Samba. Without this fix, renaming a directory ./a to ./b, whilst a directory ./aa was already open would fail. Simplifies logic of earlier code. Jeremy.
(cherry picked from commit 37f42ad6a1fff1e43bfd6dcaa8244b738ea37363)
commit db2eedbe88dc4e219afbc6f71642b60c714e898a
Author: Jeremy Allison <jra at samba.org>
Date: Thu Oct 8 16:40:26 2009 -0700
Fix bug 6769 - symlink unlink does nothing. Jeremy.
(cherry picked from commit 9f7d155001bc4c2808b6d17e9cb5ce87173b6061)
commit 4e458a6b46c20ed61695df2c8fc765139d021419
Author: Volker Lendecke <vl at samba.org>
Date: Wed Oct 7 14:06:53 2009 +0200
s3:winbind: Only ever handle one event after a select call
While handling an fd event, the situation with other fds can change. I've just
seen a winbind stuck in the accept() call on the privileged pipe. I can only
imagine this happen because under high load we first handled other requests and
meanwhile the client on the privileged pipe went away.
(cherry picked from commit 8ef4a183da8bdc9997c198678a931b111396c104)
commit ede45f4fab7768fb0838d1546d0b78e4abc2ea34
Author: Jeremy Allison <jra at samba.org>
Date: Mon Oct 5 14:22:05 2009 -0700
Fix bug 6776 - Running overlapping Byte Lock test will core dump Samba daemon. Re-write core of POSIX locking logic. Jeremy.
(cherry picked from commit e3a41dd3167df58990d4b0f1f2ea6b6583826cf9)
commit 3dbe67e2631b2b13ee0c827f71295dc6d209fd0c
Author: Andrew Klosterman <andrew.klosterman+samba_bugzilla at gmail.com>
Date: Tue Sep 8 17:38:37 2009 +0200
s3:smbd: Fix bug 6690, wrong error check
(cherry picked from commit f1f6df1747164f3f57adc9c6912b27592baa0802)
commit b6d335efa0bc023af53e9f0a398fc3407cfb653f
Author: Stefan Metzmacher <metze at sernet.de>
Date: Fri Sep 25 06:20:33 2009 +0200
s3:winbindd: only notify the client when we exist, if the connection isn't dead already
This is similar to commit 83edf3e43e86781872a07d8eb53084f59ad7384c.
metze
(cherry picked from commit 722ba568d79451a527976181b360de82b87b68e8)
commit 39780904a42357823f0ef31b0112a727ceb54809
Author: Stefan Metzmacher <metze at sernet.de>
Date: Thu Sep 24 21:35:38 2009 +0200
s3:winbindd_cm: don't invalidate the whole connection when just samr gave ACCCESS_DENIED
metze
(cherry picked from commit bfd3a6f13aa935950142a24bf331feb98f987bde)
(cherry picked from commit 53a426986a0ead7903ff6cf576b3d5501210e379)
commit 04be26e577866b1d02f14ce524c3f3d6751e68e2
Author: Stefan Metzmacher <metze at samba.org>
Date: Sun Sep 20 23:29:11 2009 +0200
s3:rpc_client: don't randomly fragment rpc pdu's in developer mode
This is really confusing and also breaks against windows,
as it doesn't accept fragmented bind requests.
metze
(cherry picked from commit 68b8149d1fb26b2fe1138c99d971754b0a30378b)
(cherry picked from commit 10ff61b24f0604c9686e728ac92c1a2987a31aed)
commit 15ac51217643c84b8563912c43e7ed0553c65806
Author: Stefan Metzmacher <metze at samba.org>
Date: Sun Sep 20 23:29:34 2009 +0200
s3:lib/select: don't overwrite errno in the signal handler
metze
(cherry picked from commit 00e378f17c39c52689601bc622b9cd78a0cdce12)
(cherry picked from commit 8d8bcfbfbe95f1623870b54cfc9329187a06d526)
commit c095ae5221a56da4479bbcda06a4c23628716d43
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Sep 21 03:16:18 2009 +0200
tevent: make sure we don't set errno within the signal handler function.
metze
(cherry picked from commit d13dfbeb6c6ab5b20277439da5b95f1a7f2850eb)
(cherry picked from commit 017586bb84a073f03a04ade6fb0bbe26af4112c1)
commit 58c05cf82a8f2927e9402203dadfb6f95266e332
Author: Stefan Metzmacher <metze at samba.org>
Date: Thu Sep 24 06:38:08 2009 +0200
s3:rpc_server: we need to make a copy of my_name in serverinfo_to_SamInfo_base()
This is important for the case the server_info already contains a logon_server.
metze
(This is similar to commit 9ef39406d8072a1a102813fb4448af76e9020fcd)
(cherry picked from commit dd5519d926ecdccc38f488d9a6d5138bfd871aa0)
commit 6824cfbf299c1bb0f3fe8031d2e2252f01624bf5
Author: Volker Lendecke <vl at samba.org>
Date: Wed Sep 23 06:23:50 2009 +0200
s3:winbind: Fix an uninitialized variable (cherry picked from commit 0724649a8a7c04d015317d9dc2ae43ee87c1bd25)
(cherry picked from commit d6af2a5ff4e4f723e521a3f708751b3155f870fc)
commit 0f0d79724d34548b77080815d073acfa487f2b40
Author: Günther Deschner <gd at samba.org>
Date: Thu Sep 17 09:43:36 2009 +0200
s3-winbindd: Fix Bug #6711: trusts to windows 2008 (2008 r2) not working.
Winbindd should always try to use LSA via an schannel authenticated ncacn_ip_tcp
connection when talking to AD for LSA lookup calls.
In Samba <-> W2k8 interdomain trust scenarios, LookupSids3 and LookupNames4 via an
schannel ncacn_ip_tcp LSA connection are the *only* options to successfully resolve
sids and names.
Guenther
(cherry picked from commit 6a8ef6c424c52be861ed2a9806f917a64ec892a6)
(cherry picked from commit 3bd36630e402b6215a46f8b0ba98e9e2b18b44eb)
commit 742e7ffb546e3f74611cb627cb2946d81e977ac2
Author: Günther Deschner <gd at samba.org>
Date: Sat Sep 12 23:30:39 2009 +0200
s3-winbindd: add cm_connect_lsa_tcp().
Guenther
(cherry picked from commit 58f2deb94024f002e3c3df47f45454edc97f47e1)
(cherry picked from commit b35d5cf97fd610874583f0d03c6cda4def0cf0f5)
commit c8ab33d54b306c842d9f779b42a62019dca18b67
Author: Günther Deschner <gd at samba.org>
Date: Thu Sep 17 09:42:49 2009 +0200
s3-rpc_client: fix non initialized structure in rpccli_lsa_lookup_sids_noalloc.
Guenther
(cherry picked from commit a4b5c792c55ef90648a528d279beec32f86a9b22)
(cherry picked from commit 27219ada4ec86544ceb8488850293b07f1ea7a10)
commit a0734149aea2450d6b943a31469fc82253d20b6e
Author: Günther Deschner <gd at samba.org>
Date: Sun Sep 13 00:28:49 2009 +0200
s3-rpc_client: add rpccli_lsa_lookup_sids3 wrapper.
Guenther
(cherry picked from commit 2f9adf04e4b3e16c046cb371a428a8a70d5de041)
(cherry picked from commit e867d3d9bb6494cde621f8f951f7aece5798f5fe)
commit 96960d864489161def79400ba5f0c0a5698bf201
Author: Günther Deschner <gd at samba.org>
Date: Fri Sep 11 19:35:14 2009 +0200
s3-rpc_client: add rpccli_lsa_lookup_names4 wrapper.
Guenther
(cherry picked from commit ff968712bab6c2635ef74723c6f52b0fdac4b424)
(cherry picked from commit 99627d8e38a28759095b6704e8314c931ca638a0)
commit cca9f6f5890cdc4cac22acd80d455ef5249af024
Author: Günther Deschner <gd at samba.org>
Date: Thu Sep 17 08:06:34 2009 +0200
s3-winbindd: add and use winbindd_lookup_names().
Guenther
(cherry picked from commit 99c3fc19587431efda1ae6161453d84673b32071)
(cherry picked from commit 6bcf24a2affb4798840e5cc49aeeb6c78d0265d0)
commit 42910c08f41b15f296bf4c8482b5da55156d7622
Author: Günther Deschner <gd at samba.org>
Date: Thu Sep 17 07:59:25 2009 +0200
s3-winbindd: add and use winbindd_lookup_sids().
Guenther
(cherry picked from commit f0b52b8c3133e3696db361d9d0e7d1fff0fab991)
(cherry picked from commit faa6a8de595ea38d3291dc7fb80d314a3b3f05cc)
commit 39bdbf0a9164739141e4634583fb7c9cd35c0991
Author: Günther Deschner <gd at samba.org>
Date: Thu Sep 10 22:23:21 2009 +0200
s3-rpc_client: add dcerpc_transport_t to cli_rpc_pipe_open_schannel().
Guenther
(cherry picked from commit bea8e5fa6038d5abd2ec1e12f9005c4a04abb79f)
(cherry picked from commit 5b44f54a18b60fe3814623f351025335a0273916)
commit 6d17737ab3e82e870d5017d2f2d52a267515ad67
Author: Günther Deschner <gd at samba.org>
Date: Thu Sep 10 22:23:21 2009 +0200
s3-rpc_client: add dcerpc_transport_t to cli_rpc_pipe_open_spnego_ntlmssp and cli_rpc_pipe_open_ntlmssp.
Guenther
(cherry picked from commit 032e01e7c13724d057b5744d7d79613449c2f24f)
(cherry picked from commit cd8874214dba810e60faca155611dbcf2f1351f7)
commit 38c3ff566c046366c826a14936e8ac9a02b58bb8
Author: Günther Deschner <gd at samba.org>
Date: Tue Nov 4 18:40:24 2008 +0100
s3-rpc_client: add cli_rpc_pipe_open_noauth_transport.
Guenther
(cherry picked from commit 87f61a144b8d25c90b847940ca03ced1f77b036c)
(cherry picked from commit 18b8928c8cb12d2f56efcc61df5b74db3caec29c)
commit 5408dbef1a3c7ad1c75e8dde492d5799774552be
Author: Günther Deschner <gd at samba.org>
Date: Thu Sep 10 19:59:37 2009 +0200
s3-rpc_client: add enum dcerpc_transport_t to rpc_cli_transport struct.
Guenther
(cherry picked from commit 393a1f594d5f03a51448cdc465f92c599a93904c)
(cherry picked from commit ef11ccb47db899603a100e67c3ca9ecd3298e347)
commit 93d2e0eed30dd3c0146a47cbe95d1fe6257246f1
Author: Jeremy Allison <jra at samba.org>
Date: Fri Oct 2 12:23:32 2009 +0200
Second part of a fix for bug #6235.
Domain enumeration breaks if master browser has space in name.
(cherry picked from commit f3f9dfd667526611b1fed3d47dc60eb45932eee0)
commit bcdac6cf1b5ecea93d268763b83e00d69748a53e
Author: Derrell Lipman <derrell.lipman at unwireduniverse.com>
Date: Fri Oct 2 12:22:25 2009 +0200
Fix bug #6532.
Domain enumeration breaks if master browser has space in name.
(cherry picked from commit 6b4b66c0cbf6147c693a84e6aec0b5cd07fd2e54)
commit 57d15bb9ab0c46020d8be34534166226fbef48c3
Author: Simo Sorce <ssorce at redhat.com>
Date: Fri Sep 25 10:59:04 2009 -0400
Fixing timeval calculation
The code was always doubling microseconds when attempting to round up.
Fix bug #6764.
(cherry picked from commit 7f8e6b98822df2ea813e6a7da6a8f14c503935d9)
commit 340077b8b5e6364aa32717fcd39ca28ae7f4a023
Author: Volker Lendecke <vl at samba.org>
Date: Tue Sep 29 14:34:16 2009 +0200
s3: Document the "share:fake_fscaps" parameter, fix bug 6765
(cherry picked from commit 21794b0dd28a80b149342b3218d7ebb4c8791e09)
(cherry picked from commit d046ab32094caa9511862144df1c00e64c234487)
commit 12457307787228f51d2198a071321879828ff93f
Author: Volker Lendecke <vl at samba.org>
Date: Wed Sep 9 21:58:47 2009 +0200
s3:smbd: Add a "hidden" parameter "share:fake_fscaps"
This is needed to support some special app I've just come across where I had to
set the SPARSE_FILES bit (0x40) to make it work against Samba at all. There
might be others to fake. This is definitely a "Don't touch if you don't know
what you're doing" thing, so I decided to make this an undocumented parametric
parameter.
I know this sucks, so feel free to beat me up on this. But I don't think it
will hurt.
(cherry picked from commit a5cace128d1dcabd6cc90dda71a09dfa8ee8c6f6)
Fix bug #6765.
(cherry picked from commit af0c2b78f7b697fae0fae6f88a5c9922abc7c514)
commit ac8b7ec8114c8f01a0bef2b614c081bb8a1e6efe
Author: Lars Müller <lars at samba.org>
Date: Mon Feb 2 21:38:38 2009 +0100
Adjust regex to match variable names including underscores
This is required to get the CIFSUPCALL_PROGS setting extracted from
config.log.
(cherry picked from commit 5148eefe1ea6e215dcbf4ffaa642860bd8dab45f)
Fix for bug #6710.
(cherry picked from commit f142ae80e344f098fb01a4c154a9fe46ed9a4eae)
commit 909b7177421c39c352a7c56e67750be976f8d6b5
Author: Bo Yang <boyang at samba.org>
Date: Wed Sep 16 23:57:01 2009 +0800
s3: Don't overwrite password in pam_winbind, subsequent pam modules might use the old password and new password.
Signed-off-by: Bo Yang <boyang at samba.org>
Fix bug #6735.
(cherry picked from commit 2a2779bb752d83ff51161a7e5d62ca21c4e6c909)
commit a6c06024a836425ad155d9380a3e62ab069d2e1c
Author: Volker Lendecke <vl at samba.org>
Date: Wed Sep 16 03:20:49 2009 +0200
s3: Fix reading beyond the end of a named stream in xattr_streams
This was found thanks to a test by Sivani from Microsoft against Samba at the
SDC plugfest
(cherry picked from commit 444a05c28df693a745809fef73ae583a78be7c8f)
Fix bug #6731.
(cherry picked from commit ff9355149c9af7ca0e31b36690b270a03cb787fc)
commit 20894847f146939f1d3f726a238d8bfb9bd9a842
Author: Björn Jacke <bj at sernet.de>
Date: Tue Sep 15 06:48:49 2009 +0200
s3: BSD needs sys/sysctl.h included to build properly
FreeBSD (and other BSDs, too) need sys/sysctl.h inclueded to use sysctlbyname().
Thanks to Timur Bakeyev for that.
Fix bug #6728.
(cherry picked from commit 9c86a96af381f2826456f91eb99073c9fca633de)
commit 5ef27751a5284c5ce2174ea53af5d6ae2474f9b6
Author: Volker Lendecke <vl at samba.org>
Date: Fri Sep 18 18:27:16 2009 +0200
s3:smbstatus: Fix bug 6703, allow smbstatus as non-root
We only require a ctdb connection when clustering is enabled. This limits the
restriction for only-root smbstatus to the clustering case.
(cherry picked from commit b22713717422b822c3b8fcba611fc01e262d52c9)
commit 21cf908f07b1ea02e6f578c7ac33db94e03b0790
Author: Björn Jacke <bj at sernet.de>
Date: Tue Jul 7 22:11:50 2009 +0200
s3: QNX doesn't know uint - replace with uint_t
(cherry picked from commit a28596964b44f20d794999541d38fe4bae64b56b)
(cherry picked from commit 47c2dc4eee5f7644601db0c24dca0ca30b482940)
commit 02a5658f7ae89809dbce035f6ccba925f2b5d238
Author: Jeremy Allison <jra at samba.org>
Date: Tue Sep 15 09:40:48 2009 +0200
s3/libsmb: SIVAL should have been an SVAL.
Fix bug #6726.
(cherry picked from commit 7ec7440fc2f78ef49cebdc819ff81db5ce9d143c)
commit 46a716f21f41df38e4b6d9e438def65983bd8e64
Author: Marc Aurele La France <tsi at ualberta.ca>
Date: Thu Sep 10 09:52:11 2009 -0700
Fix bug 6707 - 3.4.1 segfault in parsing configs.
Fixes an occasional segfault caused by an out-of-bounds reference in config file parsing.
(cherry picked from commit 7c00227f00a83345035c4c0a6716b46864f2da8d)
(cherry picked from commit 0241ba8ce2b6da049fb3cc512508a9e9c5732781)
commit 418ebb48e1f995db8ad38c9bea0f9b06289f5a6b
Author: Jeremy Allison <jra at samba.org>
Date: Wed Sep 9 14:39:17 2009 -0700
Fix bug 6529 - Offline files conflict with Vista and Office 2003. Jeremy.
(cherry picked from commit e971428f137dcb42e8b735386d79f1b3a6effe34)
commit 83a18d1b332a0ceede93acb6ac091090af2bae92
Author: Lars Müller <lars at samba.org>
Date: Mon Feb 2 21:12:52 2009 +0100
Conditional install of the cifs.upcall man page
Only install the cifs.upcall man page if CIFSUPCALL_PROGS was set while
configure.
(cherry picked from commit e9e2414e798a2eb447de45803e61cc0a49752f11)
(cherry picked from commit 5cd771b964aa36082716352522a68c962e1aaba8)
commit 01554765113a5433e4ff8e9613ac5a13493e54b6
Author: Björn Jacke <bj at sernet.de>
Date: Fri Jul 3 14:25:06 2009 +0200
s3:configure: fix syntax error in avahi configure test
(cherry picked from commit b54e48b830dbc3d66f9de5d2711a57a1630809e2)
Should fix bug #6704.
(cherry picked from commit 686439599ad78c6f4d5609129113e6da51fb4a57)
commit b80b062d1838b25d653dff0da4dca7f526ea065b
Author: Shirish Pargaonkar <shirishpargaonkar at gmail.com>
Date: Mon Jul 27 12:02:35 2009 -0400
umount.cifs: do not attempt to update /etc/mtab if it is symbolic link
If /etc/mtab is a symbolic link to e.g. /proc/mounts, do not update it.
This is a fix for a bug reported in 4675 on samba bugzilla
Signed-off-by: Shirish Pargaonkar <shirishpargaonkar at gmail.com>
(cherry picked from commit a869e4253a87f9a5e13dbe87b2799f8683d238d7)
Fixes bug #4675.
(cherry picked from commit f710535e947008a083b49d8a3faa117208616d7f)
-----------------------------------------------------------------------
Summary of changes:
WHATSNEW.txt | 50 +++-
docs-xml/manpages-3/cifs.upcall.8.xml | 19 +-
docs-xml/manpages-3/mount.cifs.8.xml | 8 +
docs-xml/smbdotconf/protocol/sharefakefscaps.xml | 20 +
lib/tevent/tevent_signal.c | 13 +-
lib/tevent/tevent_timed.c | 2 +-
nsswitch/libwbclient/wbc_sid.c | 4 +
nsswitch/pam_winbind.c | 11 +-
packaging/RHEL/makerpms.sh.tmpl | 4 +-
packaging/RHEL/samba.spec.tmpl | 25 +-
source3/Makefile.in | 16 +-
source3/VERSION | 2 +-
source3/auth/auth_domain.c | 2 +-
source3/client/cifs.upcall.c | 488 +++++++++++++++++-----
source3/client/umount.cifs.c | 7 +-
source3/configure.in | 14 +-
source3/include/client.h | 2 +
source3/include/includes.h | 6 +
source3/include/proto.h | 41 ++-
source3/include/smb.h | 4 +
source3/lib/fault.c | 5 +
source3/lib/interfaces.c | 8 +-
source3/lib/select.c | 4 +
source3/lib/time.c | 41 ++-
source3/libnet/libnet_join.c | 3 +-
source3/libsmb/clifile.c | 2 +-
source3/libsmb/clirap2.c | 8 +-
source3/libsmb/clireadwrite.c | 189 ++++++++--
source3/libsmb/clispnego.c | 35 +-
source3/libsmb/libsmb_dir.c | 2 +-
source3/libsmb/namequery.c | 3 +-
source3/libsmb/passchange.c | 1 +
source3/libsmb/spnego.c | 30 +-
source3/locking/brlock.c | 367 ++++++++++-------
source3/modules/nfs4_acls.c | 8 +-
source3/modules/vfs_afsacl.c | 8 +-
source3/modules/vfs_default.c | 57 +++-
source3/modules/vfs_hpuxacl.c | 8 +-
source3/modules/vfs_onefs.c | 4 +-
source3/modules/vfs_streams_xattr.c | 3 +-
source3/modules/vfs_xattr_tdb.c | 52 ++-
source3/param/loadparm.c | 8 +
source3/profile/profile.c | 2 +-
source3/rpc_client/cli_lsarpc.c | 191 +++++++--
source3/rpc_client/cli_pipe.c | 67 +++-
source3/rpc_client/init_netlogon.c | 2 +-
source3/rpcclient/rpcclient.c | 3 +
source3/script/installman.sh | 3 +-
source3/script/tests/test_local_s3.sh | 6 +-
source3/smbd/aio.c | 66 ++--
source3/smbd/files.c | 32 +-
source3/smbd/nttrans.c | 16 +-
source3/smbd/posix_acls.c | 57 ++-
source3/smbd/reply.c | 49 ++-
source3/smbd/trans2.c | 129 ++++---
source3/utils/net.h | 1 +
source3/utils/net_rpc.c | 14 +-
source3/utils/net_rpc_join.c | 5 +-
source3/utils/net_rpc_samsync.c | 2 +-
source3/utils/ntlm_auth.c | 4 +-
source3/utils/status.c | 24 +-
source3/winbindd/idmap_adex/provider_unified.c | 1 -
source3/winbindd/winbindd.c | 24 +-
source3/winbindd/winbindd.h | 3 +
source3/winbindd/winbindd_ads.c | 64 +---
source3/winbindd/winbindd_cm.c | 84 ++++-
source3/winbindd/winbindd_pam.c | 15 +-
source3/winbindd/winbindd_proto.h | 19 +
source3/winbindd/winbindd_rpc.c | 215 +++++++---
69 files changed, 1905 insertions(+), 777 deletions(-)
create mode 100644 docs-xml/smbdotconf/protocol/sharefakefscaps.xml
Changeset truncated at 500 lines:
diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index f1c9d50..27c3496 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -1,4 +1,50 @@
=============================
+ Release Notes for Samba 3.4.3
+ , 2009
+ =============================
+
+
+This is the latest stable release of Samba 3.4.
+
+Major enhancements in Samba 3.4.3 include:
+
+ o
+
+
+######################################################################
+Changes
+#######
+
+Changes since 3.4.2
+-------------------
+
+
+
+
+######################################################################
+Reporting bugs & Development Discussion
+#######################################
+
+Please discuss this release on the samba-technical mailing list or by
+joining the #samba-technical IRC channel on irc.freenode.net.
+
+If you do report problems then please try to send high quality
+feedback. If you don't provide vital information to help us track down
+the problem then you will probably be ignored. All bug reports should
+be filed under the Samba 3.4 product in the project's Bugzilla
+database (https://bugzilla.samba.org/).
+
+
+======================================================================
+== Our Code, Our Bugs, Our Responsibility.
+== The Samba Team
+======================================================================
+
+
+Release notes for older versions follow:
+----------------------------------------
+
+ =============================
Release Notes for Samba 3.4.2
October 1, 2009
=============================
@@ -61,8 +107,8 @@ database (https://bugzilla.samba.org/).
======================================================================
-Release notes for older versions follow:
-----------------------------------------
+----------------------------------------------------------------------
+
=============================
Release Notes for Samba 3.4.1
diff --git a/docs-xml/manpages-3/cifs.upcall.8.xml b/docs-xml/manpages-3/cifs.upcall.8.xml
index b62246c..7259b10 100644
--- a/docs-xml/manpages-3/cifs.upcall.8.xml
+++ b/docs-xml/manpages-3/cifs.upcall.8.xml
@@ -19,8 +19,8 @@
<refsynopsisdiv>
<cmdsynopsis>
<command>cifs.upcall</command>
- <arg choice="opt">-c</arg>
- <arg choice="opt">-v</arg>
+ <arg choice="opt">--trust-dns|-t</arg>
+ <arg choice="opt">--version|-v</arg>
<arg choice="req">keyid</arg>
</cmdsynopsis>
</refsynopsisdiv>
@@ -48,12 +48,17 @@ to be run that way.</para>
<variablelist>
<varlistentry>
<term>-c</term>
- <listitem><para>When handling a kerberos upcall, use a service principal that starts with "cifs/". The default is to use the "host/" service principal.
+ <listitem><para>This option is deprecated and is currently ignored.
+ </para></listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>--trust-dns|-t</term>
+ <listitem><para>With krb5 upcalls, the name used as the host portion of the service principal defaults to the hostname portion of the UNC. This option allows the upcall program to reverse resolve the network address of the server in order to get the hostname.</para>
+ <para>This is less secure than not trusting DNS. When using this option, it's possible that an attacker could get control of DNS and trick the client into mounting a different server altogether. It's preferable to instead add server principals to the KDC for every possible hostname, but this option exists for cases where that isn't possible. The default is to not trust reverse hostname lookups in this fashion.
</para></listitem>
</varlistentry>
-
<varlistentry>
- <term>-v</term>
+ <term>--version|-v</term>
<listitem><para>Print version number and exit.
</para></listitem>
</varlistentry>
@@ -85,8 +90,8 @@ to be run that way.</para>
<para>To make this program useful for CIFS, you'll need to set up entries for them in request-key.conf<manvolnum>5</manvolnum>. Here's an example of an entry for each key type:</para>
<programlisting>
#OPERATION TYPE D C PROGRAM ARG1 ARG2...
-#========= ============= = = ==========================================
-create cifs.spnego * * /usr/local/sbin/cifs.upcall -c %k
+#========= ============= = = ================================
+create cifs.spnego * * /usr/local/sbin/cifs.upcall %k
create dns_resolver * * /usr/local/sbin/cifs.upcall %k
</programlisting>
<para>
diff --git a/docs-xml/manpages-3/mount.cifs.8.xml b/docs-xml/manpages-3/mount.cifs.8.xml
index cbe10ae..9481458 100644
--- a/docs-xml/manpages-3/mount.cifs.8.xml
+++ b/docs-xml/manpages-3/mount.cifs.8.xml
@@ -65,6 +65,14 @@ kernel log.
the mounted resource is unmounted (usually via the umount utility).
</para>
+ <para>
+ <emphasis>mount.cifs -V</emphasis> command displays the version of cifs mount helper.
+ </para>
+ <para>
+
+ <emphasis>modinfo cifs</emphasis> command displays the version of cifs module.
+ </para>
+
</refsect1>
<refsect1>
diff --git a/docs-xml/smbdotconf/protocol/sharefakefscaps.xml b/docs-xml/smbdotconf/protocol/sharefakefscaps.xml
new file mode 100644
index 0000000..713b95b
--- /dev/null
+++ b/docs-xml/smbdotconf/protocol/sharefakefscaps.xml
@@ -0,0 +1,20 @@
+<samba:parameter name="share:fake_fscaps"
+ context="G"
+ type="string"
+ advanced="1" developer="0"
+ xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+<description>
+
+ <para>
+ This is needed to support some special application that makes
+ QFSINFO calls to check whether we set the SPARSE_FILES bit
+ (0x40). If this bit is not set that particular application
+ refuses to work against
+ Samba. With <smbconfoption name="share:fake_fscaps">64</smbconfoption>
+ the SPARSE_FILES file system capability flag is set. Use other
+ decimal values to specify the bitmask you need to fake.
+ </para>
+
+</description>
+<value type="default">0</value>
+</samba:parameter>
diff --git a/lib/tevent/tevent_signal.c b/lib/tevent/tevent_signal.c
index ef9c0cf..ab170a6 100644
--- a/lib/tevent/tevent_signal.c
+++ b/lib/tevent/tevent_signal.c
@@ -85,24 +85,21 @@ static void tevent_common_signal_handler(int signum)
ssize_t res;
struct tevent_common_signal_list *sl;
struct tevent_context *ev = NULL;
+ int saved_errno = errno;
SIG_INCREMENT(sig_state->signal_count[signum]);
SIG_INCREMENT(sig_state->got_signal);
- if (sig_state->sig_handlers[signum] != NULL) {
- ev = sig_state->sig_handlers[signum]->se->event_ctx;
- /* doesn't matter if this pipe overflows */
- res = write(ev->pipe_fds[1], &c, 1);
- }
-
/* Write to each unique event context. */
for (sl = sig_state->sig_handlers[signum]; sl; sl = sl->next) {
- if (sl->se->event_ctx != ev) {
+ if (sl->se->event_ctx && sl->se->event_ctx != ev) {
+ ev = sl->se->event_ctx;
/* doesn't matter if this pipe overflows */
res = write(ev->pipe_fds[1], &c, 1);
- ev = sl->se->event_ctx;
}
}
+
+ errno = saved_errno;
}
#ifdef SA_SIGINFO
diff --git a/lib/tevent/tevent_timed.c b/lib/tevent/tevent_timed.c
index d75653d..cc51bf6 100644
--- a/lib/tevent/tevent_timed.c
+++ b/lib/tevent/tevent_timed.c
@@ -114,7 +114,7 @@ struct timeval tevent_timeval_add(const struct timeval *tv, uint32_t secs,
tv2.tv_sec += secs;
tv2.tv_usec += usecs;
tv2.tv_sec += tv2.tv_usec / 1000000;
- tv2.tv_usec += tv2.tv_usec % 1000000;
+ tv2.tv_usec = tv2.tv_usec % 1000000;
return tv2;
}
diff --git a/nsswitch/libwbclient/wbc_sid.c b/nsswitch/libwbclient/wbc_sid.c
index 46c59a9..657c6ae 100644
--- a/nsswitch/libwbclient/wbc_sid.c
+++ b/nsswitch/libwbclient/wbc_sid.c
@@ -247,9 +247,13 @@ wbcErr wbcLookupSid(const struct wbcDomainSid *sid,
if (WBC_ERROR_IS_OK(wbc_status)) {
if (pdomain != NULL) {
*pdomain = domain;
+ } else {
+ TALLOC_FREE(domain);
}
if (pname != NULL) {
*pname = name;
+ } else {
+ TALLOC_FREE(name);
}
if (pname_type != NULL) {
*pname_type = name_type;
diff --git a/nsswitch/pam_winbind.c b/nsswitch/pam_winbind.c
index 4a44248..132d637 100644
--- a/nsswitch/pam_winbind.c
+++ b/nsswitch/pam_winbind.c
@@ -976,7 +976,8 @@ static bool winbind_name_to_sid_string(struct pwb_context *ctx,
char *sid_list_buffer,
int sid_list_buffer_size)
{
- const char* sid_string;
+ const char* sid_string = NULL;
+ char *sid_str = NULL;
/* lookup name? */
if (IS_SID_STRING(name)) {
@@ -985,7 +986,6 @@ static bool winbind_name_to_sid_string(struct pwb_context *ctx,
wbcErr wbc_status;
struct wbcDomainSid sid;
enum wbcSidType type;
- char *sid_str;
_pam_log_debug(ctx, LOG_DEBUG,
"no sid given, looking up: %s\n", name);
@@ -1002,15 +1002,16 @@ static bool winbind_name_to_sid_string(struct pwb_context *ctx,
return false;
}
- wbcFreeMemory(sid_str);
sid_string = sid_str;
}
if (!safe_append_string(sid_list_buffer, sid_string,
sid_list_buffer_size)) {
+ wbcFreeMemory(sid_str);
return false;
}
+ wbcFreeMemory(sid_str);
return true;
}
@@ -3056,8 +3057,6 @@ int pam_sm_chauthtok(pam_handle_t * pamh, int flags,
ret = winbind_chauthtok_request(ctx, user, pass_old,
pass_new, pwdlastset_update);
if (ret) {
- _pam_overwrite(pass_new);
- _pam_overwrite(pass_old);
pass_old = pass_new = NULL;
goto out;
}
@@ -3086,8 +3085,6 @@ int pam_sm_chauthtok(pam_handle_t * pamh, int flags,
member, cctype, 0,
&error, &info, &policy,
NULL, &username_ret);
- _pam_overwrite(pass_new);
- _pam_overwrite(pass_old);
pass_old = pass_new = NULL;
if (ret == PAM_SUCCESS) {
diff --git a/packaging/RHEL/makerpms.sh.tmpl b/packaging/RHEL/makerpms.sh.tmpl
index 5b377bd..93d2d82 100644
--- a/packaging/RHEL/makerpms.sh.tmpl
+++ b/packaging/RHEL/makerpms.sh.tmpl
@@ -40,8 +40,8 @@ case $RPMVER in
esac
pushd .
-cd ../../source
-if [ -f Makefile ]; then
+cd ../../source3
+if [ -f Makefile ]; then
make distclean
fi
popd
diff --git a/packaging/RHEL/samba.spec.tmpl b/packaging/RHEL/samba.spec.tmpl
index 4467963..567cebf 100644
--- a/packaging/RHEL/samba.spec.tmpl
+++ b/packaging/RHEL/samba.spec.tmpl
@@ -174,8 +174,7 @@ if [ ${CC_MAJOR} -ge 3 ]; then
fi
-make CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" %{?_smp_mflags} \
- all modules pam_smbpass
+make all modules pam_smbpass
# Remove some permission bits to avoid to many dependencies
cd ..
@@ -210,8 +209,8 @@ make DESTDIR=$RPM_BUILD_ROOT \
cd ..
# NSS winbind support
-install -m 755 source3/nsswitch/libnss_winbind.so $RPM_BUILD_ROOT/%{_libarch}/libnss_winbind.so.2
-install -m 755 source3/nsswitch/libnss_wins.so $RPM_BUILD_ROOT/%{_libarch}/libnss_wins.so.2
+install -m 755 nsswitch/libnss_winbind.so $RPM_BUILD_ROOT/%{_libarch}/libnss_winbind.so.2
+install -m 755 nsswitch/libnss_wins.so $RPM_BUILD_ROOT/%{_libarch}/libnss_wins.so.2
( cd $RPM_BUILD_ROOT/%{_libarch};
ln -sf libnss_winbind.so.2 libnss_winbind.so;
ln -sf libnss_wins.so.2 libnss_wins.so )
@@ -440,6 +439,24 @@ fi
%attr(755,root,root) /%{_libarch}/security/pam_winbind.so
%attr(755,root,root) /%{_libarch}/security/pam_smbpass.so
/usr/share/locale/de/LC_MESSAGES/pam_winbind.mo
+/usr/share/locale/ar/LC_MESSAGES/pam_winbind.mo
+/usr/share/locale/cs/LC_MESSAGES/pam_winbind.mo
+/usr/share/locale/da/LC_MESSAGES/pam_winbind.mo
+/usr/share/locale/es/LC_MESSAGES/pam_winbind.mo
+/usr/share/locale/fi/LC_MESSAGES/pam_winbind.mo
+/usr/share/locale/fr/LC_MESSAGES/pam_winbind.mo
+/usr/share/locale/hu/LC_MESSAGES/pam_winbind.mo
+/usr/share/locale/it/LC_MESSAGES/pam_winbind.mo
+/usr/share/locale/ja/LC_MESSAGES/pam_winbind.mo
+/usr/share/locale/ko/LC_MESSAGES/pam_winbind.mo
+/usr/share/locale/nb/LC_MESSAGES/pam_winbind.mo
+/usr/share/locale/nl/LC_MESSAGES/pam_winbind.mo
+/usr/share/locale/pl/LC_MESSAGES/pam_winbind.mo
+/usr/share/locale/pt_BR/LC_MESSAGES/pam_winbind.mo
+/usr/share/locale/ru/LC_MESSAGES/pam_winbind.mo
+/usr/share/locale/sv/LC_MESSAGES/pam_winbind.mo
+/usr/share/locale/zh_CN/LC_MESSAGES/pam_winbind.mo
+/usr/share/locale/zh_TW/LC_MESSAGES/pam_winbind.mo
%{_includedir}/libsmbclient.h
%{_libarchdir}/libsmbclient.*
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 6ac9571..fb45056 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -212,7 +212,7 @@ BIN_PROGS4 = bin/ldbedit at EXEEXT@ bin/ldbsearch at EXEEXT@ bin/ldbadd at EXEEXT@ \
TORTURE_PROGS = bin/smbtorture at EXEEXT@ bin/msgtest at EXEEXT@ \
bin/masktest at EXEEXT@ bin/locktest at EXEEXT@ \
bin/locktest2 at EXEEXT@ bin/nsstest at EXEEXT@ bin/vfstest at EXEEXT@ \
- bin/pdbtest at EXEEXT@ bin/talloctort at EXEEXT@ bin/replacetort at EXEEXT@ \
+ bin/pdbtest at EXEEXT@ @BIN_TALLOCTORT@ bin/replacetort at EXEEXT@ \
bin/tdbtorture at EXEEXT@ \
bin/smbconftort at EXEEXT@ bin/vlp at EXEEXT@
@@ -220,7 +220,7 @@ BIN_PROGS = @EXTRA_BIN_PROGS@ \
$(BIN_PROGS1) $(BIN_PROGS2) $(BIN_PROGS3) $(BIN_PROGS4)
EVERYTHING_PROGS = bin/debug2html at EXEEXT@ bin/smbfilter at EXEEXT@ \
- bin/talloctort at EXEEXT@ bin/replacetort at EXEEXT@ \
+ @BIN_TALLOCTORT@ bin/replacetort at EXEEXT@ \
bin/log2pcap at EXEEXT@ \
bin/vlp at EXEEXT@ bin/smbiconv at EXEEXT@ \
bin/dbwrap_tool at EXEEXT@
@@ -465,7 +465,7 @@ LIBCLI_LDAP_NDR_OBJ = ../libcli/ldap/ldap_ndr.o
CLDAP_OBJ = libads/cldap.o $(LIBCLI_LDAP_MESSAGE_OBJ) $(LIBCLI_LDAP_NDR_OBJ)
LIBSMB_OBJ = libsmb/clientgen.o libsmb/cliconnect.o libsmb/clifile.o \
- libsmb/clikrb5.o libsmb/clispnego.o ../lib/util/asn1.o \
+ libsmb/clikrb5.o libsmb/clispnego.o libsmb/spnego.o ../lib/util/asn1.o \
libsmb/clirap.o libsmb/clierror.o libsmb/climessage.o \
libsmb/clireadwrite.o libsmb/clilist.o libsmb/cliprint.o \
libsmb/clitrans.o libsmb/clisecdesc.o libsmb/clidgram.o \
@@ -1276,7 +1276,7 @@ samba3-idl::
#####################################################################
-everything:: all libtalloc libsmbclient libnetapi debug2html smbfilter talloctort replacetort smbconftort modules torture \
+everything:: all libtalloc libsmbclient libnetapi debug2html smbfilter @TALLOCTORT@ replacetort smbconftort modules torture \
$(EVERYTHING_PROGS)
.SUFFIXES:
@@ -1470,7 +1470,7 @@ bin/cifs.upcall at EXEEXT@: $(BINARY_PREREQS) $(CIFS_UPCALL_OBJ) $(LIBSMBCLIENT_OBJ
@$(CC) -o $@ $(CIFS_UPCALL_OBJ) $(DYNEXP) $(LDFLAGS) \
$(LIBSMBCLIENT_OBJ1) $(LIBS) -lkeyutils $(KRB5LIBS) \
$(LDAP_LIBS) $(LIBTALLOC_LIBS) $(LIBWBCLIENT_LIBS) \
- $(LIBTDB_LIBS) $(NSCD_LIBS)
+ $(LIBTDB_LIBS) $(NSCD_LIBS) $(ZLIB_LIBS)
bin/testparm at EXEEXT@: $(BINARY_PREREQS) $(TESTPARM_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
@echo Linking $@
@@ -1872,7 +1872,7 @@ $(LIBWBCLIENT_SYMS): $(LIBWBCLIENT_HEADERS)
$(LIBWBCLIENT_SHARED_TARGET_SONAME): $(BINARY_PREREQS) $(LIBWBCLIENT_OBJ) $(LIBWBCLIENT_SYMS) @LIBTALLOC_TARGET@
@echo Linking shared library $@
- @$(SHLD_DSO) $(LIBTALLOC_LIBS) $(LIBWBCLIENT_OBJ) \
+ @$(SHLD_DSO) $(LIBWBCLIENT_OBJ) $(LIBTALLOC_LIBS) \
@SONAMEFLAG@`basename $@`
$(LIBWBCLIENT_SHARED_TARGET): $(LIBWBCLIENT_SHARED_TARGET_SONAME)
@@ -2050,7 +2050,7 @@ $(LIBNETAPI_SHARED_TARGET_SONAME): $(BINARY_PREREQS) $(LIBNETAPI_OBJ) $(LIBNETAP
@echo Linking shared library $@
@$(SHLD_DSO) $(LIBNETAPI_OBJ) \
$(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(LIBWBCLIENT_LIBS) $(LIBS) \
- $(LDAP_LIBS) $(KRB5LIBS) $(NSCD_LIBS) \
+ $(LDAP_LIBS) $(KRB5LIBS) $(NSCD_LIBS) $(ZLIB_LIBS) \
@SONAMEFLAG@`basename $@`
$(LIBNETAPI_SHARED_TARGET): $(LIBNETAPI_SHARED_TARGET_SONAME)
@@ -2386,7 +2386,7 @@ bin/vlp at EXEEXT@: $(BINARY_PREREQS) $(VLP_OBJ) @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
@echo "Linking $@"
@$(SHLD) $(LDSHFLAGS) -o $@ $(WINBIND_WINS_NSS_OBJ) \
$(LDAP_LIBS) $(KRB5LIBS) $(LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) \
- @SONAMEFLAG@`basename $@`@NSSSONAMEVERSIONSUFFIX@
+ $(ZLIB_LIBS) @SONAMEFLAG@`basename $@`@NSSSONAMEVERSIONSUFFIX@
bin/winbind_krb5_locator. at SHLIBEXT@: $(BINARY_PREREQS) $(WINBIND_KRB5_LOCATOR_OBJ) @LIBWBCLIENT_TARGET@
@echo "Linking $@"
diff --git a/source3/VERSION b/source3/VERSION
index 6a6ab01..2365c50 100644
--- a/source3/VERSION
+++ b/source3/VERSION
@@ -25,7 +25,7 @@
########################################################
SAMBA_VERSION_MAJOR=3
SAMBA_VERSION_MINOR=4
-SAMBA_VERSION_RELEASE=2
+SAMBA_VERSION_RELEASE=3
########################################################
# Bug fix releases use a letter for the patch revision #
diff --git a/source3/auth/auth_domain.c b/source3/auth/auth_domain.c
index f11dbe6..45150ab 100644
--- a/source3/auth/auth_domain.c
+++ b/source3/auth/auth_domain.c
@@ -175,7 +175,7 @@ static NTSTATUS connect_to_domain_password_server(struct cli_state **cli,
if (lp_client_schannel()) {
/* We also setup the creds chain in the open_schannel call. */
result = cli_rpc_pipe_open_schannel(
- *cli, &ndr_table_netlogon.syntax_id,
+ *cli, &ndr_table_netlogon.syntax_id, NCACN_NP,
PIPE_AUTH_LEVEL_PRIVACY, domain, &netlogon_pipe);
} else {
result = cli_rpc_pipe_open_noauth(
diff --git a/source3/client/cifs.upcall.c b/source3/client/cifs.upcall.c
index 4110de3..71e60c6 100644
--- a/source3/client/cifs.upcall.c
+++ b/source3/client/cifs.upcall.c
@@ -1,6 +1,7 @@
/*
* CIFS user-space helper.
* Copyright (C) Igor Mammedov (niallain at gmail.com) 2007
+* Copyright (C) Jeff Layton (jlayton at redhat.com) 2009
*
* Used by /sbin/request-key for handling
* cifs upcall for kerberos authorization of access to share and
@@ -26,16 +27,166 @@ create dns_resolver * * /usr/local/sbin/cifs.upcall %k
#include "includes.h"
#include <keyutils.h>
+#include <getopt.h>
#include "cifs_spnego.h"
-const char *CIFSSPNEGO_VERSION = "1.2";
+#define CIFS_DEFAULT_KRB5_DIR "/tmp"
+#define CIFS_DEFAULT_KRB5_PREFIX "krb5cc_"
+
+#define MAX_CCNAME_LEN PATH_MAX + 5
+
+const char *CIFSSPNEGO_VERSION = "1.3";
static const char *prog = "cifs.upcall";
-typedef enum _secType {
+typedef enum _sectype {
NONE = 0,
KRB5,
MS_KRB5
-} secType_t;
+} sectype_t;
+
+static inline int
+k5_data_equal(krb5_data d1, krb5_data d2, unsigned int length)
+{
+ if (!length)
+ length = d1.length;
+
+ return (d1.length == length &&
+ d1.length == d2.length &&
+ memcmp(d1.data, d2.data, length) == 0);
+
+}
+
+/* does the ccache have a valid TGT? */
+static time_t
+get_tgt_time(const char *ccname) {
+ krb5_context context;
--
Samba Shared Repository
More information about the samba-cvs
mailing list