s3:lib/ctdbd_conn: let release_ip_handler return bool

If it returns true the passed ip address matched and we
let a nested ctdb operation fail with NT_STATUS_ADDRESS_CLOSED.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>

3 files changed, 35 insertions, 9 deletions

diff --git a/source3/include/ctdbd_conn.h b/source3/include/ctdbd_conn.h
index ce5c8ba007..0f85229e9c 100644
--- a/source3/include/ctdbd_conn.h
+++ b/source3/include/ctdbd_conn.h
@@ -76,7 +76,7 @@ NTSTATUS ctdbd_traverse(uint32_t db_id,
 NTSTATUS ctdbd_register_ips(struct ctdbd_connection *conn,
 			    const struct sockaddr_storage *server,
 			    const struct sockaddr_storage *client,
-			    void (*release_ip_handler)(const char *ip_addr,
+			    bool (*release_ip_handler)(const char *ip_addr,
 						       void *private_data),
 			    void *private_data);
 
diff --git a/source3/lib/ctdbd_conn.c b/source3/lib/ctdbd_conn.c
index 6ab4bbe704..4d903248b9 100644
--- a/source3/lib/ctdbd_conn.c
+++ b/source3/lib/ctdbd_conn.c
@@ -59,7 +59,7 @@ struct ctdbd_connection {
 	struct ctdb_packet_context *pkt;
 	struct tevent_fd *fde;
 
-	void (*release_ip_handler)(const char *ip_addr, void *private_data);
+	bool (*release_ip_handler)(const char *ip_addr, void *private_data);
 	void *release_ip_priv;
 };
 
@@ -428,10 +428,23 @@ static NTSTATUS ctdb_read_req(struct ctdbd_connection *conn, uint32_t reqid,
 
 		if ((conn->release_ip_handler != NULL)
 		    && (msg->srvid == CTDB_SRVID_RELEASE_IP)) {
+			bool ret;
+
 			/* must be dispatched immediately */
 			DEBUG(10, ("received CTDB_SRVID_RELEASE_IP\n"));
-			conn->release_ip_handler((const char *)msg->data,
-						 conn->release_ip_priv);
+			ret = conn->release_ip_handler((const char *)msg->data,
+						       conn->release_ip_priv);
+			if (ret) {
+				/*
+				 * We need to release the ip,
+				 * so return an error to the upper layers.
+				 *
+				 * We make sure we don't trigger this again.
+				 */
+				conn->release_ip_handler = NULL;
+				conn->release_ip_priv = NULL;
+				return NT_STATUS_ADDRESS_CLOSED;
+			}
 			TALLOC_FREE(hdr);
 			goto next_pkt;
 		}
@@ -630,10 +643,21 @@ static NTSTATUS ctdb_handle_message(uint8_t *buf, size_t length,
 
 	if ((conn->release_ip_handler != NULL)
 	    && (msg->srvid == CTDB_SRVID_RELEASE_IP)) {
+		bool ret;
+
 		/* must be dispatched immediately */
 		DEBUG(10, ("received CTDB_SRVID_RELEASE_IP\n"));
-		conn->release_ip_handler((const char *)msg->data,
-					 conn->release_ip_priv);
+		ret = conn->release_ip_handler((const char *)msg->data,
+					       conn->release_ip_priv);
+		if (ret) {
+			/*
+			 * We need to release the ip.
+			 *
+			 * We make sure we don't trigger this again.
+			 */
+			conn->release_ip_handler = NULL;
+			conn->release_ip_priv = NULL;
+		}
 		TALLOC_FREE(buf);
 		return NT_STATUS_OK;
 	}
@@ -1692,7 +1716,7 @@ static void smbd_ctdb_canonicalize_ip(const struct sockaddr_storage *in,
 NTSTATUS ctdbd_register_ips(struct ctdbd_connection *conn,
 			    const struct sockaddr_storage *_server,
 			    const struct sockaddr_storage *_client,
-			    void (*release_ip_handler)(const char *ip_addr,
+			    bool (*release_ip_handler)(const char *ip_addr,
 						       void *private_data),
 			    void *private_data)
 {
diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index 65d005df31..3dcc5d4e27 100644
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -2509,7 +2509,7 @@ struct smbd_release_ip_state {
 /****************************************************************************
 received when we should release a specific IP
 ****************************************************************************/
-static void release_ip(const char *ip, void *priv)
+static bool release_ip(const char *ip, void *priv)
 {
 	struct smbd_release_ip_state *state =
 		talloc_get_type_abort(priv,
@@ -2546,8 +2546,10 @@ static void release_ip(const char *ip, void *priv)
 		 */
 		smbd_server_connection_terminate(state->sconn,
 						 "CTDB_SRVID_RELEASE_IP");
-		return;
+		return true;
 	}
+
+	return false;
 }
 
 static NTSTATUS smbd_register_ips(struct smbd_server_connection *sconn,