summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2007-09-17 16:07:32 +1000
committerDamien Miller <djm@mindrot.org>2007-09-17 16:07:32 +1000
commit9c89c837ccfeafb09f3d6fb463942fc919f3dc29 (patch)
tree6dbbd5d597d291645de86e3cdc16ce116f7745a1
parent5cbe7ca18df76241a3772cef49e1f6e80709420d (diff)
- stevesk@cvs.openbsd.org 2007/09/11 04:36:29
[sshpty.c] sort #include NB. RCS ID sync only
-rw-r--r--ChangeLog6
-rw-r--r--sshpty.c2
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 4e7f5846f..6a200586a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -37,6 +37,10 @@
37 [ssh-add.c ssh-agent.1 ssh-agent.c ssh-keygen.c] 37 [ssh-add.c ssh-agent.1 ssh-agent.c ssh-keygen.c]
38 sort synopsis and options in ssh-agent(1); usage is lowercase 38 sort synopsis and options in ssh-agent(1); usage is lowercase
39 ok jmc@ 39 ok jmc@
40 - stevesk@cvs.openbsd.org 2007/09/11 04:36:29
41 [sshpty.c]
42 sort #include
43 NB. RCS ID sync only
40 44
4120070914 4520070914
42 - (dtucker) [openbsd-compat/bsd-asprintf.c] Plug mem leak in error path. 46 - (dtucker) [openbsd-compat/bsd-asprintf.c] Plug mem leak in error path.
@@ -3234,4 +3238,4 @@
3234 OpenServer 6 and add osr5bigcrypt support so when someone migrates 3238 OpenServer 6 and add osr5bigcrypt support so when someone migrates
3235 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 3239 passwords between UnixWare and OpenServer they will still work. OK dtucker@
3236 3240
3237$Id: ChangeLog,v 1.4750 2007/09/17 06:05:50 djm Exp $ 3241$Id: ChangeLog,v 1.4751 2007/09/17 06:07:32 djm Exp $
diff --git a/sshpty.c b/sshpty.c
index 79c62ee9c..34ea7a74a 100644
--- a/sshpty.c
+++ b/sshpty.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sshpty.c,v 1.26 2006/08/03 03:34:42 deraadt Exp $ */ 1/* $OpenBSD: sshpty.c,v 1.27 2007/09/11 04:36:29 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