===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/dh.c,v
retrieving revision 1.2.4.1
retrieving revision 1.2.4.2
diff -u -r1.2.4.1 -r1.2.4.2
--- src/usr.bin/ssh/dh.c	2000/11/08 21:30:43	1.2.4.1
+++ src/usr.bin/ssh/dh.c	2001/03/12 15:44:10	1.2.4.2
@@ -23,7 +23,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: dh.c,v 1.2.4.1 2000/11/08 21:30:43 jason Exp $");
+RCSID("$OpenBSD: dh.c,v 1.2.4.2 2001/03/12 15:44:10 jason Exp $");
 
 #include "xmalloc.h"
 
@@ -31,10 +31,13 @@
 #include <openssl/dh.h>
 #include <openssl/evp.h>
 
-#include "ssh.h"
 #include "buffer.h"
+#include "cipher.h"
 #include "kex.h"
 #include "dh.h"
+#include "pathnames.h"
+#include "log.h"
+#include "misc.h"
 
 int
 parse_prime(int linenum, char *line, struct dhgroup *dhg)
@@ -87,7 +90,7 @@
 
 	return (1);
  fail:
-	fprintf(stderr, "Bad prime description in line %d\n", linenum);
+	error("Bad prime description in line %d\n", linenum);
 	return (0);
 }
 
@@ -100,10 +103,9 @@
 	int linenum;
 	struct dhgroup dhg;
 
-	f = fopen(DH_PRIMES, "r");
+	f = fopen(_PATH_DH_PRIMES, "r");
 	if (!f) {
-		perror(DH_PRIMES);
-		log("WARNING: %s does not exist, using old prime", DH_PRIMES);
+		log("WARNING: %s does not exist, using old prime", _PATH_DH_PRIMES);
 		return (dh_new_group1());
 	}
 
@@ -127,14 +129,13 @@
 	fclose (f);
 
 	if (bestcount == 0) {
-		log("WARNING: no primes in %s, using old prime", DH_PRIMES);
+		log("WARNING: no primes in %s, using old prime", _PATH_DH_PRIMES);
 		return (dh_new_group1());
 	}
 
-	f = fopen(DH_PRIMES, "r");
+	f = fopen(_PATH_DH_PRIMES, "r");
 	if (!f) {
-		perror(DH_PRIMES);
-		exit(1);
+		fatal("WARNING: %s dissappeared, giving up", _PATH_DH_PRIMES);
 	}
 
 	linenum = 0;