Regenerate ntp_parser.[ch] from ntp_parser.y

bk: 48cf08c4WtFTODbN0iHyd8waJR5ILA

diff --git a/ChangeLog b/ChangeLog
index c595d0effff42e577ab7ffcee3c1150a1b4625a4..ed0a526cfbe0de0f93d6f2a3a2396d4b99b1ccf4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* Regenerate ntp_parser.[ch] from ntp_parser.y
 (4.2.5p132) 2008/09/15 Released by Harlan Stenn <stenn@ntp.org>
 * [Bug 1067] Multicast DNS service registration must come after the fork
   on Solaris.

diff --git a/ntpd/ntp_parser.c b/ntpd/ntp_parser.c
index ec74f22bab1f8ee7921fe3f967a9db8256e1ca65..7c5af707dd1be64fd6bb0dabec34fc1b2d785566 100644 (file)
--- a/ntpd/ntp_parser.c
+++ b/ntpd/ntp_parser.c
@@ -455,7 +455,7 @@ typedef union YYSTYPE
     script_info *Sim_script;
 }
 /* Line 193 of yacc.c.  */
-#line 459 "ntp_parser.c"
+#line 459 "../../ntpd/ntp_parser.c"
        YYSTYPE;
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
@@ -468,7 +468,7 @@ typedef union YYSTYPE
 
 
 /* Line 216 of yacc.c.  */
-#line 472 "ntp_parser.c"
+#line 472 "../../ntpd/ntp_parser.c"
 
 #ifdef short
 # undef short
@@ -2098,10 +2098,10 @@ yyreduce:
 #line 292 "ntp_parser.y"
     {
                                        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");
                 }
     break;
@@ -2866,13 +2866,13 @@ yyreduce:
     {
                     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((yyvsp[(2) - (3)].String)), "r");
                         if (fp[curr_include_level + 1] == NULL) {
                             fprintf(stderr, "getconfig: Couldn't open <%s>\n", FindConfig((yyvsp[(2) - (3)].String)));
-                            msyslog(LOG_INFO, "getconfig: Couldn't open <%s>", FindConfig((yyvsp[(2) - (3)].String)));
+                            msyslog(LOG_ERR, "getconfig: Couldn't open <%s>", FindConfig((yyvsp[(2) - (3)].String)));
                         }
                         else
                             ip_file = fp[++curr_include_level];
@@ -3202,7 +3202,7 @@ yyreduce:
 
 
 /* Line 1267 of yacc.c.  */
-#line 3206 "ntp_parser.c"
+#line 3206 "../../ntpd/ntp_parser.c"
       default: break;
     }
   YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
@@ -3427,7 +3427,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,

diff --git a/ntpd/ntp_parser.h b/ntpd/ntp_parser.h
index 29ac442ce9eb337b90fffee60e4794d5e3386cf8..bc07082854b828fdcebfea381acd56fb7aa9b186 100644 (file)
--- a/ntpd/ntp_parser.h
+++ b/ntpd/ntp_parser.h
@@ -370,7 +370,7 @@ typedef union YYSTYPE
     script_info *Sim_script;
 }
 /* Line 1529 of yacc.c.  */
-#line 374 "ntp_parser.h"
+#line 374 "../../ntpd/ntp_parser.h"
        YYSTYPE;
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1