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

Diff for /src/usr.bin/ssh/sshconnect.c between version 1.226 and 1.227

version 1.226, 2010/10/05 05:13:18 version 1.227, 2010/10/06 06:39:28
Line 57 
Line 57 
   
 static int matching_host_key_dns = 0;  static int matching_host_key_dns = 0;
   
   static pid_t proxy_command_pid = 0;
   
 /* import */  /* import */
 extern Options options;  extern Options options;
 extern char *__progname;  extern char *__progname;
 extern uid_t original_real_uid;  extern uid_t original_real_uid;
 extern uid_t original_effective_uid;  extern uid_t original_effective_uid;
 extern pid_t proxy_command_pid;  
   
 static int show_other_keys(const char *, Key *);  static int show_other_keys(const char *, Key *);
 static void warn_changed_key(Key *);  static void warn_changed_key(Key *);
Line 156 
Line 157 
   
         /* Indicate OK return */          /* Indicate OK return */
         return 0;          return 0;
   }
   
   void
   ssh_kill_proxy_command(void)
   {
           /*
            * Send SIGHUP to proxy command if used. We don't wait() in
            * case it hangs and instead rely on init to reap the child
            */
           if (proxy_command_pid > 1)
                   kill(SIGHUP, proxy_command_pid);
 }  }
   
 /*  /*
Legend:
Removed from v.1.226  
changed lines
  Added in v.1.227