@@ -67,7 +67,7 @@ public:

 };

 }

-conversation create_conversation (pam &pam)

+conversation conversation::create (pam &pam)

 {

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

 }

@@ -45,6 +45,7 @@ public:

     {

         return delegate_->initiate (request);

     }

+    static conversation create (pam &pam);

 };

 inline conversation wrap (conversation_ifc *delegate)

@@ -52,7 +53,5 @@ inline conversation wrap (conversation_ifc *delegate)

     return conversation (std::shared_ptr<conversation_ifc> (delegate));

 };

-conversation create_conversation (pam &pam);

-

 #endif

@@ -29,6 +29,8 @@ int dual_control_ifc::setcred ( const pam_request &request)

     return PAM_SERVICE_ERR;

 }

+namespace

+{

 class impl : public dual_control_ifc

 {

 private:

@@ -61,9 +63,9 @@ int impl::authenticate (const pam_request &request)

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

     return auth_result;

 }

-

-dual_control create_dual_control (const dual_control_configuration

-                                  &configuration)

+}

+dual_control dual_control::create (const dual_control_configuration

+                                   &configuration)

 {

     return dual_control (std::shared_ptr<dual_control_ifc> (new impl (

                              configuration)));

@@ -56,11 +56,10 @@ public:

     {

         return delegate_->setcred (request);

     }

+    static dual_control create (const dual_control_configuration

+                                &configuration);

 };

-dual_control create_dual_control (const dual_control_configuration

-                                  &configuration);

-

 #endif

@@ -19,8 +19,40 @@

 #include "request.h"

 #include "dual_control.h"

+#include "validator.h"

+#include "logger.h"

+#include "conversation.h"

+#include "user.h"

+#include "token.h"

+#include "sys_pwd.h"

+#include "sys_unistd.h"

+#include "sys_fstream.h"

+#include "pam.h"

+#include "sys_syslog.h"

-dual_control dc;

+namespace

+{

+dual_control initialize()

+{

+    dual_control_configuration configuration;

+    pwd pwd (pwd::create());

+    unistd unistd (unistd::create());

+    directory directory (directory::create (unistd, pwd));

+    fstreams fstreams (fstreams::create());

+    user_token_supplier user_token_supplier (user_token_supplier::create (

+                fstreams));

+    validator validator (validator::create (directory, user_token_supplier));

+    pam pam (pam::create());

+    conversation conversation (conversation::create (pam));

+    sys_syslog sys_syslog (sys_syslog::create());

+    logger logger (logger::create (sys_syslog));

+    configuration.validator = validator;

+    configuration.logger = logger;

+    configuration.conversation = conversation;

+    return dual_control::create (configuration);

+}

+dual_control dc = initialize();

+}

 PAM_EXTERN int pam_sm_authenticate (pam_handle_t *pamh, int flags, int argc,

                                     const char **argv)

@@ -107,7 +107,7 @@ int setcred_returns_success()

 {

     //given

     dual_control_configuration configuration;

-    dual_control dc (create_dual_control (configuration));

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

     //when

     int result = dc.setcred (req());

@@ -126,7 +126,7 @@ int authenticate_validates_with_received_token()

     std::string token ("token");

     use_validator (configuration, new fake_validator (user, token));

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

-    dual_control dc (create_dual_control (configuration));

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

     pam_handle_t *handle (0);

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

@@ -146,7 +146,7 @@ int authenticate_fails_with_wrong_user()

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

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

                       token));

-    dual_control dc (create_dual_control (configuration));

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

     // when

     int actual = dc.authenticate (req());

@@ -164,7 +164,7 @@ int authenticate_fails_with_wrong_token()

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

     use_conversation (configuration, new fake_conversation (user,

                       "wrong token"));

-    dual_control dc (create_dual_control (configuration));

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

     // when

     int actual = dc.authenticate (req());

@@ -184,7 +184,7 @@ int logs_authentication()

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

     mock_logger *test_logger;

     use_logger (configuration, test_logger = new mock_logger);

-    dual_control dc (create_dual_control (configuration));

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

     //when

     dc.authenticate (req());

@@ -210,7 +210,7 @@ int logs_authentication_failure()

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

     mock_logger *test_logger;

     use_logger (configuration, test_logger = new mock_logger);

-    dual_control dc (create_dual_control (configuration));

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

     //when

     dc.authenticate (req());

@@ -9,21 +9,28 @@

  * at https://github.com/cjdev/dual-control.

  */

+#include <memory>

 #include <vector>

 #include <security/pam_modules.h>

 #include <security/pam_appl.h>

 #include "pam.h"

-class syspam : public pam_ifc

+namespace

+{

+class impl : public pam_ifc

 {

 public:

-    int get_conv (pam_handle *handle, const pam_conv **pout);

+    int get_conv (pam_handle *handle, const pam_conv **out)

+    {

+        return ::pam_get_item (handle, PAM_CONV, (const void **)out);

+    }

 };

+}

-int syspam::get_conv (pam_handle *handle,

-                      std::shared_ptr<pam_conv_ifc> &out)

+pam pam::create()

 {

-    return pam_get_item (handle, PAM_CONV, (const void **)pout);

+    static pam singleton (std::shared_ptr<pam_ifc> (new impl));

+    return singleton;

 }

@@ -36,9 +36,8 @@ public:

     {

         return delegate_->get_conv (handle, out);

     }

+    static pam create();

 };

-pam system_pam();

-

 #endif

@@ -28,7 +28,7 @@ public:

 static pwd system_pwd (pwd::delegate (new impl));

 }

-pwd pwd::system()

+pwd pwd::create()

 {

     return system_pwd;

 }

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

     {

         return delegate_-> getpwnam_r (user_name, out, buffer, buffer_sz, result);

     }

-    static pwd system();

+    static pwd create();

 };

 #endif

@@ -25,7 +25,7 @@ public:

 static unistd sys_unistd (unistd::delegate (new impl));

 }

-unistd unistd::system()

+unistd unistd::create()

 {

     return sys_unistd;

 }

@@ -40,7 +40,7 @@ public:

     {

         return delegate_->sysconf (name);

     }

-    static unistd system();

+    static unistd create();

 };

 #endif

@@ -41,8 +41,8 @@ public:

 };

 }

-validator create_validator (const directory &directory,

-                            const user_token_supplier &user_token_supplier)

+validator validator::create (const directory &directory,

+                             const user_token_supplier &user_token_supplier)

 {

     std::shared_ptr<validator_ifc> delegate (new impl (directory,

             user_token_supplier));

@@ -42,10 +42,9 @@ public:

     {

         return delegate_->validate (user_name, token);

     }

+    static validator create (const directory &directory,

+                             const user_token_supplier &token_supplier);

 };

-validator create_validator (const directory &directory,

-                            const user_token_supplier &token_supplier);

-

 #endif