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

Diff for /src/usr.bin/ssh/hostfile.c between version 1.35.2.1 and 1.35.2.2

version 1.35.2.1, 2006/02/03 03:01:56 version 1.35.2.2, 2006/10/06 03:19:32
Line 1 
Line 1 
   /* $OpenBSD$ */
 /*  /*
  * 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
Line 35 
Line 36 
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.   * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */   */
   
 #include "includes.h"  #include <sys/types.h>
 RCSID("$OpenBSD$");  
   
 #include <resolv.h>  #include <netinet/in.h>
   
 #include <openssl/hmac.h>  #include <openssl/hmac.h>
 #include <openssl/sha.h>  #include <openssl/sha.h>
   
 #include "packet.h"  #include <resolv.h>
   #include <stdio.h>
   #include <stdlib.h>
   #include <string.h>
   
   #include "xmalloc.h"
 #include "match.h"  #include "match.h"
 #include "key.h"  #include "key.h"
 #include "hostfile.h"  #include "hostfile.h"
 #include "log.h"  #include "log.h"
 #include "xmalloc.h"  
   
 static int  static int
 extract_salt(const char *s, u_int l, char *salt, size_t salt_len)  extract_salt(const char *s, u_int l, char *salt, size_t salt_len)
Line 254 
Line 259 
   
                 if (key == NULL) {                  if (key == NULL) {
                         /* we found a key of the requested type */                          /* we found a key of the requested type */
                         if (found->type == keytype)                          if (found->type == keytype) {
                                   fclose(f);
                                 return HOST_FOUND;                                  return HOST_FOUND;
                           }
                         continue;                          continue;
                 }                  }
   
Legend:
Removed from v.1.35.2.1  
changed lines
  Added in v.1.35.2.2