similarity index 100%

rename from conversation.c

rename to conversation.cc

similarity index 95%

rename from dual_control.c

rename to dual_control.cc

@@ -1,7 +1,7 @@

 #include <security/pam_appl.h>

 #include <security/pam_modules.h>

-#include <string.h>

-#include <stdlib.h>

+#include <cstring>

+#include <cstdlib>

 #include "logging.h"

 #include "token.h"

similarity index 99%

rename from dual_control_test.c

rename to dual_control_test.cc

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

 #include <security/pam_appl.h>

 #include <security/pam_modules.h>

-#include <stdio.h>

+#include <cstdio>

 #include "conversation.h"

 #include "token.h"

similarity index 100%

rename from logging.c

rename to logging.cc

similarity index 97%

rename from logging_test.c

rename to logging_test.cc

@@ -1,5 +1,5 @@

-#include <stdio.h>

-#include <string.h>

+#include <cstdio>

+#include <cstring>

 #include <syslog.h>

 #include "logging.h"

@@ -4,8 +4,8 @@

 #ifndef _TEST_SUPPORT_H

 #define _TEST_SUPPORT_H

-#include <stdlib.h>

-#include <stdio.h>

+#include <cstdlib>

+#include <cstdio>

 #include <pwd.h>

 #include <sys/stat.h>

 // SYSLOG

@@ -1,8 +1,8 @@

 #ifndef _TESTUTIL_H

 #define _TESTUTIL_H

-#include <string.h>

-#include <stdio.h>

+#include <cstring>

+#include <cstdio>

 #define check(assertion, msg) \

     if (!(assertion)) { \

       fprintf(stderr, "assertion failed: %s\n", msg); \

similarity index 97%

rename from token.c

rename to token.cc

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

-#include <stdlib.h>

-#include <string.h>

+#include <cstdlib>

+#include <cstring>

 #include <security/pam_modules.h>

 #include <pwd.h>

 #include <unistd.h>

-#include <stdio.h>

+#include <cstdio>

 #include <sys/stat.h>

 #include "token.h"

@@ -45,9 +45,11 @@ int get_passwd(const char *user, struct passwd *passwd, buffer_t buffer) {

     return (found_passwd != 0);

 }

-int validate_token(const char *user, const char *token) {

+int validate_token(const char *user, const char *token) {

+    char fetched_token[7];

+    FILE *fp = 0;

     char *filepath = 0;

     char *working_token = 0;

     buffer_t buffer = allocate_buffer();

@@ -55,31 +57,27 @@ int validate_token(const char *user, const char *token) {

     int ok = 0;

     struct passwd passwd;

     int user_found = get_passwd(user, &passwd, buffer);

-

-    // check if user is known

-    if(!user_found) {

-       goto finally;

-    }

-

     const char *directory = passwd.pw_dir;

-

     int dir_len = strlen(directory);

     int fname_len = strlen(".dual_control");

+    struct stat file_stat;

     filepath = (char *)malloc((dir_len + 1 + fname_len + 1) * sizeof(char));

     strcpy(filepath, directory);

     strcat(filepath, "/");

     strcat(filepath, ".dual_control");

-

-    struct stat file_stat;

     int check_file = stat(filepath, &file_stat);

+    // check if user is known

+    if(!user_found) {

+       goto finally;

+    }

+

+

     if (check_file) {

         goto finally;

     }

     // read the file and grab token

-    char fetched_token[7];

-    FILE *fp = 0;

     fp = fopen(filepath, "r");

     fgets(fetched_token, 7, fp);

     fclose(fp);

similarity index 92%

rename from token_test.c

rename to token_test.cc

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

-#include <string.h>

+#include <cstring>

 #include <pwd.h>

-#include <stdio.h>

+#include <cstdio>

 #include <sys/stat.h>

 #include "token.h"

@@ -10,7 +10,7 @@ const char *fake_user = "";

 const char *fake_user_token = "";

 // all the fake system calls

-char *fake_home_dir = "";

+const char *fake_home_dir = "";

 int fake_getpwnam_r(const char *nam, struct passwd *pwd, char *buffer, size_t bufsize, struct passwd **result) {

   strcpy(buffer, fake_home_dir);

   pwd->pw_dir = buffer;

@@ -20,13 +20,13 @@ int fake_getpwnam_r(const char *nam, struct passwd *pwd, char *buffer, size_t bu

 }

-char *fake_stat_path = "";

+const char *fake_stat_path = "";

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

     return (strcmp(fake_stat_path, path));

 }

-char *fake_fopen_path = "";

-char *fake_fopen_mode = "";

+const char *fake_fopen_path = "";

+const char *fake_fopen_mode = "";

 FILE *_fhandle = 0;

 FILE *fake_fopen(const char *path, const char *mode) {

     static FILE handle;