svn commit: samba r15174 - branches/SAMBA_3_0/source/nsswitch trunk/source/nsswitch

[Guenther Deschner]

Hi Volker,

On Sun, Apr 23, 2006 at 11:11:28AM +0000, vlendec at samba.org wrote:
> Author: vlendec
> Date: 2006-04-23 11:11:27 +0000 (Sun, 23 Apr 2006)
> New Revision: 15174
> 
> WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=15174
> 
> Log:
> Check in Ronan Waide's wbinfo -i. Thanks :-)
> 
> Volker
> 
> Modified:
>    branches/SAMBA_3_0/source/nsswitch/wbinfo.c
>    trunk/source/nsswitch/wbinfo.c
>    trunk/source/nsswitch/winbindd_cache.c
> 
...

> Modified: trunk/source/nsswitch/winbindd_cache.c
> ===================================================================
> --- trunk/source/nsswitch/winbindd_cache.c	2006-04-23 10:59:44 UTC (rev 15173)
> +++ trunk/source/nsswitch/winbindd_cache.c	2006-04-23 11:11:27 UTC (rev 15174)
> @@ -121,7 +121,8 @@
>  		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_security()==SEC_ADS)) {
>  			DEBUG(5,("get_cache: Setting ADS methods for domain %s\n", domain->name));
>  			domain->backend = &ads_methods;
>  		} else {

Hm, was this change by intention? It reverts jerry's "do-the-right-thing"
patch, right?

Cheers,
Guenther
-- 
Günther Deschner                    GPG-ID: 8EE11688
Novell / SUSE LINUX                       gd at suse.de
Samba Team                              gd at samba.org
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
Url : http://lists.samba.org/archive/samba-technical/attachments/20060424/b188aa63/attachment.bin