diff options
| author | Jim McDonough <jmcd@samba.org> | 2004-02-12 16:11:43 +0000 |
|---|---|---|
| committer | Jim McDonough <jmcd@samba.org> | 2004-02-12 16:11:43 +0000 |
| commit | 8733c1b8d392c4f60a1f419a60d3a68fb01db0ee (patch) | |
| tree | 868cb7a4807d00e487cc7f800e9df54bc265732d | |
| parent | 595bec7bc9bb469d1209368aa5c04713fc9f4b6f (diff) | |
| download | samba-8733c1b8d392c4f60a1f419a60d3a68fb01db0ee.tar.gz samba-8733c1b8d392c4f60a1f419a60d3a68fb01db0ee.tar.bz2 samba-8733c1b8d392c4f60a1f419a60d3a68fb01db0ee.zip | |
A couple of versioning adjustments. Remove unused version #define, and
define the INFO/version string in _only_ one place.
(This used to be commit 02181f77897d87989341e3f18dbf0cc3e9c22991)
| -rw-r--r-- | source3/passdb/pdb_tdb.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source3/passdb/pdb_tdb.c b/source3/passdb/pdb_tdb.c index d9d946ffc8..2460c97a1b 100644 --- a/source3/passdb/pdb_tdb.c +++ b/source3/passdb/pdb_tdb.c @@ -38,7 +38,7 @@ static int tdbsam_debug_level = DBGC_ALL; #endif #define TDBSAM_VERSION 1 /* Most recent TDBSAM version */ -#define PDB_VERSION "20010830" +#define TDBSAM_VERSION_STRING "INFO/version" #define PASSDB_FILE_NAME "passdb.tdb" #define USERPREFIX "USER_" #define RIDPREFIX "RID_" @@ -68,7 +68,7 @@ static struct pwent_list *tdbsam_pwent_list; static BOOL tdbsam_convert(TDB_CONTEXT *pdb_tdb, tdbsamver_t from) { - const char * vstring = "INFO/version"; + const char * vstring = TDBSAM_VERSION_STRING; SAM_ACCOUNT *user = NULL; const char *prefix = USERPREFIX; TDB_DATA data, key, old_key; @@ -187,7 +187,8 @@ static TDB_CONTEXT * tdbsam_tdbopen (const char *name, int open_flags) return NULL; /* Check the version */ - version = (tdbsamver_t) tdb_fetch_int32(pdb_tdb, "INFO/version"); + version = (tdbsamver_t) tdb_fetch_int32(pdb_tdb, + TDBSAM_VERSION_STRING); if (version == -1) version = 0; /* Version not found, assume version 0 */ |