[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.26 and 1.27

version 1.26, 2006/08/03 03:34:42 version 1.27, 2008/06/10 23:06:19
Line 181 
Line 181 
   
 /*  /*
  * returns 0 if we get a negative match for the hostname or the ip   * returns 0 if we get a negative match for the hostname or the ip
  * or if we get no match at all.  returns 1 otherwise.   * or if we get no match at all.  returns -1 on error, or 1 on
    * successful match.
  */   */
 int  int
 match_host_and_ip(const char *host, const char *ipaddr,  match_host_and_ip(const char *host, const char *ipaddr,
Line 189 
Line 190 
 {  {
         int mhost, mip;          int mhost, mip;
   
         /* negative ipaddr match */          /* error in ipaddr match */
         if ((mip = match_hostname(ipaddr, patterns, strlen(patterns))) == -1)          if ((mip = addr_match_list(ipaddr, patterns)) == -2)
                   return -1;
           else if (mip == -1) /* negative ip address match */
                 return 0;                  return 0;
   
         /* negative hostname match */          /* negative hostname match */
         if ((mhost = match_hostname(host, patterns, strlen(patterns))) == -1)          if ((mhost = match_hostname(host, patterns, strlen(patterns))) == -1)
                 return 0;                  return 0;
Legend:
Removed from v.1.26  
changed lines
  Added in v.1.27