Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-29 07:42:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bugzilla Bug 351482: Use audit_log_user_message, if available. Otherwise,

Browse Source 
fall back on audit_send_user_message, which exists in older versions of
libaudit.so.0. r=glen.beasley,relyea.
This commit is contained in:
wtchang%redhat.com 2006-09-08 00:16:53 +00:00
parent c84efc3fc7
commit 0647084026
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
security/nss/lib/softoken/fipstokn.c
View File

@ -84,6 +84,8 @@ static void (*audit_close_func)(int fd);
static int (*audit_log_user_message_func)(int audit_fd, int type,
const char *message, const char *hostname, const char *addr,
const char *tty, int result);
static int (*audit_send_user_message_func)(int fd, int type,
const char *message);
static pthread_once_t libaudit_once_control = PTHREAD_ONCE_INIT;
@ -96,8 +98,16 @@ libaudit_init(void)
}
audit_open_func = dlsym(libaudit_handle, "audit_open");
audit_close_func = dlsym(libaudit_handle, "audit_close");
/*
* audit_send_user_message is the older function.
* audit_log_user_message, if available, is preferred.
*/
audit_log_user_message_func = dlsym(libaudit_handle,
"audit_log_user_message");
if (!audit_log_user_message_func) {
audit_send_user_message_func = dlsym(libaudit_handle,
"audit_send_user_message");
}
}
#endif /* LINUX */
@ -353,8 +363,12 @@ sftk_LogAuditMessage(NSSAuditSeverity severity, const char *msg)
PR_smprintf_free(message);
return;
}
audit_log_user_message_func(audit_fd, AUDIT_USER, message,
NULL, NULL, NULL, result);
if (audit_log_user_message_func) {
audit_log_user_message_func(audit_fd, AUDIT_USER, message,
NULL, NULL, NULL, result);
} else {
audit_send_user_message_func(audit_fd, AUDIT_USER, message);
}
audit_close_func(audit_fd);
PR_smprintf_free(message);
}