diff options
| author | Hakan Olsson <ho@cvs.openbsd.org> | 2003-05-14 18:10:31 +0000 |
|---|---|---|
| committer | Hakan Olsson <ho@cvs.openbsd.org> | 2003-05-14 18:10:31 +0000 |
| commit | ba18ca6fc65478364971f21fcd6d099812d87293 (patch) | |
| tree | a31ec4c0988c088dfc6d5a90c6fc7241d3b5517d /sbin/isakmpd | |
| parent | db423c3bb03059970da2f5f5d1242d30fbc476f3 (diff) | |
Policy file default defined twice, kill the local copy.
Diffstat (limited to 'sbin/isakmpd')
| -rw-r--r-- | sbin/isakmpd/policy.c | 4 | ||||
| -rw-r--r-- | sbin/isakmpd/policy.h | 6 |
2 files changed, 3 insertions, 7 deletions
diff --git a/sbin/isakmpd/policy.c b/sbin/isakmpd/policy.c index e3ed134cd17..ab20021db72 100644 --- a/sbin/isakmpd/policy.c +++ b/sbin/isakmpd/policy.c @@ -1,4 +1,4 @@ -/* $OpenBSD: policy.c,v 1.59 2003/05/14 17:37:22 ho Exp $ */ +/* $OpenBSD: policy.c,v 1.60 2003/05/14 18:10:30 ho Exp $ */ /* $EOM: policy.c,v 1.49 2000/10/24 13:33:39 niklas Exp $ */ /* @@ -1801,7 +1801,7 @@ policy_init (void) /* Get policy file from configuration. */ policy_file = conf_get_str ("General", "Policy-file"); if (!policy_file) - policy_file = POLICY_FILE_DEFAULT; + policy_file = CONF_DFLT_POLICY_FILE; /* Check file modes and collect file size */ if (check_file_secrecy (policy_file, &sz)) diff --git a/sbin/isakmpd/policy.h b/sbin/isakmpd/policy.h index 2740e75e540..c53e0e2e23b 100644 --- a/sbin/isakmpd/policy.h +++ b/sbin/isakmpd/policy.h @@ -1,4 +1,4 @@ -/* $OpenBSD: policy.h,v 1.10 2002/06/10 18:08:58 ho Exp $ */ +/* $OpenBSD: policy.h,v 1.11 2003/05/14 18:10:30 ho Exp $ */ /* $EOM: policy.h,v 1.12 2000/09/28 12:53:27 niklas Exp $ */ /* @@ -38,10 +38,6 @@ #ifndef _POLICY_H_ #define _POLICY_H_ -#ifndef POLICY_FILE_DEFAULT -#define POLICY_FILE_DEFAULT "/etc/isakmpd/isakmpd.policy" -#endif /* POLICY_FILE_DEFAULT */ - #if defined (USE_KEYNOTE) #define CREDENTIAL_FILE "credentials" #define PRIVATE_KEY_FILE "private_key" |