From 0ab4a716125d7945645bc0b3935c052edee0e97d Mon Sep 17 00:00:00 2001 From: Shawn Routhier Date: Tue, 20 May 2014 19:35:05 -0700 Subject: [PATCH] [master] Don't halt if we can't set the resovler If we have an issue when trying to determine a resolver from resolv.conf don't halt the process. Print out a message and let the user handle it. --- RELNOTES | 4 ++++ omapip/isclib.c | 12 ++++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/RELNOTES b/RELNOTES index bc91c4905..d4a163179 100644 --- a/RELNOTES +++ b/RELNOTES @@ -160,6 +160,10 @@ by Eric Young (eay@cryptsoft.com). Thanks to Steinar Haug for the suggestion. [ISC-Bugs #36033] +- Modify the handling of the resolv.conf file to allow the DHCP + process to start up even if the resolv.conf file has problems. + [ISC-Bugs #35989] + Changes since 4.3.0rc1 - None diff --git a/omapip/isclib.c b/omapip/isclib.c index 59332ed9b..69edc2efa 100644 --- a/omapip/isclib.c +++ b/omapip/isclib.c @@ -225,9 +225,17 @@ dhcp_context_create(int flags, if (result != ISC_R_SUCCESS) goto cleanup; + /* + * If we can't set up the servers we may not be able to + * do DDNS but we should continue to try and perform + * our basic functions and let the user sort it out. + */ result = dhcp_dns_client_setservers(); - if (result != ISC_R_SUCCESS) - goto cleanup; + if (result != ISC_R_SUCCESS) { + log_error("Unable to set resolver from resolv.conf; " + "startup continuing but DDNS support " + "may be affected"); + } } #endif -- 2.47.3