allow the use of ports in hostnames

diff --git a/Changelog b/Changelog
index e530be616dfc43b190cc2d6bbc976ab4ab072a4b..33a2a690240fbdc5fe9823bdd170f95ebfb33f97 100644 (file)
--- 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 afc3a19460073371e79048f35b5ebf2fff79e56e..1ade1ab137700c55b790d0b63fccfc6ef0a54323 100755 (executable)
--- 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});