summaryrefslogtreecommitdiff
path: root/source4/lib/dcom/common
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2005-01-09 21:35:37 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:08:35 -0500
commit1b1b678cc8c79dacc3b80de4f8203154d47c0345 (patch)
tree91a0bea56f16740a41ff64ba95914c4c06f89b11 /source4/lib/dcom/common
parent1303f51099c2054c3966c6ba34490c5ffad85c13 (diff)
downloadsamba-1b1b678cc8c79dacc3b80de4f8203154d47c0345.tar.gz
samba-1b1b678cc8c79dacc3b80de4f8203154d47c0345.tar.bz2
samba-1b1b678cc8c79dacc3b80de4f8203154d47c0345.zip
r4624: Several crash fixes for DCOM
More work on the example class implementation (This used to be commit 1f8f4dd179d5aa0472c676d115dc2fc1749ce32d)
Diffstat (limited to 'source4/lib/dcom/common')
-rw-r--r--source4/lib/dcom/common/main.c8
-rw-r--r--source4/lib/dcom/common/tables.c5
2 files changed, 12 insertions, 1 deletions
diff --git a/source4/lib/dcom/common/main.c b/source4/lib/dcom/common/main.c
index b9f6127c6c..48b5ec946b 100644
--- a/source4/lib/dcom/common/main.c
+++ b/source4/lib/dcom/common/main.c
@@ -549,9 +549,15 @@ HYPER_T dcom_get_current_oxid(void)
return getpid();
}
-struct dcom_interface_p *dcom_new_local_ifacep(struct dcom_context *ctx, const struct dcom_interface *iface, void *vtable, struct dcom_object *object)
+struct dcom_interface_p *dcom_new_local_ifacep(struct dcom_context *ctx, const struct GUID *iid, void *vtable, struct dcom_object *object)
{
struct dcom_interface_p *ip = talloc_p(ctx, struct dcom_interface_p);
+ const struct dcom_interface *iface = dcom_interface_by_iid(iid);
+
+ if (!iface) {
+ DEBUG (1, ("Unable to find interface with IID %s\n", GUID_string(ctx, iid)));
+ return NULL;
+ }
ip->ctx = ctx;
ip->interface = iface;
diff --git a/source4/lib/dcom/common/tables.c b/source4/lib/dcom/common/tables.c
index faf67710e0..8a764d0a65 100644
--- a/source4/lib/dcom/common/tables.c
+++ b/source4/lib/dcom/common/tables.c
@@ -77,7 +77,12 @@ NTSTATUS dcom_register_interface(const void *_iface)
{
const struct dcom_interface *iface = _iface;
struct interface_list *l;
+ TALLOC_CTX *lcl_ctx = talloc_init("dcom_register_interface");
+ DEBUG(5, ("Adding DCOM interface %s\n", GUID_string(lcl_ctx, &iface->iid)));
+
+ talloc_destroy(lcl_ctx);
+
l = talloc_zero_p(interfaces?interfaces:talloc_autofree_context(),
struct interface_list);