From 6d273e716dcfcd834b365ff2f55b4686b3ec68dc Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Tue, 3 Oct 2000 19:22:49 +0000 Subject: [PATCH] ITS#798: Fix one-shot mode with empty file --- CHANGES | 1 + servers/slurpd/ri.c | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index 10aa0b381b..67d94cae4c 100644 --- a/CHANGES +++ b/CHANGES @@ -6,6 +6,7 @@ OpenLDAP 2.0.X Engineering Fixed slapd idletimeout lock bug (ITS#767) Fixed slapd caseIgnoreIA5string indexing bug (ITS#786) Fixed slurpd TLS initialization bug (ITS#768) + Fixed slurpd empty one shot hang (ITS#798) Fixed -lldap SASL ctx close bug (ITS#790) Fixed -lldap first/next attribute bug (ITS#778) Fixed -lldap (v2) rebind URL bug diff --git a/servers/slurpd/ri.c b/servers/slurpd/ri.c index 9ea1a22174..f22da31626 100644 --- a/servers/slurpd/ri.c +++ b/servers/slurpd/ri.c @@ -62,7 +62,13 @@ Ri_process( rq->rq_lock( rq ); while ( !sglob->slurpd_shutdown && (( re = rq->rq_gethead( rq )) == NULL )) { - /* No work - wait on condition variable */ + /* 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 ); } -- 2.39.5