diff options
Diffstat (limited to 'ssh.c')
-rw-r--r-- | ssh.c | 7 |
1 files changed, 3 insertions, 4 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh.c,v 1.292 2006/08/01 23:36:12 stevesk Exp $ */ | 1 | /* $OpenBSD: ssh.c,v 1.293 2006/08/03 03:34:42 deraadt Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -69,15 +69,14 @@ | |||
69 | #include <openssl/evp.h> | 69 | #include <openssl/evp.h> |
70 | #include <openssl/err.h> | 70 | #include <openssl/err.h> |
71 | 71 | ||
72 | #include "xmalloc.h" | ||
72 | #include "ssh.h" | 73 | #include "ssh.h" |
73 | #include "ssh1.h" | 74 | #include "ssh1.h" |
74 | #include "ssh2.h" | 75 | #include "ssh2.h" |
75 | #include "compat.h" | 76 | #include "compat.h" |
76 | #include "cipher.h" | 77 | #include "cipher.h" |
77 | #include "xmalloc.h" | ||
78 | #include "packet.h" | 78 | #include "packet.h" |
79 | #include "buffer.h" | 79 | #include "buffer.h" |
80 | #include "bufaux.h" | ||
81 | #include "channels.h" | 80 | #include "channels.h" |
82 | #include "key.h" | 81 | #include "key.h" |
83 | #include "authfd.h" | 82 | #include "authfd.h" |
@@ -1256,7 +1255,7 @@ load_public_identity_files(void) | |||
1256 | cp = tilde_expand_filename(options.identity_files[i], | 1255 | cp = tilde_expand_filename(options.identity_files[i], |
1257 | original_real_uid); | 1256 | original_real_uid); |
1258 | filename = percent_expand(cp, "d", pw->pw_dir, | 1257 | filename = percent_expand(cp, "d", pw->pw_dir, |
1259 | "u", pw->pw_name, "l", thishost, "h", host, | 1258 | "u", pw->pw_name, "l", thishost, "h", host, |
1260 | "r", options.user, (char *)NULL); | 1259 | "r", options.user, (char *)NULL); |
1261 | xfree(cp); | 1260 | xfree(cp); |
1262 | public = key_load_public(filename, NULL); | 1261 | public = key_load_public(filename, NULL); |