resolve conflicts

This commit is contained in:
z3APA3A 2020-11-03 13:31:57 +03:00
parent 98ff3464f7
commit cfb96b0a77

View File

@ -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;
} }