@@ -53,15 +53,8 @@ public:

     {

         conversation_result result;

-        pam_conv_result token_result (conversation ("Dual control token: ",

-                                      PAM_PROMPT_ECHO_OFF, request));

-

-        if (token_result.get_conv_result != PAM_SUCCESS) {

-            return result;

-        }

-

         pam_conv_result reason_result (conversation ("Reason: ", PAM_PROMPT_ECHO_ON,

-                                       request));

+						     request));

         if (reason_result.get_conv_result != PAM_SUCCESS) {

             return result;

@@ -72,8 +65,15 @@ public:

             result.reason = reason;

         }

-        if (token_result.conv_result != PAM_SUCCESS) {

-            return result;

+        pam_conv_result token_result (conversation ("Dual control token: ",

+						    PAM_PROMPT_ECHO_OFF, request));

+

+        if (token_result.get_conv_result != PAM_SUCCESS) {

+	  return result;

+        }

+

+        if (reason_result.conv_result != PAM_SUCCESS) {

+	  return result;

         }

         std::string token_answer (token_result.responses[0]->resp);

@@ -95,4 +95,3 @@ conversation conversation::create (pam &pam)

 {

     return conversation (std::shared_ptr<conversation_ifc> (new impl (pam)));

 }

-