[master] Update log_fatal message to be shorter and point to the web page

diff --git a/RELNOTES b/RELNOTES
index 93c95a1fcdbc4b6443d2c4554aca29e1b656862a..d02e5bfccb06512a6b96616d499527c6d8975820 100644 (file)
--- a/RELNOTES
+++ b/RELNOTES
@@ -144,6 +144,13 @@ work on other platforms. Please report any problems and suggested fixes to
 - Add definitions for some options that have been specified by the IETF.
   [ISC-Bugs #29268]
 
+                       Changes since 4.3.0a1
+
+- Modify the message displayed when a process hits a fatal error.
+  The new message is much shorter and simply points to the README
+  and our website for directions on bug submissions.
+  [ISC-Bugs #24789]
+
                        Changes since 4.2.5
 
 - Address static analysis warnings.

diff --git a/omapip/errwarn.c b/omapip/errwarn.c
index 722c3fc77edefdd68e2b23ae9493f11e4ba96d5c..4b3d353d6b6de0f8770cbaa4c749067452693a09 100644 (file)
--- a/omapip/errwarn.c
+++ b/omapip/errwarn.c
@@ -4,7 +4,8 @@
 
 /*
  * Copyright (c) 1995 RadioMail Corporation.
- * Copyright (c) 2004,2007,2009 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2009,2014 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004,2007 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 1996-2003 by Internet Software Consortium
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -74,25 +75,15 @@ void log_fatal (const char * fmt, ... )
          IGNORE_RET (write (STDERR_FILENO, "\n", 1));
   }
 
-#if !defined (NOMINUM)
   log_error ("%s", "");
-  log_error ("If you did not get this software from ftp.isc.org, please");
-  log_error ("get the latest from ftp.isc.org and install that before");
-  log_error ("requesting help.");
-  log_error ("%s", "");
-  log_error ("If you did get this software from ftp.isc.org and have not");
-  log_error ("yet read the README, please read it before requesting help.");
-  log_error ("If you intend to request help from the dhcp-server@isc.org");
-  log_error ("mailing list, please read the section on the README about");
-  log_error ("submitting bug reports and requests for help.");
-  log_error ("%s", "");
-  log_error ("Please do not under any circumstances send requests for");
-  log_error ("help directly to the authors of this software - please");
-  log_error ("send them to the appropriate mailing list as described in");
-  log_error ("the README file.");
+  log_error ("If you think you have received this message due to a bug rather");
+  log_error ("than a configuration issue please read the section on submitting");
+  log_error ("bugs on either our web page at www.isc.org or in the README file");
+  log_error ("before submitting a bug.  These pages explain the proper");
+  log_error ("process and the information we find helpful for debugging..");
   log_error ("%s", "");
   log_error ("exiting.");
-#endif
+
   if (log_cleanup)
          (*log_cleanup) ();
   exit (1);