From f0c50293dddf8b36e9511fdf1c2f3f443800e51c Mon Sep 17 00:00:00 2001 From: Ben Lindstrom Date: Mon, 25 Jun 2001 05:17:53 +0000 Subject: - markus@cvs.openbsd.org 2001/06/24 05:25:10 [auth-options.c match.c match.h] move ip+hostname check to match.c --- match.h | 26 +++++--------------------- 1 file changed, 5 insertions(+), 21 deletions(-) (limited to 'match.h') diff --git a/match.h b/match.h index 09c931168..5faf66819 100644 --- a/match.h +++ b/match.h @@ -1,11 +1,9 @@ -/* $OpenBSD: match.h,v 1.7 2001/03/10 17:51:04 markus Exp $ */ +/* $OpenBSD: match.h,v 1.8 2001/06/24 05:25:10 markus Exp $ */ /* * Author: Tatu Ylonen * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland * All rights reserved - * This file contains various auxiliary functions related to multiple - * precision integers. * * 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 @@ -16,24 +14,10 @@ #ifndef MATCH_H #define MATCH_H -/* - * Returns true if the given string matches the pattern (which may contain ? - * and * as wildcards), and zero if it does not match. - */ -int match_pattern(const char *s, const char *pattern); - -/* - * 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 -1 if negation matches, 1 if there is - * a positive match, 0 if there is no match at all. - */ -int match_hostname(const char *host, const char *pattern, u_int len); - -/* - * Returns first item from client-list that is also supported by server-list, - * caller must xfree() returned string. - */ +int match_pattern(const char *s, const char *pattern); +int match_hostname(const char *host, const char *pattern, u_int len); +int match_host_and_ip(const char *host, const char *ip, const char *p); +int match_user(const char *u, const char *h, const char *i, const char *p); char *match_list(const char *client, const char *server, u_int *next); #endif -- cgit v1.2.3