Change not to failed when kernel has no audit features

When an initialization of audit socket failed,
Just not initialize all functions of daemon.

Signed-off-by: Sungbae Yoo <sungbae.yoo@samsung.com>
Change-Id: I6e3cde3adaddbf59050f1e0d4c2683f7a8daff6c

diff --git a/lib/client.cpp b/lib/client.cpp
index b6d879ee19ff50eebe3a2d6edc4cda551b444a0a..620053dd91870f014163a98d1593fb4f619a81e5 100644 (file)
--- a/lib/client.cpp
+++ b/lib/client.cpp
@@ -62,7 +62,6 @@ int AuditTrailContext::subscribeNotification(const std::string& name,
                return client->subscribe<std::string, int>
                                                        (SUBSCRIBER_REGISTER, name, listener);
        } catch (runtime::Exception& e) {
-               std::cout << e.what() << std::endl;
                return -1;
        }
 }

diff --git a/server/server.cpp b/server/server.cpp
index d4202a3ccc9342037876b572a57cc565b69e5e81..a1e50cfc71046fd5597d00e47096de4c291b1b10 100644 (file)
--- a/server/server.cpp
+++ b/server/server.cpp
@@ -43,6 +43,15 @@ Server::Server() :
 
        service->setPrivilegeChecker(std::bind(&Server::checkPeerPrivilege, this, _1, _2));
 
+       try {
+               audit.reset(new Audit());
+       } catch (runtime::Exception &e) {
+               std::cout << "Kernel has no audit feature the follows" << std::endl;
+               std::cout << " - CONFIG_AUDIT, CONFIG_AUDITSYSCALL" << std::endl;
+               // Just not initialize classes and methods if kernel has no feature
+               return;
+       }
+
        service->expose(this, "", (runtime::FileDescriptor)(Server::registerNotificationSubscriber)(std::string));
        service->expose(this, "", (int)(Server::unregisterNotificationSubscriber)(std::string, int));
 
@@ -59,8 +68,6 @@ Server::Server() :
                return true;
        });
 
-       audit.reset(new Audit());
-
        audit->setEnabled(1);
        audit->setPID(::getpid());