1 files changed, 13 insertions, 7 deletions

diff --git a/dht/ToxManager.hs b/dht/ToxManager.hs
index 25a4f0f2..126efa36 100644
--- a/dht/ToxManager.hs
+++ b/dht/ToxManager.hs
@@ -134,7 +134,8 @@ toxman ssvar announcer tox presence = ToxManager
                                      toxAnnounceInterval)
                      pub
 
-            forkAccountWatcher ssvar
+            forkIO $ do
+                accountWatcher ssvar
                                (TCP.tcpClient $ tcpKademliaClient $ toxOnionRoutes tox)
                                acnt
                                tox
@@ -155,6 +156,11 @@ toxman ssvar announcer tox presence = ToxManager
                 -- Remove this xmpp client /k/ from the set holding this
                 -- account active.
                 modifyTVar' (accountExtra acnt) $ Map.delete k
+                is_last <- Map.null <$> readTVar (accountExtra acnt)
+                when is_last $ do
+                    -- Forget secret key if this was the last client.
+                    -- This ensures that incoming connections are rejected.
+                    modifyTVar' accounts $ HashMap.delete pubid
             return rs
         return $
             if (Map.null $ Map.delete k refs) then
@@ -165,7 +171,7 @@ toxman ssvar announcer tox presence = ToxManager
            let Just pubid = mpubid
                pub        = Tox.id2key pubid
            -- Stop the announce-toxid task for this account.  Note that other
-           -- announced tasks will be stopped by the forkAccountWatcher thread
+           -- announced tasks will be stopped by the accountWatcher thread
            -- when it terminates.
            cancel announcer akey
 
@@ -705,12 +711,12 @@ closeSessions me them ssvar = do
         -- Just True <- checkCompatible ag (id2key me) (id2key them)
         closeAll ag
 
-forkAccountWatcher :: TVar (Map.Map Uniq24 AggregateSession)
+accountWatcher :: TVar (Map.Map Uniq24 AggregateSession)
                       -> TCP.RelayClient
-                      -> Account JabberClients -> Tox JabberClients -> PresenceState Pending -> Announcer -> IO ThreadId
-forkAccountWatcher ssvar tcp acc tox st announcer = forkIO $ do
+                      -> Account JabberClients -> Tox JabberClients -> PresenceState Pending -> Announcer -> IO ()
+accountWatcher ssvar tcp acc tox st announcer = do
     let me = key2id $ toPublic $ userSecret acc
-    dput XMan $ "forkAccountWatcher(" ++ show me ++") started"
+    dput XMan $ "accountWatcher(" ++ show me ++") started"
     myThreadId >>= flip labelThread ("online:"
                                       ++ show (key2id $ toPublic $ userSecret acc))
     (chan,cs) <- atomically $ do
@@ -743,7 +749,7 @@ forkAccountWatcher ssvar tcp acc tox st announcer = forkIO $ do
     forM_ (HashMap.toList cs) $ \(them,c) -> do
         stopConnecting tx (id2key them) "disabled account"
         closeSessions me them ssvar
-    dput XMan $ "forkAccountWatcher(" ++ show me ++") stopped"
+    dput XMan $ "accountWatcher(" ++ show me ++") stopped"
 
 
 toxAnnounceInterval :: POSIXTime