summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2008-06-27 17:23:25 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2008-06-27 17:23:25 +0000
commit87fdeddd6f5abe7342ccdd847cad0417055ebf0b (patch)
tree37ca7b51e6cc7514df403430ecb66104b0559695 /sys
parentb82fbdc955e28dbc283c3e684c2c5fb74062fd64 (diff)
Do not disallow kernel crash dumps on panic if swap encryption is enabled,
as dumpsys() will now clear the sensitive information. ok djm@ (and dumpsys changes too)
Diffstat (limited to 'sys')
-rw-r--r--sys/kern/subr_prf.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/sys/kern/subr_prf.c b/sys/kern/subr_prf.c
index ae7ea43bbaa..5d18a97b55a 100644
--- a/sys/kern/subr_prf.c
+++ b/sys/kern/subr_prf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: subr_prf.c,v 1.73 2007/12/30 11:54:55 bluhm Exp $ */
+/* $OpenBSD: subr_prf.c,v 1.74 2008/06/27 17:23:24 miod Exp $ */
/* $NetBSD: subr_prf.c,v 1.45 1997/10/24 18:14:25 chuck Exp $ */
/*-
@@ -70,9 +70,6 @@
#include <ddb/db_output.h> /* db_printf, db_putchar prototypes */
#include <ddb/db_var.h> /* db_log, db_radix */
#endif
-#if defined(UVM_SWAP_ENCRYPT)
-extern int uvm_doswapencrypt;
-#endif
/*
@@ -185,10 +182,6 @@ panic(const char *fmt, ...)
va_list ap;
bootopt = RB_AUTOBOOT | RB_DUMP;
-#if defined(UVM_SWAP_ENCRYPT)
- if (uvm_doswapencrypt)
- bootopt &= ~RB_DUMP;
-#endif
va_start(ap, fmt);
if (panicstr)
bootopt |= RB_NOSYNC;