From nobody Thu Feb 26 06:16:27 2026 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 4fM1SD2x9Kz6TTBk for ; Thu, 26 Feb 2026 06:16:28 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fM1SD0cr3z3YC1 for ; Thu, 26 Feb 2026 06:16:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772086588; 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=3fyAgFkVyQ1fS5vo+26EFDD4wTLD716+IW7MrABGEwU=; b=a/KvgslROhbetiQVfM6qyiIK+NJeriTONbkC+7AItThH9Zq7GchJtypRjlhWaVPRvMrmvl aHI7IBmpSM3kPH46PfZWOGYx05esmmhqBlpWBY7onQXIZYkcNwVaRftS8K8TJ28U5zW91o QTSPMPzBinUrBZHKjrUk60ZJKYi7xSjVZs6+OUmuT+05OUQS3GQ3wnpLSMqlVrT+knBXWO eX63dtDwfUorxO9lidgpsCho4vqAQDPVcR8Wbe3wIyQAawfUoOfxQ1Iv/AcOfkk5hXHZ4l n27y1YgC8fbdV6NYmTkqPOMv7yZhfpn5Q6aF2gTSyxlMt1ekDnqc2byWHNXNqg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772086588; a=rsa-sha256; cv=none; b=F2uPoKD03gZnXCnkGvAjYyHIC2hgrsDLbAaVZXPIfLhwoMST1m7A0KsoWP4YWVxE9wU3kP NfVS5MkLJKXrxKhNscTntwL4F2ACKefjetM8ngR0h2O7ywoIOYRE3NH2+Kjob6Or8dGUaK s3Pk4a4SVs8RRLE0326gvG/C4qcE46cJpYoVCZGNgqiegGBjui6ov8O8vfwTiIk6rf8ntT bADqoihApxxmsHwfZ7OZb7gVKegiBJtDlYf01Y8ikxfvwtb8KZrssytjc/ae3pOhiVr58k VKpxGgwN5PdxnbTZb1Q8iEM1/W7nC5tHThzlC5toIi6cZazUWRQPth0z3IbTbg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772086588; 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=3fyAgFkVyQ1fS5vo+26EFDD4wTLD716+IW7MrABGEwU=; b=YlzPMjxn67X5NKxKVdPkQ8i2/YRXmlDGdvUFTnkRxdmUiZ5H81wLO0PaseXwmLPlqJKZ6L xJ82bJy8VgJuaPBByHJCrpGu6PDycOK9iiKA4pnpDFc7DB3sbN22ghdjqTcfG8cQ1rm/xM Rs2JAVkGvosJrys3pbvgAaEh6wobD2t4zs1lyKKsmxoerUSt6/0onGTVYgEXTdR32g6EGL p5S2P1CpYjR1ylfRQd9w6NGNHALPOc2C6G5boz7speiOC1+zbyravM8jlYxK99VaE0nlJw fX78/Tlw8TClT2j9S1IiW8178p2SI2wHkqQW0B3TYHpN+SPoThtx+Hz6Iwpkng== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fM1SC6wlWz4Lt for ; Thu, 26 Feb 2026 06:16:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 40648 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 26 Feb 2026 06:16:27 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 56fbfd1ecdc7 - main - lpd: Add timeout option 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 56fbfd1ecdc78fc99b3a2e381c355ce8980de39d Auto-Submitted: auto-generated Date: Thu, 26 Feb 2026 06:16:27 +0000 Message-Id: <699fe53b.40648.78a6c4bf@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=56fbfd1ecdc78fc99b3a2e381c355ce8980de39d commit 56fbfd1ecdc78fc99b3a2e381c355ce8980de39d Author: Dag-Erling Smørgrav AuthorDate: 2026-02-26 06:15:14 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-26 06:15:14 +0000 lpd: Add timeout option Set a 120-second receive timeout on all client connections, and add a command-line option to change that value. MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D55400 --- usr.sbin/lpr/lpd/lpd.8 | 8 +++++++- usr.sbin/lpr/lpd/lpd.c | 30 +++++++++++++++++++----------- 2 files changed, 26 insertions(+), 12 deletions(-) diff --git a/usr.sbin/lpr/lpd/lpd.8 b/usr.sbin/lpr/lpd/lpd.8 index 9a4e46996811..9d24a450ba0e 100644 --- a/usr.sbin/lpr/lpd/lpd.8 +++ b/usr.sbin/lpr/lpd/lpd.8 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd April 15, 2021 +.Dd February 19, 2026 .Dt LPD 8 .Os .Sh NAME @@ -34,6 +34,7 @@ .Sh SYNOPSIS .Nm .Op Fl cdlpsFW46 +.Op Fl t Ar timeout .Op Ar port# .Sh DEPRECATION NOTICE This facility is scheduled for removal prior to the release of @@ -108,6 +109,11 @@ This means that will not accept any connections from any remote hosts, although it will still accept print requests from all local users. +.It Fl t Ar timeout +Set the network receive timeout for client connections to +.Ar timeout +seconds. +The default is 120. .It Fl F By default, .Nm diff --git a/usr.sbin/lpr/lpd/lpd.c b/usr.sbin/lpr/lpd/lpd.c index 089b8fedc2d5..d1dcd0766a77 100644 --- a/usr.sbin/lpr/lpd/lpd.c +++ b/usr.sbin/lpr/lpd/lpd.c @@ -61,28 +61,28 @@ */ #include -#include -#include +#include #include -#include #include -#include +#include +#include + #include #include -#include -#include -#include -#include +#include +#include #include #include #include -#include +#include +#include #include #include #include #include -#include +#include +#include #include "lp.h" #include "lp.local.h" #include "pathnames.h" @@ -117,6 +117,7 @@ uid_t uid, euid; int main(int argc, char **argv) { + struct timeval tv = { .tv_sec = 120 }; int ch_options, errs, f, funix, *finet, i, lfd, socket_debug; fd_set defreadfds; struct sockaddr_un un, fromunix; @@ -139,7 +140,7 @@ main(int argc, char **argv) errx(EX_NOPERM,"must run as root"); errs = 0; - while ((i = getopt(argc, argv, "cdlpswFW46")) != -1) + while ((i = getopt(argc, argv, "cdlpst:wFW46")) != -1) switch (i) { case 'c': /* log all kinds of connection-errors to syslog */ @@ -159,6 +160,9 @@ main(int argc, char **argv) case 's': /* secure (no inet) */ sflag++; break; + case 't': + tv.tv_sec = atol(optarg); + break; case 'w': /* netbsd uses -w for maxwait */ /* * This will be removed after the release of 4.4, as @@ -386,6 +390,10 @@ main(int argc, char **argv) syslog(LOG_WARNING, "accept: %m"); continue; } + if (tv.tv_sec > 0) { + (void) setsockopt(s, SOL_SOCKET, SO_RCVTIMEO, &tv, + sizeof(tv)); + } if (fork() == 0) { /* * Note that printjob() also plays around with