[svn] GnuPG - r4989 - trunk/keyserver
svn author dshaw
cvs at cvs.gnupg.org
Tue May 5 05:29:56 CEST 2009
Author: dshaw
Date: 2009-05-05 05:29:56 +0200 (Tue, 05 May 2009)
New Revision: 4989
Modified:
trunk/keyserver/ChangeLog
trunk/keyserver/gpg2keys_mailto.in
Log:
* gpgkeys_mailto.in: Set 'mail-from' as a keyserver-option, rather
than the ugly ?from= syntax.
Modified: trunk/keyserver/ChangeLog
===================================================================
--- trunk/keyserver/ChangeLog 2009-05-04 03:03:38 UTC (rev 4988)
+++ trunk/keyserver/ChangeLog 2009-05-05 03:29:56 UTC (rev 4989)
@@ -1,3 +1,8 @@
+2009-05-04 David Shaw <dshaw at jabberwocky.com>
+
+ * gpgkeys_mailto.in: Set 'mail-from' as a keyserver-option, rather
+ than the ugly ?from= syntax.
+
2009-01-22 Werner Koch <wk at g10code.com>
* Makefile.am (gpg2keys_curl_LDADD, gpg2keys_hkp_LDADD): Add all
Modified: trunk/keyserver/gpg2keys_mailto.in
===================================================================
--- trunk/keyserver/gpg2keys_mailto.in 2009-05-04 03:03:38 UTC (rev 4988)
+++ trunk/keyserver/gpg2keys_mailto.in 2009-05-05 03:29:56 UTC (rev 4989)
@@ -52,10 +52,6 @@
open(STDIN,$ARGV[0]) || die "Can't open input file $ARGV[0]\n";
}
-($login,$name)=(getpwuid($<))[0,6];
-
-$from="$name <$login>";
-
while(<STDIN>)
{
last if($_ eq "\n");
@@ -85,9 +81,24 @@
{
$verbose--;
}
+ elsif($1=~/^mail-from=(.+)$/i)
+ {
+ $from=$1;
+ }
+ elsif($1=~/^no-mail-from$/i)
+ {
+ undef $from;
+ }
+
}
}
+if(!defined($from))
+{
+ ($login,$name)=(getpwuid($<))[0,6];
+ $from="$name <$login>";
+}
+
$program="(unknown)" if(!defined($program));
if(!defined($address))
@@ -96,29 +107,6 @@
exit(1);
}
-# decode $address
-
-($address,$args)=split(/\?/,$address);
-
-if(defined($args))
-{
- @pairs = split(/&/, $args);
- foreach $pair (@pairs)
- {
- ($hdr, $val) = split(/=/, $pair);
- $hdr =~ tr/+/ /;
- $hdr =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C", hex($1))/eg;
- $val =~ tr/+/ /;
- $val =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C", hex($1))/eg;
-# we only handle "from" right now
- if($hdr=~/^from$/i)
- {
- $from=$val;
- last;
- }
- }
-}
-
while(<STDIN>)
{
last if($_ eq "\n");
More information about the Gnupg-commits
mailing list