diff options
| author | Michael Adam <obnox@samba.org> | 2011-08-24 01:12:28 +0200 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2011-08-25 23:55:06 +0200 |
| commit | b4cb969e4099ee35f184cfaa82d6048b28228be8 (patch) | |
| tree | 619576b033b6ba5a518bd736d0d60e91905e981c /source3/registry | |
| parent | b1a94b66cc25153be3a8db1d640b4b760219a04b (diff) | |
| download | samba-b4cb969e4099ee35f184cfaa82d6048b28228be8.tar.gz samba-b4cb969e4099ee35f184cfaa82d6048b28228be8.tar.bz2 samba-b4cb969e4099ee35f184cfaa82d6048b28228be8.zip | |
s3:registry: define a constant REGDB_VERSION_KEYNAME for the key INFO/version (and use it)
Diffstat (limited to 'source3/registry')
| -rw-r--r-- | source3/registry/reg_backend_db.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/source3/registry/reg_backend_db.c b/source3/registry/reg_backend_db.c index 7c4cca117f..2a52042079 100644 --- a/source3/registry/reg_backend_db.c +++ b/source3/registry/reg_backend_db.c @@ -37,6 +37,8 @@ #undef DBGC_CLASS #define DBGC_CLASS DBGC_REGISTRY +#define REGDB_VERSION_KEYNAME "INFO/version" + static struct db_context *regdb = NULL; static int regdb_refcount; @@ -416,20 +418,18 @@ static int regdb_normalize_keynames_fn(struct db_record *rec, static WERROR regdb_store_regdb_version(struct db_context *db, uint32_t version) { NTSTATUS status; - const char *version_keyname = "INFO/version"; - if (db == NULL) { return WERR_CAN_NOT_COMPLETE; } - status = dbwrap_trans_store_int32(db, version_keyname, version); + status = dbwrap_trans_store_int32(db, REGDB_VERSION_KEYNAME, version); if (!NT_STATUS_IS_OK(status)) { DEBUG(1, ("regdb_store_regdb_version: error storing %s = %d: %s\n", - version_keyname, version, nt_errstr(status))); + REGDB_VERSION_KEYNAME, version, nt_errstr(status))); return ntstatus_to_werror(status); } else { DEBUG(10, ("regdb_store_regdb_version: stored %s = %d\n", - version_keyname, version)); + REGDB_VERSION_KEYNAME, version)); return WERR_OK; } } @@ -561,7 +561,6 @@ done: WERROR regdb_init(void) { - const char *vstring = "INFO/version"; uint32 vers_id, expected_version; WERROR werr; @@ -593,7 +592,7 @@ WERROR regdb_init(void) expected_version = REGVER_V3; - vers_id = dbwrap_fetch_int32(regdb, vstring); + vers_id = dbwrap_fetch_int32(regdb, REGDB_VERSION_KEYNAME); if (vers_id == -1) { DEBUG(10, ("regdb_init: registry version uninitialized " "(got %d), initializing to version %d\n", |