autobuild: intermittent test failure detected
The autobuild test system has detected an intermittent failing test in the current master tree. The autobuild log of the failure is available here: http://git.samba.org/autobuild.flakey/2014-05-02-1524/flakey.log The samba build logs are available here: http://git.samba.org/autobuild.flakey/2014-05-02-1524/samba.stderr http://git.samba.org/autobuild.flakey/2014-05-02-1524/samba.stdout The top commit at the time of the failure was: commit e8a323c73138bc132e95facfae011847e7c14aa0 Author: Christof Schmitt c...@samba.org Date: Thu May 1 13:50:19 2014 -0700 smbd: Fix compile warning in dmapi.c Signed-off-by: Christof Schmitt c...@samba.org Reviewed-by: Andrew Bartlett abart...@samba.org Change-Id: I69297d91ab8c857204e1f78cafb210b9a05f3b77 Autobuild-User(master): Andrew Bartlett abart...@samba.org Autobuild-Date(master): Fri May 2 03:41:31 CEST 2014 on sn-devel-104
[SCM] Samba Shared Repository - branch v4-0-test updated
The branch, v4-0-test has been updated via 4386827 s3: smbd - smb1 - fix read of deleted memory in reply_writeclose(). via deadf70 lib-util: rename memdup to smb_memdup and fix all callers (bug #10556) via 3d6e3ac build: fix ordering problems with lib-provided and internal RPATHs via 0953816 Revert tevent: fix crash bug in tevent_queue_immediate_trigger() via f0d41fb s3-lib/util: fix logic inside set_namearray loops. via 9057b42 s3-lib/util: fix read across end of namelist string via 0583bf5 s3-nmbd: reset debug settings after reading config file (bug #10239) from 1559d43 VERSION: Bump version number up to 4.0.18... http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test - Log - commit 4386827f919cf3679fde99e5f4e63ad81efa68de Author: Noel Power nopo...@suse.com Date: Thu Feb 27 12:07:11 2014 -0800 s3: smbd - smb1 - fix read of deleted memory in reply_writeclose(). While running smbtorture test raw.write under valgrind an Invalid read was reported in methid reply_writeclose, it seems after closing a file sometime later we try to access it again. Signed-off-by: Noel Power noel.po...@suse.com Signed-off-by: Jeremy Allison j...@samba.org Reviewed-by: Andreas Schneider a...@samba.org Autobuild-User(master): Jeremy Allison j...@samba.org Autobuild-Date(master): Mon Mar 3 20:42:40 CET 2014 on sn-devel-104 (cherry picked from commit 04e434661fa6b5f13776f925b0a7cbadb6b6d006) Fix bug #10554 - request backport for 'smb1 - fix read of deleted memory in reply_writeclose()'. Autobuild-User(v4-0-test): Karolin Seeger ksee...@samba.org Autobuild-Date(v4-0-test): Fri May 2 15:39:19 CEST 2014 on sn-devel-104 commit deadf7095c3ad7f93e8d099052503b0a334b9eec Author: Björn Baumbach b...@sernet.de Date: Mon Apr 14 14:37:29 2014 +0200 lib-util: rename memdup to smb_memdup and fix all callers (bug #10556) Signed-off-by: Björn Baumbach b...@sernet.de Reviewed-by: Volker Lendecke v...@samba.org (cherry picked from commit fae7e5d771d1c69bded1189b23335647023fa0f7) Conflicts: ctdb/lib/util/util.h Also renamed memdup() in source3/locking/brlock.c commit 3d6e3aceecf8893484f3fba73aef7d55c14d6b4a Author: Michael Adam ob...@samba.org Date: Wed Oct 16 15:17:18 2013 +0200 build: fix ordering problems with lib-provided and internal RPATHs When a library or system (like cups) provides an RPATH, e.g. with -Wl,-R or -Wl,-rpath, this was added by waf to the LINKFLAGS, wich was later prepended to our RPATH. But if the path by chance contains an older version of one of our internal libraries like talloc, this would lead to linking the too old talloc into our binaries. This has been observed on, e.g., FreeBSD, but it is a general problem. This patch fixes the problem by specially parsing the RPATH linker options from the pkg-config(, cups-config, ) output and putting the paths into the RPATH_lib container, which is then later correctly appended to our internal RPATH. Signed-off-by: Michael Adam ob...@samba.org Reviewed-by: Andrew Bartlett abart...@samba.org (cherry picked from commit 64f5e24100a764ec198cab9a8d2c43fa86e7027c) Bug: https://bugzilla.samba.org/show_bug.cgi?id=10548 commit 0953816ae9414ea7d32a64af62f2fecb1868a627 Author: Karolin Seeger ksee...@samba.org Date: Tue Apr 29 10:23:03 2014 +0200 Revert tevent: fix crash bug in tevent_queue_immediate_trigger() This reverts commit fc185a5f4cb34f4a2488eb336844c32812f930e7. See https://bugzilla.samba.org/show_bug.cgi?id=10344 for details. Stefan (metze) Metzmacher 2014-04-11 07:28:18 UTC Karolin, please revert fc185a5f4cb34f4a2488eb336844c32812f930e7 in v4-0-test, this somehow went in twice. 87a02403ee4fcc404dc3b887a851c421660cb4d8 is the first commit. It's not a real problem to have the same check twice, but it's a bit confusing and may generate problems with future backports. commit f0d41fbc7295de4e31229704b255ca1db7f761f8 Author: Jeremy Allison j...@samba.org Date: Tue Apr 8 10:38:33 2014 -0700 s3-lib/util: fix logic inside set_namearray loops. Additional fix for bug #10544 - s3-lib/util: set_namearray reads across end of namelist string. Not strictly needed as the initial fix addresses the problem, but corrects the internal logic inside the loops. https://bugzilla.samba.org/show_bug.cgi?id=10544 Signed-off-by: Jeremy Allison j...@samba.org Signed-off-by: Michael Adam ob...@samba.org (cherry picked from commit 4f59580331b934b183c3344da57f2002d88d4512) commit 9057b426d232638dcb1374724023aa95f4e86081 Author: Björn Baumbach b...@sernet.de Date: Mon Apr 7 13:46:42 2014 +0200 s3-lib/util:
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via ffaa284 s3: smbd: Remove open_file_fchmod().
via e6e4084 s3: smbd: change file_set_dosmode() to use
get_file_handle_for_metadata() instead of open_file_fchmod().
via 580eb94 s3: smbd : Ensure file_new doesn't call into
smbXsrv_open_create() for INTERNAL_OPEN_ONLY.
via bed323c s3 : smbd : Protect all possible code paths from fsp-op ==
NULL.
from e8a323c smbd: Fix compile warning in dmapi.c
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit ffaa2849e5afc573c4b0d82086b233f4675bed85
Author: Jeremy Allison j...@samba.org
Date: Thu May 1 11:11:20 2014 -0700
s3: smbd: Remove open_file_fchmod().
No longer used (hurrah!).
Bug 10564 - Lock order violation and file lost
https://bugzilla.samba.org/show_bug.cgi?id=10564
Signed-off-by: Jeremy Allison j...@samba.org
Reviewed-by: Volker Lendecke v...@samba.org
Autobuild-User(master): Jeremy Allison j...@samba.org
Autobuild-Date(master): Fri May 2 23:47:38 CEST 2014 on sn-devel-104
commit e6e40842d15850de35d00d5138fcaac858e37adc
Author: Jeremy Allison j...@samba.org
Date: Thu May 1 11:07:44 2014 -0700
s3: smbd: change file_set_dosmode() to use get_file_handle_for_metadata()
instead of open_file_fchmod().
get_file_handle_for_metadata() is a new function that
finds an existing open handle (fsp-fh-fd != -1) for
a given dev/ino if there is one available, and uses
INTERNAL_OPEN_ONLY with WRITE_DATA access if not.
Allows open_file_fchmod() to be removed next.
Bug 10564 - Lock order violation and file lost
https://bugzilla.samba.org/show_bug.cgi?id=10564
Signed-off-by: Jeremy Allison j...@samba.org
Signed-off-by: Volker Lendecke v...@samba.org
commit 580eb9424c5a9645c44b933e2ef144301af035cb
Author: Jeremy Allison j...@samba.org
Date: Thu May 1 11:01:03 2014 -0700
s3: smbd : Ensure file_new doesn't call into smbXsrv_open_create() for
INTERNAL_OPEN_ONLY.
This causes deadlocks which cause smbd to crash if the locking
database has already been locked for a compound operation we
need to be atomic (as in the file rename case).
Ensure INTERNAL_OPEN_ONLY opens are synonymous with req==NULL.
INTERNAL_OPEN_ONLY opens leave a NO_OPLOCK record in
the share mode database, so they can be detected by other
processes for share mode violation purposes (because
they're doing an operation on the file that may include
reads or writes they need to have real state inside the
locking database) but have an fnum of FNUM_FIELD_INVALID
and a local share_file_id of zero, as they will never be
seen on the wire.
Ensure validate_my_share_entries() ignores
INTERNAL_OPEN_ONLY records (share_file_id == 0).
Bug 10564 - Lock order violation and file lost
https://bugzilla.samba.org/show_bug.cgi?id=10564
Signed-off-by: Jeremy Allison j...@samba.org
Signed-off-by: Volker Lendecke v...@samba.org
commit bed323cebcfcf3298002ea8bc2eb6787419043b6
Author: Jeremy Allison j...@samba.org
Date: Thu May 1 10:58:51 2014 -0700
s3 : smbd : Protect all possible code paths from fsp-op == NULL.
In changes to come this will be possible for an INTERNAL_OPEN_ONLY.
The protection was already in place for some code paths, this
makes the coverage compete.
Bug 10564 - Lock order violation and file lost
https://bugzilla.samba.org/show_bug.cgi?id=10564
Signed-off-by: Jeremy Allison j...@samba.org
Reviewed-by: Volker Lendecke v...@samba.org
---
Summary of changes:
source3/locking/brlock.c | 16 ++-
source3/modules/vfs_btrfs.c |5 ++
source3/modules/vfs_default.c |9
source3/smbd/aio.c| 10
source3/smbd/dosmode.c| 104 -
source3/smbd/files.c |5 ++-
source3/smbd/open.c | 47 --
source3/smbd/proto.h |3 -
source3/smbd/scavenger.c |3 +
9 files changed, 148 insertions(+), 54 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/locking/brlock.c b/source3/locking/brlock.c
index ac22ba4..e0e042d 100644
--- a/source3/locking/brlock.c
+++ b/source3/locking/brlock.c
@@ -1563,12 +1563,18 @@ void brl_close_fnum(struct messaging_context *msg_ctx,
bool brl_mark_disconnected(struct files_struct *fsp)
{
uint32_t tid = fsp-conn-cnum;
- uint64_t smblctx = fsp-op-global-open_persistent_id;
+ uint64_t smblctx;
uint64_t fnum = fsp-fnum;
unsigned int i;
struct server_id self = messaging_server_id(fsp-conn-sconn-msg_ctx);
struct byte_range_lock *br_lck = NULL;
+ if (fsp-op == NULL) {
+
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 4b324f7 s3: Always cache idmapping results of pdb backend.
via a0ab8cb waf: fetch and use some exit codes of called processes
via 4b4f4e0 samba-tool ldapcmp: fix a typo
from ffaa284 s3: smbd: Remove open_file_fchmod().
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 4b324f7f08829ca3df0af291301d5272ae5cede1
Author: Alexander Werth alexander.we...@de.ibm.com
Date: Fri Apr 25 13:53:48 2014 +0200
s3: Always cache idmapping results of pdb backend.
And don't cache in the pdb_ldap module on the id_to_sid calls.
Signed-off-by: Alexander Werth alexander.we...@de.ibm.com
Reviewed-by: Alexander Bokovoy a...@samba.org
Reviewed-by: Michael Adam ob...@samba.org
Autobuild-User(master): Michael Adam ob...@samba.org
Autobuild-Date(master): Sat May 3 04:14:05 CEST 2014 on sn-devel-104
commit a0ab8cb53712cf77cae1d46f49d8eb56e6d5703b
Author: Björn Baumbach b...@sernet.de
Date: Fri Apr 25 22:05:54 2014 +0200
waf: fetch and use some exit codes of called processes
Without this patch for example make ctags reports Success,
also if ctags fails or is not available.
Signed-off-by: Björn Baumbach b...@sernet.de
Reviewed-by: Jeremy Allison j...@samba.org
Reviewed-by: Michael Adam ob...@samba.org
commit 4b4f4e0f4fafc72da7ab8e594595adcba9a383b6
Author: Björn Baumbach b...@sernet.de
Date: Mon Nov 25 15:29:09 2013 +0100
samba-tool ldapcmp: fix a typo
Signed-off-by: Björn Baumbach b...@sernet.de
Reviewed-by: Volker Lendecke v...@samba.org
Reviewed-by: Michael Adam ob...@samba.org
---
Summary of changes:
python/samba/netcmd/ldapcmp.py |4 ++--
source3/passdb/pdb_interface.c | 36 +---
source3/passdb/pdb_ldap.c | 14 --
wscript| 20 +++-
4 files changed, 50 insertions(+), 24 deletions(-)
Changeset truncated at 500 lines:
diff --git a/python/samba/netcmd/ldapcmp.py b/python/samba/netcmd/ldapcmp.py
index 7bd118e..89c175b 100644
--- a/python/samba/netcmd/ldapcmp.py
+++ b/python/samba/netcmd/ldapcmp.py
@@ -462,7 +462,7 @@ class LDAPObject(object):
def log(self, msg):
-Log on the screen if there is no --quiet oprion set
+Log on the screen if there is no --quiet option set
if not self.quiet:
self.outf.write(msg+\n)
@@ -679,7 +679,7 @@ class LDAPBundel(object):
def log(self, msg):
-Log on the screen if there is no --quiet oprion set
+Log on the screen if there is no --quiet option set
if not self.quiet:
self.outf.write(msg+\n)
diff --git a/source3/passdb/pdb_interface.c b/source3/passdb/pdb_interface.c
index 7a0a824..a984fcb 100644
--- a/source3/passdb/pdb_interface.c
+++ b/source3/passdb/pdb_interface.c
@@ -35,6 +35,7 @@
#include ../lib/util/util_pw.h
#include passdb/pdb_secrets.h
#include lib/util_sid_passdb.h
+#include idmap_cache.h
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_PASSDB
@@ -1206,25 +1207,54 @@ bool pdb_get_seq_num(time_t *seq_num)
bool pdb_uid_to_sid(uid_t uid, struct dom_sid *sid)
{
struct pdb_methods *pdb = pdb_get_methods();
- return pdb-uid_to_sid(pdb, uid, sid);
+ bool ret;
+
+ ret = pdb-uid_to_sid(pdb, uid, sid);
+
+ if (ret == true) {
+ struct unixid id;
+ id.id = uid;
+ id.type = ID_TYPE_UID;
+ idmap_cache_set_sid2unixid(sid, id);
+ }
+
+ return ret;
}
bool pdb_gid_to_sid(gid_t gid, struct dom_sid *sid)
{
struct pdb_methods *pdb = pdb_get_methods();
- return pdb-gid_to_sid(pdb, gid, sid);
+ bool ret;
+
+ ret = pdb-gid_to_sid(pdb, gid, sid);
+
+ if (ret == true) {
+ struct unixid id;
+ id.id = gid;
+ id.type = ID_TYPE_GID;
+ idmap_cache_set_sid2unixid(sid, id);
+ }
+
+ return ret;
}
bool pdb_sid_to_id(const struct dom_sid *sid, struct unixid *id)
{
struct pdb_methods *pdb = pdb_get_methods();
+ bool ret;
/* only ask the backend if it is responsible */
if (!sid_check_object_is_for_passdb(sid)) {
return false;
}
- return pdb-sid_to_id(pdb, sid, id);
+ ret = pdb-sid_to_id(pdb, sid, id);
+
+ if (ret == true) {
+ idmap_cache_set_sid2unixid(sid, id);
+ }
+
+ return ret;
}
uint32_t pdb_capabilities(void)
diff --git a/source3/passdb/pdb_ldap.c b/source3/passdb/pdb_ldap.c
index cea8627..7dccc03 100644
--- a/source3/passdb/pdb_ldap.c
+++ b/source3/passdb/pdb_ldap.c
@@ -4970,7 +4970,6 @@ static bool ldapsam_sid_to_id(struct pdb_methods *methods,
autobuild: intermittent test failure detected
The autobuild test system has detected an intermittent failing test in the current master tree. The autobuild log of the failure is available here: http://git.samba.org/autobuild.flakey/2014-05-03-0632/flakey.log The samba build logs are available here: http://git.samba.org/autobuild.flakey/2014-05-03-0632/samba.stderr http://git.samba.org/autobuild.flakey/2014-05-03-0632/samba.stdout The top commit at the time of the failure was: commit 4b324f7f08829ca3df0af291301d5272ae5cede1 Author: Alexander Werth alexander.we...@de.ibm.com Date: Fri Apr 25 13:53:48 2014 +0200 s3: Always cache idmapping results of pdb backend. And don't cache in the pdb_ldap module on the id_to_sid calls. Signed-off-by: Alexander Werth alexander.we...@de.ibm.com Reviewed-by: Alexander Bokovoy a...@samba.org Reviewed-by: Michael Adam ob...@samba.org Autobuild-User(master): Michael Adam ob...@samba.org Autobuild-Date(master): Sat May 3 04:14:05 CEST 2014 on sn-devel-104
