Comments and defines changed to comply with new project name

Change-Id: Ie931b2a4d7f2c5d7fa688fbbd0b8f062cfb9a818
Signed-off-by: Jan Cybulski <j.cybulski@samsung.com>

diff --git a/src/server/client/client-common.h b/src/server/client/client-common.h
index 7569f2f249e8e6a18372736d85a21b7f3ed80d37..607e8d3dbc6a015230f87cc6340e630decf138a3 100644 (file)
--- a/src/server/client/client-common.h
+++ b/src/server/client/client-common.h
@@ -20,20 +20,19 @@
  * @author      Bartlomiej Grzelewski (b.grzelewski@samsung.com)
  * @version     1.0
  * @brief       This file constains implementation of common types
- *              used in security server.
+ *              used in security manager.
  */
 
-#ifndef _SECURITY_SERVER_CLIENT_
-#define _SECURITY_SERVER_CLIENT_
+#ifndef _SECURITY_MANAGER_CLIENT_
+#define _SECURITY_MANAGER_CLIENT_
 
 #include <vector>
 #include <functional>
 
 #include <message-buffer.h>
 
-#define SECURITY_SERVER_API __attribute__((visibility("default")))
 #define SECURITY_MANAGER_API __attribute__((visibility("default")))
-#define SECURITY_SERVER_UNUSED __attribute__((unused))
+#define SECURITY_MANAGER_UNUSED __attribute__((unused))
 
 extern "C" {
     struct msghdr;
@@ -47,13 +46,13 @@ int sendToServer(char const * const interface, const RawBuffer &send, MessageBuf
 
 /*
  * sendToServerAncData is special case when we want to receive file descriptor
- * passed by Security Server on behalf of calling process. We can't get it with
+ * passed by Security Manager on behalf of calling process. We can't get it with
  * MessageBuffer.
  *
  * This function should be called _ONLY_ in this particular case.
  *
  */
-int sendToServerAncData(char const * const interface, const RawBuffer &send, struct msghdr &hdr);
+int sendToManagerAncData(char const * const interface, const RawBuffer &send, struct msghdr &hdr);
 
 /*
  * Decorator function that performs frequently repeated exception handling in
@@ -63,4 +62,4 @@ int try_catch(const std::function<int()>& func);
 
 } // namespace SecurityManager
 
-#endif // _SECURITY_SERVER_CLIENT_
+#endif // _SECURITY_MANAGER_CLIENT_

diff --git a/src/server/common/message-buffer.h b/src/server/common/message-buffer.h
index ff115e0fb4e8b36302ee0ce5182198fe622079d7..71c89ed1da7be5576a266361c203ab3f3a14d1c9 100644 (file)
--- a/src/server/common/message-buffer.h
+++ b/src/server/common/message-buffer.h
@@ -22,8 +22,8 @@
  * @brief       Implementatin of MessageBuffer.
  */
 
-#ifndef _SECURITY_SERVER_SOCKET_BUFFER_
-#define _SECURITY_SERVER_SOCKET_BUFFER_
+#ifndef _SECURITY_MANAGER_SOCKET_BUFFER_
+#define _SECURITY_MANAGER_SOCKET_BUFFER_
 
 #include <vector>
 
@@ -76,4 +76,4 @@ protected:
 
 } // namespace SecurityManager
 
-#endif // _SECURITY_SERVER_SOCKET_BUFFER_
+#endif // _SECURITY_MANAGER_SOCKET_BUFFER_

diff --git a/src/server/common/protocols.cpp b/src/server/common/protocols.cpp
index 24bdae5c612284dc9d091eb5d2ea5232e8ca1e44..c12032780746ed3c5197a138c20e78891bfe03d4 100644 (file)
--- a/src/server/common/protocols.cpp
+++ b/src/server/common/protocols.cpp
@@ -19,7 +19,7 @@
  * @file        protocols.cpp
  * @author      Bartlomiej Grzelewski (b.grzelewski@samsung.com)
  * @version     1.0
- * @brief       List of all protocols supported by security server.
+ * @brief       List of all protocols supported by security manager.
  */
 
 #include <protocols.h>

diff --git a/src/server/common/protocols.h b/src/server/common/protocols.h
index ed1c5a6bd9d0c8cdbe4547166aef8fd37db8e365..85398e8011941057154a7baf46bf61b00f66e4f4 100644 (file)
--- a/src/server/common/protocols.h
+++ b/src/server/common/protocols.h
@@ -19,11 +19,11 @@
  * @file        protocols.h
  * @author      Bartlomiej Grzelewski (b.grzelewski@samsung.com)
  * @version     1.0
- * @brief       This file contains list of all protocols suported by security-sever.
+ * @brief       This file contains list of all protocols suported by security-manager.
  */
 
-#ifndef _SECURITY_SERVER_PROTOCOLS_
-#define _SECURITY_SERVER_PROTOCOLS_
+#ifndef _SECURITY_MANAGER_PROTOCOLS_
+#define _SECURITY_MANAGER_PROTOCOLS_
 
 #include <vector>
 #include <string>
@@ -48,4 +48,4 @@ enum class SecurityModuleCall
 
 } // namespace SecurityManager
 
