ctdb: Rename ctdb socket variable from CTDB_PATH to CTDB_SOCKET

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Michael Adam <obnox@samba.org>

diff --git a/ctdb/client/ctdb_client.c b/ctdb/client/ctdb_client.c
index 7d629dbde1886af6212e26a8636d8b4285c7571c..424937ad8ca84e34dad455ee5205fd018eca62e6 100644 (file)
--- a/ctdb/client/ctdb_client.c
+++ b/ctdb/client/ctdb_client.c
@@ -3375,7 +3375,7 @@ struct ctdb_context *ctdb_init(struct event_context *ev)
        ctdb->lastid = INT_MAX-200;
        CTDB_NO_MEMORY_NULL(ctdb, ctdb->idr);
 
-       ret = ctdb_set_socketname(ctdb, CTDB_PATH);
+       ret = ctdb_set_socketname(ctdb, CTDB_SOCKET);
        if (ret != 0) {
                DEBUG(DEBUG_ERR,(__location__ " ctdb_set_socketname failed.\n"));
                talloc_free(ctdb);

diff --git a/ctdb/include/ctdb_protocol.h b/ctdb/include/ctdb_protocol.h
index 61d5735bbab5bff0c86ae460bf83df0b58d1590e..72161affa6e6f9bd6fa2b60e3c70cd1ee1265f44 100644 (file)
--- a/ctdb/include/ctdb_protocol.h
+++ b/ctdb/include/ctdb_protocol.h
@@ -22,9 +22,9 @@
 
 /* location of daemon socket, set at configure time */
 #ifdef SOCKPATH
-#define CTDB_PATH      SOCKPATH
+#define CTDB_SOCKET    SOCKPATH
 #else
-#define CTDB_PATH      "/var/run/ctdb/ctdbd.socket"
+#define CTDB_SOCKET    "/var/run/ctdb/ctdbd.socket"
 #endif
 
 /* default ctdb port number */

diff --git a/ctdb/utils/pmda/pmda_ctdb.c b/ctdb/utils/pmda/pmda_ctdb.c
index a6863893e2178657c24d1b9c87faeaa6bda3b6fa..2beac8f8fe279845920ad97618e0767ee3e317b6 100644 (file)
--- a/ctdb/utils/pmda/pmda_ctdb.c
+++ b/ctdb/utils/pmda/pmda_ctdb.c
@@ -197,7 +197,7 @@ pmda_ctdb_daemon_connect(void)
 
        socket_name = getenv("CTDB_SOCKET");
        if (socket_name == NULL) {
-               socket_name = CTDB_PATH;
+               socket_name = CTDB_SOCKET;
        }
 
        ret = ctdb_set_socketname(ctdb, socket_name);

diff --git a/source3/lib/cluster_support.c b/source3/lib/cluster_support.c
index e2aef7b99f980f0f831982a91225b2aaa7c1fae8..afe22609170cfd1dd625b201e954f8759ab7462a 100644 (file)
--- a/source3/lib/cluster_support.c
+++ b/source3/lib/cluster_support.c
@@ -62,8 +62,8 @@ const char *cluster_support_features(void)
 #ifdef HAVE_CTDB_PROTOCOL_H
        _LINE_DEF(HAVE_CTDB_PROTOCOL_H)
 #endif
-#ifdef CTDB_PATH
-       _LINE_STR(CTDB_PATH)
+#ifdef CTDB_SOCKET
+       _LINE_STR(CTDB_SOCKET)
 #endif
 #ifdef CTDB_VERSION
        _LINE_INT(CTDB_VERSION)

diff --git a/source3/lib/ctdbd_conn.c b/source3/lib/ctdbd_conn.c
index fe3e25ad320fd8575bd092900fbb5c02dbed4d8b..5044ddfb328cfad0ff5a701249052166fbe04e47 100644 (file)
--- a/source3/lib/ctdbd_conn.c
+++ b/source3/lib/ctdbd_conn.c
@@ -201,7 +201,7 @@ const char *lp_ctdbd_socket(void)
                return ret;
        }
 
-       return CTDB_PATH;
+       return CTDB_SOCKET;
 }
 
 /*