From patchwork Sat Mar 27 20:07:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Dan Raymond X-Patchwork-Id: 42792 X-Patchwork-Delegate: azanella@linux.vnet.ibm.com Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 52681385801D; Sat, 27 Mar 2021 20:09:18 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail.FoxValley.net (mail.FoxValley.net [64.135.192.34]) by sourceware.org (Postfix) with SMTP id 14A09385801A for ; Sat, 27 Mar 2021 20:09:15 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 14A09385801A Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=foxvalley.net Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=draymond@foxvalley.net Received: (qmail 22730 invoked from network) for libc-alpha@sourceware.org; 27 Mar 2021 15:09:14 -0500 Received: from unknown (HELO ?192.168.1.3?) (draymond@161.97.241.227) by mail.foxvalley.net with SMTP; 27 Mar 2021 15:09:14 -0500 To: libc-alpha@sourceware.org From: Dan Raymond Subject: [PATCH] Bug 3604: fix calls to openlog() with LOG_KERN facility Message-ID: <1395b5b8-0fc7-ae01-c8e1-5e13f3a4394c@foxvalley.net> Date: Sat, 27 Mar 2021 14:07:44 -0600 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.8.1 MIME-Version: 1.0 Content-Language: en-US X-Spam-Status: No, score=-9.4 required=5.0 tests=BAYES_00, BODY_8BITS, GIT_PATCH_0, KAM_DMARC_STATUS, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" From 93683928886a563a4740e2b42b53752a4a7d431f Mon Sep 17 00:00:00 2001 From: Dan Raymond Date: Sat, 27 Mar 2021 13:51:16 -0600 Subject: [PATCH] Bug 3604: fix calls to openlog() with LOG_KERN facility Reviewed-by: Adhemerval Zanella ---  misc/syslog.c | 6 +++---  1 file changed, 3 insertions(+), 3 deletions(-)      int retry = 0; diff --git a/misc/syslog.c b/misc/syslog.c index 2cc63ef287..bb30cd963a 100644 --- a/misc/syslog.c +++ b/misc/syslog.c @@ -285,7 +285,7 @@ __vsyslog_internal(int pri, const char *fmt, va_list ap,      /* Get connected, output the message to the local logger. */      if (!connected) -        openlog_internal(LogTag, LogStat | LOG_NDELAY, 0); +        openlog_internal(NULL, LogStat | LOG_NDELAY, LogFacility);      /* If we have a SOCK_STREAM connection, also send ASCII NUL as         a record terminator.  */ @@ -299,7 +299,7 @@ __vsyslog_internal(int pri, const char *fmt, va_list ap,          /* Try to reopen the syslog connection.  Maybe it went             down.  */          closelog_internal (); -        openlog_internal(LogTag, LogStat | LOG_NDELAY, 0); +        openlog_internal(NULL, LogStat | LOG_NDELAY, LogFacility);            }          if (!connected || __send(LogFile, buf, bufsize, send_flags) < 0) @@ -343,7 +343,7 @@ openlog_internal(const char *ident, int logstat, int logfac)      if (ident != NULL)          LogTag = ident;      LogStat = logstat; -    if (logfac != 0 && (logfac &~ LOG_FACMASK) == 0) +    if ((logfac &~ LOG_FACMASK) == 0)          LogFacility = logfac;