The Samba-Bugzilla – Attachment 6270 Details for
Bug 7858
Cannot run $PREFIX/sbin/samba under valgrind suddenly
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
samba.patch (the real one)
samba.patch (text/plain), 35.98 KB, created by
Milan Crha
on 2011-02-25 04:22:35 UTC
(
hide
)
Description:
samba.patch (the real one)
Filename:
MIME Type:
Creator:
Milan Crha
Created:
2011-02-25 04:22:35 UTC
Size:
35.98 KB
patch
obsolete
>diff --git a/source4/heimdal/lib/asn1/asn1parse.c b/source4/heimdal/lib/asn1/asn1parse.c >index 18bbcdd..2b7e3b0 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,8 +992,8 @@ 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"); > yyval.range = ecalloc(1, sizeof(*yyval.range)); >@@ -1002,8 +1002,8 @@ 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"); > yyval.range = ecalloc(1, sizeof(*yyval.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 264d573..067ce30 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 9a61f59..e3c13a0 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 a97c56f..b6f5b97 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/lex.yy.c b/source4/heimdal/lib/hx509/lex.yy.c >index 4ee5a26..b967a4f 100644 >--- a/source4/heimdal/lib/hx509/lex.yy.c >+++ b/source4/heimdal/lib/hx509/lex.yy.c >@@ -33,7 +33,7 @@ > #if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L > > /* C99 says to define __STDC_LIMIT_MACROS before including stdint.h, >- * if you want the limit (max/min) macros for int types. >+ * if you want the limit (max/min) macros for int types. > */ > #ifndef __STDC_LIMIT_MACROS > #define __STDC_LIMIT_MACROS 1 >@@ -50,7 +50,7 @@ typedef uint32_t flex_uint32_t; > typedef signed char flex_int8_t; > typedef short int flex_int16_t; > typedef int flex_int32_t; >-typedef unsigned char flex_uint8_t; >+typedef unsigned char flex_uint8_t; > typedef unsigned short int flex_uint16_t; > typedef unsigned int flex_uint32_t; > #endif /* ! C99 */ >@@ -161,7 +161,7 @@ extern FILE *yyin, *yyout; > #define EOB_ACT_LAST_MATCH 2 > > #define YY_LESS_LINENO(n) >- >+ > /* Return all but the first "n" matched characters back to the input stream. */ > #define yyless(n) \ > do \ >@@ -223,7 +223,7 @@ struct yy_buffer_state > > int yy_bs_lineno; /**< The line count. */ > int yy_bs_column; /**< The column count. */ >- >+ > /* Whether to try to fill the input buffer when we reach the > * end of it. > */ >@@ -594,7 +594,7 @@ extern int yywrap (void ); > #endif > > static void yyunput (int c,char *buf_ptr ); >- >+ > #ifndef yytext_ptr > static void yy_flex_strncpy (char *,yyconst char *,int ); > #endif >@@ -715,7 +715,7 @@ YY_DECL > register yy_state_type yy_current_state; > register char *yy_cp, *yy_bp; > register int yy_act; >- >+ > #line 68 "sel-lex.l" > > >@@ -1008,7 +1008,7 @@ case YY_STATE_EOF(INITIAL): > */ > static int yy_get_next_buffer (void) > { >- register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf; >+ register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf; > register char *source = (yytext_ptr); > register int number_to_move, i; > int ret_val; >@@ -1144,7 +1144,7 @@ static int yy_get_next_buffer (void) > { > register yy_state_type yy_current_state; > register char *yy_cp; >- >+ > yy_current_state = (yy_start); > > for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp ) >@@ -1175,7 +1175,7 @@ static int yy_get_next_buffer (void) > static yy_state_type yy_try_NUL_trans (yy_state_type yy_current_state ) > { > register int yy_is_jam; >- register char *yy_cp = (yy_c_buf_p); >+ register char *yy_cp = (yy_c_buf_p); > > register YY_CHAR yy_c = 1; > if ( yy_accept[yy_current_state] ) >@@ -1198,7 +1198,7 @@ static int yy_get_next_buffer (void) > static void yyunput (int c, register char * yy_bp ) > { > register char *yy_cp; >- >+ > yy_cp = (yy_c_buf_p); > > /* undo effects of setting up yytext */ >@@ -1241,7 +1241,7 @@ static int yy_get_next_buffer (void) > > { > int c; >- >+ > *(yy_c_buf_p) = (yy_hold_char); > > if ( *(yy_c_buf_p) == YY_END_OF_BUFFER_CHAR ) >@@ -1308,12 +1308,12 @@ static int yy_get_next_buffer (void) > > /** Immediately switch to a different input stream. > * @param input_file A readable stream. >- * >+ * > * @note This function does not reset the start condition to @c INITIAL . > */ > void yyrestart (FILE * input_file ) > { >- >+ > if ( ! YY_CURRENT_BUFFER ){ > yyensure_buffer_stack (); > YY_CURRENT_BUFFER_LVALUE = >@@ -1326,11 +1326,11 @@ static int yy_get_next_buffer (void) > > /** Switch to a different input buffer. > * @param new_buffer The new input buffer. >- * >+ * > */ > void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer ) > { >- >+ > /* TODO. We should be able to replace this entire function body > * with > * yypop_buffer_state(); >@@ -1361,7 +1361,7 @@ static int yy_get_next_buffer (void) > > static void yy_load_buffer_state (void) > { >- (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars; >+ (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars; > (yytext_ptr) = (yy_c_buf_p) = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos; > yyin = YY_CURRENT_BUFFER_LVALUE->yy_input_file; > (yy_hold_char) = *(yy_c_buf_p); >@@ -1370,13 +1370,13 @@ static void yy_load_buffer_state (void) > /** Allocate and initialize an input buffer state. > * @param file A readable stream. > * @param size The character buffer size in bytes. When in doubt, use @c YY_BUF_SIZE. >- * >+ * > * @return the allocated buffer state. > */ > YY_BUFFER_STATE yy_create_buffer (FILE * file, int size ) > { > YY_BUFFER_STATE b; >- >+ > b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state ) ); > if ( ! b ) > YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" ); >@@ -1399,11 +1399,11 @@ static void yy_load_buffer_state (void) > > /** Destroy the buffer. > * @param b a buffer created with yy_create_buffer() >- * >+ * > */ > void yy_delete_buffer (YY_BUFFER_STATE b ) > { >- >+ > if ( ! b ) > return; > >@@ -1419,7 +1419,7 @@ static void yy_load_buffer_state (void) > #ifndef __cplusplus > extern int isatty (int ); > #endif /* __cplusplus */ >- >+ > /* Initializes or reinitializes a buffer. > * This function is sometimes called more than once on the same buffer, > * such as during a yyrestart() or at EOF. >@@ -1428,7 +1428,7 @@ extern int isatty (int ); > > { > int oerrno = errno; >- >+ > yy_flush_buffer(b ); > > b->yy_input_file = file; >@@ -1444,17 +1444,17 @@ extern int isatty (int ); > } > > b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0; >- >+ > errno = oerrno; > } > > /** Discard all buffered characters. On the next scan, YY_INPUT will be called. > * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER. >- * >+ * > */ > void yy_flush_buffer (YY_BUFFER_STATE b ) > { >- if ( ! b ) >+ if ( ! b ) > return; > > b->yy_n_chars = 0; >@@ -1479,11 +1479,11 @@ extern int isatty (int ); > * the current state. This function will allocate the stack > * if necessary. > * @param new_buffer The new state. >- * >+ * > */ > void yypush_buffer_state (YY_BUFFER_STATE new_buffer ) > { >- if (new_buffer == NULL) >+ if (new_buffer == NULL) > return; > > yyensure_buffer_stack(); >@@ -1509,11 +1509,11 @@ void yypush_buffer_state (YY_BUFFER_STATE new_buffer ) > > /** Removes and deletes the top of the stack, if present. > * The next element becomes the new top. >- * >+ * > */ > void yypop_buffer_state (void) > { >- if (!YY_CURRENT_BUFFER) >+ if (!YY_CURRENT_BUFFER) > return; > > yy_delete_buffer(YY_CURRENT_BUFFER ); >@@ -1533,7 +1533,7 @@ void yypop_buffer_state (void) > static void yyensure_buffer_stack (void) > { > int num_to_alloc; >- >+ > if (!(yy_buffer_stack)) { > > /* First allocation is just for 2 elements, since we don't know if this >@@ -1546,9 +1546,9 @@ static void yyensure_buffer_stack (void) > ); > if ( ! (yy_buffer_stack) ) > YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" ); >- >+ > memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*)); >- >+ > (yy_buffer_stack_max) = num_to_alloc; > (yy_buffer_stack_top) = 0; > return; >@@ -1576,13 +1576,13 @@ static void yyensure_buffer_stack (void) > /** Setup the input buffer state to scan directly from a user-specified character buffer. > * @param base the character buffer > * @param size the size in bytes of the character buffer >- * >- * @return the newly allocated buffer state object. >+ * >+ * @return the newly allocated buffer state object. > */ > YY_BUFFER_STATE yy_scan_buffer (char * base, yy_size_t size ) > { > YY_BUFFER_STATE b; >- >+ > if ( size < 2 || > base[size-2] != YY_END_OF_BUFFER_CHAR || > base[size-1] != YY_END_OF_BUFFER_CHAR ) >@@ -1611,14 +1611,14 @@ YY_BUFFER_STATE yy_scan_buffer (char * base, yy_size_t size ) > /** Setup the input buffer state to scan a string. The next call to yylex() will > * scan from a @e copy of @a str. > * @param yystr a NUL-terminated string to scan >- * >+ * > * @return the newly allocated buffer state object. > * @note If you want to scan bytes that may contain NUL values, then use > * yy_scan_bytes() instead. > */ > YY_BUFFER_STATE yy_scan_string (yyconst char * yystr ) > { >- >+ > return yy_scan_bytes(yystr,strlen(yystr) ); > } > >@@ -1626,7 +1626,7 @@ YY_BUFFER_STATE yy_scan_string (yyconst char * yystr ) > * scan from a @e copy of @a bytes. > * @param bytes the byte buffer to scan > * @param len the number of bytes in the buffer pointed to by @a bytes. >- * >+ * > * @return the newly allocated buffer state object. > */ > YY_BUFFER_STATE yy_scan_bytes (yyconst char * yybytes, int _yybytes_len ) >@@ -1635,7 +1635,7 @@ YY_BUFFER_STATE yy_scan_bytes (yyconst char * yybytes, int _yybytes_len ) > char *buf; > yy_size_t n; > int i; >- >+ > /* Get memory for full buffer, including space for trailing EOB's. */ > n = _yybytes_len + 2; > buf = (char *) yyalloc(n ); >@@ -1665,7 +1665,7 @@ YY_BUFFER_STATE yy_scan_bytes (yyconst char * yybytes, int _yybytes_len ) > > static void yy_fatal_error (yyconst char* msg ) > { >- (void) fprintf( stderr, "%s\n", msg ); >+ (void) fprintf( stderr, "%s\n", msg ); > exit( YY_EXIT_FAILURE ); > } > >@@ -1689,16 +1689,16 @@ static void yy_fatal_error (yyconst char* msg ) > /* Accessor methods (get/set functions) to struct members. */ > > /** Get the current line number. >- * >+ * > */ > int yyget_lineno (void) > { >- >+ > return yylineno; > } > > /** Get the input stream. >- * >+ * > */ > FILE *yyget_in (void) > { >@@ -1706,7 +1706,7 @@ FILE *yyget_in (void) > } > > /** Get the output stream. >- * >+ * > */ > FILE *yyget_out (void) > { >@@ -1714,7 +1714,7 @@ FILE *yyget_out (void) > } > > /** Get the length of the current token. >- * >+ * > */ > int yyget_leng (void) > { >@@ -1722,7 +1722,7 @@ int yyget_leng (void) > } > > /** Get the current token. >- * >+ * > */ > > char *yyget_text (void) >@@ -1732,18 +1732,18 @@ char *yyget_text (void) > > /** Set the current line number. > * @param line_number >- * >+ * > */ > void yyset_lineno (int line_number ) > { >- >+ > yylineno = line_number; > } > > /** Set the input stream. This does not discard the current > * input buffer. > * @param in_str A readable stream. >- * >+ * > * @see yy_switch_to_buffer > */ > void yyset_in (FILE * in_str ) >@@ -1797,7 +1797,7 @@ static int yy_init_globals (void) > /* yylex_destroy is for both reentrant and non-reentrant scanners. */ > int yylex_destroy (void) > { >- >+ > /* Pop the buffer stack, destroying each element. */ > while(YY_CURRENT_BUFFER){ > yy_delete_buffer(YY_CURRENT_BUFFER ); >@@ -1921,3 +1921,4 @@ lex_input(char *buf, int max_size) > > return n; > } >+ >diff --git a/source4/heimdal/lib/hx509/sel-gram.c b/source4/heimdal/lib/hx509/sel-gram.c >index 5e705f1..fe3de47 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 7037472..eacb68b 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 cee2166..eb6314a 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."
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=6270">View the attachment on a separate page</a>.</b>
View Attachment As Raw
Actions:
View
Attachments on
bug 7858
:
6270