summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--sshconnect.c5
2 files changed, 6 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index a210ccf3..86f4bffe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,9 @@
- jakob@cvs.openbsd.org 2003/11/03 09:09:41
[sshconnect.c]
move changed key warning into warn_changed_key(). ok markus@
+ - jakob@cvs.openbsd.org 2003/11/03 09:37:32
+ [sshconnect.c]
+ do not free static type pointer in warn_changed_key()
20031115
- (dtucker) [regress/agent-ptrace.sh] Test for GDB output from Solaris and
@@ -1427,4 +1430,4 @@
- Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
Report from murple@murple.net, diagnosis from dtucker@zip.com.au
-$Id: ChangeLog,v 1.3099 2003/11/17 10:10:47 djm Exp $
+$Id: ChangeLog,v 1.3100 2003/11/17 10:11:15 djm Exp $
diff --git a/sshconnect.c b/sshconnect.c
index 3c8f480e..55ebd7ef 100644
--- a/sshconnect.c
+++ b/sshconnect.c
@@ -13,7 +13,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: sshconnect.c,v 1.150 2003/11/03 09:09:41 jakob Exp $");
+RCSID("$OpenBSD: sshconnect.c,v 1.151 2003/11/03 09:37:32 jakob Exp $");
#include <openssl/bn.h>
@@ -1041,7 +1041,7 @@ static void
warn_changed_key(Key *host_key)
{
char *fp;
- char *type = key_type(host_key);
+ const char *type = key_type(host_key);
fp = key_fingerprint(host_key, SSH_FP_MD5, SSH_FP_HEX);
@@ -1056,5 +1056,4 @@ warn_changed_key(Key *host_key)
error("Please contact your system administrator.");
xfree(fp);
- xfree(type);
}