From: David Disseldorp <ddiss@samba.org>
Date: Sun, 6 Sep 2020 20:59:20 +0000 (+0200)
Subject: s3:smbd: rename has_ctdb_public_ip to has_cluster_movable_ip
X-Git-Tag: talloc-2.3.2~267
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0253ba159b9a5017a11c63e362d70c9fea637ca2;p=thirdparty%2Fsamba.git

s3:smbd: rename has_ctdb_public_ip to has_cluster_movable_ip

This provides a little more detail to what's actually being tracked
with this boolean.

Signed-off-by: David Disseldorp <ddiss@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
---

diff --git a/source3/smbd/globals.h b/source3/smbd/globals.h
index fcf33a699c6..4685b6971d3 100644
--- a/source3/smbd/globals.h
+++ b/source3/smbd/globals.h
@@ -361,7 +361,7 @@ struct smbXsrv_connection {
 	const struct tsocket_address *local_address;
 	const struct tsocket_address *remote_address;
 	const char *remote_hostname;
-	bool has_ctdb_public_ip;
+	bool has_cluster_movable_ip;
 
 	enum protocol_types protocol;
 
diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index 2b2a2e09d05..7511b615520 100644
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -2813,10 +2813,10 @@ static NTSTATUS smbd_register_ips(struct smbXsrv_connection *xconn,
 			return NT_STATUS_INTERNAL_ERROR;
 		}
 
-		xconn->has_ctdb_public_ip = ctdbd_find_in_public_ips(ips, srv);
+		xconn->has_cluster_movable_ip = ctdbd_find_in_public_ips(ips, srv);
 		TALLOC_FREE(ips);
-		if (xconn->has_ctdb_public_ip) {
-			DBG_DEBUG("CTDB public ip on %s\n",
+		if (xconn->has_cluster_movable_ip) {
+			DBG_DEBUG("cluster movable IP on %s\n",
 				  smbXsrv_connection_dbg(xconn));
 		}
 	}
diff --git a/source3/smbd/smb2_server.c b/source3/smbd/smb2_server.c
index cf9de185c1f..2750c93b1e8 100644
--- a/source3/smbd/smb2_server.c
+++ b/source3/smbd/smb2_server.c
@@ -1635,9 +1635,9 @@ void smbd_server_connection_terminate_ex(struct smbXsrv_connection *xconn,
 		  smbXsrv_connection_dbg(xconn), num_ok,
 		  reason, location);
 
-	if (xconn->has_ctdb_public_ip) {
+	if (xconn->has_cluster_movable_ip) {
 		/*
-		 * If the connection has a ctdb public address
+		 * If the connection has a movable cluster public address
 		 * we disconnect all client connections,
 		 * as the public address might be moved to
 		 * a different node.