@@ -66,7 +66,8 @@ int impl::authenticate (const pam_request &request)

     int auth_result = validator_.validate (requester, input.user_name,

                                            input.token) ? PAM_SUCCESS : PAM_AUTH_ERR;

-    logger_.log (auth_result, requester_user_name, input.user_name, input.token);

+    logger_.log (auth_result, requester_user_name, input.user_name,

+                 input.token);

     return auth_result;

 }

 }

@@ -48,12 +48,14 @@ void use_sessions (dual_control_configuration &config, sessions_ifc *value)

     config.sessions = sessions (sessions::delegate (value));

 }

-class fake_sessions : public sessions_ifc {

-    private:

-        std::string user_;

-    public:

-        fake_sessions(const std::string &user) : user_(user) {}

-    std::string user_name (const pam_request &request)  const {

+class fake_sessions : public sessions_ifc

+{

+private:

+    std::string user_;

+public:

+    fake_sessions (const std::string &user) : user_ (user) {}

+    std::string user_name (const pam_request &request)  const

+    {

         return user_;

     }

@@ -67,7 +69,8 @@ private:

     std::string authorizer_user_name_;

     std::string token_;

 public:

-    void log (int result, const std::string &requester_user_name, const std::string &authorizer_user_name,

+    void log (int result, const std::string &requester_user_name,

+              const std::string &authorizer_user_name,

               const std::string &token)

     {

         result_ = result;

@@ -115,11 +118,13 @@ private:

     std::string token_;

 public:

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

-                    const std::string &token): requester_(requester), authorizer_(authorizer), token_ (token) {}

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

+        token_ (token) {}

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

                    const std::string &token)

     {

-        return requester_ == requester && authorizer_ == authorizer && token_ == token;

+        return requester_ == requester && authorizer_ == authorizer

+               && token_ == token;

     }

 };

@@ -147,12 +152,13 @@ int authenticate_validates_with_received_token()

 {

     // given

     dual_control_configuration configuration;

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

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

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

-    use_validator (configuration, new fake_validator (requester, authorizer, token));

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

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

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

+    use_validator (configuration, new fake_validator (requester, authorizer,

+                   token));

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

-    use_sessions(configuration, new fake_sessions(requester));

+    use_sessions (configuration, new fake_sessions (requester));

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

     pam_handle_t *handle (0);

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

@@ -170,7 +176,8 @@ int authenticate_fails_with_wrong_user()

     // given

     dual_control_configuration configuration;

     std::string token ("token");

-    use_validator (configuration, new fake_validator ("requester", "user", token));

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

+                   token));

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

                       token));

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

@@ -187,9 +194,10 @@ int authenticate_fails_with_wrong_token()

 {

     // given

     dual_control_configuration configuration;

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

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

-    use_validator (configuration, new fake_validator (requester, authorizer, "token"));

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

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

+    use_validator (configuration, new fake_validator (requester, authorizer,

+                   "token"));

     use_conversation (configuration, new fake_conversation (authorizer,

                       "wrong token"));

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

@@ -206,12 +214,13 @@ int logs_authentication()

 {

     //given

     dual_control_configuration configuration;

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

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

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

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

     std::string token ("token");

-    use_validator (configuration, new fake_validator (requester, authorizer, token));

+    use_validator (configuration, new fake_validator (requester, authorizer,

+                   token));

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

-    use_sessions(configuration, new fake_sessions(requester));

+    use_sessions (configuration, new fake_sessions (requester));

     mock_logger *test_logger;

     use_logger (configuration, test_logger = new mock_logger);

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

@@ -235,13 +244,13 @@ int logs_authentication_failure()

 {

     //given

     dual_control_configuration configuration;

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

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

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

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

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

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

     use_validator (configuration, new fake_validator (requester, authorizer,

                    "not the received token"));

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

-    use_sessions(configuration, new fake_sessions(requester));

+    use_sessions (configuration, new fake_sessions (requester));

     mock_logger *test_logger;

     use_logger (configuration, test_logger = new mock_logger);

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

@@ -23,7 +23,8 @@ private:

     sys_syslog syslog_;

 public:

     impl (const sys_syslog &sys_syslog) : syslog_ (sys_syslog) {}

-    void log (int result, const std::string &requester_user_name, const std::string &authorizer_user_name,

+    void log (int result, const std::string &requester_user_name,

+              const std::string &authorizer_user_name,

               const std::string &token)

     {

         std::string message;

@@ -34,19 +35,22 @@ public:

         case PAM_SUCCESS:

             facility = LOG_AUTHPRIV;

             priority = LOG_NOTICE;

-            message = requester_user_name + " " + authorizer_user_name + " " + token + " " + "success";

+            message = requester_user_name + " " + authorizer_user_name + " " + token +

+                      " " + "success";

             break;

         case PAM_AUTH_ERR:

             facility = LOG_AUTHPRIV;

             priority = LOG_NOTICE;

-            message = requester_user_name + " " + authorizer_user_name + " " + token + " " + "fail";

+            message = requester_user_name + " " + authorizer_user_name + " " + token +

+                      " " + "fail";

             break;

         default:

             facility = LOG_AUTH;

             priority = LOG_ERR;

-            message = requester_user_name + " " + authorizer_user_name + " pam returned error";

+            message = requester_user_name + " " + authorizer_user_name +

+                      " pam returned error";

             break;

         }

@@ -21,7 +21,8 @@ class logger_ifc

 {

 public:

     virtual ~logger_ifc() {}

-    virtual void log (int result, const std::string &requester_user_name, const std::string &authorizer_user_name,

+    virtual void log (int result, const std::string &requester_user_name,

+                      const std::string &authorizer_user_name,

                       const std::string &token) {};

 };

@@ -35,7 +36,8 @@ public:

     logger (const delegate &delegate) : delegate_

         (delegate) {}

     logger() : logger (delegate (new logger_ifc)) {}

-    void log (int result, const std::string &requester_user_name, const std::string &authorizer_user_name,

+    void log (int result, const std::string &requester_user_name,

+              const std::string &authorizer_user_name,

               const std::string &token)

     {

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

@@ -60,7 +60,8 @@ int logs_success()

     //then

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

-    check (capture->message == requester_user + " " + authorizer_user + " " + token + " " + "success",

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

+           token + " " + "success",

            "message does not match");

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

     check (capture->closed, "syslog not closed");

@@ -84,7 +85,8 @@ int logs_failure()

     //then

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

-    check (capture->message == requester + " " + authorizer + " " + token + " " + "fail",

+    check (capture->message == requester + " " + authorizer + " " + token + " "

+           + "fail",

            "message does not match");

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

     check (capture->closed, "syslog not closed");

@@ -108,7 +110,8 @@ int logs_pam_service_error()

     //then

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

-    check (capture->message == requester + " " + authorizer + " pam returned error",

+    check (capture->message == requester + " " + authorizer +

+           " pam returned error",

            "message does not match");

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

     check (capture->closed, "syslog not closed");

@@ -29,8 +29,8 @@ public:

 class sessions

 {

-    public:

-        typedef std::shared_ptr<sessions_ifc> delegate;

+public:

+    typedef std::shared_ptr<sessions_ifc> delegate;

 private:

     delegate delegate_;

 public: