URL:
https://github.com/SSSD/sssd/pull/5883
Title: #5883: Various fixes related forest and site name discovery
pbrezina commented:
"""
On 12/3/21 20:42, Alexey A Tikhonov wrote:
only the last patch fails because the man page entry for
|dns_resolver_server_timeout| is missing in 1-16, the option itself
exists. So what would be the preferred solution, drop the hunk with
the man page change or add a patch with the man page entries first?
Since option exists, I would vote to backport man page patch.
Funny enough, the entry was added twice in master 43b9b09
<
https://github.com/SSSD/sssd/commit/43b9b0922aa24a03ea466c673646d5e307940...
and 7190f6b
<
https://github.com/SSSD/sssd/commit/7190f6b5d5b523e18e8c320df73c44b082c4d...;,
maybe one of the commits was meant for 1-16?
Well, something really weird happened.
Looking at
https://github.com/SSSD/sssd/pull/5645/files
<
https://github.com/SSSD/sssd/pull/5645/files> : new file
|src/man/include/dns_options.xml| was meant to be introduced.
But actual commits are quite different: #5645 (comment)
<
https://github.com/SSSD/sssd/pull/5645#issuecomment-847150345>
@pbrezina <
https://github.com/pbrezina>, could you please take a look?
Who knows, but it is clearly twice in master and not once in 1.16.
Sumit, would you to mind to fix it together with backport PR?
"""
See the full comment at
https://github.com/SSSD/sssd/pull/5883#issuecomment-986703792