[SCM] Samba Shared Repository - branch v3-5-stable updated
Karolin Seeger
kseeger at samba.org
Tue Jun 14 05:18:02 MDT 2011
The branch, v3-5-stable has been updated
via 2fbc538 WHATSNEW: Update changes since 3.5.8.
via aa1fbfa Fix re-opened bug 8083 - "inherit owner = yes" doesn't interact correctly with vfs_acl_xattr or vfs_acl_tdb module.
via ee677cf Part 5 of bugfix for #8211 - "inherit owner = yes" doesn't interact correctly with "inherit permissions = yes" and POSIX ACLs
via 0108975 Part 4 of bugfix for #8211 - "inherit owner = yes" doesn't interact correctly with "inherit permissions = yes" and POSIX ACLs
via dc27e37 Part 3 of bugfix for #8211 - "inherit owner = yes" doesn't interact correctly with "inherit permissions = yes" and POSIX ACLs
via 06f653a Part 2 of bugfix for #8211 - "inherit owner = yes" doesn't interact correctly with "inherit permissions = yes" and POSIX ACLs
via 5bf5324 Part 1 of bugfix for #8211 - "inherit owner = yes" doesn't interact correctly with "inherit permissions = yes" and POSIX ACLs
via 55d6c2b s3:lib/access: normalize IPv4 mapped IPv6 addresses in both directions (bug #7383)
via adb6340 WHATSNEW: Add more changes since 3.5.8.
via 9225920 s3-winbind: BUG 8166 - Don't lockout users when offline.
via b152f50 Fix bug #7528 - Solaris with NIS autohome. (cherry picked from commit 0ffdf2288b1e6798e43259568818378c43b979e5)
via e4df1ed WHATSNEW: Start to add changes since 3.5.8.
via 8a6faa1 Fix bug #8083 - "inherit owner = yes" doesn't interact correctly with vfs_acl_xattr or vfs_acl_tdb module.
via a6157b3 Fix bug #6911 - Kerberos authentication from vista to samba fails when security blob size is greater than 16 kB
via 04ac875 s3-libnet: fix bug #6364: Pull realm from supplied username on libnet join (cherry picked from commit 67a9d4bb376d89c4411024164165ca1ed7a0b157)
via b463390 s3-printing: remove duplicate cups response processing code
via 5cadaab s3-printing: use printcap IDL for IPC
via 8cbf295 idl: define printcap IPC message format
via 4cc531c s3-printing: an empty cups printer list is treated as an error
via 0b9937c Fix our asn.1 parser to handle negative numbers.
via dadf445 Fix bug #8157 - std_pcap_cache_reload() fails to parse a cups printcap file correctly.
via 1a4449e s3-printing: remove pcap_cache_loaded asserts
via 8ff0c80 Revert "Revert "s3-printing: update parent smbd pcap cache""
via b3c1c58 Revert "Revert "s3-printing: reload shares after pcap cache fill""
via c54a013 Revert "s3-spoolss: Added EN ISO 216, A0 and A1 to builtin forms."
via 0d7a0ae libwbclient: Fix bug 8087 -- wbcChangeUserPasswordEx in RESPONSE mode does not work
via bcded87 s3-net: make sure we dont crash when publishing a single printer.
via df07498 s3/configure: fix GNU ld version detection with old gcc releases
via 0d8e132 tdb_expand: limit the expansion with huge records
via 69b4adc s3-printing: make cups_pull_comment_location() work again.
via 15d82ba s3-printing: Fix double free of cups request.
via 4a2f4c8 s3-printing: very obvious fix for cups_pull_comment_location().
via d56f76f s3-libsmb Don't ever ask for machine$ principals as a target.
via deebcee s3-libads Default to NOT using the server-supplied principal from SPNEGO
via 03d62d2 Fix bug 8111 - CIFS VFS: unexpected error on SMB posix open
via 0b1101a Fix is_myname_or_ipaddr() to be robust against strange DNS setups.
via 4b0f369 s3: Fix bug 8099 - setpwent() actually does endpwent() on FreeBSD (cherry picked from commit 2167ac2cd42c9ed5aaae0086dbd27e29d1d77686)
via 40a6b1b Fix bug 8072 - PANIC: create_file_acl_common frees handle two times.
via 78e9a21 Fix bug 8088 - rpccli_samr_chng_pswd_auth_crap segfaults if any input blobs are null. (cherry picked from commit fae43d2640459fe8cb3d485eacd1624de59b9622)
via 3d7991a Fix bug 6966 - "allow trusted domains = no" not respected in winbind. (cherry picked from commit 66de22f7b242ae9e3358d33e580547c2618bd918)
via 2ef7a5c s3: Fix bug 8066, wrong output in smbget (cherry picked from commit 4a467155fe9ad66a2d7e7e490d7e3957b4dcb67a)
via 264ed25 Fix bug #7987 - ACL can get lost when files are being renamed.
via 192f62b s3-cli_pipe: fix timeout in rpc_pipe_open_tcp_port().
via e548a03 s3-docs: document all wbinfo options.
via df4564f s3-modules: Fix debug message (bug #8074)
via cca5160 Fix bug #6762 - ctdb on gpfs error with MS Office. (cherry picked from commit 84745fe2ef953b1b5edfef473c88c71cc71d4d1e)
via 304d472 s3/vfs_gpfs: s/syncops/gpfs
via 9b86fa6 s3:vfs:gpfs convert sharemodes/leases parameter
via c57b30b s3: Fix bug 8042: File creation on OS/X
via 320ae41 Fix bug #7080 - Quota only shown when logged as root.
via b9f9be3 Fix for servers that don't put a path separator at the end of the service.
via 4ec8e36 s3: Fix Coverity ID 1137: CONSTANT_EXPRESSION_RESULT
via 7047c2e s3: Fix Coverity ID 1136: CONSTANT_EXPRESSION_RESULT (cherry picked from commit ec4d201d5b9b86dfead5d999e4f186316797f77f)
via 073047a s3: Fix Bug 8047 -- Fix mdns registration if "interfaces=" is used (cherry picked from commit baecb5a35e9f50140cf78e2dbdfe9f2791653875)
via b290e70 alpha_strcpy() is a utility function which reportedly: Strips out all but 'a-Z0-9' and the character in other_safe_chars and replaces with '_'.
via d65d227 Fix bug 8040 - smbclient segfaults when a Cyrillic netbios name or workgroup is configured.
via 56adade Fix bug #7996 - sgid bit lost on folder rename.
via cde942d s3: use getgrset() when it is available
via 1804c7c s3: add explicit configure option whether or not to enable dmapi support
via 98096f2 s3:util_seaccess: make sure that we don't grant SEC_STD_DELETE to the owner by default
via 75a617f s3:smbd: access checks should not depend on share mode flags
via e036bb5 Fix inode generation so nautilus can count total dir size correctly
via ed35030 s3: Attempt to fix bug 8016 -- gpfs_get_xattr broken (cherry picked from commit 820628a6d06c715273ae221c926e1c1e7d7e8385)
via 83cd952 Fix bug #8005 - smbtorture4 BASE-TCONDEV fails when tested on Samba
via 8a532bb nsswitch: fix a segfault in the krb5 locator plugin
via 2a87791 s3: Fix bug 8009 - net rap session cannot get username
via 4b7682a s3: Fix the talloc hierarchy in shadow_copy2_connectpath
from 47e37ad WHATSNEW: Start release notes for 3.5.9.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-stable
- Log -----------------------------------------------------------------
commit 2fbc5382ef48755b09c60e9dfa66fd1b2e880c18
Author: Karolin Seeger <kseeger at samba.org>
Date: Tue Jun 14 13:15:37 2011 +0200
WHATSNEW: Update changes since 3.5.8.
Karolin
(cherry picked from commit d1880d237bdf79b036623ebf5ae477838c9482c9)
commit aa1fbfa3056dc59262603d7bca73307643b916be
Author: Jeremy Allison <jra at samba.org>
Date: Tue Jun 7 12:36:24 2011 -0700
Fix re-opened bug 8083 - "inherit owner = yes" doesn't interact correctly with vfs_acl_xattr or vfs_acl_tdb module.
Fix incorrect interaction when all of
"inherit permissions = yes"
"inherit acls = yes"
"inherit owner = yes"
are set. Found by Björn Jacke. Thanks Björn !
(cherry picked from commit b5011e4c2cee39d4334c04ce7c8adc43a8ca7e6b)
commit ee677cf7f807716d3169fe7ce9aea66ac887fd23
Author: Jeremy Allison <jra at samba.org>
Date: Wed Jun 8 14:37:25 2011 -0700
Part 5 of bugfix for #8211 - "inherit owner = yes" doesn't interact correctly with "inherit permissions = yes" and POSIX ACLs
Ensure when creating a directory, if we make any changes due to inheritance parameters, we update the stat returned.
(cherry picked from commit f5e238cbd97d63e107b64268691dff67cce8fe94)
commit 0108975ae94576d707959b35f4ee8a930ccbe207
Author: Jeremy Allison <jra at samba.org>
Date: Wed Jun 8 14:21:52 2011 -0700
Part 4 of bugfix for #8211 - "inherit owner = yes" doesn't interact correctly with "inherit permissions = yes" and POSIX ACLs
We don't need to check mode bits as well as dev/ino to
ensure we're in the same place.
(cherry picked from commit 0c1b1b73870bd477c83c130cab297b7f2615fe55)
commit dc27e37ea8f62af657ef39e2d2ca8e12fcdf93c3
Author: Jeremy Allison <jra at samba.org>
Date: Wed Jun 8 10:25:33 2011 -0700
Part 3 of bugfix for #8211 - "inherit owner = yes" doesn't interact correctly with "inherit permissions = yes" and POSIX ACLs
When changing ownership on a new file make sure we
must have a valid stat struct before making the inheritance
calls (as they may look at it), and if we make changes we
must have a valid stat struct after them.
(cherry picked from commit d18d6df840d3a47fa1d7b877e07f804f025811ee)
commit 06f653a72d84925c76f21ad1d4d8bc907c138f69
Author: Jeremy Allison <jra at samba.org>
Date: Wed Jun 8 10:17:42 2011 -0700
Part 2 of bugfix for #8211 - "inherit owner = yes" doesn't interact correctly with "inherit permissions = yes" and POSIX ACLs
When changing ownership on a new file make sure we
also change the returned stat struct to have the correct uid.
(cherry picked from commit 59e77811b7774ad76e082ee9fd840a277df75c4c)
commit 5bf5324e6352bb8c68855e5fdbc9991ae71525b6
Author: Jeremy Allison <jra at samba.org>
Date: Wed Jun 8 10:24:02 2011 -0700
Part 1 of bugfix for #8211 - "inherit owner = yes" doesn't interact correctly with "inherit permissions = yes" and POSIX ACLs
When changing ownership on a new directory make sure we
also change the returned stat struct to have the correct uid.
(cherry picked from commit f3900b0a96f98cc65d957cda5f92963f636d6ec1)
commit 55d6c2be05655154851caaceb7eeffedf3a25558
Author: Stefan Metzmacher <metze at samba.org>
Date: Sun Apr 24 21:20:19 2011 +0200
s3:lib/access: normalize IPv4 mapped IPv6 addresses in both directions (bug #7383)
metze
(cherry picked from commit 4bfe2d5655d97fbc7e65744425b5a098e77f5ba1)
(cherry picked from commit 62b2083c627abeb8a2fb7e5adc793c630d0d561c)
Signed-off-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit d9ea6a10a8ba84e8a5a5a65c903ed96f9aa59aa5)
commit adb63408a8077725cc9e9b0ebf86d80efbb84e75
Author: Karolin Seeger <kseeger at samba.org>
Date: Sun Jun 5 21:10:53 2011 +0200
WHATSNEW: Add more changes since 3.5.8.
Karolin
(cherry picked from commit 7e307ac32ca074e47e27229fcef894343ec0f9c9)
commit 9225920bdff24b4a0b0f53f27616d069ba2081da
Author: Jim McDonough <jmcd at samba.org>
Date: Wed May 25 10:49:41 2011 -0400
s3-winbind: BUG 8166 - Don't lockout users when offline.
Windows does not track bad password attempts when offline. We were locking users out but not honoring the lockout duration.
Autobuild-User: Jim McDonough <jmcd at samba.org>
Autobuild-Date: Wed May 25 18:11:10 CEST 2011 on sn-devel-104
(cherry picked from commit b58534f1fca27e3e72f4f4107538ec05734bd42a)
(cherry picked from commit a73963dd49d33bcfdd5cbc310dad0f895683eadf)
commit b152f505a9b0fe310ea1d0899c70b395290fade9
Author: Jeremy Allison <jra at samba.org>
Date: Wed Jun 1 20:38:48 2011 +0200
Fix bug #7528 - Solaris with NIS autohome.
(cherry picked from commit 0ffdf2288b1e6798e43259568818378c43b979e5)
commit e4df1eded1a1951cafc247b3f116d504e668dd2d
Author: Karolin Seeger <kseeger at samba.org>
Date: Tue May 31 21:27:29 2011 +0200
WHATSNEW: Start to add changes since 3.5.8.
To be completed...
Karolin
(cherry picked from commit ac4aca977ecb5fd1a644aa29c4b70503e906f83a)
commit 8a6faa19b623144e4d6fe08c41ba333cc5a48bc8
Author: Jeremy Allison <jra at samba.org>
Date: Tue Apr 19 13:25:43 2011 -0700
Fix bug #8083 - "inherit owner = yes" doesn't interact correctly with vfs_acl_xattr or vfs_acl_tdb module.
If "inherit owner = yes", pass in the directory owner and group
owner as the target for CREATOR_OWNER and CREATOR_GROUP substitutions,
and also as the owner and primary group of the new security descriptor
being applied to the object.
Jeremy.
(cherry picked from commit ea331419108ed8575e33394f989240abeede2671)
commit a6157b3bbcab13f687d62d21e268a65c9fdc2bde
Author: Jeremy Allison <jra at samba.org>
Date: Thu May 26 16:39:30 2011 -0700
Fix bug #6911 - Kerberos authentication from vista to samba fails when security blob size is greater than 16 kB
We were not correctly checking the output of asn1_start_tag().
asn1_start_tag() returns -1 and sets data->has_error if the
remaining blob size is too short to contain the tag length.
We were checking data->has_error and returning NT_STATUS_OK
(to allow the second asn.1 parse to fail in that case). We
should not be checking data->has_error in this case, but
falling through to the code that already checks the length.
Thanks to Jim for reproducing this for me. We don't get bitten
by this as we announce a max buffer size of 16k, greater than
Windows's 4k, which means that most krb5 spnego packets already
fit.
Jeremy.
(cherry picked from commit c718b7d43bc5616f7f5e110afdf5332a62e04cb8)
commit 04ac875ef2bce645a7c9b466e2fd8830797236bb
Author: Jim McDonough <jmcd at samba.org>
Date: Thu May 26 20:29:24 2011 +0200
s3-libnet: fix bug #6364: Pull realm from supplied username on libnet join
(cherry picked from commit 67a9d4bb376d89c4411024164165ca1ed7a0b157)
commit b463390ec9500cbaa7efe45ee6baefe05bb16f39
Author: David Disseldorp <ddiss at suse.de>
Date: Tue May 24 11:50:12 2011 +0200
s3-printing: remove duplicate cups response processing code
There is currently a lot of duplicate code included for processing
responses to CUPS_GET_PRINTERS and CUPS_GET_CLASSES requests. This
change splits this code into a separate function.
Signed-off-by: Günther Deschner <gd at samba.org>
(cherry picked from commit 4f0077cd6a8ffcb9f4980d71c9fc434f7fc1051c)
commit 5cadaab50e26328c2a3a63146a521ad1a4adc483
Author: David Disseldorp <ddiss at suse.de>
Date: Tue May 24 11:46:25 2011 +0200
s3-printing: use printcap IDL for IPC
Use printcap IDL for marshalling and unmarshalling messages between cups
child and parent smbd processes. This simplifies the IPC and ensures
the parent is notified of cups errors encountered by the child.
https://bugzilla.samba.org/show_bug.cgi?id=7994
Signed-off-by: Günther Deschner <gd at samba.org>
(cherry picked from commit 53ecbc4a8cffe24f94d3e624faf3a9ea9067cc23)
commit 8cbf29590323f4c56e986627b7183b824b1dbbde
Author: David Disseldorp <ddiss at suse.de>
Date: Tue May 24 11:41:27 2011 +0200
idl: define printcap IPC message format
Signed-off-by: Günther Deschner <gd at samba.org>
(cherry picked from commit 2bf4660f2e3cf1921d22f74c2db1a5fb3b531657)
commit 4cc531cf8ced892f13a6846c756de822385c3c0e
Author: David Disseldorp <ddiss at suse.de>
Date: Tue May 24 11:34:59 2011 +0200
s3-printing: an empty cups printer list is treated as an error
cups_async_callback() is called to receive new printcap data from a
child process which requests the information from cupsd.
Newly received printcap information is stored in a temporary printcap
cache (tmp_pcap_cache). Once the child process closes the printcap IPC
file descriptor, the system printcap cache is replaced with the newly
populated tmp_pcap_cache, however this only occurs if tmp_pcap_cache is
non null (has at least one printer).
If the printcap cache is empty, which is the case when cups is not
exporting any printers, the printcap cache is not replaced resulting in
stale data.
Signed-off-by: Günther Deschner <gd at samba.org>
(cherry picked from commit 683b0652e23b787c5038ff5d7466fdc2a8b3c07f)
commit 0b9937c43e8191e35ff7b0698f18de83b9060c36
Author: Jeremy Allison <jra at samba.org>
Date: Tue May 24 12:47:31 2011 -0700
Fix our asn.1 parser to handle negative numbers.
Autobuild-User: Jeremy Allison <jra at samba.org>
Autobuild-Date: Tue May 24 22:57:16 CEST 2011 on sn-devel-104
(cherry picked from commit e719dfd4dc178f001a5f804fb1ac4e587574415f)
Fix bug #8163 (asn.1 library does not correctly read negative integers).
(cherry picked from commit 859d13141cd831488b60e413f7141514ae4464b5)
(cherry picked from commit d210395a50b5d5043bdcfb75f670f8abab91f974)
commit dadf4450433a5f5cd515e0096382f077bfbdbf14
Author: Jeremy Allison <jra at samba.org>
Date: Fri May 20 12:36:56 2011 -0700
Fix bug #8157 - std_pcap_cache_reload() fails to parse a cups printcap file correctly.
The parsing code made some strange assumptions about what is a printer
name, and what is a comment.
(cherry picked from commit ef1a0c14ab41c87f133d310c5f976548caf15b9a)
commit 1a4449eb7cccd581fb70ca1362d329c45a53b9d0
Author: David Disseldorp <ddiss at suse.de>
Date: Mon Jan 17 16:09:32 2011 +0100
s3-printing: remove pcap_cache_loaded asserts
pcap_cache_loaded() assertions were added to the (re)load_printers()
functions, to ensure the caller had called pcap_cache_reload() prior to
reloading printer shares.
The problem is, pcap_cache_loaded() returns false if the the pcap_cache
contains no printer entries. i.e. pcap_cache_reload() has run but not
detected any printers.
Remove these assertions, correct call ordering is already enforced.
Signed-off-by: Günther Deschner <gd at samba.org>
The last 3 patches address bug #7836 (A newly added printer isn't visbile to
clients).
(cherry picked from commit a88126d6e8577a9e0b6196acdee70633d0e06259)
commit 8ff0c807ec2d4f15d0fb19e715d9ae8f306b2cac
Author: David Disseldorp <ddiss at suse.de>
Date: Thu May 19 11:22:37 2011 +0200
Revert "Revert "s3-printing: update parent smbd pcap cache""
This reverts commit b6268f507fa3276c2ef22c58bad400a3fed48cd9.
Signed-off-by: Günther Deschner <gd at samba.org>
(cherry picked from commit 8070240ed7e73b94aba591b6d985e7e32037bb5e)
commit b3c1c588c9867261df1234a3c37452ddb00dd9d2
Author: David Disseldorp <ddiss at suse.de>
Date: Thu May 19 11:22:18 2011 +0200
Revert "Revert "s3-printing: reload shares after pcap cache fill""
This reverts commit e4579eab7fe3eab7a5209e6de74e6fd2f53099d0.
Signed-off-by: Günther Deschner <gd at samba.org>
(cherry picked from commit 9e427e5aced5caeedeeff29b9b962913ee4f796d)
commit c54a013cd1f4c78dcdba314a20582b52f6307a6d
Author: Karolin Seeger <kseeger at samba.org>
Date: Mon May 23 20:17:13 2011 +0200
Revert "s3-spoolss: Added EN ISO 216, A0 and A1 to builtin forms."
This reverts commit 73bec197a91a15aa9a69c9a3868ed51bdd3674ea.
Please see bug #8129 (Application requests printing on Format A5, but prints as
A4) fro details.
(cherry picked from commit f51ee94ee9034f88566c4441eed4ff11697454ec)
commit 0d7a0ae3fc0ffb15db0568216c4eca2d27be330f
Author: Volker Lendecke <vl at samba.org>
Date: Fri Apr 23 19:41:29 2010 +0200
libwbclient: Fix bug 8087 -- wbcChangeUserPasswordEx in RESPONSE mode does not work
This is 03115efae89c8c4f51dea1ce82613817bd9fcf5b from master
Actually copy something in wbcChangeUserPasswordEx
The length argument for memcpy was initialized to 0 and not initialized
(cherry picked from commit c707b1f3b199b8c785a79db308d80eee2926b060)
commit bcded87973ea112c7f6799424d95d05fc013d94f
Author: Günther Deschner <gd at samba.org>
Date: Fri Oct 1 06:08:12 2010 +0200
s3-net: make sure we dont crash when publishing a single printer.
Guenther
(cherry picked from commit 21576e3f8c32878910460bf9575c200ad93d682a)
Part of a fix for bug #7993 ("net rpc printer MIGRATE" command fails).
(cherry picked from commit 9c75728c62cccb8da606ece2d9df08b592e7c7c0)
commit df07498c8e770f4474a41833c85fa636830dea90
Author: Björn Jacke <bj at sernet.de>
Date: Fri Nov 26 15:14:14 2010 +0100
s3/configure: fix GNU ld version detection with old gcc releases
needed as old gcc releases output everything to stderr, even stdout output from
ld
Fixes #7825
Autobuild-User: Björn Jacke <bj at sernet.de>
Autobuild-Date: Fri Nov 26 20:15:24 CET 2010 on sn-devel-104
(cherry picked from commit 70a7da0e101910e3ceb08b86d4b840b219e24d7d)
(cherry picked from commit 19bbd0a4f0c39aaf6f0f3ecdcce7c52bb8264a5a)
commit 0d8e1326f7715def2b0aa6d9e656225685818fd3
Author: Simo Sorce <idra at samba.org>
Date: Mon Apr 18 22:15:11 2011 +0930
tdb_expand: limit the expansion with huge records
ldb can create huge records when saving indexes.
Limit the tdb expansion to avoid consuming a lot of memory for
no good reason if the record being saved is huge.
Fix bug #7610 (winbindd_cache.tdb grows too large when scaled).
(cherry picked from commit c8ba5d41f3c2ab25cb9b9d0fa78b4f884d4b9721)
commit 69b4adc4d90b3a7625c090d09b58becfefe550dd
Author: Günther Deschner <gd at samba.org>
Date: Wed May 11 10:30:42 2011 +0200
s3-printing: make cups_pull_comment_location() work again.
we deal with lp_cups_server in cups_connect() already, inside the URI all our
other cups functions we use ipp://localhost, do the same here.
Guenther
Autobuild-User: Günther Deschner <gd at samba.org>
Autobuild-Date: Wed May 11 11:36:07 CEST 2011 on sn-devel-104
The last 3 patches address bug #8132 (Samba does not fill printers Location
field when using cups).
(cherry picked from commit 392d6b2ab8dcde4176a6e872699a5a076ab92068)
commit 15d82ba902fe483ccd7e1977438279e8dfb2f7f7
Author: Günther Deschner <gd at samba.org>
Date: Tue May 10 15:49:05 2011 +0200
s3-printing: Fix double free of cups request.
We never free the request in our cups api usage except for here. The reason is
probably htis (from the cupsDoConnect API docs):
"This function sends the IPP request to the specified server, retrying and
authenticating as necessary. The request is freed with ippDelete() after
receiving a valid IPP response."
Revert "Fix a memory leak in cups_pull_comment_location"
This reverts commit fee2664dad37536b05ce8bdae3e74d45b257f632.
Autobuild-User: Günther Deschner <gd at samba.org>
Autobuild-Date: Tue May 10 17:32:58 CEST 2011 on sn-devel-104
(cherry picked from commit 019f11dd5b3240d05c1abe30dec3d793d6919313)
(cherry picked from commit 5d503c7e8927f2bdb252f2293e53b7e87f2d3cb5)
commit 4a2f4c83f5312b4db7f6205712d4f922c1df753e
Author: Günther Deschner <gd at samba.org>
Date: Tue May 10 15:48:25 2011 +0200
s3-printing: very obvious fix for cups_pull_comment_location().
This has been in there since 2008...
Guenther
(cherry picked from commit 3ba3f68e03510e3bb5b7627c200af0395e853bc2)
(cherry picked from commit 04e820ef17e5a9df90ff8b7744bf9cce5a00ae05)
commit d56f76ff59259aa6616ff875b39426197df39138
Author: Andrew Bartlett <abartlet at samba.org>
Date: Fri Dec 10 07:57:59 2010 +1100
s3-libsmb Don't ever ask for machine$ principals as a target.
It is never correct to ask for a machine$ principal as the target of a
kerberos connection. You should always connect via the
servicePrincipalName.
This current code appears to have built up from a series of minimal
changes, as the codebase adapted the to lack of a SPNEGO principal
from Windows 2008.
Andrew Bartlett
The last two patches address bug #7893 (CIFS tickets vs. <host>$ tickets).
(cherry picked from commit 12bb20a0f6cd85cfdaedf746e7b05416ccde31b0)
commit deebcee272f7be2d22a92354156fccdd9b72656a
Author: Andrew Bartlett <abartlet at samba.org>
Date: Sat Dec 4 13:48:37 2010 +1100
s3-libads Default to NOT using the server-supplied principal from SPNEGO
This principal is not supplied by later versions of windows, and using
it opens up some oportunities for man in the middle attacks. (Becuase
it isn't the name being contacted that is verified with the KDC).
This adds the option 'client use spnego principal' to the smb.conf (as
used in Samba4) to control this behaivour. As in Samba4, this
defaults to false.
Against 2008 servers, this will not change behaviour. Against earlier
servers, it may cause a downgrade to NTLMSSP more often, in
environments where server names are not registered with the KDC as
servicePrincipalName values.
Andrew Bartlett
(cherry picked from commit bb7806283e71f3b8029aae0eed326b5847a36d83)
(cherry picked from commit e962852687f539678b7c38ed21f1b76c328821f2)
commit 03d62d2d9d4bf8f2834f4a09fb4fd4bb8be42c02
Author: Jeremy Allison <jra at samba.org>
Date: Fri Apr 29 14:22:54 2011 -0700
Fix bug 8111 - CIFS VFS: unexpected error on SMB posix open
We are conflating the O_CREAT|O_EXCL with the O_TRUNC
processing, they need to be separate. We need to chose
using (O_CREAT|O_EXCL) first, then modify if O_TRUNC is
set. This needs two separate switch statements.
Jeremy
(cherry picked from commit 37823155157d735356e1f223b425252c956d8c04)
commit 0b1101ae0684186150da58aaf1ca2feb81ce66ae
Author: Jeremy Allison <jra at samba.org>
Date: Thu Mar 24 11:55:38 2011 -0700
Fix is_myname_or_ipaddr() to be robust against strange DNS setups.
If IPv6 DNS names are turned on, but Samba isn't configured to
listen on an IPv6 interface, then is_myname_or_ipaddr() can return
false on a valid DNS name that it should detect is our own. If the
IPv6 addr is returned by preference, then looking at the first addr
only causes is_myname_or_ipaddr() to fail. We need to look at all the
addresses returned by the DNS lookup and check all of them against
our interface list. This is an order N^2 lookup, but there shouldn't
be enough addresses to make this a practical problem.
Jeremy.
Fix bug #8038 - Connecting to a printer can return INVALID_PARAMETER when IPv6
DNS names are turned on.
(cherry picked from commit 80078cb6ef2e6976cb5ab25a86157bca22c836a2)
commit 4b0f3693bed64ab3b3d433e1e45d3e8c56f50afc
Author: Sergey Korsak <skif at 1plus1.net>
Date: Tue Apr 19 18:51:32 2011 +0200
s3: Fix bug 8099 - setpwent() actually does endpwent() on FreeBSD
(cherry picked from commit 2167ac2cd42c9ed5aaae0086dbd27e29d1d77686)
commit 40a6b1b25df3f437c0f785caa56f66993ee67ede
Author: Jeremy Allison <jra at samba.org>
Date: Fri Apr 8 15:25:18 2011 -0700
Fix bug 8072 - PANIC: create_file_acl_common frees handle two times.
Caused by premature optimisation storing the parent ACL on the
module handle instead of (correctly) on the file fsp. Previous
code wasn't reentrant safe. This is less optimal but doesn't
crash in the specific case :-).
Jeremy.
(cherry picked from commit 23e6f41ec923e2d3b4684ee646c8cd29506d787a)
commit 78e9a21d2c126df26dc90cdedad6a02c6cca534a
Author: Jeremy Allison <jra at samba.org>
Date: Mon Apr 18 14:26:09 2011 -0700
Fix bug 8088 - rpccli_samr_chng_pswd_auth_crap segfaults if any input blobs are null.
(cherry picked from commit fae43d2640459fe8cb3d485eacd1624de59b9622)
commit 3d7991a6eea433fb867beb7c06eb06f8fa931fca
Author: Dmitry Butskoy <dmitry at butskoy.name>
Date: Mon Apr 18 14:14:09 2011 -0700
Fix bug 6966 - "allow trusted domains = no" not respected in winbind.
(cherry picked from commit 66de22f7b242ae9e3358d33e580547c2618bd918)
commit 2ef7a5ce3223ea828041f4e30ceb589acaaa784b
Author: Volker Lendecke <vl at samba.org>
Date: Thu Apr 7 22:03:49 2011 +0200
s3: Fix bug 8066, wrong output in smbget
(cherry picked from commit 4a467155fe9ad66a2d7e7e490d7e3957b4dcb67a)
commit 264ed2505845d683d158cc7a6c3be8b3f54fdc39
Author: Jeremy Allison <jra at samba.org>
Date: Tue Apr 5 17:26:00 2011 -0700
Fix bug #7987 - ACL can get lost when files are being renamed.
There is no reason for smbd with Windows ACLs to use chmod
or fchmod unless it's a file opened with UNIX extensions or
with posix pathnames.
(cherry picked from commit bea18a55252a06fd1da005a4f57d4d4dd89acaaf)
commit 192f62bd8249668f1037282b184873f06ea6d8eb
Author: Günther Deschner <gd at samba.org>
Date: Wed Apr 13 17:41:36 2011 +0200
s3-cli_pipe: fix timeout in rpc_pipe_open_tcp_port().
Make sure we use a timeout of 60 seconds, not 60 milliseconds...
This prevented us from successfully using the ncacn_ip_tcp client in a lot of
places, I guess.
Guenther
Autobuild-User: Volker Lendecke <vlendec at samba.org>
Autobuild-Date: Wed Apr 13 18:59:19 CEST 2011 on sn-devel-104
(cherry picked from commit 4b3fe5247a6e16b1ad9f05269e9aa00e3120e36a)
Fix bug #8085 - incorrect timeout handling in ncacn_ip_tcp client code.
(cherry picked from commit d7d39c723e1855a3d18813e8a79fcca9770b0142)
commit e548a03aa1e1698c192119b64564207233f06c29
Author: Günther Deschner <gd at samba.org>
Date: Tue Apr 12 10:22:23 2011 +0200
s3-docs: document all wbinfo options.
Guenther
Autobuild-User: Günther Deschner <gd at samba.org>
Autobuild-Date: Wed Feb 23 23:45:40 CET 2011 on sn-devel-104
Fix bug #7983 - not all wbinfo parameters are documented in manpage.
(cherry picked from commit 7942bf50ce22597833bbfba99776f4b052edff1c)
commit df4564fa02b2bb2bc69711d84c1d1984ecceac85
Author: Björn Baumbach <bb at sernet.de>
Date: Mon Apr 11 10:27:58 2011 +0200
s3-modules: Fix debug message (bug #8074)
Print child descriptor instead of parent.
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Autobuild-User: Stefan Metzmacher <metze at samba.org>
Autobuild-Date: Mon Apr 11 11:48:42 CEST 2011 on sn-devel-104
(cherry picked from commit e6cf92c574fba14132757f141d8b1242fa71be88)
(cherry picked from commit 42ad7630259829f1c40d9d0fcf5376fa007568a3)
(cherry picked from commit 75ab0c486927f674937b3379104eb2e4c8f026e4)
commit cca5160d6ab2f443f9936099cf4d302b722ad2fd
Author: Martin Vogt <martin.vogt at itwm.fraunhofer.de>
Date: Thu Apr 7 21:20:06 2011 +0200
Fix bug #6762 - ctdb on gpfs error with MS Office.
(cherry picked from commit 84745fe2ef953b1b5edfef473c88c71cc71d4d1e)
commit 304d472448a5c6b16c1746adc58d713411efef62
Author: Björn Jacke <bj at sernet.de>
Date: Sun Apr 3 16:19:11 2011 +0200
s3/vfs_gpfs: s/syncops/gpfs
as pointed out by Metze in bug #8031
cherry-picked from dca465fa53f4d16cdce1353685b11010aa8ff0c7
The last two patches address bug #8031 - merge patc to make
sharemodes/leases parameter a per share setting.
(cherry picked from commit fbf1a26be29f3d78d09e5f4285c973db9e16327f)
commit 9b86fa63dff0e081768435e5166ada122a7bbc11
Author: Christian Ambach <christian.ambach at de.ibm.com>
Date: Fri Oct 8 13:15:57 2010 +0200
s3:vfs:gpfs convert sharemodes/leases parameter
convert gpfs:sharemodes and gpfs:leases parameters from a global setting
to a per share setting
cherry-picked from 22018b8b887c2677d30bbb4589f800197edf0e98
(cherry picked from commit 4413d05bd742f879a6af71206265791ff76070bb)
commit c57b30b66ac92a5049bae328621e55be4b9e57d2
Author: Volker Lendecke <Volker.Lendecke at SerNet.DE>
Date: Mon Apr 4 10:19:18 2011 -0700
s3: Fix bug 8042: File creation on OS/X
With a case insensitive file system the stat cache lookup leaked the parent
directorys stat information from unix_convert into the smb_filename. This led
open_file_ntcreate to believe it just created a directory.
In the case where we do the search we already invalidate the stat struct.
Thanks to TAKAHASHI Motonobu for insisting! :-)
Volker
(cherry picked from commit c9015e381905bb254ee61b64d99052b96b4d4913)
commit 320ae41ff34856a8837be88a4a99366b18e2d172
Author: Jeremy Allison <jra at samba.org>
Date: Tue Apr 5 14:15:56 2011 -0700
Fix bug #7080 - Quota only shown when logged as root.
Ensure we also check conn->admin_user when rejecting non-root access.
(cherry picked from commit 6d360c9e5db64fbd96d353013b7836d771935b6d)
commit b9f9be3effb16382d081f37bba6fc6ae016a74f3
Author: Larry Reid <lcreid at jadesystems.ca>
Date: Sat Mar 26 15:39:27 2011 -0700
Fix for servers that don't put a path separator at the end of the service.
Fix bug 8055 - Can't See Parts of DFS CIFS Share.
(cherry picked from commit 0d929df7d194574d283ea5b9f4f8a45d6d214a54)
commit 4ec8e365b6676d70dde7b1a2ba56d3280b0a7196
Author: Volker Lendecke <vl at samba.org>
Date: Fri Apr 1 08:40:38 2011 +0200
s3: Fix Coverity ID 1137: CONSTANT_EXPRESSION_RESULT
Autobuild-User: Volker Lendecke <vlendec at samba.org>
Autobuild-Date: Fri Apr 1 09:35:19 CEST 2011 on sn-devel-104
This patch and the last one address bug #8054 - winbindd cache stores/retrieves
wrong sizes for 16-bit ints.
(cherry picked from commit 5fc7b78c64c43fd345b96dcbc1d30f2cabfaef81)
commit 7047c2e5453f99703895431629129ac44e3de27c
Author: Volker Lendecke <vl at samba.org>
Date: Fri Apr 1 08:40:38 2011 +0200
s3: Fix Coverity ID 1136: CONSTANT_EXPRESSION_RESULT
(cherry picked from commit ec4d201d5b9b86dfead5d999e4f186316797f77f)
commit 073047a53d8fcc178c9082242e3cb73bb87ab639
Author: Marc A. Dahlhaus <mad at wol.de>
Date: Fri Apr 1 22:24:56 2011 +0200
s3: Fix Bug 8047 -- Fix mdns registration if "interfaces=" is used
(cherry picked from commit baecb5a35e9f50140cf78e2dbdfe9f2791653875)
commit b290e70432852614eba9261502bf6bc6eb8aadf6
Author: David Disseldorp <ddiss at suse.de>
Date: Fri Apr 1 11:21:59 2011 -0700
alpha_strcpy() is a utility function which reportedly: Strips out all but 'a-Z0-9' and the character in other_safe_chars and replaces with '_'.
This statement does not currently hold true in all cases (e.g. src =
"ТАНЦЕВАТЬ").
Part of a fix for bug 8040 - smbclient segfaults when a Cyrillic netbios
name or workgroup is configured.
(cherry picked from commit 3e0f539596fbb867b672eeaff037e81c33428309)
commit d65d2279399316b80b1a992e5821919c6800cad4
Author: Jeremy Allison <jra at samba.org>
Date: Fri Mar 25 15:12:12 2011 -0700
Fix bug 8040 - smbclient segfaults when a Cyrillic netbios name or workgroup is configured.
As discovered by David Disseldorp <ddiss at suse.de>, convert_string_talloc()
doesn't always return consistent results for a zero length string. The
API states an incoming string must *always* contain the terminating null,
but unfotunately too much code expects passing in a zero source length
to return a null terminated string, so at least ensure we return a
correct null string in the required character set and return the
correct length.
Also ensure we cannot return a zero length for a converted string
(we ensure that the returned buffer is always allocated and zero
terminated anyway) as calling code depends on the fact that returning
true from this function will *always* return a non-zero length (as
it must include the terminating null).
Note this is a different fix from what went into master (this is
identical to the fix I'm planning for 3.5.x) as convert_string_talloc()
has diverged between the two.
Jeremy.
(cherry picked from commit bb3ed43584e6d2c4d64b5f7b9e70a7db7f3e859d)
commit 56adade6c2c16d938d507c4d6373bb4b61aef60a
Author: Jeremy Allison <jra at samba.org>
Date: Thu Mar 31 10:49:22 2011 -0700
Fix bug #7996 - sgid bit lost on folder rename.
Refuse to set dos attributes into unix mode bits on such a
folder.
(cherry picked from commit 90e7f310ec52119359784899945f47d0a9c4e3ae)
commit cde942d2672bd81d0534c0260ebb1a3b41dc50f1
Author: Christian Ambach <christian.ambach at de.ibm.com>
Date: Mon Mar 14 08:08:58 2011 -0400
s3: use getgrset() when it is available
When getgrouplist() is not defined, use getgrset() if it is defined
instead of using the initgroups() + getgroups() combo
Major contributions from Yannick Bergeron <yaberger at ca.ibm.com>
Autobuild-User: Volker Lendecke <vlendec at samba.org>
Autobuild-Date: Sat Mar 19 10:09:38 CET 2011 on sn-devel-104
(cherry picked from commit ed46dfc4f16e230645fae5f3b3b21c462694c30a)
Fix bug #8012 (Use getgrset() instead of initgroups() + getgroups() when
getgrouplist() is not defined).
(cherry picked from commit 64be11d41292fd2e9f6c13855fa6041b9290ce0c)
commit 1804c7c22e322f680779c47a1593a0a526025587
Author: Björn Jacke <bj at sernet.de>
Date: Tue Feb 23 15:23:27 2010 +0100
s3: add explicit configure option whether or not to enable dmapi support
Signed-off-by: Stefan Metzmacher <metze at samba.org>
(similar to commit ce7727c1cc2fe4caa9b2d6e33530c3483dd5f980)
Fix bug #8033 - Backport dmapi configure checks.
(cherry picked from commit a8552d4ea6ea3b3b59b0d1c39e8fdaf2f9e11a74)
commit 98096f22d1b6983720f95502d5211bedaae6c431
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Mar 21 14:15:32 2011 +0100
s3:util_seaccess: make sure that we don't grant SEC_STD_DELETE to the owner by default
In the file server SEC_STD_DELETE is granted on the file/directory
or by FILE_DELETE_CHILD on the parent directory.
metze
(similar to commit c7d10179108a3ae8af15c838042294f3fdced03c)
The last 2 patches address bug #8034 (SEC_STD_DELETE is always granted to the
owner of a file).
(cherry picked from commit 14a31111961278db99564d4d694f10ed66ff91bd)
commit 75a617fc9b8e6cd94aca48ada306823eabd4f02a
Author: Stefan Metzmacher <metze at samba.org>
Date: Fri Mar 18 16:45:08 2011 +0100
s3:smbd: access checks should not depend on share mode flags
metze
(cherry picked from commit f0ec69b53544b7ff702f94d58b3d64c33eaabc7a)
(cherry picked from commit dca75c8e3ac23256d93269bdc13d1e67571bc9f2)
(cherry picked from commit 295271ca3d4346e130363ba227ff66b08368d957)
commit e036bb52a747fb87083796e5526bf3f918eed814
Author: Nikolay Martynov <mar.kolya at gmail.com>
Date: Wed Mar 16 13:00:22 2011 -0700
Fix inode generation so nautilus can count total dir size correctly
Fix bug #8010 (str_checksum often returns same value for different strings
[Patch]).
(cherry picked from commit e47dd1ed1a59d9fc721eeae0a9bb0f80e33be4c8)
commit ed350302fdf7741793f38e81dd9f9df73c02d0de
Author: Volker Lendecke <vl at samba.org>
Date: Fri Mar 18 17:47:27 2011 +0100
s3: Attempt to fix bug 8016 -- gpfs_get_xattr broken
(cherry picked from commit 820628a6d06c715273ae221c926e1c1e7d7e8385)
commit 83cd9523bd24b907079392d3cd2cc04859583c35
Author: Jeremy Allison <jra at samba.org>
Date: Mon Mar 14 16:12:31 2011 -0700
Fix bug #8005 - smbtorture4 BASE-TCONDEV fails when tested on Samba
When pulling non-aligned ucs2 strings, we neglected to add in the
pad byte to the buffer length we've eaten. This caused the device
string in TCONX (which seems to be one of the few places that uses
non-aligned ucs2 strings) to be incorrectly read.
Volker please check.
Jeremy.
(cherry picked from commit e59a950c049679f0394ea41b463dbb9837eb5e63)
(cherry picked from commit 9cddb8e6df6cc47e22a572af164deaffc6e1a774)
commit 8a532bbba6cd0ebc269ffa4b02d8bbb1927f1ba5
Author: Christian Ambach <christian.ambach at de.ibm.com>
Date: Thu Feb 10 15:55:50 2011 +0100
nsswitch: fix a segfault in the krb5 locator plugin
after the number of retries was exceeded, the loop did not
bail out correctly with an error and went on using a null pointer
Fix bug #8008 (winbind krb5 locator crash).
(cherry picked from commit f5eba15db82ed679d72dc8b13912d54919343314)
commit 2a87791c4c4014f938d197a7b5e9237b83a20423
Author: Volker Lendecke <vl at samba.org>
Date: Mon Mar 14 10:35:23 2011 -0700
s3: Fix bug 8009 - net rap session cannot get username
Looking in [MS-RAP].pdf - these strings are always 4 bytes as an
offset in the rparam area, the string length is the size in the rdata area.
Se we must always return we have consumed 4 param bytes.
(cherry picked from commit dd2e6fde0ab2e929b108c22244aac746e036a22c)
commit 4b7682a0b1a0a4852d1a131d31d5651ff8b6bdee
Author: Volker Lendecke <vl at samba.org>
Date: Mon Mar 14 18:35:36 2011 +0100
s3: Fix the talloc hierarchy in shadow_copy2_connectpath
We have to return on talloc_tos() because we don't have a mem_ctx given to us.
So we have to create a separate temporary talloc context.
Fix bug #8011 (memory corruption in shadow_copy2).
Autobuild-User: Volker Lendecke <vlendec at samba.org>
Autobuild-Date: Mon Mar 14 19:21:11 CET 2011 on sn-devel-104
(cherry picked from commit 746b299ec1b11ea1e70c130b69a9a379ec478750)
(cherry picked from commit 5d734a32d9719d05f1dc53b3f61535778a7cdbf3)
-----------------------------------------------------------------------
Summary of changes:
WHATSNEW.txt | 112 ++++++++-
docs-xml/manpages-3/wbinfo.1.xml | 100 +++++++-
lib/tdb/common/io.c | 25 ++-
lib/util/asn1.c | 9 +
nsswitch/libwbclient/wbc_pam.c | 16 +-
nsswitch/winbind_krb5_locator.c | 2 +-
nsswitch/winbind_nss_freebsd.c | 8 +-
source3/Makefile.in | 6 +-
source3/configure.in | 26 ++-
source3/include/local.h | 1 +
source3/include/proto.h | 7 +-
source3/lib/access.c | 31 ++-
source3/lib/charcnv.c | 32 ++-
source3/lib/jenkins_hash.c | 370 ++++++++++++++++++++++++++
source3/lib/system_smbd.c | 59 ++++-
source3/lib/util.c | 16 +-
source3/lib/util_seaccess.c | 24 +-
source3/lib/util_sock.c | 88 ++++---
source3/lib/util_str.c | 12 +-
source3/libads/sasl.c | 8 +-
source3/libnet/libnet_join.c | 7 +
source3/librpc/gen_ndr/ndr_printcap.c | 168 ++++++++++++
source3/librpc/gen_ndr/ndr_printcap.h | 14 +
source3/librpc/gen_ndr/printcap.h | 21 ++
source3/librpc/idl/printcap.idl | 17 ++
source3/libsmb/cliconnect.c | 40 +---
source3/libsmb/clidfs.c | 17 +-
source3/libsmb/clirap2.c | 2 +-
source3/modules/gpfs.c | 29 +-
source3/modules/vfs_acl_common.c | 204 ++++++++++-----
source3/modules/vfs_acl_tdb.c | 6 +-
source3/modules/vfs_acl_xattr.c | 4 +
source3/modules/vfs_gpfs.c | 93 ++++++-
source3/modules/vfs_gpfs.h | 1 +
source3/modules/vfs_shadow_copy2.c | 11 +-
source3/param/loadparm.c | 11 +
source3/printing/load.c | 5 +-
source3/printing/nt_printing.c | 2 -
source3/printing/pcap.c | 28 ++-
source3/printing/print_cups.c | 471 ++++++++++++++-------------------
source3/rpc_client/cli_pipe.c | 2 +-
source3/rpc_client/cli_samr.c | 21 ++-
source3/smbd/dosmode.c | 22 ++
source3/smbd/fake_file.c | 2 +-
source3/smbd/filename.c | 3 +
source3/smbd/nttrans.c | 4 +-
source3/smbd/open.c | 72 ++++--
source3/smbd/posix_acls.c | 2 +-
source3/smbd/process.c | 4 +-
source3/smbd/server.c | 35 ++-
source3/smbd/sesssetup.c | 28 ++-
source3/smbd/trans2.c | 66 ++++-
source3/utils/net_rpc_printer.c | 5 +
source3/utils/ntlm_auth.c | 2 +-
source3/utils/smbget.c | 8 +-
source3/web/swat.c | 4 +-
source3/winbindd/winbindd.c | 12 +-
source3/winbindd/winbindd_cache.c | 4 +-
source3/winbindd/winbindd_pam.c | 5 +-
59 files changed, 1808 insertions(+), 596 deletions(-)
create mode 100644 source3/lib/jenkins_hash.c
create mode 100644 source3/librpc/gen_ndr/ndr_printcap.c
create mode 100644 source3/librpc/gen_ndr/ndr_printcap.h
create mode 100644 source3/librpc/gen_ndr/printcap.h
create mode 100644 source3/librpc/idl/printcap.idl
Changeset truncated at 500 lines:
diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index a59df9e..f9b4a46 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -1,6 +1,6 @@
=============================
Release Notes for Samba 3.5.9
- , 2011
+ June 14, 2011
=============================
@@ -8,12 +8,118 @@ This is the latest stable release of Samba 3.5.
Major enhancements in Samba 3.5.9 include:
-o
+o Sgid bit lost on folder rename (bug #7996).
+o ACL can get lost when files are being renamed (bug #7987).
+o Respect "allow trusted domains = no" in Winbind (bug #6966).
+
Changes since 3.5.8:
--------------------
-o
+o Jeremy Allison <jra at samba.org>
+ * BUG 6911: Kerberos authentication from Vista to Samba fails when security
+ blob size is greater than 16 kB.
+ * BUG 7080: Quota only shown when logged as root.
+ * BUG 7528: Fix Solaris with NIS autohome.
+ * BUG 7987: ACL can get lost when files are being renamed.
+ * BUG 7996: sgid bit lost on folder rename.
+ * BUG 8040: Fix 'smbclient' segfaults when a Cyrillic netbios name or
+ workgroup is configured.
+ * BUG 8072: Fix panic in create_file_acl_common.
+ * BUG 8038: Fix is_myname_or_ipaddr() to be robust against strange DNS
+ setups.
+ * BUG 8083: "inherit owner = yes" doesn't interact correctly with
+ vfs_acl_xattr or vfs_acl_tdb module.
+ * BUG 8088: Fix segfault in rpccli_samr_chng_pswd_auth_crap if any input
+ blobs are null.
+ * BUG 8111: CIFS VFS: Fix unexpected error on SMB posix open.
+ * BUG 8157: Fix parsing CUPS printcap files in std_pcap_cache_reload().
+ * BUG 8163: Fix our asn.1 parser to handle negative numbers.
+ * BUG 8211: "inherit owner = yes" doesn't interact correctly with "inherit
+ permissions = yes".
+
+
+o Christian Ambach <ambi at samba.org>
+ * BUG 8008: Fix a segfault in the krb5 locator plugin.
+ * BUG 8012: Use getgrset() instead of initgroups() + getgroups() when
+ getgrouplist() is not defined.
+ * BUG 8031: Convert gpfs:sharemodes and gpfs:leases parameters from a
+ global setting to a per share setting.
+
+
+o Andrew Bartlett <abartlet at samba.org>
+ * BUG 7893: Don't ever ask for machine$ principals as a target.
+
+
+o Björn Baumbach <bb at sernet.de>
+ * BUG 8074: Fix debug message.
+
+
+o Dmitry Butskoy <dmitry at butskoy.name>
+ * BUG 6966: Respect "allow trusted domains = no" in Winbind.
+
+
+o Marc A. Dahlhaus <mad at wol.de>
+ * BUG 8047: Fix mdns registration if "interfaces=" is used.
+
+
+o Günther Deschner <gd at samba.org>
+ * BUG 7993: Make sure we don't crash when publishing a single printer.
+ * BUG 8085: Fix incorrect timeout handling in ncacn_ip_tcp client code.
+ * BUG 8132: Fix filling printers location field when using CUPS.
+
+
+o David Disseldorp <ddiss at suse.de>
+ * BUG 7836: Make newly added printers visible to clients.
+ * BUG 7994: Use printcap IDL for IPC.
+
+
+o Björn Jacke <bj at sernet.de>
+ * BUG 7825: Fix GNU ld version detection with old gcc releases.
+ * BUG 8033: Add explicit configure option whether to enable dmapi
+ support or not.
+
+
+o Sergey Korsak <skif at 1plus1.net>
+ * BUG 8099: setpwent() actually does endpwent() on FreeBSD.
+
+
+o Volker Lendecke <vl at samba.org>
+ * BUG 8009: Fix getting username in 'net rap session'.
+ * BUG 8011: Fix memory corruption in shadow_copy2.
+ * BUG 8016: Fix gpfs_get_xattr.
+ * BUG 8042: File creation on OS/X.
+ * BUG 8054: Winbind cache stores/retrieves wrong sizes for 16-bit ints.
+ * BUG 8066: Fix wrong output in 'smbget'.
+ * BUG 8087: Fix wbcChangeUserPasswordEx in RESPONSE mode.
+
+
+o Nikolay Martynov <mar.kolya at gmail.com>
+ * BUG 8010: Fix inode generation so nautilus can count total dir size
+ correctly.
+
+
+o Jim McDonough <jmcd at samba.org>
+ * BUG 6364: Pull realm from supplied username on libnet join.
+ * BUG 8166: Don't lockout users when offline.
+
+
+o Stefan Metzmacher <metze at samba.org>
+ * BUG 7383: Normalize IPv4 mapped IPv6 addresses in both directions.
+ * BUG 8034: SEC_STD_DELETE is always granted to the owner of a file.
+
+
+o Larry Reid <lcreid at jadesystems.ca>
+ * BUG 8055: Can't see Parts of DFS CIFS share.
+
+
+o Simo Sorce <idra at samba.org>
+ * BUG 7610: winbindd_cache.tdb grows too large when scaled.
+
+
+o Martin Vogt <martin.vogt at itwm.fraunhofer.de>
+ * BUG 6762: Fix ctdb on gpfs error with MS Office.
+
######################################################################
diff --git a/docs-xml/manpages-3/wbinfo.1.xml b/docs-xml/manpages-3/wbinfo.1.xml
index f63a3ee..0dbe830 100644
--- a/docs-xml/manpages-3/wbinfo.1.xml
+++ b/docs-xml/manpages-3/wbinfo.1.xml
@@ -24,22 +24,32 @@
<arg choice="opt">--allocate-gid</arg>
<arg choice="opt">--allocate-uid</arg>
<arg choice="opt">-c</arg>
+ <arg choide="opt">--ccache-save</arg>
+ <arg choide="opt">--change-user-password</arg>
<arg choice="opt">-D domain</arg>
<arg choice="opt">--domain domain</arg>
+ <arg choide="opt">--dsgetdcname domain</arg>
<arg choice="opt">-g</arg>
<arg choice="opt">--getdcname domain</arg>
<arg choice="opt">--get-auth-user</arg>
<arg choice="opt">-G gid</arg>
- <arg choice="opt">-h</arg>
+ <arg choide="opt">--gid-info</arg>
+ <arg choide="opt">--group-info</arg>
+ <arg choice="opt">--help|-?</arg>
<arg choice="opt">-i user</arg>
<arg choice="opt">-I ip</arg>
<arg choice="opt">-K user%password</arg>
+ <arg choide="opt">--lanman</arg>
<arg choice="opt">-m</arg>
<arg choice="opt">-n name</arg>
<arg choice="opt">-N netbios-name</arg>
+ <arg choide="opt">--ntlmv2</arg>
+ <arg choide="opt">--online-status</arg>
<arg choice="opt">--own-domain</arg>
<arg choice="opt">-p</arg>
+ <arg choice="opt">-P|--ping-dc</arg>
<arg choice="opt">-r user</arg>
+ <arg choide="opt">-R|--lookup-rids</arg>
<arg choice="opt">--remove-uid-mapping uid,sid</arg>
<arg choice="opt">--remove-gid-mapping gid,sid</arg>
<arg choice="opt">-s sid</arg>
@@ -49,15 +59,19 @@
<arg choice="opt">--set-uid-mapping uid,sid</arg>
<arg choice="opt">--set-gid-mapping gid,sid</arg>
<arg choice="opt">-S sid</arg>
+ <arg choide="opt">--sid-aliases</arg>
+ <arg choide="opt">--sid-to-fullname</arg>
<arg choice="opt">-t</arg>
<arg choice="opt">-u</arg>
<arg choice="opt">--uid-info uid</arg>
+ <arg choide="opt">--usage</arg>
<arg choice="opt">--user-domgroups sid</arg>
<arg choice="opt">--user-sids sid</arg>
<arg choice="opt">-U uid</arg>
<arg choice="opt">-V</arg>
- <arg choice="opt">-Y sid</arg>
<arg choice="opt">--verbose</arg>
+ <arg choice="opt">-Y sid</arg>
+
</cmdsynopsis>
</refsynopsisdiv>
@@ -120,6 +134,18 @@
</varlistentry>
<varlistentry>
+ <term>--ccache-save <replaceable>username%password</replaceable></term>
+ <listitem><para>Store user and password for ccache.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>--change-user-password <replaceable>username</replaceable></term>
+ <listitem><para>Change the password of a user. The old and new password will be prompted.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
<term>--domain <replaceable>name</replaceable></term>
<listitem><para>This parameter sets the domain on which any specified
operations will performed. If special domain name '.' is used to represent
@@ -138,6 +164,24 @@
</varlistentry>
<varlistentry>
+ <term>--dsgetdcname <replaceable>domain</replaceable></term>
+ <listitem><para>Find a DC for a domain.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>--gid-info <replaceable>gid</replaceable></term>
+ <listitem><para>Get group info from gid.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>--group-info <replaceable>user</replaceable></term>
+ <listitem><para>Get group info for user.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
<term>-g|--domain-groups</term>
<listitem><para>This option will list all groups available
in the Windows NT domain for which the <citerefentry><refentrytitle>samba</refentrytitle>
@@ -171,6 +215,12 @@
</varlistentry>
<varlistentry>
+ <term>-?</term>
+ <listitem><para>Print brief help overview.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
<term>-i|--user-info <replaceable>user</replaceable></term>
<listitem><para>Get user info.
</para></listitem>
@@ -193,6 +243,12 @@
</varlistentry>
<varlistentry>
+ <term>--lanman</term>
+ <listitem><para>Use lanman cryptography for user authentication.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
<term>-m|--trusted-domains</term>
<listitem><para>Produce a list of domains trusted by the
Windows NT server <citerefentry><refentrytitle>winbindd</refentrytitle>
@@ -227,6 +283,20 @@
</varlistentry>
<varlistentry>
+ <term>--ntlmv2</term>
+ <listitem><para>Use NTLMv2 cryptography for user authentication.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>--online-status <replaceable>domain</replaceable></term>
+ <listitem><para>Show whether domains are marked as online or
+ offline. An optional domain argument limits the
+ output to the online status of a given domain.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
<term>--own-domain</term>
<listitem><para>List own domain.
</para></listitem>
@@ -249,6 +319,13 @@
</varlistentry>
<varlistentry>
+ <term>-R|--lookup-rids <replaceable>rid1, rid2, rid3...</replaceable></term>
+ <listitem><para>Converts RIDs to names. Uses a comma separated
+ list of rids.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
<term>-s|--sid-to-name <replaceable>sid</replaceable></term>
<listitem><para>Use <parameter>-s</parameter> to resolve
a SID to a name. This is the inverse of the <parameter>-n
@@ -289,6 +366,19 @@
</varlistentry>
<varlistentry>
+ <term>--sid-aliases <replaceable>sid</replaceable></term>
+ <listitem><para>Get SID aliases for a given SID.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>--sid-to-fullname <replaceable>sid</replaceable></term>
+ <listitem><para>Converts a SID to a full username
+ (DOMAIN\username).
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
<term>-t|--check-secret</term>
<listitem><para>Verify that the workstation trust account
created when the Samba server is added to the Windows NT
@@ -315,6 +405,12 @@
</varlistentry>
<varlistentry>
+ <term>--usage</term>
+ <listitem><para>Print brief help overview.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
<term>--user-domgroups <replaceable>sid</replaceable></term>
<listitem><para>Get user domain groups.
</para></listitem>
diff --git a/lib/tdb/common/io.c b/lib/tdb/common/io.c
index d549715..2f58a49 100644
--- a/lib/tdb/common/io.c
+++ b/lib/tdb/common/io.c
@@ -299,7 +299,7 @@ static int tdb_expand_file(struct tdb_context *tdb, tdb_off_t size, tdb_off_t ad
int tdb_expand(struct tdb_context *tdb, tdb_off_t size)
{
struct tdb_record rec;
- tdb_off_t offset, new_size;
+ tdb_off_t offset, new_size, top_size, map_size;
if (tdb_lock(tdb, -1, F_WRLCK) == -1) {
TDB_LOG((tdb, TDB_DEBUG_ERROR, "lock failed in tdb_expand\n"));
@@ -309,10 +309,25 @@ int tdb_expand(struct tdb_context *tdb, tdb_off_t size)
/* must know about any previous expansions by another process */
tdb->methods->tdb_oob(tdb, tdb->map_size + 1, 1);
- /* always make room for at least 100 more records, and at
- least 25% more space. Round the database up to a multiple
- of the page size */
- new_size = MAX(tdb->map_size + size*100, tdb->map_size * 1.25);
+ /* limit size in order to avoid using up huge amounts of memory for
+ * in memory tdbs if an oddball huge record creeps in */
+ if (size > 100 * 1024) {
+ top_size = tdb->map_size + size * 2;
+ } else {
+ top_size = tdb->map_size + size * 100;
+ }
+
+ /* always make room for at least top_size more records, and at
+ least 25% more space. if the DB is smaller than 100MiB,
+ otherwise grow it by 10% only. */
+ if (tdb->map_size > 100 * 1024 * 1024) {
+ map_size = tdb->map_size * 1.10;
+ } else {
+ map_size = tdb->map_size * 1.25;
+ }
+
+ /* Round the database up to a multiple of the page size */
+ new_size = MAX(top_size, map_size);
size = TDB_ALIGN(new_size, tdb->page_size) - tdb->map_size;
if (!(tdb->flags & TDB_INTERNAL))
diff --git a/lib/util/asn1.c b/lib/util/asn1.c
index 70c2c57..0d696c6 100644
--- a/lib/util/asn1.c
+++ b/lib/util/asn1.c
@@ -716,10 +716,19 @@ bool asn1_read_ContextSimple(struct asn1_data *data, uint8_t num, DATA_BLOB *blo
bool asn1_read_implicit_Integer(struct asn1_data *data, int *i)
{
uint8_t b;
+ bool first_byte = true;
*i = 0;
while (!data->has_error && asn1_tag_remaining(data)>0) {
if (!asn1_read_uint8(data, &b)) return false;
+ if (first_byte) {
+ if (b & 0x80) {
+ /* Number is negative.
+ Set i to -1 for sign extend. */
+ *i = -1;
+ }
+ first_byte = false;
+ }
*i = (*i << 8) + b;
}
return !data->has_error;
diff --git a/nsswitch/libwbclient/wbc_pam.c b/nsswitch/libwbclient/wbc_pam.c
index 25475ce..8c725d2 100644
--- a/nsswitch/libwbclient/wbc_pam.c
+++ b/nsswitch/libwbclient/wbc_pam.c
@@ -865,35 +865,35 @@ wbcErr wbcChangeUserPasswordEx(const struct wbcChangePasswordParams *params,
sizeof(request.data.chng_pswd_auth_crap.domain) - 1);
if (params->new_password.response.nt_data) {
+ request.data.chng_pswd_auth_crap.new_nt_pswd_len =
+ params->new_password.response.nt_length;
memcpy(request.data.chng_pswd_auth_crap.new_nt_pswd,
params->new_password.response.nt_data,
request.data.chng_pswd_auth_crap.new_nt_pswd_len);
- request.data.chng_pswd_auth_crap.new_nt_pswd_len =
- params->new_password.response.nt_length;
}
if (params->new_password.response.lm_data) {
+ request.data.chng_pswd_auth_crap.new_lm_pswd_len =
+ params->new_password.response.lm_length;
memcpy(request.data.chng_pswd_auth_crap.new_lm_pswd,
params->new_password.response.lm_data,
request.data.chng_pswd_auth_crap.new_lm_pswd_len);
- request.data.chng_pswd_auth_crap.new_lm_pswd_len =
- params->new_password.response.lm_length;
}
if (params->old_password.response.old_nt_hash_enc_data) {
+ request.data.chng_pswd_auth_crap.old_nt_hash_enc_len =
+ params->old_password.response.old_nt_hash_enc_length;
memcpy(request.data.chng_pswd_auth_crap.old_nt_hash_enc,
params->old_password.response.old_nt_hash_enc_data,
request.data.chng_pswd_auth_crap.old_nt_hash_enc_len);
- request.data.chng_pswd_auth_crap.old_nt_hash_enc_len =
- params->old_password.response.old_nt_hash_enc_length;
}
if (params->old_password.response.old_lm_hash_enc_data) {
+ request.data.chng_pswd_auth_crap.old_lm_hash_enc_len =
+ params->old_password.response.old_lm_hash_enc_length;
memcpy(request.data.chng_pswd_auth_crap.old_lm_hash_enc,
params->old_password.response.old_lm_hash_enc_data,
request.data.chng_pswd_auth_crap.old_lm_hash_enc_len);
- request.data.chng_pswd_auth_crap.old_lm_hash_enc_len =
- params->old_password.response.old_lm_hash_enc_length;
}
break;
diff --git a/nsswitch/winbind_krb5_locator.c b/nsswitch/winbind_krb5_locator.c
index db6e8d0..e921cae 100644
--- a/nsswitch/winbind_krb5_locator.c
+++ b/nsswitch/winbind_krb5_locator.c
@@ -192,7 +192,7 @@ static krb5_error_code smb_krb5_locator_call_cbfunc(const char *name,
break;
}
- if (ret == EAI_AGAIN) {
+ if ((ret == EAI_AGAIN) && (count > 1)) {
count--;
continue;
}
diff --git a/nsswitch/winbind_nss_freebsd.c b/nsswitch/winbind_nss_freebsd.c
index ac230c8..5fcd557 100644
--- a/nsswitch/winbind_nss_freebsd.c
+++ b/nsswitch/winbind_nss_freebsd.c
@@ -58,14 +58,14 @@ static ns_mtab methods[] = {
{ NSDB_GROUP, "getgrnam_r", __nss_compat_getgrnam_r, _nss_winbind_getgrnam_r },
{ NSDB_GROUP, "getgrgid_r", __nss_compat_getgrgid_r, _nss_winbind_getgrgid_r },
{ NSDB_GROUP, "getgrent_r", __nss_compat_getgrent_r, _nss_winbind_getgrent_r },
-{ NSDB_GROUP, "endgrent", __nss_compat_setgrent, _nss_winbind_setgrent },
-{ NSDB_GROUP, "setgrent", __nss_compat_endgrent, _nss_winbind_endgrent },
+{ NSDB_GROUP, "setgrent", __nss_compat_setgrent, _nss_winbind_setgrent },
+{ NSDB_GROUP, "endgrent", __nss_compat_endgrent, _nss_winbind_endgrent },
{ NSDB_PASSWD, "getpwnam_r", __nss_compat_getpwnam_r, _nss_winbind_getpwnam_r },
{ NSDB_PASSWD, "getpwuid_r", __nss_compat_getpwuid_r, _nss_winbind_getpwuid_r },
{ NSDB_PASSWD, "getpwent_r", __nss_compat_getpwent_r, _nss_winbind_getpwent_r },
-{ NSDB_PASSWD, "endpwent", __nss_compat_setpwent, _nss_winbind_setpwent },
-{ NSDB_PASSWD, "setpwent", __nss_compat_endpwent, _nss_winbind_endpwent },
+{ NSDB_PASSWD, "setpwent", __nss_compat_setpwent, _nss_winbind_setpwent },
+{ NSDB_PASSWD, "endpwent", __nss_compat_endpwent, _nss_winbind_endpwent },
};
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 9f89808..425aa2b 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -398,7 +398,7 @@ LIB_OBJ = $(LIBSAMBAUTIL_OBJ) $(UTIL_OBJ) $(CRYPTO_OBJ) \
lib/wins_srv.o \
lib/util_str.o lib/clobber.o lib/util_sid.o lib/util_uuid.o \
lib/util_unistr.o lib/util_file.o \
- lib/util.o lib/util_sock.o lib/sock_exec.o lib/util_sec.o \
+ lib/util.o lib/jenkins_hash.o lib/util_sock.o lib/sock_exec.o lib/util_sec.o \
lib/substitute.o lib/dbwrap_util.o \
lib/ms_fnmatch.o lib/select.o lib/errmap_unix.o \
lib/tallocmsg.o lib/dmallocmsg.o \
@@ -827,7 +827,7 @@ SMBD_OBJ_BASE = $(PARAM_WITHOUT_REG_OBJ) $(SMBD_OBJ_SRV) $(LIBSMB_OBJ) \
PRINTING_OBJ = printing/pcap.o printing/print_svid.o printing/print_aix.o \
printing/print_cups.o printing/print_generic.o \
printing/lpq_parse.o printing/load.o \
- printing/print_iprint.o
+ printing/print_iprint.o librpc/gen_ndr/ndr_printcap.o
--
Samba Shared Repository
More information about the samba-cvs
mailing list