From nobody Mon May 29 20:39:25 2023 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 4QVS7L1bxnz4Wt9Y; Mon, 29 May 2023 20:39:26 +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 4QVS7L15qjz4Mk4; Mon, 29 May 2023 20:39:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685392766; 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=vosY+fvk1FuR+DudHuWc2uT+mWOJjkcFnOsIjD2EWYU=; b=Lsa2gMuxpzbz0ssrycU5b+pf6waUwY03LW2V9jmCaoTXdEdT1yAh6H095AEfA0QMbesrmm DW8IOt5l5sRv1zGTwmUxHcEmi2MJshEswUgoMZRYldVvjFAw1YrqS6uUdvkm/USVsPToG5 pKvPiu11+ul9r5BxLgUstMRUI0XHI/Cz3FjuXXzb+YZihto8J5eVKHiIzYNM1WiodAZclW Jd2ZgR5gFE29PuxudaqfdSfWSnj7az8FuQeR2ud9Pee1rYTtZ/E2ageCIc/pl5LzX1Y2Yz H4EEUt1hE+Aw5ou5xvOqShYdhbfaGolCAbZeX99+8T12w8DaKwf1p79MUrGPVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685392766; 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=vosY+fvk1FuR+DudHuWc2uT+mWOJjkcFnOsIjD2EWYU=; b=YUgkUfMV2go1ziWRe6oWHpqiFYgSWuS7jcBpYSfY0oxYjqmE5WHJOmTKF3FYbD0fS4/5hv kmIZ+TRBk75iuoFg7iTSTMob6pU1ixJGcw1Exo75vHCMal3kezIf70+OHvu2pIWToheIZm F5653gH1V190UjipkFdR1NOOGs99yL/4meP+0cTrbZI0Vzo045sV/27+lYxmpqee3cN4uF oV50G8h2x3FQOrAQ8g36x78oYnshV2d7ymR4ob4or5h06z2ZEoV4cmWu1//uLCyqBSMIO1 YNa7gAzHh7yYB86weauaUpPSRC/s7J06ozZRcVgVY3LsGRZCyWlSx5rdc0cdEQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1685392766; a=rsa-sha256; cv=none; b=CycGjfgtXEwh5TEyBiznfNOJr/y26RpDIF5XSnJorRnGQ8G1sgq33CqoKjZHbFC642dCkR pkXtR9E1nU7ceqWuXAOVO1/LmLGOs8qLz0ZVkeAE9hfxp/pwwGe5WaHSwu4omofIymXlMi W9pUSt/cZDGoiIuzh4mzvhfWWTn2l+kI23m3IxqDAYBCNevyrQs/rlJR1KRqJ1rKhX+u0p 9GFIShADana/RlWO6x/DUhFaBWZGVXWXldqN/VSA2/eVjGCZtLj94mNscL5DJOl55sdHlo K/q0EuNi2iEWA4nRh1px0o69NO/iORvnlmi13T4l6LVY9lPsQ2kusbmh/UDRag== 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 4QVS7L08HqzQDD; Mon, 29 May 2023 20:39:26 +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 34TKdPSb083780; Mon, 29 May 2023 20:39:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34TKdP0I083779; Mon, 29 May 2023 20:39:25 GMT (envelope-from git) Date: Mon, 29 May 2023 20:39:25 GMT Message-Id: <202305292039.34TKdP0I083779@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: a94018e2003b - main - nfsuserd: Improve failure message when running in a jail 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: a94018e2003b83c10e8fb814f7a8d47e2513da95 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=a94018e2003b83c10e8fb814f7a8d47e2513da95 commit a94018e2003b83c10e8fb814f7a8d47e2513da95 Author: Rick Macklem AuthorDate: 2023-05-29 20:38:07 +0000 Commit: Rick Macklem CommitDate: 2023-05-29 20:38:07 +0000 nfsuserd: Improve failure message when running in a jail If a jail is not correctly configured to run nfsd(8) in the jail, nfsuserd(8) cannot run. This patch improves the failure message for this case. MFC after: 2 weeks --- usr.sbin/nfsuserd/nfsuserd.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/usr.sbin/nfsuserd/nfsuserd.c b/usr.sbin/nfsuserd/nfsuserd.c index 3095948dce75..0f632a6efccc 100644 --- a/usr.sbin/nfsuserd/nfsuserd.c +++ b/usr.sbin/nfsuserd/nfsuserd.c @@ -35,6 +35,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -127,7 +128,8 @@ main(int argc, char *argv[]) #ifdef INET6 struct sockaddr_in6 *sin6; #endif - int s; + int jailed, s; + size_t jailed_size; if (modfind("nfscommon") < 0) { /* Not present in kernel, try loading it */ @@ -326,10 +328,19 @@ main(int argc, char *argv[]) #else if (nfssvc(NFSSVC_NFSUSERDPORT | NFSSVC_NEWSTRUCT, &nargs) < 0) { if (errno == EPERM) { - fprintf(stderr, - "Can't start nfsuserd when already running"); - fprintf(stderr, - " If not running, use the -force option.\n"); + jailed = 0; + jailed_size = sizeof(jailed); + sysctlbyname("security.jail.jailed", &jailed, + &jailed_size, NULL, 0); + if (jailed != 0) { + fprintf(stderr, "Cannot start nfsuserd. " + "allow.nfsd might not be configured\n"); + } else { + fprintf(stderr, "Cannot start nfsuserd " + "when already running."); + fprintf(stderr, " If not running, " + "use the -force option.\n"); + } } else { fprintf(stderr, "Can't do nfssvc() to add port\n"); }