summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--ssh-agent.c2
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 0ce7f8c6b..c8bd1ae9d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -45,6 +45,12 @@
45 - markus@cvs.openbsd.org 2006/06/08 14:45:49 45 - markus@cvs.openbsd.org 2006/06/08 14:45:49
46 [readpass.c sshconnect.c sshconnect2.c uidswap.c uidswap.h] 46 [readpass.c sshconnect.c sshconnect2.c uidswap.c uidswap.h]
47 do not set the gid, noted by solar; ok djm 47 do not set the gid, noted by solar; ok djm
48 - djm@cvs.openbsd.org 2006/06/13 01:18:36
49 [ssh-agent.c]
50 always use a format string, even when printing a constant
51 - djm@cvs.openbsd.org 2006/06/13 02:17:07
52 [ssh-agent.c]
53 revert; i am on drugs. spotted by alexander AT beard.se
48 54
4920060521 5520060521
50 - (dtucker) [auth.c monitor.c] Now that we don't log from both the monitor 56 - (dtucker) [auth.c monitor.c] Now that we don't log from both the monitor
@@ -4678,4 +4684,4 @@
4678 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 4684 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
4679 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 4685 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
4680 4686
4681$Id: ChangeLog,v 1.4342 2006/06/13 03:10:00 djm Exp $ 4687$Id: ChangeLog,v 1.4343 2006/06/13 03:10:18 djm Exp $
diff --git a/ssh-agent.c b/ssh-agent.c
index 656e399d4..db3935ec7 100644
--- a/ssh-agent.c
+++ b/ssh-agent.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh-agent.c,v 1.138 2006/05/17 12:43:34 markus Exp $ */ 1/* $OpenBSD: ssh-agent.c,v 1.140 2006/06/13 02:17:07 djm 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