-#endif // _SECURITY_SERVER_PROTOCOLS_
+#endif // _SECURITY_MANAGER_PROTOCOLS_

diff --git a/src/server/dpl/core/include/dpl/assert.h b/src/server/dpl/core/include/dpl/assert.h
index a02aac94e44154d2959b9952ff33595f1ab38efb..34daa4d3832d999f95e27dc4babfd4078260ae5a 100644 (file)
--- a/src/server/dpl/core/include/dpl/assert.h
+++ b/src/server/dpl/core/include/dpl/assert.h
@@ -19,8 +19,8 @@
  * @version     1.0
  * @brief       This file is the implementation file of assert
  */
-#ifndef SECURITY_SERVER_ASSERT_H
-#define SECURITY_SERVER_ASSERT_H
+#ifndef SECURITY_MANAGER_ASSERT_H
+#define SECURITY_MANAGER_ASSERT_H
 
 #include <dpl/noreturn.h>
 
@@ -28,7 +28,7 @@ namespace SecurityManager {
 // Assertion handler procedure
 // Do not call directly
 // Always use Assert macro
-SECURITYSERVER_NORETURN void AssertProc(const char *condition,
+SECURITYMANAGER_NORETURN void AssertProc(const char *condition,
                              const char *file,
                              int line,
                              const char *function);
@@ -40,4 +40,4 @@ SECURITYSERVER_NORETURN void AssertProc(const char *condition,
                                                                    __FUNCTION__); \
                                } } while (0)
 
-#endif // SECURITY_SERVER_ASSERT_H
+#endif // SECURITY_MANAGER_ASSERT_H

diff --git a/src/server/dpl/core/include/dpl/binary_queue.h b/src/server/dpl/core/include/dpl/binary_queue.h
index e0077124d0f833acfb52ef48e58abaa953cb3801..dd03f5ecdeb1ad8fd8b5975acbee5565452b7c44 100644 (file)
--- a/src/server/dpl/core/include/dpl/binary_queue.h
+++ b/src/server/dpl/core/include/dpl/binary_queue.h
@@ -19,8 +19,8 @@
  * @version     1.0
  * @brief       This file is the header file of binary queue
  */
-#ifndef SECURITY_SERVER_BINARY_QUEUE_H
-#define SECURITY_SERVER_BINARY_QUEUE_H
+#ifndef SECURITY_MANAGER_BINARY_QUEUE_H
+#define SECURITY_MANAGER_BINARY_QUEUE_H
 
 //#include <dpl/abstract_input_output.h>
 #include <dpl/exception.h>
@@ -295,4 +295,4 @@ class BinaryQueue
 
 } // namespace SecurityManager
 
-#endif // SECURITY_SERVER_BINARY_QUEUE_H
+#endif // SECURITY_MANAGER_BINARY_QUEUE_H

diff --git a/src/server/dpl/core/include/dpl/colors.h b/src/server/dpl/core/include/dpl/colors.h
index 69136d17c2299280ca4d9be04ffb177564479f58..d10f973be4c9d7571f1dc830f9fbb4c37409a7ff 100644 (file)
--- a/src/server/dpl/core/include/dpl/colors.h
+++ b/src/server/dpl/core/include/dpl/colors.h
@@ -21,8 +21,8 @@
  *              and html output
  */
 
