From ac6468d89159244eff42b66e5f1c19fb1e1daf40 Mon Sep 17 00:00:00 2001 From: David Shaw Date: Thu, 23 Jan 2003 02:50:47 +0000 Subject: [PATCH] * gpgkeys_mailto.in: Fix regexp to work properly if the "keyid" is not a keyid, but rather a text string from the user ID. --- keyserver/ChangeLog | 5 +++++ keyserver/gpgkeys_mailto.in | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/keyserver/ChangeLog b/keyserver/ChangeLog index defe989f0..bb445c04f 100644 --- a/keyserver/ChangeLog +++ b/keyserver/ChangeLog @@ -1,3 +1,8 @@ +2003-01-22 David Shaw + + * gpgkeys_mailto.in: Fix regexp to work properly if the "keyid" is + not a keyid, but rather a text string from the user ID. + 2002-11-04 David Shaw * gpgkeys_hkp.c (send_key), gpgkeys_ldap.c (send_key): Properly diff --git a/keyserver/gpgkeys_mailto.in b/keyserver/gpgkeys_mailto.in index 9086de419..4e48ba479 100755 --- a/keyserver/gpgkeys_mailto.in +++ b/keyserver/gpgkeys_mailto.in @@ -44,7 +44,7 @@ while() { last if($_ eq "\n"); - if(/^COMMAND (\w+)/) + if(/^COMMAND (\S+)/) { $command=$1; } @@ -59,7 +59,7 @@ while() $program=$1; } - if(/^OPTION (\w+)/) + if(/^OPTION (\S+)/) { if($1=~/^verbose$/i) { @@ -175,7 +175,7 @@ if($command=~/send/i) while() { - if(/^KEY (\w+) BEGIN$/) + if(/^KEY (\S+) BEGIN$/) { $key=$1; last; @@ -184,7 +184,7 @@ if($command=~/send/i) while() { - if(/^KEY \w+ END$/) + if(/^KEY \S+ END$/) { last; }