[SCM] Samba Shared Repository - branch master updated

[Andrew Tridgell]

The branch, master has been updated
       via  729c4b3... s4-selftest: fixed 'make testenv'
       via  c45a81e... s4-pyldb: fixed 64 bit issues
       via  96a4158... s4-idmap: the idmap database should be indexed
      from  89ba043... s4-libnet: fixed privilege handling in samsync to use the right db

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 729c4b3eeef132ea29d1145d276b63744acfa023
Author: Andrew Tridgell <tridge at samba.org>
Date:   Mon Oct 19 21:37:20 2009 +1100

    s4-selftest: fixed 'make testenv'
    
    The 'TERM' variable is used for terminal type, so we can't use it for
    what terminal to use.

commit c45a81ecf3229762b7074891b86d894c27489180
Author: Andrew Tridgell <tridge at samba.org>
Date:   Mon Oct 19 21:36:41 2009 +1100

    s4-pyldb: fixed 64 bit issues
    
    The python argument parse functions take standard C types, not enums
    and time_t. This broken the python interface on PPC.

commit 96a41581e6aab2b6a3511842c688818a163796f7
Author: Andrew Tridgell <tridge at samba.org>
Date:   Mon Oct 19 20:31:40 2009 +1100

    s4-idmap: the idmap database should be indexed

-----------------------------------------------------------------------

Summary of changes:
 selftest/selftest.pl          |    2 +-
 source4/lib/ldb/pyldb.c       |    6 ++++--
 source4/setup/idmap_init.ldif |    4 ++++
 3 files changed, 9 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/selftest/selftest.pl b/selftest/selftest.pl
index 1cae9ea..ef54320 100755
--- a/selftest/selftest.pl
+++ b/selftest/selftest.pl
@@ -835,7 +835,7 @@ if ($opt_testenv) {
 
 	my $envvarstr = exported_envvars_str($testenv_vars);
 
-	my $term = ($ENV{TERM} or "xterm");
+	my $term = ($ENV{TERMINAL} or "xterm");
 	system("$term -e 'echo -e \"
 Welcome to the Samba4 Test environment '$testenv_name'
 
diff --git a/source4/lib/ldb/pyldb.c b/source4/lib/ldb/pyldb.c
index 1d47d6f..35508c8 100644
--- a/source4/lib/ldb/pyldb.c
+++ b/source4/lib/ldb/pyldb.c
@@ -1006,7 +1006,7 @@ static PyObject *py_ldb_schema_format_value(PyLdbObject *self, PyObject *args)
 static PyObject *py_ldb_search(PyLdbObject *self, PyObject *args, PyObject *kwargs)
 {
 	PyObject *py_base = Py_None;
-	enum ldb_scope scope = LDB_SCOPE_DEFAULT;
+	int scope = LDB_SCOPE_DEFAULT;
 	char *expr = NULL;
 	PyObject *py_attrs = Py_None;
 	PyObject *py_controls = Py_None;
@@ -2370,10 +2370,12 @@ static PyObject *py_register_module(PyObject *module, PyObject *args)
 static PyObject *py_timestring(PyObject *module, PyObject *args)
 {
 	time_t t;
+	unsigned long val;
 	char *tresult;
 	PyObject *ret;
-	if (!PyArg_ParseTuple(args, "L", &t))
+	if (!PyArg_ParseTuple(args, "l", &val))
 		return NULL;
+	t = (time_t)val;
 	tresult = ldb_timestring(NULL, t);
 	ret = PyString_FromString(tresult);
 	talloc_free(tresult);
diff --git a/source4/setup/idmap_init.ldif b/source4/setup/idmap_init.ldif
index 43e5b65..8c143c1 100644
--- a/source4/setup/idmap_init.ldif
+++ b/source4/setup/idmap_init.ldif
@@ -2,3 +2,7 @@ dn: CN=CONFIG
 cn: CONFIG
 lowerBound: 3000000
 upperBound: 4000000
+
+dn: @INDEXLIST
+ at IDXATTR: xidNumber
+ at IDXATTR: objectSid


-- 
Samba Shared Repository