-#ifndef SECURITY_SERVER_COLORS_H
-#define SECURITY_SERVER_COLORS_H
+#ifndef SECURITY_MANAGER_COLORS_H
+#define SECURITY_MANAGER_COLORS_H
 
 namespace SecurityManager {
 namespace Colors {
@@ -70,4 +70,4 @@ extern const char* BOLD_WHITE_END;
 } //namespace Colors
 } //namespace SecurityManager
 
-#endif /* SECURITY_SERVER_COLORS_H */
+#endif /* SECURITY_MANAGER_COLORS_H */

diff --git a/src/server/dpl/core/include/dpl/exception.h b/src/server/dpl/core/include/dpl/exception.h
index f9c2cf2ff445971a71e72421779484f5ca8bade8..2087102c978e5aa1444dea8895ab0e7073e92eca 100644 (file)
--- a/src/server/dpl/core/include/dpl/exception.h
+++ b/src/server/dpl/core/include/dpl/exception.h
@@ -19,8 +19,8 @@
  * @version 1.0
  * @brief   Header file for base exception
  */
-#ifndef SECURITY_SERVER_EXCEPTION_H
-#define SECURITY_SERVER_EXCEPTION_H
+#ifndef SECURITY_MANAGER_EXCEPTION_H
+#define SECURITY_MANAGER_EXCEPTION_H
 
 #include <string>
 #include <cstring>
@@ -94,7 +94,7 @@ class Exception
     {
         std::ostringstream message;
         message <<
-        "\033[1;5;31m\n=== Unhandled SecurityServer exception occurred ===\033[m\n\n";
+        "\033[1;5;31m\n=== Unhandled SecurityManager exception occurred ===\033[m\n\n";
         message << "\033[1;33mException trace:\033[m\n\n";
         message << e.DumpToString();
         message << "\033[1;31m\n=== Will now abort ===\033[m\n";
@@ -106,7 +106,7 @@ class Exception
     {
         std::ostringstream message;
         message <<
-        "\033[1;5;31m\n=== Unhandled non-SecurityServer exception occurred ===\033[m\n\n";
+        "\033[1;5;31m\n=== Unhandled non-SecurityManager exception occurred ===\033[m\n\n";
         message << "\033[1;31m\n=== Will now abort ===\033[m\n";
 
         return message.str();
@@ -382,4 +382,4 @@ DECLARE_EXCEPTION_TYPE(Exception, InternalError) ///< Unexpected error from
 }
 }
 
-#endif // SECURITY_SERVER_EXCEPTION_H
+#endif // SECURITY_MANAGER_EXCEPTION_H

diff --git a/src/server/dpl/core/include/dpl/fstream_accessors.h b/src/server/dpl/core/include/dpl/fstream_accessors.h
index 1c595b6355606dc2ad58b703f1f4c4235a5f3e40..141a4996a3b839d62e202a8679d10ded77250c74 100644 (file)
--- a/src/server/dpl/core/include/dpl/fstream_accessors.h
+++ b/src/server/dpl/core/include/dpl/fstream_accessors.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SECURITY_SERVER_FSTREAM_ACCESSORS_H
-#define SECURITY_SERVER_FSTREAM_ACCESSORS_H
+#ifndef SECURITY_MANAGER_FSTREAM_ACCESSORS_H
+#define SECURITY_MANAGER_FSTREAM_ACCESSORS_H
 
 namespace DPL {
 
@@ -45,4 +45,4 @@ public:
 
 } // namespace DPL
 
-#endif // SECURITY_SERVER_FSTREAM_ACCESSORS_H
+#endif // SECURITY_MANAGER_FSTREAM_ACCESSORS_H

diff --git a/src/server/dpl/core/include/dpl/noncopyable.h b/src/server/dpl/core/include/dpl/noncopyable.h
index 8f20bbc055689d26c2f024891cf5824d520b2f82..4d476a44a2e952fdb908d8b532dfb9e9afc110ae 100644 (file)
--- a/src/server/dpl/core/include/dpl/noncopyable.h
+++ b/src/server/dpl/core/include/dpl/noncopyable.h
@@ -19,8 +19,8 @@
  * @version     1.0
  * @brief       This file is the implementation file of noncopyable
  */
