From nobody Tue Jan 27 18:44:36 2026 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 4f0vTK1Zdmz6QG06 for ; Tue, 27 Jan 2026 18:44:37 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f0vTJ2qwzz3rs4 for ; Tue, 27 Jan 2026 18:44:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769539476; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dU2Bz3TMSksHe6YvMA7ZCvkHeMGtREpo9qpUOFUA9YU=; b=gMkjKDJimoXqZc2VTx37JCO0HXdy3OLfvkAKDL9bTH7a+8Y2yV3BdIf/GzrakRorPGv1Pv ocS6L+V57YHNPzfQSLuk9nBQGA86Zal5iqUhsHR4g0Rvhj9qGEb9uh9IY+8qu+9rqx9587 sJlqWn4Vhd/q30g8ZbLUoVfhwL8hNZBWnyLnPbjhW0kY0WTaWeNnQeZ3TwCrmNeEELg6Zk gW9BzcNwQ48pGF8yN47x57BEyzrIZmtvhIx/0y+BZK9QGZfoLtOr9Iems1eD4HDhBK6d/E MycF1xF5rla4602p2iMgib9hxd0nRLMfQc3tVzYT5NJuxbkFfZyW40D+4XeQaQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769539476; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dU2Bz3TMSksHe6YvMA7ZCvkHeMGtREpo9qpUOFUA9YU=; b=dKn9VfDpfkGZ3Vzc16SoFPwvfyeatqadqpryWe3hitzE6d6It9u/Tyi3ssxJfWrBuN4/pB Sto+Rmu/wnIHcdEWWOZoNu9B0kS3y6Rok4eZCVSgeg/KbMTbxnqp155ZccN+9fzqnkG4c3 0t3Utu1w8qbsVh+/EYvVqP5iGx9YSUb8glxAdaxXjoVruAQ663O8Qqz9O09pGMOn+89x2d AUWEn7Z0rc3YQSMWIujof/kIvPDWWllSGNdv6mJw2yPaTHEEJ43ObgtqgbQQ/tjObg0GXt X8WK3ltePBfnUkLd0rUB1p1RBrva7f/OKlazslFfxq3VWE3YvD8Ujqv3r0JMLA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769539476; a=rsa-sha256; cv=none; b=NerMzDAGWlTvsOVtm2KD31I86OHl9cKmCcD9vQg71gT9LaHvOLeKnt11LZpE33zcDghna4 /kJe2/uEhsIFgU1b2Y2b9vii/pgTDbdiQYwS/JsqV0wjsoXxv813ffFs9lTLLqQSPbwgxd +QWAJ5gaTcGaCb8u1MvW7Qb9KlcNxbPdwcxlAZUmwkyUp1+oksXrGQesbK8Bkw+jgigKav mtMD/jScVjsiB9dAtYvcP/Cx8BzH1pi4DNssadyjggQ766DZRJ/9VMswDEMRrwUw1ks6at gjz3wFryDC2H+T3pmRNn942ijgl02LRxqlxhetTHmd/hwJndkGG/cQltSi4evw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f0vTJ233Rz39k for ; Tue, 27 Jan 2026 18:44:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 20557 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 27 Jan 2026 18:44:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav From: John Baldwin Subject: git: ac930fe19978 - stable/14 - ctld: Use strtonum in lun_set_device_type 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: ac930fe19978684a99f1f077d93ea71e0a1c9513 Auto-Submitted: auto-generated Date: Tue, 27 Jan 2026 18:44:36 +0000 Message-Id: <69790794.20557.2fd9e33c@gitrepo.freebsd.org> The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=ac930fe19978684a99f1f077d93ea71e0a1c9513 commit ac930fe19978684a99f1f077d93ea71e0a1c9513 Author: Dag-Erling Smørgrav AuthorDate: 2025-08-02 14:05:36 +0000 Commit: John Baldwin CommitDate: 2026-01-27 18:15:58 +0000 ctld: Use strtonum in lun_set_device_type This is a direct commit to stable of part of commit 2e0caa7c7e14d7bdc89ec43be9bc848abe1ca264. The full commit is not merged as it changes the API/ABI of expand_number(3). --- usr.sbin/ctld/conf.cc | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/usr.sbin/ctld/conf.cc b/usr.sbin/ctld/conf.cc index e86b44ee5004..f3285ebf9d56 100644 --- a/usr.sbin/ctld/conf.cc +++ b/usr.sbin/ctld/conf.cc @@ -409,7 +409,8 @@ lun_set_blocksize(size_t value) bool lun_set_device_type(const char *value) { - uint64_t device_type; + const char *errstr; + int device_type; if (strcasecmp(value, "disk") == 0 || strcasecmp(value, "direct") == 0) @@ -421,9 +422,12 @@ lun_set_device_type(const char *value) strcasecmp(value, "dvd") == 0 || strcasecmp(value, "dvdrom") == 0) device_type = T_CDROM; - else if (expand_number(value, &device_type) != 0 || device_type > 15) { - log_warnx("invalid device-type \"%s\" for lun \"%s\"", value, - lun->l_name); + else { + device_type = strtonum(value, 0, 15, &errstr); + if (errstr != NULL) { + log_warnx("invalid device-type \"%s\" for lun \"%s\"", value, + lun->l_name); + } return (false); }