summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--pidl/lib/Parse/Pidl/Samba4/NDR/Server.pm4
-rw-r--r--source4/rpc_server/backupkey/dcesrv_backupkey.c7
-rw-r--r--source4/rpc_server/backupkey/dcesrv_backupkey_heimdal.c7
-rw-r--r--source4/rpc_server/dcerpc_server.c2
-rw-r--r--source4/rpc_server/dcerpc_server.h2
-rw-r--r--source4/rpc_server/dcesrv_mgmt.c7
-rw-r--r--source4/rpc_server/dnsserver/dcerpc_dnsserver.c7
-rw-r--r--source4/rpc_server/drsuapi/dcesrv_drsuapi.c7
-rw-r--r--source4/rpc_server/echo/rpc_echo.c7
-rw-r--r--source4/rpc_server/epmapper/rpc_epmapper.c7
-rw-r--r--source4/rpc_server/lsa/dcesrv_lsa.c7
-rw-r--r--source4/rpc_server/netlogon/dcerpc_netlogon.c7
-rw-r--r--source4/rpc_server/remote/dcesrv_remote.c3
-rw-r--r--source4/rpc_server/samr/dcesrv_samr.c7
-rw-r--r--source4/torture/rpc/spoolss_notify.c5
15 files changed, 38 insertions, 48 deletions
diff --git a/pidl/lib/Parse/Pidl/Samba4/NDR/Server.pm b/pidl/lib/Parse/Pidl/Samba4/NDR/Server.pm
index ad36f000077..e228a762591 100644
--- a/pidl/lib/Parse/Pidl/Samba4/NDR/Server.pm
+++ b/pidl/lib/Parse/Pidl/Samba4/NDR/Server.pm
@@ -81,10 +81,10 @@ sub Boilerplate_Iface($)
my $if_version = $interface->{VERSION};
pidl "
-static NTSTATUS $name\__op_bind(struct dcesrv_call_state *dce_call, const struct dcesrv_interface *iface, uint32_t if_version)
+static NTSTATUS $name\__op_bind(struct dcesrv_connection_context *context, const struct dcesrv_interface *iface)
{
#ifdef DCESRV_INTERFACE_$uname\_BIND
- return DCESRV_INTERFACE_$uname\_BIND(dce_call,iface);
+ return DCESRV_INTERFACE_$uname\_BIND(context,iface);
#else
return NT_STATUS_OK;
#endif
diff --git a/source4/rpc_server/backupkey/dcesrv_backupkey.c b/source4/rpc_server/backupkey/dcesrv_backupkey.c
index 307a7f09b74..a826ae083f4 100644
--- a/source4/rpc_server/backupkey/dcesrv_backupkey.c
+++ b/source4/rpc_server/backupkey/dcesrv_backupkey.c
@@ -42,12 +42,11 @@
#include <gnutls/crypto.h>
#include <gnutls/abstract.h>
-#define DCESRV_INTERFACE_BACKUPKEY_BIND(call, iface) \
- dcesrv_interface_backupkey_bind(call, iface)
-static NTSTATUS dcesrv_interface_backupkey_bind(struct dcesrv_call_state *dce_call,
+#define DCESRV_INTERFACE_BACKUPKEY_BIND(context, iface) \
+ dcesrv_interface_backupkey_bind(context, iface)
+static NTSTATUS dcesrv_interface_backupkey_bind(struct dcesrv_connection_context *context,
const struct dcesrv_interface *iface)
{
- struct dcesrv_connection_context *context = dce_call->context;
return dcesrv_interface_bind_require_privacy(context, iface);
}
diff --git a/source4/rpc_server/backupkey/dcesrv_backupkey_heimdal.c b/source4/rpc_server/backupkey/dcesrv_backupkey_heimdal.c
index 05113a9cc74..60d082378d7 100644
--- a/source4/rpc_server/backupkey/dcesrv_backupkey_heimdal.c
+++ b/source4/rpc_server/backupkey/dcesrv_backupkey_heimdal.c
@@ -49,12 +49,11 @@
#include <gcrypt.h>
#endif
-#define DCESRV_INTERFACE_BACKUPKEY_BIND(call, iface) \
- dcesrv_interface_backupkey_bind(call, iface)
-static NTSTATUS dcesrv_interface_backupkey_bind(struct dcesrv_call_state *dce_call,
+#define DCESRV_INTERFACE_BACKUPKEY_BIND(context, iface) \
+ dcesrv_interface_backupkey_bind(context, iface)
+static NTSTATUS dcesrv_interface_backupkey_bind(struct dcesrv_connection_context *context,
const struct dcesrv_interface *iface)
{
- struct dcesrv_connection_context *context = dce_call->context;
return dcesrv_interface_bind_require_privacy(context, iface);
}
diff --git a/source4/rpc_server/dcerpc_server.c b/source4/rpc_server/dcerpc_server.c
index 9717a24d637..d9ed390a498 100644
--- a/source4/rpc_server/dcerpc_server.c
+++ b/source4/rpc_server/dcerpc_server.c
@@ -1510,7 +1510,7 @@ static NTSTATUS dcesrv_check_or_create_context(struct dcesrv_call_state *call,
*/
call->state_flags |= DCESRV_CALL_STATE_FLAG_MULTIPLEXED;
- status = iface->bind(call, iface, if_version);
+ status = iface->bind(context, iface);
call->context = NULL;
if (!NT_STATUS_IS_OK(status)) {
/* we don't want to trigger the iface->unbind() hook */
diff --git a/source4/rpc_server/dcerpc_server.h b/source4/rpc_server/dcerpc_server.h
index dfe48883353..8e404c0591c 100644
--- a/source4/rpc_server/dcerpc_server.h
+++ b/source4/rpc_server/dcerpc_server.h
@@ -45,7 +45,7 @@ struct dcesrv_interface {
struct ndr_syntax_id syntax_id;
/* this function is called when the client binds to this interface */
- NTSTATUS (*bind)(struct dcesrv_call_state *, const struct dcesrv_interface *, uint32_t if_version);
+ NTSTATUS (*bind)(struct dcesrv_connection_context *, const struct dcesrv_interface *);
/* this function is called when the client disconnects the endpoint */
void (*unbind)(struct dcesrv_connection_context *, const struct dcesrv_interface *);
diff --git a/source4/rpc_server/dcesrv_mgmt.c b/source4/rpc_server/dcesrv_mgmt.c
index 210a86de6ee..e520a34f0bd 100644
--- a/source4/rpc_server/dcesrv_mgmt.c
+++ b/source4/rpc_server/dcesrv_mgmt.c
@@ -24,8 +24,8 @@
#include "rpc_server/dcerpc_server_proto.h"
#include "librpc/gen_ndr/ndr_mgmt.h"
-#define DCESRV_INTERFACE_MGMT_BIND(call, iface) \
- dcesrv_interface_mgmt_bind(call, iface)
+#define DCESRV_INTERFACE_MGMT_BIND(context, iface) \
+ dcesrv_interface_mgmt_bind(context, iface)
/*
* This #define allows the mgmt interface to accept invalid
* association groups, because association groups are to coordinate
@@ -36,10 +36,9 @@
#define DCESRV_INTERFACE_MGMT_FLAGS DCESRV_INTERFACE_FLAGS_HANDLES_NOT_USED
-static NTSTATUS dcesrv_interface_mgmt_bind(struct dcesrv_call_state *dce_call,
+static NTSTATUS dcesrv_interface_mgmt_bind(struct dcesrv_connection_context *context,
const struct dcesrv_interface *iface)
{
- struct dcesrv_connection_context *context = dce_call->context;
return dcesrv_interface_bind_allow_connect(context, iface);
}
diff --git a/source4/rpc_server/dnsserver/dcerpc_dnsserver.c b/source4/rpc_server/dnsserver/dcerpc_dnsserver.c
index 7c2ca8e4d52..841557814a0 100644
--- a/source4/rpc_server/dnsserver/dcerpc_dnsserver.c
+++ b/source4/rpc_server/dnsserver/dcerpc_dnsserver.c
@@ -28,12 +28,11 @@
#include "dns_server/dnsserver_common.h"
#include "dnsserver.h"
-#define DCESRV_INTERFACE_DNSSERVER_BIND(call, iface) \
- dcesrv_interface_dnsserver_bind(call, iface)
-static NTSTATUS dcesrv_interface_dnsserver_bind(struct dcesrv_call_state *dce_call,
+#define DCESRV_INTERFACE_DNSSERVER_BIND(context, iface) \
+ dcesrv_interface_dnsserver_bind(context, iface)
+static NTSTATUS dcesrv_interface_dnsserver_bind(struct dcesrv_connection_context *context,
const struct dcesrv_interface *iface)
{
- struct dcesrv_connection_context *context = dce_call->context;
return dcesrv_interface_bind_require_integrity(context, iface);
}
diff --git a/source4/rpc_server/drsuapi/dcesrv_drsuapi.c b/source4/rpc_server/drsuapi/dcesrv_drsuapi.c
index 347823ebca3..7e2b6174d2f 100644
--- a/source4/rpc_server/drsuapi/dcesrv_drsuapi.c
+++ b/source4/rpc_server/drsuapi/dcesrv_drsuapi.c
@@ -42,12 +42,11 @@
DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR); \
} while (0)
-#define DCESRV_INTERFACE_DRSUAPI_BIND(call, iface) \
- dcesrv_interface_drsuapi_bind(call, iface)
-static NTSTATUS dcesrv_interface_drsuapi_bind(struct dcesrv_call_state *dce_call,
+#define DCESRV_INTERFACE_DRSUAPI_BIND(context, iface) \
+ dcesrv_interface_drsuapi_bind(context, iface)
+static NTSTATUS dcesrv_interface_drsuapi_bind(struct dcesrv_connection_context *context,
const struct dcesrv_interface *iface)
{
- struct dcesrv_connection_context *context = dce_call->context;
return dcesrv_interface_bind_require_privacy(context, iface);
}
diff --git a/source4/rpc_server/echo/rpc_echo.c b/source4/rpc_server/echo/rpc_echo.c
index e00eaecbd45..b0baf82d7d0 100644
--- a/source4/rpc_server/echo/rpc_echo.c
+++ b/source4/rpc_server/echo/rpc_echo.c
@@ -26,12 +26,11 @@
#include "librpc/gen_ndr/ndr_echo.h"
#include "lib/events/events.h"
-#define DCESRV_INTERFACE_RPCECHO_BIND(call, iface) \
- dcesrv_interface_rpcecho_bind(call, iface)
-static NTSTATUS dcesrv_interface_rpcecho_bind(struct dcesrv_call_state *dce_call,
+#define DCESRV_INTERFACE_RPCECHO_BIND(context, iface) \
+ dcesrv_interface_rpcecho_bind(context, iface)
+static NTSTATUS dcesrv_interface_rpcecho_bind(struct dcesrv_connection_context *context,
const struct dcesrv_interface *iface)
{
- struct dcesrv_connection_context *context = dce_call->context;
return dcesrv_interface_bind_allow_connect(context, iface);
}
diff --git a/source4/rpc_server/epmapper/rpc_epmapper.c b/source4/rpc_server/epmapper/rpc_epmapper.c
index 7e9c2614f29..793070d470e 100644
--- a/source4/rpc_server/epmapper/rpc_epmapper.c
+++ b/source4/rpc_server/epmapper/rpc_epmapper.c
@@ -24,12 +24,11 @@
#include "librpc/gen_ndr/ndr_epmapper.h"
#include "rpc_server/dcerpc_server.h"
-#define DCESRV_INTERFACE_EPMAPPER_BIND(call, iface) \
- dcesrv_interface_epmapper_bind(call, iface)
-static NTSTATUS dcesrv_interface_epmapper_bind(struct dcesrv_call_state *dce_call,
+#define DCESRV_INTERFACE_EPMAPPER_BIND(context, iface) \
+ dcesrv_interface_epmapper_bind(context, iface)
+static NTSTATUS dcesrv_interface_epmapper_bind(struct dcesrv_connection_context *context,
const struct dcesrv_interface *iface)
{
- struct dcesrv_connection_context *context = dce_call->context;
return dcesrv_interface_bind_allow_connect(context, iface);
}
diff --git a/source4/rpc_server/lsa/dcesrv_lsa.c b/source4/rpc_server/lsa/dcesrv_lsa.c
index 4a1bf60ac64..ec3be02bf87 100644
--- a/source4/rpc_server/lsa/dcesrv_lsa.c
+++ b/source4/rpc_server/lsa/dcesrv_lsa.c
@@ -35,12 +35,11 @@
#include "lib/messaging/irpc.h"
#include "libds/common/roles.h"
-#define DCESRV_INTERFACE_LSARPC_BIND(call, iface) \
- dcesrv_interface_lsarpc_bind(call, iface)
-static NTSTATUS dcesrv_interface_lsarpc_bind(struct dcesrv_call_state *dce_call,
+#define DCESRV_INTERFACE_LSARPC_BIND(context, iface) \
+ dcesrv_interface_lsarpc_bind(context, iface)
+static NTSTATUS dcesrv_interface_lsarpc_bind(struct dcesrv_connection_context *context,
const struct dcesrv_interface *iface)
{
- struct dcesrv_connection_context *context = dce_call->context;
return dcesrv_interface_bind_reject_connect(context, iface);
}
diff --git a/source4/rpc_server/netlogon/dcerpc_netlogon.c b/source4/rpc_server/netlogon/dcerpc_netlogon.c
index ca3dba374b9..530350d442a 100644
--- a/source4/rpc_server/netlogon/dcerpc_netlogon.c
+++ b/source4/rpc_server/netlogon/dcerpc_netlogon.c
@@ -45,8 +45,8 @@
#include "rpc_server/common/sid_helper.h"
#include "lib/util/util_str_escape.h"
-#define DCESRV_INTERFACE_NETLOGON_BIND(call, iface) \
- dcesrv_interface_netlogon_bind(call, iface)
+#define DCESRV_INTERFACE_NETLOGON_BIND(context, iface) \
+ dcesrv_interface_netlogon_bind(context, iface)
/*
* This #define allows the netlogon interface to accept invalid
@@ -57,10 +57,9 @@
*/
#define DCESRV_INTERFACE_NETLOGON_FLAGS DCESRV_INTERFACE_FLAGS_HANDLES_NOT_USED
-static NTSTATUS dcesrv_interface_netlogon_bind(struct dcesrv_call_state *dce_call,
+static NTSTATUS dcesrv_interface_netlogon_bind(struct dcesrv_connection_context *context,
const struct dcesrv_interface *iface)
{
- struct dcesrv_connection_context *context = dce_call->context;
return dcesrv_interface_bind_reject_connect(context, iface);
}
diff --git a/source4/rpc_server/remote/dcesrv_remote.c b/source4/rpc_server/remote/dcesrv_remote.c
index a4abb4bc2cd..0d3b123bcd2 100644
--- a/source4/rpc_server/remote/dcesrv_remote.c
+++ b/source4/rpc_server/remote/dcesrv_remote.c
@@ -45,7 +45,8 @@ static NTSTATUS remote_op_reply(struct dcesrv_call_state *dce_call, TALLOC_CTX *
return NT_STATUS_OK;
}
-static NTSTATUS remote_op_bind(struct dcesrv_call_state *dce_call, const struct dcesrv_interface *iface, uint32_t if_version)
+static NTSTATUS remote_op_bind(struct dcesrv_connection_context *context,
+ const struct dcesrv_interface *iface)
{
return NT_STATUS_OK;
}
diff --git a/source4/rpc_server/samr/dcesrv_samr.c b/source4/rpc_server/samr/dcesrv_samr.c
index 0ddbaae835d..51fed4da62b 100644
--- a/source4/rpc_server/samr/dcesrv_samr.c
+++ b/source4/rpc_server/samr/dcesrv_samr.c
@@ -41,12 +41,11 @@
#include "lib/util/tsort.h"
#include "libds/common/flag_mapping.h"
-#define DCESRV_INTERFACE_SAMR_BIND(call, iface) \
- dcesrv_interface_samr_bind(call, iface)
-static NTSTATUS dcesrv_interface_samr_bind(struct dcesrv_call_state *dce_call,
+#define DCESRV_INTERFACE_SAMR_BIND(context, iface) \
+ dcesrv_interface_samr_bind(context, iface)
+static NTSTATUS dcesrv_interface_samr_bind(struct dcesrv_connection_context *context,
const struct dcesrv_interface *iface)
{
- struct dcesrv_connection_context *context = dce_call->context;
return dcesrv_interface_bind_reject_connect(context, iface);
}
diff --git a/source4/torture/rpc/spoolss_notify.c b/source4/torture/rpc/spoolss_notify.c
index 718ae703bc9..2dd12994e8d 100644
--- a/source4/torture/rpc/spoolss_notify.c
+++ b/source4/torture/rpc/spoolss_notify.c
@@ -33,9 +33,8 @@
#include "ntvfs/ntvfs.h"
#include "param/param.h"
-static NTSTATUS spoolss__op_bind(struct dcesrv_call_state *dce_call,
- const struct dcesrv_interface *iface,
- uint32_t if_version)
+static NTSTATUS spoolss__op_bind(struct dcesrv_connection_context *context,
+ const struct dcesrv_interface *iface)
{
return NT_STATUS_OK;
}
View Lorry Controller Status