Whitespace fixes

[pgp-tools.git] / caff / caff

diff --git a/caff/caff b/caff/caff
index 9a636cb19260905c8e23ecd84a48da36fd2a6a02..a5d4f4a7023355609b800ebe6a92e516b6e14329 100755 (executable)
--- a/caff/caff
+++ b/caff/caff
@@ -90,6 +90,10 @@ configuration file.
 
 Import keys from file. Can be supplied more than once.
 
+=item B<--keys-from-gnupg> I<file>
+
+Try to import keys from your standard GnuPG keyrings.
+
 =back
 
 =head1 FILES
@@ -1039,11 +1043,13 @@ sub import_key_files($$) {
 sub import_keys_to_sign() {
        # Check if we can find the gpg key from our normal gnupghome, and then
        # try to import it into our working gnupghome directory
-       foreach my $keyid (@KEYIDS) {
-               if (!import_key_from_user_gnupghome($keyid, $GNUPGHOME)) {
-                       info("Key $keyid imported from your normal GnuPGHOME.");
+       if ($CONFIG{'keys-from-gnupg'}) {
+               foreach my $keyid (@KEYIDS) {
+                       if (!import_key_from_user_gnupghome($keyid, $GNUPGHOME)) {
+                               info("Key $keyid imported from your normal GnuPGHOME.");
+                       }
                }
-       }
+       };
 
        # Import user specified key files
        foreach my $keyfile (@{$CONFIG{'key-files'}}) {
@@ -1058,25 +1064,26 @@ sub import_keys_to_sign() {
 ###################
 Getopt::Long::config('bundling');
 if (!GetOptions (
-       '-h'              =>  \$params->{'help'},
-       '--help'          =>  \$params->{'help'},
-       '--version'       =>  \$params->{'version'},
-       '-V'              =>  \$params->{'version'},
-       '-u=s'            =>  \$params->{'local-user'},
-       '--local-user=s'  =>  \$params->{'local-user'},
-       '-e'              =>  \$params->{'export-old'},
-       '--export-old'    =>  \$params->{'export-old'},
-       '-E'              =>  \$params->{'no-export-old'},
-       '--no-export-old' =>  \$params->{'no-export-old'},
+       '-h'                =>  \$params->{'help'},
+       '--help'            =>  \$params->{'help'},
+       '--version'         =>  \$params->{'version'},
+       '-V'                =>  \$params->{'version'},
+       '-u=s'              =>  \$params->{'local-user'},
+       '--local-user=s'    =>  \$params->{'local-user'},
+       '-e'                =>  \$params->{'export-old'},
+       '--export-old'      =>  \$params->{'export-old'},
+       '-E'                =>  \$params->{'no-export-old'},
+       '--no-export-old'   =>  \$params->{'no-export-old'},
        '-m:s'              =>  \$params->{'mail'},
        '--mail:s'          =>  \$params->{'mail'},
-       '-M'              =>  \$params->{'no-mail'},
-       '--no-mail'       =>  \$params->{'no-mail'},
-       '-R'              =>  \$params->{'no-download'},
-       '--no-download'   =>  \$params->{'no-download'},
-       '-S'              =>  \$params->{'no-sign'},
-       '--no-sign'       =>  \$params->{'no-sign'},
-       '--key-file=s@'   =>  \$params->{'key-files'},
+       '-M'                =>  \$params->{'no-mail'},
+       '--no-mail'         =>  \$params->{'no-mail'},
+       '-R'                =>  \$params->{'no-download'},
+       '--no-download'     =>  \$params->{'no-download'},
+       '-S'                =>  \$params->{'no-sign'},
+       '--no-sign'         =>  \$params->{'no-sign'},
+       '--key-file=s@'     =>  \$params->{'key-files'},
+       '--keys-from-gnupg' =>  \$params->{'keys-from-gnupg'},
        )) {
        usage(\*STDERR, 1);
 };
@@ -1096,6 +1103,8 @@ $CONFIG{'no-sign'}     = $params->{'no-sign'}     if defined $params->{'no-sign'
 $CONFIG{'no-mail'}     = $params->{'no-mail'}     if defined $params->{'no-mail'};
 $CONFIG{'mail'}        = $params->{'mail'}        if defined $params->{'mail'};
 
+$CONFIG{'keys-from-gnupg'} = $params->{'keys-from-gnupg'} if defined $params->{'keys-from-gnupg'};
+
 # If old 'no-mail' parameter, or if the 'mail' parameter is set to 'no'
 if ( defined $CONFIG{'no-mail'} || 
      ( defined $CONFIG{'mail'} && $CONFIG{'mail'}  eq 'no' ) ) {