From nobody Thu Mar 2 03:01:08 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PRwps35Yfz3vk9G; Thu, 2 Mar 2023 03:01:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PRwpr6rdGz44FM; Thu, 2 Mar 2023 03:01:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677726069; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vBLQMeFTnEjbzwTtLL4BdbWf9lYkLNNDivGq3qM08bM=; b=AF38gMNXYZrKXgq33bD74mMG1WEspJfstlVFsYIajxiMKVSoIMpufbbI8NgEkXcd7NC4M8 25ZppU9YFKWDmltMjYnuNv0wF0zzFeBAnupYpeDL3T7/UMck61ixBwA3sqxMMBmWpxYUme nrIFyJbKCFcrvQJL13V3wKjBCSZyvyifa5p9QHfCLE6icfA9fp30JiKo9T1EBMTN/GvZsl 27VIa8dtOTVqv3dhv6ahQvEJl6To84czbJAq7PUV90/R3DyxCzJCBTccjNXEfUunLVmQNA gkHwmq72WbwakeFa89f2WBErtw1O0Tlk/DXlJa5WBSXLaQA0kiAckcHHXIW/Lw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677726069; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vBLQMeFTnEjbzwTtLL4BdbWf9lYkLNNDivGq3qM08bM=; b=AvC/O/DaHAo8x5FAojBqcp/y1rOXE+BHJ4ym5vIiJlAdWQUqhChzIC5iwu3grrc7N5JsXa 7GjsezQEBMs7Ekeb/gKatZdXpSYCEMtduCVTaE6OBTIGfIJtie93hIN9AZD1nkHpOkKv+A SFVpuPujtbjOxnFzFX8nrvnWqRo+er+s4rxr5zUSEEH2Niemeg8829zveMef/Ph++iJ6+r 1rna7o/lft9bSAyM0kEz+X0KVLlSEWTlBD/yCbptvG3gd8iwkfW4ZGk5eOvMi/hy/sAnfl 7uWmeqz0OIK8bZ1tvgBHijBqmch7+AGBYyICXamIQrujFzLN8AXouJhGC/2ytQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677726069; a=rsa-sha256; cv=none; b=ZMUB0JbsinywEOJxFJcquEanRKQEBXd3UOEfXhgSVypzZQczJGzpfo9EcQj7ATc340LCLO AnJeChU1SJL2SAb4jGaJPwlGgSeWhpcK8ppXc3fc/lqEn1noZ1uN7BGSd18c3OAzgg7MhK xtIy3mVjsb+PdMWPM35j+0noP9G4IliSZWn2Ldcqz5a7QK4zHp3qT2QBGCPGBwQvuUnET+ 1ngkrsL2lGjz/2NJ7M+OV46xkrGCAA8qbiT5qv/ORkqKUlu1URk5WTeiWtQpZMqhwTRTPO B/URcqEggVK3U3ITE2m3OoGL5WGpf94T7mTttJ5Jr15qgBTvvelEwKBc4/fRDg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PRwpr5dbWz10Ym; Thu, 2 Mar 2023 03:01:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 322318R2034399; Thu, 2 Mar 2023 03:01:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 322318tN034398; Thu, 2 Mar 2023 03:01:08 GMT (envelope-from git) Date: Thu, 2 Mar 2023 03:01:08 GMT Message-Id: <202303020301.322318tN034398@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 6f0636728b53 - main - daemon: move syslog facility and syslog tag into log_params List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6f0636728b53c74d3327a8da8c51efee810fbff0 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=6f0636728b53c74d3327a8da8c51efee810fbff0 commit 6f0636728b53c74d3327a8da8c51efee810fbff0 Author: Ihor Antonov AuthorDate: 2023-03-02 03:00:42 +0000 Commit: Kyle Evans CommitDate: 2023-03-02 03:00:42 +0000 daemon: move syslog facility and syslog tag into log_params Since struct log_params already contains logging-related varaiables, including syslog-related, move remaining syslog-related variables into struct log_params as well Reviewed by: kevans Pull Request: https://github.com/freebsd/freebsd-src/pull/669 --- usr.sbin/daemon/daemon.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/usr.sbin/daemon/daemon.c b/usr.sbin/daemon/daemon.c index 379c31a0a221..6904dfa1896f 100644 --- a/usr.sbin/daemon/daemon.c +++ b/usr.sbin/daemon/daemon.c @@ -61,7 +61,9 @@ __FBSDID("$FreeBSD$"); struct log_params { const char *output_filename; + const char *syslog_tag; int syslog_priority; + int syslog_facility; int noclose; int output_fd; bool syslog_enabled; @@ -146,13 +148,11 @@ main(int argc, char *argv[]) bool log_reopen = false; char *p = NULL; const char *pidfile = NULL; - const char *syslog_tag = "daemon"; const char *ppidfile = NULL; const char *title = NULL; const char *user = NULL; int ch = 0; int child_eof = 0; - int syslog_facility = LOG_DAEMON; int nochdir = 1; int pfd[2] = { -1, -1 }; int restart = 0; @@ -160,6 +160,8 @@ main(int argc, char *argv[]) struct log_params logpar = { .syslog_enabled = false, .syslog_priority = LOG_NOTICE, + .syslog_tag = "daemon", + .syslog_facility = LOG_DAEMON, .noclose = 1, .output_fd = -1, .output_filename = NULL @@ -188,8 +190,8 @@ main(int argc, char *argv[]) log_reopen = true; break; case 'l': - syslog_facility = get_log_mapping(optarg, facilitynames); - if (syslog_facility == -1) { + logpar.syslog_facility = get_log_mapping(optarg, facilitynames); + if (logpar.syslog_facility == -1) { errx(5, "unrecognized syslog facility"); } logpar.syslog_enabled = true; @@ -232,7 +234,7 @@ main(int argc, char *argv[]) title = optarg; break; case 'T': - syslog_tag = optarg; + logpar.syslog_tag = optarg; logpar.syslog_enabled = true; break; case 'u': @@ -264,7 +266,7 @@ main(int argc, char *argv[]) } if (logpar.syslog_enabled) { - openlog(syslog_tag, LOG_PID | LOG_NDELAY, syslog_facility); + openlog(logpar.syslog_tag, LOG_PID | LOG_NDELAY, logpar.syslog_facility); } /*