-#ifndef SECURITYSERVER_NONCOPYABLE_H
-#define SECURITYSERVER_NONCOPYABLE_H
+#ifndef SECURITYMANAGER_NONCOPYABLE_H
+#define SECURITYMANAGER_NONCOPYABLE_H
 
 namespace SecurityManager {
 class Noncopyable
@@ -35,4 +35,4 @@ class Noncopyable
 };
 } // namespace SecurityManager
 
-#endif // SECURITYSERVER_NONCOPYABLE_H
+#endif // SECURITYMANAGER_NONCOPYABLE_H

diff --git a/src/server/dpl/core/include/dpl/noreturn.h b/src/server/dpl/core/include/dpl/noreturn.h
index 44dfd4a26bdb3159439625c222ad3d65cd539f8a..a876f34b6dd1e94153684b67547a829d9764de05 100644 (file)
--- a/src/server/dpl/core/include/dpl/noreturn.h
+++ b/src/server/dpl/core/include/dpl/noreturn.h
@@ -19,9 +19,9 @@
  * @version     1.0
  * @brief       This file is the implementation file of noreturn
  */
-#ifndef SECURITYSERVER_NORETURN_H
-#define SECURITYSERVER_NORETURN_H
+#ifndef SECURITYMANAGER_NORETURN_H
+#define SECURITYMANAGER_NORETURN_H
 
-#define SECURITYSERVER_NORETURN __attribute__((__noreturn__))
+#define SECURITYMANAGER_NORETURN __attribute__((__noreturn__))
 
-#endif // SECURITYSERVER_NORETURN_H
+#endif // SECURITYMANAGER_NORETURN_H

diff --git a/src/server/dpl/core/include/dpl/singleton.h b/src/server/dpl/core/include/dpl/singleton.h
index f089107b0664db5288257f8bb75bd53ced054466..d064c62463ecf74c7401ace4fb25853542da4314 100644 (file)
--- a/src/server/dpl/core/include/dpl/singleton.h
+++ b/src/server/dpl/core/include/dpl/singleton.h
@@ -19,8 +19,8 @@
  * @version     1.0
  * @brief       This file is the implementation file of singleton
  */
-#ifndef SECURITYSERVER_SINGLETON_H
-#define SECURITYSERVER_SINGLETON_H
+#ifndef SECURITYMANAGER_SINGLETON_H
+#define SECURITYMANAGER_SINGLETON_H
 
 namespace SecurityManager {
 template<typename Class>
@@ -48,4 +48,4 @@ class Singleton :
 };
 } // namespace SecurityManager
 
-#endif // SECURITYSERVER_SINGLETON_H
+#endif // SECURITYMANAGER_SINGLETON_H

diff --git a/src/server/dpl/core/include/dpl/singleton_impl.h b/src/server/dpl/core/include/dpl/singleton_impl.h
index 00cdbde32ef1618ad89e6bc6468765807ebf92e3..7f316c14094e09130af714fb429715dab60db608 100644 (file)
--- a/src/server/dpl/core/include/dpl/singleton_impl.h
+++ b/src/server/dpl/core/include/dpl/singleton_impl.h
@@ -19,8 +19,8 @@
  * @version     1.0
  * @brief       This file is the implementation file of singleton
  */
-#ifndef SECURITYSERVER_SINGLETON_IMPL_H
-#define SECURITYSERVER_SINGLETON_IMPL_H
+#ifndef SECURITYMANAGER_SINGLETON_IMPL_H
+#define SECURITYMANAGER_SINGLETON_IMPL_H
 
 /*
  * WARNING!
@@ -50,4 +50,4 @@ Class &Singleton<Class>::Instance()
     template SecurityManager::Singleton<Type>&SecurityManager::Singleton<Type>::InternalInstance();    \
     template Type & SecurityManager::Singleton<Type>::Instance();                            \
 
-#endif // SECURITYSERVER_SINGLETON_IMPL_H
+#endif // SECURITYMANAGER_SINGLETON_IMPL_H

diff --git a/src/server/dpl/core/include/dpl/singleton_safe_impl.h b/src/server/dpl/core/include/dpl/singleton_safe_impl.h
index feeb30befc9b16b8cbca871356edf8ed8db9ae71..c199db774aa5c69c11e7c82fd2b0d78cab7f42b0 100644 (file)
--- a/src/server/dpl/core/include/dpl/singleton_safe_impl.h
+++ b/src/server/dpl/core/include/dpl/singleton_safe_impl.h
@@ -19,8 +19,8 @@
  * @version     1.0
  * @brief       This file is the implementation file of singleton
  */
