-/*
- * Copyright (c) 1996 Regents of the University of Michigan.
+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2008 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>.
+ */
+/* Portions Copyright (c) 1996 Regents of the University of Michigan.
* All rights reserved.
*
* Redistribution and use in source and binary forms are permitted
* 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
#include "portable.h"
#include <stdio.h>
+
+#include <ac/stdlib.h>
+#include <ac/string.h>
#include <ac/signal.h>
#include "slurp.h"
#include "globals.h"
-/* External references */
-extern void write_reject LDAP_P(( Ri *, Re *, int, char * ));
-extern void do_nothing LDAP_P(());
-
/* Forward references */
static int ismine LDAP_P(( Ri *, Re * ));
static int isnew LDAP_P(( Ri *, Re * ));
-void tsleep LDAP_P(( time_t ));
/*
)
{
Rq *rq = sglob->rq;
- Re *re, *new_re;
- int i;
+ Re *re = NULL, *new_re = NULL;
int rc ;
char *errmsg;
+ int errfree;
-#ifdef HAVE_LINUX_THREADS
- (void) SIGNAL( SIGSTKFLT, do_nothing );
-#else
- (void) SIGNAL( SIGUSR1, do_nothing );
-#endif
+ (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;
rq->rq_lock( rq );
while ( !sglob->slurpd_shutdown &&
(( re = rq->rq_gethead( rq )) == NULL )) {
- /* No work - wait on condition variable */
- pthread_cond_wait( &rq->rq_more, &rq->rq_mutex );
+ /* No work */
+ if ( sglob->one_shot_mode ) {
+ /* give up if in one shot mode */
+ rq->rq_unlock( rq );
+ return 0;
+ }
+ /* wait on condition variable */
+ ldap_pvt_thread_cond_wait( &rq->rq_more, &rq->rq_mutex );
}
/*
"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:
- tsleep( RETRY_SLEEP_TIME );
+ ldap_pvt_thread_sleep( RETRY_SLEEP_TIME );
Debug( LDAP_DEBUG_ANY,
"Retrying operation for DN %s on replica %s:%d\n",
re->re_dn, ri->ri_hostname, ri->ri_port );
continue;
break;
- case DO_LDAP_ERR_FATAL:
+ case DO_LDAP_ERR_FATAL: {
/* Non-retryable error. Write rejection log. */
- write_reject( ri, re, ri->ri_ldp->ld_errno, errmsg );
+ int ld_errno = 0;
+ ldap_get_option(ri->ri_ldp, LDAP_OPT_ERROR_NUMBER, &ld_errno);
+ write_reject( ri, re, ld_errno, errmsg );
/* Update status ... */
(void) sglob->st->st_update( sglob->st, ri->ri_stel, re );
/* ... and write to disk */
(void) sglob->st->st_write( sglob->st );
- break;
+ } break;
default:
/* LDAP op completed ok - update status... */
(void) sglob->st->st_update( sglob->st, ri->ri_stel, re );
(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",
while ( !sglob->slurpd_shutdown &&
((new_re = re->re_getnext( re )) == NULL )) {
if ( sglob->one_shot_mode ) {
+ rq->rq_unlock( rq );
return 0;
}
/* No work - wait on condition variable */
- pthread_cond_wait( &rq->rq_more, &rq->rq_mutex );
+ ldap_pvt_thread_cond_wait( &rq->rq_more, &rq->rq_mutex );
}
re->re_decrefcnt( re );
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;
}
}
/*
* Wake a replication thread which may be sleeping.
- * Send it a SIG(STKFLT|USR1).
+ * Send it a LDAP_SIGUSR1.
*/
static void
Ri_wake(
if ( ri == NULL ) {
return;
}
-#ifdef HAVE_LINUX_THREADS
- pthread_kill( ri->ri_tid, SIGSTKFLT );
- (void) SIGNAL( SIGSTKFLT, do_nothing );
-#else
- pthread_kill( ri->ri_tid, SIGUSR1 );
- (void) SIGNAL( SIGUSR1, do_nothing );
-#endif
+ ldap_pvt_thread_kill( ri->ri_tid, LDAP_SIGUSR1 );
}
Ri **ri
)
{
- (*ri) = ( Ri * ) malloc( sizeof( Ri ));
+ (*ri) = ( Ri * ) calloc( 1, sizeof( Ri ));
if ( *ri == NULL ) {
return -1;
}
/* Initialize private data */
(*ri)->ri_hostname = NULL;
- (*ri)->ri_port = 0;
+ (*ri)->ri_uri = NULL;
(*ri)->ri_ldp = NULL;
- (*ri)->ri_bind_method = 0;
(*ri)->ri_bind_dn = NULL;
(*ri)->ri_password = NULL;
- (*ri)->ri_principal = NULL;
+ (*ri)->ri_authcId = NULL;
(*ri)->ri_srvtab = NULL;
(*ri)->ri_curr = NULL;
Re *re
)
{
- int x;
+ long x;
int ret;
/* Lock the St struct to avoid a race */
sglob->st->st_lock( sglob->st );
- x = strcmp( re->re_timestamp, ri->ri_stel->last );
+ x = re->re_timestamp - ri->ri_stel->last;
if ( x > 0 ) {
/* re timestamp is newer */
ret = 1;
sglob->st->st_unlock( sglob->st );
return ret;
}
-
-
projects / openldap / blobdiff