From nobody Wed May 24 02:19:26 2023 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 4QQvyR1WxVz4TLvT; Wed, 24 May 2023 02:19:27 +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 4QQvyR14bbz3Jvy; Wed, 24 May 2023 02:19:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684894767; 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=rjaQR7R0kwc3rBSHgJhzywMVaDoomGT+EfkAQ4rjIFE=; b=rHFxrKDi2+gUG2sSzIaOeAAPDazY/JUMOcvWhJIAi6zHW25TyjOvKWpe4iK3j+zog1+Vt8 WXb1hcaeyk+VmHnR1KjiqxOyTtLJ6KM50P8cXbjEhmR57aaszOgtyzaBhW6AMv3GzljLKY QK2P/cQzkzfBUbagUg7czanEQzsMQRWaUwOitmvL5y8TP/nDYSwu54TcDiDvTirust9h4I MvWLsFCiRY1O+xTz6dqgEk1LwNEIbMJkkEm11QC/zEUyep/q6f9+LlLaQvigRRwWMTC7eS Kw2G3AeTV4l/vLskjv3m0HvmmIcod7ydAYqEjVGA6T5WcG5WUwJoTUWXNoSy5A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684894767; 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=rjaQR7R0kwc3rBSHgJhzywMVaDoomGT+EfkAQ4rjIFE=; b=HszWmm3fpgITicwg9H1/kPZc4qeHGjF6+OHTq37WpaBgMaAiFfLt+OcSY9C3x0jtO5n6+Y ITx3dFo4XSRw6E1rz0wvtDJLoRBKxSXNBSFvP8zu1HElTFCThRZY+dFqfNglv3Vh1KnUov vqCmmM/Yi9gqh4h5GgCuTPRDsUvY4/87ew+5UxULoPVPOqt8cf4byeG1bdC7x5H1rexpki fpK43b9hoaz93hRgvIup87q+lk23YgiX2nbZvbqDBOTwuYxCKiMGFDEUgpseubi3Cr0RvM vC5wUnfinQUefG0Cr+2pqINbJNPKTLLYqfVLN8A8JzAwpLPqWk5+LashQmhGnw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1684894767; a=rsa-sha256; cv=none; b=O/4wb8meKR96KWT2RoOV+VVSN6pqdaDhUuWR1ncMPJNlOjF8nOFuEbavzck54VmB/oBkO8 DhW8dJ9bFJpWq7iVzlRAQHKP/5g/aYQO2j/Z4usUAGdNRwBBr56+RFD0WeAXHrquu73429 q4jWLZAbdyeaUvxZfTgs0dTMSBe1yU9z2LTo9hakidr1gCl/5PQ5SGqAF46Gew7XgthIJh C15EColmbM/JtKoGjd/k/6dOjHCV8GxkOTHOVAiXiqRtDjVT9LaMItaH6mx4EmLGPSt4LI J/5y2GhQZX66wdg3TGGCVEnDiuh2oLKDzdqNHbpytNAwpu+n9fKzaMXSbT9F0w== 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 4QQvyR08HlzPvd; Wed, 24 May 2023 02:19:27 +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 34O2JQjR085601; Wed, 24 May 2023 02:19:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34O2JQaI085600; Wed, 24 May 2023 02:19:26 GMT (envelope-from git) Date: Wed, 24 May 2023 02:19:26 GMT Message-Id: <202305240219.34O2JQaI085600@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: 8d92ebe2fa49 - stable/13 - nfsd.c: Log a more meaningful failure message 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: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 8d92ebe2fa49f6701e6aea7345b9ab9047aaec5b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=8d92ebe2fa49f6701e6aea7345b9ab9047aaec5b commit 8d92ebe2fa49f6701e6aea7345b9ab9047aaec5b Author: Rick Macklem AuthorDate: 2023-02-22 22:09:15 +0000 Commit: Rick Macklem CommitDate: 2023-05-24 02:15:01 +0000 nfsd.c: Log a more meaningful failure message For the cases where the nfsd(8) daemon is already running or has failed to start within a prison due to an incorrect prison configuration, the failure message logged is: Can't read stable storage file: operation not permitted This patch replaces the above with more meaningful messages. It depends on commit 10dff9da9748 to differentiate between the above two cases, however even without this commit, the messages should be an improvement. (cherry picked from commit fe5c211ba87315b098769a7e6d50b41f00f6fed4) --- usr.sbin/nfsd/nfsd.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/usr.sbin/nfsd/nfsd.c b/usr.sbin/nfsd/nfsd.c index 0222d23f2312..3a7f58c7b4e5 100644 --- a/usr.sbin/nfsd/nfsd.c +++ b/usr.sbin/nfsd/nfsd.c @@ -170,8 +170,8 @@ main(int argc, char **argv) int udpflag, ecode, error, s; int bindhostc, bindanyflag, rpcbreg, rpcbregcnt; int nfssvc_addsock; - int longindex = 0; - size_t nfs_minvers_size; + int jailed, longindex = 0; + size_t jailed_size, nfs_minvers_size; const char *lopt; char **bindhost = NULL; pid_t pid; @@ -465,7 +465,21 @@ main(int argc, char **argv) /* This system call will fail for old kernels, but that's ok. */ nfssvc(NFSSVC_BACKUPSTABLE, NULL); if (nfssvc(NFSSVC_STABLERESTART, (caddr_t)&stablefd) < 0) { - syslog(LOG_ERR, "Can't read stable storage file: %m\n"); + if (errno == EPERM) { + jailed = 0; + jailed_size = sizeof(jailed); + sysctlbyname("security.jail.jailed", &jailed, + &jailed_size, NULL, 0); + if (jailed != 0) + syslog(LOG_ERR, "nfssvc stablerestart failed: " + "allow.nfsd might not be configured"); + else + syslog(LOG_ERR, "nfssvc stablerestart failed"); + } else if (errno == ENXIO) + syslog(LOG_ERR, "nfssvc stablerestart failed: is nfsd " + "already running?"); + else + syslog(LOG_ERR, "Can't read stable storage file: %m\n"); exit(1); } nfssvc_addsock = NFSSVC_NFSDADDSOCK;