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

ITS#10070 Allow running without a valid resolv.conf file

Browse Source
This commit is contained in:
Ondřej Kuzník 2023-06-22 16:20:22 +01:00 committed by Quanah Gibson-Mount
parent 85e13b49b9
commit d06bfb1fa9
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
servers/lloadd/daemon.c
View File

@ -92,6 +92,11 @@ struct event_base *listener_base = NULL;
LloadListener **lload_listeners = NULL;
static ldap_pvt_thread_t listener_tid, *daemon_tid;
#ifndef RESOLV_CONF_PATH
#define RESOLV_CONF_PATH "/etc/resolv.conf"
#endif
char *lload_resolvconf_path = RESOLV_CONF_PATH;
struct event_base *daemon_base = NULL;
struct evdns_base *dnsbase;
@ -1243,13 +1248,22 @@ lloadd_daemon( struct event_base *daemon_base )
assert( daemon_base != NULL );
dnsbase = evdns_base_new( daemon_base, EVDNS_BASE_INITIALIZE_NAMESERVERS );
dnsbase = evdns_base_new( daemon_base, 0 );
if ( !dnsbase ) {
Debug( LDAP_DEBUG_ANY, "lloadd startup: "
"failed to set up for async name resolution\n" );
return -1;
}
/*
* ITS#10070: Allow both operation without working DNS (test environments)
* and e.g. containers that don't have a /etc/resolv.conf but do have a
* server listening on 127.0.0.1 which is the default.
*/
(void)evdns_base_resolv_conf_parse( dnsbase,
DNS_OPTION_NAMESERVERS|DNS_OPTION_HOSTSFILE,
lload_resolvconf_path );
if ( lload_daemon_threads > SLAPD_MAX_DAEMON_THREADS )
lload_daemon_threads = SLAPD_MAX_DAEMON_THREADS;