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 aa12a79c0f24b078ba63e4e76fef4db2f7ed621b..62062cceb8a7562084cab3373bd96a148d63d3cd 100644 (file)
--- a/servers/slurpd/ri.c
+++ b/servers/slurpd/ri.c
@@ -1,10 +1,18 @@
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2007 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
-/*
- * Copyright (c) 1996 Regents of the University of Michigan.
+/* Portions Copyright (c) 1996 Regents of the University of Michigan.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms are permitted
@@ -14,6 +22,10 @@
  * software without specific prior written permission. This software
  * is provided ``as is'' without express or implied warranty.
  */
+/* ACKNOWLEDGEMENTS:
+ * This work was originally developed by the University of Michigan
+ * (as part of U-MICH LDAP).
+ */
 
 /*
  * ri.c - routines used to manipulate Ri structures.  An Ri (Replica
@@ -48,12 +60,15 @@ Ri_process(
 )
 {
     Rq         *rq = sglob->rq;
-    Re         *re, *new_re;
+    Re         *re = NULL, *new_re = NULL;
     int                rc ;
     char       *errmsg;
+    int                errfree;
 
     (void) SIGNAL( LDAP_SIGUSR1, do_nothing );
+#ifdef SIGPIPE
     (void) SIGNAL( SIGPIPE, SIG_IGN );
+#endif
     if ( ri == NULL ) {
        Debug( LDAP_DEBUG_ANY, "Error: Ri_process: ri == NULL!\n", 0, 0, 0 );
        return -1;
@@ -94,7 +109,7 @@ Ri_process(
                        "Replica %s:%d, skip repl record for %s (old)\n",
                        ri->ri_hostname, ri->ri_port, re->re_dn );
            } else {
-               rc = do_ldap( ri, re, &errmsg );
+               rc = do_ldap( ri, re, &errmsg, &errfree );
                switch ( rc ) {
                case DO_LDAP_ERR_RETRYABLE:
                    ldap_pvt_thread_sleep( RETRY_SLEEP_TIME );
@@ -106,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 );
@@ -120,6 +135,9 @@ Ri_process(
                    (void) sglob->st->st_write( sglob->st );
                    break;
                }
+               if ( errfree && errmsg ) {
+                   ch_free( errmsg );
+               }
            }
        } else {
            Debug( LDAP_DEBUG_ANY, "Error: re is null in Ri_process\n",
@@ -139,6 +157,10 @@ Ri_process(
        re = new_re;
        rq->rq_unlock( rq );
        if ( sglob->slurpd_shutdown ) {
+           if ( ri->ri_ldp ) {
+               ldap_unbind_ext( ri->ri_ldp, NULL, NULL );
+               ri->ri_ldp = NULL;
+           }
            return 0;
        }
     }
@@ -182,11 +204,11 @@ Ri_init(
 
     /* Initialize private data */
     (*ri)->ri_hostname = NULL;
+    (*ri)->ri_uri = NULL;
     (*ri)->ri_ldp = NULL;
     (*ri)->ri_bind_dn = NULL;
     (*ri)->ri_password = NULL;
     (*ri)->ri_authcId = NULL;
-    (*ri)->ri_srvtab = NULL;
     (*ri)->ri_curr = NULL;
 
     return 0;