Commit 6ede0ba4 authored by Per Cederqvist's avatar Per Cederqvist
Browse files

(do_create_conf): New argument: creating_connection. All callers

	updated.
(modify_conf_info): Adjusted to new API of
	check_delete_aux_item_list() and
	conf_stat_check_add_aux_item_list().
parent a39fe654
/* /*
* $Id: conference.c,v 0.88 2003/08/17 11:09:30 ceder Exp $ * $Id: conference.c,v 0.89 2003/08/20 08:26:02 ceder Exp $
* Copyright (C) 1991-2002 Lysator Academic Computer Association. * Copyright (C) 1991-2002 Lysator Academic Computer Association.
* *
* This file is part of the LysKOM server. * This file is part of the LysKOM server.
...@@ -272,6 +272,7 @@ do_create_conf(String name, ...@@ -272,6 +272,7 @@ do_create_conf(String name,
Conf_no supervisor, Conf_no supervisor,
Conf_no super_conf, Conf_no super_conf,
Conf_type type, Conf_type type,
Connection *creating_connection,
Aux_item_list *aux) Aux_item_list *aux)
{ {
Conf_no conf_no; Conf_no conf_no;
...@@ -316,7 +317,7 @@ do_create_conf(String name, ...@@ -316,7 +317,7 @@ do_create_conf(String name,
if (conf_stat_check_add_aux_item_list(conf_c, if (conf_stat_check_add_aux_item_list(conf_c,
conf_no, conf_no,
aux, aux,
creator, creating_connection,
TRUE) != OK) TRUE) != OK)
{ {
/* FIXME (bug 146): Conf_no leak: We create a conference, check the /* FIXME (bug 146): Conf_no leak: We create a conference, check the
...@@ -513,7 +514,8 @@ create_conf_generic(const String name, ...@@ -513,7 +514,8 @@ create_conf_generic(const String name,
return 0; return 0;
} }
conf_no = do_create_conf(name, ACTPERS, ACTPERS, ACTPERS, type, aux); conf_no = do_create_conf(name, ACTPERS, ACTPERS, ACTPERS, type,
active_connection, aux);
if ( conf_no != 0) if ( conf_no != 0)
{ {
...@@ -1515,14 +1517,14 @@ modify_conf_info(Conf_no conf_no, ...@@ -1515,14 +1517,14 @@ modify_conf_info(Conf_no conf_no,
if (check_delete_aux_item_list(items_to_delete, if (check_delete_aux_item_list(items_to_delete,
&conf->aux_item_list, &conf->aux_item_list,
conf->supervisor)!=OK) conf_no)!=OK)
return FAILURE; return FAILURE;
delete_aux_item_list(items_to_delete, &conf->aux_item_list, delete_aux_item_list(items_to_delete, &conf->aux_item_list,
CONF_OBJECT_TYPE, CONF_OBJECT_TYPE,
conf_no, conf); conf_no, conf);
if (conf_stat_check_add_aux_item_list(conf, conf_no, aux, ACTPERS, if (conf_stat_check_add_aux_item_list(conf, conf_no, aux,
FALSE) != OK) active_connection, FALSE) != OK)
{ {
undelete_aux_item_list(items_to_delete, &conf->aux_item_list, undelete_aux_item_list(items_to_delete, &conf->aux_item_list,
CONF_OBJECT_TYPE, CONF_OBJECT_TYPE,
......
Supports Markdown
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