The branch, master has been updated via 34fc529d95c3e45e7c4b81246864b3de5ca73fd8 (commit) via 3080fd66243f8f0c4b34be845a7dfd922242b685 (commit) from 09bc3a2f9c3847aafdb2e6cc2651baba62f2489e (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 34fc529d95c3e45e7c4b81246864b3de5ca73fd8 Author: Volker Lendecke <[EMAIL PROTECTED]> Date: Sun Nov 23 12:13:48 2008 +0100 fix the build commit 3080fd66243f8f0c4b34be845a7dfd922242b685 Author: Stefan Metzmacher <[EMAIL PROTECTED]> Date: Sun Nov 23 11:24:29 2008 +0100 RPC sessions on np connections need the real session key transferred ----------------------------------------------------------------------- Summary of changes: source4/rpc_server/dcerpc_server.c | 4 ++-- source4/rpc_server/service_rpc.c | 5 +++++ source4/utils/net/net_machinepw.c | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) Changeset truncated at 500 lines: diff --git a/source4/rpc_server/dcerpc_server.c b/source4/rpc_server/dcerpc_server.c index 6f3f679..6e888e5 100644 --- a/source4/rpc_server/dcerpc_server.c +++ b/source4/rpc_server/dcerpc_server.c @@ -251,8 +251,8 @@ _PUBLIC_ NTSTATUS dcesrv_interface_register(struct dcesrv_context *dce_ctx, return NT_STATUS_OK; } -static NTSTATUS dcesrv_inherited_session_key(struct dcesrv_connection *p, - DATA_BLOB *session_key) +NTSTATUS dcesrv_inherited_session_key(struct dcesrv_connection *p, + DATA_BLOB *session_key) { if (p->auth_state.session_info->session_key.length) { *session_key = p->auth_state.session_info->session_key; diff --git a/source4/rpc_server/service_rpc.c b/source4/rpc_server/service_rpc.c index e526b17..bb4d6bd 100644 --- a/source4/rpc_server/service_rpc.c +++ b/source4/rpc_server/service_rpc.c @@ -27,6 +27,7 @@ #include "auth/gensec/gensec.h" #include "../lib/util/dlinklist.h" #include "rpc_server/dcerpc_server.h" +#include "rpc_server/dcerpc_server_proto.h" #include "lib/events/events.h" #include "smbd/service_task.h" #include "smbd/service_stream.h" @@ -139,6 +140,10 @@ static void dcesrv_sock_accept(struct stream_connection *srv_conn) dcesrv_conn->transport.get_my_addr = dcesrv_sock_get_my_addr; dcesrv_conn->transport.get_peer_addr = dcesrv_sock_get_peer_addr; + if (dcesrv_sock->endpoint->ep_description->transport == NCACN_NP) { + dcesrv_conn->auth_state.session_key = dcesrv_inherited_session_key; + } + srv_conn->private = dcesrv_conn; irpc_add_name(srv_conn->msg_ctx, "rpc_server"); diff --git a/source4/utils/net/net_machinepw.c b/source4/utils/net/net_machinepw.c index 8c2fac9..710d889 100644 --- a/source4/utils/net/net_machinepw.c +++ b/source4/utils/net/net_machinepw.c @@ -25,6 +25,7 @@ #include "param/secrets.h" #include "param/param.h" #include "lib/events/events.h" +#include "lib/util/util_ldb.h" int net_machinepw_usage(struct net_context *ctx, int argc, const char **argv) { @@ -38,7 +39,6 @@ int net_machinepw(struct net_context *ctx, int argc, const char **argv) TALLOC_CTX *mem_ctx; struct event_context *ev; struct ldb_message **msgs; - int res; int num_records; const char *attrs[] = { "secret", NULL }; const char *secret; -- Samba Shared Repository