r9330: Remove the classic dual daemon since it was not being used.

It was already gone in trunk anyways.
working on fixing BUG 3000 which does work now but we are flying
without a cache.
(This used to be commit 4936d6d8b28edc59a3d17defcdf255ea6e0ba4e0)

1 files changed, 0 insertions, 180 deletions

diff --git a/source3/nsswitch/winbindd_dual.c b/source3/nsswitch/winbindd_dual.c
index 46b3ce2258..d4bcf4e384 100644
--- a/source3/nsswitch/winbindd_dual.c
+++ b/source3/nsswitch/winbindd_dual.c
@@ -36,22 +36,6 @@
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_WINBIND
 
-extern BOOL opt_dual_daemon;
-BOOL background_process = False;
-int dual_daemon_pipe = -1;
-
-
-/* a list of requests ready to be sent to the dual daemon */
-struct dual_list {
-	struct dual_list *next;
-	char *data;
-	int length;
-	int offset;
-};
-
-static struct dual_list *dual_list;
-static struct dual_list *dual_list_end;
-
 /* Read some data from a client connection */
 
 static void dual_client_read(struct winbindd_cli_state *state)
@@ -86,167 +70,6 @@ static void dual_client_read(struct winbindd_cli_state *state)
 }
 
 /*
-  setup a select() including the dual daemon pipe
- */
-int dual_select_setup(fd_set *fds, int maxfd)
-{
-	if (dual_daemon_pipe == -1 ||
-	    !dual_list) {
-		return maxfd;
-	}
-
-	FD_SET(dual_daemon_pipe, fds);
-	if (dual_daemon_pipe > maxfd) {
-		maxfd = dual_daemon_pipe;
-	}
-	return maxfd;
-}
-
-
-/*
-  a hook called from the main winbindd select() loop to handle writes
-  to the dual daemon pipe 
-*/
-void dual_select(fd_set *fds)
-{
-	int n;
-
-	if (dual_daemon_pipe == -1 ||
-	    !dual_list ||
-	    !FD_ISSET(dual_daemon_pipe, fds)) {
-		return;
-	}
-
-	n = sys_write(dual_daemon_pipe, 
-		  &dual_list->data[dual_list->offset],
-		  dual_list->length - dual_list->offset);
-
-	if (n <= 0) {
-		/* the pipe is dead! fall back to normal operation */
-		dual_daemon_pipe = -1;
-		return;
-	}
-
-	dual_list->offset += n;
-
-	if (dual_list->offset == dual_list->length) {
-		struct dual_list *next;
-		next = dual_list->next;
-		free(dual_list->data);
-		free(dual_list);
-		dual_list = next;
-		if (!dual_list) {
-			dual_list_end = NULL;
-		}
-	}
-}
-
-/* 
-   send a request to the background daemon 
-   this is called for stale cached entries
-*/
-void dual_send_request(struct winbindd_cli_state *state)
-{
-	struct dual_list *list;
-
-	if (!background_process) return;
-
-	list = SMB_MALLOC_P(struct dual_list);
-	if (!list) return;
-
-	list->next = NULL;
-	list->data = memdup(&state->request, sizeof(state->request));
-	list->length = sizeof(state->request);
-	list->offset = 0;
-	
-	if (!dual_list_end) {
-		dual_list = list;
-		dual_list_end = list;
-	} else {
-		dual_list_end->next = list;
-		dual_list_end = list;
-	}
-
-	background_process = False;
-}
-
-
-/* 
-the main dual daemon 
-*/
-void do_dual_daemon(void)
-{
-	int fdpair[2];
-	struct winbindd_cli_state state;
-	
-	if (pipe(fdpair) != 0) {
-		return;
-	}
-
-	ZERO_STRUCT(state);
-	state.pid = getpid();
-
-	dual_daemon_pipe = fdpair[1];
-	state.sock = fdpair[0];
-
-	if (sys_fork() != 0) {
-		close(fdpair[0]);
-		return;
-	}
-	close(fdpair[1]);
-
-	/* tdb needs special fork handling */
-	if (tdb_reopen_all() == -1) {
-		DEBUG(0,("tdb_reopen_all failed.\n"));
-		_exit(0);
-	}
-	
-	dual_daemon_pipe = -1;
-	opt_dual_daemon = False;
-
-	while (1) {
-		/* free up any talloc memory */
-		lp_talloc_free();
-		main_loop_talloc_free();
-
-		/* fetch a request from the main daemon */
-		dual_client_read(&state);
-
-		if (state.finished) {
-			/* we lost contact with our parent */
-			exit(0);
-		}
-
-		/* process full rquests */
-		if (state.read_buf_len == sizeof(state.request)) {
-			DEBUG(4,("dual daemon request %d\n", (int)state.request.cmd));
-
-			/* special handling for the stateful requests */
-			switch (state.request.cmd) {
-			case WINBINDD_GETPWENT:
-				winbindd_setpwent(&state);
-				break;
-				
-			case WINBINDD_GETGRENT:
-			case WINBINDD_GETGRLST:
-				winbindd_setgrent(&state);
-				break;
-			default:
-				break;
-			}
-
-			winbind_process_packet(&state);
-			SAFE_FREE(state.response.extra_data);
-
-			free_getent_state(state.getpwent_state);
-			free_getent_state(state.getgrent_state);
-			state.getpwent_state = NULL;
-			state.getgrent_state = NULL;
-		}
-	}
-}
-
-/*
  * Machinery for async requests sent to children. You set up a
  * winbindd_request, select a child to query, and issue a async_request
  * call. When the request is completed, the callback function you specified is
@@ -645,9 +468,6 @@ static BOOL fork_domain_child(struct winbindd_child *child)
 		reopen_logs();
 	}
 	
-	dual_daemon_pipe = -1;
-	opt_dual_daemon = False;
-
 	while (1) {
 		/* free up any talloc memory */
 		lp_talloc_free();