From 1e4f78cc41d7d44703bea238fee86da618d1587b Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Thu, 12 Mar 2009 10:04:02 +0100 Subject: s4:ldb: setup tevent debug functions on a selfcreated event context metze --- source4/lib/ldb/common/ldb.c | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) (limited to 'source4/lib') diff --git a/source4/lib/ldb/common/ldb.c b/source4/lib/ldb/common/ldb.c index f1b28b6819..e17e10dcaa 100644 --- a/source4/lib/ldb/common/ldb.c +++ b/source4/lib/ldb/common/ldb.c @@ -47,6 +47,40 @@ static int ldb_context_destructor(void *ptr) return 0; } +/* + this is used to catch debug messages from events +*/ +static void ldb_tevent_debug(void *context, enum tevent_debug_level level, + const char *fmt, va_list ap) PRINTF_ATTRIBUTE(3,0); + +static void ldb_tevent_debug(void *context, enum tevent_debug_level level, + const char *fmt, va_list ap) +{ + struct ldb_context = talloc_get_type_abort(context, struct ldb_context); + enum ldb_debug_level ldb_level = LDB_DEBUG_FATAL; + char *s = NULL; + + switch (level) { + case TEVENT_DEBUG_FATAL: + ldb_level = LDB_DEBUG_FATAL; + break; + case TEVENT_DEBUG_ERROR: + ldb_level = LDB_DEBUG_ERROR; + break; + case TEVENT_DEBUG_WARNING: + ldb_level = LDB_DEBUG_WARNING; + break; + case TEVENT_DEBUG_TRACE: + ldb_level = LDB_DEBUG_TRACE; + break; + }; + + vasprintf(&s, fmt, ap); + if (!s) return; + ldb_debug(ldb, ldb_level, "tevent: %s", s); + free(s); +} + /* initialise a ldb context The mem_ctx is required @@ -62,6 +96,7 @@ struct ldb_context *ldb_init(TALLOC_CTX *mem_ctx, struct tevent_context *ev_ctx) * until we have them all converted */ if (ev_ctx == NULL) { ev_ctx = tevent_context_init(talloc_autofree_context()); + tevent_set_debug(ev_ctx, ldb_tevent_debug, ldb); } ret = ldb_setup_wellknown_attributes(ldb); -- cgit From 6802394212f7fefc21d1e2ad257fbeee26238b2d Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Thu, 12 Mar 2009 10:05:05 +0100 Subject: s4:ldb: allow nested events until the code is fixed to avoid them metze --- source4/lib/ldb/common/ldb.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'source4/lib') diff --git a/source4/lib/ldb/common/ldb.c b/source4/lib/ldb/common/ldb.c index e17e10dcaa..86ce2069a5 100644 --- a/source4/lib/ldb/common/ldb.c +++ b/source4/lib/ldb/common/ldb.c @@ -32,6 +32,7 @@ * Author: Andrew Tridgell */ +#define TEVENT_DEPRECATED 1 #include "ldb_private.h" static int ldb_context_destructor(void *ptr) @@ -56,7 +57,7 @@ static void ldb_tevent_debug(void *context, enum tevent_debug_level level, static void ldb_tevent_debug(void *context, enum tevent_debug_level level, const char *fmt, va_list ap) { - struct ldb_context = talloc_get_type_abort(context, struct ldb_context); + struct ldb_context *ldb = talloc_get_type(context, struct ldb_context); enum ldb_debug_level ldb_level = LDB_DEBUG_FATAL; char *s = NULL; @@ -97,6 +98,7 @@ struct ldb_context *ldb_init(TALLOC_CTX *mem_ctx, struct tevent_context *ev_ctx) if (ev_ctx == NULL) { ev_ctx = tevent_context_init(talloc_autofree_context()); tevent_set_debug(ev_ctx, ldb_tevent_debug, ldb); + tevent_loop_allow_nesting(ev_ctx); } ret = ldb_setup_wellknown_attributes(ldb); -- cgit From a3d5d8378c8edb6baa9ab42b02cee4711a58840b Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Thu, 12 Mar 2009 10:05:47 +0100 Subject: s4:events: allow nested events until we fixed all code to avoid them metze --- source4/lib/events/tevent_s4.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'source4/lib') diff --git a/source4/lib/events/tevent_s4.c b/source4/lib/events/tevent_s4.c index 89ca7bbe5c..06bfbf61ed 100644 --- a/source4/lib/events/tevent_s4.c +++ b/source4/lib/events/tevent_s4.c @@ -17,6 +17,7 @@ */ #include "includes.h" +#define TEVENT_DEPRECATED 1 #include "lib/events/events.h" /* @@ -65,6 +66,7 @@ struct tevent_context *s4_event_context_init(TALLOC_CTX *mem_ctx) ev = tevent_context_init_byname(mem_ctx, NULL); if (ev) { tevent_set_debug(ev, ev_wrap_debug, NULL); + tevent_loop_allow_nesting(ev); } return ev; } -- cgit From 4638633308e0508fa753173fa3e430c38e51732e Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sat, 14 Mar 2009 21:57:44 +0100 Subject: Move tdr to top-level. --- source4/lib/tdr/TODO | 1 - source4/lib/tdr/config.mk | 9 - source4/lib/tdr/tdr.c | 397 -------------------------------------------- source4/lib/tdr/tdr.h | 67 -------- source4/lib/tdr/testsuite.c | 186 --------------------- 5 files changed, 660 deletions(-) delete mode 100644 source4/lib/tdr/TODO delete mode 100644 source4/lib/tdr/config.mk delete mode 100644 source4/lib/tdr/tdr.c delete mode 100644 source4/lib/tdr/tdr.h delete mode 100644 source4/lib/tdr/testsuite.c (limited to 'source4/lib') diff --git a/source4/lib/tdr/TODO b/source4/lib/tdr/TODO deleted file mode 100644 index 5093afd438..0000000000 --- a/source4/lib/tdr/TODO +++ /dev/null @@ -1 +0,0 @@ -- Support read/write (to fd) as well as push/pull (to DATA_BLOB) diff --git a/source4/lib/tdr/config.mk b/source4/lib/tdr/config.mk deleted file mode 100644 index 07506ec647..0000000000 --- a/source4/lib/tdr/config.mk +++ /dev/null @@ -1,9 +0,0 @@ -[SUBSYSTEM::TDR] -CFLAGS = -Ilib/tdr -PUBLIC_DEPENDENCIES = LIBTALLOC LIBSAMBA-UTIL - -TDR_OBJ_FILES = $(libtdrsrcdir)/tdr.o - -$(eval $(call proto_header_template,$(libtdrsrcdir)/tdr_proto.h,$(TDR_OBJ_FILES:.o=.c))) - -PUBLIC_HEADERS += $(libtdrsrcdir)/tdr.h diff --git a/source4/lib/tdr/tdr.c b/source4/lib/tdr/tdr.c deleted file mode 100644 index 8b62ea0c2b..0000000000 --- a/source4/lib/tdr/tdr.c +++ /dev/null @@ -1,397 +0,0 @@ -/* - Unix SMB/CIFS implementation. - - TDR (Trivial Data Representation) helper functions - Based loosely on ndr.c by Andrew Tridgell. - - 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 . -*/ - -#include "includes.h" -#include "system/filesys.h" -#include "system/network.h" -#include "tdr/tdr.h" - -#define TDR_BASE_MARSHALL_SIZE 1024 - -#define TDR_PUSH_NEED_BYTES(tdr, n) TDR_CHECK(tdr_push_expand(tdr, tdr->data.length+(n))) - -#define TDR_PULL_NEED_BYTES(tdr, n) do { \ - if ((n) > tdr->data.length || tdr->offset + (n) > tdr->data.length) { \ - return NT_STATUS_BUFFER_TOO_SMALL; \ - } \ -} while(0) - -#define TDR_BE(tdr) ((tdr)->flags & TDR_BIG_ENDIAN) - -#define TDR_CVAL(tdr, ofs) CVAL(tdr->data.data,ofs) -#define TDR_SVAL(tdr, ofs) (TDR_BE(tdr)?RSVAL(tdr->data.data,ofs):SVAL(tdr->data.data,ofs)) -#define TDR_IVAL(tdr, ofs) (TDR_BE(tdr)?RIVAL(tdr->data.data,ofs):IVAL(tdr->data.data,ofs)) -#define TDR_SCVAL(tdr, ofs, v) SCVAL(tdr->data.data,ofs,v) -#define TDR_SSVAL(tdr, ofs, v) do { if (TDR_BE(tdr)) { RSSVAL(tdr->data.data,ofs,v); } else SSVAL(tdr->data.data,ofs,v); } while (0) -#define TDR_SIVAL(tdr, ofs, v) do { if (TDR_BE(tdr)) { RSIVAL(tdr->data.data,ofs,v); } else SIVAL(tdr->data.data,ofs,v); } while (0) - -/** - expand the available space in the buffer to 'size' -*/ -NTSTATUS tdr_push_expand(struct tdr_push *tdr, uint32_t size) -{ - if (talloc_get_size(tdr->data.data) >= size) { - return NT_STATUS_OK; - } - - tdr->data.data = talloc_realloc(tdr, tdr->data.data, uint8_t, tdr->data.length + TDR_BASE_MARSHALL_SIZE); - - if (tdr->data.data == NULL) - return NT_STATUS_NO_MEMORY; - - return NT_STATUS_OK; -} - - -NTSTATUS tdr_pull_uint8(struct tdr_pull *tdr, TALLOC_CTX *ctx, uint8_t *v) -{ - TDR_PULL_NEED_BYTES(tdr, 1); - *v = TDR_CVAL(tdr, tdr->offset); - tdr->offset += 1; - return NT_STATUS_OK; -} - -NTSTATUS tdr_push_uint8(struct tdr_push *tdr, const uint8_t *v) -{ - TDR_PUSH_NEED_BYTES(tdr, 1); - TDR_SCVAL(tdr, tdr->data.length, *v); - tdr->data.length += 1; - return NT_STATUS_OK; -} - -NTSTATUS tdr_print_uint8(struct tdr_print *tdr, const char *name, uint8_t *v) -{ - tdr->print(tdr, "%-25s: 0x%02x (%u)", name, *v, *v); - return NT_STATUS_OK; -} - -NTSTATUS tdr_pull_uint16(struct tdr_pull *tdr, TALLOC_CTX *ctx, uint16_t *v) -{ - TDR_PULL_NEED_BYTES(tdr, 2); - *v = TDR_SVAL(tdr, tdr->offset); - tdr->offset += 2; - return NT_STATUS_OK; -} - -NTSTATUS tdr_push_uint16(struct tdr_push *tdr, const uint16_t *v) -{ - TDR_PUSH_NEED_BYTES(tdr, 2); - TDR_SSVAL(tdr, tdr->data.length, *v); - tdr->data.length += 2; - return NT_STATUS_OK; -} - -NTSTATUS tdr_print_uint16(struct tdr_print *tdr, const char *name, uint16_t *v) -{ - tdr->print(tdr, "%-25s: 0x%02x (%u)", name, *v, *v); - return NT_STATUS_OK; -} - -NTSTATUS tdr_pull_uint32(struct tdr_pull *tdr, TALLOC_CTX *ctx, uint32_t *v) -{ - TDR_PULL_NEED_BYTES(tdr, 4); - *v = TDR_IVAL(tdr, tdr->offset); - tdr->offset += 4; - return NT_STATUS_OK; -} - -NTSTATUS tdr_push_uint32(struct tdr_push *tdr, const uint32_t *v) -{ - TDR_PUSH_NEED_BYTES(tdr, 4); - TDR_SIVAL(tdr, tdr->data.length, *v); - tdr->data.length += 4; - return NT_STATUS_OK; -} - -NTSTATUS tdr_print_uint32(struct tdr_print *tdr, const char *name, uint32_t *v) -{ - tdr->print(tdr, "%-25s: 0x%02x (%u)", name, *v, *v); - return NT_STATUS_OK; -} - -NTSTATUS tdr_pull_charset(struct tdr_pull *tdr, TALLOC_CTX *ctx, const char **v, uint32_t length, uint32_t el_size, charset_t chset) -{ - size_t ret; - - if (length == -1) { - switch (chset) { - case CH_DOS: - length = ascii_len_n((const char*)tdr->data.data+tdr->offset, tdr->data.length-tdr->offset); - break; - case CH_UTF16: - length = utf16_len_n(tdr->data.data+tdr->offset, tdr->data.length-tdr->offset); - break; - - default: - return NT_STATUS_INVALID_PARAMETER; - } - } - - if (length == 0) { - *v = talloc_strdup(ctx, ""); - return NT_STATUS_OK; - } - - 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)) { - return NT_STATUS_INVALID_PARAMETER; - } - - tdr->offset += length * el_size; - - return NT_STATUS_OK; -} - -NTSTATUS tdr_push_charset(struct tdr_push *tdr, const char **v, uint32_t length, uint32_t el_size, charset_t chset) -{ - size_t ret, required; - - if (length == -1) { - length = strlen(*v) + 1; /* Extra element for null character */ - } - - required = el_size * length; - 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)) { - return NT_STATUS_INVALID_PARAMETER; - } - - /* Make sure the remaining part of the string is filled with zeroes */ - if (ret < required) { - memset(tdr->data.data+tdr->data.length+ret, 0, required-ret); - } - - tdr->data.length += required; - - return NT_STATUS_OK; -} - -NTSTATUS tdr_print_charset(struct tdr_print *tdr, const char *name, const char **v, uint32_t length, uint32_t el_size, charset_t chset) -{ - tdr->print(tdr, "%-25s: %s", name, *v); - return NT_STATUS_OK; -} - -/** - parse a hyper -*/ -NTSTATUS tdr_pull_hyper(struct tdr_pull *tdr, TALLOC_CTX *ctx, uint64_t *v) -{ - TDR_PULL_NEED_BYTES(tdr, 8); - *v = TDR_IVAL(tdr, tdr->offset); - *v |= (uint64_t)(TDR_IVAL(tdr, tdr->offset+4)) << 32; - tdr->offset += 8; - return NT_STATUS_OK; -} - -/** - push a hyper -*/ -NTSTATUS tdr_push_hyper(struct tdr_push *tdr, uint64_t *v) -{ - TDR_PUSH_NEED_BYTES(tdr, 8); - TDR_SIVAL(tdr, tdr->data.length, ((*v) & 0xFFFFFFFF)); - TDR_SIVAL(tdr, tdr->data.length+4, ((*v)>>32)); - tdr->data.length += 8; - return NT_STATUS_OK; -} - -/** - push a NTTIME -*/ -NTSTATUS tdr_push_NTTIME(struct tdr_push *tdr, NTTIME *t) -{ - TDR_CHECK(tdr_push_hyper(tdr, t)); - return NT_STATUS_OK; -} - -/** - pull a NTTIME -*/ -NTSTATUS tdr_pull_NTTIME(struct tdr_pull *tdr, TALLOC_CTX *ctx, NTTIME *t) -{ - TDR_CHECK(tdr_pull_hyper(tdr, ctx, t)); - return NT_STATUS_OK; -} - -/** - push a time_t -*/ -NTSTATUS tdr_push_time_t(struct tdr_push *tdr, time_t *t) -{ - return tdr_push_uint32(tdr, (uint32_t *)t); -} - -/** - pull a time_t -*/ -NTSTATUS tdr_pull_time_t(struct tdr_pull *tdr, TALLOC_CTX *ctx, time_t *t) -{ - uint32_t tt; - TDR_CHECK(tdr_pull_uint32(tdr, ctx, &tt)); - *t = tt; - return NT_STATUS_OK; -} - -NTSTATUS tdr_print_time_t(struct tdr_print *tdr, const char *name, time_t *t) -{ - if (*t == (time_t)-1 || *t == 0) { - tdr->print(tdr, "%-25s: (time_t)%d", name, (int)*t); - } else { - tdr->print(tdr, "%-25s: %s", name, timestring(tdr, *t)); - } - - return NT_STATUS_OK; -} - -NTSTATUS tdr_print_NTTIME(struct tdr_print *tdr, const char *name, NTTIME *t) -{ - tdr->print(tdr, "%-25s: %s", name, nt_time_string(tdr, *t)); - - return NT_STATUS_OK; -} - -NTSTATUS tdr_print_DATA_BLOB(struct tdr_print *tdr, const char *name, DATA_BLOB *r) -{ - tdr->print(tdr, "%-25s: DATA_BLOB length=%u", name, r->length); - if (r->length) { - dump_data(10, r->data, r->length); - } - - return NT_STATUS_OK; -} - -#define TDR_ALIGN(l,n) (((l) & ((n)-1)) == 0?0:((n)-((l)&((n)-1)))) - -/* - push a DATA_BLOB onto the wire. -*/ -NTSTATUS tdr_push_DATA_BLOB(struct tdr_push *tdr, DATA_BLOB *blob) -{ - if (tdr->flags & TDR_ALIGN2) { - blob->length = TDR_ALIGN(tdr->data.length, 2); - } else if (tdr->flags & TDR_ALIGN4) { - blob->length = TDR_ALIGN(tdr->data.length, 4); - } else if (tdr->flags & TDR_ALIGN8) { - blob->length = TDR_ALIGN(tdr->data.length, 8); - } - - TDR_PUSH_NEED_BYTES(tdr, blob->length); - - memcpy(tdr->data.data+tdr->data.length, blob->data, blob->length); - return NT_STATUS_OK; -} - -/* - pull a DATA_BLOB from the wire. -*/ -NTSTATUS tdr_pull_DATA_BLOB(struct tdr_pull *tdr, TALLOC_CTX *ctx, DATA_BLOB *blob) -{ - uint32_t length; - - if (tdr->flags & TDR_ALIGN2) { - length = TDR_ALIGN(tdr->offset, 2); - } else if (tdr->flags & TDR_ALIGN4) { - length = TDR_ALIGN(tdr->offset, 4); - } else if (tdr->flags & TDR_ALIGN8) { - length = TDR_ALIGN(tdr->offset, 8); - } else if (tdr->flags & TDR_REMAINING) { - length = tdr->data.length - tdr->offset; - } else { - return NT_STATUS_INVALID_PARAMETER; - } - - if (tdr->data.length - tdr->offset < length) { - length = tdr->data.length - tdr->offset; - } - - TDR_PULL_NEED_BYTES(tdr, length); - - *blob = data_blob_talloc(tdr, tdr->data.data+tdr->offset, length); - tdr->offset += length; - return NT_STATUS_OK; -} - -struct tdr_push *tdr_push_init(TALLOC_CTX *mem_ctx, struct smb_iconv_convenience *ic) -{ - struct tdr_push *push = talloc_zero(mem_ctx, struct tdr_push); - - if (push == NULL) - 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 *pull = talloc_zero(mem_ctx, struct tdr_pull); - - if (pull == NULL) - 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); - - if (push == NULL) - return NT_STATUS_NO_MEMORY; - - if (NT_STATUS_IS_ERR(push_fn(push, p))) { - DEBUG(1, ("Error pushing data\n")); - talloc_free(push); - return NT_STATUS_UNSUCCESSFUL; - } - - if (write(fd, push->data.data, push->data.length) < push->data.length) { - DEBUG(1, ("Error writing all data\n")); - return NT_STATUS_UNSUCCESSFUL; - } - - talloc_free(push); - - return NT_STATUS_OK; -} - -void tdr_print_debug_helper(struct tdr_print *tdr, const char *format, ...) _PRINTF_ATTRIBUTE(2,3) -{ - va_list ap; - char *s = NULL; - int i; - - va_start(ap, format); - vasprintf(&s, format, ap); - va_end(ap); - - for (i=0;ilevel;i++) { DEBUG(0,(" ")); } - - DEBUG(0,("%s\n", s)); - free(s); -} diff --git a/source4/lib/tdr/tdr.h b/source4/lib/tdr/tdr.h deleted file mode 100644 index c983cd35c1..0000000000 --- a/source4/lib/tdr/tdr.h +++ /dev/null @@ -1,67 +0,0 @@ -/* - Unix SMB/CIFS implementation. - 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 . -*/ - -#ifndef __TDR_H__ -#define __TDR_H__ - -#include -#include "../lib/util/charset/charset.h" - -#define TDR_BIG_ENDIAN 0x01 -#define TDR_ALIGN2 0x02 -#define TDR_ALIGN4 0x04 -#define TDR_ALIGN8 0x08 -#define TDR_REMAINING 0x10 - -struct tdr_pull { - DATA_BLOB data; - uint32_t offset; - int flags; - struct smb_iconv_convenience *iconv_convenience; -}; - -struct tdr_push { - DATA_BLOB data; - int flags; - struct smb_iconv_convenience *iconv_convenience; -}; - -struct tdr_print { - int level; - void (*print)(struct tdr_print *, const char *, ...); - int flags; -}; - -#define TDR_CHECK(call) do { NTSTATUS _status; \ - _status = call; \ - if (!NT_STATUS_IS_OK(_status)) \ - return _status; \ - } while (0) - -#define TDR_ALLOC(ctx, s, n) do { \ - (s) = talloc_array_size(ctx, sizeof(*(s)), n); \ - if ((n) && !(s)) return NT_STATUS_NO_MEMORY; \ - } while (0) - -typedef NTSTATUS (*tdr_push_fn_t) (struct tdr_push *, const void *); -typedef NTSTATUS (*tdr_pull_fn_t) (struct tdr_pull *, TALLOC_CTX *, void *); - -#include "lib/tdr/tdr_proto.h" - -#endif /* __TDR_H__ */ diff --git a/source4/lib/tdr/testsuite.c b/source4/lib/tdr/testsuite.c deleted file mode 100644 index 44c5810f90..0000000000 --- a/source4/lib/tdr/testsuite.c +++ /dev/null @@ -1,186 +0,0 @@ -/* - Unix SMB/CIFS implementation. - test suite for basic tdr functions - - Copyright (C) Jelmer Vernooij 2007 - - 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 . -*/ - -#include "includes.h" -#include "torture/torture.h" -#include "lib/tdr/tdr.h" -#include "param/param.h" - -static bool test_push_uint8(struct torture_context *tctx) -{ - uint8_t v = 4; - struct tdr_push *tdr = tdr_push_init(tctx, lp_iconv_convenience(tctx->lp_ctx)); - - torture_assert_ntstatus_ok(tctx, tdr_push_uint8(tdr, &v), "push failed"); - torture_assert_int_equal(tctx, tdr->data.length, 1, "length incorrect"); - torture_assert_int_equal(tctx, tdr->data.data[0], 4, "data incorrect"); - return true; -} - -static bool test_pull_uint8(struct torture_context *tctx) -{ - uint8_t d = 2; - uint8_t l; - struct tdr_pull *tdr = tdr_pull_init(tctx, lp_iconv_convenience(tctx->lp_ctx)); - tdr->data.data = &d; - tdr->data.length = 1; - tdr->offset = 0; - tdr->flags = 0; - torture_assert_ntstatus_ok(tctx, tdr_pull_uint8(tdr, tctx, &l), - "pull failed"); - torture_assert_int_equal(tctx, 1, tdr->offset, - "offset invalid"); - return true; -} - -static bool test_push_uint16(struct torture_context *tctx) -{ - uint16_t v = 0xF32; - struct tdr_push *tdr = tdr_push_init(tctx, lp_iconv_convenience(tctx->lp_ctx)); - - torture_assert_ntstatus_ok(tctx, tdr_push_uint16(tdr, &v), "push failed"); - torture_assert_int_equal(tctx, tdr->data.length, 2, "length incorrect"); - torture_assert_int_equal(tctx, tdr->data.data[0], 0x32, "data incorrect"); - torture_assert_int_equal(tctx, tdr->data.data[1], 0x0F, "data incorrect"); - return true; -} - -static bool test_pull_uint16(struct torture_context *tctx) -{ - uint8_t d[2] = { 782 & 0xFF, (782 & 0xFF00) / 0x100 }; - uint16_t l; - struct tdr_pull *tdr = tdr_pull_init(tctx, lp_iconv_convenience(tctx->lp_ctx)); - tdr->data.data = d; - tdr->data.length = 2; - tdr->offset = 0; - tdr->flags = 0; - torture_assert_ntstatus_ok(tctx, tdr_pull_uint16(tdr, tctx, &l), - "pull failed"); - torture_assert_int_equal(tctx, 2, tdr->offset, "offset invalid"); - torture_assert_int_equal(tctx, 782, l, "right int read"); - return true; -} - -static bool test_push_uint32(struct torture_context *tctx) -{ - uint32_t v = 0x100F32; - struct tdr_push *tdr = tdr_push_init(tctx, lp_iconv_convenience(tctx->lp_ctx)); - - torture_assert_ntstatus_ok(tctx, tdr_push_uint32(tdr, &v), "push failed"); - torture_assert_int_equal(tctx, tdr->data.length, 4, "length incorrect"); - torture_assert_int_equal(tctx, tdr->data.data[0], 0x32, "data incorrect"); - torture_assert_int_equal(tctx, tdr->data.data[1], 0x0F, "data incorrect"); - torture_assert_int_equal(tctx, tdr->data.data[2], 0x10, "data incorrect"); - torture_assert_int_equal(tctx, tdr->data.data[3], 0x00, "data incorrect"); - return true; -} - -static bool test_pull_uint32(struct torture_context *tctx) -{ - uint8_t d[4] = { 782 & 0xFF, (782 & 0xFF00) / 0x100, 0, 0 }; - uint32_t l; - struct tdr_pull *tdr = tdr_pull_init(tctx, lp_iconv_convenience(tctx->lp_ctx)); - tdr->data.data = d; - tdr->data.length = 4; - tdr->offset = 0; - tdr->flags = 0; - torture_assert_ntstatus_ok(tctx, tdr_pull_uint32(tdr, tctx, &l), - "pull failed"); - torture_assert_int_equal(tctx, 4, tdr->offset, "offset invalid"); - torture_assert_int_equal(tctx, 782, l, "right int read"); - return true; -} - -static bool test_pull_charset(struct torture_context *tctx) -{ - struct tdr_pull *tdr = tdr_pull_init(tctx, lp_iconv_convenience(tctx->lp_ctx)); - const char *l = NULL; - tdr->data.data = (uint8_t *)talloc_strdup(tctx, "bla"); - tdr->data.length = 4; - tdr->offset = 0; - tdr->flags = 0; - torture_assert_ntstatus_ok(tctx, tdr_pull_charset(tdr, tctx, &l, -1, 1, CH_DOS), - "pull failed"); - torture_assert_int_equal(tctx, 4, tdr->offset, "offset invalid"); - torture_assert_str_equal(tctx, "bla", l, "right int read"); - - tdr->offset = 0; - torture_assert_ntstatus_ok(tctx, tdr_pull_charset(tdr, tctx, &l, 2, 1, CH_UNIX), - "pull failed"); - torture_assert_int_equal(tctx, 2, tdr->offset, "offset invalid"); - torture_assert_str_equal(tctx, "bl", l, "right int read"); - - return true; -} - -static bool test_pull_charset_empty(struct torture_context *tctx) -{ - struct tdr_pull *tdr = tdr_pull_init(tctx, lp_iconv_convenience(tctx->lp_ctx)); - const char *l = NULL; - tdr->data.data = (uint8_t *)talloc_strdup(tctx, "bla"); - tdr->data.length = 4; - tdr->offset = 0; - tdr->flags = 0; - torture_assert_ntstatus_ok(tctx, tdr_pull_charset(tdr, tctx, &l, 0, 1, CH_DOS), - "pull failed"); - torture_assert_int_equal(tctx, 0, tdr->offset, "offset invalid"); - torture_assert_str_equal(tctx, "", l, "right string read"); - - return true; -} - - - -static bool test_push_charset(struct torture_context *tctx) -{ - const char *l = "bloe"; - struct tdr_push *tdr = tdr_push_init(tctx, lp_iconv_convenience(tctx->lp_ctx)); - 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_ntstatus_ok(tctx, tdr_push_charset(tdr, &l, -1, 1, CH_UTF8), - "push failed"); - torture_assert_int_equal(tctx, 9, tdr->data.length, "offset invalid"); - torture_assert_str_equal(tctx, "bloe", (const char *)tdr->data.data+4, "right string read"); - - return true; -} - -struct torture_suite *torture_local_tdr(TALLOC_CTX *mem_ctx) -{ - struct torture_suite *suite = torture_suite_create(mem_ctx, "TDR"); - - torture_suite_add_simple_test(suite, "pull_uint8", test_pull_uint8); - torture_suite_add_simple_test(suite, "push_uint8", test_push_uint8); - - torture_suite_add_simple_test(suite, "pull_uint16", test_pull_uint16); - torture_suite_add_simple_test(suite, "push_uint16", test_push_uint16); - - torture_suite_add_simple_test(suite, "pull_uint32", test_pull_uint32); - torture_suite_add_simple_test(suite, "push_uint32", test_push_uint32); - - torture_suite_add_simple_test(suite, "pull_charset", test_pull_charset); - torture_suite_add_simple_test(suite, "pull_charset", test_pull_charset_empty); - torture_suite_add_simple_test(suite, "push_charset", test_push_charset); - - return suite; -} -- cgit From a1ebb850209289734b12ea966b01d295d8fc436d Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Tue, 17 Mar 2009 14:18:53 +1100 Subject: added support for parentGUID This is made up of 4 parts: 1) change our schema to include the parentGUID attribute type 2) in the add hook in the objectclass module, get the objectGUID of the parent and add it to the message as parentGUID 3) in the rename hook in the objectclass module, get the objectGUID of the new parent, and insert an async modify request after the renmam is done 4) added a simple test suite --- source4/lib/ldb/tests/python/ldap.py | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'source4/lib') diff --git a/source4/lib/ldb/tests/python/ldap.py b/source4/lib/ldb/tests/python/ldap.py index a30273fc66..7d2c7d0547 100755 --- a/source4/lib/ldb/tests/python/ldap.py +++ b/source4/lib/ldb/tests/python/ldap.py @@ -90,6 +90,36 @@ class BasicTests(unittest.TestCase): except LdbError, (num, _): self.assertEquals(num, ERR_NO_SUCH_OBJECT) + def test_parentGUID(self): + """Test parentGUID behaviour""" + print "Testing parentGUID behaviour\n" + + self.ldb.add({ + "dn": "cn=parentguidtest,cn=users," + self.base_dn, + "objectclass":"user", + "samaccountname":"parentguidtest"}); + res1 = ldb.search(base="cn=parentguidtest,cn=users," + self.base_dn, scope=SCOPE_BASE, + attrs=["parentGUID"]); + res2 = ldb.search(base="cn=users," + self.base_dn,scope=SCOPE_BASE, + attrs=["objectGUID"]); + self.assertEquals(res1[0]["parentGUID"], res2[0]["objectGUID"]); + + """Test parentGUID behaviour""" + print "Testing parentGUID behaviour on rename\n" + + self.ldb.add({ + "dn": "cn=testotherusers," + self.base_dn, + "objectclass":"container"}); + res1 = ldb.search(base="cn=testotherusers," + self.base_dn,scope=SCOPE_BASE, + attrs=["objectGUID"]); + ldb.rename("cn=parentguidtest,cn=users," + self.base_dn, + "cn=parentguidtest,cn=testotherusers," + self.base_dn); + res2 = ldb.search(base="cn=parentguidtest,cn=testotherusers," + self.base_dn, + scope=SCOPE_BASE, + attrs=["parentGUID"]); + self.assertEquals(res1[0]["objectGUID"], res2[0]["parentGUID"]); + + def test_all(self): """Basic tests""" -- cgit From a23719babb7fd117ed2d4d2355748d00e415d561 Mon Sep 17 00:00:00 2001 From: Björn Jacke Date: Sun, 15 Mar 2009 17:26:21 +0100 Subject: fix build on sles8 and other old popt installations Signed-off-by: Michael Adam --- source4/lib/cmdline/popt_common.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'source4/lib') diff --git a/source4/lib/cmdline/popt_common.h b/source4/lib/cmdline/popt_common.h index 733d12a443..2f4ab2c178 100644 --- a/source4/lib/cmdline/popt_common.h +++ b/source4/lib/cmdline/popt_common.h @@ -28,6 +28,10 @@ extern struct poptOption popt_common_connection[]; extern struct poptOption popt_common_version[]; extern struct poptOption popt_common_credentials[]; +#ifndef POPT_TABLEEND +#define POPT_TABLEEND { NULL, '\0', 0, 0, 0, NULL, NULL } +#endif + #define POPT_COMMON_SAMBA { NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_samba, 0, "Common samba options:", NULL }, #define POPT_COMMON_CONNECTION { NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_connection, 0, "Connection options:", NULL }, #define POPT_COMMON_VERSION { NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_version, 0, "Common samba options:", NULL }, -- cgit From 722dc9eed3798db0d3795bdf70ce10e6d402705a Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Fri, 20 Mar 2009 00:33:43 +0100 Subject: pyldb: Improve exception message when a list is expected. --- source4/lib/ldb/pyldb.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'source4/lib') diff --git a/source4/lib/ldb/pyldb.c b/source4/lib/ldb/pyldb.c index 81b960979f..7ff4bf4aad 100644 --- a/source4/lib/ldb/pyldb.c +++ b/source4/lib/ldb/pyldb.c @@ -469,19 +469,20 @@ static PyObject *py_ldb_get_default_basedn(PyLdbObject *self) return PyLdbDn_FromDn(dn); } -static const char **PyList_AsStringList(TALLOC_CTX *mem_ctx, PyObject *list) +static const char **PyList_AsStringList(TALLOC_CTX *mem_ctx, PyObject *list, + const char *paramname) { const char **ret; int i; if (!PyList_Check(list)) { - PyErr_SetString(PyExc_TypeError, "options is not a list"); + PyErr_Format(PyExc_TypeError, "%s is not a list", paramname); return NULL; } ret = talloc_array(NULL, const char *, PyList_Size(list)+1); for (i = 0; i < PyList_Size(list); i++) { PyObject *item = PyList_GetItem(list, i); if (!PyString_Check(item)) { - PyErr_SetString(PyExc_TypeError, "options should be strings"); + PyErr_Format(PyExc_TypeError, "%s should be strings", paramname); return NULL; } ret[i] = PyString_AsString(item); @@ -510,7 +511,7 @@ static int py_ldb_init(PyLdbObject *self, PyObject *args, PyObject *kwargs) if (py_options == Py_None) { options = NULL; } else { - options = PyList_AsStringList(ldb, py_options); + options = PyList_AsStringList(ldb, py_options, "options"); if (options == NULL) return -1; } @@ -563,7 +564,7 @@ static PyObject *py_ldb_connect(PyLdbObject *self, PyObject *args, PyObject *kwa if (py_options == Py_None) { options = NULL; } else { - options = PyList_AsStringList(NULL, py_options); + options = PyList_AsStringList(NULL, py_options, "options"); if (options == NULL) return NULL; } @@ -813,7 +814,7 @@ static PyObject *py_ldb_search(PyLdbObject *self, PyObject *args, PyObject *kwar if (py_attrs == Py_None) { attrs = NULL; } else { - attrs = PyList_AsStringList(ldb_ctx, py_attrs); + attrs = PyList_AsStringList(ldb_ctx, py_attrs, "attrs"); if (attrs == NULL) return NULL; } @@ -828,7 +829,7 @@ static PyObject *py_ldb_search(PyLdbObject *self, PyObject *args, PyObject *kwar if (py_controls == Py_None) { parsed_controls = NULL; } else { - const char **controls = PyList_AsStringList(ldb_ctx, py_controls); + const char **controls = PyList_AsStringList(ldb_ctx, py_controls, "controls"); parsed_controls = ldb_parse_control_strings(ldb_ctx, ldb_ctx, controls); talloc_free(controls); } @@ -1129,7 +1130,7 @@ static PyObject *py_ldb_module_search(PyLdbModuleObject *self, PyObject *args, P mod = self->mod; ret = ldb_build_search_req(&req, mod->ldb, NULL, PyLdbDn_AsDn(py_base), - scope, NULL /* expr */, py_attrs == Py_None?NULL:PyList_AsStringList(req, py_attrs), + scope, NULL /* expr */, py_attrs == Py_None?NULL:PyList_AsStringList(req, py_attrs, "attrs"), NULL /* controls */, NULL, NULL, NULL); PyErr_LDB_ERROR_IS_ERR_RAISE(ret, mod->ldb); -- cgit