X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fmain.c;h=b18b8e0e07fd1c11cfff66556160bab076c48ea5;hb=5ed0fc37494b835aeeb39bd55ee6d71cedad8143;hp=1b653c6d51caf6d465ec458cd3769186e15d7ee5;hpb=ba68a94f113f4b272b955174795a212211d713f9;p=openldap

diff --git a/servers/slapd/main.c b/servers/slapd/main.c
index 1b653c6d51..b18b8e0e07 100644
--- a/servers/slapd/main.c
+++ b/servers/slapd/main.c
@@ -697,6 +697,8 @@ unhandled_option:;
 
 	Debug( LDAP_DEBUG_ANY, "%s", Versionstr, 0, 0 );
 
+	global_host = ldap_pvt_get_fqdn( NULL );
+
 	if( check == CHECK_NONE && slapd_daemon_init( urls ) != 0 ) {
 		rc = 1;
 		SERVICE_EXIT( ERROR_SERVICE_SPECIFIC_ERROR, 16 );
@@ -830,12 +832,6 @@ unhandled_option:;
 	}
 #endif
 
-#ifdef HAVE_CYRUS_SASL
-	if( global_host == NULL ) {
-		global_host = ldap_pvt_get_fqdn( NULL );
-	}
-#endif
-
 	(void) SIGNAL( LDAP_SIGUSR1, slap_sig_wake );
 	(void) SIGNAL( LDAP_SIGUSR2, slap_sig_shutdown );