1634393
diff -up Linux-PAM-1.1.8/modules/pam_tally2/pam_tally2.c.audit-user-mgmt Linux-PAM-1.1.8/modules/pam_tally2/pam_tally2.c
1634393
--- Linux-PAM-1.1.8/modules/pam_tally2/pam_tally2.c.audit-user-mgmt	2013-06-18 16:11:21.000000000 +0200
1634393
+++ Linux-PAM-1.1.8/modules/pam_tally2/pam_tally2.c	2014-10-17 12:09:12.965490940 +0200
1634393
@@ -997,9 +997,9 @@ main( int argc UNUSED, char **argv )
1634393
 #ifdef HAVE_LIBAUDIT
1634393
         char buf[64];
1634393
         int audit_fd = audit_open();
1634393
-        snprintf(buf, sizeof(buf), "pam_tally2 uid=%u reset=%hu", uid, cline_reset);
1634393
-        audit_log_user_message(audit_fd, AUDIT_USER_ACCT,
1634393
-                buf, NULL, NULL, ttyname(STDIN_FILENO), 1);
1634393
+        snprintf(buf, sizeof(buf), "pam_tally2 reset=%hu", cline_reset);
1634393
+        audit_log_acct_message(audit_fd, AUDIT_USER_MGMT, NULL,
1634393
+                buf, NULL, uid, NULL, NULL, ttyname(STDIN_FILENO), 1);
1634393
         if (audit_fd >=0)
1634393
                 close(audit_fd);
1634393
 #endif
1634393
@@ -1040,11 +1040,10 @@ main( int argc UNUSED, char **argv )
1634393
     }
1634393
     else if ( !cline_reset ) {
1634393
 #ifdef HAVE_LIBAUDIT
1634393
-      char buf[64];
1634393
       int audit_fd = audit_open();
1634393
-      snprintf(buf, sizeof(buf), "pam_tally2 uid=all reset=0");
1634393
-      audit_log_user_message(audit_fd, AUDIT_USER_ACCT,
1634393
-              buf, NULL, NULL, ttyname(STDIN_FILENO), 1);
1634393
+      audit_log_acct_message(audit_fd, AUDIT_USER_MGMT, NULL,
1634393
+              "pam_tally2-reset-all-accts reset=0", "*", -1,
1634393
+               NULL, NULL, ttyname(STDIN_FILENO), 1);
1634393
       if (audit_fd >=0)
1634393
               close(audit_fd);
1634393
 #endif