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

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

 };

-

 #endif

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

     return PAM_SERVICE_ERR;

 }

-namespace {

+namespace

+{

 class impl : public dual_control_ifc

 {

 private:

@@ -64,7 +65,7 @@ int impl::authenticate (const pam_request &request)

 }

 }

 dual_control dual_control::create (const dual_control_configuration

-                                  &configuration)

+                                   &configuration)

 {

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

                              configuration)));

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

         return delegate_->setcred (request);

     }

     static dual_control create (const dual_control_configuration

-                                  &configuration);

+                                &configuration);

 };

-

 #endif

@@ -30,25 +30,28 @@

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

+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,

@@ -16,18 +16,21 @@

 #include "pam.h"

-namespace {

+namespace

+{

 class impl : public pam_ifc

 {

 public:

-    int get_conv (pam_handle *handle, const pam_conv **out) {

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

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

+    {

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

     }

 };

 }

-

-pam pam::create() {

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

+pam pam::create()

+{

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

     return singleton;

 }

+

@@ -39,6 +39,5 @@ public:

     static pam create();

 };

-

 #endif

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

 }

 validator validator::create (const directory &directory,

-                            const user_token_supplier &user_token_supplier)

+                             const user_token_supplier &user_token_supplier)

 {

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

             user_token_supplier));

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

     {

         return delegate_->validate (user_name, token);

     }

-    static validator create(const directory &directory, const user_token_supplier &token_supplier);

+    static validator create (const directory &directory,

+                             const user_token_supplier &token_supplier);

 };

 #endif