svn commit: samba r18427 - in branches/SAMBA_4_0/source/lib/socket_wrapper: .

metze at samba.org metze at samba.org
Tue Sep 12 16:25:50 GMT 2006


Author: metze
Date: 2006-09-12 16:25:50 +0000 (Tue, 12 Sep 2006)
New Revision: 18427

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=18427

Log:
set sin_port correctly on autobound socket

metze
Modified:
   branches/SAMBA_4_0/source/lib/socket_wrapper/socket_wrapper.c


Changeset:
Modified: branches/SAMBA_4_0/source/lib/socket_wrapper/socket_wrapper.c
===================================================================
--- branches/SAMBA_4_0/source/lib/socket_wrapper/socket_wrapper.c	2006-09-12 14:59:08 UTC (rev 18426)
+++ branches/SAMBA_4_0/source/lib/socket_wrapper/socket_wrapper.c	2006-09-12 16:25:50 UTC (rev 18427)
@@ -535,6 +535,7 @@
 	int i;
 	char type;
 	int ret;
+	int port;
 	struct stat st;
 	
 	un_addr.sun_family = AF_UNIX;
@@ -552,9 +553,10 @@
 	}
 	
 	for (i=0;i<1000;i++) {
+		port = 10000 + i;
 		snprintf(un_addr.sun_path, sizeof(un_addr.sun_path), 
 			 "%s/"SOCKET_FORMAT, socket_wrapper_dir(),
-			 type, socket_wrapper_default_iface(), i + 10000);
+			 type, socket_wrapper_default_iface(), port);
 		if (stat(un_addr.sun_path, &st) == 0) continue;
 		
 		ret = real_bind(si->fd, (struct sockaddr *)&un_addr, sizeof(un_addr));
@@ -571,7 +573,7 @@
 	
 	memset(&in, 0, sizeof(in));
 	in.sin_family = AF_INET;
-	in.sin_port   = htons(i);
+	in.sin_port   = htons(port);
 	in.sin_addr.s_addr = htonl(127<<24 | socket_wrapper_default_iface());
 	
 	si->myname_len = sizeof(in);



More information about the samba-cvs mailing list