From aeec1a4e3d55dd96aec8cd7135e2c8ad14ce8639 Mon Sep 17 00:00:00 2001
Message-Id: <aeec1a4e3d55dd96aec8cd7135e2c8ad14ce8639.1715436816.git.mdw@distorted.org.uk>
From: Mark Wooding <mdw@chiark.greenend.org.uk>
Date: Tue, 21 Mar 2006 10:54:16 +0000
Subject: [PATCH] Fixes for stupid things found at installation.
Organization: Straylight/Edgeware

From: Mark Wooding <mdw@distorted.org.uk>

---
 .gitignore     |  2 ++
 .userv/rc      |  2 +-
 Makefile       | 10 ++++++----
 bin/cryptomail |  4 +++-
 config         |  1 +
 5 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 06f2f8c..3918b9c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
 *.stamp
 config.files
 db
+really-install-crontab
+.qmail*
diff --git a/.userv/rc b/.userv/rc
index dd2bd53..0a05d20 100644
--- a/.userv/rc
+++ b/.userv/rc
@@ -6,7 +6,7 @@ if glob service generate
 fi
 
 if ( glob service addrcheck:cryptomail-default
-   & glob calling_user qmaild
+   & glob calling-user qmaild
    )
 	no-suppress-args
 	execute bin/cryptomail addrcheck --
diff --git a/Makefile b/Makefile
index 7e98d7d..9598bf9 100644
--- a/Makefile
+++ b/Makefile
@@ -9,17 +9,18 @@ all: config.files crontab.stamp
 
 config.files: config
 	splitconf config
+	update-addrcheck
 
 crontab.stamp: crontab
 	@if [ -f really-install-crontab ]; then \
-	  echo "crontab crontab"; \
-	  crontab crontab; \
+	  echo "crontab -u $(USER) crontab"; \
+	  crontab -u $(USER) crontab; \
 	else \
 	  echo "(Not installing crontab.)"; \
 	fi
 	touch crontab.stamp
 
-install: db/keyring db/cryptomail.db
+install: all db/keyring db/cryptomail.db
 
 db:
 	mkdir -p -m 700 db.new
@@ -28,7 +29,8 @@ db:
 
 db/keyring: db
 	$(ASUSER) \
-	  key -k db/keyring add -abinary -b$(KEYSZ) cryptomail prp=$(PRP)
+	  key -k db/keyring add -abinary -b$(KEYSZ) -eforever \
+		 cryptomail prp=$(PRP)
 
 db/cryptomail.db: db
 	$(ASUSER) bin/cryptomail initdb
diff --git a/bin/cryptomail b/bin/cryptomail
index 0c0ed94..54f8483 100755
--- a/bin/cryptomail
+++ b/bin/cryptomail
@@ -610,7 +610,9 @@ def main():
 
 try:
   main()
-except Exception:
+except SystemExit:
+  raise
+except:
   ty, exc, tb = exc_info()
   moan('unhandled %s exception' % ty.__name__)
   for file, line, func, text in TB.extract_tb(tb):
diff --git a/config b/config
index 3566d95..5e5c4ee 100644
--- a/config
+++ b/config
@@ -10,4 +10,5 @@ prefix = .qmail-
 portmaster: root
 
 [default] 
+#? addrcheck
 | addr=$(bin/cryptomail fwaddr -- "$DEFAULT" "$SENDER") && forward "$addr"
-- 
[mdw]