diff options
| author | Shawn Routhier <sar@isc.org> | 2014-05-20 19:35:05 -0700 |
|---|---|---|
| committer | Shawn Routhier <sar@isc.org> | 2014-05-20 19:35:05 -0700 |
| commit | 0ab4a716125d7945645bc0b3935c052edee0e97d (patch) | |
| tree | c7e88a820de6bcb8af7caa6e4a420d0721312c0d /omapip | |
| parent | 59a351d6d50a80e76af0416089670aa0842b16dc (diff) | |
| download | isc-dhcp-0ab4a716125d7945645bc0b3935c052edee0e97d.tar.gz | |
[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.
Diffstat (limited to 'omapip')
| -rw-r--r-- | omapip/isclib.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/omapip/isclib.c b/omapip/isclib.c index 59332ed9..69edc2ef 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 |