The branch, master has been updated
via d17abc6... s3-dcerpc: Avoid ifdef, it is handled within
dcerpc_gssapi.c already
from 44add99... s3: Fix cli_qpathinfo2
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit d17abc69f690ccc845a0a1d6d291b6e21ce86b3d
Author: Simo Sorce <i...@samba.org>
Date: Wed Jul 28 15:35:02 2010 -0400
s3-dcerpc: Avoid ifdef, it is handled within dcerpc_gssapi.c already
-----------------------------------------------------------------------
Summary of changes:
source3/rpc_client/cli_pipe.c | 9 ++-------
1 files changed, 2 insertions(+), 7 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/rpc_client/cli_pipe.c b/source3/rpc_client/cli_pipe.c
index 8588875..bbd869e 100644
--- a/source3/rpc_client/cli_pipe.c
+++ b/source3/rpc_client/cli_pipe.c
@@ -3344,7 +3344,6 @@ NTSTATUS cli_rpc_pipe_open_krb5(struct cli_state *cli,
const char *password,
struct rpc_pipe_client **presult)
{
-#ifdef HAVE_GSSAPI_H
struct rpc_pipe_client *result;
struct pipe_auth_data *auth;
NTSTATUS status;
@@ -3367,18 +3366,14 @@ NTSTATUS cli_rpc_pipe_open_krb5(struct cli_state *cli,
status = rpc_pipe_bind(result, auth);
if (!NT_STATUS_IS_OK(status)) {
- DEBUG(0, ("cli_rpc_pipe_open_krb5: cli_rpc_pipe_bind failed "
- "with error %s\n", nt_errstr(status)));
+ DEBUG(0, ("cli_rpc_pipe_bind failed with error %s\n",
+ nt_errstr(status)));
TALLOC_FREE(result);
return status;
}
*presult = result;
return NT_STATUS_OK;
-#else
- DEBUG(0,("cli_rpc_pipe_open_krb5: kerberos not found at compile
time.\n"));
- return NT_STATUS_NOT_IMPLEMENTED;
-#endif
}
NTSTATUS cli_get_session_key(TALLOC_CTX *mem_ctx,
--
Samba Shared Repository
