Package: signing-party
Severity: wishlist
Tags: patch
Submitter: "Michael C. Toren" <[EMAIL PROTECTED]>

----- Forwarded message from "Michael C. Toren" <[EMAIL PROTECTED]> -----

Date: Fri, 7 Apr 2006 16:23:31 -0400
From: "Michael C. Toren" <[EMAIL PROTECTED]>
To: Christoph Berg <[EMAIL PROTECTED]>
Subject: caff patch to add "local-user" configuration file option
X-Greylist: delayed 398 seconds by postgrey-1.21 at meitner; Fri, 07 Apr 2006 
22:30:11 CEST
X-Moon: The Moon is Waxing Gibbous (72% of Full)
X-IMAPbase: 1116947860 46050

Hi,

Attached is a patch against caff revision 239 to add support for a
"local-user" configuration file option, which behaves the same as the
"--local-user" or "-u" command line argument.  Unfortunately I cannot
provide a diff against the latest revision in svn, as svn.debian.org
appears to be down at the moment.

Thanks,
-mct

--- caff.orig   2006-04-07 16:05:11.000000000 -0400
+++ caff        2006-04-07 16:16:35.000000000 -0400
@@ -202,6 +202,10 @@
 Don't export UIDs by default, on which your latest signature is older
 than this age.  Default: B<24*60*60> (i.e. one day).
 
+=item B<local-user> [string]
+
+Select the key that is used for signing, in case you have more than one key.
+
 =head2 Mail settings
 
 =item B<mail> [boolean]
@@ -843,10 +847,15 @@
 };
 usage(\*STDERR, 1) unless scalar @ARGV >= 1;
 
+$CONFIG{'local-user'}  = $params->{'local-user'}  if defined 
$params->{'local-user'};
+$CONFIG{'no-download'} = $params->{'no-download'} if defined 
$params->{'no-download'};
+$CONFIG{'no-mail'}     = $params->{'no-mail'}     if defined 
$params->{'no-mail'};
+$CONFIG{'mail'}        = $params->{'mail'}        if defined $params->{'mail'};
+$CONFIG{'no-sign'}     = $params->{'no-sign'}     if defined 
$params->{'no-sign'};
+push @{$CONFIG{'key-files'}}, @{$params->{'key-files'}} if defined 
$params->{'key-files'};
 
-
-if ($params->{'local-user'}) {
-       $USER = $params->{'local-user'};
+if ($CONFIG{'local-user'}) {
+       $USER = $CONFIG{'local-user'};
        $USER =~ s/^0x//i;
        unless ($USER =~ /^([A-F0-9]{8}|[A-F0-9]{16}|[A-F0-9]{40})$/i) {
                print STDERR "-u $USER is not a keyid.\n";
@@ -868,13 +877,6 @@
        push @KEYIDS, uc($keyid);
 };
 
-$CONFIG{'no-download'} = $params->{'no-download'} if defined 
$params->{'no-download'};
-$CONFIG{'no-mail'}     = $params->{'no-mail'}     if defined 
$params->{'no-mail'};
-$CONFIG{'mail'}        = $params->{'mail'}        if defined $params->{'mail'};
-$CONFIG{'no-sign'}     = $params->{'no-sign'}     if defined 
$params->{'no-sign'};
-push @{$CONFIG{'key-files'}}, @{$params->{'key-files'}} if defined 
$params->{'key-files'};
-
-
 #################
 # import own keys
 #################


----- End forwarded message -----

Christoph
-- 
[EMAIL PROTECTED] | http://www.df7cb.de/

Attachment: signature.asc
Description: Digital signature

Reply via email to