summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNiklas Hallqvist <niklas@cvs.openbsd.org>1999-10-01 14:09:21 +0000
committerNiklas Hallqvist <niklas@cvs.openbsd.org>1999-10-01 14:09:21 +0000
commitcbca5d09b5fbd3b71acd016727174445f3a65a85 (patch)
treebebd82c0c73d5c58fbcb326c2ed6bf97ef53783f
parent6f89fafd3e91825fb5429051fe17a8f9fe9d73d7 (diff)
isakmpd.8: Merge with EOM 1.17
isakmpd.c: Merge with EOM 1.38 author: angelos Allow "-DA=xx" to mean "set all debug classes to level xx"
-rw-r--r--sbin/isakmpd/isakmpd.89
-rw-r--r--sbin/isakmpd/isakmpd.c14
2 files changed, 17 insertions, 6 deletions
diff --git a/sbin/isakmpd/isakmpd.8 b/sbin/isakmpd/isakmpd.8
index f3f6752eba8..6eaabfb97fe 100644
--- a/sbin/isakmpd/isakmpd.8
+++ b/sbin/isakmpd/isakmpd.8
@@ -1,5 +1,5 @@
-.\" $OpenBSD: isakmpd.8,v 1.12 1999/07/18 20:13:39 niklas Exp $
-.\" $EOM: isakmpd.8,v 1.16 1999/07/18 20:12:12 niklas Exp $
+.\" $OpenBSD: isakmpd.8,v 1.13 1999/10/01 14:09:20 niklas Exp $
+.\" $EOM: isakmpd.8,v 1.17 1999/09/20 19:57:50 angelos Exp $
.\"
.\" Copyright (c) 1998, 1999 Niklas Hallqvist. All rights reserved.
.\"
@@ -88,7 +88,10 @@ denotes a debugging class, and
.Ar level
the level you want that debugging class to
limit debug printouts at (i.e., all debug printouts above the level specified
-will not output anything).
+will not output anything). If
+.Ar class
+is set to 'A',
+then all debugging classes are set to the specified level.
.It Fl f Ar fifo
The
.Fl f
diff --git a/sbin/isakmpd/isakmpd.c b/sbin/isakmpd/isakmpd.c
index c3d0c5c12e5..fda2a8ecce0 100644
--- a/sbin/isakmpd/isakmpd.c
+++ b/sbin/isakmpd/isakmpd.c
@@ -1,5 +1,5 @@
-/* $OpenBSD: isakmpd.c,v 1.14 1999/08/26 22:31:45 niklas Exp $ */
-/* $EOM: isakmpd.c,v 1.37 1999/08/26 11:21:49 niklas Exp $ */
+/* $OpenBSD: isakmpd.c,v 1.15 1999/10/01 14:09:20 niklas Exp $ */
+/* $EOM: isakmpd.c,v 1.38 1999/09/20 19:57:50 angelos Exp $ */
/*
* Copyright (c) 1998, 1999 Niklas Hallqvist. All rights reserved.
@@ -112,7 +112,15 @@ parse_args (int argc, char *argv[])
break;
case 'D':
if (sscanf (optarg, "%d=%d", &cls, &level) != 2)
- log_print ("parse_args: -D argument unparseable: %s", optarg);
+ {
+ if (sscanf (optarg, "A=%d", &level) == 1)
+ {
+ for (cls = 0; cls < LOG_ENDCLASS; cls++)
+ log_debug_cmd (cls, level);
+ }
+ else
+ log_print ("parse_args: -D argument unparseable: %s", optarg);
+ }
else
log_debug_cmd (cls, level);
break;