summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog11
-rw-r--r--auth-options.c6
-rw-r--r--auth-options.h6
-rw-r--r--auth-passwd.c6
-rw-r--r--auth-rh-rsa.c6
-rw-r--r--auth-rhosts.c3
-rw-r--r--auth-rsa.c4
-rw-r--r--auth.c3
-rw-r--r--auth.h10
-rw-r--r--auth2-hostbased.c6
-rw-r--r--auth2-pubkey.c4
-rw-r--r--auth2.c6
-rw-r--r--includes.h4
-rw-r--r--loginrec.c2
-rw-r--r--misc.c4
-rw-r--r--misc.h6
-rw-r--r--monitor.c3
-rw-r--r--monitor_wrap.c6
-rw-r--r--monitor_wrap.h7
-rw-r--r--scp.c3
-rw-r--r--serverloop.c3
-rw-r--r--session.c3
-rw-r--r--session.h6
-rw-r--r--sftp-common.c3
-rw-r--r--sftp-server.c1
-rw-r--r--ssh-add.c4
-rw-r--r--ssh-keygen.c5
-rw-r--r--ssh-keysign.c3
-rw-r--r--ssh-rand-helper.c1
-rw-r--r--ssh.c3
-rw-r--r--sshconnect.c3
-rw-r--r--sshconnect.h6
-rw-r--r--sshd.c3
-rw-r--r--sshpty.c3
-rw-r--r--sshpty.h5
-rw-r--r--uidswap.c6
-rw-r--r--uidswap.h6
37 files changed, 132 insertions, 38 deletions
diff --git a/ChangeLog b/ChangeLog
index e3e7ce825..a4a75e57b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -41,6 +41,15 @@
41 - djm@cvs.openbsd.org 2006/07/06 10:47:57 41 - djm@cvs.openbsd.org 2006/07/06 10:47:57
42 [sftp-server.8 sftp-server.c] 42 [sftp-server.8 sftp-server.c]
43 add commandline options to enable logging of transactions; ok markus@ 43 add commandline options to enable logging of transactions; ok markus@
44 - stevesk@cvs.openbsd.org 2006/07/06 16:03:53
45 [auth-options.c auth-options.h auth-passwd.c auth-rh-rsa.c]
46 [auth-rhosts.c auth-rsa.c auth.c auth.h auth2-hostbased.c]
47 [auth2-pubkey.c auth2.c includes.h misc.c misc.h monitor.c]
48 [monitor_wrap.c monitor_wrap.h scp.c serverloop.c session.c]
49 [session.h sftp-common.c ssh-add.c ssh-keygen.c ssh-keysign.c]
50 [ssh.c sshconnect.c sshconnect.h sshd.c sshpty.c sshpty.h uidswap.c]
51 [uidswap.h]
52 move #include <pwd.h> out of includes.h; ok markus@
44 53
4520060706 5420060706
46 - (dtucker) [configure.ac] Try AIX blibpath test in different order when 55 - (dtucker) [configure.ac] Try AIX blibpath test in different order when
@@ -4774,4 +4783,4 @@
4774 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 4783 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
4775 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 4784 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
4776 4785
4777$Id: ChangeLog,v 1.4370 2006/07/10 10:46:55 djm Exp $ 4786$Id: ChangeLog,v 1.4371 2006/07/10 10:53:08 djm Exp $
diff --git a/auth-options.c b/auth-options.c
index 56d598412..473fb8bf7 100644
--- a/auth-options.c
+++ b/auth-options.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: auth-options.c,v 1.35 2006/03/25 13:17:01 djm Exp $ */ 1/* $OpenBSD: auth-options.c,v 1.36 2006/07/06 16:03:53 stevesk 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
@@ -12,6 +12,10 @@
12 12
13#include "includes.h" 13#include "includes.h"
14 14
15#include <sys/types.h>
16
17#include <pwd.h>
18
15#include "xmalloc.h" 19#include "xmalloc.h"
16#include "match.h" 20#include "match.h"
17#include "log.h" 21#include "log.h"
diff --git a/auth-options.h b/auth-options.h
index d34b5f190..cd2b030cd 100644
--- a/auth-options.h
+++ b/auth-options.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: auth-options.h,v 1.14 2006/03/25 22:22:42 djm Exp $ */ 1/* $OpenBSD: auth-options.h,v 1.15 2006/07/06 16:03:53 stevesk Exp $ */
2 2
3/* 3/*
4 * Author: Tatu Ylonen <ylo@cs.hut.fi> 4 * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -15,6 +15,10 @@
15#ifndef AUTH_OPTIONS_H 15#ifndef AUTH_OPTIONS_H
16#define AUTH_OPTIONS_H 16#define AUTH_OPTIONS_H
17 17
18#include <sys/types.h>
19
20#include <pwd.h>
21
18/* Linked list of custom environment strings */ 22/* Linked list of custom environment strings */
19struct envstring { 23struct envstring {
20 struct envstring *next; 24 struct envstring *next;
diff --git a/auth-passwd.c b/auth-passwd.c
index 2ebcc5fc4..3cf86dcbd 100644
--- a/auth-passwd.c
+++ b/auth-passwd.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: auth-passwd.c,v 1.36 2006/03/25 13:17:01 djm Exp $ */ 1/* $OpenBSD: auth-passwd.c,v 1.37 2006/07/06 16:03:53 stevesk 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
@@ -38,6 +38,10 @@
38 38
39#include "includes.h" 39#include "includes.h"
40 40
41#include <sys/types.h>
42
43#include <pwd.h>
44
41#include "packet.h" 45#include "packet.h"
42#include "buffer.h" 46#include "buffer.h"
43#include "log.h" 47#include "log.h"
diff --git a/auth-rh-rsa.c b/auth-rh-rsa.c
index c8bdfa26c..8fa21e12c 100644
--- a/auth-rh-rsa.c
+++ b/auth-rh-rsa.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: auth-rh-rsa.c,v 1.40 2006/03/25 13:17:01 djm Exp $ */ 1/* $OpenBSD: auth-rh-rsa.c,v 1.41 2006/07/06 16:03:53 stevesk 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
@@ -15,6 +15,10 @@
15 15
16#include "includes.h" 16#include "includes.h"
17 17
18#include <sys/types.h>
19
20#include <pwd.h>
21
18#include "packet.h" 22#include "packet.h"
19#include "uidswap.h" 23#include "uidswap.h"
20#include "log.h" 24#include "log.h"
diff --git a/auth-rhosts.c b/auth-rhosts.c
index ce72adb7d..d50ea3a01 100644
--- a/auth-rhosts.c
+++ b/auth-rhosts.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: auth-rhosts.c,v 1.37 2006/03/25 13:17:01 djm Exp $ */ 1/* $OpenBSD: auth-rhosts.c,v 1.38 2006/07/06 16:03:53 stevesk 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
@@ -22,6 +22,7 @@
22#ifdef HAVE_NETGROUP_H 22#ifdef HAVE_NETGROUP_H
23# include <netgroup.h> 23# include <netgroup.h>
24#endif 24#endif
25#include <pwd.h>
25 26
26#include "packet.h" 27#include "packet.h"
27#include "uidswap.h" 28#include "uidswap.h"
diff --git a/auth-rsa.c b/auth-rsa.c
index c331c267d..867597642 100644
--- a/auth-rsa.c
+++ b/auth-rsa.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: auth-rsa.c,v 1.67 2006/03/25 18:29:35 deraadt Exp $ */ 1/* $OpenBSD: auth-rsa.c,v 1.68 2006/07/06 16:03:53 stevesk 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
@@ -22,6 +22,8 @@
22#include <openssl/rsa.h> 22#include <openssl/rsa.h>
23#include <openssl/md5.h> 23#include <openssl/md5.h>
24 24
25#include <pwd.h>
26
25#include "rsa.h" 27#include "rsa.h"
26#include "packet.h" 28#include "packet.h"
27#include "xmalloc.h" 29#include "xmalloc.h"
diff --git a/auth.c b/auth.c
index ffa94e886..0c8894c99 100644
--- a/auth.c
+++ b/auth.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: auth.c,v 1.67 2006/03/30 11:40:21 dtucker Exp $ */ 1/* $OpenBSD: auth.c,v 1.68 2006/07/06 16:03:53 stevesk Exp $ */
2/* 2/*
3 * Copyright (c) 2000 Markus Friedl. All rights reserved. 3 * Copyright (c) 2000 Markus Friedl. All rights reserved.
4 * 4 *
@@ -31,6 +31,7 @@
31#ifdef HAVE_PATHS_H 31#ifdef HAVE_PATHS_H
32# include <paths.h> 32# include <paths.h>
33#endif 33#endif
34#include <pwd.h>
34#ifdef HAVE_LOGIN_H 35#ifdef HAVE_LOGIN_H
35#include <login.h> 36#include <login.h>
36#endif 37#endif
diff --git a/auth.h b/auth.h
index 5f9fb6f10..6688c3dc5 100644
--- a/auth.h
+++ b/auth.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: auth.h,v 1.53 2006/04/20 09:27:09 djm Exp $ */ 1/* $OpenBSD: auth.h,v 1.54 2006/07/06 16:03:53 stevesk Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2000 Markus Friedl. All rights reserved. 4 * Copyright (c) 2000 Markus Friedl. All rights reserved.
@@ -28,10 +28,11 @@
28#ifndef AUTH_H 28#ifndef AUTH_H
29#define AUTH_H 29#define AUTH_H
30 30
31#include <sys/types.h>
32
31#include <signal.h> 33#include <signal.h>
34#include <pwd.h>
32 35
33#include "key.h"
34#include "hostfile.h"
35#include "buffer.h" 36#include "buffer.h"
36#include <openssl/rsa.h> 37#include <openssl/rsa.h>
37 38
@@ -45,6 +46,9 @@
45#include <krb5.h> 46#include <krb5.h>
46#endif 47#endif
47 48
49#include "key.h"
50#include "hostfile.h"
51
48typedef struct Authctxt Authctxt; 52typedef struct Authctxt Authctxt;
49typedef struct Authmethod Authmethod; 53typedef struct Authmethod Authmethod;
50typedef struct KbdintDevice KbdintDevice; 54typedef struct KbdintDevice KbdintDevice;
diff --git a/auth2-hostbased.c b/auth2-hostbased.c
index 8d5f38353..56bf0be13 100644
--- a/auth2-hostbased.c
+++ b/auth2-hostbased.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: auth2-hostbased.c,v 1.8 2006/03/25 13:17:01 djm Exp $ */ 1/* $OpenBSD: auth2-hostbased.c,v 1.9 2006/07/06 16:03:53 stevesk Exp $ */
2/* 2/*
3 * Copyright (c) 2000 Markus Friedl. All rights reserved. 3 * Copyright (c) 2000 Markus Friedl. All rights reserved.
4 * 4 *
@@ -25,6 +25,10 @@
25 25
26#include "includes.h" 26#include "includes.h"
27 27
28#include <sys/types.h>
29
30#include <pwd.h>
31
28#include "ssh2.h" 32#include "ssh2.h"
29#include "xmalloc.h" 33#include "xmalloc.h"
30#include "packet.h" 34#include "packet.h"
diff --git a/auth2-pubkey.c b/auth2-pubkey.c
index 8786014f2..7962dcef2 100644
--- a/auth2-pubkey.c
+++ b/auth2-pubkey.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: auth2-pubkey.c,v 1.12 2006/03/25 13:17:01 djm Exp $ */ 1/* $OpenBSD: auth2-pubkey.c,v 1.13 2006/07/06 16:03:53 stevesk Exp $ */
2/* 2/*
3 * Copyright (c) 2000 Markus Friedl. All rights reserved. 3 * Copyright (c) 2000 Markus Friedl. All rights reserved.
4 * 4 *
@@ -28,6 +28,8 @@
28#include <sys/types.h> 28#include <sys/types.h>
29#include <sys/stat.h> 29#include <sys/stat.h>
30 30
31#include <pwd.h>
32
31#include "ssh.h" 33#include "ssh.h"
32#include "ssh2.h" 34#include "ssh2.h"
33#include "xmalloc.h" 35#include "xmalloc.h"
diff --git a/auth2.c b/auth2.c
index 8f7ec0d6d..ad57c64e6 100644
--- a/auth2.c
+++ b/auth2.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: auth2.c,v 1.110 2006/03/25 13:17:01 djm Exp $ */ 1/* $OpenBSD: auth2.c,v 1.111 2006/07/06 16:03:53 stevesk Exp $ */
2/* 2/*
3 * Copyright (c) 2000 Markus Friedl. All rights reserved. 3 * Copyright (c) 2000 Markus Friedl. All rights reserved.
4 * 4 *
@@ -25,6 +25,10 @@
25 25
26#include "includes.h" 26#include "includes.h"
27 27
28#include <sys/types.h>
29
30#include <pwd.h>
31
28#include "ssh2.h" 32#include "ssh2.h"
29#include "xmalloc.h" 33#include "xmalloc.h"
30#include "packet.h" 34#include "packet.h"
diff --git a/includes.h b/includes.h
index 51b6a0b84..55ca7bedd 100644
--- a/includes.h
+++ b/includes.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: includes.h,v 1.44 2006/07/05 02:42:09 stevesk Exp $ */ 1/* $OpenBSD: includes.h,v 1.45 2006/07/06 16:03:53 stevesk Exp $ */
2 2
3/* 3/*
4 * Author: Tatu Ylonen <ylo@cs.hut.fi> 4 * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -27,8 +27,6 @@
27#include <stdlib.h> 27#include <stdlib.h>
28#include <string.h> 28#include <string.h>
29#include <stdarg.h> 29#include <stdarg.h>
30#include <pwd.h>
31#include <grp.h>
32#include <time.h> 30#include <time.h>
33#include <stddef.h> 31#include <stddef.h>
34 32
diff --git a/loginrec.c b/loginrec.c
index 76ddc2000..42f022fd9 100644
--- a/loginrec.c
+++ b/loginrec.c
@@ -153,6 +153,8 @@
153 153
154#include <netinet/in.h> 154#include <netinet/in.h>
155 155
156#include <pwd.h>
157
156#include "ssh.h" 158#include "ssh.h"
157#include "xmalloc.h" 159#include "xmalloc.h"
158#include "loginrec.h" 160#include "loginrec.h"
diff --git a/misc.c b/misc.c
index 63c7ddf1e..b7316519d 100644
--- a/misc.c
+++ b/misc.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: misc.c,v 1.53 2006/07/05 02:42:09 stevesk Exp $ */ 1/* $OpenBSD: misc.c,v 1.54 2006/07/06 16:03:53 stevesk Exp $ */
2/* 2/*
3 * Copyright (c) 2000 Markus Friedl. All rights reserved. 3 * Copyright (c) 2000 Markus Friedl. All rights reserved.
4 * Copyright (c) 2005,2006 Damien Miller. All rights reserved. 4 * Copyright (c) 2005,2006 Damien Miller. All rights reserved.
@@ -27,6 +27,7 @@
27#include "includes.h" 27#include "includes.h"
28 28
29#include <sys/ioctl.h> 29#include <sys/ioctl.h>
30#include <sys/types.h>
30#include <sys/socket.h> 31#include <sys/socket.h>
31 32
32#include <netinet/in.h> 33#include <netinet/in.h>
@@ -34,6 +35,7 @@
34 35
35#ifdef HAVE_PATHS_H 36#ifdef HAVE_PATHS_H
36# include <paths.h> 37# include <paths.h>
38#include <pwd.h>
37#endif 39#endif
38#ifdef SSH_TUN_OPENBSD 40#ifdef SSH_TUN_OPENBSD
39#include <net/if.h> 41#include <net/if.h>
diff --git a/misc.h b/misc.h
index bbd66ef10..f96328662 100644
--- a/misc.h
+++ b/misc.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: misc.h,v 1.31 2006/03/30 09:58:15 djm Exp $ */ 1/* $OpenBSD: misc.h,v 1.32 2006/07/06 16:03:53 stevesk Exp $ */
2 2
3/* 3/*
4 * Author: Tatu Ylonen <ylo@cs.hut.fi> 4 * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -15,6 +15,10 @@
15#ifndef _MISC_H 15#ifndef _MISC_H
16#define _MISC_H 16#define _MISC_H
17 17
18#include <sys/types.h>
19
20#include <pwd.h>
21
18/* misc.c */ 22/* misc.c */
19 23
20char *chop(char *); 24char *chop(char *);
diff --git a/monitor.c b/monitor.c
index 08919ddfc..72176f9aa 100644
--- a/monitor.c
+++ b/monitor.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: monitor.c,v 1.77 2006/03/30 11:40:21 dtucker Exp $ */ 1/* $OpenBSD: monitor.c,v 1.78 2006/07/06 16:03:53 stevesk Exp $ */
2/* 2/*
3 * Copyright 2002 Niels Provos <provos@citi.umich.edu> 3 * Copyright 2002 Niels Provos <provos@citi.umich.edu>
4 * Copyright 2002 Markus Friedl <markus@openbsd.org> 4 * Copyright 2002 Markus Friedl <markus@openbsd.org>
@@ -33,6 +33,7 @@
33#ifdef HAVE_PATHS_H 33#ifdef HAVE_PATHS_H
34#include <paths.h> 34#include <paths.h>
35#endif 35#endif
36#include <pwd.h>
36#include <signal.h> 37#include <signal.h>
37 38
38#ifdef SKEY 39#ifdef SKEY
diff --git a/monitor_wrap.c b/monitor_wrap.c
index 332652895..22b1fe854 100644
--- a/monitor_wrap.c
+++ b/monitor_wrap.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: monitor_wrap.c,v 1.45 2006/03/30 09:58:15 djm Exp $ */ 1/* $OpenBSD: monitor_wrap.c,v 1.46 2006/07/06 16:03:53 stevesk Exp $ */
2/* 2/*
3 * Copyright 2002 Niels Provos <provos@citi.umich.edu> 3 * Copyright 2002 Niels Provos <provos@citi.umich.edu>
4 * Copyright 2002 Markus Friedl <markus@openbsd.org> 4 * Copyright 2002 Markus Friedl <markus@openbsd.org>
@@ -27,9 +27,13 @@
27 27
28#include "includes.h" 28#include "includes.h"
29 29
30#include <sys/types.h>
31
30#include <openssl/bn.h> 32#include <openssl/bn.h>
31#include <openssl/dh.h> 33#include <openssl/dh.h>
32 34
35#include <pwd.h>
36
33#include "ssh.h" 37#include "ssh.h"
34#include "dh.h" 38#include "dh.h"
35#include "kex.h" 39#include "kex.h"
diff --git a/monitor_wrap.h b/monitor_wrap.h
index c06e30606..0f3b211c9 100644
--- a/monitor_wrap.h
+++ b/monitor_wrap.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: monitor_wrap.h,v 1.16 2006/03/25 22:22:43 djm Exp $ */ 1/* $OpenBSD: monitor_wrap.h,v 1.17 2006/07/06 16:03:53 stevesk Exp $ */
2 2
3/* 3/*
4 * Copyright 2002 Niels Provos <provos@citi.umich.edu> 4 * Copyright 2002 Niels Provos <provos@citi.umich.edu>
@@ -27,6 +27,11 @@
27 27
28#ifndef _MM_WRAP_H_ 28#ifndef _MM_WRAP_H_
29#define _MM_WRAP_H_ 29#define _MM_WRAP_H_
30
31#include <sys/types.h>
32
33#include <pwd.h>
34
30#include "key.h" 35#include "key.h"
31#include "buffer.h" 36#include "buffer.h"
32 37
diff --git a/scp.c b/scp.c
index e5332972c..cfe2165e6 100644
--- a/scp.c
+++ b/scp.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: scp.c,v 1.142 2006/05/17 12:43:34 markus Exp $ */ 1/* $OpenBSD: scp.c,v 1.143 2006/07/06 16:03:53 stevesk Exp $ */
2/* 2/*
3 * scp - secure remote copy. This is basically patched BSD rcp which 3 * scp - secure remote copy. This is basically patched BSD rcp which
4 * uses ssh to do the data transfer (instead of using rcmd). 4 * uses ssh to do the data transfer (instead of using rcmd).
@@ -81,6 +81,7 @@
81 81
82#include <ctype.h> 82#include <ctype.h>
83#include <dirent.h> 83#include <dirent.h>
84#include <pwd.h>
84#include <signal.h> 85#include <signal.h>
85 86
86#include "xmalloc.h" 87#include "xmalloc.h"
diff --git a/serverloop.c b/serverloop.c
index a0832679c..14baecae1 100644
--- a/serverloop.c
+++ b/serverloop.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: serverloop.c,v 1.136 2006/07/05 02:42:09 stevesk Exp $ */ 1/* $OpenBSD: serverloop.c,v 1.137 2006/07/06 16:03:53 stevesk 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
@@ -43,6 +43,7 @@
43 43
44#include <netinet/in.h> 44#include <netinet/in.h>
45 45
46#include <pwd.h>
46#include <signal.h> 47#include <signal.h>
47#include <termios.h> 48#include <termios.h>
48 49
diff --git a/session.c b/session.c
index 899c3a16b..9115c5aa1 100644
--- a/session.c
+++ b/session.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: session.c,v 1.205 2006/07/06 10:47:05 djm Exp $ */ 1/* $OpenBSD: session.c,v 1.206 2006/07/06 16:03:53 stevesk Exp $ */
2/* 2/*
3 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 3 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
4 * All rights reserved 4 * All rights reserved
@@ -46,6 +46,7 @@
46#ifdef HAVE_PATHS_H 46#ifdef HAVE_PATHS_H
47#include <paths.h> 47#include <paths.h>
48#endif 48#endif
49#include <pwd.h>
49#include <signal.h> 50#include <signal.h>
50#include <arpa/inet.h> 51#include <arpa/inet.h>
51 52
diff --git a/session.h b/session.h
index bdac05934..c3a12821f 100644
--- a/session.h
+++ b/session.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: session.h,v 1.27 2006/03/25 22:22:43 djm Exp $ */ 1/* $OpenBSD: session.h,v 1.28 2006/07/06 16:03:53 stevesk Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. 4 * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved.
@@ -26,6 +26,10 @@
26#ifndef SESSION_H 26#ifndef SESSION_H
27#define SESSION_H 27#define SESSION_H
28 28
29#include <sys/types.h>
30
31#include <pwd.h>
32
29#define TTYSZ 64 33#define TTYSZ 64
30typedef struct Session Session; 34typedef struct Session Session;
31struct Session { 35struct Session {
diff --git a/sftp-common.c b/sftp-common.c
index 8c794a05f..92ce90661 100644
--- a/sftp-common.c
+++ b/sftp-common.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sftp-common.c,v 1.14 2006/07/02 22:45:59 stevesk Exp $ */ 1/* $OpenBSD: sftp-common.c,v 1.15 2006/07/06 16:03:53 stevesk Exp $ */
2/* 2/*
3 * Copyright (c) 2001 Markus Friedl. All rights reserved. 3 * Copyright (c) 2001 Markus Friedl. All rights reserved.
4 * Copyright (c) 2001 Damien Miller. All rights reserved. 4 * Copyright (c) 2001 Damien Miller. All rights reserved.
@@ -30,6 +30,7 @@
30#include <sys/stat.h> 30#include <sys/stat.h>
31 31
32#include <grp.h> 32#include <grp.h>
33#include <pwd.h>
33 34
34#include "buffer.h" 35#include "buffer.h"
35#include "bufaux.h" 36#include "bufaux.h"
diff --git a/sftp-server.c b/sftp-server.c
index e882216b1..b95cb96c2 100644
--- a/sftp-server.c
+++ b/sftp-server.c
@@ -20,6 +20,7 @@
20#include <sys/stat.h> 20#include <sys/stat.h>
21 21
22#include <dirent.h> 22#include <dirent.h>
23#include <pwd.h>
23 24
24#include "buffer.h" 25#include "buffer.h"
25#include "bufaux.h" 26#include "bufaux.h"
diff --git a/ssh-add.c b/ssh-add.c
index 836cb5f9c..1cc10295f 100644
--- a/ssh-add.c
+++ b/ssh-add.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh-add.c,v 1.80 2006/05/30 11:46:38 mk Exp $ */ 1/* $OpenBSD: ssh-add.c,v 1.81 2006/07/06 16:03:53 stevesk 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
@@ -42,6 +42,8 @@
42 42
43#include <openssl/evp.h> 43#include <openssl/evp.h>
44 44
45#include <pwd.h>
46
45#include "ssh.h" 47#include "ssh.h"
46#include "rsa.h" 48#include "rsa.h"
47#include "log.h" 49#include "log.h"
diff --git a/ssh-keygen.c b/ssh-keygen.c
index e06ae1a52..b10e42ec8 100644
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh-keygen.c,v 1.144 2006/05/17 12:43:34 markus Exp $ */ 1/* $OpenBSD: ssh-keygen.c,v 1.145 2006/07/06 16:03:53 stevesk Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -20,6 +20,9 @@
20#include <openssl/evp.h> 20#include <openssl/evp.h>
21#include <openssl/pem.h> 21#include <openssl/pem.h>
22 22
23#include <paths.h>
24#include <pwd.h>
25
23#include "xmalloc.h" 26#include "xmalloc.h"
24#include "key.h" 27#include "key.h"
25#include "rsa.h" 28#include "rsa.h"
diff --git a/ssh-keysign.c b/ssh-keysign.c
index 017af5307..751d49a90 100644
--- a/ssh-keysign.c
+++ b/ssh-keysign.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh-keysign.c,v 1.23 2006/04/02 08:34:52 dtucker Exp $ */ 1/* $OpenBSD: ssh-keysign.c,v 1.24 2006/07/06 16:03:53 stevesk Exp $ */
2/* 2/*
3 * Copyright (c) 2002 Markus Friedl. All rights reserved. 3 * Copyright (c) 2002 Markus Friedl. All rights reserved.
4 * 4 *
@@ -27,6 +27,7 @@
27#ifdef HAVE_PATHS_H 27#ifdef HAVE_PATHS_H
28#include <paths.h> 28#include <paths.h>
29#endif 29#endif
30#include <pwd.h>
30 31
31#include <openssl/evp.h> 32#include <openssl/evp.h>
32#include <openssl/rand.h> 33#include <openssl/rand.h>
diff --git a/ssh-rand-helper.c b/ssh-rand-helper.c
index d8da7d3c0..feb1bfb18 100644
--- a/ssh-rand-helper.c
+++ b/ssh-rand-helper.c
@@ -36,6 +36,7 @@
36# include <sys/un.h> 36# include <sys/un.h>
37#endif 37#endif
38 38
39#include <pwd.h>
39#include <signal.h> 40#include <signal.h>
40 41
41#include <openssl/rand.h> 42#include <openssl/rand.h>
diff --git a/ssh.c b/ssh.c
index 47b1b7195..d9837f162 100644
--- a/ssh.c
+++ b/ssh.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh.c,v 1.278 2006/07/03 08:54:20 stevesk Exp $ */ 1/* $OpenBSD: ssh.c,v 1.279 2006/07/06 16:03:53 stevesk 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
@@ -54,6 +54,7 @@
54#ifdef HAVE_PATHS_H 54#ifdef HAVE_PATHS_H
55#include <paths.h> 55#include <paths.h>
56#endif 56#endif
57#include <pwd.h>
57#include <signal.h> 58#include <signal.h>
58 59
59#include <openssl/evp.h> 60#include <openssl/evp.h>
diff --git a/sshconnect.c b/sshconnect.c
index 7f9c09b91..3bc455eb4 100644
--- a/sshconnect.c
+++ b/sshconnect.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sshconnect.c,v 1.187 2006/07/05 02:42:09 stevesk Exp $ */ 1/* $OpenBSD: sshconnect.c,v 1.188 2006/07/06 16:03:53 stevesk 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
@@ -26,6 +26,7 @@
26#ifdef HAVE_PATHS_H 26#ifdef HAVE_PATHS_H
27#include <paths.h> 27#include <paths.h>
28#endif 28#endif
29#include <pwd.h>
29 30
30#include "ssh.h" 31#include "ssh.h"
31#include "xmalloc.h" 32#include "xmalloc.h"
diff --git a/sshconnect.h b/sshconnect.h
index 692d27567..c1b07390b 100644
--- a/sshconnect.h
+++ b/sshconnect.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: sshconnect.h,v 1.20 2006/06/06 10:20:20 markus Exp $ */ 1/* $OpenBSD: sshconnect.h,v 1.21 2006/07/06 16:03:53 stevesk Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2000 Markus Friedl. All rights reserved. 4 * Copyright (c) 2000 Markus Friedl. All rights reserved.
@@ -26,6 +26,10 @@
26#ifndef SSHCONNECT_H 26#ifndef SSHCONNECT_H
27#define SSHCONNECT_H 27#define SSHCONNECT_H
28 28
29#include <sys/types.h>
30
31#include <pwd.h>
32
29typedef struct Sensitive Sensitive; 33typedef struct Sensitive Sensitive;
30struct Sensitive { 34struct Sensitive {
31 Key **keys; 35 Key **keys;
diff --git a/sshd.c b/sshd.c
index 4c0231d76..790d27576 100644
--- a/sshd.c
+++ b/sshd.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sshd.c,v 1.332 2006/07/03 08:54:20 stevesk Exp $ */ 1/* $OpenBSD: sshd.c,v 1.333 2006/07/06 16:03:53 stevesk 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
@@ -54,6 +54,7 @@
54#ifdef HAVE_PATHS_H 54#ifdef HAVE_PATHS_H
55#include <paths.h> 55#include <paths.h>
56#endif 56#endif
57#include <pwd.h>
57#include <signal.h> 58#include <signal.h>
58 59
59#include <openssl/dh.h> 60#include <openssl/dh.h>
diff --git a/sshpty.c b/sshpty.c
index 92f86e7a1..973c2d2d8 100644
--- a/sshpty.c
+++ b/sshpty.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sshpty.c,v 1.20 2006/07/02 22:45:59 stevesk Exp $ */ 1/* $OpenBSD: sshpty.c,v 1.21 2006/07/06 16:03:53 stevesk 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
@@ -23,6 +23,7 @@
23#ifdef HAVE_PATHS_H 23#ifdef HAVE_PATHS_H
24# include <paths.h> 24# include <paths.h>
25#endif 25#endif
26#include <pwd.h>
26#include <termios.h> 27#include <termios.h>
27#ifdef HAVE_UTIL_H 28#ifdef HAVE_UTIL_H
28# include <util.h> 29# include <util.h>
diff --git a/sshpty.h b/sshpty.h
index f61a5e71e..a7b337474 100644
--- a/sshpty.h
+++ b/sshpty.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: sshpty.h,v 1.8 2006/03/25 22:22:43 djm Exp $ */ 1/* $OpenBSD: sshpty.h,v 1.9 2006/07/06 16:03:53 stevesk Exp $ */
2 2
3/* 3/*
4 * Author: Tatu Ylonen <ylo@cs.hut.fi> 4 * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -17,6 +17,9 @@
17#ifndef SSHPTY_H 17#ifndef SSHPTY_H
18#define SSHPTY_H 18#define SSHPTY_H
19 19
20#include <sys/types.h>
21
22#include <pwd.h>
20#include <termios.h> 23#include <termios.h>
21 24
22struct termios get_saved_tio(void); 25struct termios get_saved_tio(void);
diff --git a/uidswap.c b/uidswap.c
index 32441828d..2ac5d7f91 100644
--- a/uidswap.c
+++ b/uidswap.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: uidswap.c,v 1.29 2006/06/08 14:45:49 markus Exp $ */ 1/* $OpenBSD: uidswap.c,v 1.30 2006/07/06 16:03:53 stevesk 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
@@ -14,6 +14,10 @@
14 14
15#include "includes.h" 15#include "includes.h"
16 16
17#include <sys/types.h>
18
19#include <pwd.h>
20
17#include <grp.h> 21#include <grp.h>
18 22
19#include "log.h" 23#include "log.h"
diff --git a/uidswap.h b/uidswap.h
index f827782d5..436c10f75 100644
--- a/uidswap.h
+++ b/uidswap.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: uidswap.h,v 1.11 2006/06/08 14:45:49 markus Exp $ */ 1/* $OpenBSD: uidswap.h,v 1.12 2006/07/06 16:03:53 stevesk Exp $ */
2 2
3/* 3/*
4 * Author: Tatu Ylonen <ylo@cs.hut.fi> 4 * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -15,6 +15,10 @@
15#ifndef UIDSWAP_H 15#ifndef UIDSWAP_H
16#define UIDSWAP_H 16#define UIDSWAP_H
17 17
18#include <sys/types.h>
19
20#include <pwd.h>
21
18void temporarily_use_uid(struct passwd *); 22void temporarily_use_uid(struct passwd *);
19void restore_uid(void); 23void restore_uid(void);
20void permanently_set_uid(struct passwd *); 24void permanently_set_uid(struct passwd *);
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-29 18:50:48 +0000