X-Git-Url: https://git.saurik.com/apple/syslog.git/blobdiff_plain/15d86b03f7cbb54d2ca0e4c0ef9ed26542aa8a3a..797dbbb8a01179b913d8a1a41242f4a7673577f8:/libsystem_asl.tproj/src/asl.c diff --git a/libsystem_asl.tproj/src/asl.c b/libsystem_asl.tproj/src/asl.c index 78a48bc..8e4777e 100644 --- a/libsystem_asl.tproj/src/asl.c +++ b/libsystem_asl.tproj/src/asl.c @@ -559,15 +559,21 @@ _asl_evaluate_send(asl_object_t client, asl_object_t m, int slevel) val = NULL; if ((asl_msg_lookup(msg, ASL_KEY_OPTION, &val, NULL) == 0) && (val != NULL)) eval &= ~EVAL_SEND_TRACE; - /* don't send lastlog/utmp messages to Activity Tracing */ - val = NULL; - if ((asl_msg_lookup(msg, ASL_KEY_FACILITY, &val, NULL) == 0) && (val != NULL) && - (!strcmp(val, FACILITY_LASTLOG) || !strcmp(val, FACILITY_UTMPX))) eval &= ~EVAL_SEND_TRACE; - /* don't send CFLog messages to Activity Tracing */ val = NULL; if ((asl_msg_lookup(msg, ASL_KEY_CFLOG_LOCAL_TIME, &val, NULL) == 0) && (val != NULL)) eval &= ~EVAL_SEND_TRACE; + val = NULL; + if (((asl_msg_lookup(msg, ASL_KEY_FACILITY, &val, NULL) == 0) && (val != NULL)) || + ((asl_msg_lookup(asl->kvdict, ASL_KEY_FACILITY, &val, NULL) == 0) && (val != NULL))) + { + /* don't send lastlog/utmp messages to Activity Tracing */ + if (!strcmp(val, FACILITY_LASTLOG) || !strcmp(val, FACILITY_UTMPX)) eval &= ~EVAL_SEND_TRACE; + + /* don't send LOG_INSTALL messages to Activity Tracing */ + if (!strcmp(val, asl_syslog_faciliy_num_to_name(LOG_INSTALL))) eval &= ~EVAL_SEND_TRACE; + } + return eval; }