aboutsummaryrefslogtreecommitdiff
path: root/usr.sbin/gssd/gssd.c
diff options
context:
space:
mode:
authorRick Macklem <rmacklem@FreeBSD.org>2023-01-12 02:23:17 +0000
committerRick Macklem <rmacklem@FreeBSD.org>2023-01-12 02:23:17 +0000
commit24f42edcdd761cf55ffeb19d2b44e961967e7abc (patch)
tree9319d7e82cdce1545bfadfa4119b385ba6a1e496 /usr.sbin/gssd/gssd.c
parent51e94a4658d23016dd0ae67c189a89f53281cbcd (diff)
downloadsrc-24f42edcdd761cf55ffeb19d2b44e961967e7abc.tar.gz
src-24f42edcdd761cf55ffeb19d2b44e961967e7abc.zip
Revert "gssd: Fix handling of the gssname=<name> 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
Diffstat (limited to 'usr.sbin/gssd/gssd.c')
-rw-r--r--usr.sbin/gssd/gssd.c2
1 files changed, 1 insertions, 1 deletions
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);