summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--monitor.c3
-rw-r--r--session.c2
3 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 162881faa..9d93ab4a1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -61,6 +61,10 @@
61 [monitor_fdpass.c nchan.c packet.c servconf.c sftp.c ssh-agent.c] 61 [monitor_fdpass.c nchan.c packet.c servconf.c sftp.c ssh-agent.c]
62 [ssh-keyscan.c ssh.c sshconnect.h sshd.c sshlogin.h] 62 [ssh-keyscan.c ssh.c sshconnect.h sshd.c sshlogin.h]
63 move #include <sys/socket.h> out of includes.h 63 move #include <sys/socket.h> out of includes.h
64 - stevesk@cvs.openbsd.org 2006/07/08 21:48:53
65 [monitor.c session.c]
66 missed these from last commit:
67 move #include <sys/socket.h> out of includes.h
64 68
6520060706 6920060706
66 - (dtucker) [configure.ac] Try AIX blibpath test in different order when 70 - (dtucker) [configure.ac] Try AIX blibpath test in different order when
@@ -4794,4 +4798,4 @@
4794 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 4798 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
4795 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 4799 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
4796 4800
4797$Id: ChangeLog,v 1.4374 2006/07/10 11:08:03 djm Exp $ 4801$Id: ChangeLog,v 1.4375 2006/07/10 11:08:34 djm Exp $
diff --git a/monitor.c b/monitor.c
index 4a295d312..f01f921ae 100644
--- a/monitor.c
+++ b/monitor.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: monitor.c,v 1.78 2006/07/06 16:03:53 stevesk Exp $ */ 1/* $OpenBSD: monitor.c,v 1.79 2006/07/08 21:48: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>
@@ -30,6 +30,7 @@
30#include <sys/types.h> 30#include <sys/types.h>
31#include <sys/socket.h> 31#include <sys/socket.h>
32#include <sys/wait.h> 32#include <sys/wait.h>
33#include <sys/socket.h>
33 34
34#ifdef HAVE_PATHS_H 35#ifdef HAVE_PATHS_H
35#include <paths.h> 36#include <paths.h>
diff --git a/session.c b/session.c
index 8b1a9ed94..0a321be30 100644
--- a/session.c
+++ b/session.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: session.c,v 1.206 2006/07/06 16:03:53 stevesk Exp $ */ 1/* $OpenBSD: session.c,v 1.207 2006/07/08 21:48: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