diff options
| author | Günther Deschner <gd@samba.org> | 2013-09-04 16:45:32 +0200 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2013-09-18 10:41:23 +0200 |
| commit | db63abdf9ae30cb98169ddb9551315b82204942e (patch) | |
| tree | 4587a5cc3413ad63b3be8763fa1230b624cddcbc | |
| parent | dd312ac3ee5dad7b0b992bdb0123bbb99a110d12 (diff) | |
| download | samba-db63abdf9ae30cb98169ddb9551315b82204942e.tar.gz | |
s3-sessionid: make sure to call sessionid_init() also from the cmdline tools.
Guenther
Signed-off-by: Günther Deschner <gd@samba.org>
(cherry picked from commit 039171a9d1fc72de39ee8aa51830a37221988859)
| -rw-r--r-- | source3/utils/net_serverid.c | 5 | ||||
| -rw-r--r-- | source3/utils/net_status.c | 6 | ||||
| -rw-r--r-- | source3/utils/status.c | 6 |
3 files changed, 17 insertions, 0 deletions
diff --git a/source3/utils/net_serverid.c b/source3/utils/net_serverid.c index 08a1a7f298b..01109b9ffad 100644 --- a/source3/utils/net_serverid.c +++ b/source3/utils/net_serverid.c @@ -150,5 +150,10 @@ int net_serverid(struct net_context *c, int argc, const char **argv) {NULL, NULL, 0, NULL, NULL} }; + if (!sessionid_init()) { + d_printf("failed to open sessionid.tdb\n"); + return -1; + }; + return net_run_function(c, argc, argv, "net serverid", func); } diff --git a/source3/utils/net_status.c b/source3/utils/net_status.c index d6027433a29..39e2d205e2e 100644 --- a/source3/utils/net_status.c +++ b/source3/utils/net_status.c @@ -239,5 +239,11 @@ int net_status(struct net_context *c, int argc, const char **argv) }, {NULL, NULL, 0, NULL, NULL} }; + + if (!sessionid_init()) { + d_printf("failed to open sessionid.tdb\n"); + return -1; + } + return net_run_function(c, argc, argv, "net status", func); } diff --git a/source3/utils/status.c b/source3/utils/status.c index cf625fb73fa..34a7730994c 100644 --- a/source3/utils/status.c +++ b/source3/utils/status.c @@ -378,6 +378,12 @@ static int traverse_sessionid(const char *key, struct sessionid *session, } + if (!sessionid_init()) { + fprintf(stderr, "Can't open sessionid.tdb\n"); + ret = -1; + goto done; + } + if (lp_clustering()) { /* * This implicitly initializes the global ctdbd |