From 21916f8c5887da7924ec0ecf67b57166a8e591cb Mon Sep 17 00:00:00 2001
From: rhatto <rhatto>
Date: Wed, 11 Jul 2007 14:39:35 +0000
Subject: small fix

---
 firma | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'firma')

diff --git a/firma b/firma
index 69569e7..13d2112 100755
--- a/firma
+++ b/firma
@@ -96,8 +96,7 @@ function CheckPassphrase {
   # depends on function(s): none
   # returns: 0 if valid password, 1 if invalid
   #-------------------------------------------------------------
-  if [[ -z "$(grep -o "^PASSPHRASE='[^']*'$" $LIST_CONFIG_FILE)" || \
-       -z "$PASSPHRASE" || \
+  if [[ -z "$PASSPHRASE" || \
        "$(echo "$PASSPHRASE" | wc -c)" -lt "25" || \
        -z "$(echo "$PASSPHRASE" | tr -dc '[[:lower:]]')" || \
        -z "$(echo "$PASSPHRASE" | tr -dc '[[:upper:]]')" || \
@@ -184,7 +183,7 @@ function CheckListConfigFile {
   if [[ ! -d "$LIST_HOMEDIR" || ! -f "$LIST_HOMEDIR/pubring.gpg" || ! -f "$LIST_HOMEDIR/secring.gpg" ]]; then
     LogMessage "FATAL: $LIST_NAME: GPG home directory ("$LIST_HOMEDIR") or the GPG keyrings could not be found. Quitting."
     return_code=1
-  elif ! CheckPassphrase; then
+  if [[ -z "$(grep -o "^PASSPHRASE='[^']*'$" $LIST_CONFIG_FILE)" ]] || ! CheckPassphrase; then
     LogMessage "FATAL: $LIST_NAME: List passphrase is empty or does not meet the minimum complexity requirements. Quitting."
     return_code=1
   elif [[ -z "$($GPG --list-secret-keys --with-colons --fixed-list-mode "<$LIST_ADDRESS>" 2> /dev/null)" ]]; then
-- 
cgit v1.2.3