method tag should be unsigned long.

connection assert should use s, not i.

diff --git a/servers/slapd/bind.c b/servers/slapd/bind.c
index 778471118278005e13599982e1b837367e2baaeb..0e1d4d0576813697edc5221ccb42518c66b39f92 100644 (file)
--- a/servers/slapd/bind.c
+++ b/servers/slapd/bind.c
@@ -28,7 +28,8 @@ do_bind(
 )
 {
        BerElement      *ber = op->o_ber;
-       int             version, method;
+       int             version;
+       unsigned long method;
        char            *cdn, *ndn;
        unsigned long   rc;
        struct berval   cred;

diff --git a/servers/slapd/connection.c b/servers/slapd/connection.c
index fd75a314f6a167750287592f13ba7fb3ca9141b9..f6c756cb7674090178156d06a677c58041620ad5 100644 (file)
--- a/servers/slapd/connection.c
+++ b/servers/slapd/connection.c
@@ -153,7 +153,7 @@ static Connection* connection_get( int s )
 #ifndef HAVE_WINSOCK
        assert( connections[s].c_struct_state == SLAP_C_USED );
        assert( connections[s].c_conn_state != SLAP_C_INVALID );
-       assert( !ber_pvt_sb_in_use( connections[i].c_sb ) );
+       assert( ber_pvt_sb_in_use( connections[s].c_sb ) );
 
        c = &connections[s];
 #else