From ada6882332224531428465104fc528812bef50bb Mon Sep 17 00:00:00 2001
From: djm <djm>
Date: Wed, 15 Mar 2006 00:52:09 +0000
Subject: [PATCH] oops, this commit is really:

   - stevesk@cvs.openbsd.org 2006/02/20 17:02:44
     [clientloop.c includes.h monitor.c progressmeter.c scp.c]
     [serverloop.c session.c sftp.c ssh-agent.c ssh.c sshd.c]
     move #include <signal.h> out of includes.h; ok markus@

the previous was:

   - stevesk@cvs.openbsd.org 2006/02/20 17:19:54
     [auth-rhosts.c auth-rsa.c auth.c auth2-none.c auth2-pubkey.c]
     [authfile.c clientloop.c includes.h readconf.c scp.c session.c]
     [sftp-client.c sftp-common.c sftp-common.h sftp-glob.c]
     [sftp-server.c sftp.c ssh-add.c ssh-keygen.c ssh.c sshconnect.c]
     [sshconnect2.c sshd.c sshpty.c]
     move #include <sys/stat.h> out of includes.h; ok markus@
---
 ChangeLog       | 7 +++++++
 clientloop.c    | 1 +
 includes.h      | 3 +--
 monitor.c       | 3 ++-
 progressmeter.c | 4 +++-
 scp.c           | 1 +
 serverloop.c    | 3 ++-
 session.c       | 1 +
 sftp.c          | 1 +
 ssh-agent.c     | 4 +++-
 ssh.c           | 1 +
 sshd.c          | 1 +
 12 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7721b7d5..c995c03b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -139,6 +139,13 @@
      [clientloop.c includes.h monitor.c progressmeter.c scp.c]
      [serverloop.c session.c sftp.c ssh-agent.c ssh.c sshd.c]
      move #include <signal.h> out of includes.h; ok markus@
+   - stevesk@cvs.openbsd.org 2006/02/20 17:19:54
+     [auth-rhosts.c auth-rsa.c auth.c auth2-none.c auth2-pubkey.c]
+     [authfile.c clientloop.c includes.h readconf.c scp.c session.c]
+     [sftp-client.c sftp-common.c sftp-common.h sftp-glob.c]
+     [sftp-server.c sftp.c ssh-add.c ssh-keygen.c ssh.c sshconnect.c]
+     [sshconnect2.c sshd.c sshpty.c]
+     move #include <sys/stat.h> out of includes.h; ok markus@
 
 20060313
  - (dtucker) [configure.ac] Bug #1171: Don't use printf("%lld", longlong)
diff --git a/clientloop.c b/clientloop.c
index a7c510cc..af5351b7 100644
--- a/clientloop.c
+++ b/clientloop.c
@@ -68,6 +68,7 @@ RCSID("$OpenBSD: clientloop.c,v 1.154 2006/02/20 17:19:54 stevesk Exp $");
 #include <sys/ioctl.h>
 
 #include <paths.h>
+#include <signal.h>
 #include <termios.h>
 
 #include "ssh.h"
diff --git a/includes.h b/includes.h
index be844c80..564bb763 100644
--- a/includes.h
+++ b/includes.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: includes.h,v 1.36 2006/02/20 17:19:53 stevesk Exp $	*/
+/*	$OpenBSD: includes.h,v 1.35 2006/02/20 17:02:44 stevesk Exp $	*/
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -28,7 +28,6 @@ static /**/const char *const rcsid[] = { (const char *)rcsid, "\100(#)" msg }
 #include <ctype.h>
 #include <errno.h>
 #include <fcntl.h> /* For O_NONBLOCK */
-#include <signal.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdarg.h>
diff --git a/monitor.c b/monitor.c
index c21c0fab..3260d473 100644
--- a/monitor.c
+++ b/monitor.c
@@ -25,12 +25,13 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: monitor.c,v 1.67 2006/02/10 01:44:26 stevesk Exp $");
+RCSID("$OpenBSD: monitor.c,v 1.68 2006/02/20 17:02:44 stevesk Exp $");
 
 #include <sys/types.h>
 #include <sys/wait.h>
 
 #include <paths.h>
+#include <signal.h>
 
 #ifdef SKEY
 #include <skey.h>
