[SCM] Samba Shared Repository - branch v3-4-test updated
Karolin Seeger
kseeger at samba.org
Wed Nov 11 06:41:34 MST 2009
The branch, v3-4-test has been updated
via bb86aea... s3-rpc_client: make sure cli_rpc_pipe_open_schannel() does not always return NT_STATUS_OK.
from aecf2db... Second part of the fix for bug 6828 - infinite timeout occurs when byte lock held outside of samba. Fixes case where a connection with a pending lock can me marked "idle", and ensures that the lock queue timeout is always recalculated. Jeremy.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test
- Log -----------------------------------------------------------------
commit bb86aea5007b8ccf6f2f01e5f3c7a32b74eb7d74
Author: Günther Deschner <gd at samba.org>
Date: Tue Nov 10 13:10:12 2009 +0100
s3-rpc_client: make sure cli_rpc_pipe_open_schannel() does not always return NT_STATUS_OK.
Guenther
Part of a fix for bug #6697.
And hopefully a fix for bug #6889.
-----------------------------------------------------------------------
Summary of changes:
source3/rpc_client/cli_pipe.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/rpc_client/cli_pipe.c b/source3/rpc_client/cli_pipe.c
index 0d1d5e8..68e1530 100644
--- a/source3/rpc_client/cli_pipe.c
+++ b/source3/rpc_client/cli_pipe.c
@@ -4034,6 +4034,8 @@ NTSTATUS cli_rpc_pipe_open_schannel(struct cli_state *cli,
struct rpc_pipe_client *result = NULL;
NTSTATUS status;
+ *presult = NULL;
+
status = get_schannel_session_key(cli, domain, &neg_flags,
&netlogon_pipe);
if (!NT_STATUS_IS_OK(status)) {
@@ -4054,7 +4056,7 @@ NTSTATUS cli_rpc_pipe_open_schannel(struct cli_state *cli,
*presult = result;
}
- return NT_STATUS_OK;
+ return status;
}
/****************************************************************************
--
Samba Shared Repository
More information about the samba-cvs
mailing list