Commit f2aac34c authored by Per Cederqvist's avatar Per Cederqvist

(aux_item_add_perm): Removed the conf_c argument from all calls to

	is_strictly_supervisor and is_supervisor.
(filter_aux_item_list): Likewise.
(check_delete_aux_item_list): Likewise.
parent b4a4d9bb
/*
* $Id: aux-items.c,v 1.22 1999/06/26 14:07:27 byers Exp $
* $Id: aux-items.c,v 1.23 1999/07/05 07:03:25 ceder Exp $
* Copyright (C) 1994-1999 Lysator Academic Computer Association.
*
* This file is part of the LysKOM server.
......@@ -1107,7 +1107,7 @@ aux_item_add_perm(Aux_item *item,
if (def->author_only &&
owner_check &&
object_creator != item_creator &&
!is_strictly_supervisor(object_creator, NULL, item_creator, NULL) &&
!is_strictly_supervisor(object_creator, item_creator, NULL) &&
!(item_creator == ACTPERS && ENA(wheel, 8))) /* NOT OK! */
{
kom_errno = KOM_AUX_PERM;
......@@ -1116,7 +1116,7 @@ aux_item_add_perm(Aux_item *item,
if (def->supervisor_only &&
owner_check &&
!is_strictly_supervisor(object_creator, NULL, item_creator, NULL) &&
!is_strictly_supervisor(object_creator, item_creator, NULL) &&
!(item_creator == ACTPERS && ENA(wheel,8))) /* NOT OK! */
{
kom_errno = KOM_AUX_PERM;
......@@ -1294,7 +1294,7 @@ filter_aux_item_list(Aux_item_list *original,
{
orig_aux = &original->items[from];
if ( orig_aux->flags.secret &&
!is_supervisor(orig_aux->creator, NULL,
!is_supervisor(orig_aux->creator,
viewer_conn->pers_no, viewer_conn->person) &&
!ENA_C(viewer_conn, admin, 4))
continue;
......@@ -1302,7 +1302,7 @@ filter_aux_item_list(Aux_item_list *original,
result->items[to] = *orig_aux;
if (orig_aux->flags.hide_creator &&
!is_supervisor(orig_aux->creator, NULL,
!is_supervisor(orig_aux->creator,
viewer_conn->pers_no, viewer_conn->person) &&
!ENA_C(viewer_conn, admin, 4))
result->items[to].creator = 0;
......@@ -1351,7 +1351,7 @@ check_delete_aux_item_list(Number_list *items_to_delete,
(def->may_not_delete) ||
(item->creator == 0 && !ENA(wheel, 8)) || /* NOT OK! */
(item->creator != ACTPERS && /* NOT OK! */
!is_supervisor(item->creator, NULL, ACTPERS, NULL) && /* NOT OK! */
!is_supervisor(item->creator, ACTPERS, NULL) && /* NOT OK! */
!ENA(wheel,8))) /* NOT OK! */
{
kom_errno = KOM_AUX_PERM;
......
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