@@ -12,6 +12,7 @@ PAM_EXTERN int pam_sm_authenticate(pam_handle_t *pamh, int flags, int argc, cons

         log_success();

         return PAM_SUCCESS;

     } else {

+        log_failure();

         return PAM_AUTH_ERR;

     }

 }

@@ -19,3 +20,4 @@ PAM_EXTERN int pam_sm_authenticate(pam_handle_t *pamh, int flags, int argc, cons

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

     return PAM_SUCCESS;

 }

+

@@ -9,15 +9,18 @@

 const char *validated_token = "";

 const char *token_to_return = "";

 int validation_to_return = 0;

-int log_success_invoked = 1;

+int log_success_invoked = 0;

+int log_failure_invoked = 0;

 int at_least_one_failed_test = 0;

 pam_handle_t *passed_pam_handle = NULL;

-#define reset_vars() \

-  validated_token = ""; \

-  validation_to_return = 1; \

-  passed_pam_handle = NULL; \

-  log_success_invoked = 0

+RESET_VARS_START

+validated_token = "";

+validation_to_return = 1;

+passed_pam_handle = NULL;

+log_success_invoked = 0;

+log_failure_invoked = 0;

+RESET_VARS_END

 const char *ask_for_token(pam_handle_t *pamh) {

     passed_pam_handle = pamh;

@@ -33,6 +36,10 @@ void log_success() {

     log_success_invoked = 1;

 }

+void log_failure() {

+    log_failure_invoked = 1;

+}

+

 int pam_sm_setcred_returns_success() {

     //given

@@ -62,15 +69,25 @@ int pam_sm_authenticate_validates_with_received_token() {

 int pam_sm_authenticate_success_invokes_log_success() {

     // given

     validation_to_return = 1;

-    log_success_invoked = 0;

     //when

    pam_sm_authenticate(NULL, 0, 0, NULL);

    return log_success_invoked;

 }

+int pam_sm_authenticate_fail_invokes_log_failure() {

+    // given

+    validation_to_return = 0;

+

+    //when

+   pam_sm_authenticate(NULL, 0, 0, NULL);

+   check(log_failure_invoked, "log failure should be invoked");

+   succeed();

+}

+

 int succeeds_with_valid_token() {

     //given

+    validation_to_return = 1;

     //when

     int result = pam_sm_authenticate(NULL, 0, 0, NULL);

@@ -94,6 +111,7 @@ int runtests() {

     test(pam_sm_authenticate_validates_with_received_token);

     test(pam_sm_setcred_returns_success);

     test(pam_sm_authenticate_success_invokes_log_success);

+    test(pam_sm_authenticate_fail_invokes_log_failure);

     test(succeeds_with_valid_token);

     test(fails_with_invalid_token);

     succeed();

@@ -2,6 +2,6 @@

 #define __DUAL_CONTROL_LOGGING

 void log_success();

-void log_fail();

+void log_failure();

 #endif

Binary files a/logging_test and b/logging_test differ

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

 #include "testutil.h"

-#define reset_vars() \

-    logged_priority = -1000; \

-    close_log_invoked = 0; \

-    opened_facility = -1000; \

-    const char *opened_program_name = ""; \

-    int opened_logopt = -1000; \

-

 int logged_priority = -1000;

 const char *logged_message = "";

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

@@ -34,6 +27,14 @@ void dc_openlog(const char *ident, int logopt, int facility) {

     opened_logopt = logopt;

 }

+RESET_VARS_START

+logged_priority = -1000;

+close_log_invoked = 0;

+opened_facility = -1000;

+const char *opened_program_name = "";

+int opened_logopt = -1000;

+RESET_VARS_END

+

 int test_log_success() {

     // given

@@ -58,3 +59,4 @@ int test_runner() {

 int main(int numargs, char **args) {

     return !test_runner();

 }

+

@@ -2,7 +2,7 @@

 #define _TESTUTIL_H

 #include <string.h>

-

+#include <stdio.h>

 #define check(assertion, msg) \

     if (!(assertion)) { \

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

@@ -15,15 +15,13 @@

 #define checkstr(expected, actual, name) \

     check(!strcmp(expected, actual), name " should be '" expected "'")

-#ifdef reset_vars

-#define _reset reset_vars()

-#else

-#define _reset

-#endif

+#define RESET_VARS_START void __reset_vars() {

+

+#define RESET_VARS_END }

 #define test(NAME) \

     { \

-      _reset \

+      __reset_vars(); \

       int result = NAME (); \

       if (!result) { \

           fprintf(stderr, "test failed: %s\n", #NAME); \