[2013] corrected the return value of socket.accept().

not directly related to the subject of this branch, but it's a small bug fix
in a file we are updating, so it seemed reasonable to incorporate it here.

src/bin/ddns/ddns.py.in

@@ -270,10 +270,10 @@ class DDNSServer:
         Accept another connection and create the session receiver.
         """
         try:
-            sock = self._listen_socket.accept()
+            (sock, remote_addr) = self._listen_socket.accept()
             fileno = sock.fileno()
             logger.debug(TRACE_BASIC, DDNS_NEW_CONN, fileno,
-                         sock.getpeername())
+                         remote_addr if remote_addr else '<anonymous address>')
             receiver = isc.util.cio.socketsession.SocketSessionReceiver(sock)
             self._socksession_receivers[fileno] = (sock, receiver)
         except (socket.error, isc.util.cio.socketsession.SocketSessionError) \

src/bin/ddns/tests/ddns_test.py

@@ -70,7 +70,7 @@ class FakeSocket:
     def getpeername(self):
         return "fake_unix_socket"
     def accept(self):
-        return FakeSocket(self.__fileno + 1)
+        return FakeSocket(self.__fileno + 1), '/dummy/path'
     def sendto(self, data, addr):
         self._sent_data = data
         self._sent_addr = addr