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

     std::string user_name = conversation.user_name();

     std::string token = conversation.token();

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

+    int auth_result = validator_.validate(user_name, token) ? PAM_SUCCESS : PAM_AUTH_ERR;

     logger_.log(auth_result, user_name, token);

     return auth_result;

@@ -74,7 +74,7 @@ int authenticate_validates_with_received_token() {

     dual_control_configuration configuration;

     std::string user("user");

     std::string token("token");

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

+    configuration.validator = validator(std::shared_ptr<validator_ifc>(new fake_validator(user, token)));

     configuration.conversations = conversations(std::shared_ptr<conversations_ifc>(new fake_conversations(user, token)));

     dual_control dc(create_dual_control(configuration));

     pam_handle_t *handle(0);

@@ -92,7 +92,7 @@ int authenticate_fails_with_wrong_user() {

     // given

     dual_control_configuration configuration;

     std::string token("token");

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

+    configuration.validator = validator(std::shared_ptr<validator_ifc>(new fake_validator("user", token)));

     configuration.conversations = conversations(std::shared_ptr<conversations_ifc>(new fake_conversations("wrong user", token)));

     dual_control dc(create_dual_control(configuration));

     pam_handle_t *handle(0);

@@ -110,7 +110,7 @@ int authenticate_fails_with_wrong_token() {

     // given

     dual_control_configuration configuration;

     std::string user("user");

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

+    configuration.validator = validator(std::shared_ptr<validator_ifc>(new fake_validator(user, "token")));

     configuration.conversations = conversations(std::shared_ptr<conversations_ifc>(new fake_conversations(user, "wrong token")));

     dual_control dc(create_dual_control(configuration));

     pam_handle_t *handle(0);

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

     dual_control_configuration configuration;

     std::string user("user");

     std::string token("token");

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

+    configuration.validator = validator(std::shared_ptr<validator_ifc>(new fake_validator(user, token)));

     configuration.conversations = conversations(std::shared_ptr<conversations_ifc>(new fake_conversations(user, token)));

     mock_logger *test_logger = new mock_logger;

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

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

     dual_control_configuration configuration;

     std::string user("user");

     std::string token("token");

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

+    configuration.validator = validator(std::shared_ptr<validator_ifc>(new fake_validator(user, "not the received token")));

     configuration.conversations = conversations(std::shared_ptr<conversations_ifc>(new fake_conversations(user, token)));

     mock_logger *test_logger = new mock_logger;

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

@@ -10,12 +10,21 @@

 class validator_ifc {

     public:

         virtual ~validator_ifc() {}

-        virtual bool validate(const std::string &user, const std::string &token) {

+        virtual bool validate(const std::string &user_name, const std::string &token) {

            return false;

         }

 };

-typedef std::shared_ptr<validator_ifc> validator;

+class validator : public validator_ifc {

+    private:

+        std::shared_ptr<validator_ifc> delegate_;

+    public:

+        validator(const std::shared_ptr<validator_ifc> &delegate) : delegate_(delegate) {}

+        validator() : validator(std::shared_ptr<validator_ifc>(new validator_ifc)) {}

+        bool validate(const std::string &user_name, const std::string &token) {

+            return delegate_->validate(user_name, token);

+        }

+};

 class old_validator {

     private: