Changeset 427 for vendor/current/source3/winbindd/winbindd.c

Timestamp:

Apr 9, 2010, 3:20:58 PM (15 years ago)

Author:

Silvan Scherrer

Message:

Samba 3.5.x: update to 3.5.2

File:

• vendor/current/source3/winbindd/winbindd.c (modified) (8 diffs)

vendor/current/source3/winbindd/winbindd.c

@@ -571 +571 @@
         state->pid = state->request->pid;
 
+        state->cmd_name = "unknown request";
+        state->recv_fn = NULL;
+
         /* Process command */
 
@@ -591 +594 @@
                 struct tevent_req *req;
 
-                DEBUG(10, ("process_request: Handling async request %s\n",
-                           atable->cmd_name));
+                state->cmd_name = atable->cmd_name;
+                state->recv_fn = atable->recv_req;
+
+                DEBUG(10, ("process_request: Handling async request %d:%s\n",
+                           (int)state->pid, state->cmd_name));
 
                 req = atable->send_req(state->mem_ctx, winbind_event_context(),
@@ -603 +609 @@
                 }
                 tevent_req_set_callback(req, wb_request_done, state);
-                state->recv_fn = atable->recv_req;
                 return;
         }
@@ -621 +626 @@
                         DEBUG(10,("process_request: request fn %s\n",
                                   table->winbindd_cmd_name ));
+                        state->cmd_name = table->winbindd_cmd_name;
                         table->fn(state);
                         break;
@@ -639 +645 @@
         NTSTATUS status;
 
-        state->response = talloc_zero(state, struct winbindd_response);
+        state->response = talloc_zero(state->mem_ctx,
+                                      struct winbindd_response);
         if (state->response == NULL) {
+                DEBUG(0, ("wb_request_done[%d:%s]: talloc_zero failed - removing client\n",
+                          (int)state->pid, state->cmd_name));
                 remove_client(state);
                 return;
@@ -649 +658 @@
         status = state->recv_fn(req, state->response);
         TALLOC_FREE(req);
+
+        DEBUG(10,("wb_request_done[%d:%s]: %s\n",
+                  (int)state->pid, state->cmd_name, nt_errstr(status)));
+
         if (!NT_STATUS_IS_OK(status)) {
-                DEBUG(10, ("returning %s\n", nt_errstr(status)));
                 request_error(state);
                 return;
@@ -682 +694 @@
                                  state->response);
         if (req == NULL) {
+                DEBUG(10,("request_finished[%d:%s]: wb_resp_write_send() failed\n",
+                          (int)state->pid, state->cmd_name));
                 remove_client(state);
                 return;
@@ -700 +714 @@
                 close(state->sock);
                 state->sock = -1;
-                DEBUG(2, ("Could not write response to client: %s\n",
-                          strerror(err)));
+                DEBUG(2, ("Could not write response[%d:%s] to client: %s\n",
+                          (int)state->pid, state->cmd_name, strerror(err)));
                 remove_client(state);
                 return;
         }
+
+        DEBUG(10,("winbind_client_response_written[%d:%s]: deliverd response to client\n",
+                  (int)state->pid, state->cmd_name));
 
         TALLOC_FREE(state->mem_ctx);
         state->response = NULL;
+        state->cmd_name = "no request";
+        state->recv_fn = NULL;
 
         req = wb_req_read_send(state, winbind_event_context(), state->sock,