From nobody Fri Feb 25 19:59:58 2022 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 AF92D19E188F; Fri, 25 Feb 2022 19:59:58 +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 4K50xB4YXYz3PWs; Fri, 25 Feb 2022 19:59:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645819198; 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=8Wn1BVLFZBrRX82RolrrqzsHW4SG/q74PfuM56AgvwE=; b=Krxrw907kefH9V7Axp5p0sibYvRWF6eDEGEpKh+pAWOmEvwjJkQoCiH14aEUqijOr4ev+3 E+whdGbUPRhQhVxkYobn+fP2UalARbPe0+hUgbLFJYerr/h5hWHtHQ94v5BP9JTQlZW3Jp fi8dRe3WTBzOSGdM5d4YmAuWTcS9YKOxJpZOWdJcn8DLiIrL3DAm9dwosfNMEmovk03VZT SOkZJTLU6GlOzU9ioNOIIZit6cJpcV/besVUQzbfGFabPLtlTLLeqgbk3GcXtR9BpsxUAp 70Fu39WwQIt1YNiKnCfQLivsQ6R4OBjLcRJp26O1/7m4PE7xFS2KWnyWcqPV/g== 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 7C48225D22; Fri, 25 Feb 2022 19:59:58 +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 21PJxwHR028244; Fri, 25 Feb 2022 19:59:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21PJxwq0028243; Fri, 25 Feb 2022 19:59:58 GMT (envelope-from git) Date: Fri, 25 Feb 2022 19:59:58 GMT Message-Id: <202202251959.21PJxwq0028243@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Richard Scheffenegger Subject: git: 407c34e735b5 - main - iscsi: retrieve global login timeout from sysctlbyname() as integer 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: rscheff X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 407c34e735b5d17e2be574808a09e6d729b0a45a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645819198; 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=8Wn1BVLFZBrRX82RolrrqzsHW4SG/q74PfuM56AgvwE=; b=W1G76khk1Kjxi8cnLbdWO3mIqBkcdmwo4mgwbNrvkIFpxX4JLx9TrlTTSFP+HSQIpRjbDp v9G9mR87TXUMoBC+C4oVjYuMN0RDkkqTX2xCGC7Idw4JDaY+VBIAznoMOmqWmZ1ExjpGj2 NaLE+IeFXHIl3Bi2kqIai7skoLkoJC4mOS+DLCRYICT0OscPoQachlx3Nm+STH49rXPIAt 7Z2XQSOwyvOFkJFbW65pfvhDDUjNTKtdMZvSTlAHUjvCbnAPGddNwazS9GnXyHi7fWaDcS 0eYemAFyHXRoG/JU+NErFD0yYhO9KNR3F5FQLbS5rBVli/C9br6wYpezaY/YWw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645819198; a=rsa-sha256; cv=none; b=owwIYJKlmMgTJRDCxtJOH5ZwY5N8QX9VdENESr8k1DyLDVIxq9G9FvY+6Xavh7uhsyHFZq U7ls0ro1/JgmZ6qqQCVmw5FhpjtzdW2aehDK1FEJqBcPozZ/Qhvle5aWadHM7TWPZNMKZp l24x5fqPISOlbQJ2GZFqDsqeOT/qqVx5hTyHLbkooOgw0RZT8vksUpsBJE6NMVnThKwhDE RvTmxPadxnLNkUU9+35rd2+EpXoZsBf2gzSb22AGSR7no6jE8k/arLNhhc8TP0cQBllfbR oGmG3d3b/NxAfh0baT2LuHRu2EDpeougmwcnlbpMoQ/TcK14MHR32wBsYXIztw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rscheff: URL: https://cgit.FreeBSD.org/src/commit/?id=407c34e735b5d17e2be574808a09e6d729b0a45a commit 407c34e735b5d17e2be574808a09e6d729b0a45a Author: Richard Scheffenegger AuthorDate: 2022-02-25 19:56:31 +0000 Commit: Richard Scheffenegger CommitDate: 2022-02-25 19:57:05 +0000 iscsi: retrieve global login timeout from sysctlbyname() as integer The OID "kern.iscsi.login_timeout" references an integer and not a string. Sponsored by: NetApp, Inc. Differential Revision: https://reviews.freebsd.org/D34380 --- usr.sbin/iscsid/iscsid.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/usr.sbin/iscsid/iscsid.c b/usr.sbin/iscsid/iscsid.c index ebfcfa34dd6d..d08a11c90eeb 100644 --- a/usr.sbin/iscsid/iscsid.c +++ b/usr.sbin/iscsid/iscsid.c @@ -397,12 +397,14 @@ connection_new(int iscsi_fd, const struct iscsi_daemon_request *request) keepinit); } if (conn->conn_conf.isc_login_timeout == -1) { - char value[8]; + int value; size_t size = sizeof(value); - sysctlbyname("kern.iscsi.login_timeout", &value, &size, - NULL, 0); - keepinit = strtol(value, NULL, 10); - log_debugx("global login_timeout at %d sec", keepinit); + if (sysctlbyname("kern.iscsi.login_timeout", + &value, &size, NULL, 0) == 0) { + keepinit = value; + log_debugx("global login_timeout at %d sec", + keepinit); + } } if (keepinit > 0) { if (setsockopt(conn->conn.conn_socket,