@@ -33,7 +33,7 @@ public:

     }

 };

-class conversation: public conversation_ifc

+class conversation

 {

 private:

     std::shared_ptr<conversation_ifc> delegate_;

@@ -39,7 +39,7 @@ public:

     virtual int setcred (const pam_request &request);

 };

-class dual_control : public dual_control_ifc

+class dual_control

 {

 private:

     std::shared_ptr<dual_control_ifc> delegate_;

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

                       const std::string &token) {};

 };

-class logger : public logger_ifc

+class logger

 {

 public:

     typedef std::shared_ptr<logger_ifc> delegate;

@@ -26,13 +26,14 @@ public:

     }

 };

-class fstreams : public fstreams_ifc

+class fstreams

 {

 public:

     typedef std::shared_ptr<fstreams_ifc> delegate;

 private:

     delegate delegate_;

 public:

+    typedef fstreams_ifc::pstream pstream;

     fstreams (const delegate &delegate) : delegate_ (delegate) {}

     fstreams() : fstreams (delegate (new fstreams_ifc)) {}

     pstream open_fstream (const std::string &file_path)

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

     }

 };

-class pam : public pam_ifc

+class pam

 {

     typedef std::shared_ptr<pam_ifc> delegate;

 private:

@@ -27,7 +27,7 @@ public:

     };

 };

-class pwd : public pwd_ifc

+class pwd

 {

 public:

     typedef std::shared_ptr<pwd_ifc> delegate;

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

     virtual void closelog() {}

 };

-class sys_syslog : public sys_syslog_ifc

+class sys_syslog

 {

 public:

     typedef std::shared_ptr<sys_syslog_ifc> delegate;

@@ -26,7 +26,7 @@ public:

     }

 };

-class unistd : public unistd_ifc

+class unistd

 {

 public:

     typedef std::shared_ptr<unistd_ifc> delegate;

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

     }

 };

-class user_token_supplier : public user_token_supplier_ifc

+class user_token_supplier

 {

 public:

     typedef std::shared_ptr<user_token_supplier_ifc> delegate;

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

     }

 };

-class user : public user_ifc

+class user

 {

 public:

     typedef std::shared_ptr<user_ifc> delegate;

@@ -29,7 +29,7 @@ public:

     }

 };

-class validator : public validator_ifc

+class validator

 {

 private:

     std::shared_ptr<validator_ifc> delegate_;

@@ -39,7 +39,7 @@ public:

     }

 };

-class fake_user_token_supplier : public user_token_supplier

+class fake_user_token_supplier : public user_token_supplier_ifc

 {

 private:

     std::string token_;