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.9 and 1.10

version 1.9, 1998/10/26 01:38:39	version 1.10, 1998/11/04 00:41:01
Line 168 wait4msg( LDAP *ld, int msgid, int all,	Line 168 wait4msg( LDAP *ld, int msgid, int all,
if ( ld->ld_sb.sb_ber.ber_ptr >= ld->ld_sb.sb_ber.ber_end ) {	if ( ld->ld_sb.sb_ber.ber_ptr >= ld->ld_sb.sb_ber.ber_end ) {
rc = ldap_select1( ld, tvp );	rc = ldap_select1( ld, tvp );

if ( rc == 0 \|\| ( rc == -1 && (( ld->ld_options &	if ( rc == 0 \|\| ( rc == -1 && (
LDAP_OPT_RESTART ) == 0 \|\| errno != EINTR ))) {	(LDAP_BOOL_GET(ld, LDAP_BOOL_RESTART) = LDAP_OPT_OFF)
	\|\| errno != EINTR ))) {
ld->ld_errno = (rc == -1 ? LDAP_SERVER_DOWN :	ld->ld_errno = (rc == -1 ? LDAP_SERVER_DOWN :
LDAP_TIMEOUT);	LDAP_TIMEOUT);
return( rc );	return( rc );
Line 209 wait4msg( LDAP *ld, int msgid, int all,	Line 210 wait4msg( LDAP *ld, int msgid, int all,
}	}
#endif	#endif

if ( rc == 0 \|\| ( rc == -1 && (( ld->ld_options &	if ( rc == 0 \|\| ( rc == -1 && (
LDAP_OPT_RESTART ) == 0 \|\| errno != EINTR ))) {	(LDAP_BOOL_GET(ld, LDAP_BOOL_RESTART) == LDAP_OPT_OFF)
	\|\| errno != EINTR ))) {
ld->ld_errno = (rc == -1 ? LDAP_SERVER_DOWN :	ld->ld_errno = (rc == -1 ? LDAP_SERVER_DOWN :
LDAP_TIMEOUT);	LDAP_TIMEOUT);
return( rc );	return( rc );
Line 326 read1msg( LDAP *ld, int msgid, int all,	Line 328 read1msg( LDAP *ld, int msgid, int all,
if ( tag != LDAP_RES_SEARCH_ENTRY ) {	if ( tag != LDAP_RES_SEARCH_ENTRY ) {
if ( ld->ld_version >= LDAP_VERSION2 &&	if ( ld->ld_version >= LDAP_VERSION2 &&
( lr->lr_parent != NULL \|\|	( lr->lr_parent != NULL \|\|
( ld->ld_options & LDAP_OPT_REFERRALS ) != 0 )) {	(LDAP_BOOL_GET(ld, LDAP_BOOL_REFERRALS) != LDAP_OPT_OFF))) {
tmpber = ber; /* struct copy */	tmpber = ber; /* struct copy */
if ( ber_scanf( &tmpber, "{iaa}", &lderr,	if ( ber_scanf( &tmpber, "{iaa}", &lderr,
&lr->lr_res_matched, &lr->lr_res_error )	&lr->lr_res_matched, &lr->lr_res_error )

Removed from v.1.9
changed lines
	Added in v.1.10