Update a condition to do ownership transfer in easy setup
authorParkhi <h_w.park@samsung.com>
Wed, 21 Sep 2016 04:27:50 +0000 (13:27 +0900)
committerMadan Lanka <lanka.madan@samsung.com>
Wed, 21 Sep 2016 14:18:16 +0000 (14:18 +0000)
In case that Only mediator's PDM db is deleted, ownership transfer SHOULD
be terminated.

Change-Id: I6513da5fb1bd56e7fb132da94fa6be40dbe2d7f6
Signed-off-by: Parkhi <h_w.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12003
Reviewed-by: Jihun Ha <jihun.ha@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
service/easy-setup/mediator/richsdk/src/EnrolleeSecurity.cpp

index 1db5dfba18f3cf154805a4ddbdf6d9aadbac422b..7768e7c3742683336835d359cf34950cd0cb31ce 100755 (executable)
@@ -154,7 +154,16 @@ namespace OIC
 
                 if (ownedDevice)
                 {
-                    res = ESResult::ES_OK;
+                    if (isOwnedDeviceRegisteredInSVRDB())
+                    {
+                        res = ESResult::ES_OK;
+                    }
+                    else
+                    {
+                        OIC_LOG(ERROR, ENROLEE_SECURITY_TAG,
+                                "The found owned device is not in Mediator's PDM.");
+                        res = ESResult::ES_ERROR;
+                    }
                     return res;
                 }
             }