[SCM] CTDB repository - branch master updated - ctdb-2.2-32-g733fc90
The branch, master has been updated
via 733fc909425860f6a02c205c2d8f34a731853922 (commit)
from abeb65ef02d018a7c14d4f8cea71e15c6cf9e357 (commit)
http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=master
- Log -
commit 733fc909425860f6a02c205c2d8f34a731853922
Author: Amitay Isaacs ami...@gmail.com
Date: Mon Jun 24 17:37:15 2013 +1000
client: Exit with non-zero status when unix socket is closed
Signed-off-by: Amitay Isaacs ami...@gmail.com
---
Summary of changes:
client/ctdb_client.c |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/client/ctdb_client.c b/client/ctdb_client.c
index 51ca49b..5881559 100644
--- a/client/ctdb_client.c
+++ b/client/ctdb_client.c
@@ -207,8 +207,8 @@ void ctdb_client_read_cb(uint8_t *data, size_t cnt, void
*args)
talloc_steal(tmp_ctx, hdr);
if (cnt == 0) {
- DEBUG(DEBUG_INFO,(Daemon has exited - shutting down
client\n));
- exit(0);
+ DEBUG(DEBUG_CRIT,(Daemon has exited - shutting down
client\n));
+ exit(1);
}
if (cnt sizeof(*hdr)) {
--
CTDB repository
[SCM] Samba Shared Repository - branch v4-0-test updated
The branch, v4-0-test has been updated
via cc13903 torture: Add tests for LDAP substring search with no
strings provided
via 51f19c4 libcli/ldap: Cope with substring match with no chunks in
ldap_push_filter
via 980ecbf ldb: bump version to allow a depencency on the substring
crash fix
via 1650e8a ldb: Cope with substring match with no chunks in
ldb_filter_from_tree
via df6574c ldb: Ensure not to segfault on a filter such as (mail=)
via b67c906 heimdal_build: Add missing dep on samba4kgetcred
from 4b25860 docs: Avoid mentioning a possibly misleading option.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test
- Log -
commit cc139035600923af4e8837548f5f210f191c3b38
Author: Andrew Bartlett abart...@samba.org
Date: Sat Jun 22 16:55:08 2013 +1000
torture: Add tests for LDAP substring search with no strings provided
Signed-off-by: Andrew Bartlett abart...@samba.org
Reviewed-by: Jeremy Allison j...@samba.org
Autobuild-User(master): Jeremy Allison j...@samba.org
Autobuild-Date(master): Mon Jun 24 23:55:07 CEST 2013 on sn-devel-104
(cherry picked from commit 7bf8fc7ca2321c25b9194a0a13df6a8b4e783c9e)
The last 5 patches address bug #9967 - Fix crash bug from search of mail=.
Autobuild-User(v4-0-test): Karolin Seeger ksee...@samba.org
Autobuild-Date(v4-0-test): Tue Jun 25 13:35:05 CEST 2013 on sn-devel-104
commit 51f19c4e8517148030efbdd7830b5739bfc82328
Author: Andrew Bartlett abart...@samba.org
Date: Sat Jun 22 17:01:42 2013 +1000
libcli/ldap: Cope with substring match with no chunks in ldap_push_filter
Signed-off-by: Andrew Bartlett abart...@samba.org
Reviewed-by: Jeremy Allison j...@samba.org
(cherry picked from commit 70cb7fd214041e8ffacc98de4dbde3ecd77bba85)
commit 980ecbf13d6b29bdb280b024d4bcb9243159ded5
Author: Andrew Bartlett abart...@samba.org
Date: Mon Jun 24 15:28:39 2013 +1000
ldb: bump version to allow a depencency on the substring crash fix
Signed-off-by: Andrew Bartlett abart...@samba.org
Reviewed-by: Jeremy Allison j...@samba.org
(cherry picked from commit 4ca963926938917bf32af4eead61ded2a8275139)
commit 1650e8a9a244d0ea029dc0ce88eda277cf2be261
Author: Andrew Bartlett abart...@samba.org
Date: Sat Jun 22 17:01:02 2013 +1000
ldb: Cope with substring match with no chunks in ldb_filter_from_tree
Signed-off-by: Andrew Bartlett abart...@samba.org
Reviewed-by: Jeremy Allison j...@samba.org
(cherry picked from commit 1a279f74b72018f0742fc407e0574c9dbd7b7883)
commit df6574ce0f73b9574a95d927c67774a31d07fa6a
Author: Andrew Bartlett abart...@samba.org
Date: Sat Jun 15 16:00:42 2013 +1000
ldb: Ensure not to segfault on a filter such as (mail=)
As reported by Robin McCorkell xenopat...@gmail.com triggered by
Mozilla Thunderbird as an LDAP client.
Andrew Bartlett
Signed-off-by: Andrew Bartlett abart...@samba.org
Reviewed-by: Matthieu Patou m...@matws.net
Autobuild-User(master): Andrew Bartlett abart...@samba.org
Autobuild-Date(master): Sat Jun 22 09:33:14 CEST 2013 on sn-devel-104
(cherry picked from commit 0ee8650d778736a130e914df9e14734ef18e0fb5)
commit b67c906b20f4658bb1c1bfd3bebef521c7063916
Author: Andrew Bartlett abart...@samba.org
Date: Sun Jun 16 14:02:57 2013 +1000
heimdal_build: Add missing dep on samba4kgetcred
This started to fail on current Debian Sid with system Heimdal after a
binutils update.
Andrew Bartlett
Signed-off-by: Andrew Bartlett abart...@samba.org
Reviewed-By: Jelmer Vernooij jel...@samba.org
Autobuild-User(master): Andrew Bartlett abart...@samba.org
Autobuild-Date(master): Tue Jun 25 02:30:59 CEST 2013 on sn-devel-104
(cherry picked from commit 48ae86f74c5ed2ae2612d61e232bfcf93d44c7f8)
Fix bug #9968 - fix build with system Heimdal of samba4kgetcred.
---
Summary of changes:
lib/ldb/ABI/{ldb-1.1.14.sigs = ldb-1.1.16.sigs} |0
...ldb-util-1.1.10.sigs = pyldb-util-1.1.16.sigs} |0
lib/ldb/common/ldb_match.c |5 +
lib/ldb/common/ldb_parse.c |2 +-
lib/ldb/wscript|2 +-
libcli/ldap/ldap_message.c | 41
source4/heimdal_build/wscript_build|2 +-
source4/torture/ldap/basic.c | 110
8 files changed, 140 insertions(+), 22 deletions(-)
copy lib/ldb/ABI/{ldb-1.1.14.sigs = ldb-1.1.16.sigs} (100%)
copy lib/ldb/ABI/{pyldb-util-1.1.10.sigs = pyldb-util-1.1.16.sigs} (100%)
Changeset truncated at 500 lines:
diff --git a/lib/ldb/ABI/ldb-1.1.14.sigs b/lib/ldb/ABI/ldb-1.1.16.sigs
similarity index 100%
copy from lib/ldb/ABI/ldb-1.1.14.sigs
copy to
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 4ee73fd s3:smbd/close remove filesystem lock before removing
sharemode
via 935992f s3:smbd/close use common exit path
via 245b5ff s3:lib add mapping for ETXTBSY
via 526f0df s3-ctdb: Fix auto-enabling of CTDB readonly support
via c9924eb s3:smbd/aio mark file as modified in the SMB2 case
via e65c532 nsswitch: fix a comment
from 48ae86f heimdal_build: Add missing dep on samba4kgetcred
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 4ee73fd97b63c65cdb8d4fcbe3287a746d667de0
Author: Christian Ambach a...@samba.org
Date: Thu Jun 13 15:23:07 2013 +0200
s3:smbd/close remove filesystem lock before removing sharemode
otherwise we are open for a race condition:
opener 1 opens file and closes it
- during the close, the share mode entry will be removed from
locking.tdb, but share mode in the file system will be dropped later
after delete_on_close and write time updates have been done
opener 2 requests open of same file with file overwrite
- locking.tdb does not list original entry, but file system share mode
is still around
- VFS_FTRUNCATE will fail and error was converted to STATUS_ACCESS_DENIED
Signed-off-by: Christian Ambach a...@samba.org
Reviewed-by: Volker Lendecke v...@samba.org
Autobuild-User(master): Christian Ambach a...@samba.org
Autobuild-Date(master): Tue Jun 25 14:48:44 CEST 2013 on sn-devel-104
commit 935992fc5502ac63cc0c1ebf00089e7f39558c82
Author: Christian Ambach a...@samba.org
Date: Fri Jun 21 15:11:55 2013 +0200
s3:smbd/close use common exit path
do not return early here, but use the common exit path that will
remove the share mode from the record
Signed-off-by: Christian Ambach a...@samba.org
Reviewed-by: Volker Lendecke v...@samba.org
commit 245b5ffddef945e071ea1b5d26de1da80a0b7ae8
Author: Christian Ambach a...@samba.org
Date: Tue Jun 11 18:20:20 2013 +0200
s3:lib add mapping for ETXTBSY
add ETXTBSY to the errno-STATUS conversion table.
It will be mapped to STATUS_SHARING_VIOLATION
Signed-off-by: Christian Ambach a...@samba.org
Reviewed-by: Volker Lendecke v...@samba.org
commit 526f0dff9635ed1572152a61672013d5f96ddd74
Author: Daniel Gan-Levi dani...@il.ibm.com
Date: Mon Jun 17 19:39:09 2013 +0300
s3-ctdb: Fix auto-enabling of CTDB readonly support
This fixes Bug 9957
Bug: https://bugzilla.samba.org/show_bug.cgi?id=9957
Signed-off-by: Daniel Gan-Levi dani...@il.ibm.com
Reviewed-by: Christian Ambach a...@samba.org
Reviewed-by: Volker Lendecke v...@samba.org
commit c9924ebccd4953bc61ebcce9187a54c48ec67962
Author: Christian Ambach a...@samba.org
Date: Thu Jun 20 18:27:39 2013 +0200
s3:smbd/aio mark file as modified in the SMB2 case
Signed-off-by: Christian Ambach a...@samba.org
Reviewed-by: Volker Lendecke v...@samba.org
commit e65c53226c21877e99879e4483d9b515dfe87672
Author: Christian Ambach a...@samba.org
Date: Fri Jun 21 13:26:18 2013 +0200
nsswitch: fix a comment
the beginning if is only ifdef LINUX now, not the long list this comment
refers to
Signed-off-by: Christian Ambach a...@samba.org
Reviewed-by: Volker Lendecke v...@samba.org
---
Summary of changes:
nsswitch/pam_winbind.h|2 +-
source3/lib/errmap_unix.c |3 +++
source3/smbd/aio.c|2 ++
source3/smbd/close.c | 20 +++-
source3/wscript | 28
5 files changed, 45 insertions(+), 10 deletions(-)
Changeset truncated at 500 lines:
diff --git a/nsswitch/pam_winbind.h b/nsswitch/pam_winbind.h
index 0d9529e..2a9dd0e 100644
--- a/nsswitch/pam_winbind.h
+++ b/nsswitch/pam_winbind.h
@@ -93,7 +93,7 @@
#define PAM_AUTHTOK_RECOVER_ERR PAM_AUTHTOK_RECOVERY_ERR
#endif
-#endif /* defined(SUNOS5) || defined(SUNOS4) || defined(HPUX) ||
defined(FREEBSD) || defined(AIX) */
+#endif /* (!)LINUX */
#if defined(HAVE_SECURITY_PAM_MODULES_H)
#include security/pam_modules.h
diff --git a/source3/lib/errmap_unix.c b/source3/lib/errmap_unix.c
index 28f527e..c5e190c 100644
--- a/source3/lib/errmap_unix.c
+++ b/source3/lib/errmap_unix.c
@@ -111,6 +111,9 @@ static const struct {
#ifdef ENOTSUP
{ ENOTSUP, NT_STATUS_NOT_SUPPORTED},
#endif
+#ifdef ETXTBSY
+ { ETXTBSY, NT_STATUS_SHARING_VIOLATION },
+#endif
};
/*
diff --git a/source3/smbd/aio.c b/source3/smbd/aio.c
index e8be408..24a822e 100644
--- a/source3/smbd/aio.c
+++ b/source3/smbd/aio.c
@@ -959,6 +959,8 @@ static void aio_pwrite_smb2_done(struct tevent_req *req)
/* Unlock now we're done. */
