From 3cdd567c187c10b7decc42c9d15b29749836a2a9 Mon Sep 17 00:00:00 2001 From: Apple Date: Wed, 9 Oct 2019 18:38:04 +0000 Subject: [PATCH] syslog-377.60.2.tar.gz --- libsystem_asl.tproj/src/asl.c | 3 +-- syslogd.tproj/after_install.sh | 9 ++------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/libsystem_asl.tproj/src/asl.c b/libsystem_asl.tproj/src/asl.c index 8e255b4..a504cd4 100644 --- a/libsystem_asl.tproj/src/asl.c +++ b/libsystem_asl.tproj/src/asl.c @@ -289,7 +289,6 @@ asl_open(const char *ident, const char *facility, uint32_t opts) asl_client_t *asl = asl_client_open(ident, facility, opts); if (asl == NULL) return NULL; - _asl_global_init(); if (!(opts & ASL_OPT_NO_REMOTE)) _asl_notify_open(1); return (asl_object_t)asl; @@ -1385,7 +1384,6 @@ _asl_send_message(asl_object_t obj, uint32_t eval, asl_msg_t *msg, const char *m return outstatus; } - _asl_global_init(); outstatus = 0; /* @@ -1480,6 +1478,7 @@ _asl_send_message(asl_object_t obj, uint32_t eval, asl_msg_t *msg, const char *m } #endif + _asl_global_init(); if ((_asl_global.server_port != MACH_PORT_NULL) && (eval & EVAL_SEND_ASL)) { asl_string_t *send_str; diff --git a/syslogd.tproj/after_install.sh b/syslogd.tproj/after_install.sh index 55d50c0..05e5854 100755 --- a/syslogd.tproj/after_install.sh +++ b/syslogd.tproj/after_install.sh @@ -8,17 +8,12 @@ elif [[ "${PLATFORM_NAME}" == "macosx" ]] ; then ASL_CONF="${SRCROOT}"/syslogd.tproj/asl.conf.osx SYSLOG_CONF="${SRCROOT}"/syslogd.tproj/syslog.conf elif [[ "${PLATFORM_NAME}" == "bridgeos" ]] ; then - PLIST="${SRCROOT}"/syslogd.tproj/com.apple.syslogd.plist - ASL_CONF="${SRCROOT}"/syslogd.tproj/asl.conf.ios - SYSLOG_CONF="${SRCROOT}"/syslogd.tproj/syslog.conf - SYSTEM_LOG_CONF="${SRCROOT}"/syslogd.tproj/com.apple.system.log.bridgeos -elif [[ "${PLATFORM_NAME}" == "watchos" ]] ; then PLIST="${SRCROOT}"/syslogd.tproj/com.apple.syslogd.disabled.plist ASL_CONF="${SRCROOT}"/syslogd.tproj/asl.conf.ios SYSLOG_CONF="${SRCROOT}"/syslogd.tproj/syslog.conf - SYSTEM_LOG_CONF="${SRCROOT}"/syslogd.tproj/com.apple.system.log + SYSTEM_LOG_CONF="${SRCROOT}"/syslogd.tproj/com.apple.system.log.bridgeos else - PLIST="${SRCROOT}"/syslogd.tproj/com.apple.syslogd.plist + PLIST="${SRCROOT}"/syslogd.tproj/com.apple.syslogd.disabled.plist ASL_CONF="${SRCROOT}"/syslogd.tproj/asl.conf.ios SYSLOG_CONF="${SRCROOT}"/syslogd.tproj/syslog.conf SYSTEM_LOG_CONF="${SRCROOT}"/syslogd.tproj/com.apple.system.log -- 2.47.2