summaryrefslogtreecommitdiff
path: root/source4/lib/dcom
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2004-11-08 22:18:18 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:05:40 -0500
commite056ed97d79c046a7f4b9562ad785fc54719a8ce (patch)
treea2000af9b0e4da9b3768708966114fe80e071f81 /source4/lib/dcom
parent73c1f61350a01c0cc5825ae0a08bb4c03121eda4 (diff)
downloadsamba-e056ed97d79c046a7f4b9562ad785fc54719a8ce.tar.gz
samba-e056ed97d79c046a7f4b9562ad785fc54719a8ce.tar.bz2
samba-e056ed97d79c046a7f4b9562ad785fc54719a8ce.zip
r3626: More minor DCOM fixes
(This used to be commit 709f279b192c8f9eeea04749169c00f2d57b20d3)
Diffstat (limited to 'source4/lib/dcom')
-rw-r--r--source4/lib/dcom/common/main.c17
1 files changed, 12 insertions, 5 deletions
diff --git a/source4/lib/dcom/common/main.c b/source4/lib/dcom/common/main.c
index c276b5e61a..b2cb782953 100644
--- a/source4/lib/dcom/common/main.c
+++ b/source4/lib/dcom/common/main.c
@@ -115,6 +115,13 @@ WERROR dcom_init(struct dcom_context **ctx, const char *domain, const char *user
return WERR_OK;
}
+WERROR dcom_ping(struct dcom_context *ctx)
+{
+ /* FIXME: If OID's waiting in queue, do a ComplexPing call */
+ /* FIXME: otherwise, do a SimplePing call */
+ return WERR_OK;
+}
+
WERROR dcom_create_object(struct dcom_context *ctx, struct GUID *clsid, const char *server, int num_ifaces, struct GUID *iid, struct dcom_interface **ip, WERROR *results)
{
struct dcom_oxid_mapping *m;
@@ -131,8 +138,8 @@ WERROR dcom_create_object(struct dcom_context *ctx, struct GUID *clsid, const ch
}
ZERO_STRUCT(r.in);
- r.in.this.version.MajorVersion = 5;
- r.in.this.version.MinorVersion = 1;
+ r.in.this.version.MajorVersion = COM_MAJOR_VERSION;
+ r.in.this.version.MinorVersion = COM_MINOR_VERSION;
uuid_generate_random(&r.in.this.cid);
r.in.Clsid = *clsid;
r.in.ClientImpLevel = RPC_C_IMP_LEVEL_IDENTIFY;
@@ -171,7 +178,7 @@ WERROR dcom_create_object(struct dcom_context *ctx, struct GUID *clsid, const ch
m->oxid = r.out.pOxid;
m->bindings = *r.out.pdsaOxidBindings;
DLIST_ADD(ctx->oxids, m);
-
+
return WERR_OK;
}
@@ -191,8 +198,8 @@ WERROR dcom_get_class_object(struct dcom_context *ctx, struct GUID *clsid, const
}
ZERO_STRUCT(r.in);
- r.in.this.version.MajorVersion = 5;
- r.in.this.version.MinorVersion = 1;
+ r.in.this.version.MajorVersion = COM_MAJOR_VERSION;
+ r.in.this.version.MinorVersion = COM_MINOR_VERSION;
uuid_generate_random(&r.in.this.cid);
r.in.Clsid = *clsid;
r.in.ClientImpLevel = RPC_C_IMP_LEVEL_IDENTIFY;