silc_attribute_payload_parse interface change.

	silc_hash_table_find_foreach interface change.

diff --git a/apps/silcd/server_query.c b/apps/silcd/server_query.c
index 6f8164886c6a377e9fd0f84fa8d389e1c35e2a12..81b460e3281633eb51bde77fc656720bdc588582 100644 (file)
--- a/apps/silcd/server_query.c
+++ b/apps/silcd/server_query.c
@@ -427,7 +427,7 @@ void silc_server_query_parse(SilcServer server, SilcServerQuery query)
     /* Get requested attributes if set */
     tmp = silc_argument_get_arg_type(cmd->args, 3, &tmp_len);
     if (tmp)
-      query->attrs = silc_attribute_payload_parse_list(tmp, tmp_len);
+      query->attrs = silc_attribute_payload_parse(tmp, tmp_len);
     break;
 
   case SILC_COMMAND_WHOWAS:

diff --git a/apps/silcd/server_util.c b/apps/silcd/server_util.c
index 990e913bc020679fdc5445e33fcab62c4d953907..74a4d7e5d9801f214676e2a7e7e7deff16b6141e 100644 (file)
--- a/apps/silcd/server_util.c
+++ b/apps/silcd/server_util.c
@@ -1564,6 +1564,9 @@ silc_server_check_watcher_list_foreach(void *key, void *context,
   SilcClientEntry entry = context;
   SilcSocketConnection sock;
 
+  if (!context)
+    return;
+
   if (entry == notify->client)
     return;