ChangeLog:

  Error messages should log as errors.
ntp_parser.y, ntp_config.c:
  Error messages should log as errors.

bk: 48cd2134MBz21Slz5xqPYntZfIfNrA

diff --git a/ChangeLog b/ChangeLog
index 8a18cc7a3961254ab3c345c192d83a53fa9e8eff..8bce007bb2fe2a595fed688e8a62ae547a773140 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* [Bug 1066] Error messages should log as errors
 (4.2.5p131) 2008/09/14 Released by Harlan Stenn <stenn@ntp.org>
 * [Bug 1065] Re-enable support for the timingstats file.
 (4.2.5p130) 2008/09/13 Released by Harlan Stenn <stenn@ntp.org>

diff --git a/ntpd/ntp_config.c b/ntpd/ntp_config.c
index 6bc53a3c9914cdcc36167c940838b8eb49ef4e99..5d448f2bc4497d4cef953fdc13a640ab42f48769 100644 (file)
--- a/ntpd/ntp_config.c
+++ b/ntpd/ntp_config.c
@@ -1394,7 +1394,7 @@ config_qos(void)
                        qtos = CONF_QOS_CS7;
 #endif  /* IPTOS_PREC_INTERNETCONTROL */
                if (qtos == 0)
-                       msyslog(LOG_INFO, "parse error, qos %s not accepted\n", s);
+                       msyslog(LOG_ERR, "parse error, qos %s not accepted\n", s);
                else
                        qos = qtos;
 #endif  /* HAVE IPTOS_SUPPORT */

diff --git a/ntpd/ntp_parser.y b/ntpd/ntp_parser.y
index fd3fdc785a491248a2aacf307febc247e4acb93b..36e4ab10b51ba950078decf9dd5e8d384276530a 100644 (file)
--- a/ntpd/ntp_parser.y
+++ b/ntpd/ntp_parser.y
@@ -291,10 +291,10 @@ command_list
         |       error T_EOC
                 {
                                        if (input_from_file == 1) {
-                       msyslog(LOG_INFO, "parse error %s line %d ignored\n",
+                       msyslog(LOG_ERR, "parse error %s line %d ignored\n",
                             ip_file->fname, ip_file->line_no);
                        } else if (input_from_file != 0)
-                               msyslog(LOG_INFO,
+                               msyslog(LOG_ERR,
                                    "parse: bad boolean input flag\n");
                 }
        ;
@@ -699,13 +699,13 @@ miscellaneous_command
                 {
                     if (curr_include_level >= MAXINCLUDELEVEL) {
                         fprintf(stderr, "getconfig: Maximum include file level exceeded.\n");
-                        msyslog(LOG_INFO, "getconfig: Maximum include file level exceeded.");
+                        msyslog(LOG_ERR, "getconfig: Maximum include file level exceeded.");
                     }
                     else {
                         fp[curr_include_level + 1] = F_OPEN(FindConfig($2), "r");
                         if (fp[curr_include_level + 1] == NULL) {
                             fprintf(stderr, "getconfig: Couldn't open <%s>\n", FindConfig($2));
-                            msyslog(LOG_INFO, "getconfig: Couldn't open <%s>", FindConfig($2));
+                            msyslog(LOG_ERR, "getconfig: Couldn't open <%s>", FindConfig($2));
                         }
                         else
                             ip_file = fp[++curr_include_level];
@@ -923,7 +923,7 @@ void yyerror (char *msg)
 {
     int retval;
     if (input_from_file)
-        fprintf(stderr, "%s\n", msg);
+        msyslog(LOG_ERR, "%s\n", msg);
     else {
         /* Save the error message in the correct buffer */
         retval = snprintf(remote_config.err_msg + remote_config.err_pos,