summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--session.c2
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 8109dd671..ca25e7866 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,10 @@
9 [ssh-agent.c ssh-keyscan.c ssh.c] 9 [ssh-agent.c ssh-keyscan.c ssh.c]
10 sys/resource.h needs sys/time.h; prompted by brad@ 10 sys/resource.h needs sys/time.h; prompted by brad@
11 (NB. Id sync only for portable) 11 (NB. Id sync only for portable)
12 - djm@cvs.openbsd.org 2006/10/09 23:36:11
13 [session.c]
14 xmalloc -> xcalloc that was missed previously, from portable
15 (NB. Id sync only for portable, obviously)
12 16
1320061018 1720061018
14 - (dtucker) OpenBSD CVS Sync 18 - (dtucker) OpenBSD CVS Sync
@@ -2550,4 +2554,4 @@
2550 OpenServer 6 and add osr5bigcrypt support so when someone migrates 2554 OpenServer 6 and add osr5bigcrypt support so when someone migrates
2551 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 2555 passwords between UnixWare and OpenServer they will still work. OK dtucker@
2552 2556
2553$Id: ChangeLog,v 1.4574 2006/10/23 17:01:16 djm Exp $ 2557$Id: ChangeLog,v 1.4575 2006/10/23 17:01:56 djm Exp $
diff --git a/session.c b/session.c
index 15c5ca9a0..69153ad1e 100644
--- a/session.c
+++ b/session.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: session.c,v 1.219 2006/08/29 10:40:19 djm Exp $ */ 1/* $OpenBSD: session.c,v 1.220 2006/10/09 23:36:11 djm 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