nsd contains two yacc parsers, but predates "yacc -b". Instead a

script renames the fields in one parser.  Three additional variables
(yysslim, yyssp, yystacksize) need to be renamed also.
Yes it is worse than stepping out of bed on the wrong side into cat vomit.

1 files changed, 36 insertions, 1 deletions

diff --git a/usr.sbin/nsd/configyyrename.h b/usr.sbin/nsd/configyyrename.h
index f1e125a1d1c..e16643533b2 100644
--- a/usr.sbin/nsd/configyyrename.h
+++ b/usr.sbin/nsd/configyyrename.h
@@ -9,7 +9,7 @@
 
 #ifndef CONFIGYYRENAME_H
 #define CONFIGYYRENAME_H
-#include <config.h>
+#include "config.h"
 
 /* defines to change symbols so that no yacc/lex symbols clash */
 #define yymaxdepth c_maxdepth
@@ -32,6 +32,10 @@
 #define yyps    c_ps
 #define yypv    c_pv
 #define yys     c_s
+#define yyss    c_ss
+#define yysslim c_sslimit
+#define yyssp   c_ssp
+#define yystacksize c_stacksize
 #define yy_yys  c_yys
 #define yystate c_state
 #define yytmp   c_tmp
@@ -85,5 +89,36 @@
 #define yyget_leng c_get_leng
 #define yylineno c_lineno
 #define yyget_text c_get_text
+#define yyvsp c_vsp
+#define yyvs c_vs
+#define yytext c_text
+#define yyleng c_leng
+#define yy_meta c__meta
+#define yy_start c__start
+#define yy_nxt c__nxt
+#define yy_n_chars c__n_chars
+#define yy_more_flag c__more_flag
+#define yy_more_len c__more_len
+#define yy_try_NUL_trans c__try_NUL_trans
+#define yy_last_accepting_cpos c__last_accepting_cpos
+#define yy_last_accepting_state c__last_accepting_state
+#define yy_init c__init
+#define yy_base c__base
+#define yy_accept c__accept
+#define yy_c_buf_p c__c_buf_p
+#define yy_chk c__chk
+#ifndef LEX_DEFINES_YY_CURRENT_BUFFER
+#  define yy_current_buffer c__current_buffer
+#endif
+#define yy_def c__def
+#define yy_did_buffer_switch_on_eof c__did_buffer_switch_on_eof
+#define yy_ec c__ec
+#define yy_fatal_error c__fatal_error
+#define yy_flex_alloc c__flex_alloc
+#define yy_flex_free c__flex_free
+#define yy_flex_realloc c__flex_realloc
+#define yy_get_next_buffer c__get_next_buffer
+#define yy_get_previous_state c__get_previous_state
+#define yy_hold_char c__hold_char
 
 #endif /* CONFIGYYRENAME_H */