-#ifndef SECURITYSERVER_SINGLETON_SAFE_IMPL_H
-#define SECURITYSERVER_SINGLETON_SAFE_IMPL_H
+#ifndef SECURITYMANAGER_SINGLETON_SAFE_IMPL_H
+#define SECURITYMANAGER_SINGLETON_SAFE_IMPL_H
 
 #define IMPLEMENT_SAFE_SINGLETON(Class)                                        \
     namespace SecurityManager {                                                    \
@@ -42,4 +42,4 @@
     template Class & Singleton<Class>::Instance();                                  \
     } // namespace SecurityManager
 
-#endif // SECURITYSERVER_SINGLETON_SAFE_IMPL_H
+#endif // SECURITYMANAGER_SINGLETON_SAFE_IMPL_H

diff --git a/src/server/dpl/core/src/assert.cpp b/src/server/dpl/core/src/assert.cpp
index ba1cecca3856bfa510ccbc36b6ed705b80e96955..63538a2b64484dfd1bebd81f015cc11d9e762cf4 100644 (file)
--- a/src/server/dpl/core/src/assert.cpp
+++ b/src/server/dpl/core/src/assert.cpp
@@ -49,7 +49,7 @@ void AssertProc(const char *condition,
         INTERNAL_LOG(
             "################################################################################");
         INTERNAL_LOG(
-            "###                          SecurityServer assertion failed!                           ###");
+            "###                          SecurityManager assertion failed!                           ###");
         INTERNAL_LOG(
             "################################################################################");
         INTERNAL_LOG("### Condition: " << condition);

diff --git a/src/server/dpl/log/include/dpl/log/abstract_log_provider.h b/src/server/dpl/log/include/dpl/log/abstract_log_provider.h
index 04a000f1a4ce68a6c177f89a5462df105f8c2fe5..cfe967957b7ccfee0b20ccd9eb515b8d514c3f22 100644 (file)
--- a/src/server/dpl/log/include/dpl/log/abstract_log_provider.h
+++ b/src/server/dpl/log/include/dpl/log/abstract_log_provider.h
@@ -19,8 +19,8 @@
  * @version     1.0
  * @brief       This file is the implementation file of abstract log provider
  */
-#ifndef SECURITYSERVER_ABSTRACT_LOG_PROVIDER_H
-#define SECURITYSERVER_ABSTRACT_LOG_PROVIDER_H
+#ifndef SECURITYMANAGER_ABSTRACT_LOG_PROVIDER_H
+#define SECURITYMANAGER_ABSTRACT_LOG_PROVIDER_H
 
 namespace SecurityManager {
 namespace Log {
@@ -78,4 +78,4 @@ class AbstractLogProvider
 }
 } // namespace SecurityManager
 
-#endif // SECURITYSERVER_ABSTRACT_LOG_PROVIDER_H
+#endif // SECURITYMANAGER_ABSTRACT_LOG_PROVIDER_H

diff --git a/src/server/dpl/log/include/dpl/log/dlog_log_provider.h b/src/server/dpl/log/include/dpl/log/dlog_log_provider.h
index 1d80ff75536a1dcf127f7f2bfb922fae347bfc39..6fe0d97c36b43d9c36f5b85e5756c148b1b662c2 100644 (file)
--- a/src/server/dpl/log/include/dpl/log/dlog_log_provider.h
+++ b/src/server/dpl/log/include/dpl/log/dlog_log_provider.h
@@ -19,8 +19,8 @@
  * @version     1.0
  * @brief       This file is the implementation file of DLOG log provider
  */
-#ifndef SECURITYSERVER_DLOG_LOG_PROVIDER_H
-#define SECURITYSERVER_DLOG_LOG_PROVIDER_H
+#ifndef SECURITYMANAGER_DLOG_LOG_PROVIDER_H
+#define SECURITYMANAGER_DLOG_LOG_PROVIDER_H
 
 #include <dpl/log/abstract_log_provider.h>
 #include <memory>
