[SCM] Samba Shared Repository - branch v4-3-test updated
The branch, v4-3-test has been updated via 610de62 WHATSNEW: Prepare release notes for Samba 4.3.0rc4 via 554a887 VERSION: Bump version up to 4.3.0rc4... via 5d9f4f9 VERSION: Release Samba 4.3.0rc3 via 5b3545e WHATSNEW: Update release notes for Samba 4.3.0rc3 from dfa6a2d ctdb-daemon: Correctly process the exit code from failed eventscripts https://git.samba.org/?p=samba.git;a=shortlog;h=v4-3-test - Log - commit 610de623d9dfe130656fcf03c761192b17f2751e Author: Stefan Metzmacher me...@samba.org Date: Tue Aug 18 12:36:33 2015 +0200 WHATSNEW: Prepare release notes for Samba 4.3.0rc4 Signed-off-by: Stefan Metzmacher me...@samba.org commit 554a887f56fa423c874d45dc447ec80936571e38 Author: Stefan Metzmacher me...@samba.org Date: Tue Aug 18 12:31:57 2015 +0200 VERSION: Bump version up to 4.3.0rc4... ...and re-enable git snapshots. Signed-off-by: Stefan Metzmacher me...@samba.org commit 5d9f4f950e5c63d30611e77eb7bc7fcfcf985b82 Author: Stefan Metzmacher me...@samba.org Date: Tue Aug 18 12:30:59 2015 +0200 VERSION: Release Samba 4.3.0rc3 Signed-off-by: Stefan Metzmacher me...@samba.org commit 5b3545e4b939990a6d39a13e43cc2ab1f3469345 Author: Stefan Metzmacher me...@samba.org Date: Tue Aug 18 12:27:47 2015 +0200 WHATSNEW: Update release notes for Samba 4.3.0rc3 Signed-off-by: Stefan Metzmacher me...@samba.org Reviewed-by: Andreas Schneider a...@samba.org --- Summary of changes: VERSION | 2 +- WHATSNEW.txt | 37 - 2 files changed, 37 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/VERSION b/VERSION index 32bb725..2b6b1ad 100644 --- a/VERSION +++ b/VERSION @@ -87,7 +87,7 @@ SAMBA_VERSION_PRE_RELEASE= # e.g. SAMBA_VERSION_RC_RELEASE=1 # # - 3.0.0rc1 # -SAMBA_VERSION_RC_RELEASE=3 +SAMBA_VERSION_RC_RELEASE=4 # To mark SVN snapshots this should be set to 'yes'# diff --git a/WHATSNEW.txt b/WHATSNEW.txt index a657a9e..4150dba 100644 --- a/WHATSNEW.txt +++ b/WHATSNEW.txt @@ -1,7 +1,7 @@ Release Announcements = -This is the third release candidate of Samba 4.3. This is *not* +This is the fourth release candidate of Samba 4.3. This is *not* intended for production environments and is designed for testing purposes only. Please report any defects via the Samba bug reporting system at https://bugzilla.samba.org/. @@ -126,6 +126,12 @@ Both client and server have support for SMB 3.1.1 now. This is the dialect introduced with Windows 10, it improves the secure negotiation of SMB dialects and features. +There's also a new optinal encryption algorithm aes-gcm-128, +but for now this is only selected as fallback and aes-ccm-128 +is preferred because of the better performance. This might change +in future versions when hardware encryption will be supported. +See https://bugzilla.samba.org/show_bug.cgi?id=11451. + New smbclient subcommands - @@ -284,9 +290,38 @@ KNOWN ISSUES Currently none. +CHANGES SINCE 4.2.0rc3 +== + + CHANGES SINCE 4.3.0rc2 == +o Andrew Bartlett abart...@samba.org +* Bug 11436: samba-tool uncaught exception error +* Bug 10493: revert LDAP extended rule 1.2.840.113556.1.4.1941 + LDAP_MATCHING_RULE_IN_CHAIN changes + +o Ralph Boehme s...@samba.org +* Bug 11278: Stream names with colon don't work with + fruit:encoding = native +* Bug 11426: net share allowedusers crashes + +o Amitay Isaacs ami...@gmail.com +* Bug 11432: Fix crash in nested ctdb banning +* Bug 11434: Cannot build ctdbpmda +* Bug 11431: CTDB's eventscript error handling is broken + +o Stefan Metzmacher me...@samba.org +* Bug 11451: Poor SMB3 encryption performance with AES-GCM (part1) +* Bug 11316: tevent_fd needs to be destroyed before closing the fd + +o Arvid Requate requ...@univention.de +* Bug 11291: NetApp joined to a Samba/ADDC cannot resolve SIDs + +o Martin Schwenke mar...@meltin.net +* Bug 11432: Fix crash in nested ctdb banning + CHANGES SINCE 4.3.0rc1 == -- Samba Shared Repository
[SCM] Resolv Wrapper Repository - branch master updated
The branch, master has been updated
via 671691a doc: Use kinit instead of dig in the manpage example
via 113c211 tests: Add tests for res_query and res_search
via c78b81b Change my e-mail address
from 538f2b9 rwrap: Fix strict aliasing warnings for symbol binding
https://git.samba.org/?p=resolv_wrapper.git;a=shortlog;h=master
- Log -
commit 671691a7b08ec60baa2dd5d339bdcb46635d61e4
Author: Jakub Hrozek jhro...@redhat.com
Date: Mon Feb 9 17:26:10 2015 +0100
doc: Use kinit instead of dig in the manpage example
Signed-off-by: Jakub Hrozek jakub.hro...@posteo.se
Reviewed-by: Andreas Schneider a...@samba.org
Reviewed-by: Stefan Metzmacher me...@samba.org
commit 113c211dc903f90bf6ef5c12cf9c746d8265f70c
Author: Jakub Hrozek jhro...@redhat.com
Date: Tue Aug 18 11:22:14 2015 +0200
tests: Add tests for res_query and res_search
Signed-off-by: Jakub Hrozek jakub.hro...@posteo.se
Reviewed-by: Andreas Schneider a...@samba.org
Reviewed-by: Stefan Metzmacher me...@samba.org
commit c78b81b4c41b7e22a2801e9d96af07b63ed0d1ce
Author: Jakub Hrozek jhro...@redhat.com
Date: Tue Aug 18 11:21:59 2015 +0200
Change my e-mail address
Signed-off-by: Jakub Hrozek jakub.hro...@posteo.se
Reviewed-by: Andreas Schneider a...@samba.org
Reviewed-by: Stefan Metzmacher me...@samba.org
---
Summary of changes:
doc/resolv_wrapper.1 | 8 +++--
doc/resolv_wrapper.1.txt | 6 +++-
src/resolv_wrapper.c | 4 +--
tests/dns_srv.c | 2 +-
tests/test_dns_fake.c | 2 +-
tests/test_real_res_query.c | 2 +-
tests/test_res_query_search.c | 69 +--
7 files changed, 81 insertions(+), 12 deletions(-)
Changeset truncated at 500 lines:
diff --git a/doc/resolv_wrapper.1 b/doc/resolv_wrapper.1
index 5482b3d..2691964 100644
--- a/doc/resolv_wrapper.1
+++ b/doc/resolv_wrapper.1
@@ -2,12 +2,12 @@
.\ Title: resolv_wrapper
.\Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\ Generator: DocBook XSL Stylesheets v1.78.1 http://docbook.sf.net/
-.\ Date: 10/12/2014
+.\ Date: 2015-08-18
.\Manual: \ \
.\Source: \ \
.\ Language: English
.\
-.TH RESOLV_WRAPPER 1 10/12/2014 \ \ \ \
+.TH RESOLV_WRAPPER 1 2015\-08\-18 \ \ \ \
.\ -
.\ * Define some portability stuff
.\ -
@@ -147,11 +147,13 @@ If you need to see what is going on in resolv_wrapper
itself or try to find a bu
.RE
.SH EXAMPLE
.sp
+The following command would trick \fIkinit(1)\fR into using DNS servers from
\./resolv\.conf for Kerberos service resolution:
+.sp
.if n \{\
.RS 4
.\}
.nf
-$ LD_PRELOAD=libresolv_wrapper\.so RESOLV_WRAPPER_CONF=\./resolv\.conf
dig test\.example\.site
+$ LD_PRELOAD=libresolv_wrapper\.so RESOLV_WRAPPER_CONF=\./resolv\.conf
kinit user@EXAMPLE\.COM
.fi
.if n \{\
.RE
diff --git a/doc/resolv_wrapper.1.txt b/doc/resolv_wrapper.1.txt
index a9e4ec5..e2e6837 100644
--- a/doc/resolv_wrapper.1.txt
+++ b/doc/resolv_wrapper.1.txt
@@ -1,5 +1,6 @@
resolv_wrapper(1)
=
+:revdate: 2015-08-18
NAME
@@ -61,4 +62,7 @@ debug symbols.
EXAMPLE
---
- $ LD_PRELOAD=libresolv_wrapper.so RESOLV_WRAPPER_CONF=./resolv.conf dig
test.example.site
+The following command would trick 'kinit(1)' into using DNS servers from
./resolv.conf
+for Kerberos service resolution:
+
+ $ LD_PRELOAD=libresolv_wrapper.so RESOLV_WRAPPER_CONF=./resolv.conf kinit
u...@example.com
diff --git a/src/resolv_wrapper.c b/src/resolv_wrapper.c
index d36d080..d6a17cf 100644
--- a/src/resolv_wrapper.c
+++ b/src/resolv_wrapper.c
@@ -1,6 +1,6 @@
/*
* Copyright (c) 2014 Andreas Schneider a...@samba.org
- * Copyright (c) 2014 Jakub Hrozek jakub.hro...@gmail.com
+ * Copyright (c) 2014 Jakub Hrozek jakub.hro...@posteo.se
*
* All rights reserved.
*
@@ -1690,7 +1690,7 @@ int __res_nsearch(struct __res_state *state,
}
/
- * RES_QUERY
+ * RES_SEARCH
***/
static int rwrap_res_search(const char *dname,
diff --git a/tests/dns_srv.c b/tests/dns_srv.c
index b2e6aa3..94e5c3d 100644
--- a/tests/dns_srv.c
+++ b/tests/dns_srv.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) Jakub Hrozek 2014 jakub.hro...@gmail.com
+ * Copyright (C) Jakub Hrozek 2014 jakub.hro...@posteo.se
*
* All rights reserved.
*
diff --git a/tests/test_dns_fake.c b/tests/test_dns_fake.c
index 9bc92cd..8d1dd0c 100644
--- a/tests/test_dns_fake.c
+++ b/tests/test_dns_fake.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) Jakub Hrozek 2014 jakub.hro...@gmail.com
+ * Copyright (C) Jakub
[SCM] Samba Website Repository - branch master updated
The branch, master has been updated via a740dca NEWS[4.3.0rc3]: Samba 4.3.0rc3 Available for Download from 817d77e sambaXP-2015-recordings: fix typo in headline html https://git.samba.org/?p=samba-web.git;a=shortlog;h=master - Log - commit a740dca85e45d9c468fad6ddcec30f9b996e5503 Author: Stefan Metzmacher me...@samba.org Date: Tue Aug 18 12:49:06 2015 +0200 NEWS[4.3.0rc3]: Samba 4.3.0rc3 Available for Download Signed-off-by: Stefan Metzmacher me...@samba.org --- Summary of changes: posted_news/20150818-104759.4.3.0rc3.body.html | 13 + posted_news/20150818-104759.4.3.0rc3.headline.html | 3 +++ 2 files changed, 16 insertions(+) create mode 100644 posted_news/20150818-104759.4.3.0rc3.body.html create mode 100644 posted_news/20150818-104759.4.3.0rc3.headline.html Changeset truncated at 500 lines: diff --git a/posted_news/20150818-104759.4.3.0rc3.body.html b/posted_news/20150818-104759.4.3.0rc3.body.html new file mode 100644 index 000..18742d1 --- /dev/null +++ b/posted_news/20150818-104759.4.3.0rc3.body.html @@ -0,0 +1,13 @@ +!-- BEGIN: posted_news/20150818-104759.4.3.0rc3.body.html -- +h5a name=4.3.0rc318 August 2015/a/h5 +p class=headlineSamba 4.3.0rc3 Available for Download/p +p +This is the third release candidate of the upcoming Samba 4.3 release series. +/p +p +The uncompressed tarball has been signed using GnuPG (ID 6568B7EA). +The source code can be a href=https://download.samba.org/pub/samba/rc/samba-4.3.0rc3.tar.gz;downloaded now/a. +See a href=https://download.samba.org/pub/samba/rc/samba-4.3.0rc3.WHATSNEW.txt;the release notes for more info/a. +/p +!-- END: posted_news/20150818-104759.4.3.0rc3.body.html -- + diff --git a/posted_news/20150818-104759.4.3.0rc3.headline.html b/posted_news/20150818-104759.4.3.0rc3.headline.html new file mode 100644 index 000..76604f0 --- /dev/null +++ b/posted_news/20150818-104759.4.3.0rc3.headline.html @@ -0,0 +1,3 @@ +!-- BEGIN: posted_news/20150818-104759.4.3.0rc3.headline.html -- +li 18 August 2015 a href=#4.3.0rc3Samba 4.3.0rc3 Available for Download/a/li +!-- END: posted_news/20150818-104759.4.3.0rc3.headline.html -- -- Samba Website Repository
[SCM] Samba Shared Repository - branch v4-3-stable updated
The branch, v4-3-stable has been updated via 5d9f4f9 VERSION: Release Samba 4.3.0rc3 via 5b3545e WHATSNEW: Update release notes for Samba 4.3.0rc3 via dfa6a2d ctdb-daemon: Correctly process the exit code from failed eventscripts via 37e126d ctdb-tool: Correctly print timed out event scripts output via 88c53b8 s3:lib: fix some corner cases of open_socket_out_cleanup() via 2aff77c s3:smb2_negprot: prefer AES128_CCM if the client supports it via ef11f8d libcli/smb: prefer AES128_CCM via 9da9cf5 release-scripts/build-manpages-nogit: run make realdistclean at the end via 6fc5d55 Revert ldb-samba: Implement transitive extended matching via 3f5cd1f Revert dsdb: Only parse SAMBA_LDAP_MATCH_RULE_TRANSITIVE_EVAL as a DN via ec7f97c ctdb-pmda: Add missing prototype declaration for non-static function via d0c4863 ctdb-daemon: Check if updates are in flight when releasing all IPs via 3c7f3e7 ctdb-banning: If node is already banned, do not run ctdb_local_node_got_banned() via b37340b s3-net: use talloc array in share allowedusers via 0c7e786 s4:torture:vfs_fruit: add a test for stream names via 3c1e7cb s4:torture:vfs_fruit: pass xattr name as arg to torture_setup_local_xattr() via 047cbb3 vfs_catia: run translation on stream names via fe55c949 vfs_streams_xattr: stream names may contain colons via 977be7b python:samba/upgrade.py Fix format string syntax in error condition via 20d00d3 s4:rpc_server/netlogon: Fix for NetApp via 1d3e6b5 WHATSNEW: Add description of improved cross-compilation support via f8b5de9 WHATSNEW: Document CTDB logging and NFS changes via 4fb42e8 WHATSNEW: add a section about samba-tool fsmo via e408235 script/librelease.sh: this is replaced by script/release.sh now via e41e6a5 script/release.sh: This is a new script to do releases via c55e72e WHATSNEW: fix version numbers via 3f010b5 WHATSNEW: Prepare release notes for Samba 4.3.0rc3 via 47f47d9 VERSION: Bump version up to 4.3.0rc3... from dd3c69d VERSION: Release Samba 4.3.0rc2 https://git.samba.org/?p=samba.git;a=shortlog;h=v4-3-stable - Log - --- Summary of changes: VERSION | 2 +- WHATSNEW.txt| 113 - ctdb/server/ctdb_banning.c | 7 +- ctdb/server/ctdb_event_helper.c | 6 +- ctdb/server/ctdb_takeover.c | 18 +- ctdb/tools/ctdb.c | 8 + ctdb/utils/pmda/pmda_ctdb.c | 3 +- lib/ldb-samba/ldb_matching_rules.c | 338 - lib/ldb-samba/ldb_matching_rules.h | 28 -- lib/ldb-samba/ldif_handlers.c | 6 - lib/ldb-samba/wscript_build | 2 +- libcli/smb/smbXcli_base.c | 8 +- python/samba/upgrade.py | 2 +- release-scripts/build-manpages-nogit| 4 + script/librelease.sh| 110 - script/release.sh | 615 selftest/knownfail | 13 + selftest/target/Samba3.pm | 3 +- selftest/target/Samba4.pm | 3 +- source3/lib/util_sock.c | 3 + source3/modules/vfs_catia.c | 58 ++- source3/modules/vfs_streams_xattr.c | 16 +- source3/smbd/smb2_negprot.c | 18 +- source3/utils/net_rpc.c | 24 +- source4/dsdb/samdb/ldb_modules/extended_dn_in.c | 4 +- source4/rpc_server/netlogon/dcerpc_netlogon.c | 22 +- source4/torture/vfs/fruit.c | 143 +- 27 files changed, 1052 insertions(+), 525 deletions(-) delete mode 100644 lib/ldb-samba/ldb_matching_rules.c delete mode 100644 lib/ldb-samba/ldb_matching_rules.h delete mode 100755 script/librelease.sh create mode 100755 script/release.sh Changeset truncated at 500 lines: diff --git a/VERSION b/VERSION index cf10465..799aa62 100644 --- a/VERSION +++ b/VERSION @@ -87,7 +87,7 @@ SAMBA_VERSION_PRE_RELEASE= # e.g. SAMBA_VERSION_RC_RELEASE=1 # # - 3.0.0rc1 # -SAMBA_VERSION_RC_RELEASE=2 +SAMBA_VERSION_RC_RELEASE=3 # To mark SVN snapshots this should be set to 'yes'# diff --git a/WHATSNEW.txt b/WHATSNEW.txt index f2ff8d4..68ff6ef 100644 --- a/WHATSNEW.txt +++ b/WHATSNEW.txt @@ -1,7 +1,7 @@ Release Announcements = -This is the second
[SCM] UID Wrapper Repository - branch master updated
The branch, master has been updated
via 940aa64 tests: Fix tests on Solaris
from 319c52b uwrap: Removed double newline
https://git.samba.org/?p=uid_wrapper.git;a=shortlog;h=master
- Log -
commit 940aa64fde39a46c311eade4e9992e9a9bc65253
Author: Andreas Schneider a...@samba.org
Date: Tue Aug 18 10:10:41 2015 +0200
tests: Fix tests on Solaris
Signed-off-by: Andreas Schneider a...@samba.org
Reviewed-by: Volker Lendecke v...@samba.org
---
Summary of changes:
tests/test_syscall_gid.c | 10 --
tests/test_syscall_uid.c | 13 -
2 files changed, 16 insertions(+), 7 deletions(-)
Changeset truncated at 500 lines:
diff --git a/tests/test_syscall_gid.c b/tests/test_syscall_gid.c
index d87bb84..3ccdd4a 100644
--- a/tests/test_syscall_gid.c
+++ b/tests/test_syscall_gid.c
@@ -48,7 +48,9 @@ static void test_uwrap_syscall_setregid(void **state)
g = getegid();
assert_int_equal(g, 0);
+#ifdef SYS_getegid /* not available on Solaris */
assert_int_equal(g, syscall(SYS_getegid));
+#endif
rc = syscall(SYS_setregid, -1, 42);
assert_int_equal(rc, 0);
@@ -59,7 +61,7 @@ static void test_uwrap_syscall_setregid(void **state)
assert_int_equal(g, 42);
}
-#if defined(SYS_setresgid) defined(SYS_getresgid)
+#if defined(SYS_setresgid)
static void test_uwrap_syscall_setresgid(void **state)
{
long int rc;
@@ -72,11 +74,15 @@ static void test_uwrap_syscall_setresgid(void **state)
assert_int_equal(rc, 0);
g = getegid();
+ assert_int_equal(g, 0);
+
+#ifdef SYS_getresgid /* not available on Solaris */
rc = syscall(SYS_getresgid, g_r, g_e, g_s);
assert_return_code(rc, errno);
assert_int_equal(g_r, 42);
assert_int_equal(g, g_e);
+#endif
rc = syscall(SYS_setregid, -1, 42);
assert_return_code(rc, errno);
@@ -121,7 +127,7 @@ int main(void) {
const struct CMUnitTest uwrap_tests[] = {
cmocka_unit_test(test_uwrap_syscall_setgid),
cmocka_unit_test(test_uwrap_syscall_setregid),
-#if defined(SYS_setresgid) defined(SYS_getresgid)
+#if defined(SYS_setresgid)
cmocka_unit_test(test_uwrap_syscall_setresgid),
#endif
#if defined(SYS_setgroups)
diff --git a/tests/test_syscall_uid.c b/tests/test_syscall_uid.c
index 7c702c3..c7f8ef3 100644
--- a/tests/test_syscall_uid.c
+++ b/tests/test_syscall_uid.c
@@ -44,7 +44,10 @@ static void test_uwrap_syscall_setreuid(void **state)
assert_int_equal(rc, 0);
u = geteuid();
+ assert_int_equal(u, 0);
+#ifdef SYS_geteuid /* not available on Solaris */
assert_int_equal(u, syscall(SYS_geteuid));
+#endif
rc = syscall(SYS_setreuid, -1, 42);
assert_int_equal(rc, 0);
@@ -56,8 +59,7 @@ static void test_uwrap_syscall_setreuid(void **state)
assert_int_equal(u, 2);
}
-/* not available on Solaris */
-#if defined(SYS_setresuid) defined(SYS_getresuid)
+#if defined(SYS_setresuid)
static void test_uwrap_syscall_setresuid(void **state)
{
long int rc;
@@ -69,15 +71,16 @@ static void test_uwrap_syscall_setresuid(void **state)
rc = syscall(SYS_setresuid, 3, 0, 1);
assert_int_equal(rc, 0);
+ u = geteuid();
+ assert_int_equal(u, 0);
+#ifdef SYS_getresuid /* not available on Solaris */
rc = syscall(SYS_getresuid, u_r, u_e, u_s);
assert_return_code(rc, errno);
assert_int_equal(u_r, 3);
-
- u = geteuid();
assert_int_equal(u_e, u);
-
assert_int_equal(u_s, 1);
+#endif
rc = syscall(SYS_setresuid, -1, 42, -1);
assert_return_code(rc, errno);
--
UID Wrapper Repository
[SCM] Samba Shared Repository - branch v4-3-test updated
The branch, v4-3-test has been updated
via dfa6a2d ctdb-daemon: Correctly process the exit code from failed
eventscripts
via 37e126d ctdb-tool: Correctly print timed out event scripts output
from 88c53b8 s3:lib: fix some corner cases of open_socket_out_cleanup()
https://git.samba.org/?p=samba.git;a=shortlog;h=v4-3-test
- Log -
commit dfa6a2d025e68250b49cb1c27ce69fbcbd7bdde8
Author: Amitay Isaacs ami...@gmail.com
Date: Tue Jul 21 16:37:04 2015 +1000
ctdb-daemon: Correctly process the exit code from failed eventscripts
BUG: https://bugzilla.samba.org/show_bug.cgi?id=11431
Signed-off-by: Amitay Isaacs ami...@gmail.com
Reviewed-by: Martin Schwenke mar...@meltin.net
Autobuild-User(master): Martin Schwenke mart...@samba.org
Autobuild-Date(master): Wed Jul 22 15:03:53 CEST 2015 on sn-devel-104
(cherry picked from commit 00ec3c477eba50206801b451ae4eb64c12aba5db)
Autobuild-User(v4-3-test): Stefan Metzmacher me...@samba.org
Autobuild-Date(v4-3-test): Tue Aug 18 10:55:54 CEST 2015 on sn-devel-104
commit 37e126daf941fd577290e34ac580b5ae0cc4a674
Author: Amitay Isaacs ami...@gmail.com
Date: Mon Jul 20 16:37:58 2015 +1000
ctdb-tool: Correctly print timed out event scripts output
The timed out error is ignored for certain events (start_recovery,
recoverd, takeip, releaseip). If these events time out, then the debug
hung script outputs the following:
3 scripts were executed last releaseip cycle
00.ctdb Status:OKDuration:4.381 Thu Jul 16 23:45:24 2015
01.reclock Status:OKDuration:13.422 Thu Jul 16 23:45:28 2015
10.external Status:DISABLED
10.interface Status:OKDuration:-1437083142.208 Thu Jul 16
23:45:42 2015
The endtime for timed out scripts is not set. Since the status is not
returned as -ETIME for some events, ctdb scriptstatus prints -ve duration.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=11431
Signed-off-by: Amitay Isaacs ami...@gmail.com
Reviewed-by: Martin Schwenke mar...@meltin.net
(cherry picked from commit 71b89b2b7a9768de437347e6678370b2682da892)
---
Summary of changes:
ctdb/server/ctdb_event_helper.c | 6 +-
ctdb/tools/ctdb.c | 8
2 files changed, 13 insertions(+), 1 deletion(-)
Changeset truncated at 500 lines:
diff --git a/ctdb/server/ctdb_event_helper.c b/ctdb/server/ctdb_event_helper.c
index f14e336..a1b5318 100644
--- a/ctdb/server/ctdb_event_helper.c
+++ b/ctdb/server/ctdb_event_helper.c
@@ -128,7 +128,11 @@ int main(int argc, char *argv[])
exit(1);
}
if (WIFEXITED(status)) {
- output = -WEXITSTATUS(status);
+ output = WEXITSTATUS(status);
+ /* Only errors should be returned as -ve values */
+ if (output == ENOENT || output == ENOEXEC) {
+ output = -output;
+ }
sys_write(write_fd, output, sizeof(output));
exit(0);
}
diff --git a/ctdb/tools/ctdb.c b/ctdb/tools/ctdb.c
index 4734b26..c6da621 100644
--- a/ctdb/tools/ctdb.c
+++ b/ctdb/tools/ctdb.c
@@ -1424,6 +1424,14 @@ static int control_one_scriptstatus(struct ctdb_context
*ctdb,
for (i=0; iscript_status-num_scripts; i++) {
const char *status = NULL;
+ /* The ETIME status is ignored for certain events.
+* In that case the status is 0, but endtime is not set.
+*/
+ if (script_status-scripts[i].status == 0
+ timeval_is_zero(script_status-scripts[i].finished)) {
+ script_status-scripts[i].status = -ETIME;
+ }
+
switch (script_status-scripts[i].status) {
case -ETIME:
status = TIMEDOUT;
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v4-2-test updated
The branch, v4-2-test has been updated
via b688f57 s4:rpc_server/netlogon: fix bugs in
dcesrv_netr_DsRGetDCNameEx2()
from 75e2768 ctdb-daemon: Correctly process the exit code from failed
eventscripts
https://git.samba.org/?p=samba.git;a=shortlog;h=v4-2-test
- Log -
commit b688f57ba0f1cbaf65dbe81075848ed7aeba702f
Author: Stefan Metzmacher me...@samba.org
Date: Thu Jan 22 11:22:25 2015 +
s4:rpc_server/netlogon: fix bugs in dcesrv_netr_DsRGetDCNameEx2()
We should return the our ip address the client is connected too.
Signed-off-by: Stefan Metzmacher me...@samba.org
Reviewed-by: Andreas Schneider a...@samba.org
Reviewed-by: Günther Deschner g...@samba.org
(cherry picked from commit 459d1d3fb9a5282d19121eaacba9d611896b37ff)
Autobuild-User(v4-2-test): Stefan Metzmacher me...@samba.org
Autobuild-Date(v4-2-test): Tue Aug 18 19:15:43 CEST 2015 on sn-devel-104
---
Summary of changes:
source4/rpc_server/netlogon/dcerpc_netlogon.c | 22 ++
1 file changed, 14 insertions(+), 8 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/rpc_server/netlogon/dcerpc_netlogon.c
b/source4/rpc_server/netlogon/dcerpc_netlogon.c
index 3ea26e2..b2f0073 100644
--- a/source4/rpc_server/netlogon/dcerpc_netlogon.c
+++ b/source4/rpc_server/netlogon/dcerpc_netlogon.c
@@ -1828,15 +1828,16 @@ static WERROR dcesrv_netr_DsRGetDCNameEx2(struct
dcesrv_call_state *dce_call,
struct ldb_context *sam_ctx;
struct netr_DsRGetDCNameInfo *info;
struct loadparm_context *lp_ctx = dce_call-conn-dce_ctx-lp_ctx;
+ const struct tsocket_address *local_address;
+ char *local_addr = NULL;
const struct tsocket_address *remote_address;
- char *addr = NULL;
+ char *remote_addr = NULL;
const char *server_site_name;
char *guid_str;
struct netlogon_samlogon_response response;
NTSTATUS status;
const char *dc_name = NULL;
const char *domain_name = NULL;
- struct interface *ifaces;
const char *pdc_ip;
ZERO_STRUCTP(r-out.info);
@@ -1847,10 +1848,16 @@ static WERROR dcesrv_netr_DsRGetDCNameEx2(struct
dcesrv_call_state *dce_call,
return WERR_DS_UNAVAILABLE;
}
+ local_address = dcesrv_connection_get_local_address(dce_call-conn);
+ if (tsocket_address_is_inet(local_address, ip)) {
+ local_addr = tsocket_address_inet_addr_string(local_address,
mem_ctx);
+ W_ERROR_HAVE_NO_MEMORY(local_addr);
+ }
+
remote_address = dcesrv_connection_get_remote_address(dce_call-conn);
if (tsocket_address_is_inet(remote_address, ip)) {
- addr = tsocket_address_inet_addr_string(remote_address,
mem_ctx);
- W_ERROR_HAVE_NO_MEMORY(addr);
+ remote_addr = tsocket_address_inet_addr_string(remote_address,
mem_ctx);
+ W_ERROR_HAVE_NO_MEMORY(remote_addr);
}
/* server_unc is ignored by w2k3 */
@@ -1908,7 +1915,7 @@ static WERROR dcesrv_netr_DsRGetDCNameEx2(struct
dcesrv_call_state *dce_call,
r-in.domain_name,
NULL, guid_str,
r-in.client_account,
-r-in.mask, addr,
+r-in.mask, remote_addr,
NETLOGON_NT_VERSION_5EX_WITH_IP,
lp_ctx, response, true);
if (!NT_STATUS_IS_OK(status)) {
@@ -1956,12 +1963,11 @@ static WERROR dcesrv_netr_DsRGetDCNameEx2(struct
dcesrv_call_state *dce_call,
info = talloc(mem_ctx, struct netr_DsRGetDCNameInfo);
W_ERROR_HAVE_NO_MEMORY(info);
info-dc_unc = talloc_asprintf(mem_ctx, %s%s,
- dc_name[0] == '\\'? :,
+ dc_name[0] != '\\'? :,
talloc_strdup(mem_ctx, dc_name));
W_ERROR_HAVE_NO_MEMORY(info-dc_unc);
- load_interface_list(mem_ctx, lp_ctx, ifaces);
- pdc_ip = iface_list_best_ip(ifaces, addr);
+ pdc_ip = local_addr;
if (pdc_ip == NULL) {
pdc_ip = 127.0.0.1;
}
--
Samba Shared Repository
[SCM] Samba Shared Repository - annotated tag samba-4.3.0rc3 created
The annotated tag, samba-4.3.0rc3 has been created at d9dba7b73405b961046f4b0ac9da5e020ea0ddb0 (tag) tagging 5d9f4f950e5c63d30611e77eb7bc7fcfcf985b82 (commit) replaces samba-4.3.0rc2 tagged by Stefan Metzmacher on Tue Aug 18 12:44:21 2015 +0200 - Log - samba: tag release samba-4.3.0rc3 -BEGIN PGP SIGNATURE- Version: GnuPG v1 iD8DBQBV0wyFbzORW2Vot+oRAotpAKCzNRTGsDKS75hG/r3hJ5VLed3UKACdEu7E RiUBLnzM/ct8INAPtGddw6c= =1Gze -END PGP SIGNATURE- Amitay Isaacs (4): ctdb-banning: If node is already banned, do not run ctdb_local_node_got_banned() ctdb-pmda: Add missing prototype declaration for non-static function ctdb-tool: Correctly print timed out event scripts output ctdb-daemon: Correctly process the exit code from failed eventscripts Andrew Bartlett (3): python:samba/upgrade.py Fix format string syntax in error condition Revert dsdb: Only parse SAMBA_LDAP_MATCH_RULE_TRANSITIVE_EVAL as a DN Revert ldb-samba: Implement transitive extended matching Arvid Requate (1): s4:rpc_server/netlogon: Fix for NetApp Martin Schwenke (2): WHATSNEW: Document CTDB logging and NFS changes ctdb-daemon: Check if updates are in flight when releasing all IPs Ralph Boehme (5): vfs_streams_xattr: stream names may contain colons vfs_catia: run translation on stream names s4:torture:vfs_fruit: pass xattr name as arg to torture_setup_local_xattr() s4:torture:vfs_fruit: add a test for stream names s3-net: use talloc array in share allowedusers Rowland Penny (1): WHATSNEW: add a section about samba-tool fsmo Stefan Metzmacher (11): VERSION: Bump version up to 4.3.0rc3... WHATSNEW: Prepare release notes for Samba 4.3.0rc3 WHATSNEW: fix version numbers script/release.sh: This is a new script to do releases script/librelease.sh: this is replaced by script/release.sh now release-scripts/build-manpages-nogit: run make realdistclean at the end libcli/smb: prefer AES128_CCM s3:smb2_negprot: prefer AES128_CCM if the client supports it s3:lib: fix some corner cases of open_socket_out_cleanup() WHATSNEW: Update release notes for Samba 4.3.0rc3 VERSION: Release Samba 4.3.0rc3 Uri Simchoni (1): WHATSNEW: Add description of improved cross-compilation support --- -- Samba Shared Repository
[SCM] UID Wrapper Repository - branch master updated
The branch, master has been updated via 74d0f0a doc: Make the manpage reproducible from 940aa64 tests: Fix tests on Solaris https://git.samba.org/?p=uid_wrapper.git;a=shortlog;h=master - Log - commit 74d0f0acd0a888eef24b82d90ed091ef137e0573 Author: Andreas Schneider a...@samba.org Date: Tue Aug 18 12:32:03 2015 +0200 doc: Make the manpage reproducible Signed-off-by: Andreas Schneider a...@samba.org Reviewed-by: Guenther Deschner g...@samba.org --- Summary of changes: doc/uid_wrapper.1 | 4 ++-- doc/uid_wrapper.1.txt | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/doc/uid_wrapper.1 b/doc/uid_wrapper.1 index f6ff0df..0faff95 100644 --- a/doc/uid_wrapper.1 +++ b/doc/uid_wrapper.1 @@ -2,12 +2,12 @@ .\ Title: uid_wrapper .\Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\ Generator: DocBook XSL Stylesheets v1.78.1 http://docbook.sf.net/ -.\ Date: 07/11/2014 +.\ Date: 2014-07-11 .\Manual: \ \ .\Source: \ \ .\ Language: English .\ -.TH UID_WRAPPER 1 07/11/2014 \ \ \ \ +.TH UID_WRAPPER 1 2014\-07\-11 \ \ \ \ .\ - .\ * Define some portability stuff .\ - diff --git a/doc/uid_wrapper.1.txt b/doc/uid_wrapper.1.txt index 51cdb73..dec69e6 100644 --- a/doc/uid_wrapper.1.txt +++ b/doc/uid_wrapper.1.txt @@ -1,5 +1,6 @@ uid_wrapper(1) == +:revdate: 2014-07-11 NAME -- UID Wrapper Repository
[SCM] Samba Shared Repository - branch v4-2-test updated
The branch, v4-2-test has been updated via 75e2768 ctdb-daemon: Correctly process the exit code from failed eventscripts via bbaef4d ctdb-daemon: Improve error handling for running event scripts via 0d36fba ctdb-tool: Correctly print timed out event scripts output via 1f7e86d s3:lib: fix some corner cases of open_socket_out_cleanup() via 7ad714e lib: Fix rundown of open_socket_out() from e9d22f1 s4:torture:vfs_fruit: add a test for stream names https://git.samba.org/?p=samba.git;a=shortlog;h=v4-2-test - Log - commit 75e2768a08f4d53644d1f1f6a1a348f811440358 Author: Amitay Isaacs ami...@gmail.com Date: Tue Jul 21 16:37:04 2015 +1000 ctdb-daemon: Correctly process the exit code from failed eventscripts BUG: https://bugzilla.samba.org/show_bug.cgi?id=11431 Signed-off-by: Amitay Isaacs ami...@gmail.com Reviewed-by: Martin Schwenke mar...@meltin.net Autobuild-User(master): Martin Schwenke mart...@samba.org Autobuild-Date(master): Wed Jul 22 15:03:53 CEST 2015 on sn-devel-104 (cherry picked from commit 00ec3c477eba50206801b451ae4eb64c12aba5db) Autobuild-User(v4-2-test): Stefan Metzmacher me...@samba.org Autobuild-Date(v4-2-test): Tue Aug 18 15:55:44 CEST 2015 on sn-devel-104 commit bbaef4d48ed9f835a00cdff57b5282835af45f3d Author: Amitay Isaacs ami...@gmail.com Date: Thu Nov 13 11:02:26 2014 +1100 ctdb-daemon: Improve error handling for running event scripts BUG: https://bugzilla.samba.org/show_bug.cgi?id=11431 Signed-off-by: Amitay Isaacs ami...@gmail.com Reviewed-by: Martin Schwenke mar...@meltin.net Autobuild-User(master): Martin Schwenke mart...@samba.org Autobuild-Date(master): Fri Nov 14 03:06:12 CET 2014 on sn-devel-104 (cherry picked from commit d04bfc6ec6ad7a4749ebfee2284253c4a91a81aa) commit 0d36fbabdc2457cdea80e18ca224232317142b06 Author: Amitay Isaacs ami...@gmail.com Date: Mon Jul 20 16:37:58 2015 +1000 ctdb-tool: Correctly print timed out event scripts output The timed out error is ignored for certain events (start_recovery, recoverd, takeip, releaseip). If these events time out, then the debug hung script outputs the following: 3 scripts were executed last releaseip cycle 00.ctdb Status:OKDuration:4.381 Thu Jul 16 23:45:24 2015 01.reclock Status:OKDuration:13.422 Thu Jul 16 23:45:28 2015 10.external Status:DISABLED 10.interface Status:OKDuration:-1437083142.208 Thu Jul 16 23:45:42 2015 The endtime for timed out scripts is not set. Since the status is not returned as -ETIME for some events, ctdb scriptstatus prints -ve duration. BUG: https://bugzilla.samba.org/show_bug.cgi?id=11431 Signed-off-by: Amitay Isaacs ami...@gmail.com Reviewed-by: Martin Schwenke mar...@meltin.net (cherry picked from commit 71b89b2b7a9768de437347e6678370b2682da892) commit 1f7e86d813293a36e1f84bc4983c8cbb528cfc71 Author: Stefan Metzmacher me...@samba.org Date: Fri Aug 14 12:54:00 2015 +0200 s3:lib: fix some corner cases of open_socket_out_cleanup() In case of timeouts we retry the async_connect_send() and forgot to remember it, this results in an abort() in async_connect_cleanup() as the fd is already closed when calling fcntl(F_SETFL). BUG: https://bugzilla.samba.org/show_bug.cgi?id=11316 Signed-off-by: Stefan Metzmacher me...@samba.org Reviewed-by: Andreas Schneider a...@samba.org Reviewed-by: Volker Lendecke v...@samba.org (cherry picked from commit ce3c77fb45ccf4d45a0fa655325e30e748d89245) commit 7ad714e2eb4758edbbdd774db2af3287c41c6eba Author: Volker Lendecke v...@samba.org Date: Mon Jun 29 19:00:55 2015 +0200 lib: Fix rundown of open_socket_out() Under valgrind I've seen the abort in async_connect_cleanup kick in. Yes, it's good that we check these return codes! Bug: https://bugzilla.samba.org/show_bug.cgi?id=11316 Signed-off-by: Volker Lendecke v...@samba.org Reviewed-by: Stefan (metze) Metzmacher me...@samba.org Autobuild-User(master): Volker Lendecke v...@samba.org Autobuild-Date(master): Tue Jun 30 20:24:37 CEST 2015 on sn-devel-104 (cherry picked from commit 6fc65aaf956f35e2068e2a6f8521af2f2351d31e) --- Summary of changes: ctdb/server/ctdb_event_helper.c | 44 ++--- ctdb/server/eventscript.c | 10 +++-- ctdb/tools/ctdb.c | 8 +++ source3/lib/util_sock.c | 48 ++--- 4 files changed, 83 insertions(+), 27 deletions(-) Changeset truncated at 500 lines: diff --git a/ctdb/server/ctdb_event_helper.c b/ctdb/server/ctdb_event_helper.c index 9ff763c..a1b5318
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/2015-08-18-1851/flakey.log The samba build logs are available here: http://git.samba.org/autobuild.flakey/2015-08-18-1851/samba.stderr http://git.samba.org/autobuild.flakey/2015-08-18-1851/samba.stdout The top commit at the time of the failure was: commit e8c602dfa2f08a9ea43c84a7e7ae9fe17e007d60 Author: Stefan Metzmacher me...@samba.org Date: Wed Aug 12 09:24:42 2015 +0200 s4:torture/rpc: fix ndr_security.h include in fsrvp.c We should not include ndr_security.c This allows ./configure --nonshared-binary=smbtorture again. Signed-off-by: Stefan Metzmacher me...@samba.org Reviewed-by: Ralph Boehme s...@samba.org Autobuild-User(master): Ralph Böhme s...@samba.org Autobuild-Date(master): Mon Aug 17 20:53:10 CEST 2015 on sn-devel-104
