@@ -98,7 +98,8 @@ public:

     {

         return token_;

     }

-    std::string logged_reason() {

+    std::string logged_reason()

+    {

         return reason_;

     }

 };

@@ -112,7 +113,7 @@ private:

 public:

     fake_conversation (const std::string &user_name,

                        const std::string &token, const std::string &reason) :

-        user_name_ (user_name), token_ (token), reason_(reason) {}

+        user_name_ (user_name), token_ (token), reason_ (reason) {}

     conversation_result initiate (const pam_request &request)

     {

         return {user_name_, token_, reason_};

@@ -128,8 +129,10 @@ private:

     std::string reason_;

 public:

     fake_validator (const std::string &requester, const std::string &authorizer,

-                    const std::string &token, const std::string &reason): requester_ (requester), authorizer_ (authorizer),

-        token_ (token), reason_(reason) {}

+                    const std::string &token,

+                    const std::string &reason): requester_ (requester),

+        authorizer_ (authorizer),

+        token_ (token), reason_ (reason) {}

     bool validate (const std::string &requester, const std::string &authorizer,

                    const std::string &token, const std::string &reason) override

     {

@@ -165,10 +168,11 @@ int authenticate_validates_with_received_token()

     std::string requester ("requester");

     std::string authorizer ("authorizer");

     std::string token ("token");

-    std::string reason("reason");

+    std::string reason ("reason");

     use_validator (configuration, new fake_validator (requester, authorizer,

                    token, reason));

-    use_conversation (configuration, new fake_conversation (authorizer, token, reason));

+    use_conversation (configuration, new fake_conversation (authorizer, token,

+                      reason));

     use_sessions (configuration, new fake_sessions (requester));

     dual_control dc (dual_control::create (configuration));

     pam_handle_t *handle (0);

@@ -187,7 +191,7 @@ int authenticate_fails_with_wrong_user()

     // given

     dual_control_configuration configuration;

     std::string token ("token");

-    std::string reason("reason");

+    std::string reason ("reason");

     use_validator (configuration, new fake_validator ("requester", "user",

                    token, reason));

     use_conversation (configuration, new fake_conversation ("wrong user",

@@ -229,10 +233,11 @@ int logs_authentication()

     std::string requester ("requester");

     std::string authorizer ("authorizer");

     std::string token ("token");

-    std::string reason("reason");

+    std::string reason ("reason");

     use_validator (configuration, new fake_validator (requester, authorizer,

                    token, reason));

-    use_conversation (configuration, new fake_conversation (authorizer, token, reason));

+    use_conversation (configuration, new fake_conversation (authorizer, token,

+                      reason));

     use_sessions (configuration, new fake_sessions (requester));

     mock_logger *test_logger;

     use_logger (configuration, test_logger = new mock_logger);

@@ -252,7 +257,7 @@ int logs_authentication()

            "logged token should be token");

     std::cout <<test_logger->logged_reason() << std::endl;

     check (test_logger->logged_reason() == reason,

-            "logged reason should be reason");

+           "logged reason should be reason");

     succeed();

 }

@@ -266,7 +271,8 @@ int logs_authentication_failure()

     std::string reason ("reason");

     use_validator (configuration, new fake_validator (requester, authorizer,

                    "not the received token", reason));

-    use_conversation (configuration, new fake_conversation (authorizer, token, reason));

+    use_conversation (configuration, new fake_conversation (authorizer, token,

+                      reason));

     use_sessions (configuration, new fake_sessions (requester));

     mock_logger *test_logger;

     use_logger (configuration, test_logger = new mock_logger);

@@ -42,7 +42,8 @@ public:

               const std::string &token,

               const std::string &reason)

     {

-        delegate_->log (result, requester_user_name, authorizer_user_name, token, reason);

+        delegate_->log (result, requester_user_name, authorizer_user_name, token,

+                        reason);

     }

     static logger create (const sys_syslog &sys_syslog);

 };

@@ -54,14 +54,15 @@ int logs_success()

     std::string requester_user ("requester_user");

     std::string authorizer_user ("authorizer_user");

     std::string token ("token");

-    std::string reason("reason");

+    std::string reason ("reason");

     //when

     logger.log (PAM_SUCCESS, requester_user, authorizer_user, token, reason);

     //then

     check (capture->facility == LOG_AUTHPRIV, "facility does not match");

-    check (capture->message == requester_user + " " + authorizer_user + " " + reason + " " +

+    check (capture->message == requester_user + " " + authorizer_user + " " +

+           reason + " " +

            "success",

            "message does not match");

     check (capture->priority == LOG_NOTICE, "priority does not match");

@@ -80,7 +81,7 @@ int logs_failure()

     std::string requester ("requestuser");

     std::string authorizer ("authuser");

     std::string token ("token");

-    std::string reason("reason");

+    std::string reason ("reason");

     //when

     logger.log (PAM_AUTH_ERR, requester, authorizer, token, reason);

@@ -106,7 +107,7 @@ int logs_pam_service_error()

     std::string requester ("user");

     std::string authorizer ("user");

     std::string token ("token");

-    std::string reason("reason");

+    std::string reason ("reason");

     //when

     logger.log (PAM_SERVICE_ERR, requester, authorizer, token, reason);

@@ -106,7 +106,8 @@ bool validator_fails_incorrect_token()

     validator validator = validator::create (directory, tokens);

     // when

-    bool actual = validator.validate ("requester", user_name, "token", "reason");

+    bool actual = validator.validate ("requester", user_name, "token",

+                                      "reason");

     // then

     check (!actual, "should not be valid");

@@ -154,7 +155,8 @@ bool validator_fails_with_unknown_requester()

     succeed();

 }

-bool validator_fails_on_empty_reason() {

+bool validator_fails_on_empty_reason()

+{

     //given

     std::string requester_user_name ("");

     std::string authorizer_user_name ("authorizer");

@@ -170,7 +172,7 @@ bool validator_fails_on_empty_reason() {

                                       authorizer_token, reason);

     //then

-    check(!actual, "should not be valid");

+    check (!actual, "should not be valid");

     succeed();

 }