diff options
author | Darren Tucker <dtucker@zip.com.au> | 2006-07-12 22:22:46 +1000 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2006-07-12 22:22:46 +1000 |
commit | 39972493467dd9a32a117e85bcbff9aa1e7f3c8d (patch) | |
tree | 652f02d97e6237c0b0a7b202e60517bdc7c14720 | |
parent | e7d4b19f755c0d33122ef373e54b69e6b93cb0b4 (diff) |
- stevesk@cvs.openbsd.org 2006/07/11 20:07:25
[scp.c auth.c monitor.c serverloop.c sftp-server.c sshpty.c readpass.c
sshd.c monitor_wrap.c monitor_fdpass.c ssh-agent.c ttymodes.c atomicio.c
includes.h session.c sshlogin.c monitor_mm.c packet.c sshconnect2.c
sftp-client.c nchan.c clientloop.c sftp.c misc.c canohost.c channels.c
ssh-keygen.c progressmeter.c uidswap.c msg.c readconf.c sshconnect.c]
move #include <errno.h> out of includes.h; ok markus@
-rw-r--r-- | ChangeLog | 9 | ||||
-rw-r--r-- | atomicio.c | 4 | ||||
-rw-r--r-- | auth.c | 3 | ||||
-rw-r--r-- | canohost.c | 3 | ||||
-rw-r--r-- | channels.c | 3 | ||||
-rw-r--r-- | clientloop.c | 3 | ||||
-rw-r--r-- | includes.h | 3 | ||||
-rw-r--r-- | misc.c | 3 | ||||
-rw-r--r-- | monitor.c | 3 | ||||
-rw-r--r-- | monitor_fdpass.c | 4 | ||||
-rw-r--r-- | monitor_mm.c | 4 | ||||
-rw-r--r-- | monitor_wrap.c | 3 | ||||
-rw-r--r-- | msg.c | 4 | ||||
-rw-r--r-- | nchan.c | 4 | ||||
-rw-r--r-- | packet.c | 3 | ||||
-rw-r--r-- | progressmeter.c | 3 | ||||
-rw-r--r-- | readconf.c | 3 | ||||
-rw-r--r-- | readpass.c | 3 | ||||
-rw-r--r-- | scp.c | 3 | ||||
-rw-r--r-- | serverloop.c | 3 | ||||
-rw-r--r-- | session.c | 3 | ||||
-rw-r--r-- | sftp-client.c | 3 | ||||
-rw-r--r-- | sftp-server.c | 3 | ||||
-rw-r--r-- | sftp.c | 4 | ||||
-rw-r--r-- | ssh-agent.c | 3 | ||||
-rw-r--r-- | ssh-keygen.c | 3 | ||||
-rw-r--r-- | sshconnect.c | 3 | ||||
-rw-r--r-- | sshconnect2.c | 4 | ||||
-rw-r--r-- | sshd.c | 3 | ||||
-rw-r--r-- | sshlogin.c | 3 | ||||
-rw-r--r-- | sshpty.c | 3 | ||||
-rw-r--r-- | ttymodes.c | 3 | ||||
-rw-r--r-- | uidswap.c | 3 |
33 files changed, 78 insertions, 34 deletions
@@ -29,6 +29,13 @@ add ExitOnForwardFailure: terminate the connection if ssh(1) cannot set up all requested dynamic, local, and remote port forwardings. ok djm, dtucker, stevesk, jmc + - stevesk@cvs.openbsd.org 2006/07/11 20:07:25 + [scp.c auth.c monitor.c serverloop.c sftp-server.c sshpty.c readpass.c + sshd.c monitor_wrap.c monitor_fdpass.c ssh-agent.c ttymodes.c atomicio.c + includes.h session.c sshlogin.c monitor_mm.c packet.c sshconnect2.c + sftp-client.c nchan.c clientloop.c sftp.c misc.c canohost.c channels.c + ssh-keygen.c progressmeter.c uidswap.c msg.c readconf.c sshconnect.c] + move #include <errno.h> out of includes.h; ok markus@ 20060711 - (dtucker) [configure.ac ssh-keygen.c openbsd-compat/bsd-openpty.c @@ -4878,4 +4885,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.4396 2006/07/12 12:17:10 dtucker Exp $ +$Id: ChangeLog,v 1.4397 2006/07/12 12:22:46 dtucker Exp $ @@ -1,4 +1,4 @@ -/* $OpenBSD: atomicio.c,v 1.19 2006/04/16 07:59:00 djm Exp $ */ +/* $OpenBSD: atomicio.c,v 1.20 2006/07/11 20:07:25 stevesk Exp $ */ /* * Copyright (c) 2006 Damien Miller. All rights reserved. * Copyright (c) 2005 Anil Madhavapeddy. All rights reserved. @@ -28,6 +28,8 @@ #include "includes.h" +#include <errno.h> + #include "atomicio.h" /* @@ -1,4 +1,4 @@ -/* $OpenBSD: auth.c,v 1.69 2006/07/10 16:37:36 stevesk Exp $ */ +/* $OpenBSD: auth.c,v 1.70 2006/07/11 20:07:25 stevesk Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * @@ -28,6 +28,7 @@ #include <sys/types.h> #include <sys/stat.h> +#include <errno.h> #ifdef HAVE_PATHS_H # include <paths.h> #endif @@ -1,4 +1,4 @@ -/* $OpenBSD: canohost.c,v 1.55 2006/07/08 21:47:12 stevesk Exp $ */ +/* $OpenBSD: canohost.c,v 1.56 2006/07/11 20:07:25 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 <netinet/in.h> #include <ctype.h> +#include <errno.h> #include "packet.h" #include "xmalloc.h" @@ -1,4 +1,4 @@ -/* $OpenBSD: channels.c,v 1.253 2006/07/11 18:50:47 markus Exp $ */ +/* $OpenBSD: channels.c,v 1.254 2006/07/11 20:07:25 stevesk Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -49,6 +49,7 @@ #include <netinet/in.h> #include <arpa/inet.h> +#include <errno.h> #include <termios.h> #include "ssh.h" diff --git a/clientloop.c b/clientloop.c index 6cb2a7ac..978289b6 100644 --- a/clientloop.c +++ b/clientloop.c @@ -1,4 +1,4 @@ -/* $OpenBSD: clientloop.c,v 1.167 2006/07/11 18:50:47 markus Exp $ */ +/* $OpenBSD: clientloop.c,v 1.168 2006/07/11 20:07:25 stevesk Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -69,6 +69,7 @@ #include <sys/ioctl.h> #include <ctype.h> +#include <errno.h> #ifdef HAVE_PATHS_H #include <paths.h> #endif @@ -1,4 +1,4 @@ -/* $OpenBSD: includes.h,v 1.48 2006/07/10 16:37:36 stevesk Exp $ */ +/* $OpenBSD: includes.h,v 1.49 2006/07/11 20:07:25 stevesk Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> @@ -21,7 +21,6 @@ #define _GNU_SOURCE /* activate extra prototypes for glibc */ #include <stdio.h> -#include <errno.h> #include <stdlib.h> #include <string.h> #include <time.h> @@ -1,4 +1,4 @@ -/* $OpenBSD: misc.c,v 1.57 2006/07/10 16:37:36 stevesk Exp $ */ +/* $OpenBSD: misc.c,v 1.58 2006/07/11 20:07:25 stevesk Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * Copyright (c) 2005,2006 Damien Miller. All rights reserved. @@ -35,6 +35,7 @@ #include <netinet/in.h> #include <netinet/tcp.h> +#include <errno.h> #include <fcntl.h> #ifdef HAVE_PATHS_H # include <paths.h> @@ -1,4 +1,4 @@ -/* $OpenBSD: monitor.c,v 1.80 2006/07/09 15:15:10 stevesk Exp $ */ +/* $OpenBSD: monitor.c,v 1.81 2006/07/11 20:07:25 stevesk Exp $ */ /* * Copyright 2002 Niels Provos <provos@citi.umich.edu> * Copyright 2002 Markus Friedl <markus@openbsd.org> @@ -31,6 +31,7 @@ #include <sys/socket.h> #include <sys/wait.h> +#include <errno.h> #include <fcntl.h> #ifdef HAVE_PATHS_H #include <paths.h> diff --git a/monitor_fdpass.c b/monitor_fdpass.c index 546f7010..9d319ac1 100644 --- a/monitor_fdpass.c +++ b/monitor_fdpass.c @@ -1,4 +1,4 @@ -/* $OpenBSD: monitor_fdpass.c,v 1.9 2006/07/08 21:47:12 stevesk Exp $ */ +/* $OpenBSD: monitor_fdpass.c,v 1.10 2006/07/11 20:07:25 stevesk Exp $ */ /* * Copyright 2001 Niels Provos <provos@citi.umich.edu> * All rights reserved. @@ -30,6 +30,8 @@ #include <sys/socket.h> #include <sys/uio.h> +#include <errno.h> + #include "log.h" #include "monitor_fdpass.h" diff --git a/monitor_mm.c b/monitor_mm.c index 22275162..dc0dbda7 100644 --- a/monitor_mm.c +++ b/monitor_mm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: monitor_mm.c,v 1.11 2006/03/25 13:17:02 djm Exp $ */ +/* $OpenBSD: monitor_mm.c,v 1.12 2006/07/11 20:07:25 stevesk Exp $ */ /* * Copyright 2002 Niels Provos <provos@citi.umich.edu> * All rights reserved. @@ -26,6 +26,8 @@ #include "includes.h" +#include <errno.h> + #ifdef HAVE_SYS_MMAN_H #include <sys/mman.h> #endif diff --git a/monitor_wrap.c b/monitor_wrap.c index 22b1fe85..9ec60b6a 100644 --- a/monitor_wrap.c +++ b/monitor_wrap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: monitor_wrap.c,v 1.46 2006/07/06 16:03:53 stevesk Exp $ */ +/* $OpenBSD: monitor_wrap.c,v 1.47 2006/07/11 20:07:25 stevesk Exp $ */ /* * Copyright 2002 Niels Provos <provos@citi.umich.edu> * Copyright 2002 Markus Friedl <markus@openbsd.org> @@ -32,6 +32,7 @@ #include <openssl/bn.h> #include <openssl/dh.h> +#include <errno.h> #include <pwd.h> #include "ssh.h" @@ -1,4 +1,4 @@ -/* $OpenBSD: msg.c,v 1.11 2006/03/30 09:58:15 djm Exp $ */ +/* $OpenBSD: msg.c,v 1.12 2006/07/11 20:07:25 stevesk Exp $ */ /* * Copyright (c) 2002 Markus Friedl. All rights reserved. * @@ -24,6 +24,8 @@ */ #include "includes.h" +#include <errno.h> + #include "buffer.h" #include "log.h" #include "atomicio.h" @@ -1,4 +1,4 @@ -/* $OpenBSD: nchan.c,v 1.54 2006/07/08 21:47:12 stevesk Exp $ */ +/* $OpenBSD: nchan.c,v 1.55 2006/07/11 20:07:25 stevesk Exp $ */ /* * Copyright (c) 1999, 2000, 2001, 2002 Markus Friedl. All rights reserved. * @@ -28,6 +28,8 @@ #include <sys/types.h> #include <sys/socket.h> +#include <errno.h> + #include "ssh1.h" #include "ssh2.h" #include "buffer.h" @@ -1,4 +1,4 @@ -/* $OpenBSD: packet.c,v 1.134 2006/07/10 16:37:36 stevesk Exp $ */ +/* $OpenBSD: packet.c,v 1.135 2006/07/11 20:07:25 stevesk Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -47,6 +47,7 @@ #include <netinet/in.h> #include <netinet/ip.h> +#include <errno.h> #include <stdarg.h> #include "xmalloc.h" diff --git a/progressmeter.c b/progressmeter.c index d145a724..98a30e11 100644 --- a/progressmeter.c +++ b/progressmeter.c @@ -1,4 +1,4 @@ -/* $OpenBSD: progressmeter.c,v 1.29 2006/03/25 13:17:02 djm Exp $ */ +/* $OpenBSD: progressmeter.c,v 1.30 2006/07/11 20:07:25 stevesk Exp $ */ /* * Copyright (c) 2003 Nils Nordman. All rights reserved. * @@ -27,6 +27,7 @@ #include <sys/ioctl.h> +#include <errno.h> #include <signal.h> #include "progressmeter.h" @@ -1,4 +1,4 @@ -/* $OpenBSD: readconf.c,v 1.153 2006/07/11 18:50:48 markus Exp $ */ +/* $OpenBSD: readconf.c,v 1.154 2006/07/11 20:07:25 stevesk Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -21,6 +21,7 @@ #include <netinet/in.h> #include <ctype.h> +#include <errno.h> #include "ssh.h" #include "xmalloc.h" @@ -1,4 +1,4 @@ -/* $OpenBSD: readpass.c,v 1.41 2006/07/10 16:37:36 stevesk Exp $ */ +/* $OpenBSD: readpass.c,v 1.42 2006/07/11 20:07:25 stevesk Exp $ */ /* * Copyright (c) 2001 Markus Friedl. All rights reserved. * @@ -28,6 +28,7 @@ #include <sys/types.h> #include <sys/wait.h> +#include <errno.h> #include <fcntl.h> #ifdef HAVE_PATHS_H # include <paths.h> @@ -1,4 +1,4 @@ -/* $OpenBSD: scp.c,v 1.146 2006/07/10 16:37:36 stevesk Exp $ */ +/* $OpenBSD: scp.c,v 1.147 2006/07/11 20:07:25 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 <errno.h> #include <fcntl.h> #include <pwd.h> #include <signal.h> diff --git a/serverloop.c b/serverloop.c index 09063ab8..83138aec 100644 --- a/serverloop.c +++ b/serverloop.c @@ -1,4 +1,4 @@ -/* $OpenBSD: serverloop.c,v 1.138 2006/07/09 15:15:11 stevesk Exp $ */ +/* $OpenBSD: serverloop.c,v 1.139 2006/07/11 20:07:25 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 <errno.h> #include <fcntl.h> #include <pwd.h> #include <signal.h> @@ -1,4 +1,4 @@ -/* $OpenBSD: session.c,v 1.208 2006/07/11 18:50:48 markus Exp $ */ +/* $OpenBSD: session.c,v 1.209 2006/07/11 20:07:25 stevesk Exp $ */ /* * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * All rights reserved @@ -43,6 +43,7 @@ #include <sys/wait.h> #include <sys/un.h> +#include <errno.h> #include <grp.h> #ifdef HAVE_PATHS_H #include <paths.h> diff --git a/sftp-client.c b/sftp-client.c index e10361e9..8fe0c0fe 100644 --- a/sftp-client.c +++ b/sftp-client.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sftp-client.c,v 1.66 2006/07/09 15:15:11 stevesk Exp $ */ +/* $OpenBSD: sftp-client.c,v 1.67 2006/07/11 20:07:25 stevesk Exp $ */ /* * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org> * @@ -27,6 +27,7 @@ # include <sys/stat.h> #endif +#include <errno.h> #include <fcntl.h> #include <signal.h> diff --git a/sftp-server.c b/sftp-server.c index e7193859..29503246 100644 --- a/sftp-server.c +++ b/sftp-server.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sftp-server.c,v 1.61 2006/07/10 11:25:53 djm Exp $ */ +/* $OpenBSD: sftp-server.c,v 1.62 2006/07/11 20:07:25 stevesk Exp $ */ /* * Copyright (c) 2000-2004 Markus Friedl. All rights reserved. * @@ -20,6 +20,7 @@ #include <sys/stat.h> #include <dirent.h> +#include <errno.h> #include <fcntl.h> #include <pwd.h> @@ -1,4 +1,4 @@ -/* $OpenBSD: sftp.c,v 1.84 2006/07/10 16:01:57 stevesk Exp $ */ +/* $OpenBSD: sftp.c,v 1.85 2006/07/11 20:07:25 stevesk Exp $ */ /* * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org> * @@ -25,6 +25,8 @@ #include <sys/socket.h> #include <sys/wait.h> +#include <errno.h> + #ifdef HAVE_PATHS_H # include <paths.h> #endif diff --git a/ssh-agent.c b/ssh-agent.c index 57c7380f..4421fa42 100644 --- a/ssh-agent.c +++ b/ssh-agent.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh-agent.c,v 1.142 2006/07/09 15:15:11 stevesk Exp $ */ +/* $OpenBSD: ssh-agent.c,v 1.143 2006/07/11 20:07:25 stevesk Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -45,6 +45,7 @@ #include "openbsd-compat/sys-queue.h" #include <sys/resource.h> +#include <errno.h> #include <fcntl.h> #ifdef HAVE_PATHS_H # include <paths.h> diff --git a/ssh-keygen.c b/ssh-keygen.c index 4e42d0cf..1c506059 100644 --- a/ssh-keygen.c +++ b/ssh-keygen.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh-keygen.c,v 1.147 2006/07/09 15:15:11 stevesk Exp $ */ +/* $OpenBSD: ssh-keygen.c,v 1.148 2006/07/11 20:07:25 stevesk Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -21,6 +21,7 @@ #include <openssl/evp.h> #include <openssl/pem.h> +#include <errno.h> #include <fcntl.h> #ifdef HAVE_PATHS_H # include <paths.h> diff --git a/sshconnect.c b/sshconnect.c index f8450ead..c9d6221d 100644 --- a/sshconnect.c +++ b/sshconnect.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sshconnect.c,v 1.189 2006/07/10 12:46:51 dtucker Exp $ */ +/* $OpenBSD: sshconnect.c,v 1.190 2006/07/11 20:07:25 stevesk Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -23,6 +23,7 @@ #include <netinet/in.h> #include <ctype.h> +#include <errno.h> #ifdef HAVE_PATHS_H #include <paths.h> #endif diff --git a/sshconnect2.c b/sshconnect2.c index 4f96dcfc..04ea8dfc 100644 --- a/sshconnect2.c +++ b/sshconnect2.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sshconnect2.c,v 1.155 2006/06/08 14:45:49 markus Exp $ */ +/* $OpenBSD: sshconnect2.c,v 1.156 2006/07/11 20:07:25 stevesk Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * @@ -29,6 +29,8 @@ #include <sys/wait.h> #include <sys/stat.h> +#include <errno.h> + #include "openbsd-compat/sys-queue.h" #include "ssh.h" @@ -1,4 +1,4 @@ -/* $OpenBSD: sshd.c,v 1.335 2006/07/09 15:15:11 stevesk Exp $ */ +/* $OpenBSD: sshd.c,v 1.336 2006/07/11 20:07:25 stevesk Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -52,6 +52,7 @@ #include <sys/socket.h> #include <sys/wait.h> +#include <errno.h> #include <fcntl.h> #ifdef HAVE_PATHS_H #include <paths.h> @@ -1,4 +1,4 @@ -/* $OpenBSD: sshlogin.c,v 1.18 2006/07/09 15:15:11 stevesk Exp $ */ +/* $OpenBSD: sshlogin.c,v 1.19 2006/07/11 20:07:25 stevesk Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -41,6 +41,7 @@ #include "includes.h" +#include <errno.h> #include <fcntl.h> #include "loginrec.h" @@ -1,4 +1,4 @@ -/* $OpenBSD: sshpty.c,v 1.22 2006/07/09 15:15:11 stevesk Exp $ */ +/* $OpenBSD: sshpty.c,v 1.23 2006/07/11 20:07:25 stevesk Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -19,6 +19,7 @@ #include <sys/stat.h> #include <signal.h> +#include <errno.h> #include <fcntl.h> #include <grp.h> #ifdef HAVE_PATHS_H @@ -1,4 +1,4 @@ -/* $OpenBSD: ttymodes.c,v 1.23 2006/03/25 13:17:03 djm Exp $ */ +/* $OpenBSD: ttymodes.c,v 1.24 2006/07/11 20:07:25 stevesk Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -45,6 +45,7 @@ #include "includes.h" +#include <errno.h> #include <termios.h> #include "packet.h" @@ -1,4 +1,4 @@ -/* $OpenBSD: uidswap.c,v 1.30 2006/07/06 16:03:53 stevesk Exp $ */ +/* $OpenBSD: uidswap.c,v 1.31 2006/07/11 20:07:25 stevesk Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -16,6 +16,7 @@ #include <sys/types.h> +#include <errno.h> #include <pwd.h> #include <grp.h> |