[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.

diff --git a/RELNOTES b/RELNOTES
index bc91c49050ed34f0ad3c3193b4686734937f1aff..d4a16317951e3403dc03c3b074b81f4268f6683c 100644 (file)
--- 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 59332ed9b241255bd060e02108edc26888acb3cc..69edc2efa3e3d1a4042c6333e19ae4da611952b0 100644 (file)
--- 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