From 88e91c7dab59944a9463696712fbfee3602bf7fa Mon Sep 17 00:00:00 2001
From: myon <myon@b513b33f-fedd-0310-b452-c3deb5f4c849>
Date: Sun, 30 Apr 2006 10:27:34 +0000
Subject: [PATCH]   + Make local-user a config option, thanks to Michael C.
 Toren for the     patch (Closes: #361316).

git-svn-id: svn://svn.debian.org/pgp-tools/trunk@276 b513b33f-fedd-0310-b452-c3deb5f4c849
---
 caff/caff        | 24 +++++++++++++-----------
 debian/changelog |  4 +++-
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/caff/caff b/caff/caff
index 8c6e7e6..2fc095d 100755
--- a/caff/caff
+++ b/caff/caff
@@ -203,6 +203,10 @@ This is useful for offline signing. Default: B<0>.
 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]
@@ -891,13 +895,18 @@ if ($params->{'version'}) {
 };
 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";
+		print STDERR "Local-user $USER is not a keyid.\n";
 		usage(\*STDERR, 1);
 	};
 	$USER = uc($USER);
@@ -916,13 +925,6 @@ for my $keyid (@ARGV) {
 	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
 #################
diff --git a/debian/changelog b/debian/changelog
index 957ca85..071c3b8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,12 +3,14 @@ signing-party (0.4.6-1) unreleased; urgency=low
   * caff:
     + Try hostname without -f first to be compatible with BSD
       (Closes: #356830).
+    + Make local-user a config option, thanks to Michael C. Toren for the
+      patch (Closes: #361316).
     + Bump copyright, use URL in User-Agent header.
   * pgp-clean:
     + Import caff's getopt handling.
     + Add option to allow exporting subkeys (Closes: #359698).
 
- -- Christoph Berg <myon@debian.org>  Sun, 30 Apr 2006 11:33:23 +0200
+ -- Christoph Berg <myon@debian.org>  Sun, 30 Apr 2006 12:25:27 +0200
 
 signing-party (0.4.5-1) unstable; urgency=low
 
-- 
2.30.2