diff options
| author |   deraadt <deraadt@openbsd.org> | 2006-08-03 03:34:41 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 2006-08-03 03:34:41 +0000 |
| commit | bd9502d503c60bf5de0fd1cfbab7397f3696ad80 (patch) | |
| tree | 3ea70e621f5f3cbc4c5dbba594d8fc41316978fa /usr.bin/ssh/ssh.c | |
| parent | regen (diff) | |
| download | wireguard-openbsd-bd9502d503c60bf5de0fd1cfbab7397f3696ad80.tar.xz wireguard-openbsd-bd9502d503c60bf5de0fd1cfbab7397f3696ad80.zip | |
almost entirely get rid of the culture of ".h files that include .h files"
ok djm, sort of ok stevesk
makes the pain stop in one easy step
Diffstat (limited to 'usr.bin/ssh/ssh.c')
| -rw-r--r-- | usr.bin/ssh/ssh.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/usr.bin/ssh/ssh.c b/usr.bin/ssh/ssh.c index a2066f1a9df..82dc82a0a05 100644 --- a/usr.bin/ssh/ssh.c +++ b/usr.bin/ssh/ssh.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh.c,v 1.292 2006/08/01 23:36:12 stevesk Exp $ */ +/* $OpenBSD: ssh.c,v 1.293 2006/08/03 03:34:42 deraadt Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -40,8 +40,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "includes.h" - +#include <sys/types.h> #include <sys/resource.h> #include <sys/ioctl.h> #include <sys/types.h> @@ -65,15 +64,14 @@ #include <openssl/evp.h> #include <openssl/err.h> +#include "xmalloc.h" #include "ssh.h" #include "ssh1.h" #include "ssh2.h" #include "compat.h" #include "cipher.h" -#include "xmalloc.h" #include "packet.h" #include "buffer.h" -#include "bufaux.h" #include "channels.h" #include "key.h" #include "authfd.h" @@ -1235,7 +1233,7 @@ load_public_identity_files(void) cp = tilde_expand_filename(options.identity_files[i], original_real_uid); 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); xfree(cp); public = key_load_public(filename, NULL); |