security-and-privacy/gnupg
security-and-privacy
/
gnupg
mirror of git://git.gnupg.org/gnupg.git
1
0
Fork 0
Code Releases Activity

* gpgkeys_mailto.in: Set 'mail-from' as a keyserver-option, rather 

than the ugly ?from= syntax.
This commit is contained in:
David Shaw 2009-05-05 03:29:56 +00:00
parent 82d26564dc
commit 4409dbf068
2 changed files with 20 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
keyserver/ChangeLog
View File

@ -1,3 +1,8 @@
2009-05-04 David Shaw <dshaw@jabberwocky.com>
* gpgkeys_mailto.in: Set 'mail-from' as a keyserver-option, rather
than the ugly ?from= syntax.
2009-01-22 Werner Koch <wk@g10code.com>
* Makefile.am (gpg2keys_curl_LDADD, gpg2keys_hkp_LDADD): Add all

42
keyserver/gpg2keys_mailto.in
View File

@ -52,10 +52,6 @@ if(@ARGV)
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 @@ while(<STDIN>)
{
$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 @@ if(!defined($address))
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");