summaryrefslogtreecommitdiff
path: root/sbin/isakmpd/conf.c
diff options
context:
space:
mode:
authorNiklas Hallqvist <niklas@cvs.openbsd.org>1999-05-01 20:43:47 +0000
committerNiklas Hallqvist <niklas@cvs.openbsd.org>1999-05-01 20:43:47 +0000
commit5a7f502ff85fa80daab3422d3d21e27a6768f2e4 (patch)
tree5ead3611b8809acc3fbaa7d07b57e50a51975e88 /sbin/isakmpd/conf.c
parenta43578c3e198040540661d0a58d2439a31b021e4 (diff)
sysdep/openbsd/sysdep.c: Merge with EOM 1.7
DESIGN-NOTES: Merge with EOM 1.42 Makefile: Merge with EOM 1.51 app.c: Merge with EOM 1.6 conf.c: Merge with EOM 1.18 init.c: Merge with EOM 1.14 isakmpd.conf.5: Merge with EOM 1.19 pf_encap.c: Merge with EOM 1.64 pf_encap.h: Merge with EOM 1.12 pf_key_v2.h: Merge with EOM 1.3 sysdep.h: Merge with EOM 1.16 transport.c: Merge with EOM 1.40 ui.c: Merge with EOM 1.32 author: niklas A new connection abstraction
Diffstat (limited to 'sbin/isakmpd/conf.c')
-rw-r--r--sbin/isakmpd/conf.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/sbin/isakmpd/conf.c b/sbin/isakmpd/conf.c
index fe84201e184..1d79a0e1eac 100644
--- a/sbin/isakmpd/conf.c
+++ b/sbin/isakmpd/conf.c
@@ -1,5 +1,5 @@
-/* $OpenBSD: conf.c,v 1.8 1999/04/05 21:00:40 niklas Exp $ */
-/* $EOM: conf.c,v 1.17 1999/04/05 08:30:41 niklas Exp $ */
+/* $OpenBSD: conf.c,v 1.9 1999/05/01 20:43:42 niklas Exp $ */
+/* $EOM: conf.c,v 1.18 1999/05/01 20:21:07 niklas Exp $ */
/*
* Copyright (c) 1998, 1999 Niklas Hallqvist. All rights reserved.
@@ -248,11 +248,6 @@ conf_init (void)
LIST_INIT (&conf_bindings);
conf_parse ();
-
-#ifdef NEED_SYSDEP_APP
- /* Let the application layer record on-demand keyed connections. */
- app_conf_init_hook ();
-#endif
}
/*