diff options
Diffstat (limited to 'contrib/amd/amd/opts.c')
| -rw-r--r-- | contrib/amd/amd/opts.c | 24 |
1 files changed, 20 insertions, 4 deletions
diff --git a/contrib/amd/amd/opts.c b/contrib/amd/amd/opts.c index 907e55c..b2d7ff9 100644 --- a/contrib/amd/amd/opts.c +++ b/contrib/amd/amd/opts.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-1998 Erez Zadok + * Copyright (c) 1997-1999 Erez Zadok * Copyright (c) 1989 Jan-Simon Pendry * Copyright (c) 1989 Imperial College of Science, Technology & Medicine * Copyright (c) 1989 The Regents of the University of California. @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: opts.c,v 1.2 1998/12/27 06:24:48 ezk Exp $ + * $Id: opts.c,v 1.5 1999/08/16 01:16:23 ezk Exp $ * */ @@ -95,6 +95,7 @@ struct functable { */ static int f_in_network(char *); static int f_netgrp(char *); +static int f_netgrpd(char *); static int f_exists(char *); static int f_false(char *); static int f_true(char *); @@ -218,6 +219,7 @@ static struct opt opt_fields[] = { static struct functable functable[] = { { "in_network", f_in_network }, { "netgrp", f_netgrp }, + { "netgrpd", f_netgrpd }, { "exists", f_exists }, { "false", f_false }, { "true", f_true }, @@ -494,7 +496,7 @@ eval_opts(char *opts, char *mapkey) continue; } else if (NSTREQ(f, "!", 1) && (func = functable_lookup(&f[1]))) { /* then this is a negated prefixed function such as "!exists" */ - plog(XLOG_USER, "executing negated function %s", &f[1]); + plog(XLOG_INFO, "executing negated function %s", &f[1]); if ((*func) (arg)) { return (0); } @@ -730,7 +732,7 @@ f_in_network(char *arg) } -/* test if this host is in netgroup (arg) */ +/* test if this host (short hostname form) is in netgroup (arg) */ static int f_netgrp(char *arg) { @@ -744,6 +746,20 @@ f_netgrp(char *arg) } +/* test if this host (fully-qualified name) is in netgroup (arg) */ +static int +f_netgrpd(char *arg) +{ + int status; + + status = innetgr(arg, opt_hostd, NULL, NULL); +#ifdef DEBUG + plog(XLOG_USER, "netgrp = %s status = %d hostd = %s", arg, status, opt_hostd); +#endif /* DEBUG */ + return status; +} + + /* test if file (arg) exists via lstat */ static int f_exists(char *arg) |
