From 9ca283b4cf877db8a851f27ce8ae2124cf7362b8 Mon Sep 17 00:00:00 2001
From: David Byers <byers@lysator.liu.se>
Date: Sat, 13 Apr 2002 11:23:12 +0000
Subject: [PATCH] Fixed bugs 38 and 145

---
 ChangeLog               | 25 +++++++++++++++++++++++++
 src/server/conference.c | 11 ++---------
 2 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 641ba3aa1..ce6b0f471 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,30 @@
+2002-04-13  David Byers  <david.byers@swipnet.se>
+
+	Test for fix of bug 145:
+	* src/server/testsuite/config/prot-a.exp (kom_delete_conf): New
+	function.
+	(kom_lookup_z_name): New function.
+
 2002-04-12  David Byers  <david.byers@swipnet.se>
 
+	Fix bug 145:
+	* src/server/conference.c (do_delete_conf): Removed lines that
+	cleared the name of the conference. That is done in
+	cached_delete_conf.
+
+	Fix bug 38:
+	* src/server/testsuite/lyskomd.0/bug-38.exp: New file.
+
+	* src/server/testsuite/config/prot-a.exp (kom_set_user_area): New
+	function.
+	(kom_shutdown_server): New function.
+	(kom_create_text_simple): New function.
+	(cres): The else branch which does eval actually works now. Made
+	ref_no global in this function.
+
+	* src/server/person.c (do_set_user_area): Copied check for read
+	access to new user area from get_text_stat.
+
 	Fix bug 331:
 	* src/server/testsuite/lyskomd.0/03.exp: Use idholl and
 	lyskomd_host for hostname-dependend strings.
diff --git a/src/server/conference.c b/src/server/conference.c
index 81646ca21..6d2052fce 100644
--- a/src/server/conference.c
+++ b/src/server/conference.c
@@ -1,5 +1,5 @@
 /*
- * $Id: conference.c,v 0.70 2001/12/28 20:00:03 ceder Exp $
+ * $Id: conference.c,v 0.71 2002/04/13 11:23:12 byers Exp $
  * Copyright (C) 1991-2001  Lysator Academic Computer Association.
  *
  * This file is part of the LysKOM server.
@@ -101,14 +101,7 @@ do_delete_conf (Conf_no      conf_no,
 
     sfree( conf_c->members.members );
     conf_c->members.members = NULL;
-    
-    /* Delete the name.
-       FIXME: This is done by cached_delete_conf */
-    /* FIXME (bug 145): I don't understand the above comment.  Check
-       this for memory leaks and memory corruption. */
-    s_clear( &conf_c->name );
-    cached_change_name( conf_no, EMPTY_STRING);
-    
+
     /* texts */
 
     /*
-- 
GitLab