[BACK]Return to match.c CVS log [TXT][DIR] Up to [local] / src / usr.bin / ssh

Diff for /src/usr.bin/ssh/match.c between version 1.6.2.5 and 1.7

version 1.6.2.5, 2001/03/21 18:52:51 version 1.7, 2000/06/06 19:32:14
Line 1 
Line 1 
 /*  /*
    *
    * match.c
    *
  * Author: Tatu Ylonen <ylo@cs.hut.fi>   * Author: Tatu Ylonen <ylo@cs.hut.fi>
    *
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland   * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
  *                    All rights reserved   *                    All rights reserved
  * Simple pattern matching, with '*' and '?' as wildcards.  
  *   *
  * As far as I am concerned, the code I have written for this software   * Created: Thu Jun 22 01:17:50 1995 ylo
  * 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".  
  */  
 /*  
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.  
  *   *
  * Redistribution and use in source and binary forms, with or without   * Simple pattern matching, with '*' and '?' as wildcards.
  * modification, are permitted provided that the following conditions  
  * are met:  
  * 1. Redistributions of source code must retain the above copyright  
  *    notice, this list of conditions and the following disclaimer.  
  * 2. Redistributions in binary form must reproduce the above copyright  
  *    notice, this list of conditions and the following disclaimer in the  
  *    documentation and/or other materials provided with the distribution.  
  *   *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR  
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES  
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,  
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT  
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,  
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY  
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT  
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF  
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  
  */   */
   
 #include "includes.h"  #include "includes.h"
 RCSID("$OpenBSD$");  RCSID("$Id$");
   
 #include "match.h"  #include "ssh.h"
 #include "xmalloc.h"  
   
 /*  /*
  * Returns true if the given string matches the pattern (which may contain ?   * Returns true if the given string matches the pattern (which may contain ?
Line 111 
Line 89 
  */   */
   
 int  int
 match_hostname(const char *host, const char *pattern, u_int len)  match_hostname(const char *host, const char *pattern, unsigned int len)
 {  {
         char sub[1024];          char sub[1024];
         int negated;          int negated;
         int got_positive;          int got_positive;
         u_int i, subi;          unsigned int i, subi;
   
         got_positive = 0;          got_positive = 0;
         for (i = 0; i < len;) {          for (i = 0; i < len;) {
Line 160 
Line 138 
          * match, we have already returned -1 and never get here.           * match, we have already returned -1 and never get here.
          */           */
         return got_positive;          return got_positive;
 }  
   
   
 #define MAX_PROP        20  
 #define SEP     ","  
 char *  
 match_list(const char *client, const char *server, u_int *next)  
 {  
         char *sproposals[MAX_PROP];  
         char *c, *s, *p, *ret, *cp, *sp;  
         int i, j, nproposals;  
   
         c = cp = xstrdup(client);  
         s = sp = xstrdup(server);  
   
         for ((p = strsep(&sp, SEP)), i=0; p && *p != '\0';  
              (p = strsep(&sp, SEP)), i++) {  
                 if (i < MAX_PROP)  
                         sproposals[i] = p;  
                 else  
                         break;  
         }  
         nproposals = i;  
   
         for ((p = strsep(&cp, SEP)), i=0; p && *p != '\0';  
              (p = strsep(&cp, SEP)), i++) {  
                 for (j = 0; j < nproposals; j++) {  
                         if (strcmp(p, sproposals[j]) == 0) {  
                                 ret = xstrdup(p);  
                                 if (next != NULL)  
                                         *next = (cp == NULL) ?  
                                             strlen(c) : cp - c;  
                                 xfree(c);  
                                 xfree(s);  
                                 return ret;  
                         }  
                 }  
         }  
         if (next != NULL)  
                 *next = strlen(c);  
         xfree(c);  
         xfree(s);  
         return NULL;  
 }  }
Legend:
Removed from v.1.6.2.5  
changed lines
  Added in v.1.7