From nobody Sun Nov 13 20:17:10 2022 X-Original-To: dev-commits-src-main@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 4N9Nyb0tFzz4fl92; Sun, 13 Nov 2022 20:17:11 +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 4N9Nyb0P6nz4K9x; Sun, 13 Nov 2022 20:17:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668370631; 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=9mfn5nZLcKHyhIattWG8MZdsoejXhhbODNzXg56m8nY=; b=f8Ff1O6YLXqmKvZqwm7hdi5y5uXj0sZX3DHZAMbBn3tLqhElw/tHqRNKCjnJnOPXqTBveX CXjOeNyVMTeOOzHPcklFmDkX8eyHX7Qc6rsemPnrJZdcDTkr2Do+zM0yVZGGs7TI+XEr25 vdXw/rCfDXBNCSs2pj16320EzzQ8VgLf8rAnpuQBkg/xZ/WZO+GqkMdV+Vy+hcS0tq5eYT QWh1P31LfyJ8T085Kiocutb1bYlljVRK/zJ51lPiYdlOSE17ALCyhND17xCdEBDqq4ia79 lnQock31vBvaTrt4Pmwz+Te5w+xSCx8yGARx6sslivdmz75nJE6V2HQHcjTz4w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668370631; 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=9mfn5nZLcKHyhIattWG8MZdsoejXhhbODNzXg56m8nY=; b=qymwpNkKcWJh/v1Mrz6ZQrVKsi3pyMJN8A3F4YqoA3NdPS2EmchTp1EeTrFgz8eDdl5L/G pinKZK/8l23SUJPC8r2+aMFzxShisu90VnF12wvmzypqPfT1TTn6f+0y4teCfnb7CYLH8H EDq8hzZ7b3zZvwaBktvHZz9QE7YTK5m+CTktu5eDrGxNzpf8UmMB4VKLWHbD5Wj/KoNfpv WxC7I3sxhjT+fBSUnYI7M8s0Z4TRIpUEkweT+sM+cKQa02LEaUXsCyj8fH+tnRuZf4fVHs theWSn6C4BqxuupSnR5VDB9By7DG80m8GkixpqAiC5uiVuQbzk5BcjHvlPDEuA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668370631; a=rsa-sha256; cv=none; b=lAYzogLoLdDd9eixIny5S7cwELWiiYthIbFQPUXxn90UnyngzFFb2XCR42XTx/tJezsa67 rMJYOMqYXGxrLfjEzLscrhyMtHRdf4Ie3P+hIq+3Vk00Rr7m0cfA+A8CLGqz9XAD3gTDAC 9M1xmvPqR/4b7KP0ADGdHHg861S2DKKnPimoIs6crS+6V+0Mx808WC7Mn/C17u+zgN4GiI JRe3E1/nfo8nzxLx+/FMyrKv8gpBh3YEwNbFaIIyxItrDofLEwvzZg3hxB60BjSzmTuieC I0BOvfOLn3o1CMMOUOxAm+mAAVGHJbIGCmFNicjOPo8bgxsrSr6abwx2zBLdYg== 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 4N9NyZ6ZHzzFpb; Sun, 13 Nov 2022 20:17:10 +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 2ADKHAie047333; Sun, 13 Nov 2022 20:17:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2ADKHALq047332; Sun, 13 Nov 2022 20:17:10 GMT (envelope-from git) Date: Sun, 13 Nov 2022 20:17:10 GMT Message-Id: <202211132017.2ADKHALq047332@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: 032b04626b67 - main - rpcb_clnt.c: Do not force use of UDP List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 032b04626b671ec16deacd479569998b96c96142 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=032b04626b671ec16deacd479569998b96c96142 commit 032b04626b671ec16deacd479569998b96c96142 Author: Rick Macklem AuthorDate: 2022-11-13 20:16:06 +0000 Commit: Rick Macklem CommitDate: 2022-11-13 20:16:06 +0000 rpcb_clnt.c: Do not force use of UDP Without this patch, the code in the rpcbind client forces the use of UDP. A comment notes that some rpcbind servers only support UDP. This makes NFSv3 mounts to Azure servers impossible, since they require use of TCP for rpcbind. Since the comment is very old (imported from NetBSD in 2001) and I do not believe any UDP only rpcbind servers will still exist, this patch comments out the code that forces use of UDP, so that NFSv3 mounts to Azure servers can work. For an NFSv3 mount, the "udp" mount option will still make mount_nfs use UDP for rpcbind so that can be used as a workaround for any old NFSv3 server that only supports rpcbind over UDP (if any such server still exists). I asked if doing this change is appropriate on freebsd-fs@ and I only got one reply (off list) that supported doing the change. PR: 267301 MFC after: 1 month --- lib/libc/rpc/rpcb_clnt.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/lib/libc/rpc/rpcb_clnt.c b/lib/libc/rpc/rpcb_clnt.c index f39d99bfeee3..b44fd1c5e77b 100644 --- a/lib/libc/rpc/rpcb_clnt.c +++ b/lib/libc/rpc/rpcb_clnt.c @@ -741,6 +741,16 @@ __rpcb_findaddr_timed(rpcprog_t program, rpcvers_t version, rpcvers_t pmapvers = 2; struct pmap pmapparms; + /* + * The comment below is now very old, having + * been committed to FreeBSD during an import + * from NetBSD in 2001. I do not believe there + * will still be any rpcbind servers that do + * UDP only and, since Azure requires use of + * TCP for NFSv3 mounts, comment this out + * so that NFSv3 mounts on Azure can work. + */ +#ifdef notnow /* * Try UDP only - there are some portmappers out * there that use UDP only. @@ -754,9 +764,9 @@ __rpcb_findaddr_timed(rpcprog_t program, rpcvers_t version, } client = getclnthandle(host, newnconf, &parms.r_addr); freenetconfigent(newnconf); - } else { + } else +#endif client = getclnthandle(host, nconf, &parms.r_addr); - } if (client == NULL) return (NULL);