Changeset 6379 for trunk/rms

Timestamp:

07/01/08 06:46:31 (5 months ago)

Author:

flynd

Message:

Use the new DropOwner? function to properly specify which owner to unlock.

Files:

• trunk/rms/src/rms.cpp (modified) (6 diffs)

trunk/rms/src/rms.cpp

@@ -677 +677 @@
     case STATE_PASSWORD:
     {
-      ICQOwner *o = gUserManager.FetchOwner(LOCK_R);
+      ICQOwner* o = gUserManager.FetchOwner(LICQ_PPID, LOCK_R);
       if (o == NULL)
         return -1;
@@ -687 +687 @@
       if (!ok)
       {
-        gUserManager.DropOwner();
+        gUserManager.DropOwner(o);
         gLog.Info("%sClient failed validation from %s.\n", L_RMSxSTR,
            sock.RemoteIpStr(buf));
@@ -699 +699 @@
          o->GetAlias());
       fflush(fs);
-      gUserManager.DropOwner();
+      gUserManager.DropOwner(o);
       m_nState = STATE_COMMAND;
       break;
@@ -849 +849 @@
       {
         fprintf(fs, "%d %s %s %s\n", CODE_STATUS, o->IdString(), (*it)->Name(), o->StatusStr());
-        gUserManager.DropOwner((*it)->PPID());
+        gUserManager.DropOwner(o);
       }
     }
@@ -903 +903 @@
     ICQOwner *o = gUserManager.FetchOwner(nPPID, LOCK_R);
     bool b = o->StatusOffline();
-    gUserManager.DropOwner(nPPID);
+    gUserManager.DropOwner(o);
     unsigned long tag = 0;
     if (b)
@@ -1288 +1288 @@
     ICQOwner *o = gUserManager.FetchOwner(m_nPPID, LOCK_W);
     o->SetAutoResponse(m_szText);
-    gUserManager.DropOwner();
+    gUserManager.DropOwner(o);
   }
   else