From c510e6d474ecece26daf627ad7b96947bccec0c5 Mon Sep 17 00:00:00 2001 From: Luke Howard Date: Fri, 27 Dec 2019 20:47:24 +1100 Subject: [PATCH] gss: don't provide domain to nsi_probe() in NTLM _gss_ntlm_accept_sec_context() does not provide the acceptor domain to nsi_probe(); for consistency, _gss_ntlm_acquire_cred_from() should do that same. Providing the acceptor domain was breaking tests. Note that the Heimdal NTLM implementation is old and has few consumers (Apple and Samba use their own implementations). Arguably we should merge the Apple implementation or remove it. --- lib/gssapi/ntlm/acquire_cred.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/gssapi/ntlm/acquire_cred.c b/lib/gssapi/ntlm/acquire_cred.c index 79836d581..a6b151f7a 100644 --- a/lib/gssapi/ntlm/acquire_cred.c +++ b/lib/gssapi/ntlm/acquire_cred.c @@ -45,7 +45,6 @@ _gss_ntlm_acquire_cred_from(OM_uint32 *min_stat, OM_uint32 *time_rec) { ntlm_name name = (ntlm_name) desired_name; - const char *domain = NULL; OM_uint32 maj_stat; ntlm_ctx ctx; @@ -63,8 +62,7 @@ _gss_ntlm_acquire_cred_from(OM_uint32 *min_stat, if (maj_stat != GSS_S_COMPLETE) return maj_stat; - domain = name != NULL ? name->domain : NULL; - ret = (*ctx->server->nsi_probe)(min_stat, ctx->ictx, domain); + ret = (*ctx->server->nsi_probe)(min_stat, ctx->ictx, NULL); { gss_ctx_id_t context = (gss_ctx_id_t)ctx; OM_uint32 junk;