summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2005-05-26 12:09:32 +1000
committerDamien Miller <djm@mindrot.org>2005-05-26 12:09:32 +1000
commit924c25a64e063cf37eeeb3e5e5c0fa9a523435ff (patch)
treed9d2c938676f4ad5520b227e99c1dbf097cc3494
parentd2ebd450f035e2bc549d778389313441a433b173 (diff)
- djm@cvs.openbsd.org 2005/05/10 10:28:11
[ssh.c] print nice error message for EADDRINUSE as well (ID sync only)
-rw-r--r--ChangeLog5
-rw-r--r--ssh.c2
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 3a21b12d1..089af477f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -47,6 +47,9 @@
47 - markus@cvs.openbsd.org 2005/05/02 21:13:22 47 - markus@cvs.openbsd.org 2005/05/02 21:13:22
48 [readpass.c] 48 [readpass.c]
49 missing {} 49 missing {}
50 - djm@cvs.openbsd.org 2005/05/10 10:28:11
51 [ssh.c]
52 print nice error message for EADDRINUSE as well (ID sync only)
50 53
5120050524 5420050524
52 - (djm) [contrib/caldera/openssh.spec contrib/redhat/openssh.spec] 55 - (djm) [contrib/caldera/openssh.spec contrib/redhat/openssh.spec]
@@ -2546,4 +2549,4 @@
2546 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 2549 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
2547 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 2550 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
2548 2551
2549$Id: ChangeLog,v 1.3774 2005/05/26 02:07:47 djm Exp $ 2552$Id: ChangeLog,v 1.3775 2005/05/26 02:09:32 djm Exp $
diff --git a/ssh.c b/ssh.c
index 2bdc7ab91..88bb308ae 100644
--- a/ssh.c
+++ b/ssh.c
@@ -40,7 +40,7 @@
40 */ 40 */
41 41
42#include "includes.h" 42#include "includes.h"
43RCSID("$OpenBSD: ssh.c,v 1.237 2005/04/26 13:08:37 jakob Exp $"); 43RCSID("$OpenBSD: ssh.c,v 1.238 2005/05/10 10:28:11 djm Exp $");
44 44
45#include <openssl/evp.h> 45#include <openssl/evp.h>
46#include <openssl/err.h> 46#include <openssl/err.h>