X-Git-Url: https://git.distorted.org.uk/~mdw/become/blobdiff_plain/c758e6541ca05409b178dd9629e9337494c49890..bc8fea8583d9b1419861f673f6d8a7728baeb4ba:/src/parser.y?ds=sidebyside diff --git a/src/parser.y b/src/parser.y index 8b4527b..cd9c1ce 100644 --- a/src/parser.y +++ b/src/parser.y @@ -1,6 +1,6 @@ /* -*-c-*- * - * $Id: parser.y,v 1.5 1998/01/12 16:46:22 mdw Exp $ + * $Id: parser.y,v 1.8 2003/10/12 00:14:55 mdw Exp $ * * Parser for `become.conf' files * @@ -29,6 +29,19 @@ /*----- Revision history --------------------------------------------------* * * $Log: parser.y,v $ + * Revision 1.8 2003/10/12 00:14:55 mdw + * Major overhaul. Now uses DSA signatures rather than the bogus symmetric + * encrypt-and-hope thing. Integrated with mLib and Catacomb. + * + * Revision 1.7 1999/03/26 15:25:22 mdw + * Insert some missing semicolons. Bison didn't seem to care, but other + * programs like `yyextract' do, so it's worth fixing. + * + * Revision 1.6 1998/04/23 13:26:49 mdw + * New `parse' interface to configuration file parser; informs caller + * whether parsing encountered any errors. Also support no-network + * configuration. + * * Revision 1.5 1998/01/12 16:46:22 mdw * Fix copyright date. * @@ -69,6 +82,11 @@ #include #include +/* --- mLib headers --- */ + +#include +#include + /* --- Local headers --- */ #include "class.h" @@ -76,9 +94,7 @@ #include "lexer.h" #include "name.h" #include "rule.h" -#include "sym.h" #include "userdb.h" -#include "utils.h" %} /*----- Stack type --------------------------------------------------------*/ @@ -206,18 +222,38 @@ host_spec : HOST name '=' host_class ';' { ; port_spec : PORT STRING ';' { +#ifndef NONETWORK struct servent *s = getservbyname($2, "udp"); if (!s) { moan("unknown service `%s' at line %i", $2, lex_line); - YYERROR; + yynerrs++; YYERROR; } daemon_usePort(s->s_port); +#else + yyerror("`port' command unsupported"); + yynerrs++; YYERROR; +#endif + } + | PORT INT ';' { +#ifndef NONETWORK + daemon_usePort(htons($2)); +#else + yyerror("`port' command unsupported"); + yynerrs++; YYERROR; +#endif } - | PORT INT ';' { daemon_usePort(htons($2)); } ; -key_spec : KEYFILE STRING ';' { daemon_readKey($2); } +key_spec : KEYFILE STRING ';' { +#ifndef NONETWORK + daemon_readKey($2); +#else + yyerror("`keyfile' command unsupported"); + yynerrs++; YYERROR; +#endif + } + ; /* --- Parsing allow specifications --- */ @@ -225,6 +261,7 @@ allow_spec : ALLOW host_class_opt user_class ARROW user_class_opt command_class_opt ';' { rule_add($2, $3, $5, $6); } + ; host_class_opt : /* empty */ { $$ = class_all; } | '[' host_class ']' { $$ = $2; } @@ -247,6 +284,7 @@ name : WORD { n->c = 0; $$ = n; } + ; /*----- Various class expression types ------------------------------------* * @@ -259,25 +297,25 @@ name : WORD { user_class : user_class ',' user_class { if (($$ = class_union($1, $3)) == 0) { yyerror("type mismatch"); - YYERROR; + yynerrs++; YYERROR; } } | user_class '-' user_class { if (($$ = class_diff($1, $3)) == 0) { yyerror("type mismatch"); - YYERROR; + yynerrs++; YYERROR; } } | user_class '&' user_class { if (($$ = class_isect($1, $3)) == 0) { yyerror("type mismatch"); - YYERROR; + yynerrs++; YYERROR; } } | user_class '|' user_class { if (($$ = class_union($1, $3)) == 0) { yyerror("type mismatch"); - YYERROR; + yynerrs++; YYERROR; } } | INT { $$ = class_fromUser(clType_user, $1); } @@ -286,7 +324,7 @@ user_class : user_class ',' user_class { if ((pw = userdb_userByName($1)) == 0) { moan("user `%s' not known at line %i", $1, lex_line); - YYERROR; + yynerrs++; YYERROR; } else $$ = class_fromUser(clType_user, pw->pw_uid); } @@ -295,10 +333,10 @@ user_class : user_class ',' user_class { if (!n || !n->c) { moan("class `%s' not found at line %i", $1, lex_line); - YYERROR; + yynerrs++; YYERROR; } else if (~n->c->type & clType_user) { - yyerror("type mismatch"); - YYERROR; + yynerrs++; yyerror("type mismatch"); + yynerrs++; YYERROR; } else { $$ = n->c; class_inc(n->c); @@ -312,25 +350,25 @@ user_class : user_class ',' user_class { command_class : command_class ',' command_class { if (($$ = class_union($1, $3)) == 0) { yyerror("type mismatch"); - YYERROR; + yynerrs++; YYERROR; } } | command_class '-' command_class { if (($$ = class_diff($1, $3)) == 0) { yyerror("type mismatch"); - YYERROR; + yynerrs++; YYERROR; } } | command_class '&' command_class { if (($$ = class_isect($1, $3)) == 0) { yyerror("type mismatch"); - YYERROR; + yynerrs++; YYERROR; } } | command_class '|' command_class { if (($$ = class_union($1, $3)) == 0) { yyerror("type mismatch"); - YYERROR; + yynerrs++; YYERROR; } } | STRING { $$ = class_fromString(clType_command, $1); } @@ -339,10 +377,10 @@ command_class : command_class ',' command_class { if (!n || !n->c) { moan("class `%s' not found at line %i", $1, lex_line); - YYERROR; + yynerrs++; YYERROR; } else if (~n->c->type & clType_command) { yyerror("type mismatch"); - YYERROR; + yynerrs++; YYERROR; } else { $$ = n->c; class_inc(n->c); @@ -356,25 +394,25 @@ command_class : command_class ',' command_class { host_class : host_class ',' host_class { if (($$ = class_union($1, $3)) == 0) { yyerror("type mismatch"); - YYERROR; + yynerrs++; YYERROR; } } | host_class '-' host_class { if (($$ = class_diff($1, $3)) == 0) { yyerror("type mismatch"); - YYERROR; + yynerrs++; YYERROR; } } | host_class '&' host_class { if (($$ = class_isect($1, $3)) == 0) { yyerror("type mismatch"); - YYERROR; + yynerrs++; YYERROR; } } | host_class '|' host_class { if (($$ = class_union($1, $3)) == 0) { yyerror("type mismatch"); - YYERROR; + yynerrs++; YYERROR; } } | STRING { $$ = class_fromString(clType_host, $1); } @@ -383,10 +421,10 @@ host_class : host_class ',' host_class { if (!n || !n->c) { moan("class `%s' not found at line %i", $1, lex_line); - YYERROR; + yynerrs++; YYERROR; } else if (~n->c->type & clType_host) { yyerror("type mismatch"); - YYERROR; + yynerrs++; YYERROR; } else { $$ = n->c; class_inc(n->c); @@ -395,4 +433,21 @@ host_class : host_class ',' host_class { | '(' host_class ')' { $$ = $2; } ; +/*----- Helper functions --------------------------------------------------*/ +%% +/* --- @parse@ --- * + * + * Arguments: --- + * + * Returns: Zero if it worked, nonzero if it didn't. + * + * Use: Parses configuration files. + */ + +int parse(void) +{ + yynerrs = 0; + return (yyparse() || yynerrs); +} + /*----- That's all, folks -------------------------------------------------*/