From: Michael J. Rubinsky <mrubinsk@horde.org>
Date: Tue, 30 Mar 2010 13:49:06 +0000 (-0400)
Subject: Make sure we recognize that a policykey of zero means device is not provisioned.
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=db1a3aead8c8d86e659b9dfc62c9dc48a8fd5a45;p=horde.git

Make sure we recognize that a policykey of zero means device is not provisioned.
---

diff --git a/framework/ActiveSync/lib/Horde/ActiveSync/Request/Base.php b/framework/ActiveSync/lib/Horde/ActiveSync/Request/Base.php
index 7987dc54d..74f7fb134 100644
--- a/framework/ActiveSync/lib/Horde/ActiveSync/Request/Base.php
+++ b/framework/ActiveSync/lib/Horde/ActiveSync/Request/Base.php
@@ -82,8 +82,6 @@ abstract class Horde_ActiveSync_Request_Base
      * @param Horde_ActiveSync_Wbxml_Decoder $decoder    The Wbxml decoder
      * @param Horde_ActiveSync_Wbxml_Endcodder $encdoer  The Wbxml encoder
      * @param Horde_Controller_Request_Http $request     The request object
-     * @param string $version                            ActiveSync version
-     * @param string $devId                              The PIM device id
      * @param string $provisioning                       Is provisioning required?
      *
      * @return Horde_ActiveSync
@@ -121,7 +119,7 @@ abstract class Horde_ActiveSync_Request_Base
             $state = $this->_driver->getStateObject();
             $storedKey = $state->getPolicyKey($this->_devId);
             /* Loose provsioning should allow a blank key */
-            if ($storedKey != $sentKey &&
+            if (($storedKey == 0 || $storedKey != $sentKey) &&
                ($this->_provisioning !== 'loose' ||
                ($this->_provisioning === 'loose' && !empty($this->_policyKey)))) {