@@ -16,6 +16,7 @@ pam_token_conversation::pam_token_conversation(pam_handle_t *pamh, const pam_p p

     struct pam_message prompt;

     std::string message("Dual control token: ");

     prompt.msg = const_cast<char *>(message.c_str());

+    prompt.msg_style = PAM_PROMPT_ECHO_OFF;

     std::vector<const struct pam_message *> prompts(1);

     prompts[0] = &prompt;

     std::vector<struct pam_response *> answers(1);

@@ -26,13 +26,13 @@ class fake_pam_conversation : public pam_conversation {

         }

 };

-class mock_pam_conversation : public pam_conversation {

+class match_prompt_text_conversation : public pam_conversation {

     private:

         pam_response response_;

         std::string answer_;

         std::string prompt_;

     public:

-        mock_pam_conversation(const std::string &prompt) : prompt_(prompt), answer_("ok:123") {}

+        match_prompt_text_conversation(const std::string &prompt) : prompt_(prompt), answer_("ok:123") {}

         int conv(const std::vector<const struct pam_message *> &prompts, std::vector<struct pam_response *> &answers) {

             if (prompt_ != prompts[0]->msg) {

                 throw std::string("prompt does not match");

@@ -46,6 +46,26 @@ class mock_pam_conversation : public pam_conversation {

 };

+class match_prompt_style_conversation : public pam_conversation {

+    private:

+        pam_response response_;

+        std::string answer_;

+        int style_;

+    public:

+        match_prompt_style_conversation(int style) : style_(style), answer_("ok:123") {}

+        int conv(const std::vector<const struct pam_message *> &prompts, std::vector<struct pam_response *> &answers) {

+            if (style_ != prompts[0]->msg_style) {

+                throw std::string("style does not match");

+            }

+            response_.resp_retcode = 0;

+            response_.resp = const_cast<char *>(answer_.c_str());

+            answers.resize(1);

+            answers[0] = &response_;

+            return 0;

+        }

+

+};

+

 class fake_pam : public pam {

     private:

         std::shared_ptr<pam_conversation> conversation_;

@@ -169,7 +189,7 @@ int returns_empty_user_and_token_when_pam_cant_create_conversation() {

 int prompts_user_with_correct_text() {

     // given

     pam_handle_t *pamh;

-    pam_conversation_p match_conversation = (pam_conversation_p) new mock_pam_conversation("Dual control token: ");

+    pam_conversation_p match_conversation = (pam_conversation_p) new match_prompt_text_conversation("Dual control token: ");

     pam_p pam = (pam_p)new fake_pam(match_conversation);

@@ -181,10 +201,27 @@ int prompts_user_with_correct_text() {

         fail();

     }

+}

+

+int prompts_user_with_correct_style() {

+    // given

+    pam_handle_t *pamh;

+    pam_conversation_p match_conversation = (pam_conversation_p) new match_prompt_style_conversation(PAM_PROMPT_ECHO_OFF);

+    pam_p pam = (pam_p)new fake_pam(match_conversation);

+    // when / then

+    try {

+      pam_token_conversation conversation(pamh, pam);

+      succeed();

+    } catch (const std::string &x) {

+        fail();

+    }

 }

+

+

+

 RESET_VARS_START

 RESET_VARS_END

@@ -197,6 +234,7 @@ int run_tests() {

     test(returns_empty_user_and_token_when_empty_answer);

     test(returns_empty_user_and_token_when_pam_cant_create_conversation);

     test(prompts_user_with_correct_text);

+    test(prompts_user_with_correct_style);

     succeed();

 }