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