svn commit: samba r23312 - in branches: SAMBA_3_0/source/nsswitch SAMBA_3_0_26/source/nsswitch

[jpeach at samba.org]

Author: jpeach
Date: 2007-06-02 21:12:47 +0000 (Sat, 02 Jun 2007)
New Revision: 23312

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23312

Log:
As per Volker, rename the "windbind:ads" parameter "winbind:rpc only".

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-02 11:38:27 UTC (rev 23311)
+++ branches/SAMBA_3_0/source/nsswitch/winbindd_cache.c	2007-06-02 21:12:47 UTC (rev 23312)
@@ -133,9 +133,6 @@
 static struct winbind_cache *get_cache(struct winbindd_domain *domain)
 {
 	struct winbind_cache *ret = wcache;
-#ifdef HAVE_ADS
-	struct winbindd_domain *our_domain = domain;
-#endif
 
 	/* We have to know what type of domain we are dealing with first. */
 
@@ -163,6 +160,8 @@
 
 	if (!domain->backend) {
 #ifdef HAVE_ADS
+		struct winbindd_domain *our_domain = domain;
+
 		/* find our domain first so we can figure out if we 
 		   are joined to a kerberized domain */
 
@@ -171,7 +170,7 @@
 
 		if ((our_domain->active_directory || IS_DC)
 		    && domain->active_directory
-		    && lp_parm_bool(-1, "winbind", "ads", True)) {
+		    && !lp_parm_bool(-1, "winbind", "rpc only", False)) {
 			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-02 11:38:27 UTC (rev 23311)
+++ branches/SAMBA_3_0_26/source/nsswitch/winbindd_cache.c	2007-06-02 21:12:47 UTC (rev 23312)
@@ -133,9 +133,6 @@
 static struct winbind_cache *get_cache(struct winbindd_domain *domain)
 {
 	struct winbind_cache *ret = wcache;
-#ifdef HAVE_ADS
-	struct winbindd_domain *our_domain = domain;
-#endif
 
 	/* We have to know what type of domain we are dealing with first. */
 
@@ -163,6 +160,8 @@
 
 	if (!domain->backend) {
 #ifdef HAVE_ADS
+		struct winbindd_domain *our_domain = domain;
+
 		/* find our domain first so we can figure out if we 
 		   are joined to a kerberized domain */
 
@@ -171,7 +170,7 @@
 
 		if ((our_domain->active_directory || IS_DC)
 		    && domain->active_directory
-		    && lp_parm_bool(-1, "winbind", "ads", True)) {
+		    && !lp_parm_bool(-1, "winbind", "rpc only", False)) {
 			DEBUG(5,("get_cache: Setting ADS methods for domain %s\n", domain->name));
 			domain->backend = &ads_methods;
 		} else {