diff options
author | Damien Miller <djm@mindrot.org> | 2003-11-17 21:11:15 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2003-11-17 21:11:15 +1100 |
commit | 8f746ec9703a0072c7a07a25e4c059f7533bf94b (patch) | |
tree | 8e67c0b3377cfc481a91922493f26000b51333ef | |
parent | 5a38897dbb417d2dacaaeae5bd5ce0718a7f3fb1 (diff) |
- jakob@cvs.openbsd.org 2003/11/03 09:37:32
[sshconnect.c]
do not free static type pointer in warn_changed_key()
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | sshconnect.c | 5 |
2 files changed, 6 insertions, 4 deletions
@@ -7,6 +7,9 @@ | |||
7 | - jakob@cvs.openbsd.org 2003/11/03 09:09:41 | 7 | - jakob@cvs.openbsd.org 2003/11/03 09:09:41 |
8 | [sshconnect.c] | 8 | [sshconnect.c] |
9 | move changed key warning into warn_changed_key(). ok markus@ | 9 | move changed key warning into warn_changed_key(). ok markus@ |
10 | - jakob@cvs.openbsd.org 2003/11/03 09:37:32 | ||
11 | [sshconnect.c] | ||
12 | do not free static type pointer in warn_changed_key() | ||
10 | 13 | ||
11 | 20031115 | 14 | 20031115 |
12 | - (dtucker) [regress/agent-ptrace.sh] Test for GDB output from Solaris and | 15 | - (dtucker) [regress/agent-ptrace.sh] Test for GDB output from Solaris and |
@@ -1427,4 +1430,4 @@ | |||
1427 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. | 1430 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. |
1428 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au | 1431 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au |
1429 | 1432 | ||
1430 | $Id: ChangeLog,v 1.3099 2003/11/17 10:10:47 djm Exp $ | 1433 | $Id: ChangeLog,v 1.3100 2003/11/17 10:11:15 djm Exp $ |
diff --git a/sshconnect.c b/sshconnect.c index 3c8f480ed..55ebd7ef2 100644 --- a/sshconnect.c +++ b/sshconnect.c | |||
@@ -13,7 +13,7 @@ | |||
13 | */ | 13 | */ |
14 | 14 | ||
15 | #include "includes.h" | 15 | #include "includes.h" |
16 | RCSID("$OpenBSD: sshconnect.c,v 1.150 2003/11/03 09:09:41 jakob Exp $"); | 16 | RCSID("$OpenBSD: sshconnect.c,v 1.151 2003/11/03 09:37:32 jakob Exp $"); |
17 | 17 | ||
18 | #include <openssl/bn.h> | 18 | #include <openssl/bn.h> |
19 | 19 | ||
@@ -1041,7 +1041,7 @@ static void | |||
1041 | warn_changed_key(Key *host_key) | 1041 | warn_changed_key(Key *host_key) |
1042 | { | 1042 | { |
1043 | char *fp; | 1043 | char *fp; |
1044 | char *type = key_type(host_key); | 1044 | const char *type = key_type(host_key); |
1045 | 1045 | ||
1046 | fp = key_fingerprint(host_key, SSH_FP_MD5, SSH_FP_HEX); | 1046 | fp = key_fingerprint(host_key, SSH_FP_MD5, SSH_FP_HEX); |
1047 | 1047 | ||
@@ -1056,5 +1056,4 @@ warn_changed_key(Key *host_key) | |||
1056 | error("Please contact your system administrator."); | 1056 | error("Please contact your system administrator."); |
1057 | 1057 | ||
1058 | xfree(fp); | 1058 | xfree(fp); |
1059 | xfree(type); | ||
1060 | } | 1059 | } |