summaryrefslogtreecommitdiff
path: root/sbin/isakmpd/conf.c
diff options
context:
space:
mode:
authorHakan Olsson <ho@cvs.openbsd.org>2003-05-15 00:28:54 +0000
committerHakan Olsson <ho@cvs.openbsd.org>2003-05-15 00:28:54 +0000
commit9ac074958843f2b1c98831b4adedf5defb618dd1 (patch)
tree3d6c048654fa6217677338a2e6d0e9d00a91c0d1 /sbin/isakmpd/conf.c
parent243c53cb7a6086a4daa27b9c7c8e33a8a3eac5eb (diff)
Start of privilege separation for isakmpd.
There are some kinks left, so keep it default disabled for now. markus@ says ok to commit.
Diffstat (limited to 'sbin/isakmpd/conf.c')
-rw-r--r--sbin/isakmpd/conf.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/sbin/isakmpd/conf.c b/sbin/isakmpd/conf.c
index 24db827ded3..41c56087050 100644
--- a/sbin/isakmpd/conf.c
+++ b/sbin/isakmpd/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.51 2003/05/14 18:11:18 ho Exp $ */
+/* $OpenBSD: conf.c,v 1.52 2003/05/15 00:28:53 ho Exp $ */
/* $EOM: conf.c,v 1.48 2000/12/04 02:04:29 angelos Exp $ */
/*
@@ -55,6 +55,7 @@
#include "app.h"
#include "conf.h"
#include "log.h"
+#include "monitor.h"
#include "util.h"
static char *conf_get_trans_str (int, char *, char *);
@@ -589,7 +590,7 @@ conf_reinit (void)
if (check_file_secrecy (conf_path, &sz))
return;
- fd = open (conf_path, O_RDONLY);
+ fd = monitor_open (conf_path, O_RDONLY, 0);
if (fd == -1)
{
log_error ("conf_reinit: open (\"%s\", O_RDONLY) failed", conf_path);
@@ -610,7 +611,7 @@ conf_reinit (void)
fd, new_conf_addr, (unsigned long)sz);
goto fail;
}
- close (fd);
+ monitor_close (fd);
trans = conf_begin ();