--- openswan-2.6.16/programs/pluto/connections-orig.c	2008-09-25 13:48:37.000000000 -0400
+++ openswan-2.6.16/programs/pluto/connections.c	2008-09-25 14:49:06.000000000 -0400
@@ -2078,6 +2078,10 @@
 		    continue;
 		if (src->that.port != srd->that.port)
 		    continue;
+
+		if (!sameaddr(&src->this.host_addr, &srd->this.host_addr))
+                 continue;
+
 		passert(oriented(*d));
 		if (srd->routing > best_routing)
 		{
