Listener commit broke test048, skip listener check on Hidden DBs

[openldap] / servers / slurpd / ri.c

diff --git a/servers/slurpd/ri.c b/servers/slurpd/ri.c
index b4384e29289bcff5114034a387829c928725860a..62062cceb8a7562084cab3373bd96a148d63d3cd 100644 (file)
--- a/servers/slurpd/ri.c
+++ b/servers/slurpd/ri.c
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2004 The OpenLDAP Foundation.
+ * Copyright 1998-2007 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -121,7 +121,7 @@ Ri_process(
                case DO_LDAP_ERR_FATAL: {
                    /* Non-retryable error.  Write rejection log. */
                        int ld_errno = 0;
-                       ldap_get_option(ri->ri_ldp, LDAP_OPT_ERROR_NUMBER, &ld_errno);
+                       ldap_get_option(ri->ri_ldp, LDAP_OPT_RESULT_CODE, &ld_errno);
                    write_reject( ri, re, ld_errno, errmsg );
                    /* Update status ... */
                    (void) sglob->st->st_update( sglob->st, ri->ri_stel, re );
@@ -158,7 +158,7 @@ Ri_process(
        rq->rq_unlock( rq );
        if ( sglob->slurpd_shutdown ) {
            if ( ri->ri_ldp ) {
-               ldap_unbind( ri->ri_ldp );
+               ldap_unbind_ext( ri->ri_ldp, NULL, NULL );
                ri->ri_ldp = NULL;
            }
            return 0;
@@ -209,7 +209,6 @@ Ri_init(
     (*ri)->ri_bind_dn = NULL;
     (*ri)->ri_password = NULL;
     (*ri)->ri_authcId = NULL;
-    (*ri)->ri_srvtab = NULL;
     (*ri)->ri_curr = NULL;
 
     return 0;