misc. minor patches

[Michael Stone]

I've had these laying about for a while, can't remember whether I sent
them before.

diff -u openssh-2.1.1p1.orig/entropy.c openssh-2.1.1p1/entropy.c
--- openssh-2.1.1p1.orig/entropy.c      Wed Jun  7 08:20:23 2000
+++ openssh-2.1.1p1/entropy.c   Thu Jun 15 13:58:25 2000
@@ -201,7 +201,9 @@

        total_entropy_estimate += stir_gettimeofday(1.0);
        total_entropy_estimate += stir_clock(0.2);
+#ifdef HAVE_GETRUSAGE
        total_entropy_estimate += stir_rusage(RUSAGE_SELF, 2.0);
+#endif

        return(total_entropy_estimate);
 }
@@ -247,8 +249,10 @@
                        /* Execution times should be a little unpredictable */
                                total_entropy_estimate += stir_gettimeofday(0.05);
                                total_entropy_estimate += stir_clock(0.05);
+#ifdef HAVE_GETRUSAGE
                                total_entropy_estimate += stir_rusage(RUSAGE_SELF, 0.1);
                                total_entropy_estimate += stir_rusage(RUSAGE_CHILDREN, 0.1);
+#endif
                        } else {
 #ifdef DEBUG_ENTROPY
                                debug("Command '%s' disabled (badness %d)",


diff -u openssh-2.1.1p1.orig/packet.c openssh-2.1.1p1/packet.c
--- openssh-2.1.1p1.orig/packet.c       Wed May 17 08:53:35 2000
+++ openssh-2.1.1p1/packet.c    Tue Jun 20 16:39:00 2000
@@ -356,7 +356,7 @@
        char buf[9];

        buffer_clear(&outgoing_packet);
-       memset(buf, 0, 8);
+       memset(buf, 0, 9);
        buf[8] = type;
        buffer_append(&outgoing_packet, buf, 9);
 }