at 16.09-beta 1.1 kB view raw
1Set SO_REUSEADDR to ensure that portmap can restart properly. 2 3https://bugs.launchpad.net/ubuntu/+source/portmap/+bug/688550 4 5=================================================================== 6--- portmap-6.0.0.orig/portmap.c 2011-03-16 20:43:26.000000000 +0100 7+++ portmap-6.0.0/portmap.c 2011-03-17 07:30:17.000000000 +0100 8@@ -142,9 +142,9 @@ 9 * loopback interface address. 10 */ 11 12+static int on = 1; 13 #ifdef LOOPBACK_SETUNSET 14 static SVCXPRT *ludpxprt, *ltcpxprt; 15-static int on = 1; 16 #ifndef INADDR_LOOPBACK 17 #define INADDR_LOOPBACK ntohl(inet_addr("127.0.0.1")) 18 #endif 19@@ -399,9 +399,7 @@ 20 syslog(LOG_ERR, "cannot create udp socket: %m"); 21 exit(1); 22 } 23-#ifdef LOOPBACK_SETUNSET 24 setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, &on, sizeof on); 25-#endif 26 27 memset((char *) &addr, 0, sizeof(addr)); 28 addr.sin_addr.s_addr = 0; 29@@ -434,9 +432,7 @@ 30 syslog(LOG_ERR, "cannot create tcp socket: %m"); 31 exit(1); 32 } 33-#ifdef LOOPBACK_SETUNSET 34 setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, &on, sizeof on); 35-#endif 36 if (bind(sock, (struct sockaddr *)&addr, len) != 0) { 37 syslog(LOG_ERR, "cannot bind tcp: %m"); 38 exit(1);