@@ -1,17 +1,6 @@

+sudo: required

+dist: trusty

 install:

   - sudo apt-get install libpam0g-dev

 language: cpp

-sudo: required

-script:

-  - sudo unlink /usr/bin/gcc && sudo ln -s /usr/bin/gcc-6 /usr/bin/gcc

-  - sudo unlink /usr/bin/g++ && sudo ln -s /usr/bin/g++-6 /usr/bin/g++

-  - gcc --version

-  - ./configure && make && make test

-addons:

-  apt:

-    sources:

-    - ubuntu-toolchain-r-test

-    packages:

-    - gcc-6

-    - g++-6

@@ -1,9 +1,9 @@

 CXXFLAGS += -fPIC -fno-stack-protector -std=c++11

 CFLAGS += -fPIC -fno-stack-protector

-LDFLAGS += -lpam

+LDFLAGS = -lpam

-OBJS = dual_control.o request.o dual_control_integrate.o validator.o conversation.o user.o \

-		sys_unistd.o sys_pwd.o token.o sys_fstream.o sys_syslog.o logger.o pam.o

+INTEGRATION_OBJS = sys_syslog.o sys_fstream.o sys_unistd.o sys_pwd.o pam.o dual_control_integrate.o

+OBJS = dual_control.o request.o validator.o conversation.o user.o token.o logger.o

 TESTS = dual_control_test validator_test conversation_test request_test user_test token_test \

 		logger_test

 TESTOBJS = $(patsubst %,%.o,$(TESTS))

@@ -42,7 +42,7 @@ distclean: clean

 -include .depend

 $(TESTS): %: %.o $(OBJS)

-	@$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS)  -o $@ $^

+	@$(CXX) $(CXXFLAGS) $(CPPFLAGS)  -o $@ $^

 	@./$@

 .PHONY: test

@@ -52,7 +52,7 @@ test: $(TESTS)

 .PHONY: install

 install: $(OBJS)

 ifeq ($(UNAME_S), Linux)

-	ld $(LDFLAGS) -x --shared -lpam -o $(DESTDIR)@PAM_MODULE_DIRECTORY@/$(MODULELIB) $(OBJS)

+	ld $(LDFLAGS) -x --shared -o $(DESTDIR)@PAM_MODULE_DIRECTORY@/$(MODULELIB) $(OBJS) $(INTEGRATION_OBJS)

 else

 	@echo installation recipe not known for $(UNAME_S)

 endif

@@ -128,7 +128,7 @@ int authenticate_validates_with_received_token()

     use_conversation (configuration, new fake_conversation (user, token));

     dual_control dc (dual_control::create (configuration));

     pam_handle_t *handle (0);

-    std::vector<const std::string> arguments;

+    std::vector<std::string> arguments;

     // when

     int actual = dc.authenticate (req());

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

 #include <memory>

 #include <vector>

-#include <iostream>

 #include "user.h"

 #include "sys_unistd.h"

@@ -18,13 +18,16 @@ class fake_pwd : public pwd_ifc

 {

 private:

     std::string expected_user_name_;

+    std::string home_directory_;

 public:

     fake_pwd (const std::string expected_user_name) : expected_user_name_

-        (expected_user_name) {}

+        (expected_user_name), home_directory_ ("/somehome") {}

     int getpwnam_r (const char *user_name, passwd *out, char *buffer,

                     size_t buffer_sz, passwd **result)

     {

         if (expected_user_name_ == user_name)  {

+            out->pw_dir = const_cast<char *> (home_directory_.c_str());

+            out->pw_name = const_cast<char *> (expected_user_name_.c_str());

             *result = out;

         } else {

             *result = 0;

@@ -38,6 +41,7 @@ class match_buffer_pwd : public pwd_ifc

 {

 private:

     long int expected_buffer_sz_;

+    std::string charbuf_;

 public:

     match_buffer_pwd (long int buffer_sz) : expected_buffer_sz_ (buffer_sz) {}

     int getpwnam_r (const char *user_name, passwd *out, char *buffer,

@@ -45,6 +49,8 @@ public:

     {

         if (expected_buffer_sz_ == buffer_sz && buffer != 0) {

+            out->pw_name = const_cast<char *> (charbuf_.c_str());

+            out->pw_dir = const_cast<char *> (charbuf_.c_str());

             *result = out;

         } else {

             *result = 0;