autobuild[sn-devel-104]: intermittent test failure detected
The autobuild test system (on sn-devel-104) 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.sn-devel-104/2016-05-18-0403/flakey.log The samba build logs are available here: http://git.samba.org/autobuild.flakey.sn-devel-104/2016-05-18-0403/samba.stderr http://git.samba.org/autobuild.flakey.sn-devel-104/2016-05-18-0403/samba.stdout The top commit at the time of the failure was: commit 84aea20f37f7a59c13eb0dcb63e26a389fcc47ee Author: Volker LendeckeDate: Tue May 17 11:39:38 2016 +0200 ctdb: Fix CID 1327222 Copy into fixed size buffer Signed-off-by: Volker Lendecke Reviewed-by: Uri Simchoni Autobuild-User(master): Uri Simchoni Autobuild-Date(master): Tue May 17 21:21:30 CEST 2016 on sn-devel-144
autobuild[sn-devel-144]: intermittent test failure detected
The autobuild test system (on sn-devel-144) 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.sn-devel-144/2016-05-18-0223/flakey.log The samba build logs are available here: http://git.samba.org/autobuild.flakey.sn-devel-144/2016-05-18-0223/samba.stderr http://git.samba.org/autobuild.flakey.sn-devel-144/2016-05-18-0223/samba.stdout The top commit at the time of the failure was: commit 84aea20f37f7a59c13eb0dcb63e26a389fcc47ee Author: Volker LendeckeDate: Tue May 17 11:39:38 2016 +0200 ctdb: Fix CID 1327222 Copy into fixed size buffer Signed-off-by: Volker Lendecke Reviewed-by: Uri Simchoni Autobuild-User(master): Uri Simchoni Autobuild-Date(master): Tue May 17 21:21:30 CEST 2016 on sn-devel-144
autobuild[sn-devel-104]: intermittent test failure detected
The autobuild test system (on sn-devel-104) 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.sn-devel-104/2016-05-18-0003/flakey.log The samba build logs are available here: http://git.samba.org/autobuild.flakey.sn-devel-104/2016-05-18-0003/samba.stderr http://git.samba.org/autobuild.flakey.sn-devel-104/2016-05-18-0003/samba.stdout The top commit at the time of the failure was: commit 84aea20f37f7a59c13eb0dcb63e26a389fcc47ee Author: Volker LendeckeDate: Tue May 17 11:39:38 2016 +0200 ctdb: Fix CID 1327222 Copy into fixed size buffer Signed-off-by: Volker Lendecke Reviewed-by: Uri Simchoni Autobuild-User(master): Uri Simchoni Autobuild-Date(master): Tue May 17 21:21:30 CEST 2016 on sn-devel-144
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 84aea20 ctdb: Fix CID 1327222 Copy into fixed size buffer via 04b5e9c ctdb: Fix CID 1361817 Dereference after null check from 404acae dbwrap_ctdb: Remove get_my_vnn dependency https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 84aea20f37f7a59c13eb0dcb63e26a389fcc47ee Author: Volker LendeckeDate: Tue May 17 11:39:38 2016 +0200 ctdb: Fix CID 1327222 Copy into fixed size buffer Signed-off-by: Volker Lendecke Reviewed-by: Uri Simchoni Autobuild-User(master): Uri Simchoni Autobuild-Date(master): Tue May 17 21:21:30 CEST 2016 on sn-devel-144 commit 04b5e9c9a629add210cafd802c9f4d584d4925b8 Author: Volker Lendecke Date: Tue May 17 11:36:44 2016 +0200 ctdb: Fix CID 1361817 Dereference after null check Signed-off-by: Volker Lendecke Reviewed-by: Uri Simchoni --- Summary of changes: ctdb/tests/src/fake_ctdbd.c | 9 - 1 file changed, 8 insertions(+), 1 deletion(-) Changeset truncated at 500 lines: diff --git a/ctdb/tests/src/fake_ctdbd.c b/ctdb/tests/src/fake_ctdbd.c index 0d08313..462ecb7 100644 --- a/ctdb/tests/src/fake_ctdbd.c +++ b/ctdb/tests/src/fake_ctdbd.c @@ -2097,11 +2097,17 @@ static bool server_recv(struct tevent_req *req, int *perr) static int socket_init(const char *sockpath) { struct sockaddr_un addr; + size_t len; int ret, fd; memset(, 0, sizeof(addr)); addr.sun_family = AF_UNIX; - strcpy(addr.sun_path, sockpath); + + len = strlcpy(addr.sun_path, sockpath, sizeof(addr.sun_path)); + if (len >= sizeof(addr.sun_path)) { + fprintf(stderr, "path too long: %s\n", sockpath); + return -1; + } fd = socket(AF_UNIX, SOCK_STREAM, 0); if (fd == -1) { @@ -2172,6 +2178,7 @@ static void start_server(TALLOC_CTX *mem_ctx, struct tevent_context *ev, req = server_send(mem_ctx, ev, ctdb, fd); if (req == NULL) { fprintf(stderr, "Memory error\n"); + exit(1); } len = write(pfd, , sizeof(ret)); -- Samba Shared Repository
autobuild[sn-devel-104]: intermittent test failure detected
The autobuild test system (on sn-devel-104) 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.sn-devel-104/2016-05-17-2004/flakey.log The samba build logs are available here: http://git.samba.org/autobuild.flakey.sn-devel-104/2016-05-17-2004/samba.stderr http://git.samba.org/autobuild.flakey.sn-devel-104/2016-05-17-2004/samba.stdout The top commit at the time of the failure was: commit 404acae05c9fa8a537e3dbf6480caa266940ec0a Author: Volker LendeckeDate: Mon Apr 11 16:31:25 2016 +0200 dbwrap_ctdb: Remove get_my_vnn dependency Signed-off-by: Volker Lendecke Reviewed-by: Ralph Boehme Autobuild-User(master): Ralph Böhme Autobuild-Date(master): Tue May 17 16:54:36 CEST 2016 on sn-devel-144
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 404acae dbwrap_ctdb: Remove get_my_vnn dependency via 1dcdd86 dbwrap_ctdb: Fix some 32-bit hickups via 3bd368b ctdbd_conn: Remove messages.h dependency via 46be182 dbwrap: Add "msg_ctx" to db_open_ctdb via 3fe3226 dbwrap_ctdb: Pass in ctdbd_connection via 0a367f5 dbwrap_ctdb: Add "conn" to db_ctdb_ctx via e3fcf90 dbwrap_ctdb: Align loop index with terminator via 069d79b lib: Move async message handling out of ctdbd_conn via 33c8861 ctdbd_conn: Expose ctdb socket readability handler via 120f867 ctdbd_conn: "sockname" is not needed anymore via 0b8896d ctdbd_conn: Simplify two DEBUGs via a1309d5 ctdbd_conn: remove ctdb_processes_exist from b3b2fee python/tests/dns_forwarder: fix for python 2.6 https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 404acae05c9fa8a537e3dbf6480caa266940ec0a Author: Volker LendeckeDate: Mon Apr 11 16:31:25 2016 +0200 dbwrap_ctdb: Remove get_my_vnn dependency Signed-off-by: Volker Lendecke Reviewed-by: Ralph Boehme Autobuild-User(master): Ralph Böhme Autobuild-Date(master): Tue May 17 16:54:36 CEST 2016 on sn-devel-144 commit 1dcdd862e58bb23927a9778166c1d91db513532a Author: Volker Lendecke Date: Mon Apr 11 16:07:12 2016 +0200 dbwrap_ctdb: Fix some 32-bit hickups Signed-off-by: Volker Lendecke Reviewed-by: Ralph Boehme commit 3bd368b12dc5b4bd6500a4bb49f2d9d536580d59 Author: Volker Lendecke Date: Sun Apr 24 17:39:44 2016 +0200 ctdbd_conn: Remove messages.h dependency This removes a circular dependency Signed-off-by: Volker Lendecke Reviewed-by: Ralph Boehme commit 46be182ccb931d689f85b0a5ef6e25cb886b59ce Author: Volker Lendecke Date: Sun Apr 24 17:37:07 2016 +0200 dbwrap: Add "msg_ctx" to db_open_ctdb Another step towards making ctdbd_conn.c independent of messages.c. No call to ctdb_conn_msg_ctx() anymore Signed-off-by: Volker Lendecke Reviewed-by: Ralph Boehme commit 3fe3226daa8488e0fa787c40359c3401b6f05fc0 Author: Volker Lendecke Date: Mon Apr 11 16:20:32 2016 +0200 dbwrap_ctdb: Pass in ctdbd_connection This removes one circular dependency of dbwrap_ctdb to messages.c: No call to messaging_ctdbd_connection() anymore from dbwrap_ctdb.c. Signed-off-by: Volker Lendecke Reviewed-by: Ralph Boehme commit 0a367f5fd4b0fa1971052bc6c88ab511b03716e2 Author: Volker Lendecke Date: Mon Apr 11 16:01:07 2016 +0200 dbwrap_ctdb: Add "conn" to db_ctdb_ctx This minimizes the use of messaging_ctdbd_connection() to db_open_ctx(). Next step will move this into db_open(). Signed-off-by: Volker Lendecke Reviewed-by: Ralph Boehme commit e3fcf90f1553ca0d27d42225d1924664c4d8901e Author: Volker Lendecke Date: Mon Apr 11 15:45:49 2016 +0200 dbwrap_ctdb: Align loop index with terminator Signed-off-by: Volker Lendecke Reviewed-by: Ralph Boehme commit 069d79bbd9ad3f37e9b1a89372301179f726300d Author: Volker Lendecke Date: Sun Apr 24 17:37:33 2016 +0200 lib: Move async message handling out of ctdbd_conn messages_ctdbd.c is the code that is genuinely interested in async messages from ctdb, so let it take care of them. Signed-off-by: Volker Lendecke Reviewed-by: Ralph Boehme commit 33c8861fc5ed828fe8e1d5b752f09a0c0ea4cc55 Author: Volker Lendecke Date: Sun Apr 24 17:36:00 2016 +0200 ctdbd_conn: Expose ctdb socket readability handler This will obsolete ctdbd_register_msg_ctx soon Signed-off-by: Volker Lendecke Reviewed-by: Ralph Boehme commit 120f86755abd4919ae7a27de6071878d72fe279b Author: Volker Lendecke Date: Tue Apr 19 21:40:40 2016 +0200 ctdbd_conn: "sockname" is not needed anymore Previously it was used in ctdb_traverse(), but with ff72a8a this is no longer the case Signed-off-by: Volker Lendecke Reviewed-by: Ralph Boehme commit 0b8896d51e1db5543048d2ccd02d45c7b17ab12c Author: Volker Lendecke Date: Tue Apr 19 16:02:49 2016 +0200 ctdbd_conn: Simplify two DEBUGs msg->hdr.length is a uint32 and we have PRIu32 Signed-off-by: Volker Lendecke Reviewed-by: Ralph Boehme commit
autobuild[sn-devel-104]: intermittent test failure detected
The autobuild test system (on sn-devel-104) 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.sn-devel-104/2016-05-17-1603/flakey.log The samba build logs are available here: http://git.samba.org/autobuild.flakey.sn-devel-104/2016-05-17-1603/samba.stderr http://git.samba.org/autobuild.flakey.sn-devel-104/2016-05-17-1603/samba.stdout The top commit at the time of the failure was: commit b3b2fee1083d9c2d659eeb7853dedfff5534a627 Author: Douglas BagnallDate: Fri May 13 12:52:18 2016 +1200 python/tests/dns_forwarder: fix for python 2.6 Signed-off-by: Douglas Bagnall Reviewed-by: Garming Sam Autobuild-User(master): Garming Sam Autobuild-Date(master): Tue May 17 07:39:03 CEST 2016 on sn-devel-144
[SCM] Samba Shared Repository - branch v4-4-test updated
The branch, v4-4-test has been updated via 8b3fbe1 libcli/auth: let msrpc_parse() return talloc'ed empty strings from cc19ba3 s3:libsmb/clifile use correct value for MaxParameterCount for setting EAs https://git.samba.org/?p=samba.git;a=shortlog;h=v4-4-test - Log - commit 8b3fbe1ec6153324ac592c5c2cb68d0269309050 Author: Stefan MetzmacherDate: Mon May 9 16:14:31 2016 +0200 libcli/auth: let msrpc_parse() return talloc'ed empty strings This make it more predictable for the callers. BUG: https://bugzilla.samba.org/show_bug.cgi?id=11912 BUG: https://bugzilla.redhat.com/show_bug.cgi?id=1334356 BUG: https://launchpad.net/bugs/1578576 Signed-off-by: Stefan Metzmacher Autobuild-User(master): Stefan Metzmacher Autobuild-Date(master): Mon May 9 22:27:21 CEST 2016 on sn-devel-144 (cherry picked from commit 58a83236294117d32d9883ac3024f81fa1730a87) Autobuild-User(v4-4-test): Karolin Seeger Autobuild-Date(v4-4-test): Tue May 17 14:42:22 CEST 2016 on sn-devel-144 --- Summary of changes: libcli/auth/msrpc_parse.c | 24 1 file changed, 20 insertions(+), 4 deletions(-) Changeset truncated at 500 lines: diff --git a/libcli/auth/msrpc_parse.c b/libcli/auth/msrpc_parse.c index d499d9e..74a7bcc 100644 --- a/libcli/auth/msrpc_parse.c +++ b/libcli/auth/msrpc_parse.c @@ -262,7 +262,11 @@ bool msrpc_parse(TALLOC_CTX *mem_ctx, ps = va_arg(ap, char **); if (len1 == 0 && len2 == 0) { - *ps = (char *)discard_const(""); + *ps = talloc_strdup(mem_ctx, ""); + if (*ps == NULL) { + ret = false; + goto cleanup; + } } else { /* make sure its in the right format - be strict */ if ((len1 != len2) || (ptr + len1 < ptr) || (ptr + len1 < len1) || (ptr + len1 > blob->length)) { @@ -289,7 +293,11 @@ bool msrpc_parse(TALLOC_CTX *mem_ctx, goto cleanup; } } else { - (*ps) = (char *)discard_const(""); + *ps = talloc_strdup(mem_ctx, ""); + if (*ps == NULL) { + ret = false; + goto cleanup; + } } } break; @@ -302,7 +310,11 @@ bool msrpc_parse(TALLOC_CTX *mem_ctx, ps = (char **)va_arg(ap, char **); /* make sure its in the right format - be strict */ if (len1 == 0 && len2 == 0) { - *ps = (char *)discard_const(""); + *ps = talloc_strdup(mem_ctx, ""); + if (*ps == NULL) { + ret = false; + goto cleanup; + } } else { if ((len1 != len2) || (ptr + len1 < ptr) || (ptr + len1 < len1) || (ptr + len1 > blob->length)) { ret = false; @@ -325,7 +337,11 @@ bool msrpc_parse(TALLOC_CTX *mem_ctx, goto cleanup; } } else { - (*ps) = (char *)discard_const(""); + *ps = talloc_strdup(mem_ctx, ""); + if (*ps == NULL) { + ret = false; + goto cleanup; + } } } break; -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v4-3-test updated
The branch, v4-3-test has been updated via e44c9b6 libcli/auth: let msrpc_parse() return talloc'ed empty strings from 3a69922 s3:libsmb/clifile use correct value for MaxParameterCount for setting EAs https://git.samba.org/?p=samba.git;a=shortlog;h=v4-3-test - Log - commit e44c9b6c7739b13d192a887f9d84b6a78362b821 Author: Stefan MetzmacherDate: Mon May 9 16:14:31 2016 +0200 libcli/auth: let msrpc_parse() return talloc'ed empty strings This make it more predictable for the callers. BUG: https://bugzilla.samba.org/show_bug.cgi?id=11912 BUG: https://bugzilla.redhat.com/show_bug.cgi?id=1334356 BUG: https://launchpad.net/bugs/1578576 Signed-off-by: Stefan Metzmacher Autobuild-User(master): Stefan Metzmacher Autobuild-Date(master): Mon May 9 22:27:21 CEST 2016 on sn-devel-144 (cherry picked from commit 58a83236294117d32d9883ac3024f81fa1730a87) Autobuild-User(v4-3-test): Karolin Seeger Autobuild-Date(v4-3-test): Tue May 17 14:29:44 CEST 2016 on sn-devel-104 --- Summary of changes: libcli/auth/msrpc_parse.c | 24 1 file changed, 20 insertions(+), 4 deletions(-) Changeset truncated at 500 lines: diff --git a/libcli/auth/msrpc_parse.c b/libcli/auth/msrpc_parse.c index d499d9e..74a7bcc 100644 --- a/libcli/auth/msrpc_parse.c +++ b/libcli/auth/msrpc_parse.c @@ -262,7 +262,11 @@ bool msrpc_parse(TALLOC_CTX *mem_ctx, ps = va_arg(ap, char **); if (len1 == 0 && len2 == 0) { - *ps = (char *)discard_const(""); + *ps = talloc_strdup(mem_ctx, ""); + if (*ps == NULL) { + ret = false; + goto cleanup; + } } else { /* make sure its in the right format - be strict */ if ((len1 != len2) || (ptr + len1 < ptr) || (ptr + len1 < len1) || (ptr + len1 > blob->length)) { @@ -289,7 +293,11 @@ bool msrpc_parse(TALLOC_CTX *mem_ctx, goto cleanup; } } else { - (*ps) = (char *)discard_const(""); + *ps = talloc_strdup(mem_ctx, ""); + if (*ps == NULL) { + ret = false; + goto cleanup; + } } } break; @@ -302,7 +310,11 @@ bool msrpc_parse(TALLOC_CTX *mem_ctx, ps = (char **)va_arg(ap, char **); /* make sure its in the right format - be strict */ if (len1 == 0 && len2 == 0) { - *ps = (char *)discard_const(""); + *ps = talloc_strdup(mem_ctx, ""); + if (*ps == NULL) { + ret = false; + goto cleanup; + } } else { if ((len1 != len2) || (ptr + len1 < ptr) || (ptr + len1 < len1) || (ptr + len1 > blob->length)) { ret = false; @@ -325,7 +337,11 @@ bool msrpc_parse(TALLOC_CTX *mem_ctx, goto cleanup; } } else { - (*ps) = (char *)discard_const(""); + *ps = talloc_strdup(mem_ctx, ""); + if (*ps == NULL) { + ret = false; + goto cleanup; + } } } break; -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v4-2-test updated
The branch, v4-2-test has been updated via e410d79 libcli/auth: let msrpc_parse() return talloc'ed empty strings from 0ef06ee VERSION: Bump version up to 4.2.12... https://git.samba.org/?p=samba.git;a=shortlog;h=v4-2-test - Log - commit e410d79f15e6d12738e33186444e85e74ad00814 Author: Stefan MetzmacherDate: Mon May 9 16:14:31 2016 +0200 libcli/auth: let msrpc_parse() return talloc'ed empty strings This make it more predictable for the callers. BUG: https://bugzilla.samba.org/show_bug.cgi?id=11912 BUG: https://bugzilla.redhat.com/show_bug.cgi?id=1334356 BUG: https://launchpad.net/bugs/1578576 Signed-off-by: Stefan Metzmacher Autobuild-User(master): Stefan Metzmacher Autobuild-Date(master): Mon May 9 22:27:21 CEST 2016 on sn-devel-144 (cherry picked from commit 58a83236294117d32d9883ac3024f81fa1730a87) Autobuild-User(v4-2-test): Karolin Seeger Autobuild-Date(v4-2-test): Tue May 17 13:47:41 CEST 2016 on sn-devel-104 --- Summary of changes: libcli/auth/msrpc_parse.c | 24 1 file changed, 20 insertions(+), 4 deletions(-) Changeset truncated at 500 lines: diff --git a/libcli/auth/msrpc_parse.c b/libcli/auth/msrpc_parse.c index d499d9e..74a7bcc 100644 --- a/libcli/auth/msrpc_parse.c +++ b/libcli/auth/msrpc_parse.c @@ -262,7 +262,11 @@ bool msrpc_parse(TALLOC_CTX *mem_ctx, ps = va_arg(ap, char **); if (len1 == 0 && len2 == 0) { - *ps = (char *)discard_const(""); + *ps = talloc_strdup(mem_ctx, ""); + if (*ps == NULL) { + ret = false; + goto cleanup; + } } else { /* make sure its in the right format - be strict */ if ((len1 != len2) || (ptr + len1 < ptr) || (ptr + len1 < len1) || (ptr + len1 > blob->length)) { @@ -289,7 +293,11 @@ bool msrpc_parse(TALLOC_CTX *mem_ctx, goto cleanup; } } else { - (*ps) = (char *)discard_const(""); + *ps = talloc_strdup(mem_ctx, ""); + if (*ps == NULL) { + ret = false; + goto cleanup; + } } } break; @@ -302,7 +310,11 @@ bool msrpc_parse(TALLOC_CTX *mem_ctx, ps = (char **)va_arg(ap, char **); /* make sure its in the right format - be strict */ if (len1 == 0 && len2 == 0) { - *ps = (char *)discard_const(""); + *ps = talloc_strdup(mem_ctx, ""); + if (*ps == NULL) { + ret = false; + goto cleanup; + } } else { if ((len1 != len2) || (ptr + len1 < ptr) || (ptr + len1 < len1) || (ptr + len1 > blob->length)) { ret = false; @@ -325,7 +337,11 @@ bool msrpc_parse(TALLOC_CTX *mem_ctx, goto cleanup; } } else { - (*ps) = (char *)discard_const(""); + *ps = talloc_strdup(mem_ctx, ""); + if (*ps == NULL) { + ret = false; + goto cleanup; + } } } break; -- Samba Shared Repository
autobuild[sn-devel-104]: intermittent test failure detected
The autobuild test system (on sn-devel-104) 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.sn-devel-104/2016-05-17-1204/flakey.log The samba build logs are available here: http://git.samba.org/autobuild.flakey.sn-devel-104/2016-05-17-1204/samba.stderr http://git.samba.org/autobuild.flakey.sn-devel-104/2016-05-17-1204/samba.stdout The top commit at the time of the failure was: commit b3b2fee1083d9c2d659eeb7853dedfff5534a627 Author: Douglas BagnallDate: Fri May 13 12:52:18 2016 +1200 python/tests/dns_forwarder: fix for python 2.6 Signed-off-by: Douglas Bagnall Reviewed-by: Garming Sam Autobuild-User(master): Garming Sam Autobuild-Date(master): Tue May 17 07:39:03 CEST 2016 on sn-devel-144
[SCM] Socket Wrapper Repository - branch master updated
The branch, master has been updated via 0c5a43a tests: Add test_connect_sendto_null_ipv4() test via e443d67 tests: Add a udp test case for sendto() after a connect() via ec18c95 swrap: Fix sendto() with connected sockets via 395dc41 swrap: Allow to open RAW sockets when loaded from d731d16 swrap: Add support for accept4() https://git.samba.org/?p=socket_wrapper.git;a=shortlog;h=master - Log - commit 0c5a43a8a05d74de6c3ffa4f6c42429c2861d75f Author: Andreas SchneiderDate: Tue May 17 10:01:38 2016 +0200 tests: Add test_connect_sendto_null_ipv4() test Signed-off-by: Andreas Schneider Reviewed-by: Ralph Boehme commit e443d67914030e7f2e1126a82003e1bada5cbbac Author: Richard Sharpe Date: Wed May 11 17:10:54 2016 -0700 tests: Add a udp test case for sendto() after a connect() Here, we do the same as net ads dns gethostbyname. That is, we connect on a UDP socket and then send a sendto with a dest address (the same as the one we connected on.) and then a recvfrom etc. Signed-of-by: Richard Sharpe Reviewed-by: Andreas Schneider Reviewed-by: Ralph Boehme commit ec18c955e13ea2a294339e4c9ee977a769fbe903 Author: Richard Sharpe Date: Wed May 11 17:03:46 2016 -0700 swrap: Fix sendto() with connected sockets Let the socket wrapper code work with the net ads dns gethostbyname etc code (lib/addn/dnssock.c) which uses connect on a UDP socket before then using sendto and recvfrom. Here, we make sure we don't error out in that case. Tested by creating a test case for this and then observing that: 1. The test case works when the socket wrapper lib is not being used ie, run the test directly after defining some SHELL variables. 2. That the test case fails when run with the un modified socket wrapper code. 3. Apply this fix and observe that it runs correctly. Pair-Programmed-With: Andreas Schneider Signed-off-by: Richard Sharpe Signed-off-by: Andreas Schneider Reviewed-by: Ralph Boehme commit 395dc418d996d343cfaeb03be5b720c9e52d1d46 Author: Andreas Schneider Date: Tue Apr 26 18:10:52 2016 +0200 swrap: Allow to open RAW sockets when loaded Signed-off-by: Andreas Schneider Reviewed-by: Ralph Boehme --- Summary of changes: src/socket_wrapper.c | 40 ++--- tests/test_echo_udp_sendto_recvfrom.c | 104 ++ 2 files changed, 135 insertions(+), 9 deletions(-) Changeset truncated at 500 lines: diff --git a/src/socket_wrapper.c b/src/socket_wrapper.c index 6e65a7e..ba289e6 100644 --- a/src/socket_wrapper.c +++ b/src/socket_wrapper.c @@ -2407,6 +2407,9 @@ static int swrap_socket(int family, int type, int protocol) #ifdef AF_NETLINK case AF_NETLINK: #endif /* AF_NETLINK */ +#ifdef AF_PACKET + case AF_PACKET: +#endif /* AF_PACKET */ case AF_UNIX: return libc_socket(family, type, protocol); default: @@ -3919,9 +3922,15 @@ static ssize_t swrap_sendmsg_before(int fd, } case SOCK_DGRAM: if (si->connected) { - if (msg->msg_name) { - errno = EISCONN; - return -1; + if (msg->msg_name != NULL) { + /* +* We are dealing with unix sockets and if we +* are connected, we should only talk to the +* connected unix path. Using the fd to send +* to another server would be hard to achieve. +*/ + msg->msg_name = NULL; + msg->msg_namelen = 0; } } else { const struct sockaddr *msg_name; @@ -4468,12 +4477,25 @@ static ssize_t swrap_sendto(int s, const void *buf, size_t len, int flags, return len; } - ret = libc_sendto(s, - buf, - len, - flags, - (struct sockaddr *)msg.msg_name, - msg.msg_namelen); + /* +* If it is a dgram socket and we are connected, don't include the +* 'to' address. +*/ + if (si->type == SOCK_DGRAM && si->connected) { + ret = libc_sendto(s, + buf,
autobuild[sn-devel-144]: intermittent test failure detected
The autobuild test system (on sn-devel-144) 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.sn-devel-144/2016-05-17-0840/flakey.log The samba build logs are available here: http://git.samba.org/autobuild.flakey.sn-devel-144/2016-05-17-0840/samba.stderr http://git.samba.org/autobuild.flakey.sn-devel-144/2016-05-17-0840/samba.stdout The top commit at the time of the failure was: commit b3b2fee1083d9c2d659eeb7853dedfff5534a627 Author: Douglas BagnallDate: Fri May 13 12:52:18 2016 +1200 python/tests/dns_forwarder: fix for python 2.6 Signed-off-by: Douglas Bagnall Reviewed-by: Garming Sam Autobuild-User(master): Garming Sam Autobuild-Date(master): Tue May 17 07:39:03 CEST 2016 on sn-devel-144
autobuild[sn-devel-104]: intermittent test failure detected
The autobuild test system (on sn-devel-104) 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.sn-devel-104/2016-05-17-0803/flakey.log The samba build logs are available here: http://git.samba.org/autobuild.flakey.sn-devel-104/2016-05-17-0803/samba.stderr http://git.samba.org/autobuild.flakey.sn-devel-104/2016-05-17-0803/samba.stdout The top commit at the time of the failure was: commit b3b2fee1083d9c2d659eeb7853dedfff5534a627 Author: Douglas BagnallDate: Fri May 13 12:52:18 2016 +1200 python/tests/dns_forwarder: fix for python 2.6 Signed-off-by: Douglas Bagnall Reviewed-by: Garming Sam Autobuild-User(master): Garming Sam Autobuild-Date(master): Tue May 17 07:39:03 CEST 2016 on sn-devel-144