am 3e73a99f: Merge "logd: auditd: add logd.auditd.dmesg property"

* commit '3e73a99ff28a0fc0765ad3fc899cfb15f5c230f8':
  logd: auditd: add logd.auditd.dmesg property

1 files changed, 9 insertions, 1 deletions

diff --git a/logd/main.cpp b/logd/main.cpp
index 83ec6c0..7346e2f 100644
--- a/logd/main.cpp
+++ b/logd/main.cpp
@@ -84,6 +84,13 @@ static int drop_privs() {
 // space logger.  Additional transitory per-client threads are created
 // for each reader once they register.
 int main() {
+    int fdDmesg = -1;
+    char dmesg[PROPERTY_VALUE_MAX];
+    property_get("logd.auditd.dmesg", dmesg, "1");
+    if (atol(dmesg)) {
+        fdDmesg = open("/dev/kmsg", O_WRONLY);
+    }
+
     if (drop_privs() != 0) {
         return -1;
     }
@@ -136,9 +143,10 @@ int main() {
     // and LogReader is notified to send updates to connected clients.
 
     // failure is an option ... messages are in dmesg (required by standard)
-    LogAudit *al = new LogAudit(logBuf, reader);
+    LogAudit *al = new LogAudit(logBuf, reader, fdDmesg);
     if (al->startListener()) {
         delete al;
+        close(fdDmesg);
     }
 
     pause();