[Bug 2149] Log an error message if /proc/net/if_inet6 cannot be opened

bk: 516d1abbzIZzfg6CD3FckDzoRoteRQ

diff --git a/ChangeLog b/ChangeLog
index b947b4402235d7ac39b84a604708cb12d3769465..5b890a7e85eecfa5c17d72cb03ac0101efd5849b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* [Bug 2149] Log an error message if /proc/net/if_inet6 cannot be opened.
 (4.2.7p364) 2013/03/26 Released by Harlan Stenn <stenn@ntp.org>
 * Bump sntp/include/autogen-version.def .
 (4.2.7p363) 2013/03/26 Released by Harlan Stenn <stenn@ntp.org>

diff --git a/lib/isc/unix/ifiter_getifaddrs.c b/lib/isc/unix/ifiter_getifaddrs.c
index 057f9601efb6e91ef55329fedcf3e841f1aaa515..1fe5753560bbb74ddc0e26188c3062f9f88715e4 100644 (file)
--- a/lib/isc/unix/ifiter_getifaddrs.c
+++ b/lib/isc/unix/ifiter_getifaddrs.c
@@ -73,9 +73,15 @@ isc_interfaceiter_create(isc_mem_t *mctx, isc_interfaceiter_t **iterp) {
         * Only open "/proc/net/if_inet6" if we have never seen a IPv6
         * address returned by getifaddrs().
         */
-       if (!seenv6)
+       if (!seenv6) {
                iter->proc = fopen("/proc/net/if_inet6", "r");
-       else
+               if (iter->proc == NULL) {
+                       isc__strerror(errno, strbuf, sizeof(strbuf));
+                       isc_log_write(isc_lctx, ISC_LOGCATEGORY_GENERAL,
+                                     ISC_LOGMODULE_SOCKET, ISC_LOG_WARNING,
+                                     "failed to open /proc/net/if_inet6");
+               }
+       } else
                iter->proc = NULL;
        iter->valid = ISC_R_FAILURE;
 #endif