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

Diff for /src/usr.bin/ssh/auth2-pubkey.c between version 1.6.2.2 and 1.7

version 1.6.2.2, 2005/03/10 17:15:04 version 1.7, 2004/06/21 17:36:31
Line 25 
Line 25 
 #include "includes.h"  #include "includes.h"
 RCSID("$OpenBSD$");  RCSID("$OpenBSD$");
   
 #include "ssh.h"  
 #include "ssh2.h"  #include "ssh2.h"
 #include "xmalloc.h"  #include "xmalloc.h"
 #include "packet.h"  #include "packet.h"
Line 41 
Line 40 
 #include "auth-options.h"  #include "auth-options.h"
 #include "canohost.h"  #include "canohost.h"
 #include "monitor_wrap.h"  #include "monitor_wrap.h"
 #include "misc.h"  
   
 /* import */  /* import */
 extern ServerOptions options;  extern ServerOptions options;
Line 165 
Line 163 
 static int  static int
 user_key_allowed2(struct passwd *pw, Key *key, char *file)  user_key_allowed2(struct passwd *pw, Key *key, char *file)
 {  {
         char line[SSH_MAX_PUBKEY_BYTES];          char line[8192];
         int found_key = 0;          int found_key = 0;
         FILE *f;          FILE *f;
         u_long linenum = 0;          u_long linenum = 0;
Line 202 
Line 200 
         found_key = 0;          found_key = 0;
         found = key_new(key->type);          found = key_new(key->type);
   
         while (read_keyfile_line(f, file, line, sizeof(line), &linenum) != -1) {          while (fgets(line, sizeof(line), f)) {
                 char *cp, *key_options = NULL;                  char *cp, *key_options = NULL;
                   linenum++;
                 /* Skip leading whitespace, empty and comment lines. */                  /* Skip leading whitespace, empty and comment lines. */
                 for (cp = line; *cp == ' ' || *cp == '\t'; cp++)                  for (cp = line; *cp == ' ' || *cp == '\t'; cp++)
                         ;                          ;

Legend:
Removed from v.1.6.2.2  
changed lines
  Added in v.1.7