Changeset 988 for vendor/current/source4/libcli/rap

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/libcli/rap

Files:

• rap.c (modified) (2 diffs)
• rap.h (modified) (1 diff)
• wscript_build (modified) (1 diff)

vendor/current/source4/libcli/rap/rap.c

@@ -31 +31 @@
         struct rap_call *call;
 
-        call = talloc(mem_ctx, struct rap_call);
-
-        if (call == NULL)
+        call = talloc_zero(mem_ctx, struct rap_call);
+        if (call == NULL) {
                 return NULL;
+        }
 
         call->callno = callno;
         call->rcv_paramlen = 4;
 
-        call->paramdesc = NULL;
-        call->datadesc = NULL;
-        call->auxdatadesc = NULL;
-
-        call->ndr_push_param = ndr_push_init_ctx(mem_ctx);
+        call->ndr_push_param = ndr_push_init_ctx(call);
+        if (call->ndr_push_param == NULL) {
+                talloc_free(call);
+                return NULL;
+        }
         call->ndr_push_param->flags = RAPNDR_FLAGS;
 
-        call->ndr_push_data = ndr_push_init_ctx(mem_ctx);
+        call->ndr_push_data = ndr_push_init_ctx(call);
+        if (call->ndr_push_data == NULL) {
+                talloc_free(call);
+                return NULL;
+        }
         call->ndr_push_data->flags = RAPNDR_FLAGS;
+
+        call->pull_mem_ctx = mem_ctx;
 
         return call;
@@ -222 +228 @@
         call->ndr_pull_param = ndr_pull_init_blob(&trans.out.params, call);
         call->ndr_pull_param->flags = RAPNDR_FLAGS;
-
+        call->ndr_pull_param->current_mem_ctx = call->pull_mem_ctx;
         call->ndr_pull_data = ndr_pull_init_blob(&trans.out.data, call);
         call->ndr_pull_data->flags = RAPNDR_FLAGS;
+        call->ndr_pull_data->current_mem_ctx = call->pull_mem_ctx;
 
         return result;

vendor/current/source4/libcli/rap/rap.h

@@ -61 +61 @@
         const char *auxdatadesc;
 
-        uint16_t status;
-        uint16_t convert;
-
         uint16_t rcv_paramlen, rcv_datalen;
 
         struct ndr_push *ndr_push_param;
         struct ndr_push *ndr_push_data;
+
+        TALLOC_CTX *pull_mem_ctx;
         struct ndr_pull *ndr_pull_param;
         struct ndr_pull *ndr_pull_data;

vendor/current/source4/libcli/rap/wscript_build

@@ -3 +3 @@
 bld.SAMBA_SUBSYSTEM('LIBCLI_RAP',
         source='rap.c',
-        public_deps='LIBCLI_RAW NDR_RAP',
+        public_deps='smbclient-raw NDR_RAP',
         autoproto='proto.h'
         )