diff options
| author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 2000-10-13 12:19:58 +0000 |
|---|---|---|
| committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 2000-10-13 12:19:58 +0000 |
| commit | 25d293866428e16eeca6db5b837b3b952197b7ad (patch) | |
| tree | 3b9c5b2c54d0d3bc3b1892824337e75b9e18157d /sbin/isakmpd/conf.c | |
| parent | fe1c5a45605504c7f1266cb37590021c358fd526 (diff) | |
Merge with EOM 1.39
author: ho
Revert. Be strict about file mode.
Diffstat (limited to 'sbin/isakmpd/conf.c')
| -rw-r--r-- | sbin/isakmpd/conf.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/sbin/isakmpd/conf.c b/sbin/isakmpd/conf.c index ca951196feb..688ed85ef33 100644 --- a/sbin/isakmpd/conf.c +++ b/sbin/isakmpd/conf.c @@ -1,5 +1,5 @@ -/* $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 $ */ +/* $OpenBSD: conf.c,v 1.20 2000/10/13 12:19:57 niklas Exp $ */ +/* $EOM: conf.c,v 1.39 2000/10/13 12:20:35 ho Exp $ */ /* * Copyright (c) 1998, 1999, 2000 Niklas Hallqvist. All rights reserved. @@ -523,8 +523,12 @@ conf_reinit (void) return; } if ((st.st_mode & (S_IRWXG | S_IRWXO)) != 0) - log_print ("conf_reinit: warning, %s may have too open permissions", - conf_path); + { + log_print ("conf_reinit: not loading %s - too open permissions", + conf_path); + close (fd); + return; + } sz = st.st_size; new_conf_addr = malloc (sz); if (!new_conf_addr) |