[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  74013ae ctdb: Fix CID 1327223 Unbounded source buffer
       via  593bdb9 ctdb: Fix CID 1327224 Unbounded source buffer
       via  826bffc lib: Fix CID 1327227 Uninitialized scalar variable
       via  8eedd5c libdap: Fix a '
       via  d527ab1 ctdbd: Fix a typo
      from  65e4829 Fixes for server role parameter in smb.conf manpage

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


- Log -----------------------------------------------------------------
commit 74013aeee38a5c40e8c9c01d2ea46143593840b0
Author: Volker Lendecke <vl at samba.org>
Date:   Tue Oct 13 20:42:06 2015 +0200

    ctdb: Fix CID 1327223 Unbounded source buffer
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>
    
    Autobuild-User(master): Jeremy Allison <jra at samba.org>
    Autobuild-Date(master): Wed Oct 14 05:22:28 CEST 2015 on sn-devel-104

commit 593bdb97840d9fd29a2eaf04fc265c9dcc66886c
Author: Volker Lendecke <vl at samba.org>
Date:   Tue Oct 13 20:40:54 2015 +0200

    ctdb: Fix CID 1327224 Unbounded source buffer
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

commit 826bffc7e6fcb1585833acd0d7822e7b09063b0d
Author: Volker Lendecke <vl at samba.org>
Date:   Tue Oct 13 20:34:24 2015 +0200

    lib: Fix CID 1327227 Uninitialized scalar variable
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

commit 8eedd5c48b95624eb61ab0b4b332ac35e05a98b7
Author: Volker Lendecke <vl at samba.org>
Date:   Mon Oct 12 22:10:51 2015 +0200

    libdap: Fix a '\0' vs NULL mixup
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

commit d527ab10940d58337e3972e6bbcf9d26f56b7e0d
Author: Volker Lendecke <vl at samba.org>
Date:   Mon Oct 12 16:52:49 2015 +0200

    ctdbd: Fix a typo
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

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

Summary of changes:
 ctdb/server/ctdb_recoverd.c       | 2 +-
 ctdb/tests/src/comm_client_test.c | 5 ++++-
 ctdb/tests/src/comm_server_test.c | 5 ++++-
 libcli/ldap/ldap_message.c        | 2 +-
 source3/lib/dbwrap/dbwrap_ctdb.c  | 4 +++-
 5 files changed, 13 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/ctdb/server/ctdb_recoverd.c b/ctdb/server/ctdb_recoverd.c
index 1165318..e945d51 100644
--- a/ctdb/server/ctdb_recoverd.c
+++ b/ctdb/server/ctdb_recoverd.c
@@ -1276,7 +1276,7 @@ static int update_local_flags(struct ctdb_recoverd *rec, struct ctdb_node_map *n
 }
 
 
-/* Create a new random generation ip. 
+/* Create a new random generation id.
    The generation id can not be the INVALID_GENERATION id
 */
 static uint32_t new_generation(void)
diff --git a/ctdb/tests/src/comm_client_test.c b/ctdb/tests/src/comm_client_test.c
index d3f5f9e..e1ebe1c 100644
--- a/ctdb/tests/src/comm_client_test.c
+++ b/ctdb/tests/src/comm_client_test.c
@@ -157,10 +157,13 @@ static int socket_init(char *sockpath)
 {
 	struct sockaddr_un addr;
 	int fd, ret;
+	size_t len;
 
 	memset(&addr, 0, sizeof(addr));
 	addr.sun_family = AF_UNIX;
-	strcpy(addr.sun_path, sockpath);
+
+	len = strlcpy(addr.sun_path, sockpath, sizeof(addr.sun_path));
+	assert(len < sizeof(addr.sun_path));
 
 	fd = socket(AF_UNIX, SOCK_STREAM, 0);
 	assert(fd != -1);
diff --git a/ctdb/tests/src/comm_server_test.c b/ctdb/tests/src/comm_server_test.c
index fe0fffd..7a7656f 100644
--- a/ctdb/tests/src/comm_server_test.c
+++ b/ctdb/tests/src/comm_server_test.c
@@ -313,10 +313,13 @@ static int socket_init(char *sockpath)
 {
 	struct sockaddr_un addr;
 	int fd, ret;
+	size_t len;
 
 	memset(&addr, 0, sizeof(addr));
 	addr.sun_family = AF_UNIX;
-	strcpy(addr.sun_path, sockpath);
+
+	len = strlcpy(addr.sun_path, sockpath, sizeof(addr.sun_path));
+	assert(len < sizeof(addr.sun_path));
 
 	fd = socket(AF_UNIX, SOCK_STREAM, 0);
 	assert(fd != -1);
diff --git a/libcli/ldap/ldap_message.c b/libcli/ldap/ldap_message.c
index 0c664b7..bf83627 100644
--- a/libcli/ldap/ldap_message.c
+++ b/libcli/ldap/ldap_message.c
@@ -762,7 +762,7 @@ static struct ldb_val **ldap_decode_substring(TALLOC_CTX *mem_ctx, struct ldb_va
 	}
 	chunks[chunk_num]->length = strlen(value);
 
-	chunks[chunk_num + 1] = '\0';
+	chunks[chunk_num + 1] = NULL;
 
 	return chunks;
 }
diff --git a/source3/lib/dbwrap/dbwrap_ctdb.c b/source3/lib/dbwrap/dbwrap_ctdb.c
index e024fe5..9066beb 100644
--- a/source3/lib/dbwrap/dbwrap_ctdb.c
+++ b/source3/lib/dbwrap/dbwrap_ctdb.c
@@ -852,7 +852,7 @@ static NTSTATUS db_ctdb_store(struct db_record *rec, TDB_DATA data, int flag)
 
 static NTSTATUS db_ctdb_send_schedule_for_deletion(struct db_record *rec)
 {
-	NTSTATUS status;
+	NTSTATUS status = NT_STATUS_OK;
 	int ret;
 	struct ctdb_control_schedule_for_deletion *dd;
 	TDB_DATA indata;
@@ -888,6 +888,8 @@ static NTSTATUS db_ctdb_send_schedule_for_deletion(struct db_record *rec)
 			  "SCHEDULE_FOR_DELETION: %s, cstatus = %d\n",
 			  strerror(ret), cstatus));
 		if (ret != 0) {
+			status = map_nt_error_from_unix(ret);
+		} else {
 			status = NT_STATUS_UNSUCCESSFUL;
 		}
 	}


-- 
Samba Shared Repository