Apply Tizen C++ coding style to Access Control 95/64395/4
authorSomin Kim <somin926.kim@samsung.com>
Fri, 1 Apr 2016 02:47:25 +0000 (11:47 +0900)
committerSomin Kim <somin926.kim@samsung.com>
Fri, 1 Apr 2016 07:12:09 +0000 (16:12 +0900)
Change-Id: Ieb065f8f088a87cb616dd4057a418be97e25cd58
Signed-off-by: Somin Kim <somin926.kim@samsung.com>
18 files changed:
src/ClientRequest.cpp
src/ClientRequest.h
src/DBusServer.cpp
src/Request.cpp
src/Request.h
src/access_control/PeerCreds.cpp [new file with mode: 0644]
src/access_control/PeerCreds.h [new file with mode: 0644]
src/access_control/Privilege.cpp [new file with mode: 0644]
src/access_control/Privilege.h [new file with mode: 0644]
src/access_control/peer_creds.cpp [deleted file]
src/access_control/peer_creds.h [deleted file]
src/access_control/privilege.cpp [deleted file]
src/access_control/privilege.h [deleted file]
src/context_mgr_impl.cpp
src/context_mgr_impl.h
src/provider.cpp
src/provider.h
src/trigger/ContextMonitor.cpp

index 8af07e5b7eaf6c2ed9422688ae0876d7e7a78250..6bd1e8a674b4e621a559c59cffdace512cb20a74 100644 (file)
 #include <app_manager.h>
 #include <types_internal.h>
 #include "DBusServer.h"
-#include "access_control/peer_creds.h"
+#include "access_control/PeerCreds.h"
 #include "ClientRequest.h"
 
 ctx::ClientRequest::ClientRequest(int type, int reqId, const char *subj, const char *desc,
-               ctx::credentials *creds, const char *sender, GDBusMethodInvocation *inv) :
+               ctx::Credentials *creds, const char *sender, GDBusMethodInvocation *inv) :
        RequestInfo(type, reqId, subj, desc),
        __credentials(creds),
        __dbusSender(sender),
@@ -39,7 +39,7 @@ ctx::ClientRequest::~ClientRequest()
        delete __credentials;
 }
 
-const ctx::credentials* ctx::ClientRequest::getCredentials()
+const ctx::Credentials* ctx::ClientRequest::getCredentials()
 {
        return __credentials;
 }
@@ -47,7 +47,7 @@ const ctx::credentials* ctx::ClientRequest::getCredentials()
 const char* ctx::ClientRequest::getPackageId()
 {
        if (__credentials)
-               return __credentials->package_id;
+               return __credentials->packageId;
 
        return NULL;
 }
