X-Git-Url: http://git.silcnet.org/gitweb/?a=blobdiff_plain;f=apps%2Fsilcd%2Fserver_query.c;h=f3337770ce776b01101d33dc615f656b36c44f36;hb=454d63a3ea0c954f9d40b9e7725fd9ea48503f4c;hp=968e0ca38adb0289e2d0501890dfdc759cc3ac3d;hpb=c0a3e19503062eb3aab8335d97e27e348595b81d;p=silc.git

diff --git a/apps/silcd/server_query.c b/apps/silcd/server_query.c
index 968e0ca3..f3337770 100644
--- a/apps/silcd/server_query.c
+++ b/apps/silcd/server_query.c
@@ -396,6 +396,7 @@ void silc_server_query_send_router_reply(void *context, void *reply)
     /* If this was nick@server query, retry to @serv if the primary router
        returned error. */
     if (query->nick_server[0] && !query->dynamic_retry &&
+	server->config->dynamic_server &&
 	!silc_server_num_sockets_by_remote(server, query->nick_server,
 					   query->nick_server, 706, type)) {
       SILC_LOG_DEBUG(("Retry query by connecting to %s:%d",
@@ -937,6 +938,11 @@ void silc_server_query_process(SilcServer server, SilcServerQuery query,
   SilcUInt32 clients_count = 0, channels_count = 0, servers_count = 0;
   int i;
 
+  if (!idata) {
+    silc_server_query_free(query);
+    return;
+  }
+
   SILC_LOG_DEBUG(("Processing %s query",
 		  silc_get_command_name(query->querycmd)));