From nobody Sat Sep 24 08:12:34 2022 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 4MZMFZ6GT4z4cmYp; Sat, 24 Sep 2022 08:12:34 +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 4MZMFZ5mj0z3ftC; Sat, 24 Sep 2022 08:12:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664007154; 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=2R45uJhtbCz6U+4F/M/A6KdGMY35jmOOrwK/BNykGLw=; b=RvgB6cXvcXlmIcZWsLrUQQbBiB2Niw0w2dKRTeyZgDquiFmQe1/kn5k3ntFlIomT3f0NZX uvUsrMCD8lljeOLXnZQJOe0F9W7oPk/6G+ABMro5HjmOhIcyQPOieS7Asc+RM12WgXegiV MFSyWoZ4AWHPr0+WcZrofQNW6XXQpWFtmlOamXQEHGHFZIIyzENhpAIFf4vWo7AqU+sHO9 twAArrGZD9ggKsyNP6QUg1dKqP9hHe/iPMOGRJ0d7Nfep42SQzE0a3w+NFM8NZ2a3FydI4 g3thbTbvXNdAL/q6TDopn2nQVqB+tSqC5V6uufjJRvjVorZWBq5J0FAwNsNmtA== 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 4MZMFZ4qFcz120y; Sat, 24 Sep 2022 08:12:34 +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 28O8CY1J026487; Sat, 24 Sep 2022 08:12:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28O8CYF9026486; Sat, 24 Sep 2022 08:12:34 GMT (envelope-from git) Date: Sat, 24 Sep 2022 08:12:34 GMT Message-Id: <202209240812.28O8CYF9026486@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: a3c3c02244f4 - stable/13 - getnetent(3): Add missing reentrant functions 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: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: a3c3c02244f4fe4c77c034ca3846b410dbbb1091 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664007154; 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=2R45uJhtbCz6U+4F/M/A6KdGMY35jmOOrwK/BNykGLw=; b=uYq2T6ShprhfLKHI+BZyD04N2o25fKF2eE9i/R6UjJk01Lqyr0u7jAqFqS0YZO/HCdM1Rq en2BGHcU2GkR/ILZqiY5W75RwINVHqHPDMsUA82bZvNUX1PVD2mG3noT48qdCWegH2geYE 4wkLzoDVdUmLb/o11DBsO7dWDb/GBG53dTgQpvrSttbNuK7bnRaNv3IYSptdeD6WR+M98N tOyRBDb8A1/jbjtgbBTZ9bbEddIXRevtRULAiPltGpn7QOLqVQO2YdEneFHA43enKuL8Eh YvPYX7JFVlvW9dnd2fdbABQxE2umsDF2wixm3PGpiRoVNm5B+lhoD7SKeOgrJQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664007154; a=rsa-sha256; cv=none; b=gZd+9vOhEX6rFnMzIdE74vBkpa2JiPOH9f3YFZHQE18l0onDCIy15NEyB7z5PctAF7BFQx YwE9OGxwSytXXRZF45vgHK56AQCqPX/Va3FwS7fGpbIHTPscaG546bzDuLgNpfopt6ZfpH fPPWkquewyJfd9BGd/r/hmCDMFs/339i/YZl0SVgEJVLA592IdPbMF+9sf7UvVBE8GUxke vwIcu2EDhmm+n33ZeX/fJ+bapPqq1GTdZCVrTfTHFpdeoxfkaf/lN4yPYh1ap9nC4AWRQ2 zHIBJrYrMz51BCh8XzHqDkk2aIO1eLCYg5Ybgbh0vtS/IyVK8b8we8LxLJFnsw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by gbe (doc committer): URL: https://cgit.FreeBSD.org/src/commit/?id=a3c3c02244f4fe4c77c034ca3846b410dbbb1091 commit a3c3c02244f4fe4c77c034ca3846b410dbbb1091 Author: Fernando Apesteguía AuthorDate: 2021-05-21 15:25:25 +0000 Commit: Gordon Bergling CommitDate: 2022-09-24 08:12:08 +0000 getnetent(3): Add missing reentrant functions Add documentation for gethostbyname_r, gethostbyname2_r and gethostbyaddr_r Create proper MLINKs for the new functions. PR: 249154 Reported by: asomers@ Approved by: manpages (0mp@), Pau Amma Differential Revision: https://reviews.freebsd.org/D30469 (cherry picked from commit dc68997328ec6cec41ad3b818c1846c8217e0c68) --- lib/libc/net/Makefile.inc | 7 ++++--- lib/libc/net/gethostbyname.3 | 33 +++++++++++++++++++++++++++++++-- 2 files changed, 35 insertions(+), 5 deletions(-) diff --git a/lib/libc/net/Makefile.inc b/lib/libc/net/Makefile.inc index 6628028ccc83..683e2826c401 100644 --- a/lib/libc/net/Makefile.inc +++ b/lib/libc/net/Makefile.inc @@ -59,9 +59,10 @@ MLINKS+=eui64.3 eui64_aton.3 eui64.3 eui64_hostton.3 \ eui64.3 eui64_ntoa.3 eui64.3 eui64_ntohost.3 MLINKS+=getaddrinfo.3 freeaddrinfo.3 MLINKS+=gethostbyname.3 endhostent.3 gethostbyname.3 gethostbyaddr.3 \ - gethostbyname.3 gethostbyname2.3 gethostbyname.3 gethostent.3 \ - gethostbyname.3 herror.3 gethostbyname.3 hstrerror.3 \ - gethostbyname.3 sethostent.3 + gethostbyname.3 gethostbyaddr_r.3 gethostbyname.3 gethostbyname2.3 \ + gethostbyname.3 gethostbyname2_r.3 gethostbyname.3 gethostbyname_r.3 \ + gethostbyname.3 gethostent.3 gethostbyname.3 herror.3 \ + gethostbyname.3 hstrerror.3 gethostbyname.3 sethostent.3 MLINKS+=getifaddrs.3 freeifaddrs.3 MLINKS+=getifmaddrs.3 freeifmaddrs.3 MLINKS+=getipnodebyname.3 getipnodebyaddr.3 getipnodebyname.3 freehostent.3 diff --git a/lib/libc/net/gethostbyname.3 b/lib/libc/net/gethostbyname.3 index 04a055ea3b1c..9f7156b7cd9c 100644 --- a/lib/libc/net/gethostbyname.3 +++ b/lib/libc/net/gethostbyname.3 @@ -28,7 +28,7 @@ .\" From: @(#)gethostbyname.3 8.4 (Berkeley) 5/25/95 .\" $FreeBSD$ .\" -.Dd October 4, 2017 +.Dd June 20, 2022 .Dt GETHOSTBYNAME 3 .Os .Sh NAME @@ -39,7 +39,10 @@ .Nm sethostent , .Nm endhostent , .Nm herror , -.Nm hstrerror +.Nm hstrerror , +.Nm gethostbyname_r , +.Nm gethostbyname2_r , +.Nm gethostbyaddr_r .Nd get network host entry .Sh LIBRARY .Lb libc @@ -62,6 +65,12 @@ .Fn herror "const char *string" .Ft const char * .Fn hstrerror "int err" +.Ft int +.Fn gethostbyname_r "const char *name" "struct hostent *he" "char *buffer" "size_t buflen" "struct hostent **result" "int *h_errnop" +.Ft int +.Fn gethostbyname2_r "const char *name" "int af" "struct hostent *he" "char *buffer" "size_t buflen" "struct hostent **result" "int *h_errnop" +.Ft int +.Fn gethostbyaddr_r "const void *addr" "socklen_t len" "int af" "struct hostent *hp" "char *buf" "size_t buflen" "struct hostent **result" "int *h_errno"p .Sh DESCRIPTION .Bf -symbolic The @@ -225,6 +234,26 @@ function returns a string which is the message text corresponding to the value of the .Fa err argument. +.Pp +Functions with the +.Em _r +suffix provide reentrant versions of their respective counterparts. +The caller must supply five additional parameters: a +.Vt struct hostent +variable to be filled on success, a +.Va buffer +of +.Va buflen +bytes in size, a +.Vt struct hostent +.Va result +variable that will point to the result on success or be set to +.Dv NULL +on failure or if the name is not found. +The +.Va h_errnop +variable will be filled with the error code if any. +All these functions return 0 on success. .Sh FILES .Bl -tag -width /etc/nsswitch.conf -compact .It Pa /etc/hosts