summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2011-07-04 16:21:26 +0200
committerMichael Adam <obnox@samba.org>2011-07-04 20:02:09 +0200
commitf36ee63df28a2c49e8661a28237b97fe60f872c4 (patch)
tree9f04625f3fc96ec9054658490406e8e346c2bb0e
parent1621aab139f0104cb2c7183c28c52cb6605abb09 (diff)
downloadsamba-f36ee63df28a2c49e8661a28237b97fe60f872c4.tar.gz
samba-f36ee63df28a2c49e8661a28237b97fe60f872c4.tar.bz2
samba-f36ee63df28a2c49e8661a28237b97fe60f872c4.zip
s3:registry: add db_context argument to regdb_upgrade_v1_to_v2()
-rw-r--r--source3/registry/reg_backend_db.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/source3/registry/reg_backend_db.c b/source3/registry/reg_backend_db.c
index e87ae649ce..e103868590 100644
--- a/source3/registry/reg_backend_db.c
+++ b/source3/registry/reg_backend_db.c
@@ -429,7 +429,7 @@ static WERROR regdb_store_regdb_version(struct db_context *db, uint32_t version)
}
}
-static WERROR regdb_upgrade_v1_to_v2(void)
+static WERROR regdb_upgrade_v1_to_v2(struct db_context *db)
{
TALLOC_CTX *mem_ctx;
int rc;
@@ -440,7 +440,7 @@ static WERROR regdb_upgrade_v1_to_v2(void)
return WERR_NOMEM;
}
- rc = regdb->traverse(regdb, regdb_normalize_keynames_fn, mem_ctx);
+ rc = regdb->traverse(db, regdb_normalize_keynames_fn, mem_ctx);
talloc_destroy(mem_ctx);
@@ -448,7 +448,7 @@ static WERROR regdb_upgrade_v1_to_v2(void)
return WERR_REG_IO_FAILURE;
}
- werr = regdb_store_regdb_version(regdb, REGVER_V2);
+ werr = regdb_store_regdb_version(db, REGVER_V2);
return werr;
}
@@ -515,7 +515,7 @@ WERROR regdb_init(void)
DEBUG(10, ("regdb_init: got registry db version %d, upgrading "
"to version %d\n", REGVER_V1, REGVER_V2));
- werr = regdb_upgrade_v1_to_v2();
+ werr = regdb_upgrade_v1_to_v2(regdb);
if (!W_ERROR_IS_OK(werr)) {
regdb->transaction_cancel(regdb);
return werr;