[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  21b2710 ctdbd_conn: Fix ctdbd_connection_destructor
       via  500df7a ctdbd_conn: Fix a copy&paste error
      from  b64f0b5 samba-tool: You cannot add members to a group if the member exists as a sAMAccountName and a CN.

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


- Log -----------------------------------------------------------------
commit 21b27105e831be8057e8370b81eaddb74ea7a390
Author: Volker Lendecke <vl at samba.org>
Date:   Fri Jun 9 08:41:49 2017 +0200

    ctdbd_conn: Fix ctdbd_connection_destructor
    
    clang had complained with
    
    ../source3/lib/ctdbd_conn.c:1784:34: warning: variable 'send_state' used in loop condition
          not modified in loop body [-Wfor-loop-analysis]
            for (send_state = c->send_list; send_state != NULL;) {
                                            ^~~~~~~~~~
    ../source3/lib/ctdbd_conn.c:1791:34: warning: variable 'recv_state' used in loop condition
          not modified in loop body [-Wfor-loop-analysis]
            for (recv_state = c->recv_list; recv_state != NULL;) {
                                            ^~~~~~~~~~
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Ralph Boehme <slow at samba.org>
    
    Autobuild-User(master): Volker Lendecke <vl at samba.org>
    Autobuild-Date(master): Sat Jun 10 03:33:13 CEST 2017 on sn-devel-144

commit 500df7a3ca40d180a49985efb58e313dfc7581f5
Author: Volker Lendecke <vl at samba.org>
Date:   Fri Jun 9 08:41:16 2017 +0200

    ctdbd_conn: Fix a copy&paste error
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Ralph Boehme <slow at samba.org>

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

Summary of changes:
 source3/lib/ctdbd_conn.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/lib/ctdbd_conn.c b/source3/lib/ctdbd_conn.c
index 053d1b5..048e364 100644
--- a/source3/lib/ctdbd_conn.c
+++ b/source3/lib/ctdbd_conn.c
@@ -1761,9 +1761,6 @@ static int ctdb_pkt_recv_recv(struct tevent_req *req,
 
 static int ctdbd_connection_destructor(struct ctdbd_connection *c)
 {
-	struct ctdb_pkt_recv_state *recv_state = NULL;
-	struct ctdb_pkt_send_state *send_state = NULL;
-
 	TALLOC_FREE(c->fde);
 	if (c->fd != -1) {
 		close(c->fd);
@@ -1773,17 +1770,19 @@ static int ctdbd_connection_destructor(struct ctdbd_connection *c)
 	TALLOC_FREE(c->read_state.hdr);
 	ZERO_STRUCT(c->read_state);
 
-	for (send_state = c->send_list; send_state != NULL;) {
+	while (c->send_list != NULL) {
+		struct ctdb_pkt_send_state *send_state = c->send_list;
 		DLIST_REMOVE(c->send_list, send_state);
 		send_state->conn = NULL;
 		tevent_req_defer_callback(send_state->req, send_state->ev);
 		tevent_req_error(send_state->req, EIO);
 	}
 
-	for (recv_state = c->recv_list; recv_state != NULL;) {
+	while (c->recv_list != NULL) {
+		struct ctdb_pkt_recv_state *recv_state = c->recv_list;
 		DLIST_REMOVE(c->recv_list, recv_state);
 		recv_state->conn = NULL;
-		tevent_req_defer_callback(send_state->req, recv_state->ev);
+		tevent_req_defer_callback(recv_state->req, recv_state->ev);
 		tevent_req_error(recv_state->req, EIO);
 	}
 


-- 
Samba Shared Repository