From nobody Mon Nov 29 15:11:30 2021 X-Original-To: dev-commits-src-branches@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 A140818ACAC9; Mon, 29 Nov 2021 15:11:31 +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 4J2phy4jt3z4bRT; Mon, 29 Nov 2021 15:11:30 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 56290246FD; Mon, 29 Nov 2021 15:11:30 +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 1ATFBUE9022734; Mon, 29 Nov 2021 15:11:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1ATFBUis022733; Mon, 29 Nov 2021 15:11:30 GMT (envelope-from git) Date: Mon, 29 Nov 2021 15:11:30 GMT Message-Id: <202111291511.1ATFBUis022733@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 23566768d92a - stable/13 - syslogd: fix WITHOUT_INET builds List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 23566768d92aed2a59d3e5d9392824cbe83b867f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638198691; 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=e2jv/N9o25exI8oKDqJWrlHtQuOmDUuIs61whiGKIJM=; b=mE/PN04+NE9lEUcrdyeJRTbMKB/wE0E12abyUTr0SAqmCO4841Vfk+ipBW/im1EXJlrngd hZbJXvrRHAjA73ConAbonUHiY/DXwXCxa+w0Yo4J4gBHghlifAvVW/SntEsBPubJ1IS8fA KCUBzR/mEtzqsBD6Pj1d5aDzGZ9UsNIrFZ1h62Ho8CgLXt5KGvNv0Kuf0IKe4GpmnENalb RmwmIeZaG99wOZPmAAE+cHVUjP7WcU0YA/M1xRPLM515fiOSAAnIsqX/pV4z5yFcctduSc bzie9PRjzkKNZnKLcylxJeD5Ky6Ny6RVjYWWGTHm8njmFIRf9uwcAEwmPa+ycg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638198691; a=rsa-sha256; cv=none; b=RAz+qbommyknVNR2uALivbLK+gQjJPhT26JmwW4vnG3v8LsWTK9KBSZ1cCwA7uGT89QOws XcgYK9FEjgjOjA2+5P9Aj6OOgltvmjQmEOw19+AhJMKZUZG4fh5InmksnTV7Ayjso5jCkm CKoQKRZzkZBSW6PU24/ARJEQxt2RHJxXpTtS0fYCVU9WOYi3rfy8pnlEbTqqjIRTPFAJ/d vjX8UPOFlepXc5sOY2RIBd7+NwqwzWqfNLK6zbTjeLLAvZ8udRYavG3Whh2ENZhTurOrI1 qK6O01AdrGOONmfes3PrfrF9fL5jp+E3csKgo9WZnNrzDOzCR6Px5YcqdRC0Ow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=23566768d92aed2a59d3e5d9392824cbe83b867f commit 23566768d92aed2a59d3e5d9392824cbe83b867f Author: Artem Khramov AuthorDate: 2021-06-12 17:21:13 +0000 Commit: Ed Maste CommitDate: 2021-11-29 15:10:53 +0000 syslogd: fix WITHOUT_INET builds Since 2d82b47 syslogd can't be built with `WITHOUT_INET` or `WITHOUT_INET6` build variables set, because `iovlist_truncate` is not defined but used. This change wraps the problematic `iovlist_truncate` call within ifdef directive. It's compiled out in this situation... Pull Request: https://github.com/freebsd/freebsd-src/pull/475 Reviewed by: imp@ (commit message slightly tweaked) (cherry picked from commit f06fa6f88733d709a5f9dd3a27b1a08571e49e6b) PR: 260098 --- usr.sbin/syslogd/syslogd.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/usr.sbin/syslogd/syslogd.c b/usr.sbin/syslogd/syslogd.c index c3b8af4fa8fa..5c2555480d3f 100644 --- a/usr.sbin/syslogd/syslogd.c +++ b/usr.sbin/syslogd/syslogd.c @@ -1861,8 +1861,10 @@ fprintlog_write(struct filed *f, struct iovlist *il, int flags) dprintf("\n"); } +#if defined(INET) || defined(INET6) /* Truncate messages to maximum forward length. */ iovlist_truncate(il, MaxForwardLen); +#endif lsent = 0; for (r = f->fu_forw_addr; r; r = r->ai_next) {