diff options
| author | Jeremy Allison <jra@samba.org> | 2002-01-09 05:24:07 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2002-01-09 05:24:07 +0000 |
| commit | a842a3d4582b556c77fcfb593af193b4d1225751 (patch) | |
| tree | 564c3fd0f43329b651efb03b6f24a485b36cbc14 /source3/rpc_server | |
| parent | abc6e70ca4824f7d7df5f4f68da4686018f9723c (diff) | |
| download | samba-a842a3d4582b556c77fcfb593af193b4d1225751.tar.gz samba-a842a3d4582b556c77fcfb593af193b4d1225751.tar.bz2 samba-a842a3d4582b556c77fcfb593af193b4d1225751.zip | |
When re-writing tdb version numbers as little endian int32, we must
change the version number also.
Jeremy.
(This used to be commit 3dec9cf99a82bd15626eb99e7d937ff00183cc05)
Diffstat (limited to 'source3/rpc_server')
| -rw-r--r-- | source3/rpc_server/srv_srvsvc_nt.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/source3/rpc_server/srv_srvsvc_nt.c b/source3/rpc_server/srv_srvsvc_nt.c index 57013829c5..67442a7761 100644 --- a/source3/rpc_server/srv_srvsvc_nt.c +++ b/source3/rpc_server/srv_srvsvc_nt.c @@ -116,7 +116,8 @@ static void smb_conf_updated(int msg_type, pid_t src, void *buf, size_t len) ********************************************************************/ static TDB_CONTEXT *share_tdb; /* used for share security descriptors */ -#define SHARE_DATABASE_VERSION 1 +#define SHARE_DATABASE_VERSION_V1 1 +#define SHARE_DATABASE_VERSION_V2 2 /* version id in little endian. */ BOOL share_info_db_init(void) { @@ -140,15 +141,15 @@ BOOL share_info_db_init(void) /* Cope with byte-reversed older versions of the db. */ vers_id = tdb_fetch_int32(share_tdb, vstring); - if ((vers_id != SHARE_DATABASE_VERSION) && (IREV(vers_id) == SHARE_DATABASE_VERSION)) { + if ((vers_id == SHARE_DATABASE_VERSION_V1) || (IREV(vers_id) == SHARE_DATABASE_VERSION_V1)) { /* Written on a bigendian machine with old fetch_int code. Save as le. */ - tdb_store_int32(share_tdb, vstring, SHARE_DATABASE_VERSION); - vers_id = SHARE_DATABASE_VERSION; + tdb_store_int32(share_tdb, vstring, SHARE_DATABASE_VERSION_V2); + vers_id = SHARE_DATABASE_VERSION_V2; } - if (vers_id != SHARE_DATABASE_VERSION) { + if (vers_id != SHARE_DATABASE_VERSION_V2) { tdb_traverse(share_tdb, tdb_traverse_delete_fn, NULL); - tdb_store_int32(share_tdb, vstring, SHARE_DATABASE_VERSION); + tdb_store_int32(share_tdb, vstring, SHARE_DATABASE_VERSION_V2); } tdb_unlock_bystring(share_tdb, vstring); |