Jelmer Vernooij [Fri, 19 Oct 2012 07:53:02 +0000 (09:53 +0200)]
samba-tool user test: Fix expected output.
Autobuild-User(master): Jelmer Vernooij <jelmer@samba.org>
Autobuild-Date(master): Fri Oct 19 11:37:44 CEST 2012 on sn-devel-104
(cherry picked from commit e3a48bb5f65bf9f5b77df010dcb75fcc9721cf3b)
Jelmer Vernooij [Fri, 5 Oct 2012 09:51:37 +0000 (11:51 +0200)]
selftest: Move more tests to common list script.
Autobuild-User(master): Jelmer Vernooij <jelmer@samba.org>
Autobuild-Date(master): Fri Oct 12 02:06:42 CEST 2012 on sn-devel-104
(cherry picked from commit ff82afb1f8ad3cf950277487aff05d442d03c969)
Jelmer Vernooij [Thu, 11 Oct 2012 15:23:13 +0000 (17:23 +0200)]
samba.join: Fix multiple spaces.
Autobuild-User(master): Jelmer Vernooij <jelmer@samba.org>
Autobuild-Date(master): Thu Oct 11 20:30:43 CEST 2012 on sn-devel-104
(cherry picked from commit 21b58b5eacb67b4dee6e7efe90bd529bbfd6ef77)
Jeremy Allison [Fri, 26 Oct 2012 00:07:29 +0000 (17:07 -0700)]
Fix bug #9329 - Directory listing with SeBackup can crash smbd.
When we do a become_root()/unbecome_root() pair to temporarily
raise privilege, this NULLs out the NT token. If we're within
a become_root()/unbecome_root() pair then return the previous
token on the stack as our NT token. This is what we should be
using to check against NT ACLs in the file server. This copes
with security context changing when removing a file on close
under the context of another user (when 2 users have a file
open, one sets delete on close and then the other user has
to actually do the delete).
Signed-off-by: Jeremy Allison <jra@samba.org> Reviewed-by: Michael Adam <obnox@samba.org>
docs-xml:smbd.8: document new smbXsrv_*_global.tdb files
metze
Signed-off-by: Michael Adam <obnox@samba.org>
Autobuild-User(master): Michael Adam <obnox@samba.org>
Autobuild-Date(master): Fri Oct 19 14:00:39 CEST 2012 on sn-devel-104
(cherry picked from commit 81d0b8aebf8e7dee73907fabf408f0b2c3145207)
Signed-off-by: Stefan Metzmacher <metze@samba.org>
The last 39 patches address bug 9304 - remove unused sessionid.tdb and
connections.tdb related code.
Gregor Beck [Mon, 3 Sep 2012 09:13:16 +0000 (11:13 +0200)]
s3:lib/conn_tdb: implement connections_forall_read() based on smbXsrv_*_global_traverse()
Signed-off-by: Stefan Metzmacher <metze@samba.org> Signed-off-by: Michael Adam <obnox@samba.org>
(cherry picked from commit 0ccbf89bda71cdbe8d216bab0aa6aacd98cf95df)
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Gregor Beck [Mon, 27 Aug 2012 13:21:42 +0000 (15:21 +0200)]
s3:lib: remove function connections_forall()
Signed-off-by: Stefan Metzmacher <metze@samba.org> Signed-off-by: Michael Adam <obnox@samba.org>
(cherry picked from commit b74ed25a9999c0029ddf2771f729c497c20b9c30)
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Gregor Beck [Thu, 23 Aug 2012 12:02:22 +0000 (14:02 +0200)]
s3:net_serverid: remove connections_forall from "net serverid wipedbs"
This tdb will go away.
Signed-off-by: Stefan Metzmacher <metze@samba.org> Signed-off-by: Michael Adam <obnox@samba.org>
(cherry picked from commit 5a4ffb20ffe387fa5bb373778ba84d24a7e5b74f)
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Gregor Beck [Thu, 23 Aug 2012 08:36:59 +0000 (10:36 +0200)]
s3:lib: remove unused sessionid_*() functions
Signed-off-by: Stefan Metzmacher <metze@samba.org> Signed-off-by: Michael Adam <obnox@samba.org>
(cherry picked from commit ac5c8909a94228cec47067188036f1c2a42378aa)
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Gregor Beck [Thu, 23 Aug 2012 12:02:22 +0000 (14:02 +0200)]
s3:net_serverid: remove sessionid_traverse from "net serverid wipedbs"
This tdb will go away.
Signed-off-by: Stefan Metzmacher <metze@samba.org> Signed-off-by: Michael Adam <obnox@samba.org>
(cherry picked from commit 2f2cb2f6894c94f375310661e7c40c167a784eda)
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Gregor Beck [Thu, 23 Aug 2012 14:15:25 +0000 (16:15 +0200)]
s3:smbd: don't use (fill) sessionid.tdb in session_claim/yield any more.
We use data from new smbXsrv_session instead.
Signed-off-by: Stefan Metzmacher <metze@samba.org> Signed-off-by: Michael Adam <obnox@samba.org>
(cherry picked from commit dbff58228e5d05d9799322973aee950951d23fb8)
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Gregor Beck [Thu, 23 Aug 2012 08:36:59 +0000 (10:36 +0200)]
s3:lib: implement sessionid_traverse_read with smb2srv_session_traverse_read
Signed-off-by: Stefan Metzmacher <metze@samba.org> Signed-off-by: Michael Adam <obnox@samba.org>
(cherry picked from commit f2714318ae7358abd328e264dc80821c2749bcc6)
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Gregor Beck [Tue, 28 Aug 2012 13:53:28 +0000 (15:53 +0200)]
s3:smbd/connection: use smbXsrv_tcon_traverse to count connections
Signed-off-by: Stefan Metzmacher <metze@samba.org> Signed-off-by: Michael Adam <obnox@samba.org>
(cherry picked from commit d9ea786c86d6bc42df60881ff703213ef3bd9319)
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Gregor Beck [Tue, 28 Aug 2012 12:29:51 +0000 (14:29 +0200)]
s3:smbd:setup_new_vc_session: traverse sessions instead of connections to shutdown other smbds
Signed-off-by: Stefan Metzmacher <metze@samba.org> Signed-off-by: Michael Adam <obnox@samba.org>
(cherry picked from commit f588704640868a003d901b57045511623e6a1f69)
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Gregor Beck [Fri, 7 Sep 2012 13:18:39 +0000 (15:18 +0200)]
s3:build: move sessionid_tdb.o and conn_tdb.o to SMBD_OBJ_BASE
and use SMBD_OBJ_BASE for a couple of targets where sessionid_tdb and conn_tdb
were used.
Signed-off-by: Stefan Metzmacher <metze@samba.org> Signed-off-by: Michael Adam <obnox@samba.org>
(cherry picked from commit bcfa721a36269d4390ae5ce747cfd3dff6a255ac)
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Signed-off-by: Stefan Metzmacher <metze@samba.org> Signed-off-by: Michael Adam <obnox@samba.org>
(cherry picked from commit 89cc865cabdf7f7fd7c26d3da784c1d7f9e1d6b0)
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Signed-off-by: Stefan Metzmacher <metze@samba.org> Signed-off-by: Michael Adam <obnox@samba.org>
(cherry picked from commit c3a658f59578899215920a42f5cb568f9368ce13)
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Gregor Beck [Thu, 23 Aug 2012 13:21:06 +0000 (15:21 +0200)]
s3:smbd: use session_global_id as session number for pam and utmp
Signed-off-by: Michael Adam <obnox@samba.org> Signed-off-by: Stefan Metzmacher <metze@samba.org>
(cherry picked from commit b288ddd5c0ee7524e30a4fce3ec4f03c19a1764a)
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Gregor Beck [Mon, 27 Aug 2012 09:03:25 +0000 (11:03 +0200)]
s3:smbd: initialize session->global before calling session_claim
Signed-off-by: Stefan Metzmacher <metze@samba.org> Signed-off-by: Michael Adam <obnox@samba.org>
(cherry picked from commit e24b1041b1f6e5b1c5a258a2cbe058f134a45ed9)
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Gregor Beck [Mon, 27 Aug 2012 07:21:58 +0000 (09:21 +0200)]
s3:smbd: remove smbd_server_connection argument from session_claim()
retrieve the server connection from the smbXsrv_session argument instead.
Signed-off-by: Stefan Metzmacher <metze@samba.org> Signed-off-by: Michael Adam <obnox@samba.org>
(cherry picked from commit 02b9b79447be46835adf963cca14c618d0c435e6)
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Gregor Beck [Thu, 23 Aug 2012 12:47:33 +0000 (14:47 +0200)]
s3:smbd: pass smbXsrv_session instead of user_struct to session_claim() and session_yield()
Signed-off-by: Stefan Metzmacher <metze@samba.org> Signed-off-by: Michael Adam <obnox@samba.org>
(cherry picked from commit 4878769f8e6763fbb8347f2ea674c7a861d95564)
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Gregor Beck [Mon, 27 Aug 2012 13:18:07 +0000 (15:18 +0200)]
s3:net_status_shares: use connections_forall_read for a read only traversal
Signed-off-by: Stefan Metzmacher <metze@samba.org> Signed-off-by: Michael Adam <obnox@samba.org>
(cherry picked from commit 77f99ece482a11aad50219e64d231b27dbbccbba)
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Gregor Beck [Mon, 27 Aug 2012 13:12:36 +0000 (15:12 +0200)]
s3:count_current_connections: do not clear orphaned entries from connections.tdb
This removes one of the last callers of connetions_forall.
Signed-off-by: Stefan Metzmacher <metze@samba.org> Signed-off-by: Michael Adam <obnox@samba.org>
(cherry picked from commit 77906e7cdf4c40ab860af8bb42e2c5f3b5501e7d)
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Gregor Beck [Tue, 28 Aug 2012 07:31:59 +0000 (09:31 +0200)]
s3:smbcontrol: don't do stack_trace by connection but by server_id.
Inparticular use serverid_traverse_read instead of connections_foralli
to enumerate processes.
Signed-off-by: Stefan Metzmacher <metze@samba.org> Signed-off-by: Michael Adam <obnox@samba.org>
(cherry picked from commit b237bbc0d1afdfea3b6b6335854f92d6fe80a151)
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Gregor Beck [Mon, 27 Aug 2012 13:07:08 +0000 (15:07 +0200)]
s3:lib: remove unused function connections_traverse()
Signed-off-by: Stefan Metzmacher <metze@samba.org> Signed-off-by: Michael Adam <obnox@samba.org>
(cherry picked from commit d5c273919d129f884d5fb13e06ad73e01c7176e1)
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Signed-off-by: Stefan Metzmacher <metze@samba.org> Signed-off-by: Michael Adam <obnox@samba.org>
(cherry picked from commit 611e30ea233f0e5dab1439e930ea8544b85ca3b2)
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Gregor Beck [Mon, 3 Sep 2012 11:55:50 +0000 (13:55 +0200)]
s3:auth: use const in smb_pam_xxx_session()
Signed-off-by: Stefan Metzmacher <metze@samba.org> Signed-off-by: Michael Adam <obnox@samba.org>
(cherry picked from commit c9a2111b0025156ba70c6eb9fa857e5d639f62b7)
Signed-off-by: Stefan Metzmacher <metze@samba.org>
1. This was broken since Samba 3.2. when ipv6 support was
added, it only worked for ipv6 addresses.
2. userspace tools only display the hostname field.
3. This is not really portable
lib/tsocket: fix loop in tdgram_bsd_recvfrom() (bug #9184)
If the socket is not readable yet, we need to retry
if tsocket_bsd_pending() returns 0.
See also
https://lists.samba.org/archive/samba-technical/2012-October/087164.html
metze
Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Tue Oct 23 14:44:21 CEST 2012 on sn-devel-104
(cherry picked from commit d2aa785290a283e06624f22a381a7ea02baae5ad)
Jeremy Allison [Wed, 3 Oct 2012 21:49:01 +0000 (14:49 -0700)]
Remove all uses of lp_security_mask/lp_force_security_mode/lp_dir_security_mask/lp_force_dir_security_mode and replace with the normal masks. Now these parameters can be removed.
Andrew Bartlett [Mon, 17 Sep 2012 18:57:33 +0000 (11:57 -0700)]
ldb: bump version to 1.1.13 so the 4.0 release can get the isprint fix
Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Mon Sep 17 23:47:57 CEST 2012 on sn-devel-104
(cherry picked from commit ac6deb30fd61b9746c46ab6b69e3ea1c8f762db5)
Michael Adam [Tue, 23 Oct 2012 11:00:02 +0000 (13:00 +0200)]
s3:smbd:durable: factor stat checks out into vfs_default_durable_reconnect_check_stat()
This makes vfs_default_durable_reconnect() simpler to read
and it reduces code duplication in the failure case handling.
Signed-off-by: Michael Adam <obnox@samba.org> Reviewed-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org>
Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Thu Oct 25 23:03:13 CEST 2012 on sn-devel-104
(cherry picked from commit 52ace6767fddb389e3393c4b19685e59782c6a90)
The last 4 patches address bug #9319 - validate stat(2) information before
reconnect durable handles.
Michael Adam [Fri, 19 Oct 2012 14:00:05 +0000 (16:00 +0200)]
s3:smbd:durable: store stat info for disconnected durables and check at reconnect.
At durable reconnect, we check the stat info stored in the cookie against the
current stat data from the file we just opened. If any detail differs, we deny
the durable reconnect, because in that case it is very likely that someone
opened the file while the handle was disconnected, which has to be interpreted
as an oplock break.
Pair-programmed-with: Stefan Metzmacher <metze@samba.org>
Signed-off-by: Michael Adam <obnox@samba.org> Signed-off-by: Stefan Metzmacher <metze@samba.org>
Autobuild-User(master): Stefan Metzmacher <metze@samba.org>
Autobuild-Date(master): Fri Oct 19 18:56:19 CEST 2012 on sn-devel-104
(cherry picked from commit 7d05ff77264cf48d1ee82ca19c8c7e6951e64cf5)
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Michael Adam [Fri, 19 Oct 2012 13:57:24 +0000 (15:57 +0200)]
s3:open_files.idl: add stat-info to vfs_default_durable_cookie.
Pair-programmed-with: Stefan Metzmacher <metze@samba.org>
Signed-off-by: Michael Adam <obnox@samba.org> Signed-off-by: Stefan Metzmacher <metze@samba.org>
(cherry picked from commit a6726f9023c899415441a619473ea9a7819d7c36)
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Michael Adam [Fri, 19 Oct 2012 13:53:50 +0000 (15:53 +0200)]
s3:smbd/durable: remove an extra blank line from vfs_default_durable_reconnect()
Pair-programmed-with: Stefan Metzmacher <metze@samba.org>
Signed-off-by: Michael Adam <obnox@samba.org> Signed-off-by: Stefan Metzmacher <metze@samba.org>
(cherry picked from commit 660e90d39174fbfea0e93f40adfe03fefb86916f)
Signed-off-by: Stefan Metzmacher <metze@samba.org>
s3:smbd/durable: add write_time specific stuff to vfs_default_durable_cookie
metze
Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Michael Adam <obnox@samba.org>
Autobuild-User(master): Michael Adam <obnox@samba.org>
Autobuild-Date(master): Fri Oct 19 17:12:29 CEST 2012 on sn-devel-104
(cherry picked from commit 24d225f44ee4958ed5e2bd934125a9b0c4fc3323)
Signed-off-by: Stefan Metzmacher <metze@samba.org>
The last 4 patches address bug 9318 - fix write time updates for durable handles
s3:open_files.idl: add write_time specific stuff to vfs_default_durable_cookie
metze
Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Michael Adam <obnox@samba.org>
(cherry picked from commit 506249b86382331c39676b8632ad33b535f9fb03)
Signed-off-by: Stefan Metzmacher <metze@samba.org>
s3:smbd/durable: update the low level write_time before disconnecting the file.
If we close the low level FD, we should better update the write_time
if needed.
It's not unlikely that the client doesn't reclaim the durable handle,
in that case we may not close the after the durable timeout.
In such a case we should make sure that we at least update the write time
on disconnect, this makes sure backup applications notice that
the file was changed.
metze
Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Michael Adam <obnox@samba.org>
(cherry picked from commit 137376391d5642c0a18ff70a5184dac4b402fa42)
Signed-off-by: Stefan Metzmacher <metze@samba.org>
s3:smbd/durable: trigger pending write_time updates before disconnecting the file
We need to call the pending write time update handler immediately.
Which means we don't wait exactly 2 seconds before updating the write time
after the first write.
metze
Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Michael Adam <obnox@samba.org>
(cherry picked from commit 9e7bce53707732700928eaf2bb53a5f1cc5d7784)
Signed-off-by: Stefan Metzmacher <metze@samba.org>
s3:rpc_server: avoid a level 0 DEBUG if tstream_npa_connect_recv fails (bug #9309)
metze
Autobuild-User(master): Stefan Metzmacher <metze@samba.org>
Autobuild-Date(master): Sat Oct 20 12:56:23 CEST 2012 on sn-devel-104
(cherry picked from commit d18591c97e1856bb48fd6d288db59065530f3a9b)
Signed-off-by: Stefan Metzmacher <metze@samba.org>
libcli/smb: fix unitialized padding in smb2_create_blob_push_one() (bug #9209)
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Autobuild-User(master): Stefan Metzmacher <metze@samba.org>
Autobuild-Date(master): Sat Oct 27 10:05:22 CEST 2012 on sn-devel-104
(cherry picked from commit 2b4672f2d30c01a4767acf660ddb061676c59908)
Autobuild-User(v4-0-test): Karolin Seeger <kseeger@samba.org>
Autobuild-Date(v4-0-test): Mon Oct 29 10:37:13 CET 2012 on sn-devel-104
Andrew Bartlett [Thu, 18 Oct 2012 08:58:04 +0000 (19:58 +1100)]
build: Assert that auth_domain, auth_builtin, auth_sam, auth_winbind are builtin
These modules are used by default and for various reasons cannot be compiled into a .so
The code setting up these lists is generic, so it is easier to just assert early,
for this non-default configuration.
Andrew Bartlett
Signed-off-by: Andreas Schneider <asn@samba.org>
Address bug #9295 - Can't find guest.so module if auth_builtin is built as
module.
Autobuild-User(master): Karolin Seeger <kseeger@samba.org>
Autobuild-Date(master): Thu Oct 18 13:14:38 CEST 2012 on sn-devel-104
(cherry picked from commit bea7a251781c65a87af6c6e1568cb71a5aef3f7f)
Autobuild-User(v4-0-test): Karolin Seeger <kseeger@samba.org>
Autobuild-Date(v4-0-test): Mon Oct 22 10:41:21 CEST 2012 on sn-devel-104
Matthieu Patou [Tue, 2 Oct 2012 04:36:34 +0000 (21:36 -0700)]
s4-dns: Ignore zones that shouldn't be returned currently
RootDNSServers should never be returned (Windows DNS server don't)
..TrustAnchors should never be returned as is, (Windows returns
TrustAnchors) and for the moment we don't support DNSSEC so we'd better
not return this zone.
Fix bug #9265 - Bind dlz fails to start if there is a trustedanchors zone.
projects / thirdparty / samba.git / log
