r9709: Fix two bugs found by Brian Moran: Any request sent to winbind while the child

in question is still initializing overwrites domain->dcname. Only overwrite if
the parent actually has sent a dcname and thus really knows it. Second,
ntlm_auth needs the error code, not just the fact it failed.

Jerry, the 3_0 part might qualify as a "recommended patch".

Thanks,

Volker

diff --git a/source/nsswitch/winbindd_dual.c b/source/nsswitch/winbindd_dual.c
index 940cd12ba53a036ce64f42a3565a7c917af444b9..ec0b7a36e2fb976fb192efa503c49cb763e024e2 100644 (file)
--- a/source/nsswitch/winbindd_dual.c
+++ b/source/nsswitch/winbindd_dual.c
@@ -158,9 +158,8 @@ static void async_reply_recv(void *private_data, BOOL success)
                return;
        }
 
-       if (state->response->result == WINBINDD_OK)
-               SMB_ASSERT(cache_retrieve_response(child->pid,
-                                                  state->response));
+       SMB_ASSERT(cache_retrieve_response(child->pid,
+                                          state->response));
 
        DLIST_REMOVE(child->requests, state);
 
@@ -479,12 +478,11 @@ static BOOL fork_domain_child(struct winbindd_child *child)
                        DEBUG(4,("child daemon request %d\n",
                                 (int)state.request.cmd));
 
+                       ZERO_STRUCT(state.response);
                        state.request.null_term = '\0';
                        child_process_request(child->domain, &state);
 
-                       if (state.response.result == WINBINDD_OK)
-                               cache_store_response(sys_getpid(),
-                                                    &state.response);
+                       cache_store_response(sys_getpid(), &state.response);
 
                        SAFE_FREE(state.response.extra_data);
 

diff --git a/source/nsswitch/winbindd_util.c b/source/nsswitch/winbindd_util.c
index 2be1520250a77ee6109eaa1878cc103fe89ae51d..6b1a6b5b4dfed924f41dc7d529902ce319d72230 100644 (file)
--- a/source/nsswitch/winbindd_util.c
+++ b/source/nsswitch/winbindd_util.c
@@ -444,7 +444,9 @@ enum winbindd_result winbindd_dual_init_connection(struct winbindd_domain *domai
        state->request.data.init_conn.dcname
                [sizeof(state->request.data.init_conn.dcname)-1]='\0';
 
-       fstrcpy(domain->dcname, state->request.data.init_conn.dcname);
+       if (strlen(state->request.data.init_conn.dcname) > 0) {
+               fstrcpy(domain->dcname, state->request.data.init_conn.dcname);
+       }
 
        if (strlen(domain->dcname) > 0) {
                if (!resolve_name(domain->dcname, &ipaddr, 0x20)) {