3 files changed, 8 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 9f75b1ffb..de0b69f91 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
+20000513
+ - Fix for non-recognised DSA keys from Arkadiusz Miskiewicz 
+   <misiek@pld.org.pl>
+
 20000511
  - Fix for prng_seed permissions checking from Lutz Jaenicke 
    <Lutz.Jaenicke@aet.TU-Cottbus.DE>
+ - "make host-key" fix for Irix
 
 20000509
  - OpenBSD CVS update
diff --git a/Makefile.in b/Makefile.in
index 39f2f9959..7c96adc7f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -140,8 +140,8 @@ install: manpages $(TARGETS)
         fi
 
 host-key: ssh-keygen
-        ./ssh-keygen -b 1024 -f $(sysconfdir)/ssh_host_key -N ''
-        ./ssh-keygen -d -f $(sysconfdir)/ssh_host_dsa_key -N ''
+        ./ssh-keygen -b 1024 -f $(sysconfdir)/ssh_host_key -N ""
+        ./ssh-keygen -d -f $(sysconfdir)/ssh_host_dsa_key -N ""
 
 uninstallall:   uninstall
         -rm -f $(DESTDIR)$(sysconfdir)/ssh_config
diff --git a/sshconnect.c b/sshconnect.c
index 9b25d7c20..d74658c96 100644
--- a/sshconnect.c
+++ b/sshconnect.c
@@ -255,7 +255,7 @@ ssh_connect(const char *host, struct sockaddr_storage * hostaddr,
                         temporarily_use_uid(original_real_uid);
                         if (connect(sock, ai->ai_addr, ai->ai_addrlen) >= 0) {
                                 /* Successful connection. */
-                                memcpy(hostaddr, ai->ai_addr, sizeof(*(ai->ai_addr)));
+                                memcpy(hostaddr, ai->ai_addr, ai->ai_addrlen);
                                 restore_uid();
                                 break;
                         } else {