[CalendarServer-changes] [4106] PyOpenDirectory/trunk/src/CDirectoryServiceAuth.cpp

[source_changes at macosforge.org]

Revision: 4106
          http://trac.macosforge.org/projects/calendarserver/changeset/4106
Author:   cdaboo at apple.com
Date:     2009-04-28 20:32:22 -0700 (Tue, 28 Apr 2009)
Log Message:
-----------
Make sure that we clear out cached DS objects if there is a fatal error during authentication.

Modified Paths:
--------------
    PyOpenDirectory/trunk/src/CDirectoryServiceAuth.cpp

Modified: PyOpenDirectory/trunk/src/CDirectoryServiceAuth.cpp
===================================================================
--- PyOpenDirectory/trunk/src/CDirectoryServiceAuth.cpp	2009-04-29 02:02:39 UTC (rev 4105)
+++ PyOpenDirectory/trunk/src/CDirectoryServiceAuth.cpp	2009-04-29 03:32:22 UTC (rev 4106)
@@ -158,6 +158,12 @@
         ::dsDataNodeDeAllocate(mDir, authType);
         authType = NULL;
         RemoveBuffer();
+
+		// If fatal error, force full reset
+		if (not result and (dirStatus != eDSAuthFailed))
+		{
+			CloseService();
+		}
     }
     catch(...)
     {
@@ -241,6 +247,12 @@
         ::dsDataNodeDeAllocate(mDir, authType);
         authType = NULL;
         RemoveBuffer();
+
+		// If fatal error, force full reset
+		if (not result and (dirStatus != eDSAuthFailed))
+		{
+			CloseService();
+		}
     }
     catch(...)
     {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20090428/8e0ab5cc/attachment.html>