Merge commit 'origin/silc.1.1.branch'

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

diff --git a/apps/silcd/server_query.c b/apps/silcd/server_query.c
index cd5103a4a28a6033c052f62df79a8bb3dc98a4c7..59eda8024e40cb5d513ef8bc89656311bb9b7150 100644 (file)
--- a/apps/silcd/server_query.c
+++ b/apps/silcd/server_query.c
@@ -397,11 +397,11 @@ void silc_server_query_send_router_reply(void *context, void *reply)
        returned error. */
     if (query->nick_server[0] && !query->dynamic_retry &&
        !silc_server_num_sockets_by_remote(server, query->nick_server,
-                                          query->nick_server, 1334, type)) {
+                                          query->nick_server, 706, type)) {
       SILC_LOG_DEBUG(("Retry query by connecting to %s:%d",
                      query->nick_server, 706));
       silc_server_create_connection(server, FALSE, TRUE, query->nick_server,
-                                   1334, silc_server_query_connected,
+                                   706, silc_server_query_connected,
                                    query);
       query->dynamic_retry = TRUE;
       query->resolved = FALSE;
@@ -1516,6 +1516,7 @@ void silc_server_query_send_reply(SilcServer server,
   SilcUInt16 ident = silc_command_get_ident(cmd->payload);
   SilcStatus status;
   unsigned char *tmp;
+  char *tmp2;
   SilcUInt32 len;
   SilcBuffer idp;
   int i, k, valid_count;
@@ -1642,8 +1643,8 @@ void silc_server_query_send_reply(SilcServer server,
            hsock = entry->connection;
            silc_strncat(uh, sizeof(uh), "@", 1);
            silc_socket_stream_get_info(silc_packet_stream_get_stream(hsock),
-                                       NULL, (const char **)&tmp, NULL, NULL);
-           silc_strncat(uh, sizeof(uh), tmp, strlen(tmp));
+                                       NULL, (const char **)&tmp2, NULL, NULL);
+           silc_strncat(uh, sizeof(uh), tmp2, strlen(tmp2));
          }
 
          if (idata->conn_type == SILC_CONN_CLIENT)
@@ -1733,9 +1734,9 @@ void silc_server_query_send_reply(SilcServer server,
            hsock = entry->connection;
            silc_strncat(uh, sizeof(uh), "@", 1);
            silc_socket_stream_get_info(silc_packet_stream_get_stream(hsock),
-                                       NULL, (const char **)&tmp,
+                                       NULL, (const char **)&tmp2,
                                        NULL, NULL);
-           silc_strncat(uh, sizeof(uh), tmp, strlen(tmp));
+           silc_strncat(uh, sizeof(uh), tmp2, strlen(tmp2));
          }
 
          silc_server_send_command_reply(server, cmd->sock, query->querycmd,