[SCM] Samba Shared Repository - branch master updated
Matthias Dieter Wallnöfer
mdw at samba.org
Fri Feb 25 04:40:01 MST 2011
The branch, master has been updated
via ea9f72c s4:heimdal - fix valgrind issue on Fedora 14
via 68c61a8 Revert "heimdal_build omit #line statments to allow valgrind to work again"
from 80e23c6 heimdal_build omit #line statments to allow valgrind to work again
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit ea9f72c0c5dc2b8271b66c11d477c09cc303969d
Author: Milan Crha <mcrha at redhat.com>
Date: Fri Feb 25 11:38:04 2011 +0100
s4:heimdal - fix valgrind issue on Fedora 14
This should definitely fix bug #7858.
Signed-off-by: Matthias Dieter Wallnöfer <mdw at samba.org>
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Autobuild-User: Matthias Dieter Wallnöfer <mdw at samba.org>
Autobuild-Date: Fri Feb 25 12:39:21 CET 2011 on sn-devel-104
commit 68c61a829b8487104483b23052b54c532fecb6ce
Author: Matthias Dieter Wallnöfer <mdw at samba.org>
Date: Fri Feb 25 11:54:02 2011 +0100
Revert "heimdal_build omit #line statments to allow valgrind to work again"
This reverts commit 80e23c68d83a7c9989f87d5a88a78bb76d222afc.
A better patch has been provided by Milan Crha in the following commit.
-----------------------------------------------------------------------
Summary of changes:
source4/heimdal/lib/asn1/asn1parse.c | 97 +++++++++++++++++++++++++-
source4/heimdal/lib/asn1/lex.c | 109 +++++++++++++++++++++++++++++-
source4/heimdal/lib/com_err/lex.c | 31 ++++++++-
source4/heimdal/lib/com_err/parse.c | 14 ++++
source4/heimdal/lib/hx509/lex.yy.c | 127 ++++++++++++++++++++--------------
source4/heimdal/lib/hx509/sel-gram.c | 29 ++++++++
source4/heimdal/lib/hx509/sel-lex.c | 28 +++++++-
source4/heimdal_build/lexyacc.sh | 16 ++---
8 files changed, 386 insertions(+), 65 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/heimdal/lib/asn1/asn1parse.c b/source4/heimdal/lib/asn1/asn1parse.c
index 87868f1..0382bcf 100644
--- a/source4/heimdal/lib/asn1/asn1parse.c
+++ b/source4/heimdal/lib/asn1/asn1parse.c
@@ -31,6 +31,7 @@ static const char yysccsid[] = "@(#)yaccpar 1.9 (Berkeley) 02/21/93";
extern int YYPARSE_DECL();
+#line 39 "asn1parse.c"
#include <config.h>
@@ -61,6 +62,7 @@ struct string_list {
#define YYMALLOC malloc
#define YYFREE free
+#line 71 "asn1parse.c"
typedef union {
int constant;
struct value *value;
@@ -75,6 +77,7 @@ typedef union {
struct memhead *members;
struct constraint_spec *constraint_spec;
} YYSTYPE;
+#line 80 "asn1parse.c"
#define kw_ABSENT 257
#define kw_ABSTRACT_SYNTAX 258
#define kw_ALL 259
@@ -609,6 +612,7 @@ YYSTYPE yylval;
/* variables for the parser stack */
static YYSTACKDATA yystack;
+#line 945 "asn1parse.c"
void
yyerror (const char *s)
@@ -702,6 +706,7 @@ fix_labels(Symbol *s)
fix_labels2(s->type, p);
free(p);
}
+#line 709 "asn1parse.c"
/* allocate initial stack or double stack size, up to YYMAXDEPTH */
static int yygrowstack(YYSTACKDATA *data)
{
@@ -904,20 +909,25 @@ yyreduce:
switch (yyn)
{
case 1:
+#line 241 "asn1parse.c"
{
checkundefined();
}
break;
case 3:
+#line 248 "asn1parse.c"
{ lex_error_message("implicit tagging is not supported"); }
break;
case 4:
+#line 250 "asn1parse.c"
{ lex_error_message("automatic tagging is not supported"); }
break;
case 6:
+#line 255 "asn1parse.c"
{ lex_error_message("no extensibility options supported"); }
break;
case 16:
+#line 276 "asn1parse.c"
{
struct string_list *sl;
for(sl = yystack.l_mark[-3].sl; sl != NULL; sl = sl->next) {
@@ -929,6 +939,7 @@ case 16:
}
break;
case 17:
+#line 288 "asn1parse.c"
{
struct string_list *sl;
for(sl = yystack.l_mark[-1].sl; sl != NULL; sl = sl->next)
@@ -936,6 +947,7 @@ case 17:
}
break;
case 24:
+#line 306 "asn1parse.c"
{
yyval.sl = emalloc(sizeof(*yyval.sl));
yyval.sl->string = yystack.l_mark[-2].name;
@@ -943,6 +955,7 @@ case 24:
}
break;
case 25:
+#line 312 "asn1parse.c"
{
yyval.sl = emalloc(sizeof(*yyval.sl));
yyval.sl->string = yystack.l_mark[0].name;
@@ -950,6 +963,7 @@ case 25:
}
break;
case 26:
+#line 320 "asn1parse.c"
{
Symbol *s = addsym (yystack.l_mark[-2].name);
s->stype = Stype;
@@ -959,12 +973,14 @@ case 26:
}
break;
case 44:
+#line 351 "asn1parse.c"
{
yyval.type = new_tag(ASN1_C_UNIV, UT_Boolean,
TE_EXPLICIT, new_type(TBoolean));
}
break;
case 45:
+#line 358 "asn1parse.c"
{
if(yystack.l_mark[-3].value->type != integervalue)
lex_error_message("Non-integer used in first part of range");
@@ -976,7 +992,8 @@ case 45:
}
break;
case 46:
- {
+#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));
@@ -985,7 +1002,8 @@ case 46:
}
break;
case 47:
- {
+#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));
@@ -994,6 +1012,7 @@ case 47:
}
break;
case 48:
+#line 384 "asn1parse.c"
{
if(yystack.l_mark[-1].value->type != integervalue)
lex_error_message("Non-integer used in limit");
@@ -1003,12 +1022,14 @@ case 48:
}
break;
case 49:
+#line 395 "asn1parse.c"
{
yyval.type = new_tag(ASN1_C_UNIV, UT_Integer,
TE_EXPLICIT, new_type(TInteger));
}
break;
case 50:
+#line 400 "asn1parse.c"
{
yyval.type = new_type(TInteger);
yyval.type->range = yystack.l_mark[0].range;
@@ -1016,6 +1037,7 @@ case 50:
}
break;
case 51:
+#line 406 "asn1parse.c"
{
yyval.type = new_type(TInteger);
yyval.type->members = yystack.l_mark[-1].members;
@@ -1023,6 +1045,7 @@ case 51:
}
break;
case 52:
+#line 414 "asn1parse.c"
{
yyval.members = emalloc(sizeof(*yyval.members));
ASN1_TAILQ_INIT(yyval.members);
@@ -1030,15 +1053,18 @@ case 52:
}
break;
case 53:
+#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 "asn1parse.c"
{ yyval.members = yystack.l_mark[-2].members; }
break;
case 55:
+#line 429 "asn1parse.c"
{
yyval.member = emalloc(sizeof(*yyval.member));
yyval.member->name = yystack.l_mark[-3].name;
@@ -1051,6 +1077,7 @@ case 55:
}
break;
case 56:
+#line 442 "asn1parse.c"
{
yyval.type = new_type(TInteger);
yyval.type->members = yystack.l_mark[-1].members;
@@ -1058,6 +1085,7 @@ case 56:
}
break;
case 58:
+#line 453 "asn1parse.c"
{
yyval.type = new_type(TBitString);
yyval.type->members = emalloc(sizeof(*yyval.type->members));
@@ -1066,6 +1094,7 @@ case 58:
}
break;
case 59:
+#line 460 "asn1parse.c"
{
yyval.type = new_type(TBitString);
yyval.type->members = yystack.l_mark[-1].members;
@@ -1073,12 +1102,14 @@ case 59:
}
break;
case 60:
+#line 468 "asn1parse.c"
{
yyval.type = new_tag(ASN1_C_UNIV, UT_OID,
TE_EXPLICIT, new_type(TOID));
}
break;
case 61:
+#line 474 "asn1parse.c"
{
Type *t = new_type(TOctetString);
t->range = yystack.l_mark[0].range;
@@ -1087,18 +1118,22 @@ case 61:
}
break;
case 62:
+#line 483 "asn1parse.c"
{
yyval.type = new_tag(ASN1_C_UNIV, UT_Null,
TE_EXPLICIT, new_type(TNull));
}
break;
case 63:
+#line 490 "asn1parse.c"
{ yyval.range = NULL; }
break;
case 64:
+#line 492 "asn1parse.c"
{ yyval.range = yystack.l_mark[0].range; }
break;
case 65:
+#line 497 "asn1parse.c"
{
yyval.type = new_type(TSequence);
yyval.type->members = yystack.l_mark[-1].members;
@@ -1106,6 +1141,7 @@ case 65:
}
break;
case 66:
+#line 503 "asn1parse.c"
{
yyval.type = new_type(TSequence);
yyval.type->members = NULL;
@@ -1113,6 +1149,7 @@ case 66:
}
break;
case 67:
+#line 511 "asn1parse.c"
{
yyval.type = new_type(TSequenceOf);
yyval.type->range = yystack.l_mark[-2].range;
@@ -1121,6 +1158,7 @@ case 67:
}
break;
case 68:
+#line 520 "asn1parse.c"
{
yyval.type = new_type(TSet);
yyval.type->members = yystack.l_mark[-1].members;
@@ -1128,6 +1166,7 @@ case 68:
}
break;
case 69:
+#line 526 "asn1parse.c"
{
yyval.type = new_type(TSet);
yyval.type->members = NULL;
@@ -1135,6 +1174,7 @@ case 69:
}
break;
case 70:
+#line 534 "asn1parse.c"
{
yyval.type = new_type(TSetOf);
yyval.type->subtype = yystack.l_mark[0].type;
@@ -1142,12 +1182,14 @@ case 70:
}
break;
case 71:
+#line 542 "asn1parse.c"
{
yyval.type = new_type(TChoice);
yyval.type->members = yystack.l_mark[-1].members;
}
break;
case 74:
+#line 553 "asn1parse.c"
{
Symbol *s = addsym(yystack.l_mark[0].name);
yyval.type = new_type(TType);
@@ -1158,18 +1200,21 @@ case 74:
}
break;
case 75:
+#line 564 "asn1parse.c"
{
yyval.type = new_tag(ASN1_C_UNIV, UT_GeneralizedTime,
TE_EXPLICIT, new_type(TGeneralizedTime));
}
break;
case 76:
+#line 569 "asn1parse.c"
{
yyval.type = new_tag(ASN1_C_UNIV, UT_UTCTime,
TE_EXPLICIT, new_type(TUTCTime));
}
break;
case 77:
+#line 576 "asn1parse.c"
{
/* if (Constraint.type == contentConstrant) {
assert(Constraint.u.constraint.type == octetstring|bitstring-w/o-NamedBitList); // remember to check type reference too
@@ -1184,11 +1229,13 @@ case 77:
}
break;
case 78:
+#line 592 "asn1parse.c"
{
yyval.constraint_spec = yystack.l_mark[-1].constraint_spec;
}
break;
case 82:
+#line 605 "asn1parse.c"
{
yyval.constraint_spec = new_constraint_spec(CT_CONTENTS);
yyval.constraint_spec->u.content.type = yystack.l_mark[0].type;
@@ -1196,6 +1243,7 @@ case 82:
}
break;
case 83:
+#line 611 "asn1parse.c"
{
if (yystack.l_mark[0].value->type != objectidentifiervalue)
lex_error_message("Non-OID used in ENCODED BY constraint");
@@ -1205,6 +1253,7 @@ case 83:
}
break;
case 84:
+#line 619 "asn1parse.c"
{
if (yystack.l_mark[0].value->type != objectidentifiervalue)
lex_error_message("Non-OID used in ENCODED BY constraint");
@@ -1214,11 +1263,13 @@ case 84:
}
break;
case 85:
+#line 629 "asn1parse.c"
{
yyval.constraint_spec = new_constraint_spec(CT_USER);
}
break;
case 86:
+#line 635 "asn1parse.c"
{
yyval.type = new_type(TTag);
yyval.type->tag = yystack.l_mark[-2].tag;
@@ -1231,6 +1282,7 @@ case 86:
}
break;
case 87:
+#line 648 "asn1parse.c"
{
yyval.tag.tagclass = yystack.l_mark[-2].constant;
yyval.tag.tagvalue = yystack.l_mark[-1].constant;
@@ -1238,41 +1290,49 @@ case 87:
}
break;
case 88:
+#line 656 "asn1parse.c"
{
yyval.constant = ASN1_C_CONTEXT;
}
break;
case 89:
+#line 660 "asn1parse.c"
{
yyval.constant = ASN1_C_UNIV;
}
break;
case 90:
+#line 664 "asn1parse.c"
{
yyval.constant = ASN1_C_APPL;
}
break;
case 91:
+#line 668 "asn1parse.c"
{
yyval.constant = ASN1_C_PRIVATE;
}
break;
case 92:
+#line 674 "asn1parse.c"
{
yyval.constant = TE_EXPLICIT;
}
break;
case 93:
+#line 678 "asn1parse.c"
{
yyval.constant = TE_EXPLICIT;
}
break;
case 94:
+#line 682 "asn1parse.c"
{
yyval.constant = TE_IMPLICIT;
}
break;
case 95:
+#line 689 "asn1parse.c"
{
Symbol *s;
s = addsym (yystack.l_mark[-3].name);
@@ -1283,54 +1343,63 @@ case 95:
}
break;
case 97:
+#line 703 "asn1parse.c"
{
yyval.type = new_tag(ASN1_C_UNIV, UT_GeneralString,
TE_EXPLICIT, new_type(TGeneralString));
}
break;
case 98:
+#line 708 "asn1parse.c"
{
yyval.type = new_tag(ASN1_C_UNIV, UT_TeletexString,
TE_EXPLICIT, new_type(TTeletexString));
}
break;
case 99:
+#line 713 "asn1parse.c"
{
yyval.type = new_tag(ASN1_C_UNIV, UT_UTF8String,
TE_EXPLICIT, new_type(TUTF8String));
}
break;
case 100:
+#line 718 "asn1parse.c"
{
yyval.type = new_tag(ASN1_C_UNIV, UT_PrintableString,
TE_EXPLICIT, new_type(TPrintableString));
}
break;
case 101:
+#line 723 "asn1parse.c"
{
yyval.type = new_tag(ASN1_C_UNIV, UT_VisibleString,
TE_EXPLICIT, new_type(TVisibleString));
}
break;
case 102:
+#line 728 "asn1parse.c"
{
yyval.type = new_tag(ASN1_C_UNIV, UT_IA5String,
TE_EXPLICIT, new_type(TIA5String));
}
break;
case 103:
+#line 733 "asn1parse.c"
{
yyval.type = new_tag(ASN1_C_UNIV, UT_BMPString,
TE_EXPLICIT, new_type(TBMPString));
}
break;
case 104:
+#line 738 "asn1parse.c"
{
yyval.type = new_tag(ASN1_C_UNIV, UT_UniversalString,
TE_EXPLICIT, new_type(TUniversalString));
}
break;
case 105:
+#line 746 "asn1parse.c"
{
yyval.members = emalloc(sizeof(*yyval.members));
ASN1_TAILQ_INIT(yyval.members);
--
Samba Shared Repository
More information about the samba-cvs
mailing list