regress/crypto/Makefile: Merge with EOM 1.5

regress/dh/Makefile: Merge with EOM 1.7
regress/group/Makefile: Merge with EOM 1.9
regress/prf/Makefile: Merge with EOM 1.4
regress/rsakeygen/Makefile: Merge with EOM 1.8
regress/x509/Makefile: Merge with EOM 1.10
Makefile: Merge with EOM 1.62
attribute.c: Merge with EOM 1.10
sa.c: Merge with EOM 1.99
conf.c: Merge with EOM 1.20
crypto.c: Merge with EOM 1.28
isakmpd.c: Merge with EOM 1.45
connection.c: Merge with EOM 1.19
doi.h: Merge with EOM 1.28
field.c: Merge with EOM 1.11
exchange.c: Merge with EOM 1.116
ike_auth.c: Merge with EOM 1.44
pf_key_v2.c: Merge with EOM 1.37
ike_phase_1.c: Merge with EOM 1.22
ipsec.c: Merge with EOM 1.118
isakmp_doi.c: Merge with EOM 1.40
log.c: Merge with EOM 1.26
log.h: Merge with EOM 1.18
math_group.c: Merge with EOM 1.23
message.c: Merge with EOM 1.144
pf_encap.c: Merge with EOM 1.70
policy.c: Merge with EOM 1.18
timer.c: Merge with EOM 1.13
transport.c: Merge with EOM 1.41
udp.c: Merge with EOM 1.47
ui.c: Merge with EOM 1.37
x509.c: Merge with EOM 1.36

author: niklas
Made debug logging a compile time selectable feature

1 files changed, 17 insertions, 3 deletions

diff --git a/sbin/isakmpd/isakmpd.c b/sbin/isakmpd/isakmpd.c
index 3466c2601ae..9ab07570fe9 100644
--- a/sbin/isakmpd/isakmpd.c
+++ b/sbin/isakmpd/isakmpd.c
@@ -1,5 +1,5 @@
-/*	$OpenBSD: isakmpd.c,v 1.19 2000/02/19 19:32:53 niklas Exp $	*/
-/*	$EOM: isakmpd.c,v 1.44 2000/02/19 07:58:56 niklas Exp $	*/
+/*	$OpenBSD: isakmpd.c,v 1.20 2000/02/25 17:23:39 niklas Exp $	*/
+/*	$EOM: isakmpd.c,v 1.45 2000/02/20 19:58:39 niklas Exp $	*/
 
 /*
  * Copyright (c) 1998, 1999, 2000 Niklas Hallqvist.  All rights reserved.
@@ -102,16 +102,22 @@ usage ()
 static void
 parse_args (int argc, char *argv[])
 {
-  int ch, cls, level;
+  int ch;
+#ifdef USE_DEBUG
+  int cls, level;
+#endif
 
   while ((ch = getopt (argc, argv, "c:dD:f:np:P:r:")) != -1) {
     switch (ch) {
     case 'c':
       conf_path = optarg;
       break;
+
     case 'd':
       debug++;
       break;
+
+#ifdef USE_DEBUG
     case 'D':
       if (sscanf (optarg, "%d=%d", &cls, &level) != 2)
 	{
@@ -126,29 +132,37 @@ parse_args (int argc, char *argv[])
       else
 	log_debug_cmd (cls, level);
       break;
+#endif /* USE_DEBUG */
+
     case 'f':
       ui_fifo = optarg;
       break;
+
     case 'n':
       app_none++;
       break;
+
     case 'p':
       udp_default_port = udp_decode_port (optarg);
       if (!udp_default_port)
 	exit (1);
       break;
+
     case 'P':
       udp_bind_port = udp_decode_port (optarg);
       if (!udp_bind_port)
 	exit (1);
       break;
+
     case 'r':
       srandom (strtoul (optarg, 0, 0));
       regrand = 1;
       break;
+
     case 'R':
       report_file = optarg;
       break;
+
     case '?':
     default:
       usage ();