updated gpgsigs:

[pgp-tools.git] / caff / caff

diff --git a/caff/caff b/caff/caff
index 084b41c0bfc419cfe0569f66fc5c7e30fdde5703..06fc62db23ef1d96eb7021bd39ff47e65c4976f4 100755 (executable)
--- a/caff/caff
+++ b/caff/caff
@@ -3,7 +3,7 @@
 # caff  --  CA - Fire and Forget
 # $Id$
 #
-# Copyright (c) 2004 Peter Palfrader <peter@palfrader.org>
+# Copyright (c) 2004, 2005 Peter Palfrader <peter@palfrader.org>
 #
 # All rights reserved.
 #
@@ -348,7 +348,7 @@ my $KEYEDIT_KEYEDIT_OR_DELSIG_PROMPT = '^\[GNUPG:\] (GET_BOOL keyedit.delsig|GET
 my $KEYEDIT_DELSUBKEY_PROMPT = '^\[GNUPG:\] GET_BOOL keyedit.remove.subkey';
 
 load_config;
-my $USER_AGENT = "caff $VERSION - (c) 2004 Peter Palfrader";
+my $USER_AGENT = "caff $VERSION - (c) 2004, 2005 Peter Palfrader";
 
 my $KEYSBASE =  $CONFIG{'caffhome'}.'/keys';
 my $GNUPGHOME = $CONFIG{'caffhome'}.'/gnupghome';
@@ -362,8 +362,8 @@ my $DATE_STRING = sprintf("%04d-%02d-%02d", $year+1900, $mon+1, $mday);
 
 
 sub usage() {
-       print STDERR "caff $VERSION - (c) 2004 Peter Palfrader\n";
-       print STDERR "Usage: $PROGRAM_NAME [-u <yourkeyid] <keyid> [<keyid> ...]\n";
+       print STDERR "caff $VERSION - (c) 2004, 2005 Peter Palfrader\n";
+       print STDERR "Usage: $PROGRAM_NAME [-u <yourkeyid>] <keyid> [<keyid> ...]\n";
        exit 1;
 };
 
@@ -554,14 +554,15 @@ if ($CONFIG{'no-download'}) {
 # sign keys
 ###########
 unless ($CONFIG{'no-sign'}) {
-       info("Sign the following keys according to your policy...");
+       info("Sign the following keys according to your policy, then exit gpg with 'save' after signing each key");
        for my $keyid (@keyids_ok) {
                my @command;
                push @command, $CONFIG{'gpg-sign'};
                push @command, '--local-user', $USER if (defined $USER);
                push @command, "--homedir=$GNUPGHOME";
                push @command, '--secret-keyring', $CONFIG{'secret-keyring'};
-               push @command, '--sign-key', $keyid;
+               push @command, '--edit', $keyid;
+               push @command, 'sign';
                print join(' ', @command),"\n";
                system (@command);
        };