[SCM] Samba Shared Repository - branch master updated
Volker Lendecke
vlendec at samba.org
Mon Jul 26 14:58:55 MDT 2010
The branch, master has been updated
via 5030ba5... s3: Callers of cli_qpathinfo_recv might ignore the output
from b6c4eb3... s3: Log the correct core path on Linux if core_pattern is set
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 5030ba5e9473b4d169f69afdcf2de20ce14f82f9
Author: Volker Lendecke <vl at samba.org>
Date: Mon Jul 26 22:57:47 2010 +0200
s3: Callers of cli_qpathinfo_recv might ignore the output
-----------------------------------------------------------------------
Summary of changes:
source3/libsmb/clifile.c | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/libsmb/clifile.c b/source3/libsmb/clifile.c
index 802fab9..6b8230b 100644
--- a/source3/libsmb/clifile.c
+++ b/source3/libsmb/clifile.c
@@ -5190,8 +5190,14 @@ NTSTATUS cli_qpathinfo_recv(struct tevent_req *req, TALLOC_CTX *mem_ctx,
if (tevent_req_is_nterror(req, &status)) {
return status;
}
- *rdata = talloc_move(mem_ctx, &state->rdata);
- *num_rdata = state->num_rdata;
+ if (rdata != NULL) {
+ *rdata = talloc_move(mem_ctx, &state->rdata);
+ } else {
+ TALLOC_FREE(state->rdata);
+ }
+ if (num_rdata != NULL) {
+ *num_rdata = state->num_rdata;
+ }
return NT_STATUS_OK;
}
--
Samba Shared Repository
More information about the samba-cvs
mailing list