X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=handlers%2Fdup.helper;h=a18063dbd507de83a7e6b4f242a0c673c159ee6b;hb=098952b69d5b39ea27bbe544cd85345422d03d80;hp=4cc0528276919b449963d8b84ffbbc5c7b1cebef;hpb=8e85d7b725897859087ae9e6be2756a8ac4d2ef3;p=matthijs%2Fupstream%2Fbackupninja.git

diff --git a/handlers/dup.helper b/handlers/dup.helper
index 4cc0528..a18063d 100644
--- a/handlers/dup.helper
+++ b/handlers/dup.helper
@@ -173,7 +173,7 @@ do_dup_gpg_signkey() {
 }
 
 do_dup_gpg_passphrase() {
-   local question="Enter the passphrase needed to $@:"
+   local question="Enter the passphrase needed to unlock the GnuPG key:"
    REPLY=
    while [ -z "$REPLY" -o -z "$dup_gpg_password" ]; do
       passwordBox "$dup_title - GnuPG" "$question"
@@ -201,19 +201,8 @@ do_dup_gpg() {
       fi
    fi
 
-   # a passphrase is only needed when signing, or when symmetric encryption is used
-   if [ "$dup_gpg_asymmetric_encryption" == "no" ]; then
-	 do_dup_gpg_passphrase "encrypt the backups"
-	 [ $? = 0 ] || return 1
-   elif [ "$dup_gpg_sign" == "yes" ]; then
-      if [ -z "$dup_gpg_signkey" ]; then
-	 do_dup_gpg_passphrase "unlock the GnuPG key used to sign the backups"
-	 [ $? = 0 ] || return 1
-      else
-	 do_dup_gpg_passphrase "unlock the GnuPG key used to sign the backups"
-	 [ $? = 0 ] || return 1
-      fi
-   fi
+   # a passphrase is alway needed
+   do_dup_gpg_passphrase
 
    _gpg_done="(DONE)"
    setDefault adv
@@ -276,18 +265,20 @@ testconnect = $dup_testconnect
 
 ######################################################
 ## gpg section
-## (how to encrypt and optionnally sign the backups)
+## (how to encrypt and optionally sign the backups)
 ##
-## WARNING: old (pre-0.9.2) example.dup used to give wrong information about
+## WARNING: old (pre-0.9.4) example.dup used to give wrong information about
 ##          the way the following options are used. Please read the following
 ##          carefully.
 ##
 ## If the encryptkey variable is set:
 ##   - data is encrypted with the GnuPG public key specified by the encryptkey
 ##     variable
-##   - if signing is enabled, the password variable is used to unlock the GnuPG
-##     private key used for signing; otherwise, you do not need to set the password
-##     variable
+##   - if signing is enabled, data is signed with the GnuPG private
+##     key specified by the signkey variable
+##   - the password variable is used to unlock the GnuPG key(s) used
+##     for encryption and (optionnal) signing
+##
 ## If the encryptkey option is not set:
 ##   - data signing is not possible
 ##   - the password variable is used to encrypt the data with symmetric