mirror of
https://github.com/3proxy/3proxy.git
synced 2025-04-22 04:02:08 +08:00
resolve conflicts
This commit is contained in:
parent
98ff3464f7
commit
cfb96b0a77
@ -1145,7 +1145,10 @@ ERRORDSTNAMES:
|
|||||||
ERRORCHAINS:
|
ERRORCHAINS:
|
||||||
ac->next = NULL;
|
ac->next = NULL;
|
||||||
ERRORNEXT:
|
ERRORNEXT:
|
||||||
freeacl(ret);
|
freeacl(srv->preacl);
|
||||||
|
srv->preacl = NULL;
|
||||||
|
freeacl(srv->acl);
|
||||||
|
srv->acl = NULL;
|
||||||
return 21;
|
return 21;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user