From ea0213d482d234af0f4a1d173ad7abe62d7d54db Mon Sep 17 00:00:00 2001
From: Thomas Preud'homme <thomas.preudhomme@celest.fr>
Date: Sat, 5 Feb 2011 17:49:33 +0100
Subject: [PATCH] Look for cyrus password in /root/passwords

Change the place to look for cyrus password:
  /root/passwords/cyrus_main_admin_password instead of
  /root/cyrus_main_admin_password
---
 email_account/email_account | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/email_account/email_account b/email_account/email_account
index 8d1ce0a..6361eb1 100755
--- a/email_account/email_account
+++ b/email_account/email_account
@@ -165,7 +165,7 @@ test_cyrus_admin ()
 {
 	local -
 	cyruser=$(grep -E "^[[:blank:]]*admins:" /etc/imapd.conf | cut -d ':' -f 2- | sed -r "s/[[:alnum:]]+@[[:alnum:].]+//g" | tr -d ' ')
-	cyrpwd=$(cat /root/cyrus_main_admin_password)
+	cyrpwd=$(cat /root/passwords/cyrus_main_admin_password)
 	testsaslauthd -u $cyruser -p $cyrpwd > /dev/null || { echo "Error! Password for main cyrus admin has changed but has not been modified in /root/" >&2 && exit 1 ; }
 }