[SCM] Samba Shared Repository - branch master updated

[Martin Schwenke]

The branch, master has been updated
       via  587bdfe ctdb-protocol: Fix CID 1417428
       via  40c5361 ctdb-protocol: Fix CID 1417430
       via  b74599b ctdb-protocol: Fix CID 1417433
      from  139bbf3 vfs_gpfs: Request DENY_DELETE sharemode when possible

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


- Log -----------------------------------------------------------------
commit 587bdfe6cc32cfd8e18268d0b5caa3ed2c011f27
Author: Amitay Isaacs <amitay at gmail.com>
Date:   Tue Sep 5 16:36:16 2017 +1000

    ctdb-protocol: Fix CID 1417428
    
    Signed-off-by: Amitay Isaacs <amitay at gmail.com>
    Reviewed-by: Martin Schwenke <martin at meltin.net>
    
    Autobuild-User(master): Martin Schwenke <martins at samba.org>
    Autobuild-Date(master): Tue Sep  5 15:16:06 CEST 2017 on sn-devel-144

commit 40c5361d41b9f5d17f3ae2f340893c4942c06472
Author: Amitay Isaacs <amitay at gmail.com>
Date:   Tue Sep 5 16:34:27 2017 +1000

    ctdb-protocol: Fix CID 1417430
    
    Signed-off-by: Amitay Isaacs <amitay at gmail.com>
    Reviewed-by: Martin Schwenke <martin at meltin.net>

commit b74599b43dbb7df10ba0a1979a334e6b94878bf3
Author: Amitay Isaacs <amitay at gmail.com>
Date:   Tue Sep 5 16:33:58 2017 +1000

    ctdb-protocol: Fix CID 1417433
    
    Signed-off-by: Amitay Isaacs <amitay at gmail.com>
    Reviewed-by: Martin Schwenke <martin at meltin.net>

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

Summary of changes:
 ctdb/protocol/protocol_control.c | 6 +++---
 ctdb/protocol/protocol_types.c   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/ctdb/protocol/protocol_control.c b/ctdb/protocol/protocol_control.c
index 50114ba..f76a1af 100644
--- a/ctdb/protocol/protocol_control.c
+++ b/ctdb/protocol/protocol_control.c
@@ -899,7 +899,7 @@ static int ctdb_req_control_data_pull(uint8_t *buf, size_t buflen,
 		break;
 
 	case CTDB_CONTROL_DEREGISTER_NOTIFY:
-		ctdb_uint64_pull(buf, buflen, &cd->data.srvid, &np);
+		ret = ctdb_uint64_pull(buf, buflen, &cd->data.srvid, &np);
 		break;
 
 	case CTDB_CONTROL_TRANS3_COMMIT:
@@ -1659,8 +1659,8 @@ static int ctdb_reply_control_data_pull(uint8_t *buf, size_t buflen,
 		break;
 
 	case CTDB_CONTROL_TRY_DELETE_RECORDS:
-		ctdb_rec_buffer_pull(buf, buflen, mem_ctx,
-				     &cd->data.recbuf, &np);
+		ret = ctdb_rec_buffer_pull(buf, buflen, mem_ctx,
+					   &cd->data.recbuf, &np);
 		break;
 
 	case CTDB_CONTROL_GET_CAPABILITIES:
diff --git a/ctdb/protocol/protocol_types.c b/ctdb/protocol/protocol_types.c
index 3fc00c9..ae6f7ed 100644
--- a/ctdb/protocol/protocol_types.c
+++ b/ctdb/protocol/protocol_types.c
@@ -3892,8 +3892,8 @@ int ctdb_script_list_pull(uint8_t *buf, size_t buflen, TALLOC_CTX *mem_ctx,
 	offset += np;
 
 	if (val->num_scripts == 0) {
-		goto done;
 		val->script = NULL;
+		goto done;
 	}
 
 	val->script = talloc_array(val, struct ctdb_script, val->num_scripts);


-- 
Samba Shared Repository