=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/match.c,v retrieving revision 1.6 retrieving revision 1.6.2.3 diff -u -r1.6 -r1.6.2.3 --- src/usr.bin/ssh/match.c 2000/04/14 10:30:31 1.6 +++ src/usr.bin/ssh/match.c 2000/11/08 21:30:56 1.6.2.3 @@ -1,20 +1,18 @@ /* - * - * match.c - * * Author: Tatu Ylonen - * * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland * All rights reserved - * - * Created: Thu Jun 22 01:17:50 1995 ylo - * * Simple pattern matching, with '*' and '?' as wildcards. * + * As far as I am concerned, the code I have written for this software + * can be used freely for any purpose. Any derived versions of this + * software must be clearly marked as such, and if the derived work is + * incompatible with the protocol description in the RFC file, it must be + * called by a name other than "ssh" or "Secure Shell". */ #include "includes.h" -RCSID("$Id: match.c,v 1.6 2000/04/14 10:30:31 markus Exp $"); +RCSID("$OpenBSD: match.c,v 1.6.2.3 2000/11/08 21:30:56 jason Exp $"); #include "ssh.h" @@ -84,8 +82,8 @@ /* * Tries to match the host name (which must be in all lowercase) against the * comma-separated sequence of subpatterns (each possibly preceded by ! to - * indicate negation). Returns true if there is a positive match; zero - * otherwise. + * indicate negation). Returns -1 if negation matches, 1 if there is + * a positive match, 0 if there is no match at all. */ int @@ -127,15 +125,15 @@ /* Try to match the subpattern against the host name. */ if (match_pattern(host, sub)) { if (negated) - return 0; /* Fail */ + return -1; /* Negative */ else - got_positive = 1; + got_positive = 1; /* Positive */ } } /* * Return success if got a positive match. If there was a negative - * match, we have already returned zero and never get here. + * match, we have already returned -1 and never get here. */ return got_positive; }