Fixed sample error due to wrong ACL setting

Sampleserver deny for PUT rquest, because PUT permission is not set in SVR_DB file.

Patch 1: Upload patch.

Change-Id: Ia033ca3a52535bb49954ba8b17e1684047ada768
Signed-off-by: js126.lee <js126.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15691
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit 480fd1b289112459c59e47b11a4b9df5517e4297)
Reviewed-on: https://gerrit.iotivity.org/gerrit/15741

diff --git a/resource/csdk/stack/samples/linux/secure/oic_svr_db_server.dat b/resource/csdk/stack/samples/linux/secure/oic_svr_db_server.dat
index c48d813..a50a65a 100644 (file)
Binary files a/resource/csdk/stack/samples/linux/secure/oic_svr_db_server.dat and b/resource/csdk/stack/samples/linux/secure/oic_svr_db_server.dat differ

diff --git a/resource/csdk/stack/samples/linux/secure/oic_svr_db_server.json b/resource/csdk/stack/samples/linux/secure/oic_svr_db_server.json
index 52004cb..8d52f5c 100644 (file)
--- a/resource/csdk/stack/samples/linux/secure/oic_svr_db_server.json
+++ b/resource/csdk/stack/samples/linux/secure/oic_svr_db_server.json
@@ -54,19 +54,13 @@
                     "subjectuuid": "32323232-3232-3232-3232-323232323232",\r
                     "resources": [\r
                         {\r
-                            "href": "/oic/sec/acl",\r
-                            "rel": "",\r
-                            "rt": ["oic.r.acl"],\r
-                            "if": ["oic.if.baseline"]\r
-                        },\r
-                        {\r
-                            "href": "/oic/sec/cred",\r
+                            "href": "*",\r
                             "rel": "",\r
-                            "rt": ["oic.r.cred"],\r
-                            "if": ["oic.if.baseline"]\r
+                            "rt": ["*"],\r
+                            "if": ["*"]\r
                         }\r
                     ],\r
-                    "permission": 8\r
+                    "permission": 7\r
                 },\r
                 {\r
                     "subjectuuid": "31393139-3139-3139-3139-313931393139",\r
@@ -78,7 +72,7 @@
                             "if": ["oic.if.baseline"]\r
                         }\r
                     ],\r
-                    "permission": 6\r
+                    "permission": 7\r
                 },\r
                 {\r
                     "subjectuuid": "37373737-3737-3737-3737-373737373737",\r

diff --git a/resource/examples/oic_svr_db_server.dat b/resource/examples/oic_svr_db_server.dat
index d35ad18..138b960 100644 (file)
Binary files a/resource/examples/oic_svr_db_server.dat and b/resource/examples/oic_svr_db_server.dat differ

diff --git a/resource/examples/oic_svr_db_server.json b/resource/examples/oic_svr_db_server.json
index b425999..f6d3dca 100644 (file)
--- a/resource/examples/oic_svr_db_server.json
+++ b/resource/examples/oic_svr_db_server.json
@@ -60,7 +60,7 @@
                             "if": ["oic.if.baseline"]\r
                         }\r
                     ],\r
-                    "permission": 6\r
+                    "permission": 7\r
                 }\r
             ]\r
         },\r