tdb_compat: use tdb_firstkey_compat/tdb_nextkey_compat everywhere.

Note that tdb_nextkey_compat frees the old key for us.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>

diff --git a/source3/printing/nt_printing_migrate.c b/source3/printing/nt_printing_migrate.c
index f6c4ef2d8b680cc1b1c3c0485d24e31faf57a574..ec66dfe8162f7bf2d1edde631e0bd2fd2dc28b5f 100644 (file)
--- a/source3/printing/nt_printing_migrate.c
+++ b/source3/printing/nt_printing_migrate.c
@@ -532,7 +532,7 @@ static NTSTATUS migrate_internal(TALLOC_CTX *mem_ctx,
                                 struct rpc_pipe_client *pipe_hnd)
 {
        const char *backup_suffix = ".bak";
-       TDB_DATA kbuf, newkey, dbuf;
+       TDB_DATA kbuf, dbuf;
        TDB_CONTEXT *tdb;
        NTSTATUS status;
        int rc;
@@ -549,9 +549,9 @@ static NTSTATUS migrate_internal(TALLOC_CTX *mem_ctx,
                return NT_STATUS_NO_SUCH_FILE;
        }
 
-       for (kbuf = tdb_firstkey(tdb);
+       for (kbuf = tdb_firstkey_compat(tdb);
             kbuf.dptr;
-            newkey = tdb_nextkey(tdb, kbuf), free(kbuf.dptr), kbuf = newkey)
+            kbuf = tdb_nextkey_compat(tdb, kbuf))
        {
                dbuf = tdb_fetch_compat(tdb, kbuf);
                if (!dbuf.dptr) {

diff --git a/source3/printing/nt_printing_tdb.c b/source3/printing/nt_printing_tdb.c
index 1361f4b3b36a4e32acfded3d1c5d603dc333d883..e703fee678fd1146b79d4cdc0c2e61f1a977b6e9 100644 (file)
--- a/source3/printing/nt_printing_tdb.c
+++ b/source3/printing/nt_printing_tdb.c
@@ -88,12 +88,12 @@ static TDB_DATA make_printers_secdesc_tdbkey(TALLOC_CTX *ctx,
 
 static bool upgrade_to_version_3(void)
 {
-       TDB_DATA kbuf, newkey, dbuf;
+       TDB_DATA kbuf, dbuf;
 
        DEBUG(0,("upgrade_to_version_3: upgrading print tdb's to version 3\n"));
 
-       for (kbuf = tdb_firstkey(tdb_drivers); kbuf.dptr;
-                       newkey = tdb_nextkey(tdb_drivers, kbuf), free(kbuf.dptr), kbuf=newkey) {
+       for (kbuf = tdb_firstkey_compat(tdb_drivers); kbuf.dptr;
+                       kbuf = tdb_nextkey_compat(tdb_drivers, kbuf)) {
 
                dbuf = tdb_fetch_compat(tdb_drivers, kbuf);
 

diff --git a/source3/utils/net_printing.c b/source3/utils/net_printing.c
index bfab0dc995ad9f5dde46cac1fc30bffdcae69d6e..2f8caad8fda75de3c9de9a44b6d49783d3dc6207 100644 (file)
--- a/source3/utils/net_printing.c
+++ b/source3/utils/net_printing.c
@@ -162,7 +162,7 @@ static int net_printing_dump(struct net_context *c, int argc,
        int ret = -1;
        TALLOC_CTX *ctx = talloc_stackframe();
        TDB_CONTEXT *tdb;
-       TDB_DATA kbuf, newkey, dbuf;
+       TDB_DATA kbuf, dbuf;
 
        if (argc < 1 || c->display_usage) {
                d_fprintf(stderr, "%s\nnet printing dump <file.tdb>\n",
@@ -176,9 +176,9 @@ static int net_printing_dump(struct net_context *c, int argc,
                goto done;
        }
 
-       for (kbuf = tdb_firstkey(tdb);
+       for (kbuf = tdb_firstkey_compat(tdb);
             kbuf.dptr;
-            newkey = tdb_nextkey(tdb, kbuf), free(kbuf.dptr), kbuf=newkey)
+            kbuf = tdb_nextkey_compat(tdb, kbuf))
        {
                dbuf = tdb_fetch_compat(tdb, kbuf);
                if (!dbuf.dptr) {
@@ -637,7 +637,7 @@ static NTSTATUS printing_migrate_internal(struct net_context *c,
 {
        TALLOC_CTX *tmp_ctx;
        TDB_CONTEXT *tdb;
-       TDB_DATA kbuf, newkey, dbuf;
+       TDB_DATA kbuf, dbuf;
        NTSTATUS status;
 
        tmp_ctx = talloc_new(mem_ctx);
@@ -652,9 +652,9 @@ static NTSTATUS printing_migrate_internal(struct net_context *c,
                goto done;
        }
 
-       for (kbuf = tdb_firstkey(tdb);
+       for (kbuf = tdb_firstkey_compat(tdb);
             kbuf.dptr;
-            newkey = tdb_nextkey(tdb, kbuf), free(kbuf.dptr), kbuf = newkey)
+            kbuf = tdb_nextkey_compat(tdb, kbuf))
        {
                dbuf = tdb_fetch_compat(tdb, kbuf);
                if (!dbuf.dptr) {