Changeset 740 for vendor/current/source4/lib/com

Timestamp:

Nov 14, 2012, 12:59:34 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to 3.6.0

Location:

vendor/current/source4/lib/com

Files:

• config.mk (deleted)
• dcom/main.c (modified) (3 diffs)
• main.c (modified) (1 diff)
• pycom.c (modified) (1 diff)
• wscript_build (added)

vendor/current/source4/lib/com/dcom/main.c

@@ -172 +172 @@
                 return dcerpc_pipe_connect(ctx->event_ctx, p, "ncalrpc", 
                                                                    &ndr_table_IRemoteActivation,
-                                                                   dcom_get_server_credentials(ctx, NULL), ctx->event_ctx, ctx->lp_ctx);
+                                                                   dcom_get_server_credentials(ctx, NULL), ctx->event_ctx, ctx->lp_ctx);
         }
         loc_ctx = talloc_new(ctx);
@@ -183 +183 @@
                 status = dcerpc_pipe_connect_b(ctx->event_ctx, p, bd, 
                                                                            &ndr_table_IRemoteActivation,
-                                                                   dcom_get_server_credentials(ctx, bd->host), ctx->event_ctx, ctx->lp_ctx);
+                                                                   dcom_get_server_credentials(ctx, bd->host), ctx->event_ctx, ctx->lp_ctx);
                 goto end;
         }
@@ -705 +705 @@
                 return;
         }
-
+/*TODO: FIXME - for now this unused anyway */
         req = dcerpc_ndr_request_send(p, &s->d->obj.u_objref.u_standard.std.ipid, s->table, s->opnum, s, s->r);
         composite_continue_rpc(c, req, s->continuation, c);

vendor/current/source4/lib/com/main.c

@@ -53 +53 @@
 
         /* Run IClassFactory::CreateInstance() */
-        error = IClassFactory_CreateInstance(factory, ctx, NULL, &classfact_iid, &iunk);
+        error = IClassFactory_CreateInstance(factory, ctx, NULL, &classfact_iid, (struct MInterfacePointer *) &iunk);
         if (!W_ERROR_IS_OK(error)) {
                 DEBUG(3, ("Error while calling IClassFactory::CreateInstance : %s\n", win_errstr(error)));

vendor/current/source4/lib/com/pycom.c

@@ -18 +18 @@
 */
 
+#include <Python.h>
 #include "includes.h"
-#include <Python.h>
 #include "lib/com/com.h"
 #include "librpc/ndr/libndr.h"
 #include "libcli/util/pyerrors.h"
-
-#ifndef Py_RETURN_NONE
-#define Py_RETURN_NONE return Py_INCREF(Py_None), Py_None
-#endif
 
 static struct com_context *py_com_ctx = NULL; /* FIXME: evil global */