@@ -24,12 +24,12 @@ class conversation_result {

 class conversations_ifc {

     public:

         virtual ~conversations_ifc() {}

-        virtual conversation_result initiate_conversation() = 0;

+        virtual conversation_result initiate_conversation() {

+            return conversation_result("","");

+        }

 };

 typedef std::shared_ptr<conversations_ifc> conversations;

-

-

 class token_conversation {

     public:

         virtual ~token_conversation() {}

@@ -16,7 +16,6 @@ class dual_control_ifc {

         virtual int authenticate(pam_handle_t *handle, int flags, const std::vector<const std::string> &arguments ) = 0;

         virtual int setcred(pam_handle_t *handle, int flags, const std::vector<const std::string> &arguments) = 0;

 };

-

 typedef std::shared_ptr<dual_control_ifc> dual_control;

 struct dual_control_configuration {

@@ -24,12 +23,11 @@ struct dual_control_configuration {

     conversations conversations;

     logger logger;

     dual_control_configuration()

-        : logger(new logger_ifc) {}

+        : validator(new validator_ifc),

+          conversations(new conversations_ifc),

+          logger(new logger_ifc) {}

 };

-

 dual_control create_dual_control(const dual_control_configuration &configuration);

-

-

 #endif

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

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

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

     dual_control dc(create_dual_control(configuration));

-    pam_handle_t *handle = (pam_handle_t*)"";

+    pam_handle_t *handle(0);

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

     // when

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

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

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

     dual_control dc(create_dual_control(configuration));

-    pam_handle_t *handle = (pam_handle_t*)"";

+    pam_handle_t *handle(0);

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

     // when

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

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

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

     dual_control dc(create_dual_control(configuration));

-    pam_handle_t *handle = (pam_handle_t*)"";

+    pam_handle_t *handle(0);

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

     // when

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

     mock_logger *test_logger = new mock_logger;

     configuration.logger = logger(test_logger);

     dual_control dc(create_dual_control(configuration));

-    pam_handle_t *handle = (pam_handle_t*)"";

+    pam_handle_t *handle(0);

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

     //when

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

     dual_control_configuration configuration;

     std::string user("user");

     std::string token("token");

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

+    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);

     dual_control dc(create_dual_control(configuration));

-    pam_handle_t *handle = (pam_handle_t*)"";

+    pam_handle_t *handle(0);

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

     //when

@@ -10,12 +10,13 @@

 class validator_ifc {

     public:

         virtual ~validator_ifc() {}

-        virtual bool validate(const std::string &user, const std::string &token) = 0;

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

+           return false;

+        }

 };

 typedef std::shared_ptr<validator_ifc> validator;

-

 class old_validator {

     private:

         directory_p directory_;

@@ -27,5 +28,4 @@ class old_validator {

         bool validate(const std::string &user, const std::string &token);

 };

-

 #endif