- [email protected] 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@

ChangeLog

@@ -41,6 +41,15 @@
    - [email protected] 2006/07/06 10:47:57
      [sftp-server.8 sftp-server.c]
      add commandline options to enable logging of transactions; ok markus@
+   - [email protected] 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 $

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 <[email protected]>
  * Copyright (c) 1995 Tatu Ylonen <[email protected]>, 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"

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 <[email protected]>
@@ -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;

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 <[email protected]>
  * Copyright (c) 1995 Tatu Ylonen <[email protected]>, 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"

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 <[email protected]>
  * Copyright (c) 1995 Tatu Ylonen <[email protected]>, 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"

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 <[email protected]>
  * Copyright (c) 1995 Tatu Ylonen <[email protected]>, Espoo, Finland
@@ -22,6 +22,7 @@
 #ifdef HAVE_NETGROUP_H
 # include <netgroup.h>
 #endif
+#include <pwd.h>
 
 #include "packet.h"
 #include "uidswap.h"

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 <[email protected]>
  * Copyright (c) 1995 Tatu Ylonen <[email protected]>, 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"

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

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 <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;

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"

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"

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"

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 <[email protected]>
@@ -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>
 

loginrec.c

@@ -153,6 +153,8 @@
 
 #include <netinet/in.h>
 
+#include <pwd.h>
+
 #include "ssh.h"
 #include "xmalloc.h"
 #include "loginrec.h"

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,13 +27,15 @@
 #include "includes.h"
 
 #include <sys/ioctl.h>
+#include <sys/types.h>
 #include <sys/socket.h>
 
 #include <netinet/in.h>
 #include <netinet/tcp.h>
 
 #ifdef HAVE_PATHS_H
 # include <paths.h>
+#include <pwd.h>
 #endif
 #ifdef SSH_TUN_OPENBSD
 #include <net/if.h>

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 <[email protected]>
@@ -15,6 +15,10 @@
 #ifndef _MISC_H
 #define _MISC_H
 
+#include <sys/types.h>
+
+#include <pwd.h>
+
 /* misc.c */
 
 char	*chop(char *);

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 <[email protected]>
  * Copyright 2002 Markus Friedl <[email protected]>
@@ -33,6 +33,7 @@
 #ifdef HAVE_PATHS_H
 #include <paths.h>
 #endif
+#include <pwd.h>
 #include <signal.h>
 
 #ifdef SKEY

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 <[email protected]>
  * Copyright 2002 Markus Friedl <[email protected]>
@@ -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"

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 <[email protected]>
@@ -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"
 

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"

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 <[email protected]>
  * Copyright (c) 1995 Tatu Ylonen <[email protected]>, Espoo, Finland
@@ -43,6 +43,7 @@
 
 #include <netinet/in.h>
 
+#include <pwd.h>
 #include <signal.h>
 #include <termios.h>
 

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 <[email protected]>, 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>
 

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 {

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"