libraries/libldap/result.c - diff

Return to result.c CVS log

Up to [OpenLDAP] / libraries / libldap

Diff for /libraries/libldap/result.c between versions 1.18 and 1.19

version 1.18, 1998/12/28 19:53:16	version 1.19, 1999/03/02 19:23:15
Line 166 wait4msg( LDAP *ld, int msgid, int all,	Line 166 wait4msg( LDAP *ld, int msgid, int all,
while ( rc == -2 ) {	while ( rc == -2 ) {
#ifndef LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS	#ifndef LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS
/* hack attack */	/* hack attack */
if ( ld->ld_sb.sb_ber.ber_ptr >= ld->ld_sb.sb_ber.ber_end ) {	if ( ! lber_pvt_sb_data_ready(&ld->ld_sb) ) {
rc = ldap_select1( ld, tvp );	rc = ldap_select1( ld, tvp );

if ( rc == 0 \|\| ( rc == -1 && (	if ( rc == 0 \|\| ( rc == -1 && (
Line 192 wait4msg( LDAP *ld, int msgid, int all,	Line 192 wait4msg( LDAP *ld, int msgid, int all,
}	}
#endif /* LDAP_DEBUG */	#endif /* LDAP_DEBUG */
for ( lc = ld->ld_conns; lc != NULL; lc = lc->lconn_next ) {	for ( lc = ld->ld_conns; lc != NULL; lc = lc->lconn_next ) {
if ( lc->lconn_sb->sb_ber.ber_ptr <	if ( lber_pvt_sb_data_ready(lc->lconn_sb) ) {
lc->lconn_sb->sb_ber.ber_end ) {
rc = read1msg( ld, msgid, all, lc->lconn_sb,	rc = read1msg( ld, msgid, all, lc->lconn_sb,
lc, result );	lc, result );
break;	break;
Line 610 ldap_select1( LDAP ld, struct timeval	Line 609 ldap_select1( LDAP ld, struct timeval
}	}

FD_ZERO( &readfds );	FD_ZERO( &readfds );
FD_SET( ld->ld_sb.sb_sd, &readfds );	FD_SET( lber_pvt_sb_get_desc(&ld->ld_sb), &readfds );

return( select( tblsize, &readfds, 0, 0, timeout ) );	return( select( tblsize, &readfds, 0, 0, timeout ) );
}	}
Line 732 cldap_getmsg( LDAP ld, struct timeval	Line 731 cldap_getmsg( LDAP ld, struct timeval
int rc;	int rc;
unsigned long tag, len;	unsigned long tag, len;

if ( ld->ld_sb.sb_ber.ber_ptr >= ld->ld_sb.sb_ber.ber_end ) {	if ( ! lber_pvt_sb_data_ready(&ld->ld_sb) ) {
rc = ldap_select1( ld, timeout );	rc = ldap_select1( ld, timeout );
if ( rc == -1 \|\| rc == 0 ) {	if ( rc == -1 \|\| rc == 0 ) {
ld->ld_errno = (rc == -1 ? LDAP_SERVER_DOWN :	ld->ld_errno = (rc == -1 ? LDAP_SERVER_DOWN :

Removed from v.1.18
changed lines
	Added in v.1.19