summaryrefslogtreecommitdiff
path: root/ctdb/tools
diff options
context:
space:
mode:
authorAmitay Isaacs <amitay@samba.org>2019-03-15 12:14:27 +1100
committerAmitay Isaacs <amitay@samba.org>2019-03-15 06:31:50 +0000
commitedd4a23d7632af51f4d7b4287917b7fa0dced963 (patch)
treee171ff22f7840cec275813be06aedb2f7e709402 /ctdb/tools
parent148306674d0e4706adca3e5dcbb779c51a2c03da (diff)
downloadsamba-edd4a23d7632af51f4d7b4287917b7fa0dced963.tar.gz
ctdb-version: Simplify version string usage
There is no need to write SAMBA_VERSION_STRING as CTDB_VERSION_STRING. Wherever required use SAMBA_VERSION_STRING directly. Avoids the confusion with two version.h files. BUG: https://bugzilla.samba.org/show_bug.cgi?id=13789 Signed-off-by: Amitay Isaacs <amitay@samba.org> Reviewed-by: Martin Schwenke <martin@meltin.net> Autobuild-User(master): Amitay Isaacs <amitay@samba.org> Autobuild-Date(master): Fri Mar 15 06:31:50 UTC 2019 on sn-devel-144
Diffstat (limited to 'ctdb/tools')
-rw-r--r--ctdb/tools/ctdb.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ctdb/tools/ctdb.c b/ctdb/tools/ctdb.c
index 8140d7337c5..6b82bf779a9 100644
--- a/ctdb/tools/ctdb.c
+++ b/ctdb/tools/ctdb.c
@@ -30,7 +30,7 @@
#include <tevent.h>
#include <tdb.h>
-#include "common/version.h"
+#include "version.h"
#include "lib/util/debug.h"
#include "lib/util/samba_util.h"
#include "lib/util/sys_rw.h"
@@ -723,7 +723,7 @@ static int run_helper(TALLOC_CTX *mem_ctx, const char *command,
static int control_version(TALLOC_CTX *mem_ctx, struct ctdb_context *ctdb,
int argc, const char **argv)
{
- printf("%s\n", ctdb_version_string);
+ printf("%s\n", SAMBA_VERSION_STRING);
return 0;
}