logd: add logd.auditd property
- permit us a mechanism to disable auditd
- standardize property boolean
Bug: 14275676
Change-Id: I76f245c6aee511ed44274159e0ea55915b484dda
diff --git a/logd/LogAudit.cpp b/logd/LogAudit.cpp
index 1056ae4..add0f0e 100644
--- a/logd/LogAudit.cpp
+++ b/logd/LogAudit.cpp
@@ -16,6 +16,7 @@
#include <ctype.h>
#include <errno.h>
+#include <limits.h>
#include <stdarg.h>
#include <stdlib.h>
#include <sys/klog.h>
@@ -39,6 +40,10 @@
struct audit_message rep;
+ rep.nlh.nlmsg_type = 0;
+ rep.nlh.nlmsg_len = 0;
+ rep.data[0] = '\0';
+
if (audit_get_reply(cli->getSocket(), &rep, GET_REPLY_BLOCKING, 0) < 0) {
SLOGE("Failed on audit_get_reply with error: %s", strerror(errno));
return false;
@@ -146,11 +151,8 @@
strcpy(newstr + 1 + l, str);
free(str);
- unsigned short len = n; // cap to internal maximum
- if (len != n) {
- len = -1;
- }
- logbuf->log(AUDIT_LOG_ID, now, uid, pid, tid, newstr, len);
+ logbuf->log(AUDIT_LOG_ID, now, uid, pid, tid, newstr,
+ (n <= USHRT_MAX) ? (unsigned short) n : USHRT_MAX);
reader->notifyNewLog();
free(newstr);