r14968: Move tdb and ldb swig wrappers in to lib/tdb and lib/ldb directories.

(This used to be commit fa8d0dc14a1af9567401d54a803b34a6498b7cd4)

5 files changed, 1 insertions, 645 deletions

diff --git a/source4/scripting/swig/Ldb.py b/source4/scripting/swig/Ldb.py
deleted file mode 100644
index f761aec398..0000000000
--- a/source4/scripting/swig/Ldb.py
+++ /dev/null
@@ -1,102 +0,0 @@
-"""Provide a more Pythonic and object-oriented interface to ldb."""
-
-#
-# Swig interface to Samba
-#
-# Copyright (C) Tim Potter 2006
-#
-# 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 2 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, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-#
-
-import ldb
-
-class LdbElement:
-    """A class representing a ldb element as an array of values."""
-    
-    def __init__(self, elt):
-        self.name = elt.name
-        self.flags = elt.flags
-        self.values = [ldb.ldb_val_array_getitem(elt.values, x)
-                       for x in range(elt.num_values)]
-
-    def __repr__(self):
-        return '<%s(name=%s) instance at 0x%x' % (self.__class__.__name__,
-                                                  `self.name`, id(self))
-
-    def __len__(self):
-        return self.values.len()
-
-    def __getitem__(self, key):
-        return self.values[key]
-
-class LdbMessage:
-    """A class representing a ldb message as a dict of ldb elements."""
-    
-    def __init__(self, msg = None):
-
-        self.dn = None
-        self.private_data = None
-        self.elements = []
-
-        if msg is not None:
-            self.dn = msg.dn
-            self.private_data = msg.private_data
-            eltlist = \
-                [LdbElement(ldb.ldb_message_element_array_getitem(
-                            msg.elements, x))
-                 for x in range(msg.num_elements)]
-            self.elements = dict([(x.name, x) for x in eltlist])
-
-    def __repr__(self):
-        return '<%s(dn=%s) instance at 0x%x>' % (self.__class__.__name__,
-                                               `self.dn`, id(self))
-
-    def __getitem__(self, key):
-        return self.elements[key]
-
-    def keys(self):
-        return self.elements.keys()
-
-class Ldb:
-    """A class representing a binding to a ldb file."""
-
-    def __init__(self):
-        self.mem_ctx = ldb.talloc_init('python ldb')
-        self.ldb_ctx = ldb.init(self.mem_ctx)
-        
-    def __del__(self):
-        ldb.talloc_free(self.mem_ctx)
-
-    def connect(self, url, flags = 0):
-        ldb.connect(self.ldb_ctx, url, flags, None)
-
-    def search(self, expression):
-
-        result = ldb.search(self.ldb_ctx, None, ldb.LDB_SCOPE_DEFAULT,
-                            expression, None);
-
-        return [LdbMessage(ldb.ldb_message_ptr_array_getitem(result.msgs, ndx))
-                for ndx in range(result.count)]
-
-    def delete(self, dn):
-        if ldb.delete(self.ldb_ctx, dn) != 0:
-            raise IOError, ldb.errstring(self.ldb_ctx)
-
-    def rename(self, olddn, newdn):
-        if ldb.rename(self.ldb_ctx, olddn, newdn) != 0:
-            raise IOError, ldb.errstring(self.ldb_ctx)
-
-    def add(self, msg):
-        ldb.add(self.ldb_ctx, msg)
diff --git a/source4/scripting/swig/Tdb.py b/source4/scripting/swig/Tdb.py
deleted file mode 100644
index ef0165ed8b..0000000000
--- a/source4/scripting/swig/Tdb.py
+++ /dev/null
@@ -1,115 +0,0 @@
-"""Provide a more Pythonic and object-oriented interface to tdb."""
-
-#
-# Swig interface to Samba
-#
-# Copyright (C) Tim Potter 2006
-#
-# 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 2 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, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-#
-
-import tdb, os
-
-# Open flags
-
-DEFAULT        = tdb.TDB_DEFAULT
-CLEAR_IF_FIRST = tdb.TDB_CLEAR_IF_FIRST
-INTERNAL       = tdb.TDB_INTERNAL
-NOLOCK         = tdb.TDB_NOLOCK
-NOMMAP         = tdb.TDB_NOMMAP
-
-# Class representing a TDB file
-
-class Tdb:
-
-    # Create and destroy Tdb objects
-
-    def __init__(self, name, hash_size = 0, flags = tdb.TDB_DEFAULT,
-                 open_flags = os.O_RDWR | os.O_CREAT, mode = 0600):
-        self.tdb = tdb.open(name, hash_size, flags, open_flags, mode)
-        if self.tdb is None:
-            raise IOError, tdb.errorstr(self.tdb)
-        
-    def __del__(self):
-        self.close()
-
-    def close(self):
-        if hasattr(self, 'tdb') and self.tdb is not None:
-            if tdb.close(self.tdb) == -1:
-                raise IOError, tdb.errorstr(self.tdb)
-            self.tdb = None
-
-    # Random access to keys, values
-
-    def __getitem__(self, key):
-        result = tdb.fetch(self.tdb, key)
-        if result is None:
-            raise KeyError, '%s: %s' % (key, tdb.errorstr(self.tdb))
-        return result
-
-    def __setitem__(self, key, item):
-        if tdb.store(self.tdb, key, item) == -1:
-            raise IOError, tdb.errorstr(self.tdb)
-
-    def __delitem__(self, key):
-        if not tdb.exists(self.tdb, key):
-            raise KeyError, '%s: %s' % (key, tdb.errorstr(self.tdb))
-        tdb.delete(self.tdb, key)
-
-    def has_key(self, key):
-        return tdb.exists(self.tdb, key)
-
-    # Tdb iterator
-
-    class TdbIterator:
-        def __init__(self, tdb):
-            self.tdb = tdb
-            self.key = None
-
-        def __iter__(self):
-            return self
-            
-        def next(self):
-            if self.key is None:
-                self.key = tdb.firstkey(self.tdb)
-                if self.key is None:
-                    raise StopIteration
-                return self.key
-            else:
-                self.key = tdb.nextkey(self.tdb, self.key)
-                if self.key is None:
-                    raise StopIteration
-                return self.key
-
-    def __iter__(self):
-        return Tdb.TdbIterator(self.tdb)
-
-    # Implement other dict functions using TdbIterator
-
-    def keys(self):
-        return [k for k in iter(self)]
-
-    def values(self):
-        return [self[k] for k in iter(self)]
-
-    def items(self):
-        return [(k, self[k]) for k in iter(self)]
-
-    def __len__(self):
-        return len(self.keys())
-
-    def clear(self):
-        for k in iter(self):
-            del(self[k])
diff --git a/source4/scripting/swig/config.mk b/source4/scripting/swig/config.mk
index e0a265b679..9dba88b299 100644
--- a/source4/scripting/swig/config.mk
+++ b/source4/scripting/swig/config.mk
@@ -1,22 +1,4 @@
 #######################
