mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-01-12 10:54:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

ITS#9787 init global_host earlier so tools see it too

Browse Source
This commit is contained in:
Howard Chu 2022-01-23 14:07:43 +00:00
parent f4e74d51f5
commit 38e16e3b39
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
servers/slapd/main.c
View File

@ -275,6 +275,9 @@ int main( int argc, char **argv )
(void) ldap_pvt_tls_set_option( slap_tls_ld, LDAP_OPT_X_TLS_REQUIRE_CERT, &rc ); (void) ldap_pvt_tls_set_option( slap_tls_ld, LDAP_OPT_X_TLS_REQUIRE_CERT, &rc );
#endif #endif
global_host = ldap_pvt_get_fqdn( NULL );
ber_str2bv( global_host, 0, 0, &global_host_bv );
serverName = lutil_progname( "slapd", argc, argv ); serverName = lutil_progname( "slapd", argc, argv );
if ( strcmp( serverName, "slapd" ) ) { if ( strcmp( serverName, "slapd" ) ) {
@ -614,9 +617,6 @@ unhandled_option:;
Debug( LDAP_DEBUG_ANY, "%s", Versionstr ); Debug( LDAP_DEBUG_ANY, "%s", Versionstr );
global_host = ldap_pvt_get_fqdn( NULL );
ber_str2bv( global_host, 0, 0, &global_host_bv );
if( check == CHECK_NONE && slapd_daemon_init( urls ) != 0 ) { if( check == CHECK_NONE && slapd_daemon_init( urls ) != 0 ) {
rc = 1; rc = 1;
SERVICE_EXIT( ERROR_SERVICE_SPECIFIC_ERROR, 16 ); SERVICE_EXIT( ERROR_SERVICE_SPECIFIC_ERROR, 16 );