[SCM] Samba Shared Repository - branch v3-6-stable updated
Karolin Seeger
kseeger at samba.org
Wed Sep 25 09:11:20 CEST 2013
The branch, v3-6-stable has been updated
via c161aba WHATSNEW: Prepare release notes for Samba 3.6.19.
via 2903b3b s3:libnet increase timeout for machine password change
via 7d88e28 s3: Give machine password changes 10 minutes of time
via eb50ca8 s3-serverid: call serverid_init_readonly() from commandline tools.
via f78228d s3-serverid: add a readonly variant of the serverid init code.
via cf21806 s3-serverid: restructure serverid initialization.
via f83239f s3-sessionid: move sessionid init call to the only function where it is needed.
via ae1ed08 s3-sessionid: use sessionid_init_readonly() from cmdline tools.
via 19d471b s3-sessionid: change session_db_ctx() to always return the session_id_ctx pointer.
via db63abd s3-sessionid: make sure to call sessionid_init() also from the cmdline tools.
via dd312ac Optimization. Don't do the retry logic if sitename_fetch() returned NULL, we already did a NULL query.
via 585f5fd Move the retry logic when site_name is passed in a NULL or "" to the wrapper function.
via 4a46c3f Move the manipulation of site_name into the caller function dsgetdcname().
via 6b03f5c Refactor dsgetdcname to be called via a wrapper function.
via dbe314b dsgetdcname_cache_fetch() doesn't use the site_name parameter so don't pass it.
via d3d9a2f smbd: Correctly return INFO_LENGTH_MISMATCH for smb1
via ee90cc9 smbd: Fix error return for STREAM_INFO
via 41dde03 smbd: Revert a93f9c3
via c9d16d1 smbd: Correctly return BUFFER_OVERFLOW in smb2_getinfo
via 926383e smbd: Correctly return INFO_LENGTH_MISMATCH in smb2_getinfo
via 827d2ed smbd: qfsinfo has fixed/variable buffers
via 8c6d12b smbd: qfilepathinfo has fixed/variable buffers
via 563bcbe smbd: Use #defines in smb2_getinfo_send
via 88a9516 s3:smbd: allow info class SMB_QUERY_FS_ATTRIBUTE_INFO to return partial data
via 1ad9d25 s3:smbd: allow info class SMB_QUERY_FS_VOLUME_INFO to return partial data
via 8832a51 s3:smbd: allow status code in smbd_do_qfsinfo() to be set by information class handler
via 5424776 s3:smbd: allow GetInfo responses with STATUS_BUFFER_OVERFLOW to return partial, but valid data
via f78a9e0 s3:smbd: return NT_STATUS_INFO_LENGTH_MISMATCH for GetInfo in case output_buffer_length is too small
via e937e09 smbd: Simplify dropbox special case in unix_convert
via cbd9d40 smbd: Fix a profile problem
via 6cefd96 s3-winbindd: fix fallback to ncacn_np in cm_connect_lsat().
via 40cae0c Fix bug #10097 - MacOSX 10.9 will not follow path-based DFS referrals handed out by Samba.
via 8cf35c0 docs: Fix variable list in man vfs_crossrename.
via b22ffe6 s3-libads: Print a message if no realm has been specified.
via 8da9ca3 s3-libads: Fail create_local_private_krb5_conf_for_domain() if parameters missing.
via 69c6410 s3-winbind: Do not delete an existing valid credential cache.
from 1c92376 WHATWNEW: Start release notes for Samba 3.6.19.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-stable
- Log -----------------------------------------------------------------
commit c161aba8942c82baf5d5a84a5d3b25163000f69d
Author: Karolin Seeger <kseeger at samba.org>
Date: Wed Sep 18 10:40:16 2013 +0200
WHATSNEW: Prepare release notes for Samba 3.6.19.
Signed-off-by: Karolin Seeger <kseeger at samba.org>
(cherry picked from commit 153fe1298a904b1225c60d8817118e71f05752da)
commit 2903b3b7ccc997e6c2345d4f618b9e5682b95de7
Author: Christian Ambach <ambi at samba.org>
Date: Tue Mar 5 11:44:03 2013 +0100
s3:libnet increase timeout for machine password change
DCs might run password filter modules that can delay the setting of
the machine password for a significant amount of time
use the same timeout as in the other paths of domain join
(e.g. rpccli_netlogon_set_trust_password)
Signed-off-by: Christian Ambach <ambi at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
(cherry picked from commit 9755541ed156d71df98607375ee3b925266c3c74)
The last 2 patches address bug #8955 - NetrServerPasswordSet2 timeout is too
short.
(cherry picked from commit d1bf6e401a41172a47684518b9836899844fdefd)
commit 7d88e286e6765debb99c08043550914a2f9ab291
Author: Volker Lendecke <vl at samba.org>
Date: Fri Jun 22 14:26:45 2012 +0200
s3: Give machine password changes 10 minutes of time
This is what we do at domain join time as well, see
lib/netapi/joindomain.c:141
Signed-off-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit b9a15f1bfad30a824f9ec87bc9f7c65adf50dae0)
(cherry picked from commit a43c682553e5a731f9fbca8649ba042ae2bb5eba)
commit eb50ca85509ab9dad761f9c4d65c0e98ea900319
Author: Günther Deschner <gd at samba.org>
Date: Fri Sep 6 18:08:45 2013 +0200
s3-serverid: call serverid_init_readonly() from commandline tools.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
The last 4 patches are follow-up patches for bug #10127 - smbstatus stopped
working as non-root user.
(cherry picked from commit 037f9ead5fc490e7e463671b76e8e8474a8728f5)
commit f78228d5c2a91eb3586b3c70985a68b8d3bf6102
Author: Günther Deschner <gd at samba.org>
Date: Fri Sep 6 17:44:49 2013 +0200
s3-serverid: add a readonly variant of the serverid init code.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
(cherry picked from commit 11d5d3d49ecec0d2ae924ff843e97cc39fa64a16)
commit cf21806e325a22d227bfcd2ce4ce8ca95edeb643
Author: Günther Deschner <gd at samba.org>
Date: Fri Sep 6 17:43:50 2013 +0200
s3-serverid: restructure serverid initialization.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
(cherry picked from commit ec1948d3a6adec3dd659abc8ab9c49a334c1e6a7)
commit f83239f5c9386b0928dfb1d01f4946429807b1d0
Author: Günther Deschner <gd at samba.org>
Date: Fri Sep 6 18:08:23 2013 +0200
s3-sessionid: move sessionid init call to the only function where it is needed.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
(cherry picked from commit 4b8b385042ace68c4ec59fea81bf8b284b34c356)
commit ae1ed0838e4aa959165e1e6d8a6866af23aa7247
Author: Günther Deschner <gd at samba.org>
Date: Wed Sep 4 16:57:17 2013 +0200
s3-sessionid: use sessionid_init_readonly() from cmdline tools.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
The last 3 patches address bug #10127 - smbstatus stopped working as non-root
user.
(cherry picked from commit 5978eab3cdbbc8971ed7f0fd9f0aadb02c98aba7)
commit 19d471bcfe1e6c88032fe7e135c77e551d39a714
Author: Günther Deschner <gd at samba.org>
Date: Wed Sep 4 16:55:11 2013 +0200
s3-sessionid: change session_db_ctx() to always return the session_id_ctx pointer.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
(cherry picked from commit d1352013bb694a30480282e398e29238470b0768)
commit db63abdf9ae30cb98169ddb9551315b82204942e
Author: Günther Deschner <gd at samba.org>
Date: Wed Sep 4 16:45:32 2013 +0200
s3-sessionid: make sure to call sessionid_init() also from the cmdline tools.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
(cherry picked from commit 039171a9d1fc72de39ee8aa51830a37221988859)
commit dd312ac3ee5dad7b0b992bdb0123bbb99a110d12
Author: Jeremy Allison <jra at samba.org>
Date: Tue Sep 3 14:07:43 2013 -0700
Optimization. Don't do the retry logic if sitename_fetch() returned NULL, we already did a NULL query.
Bug 5917 - Samba does not work on site with Read Only Domain Controller
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Autobuild-User(master): Andrew Bartlett <abartlet at samba.org>
Autobuild-Date(master): Wed Sep 4 01:19:05 CEST 2013 on sn-devel-104
(cherry picked from commit bdab6f9431715fbfd28f8cc0dfb4dde2966f22f3)
(cherry picked from commit 66b9ebd961efe91b87156abf1bb5e1b8f2b87c38)
commit 585f5fd75f762827e120c487643d4b223a2a7f23
Author: Jeremy Allison <jra at samba.org>
Date: Tue Sep 3 12:20:52 2013 -0700
Move the retry logic when site_name is passed in a NULL or "" to the wrapper function.
Bug 5917 - Samba does not work on site with Read Only Domain Controller
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Richard Sharpe <rsharpe at samba.org>
(cherry picked from commit 68e7b1c9446c7d1274b0fb85b59b90ac1a7f6041)
(cherry picked from commit f3d767ac0f6e3b07abf5672ae488ae57bc557677)
commit 4a46c3fb1ec1ae65b08b443d1a9b7aa09f3dbbc8
Author: Jeremy Allison <jra at samba.org>
Date: Tue Sep 3 12:08:46 2013 -0700
Move the manipulation of site_name into the caller function dsgetdcname().
Leave dsgetdcname_internal() only using const char *site_name.
Bug 5917 - Samba does not work on site with Read Only Domain Controller
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Richard Sharpe <rsharpe at samba.org>
(cherry picked from commit 181c11066bd53b07015a199f56eb71182e89ff71)
(cherry picked from commit c968f9cb46b44a4d1b257a89381898d16086ae26)
commit 6b03f5c490be465112df7dfab0d225431410c096
Author: Jeremy Allison <jra at samba.org>
Date: Tue Sep 3 12:04:37 2013 -0700
Refactor dsgetdcname to be called via a wrapper function.
Bug 5917 - Samba does not work on site with Read Only Domain Controller
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Richard Sharpe <rsharpe at samba.org>
(cherry picked from commit 66006be7ef703b2935334633d27641050cee5f58)
(cherry picked from commit ac4ce44d787f448e8dce7b2eca558cecdc75499e)
commit dbe314b716476c04f0b69b121c869451e5b27a00
Author: Jeremy Allison <jra at samba.org>
Date: Tue Sep 3 12:13:45 2013 -0700
dsgetdcname_cache_fetch() doesn't use the site_name parameter so don't pass it.
Bug 5917 - Samba does not work on site with Read Only Domain Controller
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Richard Sharpe <rsharpe at samba.org>
(cherry picked from commit dd12bfbcbf359c1642cc2e968aec62ae904aad5d)
(cherry picked from commit deac844f4ec4bca559285744e8c6ba924c8f492a)
commit d3d9a2fcbe32849e0a2f56160ff2492b2c1e00f7
Author: Volker Lendecke <vl at samba.org>
Date: Tue Aug 27 09:40:19 2013 +0000
smbd: Correctly return INFO_LENGTH_MISMATCH for smb1
This is required if the client offered less buffer than the fixed portion
of the info level data requires
Bug: https://bugzilla.samba.org/show_bug.cgi?id=10106
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
(cherry picked from commit 1b1935b876a14154ef74e447bf53eb7cd0a5dde9)
(cherry picked from commit 41a7d66a399c3e1ad999dce5d14570d60c4d53d2)
commit ee90cc9d0f92dbcc5f54ddff2834092e2b255eab
Author: Volker Lendecke <vl at samba.org>
Date: Tue Aug 27 09:39:17 2013 +0000
smbd: Fix error return for STREAM_INFO
The stream_info marshalling follows its own rules. This needs unifying
eventually...
Bug: https://bugzilla.samba.org/show_bug.cgi?id=10106
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
(cherry picked from commit 5634f240fd4273cb7327111140ccbea0fd41e3fc)
(cherry picked from commit a63ca3ed840ca4ab19b4b4bd9238b663228ac2a6)
commit 41dde03e73b750b5a48a66056a2b485bc72f23f0
Author: Volker Lendecke <vl at samba.org>
Date: Tue Aug 27 09:38:29 2013 +0000
smbd: Revert a93f9c3
This was too broad and has been replaced by finer-grained error checks
Bug: https://bugzilla.samba.org/show_bug.cgi?id=10106
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
(cherry picked from commit b37edda32930fec372d6467d442f67532c3fbd33)
(cherry picked from commit c8e72447345bb5b737e8383cba069098f387de0a)
commit c9d16d1567a736c8a4323ab746ace86c5a68f51a
Author: Volker Lendecke <vl at samba.org>
Date: Tue Aug 27 09:37:34 2013 +0000
smbd: Correctly return BUFFER_OVERFLOW in smb2_getinfo
Also, don't overflow the client buffer
Bug: https://bugzilla.samba.org/show_bug.cgi?id=10106
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
(cherry picked from commit 40f60024ca19e33cbbe9825b42692f386a8f1dd9)
(cherry picked from commit f5dfa2ac931d52b4517f4e5e07cf9730e6939967)
commit 926383e5c4a4ca79561b0204d6bd7102146a83d3
Author: Volker Lendecke <vl at samba.org>
Date: Tue Aug 27 09:36:03 2013 +0000
smbd: Correctly return INFO_LENGTH_MISMATCH in smb2_getinfo
We have to return this error if the client offered less than the fixed
portion of the infolevel data requires
Bug: https://bugzilla.samba.org/show_bug.cgi?id=10106
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
(cherry picked from commit 91939614760837b2ac2c6bb8b5daac108a4f4670)
(cherry picked from commit 9818b31167531f41cbf08fccf89d60ca128c3d4d)
commit 827d2ed098f523392c5da78221699f53f0b66407
Author: Volker Lendecke <vl at samba.org>
Date: Tue Aug 27 09:06:27 2013 +0000
smbd: qfsinfo has fixed/variable buffers
The error message will have to change depending whether the buffer is
too small for the fixed or variable buffers
Bug: https://bugzilla.samba.org/show_bug.cgi?id=10106
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
(cherry picked from commit ac41df91a5a425633fc716ca02187e753879d795)
(cherry picked from commit a3d041438f2f0fde9644ec27b89f19ded3146f50)
commit 8c6d12b88cabe3af876ed2b70372c5d669547136
Author: Volker Lendecke <vl at samba.org>
Date: Tue Aug 27 09:06:27 2013 +0000
smbd: qfilepathinfo has fixed/variable buffers
The error message will have to change depending whether the buffer is
too small for the fixed or variable buffers
Bug: https://bugzilla.samba.org/show_bug.cgi?id=10106
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
(cherry picked from commit 53123996033594f68a3fc9037474aada3aef0750)
(cherry picked from commit d0f6c38f9638173b34e1a174b8811df83e045f5c)
commit 563bcbe414dd0367a2136da3ce949c3739b5a5f4
Author: Volker Lendecke <vl at samba.org>
Date: Mon Aug 26 08:36:14 2013 +0000
smbd: Use #defines in smb2_getinfo_send
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: David Disseldorp <ddiss at samba.org>
Autobuild-User(master): David Disseldorp <ddiss at samba.org>
Autobuild-Date(master): Tue Aug 27 15:08:08 CEST 2013 on sn-devel-104
(cherry picked from commit 323cccd35d06c7327c19dc5cb891043507624d7d)
(cherry picked from commit 5efd0ca590670a142631db1c2133450a1020ba60)
commit 88a9516a0eb69431df59e2b4ea4150a10786b018
Author: Ralph Wuerthner <ralph.wuerthner at de.ibm.com>
Date: Wed Jul 10 16:43:39 2013 +0200
s3:smbd: allow info class SMB_QUERY_FS_ATTRIBUTE_INFO to return partial data
Reviewed-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Volker Lendecke <Volker.Lendecke at SerNet.DE>
(cherry picked from commit 270d29a743a030653037cb176f3764bec3c79b6c)
(cherry picked from commit 65d4f0b5125ebea659d0277916bb74db2c3b9cc0)
commit 1ad9d25a37d747e38d99bcc2dacefc1cbe4b9045
Author: Ralph Wuerthner <ralph.wuerthner at de.ibm.com>
Date: Wed Jul 10 15:52:06 2013 +0200
s3:smbd: allow info class SMB_QUERY_FS_VOLUME_INFO to return partial data
Reviewed-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Volker Lendecke <Volker.Lendecke at SerNet.DE>
(cherry picked from commit ec46f6b91941e38dd92f8e0fb0f278592e3157b6)
(cherry picked from commit 84eabf7b012fba624e900f2cc0294f2f1c598a46)
commit 8832a51b78669f069b69c73bdaeb09e7f4007de5
Author: Ralph Wuerthner <ralph.wuerthner at de.ibm.com>
Date: Fri Jul 5 11:32:27 2013 +0200
s3:smbd: allow status code in smbd_do_qfsinfo() to be set by information class handler
Reviewed-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Volker Lendecke <Volker.Lendecke at SerNet.DE>
(cherry picked from commit 616777f029e462f53c5118d79de8c6405a5fb7c1)
(cherry picked from commit a410c51fca3644ebf7a32512dc1075a23bfc8d38)
commit 5424776dae7d98459ff2b58e96c794e700d0a839
Author: Ralph Wuerthner <ralph.wuerthner at de.ibm.com>
Date: Fri Jul 5 11:03:16 2013 +0200
s3:smbd: allow GetInfo responses with STATUS_BUFFER_OVERFLOW to return partial, but valid data
Reviewed-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Volker Lendecke <Volker.Lendecke at SerNet.DE>
(cherry picked from commit a91d2b05bab329a8a9772c2c79a3b1e02933182e)
(cherry picked from commit 331a0e8e85727724466d7a795435b8eca36b3e17)
commit f78a9e0e040e163468e5f0c59fb4dfae04a70e01
Author: Ralph Wuerthner <ralph.wuerthner at de.ibm.com>
Date: Wed Jul 10 08:59:58 2013 +0200
s3:smbd: return NT_STATUS_INFO_LENGTH_MISMATCH for GetInfo in case output_buffer_length is too small
Reviewed-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Volker Lendecke <Volker.Lendecke at SerNet.DE>
(cherry picked from commit a93f9c3d33e442c84d0c9da7eb5d25ca4b54fc33)
(cherry picked from commit f351fbe1fc9236ddbf52afecf872cdf7e53cae85)
commit e937e097a826c36cdfea51d8c8246350066d267e
Author: Volker Lendecke <Volker.Lendecke at SerNet.DE>
Date: Wed Aug 28 15:42:22 2013 -0700
smbd: Simplify dropbox special case in unix_convert
EACCESS needs special treatment: If we want to create a fresh file,
return OBJECT_PATH_NOT_FOUND, so that the client will continue creating
the file. If the client wants us to open a potentially existing file,
we need to correctly return ACCESS_DENIED.
This patch makes this behaviour hopefully a bit clearer than the code
before did.
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
The last 2 patches address bug #10114 - Dropbox (write-only-directory) case
isn't handled correctly in pathname lookup.
(cherry picked from commit 0150086d44e90351634a68aced1e44ad076a693c)
commit cbd9d40912dc4cbe91dbeed8fcfefbdc40208178
Author: Volker Lendecke <Volker.Lendecke at SerNet.DE>
Date: Wed Aug 28 15:39:41 2013 -0700
smbd: Fix a profile problem
When trying to read a profile, under certain circumstances Windows tries
to read with its machine account first. The profile previously written
was stored with an ACL that only allows access for the user and not
the machine. Windows should get an NT_STATUS_ACCESS_DENIED when using
the machine account, making it retry with the user account (which would
then succeed).
Samba under these circumstances erroneously gives
NT_STATUS_OBJECT_PATH_NOT_FOUND, which makes Windows give up and not
retry. The reasons is the "dropbox" patch in unix_convert, turning EACCESS
on the last path component to OBJECT_PATH_NOT_FOUND. This patch makes
the dropbox behaviour only kick in when we are creating a file. I think
this is an abstraction violation. unix_convert() should not have to know
about the create_disposition, but given that we have pathname resolution
separated from the core open code right now this is the best we can do.
Signed-off-by: Volker Lendecke <Volker.Lendecke at SerNet.DE>
Reviewed-by: Jeremy Allison <jra at samba.org>
(cherry picked from commit b55072ccf8d801726aec49a925f5a69277a10494)
commit 6cefd961094ee15841bb2b0a00eab9eee86ee91d
Author: Günther Deschner <gd at samba.org>
Date: Mon Aug 12 17:23:12 2013 +0200
s3-winbindd: fix fallback to ncacn_np in cm_connect_lsat().
Fallback to lsa named-pipe connection when tcp connection has failed twice (it
could be a trusted domain connection where we cannot setup a secure channel).
Guenther
BUG: https://bugzilla.samba.org/show_bug.cgi?id=9615
BUG: https://bugzilla.samba.org/show_bug.cgi?id=9899
Signed-off-by: Günther Deschner <gd at samba.org>
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
Tested-by: Christof Schmitt <christof.schmitt at us.ibm.com>
Autobuild-User(master): Stefan Metzmacher <metze at samba.org>
Autobuild-Date(master): Tue Aug 13 20:55:33 CEST 2013 on sn-devel-104
(cherry picked from commit 87adc2118677b7cabc3f3b476313b254856f5f9d)
commit 40cae0c94db6ece270481a2535f0ff6c04b176d0
Author: Richard Sharpe <realrichardsharpe at gmail.com>
Date: Mon Aug 19 13:14:55 2013 -0700
Fix bug #10097 - MacOSX 10.9 will not follow path-based DFS referrals handed out by Samba.
Windows overloads the EA Length field in the DIRECTORY INFO leves of FIND FIRST/FIND NEXT.
This field indicates either the REPARSE_TAG if the file/folder has a reparse proint or
the EA Length if it has EAs, and is the fundamental reason you cannot have both on a
file or folder.
Signed-off-by: Richard Sharpe <rsharpe at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
(cherry picked from commit 3dd2f645a054b47d709a6b6f6968f86b9e916d49)
commit 8cf35c08182239a42d0947ca29bf525e6d2b23a1
Author: Karolin Seeger <kseeger at samba.org>
Date: Tue Aug 13 11:04:50 2013 +0200
docs: Fix variable list in man vfs_crossrename.
The varlist entries need a paragraph, otherwise the list is broken and the list
entries end with ".RE".
Fix bug #10076 - varlist in man vfs_crossrename broken.
Signed-off-by: Karolin Seeger <kseeger at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
Autobuild-User(master): Jeremy Allison <jra at samba.org>
Autobuild-Date(master): Tue Aug 20 04:19:42 CEST 2013 on sn-devel-104
(cherry picked from commit 1808316b1245290fd4a4aa87a801410899e4c1e3)
(cherry picked from commit db77fc0184eea3ee1a73111b84a2e1ad976ad612)
commit b22ffe6e110a645e9181a68fea60b32d3cabc92d
Author: Andreas Schneider <asn at samba.org>
Date: Mon Aug 5 09:25:11 2013 +0200
s3-libads: Print a message if no realm has been specified.
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
Autobuild-User(master): Andreas Schneider <asn at cryptomilk.org>
Autobuild-Date(master): Mon Aug 5 12:24:44 CEST 2013 on sn-devel-104
(cherry picked from commit 6659f0164c6b8d7ad522bcd6c2c6748c3d9bca81)
The last 2 patches address bug #10073 - net ads join - segmentation fault in
create_local_private_krb5_conf_for_domain.
(cherry picked from commit 8d40163e7a25091bcdbe90d5c91bcec088b097d5)
commit 8da9ca3ba53b5728ad03af1c21aa24685dec2c03
Author: Günther Deschner <gd at samba.org>
Date: Fri May 17 15:14:35 2013 +0200
s3-libads: Fail create_local_private_krb5_conf_for_domain() if parameters missing.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
(cherry picked from commit 6dc7c63efa95d0c04b542667d9b6a6621c8139bf)
(cherry picked from commit c472ffab2854537b9e5d6238e68c04bfe2bd5e69)
commit 69c6410cfbfeea2972fec9a20040ea4d87108408
Author: Andreas Schneider <asn at samba.org>
Date: Thu Jul 11 13:44:53 2013 +0200
s3-winbind: Do not delete an existing valid credential cache.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=9994
Thanks to David Woodhouse <dwmw2 at infradead.org>.
Reviewed-by: Günther Deschner <gd at samba.org>
Autobuild-User(master): Andreas Schneider <asn at cryptomilk.org>
Autobuild-Date(master): Mon Jul 15 12:48:46 CEST 2013 on sn-devel-104
(cherry picked from commit 0529b59fbe3f96509893fc4e93a75d6928b5a532)
(cherry picked from commit 64732d3d317be8bb3b3579455ce3b3d5c81b6ad8)
-----------------------------------------------------------------------
Summary of changes:
WHATSNEW.txt | 42 +++++++++++++--
docs-xml/manpages-3/vfs_crossrename.8.xml | 20 ++++---
source3/include/ntioctl.h | 1 +
source3/include/proto.h | 1 +
source3/include/serverid.h | 2 +
source3/include/smb.h | 1 +
source3/lib/serverid.c | 42 ++++++++++-----
source3/lib/sessionid_tdb.c | 25 ++++++---
source3/libads/kerberos.c | 10 ++++
source3/libnet/libnet_join.c | 9 +++
source3/libsmb/dsgetdcname.c | 85 ++++++++++++++++++++++-------
source3/rpc_client/cli_netlogon.c | 13 +++++
source3/smbd/dosmode.c | 5 ++
source3/smbd/filename.c | 27 ++++++++--
source3/smbd/globals.h | 2 +
source3/smbd/nttrans.c | 6 ++-
source3/smbd/reply.c | 48 +++++++++--------
source3/smbd/smb2_create.c | 3 +-
source3/smbd/smb2_getinfo.c | 45 +++++++++++++--
source3/smbd/trans2.c | 75 +++++++++++++++++++++++---
source3/utils/net_serverid.c | 9 +++
source3/utils/net_status.c | 6 ++
source3/utils/status.c | 12 ++++
source3/winbindd/winbindd_cm.c | 9 +++-
source3/winbindd/winbindd_pam.c | 8 +++
25 files changed, 407 insertions(+), 99 deletions(-)
Changeset truncated at 500 lines:
diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index d4e216a..711c225 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -4,17 +4,51 @@
==============================
-This is is the latest stable release of Samba 3.6.
-
-Major enhancements in Samba 3.6.19 include:
+This is is the latest maintenance release of Samba 3.6.
-o
+Please note that this will probably be the last maintenance release
+of the Samba 3.6 release series. With the release of Samba 4.1.0, the
+3.6 release series will be turned into the "security fixes only" mode.
Changes since 3.6.18:
---------------------
o Jeremy Allison <jra at samba.org>
+ * BUG 5917: Make Samba work on site with Read Only Domain Controller.
+
+
+o Christian Ambach <ambi at samba.org>
+ * BUG 8955: NetrServerPasswordSet2 timeout is too short.
+
+
+o Günther Deschner <gd at samba.org>
+ * BUG 9899: Fix fallback to ncacn_np in cm_connect_lsat().
+ * BUG 9615: Fix fallback to ncacn_np in cm_connect_lsat().
+ * BUG 10127: Fix 'smbstatus' as non-root user.
+
+
+o Volker Lendecke <vl at samba.org>
+ * BUG 8955: Give machine password changes 10 minutes of time.
+ * BUG 10106: Honour output buffer length set by the client for SMB2 GetInfo
+ requests.
+ * BUG 10114: Handle Dropbox (write-only-directory) case correctly in
+ pathname lookup.
+
+
+o Karolin Seeger <kseeger at samba.org>
+ * BUG 10076: Fix variable list in man vfs_crossrename.
+
+
+o Andreas Schneider <asn at samba.org>
+ * BUG 9994: s3-winbind: Do not delete an existing valid credential cache.
+ * BUG 10073: 'net ads join': Fix segmentation fault in
+ create_local_private_krb5_conf_for_domain.
+
+
+o Richard Sharpe <realrichardsharpe at gmail.com>
+ * BUG 10097: MacOSX 10.9 will not follow path-based DFS referrals handed
+ out by Samba.
######################################################################
diff --git a/docs-xml/manpages-3/vfs_crossrename.8.xml b/docs-xml/manpages-3/vfs_crossrename.8.xml
index ba7c7c8..97f62c8 100644
--- a/docs-xml/manpages-3/vfs_crossrename.8.xml
+++ b/docs-xml/manpages-3/vfs_crossrename.8.xml
@@ -37,28 +37,30 @@
NT_STATUS_NOT_SAME_DEVICE and the client has to move the file by
manual copy and delete operations. If the rename by copy is done by the
server this can be much more efficient. vfs_crossrename tries to do
- this server-side cross-device rename operation. There are however
- limitations that this module currently does not solve:
+ this server-side cross-device rename operation.
+ </para>
+
+ <para>There are however limitations that this module currently does not
+ solve:</para>
<variablelist>
<varlistentry>
- the ACLs of files are not preserved
+ <para>The ACLs of files are not preserved,</para>
</varlistentry>
<varlistentry>
- meta data in EAs are not preserved
+ <para>meta data in EAs are not preserved,</para>
</varlistentry>
<varlistentry>
- renames of whole subdirectories cannot be done recursively,
+ <para>renames of whole subdirectories cannot be done recursively,
in that case we still return STATUS_NOT_SAME_DEVICE and
- let the client decide what to do
+ let the client decide what to do,</para>
</varlistentry>
<varlistentry>
- rename operations of huge files can cause hangs on the
+ <para>rename operations of huge files can cause hangs on the
client because clients expect a rename operation to
- return fast
+ return fast.</para>
</varlistentry>
</variablelist>
- </para>
<para>This module is stackable.</para>
diff --git a/source3/include/ntioctl.h b/source3/include/ntioctl.h
index 925a06f..c990ebc 100644
--- a/source3/include/ntioctl.h
+++ b/source3/include/ntioctl.h
@@ -122,6 +122,7 @@
#define IO_REPARSE_TAG_MOUNT_POINT 0xA0000003
#define IO_REPARSE_TAG_HSM 0xC0000004
#define IO_REPARSE_TAG_SIS 0x80000007
+#define IO_REPARSE_TAG_DFS 0x8000000A
/* For FSCTL_GET_SHADOW_COPY_DATA ...*/
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 189b286..7303e76 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -1846,6 +1846,7 @@ void server_messaging_context_free(void);
/* The following definitions come from lib/sessionid_tdb.c */
struct sessionid;
bool sessionid_init(void);
+bool sessionid_init_readonly(void);
struct db_record *sessionid_fetch_record(TALLOC_CTX *mem_ctx, const char *key);
int sessionid_traverse(int (*fn)(struct db_record *rec, const char *key,
struct sessionid *session,
diff --git a/source3/include/serverid.h b/source3/include/serverid.h
index 435c88b..56b7237 100644
--- a/source3/include/serverid.h
+++ b/source3/include/serverid.h
@@ -73,4 +73,6 @@ bool serverid_parent_init(TALLOC_CTX *mem_ctx);
*/
uint64_t serverid_get_random_unique_id(void);
+bool serverid_init_readonly(TALLOC_CTX *mem_ctx);
+
#endif
diff --git a/source3/include/smb.h b/source3/include/smb.h
index 873657a..2d04373 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -1716,6 +1716,7 @@ struct smb_file_time {
#define UCF_COND_ALLOW_WCARD_LCOMP 0x00000004
#define UCF_POSIX_PATHNAMES 0x00000008
#define UCF_UNIX_NAME_LOOKUP 0x00000010
+#define UCF_CREATING_FILE 0x00000020
/*
* smb_filename
diff --git a/source3/lib/serverid.c b/source3/lib/serverid.c
index 00dd6c4..9a0deb3 100644
--- a/source3/lib/serverid.c
+++ b/source3/lib/serverid.c
@@ -34,37 +34,53 @@ struct serverid_data {
uint32_t msg_flags;
};
-bool serverid_parent_init(TALLOC_CTX *mem_ctx)
+static struct db_context *db_ptr = NULL;
+
+static struct db_context *serverid_init(TALLOC_CTX *mem_ctx,
+ bool readonly)
{
- struct tdb_wrap *db;
+ db_ptr = db_open(mem_ctx, lock_path("serverid.tdb"),
+ 0, TDB_DEFAULT|TDB_CLEAR_IF_FIRST|TDB_INCOMPATIBLE_HASH,
+ readonly ? O_RDONLY : O_RDWR | O_CREAT,
+ 0644);
+ return db_ptr;
+}
+bool serverid_parent_init(TALLOC_CTX *mem_ctx)
+{
/*
* Open the tdb in the parent process (smbd) so that our
* CLEAR_IF_FIRST optimization in tdb_reopen_all can properly
* work.
*/
- db = tdb_wrap_open(mem_ctx, lock_path("serverid.tdb"),
- 0, TDB_DEFAULT|TDB_CLEAR_IF_FIRST|TDB_INCOMPATIBLE_HASH, O_RDWR|O_CREAT,
- 0644);
- if (db == NULL) {
+ if (serverid_init(mem_ctx, false) == NULL) {
DEBUG(1, ("could not open serverid.tdb: %s\n",
strerror(errno)));
return false;
}
+
return true;
}
-static struct db_context *serverid_db(void)
+bool serverid_init_readonly(TALLOC_CTX *mem_ctx)
{
- static struct db_context *db;
+ if (serverid_init(mem_ctx, true) == NULL) {
+ DEBUG(1, ("could not open serverid.tdb: %s\n",
+ strerror(errno)));
+ return false;
+ }
- if (db != NULL) {
- return db;
+ return true;
+}
+
+static struct db_context *serverid_db(void)
+{
+ if (db_ptr != NULL) {
+ return db_ptr;
}
- db = db_open(NULL, lock_path("serverid.tdb"), 0,
- TDB_DEFAULT|TDB_CLEAR_IF_FIRST|TDB_INCOMPATIBLE_HASH, O_RDWR|O_CREAT, 0644);
- return db;
+
+ return serverid_init(NULL, false);
}
static void serverid_fill_key(const struct server_id *id,
diff --git a/source3/lib/sessionid_tdb.c b/source3/lib/sessionid_tdb.c
index de3ccab..769aac2 100644
--- a/source3/lib/sessionid_tdb.c
+++ b/source3/lib/sessionid_tdb.c
@@ -23,23 +23,34 @@
#include "session.h"
#include "util_tdb.h"
+static struct db_context *session_db_ctx_ptr = NULL;
+
static struct db_context *session_db_ctx(void)
{
- static struct db_context *session_db_ctx_ptr;
-
- if (session_db_ctx_ptr != NULL) {
- return session_db_ctx_ptr;
- }
+ return session_db_ctx_ptr;
+}
+static struct db_context *session_db_ctx_init(bool readonly)
+{
session_db_ctx_ptr = db_open(NULL, lock_path("sessionid.tdb"), 0,
TDB_CLEAR_IF_FIRST|TDB_DEFAULT|TDB_INCOMPATIBLE_HASH,
- O_RDWR | O_CREAT, 0644);
+ readonly ? O_RDONLY : O_RDWR | O_CREAT, 0644);
return session_db_ctx_ptr;
}
bool sessionid_init(void)
{
- if (session_db_ctx() == NULL) {
+ if (session_db_ctx_init(false) == NULL) {
+ DEBUG(1,("session_init: failed to open sessionid tdb\n"));
+ return False;
+ }
+
+ return True;
+}
+
+bool sessionid_init_readonly(void)
+{
+ if (session_db_ctx_init(true) == NULL) {
DEBUG(1,("session_init: failed to open sessionid tdb\n"));
return False;
}
diff --git a/source3/libads/kerberos.c b/source3/libads/kerberos.c
index 6b8f247..1153ccb 100644
--- a/source3/libads/kerberos.c
+++ b/source3/libads/kerberos.c
@@ -856,6 +856,16 @@ bool create_local_private_krb5_conf_for_domain(const char *realm,
return false;
}
+ if (realm == NULL) {
+ DEBUG(0, ("No realm has been specified! Do you really want to "
+ "join an Active Directory server?\n"));
+ return false;
+ }
+
+ if (domain == NULL || pss == NULL || kdc_name == NULL) {
+ return false;
+ }
+
dname = lock_path("smb_krb5");
if (!dname) {
return false;
diff --git a/source3/libnet/libnet_join.c b/source3/libnet/libnet_join.c
index 7bb436b..e84682d 100644
--- a/source3/libnet/libnet_join.c
+++ b/source3/libnet/libnet_join.c
@@ -850,6 +850,7 @@ static NTSTATUS libnet_join_joindomain_rpc(TALLOC_CTX *mem_ctx,
struct samr_Ids name_types;
union samr_UserInfo user_info;
struct dcerpc_binding_handle *b = NULL;
+ unsigned int old_timeout = 0;
struct samr_CryptPassword crypt_pwd;
struct samr_CryptPasswordEx crypt_pwd_ex;
@@ -1061,6 +1062,12 @@ static NTSTATUS libnet_join_joindomain_rpc(TALLOC_CTX *mem_ctx,
/* Set password on machine account - first try level 26 */
+ /*
+ * increase the timeout as password filter modules on the DC
+ * might delay the operation for a significant amount of time
+ */
+ old_timeout = rpccli_set_timeout(pipe_hnd, 600000);
+
init_samr_CryptPasswordEx(r->in.machine_password,
&cli->user_session_key,
&crypt_pwd_ex);
@@ -1092,6 +1099,8 @@ static NTSTATUS libnet_join_joindomain_rpc(TALLOC_CTX *mem_ctx,
&result);
}
+ old_timeout = rpccli_set_timeout(pipe_hnd, old_timeout);
+
if (!NT_STATUS_IS_OK(status)) {
dcerpc_samr_DeleteUser(b, mem_ctx,
diff --git a/source3/libsmb/dsgetdcname.c b/source3/libsmb/dsgetdcname.c
index 442f8ed..841a179 100644
--- a/source3/libsmb/dsgetdcname.c
+++ b/source3/libsmb/dsgetdcname.c
@@ -321,7 +321,6 @@ static NTSTATUS dsgetdcname_cache_fetch(TALLOC_CTX *mem_ctx,
const char *domain_name,
const struct GUID *domain_guid,
uint32_t flags,
- const char *site_name,
struct netr_DsRGetDCNameInfo **info_p)
{
char *key;
@@ -394,7 +393,7 @@ static NTSTATUS dsgetdcname_cached(TALLOC_CTX *mem_ctx,
NTSTATUS status;
status = dsgetdcname_cache_fetch(mem_ctx, domain_name, domain_guid,
- flags, site_name, info);
+ flags, info);
if (!NT_STATUS_IS_OK(status)
&& !NT_STATUS_EQUAL(status, NT_STATUS_NOT_FOUND)) {
DEBUG(10,("dsgetdcname_cached: cache fetch failed with: %s\n",
@@ -1083,12 +1082,10 @@ static bool is_closest_site(struct netr_DsRGetDCNameInfo *info)
}
/********************************************************************
- dsgetdcname.
-
- This will be the only public function here.
+ Internal dsgetdcname.
********************************************************************/
-NTSTATUS dsgetdcname(TALLOC_CTX *mem_ctx,
+static NTSTATUS dsgetdcname_internal(TALLOC_CTX *mem_ctx,
struct messaging_context *msg_ctx,
const char *domain_name,
const struct GUID *domain_guid,
@@ -1098,15 +1095,14 @@ NTSTATUS dsgetdcname(TALLOC_CTX *mem_ctx,
{
NTSTATUS status = NT_STATUS_DOMAIN_CONTROLLER_NOT_FOUND;
struct netr_DsRGetDCNameInfo *myinfo = NULL;
- char *query_site = NULL;
bool first = true;
struct netr_DsRGetDCNameInfo *first_info = NULL;
- DEBUG(10,("dsgetdcname: domain_name: %s, "
+ DEBUG(10,("dsgetdcname_internal: domain_name: %s, "
"domain_guid: %s, site_name: %s, flags: 0x%08x\n",
domain_name,
domain_guid ? GUID_string(mem_ctx, domain_guid) : "(null)",
- site_name, flags));
+ site_name ? site_name : "(null)", flags));
*info = NULL;
@@ -1115,18 +1111,12 @@ NTSTATUS dsgetdcname(TALLOC_CTX *mem_ctx,
return NT_STATUS_INVALID_PARAMETER;
}
- if ((site_name == NULL) || (site_name[0] == '\0')) {
- query_site = sitename_fetch(domain_name);
- } else {
- query_site = SMB_STRDUP(site_name);
- }
-
if (flags & DS_FORCE_REDISCOVERY) {
goto rediscover;
}
status = dsgetdcname_cached(mem_ctx, msg_ctx, domain_name, domain_guid,
- flags, query_site, &myinfo);
+ flags, site_name, &myinfo);
if (NT_STATUS_IS_OK(status)) {
goto done;
}
@@ -1137,12 +1127,10 @@ NTSTATUS dsgetdcname(TALLOC_CTX *mem_ctx,
rediscover:
status = dsgetdcname_rediscover(mem_ctx, msg_ctx, domain_name,
- domain_guid, flags, query_site,
+ domain_guid, flags, site_name,
&myinfo);
done:
- SAFE_FREE(query_site);
-
if (!NT_STATUS_IS_OK(status)) {
if (!first) {
*info = first_info;
@@ -1157,10 +1145,67 @@ NTSTATUS dsgetdcname(TALLOC_CTX *mem_ctx,
first = false;
first_info = myinfo;
/* TODO: may use the next_closest_site here */
- query_site = SMB_STRDUP(myinfo->client_site_name);
+ site_name = myinfo->client_site_name;
goto rediscover;
}
*info = myinfo;
return NT_STATUS_OK;
}
+
+/********************************************************************
+ dsgetdcname.
+
+ This will be the only public function here.
+********************************************************************/
+
+NTSTATUS dsgetdcname(TALLOC_CTX *mem_ctx,
+ struct messaging_context *msg_ctx,
+ const char *domain_name,
+ const struct GUID *domain_guid,
+ const char *site_name,
+ uint32_t flags,
+ struct netr_DsRGetDCNameInfo **info)
+{
+ NTSTATUS status;
+ const char *query_site = NULL;
+ char *ptr_to_free = NULL;
+ bool retry_query_with_null = false;
+
+ if ((site_name == NULL) || (site_name[0] == '\0')) {
+ ptr_to_free = sitename_fetch(domain_name);
+ if (ptr_to_free != NULL) {
+ retry_query_with_null = true;
+ }
+ query_site = ptr_to_free;
+ } else {
+ query_site = site_name;
+ }
+
+ status = dsgetdcname_internal(mem_ctx,
+ msg_ctx,
+ domain_name,
+ domain_guid,
+ query_site,
+ flags,
+ info);
+
+ SAFE_FREE(ptr_to_free);
+
+ if (!NT_STATUS_EQUAL(status, NT_STATUS_DOMAIN_CONTROLLER_NOT_FOUND)) {
+ return status;
+ }
+
+ /* Should we try again with site_name == NULL ? */
+ if (retry_query_with_null) {
+ status = dsgetdcname_internal(mem_ctx,
+ msg_ctx,
+ domain_name,
+ domain_guid,
+ NULL,
+ flags,
+ info);
+ }
+
+ return status;
+}
diff --git a/source3/rpc_client/cli_netlogon.c b/source3/rpc_client/cli_netlogon.c
index bd3232d..c69a933 100644
--- a/source3/rpc_client/cli_netlogon.c
+++ b/source3/rpc_client/cli_netlogon.c
@@ -625,11 +625,14 @@ NTSTATUS rpccli_netlogon_set_trust_password(struct rpc_pipe_client *cli,
if (cli->dc->negotiate_flags & NETLOGON_NEG_PASSWORD_SET2) {
struct netr_CryptPassword new_password;
+ uint32_t old_timeout;
init_netr_CryptPassword(new_trust_pwd_cleartext,
cli->dc->session_key,
&new_password);
+ old_timeout = dcerpc_binding_handle_set_timeout(b, 600000);
+
status = dcerpc_netr_ServerPasswordSet2(b, mem_ctx,
cli->srv_name_slash,
cli->dc->account_name,
@@ -639,6 +642,9 @@ NTSTATUS rpccli_netlogon_set_trust_password(struct rpc_pipe_client *cli,
--
Samba Shared Repository
More information about the samba-cvs
mailing list