---
 parser_lex.l  |   26 +++++++++++++-------------
 parser_yacc.y |    2 +-
 2 files changed, 14 insertions(+), 14 deletions(-)

--- a/parser_lex.l
+++ b/parser_lex.l
@@ -105,7 +105,7 @@ COMMENT_START	#[a-z]*
 			   * match any random string, I go into a
 			   * seperate state. */
 			yylval = (YYSTYPE) processunquoted(yytext, yyleng);
-			PDEBUG("Found sub name: \"%s\"\n", yylval);
+			PDEBUG("Found sub name: \"%s\"\n", yylval.id);
 			BEGIN(INITIAL);
 			return TOK_ID;
 		}
@@ -118,7 +118,7 @@ COMMENT_START	#[a-z]*
 			   * match any random string, I go into a
 			   * seperate state. */
 			yylval = (YYSTYPE) processquoted(yytext, yyleng);
-			PDEBUG("Found sub name: \"%s\"\n", yylval);
+			PDEBUG("Found sub name: \"%s\"\n", yylval.id);
 			BEGIN(INITIAL);
 			return TOK_ID;
 		}
@@ -139,7 +139,7 @@ COMMENT_START	#[a-z]*
 			   * match any random string, I go into a
 			   * seperate state. */
 			yylval = (YYSTYPE) processunquoted(yytext, yyleng);
-			PDEBUG("Found sub name: \"%s\"\n", yylval);
+			PDEBUG("Found sub name: \"%s\"\n", yylval.id);
 			BEGIN(INITIAL);
 			return TOK_ID;
 		}
@@ -152,7 +152,7 @@ COMMENT_START	#[a-z]*
 			   * match any random string, I go into a
 			   * seperate state. */
 			yylval = (YYSTYPE) processquoted(yytext, yyleng);
-			PDEBUG("Found sub name: \"%s\"\n", yylval);
+			PDEBUG("Found sub name: \"%s\"\n", yylval.id);
 			BEGIN(INITIAL);
 			return TOK_ID;
 		}
@@ -202,13 +202,13 @@ COMMENT_START	#[a-z]*
 
 	{ID}+		{
 			yylval = (YYSTYPE) processunquoted(yytext, yyleng);
-			PDEBUG("Found assignment value: \"%s\"\n", yylval);
+			PDEBUG("Found assignment value: \"%s\"\n", yylval.id);
 			return TOK_VALUE;
 			}
 
 	{QUOTED_ID}	{
 			yylval = (YYSTYPE) processquoted(yytext, yyleng);
-			PDEBUG("Found assignment value: \"%s\"\n", yylval);
+			PDEBUG("Found assignment value: \"%s\"\n", yylval.id);
 			return TOK_VALUE;
 			}
 
@@ -234,7 +234,7 @@ COMMENT_START	#[a-z]*
 	[^\n]		{
 			  /* Something we didn't expect */
 			yylval = (YYSTYPE) strdup(yytext);
-			yyerror(_("(network_mode) Found unexpected character: '%s'"), yylval);
+			yyerror(_("(network_mode) Found unexpected character: '%s'"), yytext);
 			}
 
 	\r?\n		{
@@ -334,13 +334,13 @@ COMMENT_START	#[a-z]*
 
 {SET_VARIABLE}		{
 			yylval = (YYSTYPE) strdup(yytext);
-			PDEBUG("Found set variable %s\n", yylval);
+			PDEBUG("Found set variable %s\n", yytext);
 			return TOK_SET_VAR;
 			}
 
 {BOOL_VARIABLE}		{
 			yylval = (YYSTYPE) strdup(yytext);
-			PDEBUG("Found boolean variable %s\n", yylval);
+			PDEBUG("Found boolean variable %s\n", yytext);
 			return TOK_BOOL_VAR;
 			}
 
@@ -355,19 +355,19 @@ COMMENT_START	#[a-z]*
 
 {PATHNAME}		{  
 			yylval = (YYSTYPE) processunquoted(yytext, yyleng);
-			PDEBUG("Found id: \"%s\"\n", yylval);
+			PDEBUG("Found id: \"%s\"\n", yylval.id);
 			return TOK_ID;
 			}
 
 {QPATHNAME}		{  
 			yylval = (YYSTYPE) processquoted(yytext, yyleng);
-			PDEBUG("Found id: \"%s\"\n", yylval);
+			PDEBUG("Found id: \"%s\"\n", yylval.id);
 			return TOK_ID;
 			}
 
 {MODES}			{
 			yylval = (YYSTYPE) strdup(yytext);
-			PDEBUG("Found modes: %s\n", yylval);
+			PDEBUG("Found modes: %s\n", yytext);
 			return TOK_MODE;
 			}
 
@@ -395,7 +395,7 @@ COMMENT_START	#[a-z]*
 			case -1:
 				/* no token found */
 				yylval = (YYSTYPE) processunquoted(yytext, yyleng);
-				PDEBUG("Found id: \"%s\"\n", yylval);
+				PDEBUG("Found id: \"%s\"\n", yylval.id);
 				return TOK_ID;
 				break;
 			case TOK_PROFILE:
--- a/parser_yacc.y
+++ b/parser_yacc.y
@@ -1153,7 +1153,7 @@ void add_local_entry(struct codomain *co
 struct codomain *do_local_profile(struct codomain *cod, char *name, int mode,
 	int audit)
 {
-	PDEBUG("Matched: local profile trans (%s) open rules close\n", $1);
+	PDEBUG("Matched: local profile trans (%s) open rules close\n", name);
 	if (!cod) {
 		yyerror(_("Memory allocation error."));
 	}