Changeset 740 for vendor/current/lib/tdr

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/lib/tdr

Files:

• config.mk (deleted)
• tdr.c (modified) (6 diffs)
• tdr.h (modified) (4 diffs)
• testsuite.c (modified) (10 diffs)
• wscript_build (added)

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;

vendor/current/lib/tdr/tdr.h

@@ -3 +3 @@
    TDR definitions
    Copyright (C) Jelmer Vernooij 2005
-   
+
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
@@ -34 +34 @@
         uint32_t offset;
         int flags;
-        struct smb_iconv_convenience *iconv_convenience;
 };
 
@@ -40 +39 @@
         DATA_BLOB data;
         int flags;
-        struct smb_iconv_convenience *iconv_convenience;
 };
 
@@ -63 +61 @@
 typedef NTSTATUS (*tdr_pull_fn_t) (struct tdr_pull *, TALLOC_CTX *, void *);
 
-#include "../lib/tdr/tdr_proto.h"
+NTSTATUS tdr_push_expand(struct tdr_push *tdr, uint32_t size);
+NTSTATUS tdr_pull_uint8(struct tdr_pull *tdr, TALLOC_CTX *ctx, uint8_t *v);
+NTSTATUS tdr_push_uint8(struct tdr_push *tdr, const uint8_t *v);
+NTSTATUS tdr_print_uint8(struct tdr_print *tdr, const char *name, uint8_t *v);
+NTSTATUS tdr_pull_uint16(struct tdr_pull *tdr, TALLOC_CTX *ctx, uint16_t *v);
+NTSTATUS tdr_pull_uint1632(struct tdr_pull *tdr, TALLOC_CTX *ctx, uint16_t *v);
+NTSTATUS tdr_push_uint16(struct tdr_push *tdr, const uint16_t *v);
+NTSTATUS tdr_push_uint1632(struct tdr_push *tdr, const uint16_t *v);
+NTSTATUS tdr_print_uint16(struct tdr_print *tdr, const char *name, uint16_t *v);
+NTSTATUS tdr_pull_uint32(struct tdr_pull *tdr, TALLOC_CTX *ctx, uint32_t *v);
+NTSTATUS tdr_push_uint32(struct tdr_push *tdr, const uint32_t *v);
+NTSTATUS tdr_print_uint32(struct tdr_print *tdr, const char *name, uint32_t *v);
+NTSTATUS tdr_pull_charset(struct tdr_pull *tdr, TALLOC_CTX *ctx, const char **v, uint32_t length, uint32_t el_size, charset_t chset);
+NTSTATUS tdr_push_charset(struct tdr_push *tdr, const char **v, uint32_t length, uint32_t el_size, charset_t chset);
+NTSTATUS tdr_print_charset(struct tdr_print *tdr, const char *name, const char **v, uint32_t length, uint32_t el_size, charset_t chset);
+
+NTSTATUS tdr_pull_hyper(struct tdr_pull *tdr, TALLOC_CTX *ctx, uint64_t *v);
+NTSTATUS tdr_push_hyper(struct tdr_push *tdr, uint64_t *v);
+
+NTSTATUS tdr_push_NTTIME(struct tdr_push *tdr, NTTIME *t);
+NTSTATUS tdr_pull_NTTIME(struct tdr_pull *tdr, TALLOC_CTX *ctx, NTTIME *t);
+NTSTATUS tdr_print_NTTIME(struct tdr_print *tdr, const char *name, NTTIME *t);
+
+NTSTATUS tdr_push_time_t(struct tdr_push *tdr, time_t *t);
+NTSTATUS tdr_pull_time_t(struct tdr_pull *tdr, TALLOC_CTX *ctx, time_t *t);
+NTSTATUS tdr_print_time_t(struct tdr_print *tdr, const char *name, time_t *t);
+
+NTSTATUS tdr_print_DATA_BLOB(struct tdr_print *tdr, const char *name, DATA_BLOB *r);
+NTSTATUS tdr_push_DATA_BLOB(struct tdr_push *tdr, DATA_BLOB *blob);
+NTSTATUS tdr_pull_DATA_BLOB(struct tdr_pull *tdr, TALLOC_CTX *ctx, DATA_BLOB *blob);
+
+struct tdr_push *tdr_push_init(TALLOC_CTX *mem_ctx);
+struct tdr_pull *tdr_pull_init(TALLOC_CTX *mem_ctx);
+
+NTSTATUS tdr_push_to_fd(int fd, tdr_push_fn_t push_fn, const void *p);
+void tdr_print_debug_helper(struct tdr_print *tdr, const char *format, ...) PRINTF_ATTRIBUTE(2,3);
 
 #endif /* __TDR_H__ */

