# HG changeset patch
# User Eric Warmenhoven <eric@warmenhoven.org>
# Date 967589184 0
# Node ID 57cc66fbfa8e0b5e0cfb0fc9ec8ae620509caa00
# Parent  24f1f5dc7c151e75788f27596a41a814f53d9cbe
[gaim-migrate @ 803]
hm hm hm. we probably shouldn't free memory we're going to be using later.

committer: Tailor Script <tailor@pidgin.im>

diff -r 24f1f5dc7c15 -r 57cc66fbfa8e src/server.c
--- a/src/server.c	Tue Aug 29 22:06:06 2000 +0000
+++ b/src/server.c	Tue Aug 29 22:46:24 2000 +0000
@@ -330,6 +330,7 @@
 {
 	permdeny = 3;
 	build_permit_tree();
+	serv_set_permit_deny();
 }
 
 
@@ -338,6 +339,7 @@
 {
 	permdeny = 4;
 	build_permit_tree();
+	serv_set_permit_deny();
 }
 
 
diff -r 24f1f5dc7c15 -r 57cc66fbfa8e src/toc.c
--- a/src/toc.c	Tue Aug 29 22:06:06 2000 +0000
+++ b/src/toc.c	Tue Aug 29 22:46:24 2000 +0000
@@ -864,13 +864,6 @@
 	GList *bud;
 	int how_many = 0;
 
-	/* Clean out the permit/deny list!*/
-	/* why? if we're going to merge things, then these should stay
-g_list_free(permit);
-g_list_free(deny);
-permit = NULL;
-	deny = NULL;
-	*/
 	bud = NULL;
         
 /* skip "CONFIG:" (if it exists)*/
@@ -905,7 +898,6 @@
 			} else if (*c == 'p') {
 				GList *d = permit;
 				char *n;
-				name = g_malloc(strlen(c+2) + 2);
 				g_snprintf(name, strlen(c+2) + 1, "%s", c+2);
 				n = g_strdup(normalize(name));
 				while (d) {
@@ -916,7 +908,6 @@
 				g_free(n);
 				if (!d)
 					permit = g_list_append(permit, name);
-				g_free(name);
 			} else if (*c == 'd') {
 				GList *d = deny;
 				char *n;
@@ -931,9 +922,16 @@
 				g_free(n);
 				if (!d)
 					deny = g_list_append(deny, name);
-				g_free(name);
-			} else if (*c == 't') {
-				sscanf(c + strlen(c) - 2, "%d", &permdeny);
+			} else if (!strncmp("toc", c, 3)) {
+				sscanf(c + strlen(c) - 1, "%d", &permdeny);
+				sprintf(debug_buff, "permdeny: %d\n", permdeny);
+				debug_print(debug_buff);
+				if (permdeny == 0)
+					permdeny = 1;
+			} else if (*c == 'm') {
+				sscanf(c + 2, "%d", &permdeny);
+				sprintf(debug_buff, "permdeny: %d\n", permdeny);
+				debug_print(debug_buff);
 				if (permdeny == 0)
 					permdeny = 1;
 			}