From 593938dba97e1b101bfb21d24f4028230d5a1cc8 Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Thu, 6 Oct 2011 15:09:11 +0200
Subject: Fix and improve support for local override.

---
 localnotifypwexp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/localnotifypwexp b/localnotifypwexp
index 0d7845f..2ea686e 100755
--- a/localnotifypwexp
+++ b/localnotifypwexp
@@ -91,8 +91,10 @@ the account should be disabled or deleted.'
 # ### END MAIL TEMPLATES ###
 
 # allow overrides (especially userbodytemplate)
-declare -r localconfig=/etc/local/notifypwexp
-if [ -r /etc/default/$localconfig ]; then . /etc/default/$localconfig; fi
+declare -r orgconfig=local-ORG/notifypwexp
+declare -r hostconfig=local/notifypwexp
+[ ! -r /etc/$orgconfig ] || . /etc/$orgconfig
+[ ! -r /etc/$hostconfig ] || . /etc/$hostconfig
 
 # get real users
 users=$($awkprog -F:    -v uidfield=$uidfield \
-- 
cgit v1.2.3