From 2039ad9f9e0ea3c3cdd24a8ce755b912680f79d1 Mon Sep 17 00:00:00 2001 From: Jongmin Choi Date: Mon, 9 Jan 2017 09:31:16 +0900 Subject: [PATCH] Modify CreateResetProfile() to preserve the original profile CreateResetProfile() modified to preserve the original profile created at first Patch #1: Initial upload Change-Id: I3420d83a8c8a8b17f947dd244bb03ce7926159bb Signed-off-by: Jongmin Choi Reviewed-on: https://gerrit.iotivity.org/gerrit/16237 Tested-by: jenkins-iotivity Reviewed-by: Randeep Singh (cherry picked from commit 3b065c39527b8d98b3a53c5762e1b1281e2003c1) Reviewed-on: https://gerrit.iotivity.org/gerrit/17145 --- resource/csdk/security/src/psinterface.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/resource/csdk/security/src/psinterface.c b/resource/csdk/security/src/psinterface.c index 3a8518e..eec45af 100644 --- a/resource/csdk/security/src/psinterface.c +++ b/resource/csdk/security/src/psinterface.c @@ -639,6 +639,15 @@ OCStackResult CreateResetProfile(void) cbor_parser_init(dbData, dbSize, 0, &parser, &cbor); CborValue curVal = {0}; CborError cborFindResult = CborNoError; + + // abort if reset profile exists + cborFindResult = cbor_value_map_find_value(&cbor, OIC_JSON_RESET_PF_NAME, &curVal); + if (CborNoError == cborFindResult && cbor_value_is_byte_string(&curVal)) + { + OIC_LOG(DEBUG, TAG, "Reset Profile already exists!!"); + return ret; + } + cborFindResult = cbor_value_map_find_value(&cbor, OIC_JSON_ACL_NAME, &curVal); if (CborNoError == cborFindResult && cbor_value_is_byte_string(&curVal)) { -- 2.7.4