@@ -91,4 +91,4 @@ class DLOGLogProvider :
 } // namespace Log
 } // namespace SecurityManager
 
-#endif // SECURITYSERVER_DLOG_LOG_PROVIDER_H
+#endif // SECURITYMANAGER_DLOG_LOG_PROVIDER_H

diff --git a/src/server/dpl/log/include/dpl/log/log.h b/src/server/dpl/log/include/dpl/log/log.h
index e8f3665e2791d7e93a156b2fd2880c80738068ca..2594ace7533bc0b5dde623ca61ebfa668beeef8a 100644 (file)
--- a/src/server/dpl/log/include/dpl/log/log.h
+++ b/src/server/dpl/log/include/dpl/log/log.h
@@ -19,8 +19,8 @@
  * @version     1.0
  * @brief       This file is the implementation file of log system
  */
-#ifndef SECURITYSERVER_LOG_H
-#define SECURITYSERVER_LOG_H
+#ifndef SECURITYMANAGER_LOG_H
+#define SECURITYMANAGER_LOG_H
 
 #include <dpl/singleton.h>
 #include <dpl/noncopyable.h>
@@ -31,7 +31,7 @@
 namespace SecurityManager {
 namespace Log {
 /**
- * SecurityServer log system
+ * SecurityManager log system
  *
  * To switch logs into old style, export
  * DPL_USE_OLD_STYLE_LOGS before application start
@@ -219,4 +219,4 @@ do                                                                         \
     #define LogSecureWarning(message) DPL_MACRO_DUMMY_LOGGING(message, SecureWarning)
 #endif // BUILD_TYPE_DEBUG
 
-#endif // SECURITYSERVER_LOG_H
+#endif // SECURITYMANAGER_LOG_H

diff --git a/src/server/dpl/log/include/dpl/log/old_style_log_provider.h b/src/server/dpl/log/include/dpl/log/old_style_log_provider.h
index 60b8cf90642da46857bc859165f09c375c25ca48..8ca2068b841b21d72bb0861ef5ddfcce6b9a54f2 100644 (file)
--- a/src/server/dpl/log/include/dpl/log/old_style_log_provider.h
+++ b/src/server/dpl/log/include/dpl/log/old_style_log_provider.h
@@ -19,8 +19,8 @@
  * @version     1.0
  * @brief       This file is the implementation file of old style log provider
  */
-#ifndef SECURITYSERVER_OLD_STYLE_LOG_PROVIDER_H
-#define SECURITYSERVER_OLD_STYLE_LOG_PROVIDER_H
+#ifndef SECURITYMANAGER_OLD_STYLE_LOG_PROVIDER_H
+#define SECURITYMANAGER_OLD_STYLE_LOG_PROVIDER_H
 
 #include <dpl/log/abstract_log_provider.h>
 #include <string>
@@ -101,4 +101,4 @@ class OldStyleLogProvider :
 }
 } // namespace SecurityManager
 
-#endif // SECURITYSERVER_OLD_STYLE_LOG_PROVIDER_H
+#endif // SECURITYMANAGER_OLD_STYLE_LOG_PROVIDER_H

diff --git a/src/server/dpl/log/src/log.cpp b/src/server/dpl/log/src/log.cpp
index 0b1a5288cb86ddb324c9b35ec310b83b91859fc4..9ac65c09ba6d9e86301d606e47faaade12079a78 100644 (file)
--- a/src/server/dpl/log/src/log.cpp
+++ b/src/server/dpl/log/src/log.cpp
@@ -40,7 +40,7 @@ const char *OLD_STYLE_PEDANTIC_LOGS_ENV_NAME =
     "DPL_USE_OLD_STYLE_PEDANTIC_LOGS";
 const char *OLD_STYLE_LOGS_MASK_ENV_NAME = "DPL_USE_OLD_STYLE_LOGS_MASK";
 #endif // BUILD_TYPE_DEBUG
-const char *SECURITY_SERVER_LOG_OFF = "DPL_LOG_OFF";
+const char *SECURITY_MANAGER_LOG_OFF = "DPL_LOG_OFF";
 } // namespace anonymous
 
 bool LogSystem::IsLoggingEnabled() const
