@@ -10,6 +10,6 @@ config.status

 Makefile

 *.log

 autom4te.cache/

-dual_control_test

-logging_test

-.vagrant/

+*_test

+*_test

+

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

 MODULEFLAGS = -fPIC -fno-stack-protector

-MODULEOBJS = dual_control.o logging.o dc_syslog.o token.o

-HEADERS = logging.h dc_syslog.h

-

+MODULEOBJS = dual_control.o logging.o token.o

+TESTOBJS = $(patsubst %.o, t_%.o, $(MODULEOBJS))

+HEADERS = logging.h test_support.h token.h

 MODULELIB = pam_dual_control.so

 UNAME_S := $(shell uname -s)

@@ -15,6 +15,9 @@ dual_control.a: $(MODULEOBJS)

 $(MODULEOBJS): %.o: %.c $(HEADERS)

 	$(CC) -c $(CFLAGS) $(CPPFLAGS) $(MODULEFLAGS) $< -o $@

+$(TESTOBJS): t_%.o: %.c $(HEADERS)

+	$(CC) -c $(CFLAGS) $(CPPFLAGS) $(MODULEFLAGS) -D UNIT_TEST $< -o $@

+

 .PHONY: clean

 clean:

 	@rm -f *.o *.a

@@ -24,17 +27,15 @@ clean:

 distclean: clean

 	@rm -f Makefile config.h

-dual_control_test: dual_control_test.c dual_control.o

+dual_control_test: dual_control_test.c t_dual_control.o

 	$(CC) $(CFLAGS) $(CPPFLAGS) -lpam -o $@ $^

-logging_test: logging_test.c logging.o

+logging_test: logging_test.c t_logging.o

 	$(CC) $(CFLAGS) $(CPPFLAGS) -lpam -o $@ $^

-token_test: token_test.c token.o

+token_test: token_test.c t_token.o

 	$(CC) $(CFLAGS) $(CPPFLAGS) -lpam -o $@ $^

-

-

 .PHONY: test

 test: dual_control_test logging_test token_test

 	@./dual_control_test

deleted file mode 100644

@@ -1,17 +0,0 @@

-#include <stdarg.h>

-#include "dc_syslog.h"

-

-void dc_openlog(const char *ident, int logopt, int facility) {

-    openlog(ident, logopt, facility);

-}

-

-void dc_syslog(int priority, const char *format, ...) {

-    va_list varargs;

-    va_start(varargs, format);

-    vsyslog(priority, format, varargs);

-    va_end(varargs);

-}

-void dc_closelog(void) {

-    closelog();

-}

-

deleted file mode 100644

@@ -1,10 +0,0 @@

-#ifndef _DC_SYSLOG_H

-#define _DC_SYSLOG_H

-

-#include <syslog.h>

-

-void dc_openlog(const char *ident, int logopt, int facility);

-void dc_syslog(int priority, const char *message, ...);

-void dc_closelog(void);

-

-#endif

@@ -4,7 +4,7 @@

 #include "conversation.h"

 #include "token.h"

-#include "testutil.h"

+#include "test_util.h"

 const char *validated_token = "";

 const char *token_to_return = "";

@@ -1,19 +1,21 @@

+#include <syslog.h>

+

 #include "logging.h"

-#include "dc_syslog.h"

+#include "test_support.h"

 static const char program_name[] = "pam_dual_control";

 void log_success() {

-    dc_openlog(program_name, 0, LOG_AUTHPRIV);

-    dc_syslog(LOG_NOTICE, "dual control succeeded");

-    dc_closelog();

+    openlog(program_name, 0, LOG_AUTHPRIV);

+    syslog(LOG_NOTICE, "dual control succeeded");

+    closelog();

 }

 void log_failure() {

-    dc_openlog(program_name, 0, LOG_AUTHPRIV);

-    dc_syslog(LOG_NOTICE, "dual control failed");

-    dc_closelog();

+    openlog(program_name, 0, LOG_AUTHPRIV);

+    syslog(LOG_NOTICE, "dual control failed");

+    closelog();

 }

deleted file mode 100755

Binary files a/logging_test and /dev/null differ

@@ -1,27 +1,26 @@

 #include <stdio.h>

 #include <string.h>

+#include <syslog.h>

-#include "dc_syslog.h"

 #include "logging.h"

-

-#include "testutil.h"

+#include "test_util.h"

 int logged_priority = -1000;

 const char *logged_message = "";

-void dc_syslog(int priority, const char *message, ...) {

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

     logged_priority = priority;

     logged_message = message;

 }

 int close_log_invoked = 0;

-void dc_closelog(void) {

+void fake_closelog(void) {

     close_log_invoked = 1;

 }

 int opened_facility = -1000;

 const char *opened_program_name = "";

 int opened_logopt = -1000;

-void dc_openlog(const char *ident, int logopt, int facility) {

+void fake_openlog(const char *ident, int logopt, int facility) {

     opened_facility = facility;

     opened_program_name = ident;

     opened_logopt = logopt;

new file mode 100644

@@ -0,0 +1,23 @@

+/* Include this in a module that will be under test coverage

+ *

+ */

+

+#ifndef _TEST_SUPPORT_H

+#define _TEST_SUPPORT_H

+

+void fake_openlog(const char *ident, int logopt, int facility);

+void fake_syslog(int priority, const char *format, ...);

+void fake_closelog(void);

+

+/*

+ * replace C library functions with fake counterparts when UINT_TEST symbol

+ * is defined

+ */

+#ifdef UNIT_TEST

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

+#define syslog(PRIORITY, ...) fake_syslog(PRIORITY, __VA_ARGS__)

+#define closelog() fake_closelog()

+#endif

+

+#endif

+

similarity index 100%

rename from testutil.h

rename to test_util.h

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

+#include <security/pam_modules.h>

+

 #include "token.h"

+const char *ask_for_token(pam_handle_t * pamh) {

+    return "";

+}

+

deleted file mode 100755

Binary files a/token_test and /dev/null differ

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

 #include "token.h"

-#include "testutil.h"

+#include "test_util.h"

 int validate_compares_to_user_token() {

     fail();