New silcconfig library and server parser. Merged silc-newconfig-final.patch.

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

diff --git a/apps/silcd/packet_receive.c b/apps/silcd/packet_receive.c
index 442dd310a6e4bf9f6efc56b999bee58259aac059..2f3aa2f7206a5153be05e38422658f1fcd04fba5 100644 (file)
--- a/apps/silcd/packet_receive.c
+++ b/apps/silcd/packet_receive.c
@@ -630,6 +630,7 @@ void silc_server_notify(SilcServer server,
          if (chl2) {
            chl2->mode = mode;
            silc_free(channel_id);
+           silc_hash_table_list_reset(&htl);
            goto out;
          }
        }
@@ -650,6 +651,7 @@ void silc_server_notify(SilcServer server,
          chl2 = chl;
        }
       }
+      silc_hash_table_list_reset(&htl);
       
       /* Send the same notify to the channel */
       if (!notify_sent)
@@ -2497,7 +2499,7 @@ void silc_server_connection_auth_request(SilcServer server,
                                         SilcSocketConnection sock,
                                         SilcPacketContext *packet)
 {
-  SilcServerConfigSectionClientConnection *client = NULL;
+  SilcServerConfigSectionClient *client = NULL;
   uint16 conn_type;
   int ret, port;
   SilcAuthMethod auth_meth;
@@ -2521,11 +2523,11 @@ void silc_server_connection_auth_request(SilcServer server,
   /* Get the authentication method for the client */
   auth_meth = SILC_AUTH_NONE;
   port = server->sockets[server->sock]->port; /* Listenning port */
-  client = silc_server_config_find_client_conn(server->config,
+  client = silc_server_config_find_client(server->config,
                                               sock->ip,
                                               port);
   if (!client)
-    client = silc_server_config_find_client_conn(server->config,
+    client = silc_server_config_find_client(server->config,
                                                 sock->hostname,
                                                 port);
   if (client)