Merge branch 'topic/detach-fixes' of git://valera-ext.nynaeve.net/silc into silc...

diff --git a/apps/silcd/command.c b/apps/silcd/command.c
index 2bd8198ebcfd0e2583b84098c1063bfe777c8cdd..698b22657ac1c719dbfc455c7ae8e6a45ffb6a7f 100644 (file)
--- a/apps/silcd/command.c
+++ b/apps/silcd/command.c
@@ -4078,6 +4078,13 @@ SILC_TASK_CALLBACK(silc_server_command_detach_cb)
     client->router = NULL;
     client->connection = NULL;
     silc_server_close_connection(server, sock);
+
+    /*
+     * Decrement the user count; we'll increment it if the user resumes on our
+     * server.
+     */
+    SILC_VERIFY(&server->stat.my_clients > 0);
+    server->stat.my_clients--;
   }
 
   silc_free(client_id);

diff --git a/apps/silcd/packet_receive.c b/apps/silcd/packet_receive.c
index ab174e4f5d000140e18aac2b179e83316b0c2675..5a49ca314e2cc1bd7fdd2eb7091a417955f26211 100644 (file)
--- a/apps/silcd/packet_receive.c
+++ b/apps/silcd/packet_receive.c
@@ -3734,8 +3734,12 @@ void silc_server_resume_client(SilcServer server,
       silc_server_check_watcher_list(server, detached_client, NULL,
                                     SILC_NOTIFY_TYPE_UMODE_CHANGE);
 
-    /* Delete this current client entry since we're resuming to old one. */
-    server->stat.my_clients--;
+    /* Delete this current client entry since we're resuming to old one.
+       We decrement clients/cell_clients as we are getting rid of the
+       current client and replacing it with the detached one.  We keep the
+       server user count as-is (incremented by the current client entry) as
+       we decremented the count already during detach, thus we'd be undoing
+       that operation. */
     SILC_VERIFY(server->stat.clients > 0);
     server->stat.clients--;
     if (server->stat.cell_clients)