git.samba.org
/
ira
/
wip.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
0552d7d
)
Fix enumeration of forest trusts from our root domain.
author
Gerald W. Carter
<jerry@samba.org>
Mon, 31 Mar 2008 18:39:54 +0000
(13:39 -0500)
committer
Gerald W. Carter
<jerry@samba.org>
Mon, 31 Mar 2008 18:40:58 +0000
(13:40 -0500)
Do not overwrite the domain->domain_flags when setting infomation
in set_dc_type_and_flags_connect().
(This used to be commit
3414eac439b731ad7204b821ddc4fec54fe4435d
)
source3/winbindd/winbindd_cm.c
patch
|
blob
|
history
diff --git
a/source3/winbindd/winbindd_cm.c
b/source3/winbindd/winbindd_cm.c
index d4241a0c7822ba36b4af34cd886f14e0b9dea12c..39d8def7ea67f04b4fcef3d2c16b06680009209a 100644
(file)
--- 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;
}
}