=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/sudo/Attic/testsudoers.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- src/usr.bin/sudo/Attic/testsudoers.c 1999/12/10 06:45:12 1.2 +++ src/usr.bin/sudo/Attic/testsudoers.c 2000/01/24 04:22:53 1.3 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 1998, 1999 Todd C. Miller + * Copyright (c) 1996, 1998-2000 Todd C. Miller * All rights reserved. * * This code is derived from software contributed by Chris Jepeway @@ -77,7 +77,7 @@ #endif /* HAVE_FNMATCH */ #ifndef lint -static const char rcsid[] = "$Sudo: testsudoers.c,v 1.66 1999/12/09 03:54:57 millert Exp $"; +static const char rcsid[] = "$Sudo: testsudoers.c,v 1.68 2000/01/17 23:46:26 millert Exp $"; #endif /* lint */ /* @@ -240,9 +240,10 @@ } int -netgr_matches(netgr, host, user) +netgr_matches(netgr, host, shost, user) char *netgr; char *host; + char *shost; char *user; { #ifdef HAVE_GETDOMAINNAME @@ -268,10 +269,13 @@ #endif /* HAVE_GETDOMAINNAME */ #ifdef HAVE_INNETGR - return(innetgr(netgr, host, user, domain)); -#else - return(FALSE); + if (innetgr(netgr, host, user, domain)) + return(TRUE); + else if (host != shost && innetgr(netgr, shost, user, domain)) + return(TRUE); #endif /* HAVE_INNETGR */ + + return(FALSE); } void