summaryrefslogtreecommitdiff
path: root/ctdb/server
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2017-09-21 11:51:09 -0700
committerVolker Lendecke <vl@samba.org>2017-09-26 09:37:13 +0200
commite12ed08bd5c94f287acf0938a19a3d314624016a (patch)
treee3fb34c2a368bc8799fb1eb4aa2c037735c8ebc5 /ctdb/server
parenta919ded138a40008ac960525a753e55da3704af7 (diff)
downloadsamba-e12ed08bd5c94f287acf0938a19a3d314624016a.tar.gz
ctdb: Centralize ctdb_version_string
Whenever the current git hash changes, we recompile ctdb.c and ctdb_daemon.c. As both have quite a few warnings with -Wall, this makes it quite difficult to see the real warnings that pop up during development. Centralize the ctdb_version_string to just a single file without warnings. Signed-off-by: Volker Lendecke <vl@samba.org> Reviewed-by: Amitay Isaacs <amitay@gmail.com>
Diffstat (limited to 'ctdb/server')
-rw-r--r--ctdb/server/ctdb_daemon.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ctdb/server/ctdb_daemon.c b/ctdb/server/ctdb_daemon.c
index dda09655e7f..185982e65bd 100644
--- a/ctdb/server/ctdb_daemon.c
+++ b/ctdb/server/ctdb_daemon.c
@@ -36,7 +36,7 @@
#include "lib/util/blocking.h"
#include "lib/util/become_daemon.h"
-#include "ctdb_version.h"
+#include "common/version.h"
#include "ctdb_private.h"
#include "ctdb_client.h"
@@ -1206,7 +1206,7 @@ int ctdb_start_daemon(struct ctdb_context *ctdb, bool do_fork)
ctdb->ctdbd_pid = getpid();
DEBUG(DEBUG_ERR, ("Starting CTDBD (Version %s) as PID: %u\n",
- CTDB_VERSION_STRING, ctdb->ctdbd_pid));
+ ctdb_version_string, ctdb->ctdbd_pid));
ctdb_create_pidfile(ctdb);
/* create a unix domain stream socket to listen to */