Fixed the WATCH with public keys, and added public key to the

[silc.git] / apps / silcd / server_util.c

diff --git a/apps/silcd/server_util.c b/apps/silcd/server_util.c
index 48c6f30599613fb6fce9ef466031d44462bf4173..ab8248974b4f6a0efff9de35a6bce5b3105b3d2a 100644 (file)
--- a/apps/silcd/server_util.c
+++ b/apps/silcd/server_util.c
@@ -1700,7 +1700,8 @@ silc_server_check_watcher_list_foreach(void *key, void *context,
                                  notify->client,
                                  notify->new_nick ? notify->new_nick :
                                  (const char *)notify->client->nickname,
-                                 notify->notify);
+                                 notify->notify,
+                                 notify->client->data.public_key);
   }
 }
 
@@ -1783,6 +1784,25 @@ bool silc_server_del_from_watcher_list(SilcServer server,
   }
   silc_hash_table_list_reset(&htl);
 
+  silc_hash_table_list(server->watcher_list_pk, &htl);
+  while (silc_hash_table_get(&htl, &key, (void *)&entry)) {
+    if (entry == client) {
+      silc_hash_table_del_by_context(server->watcher_list_pk, key, client);
+
+      if (client->id)
+       SILC_LOG_DEBUG(("Removing %s from WATCH list",
+                       silc_id_render(client->id, SILC_ID_CLIENT)));
+
+      /* Now check whether there still exists entries with this key, if not
+        then free the key to not leak memory. */
+      if (!silc_hash_table_find(server->watcher_list_pk, key, NULL, NULL))
+        silc_pkcs_public_key_free(key);
+
+      found = TRUE;
+    }
+  }
+  silc_hash_table_list_reset(&htl);
+
   return found;
 }