[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.7 and 1.8

version 1.7, 2004/06/21 17:36:31 version 1.8, 2004/12/06 11:41:03
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 163 
Line 164 
 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[8192];          char line[SSH_MAX_PUBKEY_BYTES];
         int found_key = 0;          int found_key = 0;
         FILE *f;          FILE *f;
         u_long linenum = 0;          u_long linenum = 0;
Line 200 
Line 201 
         found_key = 0;          found_key = 0;
         found = key_new(key->type);          found = key_new(key->type);
   
         while (fgets(line, sizeof(line), f)) {          while (read_keyfile_line(f, file, line, sizeof(line), &linenum) != -1) {
                 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.7  
changed lines
  Added in v.1.8