From: Amitay Isaacs <amitay@gmail.com>
Date: Thu, 2 Mar 2017 03:52:00 +0000 (+1100)
Subject: ctdb-daemon: Store tdb flags just after tdb is opened in ctdb_local_attach()
X-Git-Tag: tdb-1.3.14~181
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f5e53f60b8af0239070e6e43c10d289c7a5ca174;p=thirdparty%2Fsamba.git

ctdb-daemon: Store tdb flags just after tdb is opened in ctdb_local_attach()

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>
---

diff --git a/ctdb/server/ctdb_ltdb_server.c b/ctdb/server/ctdb_ltdb_server.c
index 8a364fe4894..6ae92f52a97 100644
--- a/ctdb/server/ctdb_ltdb_server.c
+++ b/ctdb/server/ctdb_ltdb_server.c
@@ -960,6 +960,10 @@ again:
 		}
 	}
 
+	/* remember the flags the client has specified */
+	tdb_add_flags(ctdb_db->ltdb->tdb, tdb_flags);
+
+
 	/* set up a rb tree we can use to track which records we have a 
 	   fetch-lock in-flight for so we can defer any additional calls
 	   for the same record.
@@ -1214,9 +1218,6 @@ int32_t ctdb_control_db_attach(struct ctdb_context *ctdb, TDB_DATA indata,
 		return -1;
 	}
 
-	/* remember the flags the client has specified */
-	tdb_add_flags(db->ltdb->tdb, tdb_flags);
-
 	outdata->dptr  = (uint8_t *)&db->db_id;
 	outdata->dsize = sizeof(db->db_id);