-# Start LIBRARY swig_tdb
-[LIBRARY::swig_tdb]
-LIBRARY_REALNAME = _tdb.$(SHLIBEXT)
-OBJ_FILES = tdb_wrap.o
-REQUIRED_SUBSYSTEMS = LIBTDB DYNCONFIG
-# End LIBRARY swig_tdb
-#######################
-
-#######################
-# Start LIBRARY swig_ldb
-[LIBRARY::swig_ldb]
-REQUIRED_SUBSYSTEMS = ldb DYNCONFIG
-LIBRARY_REALNAME = _ldb.$(SHLIBEXT)
-OBJ_FILES = ldb_wrap.o
-# End LIBRARY swig_ldb
-#######################
-
-#######################
 # Start LIBRARY swig_dcerpc
 [LIBRARY::swig_dcerpc]
 LIBRARY_REALNAME = _dcerpc.$(SHLIBEXT)
@@ -26,7 +8,7 @@ OBJ_FILES = dcerpc_wrap.o
 #######################
 
 # Swig extensions
-swig: scripting/swig/_tdb.$(SHLIBEXT) scripting/swig/_ldb.$(SHLIBEXT)
+swig: lib/tdb/swig/_tdb.$(SHLIBEXT) lib/ldb/swig/_ldb.$(SHLIBEXT)
 
 .SUFFIXES: _wrap.c .i
 
