diff options
author | Jeremy Allison <jra@samba.org> | 2002-01-09 05:24:05 +0000 |
---|---|---|
committer | Jeremy Allison <jra@samba.org> | 2002-01-09 05:24:05 +0000 |
commit | 5a9f923b40721b68ddaeed21741dbf28e4f70a99 (patch) | |
tree | 7fe60fb64d406f82be7985f203b643dcb8c95a5b /source/rpc_server/srv_srvsvc_nt.c | |
parent | 48200676310fcbd7de171407c4d9d17db0376af7 (diff) | |
download | samba-5a9f923b40721b68ddaeed21741dbf28e4f70a99.tar.gz samba-5a9f923b40721b68ddaeed21741dbf28e4f70a99.tar.xz samba-5a9f923b40721b68ddaeed21741dbf28e4f70a99.zip |
When re-writing tdb version numbers as little endian int32, we must
change the version number also.
Jeremy.
Diffstat (limited to 'source/rpc_server/srv_srvsvc_nt.c')
-rw-r--r-- | source/rpc_server/srv_srvsvc_nt.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/source/rpc_server/srv_srvsvc_nt.c b/source/rpc_server/srv_srvsvc_nt.c index 7e28d61f47d..d1fa83ce437 100644 --- a/source/rpc_server/srv_srvsvc_nt.c +++ b/source/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); |