[Pkg-privacy-commits] [msva-perl] 05/15: newer versions of Net::Server can bind to multiple sockets

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to annotated tag msva-perl_debian/0.8.1-2
in repository msva-perl.

commit 522d77ebb2b98cfd254d98eb8d71517fb2064061
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Sun Jun 24 11:44:18 2012 -0400

    newer versions of Net::Server can bind to multiple sockets
---
 Crypt/Monkeysphere/MSVA.pm | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/Crypt/Monkeysphere/MSVA.pm b/Crypt/Monkeysphere/MSVA.pm
index 29d19ab..2a8a2c7 100755
--- a/Crypt/Monkeysphere/MSVA.pm
+++ b/Crypt/Monkeysphere/MSVA.pm
@@ -825,8 +825,11 @@
     $server->{server}->{leave_children_open_on_hup} = 1;
 
     my $socketcount = @{ $server->{server}->{sock} };
-    if ( $socketcount != 1 ) {
-      msvalog('error', "%d sockets open; should have been 1.\n", $socketcount);
+    # note: we're assuming here that if there are more than one socket
+    # open (e.g. IPv6 and IPv4, or multiple IP addresses of the same
+    # family), they all share the same port number as socket 0.
+    if ( $socketcount < 1 ) {
+      msvalog('error', "%d sockets open; should have been at least 1.\n", $socketcount);
       $server->set_exit_status(10);
       $server->server_close();
     }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/msva-perl.git