Commit 2bb3452c authored by Per Cederqvist's avatar Per Cederqvist

(check_delete_aux_item_list): Indentation fixes.

(aux_inherit_items): Indentation fix.
parent 62124ab6
/* /*
* $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. * Copyright (C) 1994-2000 Lysator Academic Computer Association.
* *
* This file is part of the LysKOM server. * This file is part of the LysKOM server.
...@@ -1244,7 +1244,7 @@ aux_inherit_items(Aux_item_list *target, ...@@ -1244,7 +1244,7 @@ aux_inherit_items(Aux_item_list *target,
if (parent->items[i].flags.inherit && if (parent->items[i].flags.inherit &&
!parent->items[i].flags.deleted && !parent->items[i].flags.deleted &&
parent->items[i].inherit_limit != 1) parent->items[i].inherit_limit != 1)
{ {
def = find_aux_item_definition(&parent->items[i]); def = find_aux_item_definition(&parent->items[i]);
if (def == NULL || if (def == NULL ||
!aux_item_add_perm(&parent->items[i], !aux_item_add_perm(&parent->items[i],
...@@ -1365,24 +1365,33 @@ check_delete_aux_item_list(const Number_list *items_to_delete, ...@@ -1365,24 +1365,33 @@ check_delete_aux_item_list(const Number_list *items_to_delete,
def = find_aux_item_definition(item); def = find_aux_item_definition(item);
if (def == NULL) { if (def == NULL)
{
kom_errno = KOM_AUX_PERM; kom_errno = KOM_AUX_PERM;
err_stat = i; err_stat = i;
return FAILURE; return FAILURE;
} else if (def->may_not_delete) { }
else if (def->may_not_delete)
{
kom_errno = KOM_AUX_PERM; kom_errno = KOM_AUX_PERM;
err_stat = i; err_stat = i;
return FAILURE; 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; kom_errno = KOM_AUX_PERM;
err_stat = i; err_stat = i;
return FAILURE; return FAILURE;
} }
} else if (item->creator != ACTPERS) { }
else if (item->creator != ACTPERS)
{
if (!ENA(wheel, 8) && if (!ENA(wheel, 8) &&
!is_supervisor(item->creator, ACTPERS, NULL) && !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; kom_errno = KOM_AUX_PERM;
err_stat = i; err_stat = i;
return FAILURE; return FAILURE;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment