Merge 099ef1f6a8 into c31fe8367f

src/acl.c

@@ -150,7 +150,7 @@ int checkACL(struct clientparam * param){
 				if(param->redirected && acentry->chains && SAISNULL(&acentry->chains->addr) && !*SAPORT(&acentry->chains->addr)) {
 					continue;
 				}
-				if((param->operation == UDPASSOC)? (param->ctrlsocksrv != INVALID_SOCKET) : (param->remsock != INVALID_SOCKET)) {
+				if(param->remsock != INVALID_SOCKET && (param->operation != UDPASSOC || param->ctrlsocksrv != INVALID_SOCKET)) {
 					return 0;
 				}
 				for(; i < conf.parentretries; i++){

src/common.c

@@ -644,7 +644,6 @@ int doconnect(struct clientparam * param){
 
  if (param->operation == ADMIN || (( param->operation == DNSRESOLVE || param->operation == BIND || param->operation == UDPASSOC) && !param->redirected))
 	return 0;
- if (param->operation == UDPASSOC && param->ctrlsocksrv != INVALID_SOCKET) return 0;
  if (param->remsock != INVALID_SOCKET){
 	if(param->operation == UDPASSOC) return 0;
 	size = sizeof(param->sinsr);