diff options
33 files changed, 123 insertions, 39 deletions
diff --git a/usr.bin/ssh/auth-options.c b/usr.bin/ssh/auth-options.c index 56d59841265..473fb8bf7b2 100644 --- a/usr.bin/ssh/auth-options.c +++ b/usr.bin/ssh/auth-options.c @@ -1,4 +1,4 @@ -/* $OpenBSD: auth-options.c,v 1.35 2006/03/25 13:17:01 djm Exp $ */ +/* $OpenBSD: auth-options.c,v 1.36 2006/07/06 16:03:53 stevesk Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -12,6 +12,10 @@ #include "includes.h" +#include <sys/types.h> + +#include <pwd.h> + #include "xmalloc.h" #include "match.h" #include "log.h" diff --git a/usr.bin/ssh/auth-options.h b/usr.bin/ssh/auth-options.h index d34b5f19065..cd2b030cd46 100644 --- a/usr.bin/ssh/auth-options.h +++ b/usr.bin/ssh/auth-options.h @@ -1,4 +1,4 @@ -/* $OpenBSD: auth-options.h,v 1.14 2006/03/25 22:22:42 djm Exp $ */ +/* $OpenBSD: auth-options.h,v 1.15 2006/07/06 16:03:53 stevesk Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> @@ -15,6 +15,10 @@ #ifndef AUTH_OPTIONS_H #define AUTH_OPTIONS_H +#include <sys/types.h> + +#include <pwd.h> + /* Linked list of custom environment strings */ struct envstring { struct envstring *next; diff --git a/usr.bin/ssh/auth-passwd.c b/usr.bin/ssh/auth-passwd.c index beac5e9ca97..ec128dc2e96 100644 --- a/usr.bin/ssh/auth-passwd.c +++ b/usr.bin/ssh/auth-passwd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: auth-passwd.c,v 1.36 2006/03/25 13:17:01 djm Exp $ */ +/* $OpenBSD: auth-passwd.c,v 1.37 2006/07/06 16:03:53 stevesk Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -38,6 +38,10 @@ #include "includes.h" +#include <sys/types.h> + +#include <pwd.h> + #include "packet.h" #include "buffer.h" #include "log.h" diff --git a/usr.bin/ssh/auth-rh-rsa.c b/usr.bin/ssh/auth-rh-rsa.c index c8bdfa26c17..8fa21e12c63 100644 --- a/usr.bin/ssh/auth-rh-rsa.c +++ b/usr.bin/ssh/auth-rh-rsa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: auth-rh-rsa.c,v 1.40 2006/03/25 13:17:01 djm Exp $ */ +/* $OpenBSD: auth-rh-rsa.c,v 1.41 2006/07/06 16:03:53 stevesk Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -15,6 +15,10 @@ #include "includes.h" +#include <sys/types.h> + +#include <pwd.h> + #include "packet.h" #include "uidswap.h" #include "log.h" diff --git a/usr.bin/ssh/auth-rhosts.c b/usr.bin/ssh/auth-rhosts.c index 4fc22404a30..e1417a07881 100644 --- a/usr.bin/ssh/auth-rhosts.c +++ b/usr.bin/ssh/auth-rhosts.c @@ -1,4 +1,4 @@ -/* $OpenBSD: auth-rhosts.c,v 1.37 2006/03/25 13:17:01 djm Exp $ */ +/* $OpenBSD: auth-rhosts.c,v 1.38 2006/07/06 16:03:53 stevesk Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -20,6 +20,7 @@ #include <sys/stat.h> #include <netgroup.h> +#include <pwd.h> #include "packet.h" #include "uidswap.h" diff --git a/usr.bin/ssh/auth-rsa.c b/usr.bin/ssh/auth-rsa.c index c331c267d21..867597642e4 100644 --- a/usr.bin/ssh/auth-rsa.c +++ b/usr.bin/ssh/auth-rsa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: auth-rsa.c,v 1.67 2006/03/25 18:29:35 deraadt Exp $ */ +/* $OpenBSD: auth-rsa.c,v 1.68 2006/07/06 16:03:53 stevesk Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -22,6 +22,8 @@ #include <openssl/rsa.h> #include <openssl/md5.h> +#include <pwd.h> + #include "rsa.h" #include "packet.h" #include "xmalloc.h" diff --git a/usr.bin/ssh/auth.c b/usr.bin/ssh/auth.c index c828cb0fafd..eec3d7af432 100644 --- a/usr.bin/ssh/auth.c +++ b/usr.bin/ssh/auth.c @@ -1,4 +1,4 @@ -/* $OpenBSD: auth.c,v 1.67 2006/03/30 11:40:21 dtucker Exp $ */ +/* $OpenBSD: auth.c,v 1.68 2006/07/06 16:03:53 stevesk Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * @@ -30,6 +30,7 @@ #include <libgen.h> #include <paths.h> +#include <pwd.h> #include "xmalloc.h" #include "match.h" diff --git a/usr.bin/ssh/auth.h b/usr.bin/ssh/auth.h index 157a468fb12..76e4a055b46 100644 --- a/usr.bin/ssh/auth.h +++ b/usr.bin/ssh/auth.h @@ -1,4 +1,4 @@ -/* $OpenBSD: auth.h,v 1.53 2006/04/20 09:27:09 djm Exp $ */ +/* $OpenBSD: auth.h,v 1.54 2006/07/06 16:03:53 stevesk Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. @@ -28,10 +28,12 @@ #ifndef AUTH_H #define AUTH_H -#include "key.h" -#include "hostfile.h" +#include <sys/types.h> + #include <openssl/rsa.h> +#include <pwd.h> + #ifdef HAVE_LOGIN_CAP #include <login_cap.h> #endif @@ -42,6 +44,9 @@ #include <krb5.h> #endif +#include "key.h" +#include "hostfile.h" + typedef struct Authctxt Authctxt; typedef struct Authmethod Authmethod; typedef struct KbdintDevice KbdintDevice; diff --git a/usr.bin/ssh/auth2-hostbased.c b/usr.bin/ssh/auth2-hostbased.c index 8d5f383531a..56bf0be1337 100644 --- a/usr.bin/ssh/auth2-hostbased.c +++ b/usr.bin/ssh/auth2-hostbased.c @@ -1,4 +1,4 @@ -/* $OpenBSD: auth2-hostbased.c,v 1.8 2006/03/25 13:17:01 djm Exp $ */ +/* $OpenBSD: auth2-hostbased.c,v 1.9 2006/07/06 16:03:53 stevesk Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * @@ -25,6 +25,10 @@ #include "includes.h" +#include <sys/types.h> + +#include <pwd.h> + #include "ssh2.h" #include "xmalloc.h" #include "packet.h" diff --git a/usr.bin/ssh/auth2-pubkey.c b/usr.bin/ssh/auth2-pubkey.c index 5e5f42d977f..61242541e92 100644 --- a/usr.bin/ssh/auth2-pubkey.c +++ b/usr.bin/ssh/auth2-pubkey.c @@ -1,4 +1,4 @@ -/* $OpenBSD: auth2-pubkey.c,v 1.12 2006/03/25 13:17:01 djm Exp $ */ +/* $OpenBSD: auth2-pubkey.c,v 1.13 2006/07/06 16:03:53 stevesk Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * @@ -28,6 +28,8 @@ #include <sys/types.h> #include <sys/stat.h> +#include <pwd.h> + #include "ssh.h" #include "ssh2.h" #include "xmalloc.h" diff --git a/usr.bin/ssh/auth2.c b/usr.bin/ssh/auth2.c index ed99b706a36..fe6ab40dbd4 100644 --- a/usr.bin/ssh/auth2.c +++ b/usr.bin/ssh/auth2.c @@ -1,4 +1,4 @@ -/* $OpenBSD: auth2.c,v 1.110 2006/03/25 13:17:01 djm Exp $ */ +/* $OpenBSD: auth2.c,v 1.111 2006/07/06 16:03:53 stevesk Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * @@ -25,6 +25,10 @@ #include "includes.h" +#include <sys/types.h> + +#include <pwd.h> + #include "ssh2.h" #include "xmalloc.h" #include "packet.h" diff --git a/usr.bin/ssh/includes.h b/usr.bin/ssh/includes.h index 43b4ab3be5a..a958336f5f3 100644 --- a/usr.bin/ssh/includes.h +++ b/usr.bin/ssh/includes.h @@ -1,4 +1,4 @@ -/* $OpenBSD: includes.h,v 1.44 2006/07/05 02:42:09 stevesk Exp $ */ +/* $OpenBSD: includes.h,v 1.45 2006/07/06 16:03:53 stevesk Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> @@ -30,7 +30,6 @@ #include <stdlib.h> #include <string.h> #include <stdarg.h> -#include <pwd.h> #include <unistd.h> #include <time.h> diff --git a/usr.bin/ssh/misc.c b/usr.bin/ssh/misc.c index b8ea874ce95..cd9b5904c24 100644 --- a/usr.bin/ssh/misc.c +++ b/usr.bin/ssh/misc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: misc.c,v 1.53 2006/07/05 02:42:09 stevesk Exp $ */ +/* $OpenBSD: misc.c,v 1.54 2006/07/06 16:03:53 stevesk Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * Copyright (c) 2005,2006 Damien Miller. All rights reserved. @@ -27,6 +27,7 @@ #include "includes.h" #include <sys/ioctl.h> +#include <sys/types.h> #include <sys/socket.h> #include <net/if.h> @@ -34,6 +35,7 @@ #include <netinet/tcp.h> #include <paths.h> +#include <pwd.h> #include "misc.h" #include "log.h" diff --git a/usr.bin/ssh/misc.h b/usr.bin/ssh/misc.h index bbd66ef106b..f96328662f6 100644 --- a/usr.bin/ssh/misc.h +++ b/usr.bin/ssh/misc.h @@ -1,4 +1,4 @@ -/* $OpenBSD: misc.h,v 1.31 2006/03/30 09:58:15 djm Exp $ */ +/* $OpenBSD: misc.h,v 1.32 2006/07/06 16:03:53 stevesk Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> @@ -15,6 +15,10 @@ #ifndef _MISC_H #define _MISC_H +#include <sys/types.h> + +#include <pwd.h> + /* misc.c */ char *chop(char *); diff --git a/usr.bin/ssh/monitor.c b/usr.bin/ssh/monitor.c index 06f505b1193..1cdc0696893 100644 --- a/usr.bin/ssh/monitor.c +++ b/usr.bin/ssh/monitor.c @@ -1,4 +1,4 @@ -/* $OpenBSD: monitor.c,v 1.77 2006/03/30 11:40:21 dtucker Exp $ */ +/* $OpenBSD: monitor.c,v 1.78 2006/07/06 16:03:53 stevesk Exp $ */ /* * Copyright 2002 Niels Provos <provos@citi.umich.edu> * Copyright 2002 Markus Friedl <markus@openbsd.org> @@ -30,15 +30,16 @@ #include <sys/types.h> #include <sys/wait.h> +#include <openssl/dh.h> + #include <paths.h> +#include <pwd.h> #include <signal.h> #ifdef SKEY #include <skey.h> #endif -#include <openssl/dh.h> - #include "ssh.h" #include "auth.h" #include "kex.h" diff --git a/usr.bin/ssh/monitor_wrap.c b/usr.bin/ssh/monitor_wrap.c index f95cd8c605d..f5aac087251 100644 --- a/usr.bin/ssh/monitor_wrap.c +++ b/usr.bin/ssh/monitor_wrap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: monitor_wrap.c,v 1.45 2006/03/30 09:58:15 djm Exp $ */ +/* $OpenBSD: monitor_wrap.c,v 1.46 2006/07/06 16:03:53 stevesk Exp $ */ /* * Copyright 2002 Niels Provos <provos@citi.umich.edu> * Copyright 2002 Markus Friedl <markus@openbsd.org> @@ -27,9 +27,13 @@ #include "includes.h" +#include <sys/types.h> + #include <openssl/bn.h> #include <openssl/dh.h> +#include <pwd.h> + #include "ssh.h" #include "dh.h" #include "kex.h" diff --git a/usr.bin/ssh/monitor_wrap.h b/usr.bin/ssh/monitor_wrap.h index 989f86800e0..0536b16b875 100644 --- a/usr.bin/ssh/monitor_wrap.h +++ b/usr.bin/ssh/monitor_wrap.h @@ -1,4 +1,4 @@ -/* $OpenBSD: monitor_wrap.h,v 1.16 2006/03/25 22:22:43 djm Exp $ */ +/* $OpenBSD: monitor_wrap.h,v 1.17 2006/07/06 16:03:53 stevesk Exp $ */ /* * Copyright 2002 Niels Provos <provos@citi.umich.edu> @@ -27,6 +27,11 @@ #ifndef _MM_WRAP_H_ #define _MM_WRAP_H_ + +#include <sys/types.h> + +#include <pwd.h> + #include "key.h" #include "buffer.h" diff --git a/usr.bin/ssh/scp.c b/usr.bin/ssh/scp.c index 2345a98be18..e371bf55a05 100644 --- a/usr.bin/ssh/scp.c +++ b/usr.bin/ssh/scp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: scp.c,v 1.142 2006/05/17 12:43:34 markus Exp $ */ +/* $OpenBSD: scp.c,v 1.143 2006/07/06 16:03:53 stevesk Exp $ */ /* * scp - secure remote copy. This is basically patched BSD rcp which * uses ssh to do the data transfer (instead of using rcmd). @@ -79,6 +79,7 @@ #include <ctype.h> #include <dirent.h> +#include <pwd.h> #include <signal.h> #include "xmalloc.h" diff --git a/usr.bin/ssh/serverloop.c b/usr.bin/ssh/serverloop.c index e966aa4fe2e..028f8b03745 100644 --- a/usr.bin/ssh/serverloop.c +++ b/usr.bin/ssh/serverloop.c @@ -1,4 +1,4 @@ -/* $OpenBSD: serverloop.c,v 1.136 2006/07/05 02:42:09 stevesk Exp $ */ +/* $OpenBSD: serverloop.c,v 1.137 2006/07/06 16:03:53 stevesk Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -43,6 +43,7 @@ #include <netinet/in.h> +#include <pwd.h> #include <signal.h> #include <termios.h> diff --git a/usr.bin/ssh/session.c b/usr.bin/ssh/session.c index 3bb9a896aae..ec3d85dd2f8 100644 --- a/usr.bin/ssh/session.c +++ b/usr.bin/ssh/session.c @@ -1,4 +1,4 @@ -/* $OpenBSD: session.c,v 1.205 2006/07/06 10:47:05 djm Exp $ */ +/* $OpenBSD: session.c,v 1.206 2006/07/06 16:03:53 stevesk Exp $ */ /* * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * All rights reserved @@ -42,6 +42,7 @@ #include <grp.h> #include <paths.h> +#include <pwd.h> #include <signal.h> #include "ssh.h" diff --git a/usr.bin/ssh/session.h b/usr.bin/ssh/session.h index bdac05934ec..c3a12821f8f 100644 --- a/usr.bin/ssh/session.h +++ b/usr.bin/ssh/session.h @@ -1,4 +1,4 @@ -/* $OpenBSD: session.h,v 1.27 2006/03/25 22:22:43 djm Exp $ */ +/* $OpenBSD: session.h,v 1.28 2006/07/06 16:03:53 stevesk Exp $ */ /* * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. @@ -26,6 +26,10 @@ #ifndef SESSION_H #define SESSION_H +#include <sys/types.h> + +#include <pwd.h> + #define TTYSZ 64 typedef struct Session Session; struct Session { diff --git a/usr.bin/ssh/sftp-common.c b/usr.bin/ssh/sftp-common.c index 8c794a05f85..92ce9066113 100644 --- a/usr.bin/ssh/sftp-common.c +++ b/usr.bin/ssh/sftp-common.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sftp-common.c,v 1.14 2006/07/02 22:45:59 stevesk Exp $ */ +/* $OpenBSD: sftp-common.c,v 1.15 2006/07/06 16:03:53 stevesk Exp $ */ /* * Copyright (c) 2001 Markus Friedl. All rights reserved. * Copyright (c) 2001 Damien Miller. All rights reserved. @@ -30,6 +30,7 @@ #include <sys/stat.h> #include <grp.h> +#include <pwd.h> #include "buffer.h" #include "bufaux.h" diff --git a/usr.bin/ssh/ssh-add.c b/usr.bin/ssh/ssh-add.c index 03a18779dd4..00d4d8293aa 100644 --- a/usr.bin/ssh/ssh-add.c +++ b/usr.bin/ssh/ssh-add.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh-add.c,v 1.80 2006/05/30 11:46:38 mk Exp $ */ +/* $OpenBSD: ssh-add.c,v 1.81 2006/07/06 16:03:53 stevesk Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -42,6 +42,8 @@ #include <openssl/evp.h> +#include <pwd.h> + #include "ssh.h" #include "rsa.h" #include "log.h" diff --git a/usr.bin/ssh/ssh-keygen.c b/usr.bin/ssh/ssh-keygen.c index fa0a67c47c3..476d7bc4569 100644 --- a/usr.bin/ssh/ssh-keygen.c +++ b/usr.bin/ssh/ssh-keygen.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh-keygen.c,v 1.144 2006/05/17 12:43:34 markus Exp $ */ +/* $OpenBSD: ssh-keygen.c,v 1.145 2006/07/06 16:03:53 stevesk Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -20,6 +20,8 @@ #include <openssl/evp.h> #include <openssl/pem.h> +#include <pwd.h> + #include "xmalloc.h" #include "key.h" #include "rsa.h" diff --git a/usr.bin/ssh/ssh-keysign.c b/usr.bin/ssh/ssh-keysign.c index 63d856b979b..29b841a2f96 100644 --- a/usr.bin/ssh/ssh-keysign.c +++ b/usr.bin/ssh/ssh-keysign.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh-keysign.c,v 1.23 2006/04/02 08:34:52 dtucker Exp $ */ +/* $OpenBSD: ssh-keysign.c,v 1.24 2006/07/06 16:03:53 stevesk Exp $ */ /* * Copyright (c) 2002 Markus Friedl. All rights reserved. * @@ -24,12 +24,15 @@ */ #include "includes.h" -#include <paths.h> +#include <sys/types.h> #include <openssl/evp.h> #include <openssl/rand.h> #include <openssl/rsa.h> +#include <paths.h> +#include <pwd.h> + #include "log.h" #include "key.h" #include "ssh.h" diff --git a/usr.bin/ssh/ssh.c b/usr.bin/ssh/ssh.c index 3b4d3dd7a00..929fad8fb7c 100644 --- a/usr.bin/ssh/ssh.c +++ b/usr.bin/ssh/ssh.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh.c,v 1.278 2006/07/03 08:54:20 stevesk Exp $ */ +/* $OpenBSD: ssh.c,v 1.279 2006/07/06 16:03:53 stevesk Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -50,6 +50,7 @@ #include <ctype.h> #include <paths.h> +#include <pwd.h> #include <signal.h> #include <openssl/evp.h> diff --git a/usr.bin/ssh/sshconnect.c b/usr.bin/ssh/sshconnect.c index 90493ef06fe..9c489b71a04 100644 --- a/usr.bin/ssh/sshconnect.c +++ b/usr.bin/ssh/sshconnect.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sshconnect.c,v 1.187 2006/07/05 02:42:09 stevesk Exp $ */ +/* $OpenBSD: sshconnect.c,v 1.188 2006/07/06 16:03:53 stevesk Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -24,6 +24,7 @@ #include <ctype.h> #include <paths.h> +#include <pwd.h> #include "ssh.h" #include "xmalloc.h" diff --git a/usr.bin/ssh/sshconnect.h b/usr.bin/ssh/sshconnect.h index 692d2756753..c1b07390b38 100644 --- a/usr.bin/ssh/sshconnect.h +++ b/usr.bin/ssh/sshconnect.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sshconnect.h,v 1.20 2006/06/06 10:20:20 markus Exp $ */ +/* $OpenBSD: sshconnect.h,v 1.21 2006/07/06 16:03:53 stevesk Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. @@ -26,6 +26,10 @@ #ifndef SSHCONNECT_H #define SSHCONNECT_H +#include <sys/types.h> + +#include <pwd.h> + typedef struct Sensitive Sensitive; struct Sensitive { Key **keys; diff --git a/usr.bin/ssh/sshd.c b/usr.bin/ssh/sshd.c index cbea119794c..0b8f40f7a73 100644 --- a/usr.bin/ssh/sshd.c +++ b/usr.bin/ssh/sshd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sshd.c,v 1.332 2006/07/03 08:54:20 stevesk Exp $ */ +/* $OpenBSD: sshd.c,v 1.333 2006/07/06 16:03:53 stevesk Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -50,6 +50,7 @@ #include <sys/stat.h> #include <paths.h> +#include <pwd.h> #include <signal.h> #include <openssl/dh.h> diff --git a/usr.bin/ssh/sshpty.c b/usr.bin/ssh/sshpty.c index 37c7acbf7ad..b01c8ca61b1 100644 --- a/usr.bin/ssh/sshpty.c +++ b/usr.bin/ssh/sshpty.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sshpty.c,v 1.20 2006/07/02 22:45:59 stevesk Exp $ */ +/* $OpenBSD: sshpty.c,v 1.21 2006/07/06 16:03:53 stevesk Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -20,6 +20,7 @@ #include <grp.h> #include <paths.h> +#include <pwd.h> #include <termios.h> #include <util.h> diff --git a/usr.bin/ssh/sshpty.h b/usr.bin/ssh/sshpty.h index f61a5e71eed..a7b33747424 100644 --- a/usr.bin/ssh/sshpty.h +++ b/usr.bin/ssh/sshpty.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sshpty.h,v 1.8 2006/03/25 22:22:43 djm Exp $ */ +/* $OpenBSD: sshpty.h,v 1.9 2006/07/06 16:03:53 stevesk Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> @@ -17,6 +17,9 @@ #ifndef SSHPTY_H #define SSHPTY_H +#include <sys/types.h> + +#include <pwd.h> #include <termios.h> struct termios get_saved_tio(void); diff --git a/usr.bin/ssh/uidswap.c b/usr.bin/ssh/uidswap.c index 60b378b2c40..d05c9ecc6a2 100644 --- a/usr.bin/ssh/uidswap.c +++ b/usr.bin/ssh/uidswap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uidswap.c,v 1.29 2006/06/08 14:45:49 markus Exp $ */ +/* $OpenBSD: uidswap.c,v 1.30 2006/07/06 16:03:53 stevesk Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -14,6 +14,10 @@ #include "includes.h" +#include <sys/types.h> + +#include <pwd.h> + #include "log.h" #include "uidswap.h" diff --git a/usr.bin/ssh/uidswap.h b/usr.bin/ssh/uidswap.h index f827782d5b2..436c10f7569 100644 --- a/usr.bin/ssh/uidswap.h +++ b/usr.bin/ssh/uidswap.h @@ -1,4 +1,4 @@ -/* $OpenBSD: uidswap.h,v 1.11 2006/06/08 14:45:49 markus Exp $ */ +/* $OpenBSD: uidswap.h,v 1.12 2006/07/06 16:03:53 stevesk Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> @@ -15,6 +15,10 @@ #ifndef UIDSWAP_H #define UIDSWAP_H +#include <sys/types.h> + +#include <pwd.h> + void temporarily_use_uid(struct passwd *); void restore_uid(void); void permanently_set_uid(struct passwd *); |