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

Diff for /src/usr.bin/ssh/ssh-agent.c between version 1.111.2.1 and 1.111.2.2

version 1.111.2.1, 2004/02/28 03:51:34 version 1.111.2.2, 2004/08/19 22:37:32
Line 50 
Line 50 
 #include "authfd.h"  #include "authfd.h"
 #include "compat.h"  #include "compat.h"
 #include "log.h"  #include "log.h"
 #include "readpass.h"  
 #include "misc.h"  #include "misc.h"
   
 #ifdef SMARTCARD  #ifdef SMARTCARD
Line 782 
Line 781 
 {  {
         u_int i, old_alloc, new_alloc;          u_int i, old_alloc, new_alloc;
   
         if (fcntl(fd, F_SETFL, O_NONBLOCK) < 0)          set_nonblock(fd);
                 error("fcntl O_NONBLOCK: %s", strerror(errno));  
   
         if (fd > max_fd)          if (fd > max_fd)
                 max_fd = fd;                  max_fd = fd;
Line 814 
Line 812 
 }  }
   
 static int  static int
 prepare_select(fd_set **fdrp, fd_set **fdwp, int *fdl, int *nallocp)  prepare_select(fd_set **fdrp, fd_set **fdwp, int *fdl, u_int *nallocp)
 {  {
         u_int i, sz;          u_int i, sz;
         int n = 0;          int n = 0;
Line 1000 
Line 998 
 main(int ac, char **av)  main(int ac, char **av)
 {  {
         int c_flag = 0, d_flag = 0, k_flag = 0, s_flag = 0;          int c_flag = 0, d_flag = 0, k_flag = 0, s_flag = 0;
         int sock, fd,  ch, nalloc;          int sock, fd,  ch;
           u_int nalloc;
         char *shell, *format, *pidstr, *agentsocket = NULL;          char *shell, *format, *pidstr, *agentsocket = NULL;
         fd_set *readsetp = NULL, *writesetp = NULL;          fd_set *readsetp = NULL, *writesetp = NULL;
         struct sockaddr_un sunaddr;          struct sockaddr_un sunaddr;
Legend:
Removed from v.1.111.2.1  
changed lines
  Added in v.1.111.2.2