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

Diff for /src/usr.bin/ssh/ssh.c between version 1.360 and 1.361

version 1.360, 2011/05/06 21:38:58 version 1.361, 2011/05/24 07:15:47
Line 204 
Line 204 
 void muxclient(const char *);  void muxclient(const char *);
 void muxserver_listen(void);  void muxserver_listen(void);
   
   /* ~/ expand a list of paths. NB. assumes path[n] is heap-allocated. */
   static void
   tilde_expand_paths(char **paths, u_int num_paths)
   {
           u_int i;
           char *cp;
   
           for (i = 0; i < num_paths; i++) {
                   cp = tilde_expand_filename(paths[i], original_real_uid);
                   xfree(paths[i]);
                   paths[i] = cp;
           }
   }
   
 /*  /*
  * Main program for the ssh client.   * Main program for the ssh client.
  */   */
Line 835 
Line 849 
         load_public_identity_files();          load_public_identity_files();
   
         /* Expand ~ in known host file names. */          /* Expand ~ in known host file names. */
         /* XXX mem-leaks: */          tilde_expand_paths(options.system_hostfiles,
         options.system_hostfile =              options.num_system_hostfiles);
             tilde_expand_filename(options.system_hostfile, original_real_uid);          tilde_expand_paths(options.user_hostfiles, options.num_user_hostfiles);
         options.user_hostfile =  
             tilde_expand_filename(options.user_hostfile, original_real_uid);  
         options.system_hostfile2 =  
             tilde_expand_filename(options.system_hostfile2, original_real_uid);  
         options.user_hostfile2 =  
             tilde_expand_filename(options.user_hostfile2, original_real_uid);  
   
         signal(SIGPIPE, SIG_IGN); /* ignore SIGPIPE early */          signal(SIGPIPE, SIG_IGN); /* ignore SIGPIPE early */
         signal(SIGCHLD, main_sigchld_handler);          signal(SIGCHLD, main_sigchld_handler);

Legend:
Removed from v.1.360  
changed lines
  Added in v.1.361