diff --git a/source4/scripting/swig/ldb.i b/source4/scripting/swig/ldb.i
deleted file mode 100644
index 31c1ffe3e4..0000000000
--- a/source4/scripting/swig/ldb.i
+++ /dev/null
@@ -1,219 +0,0 @@
-/* 
-   Unix SMB/CIFS implementation.
-
-   Swig interface to ldb.
-
-   Copyright (C) 2005,2006 Tim Potter <tpot@samba.org>
-   Copyright (C) 2006 Simo Sorce <idra@samba.org>
-
-     ** 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
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-
-   This library 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with this library; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
-
-%module ldb
-
-%{
-
-/* Some typedefs to help swig along */
-
-typedef unsigned char uint8_t;
-typedef unsigned long long uint64_t;
-typedef long long int64_t;
-
-/* Include headers */
-
-#include "lib/ldb/include/ldb.h"
-#include "lib/talloc/talloc.h"
-
-%}
-
-%include "carrays.i"
-%include "exception.i"
-
-/* 
- * Wrap struct ldb_context
- */
-
-/* The ldb functions will crash if a NULL ldb context is passed so
-   catch this before it happens. */
-
-%typemap(check) struct ldb_context* {
-	if ($1 == NULL)
-		SWIG_exception(SWIG_ValueError, 
-			"ldb context must be non-NULL");
-}
-
-/* 
- * Wrap TALLOC_CTX
- */
-
-/* Use talloc_init() to create a parameter to pass to ldb_init().  Don't
-   forget to free it using talloc_free() afterwards. */
-
-TALLOC_CTX *talloc_init(char *name);
-int talloc_free(TALLOC_CTX *ptr);
-
-/*
- * Wrap struct ldb_val
- */
-
-%typemap(in) struct ldb_val {
-	if (!PyString_Check($input)) {
-		PyErr_SetString(PyExc_TypeError, "string arg expected");
-		return NULL;
-	}
-	$1.length = PyString_Size($input);
-	$1.data = PyString_AsString($input);
-}
-
-%typemap(out) struct ldb_val {
-	if ($1.data == NULL && $1.length == 0) {
-		$result = Py_None;
-	} else {
-		$result = PyString_FromStringAndSize($1.data, $1.length);
-	}
-}
-
-enum ldb_scope {LDB_SCOPE_DEFAULT=-1, 
-		LDB_SCOPE_BASE=0, 
-		LDB_SCOPE_ONELEVEL=1,
-		LDB_SCOPE_SUBTREE=2};
-
-/*
- * Wrap struct ldb_result
- */
-
-%typemap(in, numinputs=0) struct ldb_result **OUT (struct ldb_result *temp_ldb_result) {
-	$1 = &temp_ldb_result;
-}
-
-%typemap(argout) struct ldb_result ** {
-
-	/* XXX: Check result for error and throw exception if necessary */
-
-	resultobj = SWIG_NewPointerObj(*$1, SWIGTYPE_p_ldb_result, 0);
-}	
-
-%types(struct ldb_result *);
-
-/*
- * Wrap struct ldb_dn
- */
-
-%typemap(in) struct ldb_dn * {
-	if ($input == Py_None) {
-		$1 = NULL;
-	} else if (!PyString_Check($input)) {
-		PyErr_SetString(PyExc_TypeError, "string arg expected");
-		return NULL;
-	} else {
-		$1 = ldb_dn_explode(NULL, PyString_AsString($input));
-	}
-}
-
-%typemap(out) struct ldb_dn * {
-	$result = PyString_FromString(ldb_dn_linearize($1, $1));
-}
-
-/*
- * Wrap struct ldb_message_element
- */
-
-%array_functions(struct ldb_val, ldb_val_array);
-
-struct ldb_message_element {
-	unsigned int flags;
-	const char *name;
-	unsigned int num_values;
-	struct ldb_val *values;
-};
-
-/*
- * Wrap struct ldb_message
- */
-
-%array_functions(struct ldb_message_element, ldb_message_element_array);
-
-struct ldb_message {
-	struct ldb_dn *dn;
-	unsigned int num_elements;
-	struct ldb_message_element *elements;
-	void *private_data; /* private to the backend */
-};
-
-%typemap(in) struct ldb_message * {
-	PyObject *obj, *key, *value;
-	int pos;
-
-	$1 = ldb_msg_new(NULL);
-
-	obj = PyObject_GetAttrString($input, "dn");
-	$1->dn = ldb_dn_explode(NULL, PyString_AsString(obj));
-
-	obj = PyObject_GetAttrString($input, "private_data");
-	$1->private_data = PyString_AsString(obj);
-
-	obj = PyObject_GetAttrString($input, "elements");
-
-	pos = 0;
-	while (PyDict_Next(obj, &pos, &key, &value)) {
-		struct ldb_val v;
-
-		v.data = PyString_AsString(value);
-		v.length = PyString_Size(value);
-		ldb_msg_add_value($1, PyString_AsString(key), &v);
-	}
-}
-
-/*
- * Wrap struct ldb_result
- */
-
-%array_functions(struct ldb_message *, ldb_message_ptr_array);
-
-struct ldb_result {
-	unsigned int count;
-	struct ldb_message **msgs;
-	char **refs;
-	struct ldb_control **controls;
-};
-
-/*
- * Wrap ldb functions 
- */
-
-%rename ldb_init init;
-struct ldb_context *ldb_init(TALLOC_CTX *mem_ctx);
-
-%rename ldb_errstring errstring;
-const char *ldb_errstring(struct ldb_context *ldb);
-
-%rename ldb_connect connect;
-int ldb_connect(struct ldb_context *ldb, const char *url, unsigned int flags, const char *options[]);
-
-%rename ldb_search search;
-int ldb_search(struct ldb_context *ldb, const struct ldb_dn *base, enum ldb_scope scope, const char *expression, const char * const *attrs, struct ldb_result **OUT);
-
-%rename ldb_delete delete;
-int ldb_delete(struct ldb_context *ldb, const struct ldb_dn *dn);
-
-%rename ldb_rename rename;
-int ldb_rename(struct ldb_context *ldb, const struct ldb_dn *olddn, const struct ldb_dn *newdn);
-
-%rename ldb_add add;
-int ldb_add(struct ldb_context *ldb, const struct ldb_message *message);
diff --git a/source4/scripting/swig/tdb.i b/source4/scripting/swig/tdb.i
deleted file mode 100644
index 8f473c61e6..0000000000
--- a/source4/scripting/swig/tdb.i
+++ /dev/null
@@ -1,190 +0,0 @@
-/* 
-   Unix SMB/CIFS implementation.
-
-   Swig interface to tdb.
-
-   Copyright (C) 2004,2005 Tim Potter <tpot@samba.org>
-
-     ** NOTE! The following LGPL license applies to the tdb
-     ** 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
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-
-   This library 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with this library; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
-
-%module tdb
-
-%{
-
-/* This symbol is used in both includes.h and Python.h which causes an
-   annoying compiler warning. */
-
-#ifdef HAVE_FSTAT
-#undef HAVE_FSTAT
-#endif
-
-#if (__GNUC__ >= 3)
-/** Use gcc attribute to check printf fns.  a1 is the 1-based index of
- * the parameter containing the format, and a2 the index of the first
- * argument. Note that some gcc 2.x versions don't handle this
- * properly **/
-#define PRINTF_ATTRIBUTE(a1, a2) __attribute__ ((format (__printf__, a1, a2)))
-#else
-#define PRINTF_ATTRIBUTE(a1, a2)
-#endif
-
-/* Include tdb headers */
-
-#include "lib/tdb/include/tdb.h"
-
-%}
-
-/* The tdb functions will crash if a NULL tdb context is passed */
-
-%include exception.i
-
-%typemap(check) TDB_CONTEXT* {
-	if ($1 == NULL)
-		SWIG_exception(SWIG_ValueError, 
-			"tdb context must be non-NULL");
-}
-
-/* In and out typemaps for the TDB_DATA structure.  This is converted to
-   and from the Python string type which can contain arbitrary binary
-   data.. */
-
-%typemap(in) TDB_DATA {
-	if (!PyString_Check($input)) {
-		PyErr_SetString(PyExc_TypeError, "string arg expected");
-		return NULL;
-	}
-	$1.dsize = PyString_Size($input);
-	$1.dptr = PyString_AsString($input);
-}
-
-%typemap(out) TDB_DATA {
-	if ($1.dptr == NULL && $1.dsize == 0) {
-		$result = Py_None;
-	} else {
-		$result = PyString_FromStringAndSize($1.dptr, $1.dsize);
-		free($1.dptr);
-	}
-}
-
-/* Treat a mode_t as an unsigned integer */
-
-typedef int mode_t;
-
-/* flags to tdb_store() */
-
-#define TDB_REPLACE 1
-#define TDB_INSERT 2
-#define TDB_MODIFY 3
-
-/* flags for tdb_open() */
-
-#define TDB_DEFAULT 0 /* just a readability place holder */
-#define TDB_CLEAR_IF_FIRST 1
-#define TDB_INTERNAL 2 /* don't store on disk */
-#define TDB_NOLOCK   4 /* don't do any locking */
-#define TDB_NOMMAP   8 /* don't use mmap */
-#define TDB_CONVERT 16 /* convert endian (internal use) */
-#define TDB_BIGENDIAN 32 /* header is big-endian (internal use) */
-
-/* Throw an IOError exception if tdb_open() or tdb_open_ex() returns NULL */
-
-%exception {
-	$action
-	if (result == NULL) {
-		PyErr_SetFromErrno(PyExc_IOError);
-		SWIG_fail;
-	}
-}
-
-%rename tdb_open open;
-TDB_CONTEXT *tdb_open(const char *name, int hash_size, int tdb_flags,
-		      int open_flags, mode_t mode);
-
-%rename tdb_open_ex open_ex;
-TDB_CONTEXT *tdb_open_ex(const char *name, int hash_size, int tdb_flags,
-			 int open_flags, mode_t mode,
-			 tdb_log_func log_fn,
-			 tdb_hash_func hash_fn);
-
-%exception;
-
-%rename tdb_reopen reopen;
-int tdb_reopen(TDB_CONTEXT *tdb);
-
-%rename tdb_reopen_all reopen_all;
-int tdb_reopen_all(void);
-
-%rename tdb_logging_function logging_function;
-void tdb_logging_function(TDB_CONTEXT *tdb, tdb_log_func);
-
-%rename tdb_error error;
-enum TDB_ERROR tdb_error(TDB_CONTEXT *tdb);
-
-%rename tdb_errorstr errorstr;
-const char *tdb_errorstr(TDB_CONTEXT *tdb);
-
-%rename tdb_fetch fetch;
-TDB_DATA tdb_fetch(TDB_CONTEXT *tdb, TDB_DATA key);
-
-%rename tdb_delete delete;
-int tdb_delete(TDB_CONTEXT *tdb, TDB_DATA key);
-
-%rename tdb_store store;
-int tdb_store(TDB_CONTEXT *tdb, TDB_DATA key, TDB_DATA dbuf, int flag = TDB_REPLACE);
-
-%rename tdb_append append;
-int tdb_append(TDB_CONTEXT *tdb, TDB_DATA key, TDB_DATA new_dbuf);
-
-%rename tdb_close close;
-int tdb_close(TDB_CONTEXT *tdb);
-
-%rename tdb_firstkey firstkey;
-TDB_DATA tdb_firstkey(TDB_CONTEXT *tdb);
-
-%rename tdb_nextkey nextkey;
-TDB_DATA tdb_nextkey(TDB_CONTEXT *tdb, TDB_DATA key);
-
-%rename tdb_traverse traverse;
-int tdb_traverse(TDB_CONTEXT *tdb, tdb_traverse_func fn, void *state);
-
-%rename tdb_exists exists;
-int tdb_exists(TDB_CONTEXT *tdb, TDB_DATA key);
-
-%rename tdb_lockall lockall;
-int tdb_lockall(TDB_CONTEXT *tdb);
-
-%rename tdb_unlockall unlockall;
-void tdb_unlockall(TDB_CONTEXT *tdb);
-
-/* Low level locking functions: use with care */
-
-%rename tdb_chainlock chainlock;
-int tdb_chainlock(TDB_CONTEXT *tdb, TDB_DATA key);
-
-%rename tdb_chainunlock chainunlock;
-int tdb_chainunlock(TDB_CONTEXT *tdb, TDB_DATA key);
-
-/* Debug functions. Not used in production. */
-
-%rename tdb_dump_all dump_all;
-void tdb_dump_all(TDB_CONTEXT *tdb);
-
-%rename tdb_printfreelist printfreelist;
-int tdb_printfreelist(TDB_CONTEXT *tdb);