diff --git a/clients/fax500/main.c b/clients/fax500/main.c
index a4a6e308573db588718d13e26eeb4c8822473fc9..654a3df0a6080750baeceed02abb5740516acbe2 100644
--- a/clients/fax500/main.c
+++ b/clients/fax500/main.c
@@ -323,8 +323,8 @@ connect_to_x500( void )
int sizelimit = FAX_MAXAMBIGUOUS;
int deref = LDAP_DEREF_ALWAYS;
- if ( (ld = ldap_open( NULL, 0 )) == NULL ) {
- syslog( LOG_ALERT, "ldap_open failed" );
+ if ( (ld = ldap_init( NULL, 0 )) == NULL ) {
+ syslog( LOG_ALERT, "ldap_init failed" );
return( -1 );
}
diff --git a/clients/fax500/rp500.c b/clients/fax500/rp500.c
index f4f9c5842529d54e222e4e3e01e4b0b9052fc7ba..2df90c6ba3aee69e055b6c608b61934122c9ecab 100644
--- a/clients/fax500/rp500.c
+++ b/clients/fax500/rp500.c
@@ -115,8 +115,8 @@ main( int argc, char **argv )
(void) SIGNAL( SIGPIPE, SIG_IGN );
#endif
- if ( (ld = ldap_open( ldaphost, 0 )) == NULL ) {
- perror( "ldap_open" );
+ if ( (ld = ldap_init( ldaphost, 0 )) == NULL ) {
+ perror( "ldap_init" );
exit( -1 );
}
diff --git a/clients/finger/main.c b/clients/finger/main.c
index 1dc1664d804d759774506dd2f8b4189ab4d6f6a2..9b1cf975f91154e7aa6704e05f30e7433db464e2 100644
--- a/clients/finger/main.c
+++ b/clients/finger/main.c
@@ -158,9 +158,9 @@ do_query( void )
fd_set readfds;
LDAP *ld;
- if ( (ld = ldap_open( ldaphost, ldapport )) == NULL ) {
+ if ( (ld = ldap_init( ldaphost, ldapport )) == NULL ) {
fprintf( stderr, FINGER_UNAVAILABLE );
- perror( "ldap_open" );
+ perror( "ldap_init" );
exit( 1 );
}
diff --git a/clients/gopher/go500.c b/clients/gopher/go500.c
index 7b5141bbed4888792882f4de23fdc3e0f063c3e5..d9a0d64447d5b06e1f68e820207a8c1a9a840e56 100644
--- a/clients/gopher/go500.c
+++ b/clients/gopher/go500.c
@@ -392,7 +392,7 @@ do_queries( int s )
if ( *query == '~' || *query == '@' ) {
ld = NULL;
- } else if ( (ld = ldap_open( ldaphost, 0 )) == NULL ) {
+ } else if ( (ld = ldap_init( ldaphost, 0 )) == NULL ) {
fprintf(fp,
"0An error occurred (explanation)\t@%d\t%s\t%d\r\n",
LDAP_SERVER_DOWN, myhost, myport );
diff --git a/clients/gopher/go500gw.c b/clients/gopher/go500gw.c
index 9381acda5bd208da291e2d12edad3956118304cd..843e7d25a2e44a25e50668987eac09518132091d 100644
--- a/clients/gopher/go500gw.c
+++ b/clients/gopher/go500gw.c
@@ -441,8 +441,8 @@ do_queries( int s )
/* NOT REACHED */
}
- if ( (ld = ldap_open( ldaphost, ldapport )) == NULL ) {
- if ( debug ) perror( "ldap_open" );
+ if ( (ld = ldap_init( ldaphost, ldapport )) == NULL ) {
+ if ( debug ) perror( "ldap_init" );
fprintf(fp, "0An error occurred (explanation)\tE%d\t%s\t%d\r\n",
LDAP_SERVER_DOWN, myhost, myport );
fprintf( fp, ".\r\n" );
diff --git a/clients/mail500/main.c b/clients/mail500/main.c
index dec8e66d3e421c4b905b8cfce12bbbb02a9f3621..7719d959e8214344db91436d41400eea5b2de534 100644
--- a/clients/mail500/main.c
+++ b/clients/mail500/main.c
@@ -360,8 +360,8 @@ connect_to_x500( void )
{
int opt;
- if ( (ld = ldap_open( ldaphost, 0 )) == NULL ) {
- syslog( LOG_ALERT, "ldap_open failed" );
+ if ( (ld = ldap_init( ldaphost, 0 )) == NULL ) {
+ syslog( LOG_ALERT, "ldap_init failed" );
return( -1 );
}
diff --git a/clients/rcpt500/query.c b/clients/rcpt500/query.c
index c035881849ffeaf0c8976455b36cc612afc375b5..c83a02bdab16a213cd49ee7105ee4a05983770df 100644
--- a/clients/rcpt500/query.c
+++ b/clients/rcpt500/query.c
@@ -77,7 +77,7 @@ query_cmd( struct msginfo *msgp, char *reply )
ldp = cldap_open( ldaphost, ldapport );
else
#endif /* LDAP_CONNECTIONLESS */
- ldp = ldap_open( ldaphost, ldapport );
+ ldp = ldap_init( ldaphost, ldapport );
if ( ldp == NULL ) {
strcat( reply, errpreface );
diff --git a/clients/ud/main.c b/clients/ud/main.c
index bb0bb8ca7ed9284cf31a6fe70431e49a6c0a65a1..a4d742bbeed0652e609e8d22a21f01d53a8c7c58 100644
--- a/clients/ud/main.c
+++ b/clients/ud/main.c
@@ -648,8 +648,8 @@ initialize_client( void )
* are meaningless since we will immediately be doing a null bind
* because we want to be sure to use TCP, not UDP.
*/
- if ((ld = ldap_open(server, ldap_port)) == NULL) {
- fprintf(stderr, " The LDAP Directory is temporarily unavailable. Please try again later.\n");
+ if ((ld = ldap_init(server, ldap_port)) == NULL) {
+ fprintf(stderr, " Initialization of LDAP session failed.\n");
exit(0);
/* NOTREACHED */
}
diff --git a/contrib/saucer/main.c b/contrib/saucer/main.c
index 605c1ad4ed959a639214cac26d94b4b239147ff5..d99d3e558dc3e807db6732171d82e3bd69a7dcee 100644
--- a/contrib/saucer/main.c
+++ b/contrib/saucer/main.c
@@ -639,8 +639,8 @@ int main(int argc, char **argv)
rc = user_tailor();
- if (!(ld = ldap_open(hostname, portnum))) {
- fprintf(stderr, "%s: unable to connect to server at host `%s' on port %d\n",
+ if (!(ld = ldap_init(hostname, portnum))) {
+ fprintf(stderr, "%s: unable to initialize LDAP session (%s:%d)\n",
progname, hostname, portnum);
exit(2);
}
diff --git a/contrib/web_ldap/web_ldap.c b/contrib/web_ldap/web_ldap.c
index 37376d1ec9f0c5be751dc014ae27985699cd9732..0be574aec27ba3f75b9324780e617ff72abd9a74 100644
--- a/contrib/web_ldap/web_ldap.c
+++ b/contrib/web_ldap/web_ldap.c
@@ -321,20 +321,20 @@ main(int argc, char ** argv) {
time(&now);
sprintf(temp,"\n==< Results >==\n\n");
fputs(temp,logfp);
- sprintf(temp,"** performing ldap_open at %s\n", ctime(&now));
+ sprintf(temp,"** performing ldap_init at %s\n", ctime(&now));
fputs(temp,logfp);
fflush(logfp);
fclose(logfp);
}
}
- if ( (ld = ldap_open(ldap_data.servername, ldap_data.ldap_port_num) ) == NULL)
+ if ( (ld = ldap_init(ldap_data.servername, ldap_data.ldap_port_num) ) == NULL)
{
- printf("<font color=red><b>ldap_open error</b></font>\n");
+ printf("<font color=red><b>ldap_init error</b></font>\n");
if (ldap_data.debug != 0) {
if ((logfp = fopen("web_ldap.log","a")) == 0) {
}
else {
- sprintf(temp,"++ ldap_open error\n");
+ sprintf(temp,"++ ldap_init error\n");
fputs(temp,logfp);
fflush(logfp);
fclose(logfp);
diff --git a/contrib/whois++/whois++.c b/contrib/whois++/whois++.c
index 023b25b9e97336f70424b55d94481a7e2ef8b96d..469e3ac664142d15120afeb6f8e28a38bef91616 100644
--- a/contrib/whois++/whois++.c
+++ b/contrib/whois++/whois++.c
@@ -178,10 +178,10 @@ char **argv;
}
}
- if ( (ld = ldap_open( ldaphost, LDAP_PORT )) == NULL ) {
+ if ( (ld = ldap_init( ldaphost, LDAP_PORT )) == NULL ) {
printFormatted( lineLength, TRUE, stdout,
"Connection to LDAP port on %s has failed", ldaphost );
- syslog( LOG_ERR, "Connection to LDAP port on %s has failed",
+ syslog( LOG_ERR, "Initialization of LDAP session (%s)",
ldaphost );
exit( 1 );
}
diff --git a/libraries/libldap/test.c b/libraries/libldap/test.c
index 4d7234f3c957c5444c751334e31bb0afaf98550e..b6aab5924d0ecb59a3d82a21308426cddf6cef07 100644
--- a/libraries/libldap/test.c
+++ b/libraries/libldap/test.c
@@ -346,7 +346,8 @@ main( int argc, char **argv )
exit( 1 );
}
- printf( "%sldap_open( %s, %d )\n", cldapflg ? "c" : "",
+ printf( "%s( %s, %d )\n",
+ cldapflg ? "cldap_open" : "ldap_init",
host == NULL ? "(null)" : host, port );
if ( cldapflg ) {
@@ -354,11 +355,11 @@ main( int argc, char **argv )
ld = cldap_open( host, port );
#endif /* LDAP_CONNECTIONLESS */
} else {
- ld = ldap_open( host, port );
+ ld = ldap_init( host, port );
}
if ( ld == NULL ) {
- perror( "ldap_open" );
+ perror( cldapflg ? "cldap_open" : "ldap_init" );
exit(1);
}
diff --git a/servers/slapd/tools/centipede.c b/servers/slapd/tools/centipede.c
index c558b1c487fa39960714c18f7efe008a34d9b037..f3b36d72f3697e63890e1cf5e7265b7d22698e39 100644
--- a/servers/slapd/tools/centipede.c
+++ b/servers/slapd/tools/centipede.c
@@ -383,8 +383,8 @@ start_ldap_search(
fflush( stdout );
}
- if ( (ld = ldap_open( ldaphost, 0 )) == NULL ) {
- perror( "ldap_open" );
+ if ( (ld = ldap_init( ldaphost, 0 )) == NULL ) {
+ perror( "ldap_init" );
return( NULL );
}
@@ -976,8 +976,8 @@ bind_to_destination_ldap(
free( ldapbase );
ldapbase = strdup( buf );
- if ( (ld = ldap_open( ldaphost, 0 )) == NULL ) {
- perror( "ldap_open" );
+ if ( (ld = ldap_init( ldaphost, 0 )) == NULL ) {
+ perror( "ldap_init" );
return( NULL );
}
diff --git a/servers/slapd/tools/sizecount.c b/servers/slapd/tools/sizecount.c
index 4d881faf643f8da7e0831a6a0b8f899f433a79a1..e04ced459f0619e377d681ed7b1fbf34460dbe2e 100644
--- a/servers/slapd/tools/sizecount.c
+++ b/servers/slapd/tools/sizecount.c
@@ -48,8 +48,8 @@ main( int argc, char **argv )
ldap_debug = 255;
lber_debug = 255;
*/
- if ( (ld = ldap_open( "vertigo:5555", 0 )) == NULL ) {
- perror( "ldap_open" );
+ if ( (ld = ldap_init( "vertigo:5555", 0 )) == NULL ) {
+ perror( "ldap_init" );
exit( 1 );
}
diff --git a/servers/slurpd/ldap_op.c b/servers/slurpd/ldap_op.c
index 9ae70dc78d147670afeb95d75367859903c04370..404f321ef4f7966db123ea7b648cf889385c5536 100644
--- a/servers/slurpd/ldap_op.c
+++ b/servers/slurpd/ldap_op.c
@@ -611,11 +611,11 @@ do_bind(
ri->ri_ldp = NULL;
}
- Debug( LDAP_DEBUG_ARGS, "Open connection to %s:%d\n",
+ Debug( LDAP_DEBUG_ARGS, "Initializing session to %s:%d\n",
ri->ri_hostname, ri->ri_port, 0 );
- ri->ri_ldp = ldap_open( ri->ri_hostname, ri->ri_port );
+ ri->ri_ldp = ldap_init( ri->ri_hostname, ri->ri_port );
if ( ri->ri_ldp == NULL ) {
- Debug( LDAP_DEBUG_ANY, "Error: ldap_open(%s, %d) failed: %s\n",
+ Debug( LDAP_DEBUG_ANY, "Error: ldap_init(%s, %d) failed: %s\n",
ri->ri_hostname, ri->ri_port, sys_errlist[ errno ] );
return( BIND_ERR_OPEN );
}