svn commit: samba r9713 - in
branches/tmp/RPCREWRITE/source/nsswitch: .
jra at samba.org
jra at samba.org
Sun Aug 28 16:50:48 GMT 2005
Author: jra
Date: 2005-08-28 16:50:47 +0000 (Sun, 28 Aug 2005)
New Revision: 9713
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=9713
Log:
Ensure I keep up to date with HEAD.
Jeremy.
Modified:
branches/tmp/RPCREWRITE/source/nsswitch/winbindd_dual.c
branches/tmp/RPCREWRITE/source/nsswitch/winbindd_util.c
Changeset:
Modified: branches/tmp/RPCREWRITE/source/nsswitch/winbindd_dual.c
===================================================================
--- branches/tmp/RPCREWRITE/source/nsswitch/winbindd_dual.c 2005-08-28 14:55:26 UTC (rev 9712)
+++ branches/tmp/RPCREWRITE/source/nsswitch/winbindd_dual.c 2005-08-28 16:50:47 UTC (rev 9713)
@@ -196,9 +196,8 @@
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);
@@ -526,13 +525,13 @@
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);
SAFE_FREE(state.request.extra_data);
- 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);
Modified: branches/tmp/RPCREWRITE/source/nsswitch/winbindd_util.c
===================================================================
--- branches/tmp/RPCREWRITE/source/nsswitch/winbindd_util.c 2005-08-28 14:55:26 UTC (rev 9712)
+++ branches/tmp/RPCREWRITE/source/nsswitch/winbindd_util.c 2005-08-28 16:50:47 UTC (rev 9713)
@@ -444,7 +444,9 @@
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)) {
More information about the samba-cvs
mailing list