@@ -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,6 @@ inline conversation wrap (conversation_ifc *delegate)

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

 };

-conversation create_conversation (pam &pam);

 #endif

@@ -19,11 +19,33 @@

 #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"

 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();

@@ -9,21 +9,25 @@

  * 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)

-{

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

 }

+

+pam pam::create() {

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

+    return singleton;

+}

@@ -36,9 +36,9 @@ 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,7 +41,7 @@ public:

 };

 }

-validator create_validator (const directory &directory,

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

                             const user_token_supplier &user_token_supplier)

 {

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

@@ -42,10 +42,8 @@ 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