@@ -49,7 +49,7 @@ bool LogSystem::IsLoggingEnabled() const
 }
 
 LogSystem::LogSystem() :
-    m_isLoggingEnabled(!getenv(SECURITY_SERVER_LOG_OFF))
+    m_isLoggingEnabled(!getenv(SECURITY_MANAGER_LOG_OFF))
 {
 #ifdef BUILD_TYPE_DEBUG
     bool oldStyleLogs = false;

diff --git a/src/server/main/generic-event.h b/src/server/main/generic-event.h
index 8e70ae386e7fff041a277105785294e0e6863d6d..348615510500047a5bfc10d6ddfeb2ee46acc875 100644 (file)
--- a/src/server/main/generic-event.h
+++ b/src/server/main/generic-event.h
@@ -22,8 +22,8 @@
  * @brief       Implementation of GenericEvent.
  */
 
-#ifndef _SECURITY_SERVER_GENERIC_EVENT_
-#define _SECURITY_SERVER_GENERIC_EVENT_
+#ifndef _SECURITY_MANAGER_GENERIC_EVENT_
+#define _SECURITY_MANAGER_GENERIC_EVENT_
 
 namespace SecurityManager {
 
@@ -33,4 +33,4 @@ struct GenericEvent {
 
 } // namespace SecurityManager
 
-#endif // _SECURITY_SERVER_GENERIC_EVENT_
+#endif // _SECURITY_MANAGER_GENERIC_EVENT_

diff --git a/src/server/main/generic-socket-manager.h b/src/server/main/generic-socket-manager.h
index 8603eabf8164770278dd5a3455881dc987409896..2f0ad1d635136985c476df211eeb5105a5adf747 100644 (file)
--- a/src/server/main/generic-socket-manager.h
+++ b/src/server/main/generic-socket-manager.h
@@ -22,8 +22,8 @@
  * @brief       Implementation of GenericSocketService and GenericSocketManager.
  */
 
-#ifndef _SECURITY_SERVER_GENERIC_SERVICE_MANAGER_
-#define _SECURITY_SERVER_GENERIC_SERVICE_MANAGER_
+#ifndef _SECURITY_MANAGER_GENERIC_SERVICE_MANAGER_
+#define _SECURITY_MANAGER_GENERIC_SERVICE_MANAGER_
 
 #include <vector>
 #include <string>
@@ -140,4 +140,4 @@ struct GenericSocketManager {
 
 } // namespace SecurityManager
 
-#endif // _SECURITY_SERVER_GENERIC_SERVICE_MANAGER_
+#endif // _SECURITY_MANAGER_GENERIC_SERVICE_MANAGER_

diff --git a/src/server/main/security-manager-util.cpp b/src/server/main/security-manager-util.cpp
index 030c5ca1cc4da5a1854f747af99c8e20b6d5ec92..4218375b9610cb3475ccf73f198a093bbe13be68 100644 (file)
--- a/src/server/main/security-manager-util.cpp
+++ b/src/server/main/security-manager-util.cpp
@@ -1,5 +1,5 @@
 /*
- *  security-server
+ *  security-manager
  *
  *  Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd All Rights Reserved
  *

diff --git a/src/server/main/security-manager-util.h b/src/server/main/security-manager-util.h
index 611696e972cbf8807b60868d525b654d42a90c14..62aa45aba0702c9f7e853c56e3a40f10b0f64586 100644 (file)
--- a/src/server/main/security-manager-util.h
+++ b/src/server/main/security-manager-util.h
@@ -1,5 +1,5 @@
 /*
- *  security-server
+ *  security-manager
  *
  *  Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd All Rights Reserved
  *
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef SECURITY_SERVER_UTIL_H
-#define SECURITY_SERVER_UTIL_H
+#ifndef SECURITY_MANAGER_UTIL_H
+#define SECURITY_MANAGER_UTIL_H
 
 #include <sys/types.h>
 
@@ -31,4 +31,4 @@ char *read_exe_path_from_proc(pid_t pid);
 
 } // namespace SecurityManager
 
-#endif /*SECURITY_SERVER_UTIL_H*/
+#endif /*SECURITY_MANAGER_UTIL_H*/

diff --git a/src/server/main/server2-main.cpp b/src/server/main/server2-main.cpp
index 0111e42ecc787632009a139b36cd81bdcc1a1077..213f749a9f0b42532e8c0e04106055060bbf8148 100644 (file)
--- a/src/server/main/server2-main.cpp
+++ b/src/server/main/server2-main.cpp
@@ -19,7 +19,7 @@
  * @file        sever2-main.cpp
  * @author      Bartlomiej Grzelewski (b.grzelewski@samsung.com)
  * @version     1.0
- * @brief       Implementation of security-server2
+ * @brief       Implementation of security-manager on basis of security-server
  */
 #include <stdlib.h>
 #include <signal.h>
@@ -67,9 +67,9 @@ int main(void) {
     {
         SecurityManager::Singleton<SecurityManager::Log::LogSystem>::Instance().SetTag("SECURITY_MANAGER");
 
-        // This provider may be used in security-server only.
+        // This provider may be used in security-manager only.
         // If we add it inside LogSystem constructor it also
-        // will be used by security-server-client library.
+        // will be used by security-manager-client library.
         SecurityManager::Log::AuditSmackLog *smackLog = new SecurityManager::Log::AuditSmackLog;
         if (smackLog->Fail())
             delete smackLog;

diff --git a/src/server/main/service-thread.h b/src/server/main/service-thread.h
index 71c6e3fe0249ca2408a9ea846c20805fdd6af830..8b8286c48e77152e7b219d02622f7d1c82fc495f 100644 (file)
--- a/src/server/main/service-thread.h
+++ b/src/server/main/service-thread.h
@@ -22,8 +22,8 @@
  * @brief       Implementation of threads.
  */
 
-#ifndef _SECURITY_SERVER_SERVICE_THREAD_
-#define _SECURITY_SERVER_SERVICE_THREAD_
+#ifndef _SECURITY_MANAGER_SERVICE_THREAD_
+#define _SECURITY_MANAGER_SERVICE_THREAD_
 
 #include <cassert>
 #include <queue>
@@ -174,4 +174,4 @@ protected:
 
 } // namespace SecurityManager
 
-#endif // _SECURITY_SERVER_SERVICE_THREAD_
+#endif // _SECURITY_MANAGER_SERVICE_THREAD_

diff --git a/src/server/main/socket-manager.h b/src/server/main/socket-manager.h
index fdc6516d8585005a4adc2c6d274d32504bea8fee..58d3db14c5e9e84995b2a278a7730ce13b98924b 100644 (file)
--- a/src/server/main/socket-manager.h
+++ b/src/server/main/socket-manager.h
@@ -22,8 +22,8 @@
  * @brief       SocketManager implementation.
  */
 
-#ifndef _SECURITY_SERVER_SOCKET_MANAGER_
-#define _SECURITY_SERVER_SOCKET_MANAGER_
+#ifndef _SECURITY_MANAGER_SOCKET_MANAGER_
+#define _SECURITY_MANAGER_SOCKET_MANAGER_
 
 #include <vector>
 #include <queue>
@@ -132,4 +132,4 @@ protected:
 
 } // namespace SecurityManager
 
-#endif // _SECURITY_SERVER_SOCKET_MANAGER_
+#endif // _SECURITY_MANAGER_SOCKET_MANAGER_

diff --git a/src/server/service/installer.h b/src/server/service/installer.h
index 43bf1db62b24a3ea7b296b21260e459ced1b2b6e..656bc1a0ab7f17ce3490a8ed5c98f8fbac20b7bd 100644 (file)
--- a/src/server/service/installer.h
+++ b/src/server/service/installer.h
@@ -21,8 +21,8 @@
  * @brief       Implementation of installer service for libprivilege-control encapsulation.
  */
 
-#ifndef _SECURITY_SERVER_INSTALLER_
-#define _SECURITY_SERVER_INSTALLER_
+#ifndef _SECURITY_MANAGER_INSTALLER_
+#define _SECURITY_MANAGER_INSTALLER_
 
 #include <service-thread.h>
 #include <generic-socket-manager.h>
@@ -92,4 +92,4 @@ private:
 
 } // namespace SecurityManager
 
-#endif // _SECURITY_SERVER_INSTALLER_
+#endif // _SECURITY_MANAGER_INSTALLER_