diff options
author | Milan Crha <mcrha@redhat.com> | 2011-02-25 11:38:04 +0100 |
---|---|---|
committer | Matthias Dieter Wallnöfer <mdw@samba.org> | 2011-02-25 12:39:20 +0100 |
commit | ea9f72c0c5dc2b8271b66c11d477c09cc303969d (patch) | |
tree | d6a0865c11ef987c200bf2715904643b4aa330df | |
parent | 68c61a829b8487104483b23052b54c532fecb6ce (diff) | |
download | samba-ea9f72c0c5dc2b8271b66c11d477c09cc303969d.tar.gz samba-ea9f72c0c5dc2b8271b66c11d477c09cc303969d.tar.xz samba-ea9f72c0c5dc2b8271b66c11d477c09cc303969d.zip |
s4:heimdal - fix valgrind issue on Fedora 14
This should definitely fix bug #7858.
Signed-off-by: Matthias Dieter Wallnöfer <mdw@samba.org>
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Autobuild-User: Matthias Dieter Wallnöfer <mdw@samba.org>
Autobuild-Date: Fri Feb 25 12:39:21 CET 2011 on sn-devel-104
-rw-r--r-- | source4/heimdal/lib/asn1/asn1parse.c | 186 | ||||
-rw-r--r-- | source4/heimdal/lib/asn1/lex.c | 8 | ||||
-rw-r--r-- | source4/heimdal/lib/com_err/lex.c | 8 | ||||
-rw-r--r-- | source4/heimdal/lib/com_err/parse.c | 28 | ||||
-rw-r--r-- | source4/heimdal/lib/hx509/sel-gram.c | 58 | ||||
-rw-r--r-- | source4/heimdal/lib/hx509/sel-lex.c | 8 | ||||
-rwxr-xr-x | source4/heimdal_build/lexyacc.sh | 10 |
7 files changed, 153 insertions, 153 deletions
diff --git a/source4/heimdal/lib/asn1/asn1parse.c b/source4/heimdal/lib/asn1/asn1parse.c index 18bbcdd39c..0382bcf7f5 100644 --- a/source4/heimdal/lib/asn1/asn1parse.c +++ b/source4/heimdal/lib/asn1/asn1parse.c @@ -31,7 +31,7 @@ static const char yysccsid[] = "@(#)yaccpar 1.9 (Berkeley) 02/21/93"; extern int YYPARSE_DECL(); -#line 39 "" +#line 39 "asn1parse.c" #include <config.h> @@ -62,7 +62,7 @@ struct string_list { #define YYMALLOC malloc #define YYFREE free -#line 71 "" +#line 71 "asn1parse.c" typedef union { int constant; struct value *value; @@ -77,7 +77,7 @@ typedef union { struct memhead *members; struct constraint_spec *constraint_spec; } YYSTYPE; -#line 80 "" +#line 80 "asn1parse.c" #define kw_ABSENT 257 #define kw_ABSTRACT_SYNTAX 258 #define kw_ALL 259 @@ -612,7 +612,7 @@ YYSTYPE yylval; /* variables for the parser stack */ static YYSTACKDATA yystack; -#line 945 "" +#line 945 "asn1parse.c" void yyerror (const char *s) @@ -706,7 +706,7 @@ fix_labels(Symbol *s) fix_labels2(s->type, p); free(p); } -#line 709 "" +#line 709 "asn1parse.c" /* allocate initial stack or double stack size, up to YYMAXDEPTH */ static int yygrowstack(YYSTACKDATA *data) { @@ -909,25 +909,25 @@ yyreduce: switch (yyn) { case 1: -#line 241 "" +#line 241 "asn1parse.c" { checkundefined(); } break; case 3: -#line 248 "" +#line 248 "asn1parse.c" { lex_error_message("implicit tagging is not supported"); } break; case 4: -#line 250 "" +#line 250 "asn1parse.c" { lex_error_message("automatic tagging is not supported"); } break; case 6: -#line 255 "" +#line 255 "asn1parse.c" { lex_error_message("no extensibility options supported"); } break; case 16: -#line 276 "" +#line 276 "asn1parse.c" { struct string_list *sl; for(sl = yystack.l_mark[-3].sl; sl != NULL; sl = sl->next) { @@ -939,7 +939,7 @@ case 16: } break; case 17: -#line 288 "" +#line 288 "asn1parse.c" { struct string_list *sl; for(sl = yystack.l_mark[-1].sl; sl != NULL; sl = sl->next) @@ -947,7 +947,7 @@ case 17: } break; case 24: -#line 306 "" +#line 306 "asn1parse.c" { yyval.sl = emalloc(sizeof(*yyval.sl)); yyval.sl->string = yystack.l_mark[-2].name; @@ -955,7 +955,7 @@ case 24: } break; case 25: -#line 312 "" +#line 312 "asn1parse.c" { yyval.sl = emalloc(sizeof(*yyval.sl)); yyval.sl->string = yystack.l_mark[0].name; @@ -963,7 +963,7 @@ case 25: } break; case 26: -#line 320 "" +#line 320 "asn1parse.c" { Symbol *s = addsym (yystack.l_mark[-2].name); s->stype = Stype; @@ -973,14 +973,14 @@ case 26: } break; case 44: -#line 351 "" +#line 351 "asn1parse.c" { yyval.type = new_tag(ASN1_C_UNIV, UT_Boolean, TE_EXPLICIT, new_type(TBoolean)); } break; case 45: -#line 358 "" +#line 358 "asn1parse.c" { if(yystack.l_mark[-3].value->type != integervalue) lex_error_message("Non-integer used in first part of range"); @@ -992,7 +992,7 @@ case 45: } break; case 46: -#line 368 "" +#line 368 "asn1parse.c" { if(yystack.l_mark[-3].value->type != integervalue) lex_error_message("Non-integer in first part of range"); @@ -1002,7 +1002,7 @@ case 46: } break; case 47: -#line 376 "" +#line 376 "asn1parse.c" { if(yystack.l_mark[-1].value->type != integervalue) lex_error_message("Non-integer in second part of range"); @@ -1012,7 +1012,7 @@ case 47: } break; case 48: -#line 384 "" +#line 384 "asn1parse.c" { if(yystack.l_mark[-1].value->type != integervalue) lex_error_message("Non-integer used in limit"); @@ -1022,14 +1022,14 @@ case 48: } break; case 49: -#line 395 "" +#line 395 "asn1parse.c" { yyval.type = new_tag(ASN1_C_UNIV, UT_Integer, TE_EXPLICIT, new_type(TInteger)); } break; case 50: -#line 400 "" +#line 400 "asn1parse.c" { yyval.type = new_type(TInteger); yyval.type->range = yystack.l_mark[0].range; @@ -1037,7 +1037,7 @@ case 50: } break; case 51: -#line 406 "" +#line 406 "asn1parse.c" { yyval.type = new_type(TInteger); yyval.type->members = yystack.l_mark[-1].members; @@ -1045,7 +1045,7 @@ case 51: } break; case 52: -#line 414 "" +#line 414 "asn1parse.c" { yyval.members = emalloc(sizeof(*yyval.members)); ASN1_TAILQ_INIT(yyval.members); @@ -1053,18 +1053,18 @@ case 52: } break; case 53: -#line 420 "" +#line 420 "asn1parse.c" { ASN1_TAILQ_INSERT_TAIL(yystack.l_mark[-2].members, yystack.l_mark[0].member, members); yyval.members = yystack.l_mark[-2].members; } break; case 54: -#line 425 "" +#line 425 "asn1parse.c" { yyval.members = yystack.l_mark[-2].members; } break; case 55: -#line 429 "" +#line 429 "asn1parse.c" { yyval.member = emalloc(sizeof(*yyval.member)); yyval.member->name = yystack.l_mark[-3].name; @@ -1077,7 +1077,7 @@ case 55: } break; case 56: -#line 442 "" +#line 442 "asn1parse.c" { yyval.type = new_type(TInteger); yyval.type->members = yystack.l_mark[-1].members; @@ -1085,7 +1085,7 @@ case 56: } break; case 58: -#line 453 "" +#line 453 "asn1parse.c" { yyval.type = new_type(TBitString); yyval.type->members = emalloc(sizeof(*yyval.type->members)); @@ -1094,7 +1094,7 @@ case 58: } break; case 59: -#line 460 "" +#line 460 "asn1parse.c" { yyval.type = new_type(TBitString); yyval.type->members = yystack.l_mark[-1].members; @@ -1102,14 +1102,14 @@ case 59: } break; case 60: -#line 468 "" +#line 468 "asn1parse.c" { yyval.type = new_tag(ASN1_C_UNIV, UT_OID, TE_EXPLICIT, new_type(TOID)); } break; case 61: -#line 474 "" +#line 474 "asn1parse.c" { Type *t = new_type(TOctetString); t->range = yystack.l_mark[0].range; @@ -1118,22 +1118,22 @@ case 61: } break; case 62: -#line 483 "" +#line 483 "asn1parse.c" { yyval.type = new_tag(ASN1_C_UNIV, UT_Null, TE_EXPLICIT, new_type(TNull)); } break; case 63: -#line 490 "" +#line 490 "asn1parse.c" { yyval.range = NULL; } break; case 64: -#line 492 "" +#line 492 "asn1parse.c" { yyval.range = yystack.l_mark[0].range; } break; case 65: -#line 497 "" +#line 497 "asn1parse.c" { yyval.type = new_type(TSequence); yyval.type->members = yystack.l_mark[-1].members; @@ -1141,7 +1141,7 @@ case 65: } break; case 66: -#line 503 "" +#line 503 "asn1parse.c" { yyval.type = new_type(TSequence); yyval.type->members = NULL; @@ -1149,7 +1149,7 @@ case 66: } break; case 67: -#line 511 "" +#line 511 "asn1parse.c" { yyval.type = new_type(TSequenceOf); yyval.type->range = yystack.l_mark[-2].range; @@ -1158,7 +1158,7 @@ case 67: } break; case 68: -#line 520 "" +#line 520 "asn1parse.c" { yyval.type = new_type(TSet); yyval.type->members = yystack.l_mark[-1].members; @@ -1166,7 +1166,7 @@ case 68: } break; case 69: -#line 526 "" +#line 526 "asn1parse.c" { yyval.type = new_type(TSet); yyval.type->members = NULL; @@ -1174,7 +1174,7 @@ case 69: } break; case 70: -#line 534 "" +#line 534 "asn1parse.c" { yyval.type = new_type(TSetOf); yyval.type->subtype = yystack.l_mark[0].type; @@ -1182,14 +1182,14 @@ case 70: } break; case 71: -#line 542 "" +#line 542 "asn1parse.c" { yyval.type = new_type(TChoice); yyval.type->members = yystack.l_mark[-1].members; } break; case 74: -#line 553 "" +#line 553 "asn1parse.c" { Symbol *s = addsym(yystack.l_mark[0].name); yyval.type = new_type(TType); @@ -1200,21 +1200,21 @@ case 74: } break; case 75: -#line 564 "" +#line 564 "asn1parse.c" { yyval.type = new_tag(ASN1_C_UNIV, UT_GeneralizedTime, TE_EXPLICIT, new_type(TGeneralizedTime)); } break; case 76: -#line 569 "" +#line 569 "asn1parse.c" { yyval.type = new_tag(ASN1_C_UNIV, UT_UTCTime, TE_EXPLICIT, new_type(TUTCTime)); } break; case 77: -#line 576 "" +#line 576 "asn1parse.c" { /* if (Constraint.type == contentConstrant) { assert(Constraint.u.constraint.type == octetstring|bitstring-w/o-NamedBitList); // remember to check type reference too @@ -1229,13 +1229,13 @@ case 77: } break; case 78: -#line 592 "" +#line 592 "asn1parse.c" { yyval.constraint_spec = yystack.l_mark[-1].constraint_spec; } break; case 82: -#line 605 "" +#line 605 "asn1parse.c" { yyval.constraint_spec = new_constraint_spec(CT_CONTENTS); yyval.constraint_spec->u.content.type = yystack.l_mark[0].type; @@ -1243,7 +1243,7 @@ case 82: } break; case 83: -#line 611 "" +#line 611 "asn1parse.c" { if (yystack.l_mark[0].value->type != objectidentifiervalue) lex_error_message("Non-OID used in ENCODED BY constraint"); @@ -1253,7 +1253,7 @@ case 83: } break; case 84: -#line 619 "" +#line 619 "asn1parse.c" { if (yystack.l_mark[0].value->type != objectidentifiervalue) lex_error_message("Non-OID used in ENCODED BY constraint"); @@ -1263,13 +1263,13 @@ case 84: } break; case 85: -#line 629 "" +#line 629 "asn1parse.c" { yyval.constraint_spec = new_constraint_spec(CT_USER); } break; case 86: -#line 635 "" +#line 635 "asn1parse.c" { yyval.type = new_type(TTag); yyval.type->tag = yystack.l_mark[-2].tag; @@ -1282,7 +1282,7 @@ case 86: } break; case 87: -#line 648 "" +#line 648 "asn1parse.c" { yyval.tag.tagclass = yystack.l_mark[-2].constant; yyval.tag.tagvalue = yystack.l_mark[-1].constant; @@ -1290,49 +1290,49 @@ case 87: } break; case 88: -#line 656 "" +#line 656 "asn1parse.c" { yyval.constant = ASN1_C_CONTEXT; } break; case 89: -#line 660 "" +#line 660 "asn1parse.c" { yyval.constant = ASN1_C_UNIV; } break; case 90: -#line 664 "" +#line 664 "asn1parse.c" { yyval.constant = ASN1_C_APPL; } break; case 91: -#line 668 "" +#line 668 "asn1parse.c" { yyval.constant = ASN1_C_PRIVATE; } break; case 92: -#line 674 "" +#line 674 "asn1parse.c" { yyval.constant = TE_EXPLICIT; } break; case 93: -#line 678 "" +#line 678 "asn1parse.c" { yyval.constant = TE_EXPLICIT; } break; case 94: -#line 682 "" +#line 682 "asn1parse.c" { yyval.constant = TE_IMPLICIT; } break; case 95: -#line 689 "" +#line 689 "asn1parse.c" { Symbol *s; s = addsym (yystack.l_mark[-3].name); @@ -1343,63 +1343,63 @@ case 95: } break; case 97: -#line 703 "" +#line 703 "asn1parse.c" { yyval.type = new_tag(ASN1_C_UNIV, UT_GeneralString, TE_EXPLICIT, new_type(TGeneralString)); } break; case 98: -#line 708 "" +#line 708 "asn1parse.c" { yyval.type = new_tag(ASN1_C_UNIV, UT_TeletexString, TE_EXPLICIT, new_type(TTeletexString)); } break; case 99: -#line 713 "" +#line 713 "asn1parse.c" { yyval.type = new_tag(ASN1_C_UNIV, UT_UTF8String, TE_EXPLICIT, new_type(TUTF8String)); } break; case 100: -#line 718 "" +#line 718 "asn1parse.c" { yyval.type = new_tag(ASN1_C_UNIV, UT_PrintableString, TE_EXPLICIT, new_type(TPrintableString)); } break; case 101: -#line 723 "" +#line 723 "asn1parse.c" { yyval.type = new_tag(ASN1_C_UNIV, UT_VisibleString, TE_EXPLICIT, new_type(TVisibleString)); } break; case 102: -#line 728 "" +#line 728 "asn1parse.c" { yyval.type = new_tag(ASN1_C_UNIV, UT_IA5String, TE_EXPLICIT, new_type(TIA5String)); } break; case 103: -#line 733 "" +#line 733 "asn1parse.c" { yyval.type = new_tag(ASN1_C_UNIV, UT_BMPString, TE_EXPLICIT, new_type(TBMPString)); } break; case 104: -#line 738 "" +#line 738 "asn1parse.c" { yyval.type = new_tag(ASN1_C_UNIV, UT_UniversalString, TE_EXPLICIT, new_type(TUniversalString)); } break; case 105: -#line 746 "" +#line 746 "asn1parse.c" { yyval.members = emalloc(sizeof(*yyval.members)); ASN1_TAILQ_INIT(yyval.members); @@ -1407,14 +1407,14 @@ case 105: } break; case 106: -#line 752 "" +#line 752 "asn1parse.c" { ASN1_TAILQ_INSERT_TAIL(yystack.l_mark[-2].members, yystack.l_mark[0].member, members); yyval.members = yystack.l_mark[-2].members; } break; case 107: -#line 757 "" +#line 757 "asn1parse.c" { struct member *m = ecalloc(1, sizeof(*m)); m->name = estrdup("..."); @@ -1425,7 +1425,7 @@ case 107: } break; case 108: -#line 768 "" +#line 768 "asn1parse.c" { yyval.member = emalloc(sizeof(*yyval.member)); yyval.member->name = yystack.l_mark[-1].name; @@ -1436,7 +1436,7 @@ case 108: } break; case 109: -#line 779 "" +#line 779 "asn1parse.c" { yyval.member = yystack.l_mark[0].member; yyval.member->optional = 0; @@ -1444,7 +1444,7 @@ case 109: } break; case 110: -#line 785 "" +#line 785 "asn1parse.c" { yyval.member = yystack.l_mark[-1].member; yyval.member->optional = 1; @@ -1452,7 +1452,7 @@ case 110: } break; case 111: -#line 791 "" +#line 791 "asn1parse.c" { yyval.member = yystack.l_mark[-2].member; yyval.member->optional = 0; @@ -1460,7 +1460,7 @@ case 111: } break; case 112: -#line 799 "" +#line 799 "asn1parse.c" { yyval.members = emalloc(sizeof(*yyval.members)); ASN1_TAILQ_INIT(yyval.members); @@ -1468,14 +1468,14 @@ case 112: } break; case 113: -#line 805 "" +#line 805 "asn1parse.c" { ASN1_TAILQ_INSERT_TAIL(yystack.l_mark[-2].members, yystack.l_mark[0].member, members); yyval.members = yystack.l_mark[-2].members; } break; case 114: -#line 812 "" +#line 812 "asn1parse.c" { yyval.member = emalloc(sizeof(*yyval.member)); yyval.member->name = yystack.l_mark[-3].name; @@ -1488,23 +1488,23 @@ case 114: } break; case 116: -#line 825 "" +#line 825 "asn1parse.c" { yyval.objid = NULL; } break; case 117: -#line 829 "" +#line 829 "asn1parse.c" { yyval.objid = yystack.l_mark[-1].objid; } break; case 118: -#line 835 "" +#line 835 "asn1parse.c" { yyval.objid = NULL; } break; case 119: -#line 839 "" +#line 839 "asn1parse.c" { if (yystack.l_mark[0].objid) { yyval.objid = yystack.l_mark[0].objid; @@ -1515,13 +1515,13 @@ case 119: } break; case 120: -#line 850 "" +#line 850 "asn1parse.c" { yyval.objid = new_objid(yystack.l_mark[-3].name, yystack.l_mark[-1].constant); } break; case 121: -#line 854 "" +#line 854 "asn1parse.c" { Symbol *s = addsym(yystack.l_mark[0].name); if(s->stype != SValue || @@ -1534,13 +1534,13 @@ case 121: } break; case 122: -#line 865 "" +#line 865 "asn1parse.c" { yyval.objid = new_objid(NULL, yystack.l_mark[0].constant); } break; case 132: -#line 888 "" +#line 888 "asn1parse.c" { Symbol *s = addsym(yystack.l_mark[0].name); if(s->stype != SValue) @@ -1551,7 +1551,7 @@ case 132: } break; case 133: -#line 899 "" +#line 899 "asn1parse.c" { yyval.value = emalloc(sizeof(*yyval.value)); yyval.value->type = stringvalue; @@ -1559,7 +1559,7 @@ case 133: } break; case 134: -#line 907 "" +#line 907 "asn1parse.c" { yyval.value = emalloc(sizeof(*yyval.value)); yyval.value->type = booleanvalue; @@ -1567,7 +1567,7 @@ case 134: } break; case 135: -#line 913 "" +#line 913 "asn1parse.c" { yyval.value = emalloc(sizeof(*yyval.value)); yyval.value->type = booleanvalue; @@ -1575,7 +1575,7 @@ case 135: } break; case 136: -#line 921 "" +#line 921 "asn1parse.c" { yyval.value = emalloc(sizeof(*yyval.value)); yyval.value->type = integervalue; @@ -1583,19 +1583,19 @@ case 136: } break; case 138: -#line 932 "" +#line 932 "asn1parse.c" { } break; case 139: -#line 937 "" +#line 937 "asn1parse.c" { yyval.value = emalloc(sizeof(*yyval.value)); yyval.value->type = objectidentifiervalue; yyval.value->u.objectidentifiervalue = yystack.l_mark[0].objid; } break; -#line 1598 "" +#line 1598 "asn1parse.c" } yystack.s_mark -= yym; yystate = *yystack.s_mark; diff --git a/source4/heimdal/lib/asn1/lex.c b/source4/heimdal/lib/asn1/lex.c index 264d573008..067ce30a61 100644 --- a/source4/heimdal/lib/asn1/lex.c +++ b/source4/heimdal/lib/asn1/lex.c @@ -1,6 +1,6 @@ #include "config.h" -#line 3 "" +#line 3 "lex.c" #define YY_INT_ALIGNED short int @@ -848,7 +848,7 @@ static unsigned lineno = 1; static void unterminated(const char *, unsigned); /* This is for broken old lexes (solaris 10 and hpux) */ -#line 851 "" +#line 851 "lex.c" #define INITIAL 0 @@ -1032,7 +1032,7 @@ YY_DECL #line 68 "lex.l" -#line 1035 "" +#line 1035 "lex.c" if ( !(yy_init) ) { @@ -1701,7 +1701,7 @@ YY_RULE_SETUP #line 274 "lex.l" ECHO; YY_BREAK -#line 1704 "" +#line 1704 "lex.c" case YY_STATE_EOF(INITIAL): yyterminate(); diff --git a/source4/heimdal/lib/com_err/lex.c b/source4/heimdal/lib/com_err/lex.c index 9a61f5902b..e3c13a047e 100644 --- a/source4/heimdal/lib/com_err/lex.c +++ b/source4/heimdal/lib/com_err/lex.c @@ -1,6 +1,6 @@ #include "config.h" -#line 3 "" +#line 3 "lex.c" #define YY_INT_ALIGNED short int @@ -527,7 +527,7 @@ static int getstring(void); #undef ECHO -#line 530 "" +#line 530 "lex.c" #define INITIAL 0 @@ -709,7 +709,7 @@ YY_DECL #line 58 "lex.l" -#line 712 "" +#line 712 "lex.c" if ( !(yy_init) ) { @@ -873,7 +873,7 @@ YY_RULE_SETUP #line 74 "lex.l" ECHO; YY_BREAK -#line 876 "" +#line 876 "lex.c" case YY_STATE_EOF(INITIAL): yyterminate(); diff --git a/source4/heimdal/lib/com_err/parse.c b/source4/heimdal/lib/com_err/parse.c index a97c56f0b2..b6f5b97f04 100644 --- a/source4/heimdal/lib/com_err/parse.c +++ b/source4/heimdal/lib/com_err/parse.c @@ -31,7 +31,7 @@ static const char yysccsid[] = "@(#)yaccpar 1.9 (Berkeley) 02/21/93"; extern int YYPARSE_DECL(); -#line 2 "" +#line 2 "parse.c" /* * Copyright (c) 1998 - 2000 Kungliga Tekniska Högskolan * (Royal Institute of Technology, Stockholm, Sweden). @@ -82,12 +82,12 @@ extern char *yytext; #define YYMALLOC malloc #define YYFREE free -#line 54 "" +#line 54 "parse.c" typedef union { char *string; int number; } YYSTYPE; -#line 90 "" +#line 90 "parse.c" #define ET 257 #define INDEX 258 #define PREFIX 259 @@ -261,7 +261,7 @@ YYSTYPE yylval; /* variables for the parser stack */ static YYSTACKDATA yystack; -#line 144 "" +#line 144 "parse.c" static long name2number(const char *str) @@ -293,7 +293,7 @@ yyerror (char *s) { _lex_error_message ("%s\n", s); } -#line 296 "" +#line 296 "parse.c" /* allocate initial stack or double stack size, up to YYMAXDEPTH */ static int yygrowstack(YYSTACKDATA *data) { @@ -496,13 +496,13 @@ yyreduce: switch (yyn) { case 5: -#line 74 "" +#line 74 "parse.c" { id_str = yystack.l_mark[0].string; } break; case 6: -#line 80 "" +#line 80 "parse.c" { base_id = name2number(yystack.l_mark[0].string); strlcpy(name, yystack.l_mark[0].string, sizeof(name)); @@ -510,7 +510,7 @@ case 6: } break; case 7: -#line 86 "" +#line 86 "parse.c" { base_id = name2number(yystack.l_mark[-1].string); strlcpy(name, yystack.l_mark[0].string, sizeof(name)); @@ -519,13 +519,13 @@ case 7: } break; case 10: -#line 99 "" +#line 99 "parse.c" { number = yystack.l_mark[0].number; } break; case 11: -#line 103 "" +#line 103 "parse.c" { free(prefix); asprintf (&prefix, "%s_", yystack.l_mark[0].string); @@ -535,7 +535,7 @@ case 11: } break; case 12: -#line 111 "" +#line 111 "parse.c" { prefix = realloc(prefix, 1); if (prefix == NULL) @@ -544,7 +544,7 @@ case 12: } break; case 13: -#line 118 "" +#line 118 "parse.c" { struct error_code *ec = malloc(sizeof(*ec)); @@ -566,12 +566,12 @@ case 13: } break; case 14: -#line 138 "" +#line 138 "parse.c" { YYACCEPT; } break; -#line 574 "" +#line 574 "parse.c" } yystack.s_mark -= yym; yystate = *yystack.s_mark; diff --git a/source4/heimdal/lib/hx509/sel-gram.c b/source4/heimdal/lib/hx509/sel-gram.c index 5e705f19fd..fe3de4757b 100644 --- a/source4/heimdal/lib/hx509/sel-gram.c +++ b/source4/heimdal/lib/hx509/sel-gram.c @@ -31,7 +31,7 @@ static const char yysccsid[] = "@(#)yaccpar 1.9 (Berkeley) 02/21/93"; extern int YYPARSE_DECL(); -#line 35 "" +#line 35 "sel-gram.c" #ifdef HAVE_CONFIG_H #include <config.h> #endif @@ -40,12 +40,12 @@ extern int YYPARSE_DECL(); #include <hx_locl.h> -#line 45 "" +#line 45 "sel-gram.c" typedef union { char *string; struct hx_expr *expr; } YYSTYPE; -#line 48 "" +#line 48 "sel-gram.c" #define kw_TRUE 257 #define kw_FALSE 258 #define kw_AND 259 @@ -436,109 +436,109 @@ yyreduce: switch (yyn) { case 1: -#line 73 "" +#line 73 "sel-gram.c" { _hx509_expr_input.expr = yystack.l_mark[0].expr; } break; case 2: -#line 75 "" +#line 75 "sel-gram.c" { yyval.expr = _hx509_make_expr(op_TRUE, NULL, NULL); } break; case 3: -#line 76 "" +#line 76 "sel-gram.c" { yyval.expr = _hx509_make_expr(op_FALSE, NULL, NULL); } break; case 4: -#line 77 "" +#line 77 "sel-gram.c" { yyval.expr = _hx509_make_expr(op_NOT, yystack.l_mark[0].expr, NULL); } break; case 5: -#line 78 "" +#line 78 "sel-gram.c" { yyval.expr = _hx509_make_expr(op_AND, yystack.l_mark[-2].expr, yystack.l_mark[0].expr); } break; case 6: -#line 79 "" +#line 79 "sel-gram.c" { yyval.expr = _hx509_make_expr(op_OR, yystack.l_mark[-2].expr, yystack.l_mark[0].expr); } break; case 7: -#line 80 "" +#line 80 "sel-gram.c" { yyval.expr = yystack.l_mark[-1].expr; } break; case 8: -#line 81 "" +#line 81 "sel-gram.c" { yyval.expr = _hx509_make_expr(op_COMP, yystack.l_mark[0].expr, NULL); } break; case 9: -#line 84 "" +#line 84 "sel-gram.c" { yyval.expr = _hx509_make_expr(expr_WORDS, yystack.l_mark[0].expr, NULL); } break; case 10: -#line 85 "" +#line 85 "sel-gram.c" { yyval.expr = _hx509_make_expr(expr_WORDS, yystack.l_mark[-2].expr, yystack.l_mark[0].expr); } break; case 11: -#line 88 "" +#line 88 "sel-gram.c" { yyval.expr = _hx509_make_expr(comp_EQ, yystack.l_mark[-3].expr, yystack.l_mark[0].expr); } break; case 12: -#line 89 "" +#line 89 "sel-gram.c" { yyval.expr = _hx509_make_expr(comp_NE, yystack.l_mark[-3].expr, yystack.l_mark[0].expr); } break; case 13: -#line 90 "" +#line 90 "sel-gram.c" { yyval.expr = _hx509_make_expr(comp_TAILEQ, yystack.l_mark[-2].expr, yystack.l_mark[0].expr); } break; case 14: -#line 91 "" +#line 91 "sel-gram.c" { yyval.expr = _hx509_make_expr(comp_IN, yystack.l_mark[-4].expr, yystack.l_mark[-1].expr); } break; case 15: -#line 92 "" +#line 92 "sel-gram.c" { yyval.expr = _hx509_make_expr(comp_IN, yystack.l_mark[-2].expr, yystack.l_mark[0].expr); } break; case 16: -#line 95 "" +#line 95 "sel-gram.c" { yyval.expr = yystack.l_mark[0].expr; } break; case 17: -#line 96 "" +#line 96 "sel-gram.c" { yyval.expr = yystack.l_mark[0].expr; } break; case 18: -#line 97 "" +#line 97 "sel-gram.c" { yyval.expr = yystack.l_mark[0].expr; } break; case 19: -#line 98 "" +#line 98 "sel-gram.c" { yyval.expr = yystack.l_mark[0].expr; } break; case 20: -#line 101 "" +#line 101 "sel-gram.c" { yyval.expr = _hx509_make_expr(expr_NUMBER, yystack.l_mark[0].string, NULL); } break; case 21: -#line 102 "" +#line 102 "sel-gram.c" { yyval.expr = _hx509_make_expr(expr_STRING, yystack.l_mark[0].string, NULL); } break; case 22: -#line 104 "" +#line 104 "sel-gram.c" { yyval.expr = _hx509_make_expr(expr_FUNCTION, yystack.l_mark[-3].string, yystack.l_mark[-1].expr); } break; case 23: -#line 107 "" +#line 107 "sel-gram.c" { yyval.expr = yystack.l_mark[-1].expr; } break; case 24: -#line 110 "" +#line 110 "sel-gram.c" { yyval.expr = _hx509_make_expr(expr_VAR, yystack.l_mark[-2].string, yystack.l_mark[0].expr); } break; case 25: -#line 112 "" +#line 112 "sel-gram.c" { yyval.expr = _hx509_make_expr(expr_VAR, yystack.l_mark[0].string, NULL); } break; -#line 541 "" +#line 541 "sel-gram.c" } yystack.s_mark -= yym; yystate = *yystack.s_mark; diff --git a/source4/heimdal/lib/hx509/sel-lex.c b/source4/heimdal/lib/hx509/sel-lex.c index 703747217f..eacb68b43d 100644 --- a/source4/heimdal/lib/hx509/sel-lex.c +++ b/source4/heimdal/lib/hx509/sel-lex.c @@ -1,6 +1,6 @@ #include "config.h" -#line 3 "" +#line 3 "sel-lex.c" #define YY_INT_ALIGNED short int @@ -535,7 +535,7 @@ struct hx_expr_input _hx509_expr_input; #undef ECHO -#line 538 "" +#line 538 "sel-lex.c" #define INITIAL 0 @@ -720,7 +720,7 @@ YY_DECL #line 68 "sel-lex.l" -#line 723 "" +#line 723 "sel-lex.c" if ( !(yy_init) ) { @@ -867,7 +867,7 @@ YY_RULE_SETUP #line 85 "sel-lex.l" ECHO; YY_BREAK -#line 870 "" +#line 870 "sel-lex.c" case YY_STATE_EOF(INITIAL): yyterminate(); diff --git a/source4/heimdal_build/lexyacc.sh b/source4/heimdal_build/lexyacc.sh index cee21668e5..eb6314ad96 100755 --- a/source4/heimdal_build/lexyacc.sh +++ b/source4/heimdal_build/lexyacc.sh @@ -28,16 +28,16 @@ call_lex() { if [ -r lex.yy.c ]; then echo "#include \"config.h\"" > $base.c - sed -e "s|lex\.yy\.c|$DEST|" lex.yy.c >> $base.c + sed -e "s|lex\.yy\.c|$cfile|" lex.yy.c >> $base.c rm -f $base.yy.c elif [ -r $base.yy.c ]; then echo "#include \"config.h\"" > $base.c - sed -e "s|$base\.yy\.c|$DEST|" $base.yy.c >> $base.c + sed -e "s|$base\.yy\.c|$cfile|" $base.yy.c >> $base.c rm -f $base.yy.c elif [ -r $base.c ]; then mv $base.c $base.c.tmp echo "#include \"config.h\"" > $base.c - sed -e "s|$base\.yy\.c|$DEST|" $base.c.tmp >> $base.c + sed -e "s|$base\.yy\.c|$cfile|" $base.c.tmp >> $base.c rm -f $base.c.tmp elif [ ! -r base.c ]; then echo "$base.c nor $base.yy.c nor lex.yy.c generated." @@ -61,8 +61,8 @@ call_yacc() { $YACC -d $yfile || exit 1 if [ -r y.tab.h -a -r y.tab.c ];then - sed -e "/^#/!b" -e "s|y\.tab\.h|$SRC|" -e "s|\"$base.y|\"$SRC|" y.tab.h > $base.h - sed -e "s|y\.tab\.c|$SRC|" -e "s|\"$base.y|\"$SRC|" y.tab.c > $base.c + sed -e "/^#/!b" -e "s|y\.tab\.h|$cfile|" -e "s|\"$base.y|\"$cfile|" y.tab.h > $base.h + sed -e "s|y\.tab\.c|$cfile|" -e "s|\"$base.y|\"$cfile|" y.tab.c > $base.c rm -f y.tab.c y.tab.h elif [ ! -r $base.h -a ! -r $base.c]; then echo "$base.h nor $base.c generated." |