Fix idl_firstid to return NOID when !(nids > 1) instead of when (nids == 1)

[openldap] / servers / ldapd / bind.c

diff --git a/servers/ldapd/bind.c b/servers/ldapd/bind.c
index defcb19e0a0b9ab060cc95d143a0562c66c4aa07..1d83e1c060798ee25fa47450205f90134b0d87c3 100644 (file)
--- a/servers/ldapd/bind.c
+++ b/servers/ldapd/bind.c
@@ -15,6 +15,7 @@
 #include <stdio.h>
 
 #include <ac/socket.h>
+#include <ac/string.h>         /* get SAFEMEMCPY */
 
 #include <quipu/commonarg.h>
 #include <quipu/attrvalue.h>
@@ -27,7 +28,6 @@
 #include "common.h"
 
 #ifdef LDAP_COMPAT20
-extern int     ldap_compat;
 #define BINDTAG        (ldap_compat == 20 ? OLD_LDAP_RES_BIND : LDAP_RES_BIND)
 #else
 #define BINDTAG        LDAP_RES_BIND
@@ -52,9 +52,7 @@ do_bind(
        unsigned long   len;
        char            *dn, *pw;
        char            *matched;
-       struct PSAPaddr *addr, *psap_cpy();
-       extern char     *dsa_address;
-       extern int      version;
+       struct PSAPaddr *addr;
 
        Debug( LDAP_DEBUG_TRACE, "do_bind\n", 0, 0, 0 );
 
@@ -98,7 +96,7 @@ do_bind(
                return( 0 );
        }
 
-       Debug( LDAP_DEBUG_ARGS, "do_bind: version %d dn (%s) method %d\n",
+       Debug( LDAP_DEBUG_ARGS, "do_bind: version %d dn (%s) method %lu\n",
            version, dn, method );
 
        if ( m->m_conn->c_paddr == NULLPA ) {
@@ -146,8 +144,6 @@ do_bind_real(
 #ifdef HAVE_KERBEROS
        u_long                  nonce;
 #endif
-       extern DN               ldap_str2dn();
-
        Debug( LDAP_DEBUG_TRACE, "do_bind_real\n", 0, 0, 0 );
 
        *matched = NULL;