Merge remote-tracking branch 'refs/remotes/origin/devel'

src/common.c

@@ -669,14 +669,12 @@ int doconnect(struct clientparam * param){
 	}
 #endif
 
-	if(SAISNULL(&param->sinsl)){
 #ifndef NOIPV6
-		if(*SAFAMILY(&param->sinsr) == AF_INET6) param->sinsl = param->srv->extsa6;
-		else
+	if(*SAFAMILY(&param->sinsr) == AF_INET6) param->sinsl = param->srv->extsa6;
+	else
 #endif
-			param->sinsl = param->srv->extsa;
-		*SAPORT(&param->sinsl) = 0;
-	}
+		param->sinsl = param->srv->extsa;
+	*SAPORT(&param->sinsl) = 0;
 	if(so._bind(param->remsock, (struct sockaddr*)&param->sinsl, SASIZE(&param->sinsl))==-1) {
 		return 12;
 	}