X-Git-Url: https://git.distorted.org.uk/~mdw/become/blobdiff_plain/c4f2d992e4a0fc068281376d89ec38de56dc2f58..c758e6541ca05409b178dd9629e9337494c49890:/src/parser.y diff --git a/src/parser.y b/src/parser.y index 0a8462f..8b4527b 100644 --- a/src/parser.y +++ b/src/parser.y @@ -1,13 +1,13 @@ /* -*-c-*- * - * $Id: parser.y,v 1.1 1997/07/21 13:47:45 mdw Exp $ + * $Id: parser.y,v 1.5 1998/01/12 16:46:22 mdw Exp $ * * Parser for `become.conf' files * - * (c) 1997 EBI + * (c) 1998 EBI */ -/*----- Licencing notice --------------------------------------------------* +/*----- Licensing notice --------------------------------------------------* * * This file is part of `become' * @@ -22,14 +22,27 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with `become'; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * along with `become'; if not, write to the Free Software Foundation, + * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /*----- Revision history --------------------------------------------------* * * $Log: parser.y,v $ - * Revision 1.1 1997/07/21 13:47:45 mdw + * Revision 1.5 1998/01/12 16:46:22 mdw + * Fix copyright date. + * + * Revision 1.4 1997/09/17 10:26:52 mdw + * Use rewritten class handler. Makes the expression parsers considerably + * simpler. + * + * Revision 1.3 1997/09/09 18:17:06 mdw + * Allow default port to be given as a service name or port number. + * + * Revision 1.2 1997/08/04 10:24:24 mdw + * Sources placed under CVS control. + * + * Revision 1.1 1997/07/21 13:47:45 mdw * Initial revision * */ @@ -46,7 +59,13 @@ /* --- Unix headers --- */ #include +#include +#include + +#include + +#include #include #include @@ -57,7 +76,6 @@ #include "lexer.h" #include "name.h" #include "rule.h" -#include "set.h" #include "sym.h" #include "userdb.h" #include "utils.h" @@ -69,7 +87,7 @@ long i; char *s; name *n; - classdef *c; + class_node *c; } /*----- Token and rule declarations ---------------------------------------*/ @@ -187,7 +205,16 @@ host_spec : HOST name '=' host_class ';' { } ; -port_spec : PORT INT ';' { daemon_usePort($2); } +port_spec : PORT STRING ';' { + struct servent *s = getservbyname($2, "udp"); + if (!s) { + moan("unknown service `%s' at line %i", + $2, lex_line); + YYERROR; + } + daemon_usePort(s->s_port); + } + | PORT INT ';' { daemon_usePort(htons($2)); } ; key_spec : KEYFILE STRING ';' { daemon_readKey($2); } @@ -230,90 +257,38 @@ name : WORD { /* --- User class expressions --- */ user_class : user_class ',' user_class { - if ($1->type != $3->type) { + if (($$ = class_union($1, $3)) == 0) { yyerror("type mismatch"); - class_dec($1); - class_dec($3); YYERROR; - } else { - if ($1 == class_all) - $$ = class_all; - else - $$ = class_create($1->type, - set_union($1->t, $3->t)); - class_dec($1); - class_dec($3); } } | user_class '-' user_class { - if ($1->type != $3->type) { + if (($$ = class_diff($1, $3)) == 0) { yyerror("type mismatch"); - class_dec($1); - class_dec($3); YYERROR; - } else { - $$ = class_create($1->type, - set_subtract($1->t, $3->t)); - class_dec($1); - class_dec($3); } } | user_class '&' user_class { - if ($1->type != $3->type) { + if (($$ = class_isect($1, $3)) == 0) { yyerror("type mismatch"); - class_dec($1); - class_dec($3); YYERROR; - } else { - if ($1 == class_all) - $$ = class_all; - else - $$ = class_create($1->type, - set_intersect($1->t, $3->t)); - class_dec($1); - class_dec($3); } } | user_class '|' user_class { - if ($1->type != $3->type) { + if (($$ = class_union($1, $3)) == 0) { yyerror("type mismatch"); - class_dec($1); - class_dec($3); YYERROR; - } else { - if ($1 == class_all) - $$ = class_all; - else - $$ = class_create($1->type, - set_union($1->t, $3->t)); - class_dec($1); - class_dec($3); } } - | INT { - sym_table *t = xmalloc(sizeof(*t)); - int u = $1; - sym_createTable(t); - sym_find(t, (char *)&u, sizeof(u), - sizeof(sym_base), 0); - $$ = class_create(clType_user, t); - } + | INT { $$ = class_fromUser(clType_user, $1); } | STRING { struct passwd *pw; - sym_table *t; - int u; if ((pw = userdb_userByName($1)) == 0) { moan("user `%s' not known at line %i", $1, lex_line); YYERROR; - } else { - t = xmalloc(sizeof(*t)); - u = pw->pw_uid; - sym_createTable(t); - sym_find(t, (char *)&u, sizeof(u), - sizeof(sym_base), 0); - $$ = class_create(clType_user, t); - } + } else + $$ = class_fromUser(clType_user, pw->pw_uid); } | WORD { name *n = name_find($1, 0, 0); @@ -335,72 +310,30 @@ user_class : user_class ',' user_class { /* --- Command class expressions --- */ command_class : command_class ',' command_class { - if ($1->type != $3->type) { + if (($$ = class_union($1, $3)) == 0) { yyerror("type mismatch"); - class_dec($1); - class_dec($3); YYERROR; - } else { - if ($1 == class_all) - $$ = class_all; - else - $$ = class_create($1->type, - set_union($1->t, $3->t)); - class_dec($1); - class_dec($3); } } | command_class '-' command_class { - if ($1->type != $3->type) { + if (($$ = class_diff($1, $3)) == 0) { yyerror("type mismatch"); - class_dec($1); - class_dec($3); YYERROR; - } else { - $$ = class_create($1->type, - set_subtract($1->t, $3->t)); - class_dec($1); - class_dec($3); } } | command_class '&' command_class { - if ($1->type != $3->type) { + if (($$ = class_isect($1, $3)) == 0) { yyerror("type mismatch"); - class_dec($1); - class_dec($3); YYERROR; - } else { - if ($1 == class_all) - $$ = class_all; - else - $$ = class_create($1->type, - set_intersect($1->t, $3->t)); - class_dec($1); - class_dec($3); } } | command_class '|' command_class { - if ($1->type != $3->type) { + if (($$ = class_union($1, $3)) == 0) { yyerror("type mismatch"); - class_dec($1); - class_dec($3); YYERROR; - } else { - if ($1 == class_all) - $$ = class_all; - else - $$ = class_create($1->type, - set_union($1->t, $3->t)); - class_dec($1); - class_dec($3); } } - | STRING { - sym_table *t = xmalloc(sizeof(*t)); - sym_createTable(t); - sym_find(t, $1, -1, sizeof(sym_base), 0); - $$ = class_create(clType_command, t); - } + | STRING { $$ = class_fromString(clType_command, $1); } | WORD { name *n = name_find($1, 0, 0); if (!n || !n->c) { @@ -420,73 +353,31 @@ command_class : command_class ',' command_class { /* --- Host class expressions --- */ -host_class : host_class ',' host_class { - if ($1->type != $3->type) { +host_class : host_class ',' host_class { + if (($$ = class_union($1, $3)) == 0) { yyerror("type mismatch"); - class_dec($1); - class_dec($3); YYERROR; - } else { - if ($1 == class_all) - $$ = class_all; - else - $$ = class_create($1->type, - set_union($1->t, $3->t)); - class_dec($1); - class_dec($3); } } | host_class '-' host_class { - if ($1->type != $3->type) { + if (($$ = class_diff($1, $3)) == 0) { yyerror("type mismatch"); - class_dec($1); - class_dec($3); YYERROR; - } else { - $$ = class_create($1->type, - set_subtract($1->t, $3->t)); - class_dec($1); - class_dec($3); } } | host_class '&' host_class { - if ($1->type != $3->type) { + if (($$ = class_isect($1, $3)) == 0) { yyerror("type mismatch"); - class_dec($1); - class_dec($3); YYERROR; - } else { - if ($1 == class_all) - $$ = class_all; - else - $$ = class_create($1->type, - set_intersect($1->t, $3->t)); - class_dec($1); - class_dec($3); } } | host_class '|' host_class { - if ($1->type != $3->type) { + if (($$ = class_union($1, $3)) == 0) { yyerror("type mismatch"); - class_dec($1); - class_dec($3); YYERROR; - } else { - if ($1 == class_all) - $$ = class_all; - else - $$ = class_create($1->type, - set_union($1->t, $3->t)); - class_dec($1); - class_dec($3); } } - | STRING { - sym_table *t = xmalloc(sizeof(*t)); - sym_createTable(t); - sym_find(t, $1, -1, sizeof(sym_base), 0); - $$ = class_create(clType_host, t); - } + | STRING { $$ = class_fromString(clType_host, $1); } | WORD { name *n = name_find($1, 0, 0); if (!n || !n->c) {