* fhandler_dsp.cc (fhandler_dev_dsp::fixup_after_fork): Actually call
_fixup_after_fork rather than looping forever. (fhandler_dev_dsp::fixup_after_exec): Ditto.
This commit is contained in:
parent
203cd39dfe
commit
40e0c34e9c
|
@ -4,6 +4,12 @@
|
|||
_fixup_after_fork rather than looping forever.
|
||||
(fhandler_dev_dsp::fixup_after_exec): Ditto.
|
||||
|
||||
2014-03-18 Corinna Vinschen <corinna@vinschen.de>
|
||||
|
||||
* passwd.cc (pg_ent::enumerate_ad): Ignore primary domain in list of
|
||||
trusted domains only if all trusted domains are enumerated anyway.
|
||||
Explain why.
|
||||
|
||||
2014-03-18 Corinna Vinschen <corinna@vinschen.de>
|
||||
|
||||
Partially revert patch from 2014-03-04.
|
||||
|
|
|
@ -566,7 +566,12 @@ pg_ent::enumerate_ad ()
|
|||
else if ((td = cygheap->dom.trusted_domain (resume - 1)))
|
||||
{
|
||||
++resume;
|
||||
if ((td->Flags & DS_DOMAIN_PRIMARY)
|
||||
/* Ignore primary domain in list of trusted domains only if all
|
||||
trusted domains are enumerated anyway. This handles an
|
||||
annoying backward compatibility problem in mkpasswd/mkgroup.
|
||||
Without this test, `mkpasswd -d PRIMARY_DOMAIN' wouldn't
|
||||
work as expected. */
|
||||
if (((enums & ENUM_TDOMS_ALL) && td->Flags & DS_DOMAIN_PRIMARY)
|
||||
|| !td->DomainSid
|
||||
|| (!nss_db_enum_tdom (td->NetbiosDomainName)
|
||||
&& !nss_db_enum_tdom (td->DnsDomainName))
|
||||
|
|
Loading…
Reference in New Issue