The branch, master has been updated
via e45b0d4 source3/rpc_client: Fix CID 1273041 Condition is redundant
via 661b4ed lib/talloc: Fix CID 1291639 Missing unlock
via f57a235 lib/talloc: Fix CID 1291640 Missing unlock
via 9ae65b2 smbd: Log smb2 requests returning !OK with higher log level
from d3ac3da s4:rpc_server/netlogon: Fix for NetApp
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit e45b0d49be2f487243bbe99afb6e6cd8a1f918ac
Author: Anoop C S <[email protected]>
Date: Mon Aug 3 14:01:58 2015 +0530
source3/rpc_client: Fix CID 1273041 Condition is redundant
Signed-off-by: Anoop C S <[email protected]>
Reviewed-by: Michael Adam <[email protected]>
Reviewed-by: Stefan Metzmacher <[email protected]>
Autobuild-User(master): Michael Adam <[email protected]>
Autobuild-Date(master): Fri Aug 7 01:31:23 CEST 2015 on sn-devel-104
commit 661b4edd03c4f040ff6dda07d599ff74f1b2f08b
Author: Anoop C S <[email protected]>
Date: Mon Aug 3 13:59:33 2015 +0530
lib/talloc: Fix CID 1291639 Missing unlock
Signed-off-by: Anoop C S <[email protected]>
Reviewed-by: Michael Adam <[email protected]>
Reviewed-by: Stefan Metzmacher <[email protected]>
commit f57a235a1f2cda05918971127c039f0499b9658b
Author: Anoop C S <[email protected]>
Date: Mon Aug 3 13:57:19 2015 +0530
lib/talloc: Fix CID 1291640 Missing unlock
Signed-off-by: Anoop C S <[email protected]>
Reviewed-by: Michael Adam <[email protected]>
Reviewed-by: Stefan Metzmacher <[email protected]>
commit 9ae65b2546cb3d5c7662a37bf336dda38cfb3166
Author: Christof Schmitt <[email protected]>
Date: Wed Aug 5 13:31:44 2015 -0700
smbd: Log smb2 requests returning !OK with higher log level
This can be useful for narrowing down problems without taking a full
level 10 trace.
Signed-off-by: Christof Schmitt <[email protected]>
Reviewed-by: Michael Adam <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
lib/talloc/testsuite.c | 2 ++
source3/rpc_client/rpc_transport_np.c | 3 ++-
source3/smbd/smb2_server.c | 6 +++---
3 files changed, 7 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/talloc/testsuite.c b/lib/talloc/testsuite.c
index 6d0fe94..c67cfb9 100644
--- a/lib/talloc/testsuite.c
+++ b/lib/talloc/testsuite.c
@@ -1747,6 +1747,7 @@ static void *thread_fn(void *arg)
ret = pthread_cond_wait(&condvar, &mtx);
if (ret != 0) {
talloc_free(top_ctx);
+ pthread_mutex_unlock(&mtx);
return NULL;
}
}
@@ -1827,6 +1828,7 @@ static bool test_pthread_talloc_passing(void)
printf("pthread_cond_wait %d failed (%d)\n", i,
ret);
talloc_free(mem_ctx);
+ pthread_mutex_unlock(&mtx);
return false;
}
}
diff --git a/source3/rpc_client/rpc_transport_np.c
b/source3/rpc_client/rpc_transport_np.c
index b928b7c..9dc5c56 100644
--- a/source3/rpc_client/rpc_transport_np.c
+++ b/source3/rpc_client/rpc_transport_np.c
@@ -141,7 +141,8 @@ static void rpc_transport_np_init_pipe_open(struct
tevent_req *subreq)
timeval_current_ofs_msec(100 * state->retries),
rpc_transport_np_init_pipe_open_retry, req);
if (tevent_req_nomem(te, req)) {
- return;
+ DEBUG(2, ("Failed to create asynchronous "
+ "tevent_timer"));
}
return;
} else if (!NT_STATUS_IS_OK(status)) {
diff --git a/source3/smbd/smb2_server.c b/source3/smbd/smb2_server.c
index a0b1bfc..a53ddf8 100644
--- a/source3/smbd/smb2_server.c
+++ b/source3/smbd/smb2_server.c
@@ -2790,9 +2790,9 @@ NTSTATUS smbd_smb2_request_error_ex(struct
smbd_smb2_request *req,
uint8_t *outhdr = SMBD_SMB2_OUT_HDR_PTR(req);
size_t unread_bytes = smbd_smb2_unread_bytes(req);
- DEBUG(10,("smbd_smb2_request_error_ex: idx[%d] status[%s] |%s| at %s\n",
- req->current_idx, nt_errstr(status), info ? " +info" : "",
- location));
+ DBG_NOTICE("smbd_smb2_request_error_ex: idx[%d] status[%s] |%s| "
+ "at %s\n", req->current_idx, nt_errstr(status),
+ info ? " +info" : "", location);
if (unread_bytes) {
/* Recvfile error. Drain incoming socket. */
--
Samba Shared Repository
