Update snapshot(2018-02-21)

Change-Id: If48db62676078c273b7e10feb9a4cc67f8307453
Signed-off-by: Amit <amit.s12@samsung.com>

diff --git a/packaging/snapshot_history.txt b/packaging/snapshot_history.txt
index 088559d..c921699 100755 (executable)
--- a/packaging/snapshot_history.txt
+++ b/packaging/snapshot_history.txt
@@ -1,3 +1,9 @@
+http://suprem.sec.samsung.net/jira/browse/CONPRO-1237
+
+commit_info_2018-02-21.txt
+
+commit_id: aa7649f561c5e2d806aa4bd6aa94d258da6f7433 
+----------------------------------------------------------------------------------------------------------------------------------
 http://suprem.sec.samsung.net/jira/browse/CONPRO-1230
 
 commit_info_2018-02-14.txt

diff --git a/resource/csdk/security/src/credresource.c b/resource/csdk/security/src/credresource.c
index 34fc6f4..ad0e8b7 100644 (file)
--- a/resource/csdk/security/src/credresource.c
+++ b/resource/csdk/security/src/credresource.c
@@ -2362,8 +2362,11 @@ exit:
 OCStackResult DeInitCredResource()
 {
     OCStackResult result = OCDeleteResource(gCredHandle);
-    DeleteCredList(gCred);
-    gCred = NULL;
+    gCredHandle = NULL;
+    if(gCred){
+        DeleteCredList(gCred);
+        gCred = NULL;
+    }
     return result;
 }
 

diff --git a/resource/csdk/security/src/doxmresource.c b/resource/csdk/security/src/doxmresource.c
index 6ee4b26..999c016 100644 (file)
--- a/resource/csdk/security/src/doxmresource.c
+++ b/resource/csdk/security/src/doxmresource.c
@@ -1238,6 +1238,16 @@ static OCEntityHandlerResult HandleDoxmPostRequest(OCEntityHandlerRequest * ehRe
                     InvokeOtmEventHandler(ehRequest->devAddr.addr, ehRequest->devAddr.port,
                                           NULL, OIC_OTM_STARTED);
                 }
+                else
+                {
+                    OIC_LOG_V(INFO, TAG, "%s: request owner not empty",__func__);
+                    char* strUuid = NULL;
+                    if (OC_STACK_OK == ConvertUuidToStr(&newDoxm->owner, &strUuid))
+                    {
+                        OIC_LOG_V(INFO, TAG, "%s: request owner: %s",__func__, strUuid);
+                        OICFree(strUuid);
+                    }
+                }
 #endif
 
                 if (OIC_JUST_WORKS == newDoxm->oxmSel || OIC_MV_JUST_WORKS == newDoxm->oxmSel)

diff --git a/service/easy-setup/inc/escommon.h b/service/easy-setup/inc/escommon.h
old mode 100755 (executable)
new mode 100644 (file)
index e46664b..1ce4c1c
--- a/service/easy-setup/inc/escommon.h
+++ b/service/easy-setup/inc/escommon.h
@@ -339,6 +339,11 @@ typedef enum
     ES_STATE_FAILED_TO_PUBLISH_RESOURCES_TO_CLOUD,
 
     /**
+     * Status indicating aborted provisioning by enrollee
+     */
+    ES_STATE_ABORTED_PROVISIONING_BY_ENROLLEE,
+
+    /**
      * End of Easy setup status
      */
     ES_STATE_EOF = 255