From 01f7cd141d084b098be00768ed0c56c076a26f97 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Fri, 18 Sep 2009 18:27:16 +0200 Subject: [PATCH] s3:smbstatus: Fix bug 6703, allow smbstatus as non-root We only require a ctdb connection when clustering is enabled. This limits the restriction for only-root smbstatus to the clustering case. --- source3/utils/status.c | 24 +++++++++++++----------- 1 files changed, 13 insertions(+), 11 deletions(-) diff --git a/source3/utils/status.c b/source3/utils/status.c index cbf0dcb..6123a86 100644 --- a/source3/utils/status.c +++ b/source3/utils/status.c @@ -367,18 +367,20 @@ static int traverse_sessionid(struct db_record *db, void *state) goto done; } - /* - * This implicitly initializes the global ctdbd connection, usable by - * the db_open() calls further down. - */ - msg_ctx = messaging_init(NULL, procid_self(), - event_context_init(NULL)); - - if (msg_ctx == NULL) { - fprintf(stderr, "messaging_init failed\n"); - ret = -1; - goto done; + if (lp_clustering()) { + /* + * This implicitly initializes the global ctdbd + * connection, usable by the db_open() calls further + * down. + */ + msg_ctx = messaging_init(NULL, procid_self(), + event_context_init(NULL)); + if (msg_ctx == NULL) { + fprintf(stderr, "messaging_init failed\n"); + ret = -1; + goto done; + } } if (!lp_load(get_dyn_CONFIGFILE(),False,False,False,True)) { -- 1.6.2.1