diff options
| author | Gerald W. Carter <jerry@samba.org> | 2008-03-31 13:39:54 -0500 |
|---|---|---|
| committer | Gerald W. Carter <jerry@samba.org> | 2008-03-31 13:40:58 -0500 |
| commit | 5414a21ba39f9ad5a7d65f46033d4fa5eed21225 (patch) | |
| tree | 0e4410c3b2613901473ec5ffa2dc2c74f802b10b | |
| parent | 0552d7df546bfc7db5c75f46b25b0f38577ade9f (diff) | |
| download | samba-5414a21ba39f9ad5a7d65f46033d4fa5eed21225.tar.gz samba-5414a21ba39f9ad5a7d65f46033d4fa5eed21225.tar.bz2 samba-5414a21ba39f9ad5a7d65f46033d4fa5eed21225.zip | |
Fix enumeration of forest trusts from our root domain.
Do not overwrite the domain->domain_flags when setting infomation
in set_dc_type_and_flags_connect().
(This used to be commit 3414eac439b731ad7204b821ddc4fec54fe4435d)
| -rw-r--r-- | source3/winbindd/winbindd_cm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/winbindd/winbindd_cm.c b/source3/winbindd/winbindd_cm.c index d4241a0c78..39d8def7ea 100644 --- a/source3/winbindd/winbindd_cm.c +++ b/source3/winbindd/winbindd_cm.c @@ -1938,7 +1938,7 @@ no_dssetup: lsa_info->dns.dns_forest.string); if (strequal(domain->forest_name, domain->alt_name)) { - domain->domain_flags = NETR_TRUST_FLAG_TREEROOT; + domain->domain_flags |= NETR_TRUST_FLAG_TREEROOT; } } |