@@ -1,4 +1,4 @@

-CXXFLAGS += -fPIC -fno-stack-protector

+CXXFLAGS += -fPIC -fno-stack-protector -std=c++14

 CFLAGS += -fPIC -fno-stack-protector

 OBJS = dual_control.o argument.o dual_control_integrate.o

@@ -31,7 +31,7 @@ int impl::authenticate(pam_handle *handle, int flags, const std::vector<const st

     int auth_result = validator_->validate(user_name, token) ? PAM_SUCCESS : PAM_AUTH_ERR;

-    logger_->log(auth_result, user_name, token);

+    logger_.log(auth_result, user_name, token);

     return auth_result;

 }

@@ -22,10 +22,6 @@ struct dual_control_configuration {

     validator validator;

     conversations conversations;

     logger logger;

-    dual_control_configuration()

-        : validator(new validator_ifc),

-          conversations(new conversations_ifc),

-          logger(new logger_ifc) {}

 };

 dual_control create_dual_control(const dual_control_configuration &configuration);

@@ -132,7 +132,7 @@ int logs_authentication() {

     configuration.validator = validator(new fake_validator(user, token));

     configuration.conversations = conversations(new fake_conversations(user, token));

     mock_logger *test_logger = new mock_logger;

-    configuration.logger = logger(test_logger);

+    configuration.logger = logger(std::shared_ptr<logger_ifc>(test_logger));

     dual_control dc(create_dual_control(configuration));

     pam_handle_t *handle(0);

     std::vector<const std::string> arguments;

@@ -155,7 +155,7 @@ int logs_authentication_failure() {

     configuration.validator = validator(new fake_validator(user, "not the received token"));

     configuration.conversations = conversations(new fake_conversations(user, token));

     mock_logger *test_logger = new mock_logger;

-    configuration.logger = logger(test_logger);

+    configuration.logger = logger(std::shared_ptr<logger_ifc>(test_logger));

     dual_control dc(create_dual_control(configuration));

     pam_handle_t *handle(0);

     std::vector<const std::string> arguments;

@@ -9,6 +9,16 @@ class logger_ifc {

         virtual ~logger_ifc() {}

         virtual void log(int result, const std::string &user_name, const std::string &token) {};

 };

-typedef std::shared_ptr<logger_ifc> logger;

+

+class logger : public logger_ifc {

+    private:

+        std::shared_ptr<logger_ifc> delegate_;

+    public:

+        logger(const std::shared_ptr<logger_ifc> &delegate) : delegate_(delegate) {}

+        logger() : logger(std::shared_ptr<logger_ifc>(new logger_ifc)) {}

+        void log(int result, const std::string &user_name, const std::string &token) {

+            delegate_->log(result, user_name, token);

+        }

+};

 #endif