diff options
| author | David Disseldorp <ddiss@samba.org> | 2014-11-02 20:21:42 +0100 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2014-11-03 23:46:05 +0100 |
| commit | d6792eca3c8cc4356d1e3a64161c8a0e5f8ff9d4 (patch) | |
| tree | 9f4fd1629bb0c0b3fdee34176ec15fc25a8a2f14 /source3/lib/serverid.c | |
| parent | 76fe51cea27ac29c5de237850795be7122ffdc12 (diff) | |
| download | samba-d6792eca3c8cc4356d1e3a64161c8a0e5f8ff9d4.tar.gz samba-d6792eca3c8cc4356d1e3a64161c8a0e5f8ff9d4.tar.xz samba-d6792eca3c8cc4356d1e3a64161c8a0e5f8ff9d4.zip | |
serverid: don't leak lock_path onto talloc tos
Also check for allocation failures.
Signed-off-by: David Disseldorp <ddiss@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Diffstat (limited to 'source3/lib/serverid.c')
| -rw-r--r-- | source3/lib/serverid.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/source3/lib/serverid.c b/source3/lib/serverid.c index ee479b4e68..f5e0937224 100644 --- a/source3/lib/serverid.c +++ b/source3/lib/serverid.c @@ -42,14 +42,22 @@ struct serverid_data { static struct db_context *serverid_db(void) { static struct db_context *db; + char *db_path; if (db != NULL) { return db; } - db = db_open(NULL, lock_path("serverid.tdb"), 0, + + db_path = lock_path("serverid.tdb"); + if (db_path == NULL) { + return NULL; + } + + db = db_open(NULL, db_path, 0, TDB_DEFAULT|TDB_CLEAR_IF_FIRST|TDB_INCOMPATIBLE_HASH, O_RDWR|O_CREAT, 0644, DBWRAP_LOCK_ORDER_2, DBWRAP_FLAG_NONE); + TALLOC_FREE(db_path); return db; } |