ldap/servers/slapd/daemon.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit f3ed96a32f6a5fa4ff09afd36207c1174f29a8a1
Author: Noriko Hosoi <nhosoi(a)redhat.com>
Date: Fri Dec 5 15:44:27 2014 -0800
Ticket #47935 - Error: failed to open an LDAP connection to host 'example.org'
port '389' as user 'cn=Directory Manager'. Error: unknown.
Description: "slapd started." message is logged prior to calling
PR_Listen on configured ports as well as creating a pid file. It
confuses the install script that relies on the keyword to determine
if the server is ready or not.
This patch moves the "slapd started." logging code after calling
PR_Listen and creating a pid file.
https://fedorahosted.org/389/ticket/47935
Reviewed by rmeggins(a)redhat.com (Thank you, Rich!!)
(cherry picked from commit 6c43c22c387c4d41fe1689bf73e335e92de8e542)
(cherry picked from commit 251888e57f2f60fcbe60306e1f489198224f2cae)
diff --git a/ldap/servers/slapd/daemon.c b/ldap/servers/slapd/daemon.c
index 4620e70..d315d9f 100644
--- a/ldap/servers/slapd/daemon.c
+++ b/ldap/servers/slapd/daemon.c
@@ -1010,7 +1010,6 @@ void slapd_daemon( daemon_ports_t *ports )
exit( 1 );
}
- unfurl_banners(the_connection_table,ports,n_tcps,s_tcps,i_unix);
init_op_threads ();
detect_timeout_support();
@@ -1144,6 +1143,9 @@ void slapd_daemon( daemon_ports_t *ports )
/* Now we write the pid file, indicating that the server is finally and listening for
connections */
write_pid_file();
+ /* The server is ready and listening for connections. Logging "slapd started"
message. */
+ unfurl_banners(the_connection_table,ports,n_tcps,s_tcps,i_unix);
+
/* The meat of the operation is in a loop on a call to select */
while(!g_get_shutdown())
{