@@ -14,3 +14,4 @@ std::vector<const std::string> convert_arguments (int nargs,

     return std::vector<const std::string> (temp.begin(), temp.end());

 }

+

@@ -78,3 +78,4 @@ int main()

 {

     return !run_tests();

 }

+

@@ -63,3 +63,4 @@ std::string pam_token_conversation::user_name()

 {

     return user_;

 }

+

@@ -7,8 +7,6 @@

 #include "pam.h"

-

-

 class conversation_result

 {

 private:

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

     }

 };

-

 class conversations_ifc

 {

 public:

@@ -7,7 +7,6 @@

 #include "test_util.h"

 #include "pam.h"

-

 class fake_pam_conversation : public pam_conversation

 {

 private:

@@ -133,7 +132,6 @@ public:

     }

 };

-

 int returns_correct_token()

 {

     //given

@@ -158,7 +156,6 @@ int returns_correct_user_name()

                                            fake_pam_conversation ("sally:token");

     pam_p pam = (pam_p)new fake_pam (fake_conversation);

-

     //when

     pam_token_conversation conversation (pamh, pam);

@@ -260,7 +257,6 @@ int prompts_user_with_correct_text()

                                             match_prompt_text_conversation ("Dual control token: ");

     pam_p pam = (pam_p)new fake_pam (match_conversation);

-

     // when / then

     try {

         pam_token_conversation conversation (pamh, pam);

@@ -279,7 +275,6 @@ int prompts_user_with_correct_style()

                                             match_prompt_style_conversation (PAM_PROMPT_ECHO_OFF);

     pam_p pam = (pam_p)new fake_pam (match_conversation);

-

     // when / then

     try {

         pam_token_conversation conversation (pamh, pam);

@@ -347,4 +342,3 @@ int main (int argc, char *args[])

     return !run_tests();

 }

-

@@ -48,5 +48,3 @@ dual_control create_dual_control (const dual_control_configuration

     return dual_control (new impl (configuration));

 }

-

-

@@ -7,14 +7,12 @@

 #include "logger.h"

 #include "test_util.h"

-

 template<class T>

 std::shared_ptr<T> share (T *t)

 {

     return std::shared_ptr<T> (t);

 }

-

 void use_validator (dual_control_configuration &config,

                     validator_ifc *value)

 {

@@ -88,7 +86,6 @@ public:

     }

 };

-

 int setcred_returns_success()

 {

     //given

@@ -221,7 +218,6 @@ int logs_authentication_failure()

     succeed();

 }

-

 RESET_VARS_START

 RESET_VARS_END

@@ -241,4 +237,3 @@ int main (int argc, char *argv[])

     return !runtests();

 }

-

@@ -28,3 +28,4 @@ public:

 };

 #endif

+

@@ -3,7 +3,6 @@

 #include "logging.h"

 #include "test_support.h"

-

 static const char program_name[] = "pam_dual_control";

 void log_success()

@@ -20,4 +19,3 @@ void log_failure()

     closelog();

 }

-

@@ -45,3 +45,4 @@ pam_p get_system_pam()

 {

     return (pam_p)new pam_impl;

 }

+

@@ -24,3 +24,4 @@ typedef std::shared_ptr<pam> pam_p;

 pam_p get_system_pam();

 #endif

+

@@ -25,7 +25,6 @@ FILE *fake_fopen (const char *path, const char *mode);

 char *fake_fgets (char *buf, int n, FILE *fp);

 int fake_fclose (FILE *fp);

-

 #ifdef UNIT_TEST

 // SYSLOG

 #define openlog(IDENT, LOGOPT, FACILITY) fake_openlog(IDENT, LOGOPT, FACILITY)

@@ -10,10 +10,5 @@

 #include <memory>

 #include <fstream>

-

 #include "test_support.h"

-

-

-

-

@@ -5,7 +5,6 @@

 #include "user.h"

-

 class user_token_supplier

 {

 public:

@@ -13,5 +12,5 @@ public:

 };

 typedef std::shared_ptr<user_token_supplier> user_token_supplier_p;

-

 #endif

+

@@ -21,7 +21,6 @@ int fake_getpwnam_r (const char *nam, struct passwd *pwd, char *buffer,

     return !ok;

 }

-

 const char *fake_stat_path = "";

 int fake_stat (const char *path, struct stat *stat)

 {

@@ -61,11 +60,8 @@ int fake_fclose (FILE *fp)

     return 0;

 }

-

 // STDIO

-

-

 RESET_VARS_START

 fake_user = "msmith";

 fake_user_token = "123456";

@@ -75,7 +71,6 @@ fake_fopen_path = fake_stat_path;

 fake_fopen_mode = "r";

 RESET_VARS_END

-

 int validate_compares_to_user_token()

 {

@@ -129,4 +124,3 @@ int main (int argc, char **argv)

     return rval;

 }

-

@@ -55,6 +55,3 @@ const std::shared_ptr<user> create_user (const std::string &user_name)

     return rval;

 }

-

-

-

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

     //        virtual std::string home_directory() = 0;

 };

-

 typedef std::shared_ptr<user> user_p;

 class directory

 {

@@ -3,7 +3,6 @@

 #include "user.h"

 #include "test_util.h"

-

 bool gets_home_directory()

 {

     //given

@@ -21,7 +20,6 @@ bool gets_home_directory()

     return expected_home_directory == actual_home_directory;

 }

-

 std::shared_ptr<struct passwd> fake_passwd;

 int fake_getpwnam_r (const char *nam, struct passwd *pwd, char *buffer,

                      size_t bufsize, struct passwd **result)

@@ -85,5 +83,3 @@ int main (int argc, char *argv[])

     return !run_tests();

 }

-

-

@@ -47,3 +47,4 @@ public:

 };

 #endif

+

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

     }

 };

-

 bool validator_validates()

 {

@@ -48,11 +47,9 @@ bool validator_validates()

     directory_p directory (new fake_directory (user_name));

     old_validator validator (directory, user_token_supplier);

-

     // when

     bool actual = validator.validate (user_name, "token");

-

     // then

     check (actual, "should be valid");

     succeed();

@@ -68,11 +65,9 @@ bool validator_fails_unknown_user()

     directory_p directory (new fake_directory);

     old_validator validator (directory, user_token_supplier);

-

     // when

     bool actual = validator.validate ("notuser", token);

-

     // then

     check (!actual, "should not be valid");

     succeed();

@@ -87,11 +82,9 @@ bool validator_fails_incorrect_token()

     directory_p directory (new fake_directory (user_name));

     old_validator validator (directory, user_token_supplier);

-

     // when

     bool actual = validator.validate (user_name, "token");

-

     // then

     check (!actual, "should not be valid");

     succeed();