diff --git a/progressmeter.c b/progressmeter.c
index 4f76c53d..5ae02493 100644
--- a/progressmeter.c
+++ b/progressmeter.c
@@ -23,10 +23,12 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: progressmeter.c,v 1.25 2006/02/10 00:27:13 stevesk Exp $");
+RCSID("$OpenBSD: progressmeter.c,v 1.26 2006/02/20 17:02:44 stevesk Exp $");
 
 #include <sys/ioctl.h>
 
+#include <signal.h>
+
 #include "progressmeter.h"
 #include "atomicio.h"
 #include "misc.h"
diff --git a/scp.c b/scp.c
index 8b806d63..9d30ec52 100644
--- a/scp.c
+++ b/scp.c
@@ -80,6 +80,7 @@ RCSID("$OpenBSD: scp.c,v 1.134 2006/02/20 17:19:54 stevesk Exp $");
 #include <sys/wait.h>
 
 #include <dirent.h>
+#include <signal.h>
 
 #include "xmalloc.h"
 #include "atomicio.h"
diff --git a/serverloop.c b/serverloop.c
index 11dcaf70..0a1bbf1a 100644
--- a/serverloop.c
+++ b/serverloop.c
@@ -35,11 +35,12 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: serverloop.c,v 1.126 2006/02/10 01:44:26 stevesk Exp $");
+RCSID("$OpenBSD: serverloop.c,v 1.127 2006/02/20 17:02:44 stevesk Exp $");
 
 #include <sys/types.h>
 #include <sys/wait.h>
 
+#include <signal.h>
 #include <termios.h>
 
 #include "xmalloc.h"
diff --git a/session.c b/session.c
index 1e883036..f6907450 100644
--- a/session.c
+++ b/session.c
@@ -43,6 +43,7 @@ RCSID("$OpenBSD: session.c,v 1.196 2006/02/20 17:19:54 stevesk Exp $");
 #include <sys/un.h>
 
 #include <paths.h>
+#include <signal.h>
 
 #include "ssh.h"
 #include "ssh1.h"
diff --git a/sftp.c b/sftp.c
index f5589f2b..c4f02784 100644
--- a/sftp.c
+++ b/sftp.c
@@ -32,6 +32,7 @@ RCSID("$OpenBSD: sftp.c,v 1.75 2006/02/20 17:19:54 stevesk Exp $");
 #else
 typedef void EditLine;
 #endif
+#include <signal.h>
 
 #include "buffer.h"
 #include "xmalloc.h"
diff --git a/ssh-agent.c b/ssh-agent.c
index 0ab23219..b4508762 100644
--- a/ssh-agent.c
+++ b/ssh-agent.c
@@ -34,7 +34,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: ssh-agent.c,v 1.128 2006/02/20 16:36:14 stevesk Exp $");
+RCSID("$OpenBSD: ssh-agent.c,v 1.129 2006/02/20 17:02:44 stevesk Exp $");
 
 #include <sys/types.h>
 #ifdef HAVE_SYS_UN_H
@@ -45,6 +45,8 @@ RCSID("$OpenBSD: ssh-agent.c,v 1.128 2006/02/20 16:36:14 stevesk Exp $");
 #ifdef HAVE_PATHS_H
 # include <paths.h>
 #endif
+#include <signal.h>
+
 #include <openssl/evp.h>
 #include <openssl/md5.h>
 
diff --git a/ssh.c b/ssh.c
index 196da80c..18631f27 100644
--- a/ssh.c
+++ b/ssh.c
@@ -51,6 +51,7 @@ RCSID("$OpenBSD: ssh.c,v 1.264 2006/02/20 17:19:54 stevesk Exp $");
 #include <sys/un.h>
 
 #include <paths.h>
+#include <signal.h>
 
 #include <openssl/evp.h>
 #include <openssl/err.h>
diff --git a/sshd.c b/sshd.c
index f06b4118..40593ee2 100644
--- a/sshd.c
+++ b/sshd.c
@@ -52,6 +52,7 @@ RCSID("$OpenBSD: sshd.c,v 1.323 2006/02/20 17:19:54 stevesk Exp $");
 #include <sys/wait.h>
 
 #include <paths.h>
+#include <signal.h>
 
 #include <openssl/dh.h>
 #include <openssl/bn.h>
-- 
2.45.2