@@ -21,6 +21,7 @@ class conversation_result {

         std::string user_name() { return user_name_; }

 };

+

 class conversations_ifc {

     public:

         virtual ~conversations_ifc() {}

@@ -28,7 +29,17 @@ class conversations_ifc {

             return conversation_result("","");

         }

 };

-typedef std::shared_ptr<conversations_ifc> conversations;

+

+class conversations : public conversations_ifc {

+    private:

+        std::shared_ptr<conversations_ifc> delegate_;

+    public:

+        conversations() : conversations(std::shared_ptr<conversations_ifc>(new conversations_ifc)) {}

+        conversations(const std::shared_ptr<conversations_ifc> &delegate) : delegate_(delegate) {}

+        conversation_result initiate_conversation() {

+            return delegate_->initiate_conversation();

+        }

+};

 class token_conversation {

     public:

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

 int impl::authenticate(pam_handle *handle, int flags, const std::vector<const std::string> &arguments) {

-    conversation_result conversation = conversations_->initiate_conversation();

+    conversation_result conversation = conversations_.initiate_conversation();

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

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

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

     std::string user("user");

     std::string token("token");

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

-    configuration.conversations = conversations(new fake_conversations(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);

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

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

     dual_control_configuration configuration;

     std::string token("token");

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

-    configuration.conversations = conversations(new fake_conversations("wrong 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);

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

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

     dual_control_configuration configuration;

     std::string user("user");

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

-    configuration.conversations = conversations(new fake_conversations(user, "wrong 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);

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

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

     std::string user("user");

     std::string token("token");

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

-    configuration.conversations = conversations(new fake_conversations(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));

     dual_control dc(create_dual_control(configuration));

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

     std::string user("user");

     std::string token("token");

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

-    configuration.conversations = conversations(new fake_conversations(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));

     dual_control dc(create_dual_control(configuration));