- stevesk@cvs.openbsd.org 2006/07/06 16:03:53

[auth-options.c auth-options.h auth-passwd.c auth-rh-rsa.c] [auth-rhosts.c auth-rsa.c auth.c auth.h auth2-hostbased.c] [auth2-pubkey.c auth2.c includes.h misc.c misc.h monitor.c] [monitor_wrap.c monitor_wrap.h scp.c serverloop.c session.c] [session.h sftp-common.c ssh-add.c ssh-keygen.c ssh-keysign.c] [ssh.c sshconnect.c sshconnect.h sshd.c sshpty.c sshpty.h uidswap.c] [uidswap.h] move #include <pwd.h> out of includes.h; ok markus@
2006-07-10 20:53:08 +10:00 · 2006-07-10 20:53:08 +10:00 · 9f2abc47eb
parent fef95ad816
commit 9f2abc47eb
37 changed files with 133 additions and 39 deletions
--- a/11
+++ b/11
@ -41,6 +41,15 @@
   - djm@cvs.openbsd.org 2006/07/06 10:47:57
     [sftp-server.8 sftp-server.c]
     add commandline options to enable logging of transactions; ok markus@
+   - stevesk@cvs.openbsd.org 2006/07/06 16:03:53
+     [auth-options.c auth-options.h auth-passwd.c auth-rh-rsa.c]
+     [auth-rhosts.c auth-rsa.c auth.c auth.h auth2-hostbased.c]
+     [auth2-pubkey.c auth2.c includes.h misc.c misc.h monitor.c]
+     [monitor_wrap.c monitor_wrap.h scp.c serverloop.c session.c]
+     [session.h sftp-common.c ssh-add.c ssh-keygen.c ssh-keysign.c]
+     [ssh.c sshconnect.c sshconnect.h sshd.c sshpty.c sshpty.h uidswap.c]
+     [uidswap.h]
+     move #include <pwd.h> out of includes.h; ok markus@

 20060706
 - (dtucker) [configure.ac] Try AIX blibpath test in different order when
@ -4774,4 +4783,4 @@
   - (djm) Trim deprecated options from INSTALL. Mention UsePAM
   - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu

-$Id: ChangeLog,v 1.4370 2006/07/10 10:46:55 djm Exp $
+$Id: ChangeLog,v 1.4371 2006/07/10 10:53:08 djm Exp $
--- a/auth-options.c
+++ b/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"
--- a/auth-options.h
+++ b/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;
--- a/auth-passwd.c
+++ b/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"
--- a/auth-rh-rsa.c
+++ b/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"
--- a/auth-rhosts.c
+++ b/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
@ -22,6 +22,7 @@
 #ifdef HAVE_NETGROUP_H
 # include <netgroup.h>
 #endif
+#include <pwd.h>

 #include "packet.h"
 #include "uidswap.h"
--- a/auth-rsa.c
+++ b/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"
--- a/auth.c
+++ b/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.
 *
@ -31,6 +31,7 @@
 #ifdef HAVE_PATHS_H
 # include <paths.h>
 #endif
+#include <pwd.h>
 #ifdef HAVE_LOGIN_H
 #include <login.h>
 #endif
--- a/auth.h
+++ b/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,11 @@
 #ifndef AUTH_H
 #define AUTH_H

-#include <signal.h>
+#include <sys/types.h>
+
+#include <signal.h>
+#include <pwd.h>

-#include "key.h"
-#include "hostfile.h"
 #include "buffer.h"
 #include <openssl/rsa.h>

@ -45,6 +46,9 @@
 #include <krb5.h>
 #endif

+#include "key.h"
+#include "hostfile.h"
+
 typedef struct Authctxt Authctxt;
 typedef struct Authmethod Authmethod;
 typedef struct KbdintDevice KbdintDevice;
--- a/auth2-hostbased.c
+++ b/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"
--- a/auth2-pubkey.c
+++ b/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"
--- a/auth2.c
+++ b/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"
--- a/includes.h
+++ b/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>
@ -27,8 +27,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <stdarg.h>
-#include <pwd.h>
-#include <grp.h>
 #include <time.h>
 #include <stddef.h>

--- a/loginrec.c
+++ b/loginrec.c
@ -153,6 +153,8 @@

 #include <netinet/in.h>

+#include <pwd.h>
+
 #include "ssh.h"
 #include "xmalloc.h"
 #include "loginrec.h"
--- a/misc.c
+++ b/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 <netinet/in.h>
@ -34,6 +35,7 @@

 #ifdef HAVE_PATHS_H
 # include <paths.h>
+#include <pwd.h>
 #endif
 #ifdef SSH_TUN_OPENBSD
 #include <net/if.h>
--- a/misc.h
+++ b/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 *);
--- a/monitor.c
+++ b/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>
@ -33,6 +33,7 @@
 #ifdef HAVE_PATHS_H
 #include <paths.h>
 #endif
+#include <pwd.h>
 #include <signal.h>

 #ifdef SKEY
--- a/monitor_wrap.c
+++ b/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"
--- a/monitor_wrap.h
+++ b/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"

--- a/scp.c
+++ b/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).
@ -81,6 +81,7 @@

 #include <ctype.h>
 #include <dirent.h>
+#include <pwd.h>
 #include <signal.h>

 #include "xmalloc.h"
--- a/serverloop.c
+++ b/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>

--- a/session.c
+++ b/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
@ -46,6 +46,7 @@
 #ifdef HAVE_PATHS_H
 #include <paths.h>
 #endif
+#include <pwd.h>
 #include <signal.h>
 #include <arpa/inet.h>

--- a/session.h
+++ b/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 {
--- a/sftp-common.c
+++ b/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"
--- a/sftp-server.c
+++ b/sftp-server.c
@ -20,6 +20,7 @@
 #include <sys/stat.h>

 #include <dirent.h>
+#include <pwd.h>

 #include "buffer.h"
 #include "bufaux.h"
--- a/ssh-add.c
+++ b/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"
--- a/ssh-keygen.c
+++ b/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,9 @@
 #include <openssl/evp.h>
 #include <openssl/pem.h>

+#include <paths.h>
+#include <pwd.h>
+
 #include "xmalloc.h"
 #include "key.h"
 #include "rsa.h"
--- a/ssh-keysign.c
+++ b/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.
 *
@ -27,6 +27,7 @@
 #ifdef HAVE_PATHS_H
 #include <paths.h>
 #endif
+#include <pwd.h>

 #include <openssl/evp.h>
 #include <openssl/rand.h>
--- a/ssh-rand-helper.c
+++ b/ssh-rand-helper.c
@ -36,6 +36,7 @@
 # include <sys/un.h>
 #endif

+#include <pwd.h>
 #include <signal.h>

 #include <openssl/rand.h>
--- a/ssh.c
+++ b/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
@ -54,6 +54,7 @@
 #ifdef HAVE_PATHS_H
 #include <paths.h>
 #endif
+#include <pwd.h>
 #include <signal.h>

 #include <openssl/evp.h>
--- a/sshconnect.c
+++ b/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
@ -26,6 +26,7 @@
 #ifdef HAVE_PATHS_H
 #include <paths.h>
 #endif
+#include <pwd.h>

 #include "ssh.h"
 #include "xmalloc.h"
--- a/sshconnect.h
+++ b/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;
--- a/sshd.c
+++ b/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
@ -54,6 +54,7 @@
 #ifdef HAVE_PATHS_H
 #include <paths.h>
 #endif
+#include <pwd.h>
 #include <signal.h>

 #include <openssl/dh.h>
--- a/sshpty.c
+++ b/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
@ -23,6 +23,7 @@
 #ifdef HAVE_PATHS_H
 # include <paths.h>
 #endif
+#include <pwd.h>
 #include <termios.h>
 #ifdef HAVE_UTIL_H
 # include <util.h>
--- a/sshpty.h
+++ b/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);
--- a/uidswap.c
+++ b/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 <grp.h>

 #include "log.h"
--- a/uidswap.h
+++ b/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 *);