diff options
| -rw-r--r-- | ctdb/common/version.c | 20 | ||||
| -rw-r--r-- | ctdb/common/version.h | 18 | ||||
| -rw-r--r-- | ctdb/server/ctdb_daemon.c | 4 | ||||
| -rw-r--r-- | ctdb/tools/ctdb.c | 4 | ||||
| -rw-r--r-- | ctdb/wscript | 2 |
5 files changed, 43 insertions, 5 deletions
diff --git a/ctdb/common/version.c b/ctdb/common/version.c new file mode 100644 index 00000000000..e34e98c09ef --- /dev/null +++ b/ctdb/common/version.c @@ -0,0 +1,20 @@ +/* + CTDB version string + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, see <http://www.gnu.org/licenses/>. +*/ + +#include "ctdb_version.h" + +const char ctdb_version_string[] = CTDB_VERSION_STRING; diff --git a/ctdb/common/version.h b/ctdb/common/version.h new file mode 100644 index 00000000000..1cf1c5d0cab --- /dev/null +++ b/ctdb/common/version.h @@ -0,0 +1,18 @@ +/* + CTDB version string + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, see <http://www.gnu.org/licenses/>. +*/ + +extern const char ctdb_version_string[]; 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 */ diff --git a/ctdb/tools/ctdb.c b/ctdb/tools/ctdb.c index f8f9a18fa7e..a135da2a8b8 100644 --- a/ctdb/tools/ctdb.c +++ b/ctdb/tools/ctdb.c @@ -30,7 +30,7 @@ #include <tevent.h> #include <tdb.h> -#include "ctdb_version.h" +#include "common/version.h" #include "lib/util/debug.h" #include "lib/util/samba_util.h" #include "lib/util/sys_rw.h" @@ -725,7 +725,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", ctdb_version_string); return 0; } diff --git a/ctdb/wscript b/ctdb/wscript index 2679c56db30..0523bde5449 100644 --- a/ctdb/wscript +++ b/ctdb/wscript @@ -386,7 +386,7 @@ def build(bld): logging.c rb_tree.c tunable.c pidfile.c run_proc.c hash_count.c run_event.c - sock_client.c'''), + sock_client.c version.c'''), deps='''samba-util sys_rw tevent-util replace talloc tevent tdb''') |