Author: vlendec Date: 2007-06-01 18:39:50 +0000 (Fri, 01 Jun 2007) New Revision: 23297
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23297 Log: This introduces the winbind:ads parameter which defaults to True. Setting it to False makes winbind use RPC and not LDAP methods to connect to the DCs, even when it figured out they are AD. Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_cache.c branches/SAMBA_3_0_26/source/nsswitch/winbindd_cache.c Changeset: Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_cache.c =================================================================== --- branches/SAMBA_3_0/source/nsswitch/winbindd_cache.c 2007-06-01 18:36:55 UTC (rev 23296) +++ branches/SAMBA_3_0/source/nsswitch/winbindd_cache.c 2007-06-01 18:39:50 UTC (rev 23297) @@ -169,7 +169,9 @@ if ( !domain->primary ) our_domain = find_our_domain(); - if ( (our_domain->active_directory || IS_DC) && domain->active_directory ) { + if ((our_domain->active_directory || IS_DC) + && domain->active_directory + && lp_parm_bool(-1, "winbind", "ads", True)) { DEBUG(5,("get_cache: Setting ADS methods for domain %s\n", domain->name)); domain->backend = &ads_methods; } else { Modified: branches/SAMBA_3_0_26/source/nsswitch/winbindd_cache.c =================================================================== --- branches/SAMBA_3_0_26/source/nsswitch/winbindd_cache.c 2007-06-01 18:36:55 UTC (rev 23296) +++ branches/SAMBA_3_0_26/source/nsswitch/winbindd_cache.c 2007-06-01 18:39:50 UTC (rev 23297) @@ -169,7 +169,9 @@ if ( !domain->primary ) our_domain = find_our_domain(); - if ( (our_domain->active_directory || IS_DC) && domain->active_directory ) { + if ((our_domain->active_directory || IS_DC) + && domain->active_directory + && lp_parm_bool(-1, "winbind", "ads", True)) { DEBUG(5,("get_cache: Setting ADS methods for domain %s\n", domain->name)); domain->backend = &ads_methods; } else {
