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

Timestamp:

Nov 24, 2016, 1:14:11 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to version 4.4.3

Location:

vendor/current/source4/lib/com

Files:

• classes/simple.c (modified) (1 diff)
• dcom/dcom.h (modified) (1 diff)
• dcom/main.c (modified) (4 diffs)
• main.c (modified) (1 diff)
• pycom.c (modified) (1 diff)
• tables.c (modified) (1 diff)
• wscript_build (modified) (2 diffs)

vendor/current/source4/lib/com/classes/simple.c

@@ -22 +22 @@
 #include "lib/com/com.h"
 #include "librpc/gen_ndr/com_dcom.h"
+
+NTSTATUS com_simple_init(void);
 
 static struct IClassFactory_vtable simple_classobject_vtable;

vendor/current/source4/lib/com/dcom/dcom.h

@@ -51 +51 @@
 struct dcom_object_exporter *object_exporter_by_oxid(struct com_context *ctx, uint64_t oxid);
 struct dcom_object_exporter *object_exporter_by_ip(struct com_context *ctx, struct IUnknown *ip);
-WERROR dcom_create_object(struct com_context *ctx, struct GUID *clsid, const char *server, int num_ifaces, struct GUID *iid, struct IUnknown ***ip, WERROR *results);
+WERROR dcom_create_object(struct com_context *ctx, struct GUID *clsid, const char *server, int num_ifaces, struct GUID *iid, struct IUnknown ***ip, HRESULT *results);
 WERROR dcom_get_class_object(struct com_context *ctx, struct GUID *clsid, const char *server, struct GUID *iid, struct IUnknown **ip);
 NTSTATUS dcom_get_pipe(struct IUnknown *iface, struct dcerpc_pipe **pp);

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

@@ -37 +37 @@
 static NTSTATUS dcerpc_binding_from_STRINGBINDING(TALLOC_CTX *mem_ctx, struct dcerpc_binding **b_out, struct STRINGBINDING *bd)
 {
-        char *host, *endpoint;
+        char *tstr;
+        char *bstr;
+        enum dcerpc_transport_t transport;
         struct dcerpc_binding *b;
 
-        b = talloc_zero(mem_ctx, struct dcerpc_binding);
-        if (!b) {
+        transport = dcerpc_transport_by_endpoint_protocol(bd->wTowerId);
+        if (transport == NCA_UNKNOWN) {
+                DEBUG(1, ("Can't find transport match endpoint protocol %d\n", bd->wTowerId));
+                return NT_STATUS_NOT_SUPPORTED;
+        }
+
+        tstr = derpc_transport_string_by_transport(transport);
+        bstr = talloc_asprintf(mem_ctx, "%s:%s", tstr, bd->NetworkAddr);
+        if (bstr == NULL) {
                 return NT_STATUS_NO_MEMORY;
         }
-        
-        b->transport = dcerpc_transport_by_endpoint_protocol(bd->wTowerId);
-
-        if (b->transport == -1) {
-                DEBUG(1, ("Can't find transport match endpoint protocol %d\n", bd->wTowerId));
-                talloc_free(b);
-                return NT_STATUS_NOT_SUPPORTED;
-        }
-
-        host = talloc_strdup(b, bd->NetworkAddr);
-        endpoint = strchr(host, '[');
-
-        if (endpoint) {
-                *endpoint = '\0';
-                endpoint++;
-
-                endpoint[strlen(endpoint)-1] = '\0';
-        }
-
-        b->host = host;
-        b->endpoint = talloc_strdup(b, endpoint);
+
+        status = dcerpc_parse_binding(mem_ctx, bstr, &b);
+        TALLOC_FREE(bstr);
+        if (!NT_STATUS_IS_OK(status)) {
+                return status;
+        }
 
         *b_out = b;
@@ -247 +241 @@
 }
 
-WERROR dcom_create_object(struct com_context *ctx, struct GUID *clsid, const char *server, int num_ifaces, struct GUID *iid, struct IUnknown ***ip, WERROR *results)
+WERROR dcom_create_object(struct com_context *ctx, struct GUID *clsid, const char *server, int num_ifaces, struct GUID *iid, struct IUnknown ***ip, HRESULT *results)
 {
         uint16_t protseq[] = DCOM_NEGOTIATED_PROTOCOLS;
@@ -256 +250 @@
         struct DUALSTRINGARRAY *pds;
         int i;
-        WERROR hr;
+        HRESULT hr;
         uint64_t oxid;
         struct GUID ipidRemUnknown;
@@ -308 +302 @@
                 goto end;
         }
-        
-        if(!W_ERROR_IS_OK(hr)) {
+
+        if(!HRES_IS_OK(hr)) {
                 goto end;
         }

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

@@ -29 +29 @@
         *ctx = talloc(NULL, struct com_context);
         if (event_ctx == NULL) {
-                event_ctx = event_context_init(*ctx);
+                event_ctx = samba_tevent_context_init(*ctx);
         }
         (*ctx)->event_ctx = event_ctx;

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

@@ -23 +23 @@
 #include "librpc/ndr/libndr.h"
 #include "libcli/util/pyerrors.h"
+
+void initcom(void);
 
 static struct com_context *py_com_ctx = NULL; /* FIXME: evil global */

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

@@ -70 +70 @@
 
         if (!f) {
+                dlclose(mod);
                 return NULL;
         }

vendor/current/source4/lib/com/wscript_build

@@ -3 +3 @@
 bld.SAMBA_SUBSYSTEM('COM',
         source='tables.c rot.c main.c',
+        allow_warnings=True,
         deps='samba-util samba-hostconfig events ndr NDR_DCOM'
         )
@@ -20 +21 @@
 bld.SAMBA_MODULE('com_simple',
         source='classes/simple.c',
+        allow_warnings=True,
         deps='talloc',
         subsystem='COM',