[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.292 and 1.293

version 1.292, 2006/08/01 23:36:12 version 1.293, 2006/08/03 03:34:42
Line 40 
Line 40 
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.   * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */   */
   
 #include "includes.h"  #include <sys/types.h>
   
 #include <sys/resource.h>  #include <sys/resource.h>
 #include <sys/ioctl.h>  #include <sys/ioctl.h>
 #include <sys/types.h>  #include <sys/types.h>
Line 65 
Line 64 
 #include <openssl/evp.h>  #include <openssl/evp.h>
 #include <openssl/err.h>  #include <openssl/err.h>
   
   #include "xmalloc.h"
 #include "ssh.h"  #include "ssh.h"
 #include "ssh1.h"  #include "ssh1.h"
 #include "ssh2.h"  #include "ssh2.h"
 #include "compat.h"  #include "compat.h"
 #include "cipher.h"  #include "cipher.h"
 #include "xmalloc.h"  
 #include "packet.h"  #include "packet.h"
 #include "buffer.h"  #include "buffer.h"
 #include "bufaux.h"  
 #include "channels.h"  #include "channels.h"
 #include "key.h"  #include "key.h"
 #include "authfd.h"  #include "authfd.h"
Line 1235 
Line 1233 
                 cp = tilde_expand_filename(options.identity_files[i],                  cp = tilde_expand_filename(options.identity_files[i],
                     original_real_uid);                      original_real_uid);
                 filename = percent_expand(cp, "d", pw->pw_dir,                  filename = percent_expand(cp, "d", pw->pw_dir,
                     "u", pw->pw_name, "l", thishost, "h", host,                      "u", pw->pw_name, "l", thishost, "h", host,
                     "r", options.user, (char *)NULL);                      "r", options.user, (char *)NULL);
                 xfree(cp);                  xfree(cp);
                 public = key_load_public(filename, NULL);                  public = key_load_public(filename, NULL);

Legend:
Removed from v.1.292  
changed lines
  Added in v.1.293