@@ -11,7 +11,7 @@

 #include <syslog.h>

-#include "logging.h"

+//#include "logging.h"

 #include "test_support.h"

 static const char program_name[] = "pam_dual_control";

@@ -13,9 +13,12 @@

 #include <cstring>

 #include <syslog.h>

-#include "logging.h"

+// #include "logging.h"

 #include "test_util.h"

+

+

+/*

 int logged_priority = -1000;

 const char *logged_message = "";

 void fake_syslog (int priority, const char *message, ...)

@@ -93,4 +96,5 @@ int main (int numargs, char **args)

 {

     return !test_runner();

 }

+*/

@@ -13,8 +13,6 @@

 #include <vector>

 #include <memory>

 #include <fstream>

-#include <sstream>

-#include <iostream>

 #include "token.h"

 #include "user.h"

@@ -11,9 +11,10 @@

 #ifndef _TOKEN_H

 #define _TOKEN_H

+

 #include <string>

 #include <memory>

-#include <iostream>

+

 #include "user.h"

 class user_token_supplier_ifc

@@ -22,23 +23,19 @@ public:

     virtual ~user_token_supplier_ifc() {}

     virtual std::string token (user &user)

     {

-        return "virtual supplier";

+        return "";

     }

 };

 class file_reader_ifc

 {

 public:

-    virtual std::string getline (std::ifstream &token_file,

-                                 std::string &fetched_token)

-    {

-        return "";

-    }

     virtual bool open (std::ifstream &token_file, const std::string &file_path)

     {

         return false;

     }

-    virtual std::string read (std::string file_path)

+    virtual std::string getline (std::ifstream &token_file,

+                                 std::string &fetched_token)

     {

         return "";

     }

@@ -62,10 +59,7 @@ public:

     {

         return delegate_->getline (token_file, fetched_token);

     }

-    std::string read (std::string file_path)

-    {

-        return delegate_->read (file_path);

-    }

+

     static file_reader create ();

 };

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

 #include <cstdio>

 #include <sys/stat.h>

 #include <fstream>

-#include <istream>

 #include "token.h"

 #include "test_util.h"