[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.342 and 1.343

version 1.342, 2010/07/12 22:38:52 version 1.343, 2010/07/12 22:41:13
Line 664 
Line 664 
                 options.port = sp ? ntohs(sp->s_port) : SSH_DEFAULT_PORT;                  options.port = sp ? ntohs(sp->s_port) : SSH_DEFAULT_PORT;
         }          }
   
           if (options.hostname != NULL) {
                   host = percent_expand(options.hostname,
                       "h", host, (char *)NULL);
           }
   
         if (options.local_command != NULL) {          if (options.local_command != NULL) {
                 char thishost[NI_MAXHOST];                  char thishost[NI_MAXHOST];
   
Line 673 
Line 678 
                 debug3("expanding LocalCommand: %s", options.local_command);                  debug3("expanding LocalCommand: %s", options.local_command);
                 cp = options.local_command;                  cp = options.local_command;
                 options.local_command = percent_expand(cp, "d", pw->pw_dir,                  options.local_command = percent_expand(cp, "d", pw->pw_dir,
                     "h", options.hostname? options.hostname : host,                      "h", host, "l", thishost, "n", host, "r", options.user,
                     "l", thishost, "n", host, "r", options.user, "p", buf,                      "p", buf, "u", pw->pw_name, (char *)NULL);
                     "u", pw->pw_name, (char *)NULL);  
                 debug3("expanded LocalCommand: %s", options.local_command);                  debug3("expanded LocalCommand: %s", options.local_command);
                 xfree(cp);                  xfree(cp);
         }          }
   
         if (options.hostname != NULL)  
                 host = options.hostname;  
   
         /* force lowercase for hostkey matching */          /* force lowercase for hostkey matching */
         if (options.host_key_alias != NULL) {          if (options.host_key_alias != NULL) {

Legend:
Removed from v.1.342  
changed lines
  Added in v.1.343