- Fix for non-recognised DSA keys from Arkadiusz Miskiewicz

   <misiek@pld.org.pl>

diff --git a/ChangeLog b/ChangeLog
index 9f75b1ffb7f29fdde20d5ad65af0fb28190a2b8a..de0b69f9117e20aa0b47937c8bc9bd4b99051ed4 100644 (file)
--- 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 39f2f9959d8a85b7bf8d47320fd046ee2d9b95d7..7c96adc7fbc9ea6c4fbc34d4213b15578bc04603 100644 (file)
--- 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 9b25d7c2084b70edc97342b03ad7ee4c55d84007..d74658c9687bc8866da8264a33a52d67864329b1 100644 (file)
--- 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 {