Merge, just renaming old error macros.

This commit is contained in:
Matthew Bloch
2012-06-09 02:37:23 +01:00
10 changed files with 502 additions and 87 deletions

View File

@@ -282,8 +282,7 @@ int control_acl(struct control_params* client, int linesc, char** lines)
acl_destroy( new_acl );
}
else {
client->serve->acl = new_acl;
acl_destroy( old_acl );
server_replace_acl( client->serve, new_acl );
write_socket("0: updated");
}