syslog-356.1.1.tar.gz

[apple/syslog.git] / libsystem_asl.tproj / src / asl.c

diff --git a/libsystem_asl.tproj/src/asl.c b/libsystem_asl.tproj/src/asl.c
index 78a48bcddfca8a62f9e908df72fd8c8cd9936f0f..8e4777ee97a7c51ffff546d89a866b295d513446 100644 (file)
--- 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;
 }