diff options
| author | Amitay Isaacs <amitay@gmail.com> | 2014-10-10 12:02:26 +1100 |
|---|---|---|
| committer | Amitay Isaacs <amitay@samba.org> | 2014-10-28 05:42:04 +0100 |
| commit | 0d5ecaa2e38b55e981cb2770a945d14ab1d98589 (patch) | |
| tree | 552c8a9a74fadf5c9f2a61f8e0663f9c22bdb9cc | |
| parent | 9933028a657f01d7ff9db5fca19887f5e0523299 (diff) | |
| download | samba-0d5ecaa2e38b55e981cb2770a945d14ab1d98589.tar.gz samba-0d5ecaa2e38b55e981cb2770a945d14ab1d98589.tar.xz samba-0d5ecaa2e38b55e981cb2770a945d14ab1d98589.zip | |
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>
| -rw-r--r-- | ctdb/client/ctdb_client.c | 2 | ||||
| -rw-r--r-- | ctdb/include/ctdb_protocol.h | 4 | ||||
| -rw-r--r-- | ctdb/utils/pmda/pmda_ctdb.c | 2 | ||||
| -rw-r--r-- | source3/lib/cluster_support.c | 4 | ||||
| -rw-r--r-- | source3/lib/ctdbd_conn.c | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/ctdb/client/ctdb_client.c b/ctdb/client/ctdb_client.c index 7d629dbde1..424937ad8c 100644 --- 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 61d5735bba..72161affa6 100644 --- 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 a6863893e2..2beac8f8fe 100644 --- 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 e2aef7b99f..afe2260917 100644 --- 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 fe3e25ad32..5044ddfb32 100644 --- 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; } /* |