56 lines
2.4 KiB
Diff
56 lines
2.4 KiB
Diff
|
diff -up Linux-PAM-1.1.8/modules/pam_faillock/main.c.audit-user-mgmt Linux-PAM-1.1.8/modules/pam_faillock/main.c
|
||
|
|
--- Linux-PAM-1.1.8/modules/pam_faillock/main.c.audit-user-mgmt 2014-10-17 12:09:12.928490104 +0200
|
||
|
|
+++ Linux-PAM-1.1.8/modules/pam_faillock/main.c 2014-10-17 12:09:43.001169008 +0200
|
||
|
|
@@ -127,7 +127,6 @@ do_user(struct options *opts, const char
|
||
|
|
}
|
||
|
|
if (opts->reset) {
|
||
|
|
#ifdef HAVE_LIBAUDIT
|
||
|
|
- char buf[64];
|
||
|
|
int audit_fd;
|
||
|
|
#endif
|
||
|
|
|
||
|
|
@@ -141,10 +140,8 @@ do_user(struct options *opts, const char
|
||
|
|
if ((audit_fd=audit_open()) >= 0) {
|
||
|
|
|
||
|
|
if (pwd != NULL) {
|
||
|
|
- snprintf(buf, sizeof(buf), "faillock reset uid=%u",
|
||
|
|
- pwd->pw_uid);
|
||
|
|
- audit_log_user_message(audit_fd, AUDIT_USER_ACCT,
|
||
|
|
- buf, NULL, NULL, NULL, rv == 0);
|
||
|
|
+ audit_log_acct_message(audit_fd, AUDIT_USER_MGMT, NULL,
|
||
|
|
+ "faillock-reset", NULL, pwd->pw_uid, NULL, NULL, NULL, rv == 0);
|
||
|
|
}
|
||
|
|
close(audit_fd);
|
||
|
|
}
|
||
|
|
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
|
||
|
|
--- Linux-PAM-1.1.8/modules/pam_tally2/pam_tally2.c.audit-user-mgmt 2013-06-18 16:11:21.000000000 +0200
|
||
|
|
+++ Linux-PAM-1.1.8/modules/pam_tally2/pam_tally2.c 2014-10-17 12:09:12.965490940 +0200
|
||
|
|
@@ -997,9 +997,9 @@ main( int argc UNUSED, char **argv )
|
||
|
|
#ifdef HAVE_LIBAUDIT
|
||
|
|
char buf[64];
|
||
|
|
int audit_fd = audit_open();
|
||
|
|
- snprintf(buf, sizeof(buf), "pam_tally2 uid=%u reset=%hu", uid, cline_reset);
|
||
|
|
- audit_log_user_message(audit_fd, AUDIT_USER_ACCT,
|
||
|
|
- buf, NULL, NULL, ttyname(STDIN_FILENO), 1);
|
||
|
|
+ snprintf(buf, sizeof(buf), "pam_tally2 reset=%hu", cline_reset);
|
||
|
|
+ audit_log_acct_message(audit_fd, AUDIT_USER_MGMT, NULL,
|
||
|
|
+ buf, NULL, uid, NULL, NULL, ttyname(STDIN_FILENO), 1);
|
||
|
|
if (audit_fd >=0)
|
||
|
|
close(audit_fd);
|
||
|
|
#endif
|
||
|
|
@@ -1040,11 +1040,10 @@ main( int argc UNUSED, char **argv )
|
||
|
|
}
|
||
|
|
else if ( !cline_reset ) {
|
||
|
|
#ifdef HAVE_LIBAUDIT
|
||
|
|
- char buf[64];
|
||
|
|
int audit_fd = audit_open();
|
||
|
|
- snprintf(buf, sizeof(buf), "pam_tally2 uid=all reset=0");
|
||
|
|
- audit_log_user_message(audit_fd, AUDIT_USER_ACCT,
|
||
|
|
- buf, NULL, NULL, ttyname(STDIN_FILENO), 1);
|
||
|
|
+ audit_log_acct_message(audit_fd, AUDIT_USER_MGMT, NULL,
|
||
|
|
+ "pam_tally2-reset-all-accts reset=0", "*", -1,
|
||
|
|
+ NULL, NULL, ttyname(STDIN_FILENO), 1);
|
||
|
|
if (audit_fd >=0)
|
||
|
|
close(audit_fd);
|
||
|
|
#endif
|