summaryrefslogtreecommitdiff
path: root/dh.c
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2000-11-21 21:24:55 +0000
committerBen Lindstrom <mouring@eviladmin.org>2000-11-21 21:24:55 +0000
commit14920293713ff4a5bbe45b495694bfd925d73894 (patch)
treed0f63720bdcbc574dc3c018beeb28e6da4b5e1fb /dh.c
parent4a1d91646d4248c111f573e496cc0d10ba62e274 (diff)
20001123
- (bal) Merge OpenBSD changes: - markus@cvs.openbsd.org 2000/11/15 22:31:36 [auth-options.c] case insensitive key options; from stevesk@sweeden.hp.com - markus@cvs.openbsd.org 2000/11/16 17:55:43 [dh.c] do not use perror() in sshd, after child is forked() - markus@cvs.openbsd.org 2000/11/14 23:42:40 [auth-rsa.c] parse option only if key matches; fix some confusing seen by the client - markus@cvs.openbsd.org 2000/11/14 23:44:19 [session.c] check no_agent_forward_flag for ssh-2, too - markus@cvs.openbsd.org 2000/11/15 [ssh-agent.1] reorder SYNOPSIS; typo, use .It - markus@cvs.openbsd.org 2000/11/14 23:48:55 [ssh-agent.c] do not reorder keys if a key is removed - markus@cvs.openbsd.org 2000/11/15 19:58:08 [ssh.c] just ignore non existing user keys - millert@cvs.openbsd.org 200/11/15 20:24:43 [ssh-keygen.c] Add missing \n at end of error message.
Diffstat (limited to 'dh.c')
-rw-r--r--dh.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/dh.c b/dh.c
index ff84619c..35e90143 100644
--- a/dh.c
+++ b/dh.c
@@ -23,7 +23,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: dh.c,v 1.2 2000/10/11 20:11:35 markus Exp $");
+RCSID("$OpenBSD: dh.c,v 1.3 2000/11/16 17:55:43 markus Exp $");
#include "xmalloc.h"
@@ -102,7 +102,6 @@ choose_dh(int minbits)
f = fopen(DH_PRIMES, "r");
if (!f) {
- perror(DH_PRIMES);
log("WARNING: %s does not exist, using old prime", DH_PRIMES);
return (dh_new_group1());
}
@@ -133,8 +132,7 @@ choose_dh(int minbits)
f = fopen(DH_PRIMES, "r");
if (!f) {
- perror(DH_PRIMES);
- exit(1);
+ fatal("WARNING: %s dissappeared, giving up", DH_PRIMES);
}
linenum = 0;