index db7480a172c7a2e47c958f6c80cef4d687170954..69d18e1246eae655b51b8cf2fd22a6a359e64189 100644 (file)
@@ -25,10 +25,10 @@ namespace ctx {
        class ClientRequest : public RequestInfo {
        public:
                ClientRequest(int type, int reqId, const char *subj, const char *desc,
-                               credentials *creds, const char *sender, GDBusMethodInvocation *inv);
+                               Credentials *creds, const char *sender, GDBusMethodInvocation *inv);
                ~ClientRequest();
 
-               const credentials* getCredentials();
+               const Credentials* getCredentials();
                const char* getPackageId();
                const char* getClient();
                bool reply(int error);
@@ -37,7 +37,7 @@ namespace ctx {
                bool publish(int error, ctx::Json &data);
 
        private:
-               credentials *__credentials;
+               Credentials *__credentials;
                std::string __dbusSender;
                GDBusMethodInvocation *__invocation;
        };
index c7b85c977a6400cbe73734e9a3714e7fee300514..e9a1d77bc6792fd9f953de98f1bc27071c7d75f6 100644 (file)
@@ -20,7 +20,7 @@
 #include <types_internal.h>
 #include "server.h"
 #include "ClientRequest.h"
-#include "access_control/peer_creds.h"
+#include "access_control/PeerCreds.h"
 #include "DBusServer.h"
 
 using namespace ctx;
@@ -69,7 +69,7 @@ void DBusServer::__processRequest(const char *sender, GVariant *param, GDBusMeth
        _I("[%d] ReqId: %d, Subject: %s", reqType, reqId, subject);
        _SI("Input: %s", input);
 
-       credentials *creds = NULL;
+       Credentials *creds = NULL;
 
        if (!peer_creds::get(__connection, sender, &creds)) {
                _E("Peer credentialing failed");
index 0a7fd4e4e1700f03cf5ef7e95ad2fc47f7d1742a..cac54e6422d756b19393ad07b8d392ccb4a1af0c 100644 (file)
@@ -40,7 +40,7 @@ int ctx::RequestInfo::getId()
        return _reqId;
 }
 
-const ctx::credentials* ctx::RequestInfo::getCredentials()
+const ctx::Credentials* ctx::RequestInfo::getCredentials()
 {
        return NULL;
 }
index 261244e0c327af6827afc1ed2487e46b5606a7d4..7225fc1b694718ca6b01577eb3752075bb88b271 100644 (file)
@@ -23,7 +23,7 @@
 namespace ctx {
 
        /* Forward declaration */
-       class credentials;
+       class Credentials;
 
        class RequestInfo {
        public:
@@ -35,7 +35,7 @@ namespace ctx {
                const char* getSubject();
                ctx::Json& getDescription();
 
-               virtual const credentials* getCredentials();
+               virtual const Credentials* getCredentials();
                virtual const char* getPackageId();
                /* TODO: remove this getClient() */
                virtual const char* getClient();
diff --git a/src/access_control/PeerCreds.cpp b/src/access_control/PeerCreds.cpp
new file mode 100644 (file)
index 0000000..2459862
--- /dev/null
@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <cynara-creds-gdbus.h>
+#include <cynara-session.h>
+#include <app_manager.h>
+#include <package_manager.h>
+#include <types_internal.h>
+#include "PeerCreds.h"
+
+ctx::Credentials::Credentials(char *_packageId, char *_client, char *_session, char *_user) :
+       packageId(_packageId),
+       client(_client),
+       session(_session),
+       user(_user)
+{
+}
+
+ctx::Credentials::~Credentials()
+{
+       g_free(packageId);
+       g_free(client);
+       g_free(session);
+       g_free(user);
+}
+
+bool ctx::peer_creds::get(GDBusConnection *connection, const char *uniqueName, ctx::Credentials **creds)
+{
+       pid_t pid = 0;
+       char *app_id = NULL;
+       char *packageId = NULL;
+       gchar *client = NULL;
+       char *session = NULL;
+       gchar *user = NULL;
+       int err;
+
+       err = cynara_creds_gdbus_get_pid(connection, uniqueName, &pid);
+       IF_FAIL_RETURN_TAG(err == CYNARA_API_SUCCESS, false, _E, "Peer credentialing failed");
+
+       app_manager_get_app_id(pid, &app_id);
+       package_manager_get_package_id_by_app_id(app_id, &packageId);
+       _D("AppId: %s, PackageId: %s", app_id, packageId);
+
+       err = cynara_creds_gdbus_get_client(connection, uniqueName, CLIENT_METHOD_DEFAULT, &client);
+       IF_FAIL_CATCH_TAG(err == CYNARA_API_SUCCESS, _E, "Peer credentialing failed");
+
+       session = cynara_session_from_pid(pid);
+       IF_FAIL_CATCH_TAG(session, _E, "Peer credentialing failed");
+
+       err = cynara_creds_gdbus_get_user(connection, uniqueName, USER_METHOD_DEFAULT, &user);
+       IF_FAIL_CATCH_TAG(err == CYNARA_API_SUCCESS, _E, "Peer credentialing failed");
+
+       *creds = new(std::nothrow) Credentials(packageId, client, session, user);
+       IF_FAIL_CATCH_TAG(*creds, _E, "Memory allocation failed");
+
+       return true;
+
+CATCH:
+       g_free(app_id);
+       g_free(packageId);
+       g_free(client);
+       g_free(session);
+       g_free(user);
+       return false;
+}
diff --git a/src/access_control/PeerCreds.h b/src/access_control/PeerCreds.h
new file mode 100644 (file)
index 0000000..72634cf
--- /dev/null
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef _CONTEXT_PEER_CREDENTIALS_H_
+#define _CONTEXT_PEER_CREDENTIALS_H_
+
+#include <sys/types.h>
+#include <gio/gio.h>
+#include <string>
+
+namespace ctx {
+
+       class Credentials {
+       public:
+               char *packageId;
+               char *client;   /* default: smack label */
+               char *session;
+               char *user;             /* default: UID */
+               Credentials(char *_packageId, char *_client, char *_session, char *_user);
+               ~Credentials();
+       };
+
+       namespace peer_creds {
+
+               bool get(GDBusConnection *connection, const char *uniqueName, Credentials **creds);
+
+       }       /* namespace peer_creds */
+}      /* namespace ctx */
+
+#endif /* End of _CONTEXT_PEER_CREDENTIALS_H_ */
diff --git a/src/access_control/Privilege.cpp b/src/access_control/Privilege.cpp
new file mode 100644 (file)
index 0000000..d52a52e
--- /dev/null
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <string>
+#include <cynara-client.h>
+#include <types_internal.h>
+#include "PeerCreds.h"
+#include "Privilege.h"
+
+class PermissionChecker {
+private:
+       cynara *__cynara;
+
+       PermissionChecker()
+       {
+               if (cynara_initialize(&__cynara, NULL) != CYNARA_API_SUCCESS) {
+                       _E("Cynara initialization failed");
+                       __cynara = NULL;
+                       return;
+               }
+               _I("Cynara initialized");
+       }
+
+       ~PermissionChecker()
+       {
+               if (__cynara)
+                       cynara_finish(__cynara);
+
+               _I("Cynara deinitialized");
+       }
+
+public:
+       static PermissionChecker& getInstance()
+       {
+               static PermissionChecker instance;
+               return instance;
+       }
+
+       bool hasPermission(const ctx::Credentials *creds, const char *privilege)
+       {
+               IF_FAIL_RETURN_TAG(__cynara, false, _E, "Cynara not initialized");
+               int ret = cynara_check(__cynara, creds->client, creds->session, creds->user, privilege);
+               return (ret == CYNARA_API_ACCESS_ALLOWED);
+       }
+};
+
+bool ctx::privilege_manager::isAllowed(const ctx::Credentials *creds, const char *privilege)
+{
+       IF_FAIL_RETURN(creds && privilege, true);
+
+       std::string priv = "http://tizen.org/privilege/";
+       priv += privilege;
+
+       return PermissionChecker::getInstance().hasPermission(creds, priv.c_str());
+}
diff --git a/src/access_control/Privilege.h b/src/access_control/Privilege.h
new file mode 100644 (file)
index 0000000..53251c0
--- /dev/null
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef _CONTEXT_PRIVILEGE_MANAGER_H_
+#define _CONTEXT_PRIVILEGE_MANAGER_H_
+
+#include <string>
+
+#define PRIV_ALARM_SET "alarm.set"
+
+namespace ctx {
+
+       /* Forward declaration */
+       class Credentials;
+
+       namespace privilege_manager {
+
+               bool isAllowed(const Credentials *creds, const char *privilege);
+
+       }       /* namespace privilege_manager */
+}      /* namespace ctx */
+
+#endif /* End of _CONTEXT_PRIVILEGE_MANAGER_H_ */
diff --git a/src/access_control/peer_creds.cpp b/src/access_control/peer_creds.cpp
deleted file mode 100644 (file)
index 5d42a81..0000000
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <cynara-creds-gdbus.h>
-#include <cynara-session.h>
-#include <app_manager.h>
-#include <package_manager.h>
-#include <types_internal.h>
-#include "peer_creds.h"
-
-ctx::credentials::credentials(char *_package_id, char *_client, char *_session, char *_user) :
-       package_id(_package_id),
-       client(_client),
-       session(_session),
-       user(_user)
-{
-}
-
-ctx::credentials::~credentials()
-{
-       g_free(package_id);
-       g_free(client);
-       g_free(session);
-       g_free(user);
-}
-
-bool ctx::peer_creds::get(GDBusConnection *connection, const char *unique_name, ctx::credentials **creds)
-{
-       pid_t pid = 0;
-       char *app_id = NULL;
-       char *package_id = NULL;
-       gchar *client = NULL;
-       char *session = NULL;
-       gchar *user = NULL;
-       int err;
-
-       err = cynara_creds_gdbus_get_pid(connection, unique_name, &pid);
-       IF_FAIL_RETURN_TAG(err == CYNARA_API_SUCCESS, false, _E, "Peer credentialing failed");
-
-       app_manager_get_app_id(pid, &app_id);
-       package_manager_get_package_id_by_app_id(app_id, &package_id);
-       _D("AppId: %s, PackageId: %s", app_id, package_id);
-
-       err = cynara_creds_gdbus_get_client(connection, unique_name, CLIENT_METHOD_DEFAULT, &client);
-       IF_FAIL_CATCH_TAG(err == CYNARA_API_SUCCESS, _E, "Peer credentialing failed");
-
-       session = cynara_session_from_pid(pid);
-       IF_FAIL_CATCH_TAG(session, _E, "Peer credentialing failed");
-
-       err = cynara_creds_gdbus_get_user(connection, unique_name, USER_METHOD_DEFAULT, &user);
-       IF_FAIL_CATCH_TAG(err == CYNARA_API_SUCCESS, _E, "Peer credentialing failed");
-
-       *creds = new(std::nothrow) credentials(package_id, client, session, user);
-       IF_FAIL_CATCH_TAG(*creds, _E, "Memory allocation failed");
-
-       return true;
-
-CATCH:
-       g_free(app_id);
-       g_free(package_id);
-       g_free(client);
-       g_free(session);
-       g_free(user);
-       return false;
-}
diff --git a/src/access_control/peer_creds.h b/src/access_control/peer_creds.h
deleted file mode 100644 (file)
index 4be8167..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __CONTEXT_PEER_CREDENTIALS_H__
-#define __CONTEXT_PEER_CREDENTIALS_H__
-
-#include <sys/types.h>
-#include <gio/gio.h>
-#include <string>
-
-namespace ctx {
-
-       class credentials {
-       public:
-               char *package_id;
-               char *client;   /* default: smack label */
-               char *session;
-               char *user;             /* default: UID */
-               credentials(char *_package_id, char *_client, char *_session, char *_user);
-               ~credentials();
-       };
-
-       namespace peer_creds {
-               bool get(GDBusConnection *connection, const char *unique_name, credentials **creds);
-       }
-}      /* namespace ctx */
-
-#endif /* End of __CONTEXT_PEER_CREDENTIALS_H__ */
diff --git a/src/access_control/privilege.cpp b/src/access_control/privilege.cpp
deleted file mode 100644 (file)
index a0951d9..0000000
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <string>
-#include <cynara-client.h>
-#include <types_internal.h>
-#include "peer_creds.h"
-#include "privilege.h"
-
-class permission_checker {
-private:
-       cynara *__cynara;
-
-       permission_checker()
-       {
-               if (cynara_initialize(&__cynara, NULL) != CYNARA_API_SUCCESS) {
-                       _E("Cynara initialization failed");
-                       __cynara = NULL;
-                       return;
-               }
-               _I("Cynara initialized");
-       }
-
-       ~permission_checker()
-       {
-               if (__cynara)
-                       cynara_finish(__cynara);
-
-               _I("Cynara deinitialized");
-       }
-
-public:
-       static permission_checker& get_instance()
-       {
-               static permission_checker instance;
-               return instance;
-       }
-
-       bool has_permission(const ctx::credentials *creds, const char *privilege)
-       {
-               IF_FAIL_RETURN_TAG(__cynara, false, _E, "Cynara not initialized");
-               int ret = cynara_check(__cynara, creds->client, creds->session, creds->user, privilege);
-               return (ret == CYNARA_API_ACCESS_ALLOWED);
-       }
-};
-
-bool ctx::privilege_manager::is_allowed(const ctx::credentials *creds, const char *privilege)
-{
-       IF_FAIL_RETURN(creds && privilege, true);
-
-       std::string priv = "http://tizen.org/privilege/";
-       priv += privilege;
-
-       return permission_checker::get_instance().has_permission(creds, priv.c_str());
-}
diff --git a/src/access_control/privilege.h b/src/access_control/privilege.h
deleted file mode 100644 (file)
index bd6730c..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __CONTEXT_PRIVILEGE_MANAGER_H__
-#define __CONTEXT_PRIVILEGE_MANAGER_H__
-
-#include <string>
-
-#define PRIV_ALARM_SET "alarm.set"
-
-namespace ctx {
-
-       /* Forward declaration */
-       class credentials;
-
-       namespace privilege_manager {
-
-               bool is_allowed(const credentials *creds, const char *privilege);
-
-       }       /* namespace ctx::privilege_manager */
-}      /* namespace ctx */
-
-#endif /* End of __CONTEXT_PRIVILEGE_MANAGER_H__ */
index 66331cbfab7e41979c318682b7c2504c704dd7eb..cd78e9bc3a23b9fa821672c031f631644b2a66df 100644 (file)
@@ -22,7 +22,7 @@
 #include <Json.h>
 #include <provider_iface.h>
 #include "server.h"
-#include "access_control/privilege.h"
+#include "access_control/Privilege.h"
 #include "Request.h"
 #include "provider.h"
 #include "context_mgr_impl.h"
@@ -230,7 +230,7 @@ bool ctx::context_manager_impl::is_supported(const char *subject)
        return (it != provider_handle_map.end());
 }
 
-bool ctx::context_manager_impl::is_allowed(const ctx::credentials *creds, const char *subject)
+bool ctx::context_manager_impl::is_allowed(const ctx::Credentials *creds, const char *subject)
 {
        IF_FAIL_RETURN(creds, true);    /* In case internal requests */
        auto it = provider_handle_map.find(subject);
index 65048e71630678dbcf09f71966addd571f2e694b..90785f5174efd1dad90c9a73fd0e599962f020b3 100644 (file)
@@ -26,7 +26,7 @@
 namespace ctx {
 
        /* Forward declaration */
-       class credentials;
+       class Credentials;
        class RequestInfo;
        class context_provider_handler;
 
@@ -40,7 +40,7 @@ namespace ctx {
 
                void assign_request(ctx::RequestInfo *request);
                bool is_supported(const char *subject);
-               bool is_allowed(const credentials *creds, const char *subject);
+               bool is_allowed(const Credentials *creds, const char *subject);
                bool pop_trigger_item(std::string &subject, int &operation, ctx::Json &attributes, ctx::Json &options, std::string &owner, bool& unregister);
 
                /* From the interface class */
index 4861926416a6a420f8c90f6573600231b8ade491..6511b72e2fe3cd041c8462cc5928b69ebaf92139 100644 (file)
@@ -17,7 +17,7 @@
 #include <glib.h>
 #include <types_internal.h>
 #include <Json.h>
-#include "access_control/privilege.h"
+#include "access_control/Privilege.h"
 #include "server.h"
 #include "Request.h"
 #include "provider.h"
@@ -43,10 +43,10 @@ ctx::context_provider_handler::~context_provider_handler()
        provider_info.destroy(provider_info.data);
 }
 
-bool ctx::context_provider_handler::is_allowed(const ctx::credentials *creds)
+bool ctx::context_provider_handler::is_allowed(const ctx::Credentials *creds)
 {
        IF_FAIL_RETURN(creds, true);    /* In case of internal requests */
-       return privilege_manager::is_allowed(creds, provider_info.privilege);
+       return privilege_manager::isAllowed(creds, provider_info.privilege);
 }
 
 ctx::context_provider_iface* ctx::context_provider_handler::get_provider(ctx::RequestInfo *request)
index a5b22cefb49156ec9098880569d1aaff14aacbfe..0d4a8e0255ca673fb8a358de1c52581c29a1c164 100644 (file)
@@ -24,7 +24,7 @@
 namespace ctx {
 
        class Json;
-       class credentials;
+       class Credentials;
        class RequestInfo;
 
        class context_provider_handler {
@@ -34,7 +34,7 @@ namespace ctx {
                context_provider_handler(const char *subj, context_provider_info &prvd);
                ~context_provider_handler();
 
-               bool is_allowed(const credentials *creds);
+               bool is_allowed(const Credentials *creds);
 
                void subscribe(RequestInfo *request);
                void unsubscribe(RequestInfo *request);
index 368d3f9c9b7b860d83dcd486f7decbb3608cbcd6..9037143557b8fbf4a58bd60fcb8b25c0b981d9aa 100644 (file)
@@ -15,7 +15,7 @@
  */
 
 #include <types_internal.h>
-#include "../access_control/privilege.h"
+#include "../access_control/Privilege.h"
 #include "../context_mgr_impl.h"
 #include "ContextMonitor.h"
 #include "IContextListener.h"