Commit e03d1973 authored by gates's avatar gates

Remove OpenSSL exception now that libgcrypt is being used for crypto.

parent b83e8c16
......@@ -500,18 +500,3 @@ necessary. Here is a sample; alter the names:
Ty Coon, President of Vice
That's all there is to it!
END OF GNU LESSER GENERAL PUBLIC LICENSE
--------------------------------------------------------------------------
OPENSSL EXCEPTION
In addition, as a special exception, the copyright holders of libbluray
gives permission to link the code of its release of libbluray with the
OpenSSL project's "OpenSSL" library (or with modified versions of it
that use the same license as the "OpenSSL" library), and distribute
the linked library. You must obey the GNU Lesser General Public
License in all respects for all of the code used other than "OpenSSL".
If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do
not wish to do so, delete this exception statement from your version.
......@@ -500,18 +500,3 @@ necessary. Here is a sample; alter the names:
Ty Coon, President of Vice
That's all there is to it!
END OF GNU LESSER GENERAL PUBLIC LICENSE
--------------------------------------------------------------------------
OPENSSL EXCEPTION
In addition, as a special exception, the copyright holders of libaacs
gives permission to link the code of its release of libaacs with the
OpenSSL project's "OpenSSL" library (or with modified versions of it
that use the same license as the "OpenSSL" library), and distribute
the linked library. You must obey the GNU Lesser General Public
License in all respects for all of the code used other than "OpenSSL".
If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do
not wish to do so, delete this exception statement from your version.
......@@ -15,16 +15,6 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library. If not, see
* <http://www.gnu.org/licenses/>.
*
* In addition, as a special exception, the copyright holders of libaacs
* gives permission to link the code of its release of libaacs with the
* OpenSSL project's "OpenSSL" library (or with modified versions of it
* that use the same license as the "OpenSSL" library), and distribute
* the linked library. You must obey the GNU Lesser General Public
* License in all respects for all of the code used other than "OpenSSL".
* If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do
* not wish to do so, delete this exception statement from your version.
*/
#include "file/keydbcfg.h"
......
......@@ -15,16 +15,6 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library. If not, see
* <http://www.gnu.org/licenses/>.
*
* In addition, as a special exception, the copyright holders of libaacs
* gives permission to link the code of its release of libaacs with the
* OpenSSL project's "OpenSSL" library (or with modified versions of it
* that use the same license as the "OpenSSL" library), and distribute
* the linked library. You must obey the GNU Lesser General Public
* License in all respects for all of the code used other than "OpenSSL".
* If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do
* not wish to do so, delete this exception statement from your version.
*/
#include "configfile.h"
......
......@@ -15,16 +15,6 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library. If not, see
* <http://www.gnu.org/licenses/>.
*
* In addition, as a special exception, the copyright holders of libaacs
* gives permission to link the code of its release of libaacs with the
* OpenSSL project's "OpenSSL" library (or with modified versions of it
* that use the same license as the "OpenSSL" library), and distribute
* the linked library. You must obey the GNU Lesser General Public
* License in all respects for all of the code used other than "OpenSSL".
* If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do
* not wish to do so, delete this exception statement from your version.
*/
#ifndef CONFIGFILE_H_
......
......@@ -15,16 +15,6 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library. If not, see
* <http://www.gnu.org/licenses/>.
*
* In addition, as a special exception, the copyright holders of libaacs
* gives permission to link the code of its release of libaacs with the
* OpenSSL project's "OpenSSL" library (or with modified versions of it
* that use the same license as the "OpenSSL" library), and distribute
* the linked library. You must obey the GNU Lesser General Public
* License in all respects for all of the code used other than "OpenSSL".
* If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do
* not wish to do so, delete this exception statement from your version.
*/
#ifndef FILE_H_
......
......@@ -15,16 +15,6 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library. If not, see
* <http://www.gnu.org/licenses/>.
*
* In addition, as a special exception, the copyright holders of libaacs
* gives permission to link the code of its release of libaacs with the
* OpenSSL project's "OpenSSL" library (or with modified versions of it
* that use the same license as the "OpenSSL" library), and distribute
* the linked library. You must obey the GNU Lesser General Public
* License in all respects for all of the code used other than "OpenSSL".
* If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do
* not wish to do so, delete this exception statement from your version.
*/
#include "file.h"
......
......@@ -16,16 +16,6 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library. If not, see
* <http://www.gnu.org/licenses/>.
*
* In addition, as a special exception, the copyright holders of libaacs
* gives permission to link the code of its release of libaacs with the
* OpenSSL project's "OpenSSL" library (or with modified versions of it
* that use the same license as the "OpenSSL" library), and distribute
* the linked library. You must obey the GNU Lesser General Public
* License in all respects for all of the code used other than "OpenSSL".
* If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do
* not wish to do so, delete this exception statement from your version.
*/
#include "keydbcfg-parser.h"
......
......@@ -16,16 +16,6 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library. If not, see
* <http://www.gnu.org/licenses/>.
*
* In addition, as a special exception, the copyright holders of libaacs
* gives permission to link the code of its release of libaacs with the
* OpenSSL project's "OpenSSL" library (or with modified versions of it
* that use the same license as the "OpenSSL" library), and distribute
* the linked library. You must obey the GNU Lesser General Public
* License in all respects for all of the code used other than "OpenSSL".
* If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do
* not wish to do so, delete this exception statement from your version.
*/
#include "keydbcfg.h"
......
......@@ -15,16 +15,6 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library. If not, see
* <http://www.gnu.org/licenses/>.
*
* In addition, as a special exception, the copyright holders of libaacs
* gives permission to link the code of its release of libaacs with the
* OpenSSL project's "OpenSSL" library (or with modified versions of it
* that use the same license as the "OpenSSL" library), and distribute
* the linked library. You must obey the GNU Lesser General Public
* License in all respects for all of the code used other than "OpenSSL".
* If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do
* not wish to do so, delete this exception statement from your version.
*/
#ifndef KEYDBCFG_H
......
......@@ -679,16 +679,6 @@ static yyconst flex_int32_t yy_rule_can_match_eol[27] =
* You should have received a copy of the GNU Lesser General Public
* License along with this library. If not, see
* <http://www.gnu.org/licenses/>.
*
* In addition, as a special exception, the copyright holders of libaacs
* gives permission to link the code of its release of libaacs with the
* OpenSSL project's "OpenSSL" library (or with modified versions of it
* that use the same license as the "OpenSSL" library), and distribute
* the linked library. You must obey the GNU Lesser General Public
* License in all respects for all of the code used other than "OpenSSL".
* If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do
* not wish to do so, delete this exception statement from your version.
*/
#include "keydbcfg-parser.h"
......@@ -707,7 +697,7 @@ static char *trim_string(const char *string);
*/
#define YY_NO_INPUT 1
#line 711 "keydbcfg-lexer.c"
#line 701 "keydbcfg-lexer.c"
#define INITIAL 0
#define TITLE_STATE 1
......@@ -944,9 +934,9 @@ YY_DECL
register int yy_act;
struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
#line 84 "keydbcfg-lexer.l"
#line 74 "keydbcfg-lexer.l"
#line 950 "keydbcfg-lexer.c"
#line 940 "keydbcfg-lexer.c"
yylval = yylval_param;
......@@ -1045,12 +1035,12 @@ do_action: /* This label is used only to access EOF actions. */
case 1:
YY_RULE_SETUP
#line 85 "keydbcfg-lexer.l"
#line 75 "keydbcfg-lexer.l"
{}
YY_BREAK
case 2:
YY_RULE_SETUP
#line 87 "keydbcfg-lexer.l"
#line 77 "keydbcfg-lexer.l"
{
yylval->string = trim_string(yytext);
BEGIN INITIAL;
......@@ -1060,7 +1050,7 @@ YY_RULE_SETUP
case 3:
/* rule 3 can match eol */
YY_RULE_SETUP
#line 92 "keydbcfg-lexer.l"
#line 82 "keydbcfg-lexer.l"
{
printf("Bad entry at line %u!\n", yylineno);
BEGIN INITIAL;
......@@ -1069,7 +1059,7 @@ YY_RULE_SETUP
YY_BREAK
case 4:
YY_RULE_SETUP
#line 98 "keydbcfg-lexer.l"
#line 88 "keydbcfg-lexer.l"
{
yylval->string = trim_string(yytext);
return HEXSTRING;
......@@ -1077,7 +1067,7 @@ YY_RULE_SETUP
YY_BREAK
case 5:
YY_RULE_SETUP
#line 102 "keydbcfg-lexer.l"
#line 92 "keydbcfg-lexer.l"
{
yylval->digit = (unsigned int)atoi(yytext);
return DIGIT;
......@@ -1085,112 +1075,112 @@ YY_RULE_SETUP
YY_BREAK
case 6:
YY_RULE_SETUP
#line 107 "keydbcfg-lexer.l"
#line 97 "keydbcfg-lexer.l"
{ return KEYWORD_BEGIN; }
YY_BREAK
case 7:
YY_RULE_SETUP
#line 108 "keydbcfg-lexer.l"
#line 98 "keydbcfg-lexer.l"
{ return KEYWORD_END; }
YY_BREAK
case 8:
YY_RULE_SETUP
#line 109 "keydbcfg-lexer.l"
#line 99 "keydbcfg-lexer.l"
{ return KEYWORD_PK_LIST; }
YY_BREAK
case 9:
YY_RULE_SETUP
#line 110 "keydbcfg-lexer.l"
#line 100 "keydbcfg-lexer.l"
{ return KEYWORD_HOST_CERT_LIST; }
YY_BREAK
case 10:
YY_RULE_SETUP
#line 111 "keydbcfg-lexer.l"
#line 101 "keydbcfg-lexer.l"
{ return KEYWORD_HOST_CERT_ENTRY; }
YY_BREAK
case 11:
YY_RULE_SETUP
#line 113 "keydbcfg-lexer.l"
#line 103 "keydbcfg-lexer.l"
{ return ENTRY_ID_DATE; }
YY_BREAK
case 12:
YY_RULE_SETUP
#line 114 "keydbcfg-lexer.l"
#line 104 "keydbcfg-lexer.l"
{ return ENTRY_ID_MEK; }
YY_BREAK
case 13:
YY_RULE_SETUP
#line 115 "keydbcfg-lexer.l"
#line 105 "keydbcfg-lexer.l"
{ return ENTRY_ID_VID; }
YY_BREAK
case 14:
YY_RULE_SETUP
#line 116 "keydbcfg-lexer.l"
#line 106 "keydbcfg-lexer.l"
{ return ENTRY_ID_BN; }
YY_BREAK
case 15:
YY_RULE_SETUP
#line 117 "keydbcfg-lexer.l"
#line 107 "keydbcfg-lexer.l"
{ return ENTRY_ID_VUK; }
YY_BREAK
case 16:
YY_RULE_SETUP
#line 118 "keydbcfg-lexer.l"
#line 108 "keydbcfg-lexer.l"
{ return ENTRY_ID_PAK; }
YY_BREAK
case 17:
YY_RULE_SETUP
#line 119 "keydbcfg-lexer.l"
#line 109 "keydbcfg-lexer.l"
{ return ENTRY_ID_TK; }
YY_BREAK
case 18:
YY_RULE_SETUP
#line 120 "keydbcfg-lexer.l"
#line 110 "keydbcfg-lexer.l"
{ return ENTRY_ID_UK; }
YY_BREAK
case 19:
YY_RULE_SETUP
#line 122 "keydbcfg-lexer.l"
#line 112 "keydbcfg-lexer.l"
{ BEGIN TITLE_STATE; return PUNCT_EQUALS_SIGN; }
YY_BREAK
case 20:
YY_RULE_SETUP
#line 123 "keydbcfg-lexer.l"
#line 113 "keydbcfg-lexer.l"
{ return PUNCT_VERTICAL_BAR; }
YY_BREAK
case 21:
YY_RULE_SETUP
#line 124 "keydbcfg-lexer.l"
#line 114 "keydbcfg-lexer.l"
{ return PUNCT_HYPHEN; }
YY_BREAK
case 22:
/* rule 22 can match eol */
YY_RULE_SETUP
#line 126 "keydbcfg-lexer.l"
#line 116 "keydbcfg-lexer.l"
{}
YY_BREAK
case 23:
/* rule 23 can match eol */
YY_RULE_SETUP
#line 127 "keydbcfg-lexer.l"
#line 117 "keydbcfg-lexer.l"
{ return NEWLINE; }
YY_BREAK
case 24:
YY_RULE_SETUP
#line 129 "keydbcfg-lexer.l"
#line 119 "keydbcfg-lexer.l"
{}
YY_BREAK
case 25:
YY_RULE_SETUP
#line 130 "keydbcfg-lexer.l"
#line 120 "keydbcfg-lexer.l"
{ return BAD_ENTRY; }
YY_BREAK
case 26:
YY_RULE_SETUP
#line 131 "keydbcfg-lexer.l"
#line 121 "keydbcfg-lexer.l"
ECHO;
YY_BREAK
#line 1194 "keydbcfg-lexer.c"
#line 1184 "keydbcfg-lexer.c"
case YY_STATE_EOF(INITIAL):
case YY_STATE_EOF(TITLE_STATE):
yyterminate();
......@@ -2327,7 +2317,7 @@ void yyfree (void * ptr , yyscan_t yyscanner)
#define YYTABLES_NAME "yytables"
#line 131 "keydbcfg-lexer.l"
#line 121 "keydbcfg-lexer.l"
/* Function used to trim leading and trailing space from a string */
......
......@@ -87,16 +87,6 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library. If not, see
* <http://www.gnu.org/licenses/>.
*
* In addition, as a special exception, the copyright holders of libaacs
* gives permission to link the code of its release of libaacs with the
* OpenSSL project's "OpenSSL" library (or with modified versions of it
* that use the same license as the "OpenSSL" library), and distribute
* the linked library. You must obey the GNU Lesser General Public
* License in all respects for all of the code used other than "OpenSSL".
* If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do
* not wish to do so, delete this exception statement from your version.
*/
#include "keydbcfg.h"
......@@ -166,7 +156,7 @@ extern int yyget_lineno (void *scanner);
/* Line 189 of yacc.c */
#line 170 "keydbcfg-parser.c"
#line 160 "keydbcfg-parser.c"
/* Enabling traces. */
#ifndef YYDEBUG
......@@ -247,7 +237,7 @@ typedef union YYSTYPE
{
/* Line 214 of yacc.c */
#line 112 "keydbcfg-parser.y"
#line 102 "keydbcfg-parser.y"
char *string;
unsigned int digit;
......@@ -255,7 +245,7 @@ typedef union YYSTYPE
/* Line 214 of yacc.c */
#line 259 "keydbcfg-parser.c"
#line 249 "keydbcfg-parser.c"
} YYSTYPE;
# define YYSTYPE_IS_TRIVIAL 1
# define yystype YYSTYPE /* obsolescent; will be withdrawn */
......@@ -267,7 +257,7 @@ typedef union YYSTYPE
/* Line 264 of yacc.c */
#line 271 "keydbcfg-parser.c"
#line 261 "keydbcfg-parser.c"
#ifdef short
# undef short
......@@ -582,14 +572,14 @@ static const yytype_int8 yyrhs[] =
/* YYRLINE[YYN] -- source line where rule number YYN was defined. */
static const yytype_uint16 yyrline[] =
{
0, 147, 147, 151, 155, 156, 160, 161, 165, 166,
170, 174, 181, 185, 186, 190, 191, 195, 196, 200,
204, 205, 209, 210, 214, 221, 223, 228, 230, 235,
237, 242, 244, 249, 250, 251, 259, 264, 269, 274,
282, 283, 287, 288, 292, 300, 304, 308, 309, 313,
314, 315, 316, 317, 318, 319, 320, 324, 331, 338,
345, 352, 353, 357, 369, 376, 383, 384, 388, 400,
407, 408, 412, 424, 431, 432, 436
0, 137, 137, 141, 145, 146, 150, 151, 155, 156,
160, 164, 171, 175, 176, 180, 181, 185, 186, 190,
194, 195, 199, 200, 204, 211, 213, 218, 220, 225,
227, 232, 234, 239, 240, 241, 249, 254, 259, 264,
272, 273, 277, 278, 282, 290, 294, 298, 299, 303,
304, 305, 306, 307, 308, 309, 310, 314, 321, 328,
335, 342, 343, 347, 359, 366, 373, 374, 378, 390,
397, 398, 402, 414, 421, 422, 426
};
#endif
......@@ -1640,7 +1630,7 @@ yyreduce:
case 10:
/* Line 1455 of yacc.c */
#line 171 "keydbcfg-parser.y"
#line 161 "keydbcfg-parser.y"
{
pklist = add_pk_list_entry(pklist, (yyvsp[(2) - (2)].string));
}
......@@ -1649,7 +1639,7 @@ yyreduce:
case 11:
/* Line 1455 of yacc.c */
#line 175 "keydbcfg-parser.y"
#line 165 "keydbcfg-parser.y"
{
pklist = add_pk_list_entry(pklist, (yyvsp[(1) - (1)].string));
}
......@@ -1658,7 +1648,7 @@ yyreduce:
case 24:
/* Line 1455 of yacc.c */
#line 215 "keydbcfg-parser.y"
#line 205 "keydbcfg-parser.y"
{
clist = add_cert_list(clist, (yyvsp[(1) - (4)].string), (yyvsp[(2) - (4)].string), (yyvsp[(3) - (4)].string), (yyvsp[(4) - (4)].string));
}
......@@ -1667,63 +1657,63 @@ yyreduce:
case 25:
/* Line 1455 of yacc.c */
#line 222 "keydbcfg-parser.y"
#line 212 "keydbcfg-parser.y"
{ (yyval.string) = (yyvsp[(2) - (3)].string); }
break;
case 26:
/* Line 1455 of yacc.c */
#line 224 "keydbcfg-parser.y"
#line 214 "keydbcfg-parser.y"
{ (yyval.string) = (yyvsp[(1) - (2)].string); }
break;
case 27:
/* Line 1455 of yacc.c */
#line 229 "keydbcfg-parser.y"
#line 219 "keydbcfg-parser.y"
{ (yyval.string) = (yyvsp[(2) - (3)].string); }
break;
case 28:
/* Line 1455 of yacc.c */
#line 231 "keydbcfg-parser.y"
#line 221 "keydbcfg-parser.y"
{ (yyval.string) = (yyvsp[(1) - (2)].string); }
break;
case 29:
/* Line 1455 of yacc.c */
#line 236 "keydbcfg-parser.y"
#line 226 "keydbcfg-parser.y"
{ (yyval.string) = (yyvsp[(2) - (3)].string); }
break;
case 30:
/* Line 1455 of yacc.c */
#line 238 "keydbcfg-parser.y"
#line 228 "keydbcfg-parser.y"
{ (yyval.string) = (yyvsp[(1) - (2)].string); }
break;
case 31:
/* Line 1455 of yacc.c */
#line 243 "keydbcfg-parser.y"
#line 233 "keydbcfg-parser.y"
{ (yyval.string) = (yyvsp[(2) - (3)].string); }
break;
case 32:
/* Line 1455 of yacc.c */
#line 245 "keydbcfg-parser.y"
#line 235 "keydbcfg-parser.y"
{ (yyval.string) = (yyvsp[(1) - (2)].string); }
break;
case 35:
/* Line 1455 of yacc.c */
#line 252 "keydbcfg-parser.y"
#line 242 "keydbcfg-parser.y"
{
if (yychar == YYEOF)
fprintf(stderr, "warning: last entry ended without newline\n");
......@@ -1733,7 +1723,7 @@ yyreduce:
case 36:
/* Line 1455 of yacc.c */
#line 260 "keydbcfg-parser.y"
#line 250 "keydbcfg-parser.y"
{
celist->next = new_config_entry_list();
celist = celist->next;
......@@ -1743,7 +1733,7 @@ yyreduce:
case 37:
/* Line 1455 of yacc.c */
#line 265 "keydbcfg-parser.y"
#line 255 "keydbcfg-parser.y"
{
celist->next = new_config_entry_list();
celist = celist->next;
......@@ -1753,7 +1743,7 @@ yyreduce:
case 38:
/* Line 1455 of yacc.c */
#line 270 "keydbcfg-parser.y"
#line 260 "keydbcfg-parser.y"
{
fprintf(stderr, "bad entry at line %d\n", yyget_lineno(scanner) - 1);
yyerrok;
......@@ -1763,7 +1753,7 @@ yyreduce:
case 39:
/* Line 1455 of yacc.c */
#line 275 "keydbcfg-parser.y"
#line 265 "keydbcfg-parser.y"
{
fprintf(stderr, "bad entry at line %d\n", yyget_lineno(scanner) - 1);
yyerrok;
......@@ -1773,7 +1763,7 @@ yyreduce:
case 44:
/* Line 1455 of yacc.c */
#line 293 "keydbcfg-parser.y"
#line 283 "keydbcfg-parser.y"
{
add_entry(celist, ENTRY_TYPE_DISCID, (yyvsp[(1) - (3)].string));
add_entry(celist, ENTRY_TYPE_TITLE, (yyvsp[(3) - (3)].string));
......@@ -1783,7 +1773,7 @@ yyreduce:
case 57:
/* Line 1455 of yacc.c */
#line 325 "keydbcfg-parser.y"
#line 315 "keydbcfg-parser.y"
{
add_date_entry(celist, (yyvsp[(2) - (6)].digit), (yyvsp[(4) - (6)].digit), (yyvsp[(6) - (6)].digit));
}
......@@ -1792,7 +1782,7 @@ yyreduce:
case 58:
/* Line 1455 of yacc.c */
#line 332 "keydbcfg-parser.y"
#line 322 "keydbcfg-parser.y"
{
add_entry(celist, ENTRY_TYPE_MEK, (yyvsp[(2) - (2)].string));
}
......@@ -1801,7 +1791,7 @@ yyreduce:
case 59:
/* Line 1455 of yacc.c */
#line 339 "keydbcfg-parser.y"
#line 329 "keydbcfg-parser.y"
{
add_entry(celist, ENTRY_TYPE_VID, (yyvsp[(2) - (2)].string));
}
......@@ -1810,7 +1800,7 @@ yyreduce:
case 60:
/* Line 1455 of yacc.c */
#line 346 "keydbcfg-parser.y"
#line 336 "keydbcfg-parser.y"
{
dkplist = NULL;
}
......@@ -1819,7 +1809,7 @@ yyreduce:
case 63:
/* Line 1455 of yacc.c */
#line 358 "keydbcfg-parser.y"
#line 348 "keydbcfg-parser.y"
{
if (!dkplist)
{
......@@ -1833,7 +1823,7 @@ yyreduce:
case 64:
/* Line 1455 of yacc.c */
#line 370 "keydbcfg-parser.y"
#line 360 "keydbcfg-parser.y"
{
add_entry(celist, ENTRY_TYPE_VUK, (yyvsp[(2) - (2)].string));
}
......@@ -1842,7 +1832,7 @@ yyreduce:
case 65:
/* Line 1455 of yacc.c */
#line 377 "keydbcfg-parser.y"
#line 367 "keydbcfg-parser.y"
{
dkplist = NULL;
}
......@@ -1851,7 +1841,7 @@ yyreduce:
case 68:
/* Line 1455 of yacc.c */
#line 389 "keydbcfg-parser.y"
#line 379 "keydbcfg-parser.y"
{
if (!dkplist)
{
......@@ -1865,7 +1855,7 @@ yyreduce:
case 69:
/* Line 1455 of yacc.c */
#line 401 "keydbcfg-parser.y"
#line 391 "keydbcfg-parser.y"
{
dkplist = NULL;
}
......@@ -1874,7 +1864,7 @@ yyreduce:
case 72:
/* Line 1455 of yacc.c */
#line 413 "keydbcfg-parser.y"
#line 403 "keydbcfg-parser.y"
{
if (!dkplist)
{
......@@ -1888,7 +1878,7 @@ yyreduce:
case 73:
/* Line 1455 of yacc.c */
#line 425 "keydbcfg-parser.y"
#line 415 "keydbcfg-parser.y"
{
dkplist = NULL;
}
......@@ -1897,7 +1887,7 @@ yyreduce:
case 76:
/* Line 1455 of yacc.c */
#line 437 "keydbcfg-parser.y"
#line 427 "keydbcfg-parser.y"
{
if (!dkplist)
{
......@@ -1911,7 +1901,7 @@ yyreduce:
/* Line 1455 of yacc.c */
#line 1915 "keydbcfg-parser.c"
#line 1905 "keydbcfg-parser.c"
default: break;
}
YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
......@@ -2123,7 +2113,7 @@ yyreturn:
/* Line 1675 of yacc.c */
#line 446 "keydbcfg-parser.y"
#line 436 "keydbcfg-parser.y"
/* Function to parse a config file */
int keydbcfg_parse_config(config_file *cfgfile, const char *path)
......
......@@ -93,7 +93,7 @@ typedef union YYSTYPE
{
/* Line 1676 of yacc.c */
#line 112 "keydbcfg-parser.y"