diff --git a/src/server/aux-items.c b/src/server/aux-items.c index 2b5af14c62b45aefd61dee9d7cf101516273c589..c375428e8fe6b6b7052c8451322ef10abc8701ee 100644 --- a/src/server/aux-items.c +++ b/src/server/aux-items.c @@ -1,5 +1,5 @@ /* - * $Id: aux-items.c,v 1.27 2001/09/22 13:41:25 byers Exp $ + * $Id: aux-items.c,v 1.28 2001/09/22 15:52:17 ceder Exp $ * Copyright (C) 1994-2000 Lysator Academic Computer Association. * * This file is part of the LysKOM server. @@ -1244,7 +1244,7 @@ aux_inherit_items(Aux_item_list *target, if (parent->items[i].flags.inherit && !parent->items[i].flags.deleted && parent->items[i].inherit_limit != 1) - { + { def = find_aux_item_definition(&parent->items[i]); if (def == NULL || !aux_item_add_perm(&parent->items[i], @@ -1365,24 +1365,33 @@ check_delete_aux_item_list(const Number_list *items_to_delete, def = find_aux_item_definition(item); - if (def == NULL) { + if (def == NULL) + { kom_errno = KOM_AUX_PERM; err_stat = i; return FAILURE; - } else if (def->may_not_delete) { + } + else if (def->may_not_delete) + { kom_errno = KOM_AUX_PERM; err_stat = i; return FAILURE; - } else if (item->creator == 0) { - if (!ENA(wheel, 8)) { + } + else if (item->creator == 0) + { + if (!ENA(wheel, 8)) + { kom_errno = KOM_AUX_PERM; err_stat = i; return FAILURE; } - } else if (item->creator != ACTPERS) { + } + else if (item->creator != ACTPERS) + { if (!ENA(wheel, 8) && !is_supervisor(item->creator, ACTPERS, NULL) && - (!def->owner_delete || !is_supervisor(owner, ACTPERS, NULL))) { + (!def->owner_delete || !is_supervisor(owner, ACTPERS, NULL))) + { kom_errno = KOM_AUX_PERM; err_stat = i; return FAILURE;