Revert "tgs-rep: always return canonical realm when force_canonicalize set"

This reverts commit 6f81e4c93b.

This patch may have originated in Samba from before force_canonicalize was
supported. Because the server_principal argument to tgs_make_reply() is
canonicalized prior to calling (if the server entry has force_canonicalize
set), honoring it again in tgs_make_reply() is superfluous.
This commit is contained in:
Luke Howard
2021-12-18 11:29:26 +11:00
parent 1bf02337f0
commit fc76c83ab1

View File

@@ -611,11 +611,7 @@ tgs_make_reply(astgs_request_t r,
if(ret)
goto out;
if (server->entry.flags.force_canonicalize)
ret = copy_Realm(&server->entry.principal->realm, &rep.ticket.realm);
else
ret = copy_Realm(&server_principal->realm, &rep.ticket.realm);
ret = copy_Realm(&server_principal->realm, &rep.ticket.realm);
if (ret)
goto out;
_krb5_principal2principalname(&rep.ticket.sname, server_principal);