X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fldapd%2Fmain.c;fp=servers%2Fldapd%2Fmain.c;h=ca74d44b20bac3ffe1e20b7356fa99ddd00ae928;hb=dc07e765f263ef459dcd2afd1ece01cfc85a0edd;hp=3f0e3d3580a15f4a2294fb559e39a58fb0cc7858;hpb=29a7d6229a0c25707d78d3dac2334b2178df4217;p=openldap diff --git a/servers/ldapd/main.c b/servers/ldapd/main.c index 3f0e3d3580..ca74d44b20 100644 --- a/servers/ldapd/main.c +++ b/servers/ldapd/main.c @@ -515,10 +515,10 @@ do_queries( conn_init(); } - lber_pvt_sb_init( &sb ); - lber_pvt_sb_set_desc( &sb, clientsock ); - lber_pvt_sb_set_io( &sb, (udp) ? &lber_pvt_sb_io_udp : - &lber_pvt_sb_io_tcp, NULL ); + ber_pvt_sb_init( &sb ); + ber_pvt_sb_set_desc( &sb, clientsock ); + ber_pvt_sb_set_io( &sb, (udp) ? &ber_pvt_sb_io_udp : + &ber_pvt_sb_io_tcp, NULL ); timeout.tv_sec = idletime; timeout.tv_usec = 0; for ( ;; ) { @@ -547,7 +547,7 @@ do_queries( * already waiting for us on the client sock. */ - if ( ! lber_pvt_sb_data_ready( &sb ) ) { + if ( ! ber_pvt_sb_data_ready( &sb ) ) { if ( (rc = select( dtblsize, &readfds, 0, 0, udp ? 0 : &timeout )) < 1 ) { #ifdef LDAP_DEBUG @@ -573,7 +573,7 @@ do_queries( } } - if ( lber_pvt_sb_data_ready( &sb ) || + if ( ber_pvt_sb_data_ready( &sb ) || FD_ISSET( clientsock, &readfds ) ) { client_request( &sb, conns, udp ); } else {