diff options
| author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 2000-10-13 11:44:11 +0000 |
|---|---|---|
| committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 2000-10-13 11:44:11 +0000 |
| commit | e6a95cb570c023b6cba2fa698e015d0b5d86e004 (patch) | |
| tree | c514dc2b586fad327b2ae92ddc33cb4b8fa94689 | |
| parent | b802071987f672cddcad00742c50a641a4e23c13 (diff) | |
Merge with EOM 1.38
author: ho
Warn but continue on isakmpd.conf permissions.
| -rw-r--r-- | sbin/isakmpd/conf.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/sbin/isakmpd/conf.c b/sbin/isakmpd/conf.c index 11ab157a81d..ca951196feb 100644 --- a/sbin/isakmpd/conf.c +++ b/sbin/isakmpd/conf.c @@ -1,5 +1,5 @@ -/* $OpenBSD: conf.c,v 1.18 2000/10/09 23:27:30 niklas Exp $ */ -/* $EOM: conf.c,v 1.37 2000/10/09 22:08:29 angelos Exp $ */ +/* $OpenBSD: conf.c,v 1.19 2000/10/13 11:44:10 niklas Exp $ */ +/* $EOM: conf.c,v 1.38 2000/10/13 10:23:03 ho Exp $ */ /* * Copyright (c) 1998, 1999, 2000 Niklas Hallqvist. All rights reserved. @@ -523,12 +523,8 @@ conf_reinit (void) return; } if ((st.st_mode & (S_IRWXG | S_IRWXO)) != 0) - { - log_print ("conf_reinit: not loading %s - too open permissions", - conf_path); - close (fd); - return; - } + log_print ("conf_reinit: warning, %s may have too open permissions", + conf_path); sz = st.st_size; new_conf_addr = malloc (sz); if (!new_conf_addr) |