[SCM] Samba Shared Repository - branch master updated

[Martin Schwenke]

The branch, master has been updated
       via  71bedfa ctdb-tests: Check an unchecked return value
       via  e0cf8a4 ctdb-test: Fix CID 1419118 (Error handling issues)
       via  9b880de ctdb-client: Fix a typo
       via  a0c5d2e ctdb-tests: Strengthen some tests
       via  1eec318 ctdb-protocol: Fix typo in type of return variable
      from  7d47f75 man pages: properly ident lists

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 71bedfabbfa4d04ff654857094899f6a76e30922
Author: Martin Schwenke <martin at meltin.net>
Date:   Wed Oct 11 19:16:25 2017 +1100

    ctdb-tests: Check an unchecked return value
    
    This can't fail but check it for completeness... just in case Coverity
    decides to notice it.
    
    Signed-off-by: Martin Schwenke <martin at meltin.net>
    Reviewed-by: Volker Lendecke <vl at samba.org>
    
    Autobuild-User(master): Martin Schwenke <martins at samba.org>
    Autobuild-Date(master): Mon Oct 16 09:27:17 CEST 2017 on sn-devel-144

commit e0cf8a4d0d3d820164d333d8968d4a3b599acd54
Author: Martin Schwenke <martin at meltin.net>
Date:   Wed Oct 11 19:04:28 2017 +1100

    ctdb-test: Fix CID 1419118 (Error handling issues)
    
    Signed-off-by: Martin Schwenke <martin at meltin.net>
    Reviewed-by: Volker Lendecke <vl at samba.org>

commit 9b880defb6f364925ab2b0ebba3158a21ca062a6
Author: Martin Schwenke <martin at meltin.net>
Date:   Tue Oct 10 14:51:40 2017 +1100

    ctdb-client: Fix a typo
    
    Signed-off-by: Martin Schwenke <martin at meltin.net>
    Reviewed-by: Volker Lendecke <vl at samba.org>

commit a0c5d2e2b542754ccb8d8c59396119005ce6c9fd
Author: Martin Schwenke <martin at meltin.net>
Date:   Mon Oct 9 14:56:00 2017 +1100

    ctdb-tests: Strengthen some tests
    
    Check for the expected result instead of just any failure.
    
    Signed-off-by: Martin Schwenke <martin at meltin.net>
    Reviewed-by: Volker Lendecke <vl at samba.org>

commit 1eec3184b6a65e1c1f7417f20c63a31ee4ca01a0
Author: Martin Schwenke <martin at meltin.net>
Date:   Mon Oct 9 14:52:30 2017 +1100

    ctdb-protocol: Fix typo in type of return variable
    
    This causes failures to be folded down to 1, which is incorrect.
    
    Signed-off-by: Martin Schwenke <martin at meltin.net>
    Reviewed-by: Volker Lendecke <vl at samba.org>

-----------------------------------------------------------------------

Summary of changes:
 ctdb/client/client_control_sync.c   |  2 +-
 ctdb/protocol/protocol_util.c       |  2 +-
 ctdb/tests/src/fake_ctdbd.c         | 16 +++++++++++++---
 ctdb/tests/src/protocol_util_test.c |  6 +++---
 4 files changed, 18 insertions(+), 8 deletions(-)


Changeset truncated at 500 lines:

diff --git a/ctdb/client/client_control_sync.c b/ctdb/client/client_control_sync.c
index e4e14b7..e56a2b2 100644
--- a/ctdb/client/client_control_sync.c
+++ b/ctdb/client/client_control_sync.c
@@ -2014,7 +2014,7 @@ int ctdb_ctrl_tcp_add_delayed_update(TALLOC_CTX *mem_ctx,
 	ret = ctdb_reply_control_tcp_add_delayed_update(reply);
 	if (ret != 0) {
 		DEBUG(DEBUG_ERR,
-		      ("Control TCP_ADD_DELAYED_UDATE failed, ret=%d\n", ret));
+		      ("Control TCP_ADD_DELAYED_UPDATE failed, ret=%d\n", ret));
 		return ret;
 	}
 
diff --git a/ctdb/protocol/protocol_util.c b/ctdb/protocol/protocol_util.c
index 68a470f..73652e7 100644
--- a/ctdb/protocol/protocol_util.c
+++ b/ctdb/protocol/protocol_util.c
@@ -265,7 +265,7 @@ int ctdb_sock_addr_from_string(const char *str,
 	unsigned port;
 	char *endp = NULL;
 	size_t len;
-	bool ret;
+	int ret;
 
 	if (! with_port) {
 		ret = ip_from_string(str, addr);
diff --git a/ctdb/tests/src/fake_ctdbd.c b/ctdb/tests/src/fake_ctdbd.c
index 06b5b22..af56e08 100644
--- a/ctdb/tests/src/fake_ctdbd.c
+++ b/ctdb/tests/src/fake_ctdbd.c
@@ -251,7 +251,11 @@ static bool nodemap_parse(struct node_map *node_map)
 		}
 		node = &node_map->node[node_map->num_nodes];
 
-		ctdb_sock_addr_from_string(ip, &node->addr, false);
+		ret = ctdb_sock_addr_from_string(ip, &node->addr, false);
+		if (ret != 0) {
+			fprintf(stderr, "bad line (%s) - invalid IP\n", line);
+			continue;
+		}
 		ctdb_sock_addr_set_port(&node->addr, CTDB_PORT);
 		node->pnn = pnn;
 		node->flags = flags;
@@ -1962,11 +1966,17 @@ static void control_reload_nodes_file(TALLOC_CTX *mem_ctx,
 		}
 
 		if (nodemap->node[i].flags & NODE_FLAGS_DELETED) {
+			int ret;
+
 			node = &node_map->node[i];
 
 			node->flags |= NODE_FLAGS_DELETED;
-			ctdb_sock_addr_from_string("0.0.0.0", &node->addr,
-						   false);
+			ret = ctdb_sock_addr_from_string("0.0.0.0", &node->addr,
+							 false);
+			if (ret != 0) {
+				/* Can't happen, but Coverity... */
+				goto fail;
+			}
 
 			continue;
 		}
diff --git a/ctdb/tests/src/protocol_util_test.c b/ctdb/tests/src/protocol_util_test.c
index fd1b067..eb7eb0f 100644
--- a/ctdb/tests/src/protocol_util_test.c
+++ b/ctdb/tests/src/protocol_util_test.c
@@ -49,7 +49,7 @@ static void test_sock_addr_from_string_bad(const char *ip, bool with_port)
 	int ret;
 
 	ret = ctdb_sock_addr_from_string(ip, &sa, with_port);
-	assert(ret != 0);
+	assert(ret == EINVAL);
 }
 
 static void test_sock_addr_cmp(const char *ip1, const char *ip2,
@@ -141,7 +141,7 @@ static void test_connection_from_string_bad(const char *conn_str)
 	int ret;
 
 	ret = ctdb_connection_from_string(conn_str, false, &conn);
-	assert(ret != 0);
+	assert(ret == EINVAL);
 }
 
 /*
@@ -240,7 +240,7 @@ static void test_connection_list_read_bad(const char *s1)
 	close(pipefd[0]);
 
 	ret = ctdb_connection_list_read(tmp_ctx, false, &conn_list);
-	assert(ret != 0);
+	assert(ret == EINVAL);
 
 	talloc_free(tmp_ctx);
 }


-- 
Samba Shared Repository