diff --git a/src/etc/security b/src/etc/security
index 404c10d7..71870074 100644
--- a/src/etc/security
+++ b/src/etc/security
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: security,v 1.24 1997/11/17 08:35:42 deraadt Exp $
+#	$OpenBSD: security,v 1.25 1997/12/28 23:26:25 deraadt Exp $
 #	from: @(#)security	8.1 (Berkeley) 6/9/93
 #
 
@@ -22,7 +22,7 @@ if ! mkdir $DIR ; then
 	exit 1
 fi
 
-trap 'rm -rf $DIR' 0 1 15
+trap 'rm -rf $DIR; exit 1' 0 1 2 3 13 15
 
 # Check the master password file syntax.
 MP=/etc/master.passwd