vendor/current/lib/tdr/testsuite.c

@@ -26 +26 @@
 {
         uint8_t v = 4;
-        struct tdr_push *tdr = tdr_push_init(tctx, global_iconv_convenience);
+        struct tdr_push *tdr = tdr_push_init(tctx);
 
         torture_assert_ntstatus_ok(tctx, tdr_push_uint8(tdr, &v), "push failed");
@@ -38 +38 @@
         uint8_t d = 2;
         uint8_t l;
-        struct tdr_pull *tdr = tdr_pull_init(tctx, global_iconv_convenience);
+        struct tdr_pull *tdr = tdr_pull_init(tctx);
         tdr->data.data = &d;
         tdr->data.length = 1;
@@ -53 +53 @@
 {
         uint16_t v = 0xF32;
-        struct tdr_push *tdr = tdr_push_init(tctx, global_iconv_convenience);
+        struct tdr_push *tdr = tdr_push_init(tctx);
 
         torture_assert_ntstatus_ok(tctx, tdr_push_uint16(tdr, &v), "push failed");
@@ -66 +66 @@
         uint8_t d[2] = { 782 & 0xFF, (782 & 0xFF00) / 0x100 };
         uint16_t l;
-        struct tdr_pull *tdr = tdr_pull_init(tctx, global_iconv_convenience);
+        struct tdr_pull *tdr = tdr_pull_init(tctx);
         tdr->data.data = d;
         tdr->data.length = 2;
@@ -81 +81 @@
 {
         uint32_t v = 0x100F32;
-        struct tdr_push *tdr = tdr_push_init(tctx, global_iconv_convenience);
+        struct tdr_push *tdr = tdr_push_init(tctx);
 
         torture_assert_ntstatus_ok(tctx, tdr_push_uint32(tdr, &v), "push failed");
@@ -96 +96 @@
         uint8_t d[4] = { 782 & 0xFF, (782 & 0xFF00) / 0x100, 0, 0 };
         uint32_t l;
-        struct tdr_pull *tdr = tdr_pull_init(tctx, global_iconv_convenience);
+        struct tdr_pull *tdr = tdr_pull_init(tctx);
         tdr->data.data = d;
         tdr->data.length = 4;
@@ -110 +110 @@
 static bool test_pull_charset(struct torture_context *tctx)
 {
-        struct tdr_pull *tdr = tdr_pull_init(tctx, global_iconv_convenience);
+        struct tdr_pull *tdr = tdr_pull_init(tctx);
         const char *l = NULL;
         tdr->data.data = (uint8_t *)talloc_strdup(tctx, "bla");
@@ -132 +132 @@
 static bool test_pull_charset_empty(struct torture_context *tctx)
 {
-        struct tdr_pull *tdr = tdr_pull_init(tctx, global_iconv_convenience);
+        struct tdr_pull *tdr = tdr_pull_init(tctx);
         const char *l = NULL;
         tdr->data.data = (uint8_t *)talloc_strdup(tctx, "bla");
@@ -151 +151 @@
 {
         const char *l = "bloe";
-        struct tdr_push *tdr = tdr_push_init(tctx, global_iconv_convenience);
+        struct tdr_push *tdr = tdr_push_init(tctx);
         torture_assert_ntstatus_ok(tctx, tdr_push_charset(tdr, &l, 4, 1, CH_UTF8), 
                                                            "push failed");
         torture_assert_int_equal(tctx, 4, tdr->data.length, "offset invalid");
-        torture_assert(tctx, strcmp("bloe", (const char *)tdr->data.data) == 0, "right string push");
+        torture_assert(tctx, strncmp("bloe", (const char *)tdr->data.data, 4) == 0, "right string push");
 
         torture_assert_ntstatus_ok(tctx, tdr_push_charset(tdr, &l, -1, 1, CH_UTF8), 
@@ -167 +167 @@
 struct torture_suite *torture_local_tdr(TALLOC_CTX *mem_ctx)
 {
-        struct torture_suite *suite = torture_suite_create(mem_ctx, "TDR");
+        struct torture_suite *suite = torture_suite_create(mem_ctx, "tdr");
 
         torture_suite_add_simple_test(suite, "pull_uint8", test_pull_uint8);