Changeset 740 for vendor/current/lib/tdr/tdr.c

Timestamp:

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

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to 3.6.0

File:

• vendor/current/lib/tdr/tdr.c (modified) (6 diffs)

vendor/current/lib/tdr/tdr.c

@@ -164 +164 @@
         TDR_PULL_NEED_BYTES(tdr, el_size*length);
         
-        if (!convert_string_talloc_convenience(ctx, tdr->iconv_convenience, chset, CH_UNIX, tdr->data.data+tdr->offset, el_size*length, discard_const_p(void *, v), &ret, false)) {
+        if (!convert_string_talloc(ctx, chset, CH_UNIX, tdr->data.data+tdr->offset, el_size*length, discard_const_p(void *, v), &ret, false)) {
                 return NT_STATUS_INVALID_PARAMETER;
         }
@@ -184 +184 @@
         TDR_PUSH_NEED_BYTES(tdr, required);
 
-        if (!convert_string_convenience(tdr->iconv_convenience, CH_UNIX, chset, *v, strlen(*v), tdr->data.data+tdr->data.length, required, &ret, false)) {
+        ret = convert_string(CH_UNIX, chset, *v, strlen(*v), tdr->data.data+tdr->data.length, required, false);
+        if (ret == -1) {
                 return NT_STATUS_INVALID_PARAMETER;
         }
@@ -344 +345 @@
 }
 
-struct tdr_push *tdr_push_init(TALLOC_CTX *mem_ctx, struct smb_iconv_convenience *ic)
+struct tdr_push *tdr_push_init(TALLOC_CTX *mem_ctx)
 {
         struct tdr_push *push = talloc_zero(mem_ctx, struct tdr_push);
@@ -351 +352 @@
                 return NULL;
 
-        push->iconv_convenience = talloc_reference(push, ic);
-
         return push;
 }
 
-struct tdr_pull *tdr_pull_init(TALLOC_CTX *mem_ctx, struct smb_iconv_convenience *ic)
+struct tdr_pull *tdr_pull_init(TALLOC_CTX *mem_ctx)
 {
         struct tdr_pull *pull = talloc_zero(mem_ctx, struct tdr_pull);
@@ -363 +362 @@
                 return NULL;
 
-        pull->iconv_convenience = talloc_reference(pull, ic);
-
         return pull;
 }
 
-NTSTATUS tdr_push_to_fd(int fd, struct smb_iconv_convenience *iconv_convenience, tdr_push_fn_t push_fn, const void *p)
-{
-        struct tdr_push *push = tdr_push_init(NULL, iconv_convenience);
+NTSTATUS tdr_push_to_fd(int fd, tdr_push_fn_t push_fn, const void *p)
+{
+        struct tdr_push *push = tdr_push_init(NULL);
 
         if (push == NULL)
@@ -391 +388 @@
 }
 
-void tdr_print_debug_helper(struct tdr_print *tdr, const char *format, ...) _PRINTF_ATTRIBUTE(2,3)
+void tdr_print_debug_helper(struct tdr_print *tdr, const char *format, ...)
 {
         va_list ap;