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/printing/nt_printing.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/printing/nt_printing.c')
-rw-r--r-- | source3/printing/nt_printing.c | 28 |
1 files changed, 20 insertions, 8 deletions
diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c index b49767eac7..6c0e4c83e7 100644 --- a/source3/printing/nt_printing.c +++ b/source3/printing/nt_printing.c @@ -262,15 +262,27 @@ BOOL nt_printing_init(void) /* handle a Samba upgrade */ tdb_lock_bystring(tdb_drivers, vstring); - if (tdb_fetch_int(tdb_drivers, vstring) != NTDRIVERS_DATABASE_VERSION) { - - if (tdb_fetch_int(tdb_drivers, vstring) == NTDRIVERS_DATABASE_VERSION_1) { - if (!upgrade_to_version_2()) - return False; - } else - tdb_traverse(tdb_drivers, tdb_traverse_delete_fn, NULL); + { + int32 vers_id; + + /* Cope with byte-reversed older versions of the db. */ + vers_id = tdb_fetch_int32(tdb_drivers, vstring); + if ((vers_id != NTDRIVERS_DATABASE_VERSION) && (IREV(vers_id) == NTDRIVERS_DATABASE_VERSION)) { + /* Written on a bigendian machine with old fetch_int code. Save as le. */ + tdb_store_int32(tdb_drivers, vstring, NTDRIVERS_DATABASE_VERSION); + vers_id = NTDRIVERS_DATABASE_VERSION; + } + + if (vers_id != NTDRIVERS_DATABASE_VERSION) { - tdb_store_int(tdb_drivers, vstring, NTDRIVERS_DATABASE_VERSION); + if ((vers_id == NTDRIVERS_DATABASE_VERSION_1) || (IREV(vers_id) == NTDRIVERS_DATABASE_VERSION_1)) { + if (!upgrade_to_version_2()) + return False; + } else + tdb_traverse(tdb_drivers, tdb_traverse_delete_fn, NULL); + + tdb_store_int32(tdb_drivers, vstring, NTDRIVERS_DATABASE_VERSION); + } } tdb_unlock_bystring(tdb_drivers, vstring); |