diff options
| author | Jeremy Allison <jra@samba.org> | 2002-01-09 04:13:30 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2002-01-09 04:13:30 +0000 |
| commit | 91536cc901088232074ad8dd7ae16e0f6026f25e (patch) | |
| tree | f0d2539b3503ed58ea6830d2b85c424849b98bf5 /source3/groupdb/mapping.c | |
| parent | 0a3f6b9b489fda547650083252906a881740af2b (diff) | |
| download | samba-91536cc901088232074ad8dd7ae16e0f6026f25e.tar.gz samba-91536cc901088232074ad8dd7ae16e0f6026f25e.tar.bz2 samba-91536cc901088232074ad8dd7ae16e0f6026f25e.zip | |
Fixed all uses of tdb_fetch/store/_int to use explicit int32 little endian
in tdb's. All except winbindd_idmap.... Hmmmmmm.
Jeremy.
(This used to be commit ec71f1732b6b27bd2d65b250a6f3720a235dc38d)
Diffstat (limited to 'source3/groupdb/mapping.c')
| -rw-r--r-- | source3/groupdb/mapping.c | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/source3/groupdb/mapping.c b/source3/groupdb/mapping.c index 7b44596256..7093f14eca 100644 --- a/source3/groupdb/mapping.c +++ b/source3/groupdb/mapping.c @@ -142,14 +142,17 @@ char *decode_sid_name_use(fstring group, enum SID_NAME_USE name_use) } /**************************************************************************** -open the group mapping tdb + Open the group mapping tdb. ****************************************************************************/ + BOOL init_group_mapping(void) { static pid_t local_pid; char *vstring = "INFO/version"; - - if (tdb && local_pid == sys_getpid()) return True; + int32 vers_id; + + if (tdb && local_pid == sys_getpid()) + return True; tdb = tdb_open_log(lock_path("group_mapping.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600); if (!tdb) { DEBUG(0,("Failed to open group mapping database\n")); @@ -160,10 +163,20 @@ BOOL init_group_mapping(void) /* handle a Samba upgrade */ tdb_lock_bystring(tdb, vstring); - if (tdb_fetch_int(tdb, vstring) != DATABASE_VERSION) { + + /* Cope with byte-reversed older versions of the db. */ + vers_id = tdb_fetch_int32(tdb, vstring); + if ((vers_id != DATABASE_VERSION) && (IREV(vers_id) == DATABASE_VERSION)) { + /* Written on a bigendian machine with old fetch_int code. Save as le. */ + tdb_store_int32(tdb, vstring, DATABASE_VERSION); + vers_id = DATABASE_VERSION; + } + + if (vers_id != DATABASE_VERSION) { tdb_traverse(tdb, tdb_traverse_delete_fn, NULL); - tdb_store_int(tdb, vstring, DATABASE_VERSION); + tdb_store_int32(tdb, vstring, DATABASE_VERSION); } + tdb_unlock_bystring(tdb, vstring); /* write a list of default groups */ |