Becouse of changes to the meaning of this feild over time, this doesn't

actually work.  Also, the idea of 'loopback winbind' isn't that bad an idea
anyway (potential PDC/BDC applications).

Given all that, remove it...

Andrew Bartlett

2 files changed, 0 insertions, 22 deletions

diff --git a/source/nsswitch/wb_common.c b/source/nsswitch/wb_common.c
index 89dd6252412..9bc9faafb50 100644
--- a/source/nsswitch/wb_common.c
+++ b/source/nsswitch/wb_common.c
@@ -28,7 +28,6 @@
 /* Global variables.  These are effectively the client state information */
 
 int winbindd_fd = -1;           /* fd for winbindd socket */
-static char *excluded_domain;
 
 /* Free a response structure */
 
@@ -40,16 +39,6 @@ void free_response(struct winbindd_response *response)
 		SAFE_FREE(response->extra_data);
 }
 
-/*
-  smbd needs to be able to exclude lookups for its own domain
-*/
-void winbind_exclude_domain(const char *domain)
-{
-	SAFE_FREE(excluded_domain);
-	excluded_domain = strdup(domain);
-}
-
-
 /* Initialise a request structure */
 
 void init_request(struct winbindd_request *request, int request_type)
@@ -325,12 +314,6 @@ NSS_STATUS winbindd_send_request(int req_type, struct winbindd_request *request)
 		return NSS_STATUS_NOTFOUND;
 	}
 
-	/* smbd may have excluded this domain */
-	if (excluded_domain && 
-	    strcasecmp(excluded_domain, request->domain) == 0) {
-		return NSS_STATUS_NOTFOUND;
-	}
-
 	if (!request) {
 		ZERO_STRUCT(lrequest);
 		request = &lrequest;
diff --git a/source/smbd/server.c b/source/smbd/server.c
index 41b55b96229..b2b905cec35 100644
--- a/source/smbd/server.c
+++ b/source/smbd/server.c
@@ -808,11 +808,6 @@ static void usage(char *pname)
 
 	init_structs();
 
-	/* don't call winbind for our domain if we are the DC */
-	if (lp_domain_logons()) {
-		winbind_exclude_domain(lp_workgroup());
-	}
-	
 #ifdef WITH_PROFILE
 	if (!profile_setup(False)) {
 		DEBUG(0,("ERROR: failed to setup profiling\n"));