From a49ac23a10bfe4098cb46b39d3152571a2562a38 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Fri, 30 Mar 2012 15:37:33 +0200 Subject: s3: Return CTDB_PATH from lp_ctdbd_socket() All callers had that fallback --- source3/lib/ctdbd_conn.c | 4 ---- source3/lib/dbwrap/dbwrap_open.c | 8 -------- 2 files changed, 12 deletions(-) (limited to 'source3/lib') diff --git a/source3/lib/ctdbd_conn.c b/source3/lib/ctdbd_conn.c index ba51137915..096616038e 100644 --- a/source3/lib/ctdbd_conn.c +++ b/source3/lib/ctdbd_conn.c @@ -205,10 +205,6 @@ static NTSTATUS ctdbd_connect(TALLOC_CTX *mem_ctx, int fd; socklen_t salen; - if (!sockname || !*sockname) { - sockname = CTDB_PATH; - } - fd = socket(AF_UNIX, SOCK_STREAM, 0); if (fd == -1) { DEBUG(3, ("Could not create socket: %s\n", strerror(errno))); diff --git a/source3/lib/dbwrap/dbwrap_open.c b/source3/lib/dbwrap/dbwrap_open.c index 06ae7c6eff..9bf279b1d8 100644 --- a/source3/lib/dbwrap/dbwrap_open.c +++ b/source3/lib/dbwrap/dbwrap_open.c @@ -34,10 +34,6 @@ bool db_is_local(const char *name) #ifdef CLUSTER_SUPPORT const char *sockname = lp_ctdbd_socket(); - if(!sockname || !*sockname) { - sockname = CTDB_PATH; - } - if (lp_clustering() && socket_exist(sockname)) { const char *partname; /* ctdb only wants the file part of the name */ @@ -83,10 +79,6 @@ struct db_context *db_open(TALLOC_CTX *mem_ctx, #ifdef CLUSTER_SUPPORT sockname = lp_ctdbd_socket(); - if(!sockname || !*sockname) { - sockname = CTDB_PATH; - } - if (lp_clustering()) { const char *partname; -- cgit