Delete and add correct public keys and client entrys to pk_hash.

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

diff --git a/apps/silcd/packet_receive.c b/apps/silcd/packet_receive.c
index 9e574a593cefd5b668d109bdb4d109f744d0b411..8a2e2ca2877d9f602d7211302022c82813b3dcad 100644 (file)
--- a/apps/silcd/packet_receive.c
+++ b/apps/silcd/packet_receive.c
@@ -3793,10 +3793,13 @@ void silc_server_resume_client(SilcServer server,
     sock->user_data = detached_client;
     detached_client->connection = sock;
 
-    if (client->data.public_key)
+    if (detached_client->data.public_key)
       silc_hash_table_del_by_context(server->pk_hash,
                                     detached_client->data.public_key,
-                                    client);
+                                    detached_client);
+    if (idata->public_key)
+      silc_hash_table_del_by_context(server->pk_hash,
+                                    idata->public_key, idata);
 
     /* Take new keys and stuff into use in the old entry */
     silc_idlist_del_data(detached_client);
@@ -3804,7 +3807,7 @@ void silc_server_resume_client(SilcServer server,
 
     if (detached_client->data.public_key)
       silc_hash_table_add(server->pk_hash,
-                          detached_client->data.public_key, client);
+                         detached_client->data.public_key, detached_client);
 
     detached_client->data.status |= SILC_IDLIST_STATUS_REGISTERED;
     detached_client->data.status |= SILC_IDLIST_STATUS_RESUMED;
@@ -3848,12 +3851,6 @@ void silc_server_resume_client(SilcServer server,
     silc_server_remove_from_channels(server, NULL, client, FALSE,
                                     NULL, FALSE, FALSE);
 
-    /* Remove from public key hash table. */
-    if (client->data.public_key)
-      silc_hash_table_del_by_context(server->pk_hash,
-                                    client->data.public_key,
-                                    client);
-
     silc_server_del_from_watcher_list(server, client);
     if (!silc_idlist_del_client(server->local_list, client))
       silc_idlist_del_client(server->global_list, client);
@@ -4051,8 +4048,6 @@ void silc_server_resume_client(SilcServer server,
     /* Client is detached, and now it is resumed.  Remove the detached
        mode and mark that it is resumed. */
 
-    /* we need to delete the public key from the has .. but do we need to
-     * get the key again? */
     if (detached_client->data.public_key)
       silc_hash_table_del_by_context(server->pk_hash,
                                     detached_client->data.public_key,