[master] Handle an absent resolv.conf file better

Add relnote and update copyright

diff --git a/RELNOTES b/RELNOTES
index 7b2ad72c8d83dc4e48c6b5afe0de754c8c25f971..8db18d05ce2696c7fe498b99c41a2c35d6ee7478 100644 (file)
--- a/RELNOTES
+++ b/RELNOTES
@@ -160,6 +160,9 @@ work on other platforms. Please report any problems and suggested fixes to
   and our website for directions on bug submissions.
   [ISC-Bugs #24789]
 
+- Handle an absent resolv.conf file better.
+  [ISC-Bugs #35194]
+
                        Changes since 4.2.5
 
 - Address static analysis warnings.

diff --git a/omapip/isclib.c b/omapip/isclib.c
index 4a0ce053889eac9a46d13844f7fabfe34b8d4231..671b321ba5d831bb89d88d3e9780792b9880add8 100644 (file)
--- a/omapip/isclib.c
+++ b/omapip/isclib.c
@@ -1,5 +1,5 @@
 /*
- * Copyright(c) 2009-2010,2013 by Internet Systems Consortium, Inc.("ISC")
+ * Copyright(c) 2009-2010,2013-2014 by Internet Systems Consortium, Inc.("ISC")
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above