===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/dh.c,v
retrieving revision 1.21
retrieving revision 1.21.2.2
diff -u -r1.21 -r1.21.2.2
--- src/usr.bin/ssh/dh.c	2002/03/06 00:23:27	1.21
+++ src/usr.bin/ssh/dh.c	2003/04/03 22:35:17	1.21.2.2
@@ -23,7 +23,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: dh.c,v 1.21 2002/03/06 00:23:27 markus Exp $");
+RCSID("$OpenBSD: dh.c,v 1.21.2.2 2003/04/03 22:35:17 miod Exp $");
 
 #include "xmalloc.h"
 
@@ -50,7 +50,7 @@
 	/* Ignore leading whitespace */
 	if (*arg == '\0')
 		arg = strdelim(&cp);
-	if (!*arg || *arg == '#')
+	if (!arg || !*arg || *arg == '#')
 		return 0;
 
 	/* time */
@@ -182,7 +182,7 @@
 	for (i = 0; i <= n; i++)
 		if (BN_is_bit_set(dh_pub, i))
 			bits_set++;
-	debug("bits set: %d/%d", bits_set, BN_num_bits(dh->p));
+	debug2("bits set: %d/%d", bits_set, BN_num_bits(dh->p));
 
 	/* if g==2 and bits_set==1 then computing log_g(dh_pub) is trivial */
 	if (bits_set > 1 && (BN_cmp(dh_pub, dh->p) == -1))
@@ -214,7 +214,7 @@
 		for (i = 0; i <= BN_num_bits(dh->priv_key); i++)
 			if (BN_is_bit_set(dh->priv_key, i))
 				bits_set++;
-		debug("dh_gen_key: priv key bits set: %d/%d",
+		debug2("dh_gen_key: priv key bits set: %d/%d",
 		    bits_set, BN_num_bits(dh->priv_key));
 		if (tries++ > 10)
 			fatal("dh_gen_key: too many bad keys: giving up");