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

 MODULEFLAGS = -fPIC -fno-stack-protector

-SYSOBJS = logging.o

-LOGICOBJS = dual_control.o

-MODULEOBJS = $(SYSOBJS) $(LOGICOBJS)

+MODULEOBJS = dual_control.o logging.o dc_syslog.o

+HEADERS = logging.h dc_syslog.h

 MODULELIB = pam_dual_control.so

 UNAME_S := $(shell uname -s)

@@ -13,7 +12,7 @@ dual_control.a: $(MODULEOBJS)

 	ar rvs $@ $^

 	ranlib $@

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

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

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

 .PHONY: clean

@@ -25,14 +24,13 @@ clean:

 distclean: clean

 	@rm -f Makefile config.h

-dual_control_test: dual_control_test.c $(LOGICOBJS)

+dual_control_test: dual_control_test.c dual_control.o

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

 .PHONY: test

 test: dual_control_test

 	@./dual_control_test > /dev/null

-

 .PHONY: install

 install: $(MODULEOBJS)

 ifeq ($(UNAME_S), Linux)

@@ -41,6 +39,3 @@ else

 	@echo installation recipe not known for $(UNAME_S)

 endif

-

-

-

new file mode 100644

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

+#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();

+}

+

new file mode 100644

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

+#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

@@ -10,8 +10,8 @@ PAM_EXTERN int pam_sm_acct_mgmt(pam_handle_t *pamh, int flags, int argc, const c

 PAM_EXTERN int pam_sm_authenticate(pam_handle_t *pamh, int flags, int argc, const char **argv) {

     printf("Authentication\n");

-    log_dual_control();

+    log_success();

     return PAM_SUCCESS;

 }

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

 #include <security/pam_modules.h>

 #include <stdio.h>

-int log_dual_control_invoked = 0;

-void log_dual_control() {

-    log_dual_control_invoked = 1;

+int log_success_invoked = 0;

+void log_success() {

+    log_success_invoked = 1;

 }

 int pam_sm_acct_mgmt_returns_successs() {

@@ -36,13 +36,13 @@ int pam_sm_setcred_returns_success() {

     return result == PAM_SUCCESS;

 }

-int pam_sm_authenticate_invokes_log() {

+int pam_sm_authenticate_invokes_log_success() {

     // given

-    log_dual_control_invoked = 0;

+    log_success_invoked = 0;

     //when

    pam_sm_authenticate(NULL, 0, 0, NULL);

-   return log_dual_control_invoked;

+   return log_success_invoked;

 }

@@ -62,9 +62,9 @@ int main(int argc, char* argv[]) {

         fprintf(stderr, "set cred failed\n");

     }

-    int test4_result = pam_sm_authenticate_invokes_log();

+    int test4_result = pam_sm_authenticate_invokes_log_success();

     if (!test4_result) {

-        fprintf(stderr, "authenticate invokes log failed\n");

+        fprintf(stderr, "authenticate invokes log_success failed\n");

     }

     if (test1_result && test2_result && test3_result && test4_result) {

@@ -1,18 +1,12 @@

 #include "logging.h"

-#include <syslog.h>

+#include "dc_syslog.h"

-/*

-void openlog(const char *ident, int option, int facility);

-void syslog(int priority, const char *format, ...);

-void closelog(void);

-void vsyslog(int priority, const char *format, va_list ap);

-*/

 static const char program_name[] = "pam_dual_control";

-void log_dual_control() {

-    openlog(program_name, 0, LOG_AUTHPRIV);

-    syslog(LOG_NOTICE, "Logged: ");

-    closelog();

+void log_success() {

+    dc_openlog(program_name, 0, LOG_AUTHPRIV);

+    dc_syslog(LOG_NOTICE, "Logged: ");

+    dc_closelog();

 }

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

 #ifndef __DUAL_CONTROL_LOGGING

 #define __DUAL_CONTROL_LOGGING

-void log_dual_control();

-

-

+void log_success();

+void log_fail();

 #endif