Merge lp:~clint-fewbar/gearmand/listen-only-once into lp:gearmand/1.0

[Clint Byrum]

Not sure if this is the optimal way to handle the bug, but it does seem very straightforward and solves the given test case.

[lp:~clint-fewbar/gearmand/listen-only-once]

482. By Clint Byrum on 2012-01-19

remove unnecessary unordered_map include

483. By Clint Byrum on 2012-01-19

revert accidental change to ltmain.sh

484. By Clint Byrum on 2012-01-19

revert accidental change to ltversion.m4

=== modified file 'libgearman-server/gearmand.cc'
--- libgearman-server/gearmand.cc	2012-01-18 01:41:28 +0000
+++ libgearman-server/gearmand.cc	2012-01-19 18:43:27 +0000
@@ -392,6 +392,8 @@
       return GEARMAN_ERRNO;
     }
 
+    std::set<std::string> unique_hosts;
+
     for (struct addrinfo *addrinfo_next= addrinfo; addrinfo_next != NULL;
          addrinfo_next= addrinfo_next->ai_next)
     {
@@ -408,6 +410,13 @@
         strcpy(port->port, "-");
       }
 
+      std::string hstring(host);
+      
+      if (unique_hosts.find(hstring) != unique_hosts.end()) {
+          gearmand_log_debug(GEARMAN_DEFAULT_LOG_PARAM, "Already listening on %s", host);
+          continue;
+      }
+      unique_hosts.insert(hstring);
       gearmand_log_debug(GEARMAN_DEFAULT_LOG_PARAM, "Trying to listen on %s:%s", host, port->port);
 
       /* Call to socket() can fail for some getaddrinfo results, try another. */