[SCM] Samba Shared Repository - branch master updated
Jelmer Vernooij
jelmer at samba.org
Fri Dec 31 19:40:03 MST 2010
The branch, master has been updated
via 5792fa9 s4-python: Only set BASETYPE flag if subclassing is supported.
via f5fe9c3 s4-python: Add more prototypes.
via 4350e0c s4-python: Properly call PyObject_Del from all destructors.
via 9529fda wmi: Remove unnecessary noprint statements.
via 51239bb talloc/tdb/tevent: Remove obsolete signatures files.
from 659bb64 s3: Add some const to receive_getdc_response
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 5792fa90ace06f736661d9924ec9a75c3a0a9771
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Wed Dec 29 18:56:13 2010 +0100
s4-python: Only set BASETYPE flag if subclassing is supported.
Autobuild-User: Jelmer Vernooij <jelmer at samba.org>
Autobuild-Date: Sat Jan 1 03:39:58 CET 2011 on sn-devel-104
commit f5fe9c32ef833d3f1ee4b891f46e94382aa182fe
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Wed Dec 29 18:09:09 2010 +0100
s4-python: Add more prototypes.
commit 4350e0c3c99fedab99ab1cc680e9d8fe555162e9
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Wed Dec 29 15:58:12 2010 +0100
s4-python: Properly call PyObject_Del from all destructors.
commit 9529fdab26270f4d35119e87f9ca8a7693c24a3f
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Tue Dec 28 17:33:30 2010 +0100
wmi: Remove unnecessary noprint statements.
commit 51239bb26a714bf4c41fb15fde211df1255f9468
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sat Dec 25 01:14:22 2010 +0100
talloc/tdb/tevent: Remove obsolete signatures files.
-----------------------------------------------------------------------
Summary of changes:
lib/talloc/pytalloc.c | 4 +-
lib/talloc/talloc.signatures | 62 ------------------------------
lib/tdb/pytdb.c | 2 +-
lib/tdb/tdb.signatures | 61 -----------------------------
lib/tevent/tevent.signatures | 57 ---------------------------
libcli/nbt/pynbt.c | 10 +++--
librpc/idl/wmi.idl | 27 ++++++-------
librpc/ndr/ndr_wmi.c | 15 +++----
librpc/ndr/ndr_wmi.h | 3 -
pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm | 4 --
source4/lib/ldb-samba/pyldb.c | 17 ++++----
source4/lib/ldb/pyldb.c | 18 +++++----
source4/lib/messaging/pymessaging.c | 6 ++-
source4/libnet/py_net.c | 1 +
source4/librpc/rpc/pyrpc.c | 3 +-
source4/web_server/wsgi.c | 6 +-
16 files changed, 56 insertions(+), 240 deletions(-)
delete mode 100644 lib/talloc/talloc.signatures
delete mode 100644 lib/tdb/tdb.signatures
delete mode 100644 lib/tevent/tevent.signatures
delete mode 100644 librpc/ndr/ndr_wmi.h
Changeset truncated at 500 lines:
diff --git a/lib/talloc/pytalloc.c b/lib/talloc/pytalloc.c
index 6ddcac9..614b81f 100644
--- a/lib/talloc/pytalloc.c
+++ b/lib/talloc/pytalloc.c
@@ -21,6 +21,8 @@
#include <talloc.h>
#include <pytalloc.h>
+void inittalloc(void);
+
/* print a talloc tree report for a talloc python object */
static PyObject *py_talloc_report_full(PyObject *self, PyObject *args)
{
@@ -110,8 +112,6 @@ static int py_talloc_default_cmp(PyObject *_obj1, PyObject *_obj2)
return ((char *)py_talloc_get_ptr(obj1) - (char *)py_talloc_get_ptr(obj2));
}
-
-
static PyTypeObject TallocObject_Type = {
.tp_name = "talloc.Object",
.tp_doc = "Python wrapper for a talloc-maintained object.",
diff --git a/lib/talloc/talloc.signatures b/lib/talloc/talloc.signatures
deleted file mode 100644
index f2868e8..0000000
--- a/lib/talloc/talloc.signatures
+++ /dev/null
@@ -1,62 +0,0 @@
-char *talloc_asprintf (const void *, const char *, ...);
-char *talloc_asprintf_append (char *, const char *, ...);
-char *talloc_asprintf_append_buffer (char *, const char *, ...);
-char *talloc_strdup (const void *, const char *);
-char *talloc_strdup_append (char *, const char *);
-char *talloc_strdup_append_buffer (char *, const char *);
-char *talloc_strndup (const void *, const char *, size_t);
-char *talloc_strndup_append (char *, const char *, size_t);
-char *talloc_strndup_append_buffer (char *, const char *, size_t);
-char *talloc_vasprintf (const void *, const char *, va_list);
-char *talloc_vasprintf_append (char *, const char *, va_list);
-char *talloc_vasprintf_append_buffer (char *, const char *, va_list);
-const char *talloc_get_name (const void *);
-const char *talloc_parent_name (const void *);
-const char *talloc_set_name (const void *, const char *, ...);
-int _talloc_free (void *, const char *);
-int talloc_increase_ref_count (const void *);
-int talloc_is_parent (const void *, const void *);
-int talloc_unlink (const void *, void *);
-int talloc_version_major (void);
-int talloc_version_minor (void);
-size_t talloc_get_size (const void *);
-size_t talloc_reference_count (const void *);
-size_t talloc_total_blocks (const void *);
-size_t talloc_total_size (const void *);
-void *_talloc (const void *, size_t);
-void *_talloc_array (const void *, size_t, unsigned int, const char *);
-void *_talloc_get_type_abort (const void *, const char *, const char *);
-void *_talloc_memdup (const void *, const void *, size_t, const char *);
-void *_talloc_move (const void *, const void *);
-void *_talloc_realloc (const void *, void *, size_t, const char *);
-void *_talloc_realloc_array (const void *, void *, size_t, unsigned int, const char *);
-void *_talloc_reference_loc (const void *, const void *, const char *);
-void *_talloc_steal_loc (const void *, const void *, const char *);
-void *_talloc_zero (const void *, size_t, const char *);
-void *_talloc_zero_array (const void *, size_t, unsigned int, const char *);
-void *talloc_autofree_context (void);
-void *talloc_check_name (const void *, const char *);
-void *talloc_find_parent_byname (const void *, const char *);
-void *talloc_init (const char *, ...);
-void *talloc_named (const void *, size_t, const char *, ...);
-void *talloc_named_const (const void *, size_t, const char *);
-void *talloc_parent (const void *);
-void *talloc_pool (const void *, size_t);
-void *talloc_realloc_fn (const void *, void *, size_t);
-void *talloc_reparent (const void *, const void *, const void *);
-void _talloc_set_destructor (const void *, int (*) (void *));
-void talloc_disable_null_tracking (void);
-void talloc_enable_leak_report (void);
-void talloc_enable_leak_report_full (void);
-void talloc_enable_null_tracking (void);
-void talloc_enable_null_tracking_no_autofree (void);
-void talloc_free_children (void *);
-void talloc_report (const void *, FILE *);
-void talloc_report_depth_cb (const void *, int, int, void (*) (const void *, int, int, int, void *), void *);
-void talloc_report_depth_file (const void *, int, int, FILE *);
-void talloc_report_full (const void *, FILE *);
-void talloc_set_abort_fn (void (*) (const char *));
-void talloc_set_log_fn (void (*) (const char *));
-void talloc_set_log_stderr (void);
-void talloc_set_name_const (const void *, const char *);
-void talloc_show_parents (const void *, FILE *);
diff --git a/lib/tdb/pytdb.c b/lib/tdb/pytdb.c
index 981459e..0faba56 100644
--- a/lib/tdb/pytdb.c
+++ b/lib/tdb/pytdb.c
@@ -479,7 +479,7 @@ static void tdb_object_dealloc(PyTdbObject *self)
{
if (!self->closed)
tdb_close(self->ctx);
- PyObject_Del(self);
+ self->ob_type->tp_free(self);
}
static PyObject *obj_getitem(PyTdbObject *self, PyObject *key)
diff --git a/lib/tdb/tdb.signatures b/lib/tdb/tdb.signatures
deleted file mode 100644
index 7706d18..0000000
--- a/lib/tdb/tdb.signatures
+++ /dev/null
@@ -1,61 +0,0 @@
-const char *tdb_errorstr (struct tdb_context *);
-const char *tdb_name (struct tdb_context *);
-enum TDB_ERROR tdb_error (struct tdb_context *);
-int tdb_append (struct tdb_context *, TDB_DATA, TDB_DATA);
-int tdb_chainlock_mark (struct tdb_context *, TDB_DATA);
-int tdb_chainlock_nonblock (struct tdb_context *, TDB_DATA);
-int tdb_chainlock_read (struct tdb_context *, TDB_DATA);
-int tdb_chainlock (struct tdb_context *, TDB_DATA);
-int tdb_chainlock_unmark (struct tdb_context *, TDB_DATA);
-int tdb_chainunlock_read (struct tdb_context *, TDB_DATA);
-int tdb_chainunlock (struct tdb_context *, TDB_DATA);
-int tdb_close (struct tdb_context *);
-int tdb_delete (struct tdb_context *, TDB_DATA);
-int tdb_exists (struct tdb_context *, TDB_DATA);
-int tdb_fd (struct tdb_context *);
-int tdb_freelist_size (struct tdb_context *);
-int tdb_get_flags (struct tdb_context *);
-int tdb_get_seqnum (struct tdb_context *);
-int tdb_hash_size (struct tdb_context *);
-int tdb_lockall_mark (struct tdb_context *);
-int tdb_lockall_nonblock (struct tdb_context *);
-int tdb_lockall_read_nonblock (struct tdb_context *);
-int tdb_lockall_read (struct tdb_context *);
-int tdb_lockall (struct tdb_context *);
-int tdb_lockall_unmark (struct tdb_context *);
-int tdb_parse_record (struct tdb_context *, TDB_DATA, int (*) (TDB_DATA, TDB_DATA, void *), void *);
-int tdb_printfreelist (struct tdb_context *);
-int tdb_reopen_all (int);
-int tdb_reopen (struct tdb_context *);
-int tdb_repack (struct tdb_context *);
-int tdb_store (struct tdb_context *, TDB_DATA, TDB_DATA, int);
-int tdb_transaction_cancel (struct tdb_context *);
-int tdb_transaction_commit (struct tdb_context *);
-int tdb_transaction_prepare_commit (struct tdb_context *);
-int tdb_transaction_recover (struct tdb_context *);
-int tdb_transaction_start (struct tdb_context *);
-int tdb_transaction_start_nonblock (struct tdb_context *);
-int tdb_traverse_read (struct tdb_context *, tdb_traverse_func, void *);
-int tdb_traverse (struct tdb_context *, tdb_traverse_func, void *);
-int tdb_unlockall_read (struct tdb_context *);
-int tdb_unlockall (struct tdb_context *);
-int tdb_validate_freelist (struct tdb_context *, int *);
-int tdb_wipe_all (struct tdb_context *);
-size_t tdb_map_size (struct tdb_context *);
-struct tdb_context *tdb_open (const char *, int, int, int, mode_t);
-struct tdb_context *tdb_open_ex (const char *, int, int, int, mode_t, const struct tdb_logging_context *, tdb_hash_func);
-TDB_DATA tdb_fetch (struct tdb_context *, TDB_DATA);
-TDB_DATA tdb_firstkey (struct tdb_context *);
-TDB_DATA tdb_nextkey (struct tdb_context *, TDB_DATA);
-tdb_log_func tdb_log_fn (struct tdb_context *);
-void tdb_add_flags (struct tdb_context *, unsigned int);
-void tdb_dump_all (struct tdb_context *);
-void tdb_enable_seqnum (struct tdb_context *);
-void *tdb_get_logging_private (struct tdb_context *);
-void tdb_increment_seqnum_nonblock (struct tdb_context *);
-void tdb_remove_flags (struct tdb_context *, unsigned int);
-void tdb_setalarm_sigptr (struct tdb_context *, volatile sig_atomic_t *);
-void tdb_set_logging_function (struct tdb_context *, const struct tdb_logging_context *);
-void tdb_set_max_dead (struct tdb_context *, int);
-int tdb_check (struct tdb_context *, int (*) (TDB_DATA, TDB_DATA, void *), void *);
-TDB_DATA tdb_null;
diff --git a/lib/tevent/tevent.signatures b/lib/tevent/tevent.signatures
deleted file mode 100644
index c752b9e..0000000
--- a/lib/tevent/tevent.signatures
+++ /dev/null
@@ -1,57 +0,0 @@
-_Bool tevent_queue_add (struct tevent_queue *, struct tevent_context *, struct tevent_req *, tevent_queue_trigger_fn_t, void *);
-_Bool tevent_register_backend (const char *, const struct tevent_ops *);
-_Bool _tevent_req_error (struct tevent_req *, uint64_t, const char *);
-_Bool tevent_req_is_error (struct tevent_req *, enum tevent_req_state *, uint64_t *);
-_Bool tevent_req_is_in_progress (struct tevent_req *);
-_Bool _tevent_req_nomem (const void *, struct tevent_req *, const char *);
-_Bool tevent_req_poll (struct tevent_req *, struct tevent_context *);
-_Bool tevent_req_set_endtime (struct tevent_req *, struct tevent_context *, struct timeval);
-_Bool tevent_signal_support (struct tevent_context *);
-_Bool tevent_timeval_is_zero (const struct timeval *);
-_Bool tevent_wakeup_recv (struct tevent_req *);
-char *tevent_req_default_print (struct tevent_req *, TALLOC_CTX *);
-char *tevent_req_print (TALLOC_CTX *, struct tevent_req *);
-const char **tevent_backend_list (TALLOC_CTX *);
-int _tevent_loop_once (struct tevent_context *, const char *);
-int _tevent_loop_until (struct tevent_context *, _Bool (*) (void *), void *, const char *);
-int _tevent_loop_wait (struct tevent_context *, const char *);
-int tevent_set_debug_stderr (struct tevent_context *);
-int tevent_set_debug (struct tevent_context *, void (*) (void *, enum tevent_debug_level, const char *, va_list), void *);
-int tevent_timeval_compare (const struct timeval *, const struct timeval *);
-size_t tevent_queue_length (struct tevent_queue *);
-struct tevent_context *tevent_context_init_byname (TALLOC_CTX *, const char *);
-struct tevent_context *tevent_context_init (TALLOC_CTX *);
-struct tevent_fd *_tevent_add_fd (struct tevent_context *, TALLOC_CTX *, int, uint16_t, tevent_fd_handler_t, void *, const char *, const char *);
-struct tevent_immediate *_tevent_create_immediate (TALLOC_CTX *, const char *);
-struct tevent_queue *_tevent_queue_create (TALLOC_CTX *, const char *, const char *);
-struct tevent_req *_tevent_req_create (TALLOC_CTX *, void *, size_t, const char *, const char *);
-struct tevent_req *tevent_req_post (struct tevent_req *, struct tevent_context *);
-struct tevent_req *tevent_wakeup_send (TALLOC_CTX *, struct tevent_context *, struct timeval);
-struct tevent_signal *_tevent_add_signal (struct tevent_context *, TALLOC_CTX *, int, int, tevent_signal_handler_t, void *, const char *, const char *);
-struct tevent_timer *_tevent_add_timer (struct tevent_context *, TALLOC_CTX *, struct timeval, tevent_timer_handler_t, void *, const char *, const char *);
-struct timeval tevent_timeval_add (const struct timeval *, uint32_t, uint32_t);
-struct timeval tevent_timeval_current_ofs (uint32_t, uint32_t);
-struct timeval tevent_timeval_current (void);
-struct timeval tevent_timeval_set (uint32_t, uint32_t);
-struct timeval tevent_timeval_until (const struct timeval *, const struct timeval *);
-struct timeval tevent_timeval_zero (void);
-uint16_t tevent_fd_get_flags (struct tevent_fd *);
-void tevent_fd_set_auto_close (struct tevent_fd *);
-void tevent_fd_set_close_fn (struct tevent_fd *, tevent_fd_close_fn_t);
-void tevent_fd_set_flags (struct tevent_fd *, uint16_t);
-void tevent_loop_allow_nesting (struct tevent_context *);
-void tevent_loop_set_nesting_hook (struct tevent_context *, tevent_nesting_hook, void *);
-void tevent_queue_start (struct tevent_queue *);
-void tevent_queue_stop (struct tevent_queue *);
-void *_tevent_req_callback_data (struct tevent_req *);
-void *_tevent_req_data (struct tevent_req *);
-void _tevent_req_done (struct tevent_req *, const char *);
-void _tevent_req_notify_callback (struct tevent_req *, const char *);
-void tevent_req_received (struct tevent_req *);
-void tevent_req_set_callback (struct tevent_req *, tevent_req_fn, void *);
-void tevent_req_set_print_fn (struct tevent_req *, tevent_req_print_fn);
-void _tevent_schedule_immediate (struct tevent_immediate *, struct tevent_context *, tevent_immediate_handler_t, void *, const char *, const char *);
-void tevent_set_abort_fn (void (*) (const char *));
-void tevent_set_default_backend (const char *);
-_Bool _tevent_req_cancel (struct tevent_req *, const char *);
-void tevent_req_set_cancel_fn (struct tevent_req *, tevent_req_cancel_fn);
diff --git a/libcli/nbt/pynbt.c b/libcli/nbt/pynbt.c
index 452ae3a..0bba2ec 100644
--- a/libcli/nbt/pynbt.c
+++ b/libcli/nbt/pynbt.c
@@ -24,6 +24,8 @@
#include "../libcli/nbt/libnbt.h"
#include "lib/events/events.h"
+void initnetbios(void);
+
#ifndef Py_RETURN_NONE
#define Py_RETURN_NONE return Py_INCREF(Py_None), Py_None
#endif
@@ -36,10 +38,10 @@ typedef struct {
struct nbt_name_socket *socket;
} nbt_node_Object;
-static void py_nbt_node_dealloc(PyObject *obj)
+static void py_nbt_node_dealloc(nbt_node_Object *self)
{
- talloc_free(((nbt_node_Object *)obj)->mem_ctx);
- PyObject_Del(obj);
+ talloc_free(self->mem_ctx);
+ self->ob_type->tp_free(self);
}
static PyObject *py_nbt_node_init(PyTypeObject *self, PyObject *args, PyObject *kwargs)
@@ -393,7 +395,7 @@ PyTypeObject nbt_node_Type = {
.tp_basicsize = sizeof(nbt_node_Object),
.tp_flags = Py_TPFLAGS_DEFAULT|Py_TPFLAGS_BASETYPE,
.tp_new = py_nbt_node_init,
- .tp_dealloc = py_nbt_node_dealloc,
+ .tp_dealloc = (destructor)py_nbt_node_dealloc,
.tp_methods = py_nbt_methods,
.tp_doc = "Node()\n"
"Create a new NetBIOS node\n"
diff --git a/librpc/idl/wmi.idl b/librpc/idl/wmi.idl
index 3ae5a45..4d428a8 100644
--- a/librpc/idl/wmi.idl
+++ b/librpc/idl/wmi.idl
@@ -8,7 +8,6 @@ import "dcom.idl";
import "misc.idl";
[
- helper("librpc/ndr/ndr_wmi.h"),
uuid("8BC3F05E-D86B-11d0-A075-00C04FB68820")
] coclass WbemLevel1Login
{
@@ -17,8 +16,8 @@ import "misc.idl";
};
[
- local,
- object,
+ local,
+ object,
uuid("dc12a681-737f-11cf-884d-00aa004b2e24")
]
interface IWbemClassObject : IUnknown
@@ -203,7 +202,7 @@ coclass WbemClassObject
WBEM_E_PROVIDER_DISABLED = 0x8004108a
} WBEMSTATUS;
- typedef [public,noprint] enum
+ typedef [public] bitmap
{
WBEM_FLAG_RETURN_WBEM_COMPLETE = 0,
WBEM_FLAG_BIDIRECTIONAL = 0,
@@ -225,7 +224,7 @@ coclass WbemClassObject
WBEM_MASK_RESERVED_FLAGS = 0x001F000
} WBEM_GENERIC_FLAG_TYPE;
- typedef [public,noprint,v1_enum] enum tag_WBEM_TIMEOUT_TYPE
+ typedef [public,v1_enum] enum tag_WBEM_TIMEOUT_TYPE
{
WBEM_NO_WAIT = 0,
WBEM_INFINITE = 0xFFFFFFFF
@@ -300,18 +299,18 @@ coclass WbemClassObject
WCF_CLASS = 4,
WCF_CLASS_PART_INTERNAL = 8
/* WCF_CLASS_PART_SHARED = 0x104 */
- } WCO_FLAGS;
+ } WCO_FLAGS;
- typedef [public,nopull,nopush] struct
- {
+ typedef struct
+ {
uint32 count;
[ref,charset(UTF16)] uint16 *item[count];
- } CIMSTRINGS;
+ } CIMSTRINGS;
- typedef [public,bitmap8bit] bitmap {
- DEFAULT_FLAG_EMPTY = 1,
- DEFAULT_FLAG_INHERITED = 2
- } DEFAULT_FLAGS;
+ typedef [public,bitmap8bit] bitmap {
+ DEFAULT_FLAG_EMPTY = 1,
+ DEFAULT_FLAG_INHERITED = 2
+ } DEFAULT_FLAGS;
WERROR OpenNamespace(
[in] BSTR strNamespace,
@@ -653,7 +652,7 @@ coclass WbemClassObject
[in,ref] GUID *gWCO,
[out,ref] uint32 *puReturned,
[out,ref] uint32 *pSize,
- [out,ref,noprint,size_is(,*pSize)] uint8 **pData
+ [out,ref,size_is(,*pSize)] uint8 **pData
);
}
diff --git a/librpc/ndr/ndr_wmi.c b/librpc/ndr/ndr_wmi.c
index 2c122de..87f3e96 100644
--- a/librpc/ndr/ndr_wmi.c
+++ b/librpc/ndr/ndr_wmi.c
@@ -23,7 +23,6 @@
#include "includes.h"
#include "librpc/gen_ndr/ndr_dcom.h"
#include "librpc/gen_ndr/ndr_wmi.h"
-#include "librpc/ndr/ndr_wmi.h"
// Just for debugging
int NDR_CHECK_depth = 0;
@@ -35,18 +34,18 @@ enum ndr_err_code ndr_push_BSTR(struct ndr_push *ndr, int ndr_flags, const struc
uint32_t flags;
enum ndr_err_code status;
len = strlen(r->data);
- if (ndr_flags & NDR_SCALARS) {
- NDR_CHECK(ndr_push_align(ndr, 4));
- NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0x72657355));
- NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, len));
- NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 2*len));
+ if (ndr_flags & NDR_SCALARS) {
+ NDR_CHECK(ndr_push_align(ndr, 4));
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0x72657355));
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, len));
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 2*len));
flags = ndr->flags;
ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NOTERM | LIBNDR_FLAG_STR_SIZE4);
status = ndr_push_string(ndr, NDR_SCALARS, r->data);
ndr->flags = flags;
return status;
- }
- return NDR_ERR_SUCCESS;
+ }
+ return NDR_ERR_SUCCESS;
}
enum ndr_err_code ndr_pull_BSTR(struct ndr_pull *ndr, int ndr_flags, struct BSTR *r)
diff --git a/librpc/ndr/ndr_wmi.h b/librpc/ndr/ndr_wmi.h
deleted file mode 100644
index 539b9e8..0000000
--- a/librpc/ndr/ndr_wmi.h
+++ /dev/null
@@ -1,3 +0,0 @@
-typedef const char *CIMSTRING;
-enum ndr_err_code ndr_pull_CIMSTRING(struct ndr_pull *ndr, int ndr_flags, CIMSTRING *r);
-enum ndr_err_code ndr_push_CIMSTRING(struct ndr_push *ndr, int ndr_flags, const CIMSTRING *r);
diff --git a/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm b/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
index 09518f7..732aa98 100644
--- a/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
+++ b/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
@@ -2623,10 +2623,6 @@ sub ParseInterface($$$)
($needed->{"ndr_push_$d->{NAME}"}) && $self->ParseFunctionPush($d);
($needed->{"ndr_pull_$d->{NAME}"}) && $self->ParseFunctionPull($d);
($needed->{"ndr_print_$d->{NAME}"}) && $self->ParseFunctionPrint($d);
-
- # Make sure we don't generate a function twice...
- $needed->{"ndr_push_$d->{NAME}"} = $needed->{"ndr_pull_$d->{NAME}"} =
- $needed->{"ndr_print_$d->{NAME}"} = 0;
}
$self->FunctionTable($interface);
diff --git a/source4/lib/ldb-samba/pyldb.c b/source4/lib/ldb-samba/pyldb.c
index 9345145..472a466 100644
--- a/source4/lib/ldb-samba/pyldb.c
+++ b/source4/lib/ldb-samba/pyldb.c
@@ -29,6 +29,8 @@
#include "lib/ldb-samba/ldif_handlers.h"
#include "auth/pyauth.h"
+void init_ldb(void);
+
static PyObject *pyldb_module;
static PyObject *py_ldb_error;
staticforward PyTypeObject PySambaLdb;
@@ -43,8 +45,6 @@ static void PyErr_SetLdbError(PyObject *error, int ret, struct ldb_context *ldb_
ldb_ctx == NULL?ldb_strerror(ret):ldb_errstring(ldb_ctx)));
}
-
-
static PyObject *py_ldb_set_loadparm(PyObject *self, PyObject *args)
{
PyObject *py_lp_ctx;
@@ -114,33 +114,33 @@ static PyObject *py_ldb_set_opaque_integer(PyObject *self, PyObject *args)
if (old_val) {
*old_val = value;
Py_RETURN_NONE;
- }
+ }
tmp_ctx = talloc_new(ldb);
if (tmp_ctx == NULL) {
PyErr_NoMemory();
return NULL;
}
-
+
new_val = talloc(tmp_ctx, int);
if (new_val == NULL) {
talloc_free(tmp_ctx);
PyErr_NoMemory();
return NULL;
}
-
+
opaque_name_talloc = talloc_strdup(tmp_ctx, py_opaque_name);
if (opaque_name_talloc == NULL) {
talloc_free(tmp_ctx);
PyErr_NoMemory();
return NULL;
}
-
+
*new_val = value;
/* cache the domain_sid in the ldb */
ret = ldb_set_opaque(ldb, opaque_name_talloc, new_val);
-
+
if (ret != LDB_SUCCESS) {
talloc_free(tmp_ctx);
PyErr_SetLdbError(py_ldb_error, ret, ldb);
@@ -238,13 +238,12 @@ static PyMethodDef py_samba_ldb_methods[] = {
};
static PyTypeObject PySambaLdb = {
- .tp_name = "samba.Ldb",
+ .tp_name = "samba._ldb.Ldb",
.tp_doc = "Connection to a LDB database.",
.tp_methods = py_samba_ldb_methods,
.tp_flags = Py_TPFLAGS_DEFAULT|Py_TPFLAGS_BASETYPE,
};
-
void init_ldb(void)
{
PyObject *m;
diff --git a/source4/lib/ldb/pyldb.c b/source4/lib/ldb/pyldb.c
index d67d53f..354e83d 100644
--- a/source4/lib/ldb/pyldb.c
+++ b/source4/lib/ldb/pyldb.c
@@ -8,9 +8,9 @@
Copyright (C) 2007-2010 Jelmer Vernooij <jelmer at samba.org>
Copyright (C) 2009-2010 Matthias Dieter Wallnöfer
- ** NOTE! The following LGPL license applies to the ldb
- ** library. This does NOT imply that all of Samba is released
- ** under the LGPL
+ ** NOTE! The following LGPL license applies to the ldb
+ ** library. This does NOT imply that all of Samba is released
+ ** under the LGPL
This library is free software; you can redistribute it and/or
--
Samba Shared Repository
More information about the samba-cvs
mailing list