From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Sun, 19 Dec 2010 02:22:00 +0000 (-0500)
Subject: allow the use of ports in hostnames
X-Git-Tag: msva-perl_debian/0.8-1~1^2~9
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2dc0b9a20468a77ddf4f6041d71a8e17d0f47df1;p=monkeysphere-validation-agent.git

allow the use of ports in hostnames
---

diff --git a/Changelog b/Changelog
index e530be6..33a2a69 100644
--- a/Changelog
+++ b/Changelog
@@ -4,8 +4,9 @@ msva-perl (0.8~pre) upstream;
   * avoid indirect object creation.
   * bug fix for unused option messages.
   * allow use of hkpms keyservers from gpg.conf
+  * allow the use of ports in hostnames (closes MS # 2665)
 
- -- Daniel Kahn Gillmor <dkg@fifthhorseman.net>  Sat, 18 Dec 2010 18:27:31 -0500
+ -- Daniel Kahn Gillmor <dkg@fifthhorseman.net>  Sat, 18 Dec 2010 20:51:07 -0500
 
 msva-perl (0.7) upstream;
 
diff --git a/Crypt/Monkeysphere/MSVA.pm b/Crypt/Monkeysphere/MSVA.pm
index afc3a19..1ade1ab 100755
--- a/Crypt/Monkeysphere/MSVA.pm
+++ b/Crypt/Monkeysphere/MSVA.pm
@@ -624,7 +624,7 @@
         $ret->{message} = sprintf("Invalid client peer name string: %s", $data->{peer}->{name});
         return $status, $ret;
       }
-    } elsif ($data->{peer}->{name} =~ /^($RE{net}{domain})$/) {
+    } elsif ($data->{peer}->{name} =~ /^($RE{net}{domain}(:[[:digit:]]+)?)$/) {
       $data->{peer}->{name} = $1;
     } else {
       msvalog('error', "invalid peer name string: %s\n", $data->{peer}->{name});