From nobody Thu Jan 12 02:29:38 2023 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 4NspR66lPtz2pRLx; Thu, 12 Jan 2023 02:29:38 +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 4NspR66Kd4z4Nkq; Thu, 12 Jan 2023 02:29:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673490578; 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=+6Bkgxkif4sx2eRg3Bc9Bk5NvR8vWD0egpw/dgxmd04=; b=pWDuB6fcsMdjJrU08vVzi0ZoSxNBUOeZOL0swvHgsnDiOE6x0eJ76zUUmm+FSTjmBIOwKC 20f2J5kMdOiexD69JfjDzap1LkgSawJU6E7YwDe+0D+1djx12KyeQXJZgPF317zdtLjMaJ FsAbGMASrWpPlmXXBorBIoKdMvY9APBRweGsx0IgXGDaOAJFxQggicxmNNyqUyX2K3p+Lq RuT0LAIm/q07Md6u+ExT15aMm/e+9CsEAD11iMRMnQ+1K7IPibn2joIYNoLuWIH79SLYeo ooVG4Ea6wDAq6Hi07QE1YnUn42+JhV6WH+IBpkzwQE5f0ytpt/Ai30BNkgME+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673490578; 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=+6Bkgxkif4sx2eRg3Bc9Bk5NvR8vWD0egpw/dgxmd04=; b=OONm2W6zswyQqVU0qcU8GxxmXdVJMxr+O7ejy7SkZZl1UCLgk7qZY501eBEMCdOT4KNGOg q4A+GTNta7mkwH+2Ppau4VFuotlvunaWWNt79mv9k2lmeZxG01HNmNeWf/KtfahRygZpHM U94FCbWPWdiAuFraqrW3yoPhWLuOy2axqJV3Fez4nslwVwOw0CRaMYU9gFteaOnxGG3Hky zcP0+PTNhdL3c3TDz/8TE+Cs9wplN69adVjmEEz83bByylBhVegjKOyhdIFYxOiFO8Slra LHfP4GaiffFX59GkUDVp0AyLTVETStOf5nUeYikbE3bLCGLTf/sTbgIRz6OxQQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1673490578; a=rsa-sha256; cv=none; b=Ien4SDDTg3VpHF0l0GJ1+nKqG677OanO4ROn7K0/Qwob96sjaB7R+CHUI6BgltWrrJfGda 6TPBzokuG0/QESphjbd+wBU3K5yp6hx/TMFUsasjowBPapOo9mC5E6ahAOnMvPJN60c9cZ j5fTgFEt6LiMwfplmmh/wajZamK+oOd7FOJ7xPpPY7oeCl0neSctU+CwxfEYVH/+gycjkd staa4j4K0ofVusL0Z+SsM6CEscFdTwlhxr2RAl6D+Yd0zrGX7PCQ6aMXzHZ6SpP22/xsmj Q1Hf4Q7YSJbU+cZENCu+1sHwkVSU7rmRirAqJlsopLz6T6Pfg+Qa9LkS2zG4zg== 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 4NspR65N4Vz1BHP; Thu, 12 Jan 2023 02:29:38 +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 30C2TcCs051188; Thu, 12 Jan 2023 02:29:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30C2Tc7V051187; Thu, 12 Jan 2023 02:29:38 GMT (envelope-from git) Date: Thu, 12 Jan 2023 02:29:38 GMT Message-Id: <202301120229.30C2Tc7V051187@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: 24f42edcdd76 - main - Revert "gssd: Fix handling of the gssname= NFS mount option" 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: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 24f42edcdd761cf55ffeb19d2b44e961967e7abc Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=24f42edcdd761cf55ffeb19d2b44e961967e7abc commit 24f42edcdd761cf55ffeb19d2b44e961967e7abc Author: Rick Macklem AuthorDate: 2023-01-12 02:23:17 +0000 Commit: Rick Macklem CommitDate: 2023-01-12 02:23:17 +0000 Revert "gssd: Fix handling of the gssname= NFS mount option" This reverts commit c33509d49a6fdcf86ef280a78f428d3cb7012c4a. It turns out that the long 27 second delay I saw in the gss_acquire_cred() call was caused by a (mis)configured DNS. Although I did not specify "dns" in /etc/nsswitch.conf, I did have a /etc/resolv.conf file on the system (left there by wpa_supplicant). As such, with no route, it was somehow trying to contact the DNS server, although there was none. Once I got rid of the /etc/resolv.conf file, it worked as expected. Since there is now a large 5 minute timeout on the kernel to gssd(8) upcalls, the gssd(8) daemon will not get terminated when this delay occurs and the only affect is a 30 second delay during the mount. Discussed with: bjk --- usr.sbin/gssd/gssd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/gssd/gssd.c b/usr.sbin/gssd/gssd.c index ee77471bf05b..5589da37c195 100644 --- a/usr.sbin/gssd/gssd.c +++ b/usr.sbin/gssd/gssd.c @@ -847,7 +847,7 @@ gssd_acquire_cred_1_svc(acquire_cred_args *argp, acquire_cred_res *result, struc } result->major_status = gss_acquire_cred(&result->minor_status, - GSS_C_NO_NAME, argp->time_req, argp->desired_mechs, + desired_name, argp->time_req, argp->desired_mechs, argp->cred_usage, &cred, &result->actual_mechs, &result->time_rec); gssd_verbose_out("gssd_acquire_cred: done major=0x%x minor=%d\n", (unsigned int)result->major_status, (int)result->minor_status);