From a49ac23a10bfe4098cb46b39d3152571a2562a38 Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vl@samba.org>
Date: Fri, 30 Mar 2012 15:37:33 +0200
Subject: s3: Return CTDB_PATH from lp_ctdbd_socket()

All callers had that fallback
---
 source3/param/loadparm.c | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

(limited to 'source3/param')

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index dbf47c0320..e781048d8e 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -78,6 +78,10 @@
 #include <cups/http.h>
 #endif
 
+#ifdef CLUSTER_SUPPORT
+#include "ctdb_private.h"
+#endif
+
 bool bLoaded = false;
 
 extern userdom_struct current_user_info;
@@ -5335,7 +5339,7 @@ int lp_cups_encrypt(void)
 }
 FN_GLOBAL_STRING(iprint_server, szIPrintServer)
 FN_GLOBAL_INTEGER(cups_connection_timeout, cups_connection_timeout)
-FN_GLOBAL_CONST_STRING(ctdbd_socket, ctdbdSocket)
+static FN_GLOBAL_CONST_STRING(_ctdbd_socket, ctdbdSocket)
 FN_GLOBAL_LIST(cluster_addresses, szClusterAddresses)
 FN_GLOBAL_BOOL(clustering, clustering)
 FN_GLOBAL_INTEGER(ctdb_timeout, ctdb_timeout)
@@ -9648,3 +9652,15 @@ int lp_server_role(void)
 				   lp_domain_logons(),
 				   lp_domain_master_true_or_auto());
 }
+
+const char *lp_ctdbd_socket(void)
+{
+	const char *result = lp__ctdbd_socket();
+
+#ifdef CLUSTER_SUPPORT
+	if ((result == NULL) || (*result == '\0')) {
+		return CTDB_PATH;
+	}
+#endif
+	return result;
+}
-- 
cgit