bdb_locker_id, bdb_locker_id_free: BerkeleyDB lock ids are u_int32_t, not int.

diff --git a/servers/slapd/back-bdb/cache.c b/servers/slapd/back-bdb/cache.c
index c898b7466c919be9aaef4104ef8c871ea8fb8061..d98ed21ecc7ca5db7a00a0a60ca8552078baf934 100644 (file)
--- a/servers/slapd/back-bdb/cache.c
+++ b/servers/slapd/back-bdb/cache.c
@@ -1318,15 +1318,15 @@ static void
 bdb_locker_id_free( void *key, void *data )
 {
        DB_ENV *env = key;
-       int lockid = (int) data;
+       u_int32_t lockid = (u_int32_t) data;
        int rc;
 
        rc = XLOCK_ID_FREE( env, lockid );
        if ( rc == EINVAL ) {
                DB_LOCKREQ lr;
                Debug( LDAP_DEBUG_ANY,
-                       "bdb_locker_id_free: %d err %s(%d)\n",
-                       lockid, db_strerror(rc), rc );
+                       "bdb_locker_id_free: %lu err %s(%d)\n",
+                       (unsigned long) lockid, db_strerror(rc), rc );
                /* release all locks held by this locker. */
                lr.op = DB_LOCK_PUT_ALL;
                lr.obj = NULL;
@@ -1336,9 +1336,10 @@ bdb_locker_id_free( void *key, void *data )
 }
 
 int
-bdb_locker_id( Operation *op, DB_ENV *env, int *locker )
+bdb_locker_id( Operation *op, DB_ENV *env, u_int32_t *locker )
 {
-       int i, rc, lockid;
+       int i, rc;
+       u_int32_t lockid;
        void *data;
        void *ctx;
 
@@ -1375,12 +1376,12 @@ bdb_locker_id( Operation *op, DB_ENV *env, int *locker )
                        return rc;
                }
        } else {
-               lockid = (int)data;
+               lockid = (u_int32_t) data;
        }
        *locker = lockid;
        return 0;
 }
-#endif
+#endif /* BDB_REUSE_LOCKERS */
 
 void
 bdb_cache_delete_entry(

diff --git a/servers/slapd/back-bdb/proto-bdb.h b/servers/slapd/back-bdb/proto-bdb.h
index 8a627c017be18e8e18f49dd32c7a300585cccac6..5955721f4ea4956476d61a987ba0c0fc6b538fc4 100644 (file)
--- a/servers/slapd/back-bdb/proto-bdb.h
+++ b/servers/slapd/back-bdb/proto-bdb.h
@@ -522,7 +522,7 @@ int bdb_cache_entry_db_unlock(
 #ifdef BDB_REUSE_LOCKERS
 
 #define bdb_locker_id                          BDB_SYMBOL(locker_id)
-int bdb_locker_id( Operation *op, DB_ENV *env, int *locker );
+int bdb_locker_id( Operation *op, DB_ENV *env, u_int32_t *locker );
 
 #define        LOCK_ID_FREE(env, locker)       ((void)0)
 #define        LOCK_ID(env, locker)    bdb_locker_id(op, env, locker)