diff options
| author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1999-07-18 09:33:22 +0000 |
|---|---|---|
| committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1999-07-18 09:33:22 +0000 |
| commit | 36e47efa8388a27af2c3a68358405baebd7200ec (patch) | |
| tree | 23eef1ca6c47ffe75980e94d86702a2f97f8720a /sbin | |
| parent | 815b08530ffddcab6fbfdd4f71b3959f74a8e0d6 (diff) | |
conf.h: Merge with EOM 1.9
isakmpd.8: Merge with EOM 1.15
author: niklas
Moving /etc/isakmpd.conf to /etc/isakmpd/isakmpd.conf.
Diffstat (limited to 'sbin')
| -rw-r--r-- | sbin/isakmpd/conf.h | 6 | ||||
| -rw-r--r-- | sbin/isakmpd/isakmpd.8 | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/sbin/isakmpd/conf.h b/sbin/isakmpd/conf.h index 6d31c31c1a8..71b6db90ec3 100644 --- a/sbin/isakmpd/conf.h +++ b/sbin/isakmpd/conf.h @@ -1,5 +1,5 @@ -/* $OpenBSD: conf.h,v 1.7 1999/04/19 19:54:54 niklas Exp $ */ -/* $EOM: conf.h,v 1.8 1999/04/02 00:57:30 niklas Exp $ */ +/* $OpenBSD: conf.h,v 1.8 1999/07/18 09:33:21 niklas Exp $ */ +/* $EOM: conf.h,v 1.9 1999/07/18 09:20:27 niklas Exp $ */ /* * Copyright (c) 1998, 1999 Niklas Hallqvist. All rights reserved. @@ -41,7 +41,7 @@ #include <sys/queue.h> #include <stdio.h> -#define CONFIG_FILE "/etc/isakmpd.conf" +#define CONFIG_FILE "/etc/isakmpd/isakmpd.conf" struct conf_list_node { TAILQ_ENTRY (conf_list_node) link; diff --git a/sbin/isakmpd/isakmpd.8 b/sbin/isakmpd/isakmpd.8 index aff4af9a0c1..9e02c3a7159 100644 --- a/sbin/isakmpd/isakmpd.8 +++ b/sbin/isakmpd/isakmpd.8 @@ -1,5 +1,5 @@ -.\" $OpenBSD: isakmpd.8,v 1.10 1999/07/07 22:08:10 niklas Exp $ -.\" $EOM: isakmpd.8,v 1.14 1999/07/07 19:17:30 niklas Exp $ +.\" $OpenBSD: isakmpd.8,v 1.11 1999/07/18 09:33:21 niklas Exp $ +.\" $EOM: isakmpd.8,v 1.15 1999/07/18 09:20:27 niklas Exp $ .\" .\" Copyright (c) 1998 Niklas Hallqvist. All rights reserved. .\" @@ -67,7 +67,7 @@ The options are as follows: If given, the .Fl c option specifies an alternate configuration file instead of -.Pa /etc/isakmpd.conf . +.Pa /etc/isakmpd/isakmpd.conf . .It Fl d The .Fl d @@ -134,7 +134,7 @@ The flag does not do what we document, rather it does nothing. .Sh FILES .Bl -tag -width /var/run/isakmpd.report -.It Pa /etc/isakmpd.conf +.It Pa /etc/isakmpd/isakmpd.conf The configuration file .It Pa /var/run/isakmpd.fifo The FIFO used to manually control |