[PATCH 20/27] serverid: don't leak lock_path onto talloc tos

[David Disseldorp]

Also check for allocation failures.

Signed-off-by: David Disseldorp <ddiss at samba.org>
---
 source3/lib/serverid.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/source3/lib/serverid.c b/source3/lib/serverid.c
index ee479b4..f5e0937 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;
 }
 
-- 
1.8.4.5