From: Martin Schwenke <mschwenke@ddn.com>
Date: Mon, 8 Jul 2024 07:58:55 +0000 (+1000)
Subject: ctdb-protocol: Move definition of CTDB_PORT to protocol
X-Git-Tag: tdb-1.4.11~88
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=79c5f451c86fc5e5dd77d631ebbb394070055ba1;p=thirdparty%2Fsamba.git

ctdb-protocol: Move definition of CTDB_PORT to protocol

Users of CTDB_PORT will all pick up the new definition.

Signed-off-by: Martin Schwenke <mschwenke@ddn.com>
Reviewed-by: Anoop C S <anoopcs@samba.org>
---

diff --git a/ctdb/include/ctdb_protocol.h b/ctdb/include/ctdb_protocol.h
index bec849e857c..3120103a48a 100644
--- a/ctdb/include/ctdb_protocol.h
+++ b/ctdb/include/ctdb_protocol.h
@@ -23,9 +23,6 @@
 #include <sys/socket.h>
 #include "protocol/protocol.h"
 
-/* define ctdb port number */
-#define CTDB_PORT 4379
-
 /* we must align packets to ensure ctdb works on all architectures (eg. sparc) */
 #define CTDB_DS_ALIGNMENT 8
 
diff --git a/ctdb/protocol/protocol.h b/ctdb/protocol/protocol.h
index 99440b39125..c775c4bcc64 100644
--- a/ctdb/protocol/protocol.h
+++ b/ctdb/protocol/protocol.h
@@ -22,6 +22,8 @@
 
 #include <tdb.h>
 
+#define CTDB_PORT 4379
+
 #define CTDB_MAGIC	0x43544442 /* CTDB */
 #define CTDB_PROTOCOL	1
 
diff --git a/ctdb/tests/src/fake_ctdbd.c b/ctdb/tests/src/fake_ctdbd.c
index f3af4bd43f9..522b5509cb0 100644
--- a/ctdb/tests/src/fake_ctdbd.c
+++ b/ctdb/tests/src/fake_ctdbd.c
@@ -48,8 +48,6 @@
 #include "ipalloc_read_known_ips.h"
 
 
-#define CTDB_PORT 4379
-
 /* A fake flag that is only supported by some functions */
 #define NODE_FLAGS_FAKE_TIMEOUT 0x80000000