Author: gd Date: 2006-06-07 13:06:49 +0000 (Wed, 07 Jun 2006) New Revision: 16080
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=16080 Log: Re-add accidentially excluded in-forest domain trusts (fixes bug #3823). Guenther Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_ads.c trunk/source/nsswitch/winbindd_ads.c Changeset: Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_ads.c =================================================================== --- branches/SAMBA_3_0/source/nsswitch/winbindd_ads.c 2006-06-07 12:35:16 UTC (rev 16079) +++ branches/SAMBA_3_0/source/nsswitch/winbindd_ads.c 2006-06-07 13:06:49 UTC (rev 16080) @@ -1042,7 +1042,7 @@ struct ds_domain_trust *domains = NULL; int count = 0; int i; - uint32 flags = DS_DOMAIN_DIRECT_OUTBOUND; + uint32 flags = DS_DOMAIN_IN_FOREST | DS_DOMAIN_DIRECT_OUTBOUND; struct rpc_pipe_client *cli; DEBUG(3,("ads: trusted_domains\n")); Modified: trunk/source/nsswitch/winbindd_ads.c =================================================================== --- trunk/source/nsswitch/winbindd_ads.c 2006-06-07 12:35:16 UTC (rev 16079) +++ trunk/source/nsswitch/winbindd_ads.c 2006-06-07 13:06:49 UTC (rev 16080) @@ -1042,7 +1042,7 @@ struct ds_domain_trust *domains = NULL; int count = 0; int i; - uint32 flags = DS_DOMAIN_DIRECT_OUTBOUND; + uint32 flags = DS_DOMAIN_IN_FOREST | DS_DOMAIN_DIRECT_OUTBOUND; struct rpc_pipe_client *cli; DEBUG(3,("ads: trusted_domains\n"));
