diff options
| author | Günther Deschner <gd@samba.org> | 2013-09-04 16:55:11 +0200 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2013-09-06 11:22:34 +0200 |
| commit | d1352013bb694a30480282e398e29238470b0768 (patch) | |
| tree | 2fa88be430edbdcdafd29ff6016b69bcfca04c87 | |
| parent | 039171a9d1fc72de39ee8aa51830a37221988859 (diff) | |
| download | samba-d1352013bb694a30480282e398e29238470b0768.tar.gz | |
s3-sessionid: change session_db_ctx() to always return the session_id_ctx pointer.
Guenther
Signed-off-by: Günther Deschner <gd@samba.org>
| -rw-r--r-- | source3/lib/sessionid_tdb.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/source3/lib/sessionid_tdb.c b/source3/lib/sessionid_tdb.c index de3ccab26ae..6bd39c4ef96 100644 --- a/source3/lib/sessionid_tdb.c +++ b/source3/lib/sessionid_tdb.c @@ -23,14 +23,15 @@ #include "session.h" #include "util_tdb.h" +static struct db_context *session_db_ctx_ptr = NULL; + static struct db_context *session_db_ctx(void) { - static struct db_context *session_db_ctx_ptr; - - if (session_db_ctx_ptr != NULL) { - return session_db_ctx_ptr; - } + return session_db_ctx_ptr; +} +static struct db_context *session_db_ctx_init(void) +{ session_db_ctx_ptr = db_open(NULL, lock_path("sessionid.tdb"), 0, TDB_CLEAR_IF_FIRST|TDB_DEFAULT|TDB_INCOMPATIBLE_HASH, O_RDWR | O_CREAT, 0644); @@ -39,7 +40,7 @@ static struct db_context *session_db_ctx(void) bool sessionid_init(void) { - if (session_db_ctx() == NULL) { + if (session_db_ctx_init() == NULL) { DEBUG(1,("session_init: failed to open sessionid tdb\n")); return False; } |