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);
/* 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 */
socket_name = getenv("CTDB_SOCKET");
if (socket_name == NULL) {
- socket_name = CTDB_PATH;
+ socket_name = CTDB_SOCKET;
}
ret = ctdb_set_socketname(ctdb, socket_name);
#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)
return ret;
}
- return CTDB_PATH;
+ return CTDB_SOCKET;
}
/*