From 75eef34a23ac60b9218a6fa3da80f579b6830303 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Wed, 28 Apr 2004 10:10:52 +0000
Subject: r383: Scripting extensions using swig.  This commit includes only a
 (LGPL) python interface to tdb and a rudimentary build system.

Configure with --with-python and make swig to build and append
$(builddir)/scripting/swig/python to PYTHONPATH.
(This used to be commit bbc15d6f84b6a247ae87b253752a86a38f1d6798)
---
 source4/scripting/config.m4    |  27 +++++++++
 source4/scripting/swig/samba.i |  33 +++++++++++
 source4/scripting/swig/tdb.i   | 132 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 192 insertions(+)
 create mode 100644 source4/scripting/config.m4
 create mode 100644 source4/scripting/swig/samba.i
 create mode 100644 source4/scripting/swig/tdb.i

(limited to 'source4/scripting')

diff --git a/source4/scripting/config.m4 b/source4/scripting/config.m4
new file mode 100644
index 0000000000..02a563e167
--- /dev/null
+++ b/source4/scripting/config.m4
@@ -0,0 +1,27 @@
+dnl # Scripting subsystem
+
+# Check for python support
+
+PYTHON=
+ 
+AC_ARG_WITH(python,
+[  --with-python=PYTHONNAME  build Python libraries],
+[ case "${withval-python}" in
+  yes)
+        PYTHON=python
+        ;;
+  no)
+        PYTHON=
+        ;;
+  *)
+        PYTHON=${withval-python}
+        ;;
+  esac ])
+
+if test x"$PYTHON" != "x"; then
+	incdir=`python -c 'import sys; print "%s/include/python%d.%d" % (sys.prefix, sys.version_info[[0]], sys.version_info[[1]])'`
+	CPPFLAGS="$CPPFLAGS -I $incdir"
+fi
+
+AC_SUBST(PYTHON)
+
diff --git a/source4/scripting/swig/samba.i b/source4/scripting/swig/samba.i
new file mode 100644
index 0000000000..edb038bd5b
--- /dev/null
+++ b/source4/scripting/swig/samba.i
@@ -0,0 +1,33 @@
+/* 
+   Unix SMB/CIFS implementation.
+
+   Common swig definitions
+   
+   Copyright (C) 2004 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
+*/
+
+%typemap(in) uint32 {
+	if (!PyInt_Check($input)) {
+		PyErr_SetString(PyExc_TypeError, "integer expected");
+		return NULL;
+	}
+	$1 = (uint32)PyInt_AsLong($input);
+}
diff --git a/source4/scripting/swig/tdb.i b/source4/scripting/swig/tdb.i
new file mode 100644
index 0000000000..9f8961c248
--- /dev/null
+++ b/source4/scripting/swig/tdb.i
@@ -0,0 +1,132 @@
+/* 
+   Unix SMB/CIFS implementation.
+
+   Swig interface to tdb.
+
+   Copyright (C) 2004 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
+
+%{
+
+/* The tdb_set_lock_alarm() function requires the SIG_ATOMIC_T
+   function from includes.h */
+
+#include "include/config.h"
+#if defined(HAVE_SIG_ATOMIC_T_TYPE)
+typedef sig_atomic_t SIG_ATOMIC_T;
+#else
+typedef int SIG_ATOMIC_T;
+#endif
+
+/* Include tdb headers */
+
+#include "tdb/tdb.h"
+
+%}
+
+/* The tdb functions will crash if a NULL tdb 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. */
+
+%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 unsigned 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) */
+
+TDB_CONTEXT *tdb_open(const char *name, int hash_size, int tdb_flags,
+		      int open_flags, mode_t mode);
+
+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);
+
+int tdb_reopen(TDB_CONTEXT *tdb);
+int tdb_reopen_all(void);
+
+void tdb_logging_function(TDB_CONTEXT *tdb, tdb_log_func);
+enum TDB_ERROR tdb_error(TDB_CONTEXT *tdb);
+const char *tdb_errorstr(TDB_CONTEXT *tdb);
+TDB_DATA tdb_fetch(TDB_CONTEXT *tdb, TDB_DATA key);
+int tdb_delete(TDB_CONTEXT *tdb, TDB_DATA key);
+int tdb_store(TDB_CONTEXT *tdb, TDB_DATA key, TDB_DATA dbuf, int flag = TDB_REPLACE);
+int tdb_append(TDB_CONTEXT *tdb, TDB_DATA key, TDB_DATA new_dbuf);
+int tdb_close(TDB_CONTEXT *tdb);
+TDB_DATA tdb_firstkey(TDB_CONTEXT *tdb);
+TDB_DATA tdb_nextkey(TDB_CONTEXT *tdb, TDB_DATA key);
+int tdb_traverse(TDB_CONTEXT *tdb, tdb_traverse_func fn, void *state);
+int tdb_exists(TDB_CONTEXT *tdb, TDB_DATA key);
+int tdb_lockkeys(TDB_CONTEXT *tdb, u32 number, TDB_DATA keys[]);
+void tdb_unlockkeys(TDB_CONTEXT *tdb);
+int tdb_lockall(TDB_CONTEXT *tdb);
+void tdb_unlockall(TDB_CONTEXT *tdb);
+
+/* Low level locking functions: use with care */
+void tdb_set_lock_alarm(SIG_ATOMIC_T *palarm);
+int tdb_chainlock(TDB_CONTEXT *tdb, TDB_DATA key);
+int tdb_chainunlock(TDB_CONTEXT *tdb, TDB_DATA key);
+
+/* Debug functions. Not used in production. */
+void tdb_dump_all(TDB_CONTEXT *tdb);
+int tdb_printfreelist(TDB_CONTEXT *tdb);
-- 
cgit 


From f2ad98a165cdec6d344a96aeb21a38518a10720a Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Tue, 25 May 2004 16:50:09 +0000
Subject: r888: more ..int32 -> ..int32_t stuff

metze
(This used to be commit f3b1d3bdc74f08ee2a1d22102d57bff94f71f5a5)
---
 source4/scripting/swig/samba.i | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/samba.i b/source4/scripting/swig/samba.i
index edb038bd5b..60f2efcc19 100644
--- a/source4/scripting/swig/samba.i
+++ b/source4/scripting/swig/samba.i
@@ -29,5 +29,5 @@
 		PyErr_SetString(PyExc_TypeError, "integer expected");
 		return NULL;
 	}
-	$1 = (uint32)PyInt_AsLong($input);
+	$1 = (uint32_t)PyInt_AsLong($input);
 }
-- 
cgit 


From fa2e9ec311b99dee2fbff5ee5fa2c743298dacad Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Tue, 1 Jun 2004 08:12:45 +0000
Subject: r960: convert 'unsigned int' to uint_t in the most places

metze
(This used to be commit 18062d2ed9fc9224c43143c10efbf2f6f1f5bbe0)
---
 source4/scripting/swig/tdb.i | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/tdb.i b/source4/scripting/swig/tdb.i
index 9f8961c248..e645dfaf79 100644
--- a/source4/scripting/swig/tdb.i
+++ b/source4/scripting/swig/tdb.i
@@ -77,7 +77,7 @@ typedef int SIG_ATOMIC_T;
 
 /* Treat a mode_t as an unsigned integer */
 
-typedef unsigned int mode_t;
+typedef uint_t mode_t;
 
 /* flags to tdb_store() */
 
-- 
cgit 


From b575ce6b4b09db7b8ea6b25cdee4364df8511b94 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Sat, 4 Sep 2004 22:55:33 +0000
Subject: r2226: A bunch of fixes to get python tdb module building again.  I'm
 not sure how this can be integrated into the build system properly though.
 Editing makefile.pl is the wrong way to do this. (This used to be commit
 e6a42f7880993271f2610584182f7d47538b6747)

---
 source4/scripting/swig/tdb.i | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/tdb.i b/source4/scripting/swig/tdb.i
index e645dfaf79..f4a3f53c4b 100644
--- a/source4/scripting/swig/tdb.i
+++ b/source4/scripting/swig/tdb.i
@@ -40,7 +40,7 @@ typedef int SIG_ATOMIC_T;
 
 /* Include tdb headers */
 
-#include "tdb/tdb.h"
+#include "lib/tdb/include/tdb.h"
 
 %}
 
@@ -100,7 +100,8 @@ TDB_CONTEXT *tdb_open(const char *name, int hash_size, int tdb_flags,
 
 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_log_func log_fn,
+			 tdb_hash_func hash_fn);
 
 int tdb_reopen(TDB_CONTEXT *tdb);
 int tdb_reopen_all(void);
-- 
cgit 


From 5230295b6b927649cb304790f781fdff18fc162d Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Sat, 4 Sep 2004 23:04:31 +0000
Subject: r2227: Get rid of annoying compiler warning. (This used to be commit
 64f961f039545c9948eb7d7652b7494be2443174)

---
 source4/scripting/swig/tdb.i | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/tdb.i b/source4/scripting/swig/tdb.i
index f4a3f53c4b..0c756765de 100644
--- a/source4/scripting/swig/tdb.i
+++ b/source4/scripting/swig/tdb.i
@@ -28,6 +28,13 @@
 
 %{
 
+/* This symbol is used in both includes.h and Python.h which causes an
+   annoying compiler warning. */
+
+#ifdef HAVE_FSTAT
+#undef HAVE_FSTAT
+#endif
+
 /* The tdb_set_lock_alarm() function requires the SIG_ATOMIC_T
    function from includes.h */
 
@@ -44,6 +51,7 @@ typedef int SIG_ATOMIC_T;
 
 %}
 
+
 /* The tdb functions will crash if a NULL tdb is passed */
 
 %include exception.i
-- 
cgit 


From 779b89cfc8e65b8e6a4ad2d868ab04f014a4bc20 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Sun, 5 Sep 2004 02:06:11 +0000
Subject: r2228: Finally commit bits of old workareas together to get dcerpc
 python bindings happening.  This commit lets python call
 dcerpc_pipe_connect() and open the samr pipe. (This used to be commit
 f5852bf3e2064f03aa9b63af4aa1b4f9e39bdb24)

---
 source4/scripting/swig/dcerpc.i | 68 +++++++++++++++++++++++++++++++++++++++++
 source4/scripting/swig/samba.i  |  6 ++++
 source4/scripting/swig/samr.i   | 25 +++++++++++++++
 3 files changed, 99 insertions(+)
 create mode 100644 source4/scripting/swig/dcerpc.i
 create mode 100644 source4/scripting/swig/samr.i

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/dcerpc.i b/source4/scripting/swig/dcerpc.i
new file mode 100644
index 0000000000..9ecc2702bb
--- /dev/null
+++ b/source4/scripting/swig/dcerpc.i
@@ -0,0 +1,68 @@
+/* 
+   Unix SMB/CIFS implementation.
+
+   Swig interface to librpc functions.
+
+   Copyright (C) Tim Potter 2004
+   
+   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.
+*/
+
+%module dcerpc
+
+%{
+
+/* This symbol is used in both includes.h and Python.h which causes an
+   annoying compiler warning. */
+
+#ifdef HAVE_FSTAT
+#undef HAVE_FSTAT
+#endif
+
+#include "includes.h"
+
+#undef strcpy
+
+%}
+
+%include "samba.i"
+
+%init  %{
+/* setup_logging("python", DEBUG_STDOUT);	*/
+	lp_load(dyn_CONFIGFILE, True, False, False);
+	load_interfaces();
+%}
+
+%typemap(in, numinputs=0) struct dcerpc_pipe **OUT (struct dcerpc_pipe *temp) {
+        $1 = &temp;
+}
+
+%typemap(argout) struct dcerpc_pipe ** {
+        PyObject *o = PyTuple_New(2);
+        PyTuple_SetItem(o, 0, resultobj);
+        PyTuple_SetItem(o, 1, SWIG_NewPointerObj(*$1, SWIGTYPE_p_dcerpc_pipe, 0));
+        resultobj = o;
+}
+
+%types(struct dcerpc_pipe *);
+
+NTSTATUS dcerpc_pipe_connect(struct dcerpc_pipe **OUT,
+                             const char *binding,
+                             const char *pipe_uuid,
+                             uint32 pipe_version,
+                             const char *domain,
+                             const char *username,
+                             const char *password);
+%include "samr.i"
diff --git a/source4/scripting/swig/samba.i b/source4/scripting/swig/samba.i
index 60f2efcc19..8e0eb88533 100644
--- a/source4/scripting/swig/samba.i
+++ b/source4/scripting/swig/samba.i
@@ -31,3 +31,9 @@
 	}
 	$1 = (uint32_t)PyInt_AsLong($input);
 }
+
+/* For the moment treat NTSTATUS as an integer */
+
+%typemap(out) NTSTATUS {
+        $result = PyInt_FromLong(NT_STATUS_V($1));
+}
diff --git a/source4/scripting/swig/samr.i b/source4/scripting/swig/samr.i
new file mode 100644
index 0000000000..ceb21db17a
--- /dev/null
+++ b/source4/scripting/swig/samr.i
@@ -0,0 +1,25 @@
+/* 
+   Unix SMB/CIFS implementation.
+
+   Swig interface to librpc functions.
+
+   Copyright (C) Tim Potter 2004
+   
+   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.
+*/
+
+#define DCERPC_SAMR_UUID "12345778-1234-abcd-ef00-0123456789ac"
+const int DCERPC_SAMR_VERSION = 1.0;
+#define DCERPC_SAMR_NAME "samr"
-- 
cgit 


From 86bf5cefa9798378ffb881a9a668c852fe56b2e2 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Sun, 5 Sep 2004 02:39:47 +0000
Subject: r2229: Have dcerpc_pipe_connect() throw an exception if non-zero
 NTSTATUS is returned from the C function.  This way we can return the struct
 dcerpc_pipe object instead of a tuple of (NTSTATUS, dcerpc_pipe) which is a
 bad interface. (This used to be commit
 a3a85bd419e38f0dce138e67174517e23a361010)

---
 source4/scripting/swig/dcerpc.i | 26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/dcerpc.i b/source4/scripting/swig/dcerpc.i
index 9ecc2702bb..6130f85a60 100644
--- a/source4/scripting/swig/dcerpc.i
+++ b/source4/scripting/swig/dcerpc.i
@@ -35,6 +35,21 @@
 
 #undef strcpy
 
+PyObject *ntstatus_exception;
+
+/* Set up return of a dcerpc.NTSTATUS exception */
+
+void set_ntstatus_exception(int status)
+{
+	PyObject *obj = PyTuple_New(2);
+
+	PyTuple_SetItem(obj, 0, PyInt_FromLong(status));
+	PyTuple_SetItem(obj, 1, 
+		PyString_FromString(nt_errstr(NT_STATUS(status))));
+
+	PyErr_SetObject(ntstatus_exception, obj);
+}
+
 %}
 
 %include "samba.i"
@@ -43,6 +58,7 @@
 /* setup_logging("python", DEBUG_STDOUT);	*/
 	lp_load(dyn_CONFIGFILE, True, False, False);
 	load_interfaces();
+	ntstatus_exception = PyErr_NewException("dcerpc.NTSTATUS", NULL, NULL);
 %}
 
 %typemap(in, numinputs=0) struct dcerpc_pipe **OUT (struct dcerpc_pipe *temp) {
@@ -50,10 +66,12 @@
 }
 
 %typemap(argout) struct dcerpc_pipe ** {
-        PyObject *o = PyTuple_New(2);
-        PyTuple_SetItem(o, 0, resultobj);
-        PyTuple_SetItem(o, 1, SWIG_NewPointerObj(*$1, SWIGTYPE_p_dcerpc_pipe, 0));
-        resultobj = o;
+	long status = PyLong_AsLong(resultobj);
+	if (status != 0) {
+		set_ntstatus_exception(status);
+		return NULL;
+	}
+        resultobj = SWIG_NewPointerObj(*$1, SWIGTYPE_p_dcerpc_pipe, 0);
 }
 
 %types(struct dcerpc_pipe *);
-- 
cgit 


From 65b5a2297c766f5dcaf087800993554729aa6c69 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Sun, 5 Sep 2004 04:05:45 +0000
Subject: r2230: Wrapper for dcerpc_samr_Connect2().  All this glue code should
 be automatically generated but at the moment it's hand coded. (This used to
 be commit e1a368050d3abb6a6ca6529315dc4228e8590c7f)

---
 source4/scripting/swig/dcerpc.i | 28 ++++++++++++++++++++++++++--
 source4/scripting/swig/samr.i   | 13 +++++++++++++
 2 files changed, 39 insertions(+), 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/dcerpc.i b/source4/scripting/swig/dcerpc.i
index 6130f85a60..c843ec3c36 100644
--- a/source4/scripting/swig/dcerpc.i
+++ b/source4/scripting/swig/dcerpc.i
@@ -50,6 +50,26 @@ void set_ntstatus_exception(int status)
 	PyErr_SetObject(ntstatus_exception, obj);
 }
 
+char *get_string_property(PyObject *dict, char *key)
+{
+	PyObject *item = PyDict_GetItem(dict, PyString_FromString(key));
+
+	if (!item)
+		return 0; /* TODO: throw exception */
+
+	return PyString_AsString(item);
+}
+
+uint32 get_uint32_property(PyObject *dict, char *key)
+{
+	PyObject *item = PyDict_GetItem(dict, PyString_FromString(key));
+
+	if (!item)
+		return 0; /* TODO: throw exception */
+
+	return (uint32)PyInt_AsLong(item);
+}
+
 %}
 
 %include "samba.i"
@@ -61,8 +81,12 @@ void set_ntstatus_exception(int status)
 	ntstatus_exception = PyErr_NewException("dcerpc.NTSTATUS", NULL, NULL);
 %}
 
-%typemap(in, numinputs=0) struct dcerpc_pipe **OUT (struct dcerpc_pipe *temp) {
-        $1 = &temp;
+%typemap(in, numinputs=0) struct dcerpc_pipe **OUT (struct dcerpc_pipe *temp_dcerpc_pipe) {
+        $1 = &temp_dcerpc_pipe;
+}
+
+%typemap(in, numinputs=0) TALLOC_CTX * {
+	$1 = talloc_init("foo");
 }
 
 %typemap(argout) struct dcerpc_pipe ** {
diff --git a/source4/scripting/swig/samr.i b/source4/scripting/swig/samr.i
index ceb21db17a..030f5defc2 100644
--- a/source4/scripting/swig/samr.i
+++ b/source4/scripting/swig/samr.i
@@ -23,3 +23,16 @@
 #define DCERPC_SAMR_UUID "12345778-1234-abcd-ef00-0123456789ac"
 const int DCERPC_SAMR_VERSION = 1.0;
 #define DCERPC_SAMR_NAME "samr"
+
+%typemap(in) struct samr_Connect2 * (struct samr_Connect2 temp) {
+	if (!PyDict_Check($input)) {
+		PyErr_SetString(PyExc_TypeError, "dict arg expected");
+		return NULL;
+	}
+	temp.in.system_name = get_string_property($input, "system_name");
+	temp.in.access_mask = get_uint32_property($input, "access_mask");
+	$1 = &temp;
+}
+
+%rename(samr_Connect2) dcerpc_samr_Connect2;
+NTSTATUS dcerpc_samr_Connect2(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct samr_Connect2 *r);
-- 
cgit 


From 0a3a76fe969fc56a033af1745374b90fd4aff6c7 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Mon, 6 Sep 2004 11:01:10 +0000
Subject: r2235: When creating exception data, use Py_BuildValue instead of
 doing it all by hand.

Use $symname to name TALLOC_CTX's created in wrapper function.  Also,
make sure to free context afterwards.

Set the DCERPC_NDR_REF_ALLOC flag in the dcerpc_pipe struct to save
use lots of initialisation.
(This used to be commit 5fead63618b5ee76cadc4719d933ea9cee7538b5)
---
 source4/scripting/swig/dcerpc.i | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/dcerpc.i b/source4/scripting/swig/dcerpc.i
index c843ec3c36..afa968a640 100644
--- a/source4/scripting/swig/dcerpc.i
+++ b/source4/scripting/swig/dcerpc.i
@@ -41,11 +41,8 @@ PyObject *ntstatus_exception;
 
 void set_ntstatus_exception(int status)
 {
-	PyObject *obj = PyTuple_New(2);
-
-	PyTuple_SetItem(obj, 0, PyInt_FromLong(status));
-	PyTuple_SetItem(obj, 1, 
-		PyString_FromString(nt_errstr(NT_STATUS(status))));
+	PyObject *obj = Py_BuildValue("(i,s)", status, 
+				nt_errstr(NT_STATUS(status)));
 
 	PyErr_SetObject(ntstatus_exception, obj);
 }
@@ -86,15 +83,30 @@ uint32 get_uint32_property(PyObject *dict, char *key)
 }
 
 %typemap(in, numinputs=0) TALLOC_CTX * {
-	$1 = talloc_init("foo");
+	$1 = talloc_init("$symname");
+}
+
+%typemap(freearg) TALLOC_CTX * {
+	talloc_free($1);
 }
 
 %typemap(argout) struct dcerpc_pipe ** {
 	long status = PyLong_AsLong(resultobj);
+
+	/* Throw exception if result was not OK */
+
 	if (status != 0) {
 		set_ntstatus_exception(status);
 		return NULL;
 	}
+
+	/* Set REF_ALLOC flag so we don't have to do too much extra
+	   mucking around with ref variables in ndr unmarshalling. */
+
+	(*$1)->flags |= DCERPC_NDR_REF_ALLOC;
+
+	/* Return swig handle on dcerpc_pipe */
+
         resultobj = SWIG_NewPointerObj(*$1, SWIGTYPE_p_dcerpc_pipe, 0);
 }
 
-- 
cgit 


From 68aad436e61fa0a429ee1aaf51f43e091f195fe5 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Mon, 6 Sep 2004 11:09:27 +0000
Subject: r2236: Zero request structure to let the REF_ALLOC flag work its
 magic.

Add argout typemap which throws an exception if NTSTATUS != OK and
creates a dictionary of return values.

samr_Connect2 function now works!
(This used to be commit fdfabbd4a597b0d9b44832fdbfc200f857728c2b)
---
 source4/scripting/swig/samr.i | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/samr.i b/source4/scripting/swig/samr.i
index 030f5defc2..89144a29d0 100644
--- a/source4/scripting/swig/samr.i
+++ b/source4/scripting/swig/samr.i
@@ -29,10 +29,31 @@ const int DCERPC_SAMR_VERSION = 1.0;
 		PyErr_SetString(PyExc_TypeError, "dict arg expected");
 		return NULL;
 	}
+	memset(&temp, 0, sizeof(temp));
 	temp.in.system_name = get_string_property($input, "system_name");
 	temp.in.access_mask = get_uint32_property($input, "access_mask");
 	$1 = &temp;
 }
 
+%typemap(argout) struct samr_Connect2 * {
+	long status = PyLong_AsLong(resultobj);
+	PyObject *dict;
+
+	/* Throw exception if result was not OK */
+
+	if (status != 0) {
+		set_ntstatus_exception(status);
+		return NULL;
+	}
+
+	dict = PyDict_New();
+
+	PyDict_SetItem(dict, PyString_FromString("handle"),
+		PyString_FromStringAndSize($1->out.handle, 
+					   sizeof(*($1->out.handle))));
+
+	resultobj = dict;
+}
+
 %rename(samr_Connect2) dcerpc_samr_Connect2;
 NTSTATUS dcerpc_samr_Connect2(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct samr_Connect2 *r);
-- 
cgit 


From 915f2e539d4b2f5f4eb87a1f64f50f3d9a17743a Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Tue, 7 Sep 2004 23:12:29 +0000
Subject: r2243: Include definition for PRINTF_ATTRIBUTE in Python tdb wrapper.
 (This used to be commit 301bb069c31ee7ce09bdd6cd2dd4b7fa0441e1a1)

---
 source4/scripting/swig/tdb.i | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/tdb.i b/source4/scripting/swig/tdb.i
index 0c756765de..404f498c26 100644
--- a/source4/scripting/swig/tdb.i
+++ b/source4/scripting/swig/tdb.i
@@ -45,6 +45,16 @@ typedef sig_atomic_t SIG_ATOMIC_T;
 typedef int SIG_ATOMIC_T;
 #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"
-- 
cgit 


From 3f7bf05f75c050c5132168b7eea6a346abfb482c Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Wed, 8 Sep 2004 11:54:01 +0000
Subject: r2253: Add test program, as small example of what's going on. (This
 used to be commit fd31ae38dfe2d005b3e01ac059c2e15fa389aad4)

---
 source4/scripting/swig/dcerpc.i |  2 ++
 source4/scripting/swig/test     | 13 +++++++++++++
 2 files changed, 15 insertions(+)
 create mode 100755 source4/scripting/swig/test

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/dcerpc.i b/source4/scripting/swig/dcerpc.i
index afa968a640..6769b4efc1 100644
--- a/source4/scripting/swig/dcerpc.i
+++ b/source4/scripting/swig/dcerpc.i
@@ -112,6 +112,8 @@ uint32 get_uint32_property(PyObject *dict, char *key)
 
 %types(struct dcerpc_pipe *);
 
+%rename(pipe_connect) dcerpc_pipe_connect;
+
 NTSTATUS dcerpc_pipe_connect(struct dcerpc_pipe **OUT,
                              const char *binding,
                              const char *pipe_uuid,
diff --git a/source4/scripting/swig/test b/source4/scripting/swig/test
new file mode 100755
index 0000000000..479f447860
--- /dev/null
+++ b/source4/scripting/swig/test
@@ -0,0 +1,13 @@
+#!/usr/bin/python
+
+import dcerpc
+import gc
+gc.set_debug(gc.DEBUG_LEAK)
+
+handle = dcerpc.pipe_connect("ncacn_np:win2k3dc",
+	dcerpc.DCERPC_SAMR_UUID, dcerpc.DCERPC_SAMR_VERSION,
+	"win2k3dom", "administrator", "penguin")
+
+connect = {"system_name": "win2k3dc", "access_mask": 12345}
+
+print dcerpc.samr_Connect2(handle, connect)
-- 
cgit 


From ec952cde0501b15c5e14a3c06333f97dc77dc1f0 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Wed, 8 Sep 2004 12:56:57 +0000
Subject: r2256: Include autogenerated interfaces for lsa and samr pipes. 
 Typemaps are currently not working though. (This used to be commit
 55bd2dc02de13ee3da1cde20694f452df0899a9f)

---
 source4/scripting/swig/dcerpc.i | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/dcerpc.i b/source4/scripting/swig/dcerpc.i
index 6769b4efc1..5ace564359 100644
--- a/source4/scripting/swig/dcerpc.i
+++ b/source4/scripting/swig/dcerpc.i
@@ -121,4 +121,6 @@ NTSTATUS dcerpc_pipe_connect(struct dcerpc_pipe **OUT,
                              const char *domain,
                              const char *username,
                              const char *password);
-%include "samr.i"
+
+%include "librpc/gen_ndr/samr.i"
+%include "librpc/gen_ndr/lsa.i"
-- 
cgit 


From 91222c6029274623d8f595dbedfa06e5fa7830a8 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Fri, 10 Sep 2004 12:16:42 +0000
Subject: r2276: Remove garbage collection debugs. (This used to be commit
 b7ebafbbe0ada17748ad4bb36da4c0d63a2b10f5)

---
 source4/scripting/swig/test | 2 --
 1 file changed, 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/test b/source4/scripting/swig/test
index 479f447860..c3c5c3a82b 100755
--- a/source4/scripting/swig/test
+++ b/source4/scripting/swig/test
@@ -1,8 +1,6 @@
 #!/usr/bin/python
 
 import dcerpc
-import gc
-gc.set_debug(gc.DEBUG_LEAK)
 
 handle = dcerpc.pipe_connect("ncacn_np:win2k3dc",
 	dcerpc.DCERPC_SAMR_UUID, dcerpc.DCERPC_SAMR_VERSION,
-- 
cgit 


From 56d7b0dc8af0339ba08458ecc64c91928fdf53a7 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Fri, 10 Sep 2004 12:20:25 +0000
Subject: r2278: Add some more helper functions. (This used to be commit
 5a64449599beb7b46484f1c3aef10f7e7b878319)

---
 source4/scripting/swig/dcerpc.i | 50 ++++++++++++++++++++++++++++++++---------
 1 file changed, 40 insertions(+), 10 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/dcerpc.i b/source4/scripting/swig/dcerpc.i
index 5ace564359..10dc4721e6 100644
--- a/source4/scripting/swig/dcerpc.i
+++ b/source4/scripting/swig/dcerpc.i
@@ -47,24 +47,54 @@ void set_ntstatus_exception(int status)
 	PyErr_SetObject(ntstatus_exception, obj);
 }
 
-char *get_string_property(PyObject *dict, char *key)
+uint8 uint8_from_python(PyObject *obj)
 {
-	PyObject *item = PyDict_GetItem(dict, PyString_FromString(key));
+	return (uint8)PyInt_AsLong(obj);
+}
+
+uint16 uint16_from_python(PyObject *obj)
+{
+	return (uint16)PyInt_AsLong(obj);
+}
+
+uint32 uint32_from_python(PyObject *obj)
+{
+	return (uint32)PyInt_AsLong(obj);
+}
+
+int64 int64_from_python(PyObject *obj)
+{
+	return (int64)PyLong_AsLong(obj);
+}
 
-	if (!item)
-		return 0; /* TODO: throw exception */
+uint64 uint64_from_python(PyObject *obj)
+{
+	return (uint64)PyLong_AsLong(obj);
+}
+
+NTTIME NTTIME_from_python(PyObject *obj)
+{
+	return (NTTIME)PyLong_AsLong(obj);
+}
 
-	return PyString_AsString(item);
+HYPER_T HYPER_T_from_python(PyObject *obj)
+{
+	return (HYPER_T)PyLong_AsLong(obj);
 }
 
-uint32 get_uint32_property(PyObject *dict, char *key)
+struct policy_handle *policy_handle_from_python(PyObject *obj)
 {
-	PyObject *item = PyDict_GetItem(dict, PyString_FromString(key));
+	return (struct policy_handle *)PyString_AsString(obj);
+}
 
-	if (!item)
-		return 0; /* TODO: throw exception */
+struct security_descriptor *security_descriptor_from_python(PyObject *obj)
+{
+	return NULL;
+}
 
-	return (uint32)PyInt_AsLong(item);
+char *string_from_python(PyObject *obj)
+{
+	return NULL;
 }
 
 %}
-- 
cgit 


From b5119cd6629e1fd5d52161253c16d3bf79d13df8 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Sun, 12 Sep 2004 10:13:24 +0000
Subject: r2295: Convert simple scalar types and policy handles between dcerpc
 function call request and response structures. (This used to be commit
 d31d23b944b7e4ef300d75dad5038727e9133af1)

---
 source4/scripting/swig/dcerpc.i | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/dcerpc.i b/source4/scripting/swig/dcerpc.i
index 10dc4721e6..fb4870d819 100644
--- a/source4/scripting/swig/dcerpc.i
+++ b/source4/scripting/swig/dcerpc.i
@@ -52,41 +52,81 @@ uint8 uint8_from_python(PyObject *obj)
 	return (uint8)PyInt_AsLong(obj);
 }
 
+PyObject *uint8_to_python(uint8 obj)
+{
+	return PyInt_FromLong(obj);
+}
+
 uint16 uint16_from_python(PyObject *obj)
 {
 	return (uint16)PyInt_AsLong(obj);
 }
 
+PyObject *uint16_to_python(uint16 obj)
+{
+	return PyInt_FromLong(obj);
+}
+
 uint32 uint32_from_python(PyObject *obj)
 {
 	return (uint32)PyInt_AsLong(obj);
 }
 
+PyObject *uint32_to_python(uint32 obj)
+{
+	return PyInt_FromLong(obj);
+}
+
 int64 int64_from_python(PyObject *obj)
 {
 	return (int64)PyLong_AsLong(obj);
 }
 
+PyObject *int64_to_python(int64 obj)
+{
+	return PyLong_FromLong(obj);
+}
+
 uint64 uint64_from_python(PyObject *obj)
 {
 	return (uint64)PyLong_AsLong(obj);
 }
 
+PyObject *uint64_to_python(uint64 obj)
+{
+	return PyLong_FromLong(obj);
+}
+
 NTTIME NTTIME_from_python(PyObject *obj)
 {
 	return (NTTIME)PyLong_AsLong(obj);
 }
 
+PyObject *NTTIME_to_python(NTTIME obj)
+{
+	return PyLong_FromLong(obj);
+}
+
 HYPER_T HYPER_T_from_python(PyObject *obj)
 {
 	return (HYPER_T)PyLong_AsLong(obj);
 }
 
+PyObject *HYPER_T_to_python(HYPER_T obj)
+{
+	return PyLong_FromLong(obj);
+}
+
 struct policy_handle *policy_handle_from_python(PyObject *obj)
 {
 	return (struct policy_handle *)PyString_AsString(obj);
 }
 
+PyObject *policy_handle_to_python(struct policy_handle *handle)
+{
+	return PyString_FromStringAndSize((char *)handle, sizeof(*handle));
+}
+
 struct security_descriptor *security_descriptor_from_python(PyObject *obj)
 {
 	return NULL;
-- 
cgit 


From 4c017a95294b6745ea90692168066dad256995c7 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Sun, 12 Sep 2004 10:49:41 +0000
Subject: r2296: Correct setting of access_mask in test program. (This used to
 be commit e4a5840ff84553c67c87e002e9e074095f4d18c5)

---
 source4/scripting/swig/test | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/test b/source4/scripting/swig/test
index c3c5c3a82b..f90cef747f 100755
--- a/source4/scripting/swig/test
+++ b/source4/scripting/swig/test
@@ -6,6 +6,6 @@ handle = dcerpc.pipe_connect("ncacn_np:win2k3dc",
 	dcerpc.DCERPC_SAMR_UUID, dcerpc.DCERPC_SAMR_VERSION,
 	"win2k3dom", "administrator", "penguin")
 
-connect = {"system_name": "win2k3dc", "access_mask": 12345}
+connect = {"system_name": "win2k3dc", "access_mask": 0x02000000}
 
 print dcerpc.samr_Connect2(handle, connect)
-- 
cgit 


From 23492b303309327bc84788432f2a2cd4e99ef093 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Sun, 12 Sep 2004 10:50:23 +0000
Subject: r2297: Add string conversion functions. (This used to be commit
 cbfb177394aaf2a382b481ffb3152ad3fe81de5a)

---
 source4/scripting/swig/dcerpc.i | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/dcerpc.i b/source4/scripting/swig/dcerpc.i
index fb4870d819..10c20d201f 100644
--- a/source4/scripting/swig/dcerpc.i
+++ b/source4/scripting/swig/dcerpc.i
@@ -134,7 +134,12 @@ struct security_descriptor *security_descriptor_from_python(PyObject *obj)
 
 char *string_from_python(PyObject *obj)
 {
-	return NULL;
+	return PyString_AsString(obj);
+}
+
+PyObject *string_to_python(char *obj)
+{
+	return PyString_FromString(obj);
 }
 
 %}
-- 
cgit 


From a34ddd04ca89c4bff68dbfb873dcc1dfdbc096ef Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Sun, 12 Sep 2004 11:45:37 +0000
Subject: r2299: Map a (C) NULL pointer to (Python) None and vice versa. (This
 used to be commit 05cff58070b7070157aea47c5da8512145c2774a)

---
 source4/scripting/swig/dcerpc.i | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/dcerpc.i b/source4/scripting/swig/dcerpc.i
index 10c20d201f..9d5e9f295d 100644
--- a/source4/scripting/swig/dcerpc.i
+++ b/source4/scripting/swig/dcerpc.i
@@ -134,11 +134,17 @@ struct security_descriptor *security_descriptor_from_python(PyObject *obj)
 
 char *string_from_python(PyObject *obj)
 {
+	if (obj == Py_None)
+		return NULL;
+
 	return PyString_AsString(obj);
 }
 
 PyObject *string_to_python(char *obj)
 {
+	if (obj == NULL)
+		return Py_None;
+
 	return PyString_FromString(obj);
 }
 
-- 
cgit 


From 984e71e5e51bb7b7abc390f95691affa2d9c0f33 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Sun, 12 Sep 2004 11:47:24 +0000
Subject: r2300: Start writing a Python torture test suite based on the
 smbtorture rpc tests. (This used to be commit
 73e087f11e401ef8da7c53148444b2745a94dbaf)

---
 source4/scripting/swig/test            | 11 -------
 source4/scripting/swig/torture/samr.py | 52 ++++++++++++++++++++++++++++++++++
 2 files changed, 52 insertions(+), 11 deletions(-)
 delete mode 100755 source4/scripting/swig/test
 create mode 100755 source4/scripting/swig/torture/samr.py

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/test b/source4/scripting/swig/test
deleted file mode 100755
index f90cef747f..0000000000
--- a/source4/scripting/swig/test
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/python
-
-import dcerpc
-
-handle = dcerpc.pipe_connect("ncacn_np:win2k3dc",
-	dcerpc.DCERPC_SAMR_UUID, dcerpc.DCERPC_SAMR_VERSION,
-	"win2k3dom", "administrator", "penguin")
-
-connect = {"system_name": "win2k3dc", "access_mask": 0x02000000}
-
-print dcerpc.samr_Connect2(handle, connect)
diff --git a/source4/scripting/swig/torture/samr.py b/source4/scripting/swig/torture/samr.py
new file mode 100755
index 0000000000..d7edbbcef5
--- /dev/null
+++ b/source4/scripting/swig/torture/samr.py
@@ -0,0 +1,52 @@
+#!/usr/bin/python
+
+import dcerpc
+
+def test_Connect(handle):
+
+    print 'testing samr_Connect'
+
+    r = {}
+    r['system_name'] = '\0\0'
+    r['access_mask'] = 0x02000000
+
+    result = dcerpc.samr_Connect(pipe, r)
+
+    dcerpc.samr_Close(pipe, result)
+
+    print 'testing samr_Connect2'
+
+    r = {}
+    r['system_name'] = None
+    r['access_mask'] = 0x02000000
+
+    result = dcerpc.samr_Connect2(pipe, r)
+    dcerpc.samr_Close(pipe, result)
+    
+    print 'testing samr_Connect3'
+
+    r = {}
+    r['system_name'] = None
+    r['unknown'] = 0
+    r['access_mask'] = 0x02000000
+
+    result = dcerpc.samr_Connect3(pipe, r)
+    dcerpc.samr_Close(pipe, result)
+
+    print 'testing samr_Connect4'
+
+    r = {}
+    r['system_name'] = None
+    r['unknown'] = 0
+    r['access_mask'] = 0x02000000
+
+    result = dcerpc.samr_Connect4(pipe, r)
+    dcerpc.samr_Close(pipe, result)
+    
+# Connect to server
+
+pipe = dcerpc.pipe_connect('ncacn_np:win2k3dc',
+	dcerpc.DCERPC_SAMR_UUID, dcerpc.DCERPC_SAMR_VERSION,
+	'win2k3dom', 'administrator', 'penguin')
+
+test_Connect(pipe)
-- 
cgit 


From 12b29d8bb7e0b984dc51644763cd544dbe350172 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Mon, 13 Sep 2004 12:42:25 +0000
Subject: r2324: Add hand-written versions of functions from misc.idl. (This
 used to be commit d6876701cc027ec2b14923e3483e0432e7011138)

---
 source4/scripting/swig/dcerpc.i | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/dcerpc.i b/source4/scripting/swig/dcerpc.i
index 9d5e9f295d..6ad8f8b631 100644
--- a/source4/scripting/swig/dcerpc.i
+++ b/source4/scripting/swig/dcerpc.i
@@ -127,11 +127,26 @@ PyObject *policy_handle_to_python(struct policy_handle *handle)
 	return PyString_FromStringAndSize((char *)handle, sizeof(*handle));
 }
 
-struct security_descriptor *security_descriptor_from_python(PyObject *obj)
+struct security_descriptor *security_descriptor_from_python(TALLOC_CTX *mem_ctx, PyObject *obj)
 {
 	return NULL;
 }
 
+PyObject *security_descriptor_to_python(struct security_descriptor *obj)
+{
+	return Py_None;
+}
+
+struct dom_sid2 *dom_sid2_from_python(TALLOC_CTX *mem_ctx, PyObject *obj)
+{
+	return NULL;
+}
+
+PyObject *dom_sid2_to_python(struct dom_sid2 *obj)
+{
+	return Py_None;
+}
+
 char *string_from_python(PyObject *obj)
 {
 	if (obj == Py_None)
@@ -148,6 +163,16 @@ PyObject *string_to_python(char *obj)
 	return PyString_FromString(obj);
 }
 
+struct samr_Password *samr_Password_from_python(TALLOC_CTX *mem_ctx, PyObject *obj)
+{
+	return NULL;
+}
+
+PyObject *samr_Password_to_python(struct samr_Password *obj)
+{
+	return NULL;
+}
+
 %}
 
 %include "samba.i"
-- 
cgit 


From 31288d654552736ee96a0c7edbbc0b0cdcf1a3f5 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Tue, 14 Sep 2004 12:19:59 +0000
Subject: r2336: Add another conversion function to allow union arms that
 contain structures not pointers to structures.  Do some renaming of
 hand-written functions as a result.

Include lsa interface before samr interface as samr depends on some lsa
structures.

Build up a nice hashed index of interfaces, functions, structs and
unions.

Add test for samr_Connect5() function which contains a union.
(This used to be commit 30f068164a5125f84a34f28ed0f2586a2bdec7e4)
---
 source4/scripting/swig/dcerpc.i        |  8 ++++----
 source4/scripting/swig/torture/samr.py | 13 +++++++++++++
 2 files changed, 17 insertions(+), 4 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/dcerpc.i b/source4/scripting/swig/dcerpc.i
index 6ad8f8b631..7679b773f4 100644
--- a/source4/scripting/swig/dcerpc.i
+++ b/source4/scripting/swig/dcerpc.i
@@ -127,7 +127,7 @@ PyObject *policy_handle_to_python(struct policy_handle *handle)
 	return PyString_FromStringAndSize((char *)handle, sizeof(*handle));
 }
 
-struct security_descriptor *security_descriptor_from_python(TALLOC_CTX *mem_ctx, PyObject *obj)
+struct security_descriptor *security_descriptor_ptr_from_python(TALLOC_CTX *mem_ctx, PyObject *obj)
 {
 	return NULL;
 }
@@ -137,7 +137,7 @@ PyObject *security_descriptor_to_python(struct security_descriptor *obj)
 	return Py_None;
 }
 
-struct dom_sid2 *dom_sid2_from_python(TALLOC_CTX *mem_ctx, PyObject *obj)
+struct dom_sid2 *dom_sid2_ptr_from_python(TALLOC_CTX *mem_ctx, PyObject *obj)
 {
 	return NULL;
 }
@@ -163,7 +163,7 @@ PyObject *string_to_python(char *obj)
 	return PyString_FromString(obj);
 }
 
-struct samr_Password *samr_Password_from_python(TALLOC_CTX *mem_ctx, PyObject *obj)
+struct samr_Password *samr_Password_ptr_from_python(TALLOC_CTX *mem_ctx, PyObject *obj)
 {
 	return NULL;
 }
@@ -228,5 +228,5 @@ NTSTATUS dcerpc_pipe_connect(struct dcerpc_pipe **OUT,
                              const char *username,
                              const char *password);
 
-%include "librpc/gen_ndr/samr.i"
 %include "librpc/gen_ndr/lsa.i"
+%include "librpc/gen_ndr/samr.i"
diff --git a/source4/scripting/swig/torture/samr.py b/source4/scripting/swig/torture/samr.py
index d7edbbcef5..ca9c7e9597 100755
--- a/source4/scripting/swig/torture/samr.py
+++ b/source4/scripting/swig/torture/samr.py
@@ -42,6 +42,19 @@ def test_Connect(handle):
 
     result = dcerpc.samr_Connect4(pipe, r)
     dcerpc.samr_Close(pipe, result)
+
+    print 'testing samr_Connect5'
+
+    r = {}
+    r['system_name'] = None
+    r['access_mask'] = 0x02000000
+    r['level'] = 1
+    r['info'] = {}
+    r['info']['info1'] = {}
+    r['info']['info1']['unknown1'] = 0
+    r['info']['info1']['unknown2'] = 0
+
+    result = dcerpc.samr_Connect5(pipe, r)
     
 # Connect to server
 
-- 
cgit 


From d97f808cb695886f1fefc6c58b2b955fc78302b9 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Wed, 15 Sep 2004 04:36:13 +0000
Subject: r2339: my first python commit!

added command line options for binding string, domain, username and password
(This used to be commit e94bec1079f266fdb869642eab24f542a81f8e5a)
---
 source4/scripting/swig/torture/samr.py | 30 +++++++++++++++++++++++++++---
 1 file changed, 27 insertions(+), 3 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/torture/samr.py b/source4/scripting/swig/torture/samr.py
index ca9c7e9597..91b612dd72 100755
--- a/source4/scripting/swig/torture/samr.py
+++ b/source4/scripting/swig/torture/samr.py
@@ -1,6 +1,7 @@
 #!/usr/bin/python
 
 import dcerpc
+from optparse import OptionParser
 
 def test_Connect(handle):
 
@@ -55,11 +56,34 @@ def test_Connect(handle):
     r['info']['info1']['unknown2'] = 0
 
     result = dcerpc.samr_Connect5(pipe, r)
-    
+
+    print result    
+
+# parse command line
+parser = OptionParser()
+parser.add_option("-b", "--binding", action="store", type="string", dest="binding")
+parser.add_option("-d", "--domain", action="store", type="string", dest="domain")
+parser.add_option("-u", "--username", action="store", type="string", dest="username")
+parser.add_option("-p", "--password", action="store", type="string", dest="password")
+
+(options, args) = parser.parse_args()
+
+if not options.binding:
+   parser.error('You must supply a binding string')
+
+if not options.username or not options.password or not options.domain:
+   parser.error('You must supply a domain, username and password')
+
+
+binding=options.binding
+domain=options.domain
+username=options.username
+password=options.password
+
 # Connect to server
 
-pipe = dcerpc.pipe_connect('ncacn_np:win2k3dc',
+pipe = dcerpc.pipe_connect(binding,
 	dcerpc.DCERPC_SAMR_UUID, dcerpc.DCERPC_SAMR_VERSION,
-	'win2k3dom', 'administrator', 'penguin')
+	domain, username, password)
 
 test_Connect(pipe)
-- 
cgit 


From 8d14c2a39fea4e5763728cc45d9339b92893dbba Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Wed, 15 Sep 2004 12:12:48 +0000
Subject: r2342: Remove obsolete file. (This used to be commit
 b7ef3d0a006ab8c07354ca83fcaf6018c3b595af)

---
 source4/scripting/swig/samr.i | 59 -------------------------------------------
 1 file changed, 59 deletions(-)
 delete mode 100644 source4/scripting/swig/samr.i

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/samr.i b/source4/scripting/swig/samr.i
deleted file mode 100644
index 89144a29d0..0000000000
--- a/source4/scripting/swig/samr.i
+++ /dev/null
@@ -1,59 +0,0 @@
-/* 
-   Unix SMB/CIFS implementation.
-
-   Swig interface to librpc functions.
-
-   Copyright (C) Tim Potter 2004
-   
-   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.
-*/
-
-#define DCERPC_SAMR_UUID "12345778-1234-abcd-ef00-0123456789ac"
-const int DCERPC_SAMR_VERSION = 1.0;
-#define DCERPC_SAMR_NAME "samr"
-
-%typemap(in) struct samr_Connect2 * (struct samr_Connect2 temp) {
-	if (!PyDict_Check($input)) {
-		PyErr_SetString(PyExc_TypeError, "dict arg expected");
-		return NULL;
-	}
-	memset(&temp, 0, sizeof(temp));
-	temp.in.system_name = get_string_property($input, "system_name");
-	temp.in.access_mask = get_uint32_property($input, "access_mask");
-	$1 = &temp;
-}
-
-%typemap(argout) struct samr_Connect2 * {
-	long status = PyLong_AsLong(resultobj);
-	PyObject *dict;
-
-	/* Throw exception if result was not OK */
-
-	if (status != 0) {
-		set_ntstatus_exception(status);
-		return NULL;
-	}
-
-	dict = PyDict_New();
-
-	PyDict_SetItem(dict, PyString_FromString("handle"),
-		PyString_FromStringAndSize($1->out.handle, 
-					   sizeof(*($1->out.handle))));
-
-	resultobj = dict;
-}
-
-%rename(samr_Connect2) dcerpc_samr_Connect2;
-NTSTATUS dcerpc_samr_Connect2(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct samr_Connect2 *r);
-- 
cgit 


From 2cfd0b654c693ef90b54cf309f816ed62c94b545 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Wed, 15 Sep 2004 12:24:53 +0000
Subject: r2344: Return PyDict_New() in stub functions instead of Py_None to
 avoid crashing in garbage collector (hmm - all that was required was probably
 a Py_INCREF(Py_None) though). (This used to be commit
 a3eac318a624d214084741839faa2ad485902f6f)

---
 source4/scripting/swig/dcerpc.i | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/dcerpc.i b/source4/scripting/swig/dcerpc.i
index 7679b773f4..75b078ad16 100644
--- a/source4/scripting/swig/dcerpc.i
+++ b/source4/scripting/swig/dcerpc.i
@@ -134,7 +134,7 @@ struct security_descriptor *security_descriptor_ptr_from_python(TALLOC_CTX *mem_
 
 PyObject *security_descriptor_to_python(struct security_descriptor *obj)
 {
-	return Py_None;
+	return PyDict_New();
 }
 
 struct dom_sid2 *dom_sid2_ptr_from_python(TALLOC_CTX *mem_ctx, PyObject *obj)
@@ -144,7 +144,7 @@ struct dom_sid2 *dom_sid2_ptr_from_python(TALLOC_CTX *mem_ctx, PyObject *obj)
 
 PyObject *dom_sid2_to_python(struct dom_sid2 *obj)
 {
-	return Py_None;
+	return PyDict_New();
 }
 
 char *string_from_python(PyObject *obj)
-- 
cgit 


From 3791d88b87c490c5093c964ec71989ee62b1faa4 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Wed, 15 Sep 2004 12:25:51 +0000
Subject: r2345: Add test for samr_QuerySecurity() (This used to be commit
 f6978a007a79c97910856b3c639844495f16ebab)

---
 source4/scripting/swig/torture/samr.py | 47 +++++++++++++++++++++++++---------
 1 file changed, 35 insertions(+), 12 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/torture/samr.py b/source4/scripting/swig/torture/samr.py
index 91b612dd72..e7ee4e8796 100755
--- a/source4/scripting/swig/torture/samr.py
+++ b/source4/scripting/swig/torture/samr.py
@@ -57,14 +57,34 @@ def test_Connect(handle):
 
     result = dcerpc.samr_Connect5(pipe, r)
 
-    print result    
+    return result['handle']
+    
+def test_QuerySecurity(pipe, handle):
+
+    print 'testing samr_QuerySecurity'
+
+    r = {}
+    r['handle'] = handle
+    r['sec_info'] = 7
+
+    result = dcerpc.samr_QuerySecurity(pipe, r)
+    print result
+
+# Parse command line
 
-# parse command line
 parser = OptionParser()
-parser.add_option("-b", "--binding", action="store", type="string", dest="binding")
-parser.add_option("-d", "--domain", action="store", type="string", dest="domain")
-parser.add_option("-u", "--username", action="store", type="string", dest="username")
-parser.add_option("-p", "--password", action="store", type="string", dest="password")
+
+parser.add_option("-b", "--binding", action="store", type="string",
+                  dest="binding")
+
+parser.add_option("-d", "--domain", action="store", type="string",
+                  dest="domain")
+
+parser.add_option("-u", "--username", action="store", type="string",
+                  dest="username")
+
+parser.add_option("-p", "--password", action="store", type="string",
+                  dest="password")
 
 (options, args) = parser.parse_args()
 
@@ -75,15 +95,18 @@ if not options.username or not options.password or not options.domain:
    parser.error('You must supply a domain, username and password')
 
 
-binding=options.binding
-domain=options.domain
-username=options.username
-password=options.password
+binding = options.binding
+domain = options.domain
+username = options.username
+password = options.password
 
-# Connect to server
+print 'Connecting...'
 
 pipe = dcerpc.pipe_connect(binding,
 	dcerpc.DCERPC_SAMR_UUID, dcerpc.DCERPC_SAMR_VERSION,
 	domain, username, password)
 
-test_Connect(pipe)
+handle = test_Connect(pipe)
+test_QuerySecurity(pipe, handle)
+
+print 'Done'
-- 
cgit 


From dabb37c547dd44a5eb0b11c516208d4416c6655f Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Wed, 15 Sep 2004 21:17:26 +0000
Subject: r2357: Start coding conversion routines for security descriptors,
 acls and sids. (This used to be commit
 c8d13a809b5b01823a62e5868bac47e1f2f25092)

---
 source4/scripting/swig/dcerpc.i | 59 ++++++++++++++++++++++++++++++++++++++---
 1 file changed, 56 insertions(+), 3 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/dcerpc.i b/source4/scripting/swig/dcerpc.i
index 75b078ad16..ea7b3d79a2 100644
--- a/source4/scripting/swig/dcerpc.i
+++ b/source4/scripting/swig/dcerpc.i
@@ -132,9 +132,62 @@ struct security_descriptor *security_descriptor_ptr_from_python(TALLOC_CTX *mem_
 	return NULL;
 }
 
-PyObject *security_descriptor_to_python(struct security_descriptor *obj)
+PyObject *dom_sid_to_python(struct dom_sid *obj)
 {
-	return PyDict_New();
+	return PyString_FromString("<sid>");
+}
+
+PyObject *security_acl_to_python(struct security_acl *obj)
+{
+	PyObject *result = PyDict_New();
+	PyObject *ace_list;
+	int i;
+
+	if (!obj) {
+		Py_INCREF(Py_None);
+		return Py_None;
+	}
+
+	PyDict_SetItem(result, PyString_FromString("revision"), PyInt_FromLong(obj->revision));
+	PyDict_SetItem(result, PyString_FromString("size"), PyInt_FromLong(obj->size));
+
+	ace_list = PyList_New(obj->num_aces);
+
+	for(i = 0; i < obj->num_aces; i++) {
+		PyObject *ace = PyDict_New();
+
+		PyDict_SetItem(ace, PyString_FromString("type"), PyInt_FromLong(obj->aces[i].type));
+		PyDict_SetItem(ace, PyString_FromString("flags"), PyInt_FromLong(obj->aces[i].flags));
+		PyDict_SetItem(ace, PyString_FromString("access_mask"), PyInt_FromLong(obj->aces[i].access_mask));
+		PyDict_SetItem(ace, PyString_FromString("trustee"), dom_sid_to_python(&obj->aces[i].trustee));
+
+		PyList_SetItem(ace_list, i, ace);
+	}
+
+	PyDict_SetItem(result, PyString_FromString("aces"), ace_list);
+
+	return result;
+}
+
+PyObject *security_descriptor_to_python(TALLOC_CTX *mem_ctx, struct security_descriptor *obj)
+{
+	PyObject *result = PyDict_New();
+
+	if (!obj) {
+		Py_INCREF(Py_None);
+		return Py_None;
+	}
+
+	PyDict_SetItem(result, PyString_FromString("revision"), PyInt_FromLong(obj->revision));
+	PyDict_SetItem(result, PyString_FromString("type"), PyInt_FromLong(obj->type));
+
+	PyDict_SetItem(result, PyString_FromString("owner_sid"), dom_sid_to_python(obj->owner_sid));
+	PyDict_SetItem(result, PyString_FromString("group_sid"), dom_sid_to_python(obj->group_sid));
+
+	PyDict_SetItem(result, PyString_FromString("sacl"), security_acl_to_python(obj->sacl));
+	PyDict_SetItem(result, PyString_FromString("dacl"), security_acl_to_python(obj->dacl));
+
+	return result;
 }
 
 struct dom_sid2 *dom_sid2_ptr_from_python(TALLOC_CTX *mem_ctx, PyObject *obj)
@@ -142,7 +195,7 @@ struct dom_sid2 *dom_sid2_ptr_from_python(TALLOC_CTX *mem_ctx, PyObject *obj)
 	return NULL;
 }
 
-PyObject *dom_sid2_to_python(struct dom_sid2 *obj)
+PyObject *dom_sid2_to_python(TALLOC_CTX *mem_ctx, struct dom_sid2 *obj)
 {
 	return PyDict_New();
 }
-- 
cgit 


From aa60dc1630c1e28d4e60af9d04ea77477d0f7921 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Wed, 15 Sep 2004 22:03:53 +0000
Subject: r2358: More renaming of functions to keep things consistent. (This
 used to be commit 84513e4ed14e60b4cd09fcc2e596bc72d3a8807c)

---
 source4/scripting/swig/dcerpc.i | 69 +++++++++++++++++++++++------------------
 1 file changed, 39 insertions(+), 30 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/dcerpc.i b/source4/scripting/swig/dcerpc.i
index ea7b3d79a2..169cc6404a 100644
--- a/source4/scripting/swig/dcerpc.i
+++ b/source4/scripting/swig/dcerpc.i
@@ -47,6 +47,8 @@ void set_ntstatus_exception(int status)
 	PyErr_SetObject(ntstatus_exception, obj);
 }
 
+/* Conversion functions for scalar types */
+
 uint8 uint8_from_python(PyObject *obj)
 {
 	return (uint8)PyInt_AsLong(obj);
@@ -117,12 +119,33 @@ PyObject *HYPER_T_to_python(HYPER_T obj)
 	return PyLong_FromLong(obj);
 }
 
-struct policy_handle *policy_handle_from_python(PyObject *obj)
+/* Conversion functions for types that we don't want generated automatically.
+   This is mostly security realted stuff in misc.idl */
+
+char *string_ptr_from_python(PyObject *obj)
+{
+	if (obj == Py_None)
+		return NULL;
+
+	return PyString_AsString(obj);
+}
+
+PyObject *string_ptr_to_python(char *obj)
+{
+	if (obj == NULL) {
+		Py_INCREF(Py_None);
+		return Py_None;
+	}
+
+	return PyString_FromString(obj);
+}
+
+struct policy_handle *policy_handle_ptr_from_python(PyObject *obj)
 {
 	return (struct policy_handle *)PyString_AsString(obj);
 }
 
-PyObject *policy_handle_to_python(struct policy_handle *handle)
+PyObject *policy_handle_ptr_to_python(struct policy_handle *handle)
 {
 	return PyString_FromStringAndSize((char *)handle, sizeof(*handle));
 }
@@ -132,12 +155,12 @@ struct security_descriptor *security_descriptor_ptr_from_python(TALLOC_CTX *mem_
 	return NULL;
 }
 
-PyObject *dom_sid_to_python(struct dom_sid *obj)
+PyObject *dom_sid_ptr_to_python(struct dom_sid *obj)
 {
 	return PyString_FromString("<sid>");
 }
 
-PyObject *security_acl_to_python(struct security_acl *obj)
+PyObject *security_acl_ptr_to_python(struct security_acl *obj)
 {
 	PyObject *result = PyDict_New();
 	PyObject *ace_list;
@@ -159,7 +182,7 @@ PyObject *security_acl_to_python(struct security_acl *obj)
 		PyDict_SetItem(ace, PyString_FromString("type"), PyInt_FromLong(obj->aces[i].type));
 		PyDict_SetItem(ace, PyString_FromString("flags"), PyInt_FromLong(obj->aces[i].flags));
 		PyDict_SetItem(ace, PyString_FromString("access_mask"), PyInt_FromLong(obj->aces[i].access_mask));
-		PyDict_SetItem(ace, PyString_FromString("trustee"), dom_sid_to_python(&obj->aces[i].trustee));
+		PyDict_SetItem(ace, PyString_FromString("trustee"), dom_sid_ptr_to_python(&obj->aces[i].trustee));
 
 		PyList_SetItem(ace_list, i, ace);
 	}
@@ -169,7 +192,7 @@ PyObject *security_acl_to_python(struct security_acl *obj)
 	return result;
 }
 
-PyObject *security_descriptor_to_python(TALLOC_CTX *mem_ctx, struct security_descriptor *obj)
+PyObject *security_descriptor_ptr_to_python(TALLOC_CTX *mem_ctx, struct security_descriptor *obj)
 {
 	PyObject *result = PyDict_New();
 
@@ -181,11 +204,11 @@ PyObject *security_descriptor_to_python(TALLOC_CTX *mem_ctx, struct security_des
 	PyDict_SetItem(result, PyString_FromString("revision"), PyInt_FromLong(obj->revision));
 	PyDict_SetItem(result, PyString_FromString("type"), PyInt_FromLong(obj->type));
 
-	PyDict_SetItem(result, PyString_FromString("owner_sid"), dom_sid_to_python(obj->owner_sid));
-	PyDict_SetItem(result, PyString_FromString("group_sid"), dom_sid_to_python(obj->group_sid));
+	PyDict_SetItem(result, PyString_FromString("owner_sid"), dom_sid_ptr_to_python(obj->owner_sid));
+	PyDict_SetItem(result, PyString_FromString("group_sid"), dom_sid_ptr_to_python(obj->group_sid));
 
-	PyDict_SetItem(result, PyString_FromString("sacl"), security_acl_to_python(obj->sacl));
-	PyDict_SetItem(result, PyString_FromString("dacl"), security_acl_to_python(obj->dacl));
+	PyDict_SetItem(result, PyString_FromString("sacl"), security_acl_ptr_to_python(obj->sacl));
+	PyDict_SetItem(result, PyString_FromString("dacl"), security_acl_ptr_to_python(obj->dacl));
 
 	return result;
 }
@@ -195,25 +218,10 @@ struct dom_sid2 *dom_sid2_ptr_from_python(TALLOC_CTX *mem_ctx, PyObject *obj)
 	return NULL;
 }
 
-PyObject *dom_sid2_to_python(TALLOC_CTX *mem_ctx, struct dom_sid2 *obj)
-{
-	return PyDict_New();
-}
-
-char *string_from_python(PyObject *obj)
+PyObject *dom_sid2_ptr_to_python(TALLOC_CTX *mem_ctx, struct dom_sid2 *obj)
 {
-	if (obj == Py_None)
-		return NULL;
-
-	return PyString_AsString(obj);
-}
-
-PyObject *string_to_python(char *obj)
-{
-	if (obj == NULL)
-		return Py_None;
-
-	return PyString_FromString(obj);
+	Py_INCREF(Py_None);
+	return Py_None;
 }
 
 struct samr_Password *samr_Password_ptr_from_python(TALLOC_CTX *mem_ctx, PyObject *obj)
@@ -221,9 +229,10 @@ struct samr_Password *samr_Password_ptr_from_python(TALLOC_CTX *mem_ctx, PyObjec
 	return NULL;
 }
 
-PyObject *samr_Password_to_python(struct samr_Password *obj)
+PyObject *samr_Password_ptr_to_python(struct samr_Password *obj)
 {
-	return NULL;
+	Py_INCREF(Py_None);
+	return Py_None;
 }
 
 %}
-- 
cgit 


From d46b1885607dd85cfe3538ed92d4ad43c86e381b Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Wed, 15 Sep 2004 22:35:15 +0000
Subject: r2359: More consistency fixes: pass a talloc context to every
 function that doesn't convert scalar types, more renaming of function names.

Implement conversion fns for dom_sid, dom_sid2 (to struct version stubbed
out).  Also from Python conversions for security_acl and security_descriptors.
(This used to be commit 945a4681051132c13f9235f676464fffb3bfadc8)
---
 source4/scripting/swig/dcerpc.i | 83 ++++++++++++++++++++++++++++++-----------
 1 file changed, 61 insertions(+), 22 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/dcerpc.i b/source4/scripting/swig/dcerpc.i
index 169cc6404a..3b596e85e1 100644
--- a/source4/scripting/swig/dcerpc.i
+++ b/source4/scripting/swig/dcerpc.i
@@ -122,7 +122,7 @@ PyObject *HYPER_T_to_python(HYPER_T obj)
 /* Conversion functions for types that we don't want generated automatically.
    This is mostly security realted stuff in misc.idl */
 
-char *string_ptr_from_python(PyObject *obj)
+char *string_ptr_from_python(TALLOC_CTX *mem_ctx, PyObject *obj)
 {
 	if (obj == Py_None)
 		return NULL;
@@ -130,7 +130,7 @@ char *string_ptr_from_python(PyObject *obj)
 	return PyString_AsString(obj);
 }
 
-PyObject *string_ptr_to_python(char *obj)
+PyObject *string_ptr_to_python(TALLOC_CTX *mem_ctx, char *obj)
 {
 	if (obj == NULL) {
 		Py_INCREF(Py_None);
@@ -140,27 +140,35 @@ PyObject *string_ptr_to_python(char *obj)
 	return PyString_FromString(obj);
 }
 
-struct policy_handle *policy_handle_ptr_from_python(PyObject *obj)
+struct policy_handle *policy_handle_ptr_from_python(TALLOC_CTX *mem_ctx, PyObject *obj)
 {
 	return (struct policy_handle *)PyString_AsString(obj);
 }
 
-PyObject *policy_handle_ptr_to_python(struct policy_handle *handle)
+PyObject *policy_handle_ptr_to_python(TALLOC_CTX *mem_ctx, struct policy_handle *handle)
 {
 	return PyString_FromStringAndSize((char *)handle, sizeof(*handle));
 }
 
-struct security_descriptor *security_descriptor_ptr_from_python(TALLOC_CTX *mem_ctx, PyObject *obj)
+PyObject *dom_sid_ptr_to_python(TALLOC_CTX *mem_ctx, struct dom_sid *obj)
 {
-	return NULL;
+	return PyString_FromString(dom_sid_string(mem_ctx, obj));
 }
 
-PyObject *dom_sid_ptr_to_python(struct dom_sid *obj)
+struct dom_sid *dom_sid_ptr_from_python(TALLOC_CTX *mem_ctx, PyObject *obj)
 {
-	return PyString_FromString("<sid>");
+	return dom_sid_parse_talloc(mem_ctx, PyString_AsString(obj));
 }
 
-PyObject *security_acl_ptr_to_python(struct security_acl *obj)
+#define dom_sid2_ptr_to_python dom_sid_ptr_to_python
+#define dom_sid2_ptr_from_python dom_sid_ptr_from_python
+
+void dom_sid_from_python(TALLOC_CTX *mem_ctx, struct dom_sid *sid, PyObject *obj)
+{
+	memset(sid, 0, sizeof(struct dom_sid)); // XXX
+}
+
+PyObject *security_acl_ptr_to_python(TALLOC_CTX *mem_ctx, struct security_acl *obj)
 {
 	PyObject *result = PyDict_New();
 	PyObject *ace_list;
@@ -182,7 +190,7 @@ PyObject *security_acl_ptr_to_python(struct security_acl *obj)
 		PyDict_SetItem(ace, PyString_FromString("type"), PyInt_FromLong(obj->aces[i].type));
 		PyDict_SetItem(ace, PyString_FromString("flags"), PyInt_FromLong(obj->aces[i].flags));
 		PyDict_SetItem(ace, PyString_FromString("access_mask"), PyInt_FromLong(obj->aces[i].access_mask));
-		PyDict_SetItem(ace, PyString_FromString("trustee"), dom_sid_ptr_to_python(&obj->aces[i].trustee));
+		PyDict_SetItem(ace, PyString_FromString("trustee"), dom_sid_ptr_to_python(mem_ctx, &obj->aces[i].trustee));
 
 		PyList_SetItem(ace_list, i, ace);
 	}
@@ -192,6 +200,32 @@ PyObject *security_acl_ptr_to_python(struct security_acl *obj)
 	return result;
 }
 
+struct security_acl *security_acl_ptr_from_python(TALLOC_CTX *mem_ctx, PyObject *obj)
+{
+	struct security_acl *acl = talloc(mem_ctx, sizeof(struct security_acl));
+	PyObject *ace_list;
+	int i, len;
+
+	acl->revision = PyInt_AsLong(PyDict_GetItem(obj, PyString_FromString("revision")));
+	acl->size = PyInt_AsLong(PyDict_GetItem(obj, PyString_FromString("size")));
+	ace_list = PyDict_GetItem(obj, PyString_FromString("aces"));
+
+	len = PyList_Size(ace_list);
+	acl->num_aces = len;
+	acl->aces = talloc(mem_ctx, len * sizeof(struct security_ace));
+
+	for (i = 0; i < len; i++) {
+		acl->aces[i].type = PyInt_AsLong(PyDict_GetItem(obj, PyString_FromString("type")));
+		acl->aces[i].flags = PyInt_AsLong(PyDict_GetItem(obj, PyString_FromString("flags")));
+		acl->aces[i].size = 0;
+		acl->aces[i].access_mask = PyInt_AsLong(PyDict_GetItem(obj, PyString_FromString("access_mask")));
+
+		dom_sid_from_python(mem_ctx, &acl->aces[i].trustee, PyDict_GetItem(obj, PyString_FromString("trustee")));
+	}
+
+	return acl;
+}
+
 PyObject *security_descriptor_ptr_to_python(TALLOC_CTX *mem_ctx, struct security_descriptor *obj)
 {
 	PyObject *result = PyDict_New();
@@ -204,24 +238,29 @@ PyObject *security_descriptor_ptr_to_python(TALLOC_CTX *mem_ctx, struct security
 	PyDict_SetItem(result, PyString_FromString("revision"), PyInt_FromLong(obj->revision));
 	PyDict_SetItem(result, PyString_FromString("type"), PyInt_FromLong(obj->type));
 
-	PyDict_SetItem(result, PyString_FromString("owner_sid"), dom_sid_ptr_to_python(obj->owner_sid));
-	PyDict_SetItem(result, PyString_FromString("group_sid"), dom_sid_ptr_to_python(obj->group_sid));
+	PyDict_SetItem(result, PyString_FromString("owner_sid"), dom_sid_ptr_to_python(mem_ctx, obj->owner_sid));
+	PyDict_SetItem(result, PyString_FromString("group_sid"), dom_sid_ptr_to_python(mem_ctx, obj->group_sid));
 
-	PyDict_SetItem(result, PyString_FromString("sacl"), security_acl_ptr_to_python(obj->sacl));
-	PyDict_SetItem(result, PyString_FromString("dacl"), security_acl_ptr_to_python(obj->dacl));
+	PyDict_SetItem(result, PyString_FromString("sacl"), security_acl_ptr_to_python(mem_ctx, obj->sacl));
+	PyDict_SetItem(result, PyString_FromString("dacl"), security_acl_ptr_to_python(mem_ctx, obj->dacl));
 
 	return result;
 }
 
-struct dom_sid2 *dom_sid2_ptr_from_python(TALLOC_CTX *mem_ctx, PyObject *obj)
+struct security_descriptor *security_descriptor_ptr_from_python(TALLOC_CTX *mem_ctx, PyObject *obj)
 {
-	return NULL;
-}
+	struct security_descriptor *sd = talloc(mem_ctx, sizeof(struct security_descriptor));
 
-PyObject *dom_sid2_ptr_to_python(TALLOC_CTX *mem_ctx, struct dom_sid2 *obj)
-{
-	Py_INCREF(Py_None);
-	return Py_None;
+	sd->revision = PyInt_AsLong(PyDict_GetItem(obj, PyString_FromString("revision")));
+	sd->type = PyInt_AsLong(PyDict_GetItem(obj, PyString_FromString("type")));
+
+	sd->owner_sid = security_descriptor_ptr_from_python(mem_ctx, PyDict_GetItem(obj, PyString_FromString("owner_sid")));
+	sd->group_sid = security_descriptor_ptr_from_python(mem_ctx, PyDict_GetItem(obj, PyString_FromString("group_sid")));
+
+	sd->sacl = security_acl_ptr_from_python(mem_ctx, PyDict_GetItem(obj, PyString_FromString("sacl")));
+	sd->dacl = security_acl_ptr_from_python(mem_ctx, PyDict_GetItem(obj, PyString_FromString("dacl")));
+
+	return sd;
 }
 
 struct samr_Password *samr_Password_ptr_from_python(TALLOC_CTX *mem_ctx, PyObject *obj)
@@ -229,7 +268,7 @@ struct samr_Password *samr_Password_ptr_from_python(TALLOC_CTX *mem_ctx, PyObjec
 	return NULL;
 }
 
-PyObject *samr_Password_ptr_to_python(struct samr_Password *obj)
+PyObject *samr_Password_ptr_to_python(TALLOC_CTX *mem_ctx, struct samr_Password *obj)
 {
 	Py_INCREF(Py_None);
 	return Py_None;
-- 
cgit 


From b02b2fa3473a8249a8a69eb5cc08ab207503ecd0 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Sat, 18 Sep 2004 08:41:26 +0000
Subject: r2408: Tridge suggested that all the structures from misc.idl (policy
 handles, sids, security descriptors and acls) can be automatically generated
 instead of hand-written.  Fix up the swig wrapper generator and helper
 routines to do this.  (Only works for policy handles right now though and
 arrays are to be converted into lists instead of being binary blobs).

Fix up wrapper generation for modules that don't define an interface
(e.g misc.idl).
(This used to be commit 160dc90921ecc136a25ae88e5c28800ddda5722a)
---
 source4/scripting/swig/dcerpc.i | 134 +---------------------------------------
 1 file changed, 2 insertions(+), 132 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/dcerpc.i b/source4/scripting/swig/dcerpc.i
index 3b596e85e1..64d757c634 100644
--- a/source4/scripting/swig/dcerpc.i
+++ b/source4/scripting/swig/dcerpc.i
@@ -140,146 +140,15 @@ PyObject *string_ptr_to_python(TALLOC_CTX *mem_ctx, char *obj)
 	return PyString_FromString(obj);
 }
 
-struct policy_handle *policy_handle_ptr_from_python(TALLOC_CTX *mem_ctx, PyObject *obj)
-{
-	return (struct policy_handle *)PyString_AsString(obj);
-}
-
-PyObject *policy_handle_ptr_to_python(TALLOC_CTX *mem_ctx, struct policy_handle *handle)
-{
-	return PyString_FromStringAndSize((char *)handle, sizeof(*handle));
-}
-
-PyObject *dom_sid_ptr_to_python(TALLOC_CTX *mem_ctx, struct dom_sid *obj)
-{
-	return PyString_FromString(dom_sid_string(mem_ctx, obj));
-}
-
-struct dom_sid *dom_sid_ptr_from_python(TALLOC_CTX *mem_ctx, PyObject *obj)
-{
-	return dom_sid_parse_talloc(mem_ctx, PyString_AsString(obj));
-}
-
 #define dom_sid2_ptr_to_python dom_sid_ptr_to_python
 #define dom_sid2_ptr_from_python dom_sid_ptr_from_python
 
-void dom_sid_from_python(TALLOC_CTX *mem_ctx, struct dom_sid *sid, PyObject *obj)
-{
-	memset(sid, 0, sizeof(struct dom_sid)); // XXX
-}
-
-PyObject *security_acl_ptr_to_python(TALLOC_CTX *mem_ctx, struct security_acl *obj)
-{
-	PyObject *result = PyDict_New();
-	PyObject *ace_list;
-	int i;
-
-	if (!obj) {
-		Py_INCREF(Py_None);
-		return Py_None;
-	}
-
-	PyDict_SetItem(result, PyString_FromString("revision"), PyInt_FromLong(obj->revision));
-	PyDict_SetItem(result, PyString_FromString("size"), PyInt_FromLong(obj->size));
-
-	ace_list = PyList_New(obj->num_aces);
-
-	for(i = 0; i < obj->num_aces; i++) {
-		PyObject *ace = PyDict_New();
-
-		PyDict_SetItem(ace, PyString_FromString("type"), PyInt_FromLong(obj->aces[i].type));
-		PyDict_SetItem(ace, PyString_FromString("flags"), PyInt_FromLong(obj->aces[i].flags));
-		PyDict_SetItem(ace, PyString_FromString("access_mask"), PyInt_FromLong(obj->aces[i].access_mask));
-		PyDict_SetItem(ace, PyString_FromString("trustee"), dom_sid_ptr_to_python(mem_ctx, &obj->aces[i].trustee));
-
-		PyList_SetItem(ace_list, i, ace);
-	}
-
-	PyDict_SetItem(result, PyString_FromString("aces"), ace_list);
-
-	return result;
-}
-
-struct security_acl *security_acl_ptr_from_python(TALLOC_CTX *mem_ctx, PyObject *obj)
-{
-	struct security_acl *acl = talloc(mem_ctx, sizeof(struct security_acl));
-	PyObject *ace_list;
-	int i, len;
-
-	acl->revision = PyInt_AsLong(PyDict_GetItem(obj, PyString_FromString("revision")));
-	acl->size = PyInt_AsLong(PyDict_GetItem(obj, PyString_FromString("size")));
-	ace_list = PyDict_GetItem(obj, PyString_FromString("aces"));
-
-	len = PyList_Size(ace_list);
-	acl->num_aces = len;
-	acl->aces = talloc(mem_ctx, len * sizeof(struct security_ace));
-
-	for (i = 0; i < len; i++) {
-		acl->aces[i].type = PyInt_AsLong(PyDict_GetItem(obj, PyString_FromString("type")));
-		acl->aces[i].flags = PyInt_AsLong(PyDict_GetItem(obj, PyString_FromString("flags")));
-		acl->aces[i].size = 0;
-		acl->aces[i].access_mask = PyInt_AsLong(PyDict_GetItem(obj, PyString_FromString("access_mask")));
-
-		dom_sid_from_python(mem_ctx, &acl->aces[i].trustee, PyDict_GetItem(obj, PyString_FromString("trustee")));
-	}
-
-	return acl;
-}
-
-PyObject *security_descriptor_ptr_to_python(TALLOC_CTX *mem_ctx, struct security_descriptor *obj)
-{
-	PyObject *result = PyDict_New();
-
-	if (!obj) {
-		Py_INCREF(Py_None);
-		return Py_None;
-	}
-
-	PyDict_SetItem(result, PyString_FromString("revision"), PyInt_FromLong(obj->revision));
-	PyDict_SetItem(result, PyString_FromString("type"), PyInt_FromLong(obj->type));
-
-	PyDict_SetItem(result, PyString_FromString("owner_sid"), dom_sid_ptr_to_python(mem_ctx, obj->owner_sid));
-	PyDict_SetItem(result, PyString_FromString("group_sid"), dom_sid_ptr_to_python(mem_ctx, obj->group_sid));
-
-	PyDict_SetItem(result, PyString_FromString("sacl"), security_acl_ptr_to_python(mem_ctx, obj->sacl));
-	PyDict_SetItem(result, PyString_FromString("dacl"), security_acl_ptr_to_python(mem_ctx, obj->dacl));
-
-	return result;
-}
-
-struct security_descriptor *security_descriptor_ptr_from_python(TALLOC_CTX *mem_ctx, PyObject *obj)
-{
-	struct security_descriptor *sd = talloc(mem_ctx, sizeof(struct security_descriptor));
-
-	sd->revision = PyInt_AsLong(PyDict_GetItem(obj, PyString_FromString("revision")));
-	sd->type = PyInt_AsLong(PyDict_GetItem(obj, PyString_FromString("type")));
-
-	sd->owner_sid = security_descriptor_ptr_from_python(mem_ctx, PyDict_GetItem(obj, PyString_FromString("owner_sid")));
-	sd->group_sid = security_descriptor_ptr_from_python(mem_ctx, PyDict_GetItem(obj, PyString_FromString("group_sid")));
-
-	sd->sacl = security_acl_ptr_from_python(mem_ctx, PyDict_GetItem(obj, PyString_FromString("sacl")));
-	sd->dacl = security_acl_ptr_from_python(mem_ctx, PyDict_GetItem(obj, PyString_FromString("dacl")));
-
-	return sd;
-}
-
-struct samr_Password *samr_Password_ptr_from_python(TALLOC_CTX *mem_ctx, PyObject *obj)
-{
-	return NULL;
-}
-
-PyObject *samr_Password_ptr_to_python(TALLOC_CTX *mem_ctx, struct samr_Password *obj)
-{
-	Py_INCREF(Py_None);
-	return Py_None;
-}
-
 %}
 
 %include "samba.i"
 
 %init  %{
-/* setup_logging("python", DEBUG_STDOUT);	*/
+	setup_logging("python", DEBUG_STDOUT);	
 	lp_load(dyn_CONFIGFILE, True, False, False);
 	load_interfaces();
 	ntstatus_exception = PyErr_NewException("dcerpc.NTSTATUS", NULL, NULL);
@@ -329,5 +198,6 @@ NTSTATUS dcerpc_pipe_connect(struct dcerpc_pipe **OUT,
                              const char *username,
                              const char *password);
 
+%include "librpc/gen_ndr/misc.i"
 %include "librpc/gen_ndr/lsa.i"
 %include "librpc/gen_ndr/samr.i"
-- 
cgit 


From fba4af3a1bdc350b51e61d173730b1542377dd88 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Sat, 18 Sep 2004 12:47:57 +0000
Subject: r2410: Add test for samr_SetSecurity(). (This used to be commit
 e822979e84d33015c937e22174288a3f2c2ff04b)

---
 source4/scripting/swig/torture/samr.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/torture/samr.py b/source4/scripting/swig/torture/samr.py
index e7ee4e8796..f3be954d65 100755
--- a/source4/scripting/swig/torture/samr.py
+++ b/source4/scripting/swig/torture/samr.py
@@ -12,7 +12,6 @@ def test_Connect(handle):
     r['access_mask'] = 0x02000000
 
     result = dcerpc.samr_Connect(pipe, r)
-
     dcerpc.samr_Close(pipe, result)
 
     print 'testing samr_Connect2'
@@ -68,7 +67,13 @@ def test_QuerySecurity(pipe, handle):
     r['sec_info'] = 7
 
     result = dcerpc.samr_QuerySecurity(pipe, r)
-    print result
+
+    r = {}
+    r['handle'] = handle
+    r['sec_info'] = 7
+    r['sdbuf'] = result['sdbuf']
+
+    result = dcerpc.samr_SetSecurity(pipe, r)
 
 # Parse command line
 
-- 
cgit 


From a50931e7288131b92161a56dc52e22fa2fe6050b Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Sun, 19 Sep 2004 04:59:56 +0000
Subject: r2414: samr_Connect.system_name is now an array. (This used to be
 commit e1166c210004b090c5922b2f9b10b86ebc3fc11d)

---
 source4/scripting/swig/torture/samr.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/torture/samr.py b/source4/scripting/swig/torture/samr.py
index f3be954d65..d3b9a4dd47 100755
--- a/source4/scripting/swig/torture/samr.py
+++ b/source4/scripting/swig/torture/samr.py
@@ -8,7 +8,7 @@ def test_Connect(handle):
     print 'testing samr_Connect'
 
     r = {}
-    r['system_name'] = '\0\0'
+    r['system_name'] = [0]
     r['access_mask'] = 0x02000000
 
     result = dcerpc.samr_Connect(pipe, r)
-- 
cgit 


From d384984e3541a527f36174459714a5f0cdbd8182 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Sun, 19 Sep 2004 05:28:59 +0000
Subject: r2415: Throw a TypeError exception if a scalar value doesn't have the
 correct type, or the argument to a to_python function isn't a dictionary.
 (This used to be commit 0f58ffb142a9b8c5c745b3a2c93a1659ea8282e5)

---
 source4/scripting/swig/dcerpc.i | 56 +++++++++++++++++++++++++++++++++++------
 1 file changed, 48 insertions(+), 8 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/dcerpc.i b/source4/scripting/swig/dcerpc.i
index 64d757c634..a09c3f2377 100644
--- a/source4/scripting/swig/dcerpc.i
+++ b/source4/scripting/swig/dcerpc.i
@@ -49,8 +49,13 @@ void set_ntstatus_exception(int status)
 
 /* Conversion functions for scalar types */
 
-uint8 uint8_from_python(PyObject *obj)
+uint8 uint8_from_python(PyObject *obj, char *name)
 {
+	if (!PyInt_Check(obj)) {
+		PyErr_Format(PyExc_TypeError, "Expecting int value for %s", name);
+		return 0;
+	}
+
 	return (uint8)PyInt_AsLong(obj);
 }
 
@@ -59,8 +64,13 @@ PyObject *uint8_to_python(uint8 obj)
 	return PyInt_FromLong(obj);
 }
 
-uint16 uint16_from_python(PyObject *obj)
+uint16 uint16_from_python(PyObject *obj, char *name)
 {
+	if (!PyInt_Check(obj)) {
+		PyErr_Format(PyExc_TypeError, "Expecting int value for %s", name);
+		return 0;
+	}
+
 	return (uint16)PyInt_AsLong(obj);
 }
 
@@ -69,8 +79,13 @@ PyObject *uint16_to_python(uint16 obj)
 	return PyInt_FromLong(obj);
 }
 
-uint32 uint32_from_python(PyObject *obj)
+uint32 uint32_from_python(PyObject *obj, char *name)
 {
+	if (!PyInt_Check(obj)) {
+		PyErr_Format(PyExc_TypeError, "Expecting int value for %s", name);
+		return 0;
+	}
+
 	return (uint32)PyInt_AsLong(obj);
 }
 
@@ -79,8 +94,13 @@ PyObject *uint32_to_python(uint32 obj)
 	return PyInt_FromLong(obj);
 }
 
-int64 int64_from_python(PyObject *obj)
+int64 int64_from_python(PyObject *obj, char *name)
 {
+	if (!PyInt_Check(obj)) {
+		PyErr_Format(PyExc_TypeError, "Expecting int value for %s", name);
+		return 0;
+	}
+
 	return (int64)PyLong_AsLong(obj);
 }
 
@@ -89,8 +109,13 @@ PyObject *int64_to_python(int64 obj)
 	return PyLong_FromLong(obj);
 }
 
-uint64 uint64_from_python(PyObject *obj)
+uint64 uint64_from_python(PyObject *obj, char *name)
 {
+	if (!PyInt_Check(obj)) {
+		PyErr_Format(PyExc_TypeError, "Expecting int value for %s", name);
+		return 0;
+	}
+
 	return (uint64)PyLong_AsLong(obj);
 }
 
@@ -99,8 +124,13 @@ PyObject *uint64_to_python(uint64 obj)
 	return PyLong_FromLong(obj);
 }
 
-NTTIME NTTIME_from_python(PyObject *obj)
+NTTIME NTTIME_from_python(PyObject *obj, char *name)
 {
+	if (!PyInt_Check(obj)) {
+		PyErr_Format(PyExc_TypeError, "Expecting integer value for %s", name);
+		return 0;
+	}
+
 	return (NTTIME)PyLong_AsLong(obj);
 }
 
@@ -109,8 +139,13 @@ PyObject *NTTIME_to_python(NTTIME obj)
 	return PyLong_FromLong(obj);
 }
 
-HYPER_T HYPER_T_from_python(PyObject *obj)
+HYPER_T HYPER_T_from_python(PyObject *obj, char *name)
 {
+	if (!PyInt_Check(obj)) {
+		PyErr_Format(PyExc_TypeError, "Expecting integer value for %s", name);
+		return 0;
+	}
+
 	return (HYPER_T)PyLong_AsLong(obj);
 }
 
@@ -122,11 +157,16 @@ PyObject *HYPER_T_to_python(HYPER_T obj)
 /* Conversion functions for types that we don't want generated automatically.
    This is mostly security realted stuff in misc.idl */
 
-char *string_ptr_from_python(TALLOC_CTX *mem_ctx, PyObject *obj)
+char *string_ptr_from_python(TALLOC_CTX *mem_ctx, PyObject *obj, char *name)
 {
 	if (obj == Py_None)
 		return NULL;
 
+	if (!PyString_Check(obj)) {
+		PyErr_Format(PyExc_TypeError, "Expecting string value for %s", name);
+		return 0;
+	}
+
 	return PyString_AsString(obj);
 }
 
-- 
cgit 


From 6bc08531b22895cf7ac7c0579a9445491b315b18 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Sun, 19 Sep 2004 08:58:56 +0000
Subject: r2416: More argument checks.  Raise an exception instead of
 segfaulting if a dictionary does not contain a required key. (This used to be
 commit fc5443af9c271baf189ebe0b098e190b5eda4e14)

---
 source4/scripting/swig/dcerpc.i | 42 ++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 41 insertions(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/dcerpc.i b/source4/scripting/swig/dcerpc.i
index a09c3f2377..a90ac90b5a 100644
--- a/source4/scripting/swig/dcerpc.i
+++ b/source4/scripting/swig/dcerpc.i
@@ -51,6 +51,11 @@ void set_ntstatus_exception(int status)
 
 uint8 uint8_from_python(PyObject *obj, char *name)
 {
+	if (obj == NULL) {
+		PyErr_Format(PyExc_ValueError, "Expecting key %s", name);
+		return 0;
+	}
+
 	if (!PyInt_Check(obj)) {
 		PyErr_Format(PyExc_TypeError, "Expecting int value for %s", name);
 		return 0;
@@ -66,6 +71,11 @@ PyObject *uint8_to_python(uint8 obj)
 
 uint16 uint16_from_python(PyObject *obj, char *name)
 {
+	if (obj == NULL) {
+		PyErr_Format(PyExc_ValueError, "Expecting key %s", name);
+		return 0;
+	}
+
 	if (!PyInt_Check(obj)) {
 		PyErr_Format(PyExc_TypeError, "Expecting int value for %s", name);
 		return 0;
@@ -81,6 +91,11 @@ PyObject *uint16_to_python(uint16 obj)
 
 uint32 uint32_from_python(PyObject *obj, char *name)
 {
+	if (obj == NULL) {
+		PyErr_Format(PyExc_ValueError, "Expecting key %s", name);
+		return 0;
+	}
+
 	if (!PyInt_Check(obj)) {
 		PyErr_Format(PyExc_TypeError, "Expecting int value for %s", name);
 		return 0;
@@ -96,6 +111,11 @@ PyObject *uint32_to_python(uint32 obj)
 
 int64 int64_from_python(PyObject *obj, char *name)
 {
+	if (obj == NULL) {
+		PyErr_Format(PyExc_ValueError, "Expecting key %s", name);
+		return 0;
+	}
+
 	if (!PyInt_Check(obj)) {
 		PyErr_Format(PyExc_TypeError, "Expecting int value for %s", name);
 		return 0;
@@ -111,6 +131,11 @@ PyObject *int64_to_python(int64 obj)
 
 uint64 uint64_from_python(PyObject *obj, char *name)
 {
+	if (obj == NULL) {
+		PyErr_Format(PyExc_ValueError, "Expecting key %s", name);
+		return 0;
+	}
+
 	if (!PyInt_Check(obj)) {
 		PyErr_Format(PyExc_TypeError, "Expecting int value for %s", name);
 		return 0;
@@ -126,6 +151,11 @@ PyObject *uint64_to_python(uint64 obj)
 
 NTTIME NTTIME_from_python(PyObject *obj, char *name)
 {
+	if (obj == NULL) {
+		PyErr_Format(PyExc_ValueError, "Expecting key %s", name);
+		return 0;
+	}
+
 	if (!PyInt_Check(obj)) {
 		PyErr_Format(PyExc_TypeError, "Expecting integer value for %s", name);
 		return 0;
@@ -141,6 +171,11 @@ PyObject *NTTIME_to_python(NTTIME obj)
 
 HYPER_T HYPER_T_from_python(PyObject *obj, char *name)
 {
+	if (obj == NULL) {
+		PyErr_Format(PyExc_ValueError, "Expecting key %s", name);
+		return 0;
+	}
+
 	if (!PyInt_Check(obj)) {
 		PyErr_Format(PyExc_TypeError, "Expecting integer value for %s", name);
 		return 0;
@@ -159,12 +194,17 @@ PyObject *HYPER_T_to_python(HYPER_T obj)
 
 char *string_ptr_from_python(TALLOC_CTX *mem_ctx, PyObject *obj, char *name)
 {
+	if (obj == NULL) {
+		PyErr_Format(PyExc_ValueError, "Expecting key %s", name);
+		return NULL;
+	}
+
 	if (obj == Py_None)
 		return NULL;
 
 	if (!PyString_Check(obj)) {
 		PyErr_Format(PyExc_TypeError, "Expecting string value for %s", name);
-		return 0;
+		return NULL;
 	}
 
 	return PyString_AsString(obj);
-- 
cgit 


From 6feaf61b61d8f76faeab176af79e1d6e6bea419f Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Sun, 19 Sep 2004 12:38:06 +0000
Subject: r2419: Write tests for samr_EnumDomains() and samr_LookupDomain().
 (This used to be commit aa15fd1ecba2163a077f398cecfb49d71a49cc9d)

---
 source4/scripting/swig/torture/samr.py | 42 ++++++++++++++++++++++++++++++----
 1 file changed, 38 insertions(+), 4 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/torture/samr.py b/source4/scripting/swig/torture/samr.py
index d3b9a4dd47..00e4db1958 100755
--- a/source4/scripting/swig/torture/samr.py
+++ b/source4/scripting/swig/torture/samr.py
@@ -8,7 +8,7 @@ def test_Connect(handle):
     print 'testing samr_Connect'
 
     r = {}
-    r['system_name'] = [0]
+    r['system_name'] = 0;
     r['access_mask'] = 0x02000000
 
     result = dcerpc.samr_Connect(pipe, r)
@@ -68,12 +68,43 @@ def test_QuerySecurity(pipe, handle):
 
     result = dcerpc.samr_QuerySecurity(pipe, r)
 
+    s = {}
+    s['handle'] = handle
+    s['sec_info'] = 7
+    s['sdbuf'] = result['sdbuf']
+
+    result = dcerpc.samr_SetSecurity(pipe, s)
+
+    result = dcerpc.samr_QuerySecurity(pipe, r)
+
+def test_LookupDomain(pipe, handle, domain):
+
+    print 'testing samr_LookupDomain'
+
     r = {}
     r['handle'] = handle
-    r['sec_info'] = 7
-    r['sdbuf'] = result['sdbuf']
+    r['domain'] = {}
+    r['domain']['name_len'] = 0
+    r['domain']['name_size'] = 0
+    r['domain']['name'] = domain
+
+    result = dcerpc.samr_LookupDomain(pipe, r)
+
+    print result
 
-    result = dcerpc.samr_SetSecurity(pipe, r)
+def test_EnumDomains(pipe, handle):
+
+    print 'testing samr_EnumDomains'
+
+    r = {}
+    r['handle'] = handle
+    r['resume_handle'] = 0
+    r['buf_size'] = -1
+
+    result = dcerpc.samr_EnumDomains(pipe, r)
+
+    for domain in result['sam']['entries']:
+        test_LookupDomain(pipe, handle, domain['name']['name'])
 
 # Parse command line
 
@@ -112,6 +143,9 @@ pipe = dcerpc.pipe_connect(binding,
 	domain, username, password)
 
 handle = test_Connect(pipe)
+
 test_QuerySecurity(pipe, handle)
 
+test_EnumDomains(pipe, handle)
+
 print 'Done'
-- 
cgit 


From fa8c1abcc833953d69f732d3577d6492148121a7 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Sun, 19 Sep 2004 22:22:51 +0000
Subject: r2421: Fix test for lookupdomain for a non-existent domain.

Export NTSTATUS exception from wrapper module so it can be used by scripts.
(This used to be commit 57edfd605bffcf8a0feb5ccc5ec69cf5f35b677b)
---
 source4/scripting/swig/dcerpc.i        | 9 ++++++++-
 source4/scripting/swig/torture/samr.py | 8 +++++++-
 2 files changed, 15 insertions(+), 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/dcerpc.i b/source4/scripting/swig/dcerpc.i
index a90ac90b5a..bded875b10 100644
--- a/source4/scripting/swig/dcerpc.i
+++ b/source4/scripting/swig/dcerpc.i
@@ -1,3 +1,5 @@
+/* Tastes like -*- C -*- */
+
 /* 
    Unix SMB/CIFS implementation.
 
@@ -227,11 +229,16 @@ PyObject *string_ptr_to_python(TALLOC_CTX *mem_ctx, char *obj)
 
 %include "samba.i"
 
+%pythoncode %{
+	NTSTATUS = _dcerpc.NTSTATUS
+%}
+
 %init  %{
 	setup_logging("python", DEBUG_STDOUT);	
 	lp_load(dyn_CONFIGFILE, True, False, False);
 	load_interfaces();
-	ntstatus_exception = PyErr_NewException("dcerpc.NTSTATUS", NULL, NULL);
+	ntstatus_exception = PyErr_NewException("_dcerpc.NTSTATUS", NULL, NULL);
+	PyDict_SetItemString(d, "NTSTATUS", ntstatus_exception);
 %}
 
 %typemap(in, numinputs=0) struct dcerpc_pipe **OUT (struct dcerpc_pipe *temp_dcerpc_pipe) {
diff --git a/source4/scripting/swig/torture/samr.py b/source4/scripting/swig/torture/samr.py
index 00e4db1958..1f3b60eed4 100755
--- a/source4/scripting/swig/torture/samr.py
+++ b/source4/scripting/swig/torture/samr.py
@@ -90,7 +90,13 @@ def test_LookupDomain(pipe, handle, domain):
 
     result = dcerpc.samr_LookupDomain(pipe, r)
 
-    print result
+    r['domain']['name'] = 'xxNODOMAINxx'
+
+    try:
+        result = dcerpc.samr_LookupDomain(pipe, r)
+    except dcerpc.NTSTATUS, arg:
+        if arg[0] != 0xc00000df:
+            raise dcerpc.NTSTATUS(arg)
 
 def test_EnumDomains(pipe, handle):
 
-- 
cgit 


From cb3cacdf402d91722b67b494f36abac0280fc5b9 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Sun, 19 Sep 2004 23:34:20 +0000
Subject: r2423: Add some instructions for building extensions. (This used to
 be commit 7a7cf9f3521535da47895d1a516c8572f7f34e40)

---
 source4/scripting/swig/README | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 source4/scripting/swig/README

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/README b/source4/scripting/swig/README
new file mode 100644
index 0000000000..561c5ab279
--- /dev/null
+++ b/source4/scripting/swig/README
@@ -0,0 +1,37 @@
+README for Samba SWIG Python extensions
+---------------------------------------
+
+Instructions for building:
+
+1. Run configure with the --with-python option to enable python
+   extensions. 
+
+2. Edit the script/build_idl.sh script to pass the --swig option to
+   pidl.  Here's a patch:
+
+Index: script/build_idl.sh
+===================================================================
+--- script/build_idl.sh	(revision 2413)
++++ script/build_idl.sh	(working copy)
+@@ -4,7 +4,7 @@
+ 
+ [ -d librpc/gen_ndr ] || mkdir -p librpc/gen_ndr || exit 1
+ 
+-PIDL="$PERL ./build/pidl/pidl.pl --output librpc/gen_ndr/ndr_ --parse --header --parser --server"
++PIDL="$PERL ./build/pidl/pidl.pl --output librpc/gen_ndr/ndr_ --parse --header --parser --server --swig"
+ TABLES="$PERL ./build/pidl/tables.pl --output librpc/gen_ndr/tables"
+ 
+ if [ x$FULLBUILD = xFULL ]; then
+
+3. Run 'make idl_full swig' to build extensions.
+
+4. At some stage there will be a proper system for installing the
+   extensions, but right now it's easier to run them in place.  Set
+   your PYTHONPATH to include the modules.  From the Samba source
+   directory, run:
+
+   export PYTHONPATH=`pwd`/scripting/swig
+
+Now you can go nuts and use the extensions.  Check the
+scripting/swig/torture directory for a testsuite.  There will
+hopefully be a bunch of usage examples somewhere.
\ No newline at end of file
-- 
cgit 


From 6d82eaa7e9597ebaf292e21e00345be0c50287bf Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Mon, 20 Sep 2004 00:55:53 +0000
Subject: r2424: Refactor handling of non-OK NTSTATUS returns to be more
 swiggish. (This used to be commit aaef6eaf6e0c38fb277d1be0617dfdff559a0115)

---
 source4/scripting/swig/dcerpc.i | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/dcerpc.i b/source4/scripting/swig/dcerpc.i
index bded875b10..9677d4e62d 100644
--- a/source4/scripting/swig/dcerpc.i
+++ b/source4/scripting/swig/dcerpc.i
@@ -285,6 +285,16 @@ NTSTATUS dcerpc_pipe_connect(struct dcerpc_pipe **OUT,
                              const char *username,
                              const char *password);
 
+/* Run this test after each wrapped function */
+
+%exception {
+	$action
+	if (!NT_STATUS_IS_OK(result)) {
+		set_ntstatus_exception(NT_STATUS_V(result));
+		return NULL;
+	}
+}
+
 %include "librpc/gen_ndr/misc.i"
 %include "librpc/gen_ndr/lsa.i"
 %include "librpc/gen_ndr/samr.i"
-- 
cgit 


From b653d8775a524fe727a61a297d03cf7a12d5c380 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Mon, 20 Sep 2004 02:51:54 +0000
Subject: r2427: Add tests for samr_GetDomPwInfo,
 samr_RemoveMemberFromForeignDomain, samr_LookupName, samr_OpenUser,
 samr_DeleteUser, samr_CreateUse and samr_OpenDomain. (This used to be commit
 086740c178c80ccb8d8eaff9f97007cb021bca20)

---
 source4/scripting/swig/torture/samr.py | 152 ++++++++++++++++++++++++++++++++-
 1 file changed, 150 insertions(+), 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/torture/samr.py b/source4/scripting/swig/torture/samr.py
index 1f3b60eed4..abf505e919 100755
--- a/source4/scripting/swig/torture/samr.py
+++ b/source4/scripting/swig/torture/samr.py
@@ -77,6 +77,142 @@ def test_QuerySecurity(pipe, handle):
 
     result = dcerpc.samr_QuerySecurity(pipe, r)
 
+def test_GetDomPwInfo(pipe, domain):
+
+    print 'testing samr_GetDomPwInfo'
+
+    r = {}
+    r['handle'] = handle
+    r['name'] = {}
+    r['name']['name_len'] = 0
+    r['name']['name_size'] = 0
+    r['name']['name'] = domain
+
+    result = dcerpc.samr_GetDomPwInfo(pipe, r)
+
+    r['name']['name'] = '\\\\%s' % domain
+
+    result = dcerpc.samr_GetDomPwInfo(pipe, r)
+
+    r['name']['name'] = '\\\\__NONAME__'
+
+    result = dcerpc.samr_GetDomPwInfo(pipe, r)
+
+    r['name']['name'] = '\\\\Builtin'
+
+    result = dcerpc.samr_GetDomPwInfo(pipe, r)
+
+def test_RemoveMemberFromForeignDomain(pipe, domain_handle):
+
+    r = {}
+    r['handle'] = domain_handle
+    r['sid'] = {}
+    r['sid']['sid_rev_num'] = 1
+    r['sid']['id_auth'] = [1, 2, 3, 4, 5, 6]
+    r['sid']['num_auths'] = 4
+    r['sid']['sub_auths'] = [7, 8, 9, 10]
+
+    result = dcerpc.samr_RemoveMemberFromForeignDomain(pipe, r)
+
+def test_CreateUser2(pipe, domain_handle):
+    pass
+
+def test_LookupName(pipe, domain_handle, name):
+
+    r = {}
+    r['handle'] = domain_handle
+    r['num_names'] = 1
+    r['names'] = []
+    r['names'].append({'name_len': 0, 'name_size': 0, 'name': name})
+
+    result = dcerpc.samr_LookupNames(pipe, r)
+
+    rid = result['rids']['ids'][0]
+
+    r['num_names'] = 2
+    r['names'].append({'name_len': 0, 'name_size': 0, 'name': 'xxNONAMExx'})
+
+
+    try:
+        result = dcerpc.samr_LookupNames(pipe, r)
+    except dcerpc.NTSTATUS, arg:
+        if arg[0] != 0x00000107:
+            raise dcerpc.NTSTATUS(arg)
+
+    r['num_names'] = 0
+
+    result = dcerpc.samr_LookupNames(pipe, r)
+
+    return rid
+
+def test_OpenUser_byname(pipe, domain_handle, name):
+
+    rid = test_LookupName(pipe, domain_handle, name)
+
+    r = {}
+    r['handle'] = domain_handle
+    r['access_mask'] = 0x02000000
+    r['rid'] = rid
+
+    result = dcerpc.samr_OpenUser(pipe, r)
+
+    return result['acct_handle']
+
+def test_DeleteUser_byname(pipe, domain_handle, name):
+
+    user_handle = test_OpenUser_byname(pipe, domain_handle, name)
+    
+    r = {}
+    r['handle'] = user_handle
+
+    dcerpc.samr_DeleteUser(pipe, r)
+
+def test_CreateUser(pipe, domain_handle):
+
+    r = {}
+    r['handle'] = domain_handle
+    r['account_name'] = {}
+    r['account_name']['name_len'] = 0
+    r['account_name']['name_size'] = 0
+    r['account_name']['name'] = 'samrtorturetest'
+    r['access_mask'] = 0x02000000
+
+    try:
+        result = dcerpc.samr_CreateUser(pipe, r)
+    except dcerpc.NTSTATUS, arg:
+        if arg[0] == 0xc0000022:
+            return
+        elif arg[0] == 0xc0000063:
+            test_DeleteUser_byname(pipe, domain_handle, 'samrtorturetest')
+            result = dcerpc.samr_CreateUser(pipe, r)
+        else:
+            raise dcerpc.NTSTATUS(arg)
+
+    user_handle = result['acct_handle']
+
+    # samr_QueryUserInfo(), etc
+
+def test_OpenDomain(pipe, handle, domain_sid):
+
+    print 'testing samr_OpenDomain'
+
+    r = {}
+    r['handle'] = handle
+    r['access_mask'] = 0x02000000
+    r['sid'] = domain_sid
+
+    result = dcerpc.samr_OpenDomain(pipe, r)
+
+    domain_handle = result['domain_handle']
+
+    test_QuerySecurity(pipe, domain_handle)
+
+    test_RemoveMemberFromForeignDomain(pipe, domain_handle)
+
+    test_CreateUser2(pipe, domain_handle)
+
+    test_CreateUser(pipe, domain_handle)
+    
 def test_LookupDomain(pipe, handle, domain):
 
     print 'testing samr_LookupDomain'
@@ -86,9 +222,13 @@ def test_LookupDomain(pipe, handle, domain):
     r['domain'] = {}
     r['domain']['name_len'] = 0
     r['domain']['name_size'] = 0
-    r['domain']['name'] = domain
+    r['domain']['name'] = None
 
-    result = dcerpc.samr_LookupDomain(pipe, r)
+    try:
+        result = dcerpc.samr_LookupDomain(pipe, r)
+    except dcerpc.NTSTATUS, arg:
+        if arg[0] != 0xc000000d:
+            raise dcerpc.NTSTATUS(arg)
 
     r['domain']['name'] = 'xxNODOMAINxx'
 
@@ -98,6 +238,14 @@ def test_LookupDomain(pipe, handle, domain):
         if arg[0] != 0xc00000df:
             raise dcerpc.NTSTATUS(arg)
 
+    r['domain']['name'] = domain
+
+    result = dcerpc.samr_LookupDomain(pipe, r)
+
+    test_GetDomPwInfo(pipe, domain)
+
+    test_OpenDomain(pipe, handle, result['sid'])
+    
 def test_EnumDomains(pipe, handle):
 
     print 'testing samr_EnumDomains'
-- 
cgit 


From 67cb7c9451f310ee6ae66c916b6b25a5914e46f1 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Mon, 20 Sep 2004 06:31:59 +0000
Subject: r2429: Add tests for samr_QueryUserInfo(), samr_QueryUserInfo2(),
 samr_GetUserPwInfo(), samr_TestPrivateFunctionsUser().  Add stubs for the
 rest of the functions in test_OpenDomain() from smbtorture. (This used to be
 commit 1dc86e466dc546a5509fe5195444e48dc026e9a1)

---
 source4/scripting/swig/torture/samr.py | 177 ++++++++++++++++++++++++++++++++-
 1 file changed, 174 insertions(+), 3 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/torture/samr.py b/source4/scripting/swig/torture/samr.py
index abf505e919..e726c0229a 100755
--- a/source4/scripting/swig/torture/samr.py
+++ b/source4/scripting/swig/torture/samr.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-import dcerpc
+import sys, dcerpc
 from optparse import OptionParser
 
 def test_Connect(handle):
@@ -167,6 +167,63 @@ def test_DeleteUser_byname(pipe, domain_handle, name):
 
     dcerpc.samr_DeleteUser(pipe, r)
 
+def test_QueryUserInfo(pipe, user_handle):
+
+    levels = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 16, 17, 20, 21]
+
+    for level in levels:
+        r = {}
+        r['handle'] = user_handle
+        r['level'] = level
+
+        result = dcerpc.samr_QueryUserInfo(pipe, r)
+
+def test_QueryUserInfo2(pipe, user_handle):
+
+    levels = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 16, 17, 20, 21]
+
+    for level in levels:
+        r = {}
+        r['handle'] = user_handle
+        r['level'] = level
+
+        result = dcerpc.samr_QueryUserInfo2(pipe, r)
+
+def test_SetUserInfo(pipe, user_handle):
+    pass
+
+def test_GetUserPwInfo(pipe, user_handle):
+
+    r = {}
+    r['handle'] = user_handle
+
+    result = dcerpc.samr_GetUserPwInfo(pipe, r)
+
+def test_TestPrivateFunctionsUser(pipe, user_handle):
+
+    r = {}
+    r['handle'] = user_handle
+
+    try:
+        result = dcerpc.samr_TestPrivateFunctionsUser(pipe, r)
+    except dcerpc.NTSTATUS, arg:
+        if arg[0] != 0xc0000002:
+            raise dcerpc.NTSTATUS(arg)
+
+def test_user_ops(pipe, user_handle):
+
+    test_QuerySecurity(pipe, user_handle)
+
+    test_QueryUserInfo(pipe, user_handle)
+
+    test_QueryUserInfo2(pipe, user_handle)
+
+    test_SetUserInfo(pipe, user_handle)
+
+    test_GetUserPwInfo(pipe, user_handle)
+
+    test_TestPrivateFunctionsUser(pipe, user_handle)
+
 def test_CreateUser(pipe, domain_handle):
 
     r = {}
@@ -190,7 +247,81 @@ def test_CreateUser(pipe, domain_handle):
 
     user_handle = result['acct_handle']
 
-    # samr_QueryUserInfo(), etc
+    q = {}
+    q['handle'] = user_handle
+    q['level'] = 16
+
+    result = dcerpc.samr_QueryUserInfo(pipe, q)
+
+    test_user_ops(pipe, user_handle)
+
+    return user_handle
+
+def test_CreateAlias(pipe, domain_handle):
+    pass
+
+def test_CreateDomainGroup(pipe, domain_handle):
+    pass
+
+def test_CreateAlias(pipe, domain_handle):
+    pass
+
+def test_CreateDomainGroup(pipe, domain_handle):
+    pass
+
+def test_QueryDomainInfo(pipe, domain_handle):
+    pass
+    
+def test_QueryDomainInfo2(pipe, domain_handle):
+    pass
+
+def test_EnumDomainUsers(pipe, domain_handle):
+    pass
+
+def test_EnumDomainGroups(pipe, domain_handle):
+    pass
+
+def test_EnumDomainAliases(pipe, domain_handle):
+    pass
+
+def test_QueryDisplayInfo(pipe, domain_handle):
+    pass
+
+def test_QueryDisplayInfo2(pipe, domain_handle):
+    pass
+    
+def test_QueryDisplayInfo3(pipe, domain_handle):
+    pass
+
+def test_GetDisplayEnumerationIndex(pipe, domain_handle):
+    pass
+
+def test_GetDisplayEnumerationIndex2(pipe, domain_handle):
+    pass
+
+def test_GroupList(pipe, domain_handle):
+    pass
+
+def test_TestPrivateFunctionsDomain(pipe, domain_handle):
+    pass
+
+def test_RidToSid(pipe, domain_handle):
+    pass
+
+def test_GetBootKeyInformation(pipe, domain_handle):
+    pass
+
+def test_DeleteUser(pipe, user_handle):
+    pass
+
+def test_DeleteAlias(pipe, alias_handle):
+    pass
+
+def test_DeleteDomainGroup(pipe, group_handle):
+    pass
+
+def test_Close(pipe, domain_handle):
+    pass
 
 def test_OpenDomain(pipe, handle, domain_sid):
 
@@ -211,7 +342,47 @@ def test_OpenDomain(pipe, handle, domain_sid):
 
     test_CreateUser2(pipe, domain_handle)
 
-    test_CreateUser(pipe, domain_handle)
+    user_handle = test_CreateUser(pipe, domain_handle)
+
+    alias_handle = test_CreateAlias(pipe, domain_handle)
+
+    group_handle = test_CreateDomainGroup(pipe, domain_handle)
+
+    test_QueryDomainInfo(pipe, domain_handle)
+    
+    test_QueryDomainInfo2(pipe, domain_handle)
+
+    test_EnumDomainUsers(pipe, domain_handle)
+
+    test_EnumDomainGroups(pipe, domain_handle)
+
+    test_EnumDomainAliases(pipe, domain_handle)
+
+    test_QueryDisplayInfo(pipe, domain_handle)
+
+    test_QueryDisplayInfo2(pipe, domain_handle)
+    
+    test_QueryDisplayInfo3(pipe, domain_handle)
+
+    test_GetDisplayEnumerationIndex(pipe, domain_handle)
+
+    test_GetDisplayEnumerationIndex2(pipe, domain_handle)
+
+    test_GroupList(pipe, domain_handle)
+
+    test_TestPrivateFunctionsDomain(pipe, domain_handle)
+
+    test_RidToSid(pipe, domain_handle)
+
+    test_GetBootKeyInformation(pipe, domain_handle)
+
+    test_DeleteUser(pipe, user_handle)
+
+    test_DeleteAlias(pipe, alias_handle)
+
+    test_DeleteDomainGroup(pipe, group_handle)
+
+    test_Close(pipe, domain_handle)
     
 def test_LookupDomain(pipe, handle, domain):
 
-- 
cgit 


From 851e54de66381193c209ed7674c60208d844045f Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Tue, 21 Sep 2004 04:11:41 +0000
Subject: r2461: Update samr.py torture test after policy handle parameter
 renames.

I thought of another exception to the policy name rule - samr_Close
can operate on any kind of samr handle.
(This used to be commit 632b7cc0d6b8349a9db1e57c305c359aa500c9e6)
---
 source4/scripting/swig/torture/samr.py | 131 +++++++++++++++++++++++++--------
 1 file changed, 99 insertions(+), 32 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/torture/samr.py b/source4/scripting/swig/torture/samr.py
index e726c0229a..8ee7dfdc34 100755
--- a/source4/scripting/swig/torture/samr.py
+++ b/source4/scripting/swig/torture/samr.py
@@ -12,7 +12,11 @@ def test_Connect(handle):
     r['access_mask'] = 0x02000000
 
     result = dcerpc.samr_Connect(pipe, r)
-    dcerpc.samr_Close(pipe, result)
+
+    s = {}
+    s['handle'] = result['connect_handle']
+
+    dcerpc.samr_Close(pipe, s)
 
     print 'testing samr_Connect2'
 
@@ -21,7 +25,11 @@ def test_Connect(handle):
     r['access_mask'] = 0x02000000
 
     result = dcerpc.samr_Connect2(pipe, r)
-    dcerpc.samr_Close(pipe, result)
+
+    s = {}
+    s['handle'] = result['connect_handle']
+
+    dcerpc.samr_Close(pipe, s)
     
     print 'testing samr_Connect3'
 
@@ -31,7 +39,11 @@ def test_Connect(handle):
     r['access_mask'] = 0x02000000
 
     result = dcerpc.samr_Connect3(pipe, r)
-    dcerpc.samr_Close(pipe, result)
+
+    s = {}
+    s['handle'] = result['connect_handle']
+
+    dcerpc.samr_Close(pipe, s)
 
     print 'testing samr_Connect4'
 
@@ -41,7 +53,11 @@ def test_Connect(handle):
     r['access_mask'] = 0x02000000
 
     result = dcerpc.samr_Connect4(pipe, r)
-    dcerpc.samr_Close(pipe, result)
+
+    s = {}
+    s['handle'] = result['connect_handle']
+    
+    dcerpc.samr_Close(pipe, s)
 
     print 'testing samr_Connect5'
 
@@ -56,7 +72,7 @@ def test_Connect(handle):
 
     result = dcerpc.samr_Connect5(pipe, r)
 
-    return result['handle']
+    return result['connect_handle']
     
 def test_QuerySecurity(pipe, handle):
 
@@ -105,7 +121,7 @@ def test_GetDomPwInfo(pipe, domain):
 def test_RemoveMemberFromForeignDomain(pipe, domain_handle):
 
     r = {}
-    r['handle'] = domain_handle
+    r['domain_handle'] = domain_handle
     r['sid'] = {}
     r['sid']['sid_rev_num'] = 1
     r['sid']['id_auth'] = [1, 2, 3, 4, 5, 6]
@@ -120,7 +136,7 @@ def test_CreateUser2(pipe, domain_handle):
 def test_LookupName(pipe, domain_handle, name):
 
     r = {}
-    r['handle'] = domain_handle
+    r['domain_handle'] = domain_handle
     r['num_names'] = 1
     r['names'] = []
     r['names'].append({'name_len': 0, 'name_size': 0, 'name': name})
@@ -145,25 +161,25 @@ def test_LookupName(pipe, domain_handle, name):
 
     return rid
 
-def test_OpenUser_byname(pipe, domain_handle, name):
+def test_OpenUser_byname(pipe, domain_handle, user_name):
 
-    rid = test_LookupName(pipe, domain_handle, name)
+    rid = test_LookupName(pipe, domain_handle, user_name)
 
     r = {}
-    r['handle'] = domain_handle
+    r['domain_handle'] = domain_handle
     r['access_mask'] = 0x02000000
     r['rid'] = rid
 
     result = dcerpc.samr_OpenUser(pipe, r)
 
-    return result['acct_handle']
+    return result['user_handle']
 
-def test_DeleteUser_byname(pipe, domain_handle, name):
+def test_DeleteUser_byname(pipe, domain_handle, user_name):
 
-    user_handle = test_OpenUser_byname(pipe, domain_handle, name)
+    user_handle = test_OpenUser_byname(pipe, domain_handle, user_name)
     
     r = {}
-    r['handle'] = user_handle
+    r['user_handle'] = user_handle
 
     dcerpc.samr_DeleteUser(pipe, r)
 
@@ -173,7 +189,7 @@ def test_QueryUserInfo(pipe, user_handle):
 
     for level in levels:
         r = {}
-        r['handle'] = user_handle
+        r['user_handle'] = user_handle
         r['level'] = level
 
         result = dcerpc.samr_QueryUserInfo(pipe, r)
@@ -184,7 +200,7 @@ def test_QueryUserInfo2(pipe, user_handle):
 
     for level in levels:
         r = {}
-        r['handle'] = user_handle
+        r['user_handle'] = user_handle
         r['level'] = level
 
         result = dcerpc.samr_QueryUserInfo2(pipe, r)
@@ -195,14 +211,14 @@ def test_SetUserInfo(pipe, user_handle):
 def test_GetUserPwInfo(pipe, user_handle):
 
     r = {}
-    r['handle'] = user_handle
+    r['user_handle'] = user_handle
 
     result = dcerpc.samr_GetUserPwInfo(pipe, r)
 
 def test_TestPrivateFunctionsUser(pipe, user_handle):
 
     r = {}
-    r['handle'] = user_handle
+    r['user_handle'] = user_handle
 
     try:
         result = dcerpc.samr_TestPrivateFunctionsUser(pipe, r)
@@ -227,7 +243,7 @@ def test_user_ops(pipe, user_handle):
 def test_CreateUser(pipe, domain_handle):
 
     r = {}
-    r['handle'] = domain_handle
+    r['domain_handle'] = domain_handle
     r['account_name'] = {}
     r['account_name']['name_len'] = 0
     r['account_name']['name_size'] = 0
@@ -245,10 +261,10 @@ def test_CreateUser(pipe, domain_handle):
         else:
             raise dcerpc.NTSTATUS(arg)
 
-    user_handle = result['acct_handle']
+    user_handle = result['user_handle']
 
     q = {}
-    q['handle'] = user_handle
+    q['user_handle'] = user_handle
     q['level'] = 16
 
     result = dcerpc.samr_QueryUserInfo(pipe, q)
@@ -257,14 +273,62 @@ def test_CreateUser(pipe, domain_handle):
 
     return user_handle
 
-def test_CreateAlias(pipe, domain_handle):
+def test_DeleteAlias_byname(pipe, domain_handle, alias_name):
+
+    rid = test_LookupName(pipe, domain_handle, alias_name)
+
+    r = {}
+    r['domain_handle'] = domain_handle
+    r['access_mask'] = 0x02000000
+    r['rid'] = rid
+
+    result = dcerpc.samr_OpenAlias(pipe, r)
+
+    s = {}
+    s['alias_handle'] = result['alias_handle']
+
+    dcerpc.samr_DeleteDomAlias(pipe, s)
+
+def test_alias_ops(pipe, alias_handle, domain_handle, domain_sid):
     pass
 
+def test_CreateAlias(pipe, domain_handle, domain_sid):
+
+    r = {}
+    r['domain_handle'] = domain_handle
+    r['aliasname'] = {}
+    r['aliasname']['name_len'] = 0
+    r['aliasname']['name_size'] = 0
+    r['aliasname']['name'] = 'samrtorturetestalias'
+    r['access_mask'] = 0x02000000
+
+    try:
+        result = dcerpc.samr_CreateDomAlias(pipe, r)
+    except dcerpc.NTSTATUS, arg:
+        if arg[0] != 0xc0000154:
+            raise dcerpc.NTSTATUS(arg)
+        test_DeleteAlias_byname(pipe, domain_handle, 'samrtorturetestalias')
+        result = dcerpc.samr_CreateDomAlias(pipe, r)
+
+    alias_handle = result['alias_handle']
+
+    test_alias_ops(pipe, alias_handle, domain_handle, domain_sid)
+
+    return result['alias_handle']
+
 def test_CreateDomainGroup(pipe, domain_handle):
-    pass
 
-def test_CreateAlias(pipe, domain_handle):
-    pass
+    r = {}
+    r['domain_handle'] = domain_handle
+    r['name'] = {}
+    r['name']['name_len'] = 0
+    r['name']['name_size'] = 0
+    r['name']['name'] = 'samrtorturetestgroup'
+    r['access_mask'] = 0x02000000
+
+    result = dcerpc.samr_CreateDomGroup(pipe, r)
+
+    return result['group_handle']
 
 def test_CreateDomainGroup(pipe, domain_handle):
     pass
@@ -323,12 +387,12 @@ def test_DeleteDomainGroup(pipe, group_handle):
 def test_Close(pipe, domain_handle):
     pass
 
-def test_OpenDomain(pipe, handle, domain_sid):
+def test_OpenDomain(pipe, connect_handle, domain_sid):
 
     print 'testing samr_OpenDomain'
 
     r = {}
-    r['handle'] = handle
+    r['connect_handle'] = connect_handle
     r['access_mask'] = 0x02000000
     r['sid'] = domain_sid
 
@@ -344,7 +408,10 @@ def test_OpenDomain(pipe, handle, domain_sid):
 
     user_handle = test_CreateUser(pipe, domain_handle)
 
-    alias_handle = test_CreateAlias(pipe, domain_handle)
+    alias_handle = test_CreateAlias(pipe, domain_handle, domain_sid)
+
+    print alias_handle
+    sys.exit(1)
 
     group_handle = test_CreateDomainGroup(pipe, domain_handle)
 
@@ -384,12 +451,12 @@ def test_OpenDomain(pipe, handle, domain_sid):
 
     test_Close(pipe, domain_handle)
     
-def test_LookupDomain(pipe, handle, domain):
+def test_LookupDomain(pipe, connect_handle, domain):
 
     print 'testing samr_LookupDomain'
 
     r = {}
-    r['handle'] = handle
+    r['connect_handle'] = connect_handle
     r['domain'] = {}
     r['domain']['name_len'] = 0
     r['domain']['name_size'] = 0
@@ -417,12 +484,12 @@ def test_LookupDomain(pipe, handle, domain):
 
     test_OpenDomain(pipe, handle, result['sid'])
     
-def test_EnumDomains(pipe, handle):
+def test_EnumDomains(pipe, connect_handle):
 
     print 'testing samr_EnumDomains'
 
     r = {}
-    r['handle'] = handle
+    r['connect_handle'] = handle
     r['resume_handle'] = 0
     r['buf_size'] = -1
 
-- 
cgit 


From 46efd4d31b9a73255ea7960eb16c1ec53dfe6478 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Wed, 22 Sep 2004 02:39:38 +0000
Subject: r2486: Use correct type checks when checking 64-bit quantities
 (int64, uint64, NTTIME and HYPER_T).

Also use the correct conversion routines when creating 64 bit objects.
(This used to be commit f09fee92395e89c768e221728d5b0114d78f59fe)
---
 source4/scripting/swig/dcerpc.i | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/dcerpc.i b/source4/scripting/swig/dcerpc.i
index 9677d4e62d..08b47d6329 100644
--- a/source4/scripting/swig/dcerpc.i
+++ b/source4/scripting/swig/dcerpc.i
@@ -118,17 +118,17 @@ int64 int64_from_python(PyObject *obj, char *name)
 		return 0;
 	}
 
-	if (!PyInt_Check(obj)) {
-		PyErr_Format(PyExc_TypeError, "Expecting int value for %s", name);
+	if (!PyLong_Check(obj)) {
+		PyErr_Format(PyExc_TypeError, "Expecting long value for %s", name);
 		return 0;
 	}
 
-	return (int64)PyLong_AsLong(obj);
+	return (int64)PyLong_AsLongLong(obj);
 }
 
 PyObject *int64_to_python(int64 obj)
 {
-	return PyLong_FromLong(obj);
+	return PyLong_FromLongLong(obj);
 }
 
 uint64 uint64_from_python(PyObject *obj, char *name)
@@ -138,17 +138,17 @@ uint64 uint64_from_python(PyObject *obj, char *name)
 		return 0;
 	}
 
-	if (!PyInt_Check(obj)) {
-		PyErr_Format(PyExc_TypeError, "Expecting int value for %s", name);
+	if (!PyLong_Check(obj)) {
+		PyErr_Format(PyExc_TypeError, "Expecting long value for %s", name);
 		return 0;
 	}
 
-	return (uint64)PyLong_AsLong(obj);
+	return (uint64)PyLong_AsUnsignedLongLong(obj);
 }
 
 PyObject *uint64_to_python(uint64 obj)
 {
-	return PyLong_FromLong(obj);
+	return PyLong_FromUnsignedLongLong(obj);
 }
 
 NTTIME NTTIME_from_python(PyObject *obj, char *name)
@@ -158,17 +158,17 @@ NTTIME NTTIME_from_python(PyObject *obj, char *name)
 		return 0;
 	}
 
-	if (!PyInt_Check(obj)) {
-		PyErr_Format(PyExc_TypeError, "Expecting integer value for %s", name);
+	if (!PyLong_Check(obj)) {
+		PyErr_Format(PyExc_TypeError, "Expecting long value for %s", name);
 		return 0;
 	}
 
-	return (NTTIME)PyLong_AsLong(obj);
+	return (NTTIME)PyLong_AsUnsignedLongLong(obj);
 }
 
 PyObject *NTTIME_to_python(NTTIME obj)
 {
-	return PyLong_FromLong(obj);
+	return PyLong_FromUnsignedLongLong(obj);
 }
 
 HYPER_T HYPER_T_from_python(PyObject *obj, char *name)
@@ -178,17 +178,17 @@ HYPER_T HYPER_T_from_python(PyObject *obj, char *name)
 		return 0;
 	}
 
-	if (!PyInt_Check(obj)) {
-		PyErr_Format(PyExc_TypeError, "Expecting integer value for %s", name);
+	if (!PyLong_Check(obj)) {
+		PyErr_Format(PyExc_TypeError, "Expecting long value for %s", name);
 		return 0;
 	}
 
-	return (HYPER_T)PyLong_AsLong(obj);
+	return (HYPER_T)PyLong_AsUnsignedLongLong(obj);
 }
 
 PyObject *HYPER_T_to_python(HYPER_T obj)
 {
-	return PyLong_FromLong(obj);
+	return PyLong_FromUnsignedLongLong(obj);
 }
 
 /* Conversion functions for types that we don't want generated automatically.
-- 
cgit 


From 99721cc7c827457814f97c401462243c3584f480 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Wed, 22 Sep 2004 03:42:58 +0000
Subject: r2490: Some changes to take into account non-error NTSTATUS codes
 being returned:

  - Only throw an exception if NT_STATUS_IS_ERR() instead of
    !NT_STATUS_IS_OK().

  - Add the NTSTATUS value to the returned dictionary under a key of
    'result' so calling functions can access it.
(This used to be commit 4ddcae90a2e9b93e58bd57932cd9ae4c95be6ae8)
---
 source4/scripting/swig/dcerpc.i | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/dcerpc.i b/source4/scripting/swig/dcerpc.i
index 08b47d6329..125b32df78 100644
--- a/source4/scripting/swig/dcerpc.i
+++ b/source4/scripting/swig/dcerpc.i
@@ -289,7 +289,7 @@ NTSTATUS dcerpc_pipe_connect(struct dcerpc_pipe **OUT,
 
 %exception {
 	$action
-	if (!NT_STATUS_IS_OK(result)) {
+	if (NT_STATUS_IS_ERR(result)) {
 		set_ntstatus_exception(NT_STATUS_V(result));
 		return NULL;
 	}
-- 
cgit 


From b3a11c86e1ca199de9daa8c5f8d7967746db3c77 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Wed, 22 Sep 2004 04:17:25 +0000
Subject: r2492: Some cleanups.

Add tests for samr_CreateDomainGroup, samr_DeleteDomainGroup,
samr_QueryDomainInfo, samr_SetDomainInfo, samr_EnumDomainUsers,
samr_EnumDomainAliases, samr_EnumDomainGroups.
(This used to be commit 991d783c1ade19443c92b85f2b5763b5f51c6d61)
---
 source4/scripting/swig/torture/samr.py | 174 +++++++++++++++++++++++++++------
 1 file changed, 145 insertions(+), 29 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/torture/samr.py b/source4/scripting/swig/torture/samr.py
index 8ee7dfdc34..ebb7e07d9e 100755
--- a/source4/scripting/swig/torture/samr.py
+++ b/source4/scripting/swig/torture/samr.py
@@ -89,9 +89,9 @@ def test_QuerySecurity(pipe, handle):
     s['sec_info'] = 7
     s['sdbuf'] = result['sdbuf']
 
-    result = dcerpc.samr_SetSecurity(pipe, s)
+    dcerpc.samr_SetSecurity(pipe, s)
 
-    result = dcerpc.samr_QuerySecurity(pipe, r)
+    dcerpc.samr_QuerySecurity(pipe, r)
 
 def test_GetDomPwInfo(pipe, domain):
 
@@ -104,22 +104,24 @@ def test_GetDomPwInfo(pipe, domain):
     r['name']['name_size'] = 0
     r['name']['name'] = domain
 
-    result = dcerpc.samr_GetDomPwInfo(pipe, r)
+    dcerpc.samr_GetDomPwInfo(pipe, r)
 
     r['name']['name'] = '\\\\%s' % domain
 
-    result = dcerpc.samr_GetDomPwInfo(pipe, r)
+    dcerpc.samr_GetDomPwInfo(pipe, r)
 
     r['name']['name'] = '\\\\__NONAME__'
 
-    result = dcerpc.samr_GetDomPwInfo(pipe, r)
+    dcerpc.samr_GetDomPwInfo(pipe, r)
 
     r['name']['name'] = '\\\\Builtin'
 
-    result = dcerpc.samr_GetDomPwInfo(pipe, r)
+    dcerpc.samr_GetDomPwInfo(pipe, r)
 
 def test_RemoveMemberFromForeignDomain(pipe, domain_handle):
 
+    print 'test samr_RemoveMemberFromForeignDomain'
+
     r = {}
     r['domain_handle'] = domain_handle
     r['sid'] = {}
@@ -128,13 +130,15 @@ def test_RemoveMemberFromForeignDomain(pipe, domain_handle):
     r['sid']['num_auths'] = 4
     r['sid']['sub_auths'] = [7, 8, 9, 10]
 
-    result = dcerpc.samr_RemoveMemberFromForeignDomain(pipe, r)
+    dcerpc.samr_RemoveMemberFromForeignDomain(pipe, r)
 
 def test_CreateUser2(pipe, domain_handle):
     pass
 
 def test_LookupName(pipe, domain_handle, name):
 
+    print 'test samr_LookupNames'
+
     r = {}
     r['domain_handle'] = domain_handle
     r['num_names'] = 1
@@ -150,14 +154,14 @@ def test_LookupName(pipe, domain_handle, name):
 
 
     try:
-        result = dcerpc.samr_LookupNames(pipe, r)
+        dcerpc.samr_LookupNames(pipe, r)
     except dcerpc.NTSTATUS, arg:
         if arg[0] != 0x00000107:
             raise dcerpc.NTSTATUS(arg)
 
     r['num_names'] = 0
 
-    result = dcerpc.samr_LookupNames(pipe, r)
+    dcerpc.samr_LookupNames(pipe, r)
 
     return rid
 
@@ -185,6 +189,8 @@ def test_DeleteUser_byname(pipe, domain_handle, user_name):
 
 def test_QueryUserInfo(pipe, user_handle):
 
+    print 'test samr_QueryUserInfo'
+
     levels = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 16, 17, 20, 21]
 
     for level in levels:
@@ -192,10 +198,12 @@ def test_QueryUserInfo(pipe, user_handle):
         r['user_handle'] = user_handle
         r['level'] = level
 
-        result = dcerpc.samr_QueryUserInfo(pipe, r)
+        dcerpc.samr_QueryUserInfo(pipe, r)
 
 def test_QueryUserInfo2(pipe, user_handle):
 
+    print 'test samr_QueryUserInfo2'
+
     levels = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 16, 17, 20, 21]
 
     for level in levels:
@@ -203,25 +211,29 @@ def test_QueryUserInfo2(pipe, user_handle):
         r['user_handle'] = user_handle
         r['level'] = level
 
-        result = dcerpc.samr_QueryUserInfo2(pipe, r)
+        dcerpc.samr_QueryUserInfo2(pipe, r)
 
 def test_SetUserInfo(pipe, user_handle):
     pass
 
 def test_GetUserPwInfo(pipe, user_handle):
 
+    print 'test samr_GetUserpwInfo'
+
     r = {}
     r['user_handle'] = user_handle
 
-    result = dcerpc.samr_GetUserPwInfo(pipe, r)
+    dcerpc.samr_GetUserPwInfo(pipe, r)
 
 def test_TestPrivateFunctionsUser(pipe, user_handle):
 
+    print 'test samr.TestPrivateFunctionsUser'
+
     r = {}
     r['user_handle'] = user_handle
 
     try:
-        result = dcerpc.samr_TestPrivateFunctionsUser(pipe, r)
+        dcerpc.samr_TestPrivateFunctionsUser(pipe, r)
     except dcerpc.NTSTATUS, arg:
         if arg[0] != 0xc0000002:
             raise dcerpc.NTSTATUS(arg)
@@ -242,6 +254,8 @@ def test_user_ops(pipe, user_handle):
 
 def test_CreateUser(pipe, domain_handle):
 
+    print 'test samr_CreateUser'
+    
     r = {}
     r['domain_handle'] = domain_handle
     r['account_name'] = {}
@@ -267,7 +281,7 @@ def test_CreateUser(pipe, domain_handle):
     q['user_handle'] = user_handle
     q['level'] = 16
 
-    result = dcerpc.samr_QueryUserInfo(pipe, q)
+    dcerpc.samr_QueryUserInfo(pipe, q)
 
     test_user_ops(pipe, user_handle)
 
@@ -294,6 +308,8 @@ def test_alias_ops(pipe, alias_handle, domain_handle, domain_sid):
 
 def test_CreateAlias(pipe, domain_handle, domain_sid):
 
+    print 'test samr_CreateAlias'    
+
     r = {}
     r['domain_handle'] = domain_handle
     r['aliasname'] = {}
@@ -314,10 +330,28 @@ def test_CreateAlias(pipe, domain_handle, domain_sid):
 
     test_alias_ops(pipe, alias_handle, domain_handle, domain_sid)
 
-    return result['alias_handle']
+    return alias_handle
+
+def test_DeleteGroup_byname(pipe, domain_handle, group_name):
+    
+    rid = test_LookupName(pipe, domain_handle, group_name)
+
+    r = {}
+    r['domain_handle'] = domain_handle
+    r['access_mask'] = 0x02000000
+    r['rid'] = rid
+
+    result = dcerpc.samr_OpenGroup(pipe, r)
+
+    s = {}
+    s['group_handle'] = result['group_handle']
+
+    dcerpc.samr_DeleteDomainGroup(pipe, s)
 
 def test_CreateDomainGroup(pipe, domain_handle):
 
+    print 'testing samr_CreateDomainGroup'
+
     r = {}
     r['domain_handle'] = domain_handle
     r['name'] = {}
@@ -326,27 +360,110 @@ def test_CreateDomainGroup(pipe, domain_handle):
     r['name']['name'] = 'samrtorturetestgroup'
     r['access_mask'] = 0x02000000
 
-    result = dcerpc.samr_CreateDomGroup(pipe, r)
+    try:
+        result = dcerpc.samr_CreateDomainGroup(pipe, r)
+    except dcerpc.NTSTATUS, arg:
+        if arg[0] != 0xc0000065:
+            raise dcerpc.NTSTATUS(arg)
 
-    return result['group_handle']
+        test_DeleteGroup_byname(pipe, domain_handle, 'samrtorturetestgroup')
 
-def test_CreateDomainGroup(pipe, domain_handle):
-    pass
+        result = dcerpc.samr_CreateDomainGroup(pipe, r)
+
+    return result['group_handle']
 
 def test_QueryDomainInfo(pipe, domain_handle):
-    pass
+
+    print 'testing samr_QueryDomainInfo'
+
+    levels = [1, 2, 3, 4, 5, 6, 7, 8, 9, 11, 12, 13]
+    set_ok = [1, 0, 1, 1, 0, 1, 1, 0, 1,  0,  1,  0]
     
+    for i in range(0, len(levels)):
+
+        r = {}
+        r['domain_handle'] = domain_handle
+        r['level'] = levels[i]
+
+        result = dcerpc.samr_QueryDomainInfo(pipe, r)
+
+        s = {}
+        s['domain_handle'] = domain_handle
+        s['level'] = levels[i]
+        s['info'] = result['info']
+
+        try:
+            dcerpc.samr_SetDomainInfo(pipe, s)
+        except dcerpc.NTSTATUS, arg:
+            if set_ok[i]:
+                raise dcerpc.NTSTATUS(arg)
+            if arg[0] != 0xc0000003:
+                raise dcerpc.NTSTATUS(arg)
+
 def test_QueryDomainInfo2(pipe, domain_handle):
-    pass
+
+    print 'testing samr_QueryDomainInfo'
+
+    levels = [1, 2, 3, 4, 5, 6, 7, 8, 9, 11, 12, 13]
+
+    for i in range(0, len(levels)):
+
+        r = {}
+        r['domain_handle'] = domain_handle
+        r['level'] = levels[i]
+
+        dcerpc.samr_QueryDomainInfo2(pipe, r)
 
 def test_EnumDomainUsers(pipe, domain_handle):
-    pass
+
+    print 'testing samr_EnumDomainUsers'
+
+    r = {}
+    r['domain_handle'] = domain_handle
+    r['resume_handle'] = 0
+    r['acct_flags'] = 0
+    r['max_size'] = -1
+
+    while 1:
+        result = dcerpc.samr_EnumDomainUsers(pipe, r)
+        if result['result'] == 0x00000105:
+            r['resume_handle'] = result['resume_handle']
+            continue
+        break
 
 def test_EnumDomainGroups(pipe, domain_handle):
-    pass
+
+    print 'testing samr_EnumDomainGroups'
+
+    r = {}
+    r['domain_handle'] = domain_handle
+    r['resume_handle'] = 0
+    r['acct_flags'] = 0
+    r['max_size'] = -1
+    
+    while 1:
+        result = dcerpc.samr_EnumDomainGroups(pipe, r)
+        if result['result'] == 0x00000105:
+            r['resume_handle'] = result['resume_handle']
+            continue
+        break
 
 def test_EnumDomainAliases(pipe, domain_handle):
-    pass
+
+    print 'testing samr_EnumDomainAliases'
+
+    r = {}
+    r['domain_handle'] = domain_handle
+    r['resume_handle'] = 0
+    r['acct_flags'] = 0
+    r['max_size'] = -1
+
+    while 1:
+        result = dcerpc.samr_EnumDomainAliases(pipe, r)
+        if result['result'] == 0x00000105:
+            r['resume_handle'] = result['resume_handle']
+            continue
+        break
 
 def test_QueryDisplayInfo(pipe, domain_handle):
     pass
@@ -410,9 +527,6 @@ def test_OpenDomain(pipe, connect_handle, domain_sid):
 
     alias_handle = test_CreateAlias(pipe, domain_handle, domain_sid)
 
-    print alias_handle
-    sys.exit(1)
-
     group_handle = test_CreateDomainGroup(pipe, domain_handle)
 
     test_QueryDomainInfo(pipe, domain_handle)
@@ -425,6 +539,8 @@ def test_OpenDomain(pipe, connect_handle, domain_sid):
 
     test_EnumDomainAliases(pipe, domain_handle)
 
+    sys.exit(1)
+
     test_QueryDisplayInfo(pipe, domain_handle)
 
     test_QueryDisplayInfo2(pipe, domain_handle)
@@ -463,7 +579,7 @@ def test_LookupDomain(pipe, connect_handle, domain):
     r['domain']['name'] = None
 
     try:
-        result = dcerpc.samr_LookupDomain(pipe, r)
+        dcerpc.samr_LookupDomain(pipe, r)
     except dcerpc.NTSTATUS, arg:
         if arg[0] != 0xc000000d:
             raise dcerpc.NTSTATUS(arg)
@@ -471,7 +587,7 @@ def test_LookupDomain(pipe, connect_handle, domain):
     r['domain']['name'] = 'xxNODOMAINxx'
 
     try:
-        result = dcerpc.samr_LookupDomain(pipe, r)
+        dcerpc.samr_LookupDomain(pipe, r)
     except dcerpc.NTSTATUS, arg:
         if arg[0] != 0xc00000df:
             raise dcerpc.NTSTATUS(arg)
-- 
cgit 


From c9d96e9c44eefb6107bf4632ae7a5f43035a957d Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Wed, 22 Sep 2004 07:04:44 +0000
Subject: r2502: Finish off samr torture test: samr_CreateUser2,
 samr_SetUserInfo, samr_QueryAliasInfo, samr_SetAliasInfo,
 samr_AddMemberToAlias, samr_AddMultipleMembersToAlias, samr_QueryDisplayInfo,
 samr_QueryDisplayInfo2, samr_QueryDisplayInfo3,
 samr_GetDisplayEnumerationIndex, samr_GetDisplayEnumerationIndex2,
 samr_TestPrivateFunctionsDomain, samr_RidToSid, samr_GetBootKeyInformation,
 samr_DeleteUser, samr_DeleteAlias, samr_Close. (This used to be commit
 808e0708a9601bb94246311e03a1d5adcf654022)

---
 source4/scripting/swig/torture/samr.py | 318 +++++++++++++++++++++++++++++----
 1 file changed, 288 insertions(+), 30 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/torture/samr.py b/source4/scripting/swig/torture/samr.py
index ebb7e07d9e..9bf50cbefb 100755
--- a/source4/scripting/swig/torture/samr.py
+++ b/source4/scripting/swig/torture/samr.py
@@ -133,7 +133,28 @@ def test_RemoveMemberFromForeignDomain(pipe, domain_handle):
     dcerpc.samr_RemoveMemberFromForeignDomain(pipe, r)
 
 def test_CreateUser2(pipe, domain_handle):
-    pass
+
+    print 'test samr_CreateUser2'
+
+    r = {}
+    r['domain_handle'] = domain_handle
+    r['access_mask'] = 0x02000000
+    r['account_name'] = {}
+    r['account_name']['name_len'] = 0
+    r['account_name']['name_size'] = 0
+    r['account_name']['name'] = 'samrtorturemach$'
+    r['acct_flags'] = 0x0080            # WSTRUST
+
+    try:
+        dcerpc.samr_CreateUser2(pipe, r)
+    except dcerpc.NTSTATUS, arg:
+        if arg[0] == 0xc0000022:
+            return
+        elif arg[0] == 0xc0000063:
+            test_DeleteUser_byname(pipe, domain_handle, 'samrtorturemach$')
+            result = dcerpc.samr_CreateUser(pipe, r)
+        else:
+            raise dcerpc.NTSTATUS(arg)
 
 def test_LookupName(pipe, domain_handle, name):
 
@@ -214,7 +235,24 @@ def test_QueryUserInfo2(pipe, user_handle):
         dcerpc.samr_QueryUserInfo2(pipe, r)
 
 def test_SetUserInfo(pipe, user_handle):
-    pass
+
+    r = {}
+    r['user_handle'] = user_handle
+    r['level'] = 2
+    r['info'] = {}
+    r['info']['info2'] = {}
+    r['info']['info2']['comment'] = {}
+    r['info']['info2']['comment']['name_len'] = 0
+    r['info']['info2']['comment']['name_size'] = 0
+    r['info']['info2']['comment']['name'] = 'hello'
+    r['info']['info2']['unknown'] = {}
+    r['info']['info2']['unknown']['name_len'] = 0
+    r['info']['info2']['unknown']['name_size'] = 0
+    r['info']['info2']['unknown']['name'] = None
+    r['info']['info2']['country_code'] = 0
+    r['info']['info2']['code_page'] = 0
+
+    dcerpc.samr_SetUserInfo(pipe, r)
 
 def test_GetUserPwInfo(pipe, user_handle):
 
@@ -303,32 +341,114 @@ def test_DeleteAlias_byname(pipe, domain_handle, alias_name):
 
     dcerpc.samr_DeleteDomAlias(pipe, s)
 
-def test_alias_ops(pipe, alias_handle, domain_handle, domain_sid):
-    pass
+def test_QueryAliasInfo(pipe, alias_handle):
+
+    levels = [1, 2, 3]
+
+    for i in range(0, len(levels)):
+
+        r = {}
+        r['alias_handle'] = alias_handle
+        r['level']  = levels[i]
+
+        dcerpc.samr_QueryAliasInfo(pipe, r)
+
+def test_SetAliasInfo(pipe, alias_handle):
+
+    r = {}
+    r['alias_handle'] = alias_handle
+    r['level'] = 2
+    r['info'] = {}
+    r['info']['name'] = {}
+    r['info']['name']['name_len'] = 0
+    r['info']['name']['name_size'] = 0
+    r['info']['name']['name'] = 'hello'
+
+    dcerpc.samr_SetAliasInfo(pipe, r)
+
+    del(r['info']['name'])
+
+    r['level'] = 3
+    r['info']['description'] = {}
+    r['info']['description']['name_len'] = 0
+    r['info']['description']['name_size'] = 0
+    r['info']['description']['name'] = 'this is a description'
+    
+    dcerpc.samr_SetAliasInfo(pipe, r)
+
+def test_AddMemberToAlias(pipe, alias_handle, domain_sid):
+
+    r = {}
+    r['alias_handle'] = alias_handle
+    r['sid'] = domain_sid
+
+    r['sid']['num_auths'] = r['sid']['num_auths'] + 1
+    r['sid']['sub_auths'].append(512)
+
+    dcerpc.samr_AddAliasMember(pipe, r)
+
+    dcerpc.samr_DeleteAliasMember(pipe, r)
+
+def test_AddMultipleMembersToAlias(pipe, alias_handle):
+
+    r = {}
+    r['alias_handle'] = alias_handle
+    r['sids'] = {}
+    r['sids']['num_sids'] = 2
+    r['sids']['sids'] = []
+
+    for i in range(0,2):
+        sid = {}
+        sid['sid_rev_num'] = 1
+        sid['id_auth'] = [0, 0, 0, 0, 0, 5]
+        sid['num_auths'] = 5
+        sid['sub_auths'] = [21, 737922324, -1292160505, 1285293260, 512 + i]
+
+        r['sids']['sids'].append({'sid': sid})
+
+    dcerpc.samr_AddMultipleMembersToAlias(pipe, r)
+
+    dcerpc.samr_RemoveMultipleMembersFromAlias(pipe, r)
+
+def test_alias_ops(pipe, alias_handle, domain_sid):
+
+    test_QuerySecurity(pipe, alias_handle)
+
+    test_QueryAliasInfo(pipe, alias_handle)
+
+    test_SetAliasInfo(pipe, alias_handle)
+
+    test_AddMemberToAlias(pipe, alias_handle, domain_sid)
+
+    test_AddMultipleMembersToAlias(pipe, alias_handle)
 
 def test_CreateAlias(pipe, domain_handle, domain_sid):
 
     print 'test samr_CreateAlias'    
 
+    alias_name = 'samrtorturetestalias'
+
     r = {}
     r['domain_handle'] = domain_handle
     r['aliasname'] = {}
     r['aliasname']['name_len'] = 0
     r['aliasname']['name_size'] = 0
-    r['aliasname']['name'] = 'samrtorturetestalias'
+    r['aliasname']['name'] = alias_name
     r['access_mask'] = 0x02000000
 
     try:
         result = dcerpc.samr_CreateDomAlias(pipe, r)
     except dcerpc.NTSTATUS, arg:
-        if arg[0] != 0xc0000154:
+        if arg[0] == 0xc0000022:
+            return
+        if arg[0] != 0xc0000063:
             raise dcerpc.NTSTATUS(arg)
-        test_DeleteAlias_byname(pipe, domain_handle, 'samrtorturetestalias')
+        test_DeleteAlias_byname(pipe, domain_handle, alias_name)
         result = dcerpc.samr_CreateDomAlias(pipe, r)
 
     alias_handle = result['alias_handle']
 
-    test_alias_ops(pipe, alias_handle, domain_handle, domain_sid)
+    test_alias_ops(pipe, alias_handle, domain_sid)
 
     return alias_handle
 
@@ -363,6 +483,8 @@ def test_CreateDomainGroup(pipe, domain_handle):
     try:
         result = dcerpc.samr_CreateDomainGroup(pipe, r)
     except dcerpc.NTSTATUS, arg:
+        if arg[0] == 0xc0000022:
+            return
         if arg[0] != 0xc0000065:
             raise dcerpc.NTSTATUS(arg)
 
@@ -466,43 +588,180 @@ def test_EnumDomainAliases(pipe, domain_handle):
         break
 
 def test_QueryDisplayInfo(pipe, domain_handle):
-    pass
+
+    print 'testing samr_QueryDisplayInfo'
+
+    levels = [1, 2, 3, 4, 5]
+
+    for i in range(0, len(levels)):
+
+        r = {}
+        r['domain_handle'] = domain_handle
+        r['level'] = levels[i]
+        r['start_idx'] = 0
+        r['max_entries'] = 1000
+        r['buf_size'] = -1
+
+        dcerpc.samr_QueryDisplayInfo(pipe, r)
 
 def test_QueryDisplayInfo2(pipe, domain_handle):
-    pass
+
+    print 'testing samr_QueryDisplayInfo2'
+
+    levels = [1, 2, 3, 4, 5]
+
+    for i in range(0, len(levels)):
+
+        r = {}
+        r['domain_handle'] = domain_handle
+        r['level'] = levels[i]
+        r['start_idx'] = 0
+        r['max_entries'] = 1000
+        r['buf_size'] = -1
+
+        dcerpc.samr_QueryDisplayInfo2(pipe, r)
     
 def test_QueryDisplayInfo3(pipe, domain_handle):
-    pass
+
+    print 'testing samr_QueryDisplayInfo3'
+
+    levels = [1, 2, 3, 4, 5]
+
+    for i in range(0, len(levels)):
+
+        r = {}
+        r['domain_handle'] = domain_handle
+        r['level'] = levels[i]
+        r['start_idx'] = 0
+        r['max_entries'] = 1000
+        r['buf_size'] = -1
+
+        dcerpc.samr_QueryDisplayInfo3(pipe, r)
 
 def test_GetDisplayEnumerationIndex(pipe, domain_handle):
-    pass
+
+    print 'testing samr_GetDisplayEnumerationIndex'
+
+    levels = [1, 2, 3, 4, 5]
+    ok_lvl = [1, 1, 1, 0, 0]
+
+    for i in range(0, len(levels)):
+
+        r = {}
+        r['domain_handle'] = domain_handle
+        r['level'] = levels[i]
+        r['name'] = {}
+        r['name']['name_len'] = 0
+        r['name']['name_size'] = 0
+        r['name']['name'] = 'samrtorturetest'
+
+        try:
+            dcerpc.samr_GetDisplayEnumerationIndex(pipe, r)
+        except dcerpc.NTSTATUS, arg:
+            if ok_lvl[i]:
+                raise dcerpc.NTSTATUS(arg)
+
+        r['name']['name'] = 'zzzzzzzz'
+
+        try:
+            dcerpc.samr_GetDisplayEnumerationIndex(pipe, r)
+        except dcerpc.NTSTATUS, arg:
+            if ok_lvl[i]:
+                raise dcerpc.NTSTATUS(arg)            
 
 def test_GetDisplayEnumerationIndex2(pipe, domain_handle):
-    pass
 
-def test_GroupList(pipe, domain_handle):
-    pass
+    print 'testing samr_GetDisplayEnumerationIndex2'
+
+    levels = [1, 2, 3, 4, 5]
+    ok_lvl = [1, 1, 1, 0, 0]
+
+    for i in range(0, len(levels)):
+
+        r = {}
+        r['domain_handle'] = domain_handle
+        r['level'] = levels[i]
+        r['name'] = {}
+        r['name']['name_len'] = 0
+        r['name']['name_size'] = 0
+        r['name']['name'] = 'samrtorturetest'
+
+        try:
+            dcerpc.samr_GetDisplayEnumerationIndex2(pipe, r)
+        except dcerpc.NTSTATUS, arg:
+            if ok_lvl[i]:
+                raise dcerpc.NTSTATUS(arg)
+
+        r['name']['name'] = 'zzzzzzzz'
+
+        try:
+            dcerpc.samr_GetDisplayEnumerationIndex2(pipe, r)
+        except dcerpc.NTSTATUS, arg:
+            if ok_lvl[i]:
+                raise dcerpc.NTSTATUS(arg)            
 
 def test_TestPrivateFunctionsDomain(pipe, domain_handle):
-    pass
+
+    print 'test samr.TestPrivateFunctionsDomain'
+
+    r = {}
+    r['domain_handle'] = domain_handle
+
+    try:
+        dcerpc.samr_TestPrivateFunctionsDomain(pipe, r)
+    except dcerpc.NTSTATUS, arg:
+        if arg[0] != 0xc0000002:
+            raise dcerpc.NTSTATUS(arg)
 
 def test_RidToSid(pipe, domain_handle):
-    pass
+
+    print 'testing samr_RidToSid'
+
+    r = {}
+    r['domain_handle'] = domain_handle
+    r['rid'] = 512
+
+    dcerpc.samr_RidToSid(pipe, r)
 
 def test_GetBootKeyInformation(pipe, domain_handle):
-    pass
+
+    print 'testing samr_GetBootKeyInformation'
+
+    r = {}
+    r['domain_handle'] = domain_handle
+
+    try:
+        dcerpc.samr_GetBootKeyInformation(pipe, r)
+    except dcerpc.NTSTATUS, arg:
+        pass
 
 def test_DeleteUser(pipe, user_handle):
-    pass
+
+    r = {}
+    r['user_handle'] = user_handle
+
+    dcerpc.samr_DeleteUser(pipe, r)
 
 def test_DeleteAlias(pipe, alias_handle):
-    pass
 
+    r = {}
+    r['alias_handle'] = alias_handle
+
+    dcerpc.samr_DeleteDomAlias(pipe, r)
+    
 def test_DeleteDomainGroup(pipe, group_handle):
-    pass
 
-def test_Close(pipe, domain_handle):
-    pass
+    r = {}
+    r['group_handle'] = group_handle
+
+    dcerpc.samr_DeleteDomainGroup(pipe, r)
+
+def test_Close(pipe, handle):
+
+    r = {}
+    r['handle'] = handle
+
+    dcerpc.samr_Close(pipe, r)
 
 def test_OpenDomain(pipe, connect_handle, domain_sid):
 
@@ -539,8 +798,6 @@ def test_OpenDomain(pipe, connect_handle, domain_sid):
 
     test_EnumDomainAliases(pipe, domain_handle)
 
-    sys.exit(1)
-
     test_QueryDisplayInfo(pipe, domain_handle)
 
     test_QueryDisplayInfo2(pipe, domain_handle)
@@ -551,19 +808,20 @@ def test_OpenDomain(pipe, connect_handle, domain_sid):
 
     test_GetDisplayEnumerationIndex2(pipe, domain_handle)
 
-    test_GroupList(pipe, domain_handle)
-
     test_TestPrivateFunctionsDomain(pipe, domain_handle)
 
     test_RidToSid(pipe, domain_handle)
 
     test_GetBootKeyInformation(pipe, domain_handle)
 
-    test_DeleteUser(pipe, user_handle)
+    if user_handle != None:
+        test_DeleteUser(pipe, user_handle)
 
-    test_DeleteAlias(pipe, alias_handle)
+    if alias_handle != None:
+        test_DeleteAlias(pipe, alias_handle)
 
-    test_DeleteDomainGroup(pipe, group_handle)
+    if group_handle != None:
+        test_DeleteDomainGroup(pipe, group_handle)
 
     test_Close(pipe, domain_handle)
     
-- 
cgit 


From 15568d45e1d8cc3928647476baecab2d5d7d852e Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Wed, 22 Sep 2004 11:48:10 +0000
Subject: r2511: Add NT status codes. (This used to be commit
 471b13da2b0893a58977154dbe4d004d5c06aed4)

---
 source4/scripting/swig/dcerpc.i        | 520 +++++++++++++++++++++++++++++++++
 source4/scripting/swig/torture/samr.py |  34 +--
 2 files changed, 537 insertions(+), 17 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/dcerpc.i b/source4/scripting/swig/dcerpc.i
index 125b32df78..7a8a0e4a83 100644
--- a/source4/scripting/swig/dcerpc.i
+++ b/source4/scripting/swig/dcerpc.i
@@ -229,6 +229,526 @@ PyObject *string_ptr_to_python(TALLOC_CTX *mem_ctx, char *obj)
 
 %include "samba.i"
 
+/* Win32 status codes */
+
+#define STATUS_BUFFER_OVERFLOW            0x80000005
+#define STATUS_NO_MORE_FILES              0x80000006
+#define NT_STATUS_NO_MORE_ENTRIES         0x8000001a
+
+#define STATUS_MORE_ENTRIES               0x0105
+#define STATUS_SOME_UNMAPPED              0x0107
+#define ERROR_INVALID_PARAMETER		  0x0057
+#define ERROR_INSUFFICIENT_BUFFER	  0x007a
+#define STATUS_NOTIFY_ENUM_DIR            0x010c
+#define ERROR_INVALID_DATATYPE		  0x070c
+
+/* NT status codes */
+
+#define NT_STATUS_OK 0x00000000
+#define NT_STATUS_UNSUCCESSFUL 0xC0000001
+#define NT_STATUS_NOT_IMPLEMENTED 0xC0000002
+#define NT_STATUS_INVALID_INFO_CLASS 0xC0000003
+#define NT_STATUS_INFO_LENGTH_MISMATCH 0xC0000004
+#define NT_STATUS_ACCESS_VIOLATION 0xC0000005
+#define NT_STATUS_IN_PAGE_ERROR 0xC0000006
+#define NT_STATUS_PAGEFILE_QUOTA 0xC0000007
+#define NT_STATUS_INVALID_HANDLE 0xC0000008
+#define NT_STATUS_BAD_INITIAL_STACK 0xC0000009
+#define NT_STATUS_BAD_INITIAL_PC 0xC000000a
+#define NT_STATUS_INVALID_CID 0xC000000b
+#define NT_STATUS_TIMER_NOT_CANCELED 0xC000000c
+#define NT_STATUS_INVALID_PARAMETER 0xC000000d
+#define NT_STATUS_NO_SUCH_DEVICE 0xC000000e
+#define NT_STATUS_NO_SUCH_FILE 0xC000000f
+#define NT_STATUS_INVALID_DEVICE_REQUEST 0xC0000010
+#define NT_STATUS_END_OF_FILE 0xC0000011
+#define NT_STATUS_WRONG_VOLUME 0xC0000012
+#define NT_STATUS_NO_MEDIA_IN_DEVICE 0xC0000013
+#define NT_STATUS_UNRECOGNIZED_MEDIA 0xC0000014
+#define NT_STATUS_NONEXISTENT_SECTOR 0xC0000015
+#define NT_STATUS_MORE_PROCESSING_REQUIRED 0xC0000016
+#define NT_STATUS_NO_MEMORY 0xC0000017
+#define NT_STATUS_CONFLICTING_ADDRESSES 0xC0000018
+#define NT_STATUS_NOT_MAPPED_VIEW 0xC0000019
+#define NT_STATUS_UNABLE_TO_FREE_VM 0xC000001a
+#define NT_STATUS_UNABLE_TO_DELETE_SECTION 0xC000001b
+#define NT_STATUS_INVALID_SYSTEM_SERVICE 0xC000001c
+#define NT_STATUS_ILLEGAL_INSTRUCTION 0xC000001d
+#define NT_STATUS_INVALID_LOCK_SEQUENCE 0xC000001e
+#define NT_STATUS_INVALID_VIEW_SIZE 0xC000001f
+#define NT_STATUS_INVALID_FILE_FOR_SECTION 0xC0000020
+#define NT_STATUS_ALREADY_COMMITTED 0xC0000021
+#define NT_STATUS_ACCESS_DENIED 0xC0000022
+#define NT_STATUS_BUFFER_TOO_SMALL 0xC0000023
+#define NT_STATUS_OBJECT_TYPE_MISMATCH 0xC0000024
+#define NT_STATUS_NONCONTINUABLE_EXCEPTION 0xC0000025
+#define NT_STATUS_INVALID_DISPOSITION 0xC0000026
+#define NT_STATUS_UNWIND 0xC0000027
+#define NT_STATUS_BAD_STACK 0xC0000028
+#define NT_STATUS_INVALID_UNWIND_TARGET 0xC0000029
+#define NT_STATUS_NOT_LOCKED 0xC000002a
+#define NT_STATUS_PARITY_ERROR 0xC000002b
+#define NT_STATUS_UNABLE_TO_DECOMMIT_VM 0xC000002c
+#define NT_STATUS_NOT_COMMITTED 0xC000002d
+#define NT_STATUS_INVALID_PORT_ATTRIBUTES 0xC000002e
+#define NT_STATUS_PORT_MESSAGE_TOO_LONG 0xC000002f
+#define NT_STATUS_INVALID_PARAMETER_MIX 0xC0000030
+#define NT_STATUS_INVALID_QUOTA_LOWER 0xC0000031
+#define NT_STATUS_DISK_CORRUPT_ERROR 0xC0000032
+#define NT_STATUS_OBJECT_NAME_INVALID 0xC0000033
+#define NT_STATUS_OBJECT_NAME_NOT_FOUND 0xC0000034
+#define NT_STATUS_OBJECT_NAME_COLLISION 0xC0000035
+#define NT_STATUS_HANDLE_NOT_WAITABLE 0xC0000036
+#define NT_STATUS_PORT_DISCONNECTED 0xC0000037
+#define NT_STATUS_DEVICE_ALREADY_ATTACHED 0xC0000038
+#define NT_STATUS_OBJECT_PATH_INVALID 0xC0000039
+#define NT_STATUS_OBJECT_PATH_NOT_FOUND 0xC000003a
+#define NT_STATUS_OBJECT_PATH_SYNTAX_BAD 0xC000003b
+#define NT_STATUS_DATA_OVERRUN 0xC000003c
+#define NT_STATUS_DATA_LATE_ERROR 0xC000003d
+#define NT_STATUS_DATA_ERROR 0xC000003e
+#define NT_STATUS_CRC_ERROR 0xC000003f
+#define NT_STATUS_SECTION_TOO_BIG 0xC0000040
+#define NT_STATUS_PORT_CONNECTION_REFUSED 0xC0000041
+#define NT_STATUS_INVALID_PORT_HANDLE 0xC0000042
+#define NT_STATUS_SHARING_VIOLATION 0xC0000043
+#define NT_STATUS_QUOTA_EXCEEDED 0xC0000044
+#define NT_STATUS_INVALID_PAGE_PROTECTION 0xC0000045
+#define NT_STATUS_MUTANT_NOT_OWNED 0xC0000046
+#define NT_STATUS_SEMAPHORE_LIMIT_EXCEEDED 0xC0000047
+#define NT_STATUS_PORT_ALREADY_SET 0xC0000048
+#define NT_STATUS_SECTION_NOT_IMAGE 0xC0000049
+#define NT_STATUS_SUSPEND_COUNT_EXCEEDED 0xC000004a
+#define NT_STATUS_THREAD_IS_TERMINATING 0xC000004b
+#define NT_STATUS_BAD_WORKING_SET_LIMIT 0xC000004c
+#define NT_STATUS_INCOMPATIBLE_FILE_MAP 0xC000004d
+#define NT_STATUS_SECTION_PROTECTION 0xC000004e
+#define NT_STATUS_EAS_NOT_SUPPORTED 0xC000004f
+#define NT_STATUS_EA_TOO_LARGE 0xC0000050
+#define NT_STATUS_NONEXISTENT_EA_ENTRY 0xC0000051
+#define NT_STATUS_NO_EAS_ON_FILE 0xC0000052
+#define NT_STATUS_EA_CORRUPT_ERROR 0xC0000053
+#define NT_STATUS_FILE_LOCK_CONFLICT 0xC0000054
+#define NT_STATUS_LOCK_NOT_GRANTED 0xC0000055
+#define NT_STATUS_DELETE_PENDING 0xC0000056
+#define NT_STATUS_CTL_FILE_NOT_SUPPORTED 0xC0000057
+#define NT_STATUS_UNKNOWN_REVISION 0xC0000058
+#define NT_STATUS_REVISION_MISMATCH 0xC0000059
+#define NT_STATUS_INVALID_OWNER 0xC000005a
+#define NT_STATUS_INVALID_PRIMARY_GROUP 0xC000005b
+#define NT_STATUS_NO_IMPERSONATION_TOKEN 0xC000005c
+#define NT_STATUS_CANT_DISABLE_MANDATORY 0xC000005d
+#define NT_STATUS_NO_LOGON_SERVERS 0xC000005e
+#define NT_STATUS_NO_SUCH_LOGON_SESSION 0xC000005f
+#define NT_STATUS_NO_SUCH_PRIVILEGE 0xC0000060
+#define NT_STATUS_PRIVILEGE_NOT_HELD 0xC0000061
+#define NT_STATUS_INVALID_ACCOUNT_NAME 0xC0000062
+#define NT_STATUS_USER_EXISTS 0xC0000063
+#define NT_STATUS_NO_SUCH_USER 0xC0000064
+#define NT_STATUS_GROUP_EXISTS 0xC0000065
+#define NT_STATUS_NO_SUCH_GROUP 0xC0000066
+#define NT_STATUS_MEMBER_IN_GROUP 0xC0000067
+#define NT_STATUS_MEMBER_NOT_IN_GROUP 0xC0000068
+#define NT_STATUS_LAST_ADMIN 0xC0000069
+#define NT_STATUS_WRONG_PASSWORD 0xC000006a
+#define NT_STATUS_ILL_FORMED_PASSWORD 0xC000006b
+#define NT_STATUS_PASSWORD_RESTRICTION 0xC000006c
+#define NT_STATUS_LOGON_FAILURE 0xC000006d
+#define NT_STATUS_ACCOUNT_RESTRICTION 0xC000006e
+#define NT_STATUS_INVALID_LOGON_HOURS 0xC000006f
+#define NT_STATUS_INVALID_WORKSTATION 0xC0000070
+#define NT_STATUS_PASSWORD_EXPIRED 0xC0000071
+#define NT_STATUS_ACCOUNT_DISABLED 0xC0000072
+#define NT_STATUS_NONE_MAPPED 0xC0000073
+#define NT_STATUS_TOO_MANY_LUIDS_REQUESTED 0xC0000074
+#define NT_STATUS_LUIDS_EXHAUSTED 0xC0000075
+#define NT_STATUS_INVALID_SUB_AUTHORITY 0xC0000076
+#define NT_STATUS_INVALID_ACL 0xC0000077
+#define NT_STATUS_INVALID_SID 0xC0000078
+#define NT_STATUS_INVALID_SECURITY_DESCR 0xC0000079
+#define NT_STATUS_PROCEDURE_NOT_FOUND 0xC000007a
+#define NT_STATUS_INVALID_IMAGE_FORMAT 0xC000007b
+#define NT_STATUS_NO_TOKEN 0xC000007c
+#define NT_STATUS_BAD_INHERITANCE_ACL 0xC000007d
+#define NT_STATUS_RANGE_NOT_LOCKED 0xC000007e
+#define NT_STATUS_DISK_FULL 0xC000007f
+#define NT_STATUS_SERVER_DISABLED 0xC0000080
+#define NT_STATUS_SERVER_NOT_DISABLED 0xC0000081
+#define NT_STATUS_TOO_MANY_GUIDS_REQUESTED 0xC0000082
+#define NT_STATUS_GUIDS_EXHAUSTED 0xC0000083
+#define NT_STATUS_INVALID_ID_AUTHORITY 0xC0000084
+#define NT_STATUS_AGENTS_EXHAUSTED 0xC0000085
+#define NT_STATUS_INVALID_VOLUME_LABEL 0xC0000086
+#define NT_STATUS_SECTION_NOT_EXTENDED 0xC0000087
+#define NT_STATUS_NOT_MAPPED_DATA 0xC0000088
+#define NT_STATUS_RESOURCE_DATA_NOT_FOUND 0xC0000089
+#define NT_STATUS_RESOURCE_TYPE_NOT_FOUND 0xC000008a
+#define NT_STATUS_RESOURCE_NAME_NOT_FOUND 0xC000008b
+#define NT_STATUS_ARRAY_BOUNDS_EXCEEDED 0xC000008c
+#define NT_STATUS_FLOAT_DENORMAL_OPERAND 0xC000008d
+#define NT_STATUS_FLOAT_DIVIDE_BY_ZERO 0xC000008e
+#define NT_STATUS_FLOAT_INEXACT_RESULT 0xC000008f
+#define NT_STATUS_FLOAT_INVALID_OPERATION 0xC0000090
+#define NT_STATUS_FLOAT_OVERFLOW 0xC0000091
+#define NT_STATUS_FLOAT_STACK_CHECK 0xC0000092
+#define NT_STATUS_FLOAT_UNDERFLOW 0xC0000093
+#define NT_STATUS_INTEGER_DIVIDE_BY_ZERO 0xC0000094
+#define NT_STATUS_INTEGER_OVERFLOW 0xC0000095
+#define NT_STATUS_PRIVILEGED_INSTRUCTION 0xC0000096
+#define NT_STATUS_TOO_MANY_PAGING_FILES 0xC0000097
+#define NT_STATUS_FILE_INVALID 0xC0000098
+#define NT_STATUS_ALLOTTED_SPACE_EXCEEDED 0xC0000099
+#define NT_STATUS_INSUFFICIENT_RESOURCES 0xC000009a
+#define NT_STATUS_DFS_EXIT_PATH_FOUND 0xC000009b
+#define NT_STATUS_DEVICE_DATA_ERROR 0xC000009c
+#define NT_STATUS_DEVICE_NOT_CONNECTED 0xC000009d
+#define NT_STATUS_DEVICE_POWER_FAILURE 0xC000009e
+#define NT_STATUS_FREE_VM_NOT_AT_BASE 0xC000009f
+#define NT_STATUS_MEMORY_NOT_ALLOCATED 0xC00000a0
+#define NT_STATUS_WORKING_SET_QUOTA 0xC00000a1
+#define NT_STATUS_MEDIA_WRITE_PROTECTED 0xC00000a2
+#define NT_STATUS_DEVICE_NOT_READY 0xC00000a3
+#define NT_STATUS_INVALID_GROUP_ATTRIBUTES 0xC00000a4
+#define NT_STATUS_BAD_IMPERSONATION_LEVEL 0xC00000a5
+#define NT_STATUS_CANT_OPEN_ANONYMOUS 0xC00000a6
+#define NT_STATUS_BAD_VALIDATION_CLASS 0xC00000a7
+#define NT_STATUS_BAD_TOKEN_TYPE 0xC00000a8
+#define NT_STATUS_BAD_MASTER_BOOT_RECORD 0xC00000a9
+#define NT_STATUS_INSTRUCTION_MISALIGNMENT 0xC00000aa
+#define NT_STATUS_INSTANCE_NOT_AVAILABLE 0xC00000ab
+#define NT_STATUS_PIPE_NOT_AVAILABLE 0xC00000ac
+#define NT_STATUS_INVALID_PIPE_STATE 0xC00000ad
+#define NT_STATUS_PIPE_BUSY 0xC00000ae
+#define NT_STATUS_ILLEGAL_FUNCTION 0xC00000af
+#define NT_STATUS_PIPE_DISCONNECTED 0xC00000b0
+#define NT_STATUS_PIPE_CLOSING 0xC00000b1
+#define NT_STATUS_PIPE_CONNECTED 0xC00000b2
+#define NT_STATUS_PIPE_LISTENING 0xC00000b3
+#define NT_STATUS_INVALID_READ_MODE 0xC00000b4
+#define NT_STATUS_IO_TIMEOUT 0xC00000b5
+#define NT_STATUS_FILE_FORCED_CLOSED 0xC00000b6
+#define NT_STATUS_PROFILING_NOT_STARTED 0xC00000b7
+#define NT_STATUS_PROFILING_NOT_STOPPED 0xC00000b8
+#define NT_STATUS_COULD_NOT_INTERPRET 0xC00000b9
+#define NT_STATUS_FILE_IS_A_DIRECTORY 0xC00000ba
+#define NT_STATUS_NOT_SUPPORTED 0xC00000bb
+#define NT_STATUS_REMOTE_NOT_LISTENING 0xC00000bc
+#define NT_STATUS_DUPLICATE_NAME 0xC00000bd
+#define NT_STATUS_BAD_NETWORK_PATH 0xC00000be
+#define NT_STATUS_NETWORK_BUSY 0xC00000bf
+#define NT_STATUS_DEVICE_DOES_NOT_EXIST 0xC00000c0
+#define NT_STATUS_TOO_MANY_COMMANDS 0xC00000c1
+#define NT_STATUS_ADAPTER_HARDWARE_ERROR 0xC00000c2
+#define NT_STATUS_INVALID_NETWORK_RESPONSE 0xC00000c3
+#define NT_STATUS_UNEXPECTED_NETWORK_ERROR 0xC00000c4
+#define NT_STATUS_BAD_REMOTE_ADAPTER 0xC00000c5
+#define NT_STATUS_PRINT_QUEUE_FULL 0xC00000c6
+#define NT_STATUS_NO_SPOOL_SPACE 0xC00000c7
+#define NT_STATUS_PRINT_CANCELLED 0xC00000c8
+#define NT_STATUS_NETWORK_NAME_DELETED 0xC00000c9
+#define NT_STATUS_NETWORK_ACCESS_DENIED 0xC00000ca
+#define NT_STATUS_BAD_DEVICE_TYPE 0xC00000cb
+#define NT_STATUS_BAD_NETWORK_NAME 0xC00000cc
+#define NT_STATUS_TOO_MANY_NAMES 0xC00000cd
+#define NT_STATUS_TOO_MANY_SESSIONS 0xC00000ce
+#define NT_STATUS_SHARING_PAUSED 0xC00000cf
+#define NT_STATUS_REQUEST_NOT_ACCEPTED 0xC00000d0
+#define NT_STATUS_REDIRECTOR_PAUSED 0xC00000d1
+#define NT_STATUS_NET_WRITE_FAULT 0xC00000d2
+#define NT_STATUS_PROFILING_AT_LIMIT 0xC00000d3
+#define NT_STATUS_NOT_SAME_DEVICE 0xC00000d4
+#define NT_STATUS_FILE_RENAMED 0xC00000d5
+#define NT_STATUS_VIRTUAL_CIRCUIT_CLOSED 0xC00000d6
+#define NT_STATUS_NO_SECURITY_ON_OBJECT 0xC00000d7
+#define NT_STATUS_CANT_WAIT 0xC00000d8
+#define NT_STATUS_PIPE_EMPTY 0xC00000d9
+#define NT_STATUS_CANT_ACCESS_DOMAIN_INFO 0xC00000da
+#define NT_STATUS_CANT_TERMINATE_SELF 0xC00000db
+#define NT_STATUS_INVALID_SERVER_STATE 0xC00000dc
+#define NT_STATUS_INVALID_DOMAIN_STATE 0xC00000dd
+#define NT_STATUS_INVALID_DOMAIN_ROLE 0xC00000de
+#define NT_STATUS_NO_SUCH_DOMAIN 0xC00000df
+#define NT_STATUS_DOMAIN_EXISTS 0xC00000e0
+#define NT_STATUS_DOMAIN_LIMIT_EXCEEDED 0xC00000e1
+#define NT_STATUS_OPLOCK_NOT_GRANTED 0xC00000e2
+#define NT_STATUS_INVALID_OPLOCK_PROTOCOL 0xC00000e3
+#define NT_STATUS_INTERNAL_DB_CORRUPTION 0xC00000e4
+#define NT_STATUS_INTERNAL_ERROR 0xC00000e5
+#define NT_STATUS_GENERIC_NOT_MAPPED 0xC00000e6
+#define NT_STATUS_BAD_DESCRIPTOR_FORMAT 0xC00000e7
+#define NT_STATUS_INVALID_USER_BUFFER 0xC00000e8
+#define NT_STATUS_UNEXPECTED_IO_ERROR 0xC00000e9
+#define NT_STATUS_UNEXPECTED_MM_CREATE_ERR 0xC00000ea
+#define NT_STATUS_UNEXPECTED_MM_MAP_ERROR 0xC00000eb
+#define NT_STATUS_UNEXPECTED_MM_EXTEND_ERR 0xC00000ec
+#define NT_STATUS_NOT_LOGON_PROCESS 0xC00000ed
+#define NT_STATUS_LOGON_SESSION_EXISTS 0xC00000ee
+#define NT_STATUS_INVALID_PARAMETER_1 0xC00000ef
+#define NT_STATUS_INVALID_PARAMETER_2 0xC00000f0
+#define NT_STATUS_INVALID_PARAMETER_3 0xC00000f1
+#define NT_STATUS_INVALID_PARAMETER_4 0xC00000f2
+#define NT_STATUS_INVALID_PARAMETER_5 0xC00000f3
+#define NT_STATUS_INVALID_PARAMETER_6 0xC00000f4
+#define NT_STATUS_INVALID_PARAMETER_7 0xC00000f5
+#define NT_STATUS_INVALID_PARAMETER_8 0xC00000f6
+#define NT_STATUS_INVALID_PARAMETER_9 0xC00000f7
+#define NT_STATUS_INVALID_PARAMETER_10 0xC00000f8
+#define NT_STATUS_INVALID_PARAMETER_11 0xC00000f9
+#define NT_STATUS_INVALID_PARAMETER_12 0xC00000fa
+#define NT_STATUS_REDIRECTOR_NOT_STARTED 0xC00000fb
+#define NT_STATUS_REDIRECTOR_STARTED 0xC00000fc
+#define NT_STATUS_STACK_OVERFLOW 0xC00000fd
+#define NT_STATUS_NO_SUCH_PACKAGE 0xC00000fe
+#define NT_STATUS_BAD_FUNCTION_TABLE 0xC00000ff
+#define NT_STATUS_DIRECTORY_NOT_EMPTY 0xC0000101
+#define NT_STATUS_FILE_CORRUPT_ERROR 0xC0000102
+#define NT_STATUS_NOT_A_DIRECTORY 0xC0000103
+#define NT_STATUS_BAD_LOGON_SESSION_STATE 0xC0000104
+#define NT_STATUS_LOGON_SESSION_COLLISION 0xC0000105
+#define NT_STATUS_NAME_TOO_LONG 0xC0000106
+#define NT_STATUS_FILES_OPEN 0xC0000107
+#define NT_STATUS_CONNECTION_IN_USE 0xC0000108
+#define NT_STATUS_MESSAGE_NOT_FOUND 0xC0000109
+#define NT_STATUS_PROCESS_IS_TERMINATING 0xC000010a
+#define NT_STATUS_INVALID_LOGON_TYPE 0xC000010b
+#define NT_STATUS_NO_GUID_TRANSLATION 0xC000010c
+#define NT_STATUS_CANNOT_IMPERSONATE 0xC000010d
+#define NT_STATUS_IMAGE_ALREADY_LOADED 0xC000010e
+#define NT_STATUS_ABIOS_NOT_PRESENT 0xC000010f
+#define NT_STATUS_ABIOS_LID_NOT_EXIST 0xC0000110
+#define NT_STATUS_ABIOS_LID_ALREADY_OWNED 0xC0000111
+#define NT_STATUS_ABIOS_NOT_LID_OWNER 0xC0000112
+#define NT_STATUS_ABIOS_INVALID_COMMAND 0xC0000113
+#define NT_STATUS_ABIOS_INVALID_LID 0xC0000114
+#define NT_STATUS_ABIOS_SELECTOR_NOT_AVAILABLE 0xC0000115
+#define NT_STATUS_ABIOS_INVALID_SELECTOR 0xC0000116
+#define NT_STATUS_NO_LDT 0xC0000117
+#define NT_STATUS_INVALID_LDT_SIZE 0xC0000118
+#define NT_STATUS_INVALID_LDT_OFFSET 0xC0000119
+#define NT_STATUS_INVALID_LDT_DESCRIPTOR 0xC000011a
+#define NT_STATUS_INVALID_IMAGE_NE_FORMAT 0xC000011b
+#define NT_STATUS_RXACT_INVALID_STATE 0xC000011c
+#define NT_STATUS_RXACT_COMMIT_FAILURE 0xC000011d
+#define NT_STATUS_MAPPED_FILE_SIZE_ZERO 0xC000011e
+#define NT_STATUS_TOO_MANY_OPENED_FILES 0xC000011f
+#define NT_STATUS_CANCELLED 0xC0000120
+#define NT_STATUS_CANNOT_DELETE 0xC0000121
+#define NT_STATUS_INVALID_COMPUTER_NAME 0xC0000122
+#define NT_STATUS_FILE_DELETED 0xC0000123
+#define NT_STATUS_SPECIAL_ACCOUNT 0xC0000124
+#define NT_STATUS_SPECIAL_GROUP 0xC0000125
+#define NT_STATUS_SPECIAL_USER 0xC0000126
+#define NT_STATUS_MEMBERS_PRIMARY_GROUP 0xC0000127
+#define NT_STATUS_FILE_CLOSED 0xC0000128
+#define NT_STATUS_TOO_MANY_THREADS 0xC0000129
+#define NT_STATUS_THREAD_NOT_IN_PROCESS 0xC000012a
+#define NT_STATUS_TOKEN_ALREADY_IN_USE 0xC000012b
+#define NT_STATUS_PAGEFILE_QUOTA_EXCEEDED 0xC000012c
+#define NT_STATUS_COMMITMENT_LIMIT 0xC000012d
+#define NT_STATUS_INVALID_IMAGE_LE_FORMAT 0xC000012e
+#define NT_STATUS_INVALID_IMAGE_NOT_MZ 0xC000012f
+#define NT_STATUS_INVALID_IMAGE_PROTECT 0xC0000130
+#define NT_STATUS_INVALID_IMAGE_WIN_16 0xC0000131
+#define NT_STATUS_LOGON_SERVER_CONFLICT 0xC0000132
+#define NT_STATUS_TIME_DIFFERENCE_AT_DC 0xC0000133
+#define NT_STATUS_SYNCHRONIZATION_REQUIRED 0xC0000134
+#define NT_STATUS_DLL_NOT_FOUND 0xC0000135
+#define NT_STATUS_OPEN_FAILED 0xC0000136
+#define NT_STATUS_IO_PRIVILEGE_FAILED 0xC0000137
+#define NT_STATUS_ORDINAL_NOT_FOUND 0xC0000138
+#define NT_STATUS_ENTRYPOINT_NOT_FOUND 0xC0000139
+#define NT_STATUS_CONTROL_C_EXIT 0xC000013a
+#define NT_STATUS_LOCAL_DISCONNECT 0xC000013b
+#define NT_STATUS_REMOTE_DISCONNECT 0xC000013c
+#define NT_STATUS_REMOTE_RESOURCES 0xC000013d
+#define NT_STATUS_LINK_FAILED 0xC000013e
+#define NT_STATUS_LINK_TIMEOUT 0xC000013f
+#define NT_STATUS_INVALID_CONNECTION 0xC0000140
+#define NT_STATUS_INVALID_ADDRESS 0xC0000141
+#define NT_STATUS_DLL_INIT_FAILED 0xC0000142
+#define NT_STATUS_MISSING_SYSTEMFILE 0xC0000143
+#define NT_STATUS_UNHANDLED_EXCEPTION 0xC0000144
+#define NT_STATUS_APP_INIT_FAILURE 0xC0000145
+#define NT_STATUS_PAGEFILE_CREATE_FAILED 0xC0000146
+#define NT_STATUS_NO_PAGEFILE 0xC0000147
+#define NT_STATUS_INVALID_LEVEL 0xC0000148
+#define NT_STATUS_WRONG_PASSWORD_CORE 0xC0000149
+#define NT_STATUS_ILLEGAL_FLOAT_CONTEXT 0xC000014a
+#define NT_STATUS_PIPE_BROKEN 0xC000014b
+#define NT_STATUS_REGISTRY_CORRUPT 0xC000014c
+#define NT_STATUS_REGISTRY_IO_FAILED 0xC000014d
+#define NT_STATUS_NO_EVENT_PAIR 0xC000014e
+#define NT_STATUS_UNRECOGNIZED_VOLUME 0xC000014f
+#define NT_STATUS_SERIAL_NO_DEVICE_INITED 0xC0000150
+#define NT_STATUS_NO_SUCH_ALIAS 0xC0000151
+#define NT_STATUS_MEMBER_NOT_IN_ALIAS 0xC0000152
+#define NT_STATUS_MEMBER_IN_ALIAS 0xC0000153
+#define NT_STATUS_ALIAS_EXISTS 0xC0000154
+#define NT_STATUS_LOGON_NOT_GRANTED 0xC0000155
+#define NT_STATUS_TOO_MANY_SECRETS 0xC0000156
+#define NT_STATUS_SECRET_TOO_LONG 0xC0000157
+#define NT_STATUS_INTERNAL_DB_ERROR 0xC0000158
+#define NT_STATUS_FULLSCREEN_MODE 0xC0000159
+#define NT_STATUS_TOO_MANY_CONTEXT_IDS 0xC000015a
+#define NT_STATUS_LOGON_TYPE_NOT_GRANTED 0xC000015b
+#define NT_STATUS_NOT_REGISTRY_FILE 0xC000015c
+#define NT_STATUS_NT_CROSS_ENCRYPTION_REQUIRED 0xC000015d
+#define NT_STATUS_DOMAIN_CTRLR_CONFIG_ERROR 0xC000015e
+#define NT_STATUS_FT_MISSING_MEMBER 0xC000015f
+#define NT_STATUS_ILL_FORMED_SERVICE_ENTRY 0xC0000160
+#define NT_STATUS_ILLEGAL_CHARACTER 0xC0000161
+#define NT_STATUS_UNMAPPABLE_CHARACTER 0xC0000162
+#define NT_STATUS_UNDEFINED_CHARACTER 0xC0000163
+#define NT_STATUS_FLOPPY_VOLUME 0xC0000164
+#define NT_STATUS_FLOPPY_ID_MARK_NOT_FOUND 0xC0000165
+#define NT_STATUS_FLOPPY_WRONG_CYLINDER 0xC0000166
+#define NT_STATUS_FLOPPY_UNKNOWN_ERROR 0xC0000167
+#define NT_STATUS_FLOPPY_BAD_REGISTERS 0xC0000168
+#define NT_STATUS_DISK_RECALIBRATE_FAILED 0xC0000169
+#define NT_STATUS_DISK_OPERATION_FAILED 0xC000016a
+#define NT_STATUS_DISK_RESET_FAILED 0xC000016b
+#define NT_STATUS_SHARED_IRQ_BUSY 0xC000016c
+#define NT_STATUS_FT_ORPHANING 0xC000016d
+#define NT_STATUS_PARTITION_FAILURE 0xC0000172
+#define NT_STATUS_INVALID_BLOCK_LENGTH 0xC0000173
+#define NT_STATUS_DEVICE_NOT_PARTITIONED 0xC0000174
+#define NT_STATUS_UNABLE_TO_LOCK_MEDIA 0xC0000175
+#define NT_STATUS_UNABLE_TO_UNLOAD_MEDIA 0xC0000176
+#define NT_STATUS_EOM_OVERFLOW 0xC0000177
+#define NT_STATUS_NO_MEDIA 0xC0000178
+#define NT_STATUS_NO_SUCH_MEMBER 0xC000017a
+#define NT_STATUS_INVALID_MEMBER 0xC000017b
+#define NT_STATUS_KEY_DELETED 0xC000017c
+#define NT_STATUS_NO_LOG_SPACE 0xC000017d
+#define NT_STATUS_TOO_MANY_SIDS 0xC000017e
+#define NT_STATUS_LM_CROSS_ENCRYPTION_REQUIRED 0xC000017f
+#define NT_STATUS_KEY_HAS_CHILDREN 0xC0000180
+#define NT_STATUS_CHILD_MUST_BE_VOLATILE 0xC0000181
+#define NT_STATUS_DEVICE_CONFIGURATION_ERROR 0xC0000182
+#define NT_STATUS_DRIVER_INTERNAL_ERROR 0xC0000183
+#define NT_STATUS_INVALID_DEVICE_STATE 0xC0000184
+#define NT_STATUS_IO_DEVICE_ERROR 0xC0000185
+#define NT_STATUS_DEVICE_PROTOCOL_ERROR 0xC0000186
+#define NT_STATUS_BACKUP_CONTROLLER 0xC0000187
+#define NT_STATUS_LOG_FILE_FULL 0xC0000188
+#define NT_STATUS_TOO_LATE 0xC0000189
+#define NT_STATUS_NO_TRUST_LSA_SECRET 0xC000018a
+#define NT_STATUS_NO_TRUST_SAM_ACCOUNT 0xC000018b
+#define NT_STATUS_TRUSTED_DOMAIN_FAILURE 0xC000018c
+#define NT_STATUS_TRUSTED_RELATIONSHIP_FAILURE 0xC000018d
+#define NT_STATUS_EVENTLOG_FILE_CORRUPT 0xC000018e
+#define NT_STATUS_EVENTLOG_CANT_START 0xC000018f
+#define NT_STATUS_TRUST_FAILURE 0xC0000190
+#define NT_STATUS_MUTANT_LIMIT_EXCEEDED 0xC0000191
+#define NT_STATUS_NETLOGON_NOT_STARTED 0xC0000192
+#define NT_STATUS_ACCOUNT_EXPIRED 0xC0000193
+#define NT_STATUS_POSSIBLE_DEADLOCK 0xC0000194
+#define NT_STATUS_NETWORK_CREDENTIAL_CONFLICT 0xC0000195
+#define NT_STATUS_REMOTE_SESSION_LIMIT 0xC0000196
+#define NT_STATUS_EVENTLOG_FILE_CHANGED 0xC0000197
+#define NT_STATUS_NOLOGON_INTERDOMAIN_TRUST_ACCOUNT 0xC0000198
+#define NT_STATUS_NOLOGON_WORKSTATION_TRUST_ACCOUNT 0xC0000199
+#define NT_STATUS_NOLOGON_SERVER_TRUST_ACCOUNT 0xC000019a
+#define NT_STATUS_DOMAIN_TRUST_INCONSISTENT 0xC000019b
+#define NT_STATUS_FS_DRIVER_REQUIRED 0xC000019c
+#define NT_STATUS_NO_USER_SESSION_KEY 0xC0000202
+#define NT_STATUS_USER_SESSION_DELETED 0xC0000203
+#define NT_STATUS_RESOURCE_LANG_NOT_FOUND 0xC0000204
+#define NT_STATUS_INSUFF_SERVER_RESOURCES 0xC0000205
+#define NT_STATUS_INVALID_BUFFER_SIZE 0xC0000206
+#define NT_STATUS_INVALID_ADDRESS_COMPONENT 0xC0000207
+#define NT_STATUS_INVALID_ADDRESS_WILDCARD 0xC0000208
+#define NT_STATUS_TOO_MANY_ADDRESSES 0xC0000209
+#define NT_STATUS_ADDRESS_ALREADY_EXISTS 0xC000020a
+#define NT_STATUS_ADDRESS_CLOSED 0xC000020b
+#define NT_STATUS_CONNECTION_DISCONNECTED 0xC000020c
+#define NT_STATUS_CONNECTION_RESET 0xC000020d
+#define NT_STATUS_TOO_MANY_NODES 0xC000020e
+#define NT_STATUS_TRANSACTION_ABORTED 0xC000020f
+#define NT_STATUS_TRANSACTION_TIMED_OUT 0xC0000210
+#define NT_STATUS_TRANSACTION_NO_RELEASE 0xC0000211
+#define NT_STATUS_TRANSACTION_NO_MATCH 0xC0000212
+#define NT_STATUS_TRANSACTION_RESPONDED 0xC0000213
+#define NT_STATUS_TRANSACTION_INVALID_ID 0xC0000214
+#define NT_STATUS_TRANSACTION_INVALID_TYPE 0xC0000215
+#define NT_STATUS_NOT_SERVER_SESSION 0xC0000216
+#define NT_STATUS_NOT_CLIENT_SESSION 0xC0000217
+#define NT_STATUS_CANNOT_LOAD_REGISTRY_FILE 0xC0000218
+#define NT_STATUS_DEBUG_ATTACH_FAILED 0xC0000219
+#define NT_STATUS_SYSTEM_PROCESS_TERMINATED 0xC000021a
+#define NT_STATUS_DATA_NOT_ACCEPTED 0xC000021b
+#define NT_STATUS_NO_BROWSER_SERVERS_FOUND 0xC000021c
+#define NT_STATUS_VDM_HARD_ERROR 0xC000021d
+#define NT_STATUS_DRIVER_CANCEL_TIMEOUT 0xC000021e
+#define NT_STATUS_REPLY_MESSAGE_MISMATCH 0xC000021f
+#define NT_STATUS_MAPPED_ALIGNMENT 0xC0000220
+#define NT_STATUS_IMAGE_CHECKSUM_MISMATCH 0xC0000221
+#define NT_STATUS_LOST_WRITEBEHIND_DATA 0xC0000222
+#define NT_STATUS_CLIENT_SERVER_PARAMETERS_INVALID 0xC0000223
+#define NT_STATUS_PASSWORD_MUST_CHANGE 0xC0000224
+#define NT_STATUS_NOT_FOUND 0xC0000225
+#define NT_STATUS_NOT_TINY_STREAM 0xC0000226
+#define NT_STATUS_RECOVERY_FAILURE 0xC0000227
+#define NT_STATUS_STACK_OVERFLOW_READ 0xC0000228
+#define NT_STATUS_FAIL_CHECK 0xC0000229
+#define NT_STATUS_DUPLICATE_OBJECTID 0xC000022a
+#define NT_STATUS_OBJECTID_EXISTS 0xC000022b
+#define NT_STATUS_CONVERT_TO_LARGE 0xC000022c
+#define NT_STATUS_RETRY 0xC000022d
+#define NT_STATUS_FOUND_OUT_OF_SCOPE 0xC000022e
+#define NT_STATUS_ALLOCATE_BUCKET 0xC000022f
+#define NT_STATUS_PROPSET_NOT_FOUND 0xC0000230
+#define NT_STATUS_MARSHALL_OVERFLOW 0xC0000231
+#define NT_STATUS_INVALID_VARIANT 0xC0000232
+#define NT_STATUS_DOMAIN_CONTROLLER_NOT_FOUND 0xC0000233
+#define NT_STATUS_ACCOUNT_LOCKED_OUT 0xC0000234
+#define NT_STATUS_HANDLE_NOT_CLOSABLE 0xC0000235
+#define NT_STATUS_CONNECTION_REFUSED 0xC0000236
+#define NT_STATUS_GRACEFUL_DISCONNECT 0xC0000237
+#define NT_STATUS_ADDRESS_ALREADY_ASSOCIATED 0xC0000238
+#define NT_STATUS_ADDRESS_NOT_ASSOCIATED 0xC0000239
+#define NT_STATUS_CONNECTION_INVALID 0xC000023a
+#define NT_STATUS_CONNECTION_ACTIVE 0xC000023b
+#define NT_STATUS_NETWORK_UNREACHABLE 0xC000023c
+#define NT_STATUS_HOST_UNREACHABLE 0xC000023d
+#define NT_STATUS_PROTOCOL_UNREACHABLE 0xC000023e
+#define NT_STATUS_PORT_UNREACHABLE 0xC000023f
+#define NT_STATUS_REQUEST_ABORTED 0xC0000240
+#define NT_STATUS_CONNECTION_ABORTED 0xC0000241
+#define NT_STATUS_BAD_COMPRESSION_BUFFER 0xC0000242
+#define NT_STATUS_USER_MAPPED_FILE 0xC0000243
+#define NT_STATUS_AUDIT_FAILED 0xC0000244
+#define NT_STATUS_TIMER_RESOLUTION_NOT_SET 0xC0000245
+#define NT_STATUS_CONNECTION_COUNT_LIMIT 0xC0000246
+#define NT_STATUS_LOGIN_TIME_RESTRICTION 0xC0000247
+#define NT_STATUS_LOGIN_WKSTA_RESTRICTION 0xC0000248
+#define NT_STATUS_IMAGE_MP_UP_MISMATCH 0xC0000249
+#define NT_STATUS_INSUFFICIENT_LOGON_INFO 0xC0000250
+#define NT_STATUS_BAD_DLL_ENTRYPOINT 0xC0000251
+#define NT_STATUS_BAD_SERVICE_ENTRYPOINT 0xC0000252
+#define NT_STATUS_LPC_REPLY_LOST 0xC0000253
+#define NT_STATUS_IP_ADDRESS_CONFLICT1 0xC0000254
+#define NT_STATUS_IP_ADDRESS_CONFLICT2 0xC0000255
+#define NT_STATUS_REGISTRY_QUOTA_LIMIT 0xC0000256
+#define NT_STATUS_PATH_NOT_COVERED 0xC0000257
+#define NT_STATUS_NO_CALLBACK_ACTIVE 0xC0000258
+#define NT_STATUS_LICENSE_QUOTA_EXCEEDED 0xC0000259
+#define NT_STATUS_PWD_TOO_SHORT 0xC000025a
+#define NT_STATUS_PWD_TOO_RECENT 0xC000025b
+#define NT_STATUS_PWD_HISTORY_CONFLICT 0xC000025c
+#define NT_STATUS_PLUGPLAY_NO_DEVICE 0xC000025e
+#define NT_STATUS_UNSUPPORTED_COMPRESSION 0xC000025f
+#define NT_STATUS_INVALID_HW_PROFILE 0xC0000260
+#define NT_STATUS_INVALID_PLUGPLAY_DEVICE_PATH 0xC0000261
+#define NT_STATUS_DRIVER_ORDINAL_NOT_FOUND 0xC0000262
+#define NT_STATUS_DRIVER_ENTRYPOINT_NOT_FOUND 0xC0000263
+#define NT_STATUS_RESOURCE_NOT_OWNED 0xC0000264
+#define NT_STATUS_TOO_MANY_LINKS 0xC0000265
+#define NT_STATUS_QUOTA_LIST_INCONSISTENT 0xC0000266
+#define NT_STATUS_FILE_IS_OFFLINE 0xC0000267
+#define NT_STATUS_NOT_A_REPARSE_POINT 0xC0000275
+#define NT_STATUS_NO_SUCH_JOB 0xC0000EDE
+
 %pythoncode %{
 	NTSTATUS = _dcerpc.NTSTATUS
 %}
diff --git a/source4/scripting/swig/torture/samr.py b/source4/scripting/swig/torture/samr.py
index 9bf50cbefb..68b065b677 100755
--- a/source4/scripting/swig/torture/samr.py
+++ b/source4/scripting/swig/torture/samr.py
@@ -148,9 +148,9 @@ def test_CreateUser2(pipe, domain_handle):
     try:
         dcerpc.samr_CreateUser2(pipe, r)
     except dcerpc.NTSTATUS, arg:
-        if arg[0] == 0xc0000022:
+        if arg[0] == dcerpc.NT_STATUS_ACCESS_DENIED:
             return
-        elif arg[0] == 0xc0000063:
+        elif arg[0] == dcerpc.NT_STATUS_USER_EXISTS:
             test_DeleteUser_byname(pipe, domain_handle, 'samrtorturemach$')
             result = dcerpc.samr_CreateUser(pipe, r)
         else:
@@ -177,7 +177,7 @@ def test_LookupName(pipe, domain_handle, name):
     try:
         dcerpc.samr_LookupNames(pipe, r)
     except dcerpc.NTSTATUS, arg:
-        if arg[0] != 0x00000107:
+        if arg[0] != dcerpc.STATUS_SOME_UNMAPPED:
             raise dcerpc.NTSTATUS(arg)
 
     r['num_names'] = 0
@@ -273,7 +273,7 @@ def test_TestPrivateFunctionsUser(pipe, user_handle):
     try:
         dcerpc.samr_TestPrivateFunctionsUser(pipe, r)
     except dcerpc.NTSTATUS, arg:
-        if arg[0] != 0xc0000002:
+        if arg[0] != dcerpc.NT_STATUS_NOT_IMPLEMENTED:
             raise dcerpc.NTSTATUS(arg)
 
 def test_user_ops(pipe, user_handle):
@@ -305,9 +305,9 @@ def test_CreateUser(pipe, domain_handle):
     try:
         result = dcerpc.samr_CreateUser(pipe, r)
     except dcerpc.NTSTATUS, arg:
-        if arg[0] == 0xc0000022:
+        if arg[0] == dcerpc.NT_STATUS_ACCESS_DENIED:
             return
-        elif arg[0] == 0xc0000063:
+        elif arg[0] == dcerpc.NT_STATUS_USER_EXISTS:
             test_DeleteUser_byname(pipe, domain_handle, 'samrtorturetest')
             result = dcerpc.samr_CreateUser(pipe, r)
         else:
@@ -439,9 +439,9 @@ def test_CreateAlias(pipe, domain_handle, domain_sid):
     try:
         result = dcerpc.samr_CreateDomAlias(pipe, r)
     except dcerpc.NTSTATUS, arg:
-        if arg[0] == 0xc0000022:
+        if arg[0] == dcerpc.NT_STATUS_ACCESS_DENIED:
             return
-        if arg[0] != 0xc0000063:
+        if arg[0] != dcerpc.NT_STATUS_USER_EXISTS:
             raise dcerpc.NTSTATUS(arg)
         test_DeleteAlias_byname(pipe, domain_handle, alias_name)
         result = dcerpc.samr_CreateDomAlias(pipe, r)
@@ -483,9 +483,9 @@ def test_CreateDomainGroup(pipe, domain_handle):
     try:
         result = dcerpc.samr_CreateDomainGroup(pipe, r)
     except dcerpc.NTSTATUS, arg:
-        if arg[0] == 0xc0000022:
+        if arg[0] == dcerpc.NT_STATUS_ACCESS_DENIED:
             return
-        if arg[0] != 0xc0000065:
+        if arg[0] != dcerpc.NT_STATUS_GROUP_EXISTS:
             raise dcerpc.NTSTATUS(arg)
 
         test_DeleteGroup_byname(pipe, domain_handle, 'samrtorturetestgroup')
@@ -519,7 +519,7 @@ def test_QueryDomainInfo(pipe, domain_handle):
         except dcerpc.NTSTATUS, arg:
             if set_ok[i]:
                 raise dcerpc.NTSTATUS(arg)
-            if arg[0] != 0xc0000003:
+            if arg[0] != dcerpc.NT_STATUS_INVALID_INFO_CLASS:
                 raise dcerpc.NTSTATUS(arg)
 
 def test_QueryDomainInfo2(pipe, domain_handle):
@@ -548,7 +548,7 @@ def test_EnumDomainUsers(pipe, domain_handle):
 
     while 1:
         result = dcerpc.samr_EnumDomainUsers(pipe, r)
-        if result['result'] == 0x00000105:
+        if result['result'] == dcerpc.STATUS_MORE_ENTRIES:
             r['resume_handle'] = result['resume_handle']
             continue
         break
@@ -565,7 +565,7 @@ def test_EnumDomainGroups(pipe, domain_handle):
     
     while 1:
         result = dcerpc.samr_EnumDomainGroups(pipe, r)
-        if result['result'] == 0x00000105:
+        if result['result'] == dcerpc.STATUS_MORE_ENTRIES:
             r['resume_handle'] = result['resume_handle']
             continue
         break
@@ -582,7 +582,7 @@ def test_EnumDomainAliases(pipe, domain_handle):
 
     while 1:
         result = dcerpc.samr_EnumDomainAliases(pipe, r)
-        if result['result'] == 0x00000105:
+        if result['result'] == dcerpc.STATUS_MORE_ENTRIES:
             r['resume_handle'] = result['resume_handle']
             continue
         break
@@ -710,7 +710,7 @@ def test_TestPrivateFunctionsDomain(pipe, domain_handle):
     try:
         dcerpc.samr_TestPrivateFunctionsDomain(pipe, r)
     except dcerpc.NTSTATUS, arg:
-        if arg[0] != 0xc0000002:
+        if arg[0] != dcerpc.NT_STATUS_NOT_IMPLEMENTED:
             raise dcerpc.NTSTATUS(arg)
 
 def test_RidToSid(pipe, domain_handle):
@@ -839,7 +839,7 @@ def test_LookupDomain(pipe, connect_handle, domain):
     try:
         dcerpc.samr_LookupDomain(pipe, r)
     except dcerpc.NTSTATUS, arg:
-        if arg[0] != 0xc000000d:
+        if arg[0] != dcerpc.NT_STATUS_INVALID_PARAMETER:
             raise dcerpc.NTSTATUS(arg)
 
     r['domain']['name'] = 'xxNODOMAINxx'
@@ -847,7 +847,7 @@ def test_LookupDomain(pipe, connect_handle, domain):
     try:
         dcerpc.samr_LookupDomain(pipe, r)
     except dcerpc.NTSTATUS, arg:
-        if arg[0] != 0xc00000df:
+        if arg[0] != dcerpc.NT_STATUS_NO_SUCH_DOMAIN:
             raise dcerpc.NTSTATUS(arg)
 
     r['domain']['name'] = domain
-- 
cgit 


From 169627d7f55f9f58a6564a9efe659a529bbf348a Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Thu, 23 Sep 2004 02:21:11 +0000
Subject: r2555: Start of a rpcclient type program. (This used to be commit
 c9d682731226b7ef222f588c43df5a1f62c21555)

---
 source4/scripting/swig/rpcclient | 154 ++++++++++++++++++++++++++++++++++++
 source4/scripting/swig/samr.py   | 165 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 319 insertions(+)
 create mode 100755 source4/scripting/swig/rpcclient
 create mode 100644 source4/scripting/swig/samr.py

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/rpcclient b/source4/scripting/swig/rpcclient
new file mode 100755
index 0000000000..2a3d12cc8e
--- /dev/null
+++ b/source4/scripting/swig/rpcclient
@@ -0,0 +1,154 @@
+#!/usr/bin/python
+
+import sys, os, string
+from cmd import Cmd
+from optparse import OptionParser
+
+
+import dcerpc, samr
+
+class rpcclient(Cmd):
+
+    prompt = 'rpcclient$ '
+
+    def __init__(self, binding, domain, username, password):
+        Cmd.__init__(self)
+        self.binding = binding
+        self.domain = domain
+        self.username = username
+        self.password = password
+
+    def emptyline(self):
+
+        # Default for empty line is to repeat last command - yuck
+
+        pass
+
+    def onecmd(self, line):
+
+        # Override the onecmd() method so we can trap error returns
+
+        try:
+            Cmd.onecmd(self, line)
+        except dcerpc.NTSTATUS, arg:
+            print 'The command returned an error: %s' % arg[1]
+            
+    # Command handlers
+
+    def do_help(self, line):
+        """Displays on-line help for rpcclient commands."""
+        Cmd.do_help(self, line)
+
+    def do_shell(self, line):
+
+        status = os.system(line)
+
+        if os.WIFEXITED(status):
+            if os.WEXITSTATUS(status) != 0:
+                print 'Command exited with code %d' % os.WEXITSTATUS(status)
+        else:
+            print 'Command exited with signal %d' % os.WTERMSIG(status)
+            
+    def do_EOF(self, line):
+        """Exits rpcclient."""
+        print
+        sys.exit(0)
+
+    # SAMR pipe commands
+
+    def do_SamrEnumDomains(self, line):
+        """Enumerate domain names."""
+        
+        usage = 'usage: SamrEnumDomains'
+
+        if line != '':
+            print usage
+            return
+
+        pipe = dcerpc.pipe_connect(
+            self.binding,
+            dcerpc.DCERPC_SAMR_UUID, dcerpc.DCERPC_SAMR_VERSION,
+            self.domain, self.username, self.password)
+
+        connect_handle = samr.Connect(pipe)
+
+        for i in connect_handle.EnumDomains():
+            print i
+
+    def do_SamrLookupDomain(self, line):
+        """Return the SID for a domain."""
+
+        usage = 'SamrLookupDomain DOMAIN'
+
+        parser = OptionParser(usage)
+        options, args = parser.parse_args(string.split(line))
+
+        if len(args) != 1:
+            print 'usage:', usage
+            return
+
+        pipe = dcerpc.pipe_connect(
+            self.binding,
+            dcerpc.DCERPC_SAMR_UUID, dcerpc.DCERPC_SAMR_VERSION,
+            self.domain, self.username, self.password)
+
+        connect_handle = samr.Connect(pipe)
+
+        print connect_handle.LookupDomain(args[0])
+
+if __name__ == '__main__':
+
+    # Parse command line
+
+    usage = 'rpcclient BINDING [options]'
+
+    if len(sys.argv) == 1:
+        print usage
+        sys.exit(1)
+
+    binding = sys.argv[1]
+    del(sys.argv[1])
+
+    if string.find(binding, ':') == -1:
+        binding = 'ncacn_np:' + binding
+
+    parser = OptionParser(usage)
+
+    parser.add_option('-U', '--username', action='store', type='string',
+                      help='Use given credentials when connecting',
+                      metavar='DOMAIN\\username%password',
+                      dest='username')
+
+    parser.add_option('-c', '--command', action='store', type='string',
+                      help='Execute COMMAND', dest='command')
+
+    options, args = parser.parse_args()
+
+    # Break --username up into domain, usernamd and password
+
+    if not options.username:
+        options.username = '%'
+
+    domain = ''
+    if string.find(options.username, '\\') != -1:
+        domain, options.username = string.split(options.username, '\\')
+
+    password = ''
+    if string.find(options.username, '%') != -1:
+        options.username, password  = string.split(options.username, '%')
+
+    username = options.username
+
+    # Run command loop
+
+    c = rpcclient(binding, domain, username, password)
+
+    if options.command:
+        c.onecmd(options.command)
+        sys.exit(0)
+
+    while 1:
+        try:
+            c.cmdloop()
+        except KeyboardInterrupt:
+            print 'KeyboardInterrupt'
diff --git a/source4/scripting/swig/samr.py b/source4/scripting/swig/samr.py
new file mode 100644
index 0000000000..5fd87da3ad
--- /dev/null
+++ b/source4/scripting/swig/samr.py
@@ -0,0 +1,165 @@
+import dcerpc
+
+def sid_to_string(sid):
+    """Convert a Python dictionary SID to a string SID."""
+
+    result = 'S-%d' % sid['sid_rev_num']
+
+    ia = sid['id_auth']
+    
+    result = result + '-%u' % (ia[5] + (ia[4] << 8) + (ia[3] << 16) + \
+             (ia[2] << 24))
+    
+    for i in range(0, sid['num_auths']):
+        result = result + '-%u' % sid['sub_auths'][i]
+
+    return result
+
+def string_to_sid(string):
+    """Convert a string SID to a Python dictionary SID.  Throws a
+    ValueError if the SID string was badly formed."""
+
+    if string[0] != 'S':
+        raise ValueError('Bad SID format')
+
+    string = string[1:]
+
+    import re
+
+    match = re.match('-\d+', string)
+
+    if not match:
+        raise ValueError('Bad SID format')
+
+    try:
+        sid_rev_num = int(string[match.start()+1:match.end()])
+    except ValueError:
+        raise ValueError('Bad SID format')
+
+    string = string[match.end():]
+
+    match = re.match('-\d+', string)
+
+    if not match:
+        raise ValueError('Bad SID format')
+
+    try:
+        ia = int(string[match.start()+1:match.end()])
+    except ValueError:
+        raise ValueError('Bad SID format')
+
+    string = string[match.end():]
+
+    id_auth = [0, 0, (ia >> 24) & 0xff, (ia >> 16) & 0xff,
+               (ia >> 8) & 0xff, ia & 0xff]
+
+    num_auths = 0
+    sub_auths = []
+    
+    while len(string):
+
+        match = re.match('-\d+', string)
+
+        if not match:
+            raise ValueError('Bad SID format')
+
+        try:
+            sa = int(string[match.start() + 1 : match.end()])
+        except ValueError:
+            raise ValueError('Bad SID format')
+
+        num_auths = num_auths + 1
+        sub_auths.append(int(sa))
+
+        string = string[match.end():]
+    
+    print map(type, sub_auths)
+
+    return {'sid_rev_num': sid_rev_num, 'id_auth': id_auth,
+            'num_auths': num_auths, 'sub_auths': sub_auths}
+
+class SamrHandle:
+
+    def __init__(self, pipe, handle):
+
+        self.pipe = pipe
+        self.handle = handle
+
+    def __del__(self):
+
+        r = {}
+        r['handle'] = self.handle
+
+        dcerpc.samr_Close(self.pipe, r)
+
+class ConnectHandle(SamrHandle):
+
+    def EnumDomains(self):
+
+        r = {}
+        r['connect_handle'] = self.handle
+        r['resume_handle'] = 0
+        r['buf_size'] = -1
+
+        domains = []
+
+        while 1:
+
+            result = dcerpc.samr_EnumDomains(self.pipe, r)
+
+            domains = domains + result['sam']['entries']
+
+            if result['result'] == dcerpc.STATUS_MORE_ENTRIES:
+                r['resume_handle'] = result['resume_handle']
+                continue
+
+            break
+
+        return map(lambda x: x['name']['name'], domains)
+
+    def LookupDomain(self, domain_name):
+
+        r = {}
+        r['connect_handle'] = self.handle
+        r['domain'] = {}
+        r['domain']['name_len'] = 0
+        r['domain']['name_size'] = 0
+        r['domain']['name'] = domain_name
+
+        result = dcerpc.samr_LookupDomain(self.pipe, r)
+
+        return sid_to_string(result['sid'])
+
+    def OpenDomain(self, domain_sid, access_mask = 0x02000000):
+
+        r = {}
+        r['connect_handle'] = self.handle
+        r['access_mask'] = access_mask
+        r['sid'] = string_to_sid(domain_sid)
+
+        result = dcerpc.samr_OpenDomain(self.pipe, r)
+
+        return DomainHandle(pipe, result['domain_handle'])
+
+class DomainHandle(SamrHandle):
+
+    def QueryDomainInfo(self, level = 2):
+
+        r = {}
+        r['domain_handle'] = self.domain_handle
+        r['level'] = level
+
+        result = dcerpc.samr_QueryDomainInfo(pipe, r)
+
+        return result
+
+def Connect(pipe, system_name = None, access_mask = 0x02000000):
+    """Connect to the SAMR pipe."""
+
+    r = {}
+    r['system_name'] = system_name
+    r['access_mask'] = access_mask
+
+    result = dcerpc.samr_Connect2(pipe, r)
+
+    return ConnectHandle(pipe, result['connect_handle'])
-- 
cgit 


From 46cbe76a2c8c60bf14df941b2fcf6b8c5cad10e5 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Thu, 23 Sep 2004 03:26:14 +0000
Subject: r2559: Python ints can't hold the full range of uint32 values so
 store them as Python longs.

Also allow shorter width integer types to be initialised from long values.
Their values are truncated if they are too long.
(This used to be commit e9eb231d6441774d1b5227962bbe94aa29e20995)
---
 source4/scripting/swig/dcerpc.i        | 65 ++++++++++++++++++++++------------
 source4/scripting/swig/torture/samr.py | 12 +++++++
 2 files changed, 55 insertions(+), 22 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/dcerpc.i b/source4/scripting/swig/dcerpc.i
index 7a8a0e4a83..eb8b065e33 100644
--- a/source4/scripting/swig/dcerpc.i
+++ b/source4/scripting/swig/dcerpc.i
@@ -58,12 +58,15 @@ uint8 uint8_from_python(PyObject *obj, char *name)
 		return 0;
 	}
 
-	if (!PyInt_Check(obj)) {
-		PyErr_Format(PyExc_TypeError, "Expecting int value for %s", name);
+	if (!PyInt_Check(obj) && !PyLong_Check(obj)) {
+		PyErr_Format(PyExc_TypeError, "Expecting int or long value for %s", name);
 		return 0;
 	}
 
-	return (uint8)PyInt_AsLong(obj);
+	if (PyLong_Check(obj))
+		return (uint8)PyLong_AsLong(obj);
+	else
+		return (uint8)PyInt_AsLong(obj);
 }
 
 PyObject *uint8_to_python(uint8 obj)
@@ -78,12 +81,15 @@ uint16 uint16_from_python(PyObject *obj, char *name)
 		return 0;
 	}
 
-	if (!PyInt_Check(obj)) {
-		PyErr_Format(PyExc_TypeError, "Expecting int value for %s", name);
+	if (!PyInt_Check(obj) && !PyLong_Check(obj)) {
+		PyErr_Format(PyExc_TypeError, "Expecting int or long value for %s", name);
 		return 0;
 	}
 
-	return (uint16)PyInt_AsLong(obj);
+	if (PyLong_Check(obj))
+		return (uint16)PyLong_AsLong(obj);
+	else
+		return (uint16)PyInt_AsLong(obj);
 }
 
 PyObject *uint16_to_python(uint16 obj)
@@ -98,17 +104,20 @@ uint32 uint32_from_python(PyObject *obj, char *name)
 		return 0;
 	}
 
-	if (!PyInt_Check(obj)) {
-		PyErr_Format(PyExc_TypeError, "Expecting int value for %s", name);
+	if (!PyLong_Check(obj) && !PyInt_Check(obj)) {
+		PyErr_Format(PyExc_TypeError, "Expecting int or long value for %s", name);
 		return 0;
 	}
 
-	return (uint32)PyInt_AsLong(obj);
+	if (PyLong_Check(obj))
+		return (uint32)PyLong_AsLong(obj);
+	else
+		return (uint32)PyInt_AsLong(obj);
 }
 
 PyObject *uint32_to_python(uint32 obj)
 {
-	return PyInt_FromLong(obj);
+	return PyLong_FromLong(obj);
 }
 
 int64 int64_from_python(PyObject *obj, char *name)
@@ -118,12 +127,15 @@ int64 int64_from_python(PyObject *obj, char *name)
 		return 0;
 	}
 
-	if (!PyLong_Check(obj)) {
-		PyErr_Format(PyExc_TypeError, "Expecting long value for %s", name);
+	if (!PyLong_Check(obj) && !PyInt_Check(obj)) {
+		PyErr_Format(PyExc_TypeError, "Expecting int or long value for %s", name);
 		return 0;
 	}
 
-	return (int64)PyLong_AsLongLong(obj);
+	if (PyLong_Check(obj))
+		return (int64)PyLong_AsLongLong(obj);
+	else
+		return (int64)PyInt_AsLong(obj);
 }
 
 PyObject *int64_to_python(int64 obj)
@@ -138,12 +150,15 @@ uint64 uint64_from_python(PyObject *obj, char *name)
 		return 0;
 	}
 
-	if (!PyLong_Check(obj)) {
-		PyErr_Format(PyExc_TypeError, "Expecting long value for %s", name);
+	if (!PyLong_Check(obj) && !PyInt_Check(obj)) {
+		PyErr_Format(PyExc_TypeError, "Expecting int or long value for %s", name);
 		return 0;
 	}
 
-	return (uint64)PyLong_AsUnsignedLongLong(obj);
+	if (PyLong_Check(obj))
+		return (uint64)PyLong_AsUnsignedLongLong(obj);
+	else
+		return (uint64)PyInt_AsLong(obj);
 }
 
 PyObject *uint64_to_python(uint64 obj)
@@ -158,12 +173,15 @@ NTTIME NTTIME_from_python(PyObject *obj, char *name)
 		return 0;
 	}
 
-	if (!PyLong_Check(obj)) {
-		PyErr_Format(PyExc_TypeError, "Expecting long value for %s", name);
+	if (!PyLong_Check(obj) && !PyInt_Check(obj)) {
+		PyErr_Format(PyExc_TypeError, "Expecting int or long value for %s", name);
 		return 0;
 	}
 
-	return (NTTIME)PyLong_AsUnsignedLongLong(obj);
+	if (PyLong_Check(obj))
+		return (NTTIME)PyLong_AsUnsignedLongLong(obj);
+	else
+		return (NTTIME)PyInt_AsUnsignedLongMask(obj);
 }
 
 PyObject *NTTIME_to_python(NTTIME obj)
@@ -178,12 +196,15 @@ HYPER_T HYPER_T_from_python(PyObject *obj, char *name)
 		return 0;
 	}
 
-	if (!PyLong_Check(obj)) {
-		PyErr_Format(PyExc_TypeError, "Expecting long value for %s", name);
+	if (!PyLong_Check(obj) && !PyInt_Check(obj)) {
+		PyErr_Format(PyExc_TypeError, "Expecting int or long value for %s", name);
 		return 0;
 	}
 
-	return (HYPER_T)PyLong_AsUnsignedLongLong(obj);
+	if (PyLong_Check(obj))
+		return (HYPER_T)PyLong_AsUnsignedLongLong(obj);
+	else
+		return (HYPER_T)PyInt_AsUnsignedLongMask(obj);
 }
 
 PyObject *HYPER_T_to_python(HYPER_T obj)
diff --git a/source4/scripting/swig/torture/samr.py b/source4/scripting/swig/torture/samr.py
index 68b065b677..e462087ca0 100755
--- a/source4/scripting/swig/torture/samr.py
+++ b/source4/scripting/swig/torture/samr.py
@@ -872,6 +872,16 @@ def test_EnumDomains(pipe, connect_handle):
     for domain in result['sam']['entries']:
         test_LookupDomain(pipe, handle, domain['name']['name'])
 
+def test_LongInt(pipe):
+
+    # Check that we can use long values for shorter width types
+
+    r = {}
+    r['system_name'] = 0L;
+    r['access_mask'] = 0x02000000L
+
+    result = dcerpc.samr_Connect(pipe, r)
+
 # Parse command line
 
 parser = OptionParser()
@@ -908,6 +918,8 @@ pipe = dcerpc.pipe_connect(binding,
 	dcerpc.DCERPC_SAMR_UUID, dcerpc.DCERPC_SAMR_VERSION,
 	domain, username, password)
 
+test_LongInt(pipe)
+
 handle = test_Connect(pipe)
 
 test_QuerySecurity(pipe, handle)
-- 
cgit 


From 5821c39553f1d9899f6bcfb703876de767ccebf4 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Thu, 23 Sep 2004 03:32:46 +0000
Subject: r2560: Don't require structure fields that have the pidl value()
 property to be set.  They can be if you want, but will be overwritten by the
 pidl push code. (This used to be commit
 3170f6ed84e0514bf18d2a346f153bf0231b245b)

---
 source4/scripting/swig/torture/samr.py | 28 ++--------------------------
 1 file changed, 2 insertions(+), 26 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/torture/samr.py b/source4/scripting/swig/torture/samr.py
index e462087ca0..07bbaf3a93 100755
--- a/source4/scripting/swig/torture/samr.py
+++ b/source4/scripting/swig/torture/samr.py
@@ -100,8 +100,6 @@ def test_GetDomPwInfo(pipe, domain):
     r = {}
     r['handle'] = handle
     r['name'] = {}
-    r['name']['name_len'] = 0
-    r['name']['name_size'] = 0
     r['name']['name'] = domain
 
     dcerpc.samr_GetDomPwInfo(pipe, r)
@@ -140,8 +138,6 @@ def test_CreateUser2(pipe, domain_handle):
     r['domain_handle'] = domain_handle
     r['access_mask'] = 0x02000000
     r['account_name'] = {}
-    r['account_name']['name_len'] = 0
-    r['account_name']['name_size'] = 0
     r['account_name']['name'] = 'samrtorturemach$'
     r['acct_flags'] = 0x0080            # WSTRUST
 
@@ -164,14 +160,14 @@ def test_LookupName(pipe, domain_handle, name):
     r['domain_handle'] = domain_handle
     r['num_names'] = 1
     r['names'] = []
-    r['names'].append({'name_len': 0, 'name_size': 0, 'name': name})
+    r['names'].append({'name': name})
 
     result = dcerpc.samr_LookupNames(pipe, r)
 
     rid = result['rids']['ids'][0]
 
     r['num_names'] = 2
-    r['names'].append({'name_len': 0, 'name_size': 0, 'name': 'xxNONAMExx'})
+    r['names'].append({'name': 'xxNONAMExx'})
 
 
     try:
@@ -242,12 +238,8 @@ def test_SetUserInfo(pipe, user_handle):
     r['info'] = {}
     r['info']['info2'] = {}
     r['info']['info2']['comment'] = {}
-    r['info']['info2']['comment']['name_len'] = 0
-    r['info']['info2']['comment']['name_size'] = 0
     r['info']['info2']['comment']['name'] = 'hello'
     r['info']['info2']['unknown'] = {}
-    r['info']['info2']['unknown']['name_len'] = 0
-    r['info']['info2']['unknown']['name_size'] = 0
     r['info']['info2']['unknown']['name'] = None
     r['info']['info2']['country_code'] = 0
     r['info']['info2']['code_page'] = 0
@@ -297,8 +289,6 @@ def test_CreateUser(pipe, domain_handle):
     r = {}
     r['domain_handle'] = domain_handle
     r['account_name'] = {}
-    r['account_name']['name_len'] = 0
-    r['account_name']['name_size'] = 0
     r['account_name']['name'] = 'samrtorturetest'
     r['access_mask'] = 0x02000000
 
@@ -360,8 +350,6 @@ def test_SetAliasInfo(pipe, alias_handle):
     r['level'] = 2
     r['info'] = {}
     r['info']['name'] = {}
-    r['info']['name']['name_len'] = 0
-    r['info']['name']['name_size'] = 0
     r['info']['name']['name'] = 'hello'
 
     dcerpc.samr_SetAliasInfo(pipe, r)
@@ -370,8 +358,6 @@ def test_SetAliasInfo(pipe, alias_handle):
 
     r['level'] = 3
     r['info']['description'] = {}
-    r['info']['description']['name_len'] = 0
-    r['info']['description']['name_size'] = 0
     r['info']['description']['name'] = 'this is a description'
     
     dcerpc.samr_SetAliasInfo(pipe, r)
@@ -431,8 +417,6 @@ def test_CreateAlias(pipe, domain_handle, domain_sid):
     r = {}
     r['domain_handle'] = domain_handle
     r['aliasname'] = {}
-    r['aliasname']['name_len'] = 0
-    r['aliasname']['name_size'] = 0
     r['aliasname']['name'] = alias_name
     r['access_mask'] = 0x02000000
 
@@ -475,8 +459,6 @@ def test_CreateDomainGroup(pipe, domain_handle):
     r = {}
     r['domain_handle'] = domain_handle
     r['name'] = {}
-    r['name']['name_len'] = 0
-    r['name']['name_size'] = 0
     r['name']['name'] = 'samrtorturetestgroup'
     r['access_mask'] = 0x02000000
 
@@ -651,8 +633,6 @@ def test_GetDisplayEnumerationIndex(pipe, domain_handle):
         r['domain_handle'] = domain_handle
         r['level'] = levels[i]
         r['name'] = {}
-        r['name']['name_len'] = 0
-        r['name']['name_size'] = 0
         r['name']['name'] = 'samrtorturetest'
 
         try:
@@ -682,8 +662,6 @@ def test_GetDisplayEnumerationIndex2(pipe, domain_handle):
         r['domain_handle'] = domain_handle
         r['level'] = levels[i]
         r['name'] = {}
-        r['name']['name_len'] = 0
-        r['name']['name_size'] = 0
         r['name']['name'] = 'samrtorturetest'
 
         try:
@@ -832,8 +810,6 @@ def test_LookupDomain(pipe, connect_handle, domain):
     r = {}
     r['connect_handle'] = connect_handle
     r['domain'] = {}
-    r['domain']['name_len'] = 0
-    r['domain']['name_size'] = 0
     r['domain']['name'] = None
 
     try:
-- 
cgit 


From 83d0f6ffae928e8d8571216542cfb580accff028 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Tue, 28 Sep 2004 12:49:05 +0000
Subject: r2728: Break arg parsing stuff out of samr.py into a standalone
 program. (This used to be commit 799b377badebf9a3f388b7d3fdc36484aa5e3376)

---
 source4/scripting/swig/torture/pytorture | 37 +++++++++++++++++++
 source4/scripting/swig/torture/samr.py   | 63 ++++++++------------------------
 2 files changed, 53 insertions(+), 47 deletions(-)
 create mode 100755 source4/scripting/swig/torture/pytorture

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/torture/pytorture b/source4/scripting/swig/torture/pytorture
new file mode 100755
index 0000000000..89ecfbabcf
--- /dev/null
+++ b/source4/scripting/swig/torture/pytorture
@@ -0,0 +1,37 @@
+#!/usr/bin/python
+
+from optparse import OptionParser
+
+# Parse command line
+
+parser = OptionParser()
+
+parser.add_option("-b", "--binding", action="store", type="string",
+                  dest="binding")
+
+parser.add_option("-d", "--domain", action="store", type="string",
+                  dest="domain")
+
+parser.add_option("-u", "--username", action="store", type="string",
+                  dest="username")
+
+parser.add_option("-p", "--password", action="store", type="string",
+                  dest="password")
+
+(options, args) = parser.parse_args()
+
+if not options.binding:
+   parser.error('You must supply a binding string')
+
+if not options.username or not options.password or not options.domain:
+   parser.error('You must supply a domain, username and password')
+
+binding = options.binding
+domain = options.domain
+username = options.username
+password = options.password
+
+# Run tests
+
+import samr
+samr.runtests(binding, domain, username, password)
diff --git a/source4/scripting/swig/torture/samr.py b/source4/scripting/swig/torture/samr.py
index 07bbaf3a93..ba650dfe75 100755
--- a/source4/scripting/swig/torture/samr.py
+++ b/source4/scripting/swig/torture/samr.py
@@ -1,9 +1,8 @@
 #!/usr/bin/python
 
-import sys, dcerpc
-from optparse import OptionParser
+import dcerpc
 
-def test_Connect(handle):
+def test_Connect(pipe):
 
     print 'testing samr_Connect'
 
@@ -93,7 +92,7 @@ def test_QuerySecurity(pipe, handle):
 
     dcerpc.samr_QuerySecurity(pipe, r)
 
-def test_GetDomPwInfo(pipe, domain):
+def test_GetDomPwInfo(pipe, handle, domain):
 
     print 'testing samr_GetDomPwInfo'
 
@@ -830,23 +829,23 @@ def test_LookupDomain(pipe, connect_handle, domain):
 
     result = dcerpc.samr_LookupDomain(pipe, r)
 
-    test_GetDomPwInfo(pipe, domain)
+    test_GetDomPwInfo(pipe, connect_handle, domain)
 
-    test_OpenDomain(pipe, handle, result['sid'])
+    test_OpenDomain(pipe, connect_handle, result['sid'])
     
 def test_EnumDomains(pipe, connect_handle):
 
     print 'testing samr_EnumDomains'
 
     r = {}
-    r['connect_handle'] = handle
+    r['connect_handle'] = connect_handle
     r['resume_handle'] = 0
     r['buf_size'] = -1
 
     result = dcerpc.samr_EnumDomains(pipe, r)
 
     for domain in result['sam']['entries']:
-        test_LookupDomain(pipe, handle, domain['name']['name'])
+        test_LookupDomain(pipe, connect_handle, domain['name']['name'])
 
 def test_LongInt(pipe):
 
@@ -858,48 +857,18 @@ def test_LongInt(pipe):
 
     result = dcerpc.samr_Connect(pipe, r)
 
-# Parse command line
-
-parser = OptionParser()
-
-parser.add_option("-b", "--binding", action="store", type="string",
-                  dest="binding")
-
-parser.add_option("-d", "--domain", action="store", type="string",
-                  dest="domain")
-
-parser.add_option("-u", "--username", action="store", type="string",
-                  dest="username")
-
-parser.add_option("-p", "--password", action="store", type="string",
-                  dest="password")
-
-(options, args) = parser.parse_args()
-
-if not options.binding:
-   parser.error('You must supply a binding string')
-
-if not options.username or not options.password or not options.domain:
-   parser.error('You must supply a domain, username and password')
-
-
-binding = options.binding
-domain = options.domain
-username = options.username
-password = options.password
-
-print 'Connecting...'
+def runtests(binding, domain, username, password):
 
-pipe = dcerpc.pipe_connect(binding,
-	dcerpc.DCERPC_SAMR_UUID, dcerpc.DCERPC_SAMR_VERSION,
-	domain, username, password)
+    print 'Testing SAMR pipe'
 
-test_LongInt(pipe)
+    pipe = dcerpc.pipe_connect(binding,
+            dcerpc.DCERPC_SAMR_UUID, dcerpc.DCERPC_SAMR_VERSION,
+            domain, username, password)
 
-handle = test_Connect(pipe)
+    test_LongInt(pipe)
 
-test_QuerySecurity(pipe, handle)
+    handle = test_Connect(pipe)
 
-test_EnumDomains(pipe, handle)
+    test_QuerySecurity(pipe, handle)
 
-print 'Done'
+    test_EnumDomains(pipe, handle)
-- 
cgit 


From 096d2d68de721774a4c0493863ba47cd240ff35e Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Tue, 28 Sep 2004 21:44:05 +0000
Subject: r2739: Start of torture test for winreg wrappers. (This used to be
 commit cf9b984b8457843d2b6bb1c4ac90d52c9b802d89)

---
 source4/scripting/swig/torture/winreg.py | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100755 source4/scripting/swig/torture/winreg.py

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/torture/winreg.py b/source4/scripting/swig/torture/winreg.py
new file mode 100755
index 0000000000..4f3b592065
--- /dev/null
+++ b/source4/scripting/swig/torture/winreg.py
@@ -0,0 +1,23 @@
+#!/usr/bin/python
+
+import dcerpc
+
+def test_OpenHKLM(pipe):
+
+    r = {}
+    r['unknown'] = {}
+    r['unknown']['unknown0'] = 0x84e0
+    r['unknown']['unknown1'] = 0
+    r['access_required'] = 0x02000000
+
+    dcerpc.winreg_OpenHKLM(pipe, r)
+
+def runtests(binding, domain, username, password):
+    
+    print 'Testing WINREG pipe'
+
+    pipe = dcerpc.pipe_connect(binding,
+            dcerpc.DCERPC_WINREG_UUID, dcerpc.DCERPC_WINREG_VERSION,
+            domain, username, password)
+
+    test_OpenHKLM(pipe)
-- 
cgit 


From b11be587e06705ef68da91e3ff766595d3c62c20 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Fri, 1 Oct 2004 07:36:47 +0000
Subject: r2765: Allow functions containing WERROR values to be compiled.

Add winreg.i to list of extensions.
(This used to be commit 6f3f6de058e806f13f48d3d1300db3784d2f470c)
---
 source4/scripting/swig/dcerpc.i | 1 +
 source4/scripting/swig/samba.i  | 3 +++
 2 files changed, 4 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/dcerpc.i b/source4/scripting/swig/dcerpc.i
index eb8b065e33..6be0b639f0 100644
--- a/source4/scripting/swig/dcerpc.i
+++ b/source4/scripting/swig/dcerpc.i
@@ -839,3 +839,4 @@ NTSTATUS dcerpc_pipe_connect(struct dcerpc_pipe **OUT,
 %include "librpc/gen_ndr/misc.i"
 %include "librpc/gen_ndr/lsa.i"
 %include "librpc/gen_ndr/samr.i"
+%include "librpc/gen_ndr/winreg.i"
diff --git a/source4/scripting/swig/samba.i b/source4/scripting/swig/samba.i
index 8e0eb88533..faa46dc348 100644
--- a/source4/scripting/swig/samba.i
+++ b/source4/scripting/swig/samba.i
@@ -34,6 +34,9 @@
 
 /* For the moment treat NTSTATUS as an integer */
 
+#define WERROR NTSTATUS
+
 %typemap(out) NTSTATUS {
         $result = PyInt_FromLong(NT_STATUS_V($1));
 }
+
-- 
cgit 


From 76a8fe491e568cb97d5ed54de6cb2882574421c1 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Fri, 1 Oct 2004 07:37:37 +0000
Subject: r2766: Test OpenKey, QueryInfoKey, EnumKey, CloseKey functions.

The IDL for EnumValue is wrong - can't figure it out right now.
(This used to be commit 37af942d08da9ba9dcf351853f9064b5d179d5e4)
---
 source4/scripting/swig/torture/winreg.py | 107 +++++++++++++++++++++++++++++--
 1 file changed, 102 insertions(+), 5 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/torture/winreg.py b/source4/scripting/swig/torture/winreg.py
index 4f3b592065..abc9fa2245 100755
--- a/source4/scripting/swig/torture/winreg.py
+++ b/source4/scripting/swig/torture/winreg.py
@@ -1,16 +1,110 @@
 #!/usr/bin/python
 
-import dcerpc
+import sys, dcerpc
 
 def test_OpenHKLM(pipe):
 
     r = {}
     r['unknown'] = {}
-    r['unknown']['unknown0'] = 0x84e0
-    r['unknown']['unknown1'] = 0
+    r['unknown']['unknown0'] = 0x9038
+    r['unknown']['unknown1'] = 0x0000
     r['access_required'] = 0x02000000
 
-    dcerpc.winreg_OpenHKLM(pipe, r)
+    result = dcerpc.winreg_OpenHKLM(pipe, r)
+
+    return result['handle']
+
+def test_QueryInfoKey(pipe, handle):
+
+    r = {}
+    r['handle'] = handle
+    r['class'] = {}
+    r['class']['name'] = None
+
+    return dcerpc.winreg_QueryInfoKey(pipe, r)
+
+def test_CloseKey(pipe, handle):
+
+    r = {}
+    r['handle'] = handle
+
+    dcerpc.winreg_CloseKey(pipe, r)
+
+def test_Enum(pipe, handle, depth = 0):
+
+    if depth > 2:
+        return
+
+    keyinfo = test_QueryInfoKey(pipe, handle)
+
+    # Enumerate keys
+
+    r = {}
+    r['handle'] = handle
+    r['key_name_len'] = 0
+    r['unknown'] = 0x0414
+    r['in_name'] = {}
+    r['in_name']['unknown'] = 0x20a
+    r['in_name']['key_name'] = {}
+    r['in_name']['key_name']['name'] = None
+    r['class'] = {}
+    r['class']['name'] = None
+    r['last_changed_time'] = {}
+    r['last_changed_time']['low'] = 0
+    r['last_changed_time']['high'] = 0
+
+    for i in range(0, keyinfo['num_subkeys']):
+
+        r['enum_index'] = i
+
+        subkey = dcerpc.winreg_EnumKey(pipe, r)
+
+        s = {}
+        s['handle'] = handle
+        s['keyname'] = {}
+        s['keyname']['name'] = subkey['out_name']['name']
+        s['unknown'] = 0
+        s['access_mask'] = 0x02000000
+
+        result = dcerpc.winreg_OpenKey(pipe, s)
+
+        test_Enum(pipe, result['handle'], depth + 1)
+
+        test_CloseKey(pipe, result['handle'])
+
+    # Enumerate values
+
+    return
+
+    r = {}
+    r['handle'] = handle
+    r['name'] = {}
+    r['name']['len'] = 0
+    r['name']['max_len'] = 0
+    r['name']['name'] = {}
+    r['name']['name']['max_len'] = 0
+    r['name']['name']['offset'] = 0
+    r['name']['name']['len'] = 0
+    r['name']['name']['buffer'] = None
+    r['type'] = 0
+    r['value'] = {}
+    r['value']['max_len'] = 0
+    r['value']['offset'] = 0
+    r['value']['len'] = 0
+    r['value']['buffer'] = []
+    r['returned_len'] = 0
+    
+    for i in range(0, keyinfo['num_values']):
+
+        r['enum_index'] = i
+        
+        print dcerpc.winreg_EnumValue(pipe, r)
+
+        sys.exit(1)        
+
+def test_Key(pipe, handle):
+
+    test_Enum(pipe, handle)        
 
 def runtests(binding, domain, username, password):
     
@@ -20,4 +114,7 @@ def runtests(binding, domain, username, password):
             dcerpc.DCERPC_WINREG_UUID, dcerpc.DCERPC_WINREG_VERSION,
             domain, username, password)
 
-    test_OpenHKLM(pipe)
+    handle = test_OpenHKLM(pipe)
+
+    test_Key(pipe, handle)
+    
-- 
cgit 


From 7cef5fd077cb99343df3fff0c9145e15bce563d7 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Sat, 2 Oct 2004 11:22:20 +0000
Subject: r2780: Add conversion routines for DATA_BLOB.  I'm not convinced that
 DATA_BLOB's should be treated as scalar types though. (This used to be commit
 c9e96038f821783c30b5cf509334176f982403d9)

---
 source4/scripting/swig/dcerpc.i | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/dcerpc.i b/source4/scripting/swig/dcerpc.i
index 6be0b639f0..5c3ce0ceec 100644
--- a/source4/scripting/swig/dcerpc.i
+++ b/source4/scripting/swig/dcerpc.i
@@ -246,6 +246,35 @@ PyObject *string_ptr_to_python(TALLOC_CTX *mem_ctx, char *obj)
 #define dom_sid2_ptr_to_python dom_sid_ptr_to_python
 #define dom_sid2_ptr_from_python dom_sid_ptr_from_python
 
+DATA_BLOB DATA_BLOB_from_python(PyObject *obj, char *name)
+{
+	DATA_BLOB ret;
+
+	/* Because we treat DATA_BLOB as a scalar type (why?) there 
+	   doesn't seem to be a way to pass back when an error has
+	   occured. */
+
+	if (obj == NULL) {
+		PyErr_Format(PyExc_ValueError, "Expecting key %s", name);
+		return;
+	}
+
+	if (!PyString_Check(obj)) {
+		PyErr_Format(PyExc_TypeError, "Expecting string value for key '%s'", name);
+		return;
+	}
+
+	ret.length = PyString_Size(obj);
+	ret.data = PyString_AsString(obj);
+
+	return ret;
+}
+
+PyObject *DATA_BLOB_to_python(DATA_BLOB obj)
+{
+	return PyString_FromStringAndSize(obj.data, obj.length);
+}
+
 %}
 
 %include "samba.i"
-- 
cgit 


From 710ad9613b909332b13620aa8022e8870170418d Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Sat, 2 Oct 2004 11:26:58 +0000
Subject: r2781: Got winreg_EnumValue() working.  Check it in so I don't break
 it trying to clean it up.  (-: (This used to be commit
 cc646f73b873292eaba152770be9500beff1c988)

---
 source4/scripting/swig/torture/winreg.py | 34 +++++++++++++++++++++-----------
 1 file changed, 22 insertions(+), 12 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/torture/winreg.py b/source4/scripting/swig/torture/winreg.py
index abc9fa2245..acf319d6f9 100755
--- a/source4/scripting/swig/torture/winreg.py
+++ b/source4/scripting/swig/torture/winreg.py
@@ -74,30 +74,40 @@ def test_Enum(pipe, handle, depth = 0):
 
     # Enumerate values
 
-    return
-
     r = {}
     r['handle'] = handle
-    r['name'] = {}
-    r['name']['len'] = 0
-    r['name']['max_len'] = 0
-    r['name']['name'] = {}
-    r['name']['name']['max_len'] = 0
-    r['name']['name']['offset'] = 0
-    r['name']['name']['len'] = 0
-    r['name']['name']['buffer'] = None
+
+    keyinfo['max_valnamelen'] = 18
+    keyinfo['max_valbufsize'] = 0x31f5
+
+    r['foo'] = {}
+    r['foo']['len'] = 0
+    r['foo']['max_len'] = keyinfo['max_valnamelen'] * 2
+    r['foo']['buffer'] = {}
+    r['foo']['buffer']['max_len'] = keyinfo['max_valnamelen']
+    r['foo']['buffer']['offset'] = 0
+    r['foo']['buffer']['len'] = 0
+    r['foo']['buffer']['buffer'] = ''
     r['type'] = 0
     r['value'] = {}
-    r['value']['max_len'] = 0
+    r['value']['max_len'] = keyinfo['max_valbufsize']
     r['value']['offset'] = 0
     r['value']['len'] = 0
     r['value']['buffer'] = []
     r['returned_len'] = 0
+    r['foo2'] = {}
+    r['foo2']['max_len'] = keyinfo['max_valbufsize']
+    r['foo2']['offset'] = 0
+    r['foo2']['len'] = 0
+    r['foo2']['buffer'] = ''
+    r['value1'] = keyinfo['max_valbufsize']
+    r['value2'] = 0
     
     for i in range(0, keyinfo['num_values']):
 
         r['enum_index'] = i
-        
+
+        print keyinfo
         print dcerpc.winreg_EnumValue(pipe, r)
 
         sys.exit(1)        
-- 
cgit 


From a248164de5f89cef824f5a1f7d8618fbe81ae0c4 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Sat, 2 Oct 2004 23:35:50 +0000
Subject: r2790: Add code to generate WERROR exceptions.  Arrange inclusion of
 autogenerated interface files to divvy them up into pipes that return WERRORs
 and pipes that return NTSTATUS values. (This used to be commit
 294d1ae35c09432a41e5a07a3aa1884bfb9a93be)

---
 source4/scripting/swig/dcerpc.i | 29 ++++++++++++++++++++++++++---
 1 file changed, 26 insertions(+), 3 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/dcerpc.i b/source4/scripting/swig/dcerpc.i
index 5c3ce0ceec..9508dc805e 100644
--- a/source4/scripting/swig/dcerpc.i
+++ b/source4/scripting/swig/dcerpc.i
@@ -37,7 +37,7 @@
 
 #undef strcpy
 
-PyObject *ntstatus_exception;
+PyObject *ntstatus_exception, *werror_exception;
 
 /* Set up return of a dcerpc.NTSTATUS exception */
 
@@ -49,6 +49,14 @@ void set_ntstatus_exception(int status)
 	PyErr_SetObject(ntstatus_exception, obj);
 }
 
+void set_werror_exception(int status)
+{
+	PyObject *obj = Py_BuildValue("(i,s)", status, 
+				win_errstr(W_ERROR(status)));
+
+	PyErr_SetObject(werror_exception, obj);
+}
+
 /* Conversion functions for scalar types */
 
 uint8 uint8_from_python(PyObject *obj, char *name)
@@ -801,6 +809,7 @@ PyObject *DATA_BLOB_to_python(DATA_BLOB obj)
 
 %pythoncode %{
 	NTSTATUS = _dcerpc.NTSTATUS
+	WERROR = _dcerpc.WERROR
 %}
 
 %init  %{
@@ -808,7 +817,9 @@ PyObject *DATA_BLOB_to_python(DATA_BLOB obj)
 	lp_load(dyn_CONFIGFILE, True, False, False);
 	load_interfaces();
 	ntstatus_exception = PyErr_NewException("_dcerpc.NTSTATUS", NULL, NULL);
+	werror_exception = PyErr_NewException("_dcerpc.WERROR", NULL, NULL);
 	PyDict_SetItemString(d, "NTSTATUS", ntstatus_exception);
+	PyDict_SetItemString(d, "WERROR", werror_exception);
 %}
 
 %typemap(in, numinputs=0) struct dcerpc_pipe **OUT (struct dcerpc_pipe *temp_dcerpc_pipe) {
@@ -855,7 +866,9 @@ NTSTATUS dcerpc_pipe_connect(struct dcerpc_pipe **OUT,
                              const char *username,
                              const char *password);
 
-/* Run this test after each wrapped function */
+%include "librpc/gen_ndr/misc.i"
+
+/* Wrapped functions returning NTSTATUS */
 
 %exception {
 	$action
@@ -865,7 +878,17 @@ NTSTATUS dcerpc_pipe_connect(struct dcerpc_pipe **OUT,
 	}
 }
 
-%include "librpc/gen_ndr/misc.i"
 %include "librpc/gen_ndr/lsa.i"
 %include "librpc/gen_ndr/samr.i"
+
+/* Wrapped functions returning WERROR */
+
+%exception {
+	$action
+	if (!W_ERROR_IS_OK(arg3->out.result)) {
+		set_werror_exception(W_ERROR_V(arg3->out.result));
+		return NULL;
+	}
+}
+
 %include "librpc/gen_ndr/winreg.i"
-- 
cgit 


From 68d2ce3320a5ad33c08a705cb5f551a21efa611e Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Sun, 3 Oct 2004 07:00:17 +0000
Subject: r2795: Split status code constants into a separate file. (This used
 to be commit 12a3f75c1cf39c74952077cc00fd86a4e935f74b)

---
 source4/scripting/swig/dcerpc.i       | 521 +-------------------------------
 source4/scripting/swig/status_codes.i | 552 ++++++++++++++++++++++++++++++++++
 2 files changed, 553 insertions(+), 520 deletions(-)
 create mode 100644 source4/scripting/swig/status_codes.i

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/dcerpc.i b/source4/scripting/swig/dcerpc.i
index 9508dc805e..a560cca570 100644
--- a/source4/scripting/swig/dcerpc.i
+++ b/source4/scripting/swig/dcerpc.i
@@ -286,526 +286,7 @@ PyObject *DATA_BLOB_to_python(DATA_BLOB obj)
 %}
 
 %include "samba.i"
-
-/* Win32 status codes */
-
-#define STATUS_BUFFER_OVERFLOW            0x80000005
-#define STATUS_NO_MORE_FILES              0x80000006
-#define NT_STATUS_NO_MORE_ENTRIES         0x8000001a
-
-#define STATUS_MORE_ENTRIES               0x0105
-#define STATUS_SOME_UNMAPPED              0x0107
-#define ERROR_INVALID_PARAMETER		  0x0057
-#define ERROR_INSUFFICIENT_BUFFER	  0x007a
-#define STATUS_NOTIFY_ENUM_DIR            0x010c
-#define ERROR_INVALID_DATATYPE		  0x070c
-
-/* NT status codes */
-
-#define NT_STATUS_OK 0x00000000
-#define NT_STATUS_UNSUCCESSFUL 0xC0000001
-#define NT_STATUS_NOT_IMPLEMENTED 0xC0000002
-#define NT_STATUS_INVALID_INFO_CLASS 0xC0000003
-#define NT_STATUS_INFO_LENGTH_MISMATCH 0xC0000004
-#define NT_STATUS_ACCESS_VIOLATION 0xC0000005
-#define NT_STATUS_IN_PAGE_ERROR 0xC0000006
-#define NT_STATUS_PAGEFILE_QUOTA 0xC0000007
-#define NT_STATUS_INVALID_HANDLE 0xC0000008
-#define NT_STATUS_BAD_INITIAL_STACK 0xC0000009
-#define NT_STATUS_BAD_INITIAL_PC 0xC000000a
-#define NT_STATUS_INVALID_CID 0xC000000b
-#define NT_STATUS_TIMER_NOT_CANCELED 0xC000000c
-#define NT_STATUS_INVALID_PARAMETER 0xC000000d
-#define NT_STATUS_NO_SUCH_DEVICE 0xC000000e
-#define NT_STATUS_NO_SUCH_FILE 0xC000000f
-#define NT_STATUS_INVALID_DEVICE_REQUEST 0xC0000010
-#define NT_STATUS_END_OF_FILE 0xC0000011
-#define NT_STATUS_WRONG_VOLUME 0xC0000012
-#define NT_STATUS_NO_MEDIA_IN_DEVICE 0xC0000013
-#define NT_STATUS_UNRECOGNIZED_MEDIA 0xC0000014
-#define NT_STATUS_NONEXISTENT_SECTOR 0xC0000015
-#define NT_STATUS_MORE_PROCESSING_REQUIRED 0xC0000016
-#define NT_STATUS_NO_MEMORY 0xC0000017
-#define NT_STATUS_CONFLICTING_ADDRESSES 0xC0000018
-#define NT_STATUS_NOT_MAPPED_VIEW 0xC0000019
-#define NT_STATUS_UNABLE_TO_FREE_VM 0xC000001a
-#define NT_STATUS_UNABLE_TO_DELETE_SECTION 0xC000001b
-#define NT_STATUS_INVALID_SYSTEM_SERVICE 0xC000001c
-#define NT_STATUS_ILLEGAL_INSTRUCTION 0xC000001d
-#define NT_STATUS_INVALID_LOCK_SEQUENCE 0xC000001e
-#define NT_STATUS_INVALID_VIEW_SIZE 0xC000001f
-#define NT_STATUS_INVALID_FILE_FOR_SECTION 0xC0000020
-#define NT_STATUS_ALREADY_COMMITTED 0xC0000021
-#define NT_STATUS_ACCESS_DENIED 0xC0000022
-#define NT_STATUS_BUFFER_TOO_SMALL 0xC0000023
-#define NT_STATUS_OBJECT_TYPE_MISMATCH 0xC0000024
-#define NT_STATUS_NONCONTINUABLE_EXCEPTION 0xC0000025
-#define NT_STATUS_INVALID_DISPOSITION 0xC0000026
-#define NT_STATUS_UNWIND 0xC0000027
-#define NT_STATUS_BAD_STACK 0xC0000028
-#define NT_STATUS_INVALID_UNWIND_TARGET 0xC0000029
-#define NT_STATUS_NOT_LOCKED 0xC000002a
-#define NT_STATUS_PARITY_ERROR 0xC000002b
-#define NT_STATUS_UNABLE_TO_DECOMMIT_VM 0xC000002c
-#define NT_STATUS_NOT_COMMITTED 0xC000002d
-#define NT_STATUS_INVALID_PORT_ATTRIBUTES 0xC000002e
-#define NT_STATUS_PORT_MESSAGE_TOO_LONG 0xC000002f
-#define NT_STATUS_INVALID_PARAMETER_MIX 0xC0000030
-#define NT_STATUS_INVALID_QUOTA_LOWER 0xC0000031
-#define NT_STATUS_DISK_CORRUPT_ERROR 0xC0000032
-#define NT_STATUS_OBJECT_NAME_INVALID 0xC0000033
-#define NT_STATUS_OBJECT_NAME_NOT_FOUND 0xC0000034
-#define NT_STATUS_OBJECT_NAME_COLLISION 0xC0000035
-#define NT_STATUS_HANDLE_NOT_WAITABLE 0xC0000036
-#define NT_STATUS_PORT_DISCONNECTED 0xC0000037
-#define NT_STATUS_DEVICE_ALREADY_ATTACHED 0xC0000038
-#define NT_STATUS_OBJECT_PATH_INVALID 0xC0000039
-#define NT_STATUS_OBJECT_PATH_NOT_FOUND 0xC000003a
-#define NT_STATUS_OBJECT_PATH_SYNTAX_BAD 0xC000003b
-#define NT_STATUS_DATA_OVERRUN 0xC000003c
-#define NT_STATUS_DATA_LATE_ERROR 0xC000003d
-#define NT_STATUS_DATA_ERROR 0xC000003e
-#define NT_STATUS_CRC_ERROR 0xC000003f
-#define NT_STATUS_SECTION_TOO_BIG 0xC0000040
-#define NT_STATUS_PORT_CONNECTION_REFUSED 0xC0000041
-#define NT_STATUS_INVALID_PORT_HANDLE 0xC0000042
-#define NT_STATUS_SHARING_VIOLATION 0xC0000043
-#define NT_STATUS_QUOTA_EXCEEDED 0xC0000044
-#define NT_STATUS_INVALID_PAGE_PROTECTION 0xC0000045
-#define NT_STATUS_MUTANT_NOT_OWNED 0xC0000046
-#define NT_STATUS_SEMAPHORE_LIMIT_EXCEEDED 0xC0000047
-#define NT_STATUS_PORT_ALREADY_SET 0xC0000048
-#define NT_STATUS_SECTION_NOT_IMAGE 0xC0000049
-#define NT_STATUS_SUSPEND_COUNT_EXCEEDED 0xC000004a
-#define NT_STATUS_THREAD_IS_TERMINATING 0xC000004b
-#define NT_STATUS_BAD_WORKING_SET_LIMIT 0xC000004c
-#define NT_STATUS_INCOMPATIBLE_FILE_MAP 0xC000004d
-#define NT_STATUS_SECTION_PROTECTION 0xC000004e
-#define NT_STATUS_EAS_NOT_SUPPORTED 0xC000004f
-#define NT_STATUS_EA_TOO_LARGE 0xC0000050
-#define NT_STATUS_NONEXISTENT_EA_ENTRY 0xC0000051
-#define NT_STATUS_NO_EAS_ON_FILE 0xC0000052
-#define NT_STATUS_EA_CORRUPT_ERROR 0xC0000053
-#define NT_STATUS_FILE_LOCK_CONFLICT 0xC0000054
-#define NT_STATUS_LOCK_NOT_GRANTED 0xC0000055
-#define NT_STATUS_DELETE_PENDING 0xC0000056
-#define NT_STATUS_CTL_FILE_NOT_SUPPORTED 0xC0000057
-#define NT_STATUS_UNKNOWN_REVISION 0xC0000058
-#define NT_STATUS_REVISION_MISMATCH 0xC0000059
-#define NT_STATUS_INVALID_OWNER 0xC000005a
-#define NT_STATUS_INVALID_PRIMARY_GROUP 0xC000005b
-#define NT_STATUS_NO_IMPERSONATION_TOKEN 0xC000005c
-#define NT_STATUS_CANT_DISABLE_MANDATORY 0xC000005d
-#define NT_STATUS_NO_LOGON_SERVERS 0xC000005e
-#define NT_STATUS_NO_SUCH_LOGON_SESSION 0xC000005f
-#define NT_STATUS_NO_SUCH_PRIVILEGE 0xC0000060
-#define NT_STATUS_PRIVILEGE_NOT_HELD 0xC0000061
-#define NT_STATUS_INVALID_ACCOUNT_NAME 0xC0000062
-#define NT_STATUS_USER_EXISTS 0xC0000063
-#define NT_STATUS_NO_SUCH_USER 0xC0000064
-#define NT_STATUS_GROUP_EXISTS 0xC0000065
-#define NT_STATUS_NO_SUCH_GROUP 0xC0000066
-#define NT_STATUS_MEMBER_IN_GROUP 0xC0000067
-#define NT_STATUS_MEMBER_NOT_IN_GROUP 0xC0000068
-#define NT_STATUS_LAST_ADMIN 0xC0000069
-#define NT_STATUS_WRONG_PASSWORD 0xC000006a
-#define NT_STATUS_ILL_FORMED_PASSWORD 0xC000006b
-#define NT_STATUS_PASSWORD_RESTRICTION 0xC000006c
-#define NT_STATUS_LOGON_FAILURE 0xC000006d
-#define NT_STATUS_ACCOUNT_RESTRICTION 0xC000006e
-#define NT_STATUS_INVALID_LOGON_HOURS 0xC000006f
-#define NT_STATUS_INVALID_WORKSTATION 0xC0000070
-#define NT_STATUS_PASSWORD_EXPIRED 0xC0000071
-#define NT_STATUS_ACCOUNT_DISABLED 0xC0000072
-#define NT_STATUS_NONE_MAPPED 0xC0000073
-#define NT_STATUS_TOO_MANY_LUIDS_REQUESTED 0xC0000074
-#define NT_STATUS_LUIDS_EXHAUSTED 0xC0000075
-#define NT_STATUS_INVALID_SUB_AUTHORITY 0xC0000076
-#define NT_STATUS_INVALID_ACL 0xC0000077
-#define NT_STATUS_INVALID_SID 0xC0000078
-#define NT_STATUS_INVALID_SECURITY_DESCR 0xC0000079
-#define NT_STATUS_PROCEDURE_NOT_FOUND 0xC000007a
-#define NT_STATUS_INVALID_IMAGE_FORMAT 0xC000007b
-#define NT_STATUS_NO_TOKEN 0xC000007c
-#define NT_STATUS_BAD_INHERITANCE_ACL 0xC000007d
-#define NT_STATUS_RANGE_NOT_LOCKED 0xC000007e
-#define NT_STATUS_DISK_FULL 0xC000007f
-#define NT_STATUS_SERVER_DISABLED 0xC0000080
-#define NT_STATUS_SERVER_NOT_DISABLED 0xC0000081
-#define NT_STATUS_TOO_MANY_GUIDS_REQUESTED 0xC0000082
-#define NT_STATUS_GUIDS_EXHAUSTED 0xC0000083
-#define NT_STATUS_INVALID_ID_AUTHORITY 0xC0000084
-#define NT_STATUS_AGENTS_EXHAUSTED 0xC0000085
-#define NT_STATUS_INVALID_VOLUME_LABEL 0xC0000086
-#define NT_STATUS_SECTION_NOT_EXTENDED 0xC0000087
-#define NT_STATUS_NOT_MAPPED_DATA 0xC0000088
-#define NT_STATUS_RESOURCE_DATA_NOT_FOUND 0xC0000089
-#define NT_STATUS_RESOURCE_TYPE_NOT_FOUND 0xC000008a
-#define NT_STATUS_RESOURCE_NAME_NOT_FOUND 0xC000008b
-#define NT_STATUS_ARRAY_BOUNDS_EXCEEDED 0xC000008c
-#define NT_STATUS_FLOAT_DENORMAL_OPERAND 0xC000008d
-#define NT_STATUS_FLOAT_DIVIDE_BY_ZERO 0xC000008e
-#define NT_STATUS_FLOAT_INEXACT_RESULT 0xC000008f
-#define NT_STATUS_FLOAT_INVALID_OPERATION 0xC0000090
-#define NT_STATUS_FLOAT_OVERFLOW 0xC0000091
-#define NT_STATUS_FLOAT_STACK_CHECK 0xC0000092
-#define NT_STATUS_FLOAT_UNDERFLOW 0xC0000093
-#define NT_STATUS_INTEGER_DIVIDE_BY_ZERO 0xC0000094
-#define NT_STATUS_INTEGER_OVERFLOW 0xC0000095
-#define NT_STATUS_PRIVILEGED_INSTRUCTION 0xC0000096
-#define NT_STATUS_TOO_MANY_PAGING_FILES 0xC0000097
-#define NT_STATUS_FILE_INVALID 0xC0000098
-#define NT_STATUS_ALLOTTED_SPACE_EXCEEDED 0xC0000099
-#define NT_STATUS_INSUFFICIENT_RESOURCES 0xC000009a
-#define NT_STATUS_DFS_EXIT_PATH_FOUND 0xC000009b
-#define NT_STATUS_DEVICE_DATA_ERROR 0xC000009c
-#define NT_STATUS_DEVICE_NOT_CONNECTED 0xC000009d
-#define NT_STATUS_DEVICE_POWER_FAILURE 0xC000009e
-#define NT_STATUS_FREE_VM_NOT_AT_BASE 0xC000009f
-#define NT_STATUS_MEMORY_NOT_ALLOCATED 0xC00000a0
-#define NT_STATUS_WORKING_SET_QUOTA 0xC00000a1
-#define NT_STATUS_MEDIA_WRITE_PROTECTED 0xC00000a2
-#define NT_STATUS_DEVICE_NOT_READY 0xC00000a3
-#define NT_STATUS_INVALID_GROUP_ATTRIBUTES 0xC00000a4
-#define NT_STATUS_BAD_IMPERSONATION_LEVEL 0xC00000a5
-#define NT_STATUS_CANT_OPEN_ANONYMOUS 0xC00000a6
-#define NT_STATUS_BAD_VALIDATION_CLASS 0xC00000a7
-#define NT_STATUS_BAD_TOKEN_TYPE 0xC00000a8
-#define NT_STATUS_BAD_MASTER_BOOT_RECORD 0xC00000a9
-#define NT_STATUS_INSTRUCTION_MISALIGNMENT 0xC00000aa
-#define NT_STATUS_INSTANCE_NOT_AVAILABLE 0xC00000ab
-#define NT_STATUS_PIPE_NOT_AVAILABLE 0xC00000ac
-#define NT_STATUS_INVALID_PIPE_STATE 0xC00000ad
-#define NT_STATUS_PIPE_BUSY 0xC00000ae
-#define NT_STATUS_ILLEGAL_FUNCTION 0xC00000af
-#define NT_STATUS_PIPE_DISCONNECTED 0xC00000b0
-#define NT_STATUS_PIPE_CLOSING 0xC00000b1
-#define NT_STATUS_PIPE_CONNECTED 0xC00000b2
-#define NT_STATUS_PIPE_LISTENING 0xC00000b3
-#define NT_STATUS_INVALID_READ_MODE 0xC00000b4
-#define NT_STATUS_IO_TIMEOUT 0xC00000b5
-#define NT_STATUS_FILE_FORCED_CLOSED 0xC00000b6
-#define NT_STATUS_PROFILING_NOT_STARTED 0xC00000b7
-#define NT_STATUS_PROFILING_NOT_STOPPED 0xC00000b8
-#define NT_STATUS_COULD_NOT_INTERPRET 0xC00000b9
-#define NT_STATUS_FILE_IS_A_DIRECTORY 0xC00000ba
-#define NT_STATUS_NOT_SUPPORTED 0xC00000bb
-#define NT_STATUS_REMOTE_NOT_LISTENING 0xC00000bc
-#define NT_STATUS_DUPLICATE_NAME 0xC00000bd
-#define NT_STATUS_BAD_NETWORK_PATH 0xC00000be
-#define NT_STATUS_NETWORK_BUSY 0xC00000bf
-#define NT_STATUS_DEVICE_DOES_NOT_EXIST 0xC00000c0
-#define NT_STATUS_TOO_MANY_COMMANDS 0xC00000c1
-#define NT_STATUS_ADAPTER_HARDWARE_ERROR 0xC00000c2
-#define NT_STATUS_INVALID_NETWORK_RESPONSE 0xC00000c3
-#define NT_STATUS_UNEXPECTED_NETWORK_ERROR 0xC00000c4
-#define NT_STATUS_BAD_REMOTE_ADAPTER 0xC00000c5
-#define NT_STATUS_PRINT_QUEUE_FULL 0xC00000c6
-#define NT_STATUS_NO_SPOOL_SPACE 0xC00000c7
-#define NT_STATUS_PRINT_CANCELLED 0xC00000c8
-#define NT_STATUS_NETWORK_NAME_DELETED 0xC00000c9
-#define NT_STATUS_NETWORK_ACCESS_DENIED 0xC00000ca
-#define NT_STATUS_BAD_DEVICE_TYPE 0xC00000cb
-#define NT_STATUS_BAD_NETWORK_NAME 0xC00000cc
-#define NT_STATUS_TOO_MANY_NAMES 0xC00000cd
-#define NT_STATUS_TOO_MANY_SESSIONS 0xC00000ce
-#define NT_STATUS_SHARING_PAUSED 0xC00000cf
-#define NT_STATUS_REQUEST_NOT_ACCEPTED 0xC00000d0
-#define NT_STATUS_REDIRECTOR_PAUSED 0xC00000d1
-#define NT_STATUS_NET_WRITE_FAULT 0xC00000d2
-#define NT_STATUS_PROFILING_AT_LIMIT 0xC00000d3
-#define NT_STATUS_NOT_SAME_DEVICE 0xC00000d4
-#define NT_STATUS_FILE_RENAMED 0xC00000d5
-#define NT_STATUS_VIRTUAL_CIRCUIT_CLOSED 0xC00000d6
-#define NT_STATUS_NO_SECURITY_ON_OBJECT 0xC00000d7
-#define NT_STATUS_CANT_WAIT 0xC00000d8
-#define NT_STATUS_PIPE_EMPTY 0xC00000d9
-#define NT_STATUS_CANT_ACCESS_DOMAIN_INFO 0xC00000da
-#define NT_STATUS_CANT_TERMINATE_SELF 0xC00000db
-#define NT_STATUS_INVALID_SERVER_STATE 0xC00000dc
-#define NT_STATUS_INVALID_DOMAIN_STATE 0xC00000dd
-#define NT_STATUS_INVALID_DOMAIN_ROLE 0xC00000de
-#define NT_STATUS_NO_SUCH_DOMAIN 0xC00000df
-#define NT_STATUS_DOMAIN_EXISTS 0xC00000e0
-#define NT_STATUS_DOMAIN_LIMIT_EXCEEDED 0xC00000e1
-#define NT_STATUS_OPLOCK_NOT_GRANTED 0xC00000e2
-#define NT_STATUS_INVALID_OPLOCK_PROTOCOL 0xC00000e3
-#define NT_STATUS_INTERNAL_DB_CORRUPTION 0xC00000e4
-#define NT_STATUS_INTERNAL_ERROR 0xC00000e5
-#define NT_STATUS_GENERIC_NOT_MAPPED 0xC00000e6
-#define NT_STATUS_BAD_DESCRIPTOR_FORMAT 0xC00000e7
-#define NT_STATUS_INVALID_USER_BUFFER 0xC00000e8
-#define NT_STATUS_UNEXPECTED_IO_ERROR 0xC00000e9
-#define NT_STATUS_UNEXPECTED_MM_CREATE_ERR 0xC00000ea
-#define NT_STATUS_UNEXPECTED_MM_MAP_ERROR 0xC00000eb
-#define NT_STATUS_UNEXPECTED_MM_EXTEND_ERR 0xC00000ec
-#define NT_STATUS_NOT_LOGON_PROCESS 0xC00000ed
-#define NT_STATUS_LOGON_SESSION_EXISTS 0xC00000ee
-#define NT_STATUS_INVALID_PARAMETER_1 0xC00000ef
-#define NT_STATUS_INVALID_PARAMETER_2 0xC00000f0
-#define NT_STATUS_INVALID_PARAMETER_3 0xC00000f1
-#define NT_STATUS_INVALID_PARAMETER_4 0xC00000f2
-#define NT_STATUS_INVALID_PARAMETER_5 0xC00000f3
-#define NT_STATUS_INVALID_PARAMETER_6 0xC00000f4
-#define NT_STATUS_INVALID_PARAMETER_7 0xC00000f5
-#define NT_STATUS_INVALID_PARAMETER_8 0xC00000f6
-#define NT_STATUS_INVALID_PARAMETER_9 0xC00000f7
-#define NT_STATUS_INVALID_PARAMETER_10 0xC00000f8
-#define NT_STATUS_INVALID_PARAMETER_11 0xC00000f9
-#define NT_STATUS_INVALID_PARAMETER_12 0xC00000fa
-#define NT_STATUS_REDIRECTOR_NOT_STARTED 0xC00000fb
-#define NT_STATUS_REDIRECTOR_STARTED 0xC00000fc
-#define NT_STATUS_STACK_OVERFLOW 0xC00000fd
-#define NT_STATUS_NO_SUCH_PACKAGE 0xC00000fe
-#define NT_STATUS_BAD_FUNCTION_TABLE 0xC00000ff
-#define NT_STATUS_DIRECTORY_NOT_EMPTY 0xC0000101
-#define NT_STATUS_FILE_CORRUPT_ERROR 0xC0000102
-#define NT_STATUS_NOT_A_DIRECTORY 0xC0000103
-#define NT_STATUS_BAD_LOGON_SESSION_STATE 0xC0000104
-#define NT_STATUS_LOGON_SESSION_COLLISION 0xC0000105
-#define NT_STATUS_NAME_TOO_LONG 0xC0000106
-#define NT_STATUS_FILES_OPEN 0xC0000107
-#define NT_STATUS_CONNECTION_IN_USE 0xC0000108
-#define NT_STATUS_MESSAGE_NOT_FOUND 0xC0000109
-#define NT_STATUS_PROCESS_IS_TERMINATING 0xC000010a
-#define NT_STATUS_INVALID_LOGON_TYPE 0xC000010b
-#define NT_STATUS_NO_GUID_TRANSLATION 0xC000010c
-#define NT_STATUS_CANNOT_IMPERSONATE 0xC000010d
-#define NT_STATUS_IMAGE_ALREADY_LOADED 0xC000010e
-#define NT_STATUS_ABIOS_NOT_PRESENT 0xC000010f
-#define NT_STATUS_ABIOS_LID_NOT_EXIST 0xC0000110
-#define NT_STATUS_ABIOS_LID_ALREADY_OWNED 0xC0000111
-#define NT_STATUS_ABIOS_NOT_LID_OWNER 0xC0000112
-#define NT_STATUS_ABIOS_INVALID_COMMAND 0xC0000113
-#define NT_STATUS_ABIOS_INVALID_LID 0xC0000114
-#define NT_STATUS_ABIOS_SELECTOR_NOT_AVAILABLE 0xC0000115
-#define NT_STATUS_ABIOS_INVALID_SELECTOR 0xC0000116
-#define NT_STATUS_NO_LDT 0xC0000117
-#define NT_STATUS_INVALID_LDT_SIZE 0xC0000118
-#define NT_STATUS_INVALID_LDT_OFFSET 0xC0000119
-#define NT_STATUS_INVALID_LDT_DESCRIPTOR 0xC000011a
-#define NT_STATUS_INVALID_IMAGE_NE_FORMAT 0xC000011b
-#define NT_STATUS_RXACT_INVALID_STATE 0xC000011c
-#define NT_STATUS_RXACT_COMMIT_FAILURE 0xC000011d
-#define NT_STATUS_MAPPED_FILE_SIZE_ZERO 0xC000011e
-#define NT_STATUS_TOO_MANY_OPENED_FILES 0xC000011f
-#define NT_STATUS_CANCELLED 0xC0000120
-#define NT_STATUS_CANNOT_DELETE 0xC0000121
-#define NT_STATUS_INVALID_COMPUTER_NAME 0xC0000122
-#define NT_STATUS_FILE_DELETED 0xC0000123
-#define NT_STATUS_SPECIAL_ACCOUNT 0xC0000124
-#define NT_STATUS_SPECIAL_GROUP 0xC0000125
-#define NT_STATUS_SPECIAL_USER 0xC0000126
-#define NT_STATUS_MEMBERS_PRIMARY_GROUP 0xC0000127
-#define NT_STATUS_FILE_CLOSED 0xC0000128
-#define NT_STATUS_TOO_MANY_THREADS 0xC0000129
-#define NT_STATUS_THREAD_NOT_IN_PROCESS 0xC000012a
-#define NT_STATUS_TOKEN_ALREADY_IN_USE 0xC000012b
-#define NT_STATUS_PAGEFILE_QUOTA_EXCEEDED 0xC000012c
-#define NT_STATUS_COMMITMENT_LIMIT 0xC000012d
-#define NT_STATUS_INVALID_IMAGE_LE_FORMAT 0xC000012e
-#define NT_STATUS_INVALID_IMAGE_NOT_MZ 0xC000012f
-#define NT_STATUS_INVALID_IMAGE_PROTECT 0xC0000130
-#define NT_STATUS_INVALID_IMAGE_WIN_16 0xC0000131
-#define NT_STATUS_LOGON_SERVER_CONFLICT 0xC0000132
-#define NT_STATUS_TIME_DIFFERENCE_AT_DC 0xC0000133
-#define NT_STATUS_SYNCHRONIZATION_REQUIRED 0xC0000134
-#define NT_STATUS_DLL_NOT_FOUND 0xC0000135
-#define NT_STATUS_OPEN_FAILED 0xC0000136
-#define NT_STATUS_IO_PRIVILEGE_FAILED 0xC0000137
-#define NT_STATUS_ORDINAL_NOT_FOUND 0xC0000138
-#define NT_STATUS_ENTRYPOINT_NOT_FOUND 0xC0000139
-#define NT_STATUS_CONTROL_C_EXIT 0xC000013a
-#define NT_STATUS_LOCAL_DISCONNECT 0xC000013b
-#define NT_STATUS_REMOTE_DISCONNECT 0xC000013c
-#define NT_STATUS_REMOTE_RESOURCES 0xC000013d
-#define NT_STATUS_LINK_FAILED 0xC000013e
-#define NT_STATUS_LINK_TIMEOUT 0xC000013f
-#define NT_STATUS_INVALID_CONNECTION 0xC0000140
-#define NT_STATUS_INVALID_ADDRESS 0xC0000141
-#define NT_STATUS_DLL_INIT_FAILED 0xC0000142
-#define NT_STATUS_MISSING_SYSTEMFILE 0xC0000143
-#define NT_STATUS_UNHANDLED_EXCEPTION 0xC0000144
-#define NT_STATUS_APP_INIT_FAILURE 0xC0000145
-#define NT_STATUS_PAGEFILE_CREATE_FAILED 0xC0000146
-#define NT_STATUS_NO_PAGEFILE 0xC0000147
-#define NT_STATUS_INVALID_LEVEL 0xC0000148
-#define NT_STATUS_WRONG_PASSWORD_CORE 0xC0000149
-#define NT_STATUS_ILLEGAL_FLOAT_CONTEXT 0xC000014a
-#define NT_STATUS_PIPE_BROKEN 0xC000014b
-#define NT_STATUS_REGISTRY_CORRUPT 0xC000014c
-#define NT_STATUS_REGISTRY_IO_FAILED 0xC000014d
-#define NT_STATUS_NO_EVENT_PAIR 0xC000014e
-#define NT_STATUS_UNRECOGNIZED_VOLUME 0xC000014f
-#define NT_STATUS_SERIAL_NO_DEVICE_INITED 0xC0000150
-#define NT_STATUS_NO_SUCH_ALIAS 0xC0000151
-#define NT_STATUS_MEMBER_NOT_IN_ALIAS 0xC0000152
-#define NT_STATUS_MEMBER_IN_ALIAS 0xC0000153
-#define NT_STATUS_ALIAS_EXISTS 0xC0000154
-#define NT_STATUS_LOGON_NOT_GRANTED 0xC0000155
-#define NT_STATUS_TOO_MANY_SECRETS 0xC0000156
-#define NT_STATUS_SECRET_TOO_LONG 0xC0000157
-#define NT_STATUS_INTERNAL_DB_ERROR 0xC0000158
-#define NT_STATUS_FULLSCREEN_MODE 0xC0000159
-#define NT_STATUS_TOO_MANY_CONTEXT_IDS 0xC000015a
-#define NT_STATUS_LOGON_TYPE_NOT_GRANTED 0xC000015b
-#define NT_STATUS_NOT_REGISTRY_FILE 0xC000015c
-#define NT_STATUS_NT_CROSS_ENCRYPTION_REQUIRED 0xC000015d
-#define NT_STATUS_DOMAIN_CTRLR_CONFIG_ERROR 0xC000015e
-#define NT_STATUS_FT_MISSING_MEMBER 0xC000015f
-#define NT_STATUS_ILL_FORMED_SERVICE_ENTRY 0xC0000160
-#define NT_STATUS_ILLEGAL_CHARACTER 0xC0000161
-#define NT_STATUS_UNMAPPABLE_CHARACTER 0xC0000162
-#define NT_STATUS_UNDEFINED_CHARACTER 0xC0000163
-#define NT_STATUS_FLOPPY_VOLUME 0xC0000164
-#define NT_STATUS_FLOPPY_ID_MARK_NOT_FOUND 0xC0000165
-#define NT_STATUS_FLOPPY_WRONG_CYLINDER 0xC0000166
-#define NT_STATUS_FLOPPY_UNKNOWN_ERROR 0xC0000167
-#define NT_STATUS_FLOPPY_BAD_REGISTERS 0xC0000168
-#define NT_STATUS_DISK_RECALIBRATE_FAILED 0xC0000169
-#define NT_STATUS_DISK_OPERATION_FAILED 0xC000016a
-#define NT_STATUS_DISK_RESET_FAILED 0xC000016b
-#define NT_STATUS_SHARED_IRQ_BUSY 0xC000016c
-#define NT_STATUS_FT_ORPHANING 0xC000016d
-#define NT_STATUS_PARTITION_FAILURE 0xC0000172
-#define NT_STATUS_INVALID_BLOCK_LENGTH 0xC0000173
-#define NT_STATUS_DEVICE_NOT_PARTITIONED 0xC0000174
-#define NT_STATUS_UNABLE_TO_LOCK_MEDIA 0xC0000175
-#define NT_STATUS_UNABLE_TO_UNLOAD_MEDIA 0xC0000176
-#define NT_STATUS_EOM_OVERFLOW 0xC0000177
-#define NT_STATUS_NO_MEDIA 0xC0000178
-#define NT_STATUS_NO_SUCH_MEMBER 0xC000017a
-#define NT_STATUS_INVALID_MEMBER 0xC000017b
-#define NT_STATUS_KEY_DELETED 0xC000017c
-#define NT_STATUS_NO_LOG_SPACE 0xC000017d
-#define NT_STATUS_TOO_MANY_SIDS 0xC000017e
-#define NT_STATUS_LM_CROSS_ENCRYPTION_REQUIRED 0xC000017f
-#define NT_STATUS_KEY_HAS_CHILDREN 0xC0000180
-#define NT_STATUS_CHILD_MUST_BE_VOLATILE 0xC0000181
-#define NT_STATUS_DEVICE_CONFIGURATION_ERROR 0xC0000182
-#define NT_STATUS_DRIVER_INTERNAL_ERROR 0xC0000183
-#define NT_STATUS_INVALID_DEVICE_STATE 0xC0000184
-#define NT_STATUS_IO_DEVICE_ERROR 0xC0000185
-#define NT_STATUS_DEVICE_PROTOCOL_ERROR 0xC0000186
-#define NT_STATUS_BACKUP_CONTROLLER 0xC0000187
-#define NT_STATUS_LOG_FILE_FULL 0xC0000188
-#define NT_STATUS_TOO_LATE 0xC0000189
-#define NT_STATUS_NO_TRUST_LSA_SECRET 0xC000018a
-#define NT_STATUS_NO_TRUST_SAM_ACCOUNT 0xC000018b
-#define NT_STATUS_TRUSTED_DOMAIN_FAILURE 0xC000018c
-#define NT_STATUS_TRUSTED_RELATIONSHIP_FAILURE 0xC000018d
-#define NT_STATUS_EVENTLOG_FILE_CORRUPT 0xC000018e
-#define NT_STATUS_EVENTLOG_CANT_START 0xC000018f
-#define NT_STATUS_TRUST_FAILURE 0xC0000190
-#define NT_STATUS_MUTANT_LIMIT_EXCEEDED 0xC0000191
-#define NT_STATUS_NETLOGON_NOT_STARTED 0xC0000192
-#define NT_STATUS_ACCOUNT_EXPIRED 0xC0000193
-#define NT_STATUS_POSSIBLE_DEADLOCK 0xC0000194
-#define NT_STATUS_NETWORK_CREDENTIAL_CONFLICT 0xC0000195
-#define NT_STATUS_REMOTE_SESSION_LIMIT 0xC0000196
-#define NT_STATUS_EVENTLOG_FILE_CHANGED 0xC0000197
-#define NT_STATUS_NOLOGON_INTERDOMAIN_TRUST_ACCOUNT 0xC0000198
-#define NT_STATUS_NOLOGON_WORKSTATION_TRUST_ACCOUNT 0xC0000199
-#define NT_STATUS_NOLOGON_SERVER_TRUST_ACCOUNT 0xC000019a
-#define NT_STATUS_DOMAIN_TRUST_INCONSISTENT 0xC000019b
-#define NT_STATUS_FS_DRIVER_REQUIRED 0xC000019c
-#define NT_STATUS_NO_USER_SESSION_KEY 0xC0000202
-#define NT_STATUS_USER_SESSION_DELETED 0xC0000203
-#define NT_STATUS_RESOURCE_LANG_NOT_FOUND 0xC0000204
-#define NT_STATUS_INSUFF_SERVER_RESOURCES 0xC0000205
-#define NT_STATUS_INVALID_BUFFER_SIZE 0xC0000206
-#define NT_STATUS_INVALID_ADDRESS_COMPONENT 0xC0000207
-#define NT_STATUS_INVALID_ADDRESS_WILDCARD 0xC0000208
-#define NT_STATUS_TOO_MANY_ADDRESSES 0xC0000209
-#define NT_STATUS_ADDRESS_ALREADY_EXISTS 0xC000020a
-#define NT_STATUS_ADDRESS_CLOSED 0xC000020b
-#define NT_STATUS_CONNECTION_DISCONNECTED 0xC000020c
-#define NT_STATUS_CONNECTION_RESET 0xC000020d
-#define NT_STATUS_TOO_MANY_NODES 0xC000020e
-#define NT_STATUS_TRANSACTION_ABORTED 0xC000020f
-#define NT_STATUS_TRANSACTION_TIMED_OUT 0xC0000210
-#define NT_STATUS_TRANSACTION_NO_RELEASE 0xC0000211
-#define NT_STATUS_TRANSACTION_NO_MATCH 0xC0000212
-#define NT_STATUS_TRANSACTION_RESPONDED 0xC0000213
-#define NT_STATUS_TRANSACTION_INVALID_ID 0xC0000214
-#define NT_STATUS_TRANSACTION_INVALID_TYPE 0xC0000215
-#define NT_STATUS_NOT_SERVER_SESSION 0xC0000216
-#define NT_STATUS_NOT_CLIENT_SESSION 0xC0000217
-#define NT_STATUS_CANNOT_LOAD_REGISTRY_FILE 0xC0000218
-#define NT_STATUS_DEBUG_ATTACH_FAILED 0xC0000219
-#define NT_STATUS_SYSTEM_PROCESS_TERMINATED 0xC000021a
-#define NT_STATUS_DATA_NOT_ACCEPTED 0xC000021b
-#define NT_STATUS_NO_BROWSER_SERVERS_FOUND 0xC000021c
-#define NT_STATUS_VDM_HARD_ERROR 0xC000021d
-#define NT_STATUS_DRIVER_CANCEL_TIMEOUT 0xC000021e
-#define NT_STATUS_REPLY_MESSAGE_MISMATCH 0xC000021f
-#define NT_STATUS_MAPPED_ALIGNMENT 0xC0000220
-#define NT_STATUS_IMAGE_CHECKSUM_MISMATCH 0xC0000221
-#define NT_STATUS_LOST_WRITEBEHIND_DATA 0xC0000222
-#define NT_STATUS_CLIENT_SERVER_PARAMETERS_INVALID 0xC0000223
-#define NT_STATUS_PASSWORD_MUST_CHANGE 0xC0000224
-#define NT_STATUS_NOT_FOUND 0xC0000225
-#define NT_STATUS_NOT_TINY_STREAM 0xC0000226
-#define NT_STATUS_RECOVERY_FAILURE 0xC0000227
-#define NT_STATUS_STACK_OVERFLOW_READ 0xC0000228
-#define NT_STATUS_FAIL_CHECK 0xC0000229
-#define NT_STATUS_DUPLICATE_OBJECTID 0xC000022a
-#define NT_STATUS_OBJECTID_EXISTS 0xC000022b
-#define NT_STATUS_CONVERT_TO_LARGE 0xC000022c
-#define NT_STATUS_RETRY 0xC000022d
-#define NT_STATUS_FOUND_OUT_OF_SCOPE 0xC000022e
-#define NT_STATUS_ALLOCATE_BUCKET 0xC000022f
-#define NT_STATUS_PROPSET_NOT_FOUND 0xC0000230
-#define NT_STATUS_MARSHALL_OVERFLOW 0xC0000231
-#define NT_STATUS_INVALID_VARIANT 0xC0000232
-#define NT_STATUS_DOMAIN_CONTROLLER_NOT_FOUND 0xC0000233
-#define NT_STATUS_ACCOUNT_LOCKED_OUT 0xC0000234
-#define NT_STATUS_HANDLE_NOT_CLOSABLE 0xC0000235
-#define NT_STATUS_CONNECTION_REFUSED 0xC0000236
-#define NT_STATUS_GRACEFUL_DISCONNECT 0xC0000237
-#define NT_STATUS_ADDRESS_ALREADY_ASSOCIATED 0xC0000238
-#define NT_STATUS_ADDRESS_NOT_ASSOCIATED 0xC0000239
-#define NT_STATUS_CONNECTION_INVALID 0xC000023a
-#define NT_STATUS_CONNECTION_ACTIVE 0xC000023b
-#define NT_STATUS_NETWORK_UNREACHABLE 0xC000023c
-#define NT_STATUS_HOST_UNREACHABLE 0xC000023d
-#define NT_STATUS_PROTOCOL_UNREACHABLE 0xC000023e
-#define NT_STATUS_PORT_UNREACHABLE 0xC000023f
-#define NT_STATUS_REQUEST_ABORTED 0xC0000240
-#define NT_STATUS_CONNECTION_ABORTED 0xC0000241
-#define NT_STATUS_BAD_COMPRESSION_BUFFER 0xC0000242
-#define NT_STATUS_USER_MAPPED_FILE 0xC0000243
-#define NT_STATUS_AUDIT_FAILED 0xC0000244
-#define NT_STATUS_TIMER_RESOLUTION_NOT_SET 0xC0000245
-#define NT_STATUS_CONNECTION_COUNT_LIMIT 0xC0000246
-#define NT_STATUS_LOGIN_TIME_RESTRICTION 0xC0000247
-#define NT_STATUS_LOGIN_WKSTA_RESTRICTION 0xC0000248
-#define NT_STATUS_IMAGE_MP_UP_MISMATCH 0xC0000249
-#define NT_STATUS_INSUFFICIENT_LOGON_INFO 0xC0000250
-#define NT_STATUS_BAD_DLL_ENTRYPOINT 0xC0000251
-#define NT_STATUS_BAD_SERVICE_ENTRYPOINT 0xC0000252
-#define NT_STATUS_LPC_REPLY_LOST 0xC0000253
-#define NT_STATUS_IP_ADDRESS_CONFLICT1 0xC0000254
-#define NT_STATUS_IP_ADDRESS_CONFLICT2 0xC0000255
-#define NT_STATUS_REGISTRY_QUOTA_LIMIT 0xC0000256
-#define NT_STATUS_PATH_NOT_COVERED 0xC0000257
-#define NT_STATUS_NO_CALLBACK_ACTIVE 0xC0000258
-#define NT_STATUS_LICENSE_QUOTA_EXCEEDED 0xC0000259
-#define NT_STATUS_PWD_TOO_SHORT 0xC000025a
-#define NT_STATUS_PWD_TOO_RECENT 0xC000025b
-#define NT_STATUS_PWD_HISTORY_CONFLICT 0xC000025c
-#define NT_STATUS_PLUGPLAY_NO_DEVICE 0xC000025e
-#define NT_STATUS_UNSUPPORTED_COMPRESSION 0xC000025f
-#define NT_STATUS_INVALID_HW_PROFILE 0xC0000260
-#define NT_STATUS_INVALID_PLUGPLAY_DEVICE_PATH 0xC0000261
-#define NT_STATUS_DRIVER_ORDINAL_NOT_FOUND 0xC0000262
-#define NT_STATUS_DRIVER_ENTRYPOINT_NOT_FOUND 0xC0000263
-#define NT_STATUS_RESOURCE_NOT_OWNED 0xC0000264
-#define NT_STATUS_TOO_MANY_LINKS 0xC0000265
-#define NT_STATUS_QUOTA_LIST_INCONSISTENT 0xC0000266
-#define NT_STATUS_FILE_IS_OFFLINE 0xC0000267
-#define NT_STATUS_NOT_A_REPARSE_POINT 0xC0000275
-#define NT_STATUS_NO_SUCH_JOB 0xC0000EDE
+%include "status_codes.i"
 
 %pythoncode %{
 	NTSTATUS = _dcerpc.NTSTATUS
diff --git a/source4/scripting/swig/status_codes.i b/source4/scripting/swig/status_codes.i
new file mode 100644
index 0000000000..dccbfab61d
--- /dev/null
+++ b/source4/scripting/swig/status_codes.i
@@ -0,0 +1,552 @@
+/* Win32 status codes */
+
+#define STATUS_BUFFER_OVERFLOW            0x80000005
+#define STATUS_NO_MORE_FILES              0x80000006
+#define NT_STATUS_NO_MORE_ENTRIES         0x8000001a
+
+#define STATUS_MORE_ENTRIES               0x0105
+#define STATUS_SOME_UNMAPPED              0x0107
+#define ERROR_INVALID_PARAMETER		  0x0057
+#define ERROR_INSUFFICIENT_BUFFER	  0x007a
+#define STATUS_NOTIFY_ENUM_DIR            0x010c
+#define ERROR_INVALID_DATATYPE		  0x070c
+
+/* NT status codes */
+
+#define NT_STATUS_OK 0x00000000
+#define NT_STATUS_UNSUCCESSFUL 0xC0000001
+#define NT_STATUS_NOT_IMPLEMENTED 0xC0000002
+#define NT_STATUS_INVALID_INFO_CLASS 0xC0000003
+#define NT_STATUS_INFO_LENGTH_MISMATCH 0xC0000004
+#define NT_STATUS_ACCESS_VIOLATION 0xC0000005
+#define NT_STATUS_IN_PAGE_ERROR 0xC0000006
+#define NT_STATUS_PAGEFILE_QUOTA 0xC0000007
+#define NT_STATUS_INVALID_HANDLE 0xC0000008
+#define NT_STATUS_BAD_INITIAL_STACK 0xC0000009
+#define NT_STATUS_BAD_INITIAL_PC 0xC000000a
+#define NT_STATUS_INVALID_CID 0xC000000b
+#define NT_STATUS_TIMER_NOT_CANCELED 0xC000000c
+#define NT_STATUS_INVALID_PARAMETER 0xC000000d
+#define NT_STATUS_NO_SUCH_DEVICE 0xC000000e
+#define NT_STATUS_NO_SUCH_FILE 0xC000000f
+#define NT_STATUS_INVALID_DEVICE_REQUEST 0xC0000010
+#define NT_STATUS_END_OF_FILE 0xC0000011
+#define NT_STATUS_WRONG_VOLUME 0xC0000012
+#define NT_STATUS_NO_MEDIA_IN_DEVICE 0xC0000013
+#define NT_STATUS_UNRECOGNIZED_MEDIA 0xC0000014
+#define NT_STATUS_NONEXISTENT_SECTOR 0xC0000015
+#define NT_STATUS_MORE_PROCESSING_REQUIRED 0xC0000016
+#define NT_STATUS_NO_MEMORY 0xC0000017
+#define NT_STATUS_CONFLICTING_ADDRESSES 0xC0000018
+#define NT_STATUS_NOT_MAPPED_VIEW 0xC0000019
+#define NT_STATUS_UNABLE_TO_FREE_VM 0xC000001a
+#define NT_STATUS_UNABLE_TO_DELETE_SECTION 0xC000001b
+#define NT_STATUS_INVALID_SYSTEM_SERVICE 0xC000001c
+#define NT_STATUS_ILLEGAL_INSTRUCTION 0xC000001d
+#define NT_STATUS_INVALID_LOCK_SEQUENCE 0xC000001e
+#define NT_STATUS_INVALID_VIEW_SIZE 0xC000001f
+#define NT_STATUS_INVALID_FILE_FOR_SECTION 0xC0000020
+#define NT_STATUS_ALREADY_COMMITTED 0xC0000021
+#define NT_STATUS_ACCESS_DENIED 0xC0000022
+#define NT_STATUS_BUFFER_TOO_SMALL 0xC0000023
+#define NT_STATUS_OBJECT_TYPE_MISMATCH 0xC0000024
+#define NT_STATUS_NONCONTINUABLE_EXCEPTION 0xC0000025
+#define NT_STATUS_INVALID_DISPOSITION 0xC0000026
+#define NT_STATUS_UNWIND 0xC0000027
+#define NT_STATUS_BAD_STACK 0xC0000028
+#define NT_STATUS_INVALID_UNWIND_TARGET 0xC0000029
+#define NT_STATUS_NOT_LOCKED 0xC000002a
+#define NT_STATUS_PARITY_ERROR 0xC000002b
+#define NT_STATUS_UNABLE_TO_DECOMMIT_VM 0xC000002c
+#define NT_STATUS_NOT_COMMITTED 0xC000002d
+#define NT_STATUS_INVALID_PORT_ATTRIBUTES 0xC000002e
+#define NT_STATUS_PORT_MESSAGE_TOO_LONG 0xC000002f
+#define NT_STATUS_INVALID_PARAMETER_MIX 0xC0000030
+#define NT_STATUS_INVALID_QUOTA_LOWER 0xC0000031
+#define NT_STATUS_DISK_CORRUPT_ERROR 0xC0000032
+#define NT_STATUS_OBJECT_NAME_INVALID 0xC0000033
+#define NT_STATUS_OBJECT_NAME_NOT_FOUND 0xC0000034
+#define NT_STATUS_OBJECT_NAME_COLLISION 0xC0000035
+#define NT_STATUS_HANDLE_NOT_WAITABLE 0xC0000036
+#define NT_STATUS_PORT_DISCONNECTED 0xC0000037
+#define NT_STATUS_DEVICE_ALREADY_ATTACHED 0xC0000038
+#define NT_STATUS_OBJECT_PATH_INVALID 0xC0000039
+#define NT_STATUS_OBJECT_PATH_NOT_FOUND 0xC000003a
+#define NT_STATUS_OBJECT_PATH_SYNTAX_BAD 0xC000003b
+#define NT_STATUS_DATA_OVERRUN 0xC000003c
+#define NT_STATUS_DATA_LATE_ERROR 0xC000003d
+#define NT_STATUS_DATA_ERROR 0xC000003e
+#define NT_STATUS_CRC_ERROR 0xC000003f
+#define NT_STATUS_SECTION_TOO_BIG 0xC0000040
+#define NT_STATUS_PORT_CONNECTION_REFUSED 0xC0000041
+#define NT_STATUS_INVALID_PORT_HANDLE 0xC0000042
+#define NT_STATUS_SHARING_VIOLATION 0xC0000043
+#define NT_STATUS_QUOTA_EXCEEDED 0xC0000044
+#define NT_STATUS_INVALID_PAGE_PROTECTION 0xC0000045
+#define NT_STATUS_MUTANT_NOT_OWNED 0xC0000046
+#define NT_STATUS_SEMAPHORE_LIMIT_EXCEEDED 0xC0000047
+#define NT_STATUS_PORT_ALREADY_SET 0xC0000048
+#define NT_STATUS_SECTION_NOT_IMAGE 0xC0000049
+#define NT_STATUS_SUSPEND_COUNT_EXCEEDED 0xC000004a
+#define NT_STATUS_THREAD_IS_TERMINATING 0xC000004b
+#define NT_STATUS_BAD_WORKING_SET_LIMIT 0xC000004c
+#define NT_STATUS_INCOMPATIBLE_FILE_MAP 0xC000004d
+#define NT_STATUS_SECTION_PROTECTION 0xC000004e
+#define NT_STATUS_EAS_NOT_SUPPORTED 0xC000004f
+#define NT_STATUS_EA_TOO_LARGE 0xC0000050
+#define NT_STATUS_NONEXISTENT_EA_ENTRY 0xC0000051
+#define NT_STATUS_NO_EAS_ON_FILE 0xC0000052
+#define NT_STATUS_EA_CORRUPT_ERROR 0xC0000053
+#define NT_STATUS_FILE_LOCK_CONFLICT 0xC0000054
+#define NT_STATUS_LOCK_NOT_GRANTED 0xC0000055
+#define NT_STATUS_DELETE_PENDING 0xC0000056
+#define NT_STATUS_CTL_FILE_NOT_SUPPORTED 0xC0000057
+#define NT_STATUS_UNKNOWN_REVISION 0xC0000058
+#define NT_STATUS_REVISION_MISMATCH 0xC0000059
+#define NT_STATUS_INVALID_OWNER 0xC000005a
+#define NT_STATUS_INVALID_PRIMARY_GROUP 0xC000005b
+#define NT_STATUS_NO_IMPERSONATION_TOKEN 0xC000005c
+#define NT_STATUS_CANT_DISABLE_MANDATORY 0xC000005d
+#define NT_STATUS_NO_LOGON_SERVERS 0xC000005e
+#define NT_STATUS_NO_SUCH_LOGON_SESSION 0xC000005f
+#define NT_STATUS_NO_SUCH_PRIVILEGE 0xC0000060
+#define NT_STATUS_PRIVILEGE_NOT_HELD 0xC0000061
+#define NT_STATUS_INVALID_ACCOUNT_NAME 0xC0000062
+#define NT_STATUS_USER_EXISTS 0xC0000063
+#define NT_STATUS_NO_SUCH_USER 0xC0000064
+#define NT_STATUS_GROUP_EXISTS 0xC0000065
+#define NT_STATUS_NO_SUCH_GROUP 0xC0000066
+#define NT_STATUS_MEMBER_IN_GROUP 0xC0000067
+#define NT_STATUS_MEMBER_NOT_IN_GROUP 0xC0000068
+#define NT_STATUS_LAST_ADMIN 0xC0000069
+#define NT_STATUS_WRONG_PASSWORD 0xC000006a
+#define NT_STATUS_ILL_FORMED_PASSWORD 0xC000006b
+#define NT_STATUS_PASSWORD_RESTRICTION 0xC000006c
+#define NT_STATUS_LOGON_FAILURE 0xC000006d
+#define NT_STATUS_ACCOUNT_RESTRICTION 0xC000006e
+#define NT_STATUS_INVALID_LOGON_HOURS 0xC000006f
+#define NT_STATUS_INVALID_WORKSTATION 0xC0000070
+#define NT_STATUS_PASSWORD_EXPIRED 0xC0000071
+#define NT_STATUS_ACCOUNT_DISABLED 0xC0000072
+#define NT_STATUS_NONE_MAPPED 0xC0000073
+#define NT_STATUS_TOO_MANY_LUIDS_REQUESTED 0xC0000074
+#define NT_STATUS_LUIDS_EXHAUSTED 0xC0000075
+#define NT_STATUS_INVALID_SUB_AUTHORITY 0xC0000076
+#define NT_STATUS_INVALID_ACL 0xC0000077
+#define NT_STATUS_INVALID_SID 0xC0000078
+#define NT_STATUS_INVALID_SECURITY_DESCR 0xC0000079
+#define NT_STATUS_PROCEDURE_NOT_FOUND 0xC000007a
+#define NT_STATUS_INVALID_IMAGE_FORMAT 0xC000007b
+#define NT_STATUS_NO_TOKEN 0xC000007c
+#define NT_STATUS_BAD_INHERITANCE_ACL 0xC000007d
+#define NT_STATUS_RANGE_NOT_LOCKED 0xC000007e
+#define NT_STATUS_DISK_FULL 0xC000007f
+#define NT_STATUS_SERVER_DISABLED 0xC0000080
+#define NT_STATUS_SERVER_NOT_DISABLED 0xC0000081
+#define NT_STATUS_TOO_MANY_GUIDS_REQUESTED 0xC0000082
+#define NT_STATUS_GUIDS_EXHAUSTED 0xC0000083
+#define NT_STATUS_INVALID_ID_AUTHORITY 0xC0000084
+#define NT_STATUS_AGENTS_EXHAUSTED 0xC0000085
+#define NT_STATUS_INVALID_VOLUME_LABEL 0xC0000086
+#define NT_STATUS_SECTION_NOT_EXTENDED 0xC0000087
+#define NT_STATUS_NOT_MAPPED_DATA 0xC0000088
+#define NT_STATUS_RESOURCE_DATA_NOT_FOUND 0xC0000089
+#define NT_STATUS_RESOURCE_TYPE_NOT_FOUND 0xC000008a
+#define NT_STATUS_RESOURCE_NAME_NOT_FOUND 0xC000008b
+#define NT_STATUS_ARRAY_BOUNDS_EXCEEDED 0xC000008c
+#define NT_STATUS_FLOAT_DENORMAL_OPERAND 0xC000008d
+#define NT_STATUS_FLOAT_DIVIDE_BY_ZERO 0xC000008e
+#define NT_STATUS_FLOAT_INEXACT_RESULT 0xC000008f
+#define NT_STATUS_FLOAT_INVALID_OPERATION 0xC0000090
+#define NT_STATUS_FLOAT_OVERFLOW 0xC0000091
+#define NT_STATUS_FLOAT_STACK_CHECK 0xC0000092
+#define NT_STATUS_FLOAT_UNDERFLOW 0xC0000093
+#define NT_STATUS_INTEGER_DIVIDE_BY_ZERO 0xC0000094
+#define NT_STATUS_INTEGER_OVERFLOW 0xC0000095
+#define NT_STATUS_PRIVILEGED_INSTRUCTION 0xC0000096
+#define NT_STATUS_TOO_MANY_PAGING_FILES 0xC0000097
+#define NT_STATUS_FILE_INVALID 0xC0000098
+#define NT_STATUS_ALLOTTED_SPACE_EXCEEDED 0xC0000099
+#define NT_STATUS_INSUFFICIENT_RESOURCES 0xC000009a
+#define NT_STATUS_DFS_EXIT_PATH_FOUND 0xC000009b
+#define NT_STATUS_DEVICE_DATA_ERROR 0xC000009c
+#define NT_STATUS_DEVICE_NOT_CONNECTED 0xC000009d
+#define NT_STATUS_DEVICE_POWER_FAILURE 0xC000009e
+#define NT_STATUS_FREE_VM_NOT_AT_BASE 0xC000009f
+#define NT_STATUS_MEMORY_NOT_ALLOCATED 0xC00000a0
+#define NT_STATUS_WORKING_SET_QUOTA 0xC00000a1
+#define NT_STATUS_MEDIA_WRITE_PROTECTED 0xC00000a2
+#define NT_STATUS_DEVICE_NOT_READY 0xC00000a3
+#define NT_STATUS_INVALID_GROUP_ATTRIBUTES 0xC00000a4
+#define NT_STATUS_BAD_IMPERSONATION_LEVEL 0xC00000a5
+#define NT_STATUS_CANT_OPEN_ANONYMOUS 0xC00000a6
+#define NT_STATUS_BAD_VALIDATION_CLASS 0xC00000a7
+#define NT_STATUS_BAD_TOKEN_TYPE 0xC00000a8
+#define NT_STATUS_BAD_MASTER_BOOT_RECORD 0xC00000a9
+#define NT_STATUS_INSTRUCTION_MISALIGNMENT 0xC00000aa
+#define NT_STATUS_INSTANCE_NOT_AVAILABLE 0xC00000ab
+#define NT_STATUS_PIPE_NOT_AVAILABLE 0xC00000ac
+#define NT_STATUS_INVALID_PIPE_STATE 0xC00000ad
+#define NT_STATUS_PIPE_BUSY 0xC00000ae
+#define NT_STATUS_ILLEGAL_FUNCTION 0xC00000af
+#define NT_STATUS_PIPE_DISCONNECTED 0xC00000b0
+#define NT_STATUS_PIPE_CLOSING 0xC00000b1
+#define NT_STATUS_PIPE_CONNECTED 0xC00000b2
+#define NT_STATUS_PIPE_LISTENING 0xC00000b3
+#define NT_STATUS_INVALID_READ_MODE 0xC00000b4
+#define NT_STATUS_IO_TIMEOUT 0xC00000b5
+#define NT_STATUS_FILE_FORCED_CLOSED 0xC00000b6
+#define NT_STATUS_PROFILING_NOT_STARTED 0xC00000b7
+#define NT_STATUS_PROFILING_NOT_STOPPED 0xC00000b8
+#define NT_STATUS_COULD_NOT_INTERPRET 0xC00000b9
+#define NT_STATUS_FILE_IS_A_DIRECTORY 0xC00000ba
+#define NT_STATUS_NOT_SUPPORTED 0xC00000bb
+#define NT_STATUS_REMOTE_NOT_LISTENING 0xC00000bc
+#define NT_STATUS_DUPLICATE_NAME 0xC00000bd
+#define NT_STATUS_BAD_NETWORK_PATH 0xC00000be
+#define NT_STATUS_NETWORK_BUSY 0xC00000bf
+#define NT_STATUS_DEVICE_DOES_NOT_EXIST 0xC00000c0
+#define NT_STATUS_TOO_MANY_COMMANDS 0xC00000c1
+#define NT_STATUS_ADAPTER_HARDWARE_ERROR 0xC00000c2
+#define NT_STATUS_INVALID_NETWORK_RESPONSE 0xC00000c3
+#define NT_STATUS_UNEXPECTED_NETWORK_ERROR 0xC00000c4
+#define NT_STATUS_BAD_REMOTE_ADAPTER 0xC00000c5
+#define NT_STATUS_PRINT_QUEUE_FULL 0xC00000c6
+#define NT_STATUS_NO_SPOOL_SPACE 0xC00000c7
+#define NT_STATUS_PRINT_CANCELLED 0xC00000c8
+#define NT_STATUS_NETWORK_NAME_DELETED 0xC00000c9
+#define NT_STATUS_NETWORK_ACCESS_DENIED 0xC00000ca
+#define NT_STATUS_BAD_DEVICE_TYPE 0xC00000cb
+#define NT_STATUS_BAD_NETWORK_NAME 0xC00000cc
+#define NT_STATUS_TOO_MANY_NAMES 0xC00000cd
+#define NT_STATUS_TOO_MANY_SESSIONS 0xC00000ce
+#define NT_STATUS_SHARING_PAUSED 0xC00000cf
+#define NT_STATUS_REQUEST_NOT_ACCEPTED 0xC00000d0
+#define NT_STATUS_REDIRECTOR_PAUSED 0xC00000d1
+#define NT_STATUS_NET_WRITE_FAULT 0xC00000d2
+#define NT_STATUS_PROFILING_AT_LIMIT 0xC00000d3
+#define NT_STATUS_NOT_SAME_DEVICE 0xC00000d4
+#define NT_STATUS_FILE_RENAMED 0xC00000d5
+#define NT_STATUS_VIRTUAL_CIRCUIT_CLOSED 0xC00000d6
+#define NT_STATUS_NO_SECURITY_ON_OBJECT 0xC00000d7
+#define NT_STATUS_CANT_WAIT 0xC00000d8
+#define NT_STATUS_PIPE_EMPTY 0xC00000d9
+#define NT_STATUS_CANT_ACCESS_DOMAIN_INFO 0xC00000da
+#define NT_STATUS_CANT_TERMINATE_SELF 0xC00000db
+#define NT_STATUS_INVALID_SERVER_STATE 0xC00000dc
+#define NT_STATUS_INVALID_DOMAIN_STATE 0xC00000dd
+#define NT_STATUS_INVALID_DOMAIN_ROLE 0xC00000de
+#define NT_STATUS_NO_SUCH_DOMAIN 0xC00000df
+#define NT_STATUS_DOMAIN_EXISTS 0xC00000e0
+#define NT_STATUS_DOMAIN_LIMIT_EXCEEDED 0xC00000e1
+#define NT_STATUS_OPLOCK_NOT_GRANTED 0xC00000e2
+#define NT_STATUS_INVALID_OPLOCK_PROTOCOL 0xC00000e3
+#define NT_STATUS_INTERNAL_DB_CORRUPTION 0xC00000e4
+#define NT_STATUS_INTERNAL_ERROR 0xC00000e5
+#define NT_STATUS_GENERIC_NOT_MAPPED 0xC00000e6
+#define NT_STATUS_BAD_DESCRIPTOR_FORMAT 0xC00000e7
+#define NT_STATUS_INVALID_USER_BUFFER 0xC00000e8
+#define NT_STATUS_UNEXPECTED_IO_ERROR 0xC00000e9
+#define NT_STATUS_UNEXPECTED_MM_CREATE_ERR 0xC00000ea
+#define NT_STATUS_UNEXPECTED_MM_MAP_ERROR 0xC00000eb
+#define NT_STATUS_UNEXPECTED_MM_EXTEND_ERR 0xC00000ec
+#define NT_STATUS_NOT_LOGON_PROCESS 0xC00000ed
+#define NT_STATUS_LOGON_SESSION_EXISTS 0xC00000ee
+#define NT_STATUS_INVALID_PARAMETER_1 0xC00000ef
+#define NT_STATUS_INVALID_PARAMETER_2 0xC00000f0
+#define NT_STATUS_INVALID_PARAMETER_3 0xC00000f1
+#define NT_STATUS_INVALID_PARAMETER_4 0xC00000f2
+#define NT_STATUS_INVALID_PARAMETER_5 0xC00000f3
+#define NT_STATUS_INVALID_PARAMETER_6 0xC00000f4
+#define NT_STATUS_INVALID_PARAMETER_7 0xC00000f5
+#define NT_STATUS_INVALID_PARAMETER_8 0xC00000f6
+#define NT_STATUS_INVALID_PARAMETER_9 0xC00000f7
+#define NT_STATUS_INVALID_PARAMETER_10 0xC00000f8
+#define NT_STATUS_INVALID_PARAMETER_11 0xC00000f9
+#define NT_STATUS_INVALID_PARAMETER_12 0xC00000fa
+#define NT_STATUS_REDIRECTOR_NOT_STARTED 0xC00000fb
+#define NT_STATUS_REDIRECTOR_STARTED 0xC00000fc
+#define NT_STATUS_STACK_OVERFLOW 0xC00000fd
+#define NT_STATUS_NO_SUCH_PACKAGE 0xC00000fe
+#define NT_STATUS_BAD_FUNCTION_TABLE 0xC00000ff
+#define NT_STATUS_DIRECTORY_NOT_EMPTY 0xC0000101
+#define NT_STATUS_FILE_CORRUPT_ERROR 0xC0000102
+#define NT_STATUS_NOT_A_DIRECTORY 0xC0000103
+#define NT_STATUS_BAD_LOGON_SESSION_STATE 0xC0000104
+#define NT_STATUS_LOGON_SESSION_COLLISION 0xC0000105
+#define NT_STATUS_NAME_TOO_LONG 0xC0000106
+#define NT_STATUS_FILES_OPEN 0xC0000107
+#define NT_STATUS_CONNECTION_IN_USE 0xC0000108
+#define NT_STATUS_MESSAGE_NOT_FOUND 0xC0000109
+#define NT_STATUS_PROCESS_IS_TERMINATING 0xC000010a
+#define NT_STATUS_INVALID_LOGON_TYPE 0xC000010b
+#define NT_STATUS_NO_GUID_TRANSLATION 0xC000010c
+#define NT_STATUS_CANNOT_IMPERSONATE 0xC000010d
+#define NT_STATUS_IMAGE_ALREADY_LOADED 0xC000010e
+#define NT_STATUS_ABIOS_NOT_PRESENT 0xC000010f
+#define NT_STATUS_ABIOS_LID_NOT_EXIST 0xC0000110
+#define NT_STATUS_ABIOS_LID_ALREADY_OWNED 0xC0000111
+#define NT_STATUS_ABIOS_NOT_LID_OWNER 0xC0000112
+#define NT_STATUS_ABIOS_INVALID_COMMAND 0xC0000113
+#define NT_STATUS_ABIOS_INVALID_LID 0xC0000114
+#define NT_STATUS_ABIOS_SELECTOR_NOT_AVAILABLE 0xC0000115
+#define NT_STATUS_ABIOS_INVALID_SELECTOR 0xC0000116
+#define NT_STATUS_NO_LDT 0xC0000117
+#define NT_STATUS_INVALID_LDT_SIZE 0xC0000118
+#define NT_STATUS_INVALID_LDT_OFFSET 0xC0000119
+#define NT_STATUS_INVALID_LDT_DESCRIPTOR 0xC000011a
+#define NT_STATUS_INVALID_IMAGE_NE_FORMAT 0xC000011b
+#define NT_STATUS_RXACT_INVALID_STATE 0xC000011c
+#define NT_STATUS_RXACT_COMMIT_FAILURE 0xC000011d
+#define NT_STATUS_MAPPED_FILE_SIZE_ZERO 0xC000011e
+#define NT_STATUS_TOO_MANY_OPENED_FILES 0xC000011f
+#define NT_STATUS_CANCELLED 0xC0000120
+#define NT_STATUS_CANNOT_DELETE 0xC0000121
+#define NT_STATUS_INVALID_COMPUTER_NAME 0xC0000122
+#define NT_STATUS_FILE_DELETED 0xC0000123
+#define NT_STATUS_SPECIAL_ACCOUNT 0xC0000124
+#define NT_STATUS_SPECIAL_GROUP 0xC0000125
+#define NT_STATUS_SPECIAL_USER 0xC0000126
+#define NT_STATUS_MEMBERS_PRIMARY_GROUP 0xC0000127
+#define NT_STATUS_FILE_CLOSED 0xC0000128
+#define NT_STATUS_TOO_MANY_THREADS 0xC0000129
+#define NT_STATUS_THREAD_NOT_IN_PROCESS 0xC000012a
+#define NT_STATUS_TOKEN_ALREADY_IN_USE 0xC000012b
+#define NT_STATUS_PAGEFILE_QUOTA_EXCEEDED 0xC000012c
+#define NT_STATUS_COMMITMENT_LIMIT 0xC000012d
+#define NT_STATUS_INVALID_IMAGE_LE_FORMAT 0xC000012e
+#define NT_STATUS_INVALID_IMAGE_NOT_MZ 0xC000012f
+#define NT_STATUS_INVALID_IMAGE_PROTECT 0xC0000130
+#define NT_STATUS_INVALID_IMAGE_WIN_16 0xC0000131
+#define NT_STATUS_LOGON_SERVER_CONFLICT 0xC0000132
+#define NT_STATUS_TIME_DIFFERENCE_AT_DC 0xC0000133
+#define NT_STATUS_SYNCHRONIZATION_REQUIRED 0xC0000134
+#define NT_STATUS_DLL_NOT_FOUND 0xC0000135
+#define NT_STATUS_OPEN_FAILED 0xC0000136
+#define NT_STATUS_IO_PRIVILEGE_FAILED 0xC0000137
+#define NT_STATUS_ORDINAL_NOT_FOUND 0xC0000138
+#define NT_STATUS_ENTRYPOINT_NOT_FOUND 0xC0000139
+#define NT_STATUS_CONTROL_C_EXIT 0xC000013a
+#define NT_STATUS_LOCAL_DISCONNECT 0xC000013b
+#define NT_STATUS_REMOTE_DISCONNECT 0xC000013c
+#define NT_STATUS_REMOTE_RESOURCES 0xC000013d
+#define NT_STATUS_LINK_FAILED 0xC000013e
+#define NT_STATUS_LINK_TIMEOUT 0xC000013f
+#define NT_STATUS_INVALID_CONNECTION 0xC0000140
+#define NT_STATUS_INVALID_ADDRESS 0xC0000141
+#define NT_STATUS_DLL_INIT_FAILED 0xC0000142
+#define NT_STATUS_MISSING_SYSTEMFILE 0xC0000143
+#define NT_STATUS_UNHANDLED_EXCEPTION 0xC0000144
+#define NT_STATUS_APP_INIT_FAILURE 0xC0000145
+#define NT_STATUS_PAGEFILE_CREATE_FAILED 0xC0000146
+#define NT_STATUS_NO_PAGEFILE 0xC0000147
+#define NT_STATUS_INVALID_LEVEL 0xC0000148
+#define NT_STATUS_WRONG_PASSWORD_CORE 0xC0000149
+#define NT_STATUS_ILLEGAL_FLOAT_CONTEXT 0xC000014a
+#define NT_STATUS_PIPE_BROKEN 0xC000014b
+#define NT_STATUS_REGISTRY_CORRUPT 0xC000014c
+#define NT_STATUS_REGISTRY_IO_FAILED 0xC000014d
+#define NT_STATUS_NO_EVENT_PAIR 0xC000014e
+#define NT_STATUS_UNRECOGNIZED_VOLUME 0xC000014f
+#define NT_STATUS_SERIAL_NO_DEVICE_INITED 0xC0000150
+#define NT_STATUS_NO_SUCH_ALIAS 0xC0000151
+#define NT_STATUS_MEMBER_NOT_IN_ALIAS 0xC0000152
+#define NT_STATUS_MEMBER_IN_ALIAS 0xC0000153
+#define NT_STATUS_ALIAS_EXISTS 0xC0000154
+#define NT_STATUS_LOGON_NOT_GRANTED 0xC0000155
+#define NT_STATUS_TOO_MANY_SECRETS 0xC0000156
+#define NT_STATUS_SECRET_TOO_LONG 0xC0000157
+#define NT_STATUS_INTERNAL_DB_ERROR 0xC0000158
+#define NT_STATUS_FULLSCREEN_MODE 0xC0000159
+#define NT_STATUS_TOO_MANY_CONTEXT_IDS 0xC000015a
+#define NT_STATUS_LOGON_TYPE_NOT_GRANTED 0xC000015b
+#define NT_STATUS_NOT_REGISTRY_FILE 0xC000015c
+#define NT_STATUS_NT_CROSS_ENCRYPTION_REQUIRED 0xC000015d
+#define NT_STATUS_DOMAIN_CTRLR_CONFIG_ERROR 0xC000015e
+#define NT_STATUS_FT_MISSING_MEMBER 0xC000015f
+#define NT_STATUS_ILL_FORMED_SERVICE_ENTRY 0xC0000160
+#define NT_STATUS_ILLEGAL_CHARACTER 0xC0000161
+#define NT_STATUS_UNMAPPABLE_CHARACTER 0xC0000162
+#define NT_STATUS_UNDEFINED_CHARACTER 0xC0000163
+#define NT_STATUS_FLOPPY_VOLUME 0xC0000164
+#define NT_STATUS_FLOPPY_ID_MARK_NOT_FOUND 0xC0000165
+#define NT_STATUS_FLOPPY_WRONG_CYLINDER 0xC0000166
+#define NT_STATUS_FLOPPY_UNKNOWN_ERROR 0xC0000167
+#define NT_STATUS_FLOPPY_BAD_REGISTERS 0xC0000168
+#define NT_STATUS_DISK_RECALIBRATE_FAILED 0xC0000169
+#define NT_STATUS_DISK_OPERATION_FAILED 0xC000016a
+#define NT_STATUS_DISK_RESET_FAILED 0xC000016b
+#define NT_STATUS_SHARED_IRQ_BUSY 0xC000016c
+#define NT_STATUS_FT_ORPHANING 0xC000016d
+#define NT_STATUS_PARTITION_FAILURE 0xC0000172
+#define NT_STATUS_INVALID_BLOCK_LENGTH 0xC0000173
+#define NT_STATUS_DEVICE_NOT_PARTITIONED 0xC0000174
+#define NT_STATUS_UNABLE_TO_LOCK_MEDIA 0xC0000175
+#define NT_STATUS_UNABLE_TO_UNLOAD_MEDIA 0xC0000176
+#define NT_STATUS_EOM_OVERFLOW 0xC0000177
+#define NT_STATUS_NO_MEDIA 0xC0000178
+#define NT_STATUS_NO_SUCH_MEMBER 0xC000017a
+#define NT_STATUS_INVALID_MEMBER 0xC000017b
+#define NT_STATUS_KEY_DELETED 0xC000017c
+#define NT_STATUS_NO_LOG_SPACE 0xC000017d
+#define NT_STATUS_TOO_MANY_SIDS 0xC000017e
+#define NT_STATUS_LM_CROSS_ENCRYPTION_REQUIRED 0xC000017f
+#define NT_STATUS_KEY_HAS_CHILDREN 0xC0000180
+#define NT_STATUS_CHILD_MUST_BE_VOLATILE 0xC0000181
+#define NT_STATUS_DEVICE_CONFIGURATION_ERROR 0xC0000182
+#define NT_STATUS_DRIVER_INTERNAL_ERROR 0xC0000183
+#define NT_STATUS_INVALID_DEVICE_STATE 0xC0000184
+#define NT_STATUS_IO_DEVICE_ERROR 0xC0000185
+#define NT_STATUS_DEVICE_PROTOCOL_ERROR 0xC0000186
+#define NT_STATUS_BACKUP_CONTROLLER 0xC0000187
+#define NT_STATUS_LOG_FILE_FULL 0xC0000188
+#define NT_STATUS_TOO_LATE 0xC0000189
+#define NT_STATUS_NO_TRUST_LSA_SECRET 0xC000018a
+#define NT_STATUS_NO_TRUST_SAM_ACCOUNT 0xC000018b
+#define NT_STATUS_TRUSTED_DOMAIN_FAILURE 0xC000018c
+#define NT_STATUS_TRUSTED_RELATIONSHIP_FAILURE 0xC000018d
+#define NT_STATUS_EVENTLOG_FILE_CORRUPT 0xC000018e
+#define NT_STATUS_EVENTLOG_CANT_START 0xC000018f
+#define NT_STATUS_TRUST_FAILURE 0xC0000190
+#define NT_STATUS_MUTANT_LIMIT_EXCEEDED 0xC0000191
+#define NT_STATUS_NETLOGON_NOT_STARTED 0xC0000192
+#define NT_STATUS_ACCOUNT_EXPIRED 0xC0000193
+#define NT_STATUS_POSSIBLE_DEADLOCK 0xC0000194
+#define NT_STATUS_NETWORK_CREDENTIAL_CONFLICT 0xC0000195
+#define NT_STATUS_REMOTE_SESSION_LIMIT 0xC0000196
+#define NT_STATUS_EVENTLOG_FILE_CHANGED 0xC0000197
+#define NT_STATUS_NOLOGON_INTERDOMAIN_TRUST_ACCOUNT 0xC0000198
+#define NT_STATUS_NOLOGON_WORKSTATION_TRUST_ACCOUNT 0xC0000199
+#define NT_STATUS_NOLOGON_SERVER_TRUST_ACCOUNT 0xC000019a
+#define NT_STATUS_DOMAIN_TRUST_INCONSISTENT 0xC000019b
+#define NT_STATUS_FS_DRIVER_REQUIRED 0xC000019c
+#define NT_STATUS_NO_USER_SESSION_KEY 0xC0000202
+#define NT_STATUS_USER_SESSION_DELETED 0xC0000203
+#define NT_STATUS_RESOURCE_LANG_NOT_FOUND 0xC0000204
+#define NT_STATUS_INSUFF_SERVER_RESOURCES 0xC0000205
+#define NT_STATUS_INVALID_BUFFER_SIZE 0xC0000206
+#define NT_STATUS_INVALID_ADDRESS_COMPONENT 0xC0000207
+#define NT_STATUS_INVALID_ADDRESS_WILDCARD 0xC0000208
+#define NT_STATUS_TOO_MANY_ADDRESSES 0xC0000209
+#define NT_STATUS_ADDRESS_ALREADY_EXISTS 0xC000020a
+#define NT_STATUS_ADDRESS_CLOSED 0xC000020b
+#define NT_STATUS_CONNECTION_DISCONNECTED 0xC000020c
+#define NT_STATUS_CONNECTION_RESET 0xC000020d
+#define NT_STATUS_TOO_MANY_NODES 0xC000020e
+#define NT_STATUS_TRANSACTION_ABORTED 0xC000020f
+#define NT_STATUS_TRANSACTION_TIMED_OUT 0xC0000210
+#define NT_STATUS_TRANSACTION_NO_RELEASE 0xC0000211
+#define NT_STATUS_TRANSACTION_NO_MATCH 0xC0000212
+#define NT_STATUS_TRANSACTION_RESPONDED 0xC0000213
+#define NT_STATUS_TRANSACTION_INVALID_ID 0xC0000214
+#define NT_STATUS_TRANSACTION_INVALID_TYPE 0xC0000215
+#define NT_STATUS_NOT_SERVER_SESSION 0xC0000216
+#define NT_STATUS_NOT_CLIENT_SESSION 0xC0000217
+#define NT_STATUS_CANNOT_LOAD_REGISTRY_FILE 0xC0000218
+#define NT_STATUS_DEBUG_ATTACH_FAILED 0xC0000219
+#define NT_STATUS_SYSTEM_PROCESS_TERMINATED 0xC000021a
+#define NT_STATUS_DATA_NOT_ACCEPTED 0xC000021b
+#define NT_STATUS_NO_BROWSER_SERVERS_FOUND 0xC000021c
+#define NT_STATUS_VDM_HARD_ERROR 0xC000021d
+#define NT_STATUS_DRIVER_CANCEL_TIMEOUT 0xC000021e
+#define NT_STATUS_REPLY_MESSAGE_MISMATCH 0xC000021f
+#define NT_STATUS_MAPPED_ALIGNMENT 0xC0000220
+#define NT_STATUS_IMAGE_CHECKSUM_MISMATCH 0xC0000221
+#define NT_STATUS_LOST_WRITEBEHIND_DATA 0xC0000222
+#define NT_STATUS_CLIENT_SERVER_PARAMETERS_INVALID 0xC0000223
+#define NT_STATUS_PASSWORD_MUST_CHANGE 0xC0000224
+#define NT_STATUS_NOT_FOUND 0xC0000225
+#define NT_STATUS_NOT_TINY_STREAM 0xC0000226
+#define NT_STATUS_RECOVERY_FAILURE 0xC0000227
+#define NT_STATUS_STACK_OVERFLOW_READ 0xC0000228
+#define NT_STATUS_FAIL_CHECK 0xC0000229
+#define NT_STATUS_DUPLICATE_OBJECTID 0xC000022a
+#define NT_STATUS_OBJECTID_EXISTS 0xC000022b
+#define NT_STATUS_CONVERT_TO_LARGE 0xC000022c
+#define NT_STATUS_RETRY 0xC000022d
+#define NT_STATUS_FOUND_OUT_OF_SCOPE 0xC000022e
+#define NT_STATUS_ALLOCATE_BUCKET 0xC000022f
+#define NT_STATUS_PROPSET_NOT_FOUND 0xC0000230
+#define NT_STATUS_MARSHALL_OVERFLOW 0xC0000231
+#define NT_STATUS_INVALID_VARIANT 0xC0000232
+#define NT_STATUS_DOMAIN_CONTROLLER_NOT_FOUND 0xC0000233
+#define NT_STATUS_ACCOUNT_LOCKED_OUT 0xC0000234
+#define NT_STATUS_HANDLE_NOT_CLOSABLE 0xC0000235
+#define NT_STATUS_CONNECTION_REFUSED 0xC0000236
+#define NT_STATUS_GRACEFUL_DISCONNECT 0xC0000237
+#define NT_STATUS_ADDRESS_ALREADY_ASSOCIATED 0xC0000238
+#define NT_STATUS_ADDRESS_NOT_ASSOCIATED 0xC0000239
+#define NT_STATUS_CONNECTION_INVALID 0xC000023a
+#define NT_STATUS_CONNECTION_ACTIVE 0xC000023b
+#define NT_STATUS_NETWORK_UNREACHABLE 0xC000023c
+#define NT_STATUS_HOST_UNREACHABLE 0xC000023d
+#define NT_STATUS_PROTOCOL_UNREACHABLE 0xC000023e
+#define NT_STATUS_PORT_UNREACHABLE 0xC000023f
+#define NT_STATUS_REQUEST_ABORTED 0xC0000240
+#define NT_STATUS_CONNECTION_ABORTED 0xC0000241
+#define NT_STATUS_BAD_COMPRESSION_BUFFER 0xC0000242
+#define NT_STATUS_USER_MAPPED_FILE 0xC0000243
+#define NT_STATUS_AUDIT_FAILED 0xC0000244
+#define NT_STATUS_TIMER_RESOLUTION_NOT_SET 0xC0000245
+#define NT_STATUS_CONNECTION_COUNT_LIMIT 0xC0000246
+#define NT_STATUS_LOGIN_TIME_RESTRICTION 0xC0000247
+#define NT_STATUS_LOGIN_WKSTA_RESTRICTION 0xC0000248
+#define NT_STATUS_IMAGE_MP_UP_MISMATCH 0xC0000249
+#define NT_STATUS_INSUFFICIENT_LOGON_INFO 0xC0000250
+#define NT_STATUS_BAD_DLL_ENTRYPOINT 0xC0000251
+#define NT_STATUS_BAD_SERVICE_ENTRYPOINT 0xC0000252
+#define NT_STATUS_LPC_REPLY_LOST 0xC0000253
+#define NT_STATUS_IP_ADDRESS_CONFLICT1 0xC0000254
+#define NT_STATUS_IP_ADDRESS_CONFLICT2 0xC0000255
+#define NT_STATUS_REGISTRY_QUOTA_LIMIT 0xC0000256
+#define NT_STATUS_PATH_NOT_COVERED 0xC0000257
+#define NT_STATUS_NO_CALLBACK_ACTIVE 0xC0000258
+#define NT_STATUS_LICENSE_QUOTA_EXCEEDED 0xC0000259
+#define NT_STATUS_PWD_TOO_SHORT 0xC000025a
+#define NT_STATUS_PWD_TOO_RECENT 0xC000025b
+#define NT_STATUS_PWD_HISTORY_CONFLICT 0xC000025c
+#define NT_STATUS_PLUGPLAY_NO_DEVICE 0xC000025e
+#define NT_STATUS_UNSUPPORTED_COMPRESSION 0xC000025f
+#define NT_STATUS_INVALID_HW_PROFILE 0xC0000260
+#define NT_STATUS_INVALID_PLUGPLAY_DEVICE_PATH 0xC0000261
+#define NT_STATUS_DRIVER_ORDINAL_NOT_FOUND 0xC0000262
+#define NT_STATUS_DRIVER_ENTRYPOINT_NOT_FOUND 0xC0000263
+#define NT_STATUS_RESOURCE_NOT_OWNED 0xC0000264
+#define NT_STATUS_TOO_MANY_LINKS 0xC0000265
+#define NT_STATUS_QUOTA_LIST_INCONSISTENT 0xC0000266
+#define NT_STATUS_FILE_IS_OFFLINE 0xC0000267
+#define NT_STATUS_NOT_A_REPARSE_POINT 0xC0000275
+#define NT_STATUS_NO_SUCH_JOB 0xC0000EDE
+
+#define WERR_OK 0
+#define WERR_BADFUNC 1
+#define WERR_BADFILE 2
+#define WERR_ACCESS_DENIED 5
+#define WERR_BADFID 6
+#define WERR_NOMEM 8
+#define WERR_GENERAL_FAILURE 31
+#define WERR_NOT_SUPPORTED 50
+#define WERR_BAD_NETPATH 53
+#define WERR_PRINTQ_FULL 61
+#define WERR_NO_SPOOL_SPACE 62
+#define WERR_NO_SUCH_SHARE 67
+#define WERR_ALREADY_EXISTS 80
+#define WERR_BAD_PASSWORD 86
+#define WERR_INVALID_PARAM 87
+#define WERR_INSUFFICIENT_BUFFER 122
+#define WERR_INVALID_NAME 123
+#define WERR_UNKNOWN_LEVEL 124
+#define WERR_OBJECT_PATH_INVALID 161
+#define WERR_NO_MORE_ITEMS 259
+#define WERR_MORE_DATA 234
+#define WERR_INVALID_OWNER 1307
+#define WERR_CAN_NOT_COMPLETE 1003
+#define WERR_INVALID_SECURITY_DESCRIPTOR 1338
+#define WERR_SERVER_UNAVAILABLE 1722
+#define WERR_INVALID_FORM_NAME 1902
+#define WERR_INVALID_FORM_SIZE 1903
+#define WERR_BUF_TOO_SMALL 2123
+#define WERR_JOB_NOT_FOUND 2151
+#define WERR_DEST_NOT_FOUND 2152
+#define WERR_NOT_LOCAL_DOMAIN 2320
+#define WERR_STATUS_MORE_ENTRIES 0x0105
-- 
cgit 


From 985abd104dc1011b8553986ddd1fe6f4c64705c7 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Sun, 3 Oct 2004 08:50:31 +0000
Subject: r2801: Wrapped functions that return a DOS error code can return
 DCERPC faults if they are badly formed.  Handle this by checking the value of
 NTSTATUS as well as WERROR. (This used to be commit
 bb1be7819741f6c7dc1ee982cb2a255b6d776b79)

---
 source4/scripting/swig/dcerpc.i | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/dcerpc.i b/source4/scripting/swig/dcerpc.i
index a560cca570..d8589693ac 100644
--- a/source4/scripting/swig/dcerpc.i
+++ b/source4/scripting/swig/dcerpc.i
@@ -366,6 +366,10 @@ NTSTATUS dcerpc_pipe_connect(struct dcerpc_pipe **OUT,
 
 %exception {
 	$action
+	if (NT_STATUS_IS_ERR(result)) {
+		set_ntstatus_exception(NT_STATUS_V(result));
+		return NULL;
+	}
 	if (!W_ERROR_IS_OK(arg3->out.result)) {
 		set_werror_exception(W_ERROR_V(arg3->out.result));
 		return NULL;
-- 
cgit 


From 263212aba5d05367cc9ff92daf6b1047ea699ac3 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Sun, 3 Oct 2004 11:07:04 +0000
Subject: r2807: OK I think winreg_EnumValue() finally works.  The previous
 version didn't work with non-NULL registry value names.

Update testsuite to enumerate all keys and values two levels deep.
(This used to be commit c09f0f355ba6a589121588492aa2db5deb7121e0)
---
 source4/scripting/swig/torture/winreg.py | 60 +++++++++++++-------------------
 1 file changed, 25 insertions(+), 35 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/torture/winreg.py b/source4/scripting/swig/torture/winreg.py
index acf319d6f9..b7a42042a8 100755
--- a/source4/scripting/swig/torture/winreg.py
+++ b/source4/scripting/swig/torture/winreg.py
@@ -30,12 +30,16 @@ def test_CloseKey(pipe, handle):
 
     dcerpc.winreg_CloseKey(pipe, r)
 
-def test_Enum(pipe, handle, depth = 0):
+def test_Enum(pipe, handle, name, depth = 0):
 
     if depth > 2:
         return
 
-    keyinfo = test_QueryInfoKey(pipe, handle)
+    try:
+        keyinfo = test_QueryInfoKey(pipe, handle)
+    except dcerpc.WERROR, arg:
+        if arg[0] == dcerpc.WERR_ACCESS_DENIED:
+            return
 
     # Enumerate keys
 
@@ -68,7 +72,8 @@ def test_Enum(pipe, handle, depth = 0):
 
         result = dcerpc.winreg_OpenKey(pipe, s)
 
-        test_Enum(pipe, result['handle'], depth + 1)
+        test_Enum(pipe, result['handle'], name + '/' + s['keyname']['name'],
+                  depth + 1)
 
         test_CloseKey(pipe, result['handle'])
 
@@ -77,44 +82,30 @@ def test_Enum(pipe, handle, depth = 0):
     r = {}
     r['handle'] = handle
 
-    keyinfo['max_valnamelen'] = 18
-    keyinfo['max_valbufsize'] = 0x31f5
-
-    r['foo'] = {}
-    r['foo']['len'] = 0
-    r['foo']['max_len'] = keyinfo['max_valnamelen'] * 2
-    r['foo']['buffer'] = {}
-    r['foo']['buffer']['max_len'] = keyinfo['max_valnamelen']
-    r['foo']['buffer']['offset'] = 0
-    r['foo']['buffer']['len'] = 0
-    r['foo']['buffer']['buffer'] = ''
+    r['name_in'] = {}
+    r['name_in']['len'] = 0
+    r['name_in']['max_len'] = (keyinfo['max_valnamelen'] + 1) * 2
+    r['name_in']['buffer'] = {}
+    r['name_in']['buffer']['max_len'] = keyinfo['max_valnamelen']  + 1
+    r['name_in']['buffer']['offset'] = 0
+    r['name_in']['buffer']['len'] = 0
     r['type'] = 0
-    r['value'] = {}
-    r['value']['max_len'] = keyinfo['max_valbufsize']
-    r['value']['offset'] = 0
-    r['value']['len'] = 0
-    r['value']['buffer'] = []
-    r['returned_len'] = 0
-    r['foo2'] = {}
-    r['foo2']['max_len'] = keyinfo['max_valbufsize']
-    r['foo2']['offset'] = 0
-    r['foo2']['len'] = 0
-    r['foo2']['buffer'] = ''
-    r['value1'] = keyinfo['max_valbufsize']
-    r['value2'] = 0
+    r['value_in'] = {}
+    r['value_in']['max_len'] = keyinfo['max_valbufsize']
+    r['value_in']['offset'] = 0
+    r['value_in']['len'] = 0
+    r['value_len1'] = keyinfo['max_valbufsize']
+    r['value_len2'] = 0
     
     for i in range(0, keyinfo['num_values']):
 
         r['enum_index'] = i
 
-        print keyinfo
-        print dcerpc.winreg_EnumValue(pipe, r)
+        dcerpc.winreg_EnumValue(pipe, r)
 
-        sys.exit(1)        
+def test_Key(pipe, handle, name):
 
-def test_Key(pipe, handle):
-
-    test_Enum(pipe, handle)        
+    test_Enum(pipe, handle, name)
 
 def runtests(binding, domain, username, password):
     
@@ -126,5 +117,4 @@ def runtests(binding, domain, username, password):
 
     handle = test_OpenHKLM(pipe)
 
-    test_Key(pipe, handle)
-    
+    test_Key(pipe, handle, 'HKLM')
-- 
cgit 


From 94ae449f33e45aa6cfa4946fac7c8c5409590ad7 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Mon, 4 Oct 2004 06:29:06 +0000
Subject: r2817: Get winreg_GetKeySecurity() working but use data blob instead
 of security descriptor. (This used to be commit
 bc5165e40a716fb7c612b32c0b6f03cb2d331d11)

---
 source4/scripting/swig/torture/winreg.py | 109 ++++++++++++++++++++++---------
 1 file changed, 77 insertions(+), 32 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/torture/winreg.py b/source4/scripting/swig/torture/winreg.py
index b7a42042a8..eb60b9847e 100755
--- a/source4/scripting/swig/torture/winreg.py
+++ b/source4/scripting/swig/torture/winreg.py
@@ -30,7 +30,49 @@ def test_CloseKey(pipe, handle):
 
     dcerpc.winreg_CloseKey(pipe, r)
 
-def test_Enum(pipe, handle, name, depth = 0):
+def test_FlushKey(pipe, handle):
+
+    r = {}
+    r['handle'] = handle
+    
+    dcerpc.winreg_FlushKey(pipe, r)
+
+def test_GetVersion(pipe, handle):
+
+    r = {}
+    r['handle'] = handle
+    
+    dcerpc.winreg_GetVersion(pipe, r)
+
+def test_GetKeySecurity(pipe, handle):
+
+    r = {}
+    r['handle'] = handle
+    r['unknown'] = 4
+    r['size'] = None
+    r['data'] = {}
+    r['data']['max_len'] = 0
+    r['data']['data'] = ''
+
+    result = dcerpc.winreg_GetKeySecurity(pipe, r)
+
+    print result
+
+    if result['result'] == dcerpc.WERR_INSUFFICIENT_BUFFER:
+        r['size'] = {}
+        r['size']['max_len'] = result['data']['max_len']
+        r['size']['offset'] = 0
+        r['size']['len'] = result['data']['max_len']
+
+        result = dcerpc.winreg_GetKeySecurity(pipe, r)
+
+    print result
+
+    sys.exit(1)
+    
+def test_Key(pipe, handle, name, depth = 0):
+
+    # Don't descend too far.  Registries can be very deep.
 
     if depth > 2:
         return
@@ -41,7 +83,38 @@ def test_Enum(pipe, handle, name, depth = 0):
         if arg[0] == dcerpc.WERR_ACCESS_DENIED:
             return
 
-    # Enumerate keys
+    test_GetVersion(pipe, handle)
+
+    test_FlushKey(pipe, handle)
+
+    test_GetKeySecurity(pipe, handle)
+
+    # Enumerate values in this key
+
+    r = {}
+    r['handle'] = handle
+    r['name_in'] = {}
+    r['name_in']['len'] = 0
+    r['name_in']['max_len'] = (keyinfo['max_valnamelen'] + 1) * 2
+    r['name_in']['buffer'] = {}
+    r['name_in']['buffer']['max_len'] = keyinfo['max_valnamelen']  + 1
+    r['name_in']['buffer']['offset'] = 0
+    r['name_in']['buffer']['len'] = 0
+    r['type'] = 0
+    r['value_in'] = {}
+    r['value_in']['max_len'] = keyinfo['max_valbufsize']
+    r['value_in']['offset'] = 0
+    r['value_in']['len'] = 0
+    r['value_len1'] = keyinfo['max_valbufsize']
+    r['value_len2'] = 0
+    
+    for i in range(0, keyinfo['num_values']):
+
+        r['enum_index'] = i
+
+        dcerpc.winreg_EnumValue(pipe, r)
+
+    # Recursively test subkeys of this key
 
     r = {}
     r['handle'] = handle
@@ -72,41 +145,13 @@ def test_Enum(pipe, handle, name, depth = 0):
 
         result = dcerpc.winreg_OpenKey(pipe, s)
 
-        test_Enum(pipe, result['handle'], name + '/' + s['keyname']['name'],
-                  depth + 1)
+        test_Key(pipe, result['handle'], name + '/' + s['keyname']['name'],
+                 depth + 1)
 
         test_CloseKey(pipe, result['handle'])
 
     # Enumerate values
 
-    r = {}
-    r['handle'] = handle
-
-    r['name_in'] = {}
-    r['name_in']['len'] = 0
-    r['name_in']['max_len'] = (keyinfo['max_valnamelen'] + 1) * 2
-    r['name_in']['buffer'] = {}
-    r['name_in']['buffer']['max_len'] = keyinfo['max_valnamelen']  + 1
-    r['name_in']['buffer']['offset'] = 0
-    r['name_in']['buffer']['len'] = 0
-    r['type'] = 0
-    r['value_in'] = {}
-    r['value_in']['max_len'] = keyinfo['max_valbufsize']
-    r['value_in']['offset'] = 0
-    r['value_in']['len'] = 0
-    r['value_len1'] = keyinfo['max_valbufsize']
-    r['value_len2'] = 0
-    
-    for i in range(0, keyinfo['num_values']):
-
-        r['enum_index'] = i
-
-        dcerpc.winreg_EnumValue(pipe, r)
-
-def test_Key(pipe, handle, name):
-
-    test_Enum(pipe, handle, name)
-
 def runtests(binding, domain, username, password):
     
     print 'Testing WINREG pipe'
-- 
cgit 


From 913d5df89e759d858bc7704b8aa50d63ce67a0c1 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Thu, 14 Oct 2004 06:45:25 +0000
Subject: r2964: Add spoolss to list of wrapped client functions. (This used to
 be commit 96d31ff19d2fa5b0c5a0ee23000a97cb77637968)

---
 source4/scripting/swig/dcerpc.i | 1 +
 1 file changed, 1 insertion(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/dcerpc.i b/source4/scripting/swig/dcerpc.i
index d8589693ac..606f236f35 100644
--- a/source4/scripting/swig/dcerpc.i
+++ b/source4/scripting/swig/dcerpc.i
@@ -377,3 +377,4 @@ NTSTATUS dcerpc_pipe_connect(struct dcerpc_pipe **OUT,
 }
 
 %include "librpc/gen_ndr/winreg.i"
+%include "librpc/gen_ndr/spoolss.i"
-- 
cgit 


From e3627c2c6eaf8b0ede0b014aacb3478d25faf1b8 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Thu, 14 Oct 2004 07:25:47 +0000
Subject: r2965: Ignore *.pyc files in torture directory.

Allow test module name to be specified on command line for pytorture
module.

Start spoolss torture test.
(This used to be commit 44bab84f765f6a4d37733a353fc6b74b09c1b39a)
---
 source4/scripting/swig/torture/pytorture  | 20 +++++++++++++++++---
 source4/scripting/swig/torture/spoolss.py | 24 ++++++++++++++++++++++++
 2 files changed, 41 insertions(+), 3 deletions(-)
 create mode 100644 source4/scripting/swig/torture/spoolss.py

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/torture/pytorture b/source4/scripting/swig/torture/pytorture
index 89ecfbabcf..8a8f4d8bdf 100755
--- a/source4/scripting/swig/torture/pytorture
+++ b/source4/scripting/swig/torture/pytorture
@@ -1,5 +1,6 @@
 #!/usr/bin/python
 
+import sys
 from optparse import OptionParser
 
 # Parse command line
@@ -31,7 +32,20 @@ domain = options.domain
 username = options.username
 password = options.password
 
-# Run tests
+if len(args) == 0:
+   parser.error('You must supply the name of a module to test')
 
-import samr
-samr.runtests(binding, domain, username, password)
+# Import and test
+
+for test in args:
+
+   try:
+      module = __import__(test)
+   except ImportError:
+      print 'No such module "%s"' % test
+      sys.exit(1)
+
+   if not hasattr(module, 'runtests'):
+      print 'Module "%s" does not have a runtests function' % test
+
+   module.runtests(binding, domain, username, password)
diff --git a/source4/scripting/swig/torture/spoolss.py b/source4/scripting/swig/torture/spoolss.py
new file mode 100644
index 0000000000..78d573a7cd
--- /dev/null
+++ b/source4/scripting/swig/torture/spoolss.py
@@ -0,0 +1,24 @@
+import dcerpc
+
+def test_EnumPrinters(pipe):
+
+    r = {}
+    r['flags'] = 0x02
+    r['server'] = None
+    r['level'] = 1
+    r['buffer'] = 392 * '\x00'
+    r['buf_size'] = 392
+
+    result = dcerpc.spoolss_EnumPrinters(pipe, r)
+
+    print result
+
+def runtests(binding, domain, username, password):
+    
+    print 'Testing SPOOLSS pipe'
+
+    pipe = dcerpc.pipe_connect(binding,
+            dcerpc.DCERPC_SPOOLSS_UUID, dcerpc.DCERPC_SPOOLSS_VERSION,
+            domain, username, password)
+
+    test_EnumPrinters(pipe)
-- 
cgit 


From 1c4b87c78847542a14d88966f854aa1b38162b88 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Thu, 14 Oct 2004 07:33:09 +0000
Subject: r2966: Handle conversion of DATA_BLOB fields from Python in a
 slightly nicer manner.  I'm hoping to get rid of DATA_BLOB's but for the
 moment they make it easy to get some spoolss action happening quickly. (This
 used to be commit 15f8f73f8bfec099973fb8bf167020ae50346cf6)

---
 source4/scripting/swig/dcerpc.i | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/dcerpc.i b/source4/scripting/swig/dcerpc.i
index 606f236f35..918445d7e3 100644
--- a/source4/scripting/swig/dcerpc.i
+++ b/source4/scripting/swig/dcerpc.i
@@ -254,28 +254,28 @@ PyObject *string_ptr_to_python(TALLOC_CTX *mem_ctx, char *obj)
 #define dom_sid2_ptr_to_python dom_sid_ptr_to_python
 #define dom_sid2_ptr_from_python dom_sid_ptr_from_python
 
-DATA_BLOB DATA_BLOB_from_python(PyObject *obj, char *name)
+void DATA_BLOB_ptr_from_python(TALLOC_CTX *mem_ctx, DATA_BLOB **s, 
+			       PyObject *obj, char *name)
 {
-	DATA_BLOB ret;
-
-	/* Because we treat DATA_BLOB as a scalar type (why?) there 
-	   doesn't seem to be a way to pass back when an error has
-	   occured. */
-
 	if (obj == NULL) {
 		PyErr_Format(PyExc_ValueError, "Expecting key %s", name);
 		return;
 	}
 
+	if (obj == Py_None) {
+		*s = NULL;
+		return;
+	}
+
 	if (!PyString_Check(obj)) {
 		PyErr_Format(PyExc_TypeError, "Expecting string value for key '%s'", name);
 		return;
 	}
 
-	ret.length = PyString_Size(obj);
-	ret.data = PyString_AsString(obj);
+	*s = talloc(mem_ctx, sizeof(DATA_BLOB));
 
-	return ret;
+	(*s)->length = PyString_Size(obj);
+	(*s)->data = PyString_AsString(obj);
 }
 
 PyObject *DATA_BLOB_to_python(DATA_BLOB obj)
-- 
cgit 


From acf657a7c228a920efe942b8776bf1bb1446f59c Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Thu, 14 Oct 2004 13:09:59 +0000
Subject: r2975: Try to emulate NT_STATUS_IS_ERR() functionality for WERRORs. 
 Unfortunately this means enumerating all the ones we don't think are errors.
 (This used to be commit a079e044f0ef23c6c4307c9da35019ec3e8f1d2a)

---
 source4/scripting/swig/dcerpc.i | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/dcerpc.i b/source4/scripting/swig/dcerpc.i
index 918445d7e3..f91f664820 100644
--- a/source4/scripting/swig/dcerpc.i
+++ b/source4/scripting/swig/dcerpc.i
@@ -286,7 +286,6 @@ PyObject *DATA_BLOB_to_python(DATA_BLOB obj)
 %}
 
 %include "samba.i"
-%include "status_codes.i"
 
 %pythoncode %{
 	NTSTATUS = _dcerpc.NTSTATUS
@@ -370,7 +369,8 @@ NTSTATUS dcerpc_pipe_connect(struct dcerpc_pipe **OUT,
 		set_ntstatus_exception(NT_STATUS_V(result));
 		return NULL;
 	}
-	if (!W_ERROR_IS_OK(arg3->out.result)) {
+	if (!W_ERROR_IS_OK(arg3->out.result) && 
+	    !(W_ERROR_EQUAL(arg3->out.result, WERR_INSUFFICIENT_BUFFER))) {
 		set_werror_exception(W_ERROR_V(arg3->out.result));
 		return NULL;
 	}
@@ -378,3 +378,5 @@ NTSTATUS dcerpc_pipe_connect(struct dcerpc_pipe **OUT,
 
 %include "librpc/gen_ndr/winreg.i"
 %include "librpc/gen_ndr/spoolss.i"
+
+%include "status_codes.i"
-- 
cgit 


From dc2df2530fc729e5fa858fdab3c4355e27ece310 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Fri, 15 Oct 2004 07:17:51 +0000
Subject: r2986: Add correct value to dict when generating wrapper for
 functions that return WERROR values.

Clean up WERROR vs NTSTATUS handling a bit.
(This used to be commit e6756e3ee0af3e7e98f6deaf9dc83af9aac1b586)
---
 source4/scripting/swig/dcerpc.i | 8 ++++++++
 source4/scripting/swig/samba.i  | 4 ----
 2 files changed, 8 insertions(+), 4 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/dcerpc.i b/source4/scripting/swig/dcerpc.i
index f91f664820..5248164881 100644
--- a/source4/scripting/swig/dcerpc.i
+++ b/source4/scripting/swig/dcerpc.i
@@ -352,6 +352,7 @@ NTSTATUS dcerpc_pipe_connect(struct dcerpc_pipe **OUT,
 
 %exception {
 	$action
+
 	if (NT_STATUS_IS_ERR(result)) {
 		set_ntstatus_exception(NT_STATUS_V(result));
 		return NULL;
@@ -365,10 +366,14 @@ NTSTATUS dcerpc_pipe_connect(struct dcerpc_pipe **OUT,
 
 %exception {
 	$action
+
 	if (NT_STATUS_IS_ERR(result)) {
 		set_ntstatus_exception(NT_STATUS_V(result));
 		return NULL;
 	}
+
+	/* Emulate NT_STATUS_IS_ERR() */
+
 	if (!W_ERROR_IS_OK(arg3->out.result) && 
 	    !(W_ERROR_EQUAL(arg3->out.result, WERR_INSUFFICIENT_BUFFER))) {
 		set_werror_exception(W_ERROR_V(arg3->out.result));
@@ -379,4 +384,7 @@ NTSTATUS dcerpc_pipe_connect(struct dcerpc_pipe **OUT,
 %include "librpc/gen_ndr/winreg.i"
 %include "librpc/gen_ndr/spoolss.i"
 
+/* The status codes must be included last otherwise the automatically
+   generated .i files get confused.  This is kind of yucky. */
+
 %include "status_codes.i"
diff --git a/source4/scripting/swig/samba.i b/source4/scripting/swig/samba.i
index faa46dc348..6a34f9b148 100644
--- a/source4/scripting/swig/samba.i
+++ b/source4/scripting/swig/samba.i
@@ -32,10 +32,6 @@
 	$1 = (uint32_t)PyInt_AsLong($input);
 }
 
-/* For the moment treat NTSTATUS as an integer */
-
-#define WERROR NTSTATUS
-
 %typemap(out) NTSTATUS {
         $result = PyInt_FromLong(NT_STATUS_V($1));
 }
-- 
cgit 


From 8f00427136cd52e0e1cd1b12267515d872798c56 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Fri, 15 Oct 2004 12:21:49 +0000
Subject: r2994: More cleanups.  Move the generation of NTSTATUS and WERROR
 exceptions from inside a swig %exception block and into the argout typemap. 
 This will allow us to wrap functions that don't require exception handling,
 and also get rid of some ugly code in dcerpc.i (This used to be commit
 558076cc8ddbdb563869f7d35150310217f30c31)

---
 source4/scripting/swig/dcerpc.i | 32 --------------------------------
 1 file changed, 32 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/dcerpc.i b/source4/scripting/swig/dcerpc.i
index 5248164881..ab53a1dc51 100644
--- a/source4/scripting/swig/dcerpc.i
+++ b/source4/scripting/swig/dcerpc.i
@@ -347,40 +347,8 @@ NTSTATUS dcerpc_pipe_connect(struct dcerpc_pipe **OUT,
                              const char *password);
 
 %include "librpc/gen_ndr/misc.i"
-
-/* Wrapped functions returning NTSTATUS */
-
-%exception {
-	$action
-
-	if (NT_STATUS_IS_ERR(result)) {
-		set_ntstatus_exception(NT_STATUS_V(result));
-		return NULL;
-	}
-}
-
 %include "librpc/gen_ndr/lsa.i"
 %include "librpc/gen_ndr/samr.i"
-
-/* Wrapped functions returning WERROR */
-
-%exception {
-	$action
-
-	if (NT_STATUS_IS_ERR(result)) {
-		set_ntstatus_exception(NT_STATUS_V(result));
-		return NULL;
-	}
-
-	/* Emulate NT_STATUS_IS_ERR() */
-
-	if (!W_ERROR_IS_OK(arg3->out.result) && 
-	    !(W_ERROR_EQUAL(arg3->out.result, WERR_INSUFFICIENT_BUFFER))) {
-		set_werror_exception(W_ERROR_V(arg3->out.result));
-		return NULL;
-	}
-}
-
 %include "librpc/gen_ndr/winreg.i"
 %include "librpc/gen_ndr/spoolss.i"
 
-- 
cgit 


From addb2a9fd45ad4df21f22d1b712e37ff0a5affd4 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Sat, 16 Oct 2004 00:19:33 +0000
Subject: r3001: Expose unmarshalling functions for structures marked "public"
 in the idl.  This allows us to pass a buffer of bytes returned from a spoolss
 call and convert it to a Python dictionary.  Works for enumprinters level 1!
 (This used to be commit 4bc497a2994b12845a46b2d19f60bb81c9869fc9)

---
 source4/scripting/swig/dcerpc.i           | 6 ++++++
 source4/scripting/swig/torture/spoolss.py | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/dcerpc.i b/source4/scripting/swig/dcerpc.i
index ab53a1dc51..1222d54766 100644
--- a/source4/scripting/swig/dcerpc.i
+++ b/source4/scripting/swig/dcerpc.i
@@ -346,6 +346,12 @@ NTSTATUS dcerpc_pipe_connect(struct dcerpc_pipe **OUT,
                              const char *username,
                              const char *password);
 
+%typemap(in) DATA_BLOB * (DATA_BLOB temp_data_blob) {
+	temp_data_blob.data = PyString_AsString($input);
+	temp_data_blob.length = PyString_Size($input);
+	$1 = &temp_data_blob;
+}
+
 %include "librpc/gen_ndr/misc.i"
 %include "librpc/gen_ndr/lsa.i"
 %include "librpc/gen_ndr/samr.i"
diff --git a/source4/scripting/swig/torture/spoolss.py b/source4/scripting/swig/torture/spoolss.py
index 78d573a7cd..e29178a0b6 100644
--- a/source4/scripting/swig/torture/spoolss.py
+++ b/source4/scripting/swig/torture/spoolss.py
@@ -11,7 +11,7 @@ def test_EnumPrinters(pipe):
 
     result = dcerpc.spoolss_EnumPrinters(pipe, r)
 
-    print result
+    print dcerpc.unmarshall_spoolss_PrinterInfo1(result['buffer'])
 
 def runtests(binding, domain, username, password):
     
-- 
cgit 


From 71aaba4ea7e0e95c7a976e2a163e0ff25689dcd4 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Sun, 17 Oct 2004 00:20:57 +0000
Subject: r3007: uint32 values need to be stored in Python longs, as on 32-bit
 machines Python ints can only hold int32 values. (This used to be commit
 7c5ada63bf5d876a1b67df2cf7bd44942e4b0a98)

---
 source4/scripting/swig/samba.i | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/samba.i b/source4/scripting/swig/samba.i
index 6a34f9b148..065cc7269f 100644
--- a/source4/scripting/swig/samba.i
+++ b/source4/scripting/swig/samba.i
@@ -29,7 +29,11 @@
 		PyErr_SetString(PyExc_TypeError, "integer expected");
 		return NULL;
 	}
-	$1 = (uint32_t)PyInt_AsLong($input);
+	$1 = (uint32_t)PyLong_AsLong($input);
+}
+
+%typemap(out) uint32 {
+	$1 = PyLong_FromLong($input);
 }
 
 %typemap(out) NTSTATUS {
-- 
cgit 


From c7a762bc748c63049d237de176167a13d1b8b0de Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Sun, 17 Oct 2004 00:27:40 +0000
Subject: r3009: Fix up unmarshall functions to return Python dict instead of a
 NTSTATUS. We can now unmarshall a single printer returned from an
 EnumPrinters. (This used to be commit
 89da7a9196d40699881f12c9a5fe62301aafd4cf)

---
 source4/scripting/swig/torture/spoolss.py | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/torture/spoolss.py b/source4/scripting/swig/torture/spoolss.py
index e29178a0b6..d7a16917f9 100644
--- a/source4/scripting/swig/torture/spoolss.py
+++ b/source4/scripting/swig/torture/spoolss.py
@@ -6,11 +6,17 @@ def test_EnumPrinters(pipe):
     r['flags'] = 0x02
     r['server'] = None
     r['level'] = 1
-    r['buffer'] = 392 * '\x00'
-    r['buf_size'] = 392
+    r['buffer'] = None
+    r['buf_size'] = 0
 
     result = dcerpc.spoolss_EnumPrinters(pipe, r)
 
+    if result['result'] == dcerpc.WERR_INSUFFICIENT_BUFFER:
+        r['buffer'] = result['buf_size'] * '\x00'
+        r['buf_size'] = result['buf_size']
+
+        result = dcerpc.spoolss_EnumPrinters(pipe, r)
+
     print dcerpc.unmarshall_spoolss_PrinterInfo1(result['buffer'])
 
 def runtests(binding, domain, username, password):
-- 
cgit 


From 85a2db200a11ebc4f325f9da8bfda29c3fa403c6 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Sun, 17 Oct 2004 00:37:36 +0000
Subject: r3010: Do some more PyInt vs PyLong checks. (This used to be commit
 b19dc6cd9c1ac44d970b092f09cf96c737a90fdd)

---
 source4/scripting/swig/samba.i | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/samba.i b/source4/scripting/swig/samba.i
index 065cc7269f..38a5251a08 100644
--- a/source4/scripting/swig/samba.i
+++ b/source4/scripting/swig/samba.i
@@ -25,7 +25,7 @@
 */
 
 %typemap(in) uint32 {
-	if (!PyInt_Check($input)) {
+	if (!PyInt_Check($input) && !PyLong_Check($input)) {
 		PyErr_SetString(PyExc_TypeError, "integer expected");
 		return NULL;
 	}
@@ -37,6 +37,5 @@
 }
 
 %typemap(out) NTSTATUS {
-        $result = PyInt_FromLong(NT_STATUS_V($1));
+        $result = PyLong_FromLong(NT_STATUS_V($1));
 }
-
-- 
cgit 


From 266e36aa54dc82a48655d6c64cb8cd3fbfdf4fa9 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Mon, 25 Oct 2004 07:31:59 +0000
Subject: r3204: Got unpacking of an array of PrinterInfo union elements
 working.  Phew. (This used to be commit
 f490cd719cc02589e73e26fa983aff90708d1926)

---
 source4/scripting/swig/torture/spoolss.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/torture/spoolss.py b/source4/scripting/swig/torture/spoolss.py
index d7a16917f9..8336a027df 100644
--- a/source4/scripting/swig/torture/spoolss.py
+++ b/source4/scripting/swig/torture/spoolss.py
@@ -17,7 +17,7 @@ def test_EnumPrinters(pipe):
 
         result = dcerpc.spoolss_EnumPrinters(pipe, r)
 
-    print dcerpc.unmarshall_spoolss_PrinterInfo1(result['buffer'])
+    print dcerpc.unmarshall_spoolss_PrinterInfo_array(result['buffer'], r['level'], result['count'])
 
 def runtests(binding, domain, username, password):
     
-- 
cgit 


From 974d048493c77c0bc2d7a99c1e16d0ee9643c5ab Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Mon, 25 Oct 2004 12:54:52 +0000
Subject: r3216: Add tests for OpenPrinterEx and ClosePrinter. (This used to be
 commit b7ff5f0deded4bcf6695dac0683fd9d271d9c255)

---
 source4/scripting/swig/torture/spoolss.py | 71 +++++++++++++++++++++++++++----
 1 file changed, 63 insertions(+), 8 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/torture/spoolss.py b/source4/scripting/swig/torture/spoolss.py
index 8336a027df..a18b9c61a7 100644
--- a/source4/scripting/swig/torture/spoolss.py
+++ b/source4/scripting/swig/torture/spoolss.py
@@ -1,23 +1,78 @@
+import string
 import dcerpc
 
+def test_OpenPrinterEx(pipe, printer):
+
+    print 'testing spoolss_OpenPrinterEx(%s)' % printer
+
+    r = {}
+    r['printername'] = '\\\\win2k3dc\\%s' % printer
+    r['datatype'] = None
+    r['devmode_ctr'] = {}
+    r['devmode_ctr']['size'] = 0
+    r['devmode_ctr']['devmode'] = None
+    r['access_mask'] = 0x02000000
+    r['level'] = 1
+    r['userlevel'] = {}
+    r['userlevel']['level1'] = {}
+    r['userlevel']['level1']['size'] = 0
+    r['userlevel']['level1']['client'] = None
+    r['userlevel']['level1']['user'] = None
+    r['userlevel']['level1']['build'] = 1381
+    r['userlevel']['level1']['major'] = 2
+    r['userlevel']['level1']['minor'] = 0
+    r['userlevel']['level1']['processor'] = 0
+
+    result = dcerpc.spoolss_OpenPrinterEx(pipe, r)
+
+    return result['handle']
+
+
+def test_ClosePrinter(pipe, handle):
+
+    r = {}
+    r['handle'] = handle
+
+    dcerpc.spoolss_ClosePrinter(pipe, r)
+
+
 def test_EnumPrinters(pipe):
 
+    print 'testing spoolss_EnumPrinters'
+
+    printer_names = None
+
     r = {}
     r['flags'] = 0x02
     r['server'] = None
-    r['level'] = 1
-    r['buffer'] = None
-    r['buf_size'] = 0
 
-    result = dcerpc.spoolss_EnumPrinters(pipe, r)
+    for level in [1, 2, 4, 5]:
 
-    if result['result'] == dcerpc.WERR_INSUFFICIENT_BUFFER:
-        r['buffer'] = result['buf_size'] * '\x00'
-        r['buf_size'] = result['buf_size']
+        r['level'] = level
+        r['buf_size'] = 0
+        r['buffer'] = None
 
         result = dcerpc.spoolss_EnumPrinters(pipe, r)
 
-    print dcerpc.unmarshall_spoolss_PrinterInfo_array(result['buffer'], r['level'], result['count'])
+        if result['result'] == dcerpc.WERR_INSUFFICIENT_BUFFER:
+            r['buffer'] = result['buf_size'] * '\x00'
+            r['buf_size'] = result['buf_size']
+
+            result = dcerpc.spoolss_EnumPrinters(pipe, r)
+
+        printers = dcerpc.unmarshall_spoolss_PrinterInfo_array(
+            result['buffer'], r['level'], result['count'])
+
+        if printer_names is None:
+            printer_names = map(
+                lambda x: string.split(x['info1']['name'], ',')[0], printers)
+
+    for printer in printer_names:
+
+        handle = test_OpenPrinterEx(pipe, printer)
+
+        test_ClosePrinter(pipe, handle)
+        
 
 def runtests(binding, domain, username, password):
     
-- 
cgit 


From 8ade4d978506f6b2fab2ccd194f8b62d5d97d168 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Mon, 25 Oct 2004 13:06:31 +0000
Subject: r3217: Start of a spoolss_GetPrinter test. (This used to be commit
 994fe92febe38f06d69f43b01c80e8350e902986)

---
 source4/scripting/swig/torture/spoolss.py | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/torture/spoolss.py b/source4/scripting/swig/torture/spoolss.py
index a18b9c61a7..240d815fb4 100644
--- a/source4/scripting/swig/torture/spoolss.py
+++ b/source4/scripting/swig/torture/spoolss.py
@@ -36,6 +36,30 @@ def test_ClosePrinter(pipe, handle):
     dcerpc.spoolss_ClosePrinter(pipe, r)
 
 
+def test_GetPrinter(pipe, handle):
+
+    r = {}
+    r['handle'] = handle
+
+    for level in [1, 2, 3]:
+
+        r['level'] = level
+        r['buffer'] = None
+        r['buf_size'] = 0
+
+        result = dcerpc.spoolss_GetPrinter(pipe, r)
+
+        print result
+
+        if result['result'] == dcerpc.WERR_INSUFFICIENT_BUFFER:
+            r['buffer'] = result['buf_size'] * '\x00'
+            r['buf_size'] = result['buf_size']
+
+            result = dcerpc.spoolss_GetPrinter(pipe, r)
+
+            print result
+
+
 def test_EnumPrinters(pipe):
 
     print 'testing spoolss_EnumPrinters'
@@ -71,6 +95,8 @@ def test_EnumPrinters(pipe):
 
         handle = test_OpenPrinterEx(pipe, printer)
 
+        test_GetPrinter(pipe, handle)
+
         test_ClosePrinter(pipe, handle)
         
 
-- 
cgit 


From fe54d8bc99f4ccfcaba2116430213161ebb6bf39 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Thu, 28 Oct 2004 03:40:35 +0000
Subject: r3302: The security descriptors in spoolss_PrinterInfo2 and
 spoolss_PrinterInfo3 need to be marked as subcontext(0).

GetPrinter tests now work for all info levels!
(This used to be commit 53bd02960e17f7517e0d6c4f489d27b8bdcc7582)
---
 source4/scripting/swig/torture/spoolss.py | 59 +++++++++++++++++++++++++++----
 1 file changed, 53 insertions(+), 6 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/torture/spoolss.py b/source4/scripting/swig/torture/spoolss.py
index 240d815fb4..91e785ca75 100644
--- a/source4/scripting/swig/torture/spoolss.py
+++ b/source4/scripting/swig/torture/spoolss.py
@@ -6,7 +6,8 @@ def test_OpenPrinterEx(pipe, printer):
     print 'testing spoolss_OpenPrinterEx(%s)' % printer
 
     r = {}
-    r['printername'] = '\\\\win2k3dc\\%s' % printer
+    r['printername'] = '\\\\%s\\%s' % \
+                       (dcerpc.dcerpc_server_name(pipe), printer)
     r['datatype'] = None
     r['devmode_ctr'] = {}
     r['devmode_ctr']['size'] = 0
@@ -41,7 +42,9 @@ def test_GetPrinter(pipe, handle):
     r = {}
     r['handle'] = handle
 
-    for level in [1, 2, 3]:
+    for level in [0, 1, 2, 3, 4, 5, 6, 7]:
+
+        print 'test_GetPrinter(level = %d)' % level
 
         r['level'] = level
         r['buffer'] = None
@@ -49,8 +52,6 @@ def test_GetPrinter(pipe, handle):
 
         result = dcerpc.spoolss_GetPrinter(pipe, r)
 
-        print result
-
         if result['result'] == dcerpc.WERR_INSUFFICIENT_BUFFER:
             r['buffer'] = result['buf_size'] * '\x00'
             r['buf_size'] = result['buf_size']
@@ -59,6 +60,47 @@ def test_GetPrinter(pipe, handle):
 
             print result
 
+def test_EnumForms(pipe, handle):
+
+    print 'testing spoolss_EnumForms'
+
+    r = {}
+    r['handle'] = handle
+    r['level'] = 1
+    r['buffer'] = None
+    r['buf_size'] = 0
+
+    result = dcerpc.spoolss_EnumForms(pipe, r)
+
+    if result['result'] == dcerpc.WERR_INSUFFICIENT_BUFFER:
+        r['buffer'] = result['buf_size'] * '\x00'
+        r['buf_size'] = result['buf_size']
+
+        result = dcerpc.spoolss_EnumForms(pipe, r)
+
+    print result
+           
+
+def test_EnumPorts(pipe, handle):
+
+    print 'testing spoolss_EnumPorts'
+
+    r = {}
+    r['handle'] = handle
+    r['level'] = 1
+    r['buffer'] = None
+    r['buf_size'] = 0
+
+    result = dcerpc.spoolss_EnumPorts(pipe, r)
+
+    if result['result'] == dcerpc.WERR_INSUFFICIENT_BUFFER:
+        r['buffer'] = result['buf_size'] * '\x00'
+        r['buf_size'] = result['buf_size']
+
+        result = dcerpc.spoolss_EnumPorts(pipe, r)
+
+    print result
+           
 
 def test_EnumPrinters(pipe):
 
@@ -70,7 +112,9 @@ def test_EnumPrinters(pipe):
     r['flags'] = 0x02
     r['server'] = None
 
-    for level in [1, 2, 4, 5]:
+    for level in [0, 1, 4, 5]:
+
+        print 'test_EnumPrinters(level = %d)' % level
 
         r['level'] = level
         r['buf_size'] = 0
@@ -87,7 +131,10 @@ def test_EnumPrinters(pipe):
         printers = dcerpc.unmarshall_spoolss_PrinterInfo_array(
             result['buffer'], r['level'], result['count'])
 
-        if printer_names is None:
+        from pprint import pprint
+        pprint(printers)
+
+        if level == 1:
             printer_names = map(
                 lambda x: string.split(x['info1']['name'], ',')[0], printers)
 
-- 
cgit 


From 08dd85d26b8bdcd0ad95d855279294f3248c463f Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Thu, 28 Oct 2004 06:13:42 +0000
Subject: r3308: Handle servers that don't have samr_Connect5. (This used to be
 commit 52af866ffb427427d21daf11a4ca9a8b9881f1d5)

---
 source4/scripting/swig/torture/samr.py | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/torture/samr.py b/source4/scripting/swig/torture/samr.py
index ba650dfe75..435b3a81db 100755
--- a/source4/scripting/swig/torture/samr.py
+++ b/source4/scripting/swig/torture/samr.py
@@ -15,8 +15,8 @@ def test_Connect(pipe):
     s = {}
     s['handle'] = result['connect_handle']
 
-    dcerpc.samr_Close(pipe, s)
-
+    handle = result['connect_handle']
+  
     print 'testing samr_Connect2'
 
     r = {}
@@ -69,9 +69,16 @@ def test_Connect(pipe):
     r['info']['info1']['unknown1'] = 0
     r['info']['info1']['unknown2'] = 0
 
-    result = dcerpc.samr_Connect5(pipe, r)
+    try:
+        result = dcerpc.samr_Connect5(pipe, r)
+        s = {}
+        s['handle'] = result['connect_handle']
+        dcerpc.samr_Close(pipe, s)
+    except dcerpc.NTSTATUS, arg:
+        if arg[0] != dcerpc.NT_STATUS_NET_WRITE_FAULT:
+            raise
 
-    return result['connect_handle']
+    return handle
     
 def test_QuerySecurity(pipe, handle):
 
-- 
cgit 


From d718b7f683cc4947acde79ab6ef04eb27a5a44bf Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Thu, 28 Oct 2004 06:14:10 +0000
Subject: r3309: Add wrapper for dcerpc_server_name() function. (This used to
 be commit 2d60a04f21da9dbe32c85b11afa98df74f5fd763)

---
 source4/scripting/swig/dcerpc.i | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/dcerpc.i b/source4/scripting/swig/dcerpc.i
index 1222d54766..796384d6e7 100644
--- a/source4/scripting/swig/dcerpc.i
+++ b/source4/scripting/swig/dcerpc.i
@@ -352,6 +352,8 @@ NTSTATUS dcerpc_pipe_connect(struct dcerpc_pipe **OUT,
 	$1 = &temp_data_blob;
 }
 
+const char *dcerpc_server_name(struct dcerpc_pipe *p);
+
 %include "librpc/gen_ndr/misc.i"
 %include "librpc/gen_ndr/lsa.i"
 %include "librpc/gen_ndr/samr.i"
-- 
cgit 


From c69b5f76427e7a73403acf16921c4084f4c281bb Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Thu, 28 Oct 2004 06:17:38 +0000
Subject: r3311: Consistency updates for form name members.

Add tests for EnumForms, GetForm, AddForm, DeleteForm.
(This used to be commit 6c49ce976a5c6982fa83de4ea723cef5597c29ef)
---
 source4/scripting/swig/torture/spoolss.py | 127 ++++++++++++++++++++++--------
 1 file changed, 94 insertions(+), 33 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/torture/spoolss.py b/source4/scripting/swig/torture/spoolss.py
index 91e785ca75..c1859bf2d4 100644
--- a/source4/scripting/swig/torture/spoolss.py
+++ b/source4/scripting/swig/torture/spoolss.py
@@ -1,6 +1,23 @@
-import string
+import sys, string
 import dcerpc
 
+
+def ResizeBufferCall(fn, pipe, r):
+
+    r['buffer'] = None
+    r['buf_size'] = 0
+    
+    result = fn(pipe, r)
+
+    if result['result'] == dcerpc.WERR_INSUFFICIENT_BUFFER:
+        r['buffer'] = result['buf_size'] * '\x00'
+        r['buf_size'] = result['buf_size']
+
+    result = fn(pipe, r)
+
+    return result
+
+
 def test_OpenPrinterEx(pipe, printer):
 
     print 'testing spoolss_OpenPrinterEx(%s)' % printer
@@ -50,15 +67,8 @@ def test_GetPrinter(pipe, handle):
         r['buffer'] = None
         r['buf_size'] = 0
 
-        result = dcerpc.spoolss_GetPrinter(pipe, r)
-
-        if result['result'] == dcerpc.WERR_INSUFFICIENT_BUFFER:
-            r['buffer'] = result['buf_size'] * '\x00'
-            r['buf_size'] = result['buf_size']
+        result = ResizeBufferCall(dcerpc.spoolss_GetPrinter, pipe, r)
 
-            result = dcerpc.spoolss_GetPrinter(pipe, r)
-
-            print result
 
 def test_EnumForms(pipe, handle):
 
@@ -70,16 +80,20 @@ def test_EnumForms(pipe, handle):
     r['buffer'] = None
     r['buf_size'] = 0
 
-    result = dcerpc.spoolss_EnumForms(pipe, r)
+    result = ResizeBufferCall(dcerpc.spoolss_EnumForms, pipe, r)
 
-    if result['result'] == dcerpc.WERR_INSUFFICIENT_BUFFER:
-        r['buffer'] = result['buf_size'] * '\x00'
-        r['buf_size'] = result['buf_size']
+    forms = dcerpc.unmarshall_spoolss_FormInfo_array(
+        result['buffer'], r['level'], result['count'])
 
-        result = dcerpc.spoolss_EnumForms(pipe, r)
+    for form in forms:
+
+        r = {}
+        r['handle'] = handle
+        r['formname'] = form['info1']['formname']
+        r['level'] = 1
+
+        result = ResizeBufferCall(dcerpc.spoolss_GetForm, pipe, r)
 
-    print result
-           
 
 def test_EnumPorts(pipe, handle):
 
@@ -91,16 +105,68 @@ def test_EnumPorts(pipe, handle):
     r['buffer'] = None
     r['buf_size'] = 0
 
-    result = dcerpc.spoolss_EnumPorts(pipe, r)
+    result = ResizeBufferCall(dcerpc.spoolss_EnumPorts, pipe, r)
 
-    if result['result'] == dcerpc.WERR_INSUFFICIENT_BUFFER:
-        r['buffer'] = result['buf_size'] * '\x00'
-        r['buf_size'] = result['buf_size']
 
-        result = dcerpc.spoolss_EnumPorts(pipe, r)
+def test_DeleteForm(pipe, handle, formname):
+
+    r = {}
+    r['handle'] = handle
+    r['formname'] = formname
+
+    dcerpc.spoolss_DeleteForm(pipe, r)
+
+
+def test_GetForm(pipe, handle, formname):
+
+    r = {}
+    r['handle'] = handle
+    r['formname'] = formname
+    r['level'] = 1
+
+    result = ResizeBufferCall(dcerpc.spoolss_GetForm, pipe, r)
+
+    return result['info']['info1']
+    
+
+def test_AddForm(pipe, handle):
+
+    print 'testing spoolss_AddForm'
+
+    formname = '__testform__'
+
+    r = {}
+    r['handle'] = handle
+    r['level'] = 1
+    r['info'] = {}
+    r['info']['info1'] = {}
+    r['info']['info1']['formname'] = formname
+    r['info']['info1']['flags'] = 0
+    r['info']['info1']['width'] = 1
+    r['info']['info1']['length'] = 2
+    r['info']['info1']['left'] = 3
+    r['info']['info1']['top'] = 4
+    r['info']['info1']['right'] = 5
+    r['info']['info1']['bottom'] = 6
+
+    try:
+        result = dcerpc.spoolss_AddForm(pipe, r)
+    except dcerpc.WERROR, arg:
+        if arg[0] == dcerpc.WERR_ALREADY_EXISTS:
+            test_DeleteForm(pipe, handle, formname)
+        result = dcerpc.spoolss_AddForm(pipe, r)
+
+    f = test_GetForm(pipe, handle, formname)
+
+    if r['info']['info1'] != f:
+        print 'Form type mismatch: %s != %s' % \
+              (r['info']['info1'], f)
+        sys.exit(1)
+
+    # TODO: test spoolss_SetForm()
+
+    test_DeleteForm(pipe, handle, formname)
 
-    print result
-           
 
 def test_EnumPrinters(pipe):
 
@@ -120,20 +186,11 @@ def test_EnumPrinters(pipe):
         r['buf_size'] = 0
         r['buffer'] = None
 
-        result = dcerpc.spoolss_EnumPrinters(pipe, r)
-
-        if result['result'] == dcerpc.WERR_INSUFFICIENT_BUFFER:
-            r['buffer'] = result['buf_size'] * '\x00'
-            r['buf_size'] = result['buf_size']
-
-            result = dcerpc.spoolss_EnumPrinters(pipe, r)
+        result = ResizeBufferCall(dcerpc.spoolss_EnumPrinters,pipe, r)
 
         printers = dcerpc.unmarshall_spoolss_PrinterInfo_array(
             result['buffer'], r['level'], result['count'])
 
-        from pprint import pprint
-        pprint(printers)
-
         if level == 1:
             printer_names = map(
                 lambda x: string.split(x['info1']['name'], ',')[0], printers)
@@ -144,6 +201,10 @@ def test_EnumPrinters(pipe):
 
         test_GetPrinter(pipe, handle)
 
+        test_EnumForms(pipe, handle)
+
+        test_AddForm(pipe, handle)
+
         test_ClosePrinter(pipe, handle)
         
 
-- 
cgit 


From 89665e87b47e5cc3299c3234bf3c8b0266f9bab2 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Sat, 30 Oct 2004 23:35:34 +0000
Subject: r3396: Rename form_name -> formname.  This time, check smbtorture
 builds before committing.  (-: (This used to be commit
 c776232d0130638a85cc8ce75e4bbef75952e856)

---
 source4/scripting/swig/torture/spoolss.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/torture/spoolss.py b/source4/scripting/swig/torture/spoolss.py
index c1859bf2d4..78c74569f5 100644
--- a/source4/scripting/swig/torture/spoolss.py
+++ b/source4/scripting/swig/torture/spoolss.py
@@ -163,7 +163,10 @@ def test_AddForm(pipe, handle):
               (r['info']['info1'], f)
         sys.exit(1)
 
-    # TODO: test spoolss_SetForm()
+    r['formname'] = formname
+    r['info']['info1']['unknown'] = 1
+
+    dcerpc.spoolss_SetForm(pipe, r)
 
     test_DeleteForm(pipe, handle, formname)
 
-- 
cgit 


From 75f1497c32bbae1d603b80810412a544303fce94 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Sun, 31 Oct 2004 03:54:20 +0000
Subject: r3401: Fix IDL for SetForm RPC. (This used to be commit
 206f3de297c397c8894f9855ea8571c68823e1fc)

---
 source4/scripting/swig/torture/spoolss.py | 39 +++++++++++++++++++++++--------
 1 file changed, 29 insertions(+), 10 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/torture/spoolss.py b/source4/scripting/swig/torture/spoolss.py
index 78c74569f5..4c65669d8f 100644
--- a/source4/scripting/swig/torture/spoolss.py
+++ b/source4/scripting/swig/torture/spoolss.py
@@ -129,6 +129,26 @@ def test_GetForm(pipe, handle, formname):
     return result['info']['info1']
     
 
+def test_SetForm(pipe, handle, form):
+
+    print 'testing spoolss_SetForm'
+
+    r = {}
+    r['handle'] = handle
+    r['level'] = 1
+    r['formname'] = form['info1']['formname']
+    r['info'] = form
+
+    dcerpc.spoolss_SetForm(pipe, r)
+
+    newform = test_GetForm(pipe, handle, r['formname'])
+
+    if form['info1'] != newform:
+        print 'SetForm: mismatch: %s != %s' % \
+              (r['info']['info1'], f)
+        sys.exit(1)
+
+
 def test_AddForm(pipe, handle):
 
     print 'testing spoolss_AddForm'
@@ -141,13 +161,13 @@ def test_AddForm(pipe, handle):
     r['info'] = {}
     r['info']['info1'] = {}
     r['info']['info1']['formname'] = formname
-    r['info']['info1']['flags'] = 0
-    r['info']['info1']['width'] = 1
-    r['info']['info1']['length'] = 2
-    r['info']['info1']['left'] = 3
-    r['info']['info1']['top'] = 4
-    r['info']['info1']['right'] = 5
-    r['info']['info1']['bottom'] = 6
+    r['info']['info1']['flags'] = 0x0002
+    r['info']['info1']['width'] = 100
+    r['info']['info1']['length'] = 100
+    r['info']['info1']['left'] = 0
+    r['info']['info1']['top'] = 1000
+    r['info']['info1']['right'] = 2000
+    r['info']['info1']['bottom'] = 3000
 
     try:
         result = dcerpc.spoolss_AddForm(pipe, r)
@@ -159,14 +179,13 @@ def test_AddForm(pipe, handle):
     f = test_GetForm(pipe, handle, formname)
 
     if r['info']['info1'] != f:
-        print 'Form type mismatch: %s != %s' % \
+        print 'AddForm: mismatch: %s != %s' % \
               (r['info']['info1'], f)
         sys.exit(1)
 
     r['formname'] = formname
-    r['info']['info1']['unknown'] = 1
 
-    dcerpc.spoolss_SetForm(pipe, r)
+    test_SetForm(pipe, handle, r['info'])
 
     test_DeleteForm(pipe, handle, formname)
 
-- 
cgit 


From 0e082a5c9d3faf11dd7f8813d4777597819c41da Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Sun, 31 Oct 2004 04:41:57 +0000
Subject: r3403: Add test for operations on print server handle.

Add tests for EnumJobs, GetJob.

Oops - forgot to EnumPrinters at level2.
(This used to be commit 930d57964b69fda59f473914ac4633984f259c86)
---
 source4/scripting/swig/torture/spoolss.py | 87 +++++++++++++++++++++++++------
 1 file changed, 72 insertions(+), 15 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/torture/spoolss.py b/source4/scripting/swig/torture/spoolss.py
index 4c65669d8f..1b19bd8f1a 100644
--- a/source4/scripting/swig/torture/spoolss.py
+++ b/source4/scripting/swig/torture/spoolss.py
@@ -22,9 +22,13 @@ def test_OpenPrinterEx(pipe, printer):
 
     print 'testing spoolss_OpenPrinterEx(%s)' % printer
 
+    printername = '\\\\%s' % dcerpc.dcerpc_server_name(pipe)
+    
+    if printer is not None:
+        printername = printername + '\\%s' % printer
+
     r = {}
-    r['printername'] = '\\\\%s\\%s' % \
-                       (dcerpc.dcerpc_server_name(pipe), printer)
+    r['printername'] = printername
     r['datatype'] = None
     r['devmode_ctr'] = {}
     r['devmode_ctr']['size'] = 0
@@ -190,6 +194,38 @@ def test_AddForm(pipe, handle):
     test_DeleteForm(pipe, handle, formname)
 
 
+def test_EnumJobs(pipe, handle):
+
+    print 'testing spoolss_EnumJobs'
+
+    r = {}
+    r['handle'] = handle
+    r['firstjob'] = 0
+    r['numjobs'] = 0xffffffff
+    r['level'] = 1
+
+    result = ResizeBufferCall(dcerpc.spoolss_EnumJobs, pipe, r)
+
+    if result['buffer'] is None:
+        return
+    
+    jobs = dcerpc.unmarshall_spoolss_JobInfo_array(
+        result['buffer'], r['level'], result['count'])
+
+    for job in jobs:
+
+        s = {}
+        s['handle'] = handle
+        s['job_id'] = job['info1']['job_id']
+        s['level'] = 1
+
+        result = ResizeBufferCall(dcerpc.spoolss_GetJob, pipe, s)
+
+        if result['info'] != job:
+            print 'EnumJobs: mismatch: %s != %s' % (result['info'], job)
+            sys.exit(1)
+    
+
 def test_EnumPrinters(pipe):
 
     print 'testing spoolss_EnumPrinters'
@@ -200,35 +236,55 @@ def test_EnumPrinters(pipe):
     r['flags'] = 0x02
     r['server'] = None
 
-    for level in [0, 1, 4, 5]:
+    for level in [0, 1, 2, 4, 5]:
 
         print 'test_EnumPrinters(level = %d)' % level
 
         r['level'] = level
-        r['buf_size'] = 0
-        r['buffer'] = None
 
-        result = ResizeBufferCall(dcerpc.spoolss_EnumPrinters,pipe, r)
+        result = ResizeBufferCall(dcerpc.spoolss_EnumPrinters, pipe, r)
 
         printers = dcerpc.unmarshall_spoolss_PrinterInfo_array(
             result['buffer'], r['level'], result['count'])
 
-        if level == 1:
-            printer_names = map(
-                lambda x: string.split(x['info1']['name'], ',')[0], printers)
+        if level == 2:
+            for p in printers:
 
-    for printer in printer_names:
+                # A nice check is for the specversion in the
+                # devicemode.  This has always been observed to be
+                # 1025.
 
-        handle = test_OpenPrinterEx(pipe, printer)
+                if p['info2']['devmode']['specversion'] != 1025:
+                    print 'test_EnumPrinters: specversion != 1025'
+                    sys.exit(1)
 
-        test_GetPrinter(pipe, handle)
+    r['level'] = 1
+    result = ResizeBufferCall(dcerpc.spoolss_EnumPrinters, pipe, r)
+    
+    for printer in dcerpc.unmarshall_spoolss_PrinterInfo_array(
+        result['buffer'], r['level'], result['count']):
 
-        test_EnumForms(pipe, handle)
+        if string.find(printer['info1']['name'], '\\\\') == 0:
+            print 'Skipping remote printer %s' % printer['info1']['name']
+            continue
 
-        test_AddForm(pipe, handle)
+        printername = string.split(printer['info1']['name'], ',')[0]
+
+        handle = test_OpenPrinterEx(pipe, printername)
 
+        test_GetPrinter(pipe, handle)
+        test_EnumForms(pipe, handle)
+        test_AddForm(pipe, handle)
+        test_EnumJobs(pipe, handle)
         test_ClosePrinter(pipe, handle)
-        
+
+
+def test_PrintServer(pipe):
+    
+    handle = test_OpenPrinterEx(pipe, None)
+
+    test_ClosePrinter(pipe, handle)
+    
 
 def runtests(binding, domain, username, password):
     
@@ -239,3 +295,4 @@ def runtests(binding, domain, username, password):
             domain, username, password)
 
     test_EnumPrinters(pipe)
+    test_PrintServer(pipe)
-- 
cgit 


From 5d7c6d7bbdbf9e796fa4d21aa47f177b6c81367e Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Sun, 31 Oct 2004 05:45:52 +0000
Subject: r3405: Test EnumPrinterData and GetPrinterData. (This used to be
 commit a4facee8602cfb9b2599e0068dd42933ed94655e)

---
 source4/scripting/swig/torture/spoolss.py | 49 ++++++++++++++++++++++++++++++-
 1 file changed, 48 insertions(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/torture/spoolss.py b/source4/scripting/swig/torture/spoolss.py
index 1b19bd8f1a..4779c278f2 100644
--- a/source4/scripting/swig/torture/spoolss.py
+++ b/source4/scripting/swig/torture/spoolss.py
@@ -9,7 +9,8 @@ def ResizeBufferCall(fn, pipe, r):
     
     result = fn(pipe, r)
 
-    if result['result'] == dcerpc.WERR_INSUFFICIENT_BUFFER:
+    if result['result'] == dcerpc.WERR_INSUFFICIENT_BUFFER or \
+       result['result'] == dcerpc.WERR_MORE_DATA:
         r['buffer'] = result['buf_size'] * '\x00'
         r['buf_size'] = result['buf_size']
 
@@ -226,6 +227,49 @@ def test_EnumJobs(pipe, handle):
             sys.exit(1)
     
 
+    # TODO: AddJob, DeleteJob, ScheduleJob
+
+
+def test_EnumPrinterData(pipe, handle):
+
+    print 'test_EnumPrinterData'
+
+    enum_index = 0
+
+    while 1:
+
+        r = {}
+        r['handle'] = handle
+        r['enum_index'] = enum_index
+
+        r['value_offered'] = 0
+        r['data_size'] = 0
+        
+        result = dcerpc.spoolss_EnumPrinterData(pipe, r)
+
+        r['value_offered'] = result['value_needed']
+        r['data_size'] = result['data_size']
+
+        result = dcerpc.spoolss_EnumPrinterData(pipe, r)
+
+        if result['result'] == dcerpc.WERR_NO_MORE_ITEMS:
+            break
+
+        s = {}
+        s['handle'] = handle
+        s['value_name'] = result['value_name']
+
+        result2 = ResizeBufferCall(dcerpc.spoolss_GetPrinterData, pipe, s)
+
+        if result['buffer'][:result2['buf_size']] != result2['buffer']:
+            print 'EnumPrinterData/GetPrinterData mismatch'
+            sys.exit(1)
+ 
+        enum_index += 1
+
+    sys.exit(1)
+
+
 def test_EnumPrinters(pipe):
 
     print 'testing spoolss_EnumPrinters'
@@ -276,6 +320,7 @@ def test_EnumPrinters(pipe):
         test_EnumForms(pipe, handle)
         test_AddForm(pipe, handle)
         test_EnumJobs(pipe, handle)
+        test_EnumPrinterData(pipe, handle)
         test_ClosePrinter(pipe, handle)
 
 
@@ -283,6 +328,8 @@ def test_PrintServer(pipe):
     
     handle = test_OpenPrinterEx(pipe, None)
 
+    # EnumForms and AddForm tests return WERR_BADFID here (??)
+
     test_ClosePrinter(pipe, handle)
     
 
-- 
cgit 


From 751b412326e77ee4bea0c521906e6f83a8bedd07 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Sun, 31 Oct 2004 11:33:40 +0000
Subject: r3410: Handle conversion of DATA_BLOBs and pointers to DATA_BLOBs
 from python. (This used to be commit
 12e037dbe3d497aff2415c0a22fab20a7932ab7a)

---
 source4/scripting/swig/dcerpc.i           | 17 +++++++++++++++++
 source4/scripting/swig/torture/spoolss.py | 27 ++++++++++++++++++++++++++-
 2 files changed, 43 insertions(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/dcerpc.i b/source4/scripting/swig/dcerpc.i
index 796384d6e7..c7e2d79c12 100644
--- a/source4/scripting/swig/dcerpc.i
+++ b/source4/scripting/swig/dcerpc.i
@@ -254,6 +254,23 @@ PyObject *string_ptr_to_python(TALLOC_CTX *mem_ctx, char *obj)
 #define dom_sid2_ptr_to_python dom_sid_ptr_to_python
 #define dom_sid2_ptr_from_python dom_sid_ptr_from_python
 
+void DATA_BLOB_from_python(TALLOC_CTX *mem_ctx, DATA_BLOB *s,
+			   PyObject *obj, char name)
+{
+	if (obj == NULL) {
+		PyErr_Format(PyExc_ValueError, "Expecting key %s", name);
+		return;
+	}
+
+	if (!PyString_Check(obj)) {
+		PyErr_Format(PyExc_TypeError, "Expecting string value for key '%s'", name);
+		return;
+	}
+
+	s->length = PyString_Size(obj);
+	s->data = PyString_AsString(obj);
+}
+
 void DATA_BLOB_ptr_from_python(TALLOC_CTX *mem_ctx, DATA_BLOB **s, 
 			       PyObject *obj, char *name)
 {
diff --git a/source4/scripting/swig/torture/spoolss.py b/source4/scripting/swig/torture/spoolss.py
index 4779c278f2..ef8b3150e1 100644
--- a/source4/scripting/swig/torture/spoolss.py
+++ b/source4/scripting/swig/torture/spoolss.py
@@ -267,7 +267,31 @@ def test_EnumPrinterData(pipe, handle):
  
         enum_index += 1
 
-    sys.exit(1)
+def test_SetPrinterData(pipe, handle):
+
+    print 'testing spoolss_SetPrinterData'
+
+    valuename = '__printerdatatest__'
+    data = '12345'
+    
+    r = {}
+    r['handle'] = handle
+    r['value_name'] = valuename
+    r['type'] = 3                       # REG_BINARY
+    r['buffer'] = data
+    r['real_len'] = 5
+
+    dcerpc.spoolss_SetPrinterData(pipe, r)
+
+    s = {}
+    s['handle'] = handle
+    s['value_name'] = valuename
+
+    result = ResizeBufferCall(dcerpc.spoolss_GetPrinterData, pipe, r)
+
+    if result['buffer'] != data:
+        print 'SetPrinterData: mismatch'
+        sys.exit(1)
 
 
 def test_EnumPrinters(pipe):
@@ -321,6 +345,7 @@ def test_EnumPrinters(pipe):
         test_AddForm(pipe, handle)
         test_EnumJobs(pipe, handle)
         test_EnumPrinterData(pipe, handle)
+        test_SetPrinterData(pipe, handle)
         test_ClosePrinter(pipe, handle)
 
 
-- 
cgit 


From 9ebf74c5765299492c116004c59c8368dab0b71b Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Sun, 31 Oct 2004 11:35:31 +0000
Subject: r3411: Ignore some autogenerated files. (This used to be commit
 f6428f2d01a4bd8d4acadf96e33957371cdb2021)

---
 source4/scripting/swig/torture/spoolss.py | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/torture/spoolss.py b/source4/scripting/swig/torture/spoolss.py
index ef8b3150e1..70450a9b12 100644
--- a/source4/scripting/swig/torture/spoolss.py
+++ b/source4/scripting/swig/torture/spoolss.py
@@ -267,6 +267,7 @@ def test_EnumPrinterData(pipe, handle):
  
         enum_index += 1
 
+
 def test_SetPrinterData(pipe, handle):
 
     print 'testing spoolss_SetPrinterData'
@@ -293,6 +294,8 @@ def test_SetPrinterData(pipe, handle):
         print 'SetPrinterData: mismatch'
         sys.exit(1)
 
+    dcerpc.spoolss_DeletePrinterData(pipe, r)
+
 
 def test_EnumPrinters(pipe):
 
-- 
cgit 


From 8c1edd1674fd073f3b4274a940f598e33319dd12 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Mon, 1 Nov 2004 11:51:35 +0000
Subject: r3430: Add tests for EnumPrinterDataEx, SetPrinterDataEx (doesn't
 work), EnumPrinterDrivers. (This used to be commit
 fe381c3ebc64a7d067832c7d2aebeb35b1f3923b)

---
 source4/scripting/swig/torture/spoolss.py | 75 ++++++++++++++++++++++++++-----
 1 file changed, 65 insertions(+), 10 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/torture/spoolss.py b/source4/scripting/swig/torture/spoolss.py
index 70450a9b12..a4fdbbb107 100644
--- a/source4/scripting/swig/torture/spoolss.py
+++ b/source4/scripting/swig/torture/spoolss.py
@@ -21,7 +21,7 @@ def ResizeBufferCall(fn, pipe, r):
 
 def test_OpenPrinterEx(pipe, printer):
 
-    print 'testing spoolss_OpenPrinterEx(%s)' % printer
+    print 'spoolss_OpenPrinterEx(%s)' % printer
 
     printername = '\\\\%s' % dcerpc.dcerpc_server_name(pipe)
     
@@ -66,7 +66,7 @@ def test_GetPrinter(pipe, handle):
 
     for level in [0, 1, 2, 3, 4, 5, 6, 7]:
 
-        print 'test_GetPrinter(level = %d)' % level
+        print 'spoolss_GetPrinter(level = %d)' % level
 
         r['level'] = level
         r['buffer'] = None
@@ -77,7 +77,7 @@ def test_GetPrinter(pipe, handle):
 
 def test_EnumForms(pipe, handle):
 
-    print 'testing spoolss_EnumForms'
+    print 'spoolss_EnumForms()'
 
     r = {}
     r['handle'] = handle
@@ -102,7 +102,7 @@ def test_EnumForms(pipe, handle):
 
 def test_EnumPorts(pipe, handle):
 
-    print 'testing spoolss_EnumPorts'
+    print 'spoolss_EnumPorts()'
 
     r = {}
     r['handle'] = handle
@@ -136,7 +136,7 @@ def test_GetForm(pipe, handle, formname):
 
 def test_SetForm(pipe, handle, form):
 
-    print 'testing spoolss_SetForm'
+    print 'spoolss_SetForm()'
 
     r = {}
     r['handle'] = handle
@@ -156,7 +156,7 @@ def test_SetForm(pipe, handle, form):
 
 def test_AddForm(pipe, handle):
 
-    print 'testing spoolss_AddForm'
+    print 'spoolss_AddForm()'
 
     formname = '__testform__'
 
@@ -197,7 +197,7 @@ def test_AddForm(pipe, handle):
 
 def test_EnumJobs(pipe, handle):
 
-    print 'testing spoolss_EnumJobs'
+    print 'spoolss_EnumJobs()'
 
     r = {}
     r['handle'] = handle
@@ -232,7 +232,7 @@ def test_EnumJobs(pipe, handle):
 
 def test_EnumPrinterData(pipe, handle):
 
-    print 'test_EnumPrinterData'
+    print 'test_EnumPrinterData()'
 
     enum_index = 0
 
@@ -268,9 +268,42 @@ def test_EnumPrinterData(pipe, handle):
         enum_index += 1
 
 
+def test_SetPrinterDataEx(pipe, handle):
+
+    valuename = '__printerdataextest__'
+    data = '12345'
+
+    r = {}
+    r['handle'] = handle
+    r['key_name'] = 'DsSpooler'
+    r['value_name'] = valuename
+    r['type'] = 3
+    r['buffer'] = data
+    r['buf_size'] = len(data)
+    
+    result = dcerpc.spoolss_SetPrinterDataEx(pipe, r)
+
+
+def test_EnumPrinterDataEx(pipe, handle):
+
+    r = {}
+    r['handle'] = handle
+    r['key_name'] = 'DsSpooler'
+    r['buf_size'] = 0
+
+    result = dcerpc.spoolss_EnumPrinterDataEx(pipe, r)
+
+    if result['result'] == dcerpc.WERR_MORE_DATA:
+        r['buf_size'] = result['buf_size']
+
+        result = dcerpc.spoolss_EnumPrinterDataEx(pipe, r)
+
+    # TODO: test spoolss_GetPrinterDataEx()
+
+
 def test_SetPrinterData(pipe, handle):
 
-    print 'testing spoolss_SetPrinterData'
+    print 'testing spoolss_SetPrinterData()'
 
     valuename = '__printerdatatest__'
     data = '12345'
@@ -299,7 +332,7 @@ def test_SetPrinterData(pipe, handle):
 
 def test_EnumPrinters(pipe):
 
-    print 'testing spoolss_EnumPrinters'
+    print 'testing spoolss_EnumPrinters()'
 
     printer_names = None
 
@@ -348,10 +381,31 @@ def test_EnumPrinters(pipe):
         test_AddForm(pipe, handle)
         test_EnumJobs(pipe, handle)
         test_EnumPrinterData(pipe, handle)
+        test_EnumPrinterDataEx(pipe, handle)
         test_SetPrinterData(pipe, handle)
+#       test_SetPrinterDataEx(pipe, handle)
         test_ClosePrinter(pipe, handle)
 
 
+def test_EnumPrinterDrivers(pipe):
+
+    print 'test spoolss_EnumPrinterDrivers()'
+
+    for level in [1, 2, 3]:
+
+        r = {}
+        r['server'] = None
+        r['environment'] = None
+        r['level'] = level
+
+        result = ResizeBufferCall(dcerpc.spoolss_EnumPrinterDrivers, pipe, r)
+
+        for driver in dcerpc.unmarshall_spoolss_DriverInfo_array(
+            result['buffer'], r['level'], result['count']):
+
+            print driver
+
+
 def test_PrintServer(pipe):
     
     handle = test_OpenPrinterEx(pipe, None)
@@ -370,4 +424,5 @@ def runtests(binding, domain, username, password):
             domain, username, password)
 
     test_EnumPrinters(pipe)
+    test_EnumPrinterDrivers(pipe)
     test_PrintServer(pipe)
-- 
cgit 


From 2f7d7e47e38d88655baddad4e2e0572d4c158f70 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Tue, 2 Nov 2004 03:47:24 +0000
Subject: r3456: Add appropriate #includes to fix Python extensions build.
 (This used to be commit 7e94d5bd3dd7b7055e9b70496207713f94446f98)

---
 source4/scripting/swig/dcerpc.i | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/dcerpc.i b/source4/scripting/swig/dcerpc.i
index c7e2d79c12..6bb30847eb 100644
--- a/source4/scripting/swig/dcerpc.i
+++ b/source4/scripting/swig/dcerpc.i
@@ -371,6 +371,14 @@ NTSTATUS dcerpc_pipe_connect(struct dcerpc_pipe **OUT,
 
 const char *dcerpc_server_name(struct dcerpc_pipe *p);
 
+%{
+#include "librpc/gen_ndr/ndr_misc.h"
+#include "librpc/gen_ndr/ndr_lsa.h"
+#include "librpc/gen_ndr/ndr_samr.h"
+#include "librpc/gen_ndr/ndr_winreg.h"
+#include "librpc/gen_ndr/ndr_spoolss.h"
+%}
+
 %include "librpc/gen_ndr/misc.i"
 %include "librpc/gen_ndr/lsa.i"
 %include "librpc/gen_ndr/samr.i"
-- 
cgit 


From 6afe281de820f3d3a557259386b91530432dde90 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Tue, 2 Nov 2004 04:22:57 +0000
Subject: r3459: Fix cut&paste error in copyright header. (This used to be
 commit 922ea35a4b6ea02e888a98aee241f1b9f6fca420)

---
 source4/scripting/swig/samba.i | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/samba.i b/source4/scripting/swig/samba.i
index 38a5251a08..9d73207705 100644
--- a/source4/scripting/swig/samba.i
+++ b/source4/scripting/swig/samba.i
@@ -5,8 +5,8 @@
    
    Copyright (C) 2004 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
+     ** NOTE! The following LGPL license applies to the swig
+     ** definitions. This does NOT imply that all of Samba is released
      ** under the LGPL
    
    This library is free software; you can redistribute it and/or
-- 
cgit 


From 5f68ab2538a6ef3c57c716f753663dc930b9d74b Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Tue, 2 Nov 2004 11:06:00 +0000
Subject: r3474: Add conversion functions for the time_t type. (This used to be
 commit caa563faaa264c41afdb60d64dc9566fcd31518e)

---
 source4/scripting/swig/dcerpc.i | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/dcerpc.i b/source4/scripting/swig/dcerpc.i
index 6bb30847eb..0a820c0a3c 100644
--- a/source4/scripting/swig/dcerpc.i
+++ b/source4/scripting/swig/dcerpc.i
@@ -197,6 +197,29 @@ PyObject *NTTIME_to_python(NTTIME obj)
 	return PyLong_FromUnsignedLongLong(obj);
 }
 
+time_t time_t_from_python(PyObject *obj, char *name)
+{
+	if (obj == NULL) {
+		PyErr_Format(PyExc_ValueError, "Expecting key %s", name);
+		return 0;
+	}
+
+	if (!PyLong_Check(obj) && !PyInt_Check(obj)) {
+		PyErr_Format(PyExc_TypeError, "Expecting int or long value for %s", name);
+		return 0;
+	}
+
+	if (PyLong_Check(obj))
+		return (time_t)PyLong_AsUnsignedLongLong(obj);
+	else
+		return (time_t)PyInt_AsUnsignedLongMask(obj);
+}
+
+PyObject *time_t_to_python(time_t obj)
+{
+	return PyLong_FromUnsignedLongLong(obj);
+}
+
 HYPER_T HYPER_T_from_python(PyObject *obj, char *name)
 {
 	if (obj == NULL) {
-- 
cgit 


From e3e5ef95addf3ca6b99166323adee4eada18d213 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Wed, 3 Nov 2004 06:12:42 +0000
Subject: r3505: #include dynconfig.h (This used to be commit
 336eba61e99cd96fe4abc8476b998d079fbb5770)

---
 source4/scripting/swig/dcerpc.i | 1 +
 1 file changed, 1 insertion(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/dcerpc.i b/source4/scripting/swig/dcerpc.i
index 0a820c0a3c..560345525f 100644
--- a/source4/scripting/swig/dcerpc.i
+++ b/source4/scripting/swig/dcerpc.i
@@ -34,6 +34,7 @@
 #endif
 
 #include "includes.h"
+#include "dynconfig.h"
 
 #undef strcpy
 
-- 
cgit 


From 90a8c4acc7e673e6439197776d19cc4b095ac322 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Wed, 3 Nov 2004 06:29:22 +0000
Subject: r3506: Test EnumPorts function. (This used to be commit
 354068aae16b7e0c13416cfcdf9bdef5138dccc0)

---
 source4/scripting/swig/torture/spoolss.py | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/torture/spoolss.py b/source4/scripting/swig/torture/spoolss.py
index a4fdbbb107..35a0a6039f 100644
--- a/source4/scripting/swig/torture/spoolss.py
+++ b/source4/scripting/swig/torture/spoolss.py
@@ -104,13 +104,20 @@ def test_EnumPorts(pipe, handle):
 
     print 'spoolss_EnumPorts()'
 
-    r = {}
-    r['handle'] = handle
-    r['level'] = 1
-    r['buffer'] = None
-    r['buf_size'] = 0
+    for level in [1, 2]:
+
+        r = {}
+        r['handle'] = handle
+        r['servername'] = None
+        r['level'] = level
+
+        result = ResizeBufferCall(dcerpc.spoolss_EnumPorts, pipe, r)
+
+        ports = dcerpc.unmarshall_spoolss_PortInfo_array(
+            result['buffer'], r['level'], result['count'])
 
-    result = ResizeBufferCall(dcerpc.spoolss_EnumPorts, pipe, r)
+        if level == 1:
+            port_names = map(lambda x: x['info1']['port_name'], ports)
 
 
 def test_DeleteForm(pipe, handle, formname):
@@ -377,6 +384,7 @@ def test_EnumPrinters(pipe):
         handle = test_OpenPrinterEx(pipe, printername)
 
         test_GetPrinter(pipe, handle)
+        test_EnumPorts(pipe, handle)
         test_EnumForms(pipe, handle)
         test_AddForm(pipe, handle)
         test_EnumJobs(pipe, handle)
-- 
cgit 


From 500ce03f7cb1cb2468b856cc9352422141cc9904 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Thu, 4 Nov 2004 06:40:28 +0000
Subject: r3521: Collect printer driver names in EnumPrinterDrivers. (This used
 to be commit 86f54db1ef96fbffc6f1c7948d8bc849009a536d)

---
 source4/scripting/swig/torture/spoolss.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/torture/spoolss.py b/source4/scripting/swig/torture/spoolss.py
index 35a0a6039f..a75385e079 100644
--- a/source4/scripting/swig/torture/spoolss.py
+++ b/source4/scripting/swig/torture/spoolss.py
@@ -408,11 +408,12 @@ def test_EnumPrinterDrivers(pipe):
 
         result = ResizeBufferCall(dcerpc.spoolss_EnumPrinterDrivers, pipe, r)
 
-        for driver in dcerpc.unmarshall_spoolss_DriverInfo_array(
-            result['buffer'], r['level'], result['count']):
-
-            print driver
+        drivers = dcerpc.unmarshall_spoolss_DriverInfo_array(
+            result['buffer'], r['level'], result['count'])
 
+        if level == 1:
+            driver_names = map(lambda x: x['info1']['driver_name'], drivers)
+            
 
 def test_PrintServer(pipe):
     
-- 
cgit 


From 3503373ba5af647a6da14b80385a5c1084c3112f Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Sun, 7 Nov 2004 00:41:43 +0000
Subject: r3588: Fix bug in converting SIDs containing large unsigned integers
 from Python. (This used to be commit
 a46aba43549e5221ec0c15d4133444d8ef77a4fb)

---
 source4/scripting/swig/dcerpc.i        |  6 +++---
 source4/scripting/swig/torture/samr.py | 12 ++++++++++++
 2 files changed, 15 insertions(+), 3 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/dcerpc.i b/source4/scripting/swig/dcerpc.i
index 560345525f..27afb6471c 100644
--- a/source4/scripting/swig/dcerpc.i
+++ b/source4/scripting/swig/dcerpc.i
@@ -119,9 +119,9 @@ uint32 uint32_from_python(PyObject *obj, char *name)
 	}
 
 	if (PyLong_Check(obj))
-		return (uint32)PyLong_AsLong(obj);
-	else
-		return (uint32)PyInt_AsLong(obj);
+		return (uint32)PyLong_AsUnsignedLongMask(obj);
+
+	return (uint32)PyInt_AsLong(obj);
 }
 
 PyObject *uint32_to_python(uint32 obj)
diff --git a/source4/scripting/swig/torture/samr.py b/source4/scripting/swig/torture/samr.py
index 435b3a81db..f7c33baeb3 100755
--- a/source4/scripting/swig/torture/samr.py
+++ b/source4/scripting/swig/torture/samr.py
@@ -864,6 +864,18 @@ def test_LongInt(pipe):
 
     result = dcerpc.samr_Connect(pipe, r)
 
+    # Test that we can parse a SID that contains a sub_auth that can't
+    # be held in a python int.
+
+    r = {}
+    r['connect_handle'] = result['connect_handle']
+    r['access_mask'] = 0x02000000
+    r['sid'] = {'sid_rev_num': 1, 'id_auth': [0, 0, 0, 0, 0, 5],
+                'num_auths': 4,
+                'sub_auths': [21, 737922324, 3002806791L, 1285293260]}
+
+    result = dcerpc.samr_OpenDomain(pipe, r)
+
 def runtests(binding, domain, username, password):
 
     print 'Testing SAMR pipe'
-- 
cgit 


From 6c32daf320b1c70db38199ffcdb0e1c25a207a13 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Sun, 7 Nov 2004 01:09:14 +0000
Subject: r3589: Add some extra status codes. (This used to be commit
 6d918f15951f38061128e141bbcc161d8956977e)

---
 source4/scripting/swig/status_codes.i | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/status_codes.i b/source4/scripting/swig/status_codes.i
index dccbfab61d..cf13ac9852 100644
--- a/source4/scripting/swig/status_codes.i
+++ b/source4/scripting/swig/status_codes.i
@@ -543,6 +543,8 @@
 #define WERR_CAN_NOT_COMPLETE 1003
 #define WERR_INVALID_SECURITY_DESCRIPTOR 1338
 #define WERR_SERVER_UNAVAILABLE 1722
+#define WERR_UNKNOWN_PRINTER_DRIVER 1797
+#define WERR_INVALID_ENVIRONMENT 1805
 #define WERR_INVALID_FORM_NAME 1902
 #define WERR_INVALID_FORM_SIZE 1903
 #define WERR_BUF_TOO_SMALL 2123
-- 
cgit 


From e34ee4fdaa4f8b6ae7167b663c2acda2654f2895 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Sun, 7 Nov 2004 01:11:11 +0000
Subject: r3590: Add some more commands to rpcclient from a patch by jbm.  Add
 SamrQueryDomInfo, SamrQueryDomInfo2, SamrEnumDomainAliases, and
 SamrEnumDomainUsers. (This used to be commit
 91eb405354a65bfd94bf59c21fe21f68fff7b9fd)

---
 source4/scripting/swig/rpcclient | 133 ++++++++++++++++++++++++++++++++++++++-
 source4/scripting/swig/samr.py   |  59 +++++++++++++++--
 2 files changed, 186 insertions(+), 6 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/rpcclient b/source4/scripting/swig/rpcclient
index 2a3d12cc8e..aad4597053 100755
--- a/source4/scripting/swig/rpcclient
+++ b/source4/scripting/swig/rpcclient
@@ -3,7 +3,7 @@
 import sys, os, string
 from cmd import Cmd
 from optparse import OptionParser
-
+from pprint import pprint
 
 import dcerpc, samr
 
@@ -96,6 +96,137 @@ class rpcclient(Cmd):
 
         print connect_handle.LookupDomain(args[0])
 
+    def do_SamrQueryDomInfo(self, line):
+	"""Return information about a domain designated by its SID."""
+
+	usage = 'SamrQueryDomInfo DOMAIN_SID [info_level]'
+
+	parser = OptionParser(usage)
+	options, args = parser.parse_args(string.split(line))
+
+	if (len(args) == 0) or (len(args) > 2):
+	    print 'usage:', usage
+	    return
+
+        pipe = dcerpc.pipe_connect(
+            self.binding,
+            dcerpc.DCERPC_SAMR_UUID, dcerpc.DCERPC_SAMR_VERSION,
+            self.domain, self.username, self.password)
+
+        connect_handle = samr.Connect(pipe)
+	domain_handle = connect_handle.OpenDomain(args[0])
+
+	if (len(args) == 2):
+	    result = domain_handle.QueryDomainInfo(int(args[1]))
+	else:
+	    result = domain_handle.QueryDomainInfo()
+
+        pprint(result['info'])
+
+    def do_SamrQueryDomInfo2(self, line):
+	"""Return information about a domain designated by its SID. (Windows 2000 and >)"""
+
+	usage = 'SamrQueryDomInfo2 DOMAIN_SID [info_level] (Windows 2000 and >)'
+	parser = OptionParser(usage)
+	options, args = parser.parse_args(string.split(line))
+
+	if (len(args) == 0) or (len(args) > 2):
+	    print 'usage:', usage
+	    return
+
+        pipe = dcerpc.pipe_connect(
+            self.binding,
+            dcerpc.DCERPC_SAMR_UUID, dcerpc.DCERPC_SAMR_VERSION,
+            self.domain, self.username, self.password)
+
+        connect_handle = samr.Connect(pipe)
+	domain_handle = connect_handle.OpenDomain(args[0])
+
+	if (len(args) == 2):
+	    result = domain_handle.QueryDomainInfo2(int(args[1]))
+	else:
+	    result = domain_handle.QueryDomainInfo2()
+
+        pprint(result['info'])
+
+    def do_SamrEnumDomainGroups(self, line):
+	"""Return the list of groups of a domain designated by its SID."""
+
+	usage = 'SamrEnumDomainGroups DOMAIN_SID'
+
+        parser = OptionParser(usage)
+        options, args = parser.parse_args(string.split(line))
+
+        if len(args) != 1:
+            print 'usage:', usage
+            return
+
+        pipe = dcerpc.pipe_connect(
+            self.binding,
+            dcerpc.DCERPC_SAMR_UUID, dcerpc.DCERPC_SAMR_VERSION,
+            self.domain, self.username, self.password)
+
+        connect_handle = samr.Connect(pipe)	
+	domain_handle = connect_handle.OpenDomain(args[0])
+
+	result = domain_handle.EnumDomainGroups()
+
+        for r in result['sam']['entries']:
+            print r['name']['name']
+
+    def do_SamrEnumDomainAliases(self, line):
+        """Return the list of aliases (local groups) of a domain designated by its SID."""
+
+	usage = 'SamrEnumDomainAliases DOMAIN_SID'
+
+        parser = OptionParser(usage)
+        options, args = parser.parse_args(string.split(line))
+
+        if len(args) != 1:
+            print 'usage:', usage
+            return
+
+        pipe = dcerpc.pipe_connect(
+            self.binding,
+            dcerpc.DCERPC_SAMR_UUID, dcerpc.DCERPC_SAMR_VERSION,
+            self.domain, self.username, self.password)
+
+        connect_handle = samr.Connect(pipe)
+        domain_handle = connect_handle.OpenDomain(args[0])
+
+	result = domain_handle.EnumDomainAliases()
+
+        for r in result['sam']['entries']:
+            print r['name']['name']
+
+    def do_SamrEnumDomainUsers(self, line):
+	"""Return the list of users of a domain designated by its SID."""
+
+	usage = 'SamrEnumDomainUsers DOMAIN_SID [user_account_flags]'
+
+        parser = OptionParser(usage)
+        options, args = parser.parse_args(string.split(line))
+
+	if (len(args) == 0) or (len(args) > 2):
+	    print 'usage:', usage
+	    return
+
+        pipe = dcerpc.pipe_connect(
+            self.binding,
+            dcerpc.DCERPC_SAMR_UUID, dcerpc.DCERPC_SAMR_VERSION,
+            self.domain, self.username, self.password)
+
+        connect_handle = samr.Connect(pipe)
+        domain_handle = connect_handle.OpenDomain(args[0])
+
+	if (len(args) == 2):
+	    result = domain_handle.EnumDomainUsers(int(args[1]))
+	else:
+	    result = domain_handle.EnumDomainUsers()
+
+        for r in result['sam']['entries']:
+            print r['name']['name']
+
 if __name__ == '__main__':
 
     # Parse command line
diff --git a/source4/scripting/swig/samr.py b/source4/scripting/swig/samr.py
index 5fd87da3ad..d29b7f6682 100644
--- a/source4/scripting/swig/samr.py
+++ b/source4/scripting/swig/samr.py
@@ -73,11 +73,10 @@ def string_to_sid(string):
 
         string = string[match.end():]
     
-    print map(type, sub_auths)
-
     return {'sid_rev_num': sid_rev_num, 'id_auth': id_auth,
             'num_auths': num_auths, 'sub_auths': sub_auths}
 
+
 class SamrHandle:
 
     def __init__(self, pipe, handle):
@@ -92,6 +91,7 @@ class SamrHandle:
 
         dcerpc.samr_Close(self.pipe, r)
 
+
 class ConnectHandle(SamrHandle):
 
     def EnumDomains(self):
@@ -139,20 +139,69 @@ class ConnectHandle(SamrHandle):
 
         result = dcerpc.samr_OpenDomain(self.pipe, r)
 
-        return DomainHandle(pipe, result['domain_handle'])
+        return DomainHandle(self.pipe, result['domain_handle'])
+
 
 class DomainHandle(SamrHandle):
 
     def QueryDomainInfo(self, level = 2):
 
         r = {}
-        r['domain_handle'] = self.domain_handle
+        r['domain_handle'] = self.handle
         r['level'] = level
 
-        result = dcerpc.samr_QueryDomainInfo(pipe, r)
+        result = dcerpc.samr_QueryDomainInfo(self.pipe, r)
 
         return result
 
+    def QueryDomainInfo2(self, level = 2):
+
+        r = {}
+        r['domain_handle'] = self.handle
+        r['level'] = level
+
+        result = dcerpc.samr_QueryDomainInfo2(self.pipe, r)
+
+        return result
+
+    def EnumDomainGroups(self):
+
+        r = {}
+        r['domain_handle'] = self.handle
+        r['resume_handle'] = 0
+        r['max_size'] = 1000
+
+        result = dcerpc.samr_EnumDomainGroups(self.pipe, r)
+
+        return result
+
+    def EnumDomainAliases(self):
+
+        r = {}
+        r['domain_handle'] = self.handle
+        r['resume_handle'] = 0
+        # acct_flags in SamrEnumerateAliasesInDomain has probably
+        # no meaning so use 0xffffffff like W2K
+        r['acct_flags'] = 0xffffffff
+        r['max_size'] = 1000
+
+        result = dcerpc.samr_EnumDomainAliases(self.pipe, r)
+
+        return result
+
+    def EnumDomainUsers(self, user_account_flags = 16):
+
+        r = {}
+        r['domain_handle'] = self.handle
+        r['resume_handle'] = 0
+        r['acct_flags'] = user_account_flags
+        r['max_size'] = 1000
+
+        result = dcerpc.samr_EnumDomainUsers(self.pipe, r)
+
+        return result
+
+
 def Connect(pipe, system_name = None, access_mask = 0x02000000):
     """Connect to the SAMR pipe."""
 
-- 
cgit 


From e0586efe7abfa427918779042024d7e529f92f49 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Sun, 7 Nov 2004 22:05:18 +0000
Subject: r3607: EnumDomainAlises doesn't take a max_size parameter. (This used
 to be commit 996d042bf701860fcc9a9b424118c02addb2119b)

---
 source4/scripting/swig/samr.py | 1 -
 1 file changed, 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/samr.py b/source4/scripting/swig/samr.py
index d29b7f6682..6295517132 100644
--- a/source4/scripting/swig/samr.py
+++ b/source4/scripting/swig/samr.py
@@ -183,7 +183,6 @@ class DomainHandle(SamrHandle):
         # acct_flags in SamrEnumerateAliasesInDomain has probably
         # no meaning so use 0xffffffff like W2K
         r['acct_flags'] = 0xffffffff
-        r['max_size'] = 1000
 
         result = dcerpc.samr_EnumDomainAliases(self.pipe, r)
 
-- 
cgit 


From c20a32675237b7e64e7aebbbde79e1994ac5269d Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Fri, 19 Nov 2004 02:57:35 +0000
Subject: r3870: Delete wrappers for tdb_lockkeys() and tdb_unlockkeys(). (This
 used to be commit 5af52c559e731d55ccd019a2b06f486a2f86e6ce)

---
 source4/scripting/swig/tdb.i | 2 --
 1 file changed, 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/tdb.i b/source4/scripting/swig/tdb.i
index 404f498c26..0b169510c1 100644
--- a/source4/scripting/swig/tdb.i
+++ b/source4/scripting/swig/tdb.i
@@ -136,8 +136,6 @@ TDB_DATA tdb_firstkey(TDB_CONTEXT *tdb);
 TDB_DATA tdb_nextkey(TDB_CONTEXT *tdb, TDB_DATA key);
 int tdb_traverse(TDB_CONTEXT *tdb, tdb_traverse_func fn, void *state);
 int tdb_exists(TDB_CONTEXT *tdb, TDB_DATA key);
-int tdb_lockkeys(TDB_CONTEXT *tdb, u32 number, TDB_DATA keys[]);
-void tdb_unlockkeys(TDB_CONTEXT *tdb);
 int tdb_lockall(TDB_CONTEXT *tdb);
 void tdb_unlockall(TDB_CONTEXT *tdb);
 
-- 
cgit 


From 66bd6142a2fc4679e1d6cc98237a23927dda5f63 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Thu, 6 Jan 2005 02:10:33 +0000
Subject: r4546: Use talloc_p() instad of talloc() (This used to be commit
 2ec3a137d7fd8a912bc70e865f7a7798190b8869)

---
 source4/scripting/swig/dcerpc.i | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/dcerpc.i b/source4/scripting/swig/dcerpc.i
index 27afb6471c..487876c2fb 100644
--- a/source4/scripting/swig/dcerpc.i
+++ b/source4/scripting/swig/dcerpc.i
@@ -313,7 +313,7 @@ void DATA_BLOB_ptr_from_python(TALLOC_CTX *mem_ctx, DATA_BLOB **s,
 		return;
 	}
 
-	*s = talloc(mem_ctx, sizeof(DATA_BLOB));
+	*s = talloc_p(mem_ctx, DATA_BLOB);
 
 	(*s)->length = PyString_Size(obj);
 	(*s)->data = PyString_AsString(obj);
-- 
cgit 


From 29589f38950b1ec8e5d984a2e92fef577f26d743 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Tue, 25 Jan 2005 10:20:24 +0000
Subject: r4981: Fix swig build. (This used to be commit
 b44ab87c83ad094ce4595c9702d6a21f30c1de26)

---
 source4/scripting/swig/dcerpc.i | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/dcerpc.i b/source4/scripting/swig/dcerpc.i
index 487876c2fb..89599367ed 100644
--- a/source4/scripting/swig/dcerpc.i
+++ b/source4/scripting/swig/dcerpc.i
@@ -368,7 +368,7 @@ PyObject *DATA_BLOB_to_python(DATA_BLOB obj)
 	/* Set REF_ALLOC flag so we don't have to do too much extra
 	   mucking around with ref variables in ndr unmarshalling. */
 
-	(*$1)->flags |= DCERPC_NDR_REF_ALLOC;
+	(*$1)->conn->flags |= DCERPC_NDR_REF_ALLOC;
 
 	/* Return swig handle on dcerpc_pipe */
 
@@ -399,14 +399,12 @@ const char *dcerpc_server_name(struct dcerpc_pipe *p);
 #include "librpc/gen_ndr/ndr_misc.h"
 #include "librpc/gen_ndr/ndr_lsa.h"
 #include "librpc/gen_ndr/ndr_samr.h"
-#include "librpc/gen_ndr/ndr_winreg.h"
 #include "librpc/gen_ndr/ndr_spoolss.h"
 %}
 
 %include "librpc/gen_ndr/misc.i"
 %include "librpc/gen_ndr/lsa.i"
 %include "librpc/gen_ndr/samr.i"
-%include "librpc/gen_ndr/winreg.i"
 %include "librpc/gen_ndr/spoolss.i"
 
 /* The status codes must be included last otherwise the automatically
-- 
cgit 


From 8fb54d162b449244e5380aa1e00d99b5e23e9443 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Tue, 25 Jan 2005 11:21:25 +0000
Subject: r4982: Start to move swig dependencies into new build system. 
 Unfortunately I can only get something useful happening by using the BINARY
 keyword as nothing else seems to generate dependency lists that can be used
 when linking the swig shared libraries.  Anyway this is a lot nicer than
 having lots of junk in makefile.pm. (This used to be commit
 71a22f5206086c5ab7315d38934d65483aff7a70)

---
 source4/scripting/swig/config.mk   | 7 +++++++
 source4/scripting/swig/dummymain.c | 9 +++++++++
 2 files changed, 16 insertions(+)
 create mode 100644 source4/scripting/swig/config.mk
 create mode 100644 source4/scripting/swig/dummymain.c

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/config.mk b/source4/scripting/swig/config.mk
new file mode 100644
index 0000000000..8a5b743cac
--- /dev/null
+++ b/source4/scripting/swig/config.mk
@@ -0,0 +1,7 @@
+[BINARY::swig_tdb]
+OBJ_FILES = scripting/swig/dummymain.o
+REQUIRED_SUBSYSTEMS = LIBTDB
+
+[BINARY::swig_dcerpc]
+OBJ_FILES = scripting/swig/dummymain.o
+REQUIRED_SUBSYSTEMS = LIBCLI NDR_MISC LIBBASIC CONFIG RPC_NDR_SAMR
diff --git a/source4/scripting/swig/dummymain.c b/source4/scripting/swig/dummymain.c
new file mode 100644
index 0000000000..ac39144cd9
--- /dev/null
+++ b/source4/scripting/swig/dummymain.c
@@ -0,0 +1,9 @@
+/* 
+ * Dummy main function as the build system doesn't seem to create a
+ * dependency list for a subsystem.
+ */
+
+int main(void)
+{
+	return 0;
+}
-- 
cgit 


From 5e679708899b1da6a705c5263d8c3aa5c66d95a0 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Wed, 26 Jan 2005 20:40:59 +0000
Subject: r5016: Use LIBRARY instead of BINARY for inserting the swig stuff
 into the build system.  This still generates bogus targets (i.e
 bin/swig_dcerpc.so.0.0.1) and the subsystem initialisation needs to be done
 by hand but it is less of a hack. (This used to be commit
 e9b69d19a84b31966fb6e66e9d8682b0f9b40a47)

---
 source4/scripting/swig/config.mk   | 12 ++++++++----
 source4/scripting/swig/dummymain.c |  9 ---------
 2 files changed, 8 insertions(+), 13 deletions(-)
 delete mode 100644 source4/scripting/swig/dummymain.c

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/config.mk b/source4/scripting/swig/config.mk
index 8a5b743cac..70dab7c28d 100644
--- a/source4/scripting/swig/config.mk
+++ b/source4/scripting/swig/config.mk
@@ -1,7 +1,11 @@
-[BINARY::swig_tdb]
-OBJ_FILES = scripting/swig/dummymain.o
+[LIBRARY::swig_tdb]
+MAJOR_VERSION = 0
+MINOR_VERSION = 0
+RELEASE_VERSION = 1
 REQUIRED_SUBSYSTEMS = LIBTDB
 
-[BINARY::swig_dcerpc]
-OBJ_FILES = scripting/swig/dummymain.o
+[LIBRARY::swig_dcerpc]
+MAJOR_VERSION = 0
+MINOR_VERSION = 0
+RELEASE_VERSION = 1
 REQUIRED_SUBSYSTEMS = LIBCLI NDR_MISC LIBBASIC CONFIG RPC_NDR_SAMR
diff --git a/source4/scripting/swig/dummymain.c b/source4/scripting/swig/dummymain.c
deleted file mode 100644
index ac39144cd9..0000000000
--- a/source4/scripting/swig/dummymain.c
+++ /dev/null
@@ -1,9 +0,0 @@
-/* 
- * Dummy main function as the build system doesn't seem to create a
- * dependency list for a subsystem.
- */
-
-int main(void)
-{
-	return 0;
-}
-- 
cgit 


From b10b7a360a4bbed8fc7654d9f7c70625a48f3513 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Wed, 26 Jan 2005 20:41:58 +0000
Subject: r5017: Fix bug in output typemap for uint32 (!) (This used to be
 commit dc845154ca1738f4c3959a1799cbbd6ce65b7d02)

---
 source4/scripting/swig/samba.i | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/samba.i b/source4/scripting/swig/samba.i
index 9d73207705..a989a468b9 100644
--- a/source4/scripting/swig/samba.i
+++ b/source4/scripting/swig/samba.i
@@ -33,7 +33,7 @@
 }
 
 %typemap(out) uint32 {
-	$1 = PyLong_FromLong($input);
+	$result = PyLong_FromLong($1);
 }
 
 %typemap(out) NTSTATUS {
-- 
cgit 


From 07b65ce281504bff7ba08ef57e3c15301dbd8255 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Wed, 26 Jan 2005 20:43:55 +0000
Subject: r5018: Initialise required subsystems (by hand, generated by
 substituting BINARY for LIBRARY in config.mk).

Cut things down to just the samr pipe for the moment.
(This used to be commit 95d2a58e5b2cfc30304ca390de7073c214850984)
---
 source4/scripting/swig/dcerpc.i | 48 ++++++++++++++++++++++++++++++++++-------
 1 file changed, 40 insertions(+), 8 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/dcerpc.i b/source4/scripting/swig/dcerpc.i
index 89599367ed..041235efef 100644
--- a/source4/scripting/swig/dcerpc.i
+++ b/source4/scripting/swig/dcerpc.i
@@ -341,6 +341,46 @@ PyObject *DATA_BLOB_to_python(DATA_BLOB obj)
 	werror_exception = PyErr_NewException("_dcerpc.WERROR", NULL, NULL);
 	PyDict_SetItemString(d, "NTSTATUS", ntstatus_exception);
 	PyDict_SetItemString(d, "WERROR", werror_exception);
+
+/* BINARY swig_dcerpc INIT */
+
+		extern NTSTATUS dcerpc_misc_init(void);
+		extern NTSTATUS dcerpc_krb5pac_init(void);
+		extern NTSTATUS dcerpc_samr_init(void);
+		extern NTSTATUS dcerpc_dcerpc_init(void);
+		extern NTSTATUS auth_sam_init(void);
+		extern NTSTATUS dcerpc_lsa_init(void);
+		extern NTSTATUS dcerpc_netlogon_init(void);
+		extern NTSTATUS gensec_init(void);
+		extern NTSTATUS auth_developer_init(void);
+		extern NTSTATUS gensec_spnego_init(void);
+		extern NTSTATUS auth_winbind_init(void);
+		extern NTSTATUS gensec_gssapi_init(void);
+		extern NTSTATUS gensec_ntlmssp_init(void);
+		extern NTSTATUS dcerpc_nbt_init(void);
+		extern NTSTATUS auth_anonymous_init(void);
+		extern NTSTATUS gensec_krb5_init(void);
+		extern NTSTATUS dcerpc_schannel_init(void);
+		extern NTSTATUS dcerpc_epmapper_init(void);
+		if (NT_STATUS_IS_ERR(dcerpc_misc_init())) exit(1);
+		if (NT_STATUS_IS_ERR(dcerpc_krb5pac_init())) exit(1);
+		if (NT_STATUS_IS_ERR(dcerpc_samr_init())) exit(1);
+		if (NT_STATUS_IS_ERR(dcerpc_dcerpc_init())) exit(1);
+		if (NT_STATUS_IS_ERR(auth_sam_init())) exit(1);
+		if (NT_STATUS_IS_ERR(dcerpc_lsa_init())) exit(1);
+		if (NT_STATUS_IS_ERR(dcerpc_netlogon_init())) exit(1);
+		if (NT_STATUS_IS_ERR(gensec_init())) exit(1);
+		if (NT_STATUS_IS_ERR(auth_developer_init())) exit(1);
+		if (NT_STATUS_IS_ERR(gensec_spnego_init())) exit(1);
+		if (NT_STATUS_IS_ERR(auth_winbind_init())) exit(1);
+		if (NT_STATUS_IS_ERR(gensec_gssapi_init())) exit(1);
+		if (NT_STATUS_IS_ERR(gensec_ntlmssp_init())) exit(1);
+		if (NT_STATUS_IS_ERR(dcerpc_nbt_init())) exit(1);
+		if (NT_STATUS_IS_ERR(auth_anonymous_init())) exit(1);
+		if (NT_STATUS_IS_ERR(gensec_krb5_init())) exit(1);
+		if (NT_STATUS_IS_ERR(dcerpc_schannel_init())) exit(1);
+		if (NT_STATUS_IS_ERR(dcerpc_epmapper_init())) exit(1);
+
 %}
 
 %typemap(in, numinputs=0) struct dcerpc_pipe **OUT (struct dcerpc_pipe *temp_dcerpc_pipe) {
@@ -402,12 +442,4 @@ const char *dcerpc_server_name(struct dcerpc_pipe *p);
 #include "librpc/gen_ndr/ndr_spoolss.h"
 %}
 
-%include "librpc/gen_ndr/misc.i"
-%include "librpc/gen_ndr/lsa.i"
 %include "librpc/gen_ndr/samr.i"
-%include "librpc/gen_ndr/spoolss.i"
-
-/* The status codes must be included last otherwise the automatically
-   generated .i files get confused.  This is kind of yucky. */
-
-%include "status_codes.i"
-- 
cgit 


From d5b8ec7b0e970d37653ea08da573e7145eb638e7 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Sat, 29 Jan 2005 01:42:09 +0000
Subject: r5074: Remove dead code. (This used to be commit
 36b46bb05aeffb2ba708e4653c131cecece01984)

---
 source4/scripting/swig/dcerpc.i | 266 ----------------------------------------
 1 file changed, 266 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/dcerpc.i b/source4/scripting/swig/dcerpc.i
index 041235efef..ecf50079ff 100644
--- a/source4/scripting/swig/dcerpc.i
+++ b/source4/scripting/swig/dcerpc.i
@@ -58,272 +58,6 @@ void set_werror_exception(int status)
 	PyErr_SetObject(werror_exception, obj);
 }
 
-/* Conversion functions for scalar types */
-
-uint8 uint8_from_python(PyObject *obj, char *name)
-{
-	if (obj == NULL) {
-		PyErr_Format(PyExc_ValueError, "Expecting key %s", name);
-		return 0;
-	}
-
-	if (!PyInt_Check(obj) && !PyLong_Check(obj)) {
-		PyErr_Format(PyExc_TypeError, "Expecting int or long value for %s", name);
-		return 0;
-	}
-
-	if (PyLong_Check(obj))
-		return (uint8)PyLong_AsLong(obj);
-	else
-		return (uint8)PyInt_AsLong(obj);
-}
-
-PyObject *uint8_to_python(uint8 obj)
-{
-	return PyInt_FromLong(obj);
-}
-
-uint16 uint16_from_python(PyObject *obj, char *name)
-{
-	if (obj == NULL) {
-		PyErr_Format(PyExc_ValueError, "Expecting key %s", name);
-		return 0;
-	}
-
-	if (!PyInt_Check(obj) && !PyLong_Check(obj)) {
-		PyErr_Format(PyExc_TypeError, "Expecting int or long value for %s", name);
-		return 0;
-	}
-
-	if (PyLong_Check(obj))
-		return (uint16)PyLong_AsLong(obj);
-	else
-		return (uint16)PyInt_AsLong(obj);
-}
-
-PyObject *uint16_to_python(uint16 obj)
-{
-	return PyInt_FromLong(obj);
-}
-
-uint32 uint32_from_python(PyObject *obj, char *name)
-{
-	if (obj == NULL) {
-		PyErr_Format(PyExc_ValueError, "Expecting key %s", name);
-		return 0;
-	}
-
-	if (!PyLong_Check(obj) && !PyInt_Check(obj)) {
-		PyErr_Format(PyExc_TypeError, "Expecting int or long value for %s", name);
-		return 0;
-	}
-
-	if (PyLong_Check(obj))
-		return (uint32)PyLong_AsUnsignedLongMask(obj);
-
-	return (uint32)PyInt_AsLong(obj);
-}
-
-PyObject *uint32_to_python(uint32 obj)
-{
-	return PyLong_FromLong(obj);
-}
-
-int64 int64_from_python(PyObject *obj, char *name)
-{
-	if (obj == NULL) {
-		PyErr_Format(PyExc_ValueError, "Expecting key %s", name);
-		return 0;
-	}
-
-	if (!PyLong_Check(obj) && !PyInt_Check(obj)) {
-		PyErr_Format(PyExc_TypeError, "Expecting int or long value for %s", name);
-		return 0;
-	}
-
-	if (PyLong_Check(obj))
-		return (int64)PyLong_AsLongLong(obj);
-	else
-		return (int64)PyInt_AsLong(obj);
-}
-
-PyObject *int64_to_python(int64 obj)
-{
-	return PyLong_FromLongLong(obj);
-}
-
-uint64 uint64_from_python(PyObject *obj, char *name)
-{
-	if (obj == NULL) {
-		PyErr_Format(PyExc_ValueError, "Expecting key %s", name);
-		return 0;
-	}
-
-	if (!PyLong_Check(obj) && !PyInt_Check(obj)) {
-		PyErr_Format(PyExc_TypeError, "Expecting int or long value for %s", name);
-		return 0;
-	}
-
-	if (PyLong_Check(obj))
-		return (uint64)PyLong_AsUnsignedLongLong(obj);
-	else
-		return (uint64)PyInt_AsLong(obj);
-}
-
-PyObject *uint64_to_python(uint64 obj)
-{
-	return PyLong_FromUnsignedLongLong(obj);
-}
-
-NTTIME NTTIME_from_python(PyObject *obj, char *name)
-{
-	if (obj == NULL) {
-		PyErr_Format(PyExc_ValueError, "Expecting key %s", name);
-		return 0;
-	}
-
-	if (!PyLong_Check(obj) && !PyInt_Check(obj)) {
-		PyErr_Format(PyExc_TypeError, "Expecting int or long value for %s", name);
-		return 0;
-	}
-
-	if (PyLong_Check(obj))
-		return (NTTIME)PyLong_AsUnsignedLongLong(obj);
-	else
-		return (NTTIME)PyInt_AsUnsignedLongMask(obj);
-}
-
-PyObject *NTTIME_to_python(NTTIME obj)
-{
-	return PyLong_FromUnsignedLongLong(obj);
-}
-
-time_t time_t_from_python(PyObject *obj, char *name)
-{
-	if (obj == NULL) {
-		PyErr_Format(PyExc_ValueError, "Expecting key %s", name);
-		return 0;
-	}
-
-	if (!PyLong_Check(obj) && !PyInt_Check(obj)) {
-		PyErr_Format(PyExc_TypeError, "Expecting int or long value for %s", name);
-		return 0;
-	}
-
-	if (PyLong_Check(obj))
-		return (time_t)PyLong_AsUnsignedLongLong(obj);
-	else
-		return (time_t)PyInt_AsUnsignedLongMask(obj);
-}
-
-PyObject *time_t_to_python(time_t obj)
-{
-	return PyLong_FromUnsignedLongLong(obj);
-}
-
-HYPER_T HYPER_T_from_python(PyObject *obj, char *name)
-{
-	if (obj == NULL) {
-		PyErr_Format(PyExc_ValueError, "Expecting key %s", name);
-		return 0;
-	}
-
-	if (!PyLong_Check(obj) && !PyInt_Check(obj)) {
-		PyErr_Format(PyExc_TypeError, "Expecting int or long value for %s", name);
-		return 0;
-	}
-
-	if (PyLong_Check(obj))
-		return (HYPER_T)PyLong_AsUnsignedLongLong(obj);
-	else
-		return (HYPER_T)PyInt_AsUnsignedLongMask(obj);
-}
-
-PyObject *HYPER_T_to_python(HYPER_T obj)
-{
-	return PyLong_FromUnsignedLongLong(obj);
-}
-
-/* Conversion functions for types that we don't want generated automatically.
-   This is mostly security realted stuff in misc.idl */
-
-char *string_ptr_from_python(TALLOC_CTX *mem_ctx, PyObject *obj, char *name)
-{
-	if (obj == NULL) {
-		PyErr_Format(PyExc_ValueError, "Expecting key %s", name);
-		return NULL;
-	}
-
-	if (obj == Py_None)
-		return NULL;
-
-	if (!PyString_Check(obj)) {
-		PyErr_Format(PyExc_TypeError, "Expecting string value for %s", name);
-		return NULL;
-	}
-
-	return PyString_AsString(obj);
-}
-
-PyObject *string_ptr_to_python(TALLOC_CTX *mem_ctx, char *obj)
-{
-	if (obj == NULL) {
-		Py_INCREF(Py_None);
-		return Py_None;
-	}
-
-	return PyString_FromString(obj);
-}
-
-#define dom_sid2_ptr_to_python dom_sid_ptr_to_python
-#define dom_sid2_ptr_from_python dom_sid_ptr_from_python
-
-void DATA_BLOB_from_python(TALLOC_CTX *mem_ctx, DATA_BLOB *s,
-			   PyObject *obj, char name)
-{
-	if (obj == NULL) {
-		PyErr_Format(PyExc_ValueError, "Expecting key %s", name);
-		return;
-	}
-
-	if (!PyString_Check(obj)) {
-		PyErr_Format(PyExc_TypeError, "Expecting string value for key '%s'", name);
-		return;
-	}
-
-	s->length = PyString_Size(obj);
-	s->data = PyString_AsString(obj);
-}
-
-void DATA_BLOB_ptr_from_python(TALLOC_CTX *mem_ctx, DATA_BLOB **s, 
-			       PyObject *obj, char *name)
-{
-	if (obj == NULL) {
-		PyErr_Format(PyExc_ValueError, "Expecting key %s", name);
-		return;
-	}
-
-	if (obj == Py_None) {
-		*s = NULL;
-		return;
-	}
-
-	if (!PyString_Check(obj)) {
-		PyErr_Format(PyExc_TypeError, "Expecting string value for key '%s'", name);
-		return;
-	}
-
-	*s = talloc_p(mem_ctx, DATA_BLOB);
-
-	(*s)->length = PyString_Size(obj);
-	(*s)->data = PyString_AsString(obj);
-}
-
-PyObject *DATA_BLOB_to_python(DATA_BLOB obj)
-{
-	return PyString_FromStringAndSize(obj.data, obj.length);
-}
-
 %}
 
 %include "samba.i"
-- 
cgit 


From 7e877072bd7ad52dad43abd85545571d79e7c45c Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Sat, 29 Jan 2005 05:04:23 +0000
Subject: r5094: Use builtin swig types for converting between fixed width
 integer types. (This used to be commit
 f2a1b237bcc824bd3e84da69f472ffb3c9055d00)

---
 source4/scripting/swig/samba.i | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/samba.i b/source4/scripting/swig/samba.i
index a989a468b9..6cdf424095 100644
--- a/source4/scripting/swig/samba.i
+++ b/source4/scripting/swig/samba.i
@@ -24,17 +24,14 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-%typemap(in) uint32 {
-	if (!PyInt_Check($input) && !PyLong_Check($input)) {
-		PyErr_SetString(PyExc_TypeError, "integer expected");
-		return NULL;
-	}
-	$1 = (uint32_t)PyLong_AsLong($input);
-}
-
-%typemap(out) uint32 {
-	$result = PyLong_FromLong($1);
-}
+%apply unsigned char { uint8_t };
+%apply char { int8_t };
+%apply unsigned int { uint16_t };
+%apply int { int16_t };
+%apply unsigned long { uint32_t };
+%apply long { int32_t };
+%apply unsigned long long { uint64_t };
+%apply long long { int64_t };
 
 %typemap(out) NTSTATUS {
         $result = PyLong_FromLong(NT_STATUS_V($1));
-- 
cgit 


From 5540449f1cd9d9a6efab59f2bf47be4e1487ffc2 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Sat, 29 Jan 2005 05:05:17 +0000
Subject: r5095: uint32 -> uint32_t

%include misc.i to get definition of struct policy_handle

Remove #includes we aren't using just now.
(This used to be commit e561bc3efa2a5307a3940a32058ca00d5dfc2fc5)
---
 source4/scripting/swig/dcerpc.i | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/dcerpc.i b/source4/scripting/swig/dcerpc.i
index ecf50079ff..52cd833508 100644
--- a/source4/scripting/swig/dcerpc.i
+++ b/source4/scripting/swig/dcerpc.i
@@ -156,7 +156,7 @@ void set_werror_exception(int status)
 NTSTATUS dcerpc_pipe_connect(struct dcerpc_pipe **OUT,
                              const char *binding,
                              const char *pipe_uuid,
-                             uint32 pipe_version,
+                             uint32_t pipe_version,
                              const char *domain,
                              const char *username,
                              const char *password);
@@ -171,9 +171,8 @@ const char *dcerpc_server_name(struct dcerpc_pipe *p);
 
 %{
 #include "librpc/gen_ndr/ndr_misc.h"
-#include "librpc/gen_ndr/ndr_lsa.h"
 #include "librpc/gen_ndr/ndr_samr.h"
-#include "librpc/gen_ndr/ndr_spoolss.h"
 %}
 
+%include "librpc/gen_ndr/misc.i"
 %include "librpc/gen_ndr/samr.i"
-- 
cgit 


From 05db954edd562a4fa064e951051fbc31a210baba Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Fri, 4 Feb 2005 06:35:45 +0000
Subject: r5224: Add in/out typemaps for resume handles.  This saves us having
 to much around with pointers to just one uint32.

Add an output typemap to copy a policy handle as the talloc context is
destroyed before the wrapper function returns.  More work here needed
to avoid memory leaks.

Use the swig carrays.i file to create accessor and setter functions
for fixed width integer types.  Also add functions for struct samr_SamEntry
as it's returned by the LookupDomain RPC.  This really needs to be
done by pidl so I don't have to go through and find all the structures
that are returned in arrays.

Include security.i to give us SIDs and security descriptors.
(This used to be commit 5a1f6c999ef5e84e93ec8f07b9751d795c4566a5)
---
 source4/scripting/swig/dcerpc.i | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/dcerpc.i b/source4/scripting/swig/dcerpc.i
index 52cd833508..53aaf29b1f 100644
--- a/source4/scripting/swig/dcerpc.i
+++ b/source4/scripting/swig/dcerpc.i
@@ -169,10 +169,49 @@ NTSTATUS dcerpc_pipe_connect(struct dcerpc_pipe **OUT,
 
 const char *dcerpc_server_name(struct dcerpc_pipe *p);
 
+/* Some typemaps for easier access to resume handles.  Really this can
+   also be done using the uint32 carray functions, but it's a bit of a
+   hassle.  TODO: Fix memory leak here. */
+
+%typemap(in) uint32_t *resume_handle {
+	$1 = malloc(sizeof(*$1));
+	*$1 = PyLong_AsLong($input);
+}
+
+%typemap(out) uint32_t *resume_handle {
+	$result = PyLong_FromLong(*$1);
+}
+
+/* When returning a policy handle to Python we need to make a copy of
+   as the talloc context it is created under is destroyed after the
+   wrapper function returns.  TODO: Fix memory leak created here. */
+
+%typemap(out) struct policy_handle * {
+	struct policy_handle *temp = (struct policy_handle *)malloc(sizeof(struct policy_handle));
+	memcpy(temp, $1, sizeof(struct policy_handle));
+	$result = SWIG_NewPointerObj(temp, SWIGTYPE_p_policy_handle, 0);
+}
+
 %{
 #include "librpc/gen_ndr/ndr_misc.h"
+#include "librpc/gen_ndr/ndr_security.h"
 #include "librpc/gen_ndr/ndr_samr.h"
 %}
 
+%include "carrays.i"
+
+/* Some functions for accessing arrays of fixed-width integers. */
+
+%array_functions(uint8_t, uint8_array);
+%array_functions(uint16_t, uint16_array);
+%array_functions(uint32_t, uint32_array);
+
+/* Functions for handling arrays of structures.  It would be nice for 
+   pidl to automatically generating these instead of having to find
+   them all by hand. */
+
+%array_functions(struct samr_SamEntry, samr_SamEntry_array);
+
 %include "librpc/gen_ndr/misc.i"
+%include "librpc/gen_ndr/security.i"
 %include "librpc/gen_ndr/samr.i"
-- 
cgit 


From a36c43bc2161086a229b620a01eb071f05eda878 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Sun, 6 Feb 2005 00:34:44 +0000
Subject: r5242: Check that argument is an integer or a long for uint32_t input
 typemap.

The uint32_t output typemap must return a Python long as an unsigned
uint32_t cannot be fully represented by a Python int.

Likewise for the NTSTATUS typemap.
(This used to be commit 6dba5d6fb43f87bedc380c4f82b1d5f90b70325a)
---
 source4/scripting/swig/samba.i | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/samba.i b/source4/scripting/swig/samba.i
index 6cdf424095..db48b3c4ba 100644
--- a/source4/scripting/swig/samba.i
+++ b/source4/scripting/swig/samba.i
@@ -28,11 +28,24 @@
 %apply char { int8_t };
 %apply unsigned int { uint16_t };
 %apply int { int16_t };
-%apply unsigned long { uint32_t };
-%apply long { int32_t };
 %apply unsigned long long { uint64_t };
 %apply long long { int64_t };
 
+%typemap(in) uint32_t {
+	if (PyLong_Check($input))
+		$1 = PyLong_AsUnsignedLong($input);
+	else if (PyInt_Check($input))
+		$1 = PyInt_AsLong($input);
+	else {
+		PyErr_SetString(PyExc_TypeError,"Expected a long or an int");
+		return NULL;
+	}
+}
+
+%typemap(out) uint32_t {
+	$result = PyLong_FromUnsignedLong($1);
+}
+
 %typemap(out) NTSTATUS {
-        $result = PyLong_FromLong(NT_STATUS_V($1));
+        $result = PyLong_FromUnsignedLong(NT_STATUS_V($1));
 }
-- 
cgit 


From e282b83381d21577a6fe770deb36a570461d8e57 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Sun, 6 Feb 2005 00:35:58 +0000
Subject: r5243: Woohoo - memory leak city!  Comment out talloc_free() call
 until I figure out a better way to pass tallocated memory around with SWIG.
 (This used to be commit c63668cbbe393a78ccd9a86a33fb4bd7bb9af16d)

---
 source4/scripting/swig/dcerpc.i | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/dcerpc.i b/source4/scripting/swig/dcerpc.i
index 53aaf29b1f..471140c499 100644
--- a/source4/scripting/swig/dcerpc.i
+++ b/source4/scripting/swig/dcerpc.i
@@ -126,7 +126,7 @@ void set_werror_exception(int status)
 }
 
 %typemap(freearg) TALLOC_CTX * {
-	talloc_free($1);
+//	talloc_free($1);
 }
 
 %typemap(argout) struct dcerpc_pipe ** {
-- 
cgit 


From d8e1c7f0a77fb737ddc1c065681eff1f3449a218 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Sun, 6 Feb 2005 00:38:10 +0000
Subject: r5244: Convert this module to use the new structure mapping SWIG
 stuff instead of the old dictionary based routines.  The SAMR connect, close,
 enumdomains, opendomain, enum{users,aliases,groups} functions now work again!
 (This used to be commit 53b361657fe892ad7b9d781450ad841a6b1072e5)

---
 source4/scripting/swig/samr.py | 175 ++++++++++++++++++++++++-----------------
 1 file changed, 103 insertions(+), 72 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/samr.py b/source4/scripting/swig/samr.py
index 6295517132..3c36c9980b 100644
--- a/source4/scripting/swig/samr.py
+++ b/source4/scripting/swig/samr.py
@@ -3,18 +3,21 @@ import dcerpc
 def sid_to_string(sid):
     """Convert a Python dictionary SID to a string SID."""
 
-    result = 'S-%d' % sid['sid_rev_num']
+    result = 'S-%d' % sid.sid_rev_num
 
-    ia = sid['id_auth']
+    result = result + '-%u' % \
+             (dcerpc.uint8_array_getitem(sid.id_auth, 5) +
+              (dcerpc.uint8_array_getitem(sid.id_auth, 4) << 8) + 
+              (dcerpc.uint8_array_getitem(sid.id_auth, 3) << 16) +
+              (dcerpc.uint8_array_getitem(sid.id_auth, 2) << 24))
     
-    result = result + '-%u' % (ia[5] + (ia[4] << 8) + (ia[3] << 16) + \
-             (ia[2] << 24))
-    
-    for i in range(0, sid['num_auths']):
-        result = result + '-%u' % sid['sub_auths'][i]
+    for i in range(0, sid.num_auths):
+        result = result + '-%u' % \
+                 dcerpc.uint32_array_getitem(sid.sub_auths, i)
 
     return result
 
+
 def string_to_sid(string):
     """Convert a string SID to a Python dictionary SID.  Throws a
     ValueError if the SID string was badly formed."""
@@ -72,9 +75,18 @@ def string_to_sid(string):
         sub_auths.append(int(sa))
 
         string = string[match.end():]
-    
-    return {'sid_rev_num': sid_rev_num, 'id_auth': id_auth,
-            'num_auths': num_auths, 'sub_auths': sub_auths}
+
+    sid = dcerpc.dom_sid()
+    sid.sid_rev_num = sid_rev_num
+    sid.id_auth = dcerpc.new_uint8_array(6)
+    for i in range(6):
+        dcerpc.uint8_array_setitem(sid.id_auth, i, id_auth[i])
+    sid.num_auths = num_auths
+    sid.sub_auths = dcerpc.new_uint32_array(num_auths)
+    for i in range(num_auths):
+        dcerpc.uint32_array_setitem(sid.sub_auths, i, sub_auths[i])
+
+    return sid
 
 
 class SamrHandle:
@@ -86,128 +98,147 @@ class SamrHandle:
 
     def __del__(self):
 
-        r = {}
-        r['handle'] = self.handle
+        r = dcerpc.samr_Close()
+        r.data_in.handle = self.handle
 
-        dcerpc.samr_Close(self.pipe, r)
+        dcerpc.dcerpc_samr_Close(self.pipe, r)
 
 
 class ConnectHandle(SamrHandle):
 
     def EnumDomains(self):
 
-        r = {}
-        r['connect_handle'] = self.handle
-        r['resume_handle'] = 0
-        r['buf_size'] = -1
+        r = dcerpc.samr_EnumDomains()
+        r.data_in.connect_handle = self.handle
+        r.data_in.resume_handle = 1
+        r.data_in.buf_size = -1
 
         domains = []
 
         while 1:
 
-            result = dcerpc.samr_EnumDomains(self.pipe, r)
+            result = dcerpc.dcerpc_samr_EnumDomains(self.pipe, r)
 
-            domains = domains + result['sam']['entries']
+            for i in range(r.data_out.sam.count):
+                domains.append(dcerpc.samr_SamEntry_array_getitem(
+                    r.data_out.sam.entries, i).name.string)
 
-            if result['result'] == dcerpc.STATUS_MORE_ENTRIES:
-                r['resume_handle'] = result['resume_handle']
-                continue
+            # TODO: Handle more entries here
 
             break
 
-        return map(lambda x: x['name']['name'], domains)
+        return domains
 
     def LookupDomain(self, domain_name):
 
-        r = {}
-        r['connect_handle'] = self.handle
-        r['domain'] = {}
-        r['domain']['name_len'] = 0
-        r['domain']['name_size'] = 0
-        r['domain']['name'] = domain_name
+        r = dcerpc.samr_LookupDomain()
+        r.data_in.connect_handle = self.handle
+        r.data_in.domain = dcerpc.samr_String()
+        r.data_in.domain.string = domain_name
 
-        result = dcerpc.samr_LookupDomain(self.pipe, r)
+        result = dcerpc.dcerpc_samr_LookupDomain(self.pipe, r)
 
-        return sid_to_string(result['sid'])
+        return sid_to_string(r.data_out.sid);
 
     def OpenDomain(self, domain_sid, access_mask = 0x02000000):
 
-        r = {}
-        r['connect_handle'] = self.handle
-        r['access_mask'] = access_mask
-        r['sid'] = string_to_sid(domain_sid)
+        r = dcerpc.samr_OpenDomain()
+        r.data_in.connect_handle = self.handle
+        r.data_in.access_mask = access_mask
+        r.data_in.sid = string_to_sid(domain_sid)
 
-        result = dcerpc.samr_OpenDomain(self.pipe, r)
+        result = dcerpc.dcerpc_samr_OpenDomain(self.pipe, r)
 
-        return DomainHandle(self.pipe, result['domain_handle'])
+        return DomainHandle(self.pipe, r.data_out.domain_handle)
 
 
 class DomainHandle(SamrHandle):
 
     def QueryDomainInfo(self, level = 2):
 
-        r = {}
-        r['domain_handle'] = self.handle
-        r['level'] = level
+        r = dcerpc.samr_QueryDomainInfo()
+        r.data_in.domain_handle = self.handle
+        r.data_in.level = level
 
-        result = dcerpc.samr_QueryDomainInfo(self.pipe, r)
+        result = dcerpc.dcerpc_samr_QueryDomainInfo(self.pipe, r)
 
-        return result
+        return getattr(r.data_out.info, 'info%d' % level)
 
     def QueryDomainInfo2(self, level = 2):
 
-        r = {}
-        r['domain_handle'] = self.handle
-        r['level'] = level
+        r = dcerpc.samr_QueryDomainInfo2()
+        r.data_in.domain_handle = self.handle
+        r.data_in.level = level
 
-        result = dcerpc.samr_QueryDomainInfo2(self.pipe, r)
+        result = dcerpc.dcerpc_samr_QueryDomainInfo2(self.pipe, r)
 
-        return result
+        return getattr(r.data_out.info, 'info%d' % level)       
 
     def EnumDomainGroups(self):
 
-        r = {}
-        r['domain_handle'] = self.handle
-        r['resume_handle'] = 0
-        r['max_size'] = 1000
+        r = dcerpc.samr_EnumDomainGroups()
+        r.data_in.domain_handle = self.handle
+        r.data_in.resume_handle = 0
+        r.data_in.max_size = 1000
+
+        result = dcerpc.dcerpc_samr_EnumDomainGroups(self.pipe, r)
 
-        result = dcerpc.samr_EnumDomainGroups(self.pipe, r)
+        groups = []
 
-        return result
+        if r.data_out.sam.entries:
+            for i in range(r.data_out.sam.count):
+                groups.append(dcerpc.samr_SamEntry_array_getitem(
+                    r.data_out.sam.entries, i).name.string)
+
+        return groups
 
     def EnumDomainAliases(self):
 
-        r = {}
-        r['domain_handle'] = self.handle
-        r['resume_handle'] = 0
+        r = dcerpc.samr_EnumDomainAliases()
+        r.data_in.domain_handle = self.handle
+        r.data_in.resume_handle = 0
         # acct_flags in SamrEnumerateAliasesInDomain has probably
         # no meaning so use 0xffffffff like W2K
-        r['acct_flags'] = 0xffffffff
+        r.data_in.acct_flags = 0xffffffffL
+
+        result = dcerpc.dcerpc_samr_EnumDomainAliases(self.pipe, r)
+
+        aliases = []
 
-        result = dcerpc.samr_EnumDomainAliases(self.pipe, r)
+        if r.data_out.sam.entries:
+            for i in range(r.data_out.sam.count):
+                aliases.append(dcerpc.samr_SamEntry_array_getitem(
+                    r.data_out.sam.entries, i).name.string)
 
-        return result
+        return aliases
 
     def EnumDomainUsers(self, user_account_flags = 16):
 
-        r = {}
-        r['domain_handle'] = self.handle
-        r['resume_handle'] = 0
-        r['acct_flags'] = user_account_flags
-        r['max_size'] = 1000
+        r = dcerpc.samr_EnumDomainUsers()
+        r.data_in.domain_handle = self.handle
+        r.data_in.resume_handle = 0
+        r.data_in.acct_flags = user_account_flags
+        r.data_in.max_size = 1000
+
+        result = dcerpc.dcerpc_samr_EnumDomainUsers(self.pipe, r)
+
+        users = []
 
-        result = dcerpc.samr_EnumDomainUsers(self.pipe, r)
+        if r.data_out.sam.entries:
+            for i in range(r.data_out.sam.count):
+                users.append(dcerpc.samr_SamEntry_array_getitem(
+                    r.data_out.sam.entries, i).name.string)
 
-        return result
+        return users
 
 
-def Connect(pipe, system_name = None, access_mask = 0x02000000):
+def Connect(pipe, system_name = '', access_mask = 0x02000000):
     """Connect to the SAMR pipe."""
 
-    r = {}
-    r['system_name'] = system_name
-    r['access_mask'] = access_mask
+    r = dcerpc.samr_Connect2()
+    r.data_in.system_name = system_name
+    r.data_in.access_mask = access_mask
 
-    result = dcerpc.samr_Connect2(pipe, r)
+    result = dcerpc.dcerpc_samr_Connect2(pipe, r)
 
-    return ConnectHandle(pipe, result['connect_handle'])
+    return ConnectHandle(pipe, r.data_out.connect_handle)
-- 
cgit 


From 7411bf6775e317a0395178ea829f0db70c942ebb Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Sun, 6 Feb 2005 04:34:29 +0000
Subject: r5247: Fix rpcclient to work with new swig interface. (This used to
 be commit ad12a90d0e0fe7106b1845097d8fc71be3b8e378)

---
 source4/scripting/swig/rpcclient | 52 ++++++++++++++++++++++++++--------------
 1 file changed, 34 insertions(+), 18 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/rpcclient b/source4/scripting/swig/rpcclient
index aad4597053..8f33a6133b 100755
--- a/source4/scripting/swig/rpcclient
+++ b/source4/scripting/swig/rpcclient
@@ -7,6 +7,23 @@ from pprint import pprint
 
 import dcerpc, samr
 
+def swig2dict(obj):
+    """Convert a swig object to a dictionary."""
+
+    result = {}
+
+    for attr in filter(lambda x: type(x) == str, dir(obj)):
+
+        if attr[:2] == '__' and attr[-2:] == '__':
+            continue
+
+        if attr == 'this' or attr == 'thisown':
+            continue
+        
+        result[attr] = getattr(obj, attr)
+
+    return result
+
 class rpcclient(Cmd):
 
     prompt = 'rpcclient$ '
@@ -67,7 +84,7 @@ class rpcclient(Cmd):
 
         pipe = dcerpc.pipe_connect(
             self.binding,
-            dcerpc.DCERPC_SAMR_UUID, dcerpc.DCERPC_SAMR_VERSION,
+            dcerpc.DCERPC_SAMR_UUID, int(dcerpc.DCERPC_SAMR_VERSION),
             self.domain, self.username, self.password)
 
         connect_handle = samr.Connect(pipe)
@@ -89,7 +106,7 @@ class rpcclient(Cmd):
 
         pipe = dcerpc.pipe_connect(
             self.binding,
-            dcerpc.DCERPC_SAMR_UUID, dcerpc.DCERPC_SAMR_VERSION,
+            dcerpc.DCERPC_SAMR_UUID, int(dcerpc.DCERPC_SAMR_VERSION),
             self.domain, self.username, self.password)
 
         connect_handle = samr.Connect(pipe)
@@ -110,7 +127,7 @@ class rpcclient(Cmd):
 
         pipe = dcerpc.pipe_connect(
             self.binding,
-            dcerpc.DCERPC_SAMR_UUID, dcerpc.DCERPC_SAMR_VERSION,
+            dcerpc.DCERPC_SAMR_UUID, int(dcerpc.DCERPC_SAMR_VERSION),
             self.domain, self.username, self.password)
 
         connect_handle = samr.Connect(pipe)
@@ -121,22 +138,23 @@ class rpcclient(Cmd):
 	else:
 	    result = domain_handle.QueryDomainInfo()
 
-        pprint(result['info'])
+        pprint(swig2dict(result))
 
     def do_SamrQueryDomInfo2(self, line):
-	"""Return information about a domain designated by its SID. (Windows 2000 and >)"""
+	"""Return information about a domain designated by its SID.
+        (Windows 2000 and >)"""
 
 	usage = 'SamrQueryDomInfo2 DOMAIN_SID [info_level] (Windows 2000 and >)'
 	parser = OptionParser(usage)
 	options, args = parser.parse_args(string.split(line))
 
-	if (len(args) == 0) or (len(args) > 2):
+	if len(args) == 0 or len(args) > 2:
 	    print 'usage:', usage
 	    return
 
         pipe = dcerpc.pipe_connect(
             self.binding,
-            dcerpc.DCERPC_SAMR_UUID, dcerpc.DCERPC_SAMR_VERSION,
+            dcerpc.DCERPC_SAMR_UUID, int(dcerpc.DCERPC_SAMR_VERSION),
             self.domain, self.username, self.password)
 
         connect_handle = samr.Connect(pipe)
@@ -147,7 +165,7 @@ class rpcclient(Cmd):
 	else:
 	    result = domain_handle.QueryDomainInfo2()
 
-        pprint(result['info'])
+        pprint(swig2dict(result))
 
     def do_SamrEnumDomainGroups(self, line):
 	"""Return the list of groups of a domain designated by its SID."""
@@ -163,7 +181,7 @@ class rpcclient(Cmd):
 
         pipe = dcerpc.pipe_connect(
             self.binding,
-            dcerpc.DCERPC_SAMR_UUID, dcerpc.DCERPC_SAMR_VERSION,
+            dcerpc.DCERPC_SAMR_UUID, int(dcerpc.DCERPC_SAMR_VERSION),
             self.domain, self.username, self.password)
 
         connect_handle = samr.Connect(pipe)	
@@ -171,11 +189,11 @@ class rpcclient(Cmd):
 
 	result = domain_handle.EnumDomainGroups()
 
-        for r in result['sam']['entries']:
-            print r['name']['name']
+        pprint(result)
 
     def do_SamrEnumDomainAliases(self, line):
-        """Return the list of aliases (local groups) of a domain designated by its SID."""
+        """Return the list of aliases (local groups) of a domain designated
+        by its SID."""
 
 	usage = 'SamrEnumDomainAliases DOMAIN_SID'
 
@@ -188,7 +206,7 @@ class rpcclient(Cmd):
 
         pipe = dcerpc.pipe_connect(
             self.binding,
-            dcerpc.DCERPC_SAMR_UUID, dcerpc.DCERPC_SAMR_VERSION,
+            dcerpc.DCERPC_SAMR_UUID, int(dcerpc.DCERPC_SAMR_VERSION),
             self.domain, self.username, self.password)
 
         connect_handle = samr.Connect(pipe)
@@ -196,8 +214,7 @@ class rpcclient(Cmd):
 
 	result = domain_handle.EnumDomainAliases()
 
-        for r in result['sam']['entries']:
-            print r['name']['name']
+        pprint(result)
 
     def do_SamrEnumDomainUsers(self, line):
 	"""Return the list of users of a domain designated by its SID."""
@@ -213,7 +230,7 @@ class rpcclient(Cmd):
 
         pipe = dcerpc.pipe_connect(
             self.binding,
-            dcerpc.DCERPC_SAMR_UUID, dcerpc.DCERPC_SAMR_VERSION,
+            dcerpc.DCERPC_SAMR_UUID, int(dcerpc.DCERPC_SAMR_VERSION),
             self.domain, self.username, self.password)
 
         connect_handle = samr.Connect(pipe)
@@ -224,8 +241,7 @@ class rpcclient(Cmd):
 	else:
 	    result = domain_handle.EnumDomainUsers()
 
-        for r in result['sam']['entries']:
-            print r['name']['name']
+        pprint(result)
 
 if __name__ == '__main__':
 
-- 
cgit 


From 57f69e6f37949636ae14c646517792fa40c9c75b Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Thu, 10 Feb 2005 03:19:21 +0000
Subject: r5293: Map an empty policy handle to None when creating policy
 handles, and refuse to accept None as a policy handle when accepting them. 
 Now we don't segfault after running the samr_Shutdown() test. (This used to
 be commit 2f0419c4d8100864ddddf5629d1808b655da9d76)

---
 source4/scripting/swig/dcerpc.i | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/dcerpc.i b/source4/scripting/swig/dcerpc.i
index 471140c499..3d9d076e58 100644
--- a/source4/scripting/swig/dcerpc.i
+++ b/source4/scripting/swig/dcerpc.i
@@ -182,14 +182,31 @@ const char *dcerpc_server_name(struct dcerpc_pipe *p);
 	$result = PyLong_FromLong(*$1);
 }
 
+%typemap(in) struct policy_handle * {
+
+	if ((SWIG_ConvertPtr($input, (void **) &$1, $1_descriptor,
+			     SWIG_POINTER_EXCEPTION)) == -1) 
+	        return NULL;
+
+	if ($1 == NULL) {
+		PyErr_SetString(PyExc_TypeError, "None is not a valid policy handle");
+		return NULL;
+	}
+}
+
 /* When returning a policy handle to Python we need to make a copy of
    as the talloc context it is created under is destroyed after the
    wrapper function returns.  TODO: Fix memory leak created here. */
 
 %typemap(out) struct policy_handle * {
-	struct policy_handle *temp = (struct policy_handle *)malloc(sizeof(struct policy_handle));
-	memcpy(temp, $1, sizeof(struct policy_handle));
-	$result = SWIG_NewPointerObj(temp, SWIGTYPE_p_policy_handle, 0);
+	if ($1) {
+		struct policy_handle *temp = (struct policy_handle *)malloc(sizeof(struct policy_handle));
+		memcpy(temp, $1, sizeof(struct policy_handle));
+		$result = SWIG_NewPointerObj(temp, SWIGTYPE_p_policy_handle, 0);
+	} else {
+		Py_INCREF(Py_None);
+		$result = Py_None;
+	}
 }
 
 %{
-- 
cgit 


From 4180eedd6d8a926d7a2f25b14b7a2cad084b44a9 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Fri, 11 Feb 2005 11:18:19 +0000
Subject: r5335: Add a Close() method to SamrHandle object.

Add methods for {Query,Set}Security, Shutdown, CreateUser,
Open{User,Group,Alias} and RidToSid.

Time for a torture test I think!
(This used to be commit 94a3ff2380071efccf19ca51488753d3513ab63c)
---
 source4/scripting/swig/samr.py | 149 ++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 148 insertions(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/samr.py b/source4/scripting/swig/samr.py
index 3c36c9980b..ae3f9c77f1 100644
--- a/source4/scripting/swig/samr.py
+++ b/source4/scripting/swig/samr.py
@@ -98,11 +98,34 @@ class SamrHandle:
 
     def __del__(self):
 
+        if self.handle is not None:
+            self.Close()
+
+    def Close(self):
+                    
         r = dcerpc.samr_Close()
         r.data_in.handle = self.handle
 
         dcerpc.dcerpc_samr_Close(self.pipe, r)
 
+        self.handle = None
+
+    def QuerySecurity(self, sec_info = 7):
+
+        r = dcerpc.samr_QuerySecurity()
+        r.data_in.handle = self.handle
+        r.data_in.sec_info = sec_info
+
+        result = dcerpc.dcerpc_samr_QuerySecurity(self.pipe, r)
+
+        return r.data_out.sdbuf.sd
+
+    def SetSecurity(self, sec_info = 7):
+
+        r = dcerpc.samr_SetSecurity()
+        r.data_in.handle = self.handle
+        r.data_in.sec_info = sec_info
+
 
 class ConnectHandle(SamrHandle):
 
@@ -151,6 +174,13 @@ class ConnectHandle(SamrHandle):
 
         return DomainHandle(self.pipe, r.data_out.domain_handle)
 
+    def Shutdown(self):
+
+        r = dcerpc.samr_Shutdown()
+        r.data_in.connect_handle = self.handle
+
+        result = dcerpc.dcerpc_samr_Shutdown(self.pipe, r)
+
 
 class DomainHandle(SamrHandle):
 
@@ -231,8 +261,75 @@ class DomainHandle(SamrHandle):
 
         return users
 
+    def CreateUser(self, account_name, access_mask = 0x02000000):
+
+        r = dcerpc.samr_CreateUser()
+        r.data_in.domain_handle = self.handle
+        r.data_in.account_name = dcerpc.samr_String()
+        r.data_in.account_name.string = account_name
+        r.data_in.access_mask = access_mask
+
+        result = dcerpc.dcerpc_samr_CreateUser(self.pipe, r)
+
+        return (r.data_out.user_handle,
+                dcerpc.uint32_array_getitem(r.data_out.rid, 0))
+        
+    def OpenUser(self, rid, access_mask = 0x02000000):
+
+        r = dcerpc.samr_OpenUser()
+        r.data_in.domain_handle = self.handle
+        r.data_in.access_mask = access_mask
+        r.data_in.rid = rid
+
+        result = dcerpc.dcerpc_samr_OpenUser(self.pipe, r)
+
+        return UserHandle(pipe, r.data_out.user_handle)
+
+    def OpenGroup(self, rid, access_mask = 0x02000000):
 
-def Connect(pipe, system_name = '', access_mask = 0x02000000):
+        r = dcerpc.samr_OpenGroup()
+        r.data_in.domain_handle = self.handle
+        r.data_in.access_mask = access_mask
+        r.data_in.rid = rid
+
+        result = dcerpc.dcerpc_samr_OpenGroup(self.pipe, r)
+
+        return GroupHandle(pipe, r.data_out.group_handle)
+
+    def OpenAlias(self, rid, access_mask = 0x02000000):
+
+        r = dcerpc.samr_OpenAlias()
+        r.data_in.domain_handle = self.handle
+        r.data_in.access_mask = access_mask
+        r.data_in.rid = rid
+
+        result = dcerpc.dcerpc_samr_OpenAlias(self.pipe, r)
+
+        return AliasHandle(pipe, r.data_out.group_handle)
+
+    def RidToSid(self, rid):
+
+        r = dcerpc.samr_RidToSid()
+        r.data_in.domain_handle = self.handle
+
+        result = dcerpc.dcerpc_samr_RidToSid(self.pipe, r)
+
+        return sid_to_string(r.data_out.sid)
+
+
+class UserHandle(SamrHandle):
+    pass
+    
+
+class GroupHandle(SamrHandle):
+    pass
+    
+
+class AliasHandle(SamrHandle):
+    pass
+    
+
+def Connect2(pipe, system_name = '', access_mask = 0x02000000):
     """Connect to the SAMR pipe."""
 
     r = dcerpc.samr_Connect2()
@@ -242,3 +339,53 @@ def Connect(pipe, system_name = '', access_mask = 0x02000000):
     result = dcerpc.dcerpc_samr_Connect2(pipe, r)
 
     return ConnectHandle(pipe, r.data_out.connect_handle)
+
+# CreateDomainGroup
+# CreateDomAlias
+# GetAliasMembership
+# LookupNames
+# QueryGroupInfo
+# SetGroupInfo
+# AddGroupMember
+# DeleteDomainGroup
+# DeleteGroupMember
+# QueryGroupMember
+# SetMemberAttributesofGroup
+# QueryAliasInfo
+# SetAliasInfo
+# DeleteDomAlias
+# AddAliasMember
+# DeleteAliasMember
+# GetMembersinAlias
+# DeleteUser
+# QueryUserInfo
+# SetUserInfo
+# ChangePasswordUser
+# GetGroupsForUser
+# QueryDisplayInfo
+# GetDisplayEnumerationIndex
+# TestPrivateFunctionsDomain
+# TestPrivateFunctionsUser
+# GetUserPwInfo
+# RemoveMemberFromForeignDomain
+# QueryDomainInfo2
+# QueryUserInfo2
+# QueryDisplayInfo2
+# GetDisplayEnumerationIndex2
+# CreateUser2
+# QueryDisplayInfo3
+# AddMultipleMembersToAlias
+# RemoveMultipleMembersFromAlias
+# OemChangePasswordUser2
+# ChangePasswordUser2
+# GetDomPwInfo
+# Connect
+# SetUserInfo2
+# SetBootKeyInformation
+# GetBootKeyInformation
+# Connect3
+# Connect4
+# ChangePasswordUser3
+# Connect5
+# SetDsrmPassword
+# ValidatePassword
-- 
cgit 


From 8cd9d7095bb431d78ed146f1e03a6a036cf66249 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Sat, 12 Feb 2005 00:40:00 +0000
Subject: r5348: Implement the remaining samr connect functions and fix up
 setsecurity. (This used to be commit
 4b2c3c7ac56e1e428dec6205e4e69268be84cac6)

---
 source4/scripting/swig/samr.py | 59 +++++++++++++++++++++++++++++++++++++-----
 1 file changed, 53 insertions(+), 6 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/samr.py b/source4/scripting/swig/samr.py
index ae3f9c77f1..7f82babee3 100644
--- a/source4/scripting/swig/samr.py
+++ b/source4/scripting/swig/samr.py
@@ -118,15 +118,18 @@ class SamrHandle:
 
         result = dcerpc.dcerpc_samr_QuerySecurity(self.pipe, r)
 
-        return r.data_out.sdbuf.sd
+        return r.data_out.sdbuf
 
-    def SetSecurity(self, sec_info = 7):
+    def SetSecurity(self, sdbuf, sec_info = 7):
 
         r = dcerpc.samr_SetSecurity()
         r.data_in.handle = self.handle
         r.data_in.sec_info = sec_info
+        r.data_in.sdbuf = sdbuf
 
+        result = dcerpc.dcerpc_samr_SetSecurity(self.pipe, r)
 
+        
 class ConnectHandle(SamrHandle):
 
     def EnumDomains(self):
@@ -329,6 +332,17 @@ class AliasHandle(SamrHandle):
     pass
     
 
+def Connect(pipe, access_mask = 0x02000000):
+
+    r = dcerpc.samr_Connect()
+    r.data_in.system_name = dcerpc.new_uint16_array(1)
+    dcerpc.uint16_array_setitem(r.data_in.system_name, 0, ord('\\'))
+    r.data_in.access_mask = access_mask
+
+    result = dcerpc.dcerpc_samr_Connect(pipe, r)
+
+    return ConnectHandle(pipe, r.data_out.connect_handle)
+
 def Connect2(pipe, system_name = '', access_mask = 0x02000000):
     """Connect to the SAMR pipe."""
 
@@ -340,6 +354,43 @@ def Connect2(pipe, system_name = '', access_mask = 0x02000000):
 
     return ConnectHandle(pipe, r.data_out.connect_handle)
 
+def Connect3(pipe, system_name = '', access_mask = 0x02000000):
+
+    r = dcerpc.samr_Connect3()
+    r.data_in.system_name = system_name
+    r.data_in.unknown = 0
+    r.data_in.access_mask = access_mask
+
+    result = dcerpc.dcerpc_samr_Connect3(pipe, r)
+
+    return ConnectHandle(pipe, r.data_out.connect_handle)
+
+def Connect4(pipe, system_name = '', access_mask = 0x02000000):
+
+    r = dcerpc.samr_Connect4()
+    r.data_in.system_name = system_name
+    r.data_in.unknown = 0
+    r.data_in.access_mask = access_mask
+
+    result = dcerpc.dcerpc_samr_Connect4(pipe, r)
+
+    return ConnectHandle(pipe, r.data_out.connect_handle)
+
+def Connect5(pipe, system_name = '', access_mask = 0x02000000):
+
+    r = dcerpc.samr_Connect5()
+    r.data_in.system_name = system_name
+    r.data_in.access_mask = access_mask
+    r.data_in.level = 1
+    r.data_in.info = dcerpc.new_samr_ConnectInfo_array(1)
+    r.data_in.info.unknown1 = 0
+    r.data_in.info.unknown2 = 0
+
+    result = dcerpc.dcerpc_samr_Connect5(pipe, r)
+
+    return ConnectHandle(pipe, r.data_out.connect_handle)
+    
+    
 # CreateDomainGroup
 # CreateDomAlias
 # GetAliasMembership
@@ -379,13 +430,9 @@ def Connect2(pipe, system_name = '', access_mask = 0x02000000):
 # OemChangePasswordUser2
 # ChangePasswordUser2
 # GetDomPwInfo
-# Connect
 # SetUserInfo2
 # SetBootKeyInformation
 # GetBootKeyInformation
-# Connect3
-# Connect4
 # ChangePasswordUser3
-# Connect5
 # SetDsrmPassword
 # ValidatePassword
-- 
cgit 


From 55006da0436b108f9f56b8736e58eee2777bd361 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Sat, 12 Feb 2005 00:53:32 +0000
Subject: r5350: Implement an input typemap for NTSTATUS. (This used to be
 commit 076ec6008e4dbd130044893f34c3fd7212bf667d)

---
 source4/scripting/swig/samba.i | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/samba.i b/source4/scripting/swig/samba.i
index db48b3c4ba..c7b8b46e66 100644
--- a/source4/scripting/swig/samba.i
+++ b/source4/scripting/swig/samba.i
@@ -46,6 +46,17 @@
 	$result = PyLong_FromUnsignedLong($1);
 }
 
+%typemap(in) NTSTATUS {
+	if (PyLong_Check($input))
+		$1 = NT_STATUS(PyLong_AsUnsignedLong($input));
+	else if (PyInt_Check($input))
+		$1 = NT_STATUS(PyInt_AsLong($input));
+	else {
+		PyErr_SetString(PyExc_TypeError, "Expected a long or an int");
+		return NULL;
+	}
+}
+
 %typemap(out) NTSTATUS {
         $result = PyLong_FromUnsignedLong(NT_STATUS_V($1));
 }
-- 
cgit 


From 49568fab37d3a8fc3727ec5972cecdaf35e904b5 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Sat, 12 Feb 2005 00:54:11 +0000
Subject: r5351: Add wrapper for nt_errstr and array functions for
 samr_ConnectInfo. (This used to be commit
 be37749ac7d128fcabf82bad104d87098e2d9f55)

---
 source4/scripting/swig/dcerpc.i | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/dcerpc.i b/source4/scripting/swig/dcerpc.i
index 3d9d076e58..a1261f997d 100644
--- a/source4/scripting/swig/dcerpc.i
+++ b/source4/scripting/swig/dcerpc.i
@@ -169,6 +169,8 @@ NTSTATUS dcerpc_pipe_connect(struct dcerpc_pipe **OUT,
 
 const char *dcerpc_server_name(struct dcerpc_pipe *p);
 
+char *nt_errstr(NTSTATUS nt_code);
+
 /* Some typemaps for easier access to resume handles.  Really this can
    also be done using the uint32 carray functions, but it's a bit of a
    hassle.  TODO: Fix memory leak here. */
@@ -228,6 +230,7 @@ const char *dcerpc_server_name(struct dcerpc_pipe *p);
    them all by hand. */
 
 %array_functions(struct samr_SamEntry, samr_SamEntry_array);
+%array_functions(union samr_ConnectInfo, samr_ConnectInfo_array);
 
 %include "librpc/gen_ndr/misc.i"
 %include "librpc/gen_ndr/security.i"
-- 
cgit 


From 12ccb3c453626181dcdae6ae52abf9aeb2eb8855 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Sat, 12 Feb 2005 01:05:16 +0000
Subject: r5353: Throw a NTSTATUS exception if a NT error code is returned.
 (This used to be commit 4a9677833167b3b26117ab1b4e7c682d9524a206)

---
 source4/scripting/swig/samr.py | 54 +++++++++++++++++++++++++-----------------
 1 file changed, 32 insertions(+), 22 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/samr.py b/source4/scripting/swig/samr.py
index 7f82babee3..951ca30aa3 100644
--- a/source4/scripting/swig/samr.py
+++ b/source4/scripting/swig/samr.py
@@ -89,6 +89,16 @@ def string_to_sid(string):
     return sid
 
 
+def call_fn(fn, pipe, args):
+    """Wrap up a RPC call and throw an exception is an error was returned."""
+    
+    result = fn(pipe, args);
+    if result & 0xc0000000:
+        raise dcerpc.NTSTATUS(result, dcerpc.nt_errstr(result));
+
+    return result;
+
+    
 class SamrHandle:
 
     def __init__(self, pipe, handle):
@@ -106,7 +116,7 @@ class SamrHandle:
         r = dcerpc.samr_Close()
         r.data_in.handle = self.handle
 
-        dcerpc.dcerpc_samr_Close(self.pipe, r)
+        call_fn(dcerpc.dcerpc_samr_Close, self.pipe, r)
 
         self.handle = None
 
@@ -116,7 +126,7 @@ class SamrHandle:
         r.data_in.handle = self.handle
         r.data_in.sec_info = sec_info
 
-        result = dcerpc.dcerpc_samr_QuerySecurity(self.pipe, r)
+        call_fn(dcerpc.dcerpc_samr_QuerySecurity, self.pipe, r)
 
         return r.data_out.sdbuf
 
@@ -127,7 +137,7 @@ class SamrHandle:
         r.data_in.sec_info = sec_info
         r.data_in.sdbuf = sdbuf
 
-        result = dcerpc.dcerpc_samr_SetSecurity(self.pipe, r)
+        call_fn(dcerpc.dcerpc_samr_SetSecurity, self.pipe, r)
 
         
 class ConnectHandle(SamrHandle):
@@ -143,7 +153,7 @@ class ConnectHandle(SamrHandle):
 
         while 1:
 
-            result = dcerpc.dcerpc_samr_EnumDomains(self.pipe, r)
+            call_fn(dcerpc.dcerpc_samr_EnumDomains, self.pipe, r)
 
             for i in range(r.data_out.sam.count):
                 domains.append(dcerpc.samr_SamEntry_array_getitem(
@@ -162,7 +172,7 @@ class ConnectHandle(SamrHandle):
         r.data_in.domain = dcerpc.samr_String()
         r.data_in.domain.string = domain_name
 
-        result = dcerpc.dcerpc_samr_LookupDomain(self.pipe, r)
+        call_fn(dcerpc.dcerpc_samr_LookupDomain, self.pipe, r)
 
         return sid_to_string(r.data_out.sid);
 
@@ -173,7 +183,7 @@ class ConnectHandle(SamrHandle):
         r.data_in.access_mask = access_mask
         r.data_in.sid = string_to_sid(domain_sid)
 
-        result = dcerpc.dcerpc_samr_OpenDomain(self.pipe, r)
+        call_fn(dcerpc.dcerpc_samr_OpenDomain, self.pipe, r)
 
         return DomainHandle(self.pipe, r.data_out.domain_handle)
 
@@ -182,7 +192,7 @@ class ConnectHandle(SamrHandle):
         r = dcerpc.samr_Shutdown()
         r.data_in.connect_handle = self.handle
 
-        result = dcerpc.dcerpc_samr_Shutdown(self.pipe, r)
+        call_fn(dcerpc.dcerpc_samr_Shutdown, self.pipe, r)
 
 
 class DomainHandle(SamrHandle):
@@ -193,7 +203,7 @@ class DomainHandle(SamrHandle):
         r.data_in.domain_handle = self.handle
         r.data_in.level = level
 
-        result = dcerpc.dcerpc_samr_QueryDomainInfo(self.pipe, r)
+        call_fn(dcerpc.dcerpc_samr_QueryDomainInfo, self.pipe, r)
 
         return getattr(r.data_out.info, 'info%d' % level)
 
@@ -203,7 +213,7 @@ class DomainHandle(SamrHandle):
         r.data_in.domain_handle = self.handle
         r.data_in.level = level
 
-        result = dcerpc.dcerpc_samr_QueryDomainInfo2(self.pipe, r)
+        call_fn(dcerpc.dcerpc_samr_QueryDomainInfo2, self.pipe, r)
 
         return getattr(r.data_out.info, 'info%d' % level)       
 
@@ -214,7 +224,7 @@ class DomainHandle(SamrHandle):
         r.data_in.resume_handle = 0
         r.data_in.max_size = 1000
 
-        result = dcerpc.dcerpc_samr_EnumDomainGroups(self.pipe, r)
+        call_fn(dcerpc.dcerpc_samr_EnumDomainGroups, self.pipe, r)
 
         groups = []
 
@@ -234,7 +244,7 @@ class DomainHandle(SamrHandle):
         # no meaning so use 0xffffffff like W2K
         r.data_in.acct_flags = 0xffffffffL
 
-        result = dcerpc.dcerpc_samr_EnumDomainAliases(self.pipe, r)
+        call_fn(dcerpc.dcerpc_samr_EnumDomainAliases, self.pipe, r)
 
         aliases = []
 
@@ -253,7 +263,7 @@ class DomainHandle(SamrHandle):
         r.data_in.acct_flags = user_account_flags
         r.data_in.max_size = 1000
 
-        result = dcerpc.dcerpc_samr_EnumDomainUsers(self.pipe, r)
+        call_fn(dcerpc.dcerpc_samr_EnumDomainUsers, self.pipe, r)
 
         users = []
 
@@ -272,7 +282,7 @@ class DomainHandle(SamrHandle):
         r.data_in.account_name.string = account_name
         r.data_in.access_mask = access_mask
 
-        result = dcerpc.dcerpc_samr_CreateUser(self.pipe, r)
+        call_fn(dcerpc.dcerpc_samr_CreateUser, self.pipe, r)
 
         return (r.data_out.user_handle,
                 dcerpc.uint32_array_getitem(r.data_out.rid, 0))
@@ -284,7 +294,7 @@ class DomainHandle(SamrHandle):
         r.data_in.access_mask = access_mask
         r.data_in.rid = rid
 
-        result = dcerpc.dcerpc_samr_OpenUser(self.pipe, r)
+        call_fn(dcerpc.dcerpc_samr_OpenUser, self.pipe, r)
 
         return UserHandle(pipe, r.data_out.user_handle)
 
@@ -295,7 +305,7 @@ class DomainHandle(SamrHandle):
         r.data_in.access_mask = access_mask
         r.data_in.rid = rid
 
-        result = dcerpc.dcerpc_samr_OpenGroup(self.pipe, r)
+        call_fn(dcerpc.dcerpc_samr_OpenGroup, self.pipe, r)
 
         return GroupHandle(pipe, r.data_out.group_handle)
 
@@ -306,7 +316,7 @@ class DomainHandle(SamrHandle):
         r.data_in.access_mask = access_mask
         r.data_in.rid = rid
 
-        result = dcerpc.dcerpc_samr_OpenAlias(self.pipe, r)
+        call_fn(dcerpc.dcerpc_samr_OpenAlias, self.pipe, r)
 
         return AliasHandle(pipe, r.data_out.group_handle)
 
@@ -315,7 +325,7 @@ class DomainHandle(SamrHandle):
         r = dcerpc.samr_RidToSid()
         r.data_in.domain_handle = self.handle
 
-        result = dcerpc.dcerpc_samr_RidToSid(self.pipe, r)
+        call_fn(dcerpc.dcerpc_samr_RidToSid, self.pipe, r)
 
         return sid_to_string(r.data_out.sid)
 
@@ -339,7 +349,7 @@ def Connect(pipe, access_mask = 0x02000000):
     dcerpc.uint16_array_setitem(r.data_in.system_name, 0, ord('\\'))
     r.data_in.access_mask = access_mask
 
-    result = dcerpc.dcerpc_samr_Connect(pipe, r)
+    call_fn(dcerpc.dcerpc_samr_Connect, pipe, r)
 
     return ConnectHandle(pipe, r.data_out.connect_handle)
 
@@ -350,7 +360,7 @@ def Connect2(pipe, system_name = '', access_mask = 0x02000000):
     r.data_in.system_name = system_name
     r.data_in.access_mask = access_mask
 
-    result = dcerpc.dcerpc_samr_Connect2(pipe, r)
+    call_fn(dcerpc.dcerpc_samr_Connect2, pipe, r)
 
     return ConnectHandle(pipe, r.data_out.connect_handle)
 
@@ -361,7 +371,7 @@ def Connect3(pipe, system_name = '', access_mask = 0x02000000):
     r.data_in.unknown = 0
     r.data_in.access_mask = access_mask
 
-    result = dcerpc.dcerpc_samr_Connect3(pipe, r)
+    call_fn(dcerpc.dcerpc_samr_Connect3, pipe, r)
 
     return ConnectHandle(pipe, r.data_out.connect_handle)
 
@@ -372,7 +382,7 @@ def Connect4(pipe, system_name = '', access_mask = 0x02000000):
     r.data_in.unknown = 0
     r.data_in.access_mask = access_mask
 
-    result = dcerpc.dcerpc_samr_Connect4(pipe, r)
+    call_fn(dcerpc.dcerpc_samr_Connect4, pipe, r)
 
     return ConnectHandle(pipe, r.data_out.connect_handle)
 
@@ -386,7 +396,7 @@ def Connect5(pipe, system_name = '', access_mask = 0x02000000):
     r.data_in.info.unknown1 = 0
     r.data_in.info.unknown2 = 0
 
-    result = dcerpc.dcerpc_samr_Connect5(pipe, r)
+    call_fn(dcerpc.dcerpc_samr_Connect5, pipe, r)
 
     return ConnectHandle(pipe, r.data_out.connect_handle)
     
-- 
cgit 


From 74e9fce454aa55bc2b08da6341f2851e1b8b12b7 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Sun, 13 Feb 2005 00:58:28 +0000
Subject: r5368: Fix ups for domain_name field name change.

Implement GetDomPwInfo(), CreateUser2(), RemoveMemberFromForeignDomain(),
DeleteUser().
(This used to be commit f9ba35ff839fb612f53d8c2e6c5a64aaddc3d6a1)
---
 source4/scripting/swig/samr.py | 58 ++++++++++++++++++++++++++++++++++++------
 1 file changed, 50 insertions(+), 8 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/samr.py b/source4/scripting/swig/samr.py
index 951ca30aa3..22b591930c 100644
--- a/source4/scripting/swig/samr.py
+++ b/source4/scripting/swig/samr.py
@@ -93,6 +93,7 @@ def call_fn(fn, pipe, args):
     """Wrap up a RPC call and throw an exception is an error was returned."""
     
     result = fn(pipe, args);
+
     if result & 0xc0000000:
         raise dcerpc.NTSTATUS(result, dcerpc.nt_errstr(result));
 
@@ -146,7 +147,7 @@ class ConnectHandle(SamrHandle):
 
         r = dcerpc.samr_EnumDomains()
         r.data_in.connect_handle = self.handle
-        r.data_in.resume_handle = 1
+        r.data_in.resume_handle = 0
         r.data_in.buf_size = -1
 
         domains = []
@@ -169,8 +170,8 @@ class ConnectHandle(SamrHandle):
 
         r = dcerpc.samr_LookupDomain()
         r.data_in.connect_handle = self.handle
-        r.data_in.domain = dcerpc.samr_String()
-        r.data_in.domain.string = domain_name
+        r.data_in.domain_name = dcerpc.samr_String()
+        r.data_in.domain_name.string = domain_name
 
         call_fn(dcerpc.dcerpc_samr_LookupDomain, self.pipe, r)
 
@@ -194,6 +195,16 @@ class ConnectHandle(SamrHandle):
 
         call_fn(dcerpc.dcerpc_samr_Shutdown, self.pipe, r)
 
+    def GetDomPwInfo(self, system_name):
+
+        r = dcerpc.samr_GetDomPwInfo()
+        r.data_in.domain_name = dcerpc.samr_String()
+        r.data_in.domain_name.string = system_name
+
+        call_fn(dcerpc.dcerpc_samr_GetDomPwInfo, self.pipe, r)
+
+        return r.data_out.info
+
 
 class DomainHandle(SamrHandle):
 
@@ -286,7 +297,23 @@ class DomainHandle(SamrHandle):
 
         return (r.data_out.user_handle,
                 dcerpc.uint32_array_getitem(r.data_out.rid, 0))
-        
+
+    def CreateUser2(self, account_name, acct_flags = 0x00000010,
+                    access_mask = 0x02000000):
+
+        r = dcerpc.samr_CreateUser2()
+        r.data_in.domain_handle = self.handle
+        r.data_in.account_name = dcerpc.samr_String()
+        r.data_in.account_name.string = account_name
+        r.data_in.acct_flags = acct_flags
+        r.data_in.access_mask = access_mask
+
+        call_fn(dcerpc.dcerpc_samr_CreateUser2, self.pipe, r)
+
+        return (r.data_out.user_handle,
+                dcerpc.uint32_array_getitem(r.data_out.access_granted, 0),
+                dcerpc.uint32_array_getitem(r.data_out.rid, 0))
+
     def OpenUser(self, rid, access_mask = 0x02000000):
 
         r = dcerpc.samr_OpenUser()
@@ -329,9 +356,23 @@ class DomainHandle(SamrHandle):
 
         return sid_to_string(r.data_out.sid)
 
+    def RemoveMemberFromForeignDomain(self, sid):
+
+        r = dcerpc.samr_RemoveMemberFromForeignDomain()
+        r.data_in.domain_handle = self.handle
+        r.data_in.sid = sid
+
+        call_fn(dcerpc.dcerpc_samr_RemoveMemberFromForeignDomain, self.pipe, r)
+    
 
 class UserHandle(SamrHandle):
-    pass
+
+    def DeleteUser(self):
+
+        r = dcerpc.samr_DeleteUser()
+        r.data_in.user_handle = self.handle
+
+        call_fn(dcerpc.dcerpc_samr_DeleteUser, self.pipe, r)
     
 
 class GroupHandle(SamrHandle):
@@ -353,6 +394,7 @@ def Connect(pipe, access_mask = 0x02000000):
 
     return ConnectHandle(pipe, r.data_out.connect_handle)
 
+
 def Connect2(pipe, system_name = '', access_mask = 0x02000000):
     """Connect to the SAMR pipe."""
 
@@ -364,6 +406,7 @@ def Connect2(pipe, system_name = '', access_mask = 0x02000000):
 
     return ConnectHandle(pipe, r.data_out.connect_handle)
 
+
 def Connect3(pipe, system_name = '', access_mask = 0x02000000):
 
     r = dcerpc.samr_Connect3()
@@ -375,6 +418,7 @@ def Connect3(pipe, system_name = '', access_mask = 0x02000000):
 
     return ConnectHandle(pipe, r.data_out.connect_handle)
 
+
 def Connect4(pipe, system_name = '', access_mask = 0x02000000):
 
     r = dcerpc.samr_Connect4()
@@ -386,6 +430,7 @@ def Connect4(pipe, system_name = '', access_mask = 0x02000000):
 
     return ConnectHandle(pipe, r.data_out.connect_handle)
 
+
 def Connect5(pipe, system_name = '', access_mask = 0x02000000):
 
     r = dcerpc.samr_Connect5()
@@ -418,7 +463,6 @@ def Connect5(pipe, system_name = '', access_mask = 0x02000000):
 # AddAliasMember
 # DeleteAliasMember
 # GetMembersinAlias
-# DeleteUser
 # QueryUserInfo
 # SetUserInfo
 # ChangePasswordUser
@@ -433,13 +477,11 @@ def Connect5(pipe, system_name = '', access_mask = 0x02000000):
 # QueryUserInfo2
 # QueryDisplayInfo2
 # GetDisplayEnumerationIndex2
-# CreateUser2
 # QueryDisplayInfo3
 # AddMultipleMembersToAlias
 # RemoveMultipleMembersFromAlias
 # OemChangePasswordUser2
 # ChangePasswordUser2
-# GetDomPwInfo
 # SetUserInfo2
 # SetBootKeyInformation
 # GetBootKeyInformation
-- 
cgit 


From 11e6c958fdfda9c42f0e69f59af7f1d2bdca010c Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Sun, 13 Feb 2005 00:59:26 +0000
Subject: r5369: Rename torture modules so they don't conflict with files in
 scripting/swig.

Start porting samr torture test to new API.
(This used to be commit 14593939830e130ae306b82a6c063ec9d7f36b93)
---
 source4/scripting/swig/torture/pytorture       |   2 +-
 source4/scripting/swig/torture/samr.py         | 893 -------------------------
 source4/scripting/swig/torture/torture_samr.py | 736 ++++++++++++++++++++
 3 files changed, 737 insertions(+), 894 deletions(-)
 delete mode 100755 source4/scripting/swig/torture/samr.py
 create mode 100755 source4/scripting/swig/torture/torture_samr.py

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/torture/pytorture b/source4/scripting/swig/torture/pytorture
index 8a8f4d8bdf..fd4a92eeb4 100755
--- a/source4/scripting/swig/torture/pytorture
+++ b/source4/scripting/swig/torture/pytorture
@@ -40,7 +40,7 @@ if len(args) == 0:
 for test in args:
 
    try:
-      module = __import__(test)
+      module = __import__('torture_%s' % test)
    except ImportError:
       print 'No such module "%s"' % test
       sys.exit(1)
diff --git a/source4/scripting/swig/torture/samr.py b/source4/scripting/swig/torture/samr.py
deleted file mode 100755
index f7c33baeb3..0000000000
--- a/source4/scripting/swig/torture/samr.py
+++ /dev/null
@@ -1,893 +0,0 @@
-#!/usr/bin/python
-
-import dcerpc
-
-def test_Connect(pipe):
-
-    print 'testing samr_Connect'
-
-    r = {}
-    r['system_name'] = 0;
-    r['access_mask'] = 0x02000000
-
-    result = dcerpc.samr_Connect(pipe, r)
-
-    s = {}
-    s['handle'] = result['connect_handle']
-
-    handle = result['connect_handle']
-  
-    print 'testing samr_Connect2'
-
-    r = {}
-    r['system_name'] = None
-    r['access_mask'] = 0x02000000
-
-    result = dcerpc.samr_Connect2(pipe, r)
-
-    s = {}
-    s['handle'] = result['connect_handle']
-
-    dcerpc.samr_Close(pipe, s)
-    
-    print 'testing samr_Connect3'
-
-    r = {}
-    r['system_name'] = None
-    r['unknown'] = 0
-    r['access_mask'] = 0x02000000
-
-    result = dcerpc.samr_Connect3(pipe, r)
-
-    s = {}
-    s['handle'] = result['connect_handle']
-
-    dcerpc.samr_Close(pipe, s)
-
-    print 'testing samr_Connect4'
-
-    r = {}
-    r['system_name'] = None
-    r['unknown'] = 0
-    r['access_mask'] = 0x02000000
-
-    result = dcerpc.samr_Connect4(pipe, r)
-
-    s = {}
-    s['handle'] = result['connect_handle']
-    
-    dcerpc.samr_Close(pipe, s)
-
-    print 'testing samr_Connect5'
-
-    r = {}
-    r['system_name'] = None
-    r['access_mask'] = 0x02000000
-    r['level'] = 1
-    r['info'] = {}
-    r['info']['info1'] = {}
-    r['info']['info1']['unknown1'] = 0
-    r['info']['info1']['unknown2'] = 0
-
-    try:
-        result = dcerpc.samr_Connect5(pipe, r)
-        s = {}
-        s['handle'] = result['connect_handle']
-        dcerpc.samr_Close(pipe, s)
-    except dcerpc.NTSTATUS, arg:
-        if arg[0] != dcerpc.NT_STATUS_NET_WRITE_FAULT:
-            raise
-
-    return handle
-    
-def test_QuerySecurity(pipe, handle):
-
-    print 'testing samr_QuerySecurity'
-
-    r = {}
-    r['handle'] = handle
-    r['sec_info'] = 7
-
-    result = dcerpc.samr_QuerySecurity(pipe, r)
-
-    s = {}
-    s['handle'] = handle
-    s['sec_info'] = 7
-    s['sdbuf'] = result['sdbuf']
-
-    dcerpc.samr_SetSecurity(pipe, s)
-
-    dcerpc.samr_QuerySecurity(pipe, r)
-
-def test_GetDomPwInfo(pipe, handle, domain):
-
-    print 'testing samr_GetDomPwInfo'
-
-    r = {}
-    r['handle'] = handle
-    r['name'] = {}
-    r['name']['name'] = domain
-
-    dcerpc.samr_GetDomPwInfo(pipe, r)
-
-    r['name']['name'] = '\\\\%s' % domain
-
-    dcerpc.samr_GetDomPwInfo(pipe, r)
-
-    r['name']['name'] = '\\\\__NONAME__'
-
-    dcerpc.samr_GetDomPwInfo(pipe, r)
-
-    r['name']['name'] = '\\\\Builtin'
-
-    dcerpc.samr_GetDomPwInfo(pipe, r)
-
-def test_RemoveMemberFromForeignDomain(pipe, domain_handle):
-
-    print 'test samr_RemoveMemberFromForeignDomain'
-
-    r = {}
-    r['domain_handle'] = domain_handle
-    r['sid'] = {}
-    r['sid']['sid_rev_num'] = 1
-    r['sid']['id_auth'] = [1, 2, 3, 4, 5, 6]
-    r['sid']['num_auths'] = 4
-    r['sid']['sub_auths'] = [7, 8, 9, 10]
-
-    dcerpc.samr_RemoveMemberFromForeignDomain(pipe, r)
-
-def test_CreateUser2(pipe, domain_handle):
-
-    print 'test samr_CreateUser2'
-
-    r = {}
-    r['domain_handle'] = domain_handle
-    r['access_mask'] = 0x02000000
-    r['account_name'] = {}
-    r['account_name']['name'] = 'samrtorturemach$'
-    r['acct_flags'] = 0x0080            # WSTRUST
-
-    try:
-        dcerpc.samr_CreateUser2(pipe, r)
-    except dcerpc.NTSTATUS, arg:
-        if arg[0] == dcerpc.NT_STATUS_ACCESS_DENIED:
-            return
-        elif arg[0] == dcerpc.NT_STATUS_USER_EXISTS:
-            test_DeleteUser_byname(pipe, domain_handle, 'samrtorturemach$')
-            result = dcerpc.samr_CreateUser(pipe, r)
-        else:
-            raise dcerpc.NTSTATUS(arg)
-
-def test_LookupName(pipe, domain_handle, name):
-
-    print 'test samr_LookupNames'
-
-    r = {}
-    r['domain_handle'] = domain_handle
-    r['num_names'] = 1
-    r['names'] = []
-    r['names'].append({'name': name})
-
-    result = dcerpc.samr_LookupNames(pipe, r)
-
-    rid = result['rids']['ids'][0]
-
-    r['num_names'] = 2
-    r['names'].append({'name': 'xxNONAMExx'})
-
-
-    try:
-        dcerpc.samr_LookupNames(pipe, r)
-    except dcerpc.NTSTATUS, arg:
-        if arg[0] != dcerpc.STATUS_SOME_UNMAPPED:
-            raise dcerpc.NTSTATUS(arg)
-
-    r['num_names'] = 0
-
-    dcerpc.samr_LookupNames(pipe, r)
-
-    return rid
-
-def test_OpenUser_byname(pipe, domain_handle, user_name):
-
-    rid = test_LookupName(pipe, domain_handle, user_name)
-
-    r = {}
-    r['domain_handle'] = domain_handle
-    r['access_mask'] = 0x02000000
-    r['rid'] = rid
-
-    result = dcerpc.samr_OpenUser(pipe, r)
-
-    return result['user_handle']
-
-def test_DeleteUser_byname(pipe, domain_handle, user_name):
-
-    user_handle = test_OpenUser_byname(pipe, domain_handle, user_name)
-    
-    r = {}
-    r['user_handle'] = user_handle
-
-    dcerpc.samr_DeleteUser(pipe, r)
-
-def test_QueryUserInfo(pipe, user_handle):
-
-    print 'test samr_QueryUserInfo'
-
-    levels = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 16, 17, 20, 21]
-
-    for level in levels:
-        r = {}
-        r['user_handle'] = user_handle
-        r['level'] = level
-
-        dcerpc.samr_QueryUserInfo(pipe, r)
-
-def test_QueryUserInfo2(pipe, user_handle):
-
-    print 'test samr_QueryUserInfo2'
-
-    levels = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 16, 17, 20, 21]
-
-    for level in levels:
-        r = {}
-        r['user_handle'] = user_handle
-        r['level'] = level
-
-        dcerpc.samr_QueryUserInfo2(pipe, r)
-
-def test_SetUserInfo(pipe, user_handle):
-
-    r = {}
-    r['user_handle'] = user_handle
-    r['level'] = 2
-    r['info'] = {}
-    r['info']['info2'] = {}
-    r['info']['info2']['comment'] = {}
-    r['info']['info2']['comment']['name'] = 'hello'
-    r['info']['info2']['unknown'] = {}
-    r['info']['info2']['unknown']['name'] = None
-    r['info']['info2']['country_code'] = 0
-    r['info']['info2']['code_page'] = 0
-
-    dcerpc.samr_SetUserInfo(pipe, r)
-
-def test_GetUserPwInfo(pipe, user_handle):
-
-    print 'test samr_GetUserpwInfo'
-
-    r = {}
-    r['user_handle'] = user_handle
-
-    dcerpc.samr_GetUserPwInfo(pipe, r)
-
-def test_TestPrivateFunctionsUser(pipe, user_handle):
-
-    print 'test samr.TestPrivateFunctionsUser'
-
-    r = {}
-    r['user_handle'] = user_handle
-
-    try:
-        dcerpc.samr_TestPrivateFunctionsUser(pipe, r)
-    except dcerpc.NTSTATUS, arg:
-        if arg[0] != dcerpc.NT_STATUS_NOT_IMPLEMENTED:
-            raise dcerpc.NTSTATUS(arg)
-
-def test_user_ops(pipe, user_handle):
-
-    test_QuerySecurity(pipe, user_handle)
-
-    test_QueryUserInfo(pipe, user_handle)
-
-    test_QueryUserInfo2(pipe, user_handle)
-
-    test_SetUserInfo(pipe, user_handle)
-
-    test_GetUserPwInfo(pipe, user_handle)
-
-    test_TestPrivateFunctionsUser(pipe, user_handle)
-
-def test_CreateUser(pipe, domain_handle):
-
-    print 'test samr_CreateUser'
-    
-    r = {}
-    r['domain_handle'] = domain_handle
-    r['account_name'] = {}
-    r['account_name']['name'] = 'samrtorturetest'
-    r['access_mask'] = 0x02000000
-
-    try:
-        result = dcerpc.samr_CreateUser(pipe, r)
-    except dcerpc.NTSTATUS, arg:
-        if arg[0] == dcerpc.NT_STATUS_ACCESS_DENIED:
-            return
-        elif arg[0] == dcerpc.NT_STATUS_USER_EXISTS:
-            test_DeleteUser_byname(pipe, domain_handle, 'samrtorturetest')
-            result = dcerpc.samr_CreateUser(pipe, r)
-        else:
-            raise dcerpc.NTSTATUS(arg)
-
-    user_handle = result['user_handle']
-
-    q = {}
-    q['user_handle'] = user_handle
-    q['level'] = 16
-
-    dcerpc.samr_QueryUserInfo(pipe, q)
-
-    test_user_ops(pipe, user_handle)
-
-    return user_handle
-
-def test_DeleteAlias_byname(pipe, domain_handle, alias_name):
-
-    rid = test_LookupName(pipe, domain_handle, alias_name)
-
-    r = {}
-    r['domain_handle'] = domain_handle
-    r['access_mask'] = 0x02000000
-    r['rid'] = rid
-
-    result = dcerpc.samr_OpenAlias(pipe, r)
-
-    s = {}
-    s['alias_handle'] = result['alias_handle']
-
-    dcerpc.samr_DeleteDomAlias(pipe, s)
-
-def test_QueryAliasInfo(pipe, alias_handle):
-
-    levels = [1, 2, 3]
-
-    for i in range(0, len(levels)):
-
-        r = {}
-        r['alias_handle'] = alias_handle
-        r['level']  = levels[i]
-
-        dcerpc.samr_QueryAliasInfo(pipe, r)
-
-def test_SetAliasInfo(pipe, alias_handle):
-
-    r = {}
-    r['alias_handle'] = alias_handle
-    r['level'] = 2
-    r['info'] = {}
-    r['info']['name'] = {}
-    r['info']['name']['name'] = 'hello'
-
-    dcerpc.samr_SetAliasInfo(pipe, r)
-
-    del(r['info']['name'])
-
-    r['level'] = 3
-    r['info']['description'] = {}
-    r['info']['description']['name'] = 'this is a description'
-    
-    dcerpc.samr_SetAliasInfo(pipe, r)
-
-def test_AddMemberToAlias(pipe, alias_handle, domain_sid):
-
-    r = {}
-    r['alias_handle'] = alias_handle
-    r['sid'] = domain_sid
-
-    r['sid']['num_auths'] = r['sid']['num_auths'] + 1
-    r['sid']['sub_auths'].append(512)
-
-    dcerpc.samr_AddAliasMember(pipe, r)
-
-    dcerpc.samr_DeleteAliasMember(pipe, r)
-
-def test_AddMultipleMembersToAlias(pipe, alias_handle):
-
-    r = {}
-    r['alias_handle'] = alias_handle
-    r['sids'] = {}
-    r['sids']['num_sids'] = 2
-    r['sids']['sids'] = []
-
-    for i in range(0,2):
-        sid = {}
-        sid['sid_rev_num'] = 1
-        sid['id_auth'] = [0, 0, 0, 0, 0, 5]
-        sid['num_auths'] = 5
-        sid['sub_auths'] = [21, 737922324, -1292160505, 1285293260, 512 + i]
-
-        r['sids']['sids'].append({'sid': sid})
-
-    dcerpc.samr_AddMultipleMembersToAlias(pipe, r)
-
-    dcerpc.samr_RemoveMultipleMembersFromAlias(pipe, r)
-
-def test_alias_ops(pipe, alias_handle, domain_sid):
-
-    test_QuerySecurity(pipe, alias_handle)
-
-    test_QueryAliasInfo(pipe, alias_handle)
-
-    test_SetAliasInfo(pipe, alias_handle)
-
-    test_AddMemberToAlias(pipe, alias_handle, domain_sid)
-
-    test_AddMultipleMembersToAlias(pipe, alias_handle)
-
-def test_CreateAlias(pipe, domain_handle, domain_sid):
-
-    print 'test samr_CreateAlias'    
-
-    alias_name = 'samrtorturetestalias'
-
-    r = {}
-    r['domain_handle'] = domain_handle
-    r['aliasname'] = {}
-    r['aliasname']['name'] = alias_name
-    r['access_mask'] = 0x02000000
-
-    try:
-        result = dcerpc.samr_CreateDomAlias(pipe, r)
-    except dcerpc.NTSTATUS, arg:
-        if arg[0] == dcerpc.NT_STATUS_ACCESS_DENIED:
-            return
-        if arg[0] != dcerpc.NT_STATUS_USER_EXISTS:
-            raise dcerpc.NTSTATUS(arg)
-        test_DeleteAlias_byname(pipe, domain_handle, alias_name)
-        result = dcerpc.samr_CreateDomAlias(pipe, r)
-
-    alias_handle = result['alias_handle']
-
-    test_alias_ops(pipe, alias_handle, domain_sid)
-
-    return alias_handle
-
-def test_DeleteGroup_byname(pipe, domain_handle, group_name):
-    
-    rid = test_LookupName(pipe, domain_handle, group_name)
-
-    r = {}
-    r['domain_handle'] = domain_handle
-    r['access_mask'] = 0x02000000
-    r['rid'] = rid
-
-    result = dcerpc.samr_OpenGroup(pipe, r)
-
-    s = {}
-    s['group_handle'] = result['group_handle']
-
-    dcerpc.samr_DeleteDomainGroup(pipe, s)
-
-def test_CreateDomainGroup(pipe, domain_handle):
-
-    print 'testing samr_CreateDomainGroup'
-
-    r = {}
-    r['domain_handle'] = domain_handle
-    r['name'] = {}
-    r['name']['name'] = 'samrtorturetestgroup'
-    r['access_mask'] = 0x02000000
-
-    try:
-        result = dcerpc.samr_CreateDomainGroup(pipe, r)
-    except dcerpc.NTSTATUS, arg:
-        if arg[0] == dcerpc.NT_STATUS_ACCESS_DENIED:
-            return
-        if arg[0] != dcerpc.NT_STATUS_GROUP_EXISTS:
-            raise dcerpc.NTSTATUS(arg)
-
-        test_DeleteGroup_byname(pipe, domain_handle, 'samrtorturetestgroup')
-
-        result = dcerpc.samr_CreateDomainGroup(pipe, r)
-
-    return result['group_handle']
-
-def test_QueryDomainInfo(pipe, domain_handle):
-
-    print 'testing samr_QueryDomainInfo'
-
-    levels = [1, 2, 3, 4, 5, 6, 7, 8, 9, 11, 12, 13]
-    set_ok = [1, 0, 1, 1, 0, 1, 1, 0, 1,  0,  1,  0]
-    
-    for i in range(0, len(levels)):
-
-        r = {}
-        r['domain_handle'] = domain_handle
-        r['level'] = levels[i]
-
-        result = dcerpc.samr_QueryDomainInfo(pipe, r)
-
-        s = {}
-        s['domain_handle'] = domain_handle
-        s['level'] = levels[i]
-        s['info'] = result['info']
-
-        try:
-            dcerpc.samr_SetDomainInfo(pipe, s)
-        except dcerpc.NTSTATUS, arg:
-            if set_ok[i]:
-                raise dcerpc.NTSTATUS(arg)
-            if arg[0] != dcerpc.NT_STATUS_INVALID_INFO_CLASS:
-                raise dcerpc.NTSTATUS(arg)
-
-def test_QueryDomainInfo2(pipe, domain_handle):
-
-    print 'testing samr_QueryDomainInfo'
-
-    levels = [1, 2, 3, 4, 5, 6, 7, 8, 9, 11, 12, 13]
-
-    for i in range(0, len(levels)):
-
-        r = {}
-        r['domain_handle'] = domain_handle
-        r['level'] = levels[i]
-
-        dcerpc.samr_QueryDomainInfo2(pipe, r)
-
-def test_EnumDomainUsers(pipe, domain_handle):
-
-    print 'testing samr_EnumDomainUsers'
-
-    r = {}
-    r['domain_handle'] = domain_handle
-    r['resume_handle'] = 0
-    r['acct_flags'] = 0
-    r['max_size'] = -1
-
-    while 1:
-        result = dcerpc.samr_EnumDomainUsers(pipe, r)
-        if result['result'] == dcerpc.STATUS_MORE_ENTRIES:
-            r['resume_handle'] = result['resume_handle']
-            continue
-        break
-
-def test_EnumDomainGroups(pipe, domain_handle):
-
-    print 'testing samr_EnumDomainGroups'
-
-    r = {}
-    r['domain_handle'] = domain_handle
-    r['resume_handle'] = 0
-    r['acct_flags'] = 0
-    r['max_size'] = -1
-    
-    while 1:
-        result = dcerpc.samr_EnumDomainGroups(pipe, r)
-        if result['result'] == dcerpc.STATUS_MORE_ENTRIES:
-            r['resume_handle'] = result['resume_handle']
-            continue
-        break
-
-def test_EnumDomainAliases(pipe, domain_handle):
-
-    print 'testing samr_EnumDomainAliases'
-
-    r = {}
-    r['domain_handle'] = domain_handle
-    r['resume_handle'] = 0
-    r['acct_flags'] = 0
-    r['max_size'] = -1
-
-    while 1:
-        result = dcerpc.samr_EnumDomainAliases(pipe, r)
-        if result['result'] == dcerpc.STATUS_MORE_ENTRIES:
-            r['resume_handle'] = result['resume_handle']
-            continue
-        break
-
-def test_QueryDisplayInfo(pipe, domain_handle):
-
-    print 'testing samr_QueryDisplayInfo'
-
-    levels = [1, 2, 3, 4, 5]
-
-    for i in range(0, len(levels)):
-
-        r = {}
-        r['domain_handle'] = domain_handle
-        r['level'] = levels[i]
-        r['start_idx'] = 0
-        r['max_entries'] = 1000
-        r['buf_size'] = -1
-
-        dcerpc.samr_QueryDisplayInfo(pipe, r)
-
-def test_QueryDisplayInfo2(pipe, domain_handle):
-
-    print 'testing samr_QueryDisplayInfo2'
-
-    levels = [1, 2, 3, 4, 5]
-
-    for i in range(0, len(levels)):
-
-        r = {}
-        r['domain_handle'] = domain_handle
-        r['level'] = levels[i]
-        r['start_idx'] = 0
-        r['max_entries'] = 1000
-        r['buf_size'] = -1
-
-        dcerpc.samr_QueryDisplayInfo2(pipe, r)
-    
-def test_QueryDisplayInfo3(pipe, domain_handle):
-
-    print 'testing samr_QueryDisplayInfo3'
-
-    levels = [1, 2, 3, 4, 5]
-
-    for i in range(0, len(levels)):
-
-        r = {}
-        r['domain_handle'] = domain_handle
-        r['level'] = levels[i]
-        r['start_idx'] = 0
-        r['max_entries'] = 1000
-        r['buf_size'] = -1
-
-        dcerpc.samr_QueryDisplayInfo3(pipe, r)
-
-def test_GetDisplayEnumerationIndex(pipe, domain_handle):
-
-    print 'testing samr_GetDisplayEnumerationIndex'
-
-    levels = [1, 2, 3, 4, 5]
-    ok_lvl = [1, 1, 1, 0, 0]
-
-    for i in range(0, len(levels)):
-
-        r = {}
-        r['domain_handle'] = domain_handle
-        r['level'] = levels[i]
-        r['name'] = {}
-        r['name']['name'] = 'samrtorturetest'
-
-        try:
-            dcerpc.samr_GetDisplayEnumerationIndex(pipe, r)
-        except dcerpc.NTSTATUS, arg:
-            if ok_lvl[i]:
-                raise dcerpc.NTSTATUS(arg)
-
-        r['name']['name'] = 'zzzzzzzz'
-
-        try:
-            dcerpc.samr_GetDisplayEnumerationIndex(pipe, r)
-        except dcerpc.NTSTATUS, arg:
-            if ok_lvl[i]:
-                raise dcerpc.NTSTATUS(arg)            
-
-def test_GetDisplayEnumerationIndex2(pipe, domain_handle):
-
-    print 'testing samr_GetDisplayEnumerationIndex2'
-
-    levels = [1, 2, 3, 4, 5]
-    ok_lvl = [1, 1, 1, 0, 0]
-
-    for i in range(0, len(levels)):
-
-        r = {}
-        r['domain_handle'] = domain_handle
-        r['level'] = levels[i]
-        r['name'] = {}
-        r['name']['name'] = 'samrtorturetest'
-
-        try:
-            dcerpc.samr_GetDisplayEnumerationIndex2(pipe, r)
-        except dcerpc.NTSTATUS, arg:
-            if ok_lvl[i]:
-                raise dcerpc.NTSTATUS(arg)
-
-        r['name']['name'] = 'zzzzzzzz'
-
-        try:
-            dcerpc.samr_GetDisplayEnumerationIndex2(pipe, r)
-        except dcerpc.NTSTATUS, arg:
-            if ok_lvl[i]:
-                raise dcerpc.NTSTATUS(arg)            
-
-def test_TestPrivateFunctionsDomain(pipe, domain_handle):
-
-    print 'test samr.TestPrivateFunctionsDomain'
-
-    r = {}
-    r['domain_handle'] = domain_handle
-
-    try:
-        dcerpc.samr_TestPrivateFunctionsDomain(pipe, r)
-    except dcerpc.NTSTATUS, arg:
-        if arg[0] != dcerpc.NT_STATUS_NOT_IMPLEMENTED:
-            raise dcerpc.NTSTATUS(arg)
-
-def test_RidToSid(pipe, domain_handle):
-
-    print 'testing samr_RidToSid'
-
-    r = {}
-    r['domain_handle'] = domain_handle
-    r['rid'] = 512
-
-    dcerpc.samr_RidToSid(pipe, r)
-
-def test_GetBootKeyInformation(pipe, domain_handle):
-
-    print 'testing samr_GetBootKeyInformation'
-
-    r = {}
-    r['domain_handle'] = domain_handle
-
-    try:
-        dcerpc.samr_GetBootKeyInformation(pipe, r)
-    except dcerpc.NTSTATUS, arg:
-        pass
-
-def test_DeleteUser(pipe, user_handle):
-
-    r = {}
-    r['user_handle'] = user_handle
-
-    dcerpc.samr_DeleteUser(pipe, r)
-
-def test_DeleteAlias(pipe, alias_handle):
-
-    r = {}
-    r['alias_handle'] = alias_handle
-
-    dcerpc.samr_DeleteDomAlias(pipe, r)
-    
-def test_DeleteDomainGroup(pipe, group_handle):
-
-    r = {}
-    r['group_handle'] = group_handle
-
-    dcerpc.samr_DeleteDomainGroup(pipe, r)
-
-def test_Close(pipe, handle):
-
-    r = {}
-    r['handle'] = handle
-
-    dcerpc.samr_Close(pipe, r)
-
-def test_OpenDomain(pipe, connect_handle, domain_sid):
-
-    print 'testing samr_OpenDomain'
-
-    r = {}
-    r['connect_handle'] = connect_handle
-    r['access_mask'] = 0x02000000
-    r['sid'] = domain_sid
-
-    result = dcerpc.samr_OpenDomain(pipe, r)
-
-    domain_handle = result['domain_handle']
-
-    test_QuerySecurity(pipe, domain_handle)
-
-    test_RemoveMemberFromForeignDomain(pipe, domain_handle)
-
-    test_CreateUser2(pipe, domain_handle)
-
-    user_handle = test_CreateUser(pipe, domain_handle)
-
-    alias_handle = test_CreateAlias(pipe, domain_handle, domain_sid)
-
-    group_handle = test_CreateDomainGroup(pipe, domain_handle)
-
-    test_QueryDomainInfo(pipe, domain_handle)
-    
-    test_QueryDomainInfo2(pipe, domain_handle)
-
-    test_EnumDomainUsers(pipe, domain_handle)
-
-    test_EnumDomainGroups(pipe, domain_handle)
-
-    test_EnumDomainAliases(pipe, domain_handle)
-
-    test_QueryDisplayInfo(pipe, domain_handle)
-
-    test_QueryDisplayInfo2(pipe, domain_handle)
-    
-    test_QueryDisplayInfo3(pipe, domain_handle)
-
-    test_GetDisplayEnumerationIndex(pipe, domain_handle)
-
-    test_GetDisplayEnumerationIndex2(pipe, domain_handle)
-
-    test_TestPrivateFunctionsDomain(pipe, domain_handle)
-
-    test_RidToSid(pipe, domain_handle)
-
-    test_GetBootKeyInformation(pipe, domain_handle)
-
-    if user_handle != None:
-        test_DeleteUser(pipe, user_handle)
-
-    if alias_handle != None:
-        test_DeleteAlias(pipe, alias_handle)
-
-    if group_handle != None:
-        test_DeleteDomainGroup(pipe, group_handle)
-
-    test_Close(pipe, domain_handle)
-    
-def test_LookupDomain(pipe, connect_handle, domain):
-
-    print 'testing samr_LookupDomain'
-
-    r = {}
-    r['connect_handle'] = connect_handle
-    r['domain'] = {}
-    r['domain']['name'] = None
-
-    try:
-        dcerpc.samr_LookupDomain(pipe, r)
-    except dcerpc.NTSTATUS, arg:
-        if arg[0] != dcerpc.NT_STATUS_INVALID_PARAMETER:
-            raise dcerpc.NTSTATUS(arg)
-
-    r['domain']['name'] = 'xxNODOMAINxx'
-
-    try:
-        dcerpc.samr_LookupDomain(pipe, r)
-    except dcerpc.NTSTATUS, arg:
-        if arg[0] != dcerpc.NT_STATUS_NO_SUCH_DOMAIN:
-            raise dcerpc.NTSTATUS(arg)
-
-    r['domain']['name'] = domain
-
-    result = dcerpc.samr_LookupDomain(pipe, r)
-
-    test_GetDomPwInfo(pipe, connect_handle, domain)
-
-    test_OpenDomain(pipe, connect_handle, result['sid'])
-    
-def test_EnumDomains(pipe, connect_handle):
-
-    print 'testing samr_EnumDomains'
-
-    r = {}
-    r['connect_handle'] = connect_handle
-    r['resume_handle'] = 0
-    r['buf_size'] = -1
-
-    result = dcerpc.samr_EnumDomains(pipe, r)
-
-    for domain in result['sam']['entries']:
-        test_LookupDomain(pipe, connect_handle, domain['name']['name'])
-
-def test_LongInt(pipe):
-
-    # Check that we can use long values for shorter width types
-
-    r = {}
-    r['system_name'] = 0L;
-    r['access_mask'] = 0x02000000L
-
-    result = dcerpc.samr_Connect(pipe, r)
-
-    # Test that we can parse a SID that contains a sub_auth that can't
-    # be held in a python int.
-
-    r = {}
-    r['connect_handle'] = result['connect_handle']
-    r['access_mask'] = 0x02000000
-    r['sid'] = {'sid_rev_num': 1, 'id_auth': [0, 0, 0, 0, 0, 5],
-                'num_auths': 4,
-                'sub_auths': [21, 737922324, 3002806791L, 1285293260]}
-
-    result = dcerpc.samr_OpenDomain(pipe, r)
-
-def runtests(binding, domain, username, password):
-
-    print 'Testing SAMR pipe'
-
-    pipe = dcerpc.pipe_connect(binding,
-            dcerpc.DCERPC_SAMR_UUID, dcerpc.DCERPC_SAMR_VERSION,
-            domain, username, password)
-
-    test_LongInt(pipe)
-
-    handle = test_Connect(pipe)
-
-    test_QuerySecurity(pipe, handle)
-
-    test_EnumDomains(pipe, handle)
diff --git a/source4/scripting/swig/torture/torture_samr.py b/source4/scripting/swig/torture/torture_samr.py
new file mode 100755
index 0000000000..929420695d
--- /dev/null
+++ b/source4/scripting/swig/torture/torture_samr.py
@@ -0,0 +1,736 @@
+#!/usr/bin/python
+
+import sys
+import dcerpc, samr
+
+def test_Connect(pipe):
+
+    print 'testing Connect'
+
+    handle = samr.Connect(pipe)
+    handle = samr.Connect2(pipe)
+    handle = samr.Connect3(pipe)
+    handle = samr.Connect4(pipe)
+    handle = samr.Connect5(pipe)
+
+    return handle
+    
+def test_QuerySecurity(pipe, handle):
+
+    print 'testing QuerySecurity'
+
+    sdbuf = handle.QuerySecurity()
+    handle.SetSecurity(sdbuf)
+
+
+def test_GetDomPwInfo(pipe, handle, domain):
+
+    print 'testing GetDomPwInfo'
+
+    handle.GetDomPwInfo(domain)
+    handle.GetDomPwInfo('__NONAME__')
+    handle.GetDomPwInfo('Builtin')
+
+def test_RemoveMemberFromForeignDomain(pipe, domain_handle):
+
+    print 'test RemoveMemberFromForeignDomain'
+
+    sid = samr.string_to_sid('S-1-5-32-12-34-56-78-9')
+
+    domain_handle.RemoveMemberFromForeignDomain(sid)
+
+def test_CreateUser2(pipe, domain_handle):
+
+    print 'test CreateUser2'
+
+    username = 'samrtorturemach$'
+
+    try:
+        return domain_handle.CreateUser2(username, 0x0080) # WSTRUST
+    except dcerpc.NTSTATUS, arg:
+        if arg[0] == 0x0c0000063L:
+            domain_handle.OpenUser(username).DeleteUser()
+            return domain_handle.CreateUser2(username)
+        raise
+
+def test_LookupName(pipe, domain_handle, name):
+
+    print 'test samr_LookupNames'
+
+    r = {}
+    r['domain_handle'] = domain_handle
+    r['num_names'] = 1
+    r['names'] = []
+    r['names'].append({'name': name})
+
+    result = dcerpc.samr_LookupNames(pipe, r)
+
+    rid = result['rids']['ids'][0]
+
+    r['num_names'] = 2
+    r['names'].append({'name': 'xxNONAMExx'})
+
+
+    try:
+        dcerpc.samr_LookupNames(pipe, r)
+    except dcerpc.NTSTATUS, arg:
+        if arg[0] != dcerpc.STATUS_SOME_UNMAPPED:
+            raise dcerpc.NTSTATUS(arg)
+
+    r['num_names'] = 0
+
+    dcerpc.samr_LookupNames(pipe, r)
+
+    return rid
+
+def test_OpenUser_byname(pipe, domain_handle, user_name):
+
+    rid = test_LookupName(pipe, domain_handle, user_name)
+
+    r = {}
+    r['domain_handle'] = domain_handle
+    r['access_mask'] = 0x02000000
+    r['rid'] = rid
+
+    result = dcerpc.samr_OpenUser(pipe, r)
+
+    return result['user_handle']
+
+def test_DeleteUser_byname(pipe, domain_handle, user_name):
+
+    user_handle = test_OpenUser_byname(pipe, domain_handle, user_name)
+    
+    r = {}
+    r['user_handle'] = user_handle
+
+    dcerpc.samr_DeleteUser(pipe, r)
+
+def test_QueryUserInfo(pipe, user_handle):
+
+    print 'test samr_QueryUserInfo'
+
+    levels = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 16, 17, 20, 21]
+
+    for level in levels:
+        r = {}
+        r['user_handle'] = user_handle
+        r['level'] = level
+
+        dcerpc.samr_QueryUserInfo(pipe, r)
+
+def test_QueryUserInfo2(pipe, user_handle):
+
+    print 'test samr_QueryUserInfo2'
+
+    levels = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 16, 17, 20, 21]
+
+    for level in levels:
+        r = {}
+        r['user_handle'] = user_handle
+        r['level'] = level
+
+        dcerpc.samr_QueryUserInfo2(pipe, r)
+
+def test_SetUserInfo(pipe, user_handle):
+
+    r = {}
+    r['user_handle'] = user_handle
+    r['level'] = 2
+    r['info'] = {}
+    r['info']['info2'] = {}
+    r['info']['info2']['comment'] = {}
+    r['info']['info2']['comment']['name'] = 'hello'
+    r['info']['info2']['unknown'] = {}
+    r['info']['info2']['unknown']['name'] = None
+    r['info']['info2']['country_code'] = 0
+    r['info']['info2']['code_page'] = 0
+
+    dcerpc.samr_SetUserInfo(pipe, r)
+
+def test_GetUserPwInfo(pipe, user_handle):
+
+    print 'test samr_GetUserpwInfo'
+
+    r = {}
+    r['user_handle'] = user_handle
+
+    dcerpc.samr_GetUserPwInfo(pipe, r)
+
+def test_TestPrivateFunctionsUser(pipe, user_handle):
+
+    print 'test samr.TestPrivateFunctionsUser'
+
+    r = {}
+    r['user_handle'] = user_handle
+
+    try:
+        dcerpc.samr_TestPrivateFunctionsUser(pipe, r)
+    except dcerpc.NTSTATUS, arg:
+        if arg[0] != dcerpc.NT_STATUS_NOT_IMPLEMENTED:
+            raise dcerpc.NTSTATUS(arg)
+
+def test_user_ops(pipe, user_handle):
+
+    test_QuerySecurity(pipe, user_handle)
+
+    test_QueryUserInfo(pipe, user_handle)
+
+    test_QueryUserInfo2(pipe, user_handle)
+
+    test_SetUserInfo(pipe, user_handle)
+
+    test_GetUserPwInfo(pipe, user_handle)
+
+    test_TestPrivateFunctionsUser(pipe, user_handle)
+
+def test_CreateUser(pipe, domain_handle):
+
+    print 'test samr_CreateUser'
+    
+    r = {}
+    r['domain_handle'] = domain_handle
+    r['account_name'] = {}
+    r['account_name']['name'] = 'samrtorturetest'
+    r['access_mask'] = 0x02000000
+
+    try:
+        result = dcerpc.samr_CreateUser(pipe, r)
+    except dcerpc.NTSTATUS, arg:
+        if arg[0] == dcerpc.NT_STATUS_ACCESS_DENIED:
+            return
+        elif arg[0] == dcerpc.NT_STATUS_USER_EXISTS:
+            test_DeleteUser_byname(pipe, domain_handle, 'samrtorturetest')
+            result = dcerpc.samr_CreateUser(pipe, r)
+        else:
+            raise dcerpc.NTSTATUS(arg)
+
+    user_handle = result['user_handle']
+
+    q = {}
+    q['user_handle'] = user_handle
+    q['level'] = 16
+
+    dcerpc.samr_QueryUserInfo(pipe, q)
+
+    test_user_ops(pipe, user_handle)
+
+    return user_handle
+
+def test_DeleteAlias_byname(pipe, domain_handle, alias_name):
+
+    rid = test_LookupName(pipe, domain_handle, alias_name)
+
+    r = {}
+    r['domain_handle'] = domain_handle
+    r['access_mask'] = 0x02000000
+    r['rid'] = rid
+
+    result = dcerpc.samr_OpenAlias(pipe, r)
+
+    s = {}
+    s['alias_handle'] = result['alias_handle']
+
+    dcerpc.samr_DeleteDomAlias(pipe, s)
+
+def test_QueryAliasInfo(pipe, alias_handle):
+
+    levels = [1, 2, 3]
+
+    for i in range(0, len(levels)):
+
+        r = {}
+        r['alias_handle'] = alias_handle
+        r['level']  = levels[i]
+
+        dcerpc.samr_QueryAliasInfo(pipe, r)
+
+def test_SetAliasInfo(pipe, alias_handle):
+
+    r = {}
+    r['alias_handle'] = alias_handle
+    r['level'] = 2
+    r['info'] = {}
+    r['info']['name'] = {}
+    r['info']['name']['name'] = 'hello'
+
+    dcerpc.samr_SetAliasInfo(pipe, r)
+
+    del(r['info']['name'])
+
+    r['level'] = 3
+    r['info']['description'] = {}
+    r['info']['description']['name'] = 'this is a description'
+    
+    dcerpc.samr_SetAliasInfo(pipe, r)
+
+def test_AddMemberToAlias(pipe, alias_handle, domain_sid):
+
+    r = {}
+    r['alias_handle'] = alias_handle
+    r['sid'] = domain_sid
+
+    r['sid']['num_auths'] = r['sid']['num_auths'] + 1
+    r['sid']['sub_auths'].append(512)
+
+    dcerpc.samr_AddAliasMember(pipe, r)
+
+    dcerpc.samr_DeleteAliasMember(pipe, r)
+
+def test_AddMultipleMembersToAlias(pipe, alias_handle):
+
+    r = {}
+    r['alias_handle'] = alias_handle
+    r['sids'] = {}
+    r['sids']['num_sids'] = 2
+    r['sids']['sids'] = []
+
+    for i in range(0,2):
+        sid = {}
+        sid['sid_rev_num'] = 1
+        sid['id_auth'] = [0, 0, 0, 0, 0, 5]
+        sid['num_auths'] = 5
+        sid['sub_auths'] = [21, 737922324, -1292160505, 1285293260, 512 + i]
+
+        r['sids']['sids'].append({'sid': sid})
+
+    dcerpc.samr_AddMultipleMembersToAlias(pipe, r)
+
+    dcerpc.samr_RemoveMultipleMembersFromAlias(pipe, r)
+
+def test_alias_ops(pipe, alias_handle, domain_sid):
+
+    test_QuerySecurity(pipe, alias_handle)
+
+    test_QueryAliasInfo(pipe, alias_handle)
+
+    test_SetAliasInfo(pipe, alias_handle)
+
+    test_AddMemberToAlias(pipe, alias_handle, domain_sid)
+
+    test_AddMultipleMembersToAlias(pipe, alias_handle)
+
+def test_CreateAlias(pipe, domain_handle, domain_sid):
+
+    print 'test samr_CreateAlias'    
+
+    alias_name = 'samrtorturetestalias'
+
+    r = {}
+    r['domain_handle'] = domain_handle
+    r['aliasname'] = {}
+    r['aliasname']['name'] = alias_name
+    r['access_mask'] = 0x02000000
+
+    try:
+        result = dcerpc.samr_CreateDomAlias(pipe, r)
+    except dcerpc.NTSTATUS, arg:
+        if arg[0] == dcerpc.NT_STATUS_ACCESS_DENIED:
+            return
+        if arg[0] != dcerpc.NT_STATUS_USER_EXISTS:
+            raise dcerpc.NTSTATUS(arg)
+        test_DeleteAlias_byname(pipe, domain_handle, alias_name)
+        result = dcerpc.samr_CreateDomAlias(pipe, r)
+
+    alias_handle = result['alias_handle']
+
+    test_alias_ops(pipe, alias_handle, domain_sid)
+
+    return alias_handle
+
+def test_DeleteGroup_byname(pipe, domain_handle, group_name):
+    
+    rid = test_LookupName(pipe, domain_handle, group_name)
+
+    r = {}
+    r['domain_handle'] = domain_handle
+    r['access_mask'] = 0x02000000
+    r['rid'] = rid
+
+    result = dcerpc.samr_OpenGroup(pipe, r)
+
+    s = {}
+    s['group_handle'] = result['group_handle']
+
+    dcerpc.samr_DeleteDomainGroup(pipe, s)
+
+def test_CreateDomainGroup(pipe, domain_handle):
+
+    print 'testing samr_CreateDomainGroup'
+
+    r = {}
+    r['domain_handle'] = domain_handle
+    r['name'] = {}
+    r['name']['name'] = 'samrtorturetestgroup'
+    r['access_mask'] = 0x02000000
+
+    try:
+        result = dcerpc.samr_CreateDomainGroup(pipe, r)
+    except dcerpc.NTSTATUS, arg:
+        if arg[0] == dcerpc.NT_STATUS_ACCESS_DENIED:
+            return
+        if arg[0] != dcerpc.NT_STATUS_GROUP_EXISTS:
+            raise dcerpc.NTSTATUS(arg)
+
+        test_DeleteGroup_byname(pipe, domain_handle, 'samrtorturetestgroup')
+
+        result = dcerpc.samr_CreateDomainGroup(pipe, r)
+
+    return result['group_handle']
+
+def test_QueryDomainInfo(pipe, domain_handle):
+
+    print 'testing samr_QueryDomainInfo'
+
+    levels = [1, 2, 3, 4, 5, 6, 7, 8, 9, 11, 12, 13]
+    set_ok = [1, 0, 1, 1, 0, 1, 1, 0, 1,  0,  1,  0]
+    
+    for i in range(0, len(levels)):
+
+        r = {}
+        r['domain_handle'] = domain_handle
+        r['level'] = levels[i]
+
+        result = dcerpc.samr_QueryDomainInfo(pipe, r)
+
+        s = {}
+        s['domain_handle'] = domain_handle
+        s['level'] = levels[i]
+        s['info'] = result['info']
+
+        try:
+            dcerpc.samr_SetDomainInfo(pipe, s)
+        except dcerpc.NTSTATUS, arg:
+            if set_ok[i]:
+                raise dcerpc.NTSTATUS(arg)
+            if arg[0] != dcerpc.NT_STATUS_INVALID_INFO_CLASS:
+                raise dcerpc.NTSTATUS(arg)
+
+def test_QueryDomainInfo2(pipe, domain_handle):
+
+    print 'testing samr_QueryDomainInfo'
+
+    levels = [1, 2, 3, 4, 5, 6, 7, 8, 9, 11, 12, 13]
+
+    for i in range(0, len(levels)):
+
+        r = {}
+        r['domain_handle'] = domain_handle
+        r['level'] = levels[i]
+
+        dcerpc.samr_QueryDomainInfo2(pipe, r)
+
+def test_EnumDomainUsers(pipe, domain_handle):
+
+    print 'testing samr_EnumDomainUsers'
+
+    r = {}
+    r['domain_handle'] = domain_handle
+    r['resume_handle'] = 0
+    r['acct_flags'] = 0
+    r['max_size'] = -1
+
+    while 1:
+        result = dcerpc.samr_EnumDomainUsers(pipe, r)
+        if result['result'] == dcerpc.STATUS_MORE_ENTRIES:
+            r['resume_handle'] = result['resume_handle']
+            continue
+        break
+
+def test_EnumDomainGroups(pipe, domain_handle):
+
+    print 'testing samr_EnumDomainGroups'
+
+    r = {}
+    r['domain_handle'] = domain_handle
+    r['resume_handle'] = 0
+    r['acct_flags'] = 0
+    r['max_size'] = -1
+    
+    while 1:
+        result = dcerpc.samr_EnumDomainGroups(pipe, r)
+        if result['result'] == dcerpc.STATUS_MORE_ENTRIES:
+            r['resume_handle'] = result['resume_handle']
+            continue
+        break
+
+def test_EnumDomainAliases(pipe, domain_handle):
+
+    print 'testing samr_EnumDomainAliases'
+
+    r = {}
+    r['domain_handle'] = domain_handle
+    r['resume_handle'] = 0
+    r['acct_flags'] = 0
+    r['max_size'] = -1
+
+    while 1:
+        result = dcerpc.samr_EnumDomainAliases(pipe, r)
+        if result['result'] == dcerpc.STATUS_MORE_ENTRIES:
+            r['resume_handle'] = result['resume_handle']
+            continue
+        break
+
+def test_QueryDisplayInfo(pipe, domain_handle):
+
+    print 'testing samr_QueryDisplayInfo'
+
+    levels = [1, 2, 3, 4, 5]
+
+    for i in range(0, len(levels)):
+
+        r = {}
+        r['domain_handle'] = domain_handle
+        r['level'] = levels[i]
+        r['start_idx'] = 0
+        r['max_entries'] = 1000
+        r['buf_size'] = -1
+
+        dcerpc.samr_QueryDisplayInfo(pipe, r)
+
+def test_QueryDisplayInfo2(pipe, domain_handle):
+
+    print 'testing samr_QueryDisplayInfo2'
+
+    levels = [1, 2, 3, 4, 5]
+
+    for i in range(0, len(levels)):
+
+        r = {}
+        r['domain_handle'] = domain_handle
+        r['level'] = levels[i]
+        r['start_idx'] = 0
+        r['max_entries'] = 1000
+        r['buf_size'] = -1
+
+        dcerpc.samr_QueryDisplayInfo2(pipe, r)
+    
+def test_QueryDisplayInfo3(pipe, domain_handle):
+
+    print 'testing samr_QueryDisplayInfo3'
+
+    levels = [1, 2, 3, 4, 5]
+
+    for i in range(0, len(levels)):
+
+        r = {}
+        r['domain_handle'] = domain_handle
+        r['level'] = levels[i]
+        r['start_idx'] = 0
+        r['max_entries'] = 1000
+        r['buf_size'] = -1
+
+        dcerpc.samr_QueryDisplayInfo3(pipe, r)
+
+def test_GetDisplayEnumerationIndex(pipe, domain_handle):
+
+    print 'testing samr_GetDisplayEnumerationIndex'
+
+    levels = [1, 2, 3, 4, 5]
+    ok_lvl = [1, 1, 1, 0, 0]
+
+    for i in range(0, len(levels)):
+
+        r = {}
+        r['domain_handle'] = domain_handle
+        r['level'] = levels[i]
+        r['name'] = {}
+        r['name']['name'] = 'samrtorturetest'
+
+        try:
+            dcerpc.samr_GetDisplayEnumerationIndex(pipe, r)
+        except dcerpc.NTSTATUS, arg:
+            if ok_lvl[i]:
+                raise dcerpc.NTSTATUS(arg)
+
+        r['name']['name'] = 'zzzzzzzz'
+
+        try:
+            dcerpc.samr_GetDisplayEnumerationIndex(pipe, r)
+        except dcerpc.NTSTATUS, arg:
+            if ok_lvl[i]:
+                raise dcerpc.NTSTATUS(arg)            
+
+def test_GetDisplayEnumerationIndex2(pipe, domain_handle):
+
+    print 'testing samr_GetDisplayEnumerationIndex2'
+
+    levels = [1, 2, 3, 4, 5]
+    ok_lvl = [1, 1, 1, 0, 0]
+
+    for i in range(0, len(levels)):
+
+        r = {}
+        r['domain_handle'] = domain_handle
+        r['level'] = levels[i]
+        r['name'] = {}
+        r['name']['name'] = 'samrtorturetest'
+
+        try:
+            dcerpc.samr_GetDisplayEnumerationIndex2(pipe, r)
+        except dcerpc.NTSTATUS, arg:
+            if ok_lvl[i]:
+                raise dcerpc.NTSTATUS(arg)
+
+        r['name']['name'] = 'zzzzzzzz'
+
+        try:
+            dcerpc.samr_GetDisplayEnumerationIndex2(pipe, r)
+        except dcerpc.NTSTATUS, arg:
+            if ok_lvl[i]:
+                raise dcerpc.NTSTATUS(arg)            
+
+def test_TestPrivateFunctionsDomain(pipe, domain_handle):
+
+    print 'test samr.TestPrivateFunctionsDomain'
+
+    r = {}
+    r['domain_handle'] = domain_handle
+
+    try:
+        dcerpc.samr_TestPrivateFunctionsDomain(pipe, r)
+    except dcerpc.NTSTATUS, arg:
+        if arg[0] != dcerpc.NT_STATUS_NOT_IMPLEMENTED:
+            raise dcerpc.NTSTATUS(arg)
+
+def test_RidToSid(pipe, domain_handle):
+
+    print 'testing samr_RidToSid'
+
+    r = {}
+    r['domain_handle'] = domain_handle
+    r['rid'] = 512
+
+    dcerpc.samr_RidToSid(pipe, r)
+
+def test_GetBootKeyInformation(pipe, domain_handle):
+
+    print 'testing samr_GetBootKeyInformation'
+
+    r = {}
+    r['domain_handle'] = domain_handle
+
+    try:
+        dcerpc.samr_GetBootKeyInformation(pipe, r)
+    except dcerpc.NTSTATUS, arg:
+        pass
+
+def test_DeleteUser(pipe, user_handle):
+
+    r = {}
+    r['user_handle'] = user_handle
+
+    dcerpc.samr_DeleteUser(pipe, r)
+
+def test_DeleteAlias(pipe, alias_handle):
+
+    r = {}
+    r['alias_handle'] = alias_handle
+
+    dcerpc.samr_DeleteDomAlias(pipe, r)
+    
+def test_DeleteDomainGroup(pipe, group_handle):
+
+    r = {}
+    r['group_handle'] = group_handle
+
+    dcerpc.samr_DeleteDomainGroup(pipe, r)
+
+def test_Close(pipe, handle):
+
+    r = {}
+    r['handle'] = handle
+
+    dcerpc.samr_Close(pipe, r)
+
+def test_OpenDomain(pipe, connect_handle, domain_sid):
+
+    print 'testing OpenDomain'
+
+    domain_handle = connect_handle.OpenDomain(domain_sid)
+
+    test_QuerySecurity(pipe, domain_handle)
+
+    test_RemoveMemberFromForeignDomain(pipe, domain_handle)
+
+    test_CreateUser2(pipe, domain_handle)
+
+    sys.exit(0)
+
+    user_handle = test_CreateUser(pipe, domain_handle)
+
+    alias_handle = test_CreateAlias(pipe, domain_handle, domain_sid)
+
+    group_handle = test_CreateDomainGroup(pipe, domain_handle)
+
+    test_QueryDomainInfo(pipe, domain_handle)
+    
+    test_QueryDomainInfo2(pipe, domain_handle)
+
+    test_EnumDomainUsers(pipe, domain_handle)
+
+    test_EnumDomainGroups(pipe, domain_handle)
+
+    test_EnumDomainAliases(pipe, domain_handle)
+
+    test_QueryDisplayInfo(pipe, domain_handle)
+
+    test_QueryDisplayInfo2(pipe, domain_handle)
+    
+    test_QueryDisplayInfo3(pipe, domain_handle)
+
+    test_GetDisplayEnumerationIndex(pipe, domain_handle)
+
+    test_GetDisplayEnumerationIndex2(pipe, domain_handle)
+
+    test_TestPrivateFunctionsDomain(pipe, domain_handle)
+
+    test_RidToSid(pipe, domain_handle)
+
+    test_GetBootKeyInformation(pipe, domain_handle)
+
+    if user_handle != None:
+        test_DeleteUser(pipe, user_handle)
+
+    if alias_handle != None:
+        test_DeleteAlias(pipe, alias_handle)
+
+    if group_handle != None:
+        test_DeleteDomainGroup(pipe, group_handle)
+
+    test_Close(pipe, domain_handle)
+    
+def test_LookupDomain(pipe, connect_handle, domain):
+
+    print 'testing LookupDomain'
+
+    sid = connect_handle.LookupDomain(domain)
+
+    try:
+        connect_handle.LookupDomain('xxNODOMAINxx')
+    except dcerpc.NTSTATUS, arg:
+        if arg[0] != 0xC00000DFL:          # NT_STATUS_NO_SUCH_DOMAIN
+            raise
+            
+    test_GetDomPwInfo(pipe, connect_handle, domain)
+    test_OpenDomain(pipe, connect_handle, sid)
+    
+def test_EnumDomains(pipe, connect_handle):
+
+    print 'testing EnumDomains'
+
+    for domain in connect_handle.EnumDomains():
+        test_LookupDomain(pipe, connect_handle, domain)
+
+def runtests(binding, domain, username, password):
+
+    print 'Testing SAMR pipe'
+
+    pipe = dcerpc.pipe_connect(binding,
+            dcerpc.DCERPC_SAMR_UUID, int(dcerpc.DCERPC_SAMR_VERSION),
+            domain, username, password)
+
+    handle = test_Connect(pipe)
+
+    test_QuerySecurity(pipe, handle)
+
+    test_EnumDomains(pipe, handle)
-- 
cgit 


From fd0aa010be16bd0a127fa3108b6b4a443ab6ebe6 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Sat, 12 Mar 2005 22:24:46 +0000
Subject: r5777: At some stage SIG_ATOMIC_T was renamed to sig_atomic_t.  This
 should fix abartlet's compile problem. (This used to be commit
 170139035ab1e7659a82e1e2d40990f4d7f146c3)

---
 source4/scripting/swig/tdb.i | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/tdb.i b/source4/scripting/swig/tdb.i
index 0b169510c1..0110f33824 100644
--- a/source4/scripting/swig/tdb.i
+++ b/source4/scripting/swig/tdb.i
@@ -35,14 +35,11 @@
 #undef HAVE_FSTAT
 #endif
 
-/* The tdb_set_lock_alarm() function requires the SIG_ATOMIC_T
-   function from includes.h */
+/* The tdb_set_lock_alarm() function requires the sig_atomic_t type */
 
 #include "include/config.h"
-#if defined(HAVE_SIG_ATOMIC_T_TYPE)
-typedef sig_atomic_t SIG_ATOMIC_T;
-#else
-typedef int SIG_ATOMIC_T;
+#if !defined(HAVE_SIG_ATOMIC_T_TYPE)
+typedef int sig_atomic_t
 #endif
 
 #if (__GNUC__ >= 3)
@@ -140,7 +137,7 @@ int tdb_lockall(TDB_CONTEXT *tdb);
 void tdb_unlockall(TDB_CONTEXT *tdb);
 
 /* Low level locking functions: use with care */
-void tdb_set_lock_alarm(SIG_ATOMIC_T *palarm);
+void tdb_set_lock_alarm(sig_atomic_t *palarm);
 int tdb_chainlock(TDB_CONTEXT *tdb, TDB_DATA key);
 int tdb_chainunlock(TDB_CONTEXT *tdb, TDB_DATA key);
 
-- 
cgit 


From 1fb7f63aa9ce8b1b1384a7c907fbe1c0bbc9cd92 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Sun, 13 Mar 2005 01:01:24 +0000
Subject: r5778: Remove tdb_set_lock_alarm() function from wrappers at tridge's
 request. (This used to be commit 8b83eca265b6ad5f33e90beac67f3e1621010764)

---
 source4/scripting/swig/tdb.i | 8 --------
 1 file changed, 8 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/tdb.i b/source4/scripting/swig/tdb.i
index 0110f33824..a3d1a6ebbc 100644
--- a/source4/scripting/swig/tdb.i
+++ b/source4/scripting/swig/tdb.i
@@ -35,13 +35,6 @@
 #undef HAVE_FSTAT
 #endif
 
-/* The tdb_set_lock_alarm() function requires the sig_atomic_t type */
-
-#include "include/config.h"
-#if !defined(HAVE_SIG_ATOMIC_T_TYPE)
-typedef int sig_atomic_t
-#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
@@ -137,7 +130,6 @@ int tdb_lockall(TDB_CONTEXT *tdb);
 void tdb_unlockall(TDB_CONTEXT *tdb);
 
 /* Low level locking functions: use with care */
-void tdb_set_lock_alarm(sig_atomic_t *palarm);
 int tdb_chainlock(TDB_CONTEXT *tdb, TDB_DATA key);
 int tdb_chainunlock(TDB_CONTEXT *tdb, TDB_DATA key);
 
-- 
cgit 


From e1e8928840b632297e3cbbd19aeef5e075ff7798 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Tue, 5 Apr 2005 07:58:02 +0000
Subject: r6208: Add cli_credentials support for swig wrappers.  For the moment
 it only does anonymous connections. (This used to be commit
 b09a4723539235fc924134aa50fc4aed040afb33)

---
 source4/scripting/swig/dcerpc.i                | 7 +++----
 source4/scripting/swig/samba.i                 | 6 ++++++
 source4/scripting/swig/torture/pytorture       | 2 +-
 source4/scripting/swig/torture/torture_samr.py | 5 ++---
 4 files changed, 12 insertions(+), 8 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/dcerpc.i b/source4/scripting/swig/dcerpc.i
index a1261f997d..a76e1301af 100644
--- a/source4/scripting/swig/dcerpc.i
+++ b/source4/scripting/swig/dcerpc.i
@@ -153,13 +153,12 @@ void set_werror_exception(int status)
 
 %rename(pipe_connect) dcerpc_pipe_connect;
 
-NTSTATUS dcerpc_pipe_connect(struct dcerpc_pipe **OUT,
+NTSTATUS dcerpc_pipe_connect(TALLOC_CTX *parent_ctx,
+	                     struct dcerpc_pipe **OUT,
                              const char *binding,
                              const char *pipe_uuid,
                              uint32_t pipe_version,
-                             const char *domain,
-                             const char *username,
-                             const char *password);
+			     struct cli_credentials *credentials);
 
 %typemap(in) DATA_BLOB * (DATA_BLOB temp_data_blob) {
 	temp_data_blob.data = PyString_AsString($input);
diff --git a/source4/scripting/swig/samba.i b/source4/scripting/swig/samba.i
index c7b8b46e66..620d908699 100644
--- a/source4/scripting/swig/samba.i
+++ b/source4/scripting/swig/samba.i
@@ -60,3 +60,9 @@
 %typemap(out) NTSTATUS {
         $result = PyLong_FromUnsignedLong(NT_STATUS_V($1));
 }
+
+%typemap(in) struct cli_credentials * {
+	$1 = cli_credentials_init(arg1);
+	cli_credentials_set_anonymous($1);
+//	cli_credentials_set_workstation($1, "FROGURT", CRED_SPECIFIED);
+}
diff --git a/source4/scripting/swig/torture/pytorture b/source4/scripting/swig/torture/pytorture
index fd4a92eeb4..e0123447e8 100755
--- a/source4/scripting/swig/torture/pytorture
+++ b/source4/scripting/swig/torture/pytorture
@@ -48,4 +48,4 @@ for test in args:
    if not hasattr(module, 'runtests'):
       print 'Module "%s" does not have a runtests function' % test
 
-   module.runtests(binding, domain, username, password)
+   module.runtests(binding, (domain, username, password))
diff --git a/source4/scripting/swig/torture/torture_samr.py b/source4/scripting/swig/torture/torture_samr.py
index 929420695d..2064d28044 100755
--- a/source4/scripting/swig/torture/torture_samr.py
+++ b/source4/scripting/swig/torture/torture_samr.py
@@ -721,13 +721,12 @@ def test_EnumDomains(pipe, connect_handle):
     for domain in connect_handle.EnumDomains():
         test_LookupDomain(pipe, connect_handle, domain)
 
-def runtests(binding, domain, username, password):
+def runtests(binding, creds):
 
     print 'Testing SAMR pipe'
 
     pipe = dcerpc.pipe_connect(binding,
-            dcerpc.DCERPC_SAMR_UUID, int(dcerpc.DCERPC_SAMR_VERSION),
-            domain, username, password)
+            dcerpc.DCERPC_SAMR_UUID, int(dcerpc.DCERPC_SAMR_VERSION), creds)
 
     handle = test_Connect(pipe)
 
-- 
cgit 


From d77e7cd774983e651ac6a2e679bdd6e6c73642d8 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Tue, 5 Apr 2005 09:18:36 +0000
Subject: r6210: Call cli_credentials_set_conf() when initialising credentials
 in cli_credentials typemap. (This used to be commit
 1c88e71ec645d10648f01e0405d29a4a83bc4036)

---
 source4/scripting/swig/samba.i | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/samba.i b/source4/scripting/swig/samba.i
index 620d908699..4e0e0b7659 100644
--- a/source4/scripting/swig/samba.i
+++ b/source4/scripting/swig/samba.i
@@ -64,5 +64,5 @@
 %typemap(in) struct cli_credentials * {
 	$1 = cli_credentials_init(arg1);
 	cli_credentials_set_anonymous($1);
-//	cli_credentials_set_workstation($1, "FROGURT", CRED_SPECIFIED);
+	cli_credentials_set_conf($1);
 }
-- 
cgit 


From 2543885bf3a012aa8004ff81670fde26033ff1ff Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Tue, 5 Apr 2005 09:38:51 +0000
Subject: r6211: Use cli_credentials_set_{domain,username,password}() to fill
 in command line arguments for credentials typemap.  Neat! (This used to be
 commit a3e7d71463053101e743a930f2648269d63ecaca)

---
 source4/scripting/swig/samba.i | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/samba.i b/source4/scripting/swig/samba.i
index 4e0e0b7659..25aef154cf 100644
--- a/source4/scripting/swig/samba.i
+++ b/source4/scripting/swig/samba.i
@@ -63,6 +63,23 @@
 
 %typemap(in) struct cli_credentials * {
 	$1 = cli_credentials_init(arg1);
-	cli_credentials_set_anonymous($1);
 	cli_credentials_set_conf($1);
+	if ($input == Py_None) {
+		cli_credentials_set_anonymous($1);
+	} else {
+		if (!PyTuple_Check($input) ||
+		    PyTuple_Size($input) != 3) {
+			PyErr_SetString(PyExc_TypeError, "Expecting three element tuple");
+			return NULL;
+		}
+		if (!PyString_Check(PyTuple_GetItem($input, 0)) ||
+		    !PyString_Check(PyTuple_GetItem($input, 1)) ||
+		    !PyString_Check(PyTuple_GetItem($input, 2))) {
+			PyErr_SetString(PyExc_TypeError, "Expecting string elements");
+			return NULL;
+		}
+		cli_credentials_set_domain($1, PyString_AsString(PyTuple_GetItem($input, 0)), CRED_SPECIFIED);
+		cli_credentials_set_username($1, PyString_AsString(PyTuple_GetItem($input, 1)), CRED_SPECIFIED);
+		cli_credentials_set_password($1, PyString_AsString(PyTuple_GetItem($input, 2)), CRED_SPECIFIED);
+	}
 }
-- 
cgit 


From 3b64edcfff68a696efb1d4e3aadfdd7dc339c49f Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Tue, 5 Apr 2005 11:47:21 +0000
Subject: r6212: Treat uint8 and int8's as integers instead of chars.  Swig
 maps a char to a string when we really want an integer. (This used to be
 commit 86c62b92e84a6eb1e756a7125777587583a9276e)

---
 source4/scripting/swig/samba.i | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/samba.i b/source4/scripting/swig/samba.i
index 25aef154cf..1446f9a8d5 100644
--- a/source4/scripting/swig/samba.i
+++ b/source4/scripting/swig/samba.i
@@ -24,8 +24,8 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-%apply unsigned char { uint8_t };
-%apply char { int8_t };
+%apply int { uint8_t };
+%apply int { int8_t };
 %apply unsigned int { uint16_t };
 %apply int { int16_t };
 %apply unsigned long long { uint64_t };
-- 
cgit 


From f0641cae5d39eaf4c26881be53f946367a1f49b9 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Tue, 5 Apr 2005 11:48:16 +0000
Subject: r6213: Add %array_functions for struct samr_String so we can create
 and access arrays of them. (This used to be commit
 fc2b73d4d75f383108632935ba047890c816b283)

---
 source4/scripting/swig/dcerpc.i | 1 +
 1 file changed, 1 insertion(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/dcerpc.i b/source4/scripting/swig/dcerpc.i
index a76e1301af..d4de8365f2 100644
--- a/source4/scripting/swig/dcerpc.i
+++ b/source4/scripting/swig/dcerpc.i
@@ -228,6 +228,7 @@ char *nt_errstr(NTSTATUS nt_code);
    pidl to automatically generating these instead of having to find
    them all by hand. */
 
+%array_functions(struct samr_String, samr_String_array);
 %array_functions(struct samr_SamEntry, samr_SamEntry_array);
 %array_functions(union samr_ConnectInfo, samr_ConnectInfo_array);
 
-- 
cgit 


From b796dc40771f082939e491180570e9697c03cf28 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Tue, 5 Apr 2005 11:50:47 +0000
Subject: r6214: Fix typo in DomainHandle.OpenUser() function.

Implement DomainHandle.LookupNames() function.

UserHandle.DeleteUser() closes the handle so don't try and close it
when the GC destroys the class instance.
(This used to be commit 57680163bcc1aa5c707a64dcd1d0998dbc9f0659)
---
 source4/scripting/swig/samr.py | 25 ++++++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/samr.py b/source4/scripting/swig/samr.py
index 22b591930c..9782a9fc7b 100644
--- a/source4/scripting/swig/samr.py
+++ b/source4/scripting/swig/samr.py
@@ -323,7 +323,7 @@ class DomainHandle(SamrHandle):
 
         call_fn(dcerpc.dcerpc_samr_OpenUser, self.pipe, r)
 
-        return UserHandle(pipe, r.data_out.user_handle)
+        return UserHandle(self.pipe, r.data_out.user_handle)
 
     def OpenGroup(self, rid, access_mask = 0x02000000):
 
@@ -363,7 +363,24 @@ class DomainHandle(SamrHandle):
         r.data_in.sid = sid
 
         call_fn(dcerpc.dcerpc_samr_RemoveMemberFromForeignDomain, self.pipe, r)
-    
+
+    def LookupNames(self, names):
+
+        r = dcerpc.samr_LookupNames()
+        r.data_in.domain_handle = self.handle
+        r.data_in.num_names = len(names)
+        r.data_in.names = dcerpc.new_samr_String_array(len(names))
+
+        for i in range(len(names)):
+            s = dcerpc.samr_String()
+            s.string = names[i]
+            dcerpc.samr_String_array_setitem(r.data_in.names, i, s)
+
+        call_fn(dcerpc.dcerpc_samr_LookupNames, self.pipe, r)
+
+        return ([dcerpc.uint32_array_getitem(r.data_out.rids.ids, i) for i in range(r.data_out.rids.count)],
+                [dcerpc.uint32_array_getitem(r.data_out.types.ids, i) for i in range(r.data_out.types.count)])
+
 
 class UserHandle(SamrHandle):
 
@@ -371,8 +388,10 @@ class UserHandle(SamrHandle):
 
         r = dcerpc.samr_DeleteUser()
         r.data_in.user_handle = self.handle
-
+        
         call_fn(dcerpc.dcerpc_samr_DeleteUser, self.pipe, r)
+
+        self.handle = None
     
 
 class GroupHandle(SamrHandle):
-- 
cgit 


From 86122d78e5356c0bce7dc0f6599d0efb2d09ee7c Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Tue, 5 Apr 2005 11:54:53 +0000
Subject: r6215: Add test for LookupNames.  Fix CreateUser2 test. (This used to
 be commit e3a69a73222ae3277c2d10d33c5c71b7a14da789)

---
 source4/scripting/swig/torture/torture_samr.py | 41 ++++++--------------------
 1 file changed, 9 insertions(+), 32 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/torture/torture_samr.py b/source4/scripting/swig/torture/torture_samr.py
index 2064d28044..ececbc9db6 100755
--- a/source4/scripting/swig/torture/torture_samr.py
+++ b/source4/scripting/swig/torture/torture_samr.py
@@ -49,7 +49,7 @@ def test_CreateUser2(pipe, domain_handle):
         return domain_handle.CreateUser2(username, 0x0080) # WSTRUST
     except dcerpc.NTSTATUS, arg:
         if arg[0] == 0x0c0000063L:
-            domain_handle.OpenUser(username).DeleteUser()
+            test_OpenUser_byname(pipe, domain_handle, username).DeleteUser()
             return domain_handle.CreateUser2(username)
         raise
 
@@ -57,44 +57,21 @@ def test_LookupName(pipe, domain_handle, name):
 
     print 'test samr_LookupNames'
 
-    r = {}
-    r['domain_handle'] = domain_handle
-    r['num_names'] = 1
-    r['names'] = []
-    r['names'].append({'name': name})
-
-    result = dcerpc.samr_LookupNames(pipe, r)
-
-    rid = result['rids']['ids'][0]
-
-    r['num_names'] = 2
-    r['names'].append({'name': 'xxNONAMExx'})
-
+    domain_handle.LookupNames(['Administrator', 'xxNONAMExx'])
 
     try:
-        dcerpc.samr_LookupNames(pipe, r)
+        domain_handle.LookupNames(['xxNONAMExx'])
     except dcerpc.NTSTATUS, arg:
-        if arg[0] != dcerpc.STATUS_SOME_UNMAPPED:
+        if arg[0] != 0xc0000073L:
             raise dcerpc.NTSTATUS(arg)
 
-    r['num_names'] = 0
-
-    dcerpc.samr_LookupNames(pipe, r)
-
-    return rid
+    return domain_handle.LookupNames([name])
 
 def test_OpenUser_byname(pipe, domain_handle, user_name):
 
-    rid = test_LookupName(pipe, domain_handle, user_name)
-
-    r = {}
-    r['domain_handle'] = domain_handle
-    r['access_mask'] = 0x02000000
-    r['rid'] = rid
-
-    result = dcerpc.samr_OpenUser(pipe, r)
+    rids, types = test_LookupName(pipe, domain_handle, user_name)
 
-    return result['user_handle']
+    return domain_handle.OpenUser(rids[0])
 
 def test_DeleteUser_byname(pipe, domain_handle, user_name):
 
@@ -218,7 +195,7 @@ def test_CreateUser(pipe, domain_handle):
 
 def test_DeleteAlias_byname(pipe, domain_handle, alias_name):
 
-    rid = test_LookupName(pipe, domain_handle, alias_name)
+    rid = test_LookupNames(pipe, domain_handle, alias_name)
 
     r = {}
     r['domain_handle'] = domain_handle
@@ -339,7 +316,7 @@ def test_CreateAlias(pipe, domain_handle, domain_sid):
 
 def test_DeleteGroup_byname(pipe, domain_handle, group_name):
     
-    rid = test_LookupName(pipe, domain_handle, group_name)
+    rid = test_LookupNames(pipe, domain_handle, group_name)
 
     r = {}
     r['domain_handle'] = domain_handle
-- 
cgit 


From 602be3fd493984bd85ddc6b2e1c98cd699bdd2a3 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Wed, 13 Apr 2005 05:57:51 +0000
Subject: r6324: Pass server name instead of binding string on command line
 (always use ncacn_np for the moment).

Fix rpcclient to work with struct cli_credentials.
(This used to be commit 162d3609a1f46683151d201a5404d0456d76b726)
---
 source4/scripting/swig/rpcclient | 41 +++++++++++++++++++---------------------
 1 file changed, 19 insertions(+), 22 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/rpcclient b/source4/scripting/swig/rpcclient
index 8f33a6133b..faf5b3ec09 100755
--- a/source4/scripting/swig/rpcclient
+++ b/source4/scripting/swig/rpcclient
@@ -28,9 +28,9 @@ class rpcclient(Cmd):
 
     prompt = 'rpcclient$ '
 
-    def __init__(self, binding, domain, username, password):
+    def __init__(self, server, domain, username, password):
         Cmd.__init__(self)
-        self.binding = binding
+        self.server = server
         self.domain = domain
         self.username = username
         self.password = password
@@ -83,9 +83,9 @@ class rpcclient(Cmd):
             return
 
         pipe = dcerpc.pipe_connect(
-            self.binding,
+            'ncacn_np:%s' % self.server,
             dcerpc.DCERPC_SAMR_UUID, int(dcerpc.DCERPC_SAMR_VERSION),
-            self.domain, self.username, self.password)
+            (self.domain, self.username, self.password))
 
         connect_handle = samr.Connect(pipe)
 
@@ -105,9 +105,9 @@ class rpcclient(Cmd):
             return
 
         pipe = dcerpc.pipe_connect(
-            self.binding,
+            'ncacn_np:%s' % self.server,
             dcerpc.DCERPC_SAMR_UUID, int(dcerpc.DCERPC_SAMR_VERSION),
-            self.domain, self.username, self.password)
+            (self.domain, self.username, self.password))
 
         connect_handle = samr.Connect(pipe)
 
@@ -126,9 +126,9 @@ class rpcclient(Cmd):
 	    return
 
         pipe = dcerpc.pipe_connect(
-            self.binding,
+            'ncacn_np:%s' % self.server,
             dcerpc.DCERPC_SAMR_UUID, int(dcerpc.DCERPC_SAMR_VERSION),
-            self.domain, self.username, self.password)
+            (self.domain, self.username, self.password))
 
         connect_handle = samr.Connect(pipe)
 	domain_handle = connect_handle.OpenDomain(args[0])
@@ -153,9 +153,9 @@ class rpcclient(Cmd):
 	    return
 
         pipe = dcerpc.pipe_connect(
-            self.binding,
+            'ncacn_np:%s' % self.server,
             dcerpc.DCERPC_SAMR_UUID, int(dcerpc.DCERPC_SAMR_VERSION),
-            self.domain, self.username, self.password)
+            (self.domain, self.username, self.password))
 
         connect_handle = samr.Connect(pipe)
 	domain_handle = connect_handle.OpenDomain(args[0])
@@ -180,9 +180,9 @@ class rpcclient(Cmd):
             return
 
         pipe = dcerpc.pipe_connect(
-            self.binding,
+            'ncacn_np:%s' % self.server,
             dcerpc.DCERPC_SAMR_UUID, int(dcerpc.DCERPC_SAMR_VERSION),
-            self.domain, self.username, self.password)
+            (self.domain, self.username, self.password))
 
         connect_handle = samr.Connect(pipe)	
 	domain_handle = connect_handle.OpenDomain(args[0])
@@ -205,9 +205,9 @@ class rpcclient(Cmd):
             return
 
         pipe = dcerpc.pipe_connect(
-            self.binding,
+            'ncacn_np:%s' % self.server,
             dcerpc.DCERPC_SAMR_UUID, int(dcerpc.DCERPC_SAMR_VERSION),
-            self.domain, self.username, self.password)
+            (self.domain, self.username, self.password))
 
         connect_handle = samr.Connect(pipe)
         domain_handle = connect_handle.OpenDomain(args[0])
@@ -229,9 +229,9 @@ class rpcclient(Cmd):
 	    return
 
         pipe = dcerpc.pipe_connect(
-            self.binding,
+            'ncacn_np:%s' % self.server,
             dcerpc.DCERPC_SAMR_UUID, int(dcerpc.DCERPC_SAMR_VERSION),
-            self.domain, self.username, self.password)
+            (self.domain, self.username, self.password))
 
         connect_handle = samr.Connect(pipe)
         domain_handle = connect_handle.OpenDomain(args[0])
@@ -247,18 +247,15 @@ if __name__ == '__main__':
 
     # Parse command line
 
-    usage = 'rpcclient BINDING [options]'
+    usage = 'rpcclient SERVER [options]'
 
     if len(sys.argv) == 1:
         print usage
         sys.exit(1)
 
-    binding = sys.argv[1]
+    server = sys.argv[1]
     del(sys.argv[1])
 
-    if string.find(binding, ':') == -1:
-        binding = 'ncacn_np:' + binding
-
     parser = OptionParser(usage)
 
     parser.add_option('-U', '--username', action='store', type='string',
@@ -288,7 +285,7 @@ if __name__ == '__main__':
 
     # Run command loop
 
-    c = rpcclient(binding, domain, username, password)
+    c = rpcclient(server, domain, username, password)
 
     if options.command:
         c.onecmd(options.command)
-- 
cgit 


From 041e4672085e9083ce4ce40d0af923fd55d0e454 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Wed, 13 Apr 2005 07:12:17 +0000
Subject: r6326: Add %array_functions for struct lsa_SidPtr.

Pull in the auto-generated interface file for the lsa pipe
(whaddayaknow it compiled first go!)
(This used to be commit fd884ec433c825759624a47541521cbd3d07f5a1)
---
 source4/scripting/swig/dcerpc.i | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/dcerpc.i b/source4/scripting/swig/dcerpc.i
index d4de8365f2..e41d9e4e2f 100644
--- a/source4/scripting/swig/dcerpc.i
+++ b/source4/scripting/swig/dcerpc.i
@@ -232,6 +232,9 @@ char *nt_errstr(NTSTATUS nt_code);
 %array_functions(struct samr_SamEntry, samr_SamEntry_array);
 %array_functions(union samr_ConnectInfo, samr_ConnectInfo_array);
 
+%array_functions(struct lsa_SidPtr, lsa_SidPtr_array);
+
 %include "librpc/gen_ndr/misc.i"
 %include "librpc/gen_ndr/security.i"
 %include "librpc/gen_ndr/samr.i"
+%include "librpc/gen_ndr/lsa.i"
-- 
cgit 


From 621588c9e6cc4d72212f495de3ed95c47d37fbfd Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Wed, 13 Apr 2005 07:13:00 +0000
Subject: r6327: Add LSA objects to dcerpc swig library. (This used to be
 commit b6e883a613e35ec3d5541a45efb80345578e2460)

---
 source4/scripting/swig/config.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/config.mk b/source4/scripting/swig/config.mk
index 70dab7c28d..fad6b68bda 100644
--- a/source4/scripting/swig/config.mk
+++ b/source4/scripting/swig/config.mk
@@ -8,4 +8,4 @@ REQUIRED_SUBSYSTEMS = LIBTDB
 MAJOR_VERSION = 0
 MINOR_VERSION = 0
 RELEASE_VERSION = 1
-REQUIRED_SUBSYSTEMS = LIBCLI NDR_MISC LIBBASIC CONFIG RPC_NDR_SAMR
+REQUIRED_SUBSYSTEMS = LIBCLI NDR_MISC LIBBASIC CONFIG RPC_NDR_SAMR RPC_NDR_LSA
-- 
cgit 


From 0545dfe8565699b030b65e525d6a9649dcc7118c Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Wed, 13 Apr 2005 07:14:33 +0000
Subject: r6328: Fix bug in OpenAlias.

Implement DeleteDomAlias, QueryAliasInfo, SetAliasInfo,
AddAliasMember, and AddMultipleMembersToAlias.

Fix one of those annoying large integer warnings.
(This used to be commit 25ed39651b020c9e4bda1d8aa8e2d78f918be3a2)
---
 source4/scripting/swig/samr.py | 75 +++++++++++++++++++++++++++++++++++++-----
 1 file changed, 66 insertions(+), 9 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/samr.py b/source4/scripting/swig/samr.py
index 9782a9fc7b..8c0d3d32c0 100644
--- a/source4/scripting/swig/samr.py
+++ b/source4/scripting/swig/samr.py
@@ -94,7 +94,7 @@ def call_fn(fn, pipe, args):
     
     result = fn(pipe, args);
 
-    if result & 0xc0000000:
+    if result & 0xc0000000L:
         raise dcerpc.NTSTATUS(result, dcerpc.nt_errstr(result));
 
     return result;
@@ -345,7 +345,20 @@ class DomainHandle(SamrHandle):
 
         call_fn(dcerpc.dcerpc_samr_OpenAlias, self.pipe, r)
 
-        return AliasHandle(pipe, r.data_out.group_handle)
+        return AliasHandle(self.pipe, r.data_out.alias_handle)
+
+    def CreateDomAlias(self, alias_name, access_mask = 0x02000000):
+
+        r = dcerpc.samr_CreateDomAlias()
+        r.data_in.domain_handle = self.handle
+        r.data_in.alias_name = dcerpc.samr_String()
+        r.data_in.alias_name.string = alias_name
+        r.data_in.access_mask = access_mask
+
+        call_fn(dcerpc.dcerpc_samr_CreateDomAlias, self.pipe, r)
+
+        return (AliasHandle(self.pipe, r.data_out.alias_handle),
+                r.data_out.rid)    
 
     def RidToSid(self, rid):
 
@@ -399,8 +412,57 @@ class GroupHandle(SamrHandle):
     
 
 class AliasHandle(SamrHandle):
-    pass
-    
+
+    def DeleteDomAlias(self):
+
+        r = dcerpc.samr_DeleteDomAlias()
+        r.data_in.alias_handle = self.handle
+
+        call_fn(dcerpc.dcerpc_samr_DeleteDomAlias, self.pipe, r)
+
+        self.handle = None
+
+    def QueryAliasInfo(self, level = 1):
+
+        r = dcerpc.samr_QueryAliasInfo()
+        r.data_in.alias_handle = self.handle
+        r.data_in.level = level
+
+        call_fn(dcerpc.dcerpc_samr_QueryAliasInfo, self.pipe, r)
+
+        return r.data_out.info
+
+    def SetAliasInfo(self, level, info):
+
+        r = dcerpc.samr_SetAliasInfo()
+        r.data_in.alias_handle = self.handle
+        r.data_in.level = level
+        r.data_in.info = info
+
+        call_fn(dcerpc.dcerpc_samr_SetAliasInfo, self.pipe, r)
+
+    def AddAliasMember(self, sid):
+
+        r = dcerpc.samr_AddAliasMember()
+        r.data_in.alias_handle = self.handle
+        r.data_in.sid = string_to_sid(sid)
+
+        call_fn(dcerpc.dcerpc_samr_AddAliasMember, self.pipe, r)
+
+    def AddMultipleMembersToAlias(self, sids):
+
+        r = dcerpc.samr_AddMultipleMembersToAlias()
+        r.data_in.alias_handle = self.handle
+        r.data_in.sids = dcerpc.lsa_SidArray()
+        r.data_in.sids.num_sids = len(sids)
+        r.data_in.sids.sids = dcerpc.new_lsa_SidPtr_array(len(sids))
+
+        for i in range(len(sids)):
+            s = dcerpc.lsa_SidPtr()
+            s.sid = string_to_sid(sids[i])
+            dcerpc.lsa_SidPtr_array_setitem(r.data_in.sids.sids, i, s)
+
+        call_fn(dcerpc.dcerpc_samr_AddMultipleMembersToAlias, self.pipe, r)
 
 def Connect(pipe, access_mask = 0x02000000):
 
@@ -466,7 +528,6 @@ def Connect5(pipe, system_name = '', access_mask = 0x02000000):
     
     
 # CreateDomainGroup
-# CreateDomAlias
 # GetAliasMembership
 # LookupNames
 # QueryGroupInfo
@@ -476,9 +537,6 @@ def Connect5(pipe, system_name = '', access_mask = 0x02000000):
 # DeleteGroupMember
 # QueryGroupMember
 # SetMemberAttributesofGroup
-# QueryAliasInfo
-# SetAliasInfo
-# DeleteDomAlias
 # AddAliasMember
 # DeleteAliasMember
 # GetMembersinAlias
@@ -497,7 +555,6 @@ def Connect5(pipe, system_name = '', access_mask = 0x02000000):
 # QueryDisplayInfo2
 # GetDisplayEnumerationIndex2
 # QueryDisplayInfo3
-# AddMultipleMembersToAlias
 # RemoveMultipleMembersFromAlias
 # OemChangePasswordUser2
 # ChangePasswordUser2
-- 
cgit 


From 6f036daaa4a3f8c73512a7549a399e9b0f1f2758 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Wed, 13 Apr 2005 07:15:43 +0000
Subject: r6329: Write tests for newly implemented alias functions. (This used
 to be commit 30d0c9fb2ededb86e40b985820a426f8df84053b)

---
 source4/scripting/swig/torture/torture_samr.py | 171 ++++++++-----------------
 1 file changed, 52 insertions(+), 119 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/torture/torture_samr.py b/source4/scripting/swig/torture/torture_samr.py
index ececbc9db6..2d1dfb6a95 100755
--- a/source4/scripting/swig/torture/torture_samr.py
+++ b/source4/scripting/swig/torture/torture_samr.py
@@ -11,7 +11,7 @@ def test_Connect(pipe):
     handle = samr.Connect2(pipe)
     handle = samr.Connect3(pipe)
     handle = samr.Connect4(pipe)
-    handle = samr.Connect5(pipe)
+#    handle = samr.Connect5(pipe) # win2k3 only?
 
     return handle
     
@@ -33,7 +33,7 @@ def test_GetDomPwInfo(pipe, handle, domain):
 
 def test_RemoveMemberFromForeignDomain(pipe, domain_handle):
 
-    print 'test RemoveMemberFromForeignDomain'
+    print 'testing RemoveMemberFromForeignDomain'
 
     sid = samr.string_to_sid('S-1-5-32-12-34-56-78-9')
 
@@ -41,7 +41,7 @@ def test_RemoveMemberFromForeignDomain(pipe, domain_handle):
 
 def test_CreateUser2(pipe, domain_handle):
 
-    print 'test CreateUser2'
+    print 'testing CreateUser2'
 
     username = 'samrtorturemach$'
 
@@ -55,7 +55,7 @@ def test_CreateUser2(pipe, domain_handle):
 
 def test_LookupName(pipe, domain_handle, name):
 
-    print 'test samr_LookupNames'
+    print 'testing samr_LookupNames'
 
     domain_handle.LookupNames(['Administrator', 'xxNONAMExx'])
 
@@ -84,7 +84,7 @@ def test_DeleteUser_byname(pipe, domain_handle, user_name):
 
 def test_QueryUserInfo(pipe, user_handle):
 
-    print 'test samr_QueryUserInfo'
+    print 'testing samr_QueryUserInfo'
 
     levels = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 16, 17, 20, 21]
 
@@ -97,7 +97,7 @@ def test_QueryUserInfo(pipe, user_handle):
 
 def test_QueryUserInfo2(pipe, user_handle):
 
-    print 'test samr_QueryUserInfo2'
+    print 'testing samr_QueryUserInfo2'
 
     levels = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 16, 17, 20, 21]
 
@@ -126,7 +126,7 @@ def test_SetUserInfo(pipe, user_handle):
 
 def test_GetUserPwInfo(pipe, user_handle):
 
-    print 'test samr_GetUserpwInfo'
+    print 'testing samr_GetUserpwInfo'
 
     r = {}
     r['user_handle'] = user_handle
@@ -135,7 +135,7 @@ def test_GetUserPwInfo(pipe, user_handle):
 
 def test_TestPrivateFunctionsUser(pipe, user_handle):
 
-    print 'test samr.TestPrivateFunctionsUser'
+    print 'testing samr.TestPrivateFunctionsUser'
 
     r = {}
     r['user_handle'] = user_handle
@@ -162,64 +162,14 @@ def test_user_ops(pipe, user_handle):
 
 def test_CreateUser(pipe, domain_handle):
 
-    print 'test samr_CreateUser'
-    
-    r = {}
-    r['domain_handle'] = domain_handle
-    r['account_name'] = {}
-    r['account_name']['name'] = 'samrtorturetest'
-    r['access_mask'] = 0x02000000
+    username = 'samrtorturetest'
 
     try:
-        result = dcerpc.samr_CreateUser(pipe, r)
+        return domain_handle.CreateUser(username)
     except dcerpc.NTSTATUS, arg:
-        if arg[0] == dcerpc.NT_STATUS_ACCESS_DENIED:
-            return
-        elif arg[0] == dcerpc.NT_STATUS_USER_EXISTS:
-            test_DeleteUser_byname(pipe, domain_handle, 'samrtorturetest')
-            result = dcerpc.samr_CreateUser(pipe, r)
-        else:
-            raise dcerpc.NTSTATUS(arg)
-
-    user_handle = result['user_handle']
-
-    q = {}
-    q['user_handle'] = user_handle
-    q['level'] = 16
-
-    dcerpc.samr_QueryUserInfo(pipe, q)
-
-    test_user_ops(pipe, user_handle)
-
-    return user_handle
-
-def test_DeleteAlias_byname(pipe, domain_handle, alias_name):
-
-    rid = test_LookupNames(pipe, domain_handle, alias_name)
-
-    r = {}
-    r['domain_handle'] = domain_handle
-    r['access_mask'] = 0x02000000
-    r['rid'] = rid
-
-    result = dcerpc.samr_OpenAlias(pipe, r)
-
-    s = {}
-    s['alias_handle'] = result['alias_handle']
-
-    dcerpc.samr_DeleteDomAlias(pipe, s)
-
-def test_QueryAliasInfo(pipe, alias_handle):
-
-    levels = [1, 2, 3]
-
-    for i in range(0, len(levels)):
-
-        r = {}
-        r['alias_handle'] = alias_handle
-        r['level']  = levels[i]
-
-        dcerpc.samr_QueryAliasInfo(pipe, r)
+        if arg[0] == 0xc0000063L:
+            test_OpenUser_byname(pipe, domain_handle, username).DeleteUser()
+            return domain_handle.CreateUser(username)
 
 def test_SetAliasInfo(pipe, alias_handle):
 
@@ -240,79 +190,62 @@ def test_SetAliasInfo(pipe, alias_handle):
     
     dcerpc.samr_SetAliasInfo(pipe, r)
 
-def test_AddMemberToAlias(pipe, alias_handle, domain_sid):
-
-    r = {}
-    r['alias_handle'] = alias_handle
-    r['sid'] = domain_sid
-
-    r['sid']['num_auths'] = r['sid']['num_auths'] + 1
-    r['sid']['sub_auths'].append(512)
+def test_Aliases(pipe, domain_handle, domain_sid):
 
-    dcerpc.samr_AddAliasMember(pipe, r)
+    print 'testing aliases'
 
-    dcerpc.samr_DeleteAliasMember(pipe, r)
+    aliasname = 'samrtorturetestalias'
 
-def test_AddMultipleMembersToAlias(pipe, alias_handle):
+    # Create a new alias
 
-    r = {}
-    r['alias_handle'] = alias_handle
-    r['sids'] = {}
-    r['sids']['num_sids'] = 2
-    r['sids']['sids'] = []
+    try:
 
-    for i in range(0,2):
-        sid = {}
-        sid['sid_rev_num'] = 1
-        sid['id_auth'] = [0, 0, 0, 0, 0, 5]
-        sid['num_auths'] = 5
-        sid['sub_auths'] = [21, 737922324, -1292160505, 1285293260, 512 + i]
+        handle, rid = domain_handle.CreateDomAlias(aliasname)
 
-        r['sids']['sids'].append({'sid': sid})
+    except dcerpc.NTSTATUS, arg:
 
-    dcerpc.samr_AddMultipleMembersToAlias(pipe, r)
+        if arg[0] == 0x0c0000154L:
 
-    dcerpc.samr_RemoveMultipleMembersFromAlias(pipe, r)
+            # Alias exists, delete it and try again
 
-def test_alias_ops(pipe, alias_handle, domain_sid):
+            rids, types = domain_handle.LookupNames([aliasname])
+            domain_handle.OpenAlias(rids[0]).DeleteDomAlias()
 
-    test_QuerySecurity(pipe, alias_handle)
+            handle, rid = domain_handle.CreateDomAlias(aliasname)
+            
+        else:
+            raise
 
-    test_QueryAliasInfo(pipe, alias_handle)
+    # QuerySecurity/GetSecurity
 
-    test_SetAliasInfo(pipe, alias_handle)
+    handle.SetSecurity(handle.QuerySecurity())
 
-    test_AddMemberToAlias(pipe, alias_handle, domain_sid)
+    # QueryAliasInfo/SetAliasInfo
 
-    test_AddMultipleMembersToAlias(pipe, alias_handle)
+    for i in [1, 2, 3]:
+        info = handle.QueryAliasInfo(i)
+        try:
+            handle.SetAliasInfo(i, info)
+        except dcerpc.NTSTATUS, arg:
 
-def test_CreateAlias(pipe, domain_handle, domain_sid):
+            # Can't set alias info level 1
 
-    print 'test samr_CreateAlias'    
+            if not (arg[0] == 0xC0000003L and i == 1):
+                raise
 
-    alias_name = 'samrtorturetestalias'
+    # AddAliasMember
 
-    r = {}
-    r['domain_handle'] = domain_handle
-    r['aliasname'] = {}
-    r['aliasname']['name'] = alias_name
-    r['access_mask'] = 0x02000000
+    handle.AddAliasMember('S-1-5-21-1606980848-1677128483-854245398-500')
 
-    try:
-        result = dcerpc.samr_CreateDomAlias(pipe, r)
-    except dcerpc.NTSTATUS, arg:
-        if arg[0] == dcerpc.NT_STATUS_ACCESS_DENIED:
-            return
-        if arg[0] != dcerpc.NT_STATUS_USER_EXISTS:
-            raise dcerpc.NTSTATUS(arg)
-        test_DeleteAlias_byname(pipe, domain_handle, alias_name)
-        result = dcerpc.samr_CreateDomAlias(pipe, r)
+    # AddMultipleMembersToAlias
 
-    alias_handle = result['alias_handle']
+    handle.AddMultipleMembersToAlias(
+        ['S-1-5-21-1606980848-1677128483-854245398-501',
+         'S-1-5-21-1606980848-1677128483-854245398-502'])
 
-    test_alias_ops(pipe, alias_handle, domain_sid)
+    # DeleteDomAlias
 
-    return alias_handle
+    handle.DeleteDomAlias()
 
 def test_DeleteGroup_byname(pipe, domain_handle, group_name):
     
@@ -558,7 +491,7 @@ def test_GetDisplayEnumerationIndex2(pipe, domain_handle):
 
 def test_TestPrivateFunctionsDomain(pipe, domain_handle):
 
-    print 'test samr.TestPrivateFunctionsDomain'
+    print 'testing samr.TestPrivateFunctionsDomain'
 
     r = {}
     r['domain_handle'] = domain_handle
@@ -631,13 +564,13 @@ def test_OpenDomain(pipe, connect_handle, domain_sid):
 
     test_CreateUser2(pipe, domain_handle)
 
-    sys.exit(0)
+    test_CreateUser(pipe, domain_handle)
 
-    user_handle = test_CreateUser(pipe, domain_handle)
+    test_Aliases(pipe, domain_handle, domain_sid)
 
-    alias_handle = test_CreateAlias(pipe, domain_handle, domain_sid)
+    sys.exit(0)
 
-    group_handle = test_CreateDomainGroup(pipe, domain_handle)
+    test_CreateDomainGroup(pipe, domain_handle)
 
     test_QueryDomainInfo(pipe, domain_handle)
     
-- 
cgit 


From c06297f776d92354e92f0ddda659778d57f426e5 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Mon, 25 Apr 2005 12:15:19 +0000
Subject: r6469: Add CreateDomainGroup, GetAliasMembership. (This used to be
 commit acf1d0a1b554736361f38bcd74961d4e6c1b12bd)

---
 source4/scripting/swig/samr.py | 30 ++++++++++++++++++++++++++----
 1 file changed, 26 insertions(+), 4 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/samr.py b/source4/scripting/swig/samr.py
index 8c0d3d32c0..4ba58c1c04 100644
--- a/source4/scripting/swig/samr.py
+++ b/source4/scripting/swig/samr.py
@@ -394,6 +394,32 @@ class DomainHandle(SamrHandle):
         return ([dcerpc.uint32_array_getitem(r.data_out.rids.ids, i) for i in range(r.data_out.rids.count)],
                 [dcerpc.uint32_array_getitem(r.data_out.types.ids, i) for i in range(r.data_out.types.count)])
 
+    def CreateDomainGroup(self, domain_name, access_mask = 0x02000000):
+
+        r = dcerpc.samr_CreateDomainGroup()
+        r.data_in.domain_handle = self.handle
+        r.data_in.name = dcerpc.samr_String()
+        r.data_in.name.string = domain_name
+        r.data_in.access_mask = access_mask
+
+        call_fn(dcerpc.dcerpc_samr_CreateDomainGroup, self.pipe, r)
+
+    def GetAliasMembership(self, sids):
+
+        r = dcerpc.samr_GetAliasMembership()
+        r.data_in.domain_handle = self.handle
+        r.data_in.sids = dcerpc.lsa_SidArray()
+        r.data_in.sids.num_sids = len(sids)
+        r.data_in.sids.sids = dcerpc.new_lsa_SidPtr_array(len(sids))
+
+        for i in range(len(sids)):
+            s = dcerpc.lsa_SidPtr()
+            s.sid = string_to_sid(sids[i])
+            dcerpc.lsa_SidPtr_array_setitem(r.data_in.sids.sids, i, s)
+
+        call_fn(dcerpc.dcerpc_samr_GetAliasMembership, self.pipe, r)
+
+        return [r.ids[x] x in range(r.count)]
 
 class UserHandle(SamrHandle):
 
@@ -526,10 +552,6 @@ def Connect5(pipe, system_name = '', access_mask = 0x02000000):
 
     return ConnectHandle(pipe, r.data_out.connect_handle)
     
-    
-# CreateDomainGroup
-# GetAliasMembership
-# LookupNames
 # QueryGroupInfo
 # SetGroupInfo
 # AddGroupMember
-- 
cgit 


From df13db69cc659848aba455cbb95ceb86d9d0e5b8 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Thu, 28 Apr 2005 06:36:00 +0000
Subject: r6506: Rename parameter to GetDomPwInfo. (This used to be commit
 1542a13493bb9bf33d5f09dca273957bb4333862)

---
 source4/scripting/swig/samr.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/samr.py b/source4/scripting/swig/samr.py
index 4ba58c1c04..b6b1577c02 100644
--- a/source4/scripting/swig/samr.py
+++ b/source4/scripting/swig/samr.py
@@ -195,11 +195,11 @@ class ConnectHandle(SamrHandle):
 
         call_fn(dcerpc.dcerpc_samr_Shutdown, self.pipe, r)
 
-    def GetDomPwInfo(self, system_name):
+    def GetDomPwInfo(self, domain_name):
 
         r = dcerpc.samr_GetDomPwInfo()
         r.data_in.domain_name = dcerpc.samr_String()
-        r.data_in.domain_name.string = system_name
+        r.data_in.domain_name.string = domain_name
 
         call_fn(dcerpc.dcerpc_samr_GetDomPwInfo, self.pipe, r)
 
-- 
cgit 


From 416434fbc43e37a1d21eef611d0a9ba2cc9faea7 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Thu, 28 Apr 2005 07:05:48 +0000
Subject: r6507: Fix syntax error in GetAliasMembership().

Implement SetDomainInfo() which got lost somehow.
(This used to be commit 3055addde60687acdcf4e92dcb08e7f8dfdfb8f1)
---
 source4/scripting/swig/samr.py | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/samr.py b/source4/scripting/swig/samr.py
index b6b1577c02..85d5fa0d77 100644
--- a/source4/scripting/swig/samr.py
+++ b/source4/scripting/swig/samr.py
@@ -228,6 +228,16 @@ class DomainHandle(SamrHandle):
 
         return getattr(r.data_out.info, 'info%d' % level)       
 
+    def SetDomainInfo(self, level, info):
+
+        r = dcerpc.samr_SetDomainInfo()
+        r.data_in.domain_handle = self.handle
+        r.data_in.level = level
+        r.data_in.info = dcerpc.samr_DomainInfo()
+        setattr(r.data_in.info, 'info%d' % level, info)
+
+        call_fn(dcerpc.dcerpc_samr_SetDomainInfo, self.pipe, r)
+
     def EnumDomainGroups(self):
 
         r = dcerpc.samr_EnumDomainGroups()
@@ -419,7 +429,7 @@ class DomainHandle(SamrHandle):
 
         call_fn(dcerpc.dcerpc_samr_GetAliasMembership, self.pipe, r)
 
-        return [r.ids[x] x in range(r.count)]
+        return [r.ids[x] for x in range(r.count)]
 
 class UserHandle(SamrHandle):
 
-- 
cgit 


From 25601d2d67f5ae2d539541d310fe6c3431e6a890 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Thu, 28 Apr 2005 07:22:21 +0000
Subject: r6508: Fix typo - yay testsuite. (This used to be commit
 61da936dbc491d0ec2d733d9ba155c3df01b8847)

---
 source4/scripting/swig/samr.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/samr.py b/source4/scripting/swig/samr.py
index 85d5fa0d77..4796d748eb 100644
--- a/source4/scripting/swig/samr.py
+++ b/source4/scripting/swig/samr.py
@@ -344,7 +344,7 @@ class DomainHandle(SamrHandle):
 
         call_fn(dcerpc.dcerpc_samr_OpenGroup, self.pipe, r)
 
-        return GroupHandle(pipe, r.data_out.group_handle)
+        return GroupHandle(self.pipe, r.data_out.group_handle)
 
     def OpenAlias(self, rid, access_mask = 0x02000000):
 
-- 
cgit 


From 93e41274c56e564f6d4f2ca657aca29c1eb340c7 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Thu, 28 Apr 2005 07:44:49 +0000
Subject: r6510: Initialise rid parameter in samr_RidToSid().  This is faulting
 for me on win2k - not sure why.

Add dodgy implementations of QueryDisplayInfo{,2,3}()
(This used to be commit 2e44402751f77fcbd9c89299d8533e91207de49f)
---
 source4/scripting/swig/samr.py | 60 +++++++++++++++++++++++++++++++++++++++---
 1 file changed, 56 insertions(+), 4 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/samr.py b/source4/scripting/swig/samr.py
index 4796d748eb..4346bf88f4 100644
--- a/source4/scripting/swig/samr.py
+++ b/source4/scripting/swig/samr.py
@@ -374,6 +374,7 @@ class DomainHandle(SamrHandle):
 
         r = dcerpc.samr_RidToSid()
         r.data_in.domain_handle = self.handle
+        r.data_in.rid = rid
 
         call_fn(dcerpc.dcerpc_samr_RidToSid, self.pipe, r)
 
@@ -431,6 +432,61 @@ class DomainHandle(SamrHandle):
 
         return [r.ids[x] for x in range(r.count)]
 
+    def QueryDisplayInfo(self, level):
+
+        # TODO: Handle more data returns
+
+        r = dcerpc.samr_QueryDisplayInfo()
+        r.data_in.domain_handle = self.handle
+        r.data_in.level = level
+        r.data_in.start_idx = 0
+        r.data_in.max_entries = 1000
+        r.data_in.buf_size = -1
+
+        call_fn(dcerpc.dcerpc_samr_QueryDisplayInfo, self.pipe, r)
+
+        # TODO: Return a mapping of the various samr_DispInfo
+        # structures here.
+
+        return getattr(r.data_out.info, 'info%d' % level)
+    
+    def QueryDisplayInfo2(self, level):
+
+        # TODO: Handle more data returns
+
+        r = dcerpc.samr_QueryDisplayInfo2()
+        r.data_in.domain_handle = self.handle
+        r.data_in.level = level
+        r.data_in.start_idx = 0
+        r.data_in.max_entries = 1000
+        r.data_in.buf_size = -1
+
+        call_fn(dcerpc.dcerpc_samr_QueryDisplayInfo2, self.pipe, r)
+
+        # TODO: Return a mapping of the various samr_DispInfo
+        # structures here.
+
+        return getattr(r.data_out.info, 'info%d' % level)
+
+    def QueryDisplayInfo3(self, level):
+
+        # TODO: Handle more data returns
+
+        r = dcerpc.samr_QueryDisplayInfo3()
+        r.data_in.domain_handle = self.handle
+        r.data_in.level = level
+        r.data_in.start_idx = 0
+        r.data_in.max_entries = 1000
+        r.data_in.buf_size = -1
+
+        call_fn(dcerpc.dcerpc_samr_QueryDisplayInfo3, self.pipe, r)
+
+        # TODO: Return a mapping of the various samr_DispInfo
+        # structures here.
+
+        return getattr(r.data_out.info, 'info%d' % level)
+
+
 class UserHandle(SamrHandle):
 
     def DeleteUser(self):
@@ -576,17 +632,13 @@ def Connect5(pipe, system_name = '', access_mask = 0x02000000):
 # SetUserInfo
 # ChangePasswordUser
 # GetGroupsForUser
-# QueryDisplayInfo
 # GetDisplayEnumerationIndex
 # TestPrivateFunctionsDomain
 # TestPrivateFunctionsUser
 # GetUserPwInfo
 # RemoveMemberFromForeignDomain
-# QueryDomainInfo2
 # QueryUserInfo2
-# QueryDisplayInfo2
 # GetDisplayEnumerationIndex2
-# QueryDisplayInfo3
 # RemoveMultipleMembersFromAlias
 # OemChangePasswordUser2
 # ChangePasswordUser2
-- 
cgit 


From 5fef58af7403bfd254a13e01804f9d4a081cb6c9 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Thu, 28 Apr 2005 07:51:41 +0000
Subject: r6511: Implement GetUserPwInfo(), QueryUserInfo(), QueryUserInfo2().
 (This used to be commit f9742de617b6f1f24b75ae5af18a476f03c0b732)

---
 source4/scripting/swig/samr.py | 34 +++++++++++++++++++++++++++++-----
 1 file changed, 29 insertions(+), 5 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/samr.py b/source4/scripting/swig/samr.py
index 4346bf88f4..c254acd11b 100644
--- a/source4/scripting/swig/samr.py
+++ b/source4/scripting/swig/samr.py
@@ -497,7 +497,35 @@ class UserHandle(SamrHandle):
         call_fn(dcerpc.dcerpc_samr_DeleteUser, self.pipe, r)
 
         self.handle = None
-    
+
+    def GetUserPwInfo(self):
+
+        r = dcerpc.samr_GetUserPwInfo()
+        r.data_in.user_handle = self.handle
+
+        call_fn(dcerpc.dcerpc_samr_GetUserPwInfo, self.pipe, r)
+
+        return r.data_out.info
+
+    def QueryUserInfo(self, level):
+
+        r = dcerpc.samr_QueryUserInfo()
+        r.data_in.user_handle = self.handle
+        r.data_in.level = level
+
+        call_fn(dcerpc.dcerpc_samr_QueryUserInfo, self.pipe, r)
+
+        return r.data_out.info
+
+    def QueryUserInfo2(self, level):
+
+        r = dcerpc.samr_QueryUserInfo2()
+        r.data_in.user_handle = self.handle
+        r.data_in.level = level
+
+        call_fn(dcerpc.dcerpc_samr_QueryUserInfo2, self.pipe, r)
+
+        return r.data_out.info
 
 class GroupHandle(SamrHandle):
     pass
@@ -603,7 +631,6 @@ def Connect4(pipe, system_name = '', access_mask = 0x02000000):
 
     return ConnectHandle(pipe, r.data_out.connect_handle)
 
-
 def Connect5(pipe, system_name = '', access_mask = 0x02000000):
 
     r = dcerpc.samr_Connect5()
@@ -628,16 +655,13 @@ def Connect5(pipe, system_name = '', access_mask = 0x02000000):
 # AddAliasMember
 # DeleteAliasMember
 # GetMembersinAlias
-# QueryUserInfo
 # SetUserInfo
 # ChangePasswordUser
 # GetGroupsForUser
 # GetDisplayEnumerationIndex
 # TestPrivateFunctionsDomain
 # TestPrivateFunctionsUser
-# GetUserPwInfo
 # RemoveMemberFromForeignDomain
-# QueryUserInfo2
 # GetDisplayEnumerationIndex2
 # RemoveMultipleMembersFromAlias
 # OemChangePasswordUser2
-- 
cgit 


From c23d22e4f114156f5ec2cff050bafe47660182a7 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Thu, 28 Apr 2005 07:52:32 +0000
Subject: r6512: Refactor samr torture test to use the nicer OO interface
 instead of the previous dictionary based SWIG interface (which was broken
 anyway). (This used to be commit 16b7e503bdbe4da96158e504790b1501a99d6db3)

---
 source4/scripting/swig/torture/torture_samr.py | 640 ++++---------------------
 1 file changed, 88 insertions(+), 552 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/torture/torture_samr.py b/source4/scripting/swig/torture/torture_samr.py
index 2d1dfb6a95..9025fdd978 100755
--- a/source4/scripting/swig/torture/torture_samr.py
+++ b/source4/scripting/swig/torture/torture_samr.py
@@ -5,631 +5,170 @@ import dcerpc, samr
 
 def test_Connect(pipe):
 
-    print 'testing Connect'
-
     handle = samr.Connect(pipe)
     handle = samr.Connect2(pipe)
     handle = samr.Connect3(pipe)
     handle = samr.Connect4(pipe)
-#    handle = samr.Connect5(pipe) # win2k3 only?
-
-    return handle
-    
-def test_QuerySecurity(pipe, handle):
-
-    print 'testing QuerySecurity'
-
-    sdbuf = handle.QuerySecurity()
-    handle.SetSecurity(sdbuf)
-
-
-def test_GetDomPwInfo(pipe, handle, domain):
-
-    print 'testing GetDomPwInfo'
-
-    handle.GetDomPwInfo(domain)
-    handle.GetDomPwInfo('__NONAME__')
-    handle.GetDomPwInfo('Builtin')
-
-def test_RemoveMemberFromForeignDomain(pipe, domain_handle):
-
-    print 'testing RemoveMemberFromForeignDomain'
-
-    sid = samr.string_to_sid('S-1-5-32-12-34-56-78-9')
-
-    domain_handle.RemoveMemberFromForeignDomain(sid)
-
-def test_CreateUser2(pipe, domain_handle):
-
-    print 'testing CreateUser2'
-
-    username = 'samrtorturemach$'
-
-    try:
-        return domain_handle.CreateUser2(username, 0x0080) # WSTRUST
-    except dcerpc.NTSTATUS, arg:
-        if arg[0] == 0x0c0000063L:
-            test_OpenUser_byname(pipe, domain_handle, username).DeleteUser()
-            return domain_handle.CreateUser2(username)
-        raise
-
-def test_LookupName(pipe, domain_handle, name):
-
-    print 'testing samr_LookupNames'
-
-    domain_handle.LookupNames(['Administrator', 'xxNONAMExx'])
-
-    try:
-        domain_handle.LookupNames(['xxNONAMExx'])
-    except dcerpc.NTSTATUS, arg:
-        if arg[0] != 0xc0000073L:
-            raise dcerpc.NTSTATUS(arg)
-
-    return domain_handle.LookupNames([name])
-
-def test_OpenUser_byname(pipe, domain_handle, user_name):
-
-    rids, types = test_LookupName(pipe, domain_handle, user_name)
-
-    return domain_handle.OpenUser(rids[0])
 
-def test_DeleteUser_byname(pipe, domain_handle, user_name):
-
-    user_handle = test_OpenUser_byname(pipe, domain_handle, user_name)
+    # WIN2K3 only?
     
-    r = {}
-    r['user_handle'] = user_handle
-
-    dcerpc.samr_DeleteUser(pipe, r)
-
-def test_QueryUserInfo(pipe, user_handle):
-
-    print 'testing samr_QueryUserInfo'
-
-    levels = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 16, 17, 20, 21]
-
-    for level in levels:
-        r = {}
-        r['user_handle'] = user_handle
-        r['level'] = level
-
-        dcerpc.samr_QueryUserInfo(pipe, r)
-
-def test_QueryUserInfo2(pipe, user_handle):
-
-    print 'testing samr_QueryUserInfo2'
-
-    levels = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 16, 17, 20, 21]
-
-    for level in levels:
-        r = {}
-        r['user_handle'] = user_handle
-        r['level'] = level
-
-        dcerpc.samr_QueryUserInfo2(pipe, r)
-
-def test_SetUserInfo(pipe, user_handle):
-
-    r = {}
-    r['user_handle'] = user_handle
-    r['level'] = 2
-    r['info'] = {}
-    r['info']['info2'] = {}
-    r['info']['info2']['comment'] = {}
-    r['info']['info2']['comment']['name'] = 'hello'
-    r['info']['info2']['unknown'] = {}
-    r['info']['info2']['unknown']['name'] = None
-    r['info']['info2']['country_code'] = 0
-    r['info']['info2']['code_page'] = 0
-
-    dcerpc.samr_SetUserInfo(pipe, r)
-
-def test_GetUserPwInfo(pipe, user_handle):
-
-    print 'testing samr_GetUserpwInfo'
-
-    r = {}
-    r['user_handle'] = user_handle
-
-    dcerpc.samr_GetUserPwInfo(pipe, r)
-
-def test_TestPrivateFunctionsUser(pipe, user_handle):
-
-    print 'testing samr.TestPrivateFunctionsUser'
-
-    r = {}
-    r['user_handle'] = user_handle
-
-    try:
-        dcerpc.samr_TestPrivateFunctionsUser(pipe, r)
-    except dcerpc.NTSTATUS, arg:
-        if arg[0] != dcerpc.NT_STATUS_NOT_IMPLEMENTED:
-            raise dcerpc.NTSTATUS(arg)
-
-def test_user_ops(pipe, user_handle):
-
-    test_QuerySecurity(pipe, user_handle)
-
-    test_QueryUserInfo(pipe, user_handle)
-
-    test_QueryUserInfo2(pipe, user_handle)
-
-    test_SetUserInfo(pipe, user_handle)
-
-    test_GetUserPwInfo(pipe, user_handle)
-
-    test_TestPrivateFunctionsUser(pipe, user_handle)
-
-def test_CreateUser(pipe, domain_handle):
-
-    username = 'samrtorturetest'
-
     try:
-        return domain_handle.CreateUser(username)
+        handle = samr.Connect5(pipe)
     except dcerpc.NTSTATUS, arg:
-        if arg[0] == 0xc0000063L:
-            test_OpenUser_byname(pipe, domain_handle, username).DeleteUser()
-            return domain_handle.CreateUser(username)
-
-def test_SetAliasInfo(pipe, alias_handle):
-
-    r = {}
-    r['alias_handle'] = alias_handle
-    r['level'] = 2
-    r['info'] = {}
-    r['info']['name'] = {}
-    r['info']['name']['name'] = 'hello'
-
-    dcerpc.samr_SetAliasInfo(pipe, r)
-
-    del(r['info']['name'])
+        if arg[0] != 0xc00000d2L:       # NT_STATUS_NET_WRITE_FAULT
+            raise
 
-    r['level'] = 3
-    r['info']['description'] = {}
-    r['info']['description']['name'] = 'this is a description'
+    return handle
     
-    dcerpc.samr_SetAliasInfo(pipe, r)
-
-def test_Aliases(pipe, domain_handle, domain_sid):
-
-    print 'testing aliases'
+def test_UserHandle(user_handle):
 
-    aliasname = 'samrtorturetestalias'
+    # QuerySecurity()/SetSecurity()
 
-    # Create a new alias
+    user_handle.SetSecurity(user_handle.QuerySecurity())
 
-    try:
-
-        handle, rid = domain_handle.CreateDomAlias(aliasname)
-
-    except dcerpc.NTSTATUS, arg:
+    # GetUserPwInfo()
 
-        if arg[0] == 0x0c0000154L:
+    user_handle.GetUserPwInfo()
 
-            # Alias exists, delete it and try again
+    # GetUserInfo()
 
-            rids, types = domain_handle.LookupNames([aliasname])
-            domain_handle.OpenAlias(rids[0]).DeleteDomAlias()
-
-            handle, rid = domain_handle.CreateDomAlias(aliasname)
-            
-        else:
-            raise
+    for level in [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 16, 17, 20,
+                  21, 23, 24, 25, 26]:
 
-    # QuerySecurity/GetSecurity
-
-    handle.SetSecurity(handle.QuerySecurity())
-
-    # QueryAliasInfo/SetAliasInfo
-
-    for i in [1, 2, 3]:
-        info = handle.QueryAliasInfo(i)
         try:
-            handle.SetAliasInfo(i, info)
+            user_handle.QueryUserInfo(level)
+            user_handle.QueryUserInfo2(level)
         except dcerpc.NTSTATUS, arg:
-
-            # Can't set alias info level 1
-
-            if not (arg[0] == 0xC0000003L and i == 1):
+            if arg[0] != 0xc0000003L:   # NT_STATUS_INVALID_INFO_CLASS
                 raise
 
-    # AddAliasMember
-
-    handle.AddAliasMember('S-1-5-21-1606980848-1677128483-854245398-500')
+def test_GroupHandle(group_handle):
 
-    # AddMultipleMembersToAlias
+    # QuerySecurity()/SetSecurity()
 
-    handle.AddMultipleMembersToAlias(
-        ['S-1-5-21-1606980848-1677128483-854245398-501',
-         'S-1-5-21-1606980848-1677128483-854245398-502'])
+    group_handle.SetSecurity(group_handle.QuerySecurity())
 
-    # DeleteDomAlias
+def test_AliasHandle(alias_handle):
 
-    handle.DeleteDomAlias()
+    # QuerySecurity()/SetSecurity()
 
-def test_DeleteGroup_byname(pipe, domain_handle, group_name):
-    
-    rid = test_LookupNames(pipe, domain_handle, group_name)
-
-    r = {}
-    r['domain_handle'] = domain_handle
-    r['access_mask'] = 0x02000000
-    r['rid'] = rid
+    alias_handle.SetSecurity(alias_handle.QuerySecurity())
 
-    result = dcerpc.samr_OpenGroup(pipe, r)
+def test_DomainHandle(name, sid, domain_handle):
 
-    s = {}
-    s['group_handle'] = result['group_handle']
+    print 'testing %s (%s)' % (name, sid)
 
-    dcerpc.samr_DeleteDomainGroup(pipe, s)
+    # QuerySecurity()/SetSecurity()
 
-def test_CreateDomainGroup(pipe, domain_handle):
+    domain_handle.SetSecurity(domain_handle.QuerySecurity())
 
-    print 'testing samr_CreateDomainGroup'
-
-    r = {}
-    r['domain_handle'] = domain_handle
-    r['name'] = {}
-    r['name']['name'] = 'samrtorturetestgroup'
-    r['access_mask'] = 0x02000000
+    # LookupNames(), none mapped
 
     try:
-        result = dcerpc.samr_CreateDomainGroup(pipe, r)
+        domain_handle.LookupNames(['xxNONAMExx'])
     except dcerpc.NTSTATUS, arg:
-        if arg[0] == dcerpc.NT_STATUS_ACCESS_DENIED:
-            return
-        if arg[0] != dcerpc.NT_STATUS_GROUP_EXISTS:
+        if arg[0] != 0xc0000073L:
             raise dcerpc.NTSTATUS(arg)
 
-        test_DeleteGroup_byname(pipe, domain_handle, 'samrtorturetestgroup')
-
-        result = dcerpc.samr_CreateDomainGroup(pipe, r)
-
-    return result['group_handle']
+    # LookupNames(), some mapped
 
-def test_QueryDomainInfo(pipe, domain_handle):
+    if name != 'Builtin':
+        domain_handle.LookupNames(['Administrator', 'xxNONAMExx'])
 
-    print 'testing samr_QueryDomainInfo'
+    # QueryDomainInfo()/SetDomainInfo()
 
     levels = [1, 2, 3, 4, 5, 6, 7, 8, 9, 11, 12, 13]
     set_ok = [1, 0, 1, 1, 0, 1, 1, 0, 1,  0,  1,  0]
     
-    for i in range(0, len(levels)):
+    for i in range(len(levels)):
 
-        r = {}
-        r['domain_handle'] = domain_handle
-        r['level'] = levels[i]
-
-        result = dcerpc.samr_QueryDomainInfo(pipe, r)
-
-        s = {}
-        s['domain_handle'] = domain_handle
-        s['level'] = levels[i]
-        s['info'] = result['info']
+        info = domain_handle.QueryDomainInfo(level = levels[i])
 
         try:
-            dcerpc.samr_SetDomainInfo(pipe, s)
+            domain_handle.SetDomainInfo(levels[i], info)
         except dcerpc.NTSTATUS, arg:
-            if set_ok[i]:
-                raise dcerpc.NTSTATUS(arg)
-            if arg[0] != dcerpc.NT_STATUS_INVALID_INFO_CLASS:
-                raise dcerpc.NTSTATUS(arg)
-
-def test_QueryDomainInfo2(pipe, domain_handle):
+            if not (arg[0] == 0xc0000003L and not set_ok[i]):
+                raise
 
-    print 'testing samr_QueryDomainInfo'
+    # QueryDomainInfo2()
 
     levels = [1, 2, 3, 4, 5, 6, 7, 8, 9, 11, 12, 13]
 
-    for i in range(0, len(levels)):
-
-        r = {}
-        r['domain_handle'] = domain_handle
-        r['level'] = levels[i]
-
-        dcerpc.samr_QueryDomainInfo2(pipe, r)
+    for i in range(len(levels)):
+        domain_handle.QueryDomainInfo2(level = levels[i])
 
-def test_EnumDomainUsers(pipe, domain_handle):
+    # EnumDomainUsers
 
-    print 'testing samr_EnumDomainUsers'
+    print 'testing users'
 
-    r = {}
-    r['domain_handle'] = domain_handle
-    r['resume_handle'] = 0
-    r['acct_flags'] = 0
-    r['max_size'] = -1
-
-    while 1:
-        result = dcerpc.samr_EnumDomainUsers(pipe, r)
-        if result['result'] == dcerpc.STATUS_MORE_ENTRIES:
-            r['resume_handle'] = result['resume_handle']
-            continue
-        break
-
-def test_EnumDomainGroups(pipe, domain_handle):
-
-    print 'testing samr_EnumDomainGroups'
-
-    r = {}
-    r['domain_handle'] = domain_handle
-    r['resume_handle'] = 0
-    r['acct_flags'] = 0
-    r['max_size'] = -1
+    users = domain_handle.EnumDomainUsers()
+    rids = domain_handle.LookupNames(users)
     
-    while 1:
-        result = dcerpc.samr_EnumDomainGroups(pipe, r)
-        if result['result'] == dcerpc.STATUS_MORE_ENTRIES:
-            r['resume_handle'] = result['resume_handle']
-            continue
-        break
-
-def test_EnumDomainAliases(pipe, domain_handle):
-
-    print 'testing samr_EnumDomainAliases'
-
-    r = {}
-    r['domain_handle'] = domain_handle
-    r['resume_handle'] = 0
-    r['acct_flags'] = 0
-    r['max_size'] = -1
-
-    while 1:
-        result = dcerpc.samr_EnumDomainAliases(pipe, r)
-        if result['result'] == dcerpc.STATUS_MORE_ENTRIES:
-            r['resume_handle'] = result['resume_handle']
-            continue
-        break
-
-def test_QueryDisplayInfo(pipe, domain_handle):
-
-    print 'testing samr_QueryDisplayInfo'
-
-    levels = [1, 2, 3, 4, 5]
-
-    for i in range(0, len(levels)):
-
-        r = {}
-        r['domain_handle'] = domain_handle
-        r['level'] = levels[i]
-        r['start_idx'] = 0
-        r['max_entries'] = 1000
-        r['buf_size'] = -1
-
-        dcerpc.samr_QueryDisplayInfo(pipe, r)
-
-def test_QueryDisplayInfo2(pipe, domain_handle):
-
-    print 'testing samr_QueryDisplayInfo2'
-
-    levels = [1, 2, 3, 4, 5]
-
-    for i in range(0, len(levels)):
-
-        r = {}
-        r['domain_handle'] = domain_handle
-        r['level'] = levels[i]
-        r['start_idx'] = 0
-        r['max_entries'] = 1000
-        r['buf_size'] = -1
-
-        dcerpc.samr_QueryDisplayInfo2(pipe, r)
+    for i in range(len(users)):
+        test_UserHandle(domain_handle.OpenUser(rids[0][i]))
     
-def test_QueryDisplayInfo3(pipe, domain_handle):
-
-    print 'testing samr_QueryDisplayInfo3'
-
-    levels = [1, 2, 3, 4, 5]
-
-    for i in range(0, len(levels)):
-
-        r = {}
-        r['domain_handle'] = domain_handle
-        r['level'] = levels[i]
-        r['start_idx'] = 0
-        r['max_entries'] = 1000
-        r['buf_size'] = -1
-
-        dcerpc.samr_QueryDisplayInfo3(pipe, r)
-
-def test_GetDisplayEnumerationIndex(pipe, domain_handle):
-
-    print 'testing samr_GetDisplayEnumerationIndex'
-
-    levels = [1, 2, 3, 4, 5]
-    ok_lvl = [1, 1, 1, 0, 0]
-
-    for i in range(0, len(levels)):
-
-        r = {}
-        r['domain_handle'] = domain_handle
-        r['level'] = levels[i]
-        r['name'] = {}
-        r['name']['name'] = 'samrtorturetest'
-
-        try:
-            dcerpc.samr_GetDisplayEnumerationIndex(pipe, r)
-        except dcerpc.NTSTATUS, arg:
-            if ok_lvl[i]:
-                raise dcerpc.NTSTATUS(arg)
-
-        r['name']['name'] = 'zzzzzzzz'
-
-        try:
-            dcerpc.samr_GetDisplayEnumerationIndex(pipe, r)
-        except dcerpc.NTSTATUS, arg:
-            if ok_lvl[i]:
-                raise dcerpc.NTSTATUS(arg)            
-
-def test_GetDisplayEnumerationIndex2(pipe, domain_handle):
-
-    print 'testing samr_GetDisplayEnumerationIndex2'
-
-    levels = [1, 2, 3, 4, 5]
-    ok_lvl = [1, 1, 1, 0, 0]
-
-    for i in range(0, len(levels)):
-
-        r = {}
-        r['domain_handle'] = domain_handle
-        r['level'] = levels[i]
-        r['name'] = {}
-        r['name']['name'] = 'samrtorturetest'
-
-        try:
-            dcerpc.samr_GetDisplayEnumerationIndex2(pipe, r)
-        except dcerpc.NTSTATUS, arg:
-            if ok_lvl[i]:
-                raise dcerpc.NTSTATUS(arg)
-
-        r['name']['name'] = 'zzzzzzzz'
-
-        try:
-            dcerpc.samr_GetDisplayEnumerationIndex2(pipe, r)
-        except dcerpc.NTSTATUS, arg:
-            if ok_lvl[i]:
-                raise dcerpc.NTSTATUS(arg)            
-
-def test_TestPrivateFunctionsDomain(pipe, domain_handle):
-
-    print 'testing samr.TestPrivateFunctionsDomain'
-
-    r = {}
-    r['domain_handle'] = domain_handle
+    # QueryDisplayInfo
 
-    try:
-        dcerpc.samr_TestPrivateFunctionsDomain(pipe, r)
-    except dcerpc.NTSTATUS, arg:
-        if arg[0] != dcerpc.NT_STATUS_NOT_IMPLEMENTED:
-            raise dcerpc.NTSTATUS(arg)
-
-def test_RidToSid(pipe, domain_handle):
-
-    print 'testing samr_RidToSid'
-
-    r = {}
-    r['domain_handle'] = domain_handle
-    r['rid'] = 512
-
-    dcerpc.samr_RidToSid(pipe, r)
-
-def test_GetBootKeyInformation(pipe, domain_handle):
-
-    print 'testing samr_GetBootKeyInformation'
-
-    r = {}
-    r['domain_handle'] = domain_handle
-
-    try:
-        dcerpc.samr_GetBootKeyInformation(pipe, r)
-    except dcerpc.NTSTATUS, arg:
-        pass
-
-def test_DeleteUser(pipe, user_handle):
-
-    r = {}
-    r['user_handle'] = user_handle
-
-    dcerpc.samr_DeleteUser(pipe, r)
-
-def test_DeleteAlias(pipe, alias_handle):
-
-    r = {}
-    r['alias_handle'] = alias_handle
-
-    dcerpc.samr_DeleteDomAlias(pipe, r)
-    
-def test_DeleteDomainGroup(pipe, group_handle):
-
-    r = {}
-    r['group_handle'] = group_handle
-
-    dcerpc.samr_DeleteDomainGroup(pipe, r)
-
-def test_Close(pipe, handle):
-
-    r = {}
-    r['handle'] = handle
-
-    dcerpc.samr_Close(pipe, r)
-
-def test_OpenDomain(pipe, connect_handle, domain_sid):
-
-    print 'testing OpenDomain'
-
-    domain_handle = connect_handle.OpenDomain(domain_sid)
-
-    test_QuerySecurity(pipe, domain_handle)
-
-    test_RemoveMemberFromForeignDomain(pipe, domain_handle)
-
-    test_CreateUser2(pipe, domain_handle)
-
-    test_CreateUser(pipe, domain_handle)
-
-    test_Aliases(pipe, domain_handle, domain_sid)
-
-    sys.exit(0)
+    for i in [1, 2, 3, 4, 5]:
+        domain_handle.QueryDisplayInfo(level = i)
+        domain_handle.QueryDisplayInfo2(level = i)
+        domain_handle.QueryDisplayInfo3(level = i)
+            
+    # EnumDomainGroups
 
-    test_CreateDomainGroup(pipe, domain_handle)
+    print 'testing groups'
 
-    test_QueryDomainInfo(pipe, domain_handle)
-    
-    test_QueryDomainInfo2(pipe, domain_handle)
+    groups = domain_handle.EnumDomainGroups()
+    rids = domain_handle.LookupNames(groups)
 
-    test_EnumDomainUsers(pipe, domain_handle)
+    for i in range(len(groups)):
+        test_GroupHandle(domain_handle.OpenGroup(rids[0][i]))
 
-    test_EnumDomainGroups(pipe, domain_handle)
+    # EnumDomainAliases
 
-    test_EnumDomainAliases(pipe, domain_handle)
+    print 'testing aliases'
 
-    test_QueryDisplayInfo(pipe, domain_handle)
+    aliases = domain_handle.EnumDomainAliases()
+    rids = domain_handle.LookupNames(aliases)
 
-    test_QueryDisplayInfo2(pipe, domain_handle)
+    for i in range(len(aliases)):
+        test_AliasHandle(domain_handle.OpenAlias(rids[0][i]))
     
-    test_QueryDisplayInfo3(pipe, domain_handle)
-
-    test_GetDisplayEnumerationIndex(pipe, domain_handle)
-
-    test_GetDisplayEnumerationIndex2(pipe, domain_handle)
+    # CreateUser
+    # CreateUser2
+    # CreateDomAlias
+    # RidToSid
+    # RemoveMemberFromForeignDomain
+    # CreateDomainGroup
+    # GetAliasMembership
 
-    test_TestPrivateFunctionsDomain(pipe, domain_handle)
+def test_ConnectHandle(connect_handle):
 
-    test_RidToSid(pipe, domain_handle)
+    print 'testing connect handle'
 
-    test_GetBootKeyInformation(pipe, domain_handle)
+    # QuerySecurity/SetSecurity
 
-    if user_handle != None:
-        test_DeleteUser(pipe, user_handle)
+    connect_handle.SetSecurity(connect_handle.QuerySecurity())
 
-    if alias_handle != None:
-        test_DeleteAlias(pipe, alias_handle)
-
-    if group_handle != None:
-        test_DeleteDomainGroup(pipe, group_handle)
-
-    test_Close(pipe, domain_handle)
-    
-def test_LookupDomain(pipe, connect_handle, domain):
-
-    print 'testing LookupDomain'
-
-    sid = connect_handle.LookupDomain(domain)
+    # Lookup bogus domain
 
     try:
         connect_handle.LookupDomain('xxNODOMAINxx')
     except dcerpc.NTSTATUS, arg:
         if arg[0] != 0xC00000DFL:          # NT_STATUS_NO_SUCH_DOMAIN
             raise
-            
-    test_GetDomPwInfo(pipe, connect_handle, domain)
-    test_OpenDomain(pipe, connect_handle, sid)
-    
-def test_EnumDomains(pipe, connect_handle):
 
-    print 'testing EnumDomains'
+    # Test all domains
+
+    for domain_name in connect_handle.EnumDomains():
+
+        connect_handle.GetDomPwInfo(domain_name)
+        sid = connect_handle.LookupDomain(domain_name)
+        domain_handle = connect_handle.OpenDomain(sid)
 
-    for domain in connect_handle.EnumDomains():
-        test_LookupDomain(pipe, connect_handle, domain)
+        test_DomainHandle(domain_name, sid, domain_handle)
+
+    # TODO: Test Shutdown() function
 
 def runtests(binding, creds):
 
@@ -639,7 +178,4 @@ def runtests(binding, creds):
             dcerpc.DCERPC_SAMR_UUID, int(dcerpc.DCERPC_SAMR_VERSION), creds)
 
     handle = test_Connect(pipe)
-
-    test_QuerySecurity(pipe, handle)
-
-    test_EnumDomains(pipe, handle)
+    test_ConnectHandle(handle)
-- 
cgit 


From 5c6e1f81cec532e075f2d9e7eab25794a6b10bf7 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Sun, 1 May 2005 01:31:23 +0000
Subject: r6539: A patch from jbm:

  - convert rpcclient to new credential code
  - allow anonymous connections
(This used to be commit f40977c42145e202ddfe50c9a7daad624b06cc59)
---
 source4/scripting/swig/rpcclient | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/rpcclient b/source4/scripting/swig/rpcclient
index faf5b3ec09..34efafdf73 100755
--- a/source4/scripting/swig/rpcclient
+++ b/source4/scripting/swig/rpcclient
@@ -28,12 +28,10 @@ class rpcclient(Cmd):
 
     prompt = 'rpcclient$ '
 
-    def __init__(self, server, domain, username, password):
+    def __init__(self, server, cred):
         Cmd.__init__(self)
         self.server = server
-        self.domain = domain
-        self.username = username
-        self.password = password
+        self.cred = cred
 
     def emptyline(self):
 
@@ -85,7 +83,7 @@ class rpcclient(Cmd):
         pipe = dcerpc.pipe_connect(
             'ncacn_np:%s' % self.server,
             dcerpc.DCERPC_SAMR_UUID, int(dcerpc.DCERPC_SAMR_VERSION),
-            (self.domain, self.username, self.password))
+            self.cred)
 
         connect_handle = samr.Connect(pipe)
 
@@ -107,7 +105,7 @@ class rpcclient(Cmd):
         pipe = dcerpc.pipe_connect(
             'ncacn_np:%s' % self.server,
             dcerpc.DCERPC_SAMR_UUID, int(dcerpc.DCERPC_SAMR_VERSION),
-            (self.domain, self.username, self.password))
+            self.cred)
 
         connect_handle = samr.Connect(pipe)
 
@@ -128,7 +126,7 @@ class rpcclient(Cmd):
         pipe = dcerpc.pipe_connect(
             'ncacn_np:%s' % self.server,
             dcerpc.DCERPC_SAMR_UUID, int(dcerpc.DCERPC_SAMR_VERSION),
-            (self.domain, self.username, self.password))
+            self.cred)
 
         connect_handle = samr.Connect(pipe)
 	domain_handle = connect_handle.OpenDomain(args[0])
@@ -155,7 +153,7 @@ class rpcclient(Cmd):
         pipe = dcerpc.pipe_connect(
             'ncacn_np:%s' % self.server,
             dcerpc.DCERPC_SAMR_UUID, int(dcerpc.DCERPC_SAMR_VERSION),
-            (self.domain, self.username, self.password))
+            self.cred)
 
         connect_handle = samr.Connect(pipe)
 	domain_handle = connect_handle.OpenDomain(args[0])
@@ -182,7 +180,7 @@ class rpcclient(Cmd):
         pipe = dcerpc.pipe_connect(
             'ncacn_np:%s' % self.server,
             dcerpc.DCERPC_SAMR_UUID, int(dcerpc.DCERPC_SAMR_VERSION),
-            (self.domain, self.username, self.password))
+            self.cred)
 
         connect_handle = samr.Connect(pipe)	
 	domain_handle = connect_handle.OpenDomain(args[0])
@@ -207,7 +205,7 @@ class rpcclient(Cmd):
         pipe = dcerpc.pipe_connect(
             'ncacn_np:%s' % self.server,
             dcerpc.DCERPC_SAMR_UUID, int(dcerpc.DCERPC_SAMR_VERSION),
-            (self.domain, self.username, self.password))
+            self.cred)
 
         connect_handle = samr.Connect(pipe)
         domain_handle = connect_handle.OpenDomain(args[0])
@@ -231,7 +229,7 @@ class rpcclient(Cmd):
         pipe = dcerpc.pipe_connect(
             'ncacn_np:%s' % self.server,
             dcerpc.DCERPC_SAMR_UUID, int(dcerpc.DCERPC_SAMR_VERSION),
-            (self.domain, self.username, self.password))
+            self.cred)
 
         connect_handle = samr.Connect(pipe)
         domain_handle = connect_handle.OpenDomain(args[0])
@@ -268,7 +266,9 @@ if __name__ == '__main__':
 
     options, args = parser.parse_args()
 
-    # Break --username up into domain, usernamd and password
+    # Break --username up into domain, username and password
+
+    cred = None
 
     if not options.username:
         options.username = '%'
@@ -283,9 +283,12 @@ if __name__ == '__main__':
 
     username = options.username
 
+    if username != '':
+	cred = (domain, username, password)
+
     # Run command loop
 
-    c = rpcclient(server, domain, username, password)
+    c = rpcclient(server, cred)
 
     if options.command:
         c.onecmd(options.command)
-- 
cgit 


From 9d87efb681c73e892c8690679238b9dc1d971a9c Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Sun, 1 May 2005 02:40:00 +0000
Subject: r6540: Implement a bunch more SAMR functions. (This used to be commit
 7ab240644ec6cfd0449df7e2dfe0eb1b8a52ccdb)

---
 source4/scripting/swig/dcerpc.i                |   1 +
 source4/scripting/swig/samr.py                 | 117 +++++++++++++++++++++----
 source4/scripting/swig/torture/torture_samr.py |  40 +++++++++
 3 files changed, 139 insertions(+), 19 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/dcerpc.i b/source4/scripting/swig/dcerpc.i
index e41d9e4e2f..60e661f180 100644
--- a/source4/scripting/swig/dcerpc.i
+++ b/source4/scripting/swig/dcerpc.i
@@ -231,6 +231,7 @@ char *nt_errstr(NTSTATUS nt_code);
 %array_functions(struct samr_String, samr_String_array);
 %array_functions(struct samr_SamEntry, samr_SamEntry_array);
 %array_functions(union samr_ConnectInfo, samr_ConnectInfo_array);
+%array_functions(struct samr_RidType, samr_RidType_array);
 
 %array_functions(struct lsa_SidPtr, lsa_SidPtr_array);
 
diff --git a/source4/scripting/swig/samr.py b/source4/scripting/swig/samr.py
index c254acd11b..314f78b8ad 100644
--- a/source4/scripting/swig/samr.py
+++ b/source4/scripting/swig/samr.py
@@ -17,7 +17,6 @@ def sid_to_string(sid):
 
     return result
 
-
 def string_to_sid(string):
     """Convert a string SID to a Python dictionary SID.  Throws a
     ValueError if the SID string was badly formed."""
@@ -88,7 +87,6 @@ def string_to_sid(string):
 
     return sid
 
-
 def call_fn(fn, pipe, args):
     """Wrap up a RPC call and throw an exception is an error was returned."""
     
@@ -98,8 +96,7 @@ def call_fn(fn, pipe, args):
         raise dcerpc.NTSTATUS(result, dcerpc.nt_errstr(result));
 
     return result;
-
-    
+   
 class SamrHandle:
 
     def __init__(self, pipe, handle):
@@ -139,7 +136,6 @@ class SamrHandle:
         r.data_in.sdbuf = sdbuf
 
         call_fn(dcerpc.dcerpc_samr_SetSecurity, self.pipe, r)
-
         
 class ConnectHandle(SamrHandle):
 
@@ -206,6 +202,16 @@ class ConnectHandle(SamrHandle):
         return r.data_out.info
 
 
+    def SetBootKeyInformation(self, unknown1, unknown2, unknown3):
+        
+        r = dcerpc.samr_GetBootKeyInformation()
+        r.data_in.connect_handle = self.handle
+        r.data_in.unknown1 = unknown1
+        r.data_in.unknown2 = unknown2
+        r.data_in.unknown3 = unknown3
+
+        call_fn(dcerpc.dcerpc_samr_SetBootKeyInformation, self.pipe, r)
+
 class DomainHandle(SamrHandle):
 
     def QueryDomainInfo(self, level = 2):
@@ -402,8 +408,10 @@ class DomainHandle(SamrHandle):
 
         call_fn(dcerpc.dcerpc_samr_LookupNames, self.pipe, r)
 
-        return ([dcerpc.uint32_array_getitem(r.data_out.rids.ids, i) for i in range(r.data_out.rids.count)],
-                [dcerpc.uint32_array_getitem(r.data_out.types.ids, i) for i in range(r.data_out.types.count)])
+        return ([dcerpc.uint32_array_getitem(r.data_out.rids.ids, i)
+                 for i in range(r.data_out.rids.count)],
+                [dcerpc.uint32_array_getitem(r.data_out.types.ids, i)
+                 for i in range(r.data_out.types.count)])
 
     def CreateDomainGroup(self, domain_name, access_mask = 0x02000000):
 
@@ -486,6 +494,28 @@ class DomainHandle(SamrHandle):
 
         return getattr(r.data_out.info, 'info%d' % level)
 
+    def GetBootKeyInformation(self):
+
+        r = dcerpc.samr_GetBootKeyInformation()
+        r.data_in.domain_handle = self.handle
+
+        call_fn(dcerpc.dcerpc_samr_GetBootKeyInformation, self.pipe, r)
+
+        return r.data_out.unknown
+
+    def SetBootKeyInformation(self):
+
+        r = dcerpc.samr_GetBootKeyInformation()
+        r.data_in.domain_handle = self.handle
+
+        call_fn(dcerpc.dcerpc_samr_GetBootKeyInformation, self.pipe, r)
+
+    def TestPrivateFunctionsDomain(self):
+
+        r = dcerpc.samr_TestPrivateFunctionsDomain()
+        r.data_in.domain_handle = self.handle
+
+        call_fn(dcerpc.dcerpc_samr_TestPrivateFunctionsDomain, self.pipe, r)
 
 class UserHandle(SamrHandle):
 
@@ -527,10 +557,57 @@ class UserHandle(SamrHandle):
 
         return r.data_out.info
 
+    def GetGroupsForUser(self):
+
+        r = dcerpc.samr_GetGroupsForUser()
+        r.data_in.user_handle = self.handle
+
+        call_fn(dcerpc.dcerpc_samr_GetGroupsForUser, self.pipe, r)
+
+        rid_types = [dcerpc.samr_RidType_array_getitem(r.data_out.rids.rid, x)
+                     for x in range(r.data_out.rids.count)]
+
+        return [(x.rid, x.type) for x in rid_types]
+
+    def TestPrivateFunctionsUser(self):
+
+        r = dcerpc.samr_TestPrivateFunctionsUser()
+        r.data_in.user_handle = self.handle
+
+        call_fn(dcerpc.dcerpc_samr_TestPrivateFunctionsUser, self.pipe, r)
+            
 class GroupHandle(SamrHandle):
-    pass
-    
 
+    def QueryGroupInfo(self, level):
+
+        r = dcerpc.samr_QueryGroupInfo()
+        r.data_in.group_handle = self.handle
+        r.data_in.level = level
+
+        call_fn(dcerpc.dcerpc_samr_QueryGroupInfo, self.pipe, r)
+
+        return r.data_out.info
+
+    def SetGroupInfo(self, level, info):
+
+        r = dcerpc.samr_SetGroupInfo()
+        r.data_in.group_handle = self.handle
+        r.data_in.level = level
+        r.data_in.info = info
+
+        call_fn(dcerpc.dcerpc_samr_SetGroupInfo, self.pipe, r)
+
+    def QueryGroupMember(self):
+
+        r = dcerpc.samr_QueryGroupMember()
+        r.data_in.group_handle = self.handle
+
+        call_fn(dcerpc.dcerpc_samr_QueryGroupMember, self.pipe, r)
+
+        return [(dcerpc.uint32_array_getitem(r.data_out.rids.rids, x),
+                 dcerpc.uint32_array_getitem(r.data_out.rids.unknown, x))
+                for x in range(r.data_out.rids.count)]
+    
 class AliasHandle(SamrHandle):
 
     def DeleteDomAlias(self):
@@ -584,6 +661,18 @@ class AliasHandle(SamrHandle):
 
         call_fn(dcerpc.dcerpc_samr_AddMultipleMembersToAlias, self.pipe, r)
 
+    def GetMembersInAlias(self):
+
+        r = dcerpc.samr_GetMembersInAlias()
+        r.data_in.alias_handle = self.handle
+
+        call_fn(dcerpc.dcerpc_samr_GetMembersInAlias, self.pipe, r)
+
+        return [
+            sid_to_string(
+                dcerpc.lsa_SidPtr_array_getitem(r.data_out.sids.sids, x).sid)
+            for x in range(r.data_out.sids.num_sids)]
+
 def Connect(pipe, access_mask = 0x02000000):
 
     r = dcerpc.samr_Connect()
@@ -595,7 +684,6 @@ def Connect(pipe, access_mask = 0x02000000):
 
     return ConnectHandle(pipe, r.data_out.connect_handle)
 
-
 def Connect2(pipe, system_name = '', access_mask = 0x02000000):
     """Connect to the SAMR pipe."""
 
@@ -607,7 +695,6 @@ def Connect2(pipe, system_name = '', access_mask = 0x02000000):
 
     return ConnectHandle(pipe, r.data_out.connect_handle)
 
-
 def Connect3(pipe, system_name = '', access_mask = 0x02000000):
 
     r = dcerpc.samr_Connect3()
@@ -645,30 +732,22 @@ def Connect5(pipe, system_name = '', access_mask = 0x02000000):
 
     return ConnectHandle(pipe, r.data_out.connect_handle)
     
-# QueryGroupInfo
-# SetGroupInfo
 # AddGroupMember
 # DeleteDomainGroup
 # DeleteGroupMember
-# QueryGroupMember
 # SetMemberAttributesofGroup
 # AddAliasMember
 # DeleteAliasMember
 # GetMembersinAlias
 # SetUserInfo
 # ChangePasswordUser
-# GetGroupsForUser
 # GetDisplayEnumerationIndex
-# TestPrivateFunctionsDomain
-# TestPrivateFunctionsUser
 # RemoveMemberFromForeignDomain
 # GetDisplayEnumerationIndex2
 # RemoveMultipleMembersFromAlias
 # OemChangePasswordUser2
 # ChangePasswordUser2
 # SetUserInfo2
-# SetBootKeyInformation
-# GetBootKeyInformation
 # ChangePasswordUser3
 # SetDsrmPassword
 # ValidatePassword
diff --git a/source4/scripting/swig/torture/torture_samr.py b/source4/scripting/swig/torture/torture_samr.py
index 9025fdd978..15c6dc1a76 100755
--- a/source4/scripting/swig/torture/torture_samr.py
+++ b/source4/scripting/swig/torture/torture_samr.py
@@ -42,18 +42,43 @@ def test_UserHandle(user_handle):
             if arg[0] != 0xc0000003L:   # NT_STATUS_INVALID_INFO_CLASS
                 raise
 
+    # GetGroupsForUser()
+
+    user_handle.GetGroupsForUser()
+
+    # TestPrivateFunctionsUser()
+
+    try:
+        user_handle.TestPrivateFunctionsUser()
+    except dcerpc.NTSTATUS, arg:
+        if arg[0] != 0xC0000002L:
+            raise
+
 def test_GroupHandle(group_handle):
 
     # QuerySecurity()/SetSecurity()
 
     group_handle.SetSecurity(group_handle.QuerySecurity())
 
+    # QueryGroupInfo()
+
+    for level in [1, 2, 3, 4, 5]:
+        info = group_handle.QueryGroupInfo(level)
+
+    # TODO: SetGroupinfo()
+
+    # QueryGroupMember()
+
+    group_handle.QueryGroupMember()
+
 def test_AliasHandle(alias_handle):
 
     # QuerySecurity()/SetSecurity()
 
     alias_handle.SetSecurity(alias_handle.QuerySecurity())
 
+    print alias_handle.GetMembersInAlias()
+
 def test_DomainHandle(name, sid, domain_handle):
 
     print 'testing %s (%s)' % (name, sid)
@@ -142,6 +167,21 @@ def test_DomainHandle(name, sid, domain_handle):
     # CreateDomainGroup
     # GetAliasMembership
 
+    # GetBootKeyInformation()
+
+    try:
+        domain_handle.GetBootKeyInformation()
+    except dcerpc.NTSTATUS, arg:
+        pass
+
+    # TestPrivateFunctionsDomain()
+
+    try:
+        domain_handle.TestPrivateFunctionsDomain()
+    except dcerpc.NTSTATUS, arg:
+        if arg[0] != 0xC0000002L:
+            raise
+
 def test_ConnectHandle(connect_handle):
 
     print 'testing connect handle'
-- 
cgit 


From 6950d5f8956c64a6f420b0207d6555e1b9a7bc0d Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Tue, 3 May 2005 01:48:50 +0000
Subject: r6590: Remove bogus library versioning variables from swig wrappers.
 (This used to be commit 83a125ce576b1be613e010a5c9b4257f25909b05)

---
 source4/scripting/swig/config.mk | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/config.mk b/source4/scripting/swig/config.mk
index fad6b68bda..38144fb9e2 100644
--- a/source4/scripting/swig/config.mk
+++ b/source4/scripting/swig/config.mk
@@ -1,11 +1,5 @@
 [LIBRARY::swig_tdb]
-MAJOR_VERSION = 0
-MINOR_VERSION = 0
-RELEASE_VERSION = 1
 REQUIRED_SUBSYSTEMS = LIBTDB
 
 [LIBRARY::swig_dcerpc]
-MAJOR_VERSION = 0
-MINOR_VERSION = 0
-RELEASE_VERSION = 1
 REQUIRED_SUBSYSTEMS = LIBCLI NDR_MISC LIBBASIC CONFIG RPC_NDR_SAMR RPC_NDR_LSA
-- 
cgit 


From c8d0e36312e351f0aba2e71d7744397d9fa11961 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Tue, 3 May 2005 06:11:12 +0000
Subject: r6591: Add some comments.

Use SWIG %rename to get rid of prefix on every tdb function.

Treat mode_t as an int so we can actually pass a mode argument to
tdb_open().
(This used to be commit 0abd03f70c5c63a915086eaf6e3a25b3087769bc)
---
 source4/scripting/swig/tdb.i | 48 ++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 44 insertions(+), 4 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/tdb.i b/source4/scripting/swig/tdb.i
index a3d1a6ebbc..b381487ebc 100644
--- a/source4/scripting/swig/tdb.i
+++ b/source4/scripting/swig/tdb.i
@@ -3,7 +3,7 @@
 
    Swig interface to tdb.
 
-   Copyright (C) 2004 Tim Potter <tpot@samba.org>
+   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
@@ -51,7 +51,6 @@
 
 %}
 
-
 /* The tdb functions will crash if a NULL tdb is passed */
 
 %include exception.i
@@ -63,7 +62,8 @@
 }
 
 /* In and out typemaps for the TDB_DATA structure.  This is converted to
-   and from the Python string type. */
+   and from the Python string type which can contain arbitrary binary
+   data.. */
 
 %typemap(in) TDB_DATA {
 	if (!PyString_Check($input)) {
@@ -85,7 +85,7 @@
 
 /* Treat a mode_t as an unsigned integer */
 
-typedef uint_t mode_t;
+typedef int mode_t;
 
 /* flags to tdb_store() */
 
@@ -103,36 +103,76 @@ typedef uint_t mode_t;
 #define TDB_CONVERT 16 /* convert endian (internal use) */
 #define TDB_BIGENDIAN 32 /* header is big-endian (internal use) */
 
+%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);
 
+%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);
-- 
cgit 


From 17f1cf095022a88541c461f2ea66940daabcd9a8 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Tue, 3 May 2005 07:10:46 +0000
Subject: r6592: Throw an IOError exception if tdb_open() or tdb_open_Ex()
 returns NULL. (This used to be commit
 99fb6b6badf1afeac21fdb5f1ce04c1749e1b7f7)

---
 source4/scripting/swig/tdb.i | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/tdb.i b/source4/scripting/swig/tdb.i
index b381487ebc..6c6c4af8cd 100644
--- a/source4/scripting/swig/tdb.i
+++ b/source4/scripting/swig/tdb.i
@@ -103,6 +103,16 @@ typedef int mode_t;
 #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);
@@ -113,6 +123,8 @@ TDB_CONTEXT *tdb_open_ex(const char *name, int hash_size, int tdb_flags,
 			 tdb_log_func log_fn,
 			 tdb_hash_func hash_fn);
 
+%exception;
+
 %rename tdb_reopen reopen;
 int tdb_reopen(TDB_CONTEXT *tdb);
 
-- 
cgit 


From f52a74021512aace67f7ecba33ed130102f47533 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Sun, 29 May 2005 00:13:10 +0000
Subject: r7061: A ejs scripting client.  This should allow javascript to be
 run in a command line environment instead of inside the web server.

It doesn't work yet though, rather an exception is thrown when trying
to call ejsDefineStringCFunction().
(This used to be commit 3444cd5429dfef5a67d5bf7818ae08e4e8cc5ccc)
---
 source4/scripting/config.mk       |  8 +++++
 source4/scripting/ejs/smbscript.c | 62 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 70 insertions(+)
 create mode 100644 source4/scripting/config.mk
 create mode 100644 source4/scripting/ejs/smbscript.c

(limited to 'source4/scripting')

diff --git a/source4/scripting/config.mk b/source4/scripting/config.mk
new file mode 100644
index 0000000000..31f7e6df9d
--- /dev/null
+++ b/source4/scripting/config.mk
@@ -0,0 +1,8 @@
+#######################
+# Start BINARY SMBSCRIPT
+[BINARY::smbscript]
+OBJ_FILES = \
+		scripting/ejs/smbscript.o
+REQUIRED_SUBSYSTEMS = EJS LIBBASIC
+# End BINARY SMBSCRIPT
+#######################
diff --git a/source4/scripting/ejs/smbscript.c b/source4/scripting/ejs/smbscript.c
new file mode 100644
index 0000000000..f1c3f0b46d
--- /dev/null
+++ b/source4/scripting/ejs/smbscript.c
@@ -0,0 +1,62 @@
+/* 
+   Unix SMB/CIFS implementation.
+
+   Standalone client for ESP scripting.
+
+   Copyright (C) Tim Potter <tpot@samba.org> 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 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.
+*/
+
+#include "includes.h"
+#include "web_server/ejs/ejs.h"
+
+void http_exception(const char *reason)
+{
+	fprintf(stderr, "smbscript exception: %s", reason);
+	exit(1);
+}
+
+extern void		ejsDefineStringCFunction(EjsId eid, const char *functionName, 
+					MprStringCFunction fn, void *thisPtr, int flags);
+
+static int writeProc(MprVarHandle userHandle, int argc, char **argv)
+{
+	int i;
+
+	mprAssert(argv);
+	for (i = 0; i < argc; i++) {
+		printf("%s", argv[i]);
+	}
+	return 0;
+}
+
+ int main(int argc, const char *argv[])
+{
+	EjsId eid;
+	EjsHandle primary, alternate;
+	MprVar result;
+	char *emsg;
+
+	ejsOpen(0, 0, 0);
+	eid = ejsOpenEngine(primary, alternate);
+	ejsDefineStringCFunction(eid, "write", writeProc, NULL, 0);
+	ejsEvalScript(0, "write(\"hello\n\");", &result, &emsg);
+	ejsClose();
+
+	printf("emsg = %s\n", emsg);
+
+	return 0;
+}
-- 
cgit 


From 10f428b6075698205d282c13bc9b1c21f106e165 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Sun, 29 May 2005 00:22:34 +0000
Subject: r7062: Merge scripting/swig/config.mk with scripting/config.mk (This
 used to be commit e14c00c4c1cc51dac9452c1e950445907d883e46)

---
 source4/scripting/config.mk      | 14 ++++++++++++++
 source4/scripting/swig/config.mk |  5 -----
 2 files changed, 14 insertions(+), 5 deletions(-)
 delete mode 100644 source4/scripting/swig/config.mk

(limited to 'source4/scripting')

diff --git a/source4/scripting/config.mk b/source4/scripting/config.mk
index 31f7e6df9d..0ea102deee 100644
--- a/source4/scripting/config.mk
+++ b/source4/scripting/config.mk
@@ -6,3 +6,17 @@ OBJ_FILES = \
 REQUIRED_SUBSYSTEMS = EJS LIBBASIC
 # End BINARY SMBSCRIPT
 #######################
+
+#######################
+# Start LIBRARY swig_tdb
+[LIBRARY::swig_tdb]
+REQUIRED_SUBSYSTEMS = LIBTDB
+# End LIBRARY swig_tdb
+#######################
+
+#######################
+# Start LIBRARY swig_dcerpc
+[LIBRARY::swig_dcerpc]
+REQUIRED_SUBSYSTEMS = LIBCLI NDR_MISC LIBBASIC CONFIG RPC_NDR_SAMR RPC_NDR_LSA
+# End LIBRARY swig_dcerpc
+#######################
diff --git a/source4/scripting/swig/config.mk b/source4/scripting/swig/config.mk
deleted file mode 100644
index 38144fb9e2..0000000000
--- a/source4/scripting/swig/config.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-[LIBRARY::swig_tdb]
-REQUIRED_SUBSYSTEMS = LIBTDB
-
-[LIBRARY::swig_dcerpc]
-REQUIRED_SUBSYSTEMS = LIBCLI NDR_MISC LIBBASIC CONFIG RPC_NDR_SAMR RPC_NDR_LSA
-- 
cgit 


From e95c8f19116813dd03cce957c3367254782915fd Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Sun, 29 May 2005 03:25:21 +0000
Subject: r7063: Do error checking on the ejs functions.

Tridge says there is a bug in defining per-engine CFunction's so move
calls to ejsDefineStringCFunction() above the ejsOpenEngine() call.

Test script now works!
(This used to be commit 5e2458ae6c863ff29b85fff3d093f7f4fa9dc2be)
---
 source4/scripting/ejs/smbscript.c | 28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbscript.c b/source4/scripting/ejs/smbscript.c
index f1c3f0b46d..85064d3b44 100644
--- a/source4/scripting/ejs/smbscript.c
+++ b/source4/scripting/ejs/smbscript.c
@@ -29,9 +29,6 @@ void http_exception(const char *reason)
 	exit(1);
 }
 
-extern void		ejsDefineStringCFunction(EjsId eid, const char *functionName, 
-					MprStringCFunction fn, void *thisPtr, int flags);
-
 static int writeProc(MprVarHandle userHandle, int argc, char **argv)
 {
 	int i;
@@ -50,13 +47,26 @@ static int writeProc(MprVarHandle userHandle, int argc, char **argv)
 	MprVar result;
 	char *emsg;
 
-	ejsOpen(0, 0, 0);
-	eid = ejsOpenEngine(primary, alternate);
-	ejsDefineStringCFunction(eid, "write", writeProc, NULL, 0);
-	ejsEvalScript(0, "write(\"hello\n\");", &result, &emsg);
-	ejsClose();
+	if (ejsOpen(0, 0, 0) != 0) {
+		fprintf(stderr, "smbscript: ejsOpen(): unable to initialise "
+			"EJ subsystem\n");
+		exit(1);
+	}
 
-	printf("emsg = %s\n", emsg);
+	ejsDefineStringCFunction(-1, "write", writeProc, NULL, 0);
+
+	if ((eid = ejsOpenEngine(primary, alternate)) == (EjsId)-1) {
+		fprintf(stderr, "smbscript: ejsOpenEngine(): unable to "
+			"initialise an EJS engine\n");
+		exit(1);
+	}
+
+	if (ejsEvalScript(0, "write(\"hello\n\");", &result, &emsg) == -1) {
+		fprintf(stderr, "smbscript: ejsEvalScript(): %s\n", emsg);
+		exit(1);
+	}
+
+	ejsClose();
 
 	return 0;
 }
-- 
cgit 


From de850cb754f8ea49acc80e4303a9835578768154 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Sun, 29 May 2005 03:29:10 +0000
Subject: r7064: Clean up handle parameter passing after peeking at tridge's
 ejstest.c (This used to be commit 805b6c7cf0f1e05fbb690bdfc93938747e13e6cd)

---
 source4/scripting/ejs/smbscript.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbscript.c b/source4/scripting/ejs/smbscript.c
index 85064d3b44..1c823a4d8e 100644
--- a/source4/scripting/ejs/smbscript.c
+++ b/source4/scripting/ejs/smbscript.c
@@ -43,11 +43,11 @@ static int writeProc(MprVarHandle userHandle, int argc, char **argv)
  int main(int argc, const char *argv[])
 {
 	EjsId eid;
-	EjsHandle primary, alternate;
+	EjsHandle handle;
 	MprVar result;
 	char *emsg;
 
-	if (ejsOpen(0, 0, 0) != 0) {
+	if (ejsOpen(NULL, NULL, NULL) != 0) {
 		fprintf(stderr, "smbscript: ejsOpen(): unable to initialise "
 			"EJ subsystem\n");
 		exit(1);
@@ -55,13 +55,13 @@ static int writeProc(MprVarHandle userHandle, int argc, char **argv)
 
 	ejsDefineStringCFunction(-1, "write", writeProc, NULL, 0);
 
-	if ((eid = ejsOpenEngine(primary, alternate)) == (EjsId)-1) {
+	if ((eid = ejsOpenEngine(handle, 0)) == (EjsId)-1) {
 		fprintf(stderr, "smbscript: ejsOpenEngine(): unable to "
 			"initialise an EJS engine\n");
 		exit(1);
 	}
 
-	if (ejsEvalScript(0, "write(\"hello\n\");", &result, &emsg) == -1) {
+	if (ejsEvalScript(eid, "write(\"hello\n\");", &result, &emsg) == -1) {
 		fprintf(stderr, "smbscript: ejsEvalScript(): %s\n", emsg);
 		exit(1);
 	}
-- 
cgit 


From 14ade23914b328fcb5924488c2416dfa7748e4ab Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Sun, 29 May 2005 03:53:36 +0000
Subject: r7065: Move ejs from web_server to lib so it can be shared with
 smbscript. (This used to be commit b83dc8fbfb9ffe30654bc4869398f50dd9ccccb7)

---
 source4/scripting/ejs/smbscript.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbscript.c b/source4/scripting/ejs/smbscript.c
index 1c823a4d8e..f1ff03ae49 100644
--- a/source4/scripting/ejs/smbscript.c
+++ b/source4/scripting/ejs/smbscript.c
@@ -21,7 +21,7 @@
 */
 
 #include "includes.h"
-#include "web_server/ejs/ejs.h"
+#include "lib/ejs/ejs.h"
 
 void http_exception(const char *reason)
 {
-- 
cgit 


From 7756b990f38495bf98e335b56bdc510659c34bdb Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Sun, 29 May 2005 04:10:22 +0000
Subject: r7066: Rename http_exception to ejs_exception. (This used to be
 commit f2e59d3adfd7813c3c2090350f8ff2a99a5533e9)

---
 source4/scripting/ejs/smbscript.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbscript.c b/source4/scripting/ejs/smbscript.c
index f1ff03ae49..0b0a446839 100644
--- a/source4/scripting/ejs/smbscript.c
+++ b/source4/scripting/ejs/smbscript.c
@@ -23,7 +23,7 @@
 #include "includes.h"
 #include "lib/ejs/ejs.h"
 
-void http_exception(const char *reason)
+void ejs_exception(const char *reason)
 {
 	fprintf(stderr, "smbscript exception: %s", reason);
 	exit(1);
@@ -61,7 +61,7 @@ static int writeProc(MprVarHandle userHandle, int argc, char **argv)
 		exit(1);
 	}
 
-	if (ejsEvalScript(eid, "write(\"hello\n\");", &result, &emsg) == -1) {
+	if (ejsEvalFile(eid, (char *)argv[1], &result, &emsg) == -1) {
 		fprintf(stderr, "smbscript: ejsEvalScript(): %s\n", emsg);
 		exit(1);
 	}
-- 
cgit 


From 21f3a3921c03777beb7e3072152ae33956b38807 Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vlendec@samba.org>
Date: Sun, 29 May 2005 08:12:16 +0000
Subject: r7069: Add a little usage message to smbscript and fix a compiler
 warning. My compiler still complains about "handle"
 (scripting/ejs/smbscrip.c:46) possibly not being initialized and to me this
 looks true.

Running smbscript with the trivial write("Hello, world\n"); also leaves some
memory around.

Volker
(This used to be commit 06d27a19213dc8fe6dfc948a5e8cbafa74db7a29)
---
 source4/scripting/ejs/smbscript.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbscript.c b/source4/scripting/ejs/smbscript.c
index 0b0a446839..57f42688d6 100644
--- a/source4/scripting/ejs/smbscript.c
+++ b/source4/scripting/ejs/smbscript.c
@@ -47,6 +47,11 @@ static int writeProc(MprVarHandle userHandle, int argc, char **argv)
 	MprVar result;
 	char *emsg;
 
+	if (argc != 2) {
+		fprintf(stderr, "Usage: %s <scriptfile>\n", argv[0]);
+		exit(1);
+	}
+
 	if (ejsOpen(NULL, NULL, NULL) != 0) {
 		fprintf(stderr, "smbscript: ejsOpen(): unable to initialise "
 			"EJ subsystem\n");
@@ -61,7 +66,8 @@ static int writeProc(MprVarHandle userHandle, int argc, char **argv)
 		exit(1);
 	}
 
-	if (ejsEvalFile(eid, (char *)argv[1], &result, &emsg) == -1) {
+	if (ejsEvalFile(eid, discard_const_p(char, argv[1]), &result,
+			&emsg) == -1) {
 		fprintf(stderr, "smbscript: ejsEvalScript(): %s\n", emsg);
 		exit(1);
 	}
-- 
cgit 


From 8754c793bfe79e87febb026e5915e054c23cfede Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Sun, 29 May 2005 11:35:56 +0000
Subject: r7072: moved the esp hooks calls to the ejs level, so we can call
 them from both esp scripts and ejs scripts. This allows the smbscript program
 to call all the existing extension calls like lpGet() and ldbSearch()

Also fixed smbscript to load smb.conf, and setup logging for DEBUG()

I left the unixAuth() routine in web_server/calls.c at the moment, as
that is really only useful for esp scripts. I imagine that as we
extend esp/ejs, we will put some functions in scripting/ejs/ for use
in both ejs and esp, and some functions in web_server/ where they will
only be accessed by esp web scripts
(This used to be commit e59ae64f60d388a5634559e4e0887e4676b70871)
---
 source4/scripting/config.mk       |  12 +-
 source4/scripting/ejs/mprutil.c   | 159 +++++++++++++++++++++++
 source4/scripting/ejs/smbcalls.c  | 259 ++++++++++++++++++++++++++++++++++++++
 source4/scripting/ejs/smbscript.c |  27 ++--
 4 files changed, 444 insertions(+), 13 deletions(-)
 create mode 100644 source4/scripting/ejs/mprutil.c
 create mode 100644 source4/scripting/ejs/smbcalls.c

(limited to 'source4/scripting')

diff --git a/source4/scripting/config.mk b/source4/scripting/config.mk
index 0ea102deee..b32199bc1c 100644
--- a/source4/scripting/config.mk
+++ b/source4/scripting/config.mk
@@ -1,9 +1,19 @@
+#######################
+# Start LIBRARY SMBCALLS
+[SUBSYSTEM::SMBCALLS]
+OBJ_FILES = \
+		scripting/ejs/smbcalls.o \
+		scripting/ejs/mprutil.o
+REQUIRED_SUBSYSTEMS = EJS LIBBASIC
+# End SUBSYSTEM SMBCALLS
+#######################
+
 #######################
 # Start BINARY SMBSCRIPT
 [BINARY::smbscript]
 OBJ_FILES = \
 		scripting/ejs/smbscript.o
-REQUIRED_SUBSYSTEMS = EJS LIBBASIC
+REQUIRED_SUBSYSTEMS = EJS LIBBASIC SMBCALLS
 # End BINARY SMBSCRIPT
 #######################
 
diff --git a/source4/scripting/ejs/mprutil.c b/source4/scripting/ejs/mprutil.c
new file mode 100644
index 0000000000..a1e26ecb2c
--- /dev/null
+++ b/source4/scripting/ejs/mprutil.c
@@ -0,0 +1,159 @@
+/* 
+   Unix SMB/CIFS implementation.
+
+   utility functions for manipulating mpr variables in ejs calls
+
+   Copyright (C) Andrew Tridgell 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 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.
+*/
+
+#include "includes.h"
+#include "lib/ejs/ejs.h"
+#include "lib/ldb/include/ldb.h"
+
+/*
+  add an indexed array element to a property
+*/
+static void mprAddArray(struct MprVar *var, int i, struct MprVar v)
+{
+	char idx[16];
+	mprItoa(i, idx, sizeof(idx));
+	mprCreateProperty(var, idx, &v);
+}
+
+/*
+  construct a MprVar from a list
+*/
+struct MprVar mprList(const char *name, const char **list)
+{
+	struct MprVar var;
+	int i;
+
+	var = mprCreateObjVar(name, MPR_DEFAULT_HASH_SIZE);
+	for (i=0;list && list[i];i++) {
+		mprAddArray(&var, i, mprCreateStringVar(list[i], 1));
+	}
+	return var;
+}
+
+/*
+  construct a string MprVar from a lump of data
+*/
+struct MprVar mprData(const uint8_t *p, size_t length)
+{
+	struct MprVar var;
+	char *s = talloc_strndup(mprMemCtx(), p, length);
+	if (s == NULL) {
+		return mprCreateUndefinedVar();
+	}
+	var = mprCreateStringVar(s, 1);
+	talloc_free(s);
+	return var;
+}
+
+/*
+  turn a ldb_message into a ejs object variable
+*/
+struct MprVar mprLdbMessage(struct ldb_message *msg)
+{
+	struct MprVar var;
+	int i;
+	/* we force some attributes to always be an array in the
+	   returned structure. This makes the scripting easier, as you don't 
+	   need a special case for the single value case */
+	const char *multivalued[] = { "objectClass", "memberOf", "privilege", 
+					    "member", NULL };
+	struct MprVar val;
+
+	var = mprCreateObjVar(msg->dn, MPR_DEFAULT_HASH_SIZE);
+
+	for (i=0;i<msg->num_elements;i++) {
+		struct ldb_message_element *el = &msg->elements[i];
+		if (el->num_values == 1 &&
+		    !str_list_check_ci(multivalued, el->name)) {
+			val = mprData(el->values[0].data, el->values[0].length);
+		} else {
+			int j;
+			val = mprCreateObjVar(el->name, MPR_DEFAULT_HASH_SIZE);
+			for (j=0;j<el->num_values;j++) {
+				mprAddArray(&val, j, 
+					    mprData(el->values[j].data, 
+						    el->values[j].length));
+			}
+		}
+		mprCreateProperty(&var, el->name, &val);
+	}
+
+	/* add the dn if it is not already specified */
+	if (mprGetProperty(&var, "dn", 0) == 0) {
+		val = mprCreateStringVar(msg->dn, 1);
+		mprCreateProperty(&var, "dn", &val);
+	}
+	
+	return var;		
+}
+
+
+/*
+  turn an array of ldb_messages into a ejs object variable
+*/
+struct MprVar mprLdbArray(struct ldb_message **msg, int count, const char *name)
+{
+	struct MprVar res;
+	int i;
+
+	res = mprCreateObjVar(name?name:"(NULL)", MPR_DEFAULT_HASH_SIZE);
+	for (i=0;i<count;i++) {
+		mprAddArray(&res, i, mprLdbMessage(msg[i]));
+	}
+	return res;	
+}
+
+
+/*
+  turn a MprVar string variable into a const char *
+ */
+const char *mprToString(const struct MprVar *v)
+{
+	if (v->type != MPR_TYPE_STRING) return NULL;
+	return v->string;
+}
+
+/*
+  turn a MprVar object variable into a string list
+  this assumes the object variable consists only of strings
+*/
+const char **mprToList(TALLOC_CTX *mem_ctx, struct MprVar *v)
+{
+	const char **list = NULL;
+	struct MprVar *el;
+
+	if (v->type != MPR_TYPE_OBJECT ||
+	    v->properties == NULL) {
+		return NULL;
+	}
+	for (el=mprGetFirstProperty(v, MPR_ENUM_DATA);
+	     el;
+	     el=mprGetNextProperty(v, el, MPR_ENUM_DATA)) {
+		const char *s = mprToString(el);
+		if (s) {
+			list = str_list_add(list, s);
+		}
+	}
+	talloc_steal(mem_ctx, list);
+	return list;
+}
+
diff --git a/source4/scripting/ejs/smbcalls.c b/source4/scripting/ejs/smbcalls.c
new file mode 100644
index 0000000000..664bb74df3
--- /dev/null
+++ b/source4/scripting/ejs/smbcalls.c
@@ -0,0 +1,259 @@
+/* 
+   Unix SMB/CIFS implementation.
+
+   provide hooks into smbd C calls from ejs scripts
+
+   Copyright (C) Andrew Tridgell 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 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.
+*/
+
+#include "includes.h"
+#include "lib/ejs/ejs.h"
+#include "param/loadparm.h"
+#include "lib/ldb/include/ldb.h"
+
+/*
+  return the type of a variable
+*/
+static int ejs_typeof(MprVarHandle eid, int argc, struct MprVar **argv)
+{
+	const struct {
+		MprType type;
+		const char *name;
+	} types[] = {
+		{ MPR_TYPE_UNDEFINED, "undefined" },
+		{ MPR_TYPE_NULL, "null" },
+		{ MPR_TYPE_BOOL, "boolean" },
+		{ MPR_TYPE_CFUNCTION, "function" },
+		{ MPR_TYPE_FLOAT, "float" },
+		{ MPR_TYPE_INT, "int" },
+		{ MPR_TYPE_INT64, "int64" },
+		{ MPR_TYPE_OBJECT, "object" },
+		{ MPR_TYPE_FUNCTION, "function" },
+		{ MPR_TYPE_STRING, "string" },
+		{ MPR_TYPE_STRING_CFUNCTION, "function" }
+	};
+	int i;
+	const char *type = "unknown";
+
+	if (argc != 1) return -1;
+	
+	for (i=0;i<ARRAY_SIZE(types);i++) {
+		if (argv[0]->type == types[i].type) {
+			type = types[i].name;
+			break;
+		}
+	}
+
+	ejsSetReturnString(eid, type);
+	return 0;
+}
+
+/*
+  setup a return of a string list
+*/
+static void ejs_returnlist(MprVarHandle eid, 
+			   const char *name, const char **list)
+{
+	ejsSetReturnValue(eid, mprList(name, list));
+}
+
+/*
+  return a list of defined services
+*/
+static int ejs_lpServices(MprVarHandle eid, int argc, char **argv)
+{
+	int i;
+	const char **list = NULL;
+	if (argc != 0) return -1;
+	
+	for (i=0;i<lp_numservices();i++) {
+		list = str_list_add(list, lp_servicename(i));
+	}
+	talloc_steal(mprMemCtx(), list);
+	ejs_returnlist(eid, "services", list);
+	return 0;
+}
+
+
+/*
+  allow access to loadparm variables from inside ejs scripts in swat
+  
+  can be called in 4 ways:
+
+    v = lpGet("type:parm");             gets a parametric variable
+    v = lpGet("share", "type:parm");    gets a parametric variable on a share
+    v = lpGet("parm");                  gets a global variable
+    v = lpGet("share", "parm");         gets a share variable
+
+  the returned variable is a ejs object. It is an array object for lists.  
+*/
+static int ejs_lpGet(MprVarHandle eid, int argc, char **argv)
+{
+	struct parm_struct *parm = NULL;
+	void *parm_ptr = NULL;
+	int i;
+
+	if (argc < 1) return -1;
+
+	if (argc == 2) {
+		/* its a share parameter */
+		int snum = lp_servicenumber(argv[0]);
+		if (snum == -1) {
+			return -1;
+		}
+		if (strchr(argv[1], ':')) {
+			/* its a parametric option on a share */
+			const char *type = talloc_strndup(mprMemCtx(), 
+							  argv[1], 
+							  strcspn(argv[1], ":"));
+			const char *option = strchr(argv[1], ':') + 1;
+			const char *value;
+			if (type == NULL || option == NULL) return -1;
+			value = lp_get_parametric(snum, type, option);
+			if (value == NULL) return -1;
+			ejsSetReturnString(eid, value);
+			return 0;
+		}
+
+		parm = lp_parm_struct(argv[1]);
+		if (parm == NULL || parm->class == P_GLOBAL) {
+			return -1;
+		}
+		parm_ptr = lp_parm_ptr(snum, parm);
+	} else if (strchr(argv[0], ':')) {
+		/* its a global parametric option */
+		const char *type = talloc_strndup(mprMemCtx(), 
+						  argv[0], strcspn(argv[0], ":"));
+		const char *option = strchr(argv[0], ':') + 1;
+		const char *value;
+		if (type == NULL || option == NULL) return -1;
+		value = lp_get_parametric(-1, type, option);
+		if (value == NULL) return -1;
+		ejsSetReturnString(eid, value);
+		return 0;
+	} else {
+		/* its a global parameter */
+		parm = lp_parm_struct(argv[0]);
+		if (parm == NULL) return -1;
+		parm_ptr = parm->ptr;
+	}
+
+	if (parm == NULL || parm_ptr == NULL) {
+		return -1;
+	}
+
+	/* construct and return the right type of ejs object */
+	switch (parm->type) {
+	case P_STRING:
+	case P_USTRING:
+		ejsSetReturnString(eid, *(char **)parm_ptr);
+		break;
+	case P_BOOL:
+		ejsSetReturnValue(eid, mprCreateBoolVar(*(BOOL *)parm_ptr));
+		break;
+	case P_INTEGER:
+		ejsSetReturnValue(eid, mprCreateIntegerVar(*(int *)parm_ptr));
+		break;
+	case P_ENUM:
+		for (i=0; parm->enum_list[i].name; i++) {
+			if (*(int *)parm_ptr == parm->enum_list[i].value) {
+				ejsSetReturnString(eid, parm->enum_list[i].name);
+				return 0;
+			}
+		}
+		return -1;	
+	case P_LIST: 
+		ejs_returnlist(eid, parm->label, *(const char ***)parm_ptr);
+		break;
+	case P_SEP:
+		return -1;
+	}
+	return 0;
+}
+
+
+/*
+  perform an ldb search, returning an array of results
+
+  syntax:
+     ldbSearch("dbfile", "expression");
+     var attrs = new Array("attr1", "attr2", "attr3");
+     ldbSearch("dbfile", "expression", attrs);
+*/
+static int ejs_ldbSearch(MprVarHandle eid, int argc, struct MprVar **argv)
+{
+	const char **attrs = NULL;
+	const char *expression, *dbfile;
+	TALLOC_CTX *tmp_ctx = talloc_new(mprMemCtx());
+	struct ldb_context *ldb;
+	int ret;
+	struct ldb_message **res;
+
+	/* validate arguments */
+	if (argc < 2 || argc > 3 ||
+	    argv[0]->type != MPR_TYPE_STRING) {
+		ejsSetErrorMsg(eid, "ldbSearch invalid arguments");
+		goto failed;
+	}
+	if (argc == 3 && argv[2]->type != MPR_TYPE_OBJECT) {
+		ejsSetErrorMsg(eid, "ldbSearch attributes must be an object");
+		goto failed;
+	}
+
+	dbfile     = mprToString(argv[0]);
+	expression = mprToString(argv[1]);
+	if (argc > 2) {
+		attrs = mprToList(tmp_ctx, argv[2]);
+	}
+	if (dbfile == NULL || expression == NULL) {
+		ejsSetErrorMsg(eid, "ldbSearch invalid arguments");
+		goto failed;
+	}
+
+	ldb = ldb_wrap_connect(tmp_ctx, dbfile, 0, NULL);
+	if (ldb == NULL) {
+		ejsSetErrorMsg(eid, "ldbSearch failed to open %s", dbfile);
+		goto failed;
+	}
+
+	ret = ldb_search(ldb, NULL, LDB_SCOPE_DEFAULT, expression, attrs, &res);
+	if (ret == -1) {
+		ejsSetErrorMsg(eid, "ldbSearch failed - %s", ldb_errstring(ldb));
+		goto failed;
+	}
+
+	ejsSetReturnValue(eid, mprLdbArray(res, ret, "ldb_message"));
+
+	talloc_free(tmp_ctx);
+	return 0;
+
+failed:
+	talloc_free(tmp_ctx);
+	return -1;
+}
+
+
+/*
+  setup the C functions that be called from ejs
+*/
+void smb_setup_ejs_functions(void)
+{
+	ejsDefineStringCFunction(-1, "lpGet", ejs_lpGet, NULL, 0);
+	ejsDefineStringCFunction(-1, "lpServices", ejs_lpServices, NULL, 0);
+	ejsDefineCFunction(-1, "typeof", ejs_typeof, NULL, 0);
+	ejsDefineCFunction(-1, "ldbSearch", ejs_ldbSearch, NULL, 0);
+}
diff --git a/source4/scripting/ejs/smbscript.c b/source4/scripting/ejs/smbscript.c
index 57f42688d6..593d3b0cf5 100644
--- a/source4/scripting/ejs/smbscript.c
+++ b/source4/scripting/ejs/smbscript.c
@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "dynconfig.h"
 #include "lib/ejs/ejs.h"
 
 void ejs_exception(const char *reason)
@@ -29,36 +30,36 @@ void ejs_exception(const char *reason)
 	exit(1);
 }
 
-static int writeProc(MprVarHandle userHandle, int argc, char **argv)
-{
-	int i;
-
-	mprAssert(argv);
-	for (i = 0; i < argc; i++) {
-		printf("%s", argv[i]);
-	}
-	return 0;
-}
-
  int main(int argc, const char *argv[])
 {
 	EjsId eid;
 	EjsHandle handle;
 	MprVar result;
 	char *emsg;
+	TALLOC_CTX *mem_ctx = talloc_new(NULL);
 
 	if (argc != 2) {
 		fprintf(stderr, "Usage: %s <scriptfile>\n", argv[0]);
 		exit(1);
 	}
 
+	setup_logging(argv[0],DEBUG_STDOUT);
+
+	if (!lp_load(dyn_CONFIGFILE,True,False,False)) {
+		fprintf(stderr, "%s: Can't load %s - run testparm to debug it\n",
+			argv[0], dyn_CONFIGFILE);
+		exit(1);
+	}
+
+	mprSetCtx(mem_ctx);
+
 	if (ejsOpen(NULL, NULL, NULL) != 0) {
 		fprintf(stderr, "smbscript: ejsOpen(): unable to initialise "
 			"EJ subsystem\n");
 		exit(1);
 	}
 
-	ejsDefineStringCFunction(-1, "write", writeProc, NULL, 0);
+	smb_setup_ejs_functions();
 
 	if ((eid = ejsOpenEngine(handle, 0)) == (EjsId)-1) {
 		fprintf(stderr, "smbscript: ejsOpenEngine(): unable to "
@@ -74,5 +75,7 @@ static int writeProc(MprVarHandle userHandle, int argc, char **argv)
 
 	ejsClose();
 
+	talloc_free(mem_ctx);
+
 	return 0;
 }
-- 
cgit 


From 8f84f7cdecf12396eb5c1723e5e1ccf813cd9a51 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Sun, 29 May 2005 11:43:52 +0000
Subject: r7074: we should load all shares in smbscript (This used to be commit
 92f85507df2bce5e246484860a43748321f2291e)

---
 source4/scripting/ejs/smbscript.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbscript.c b/source4/scripting/ejs/smbscript.c
index 593d3b0cf5..c6b1b7a192 100644
--- a/source4/scripting/ejs/smbscript.c
+++ b/source4/scripting/ejs/smbscript.c
@@ -45,7 +45,7 @@ void ejs_exception(const char *reason)
 
 	setup_logging(argv[0],DEBUG_STDOUT);
 
-	if (!lp_load(dyn_CONFIGFILE,True,False,False)) {
+	if (!lp_load(dyn_CONFIGFILE, False, False, False)) {
 		fprintf(stderr, "%s: Can't load %s - run testparm to debug it\n",
 			argv[0], dyn_CONFIGFILE);
 		exit(1);
-- 
cgit 


From f477a741293673adad784c55a749031a290bd072 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Sun, 29 May 2005 11:58:14 +0000
Subject: r7075: added support for ARGV[] in ejs scripts (This used to be
 commit 3db568eb6bb383c4c1e1fd0c7f043a9914dcc3cc)

---
 source4/scripting/ejs/smbscript.c | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbscript.c b/source4/scripting/ejs/smbscript.c
index c6b1b7a192..3378885147 100644
--- a/source4/scripting/ejs/smbscript.c
+++ b/source4/scripting/ejs/smbscript.c
@@ -37,8 +37,11 @@ void ejs_exception(const char *reason)
 	MprVar result;
 	char *emsg;
 	TALLOC_CTX *mem_ctx = talloc_new(NULL);
+	const char **argv_list = NULL;
+	struct MprVar v;
+	int i;
 
-	if (argc != 2) {
+	if (argc < 2) {
 		fprintf(stderr, "Usage: %s <scriptfile>\n", argv[0]);
 		exit(1);
 	}
@@ -67,6 +70,14 @@ void ejs_exception(const char *reason)
 		exit(1);
 	}
 
+	/* setup ARGV[] in the ejs environment */
+	for (i=2;i<argc;i++) {
+		argv_list = str_list_add(argv_list, argv[i]);
+	}
+	v = mprList("ARGV", argv_list);
+	mprCreateProperty(ejsGetGlobalObject(eid), "ARGV", &v);
+
+	/* run the script */
 	if (ejsEvalFile(eid, discard_const_p(char, argv[1]), &result,
 			&emsg) == -1) {
 		fprintf(stderr, "smbscript: ejsEvalScript(): %s\n", emsg);
-- 
cgit 


From fe17411203ba3ee5f0a496b524f4afb658077643 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Sun, 29 May 2005 12:10:13 +0000
Subject: r7077: pull in a bunch more libs for smbscript. I plan on making a
 whole lot of internal functions available to ejs, including rpc functions.

This should hopefully fix the link on solaris10 as well
(This used to be commit caceb31be841041a0e20c7e261badad2cce82c6a)
---
 source4/scripting/config.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/config.mk b/source4/scripting/config.mk
index b32199bc1c..a6c4f73430 100644
--- a/source4/scripting/config.mk
+++ b/source4/scripting/config.mk
@@ -13,7 +13,8 @@ REQUIRED_SUBSYSTEMS = EJS LIBBASIC
 [BINARY::smbscript]
 OBJ_FILES = \
 		scripting/ejs/smbscript.o
-REQUIRED_SUBSYSTEMS = EJS LIBBASIC SMBCALLS
+REQUIRED_SUBSYSTEMS = EJS LIBBASIC SMBCALLS CONFIG LIBSMB RPC
+
 # End BINARY SMBSCRIPT
 #######################
 
-- 
cgit 


From 09e00bbdc18741c20f2eeba83da742f056115789 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Sun, 29 May 2005 12:41:59 +0000
Subject: r7078: - fix an uninitialised variable in smbscript

- fixed handle passing in the smb/ejs interface calls, so they can be called
  safely from esp
(This used to be commit 45ea1b64413de577366939b2106f657f6c47b1bd)
---
 source4/scripting/ejs/smbcalls.c  | 8 ++++----
 source4/scripting/ejs/smbscript.c | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls.c b/source4/scripting/ejs/smbcalls.c
index 664bb74df3..e436fc78df 100644
--- a/source4/scripting/ejs/smbcalls.c
+++ b/source4/scripting/ejs/smbcalls.c
@@ -252,8 +252,8 @@ failed:
 */
 void smb_setup_ejs_functions(void)
 {
-	ejsDefineStringCFunction(-1, "lpGet", ejs_lpGet, NULL, 0);
-	ejsDefineStringCFunction(-1, "lpServices", ejs_lpServices, NULL, 0);
-	ejsDefineCFunction(-1, "typeof", ejs_typeof, NULL, 0);
-	ejsDefineCFunction(-1, "ldbSearch", ejs_ldbSearch, NULL, 0);
+	ejsDefineStringCFunction(-1, "lpGet", ejs_lpGet, NULL, MPR_VAR_SCRIPT_HANDLE);
+	ejsDefineStringCFunction(-1, "lpServices", ejs_lpServices, NULL, MPR_VAR_SCRIPT_HANDLE);
+	ejsDefineCFunction(-1, "typeof", ejs_typeof, NULL, MPR_VAR_SCRIPT_HANDLE);
+	ejsDefineCFunction(-1, "ldbSearch", ejs_ldbSearch, NULL, MPR_VAR_SCRIPT_HANDLE);
 }
diff --git a/source4/scripting/ejs/smbscript.c b/source4/scripting/ejs/smbscript.c
index 3378885147..021dafa4ae 100644
--- a/source4/scripting/ejs/smbscript.c
+++ b/source4/scripting/ejs/smbscript.c
@@ -33,7 +33,7 @@ void ejs_exception(const char *reason)
  int main(int argc, const char *argv[])
 {
 	EjsId eid;
-	EjsHandle handle;
+	EjsHandle handle = 0;
 	MprVar result;
 	char *emsg;
 	TALLOC_CTX *mem_ctx = talloc_new(NULL);
-- 
cgit 


From 0b2f972c8a5205f648ed747b04c5232c694afd30 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Sun, 29 May 2005 21:45:38 +0000
Subject: r7080: Fix typo in error message. (This used to be commit
 fcf177c86e2bfbc993352b80824487e5df0a3f63)

---
 source4/scripting/ejs/smbscript.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbscript.c b/source4/scripting/ejs/smbscript.c
index 021dafa4ae..a15fce57b0 100644
--- a/source4/scripting/ejs/smbscript.c
+++ b/source4/scripting/ejs/smbscript.c
@@ -80,7 +80,7 @@ void ejs_exception(const char *reason)
 	/* run the script */
 	if (ejsEvalFile(eid, discard_const_p(char, argv[1]), &result,
 			&emsg) == -1) {
-		fprintf(stderr, "smbscript: ejsEvalScript(): %s\n", emsg);
+		fprintf(stderr, "smbscript: ejsEvalFile(): %s\n", emsg);
 		exit(1);
 	}
 
-- 
cgit 


From 18fa5ea9ef2d9a20d076790123c131d2dbdc9c22 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Sun, 29 May 2005 22:10:51 +0000
Subject: r7081: Add mprToInt() function. (This used to be commit
 790a46f53bd5b6994cbf6aed670df1407a44e2f3)

---
 source4/scripting/ejs/mprutil.c | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/mprutil.c b/source4/scripting/ejs/mprutil.c
index a1e26ecb2c..3e47fdf9a3 100644
--- a/source4/scripting/ejs/mprutil.c
+++ b/source4/scripting/ejs/mprutil.c
@@ -132,6 +132,15 @@ const char *mprToString(const struct MprVar *v)
 	return v->string;
 }
 
+/*
+  turn a MprVar integer variable into an int
+ */
+int mprToInt(const struct MprVar *v)
+{
+	if (v->type != MPR_TYPE_INT) return 0;
+	return v->integer;
+}
+
 /*
   turn a MprVar object variable into a string list
   this assumes the object variable consists only of strings
-- 
cgit 


From 520e2258c9949f9129a2e124035c0200c0c59b39 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Sun, 29 May 2005 22:11:32 +0000
Subject: r7082: Call load_interfaces() in smbscript initialisation. (This used
 to be commit 54051bf8bbb18653adafb37cc6181617ca60b781)

---
 source4/scripting/ejs/smbscript.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbscript.c b/source4/scripting/ejs/smbscript.c
index a15fce57b0..754a49ccb1 100644
--- a/source4/scripting/ejs/smbscript.c
+++ b/source4/scripting/ejs/smbscript.c
@@ -54,6 +54,8 @@ void ejs_exception(const char *reason)
 		exit(1);
 	}
 
+	load_interfaces();
+
 	mprSetCtx(mem_ctx);
 
 	if (ejsOpen(NULL, NULL, NULL) != 0) {
-- 
cgit 


From 4f1a5b716972bc2af916a528399c9dc0c2f18c35 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Sun, 29 May 2005 22:14:21 +0000
Subject: r7083: Add a ejs hook to the resolve_name() function.

We need to figure out what the best way to return NTSTATUS codes.  In the
Python wrappers I threw an exception which could be caught by some code,
but I'm not sure whether this is possible in ejs.
(This used to be commit 6911e46c6a576a379ea06f9ba3ef6a62653170f0)
---
 source4/scripting/ejs/smbcalls.c | 51 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls.c b/source4/scripting/ejs/smbcalls.c
index e436fc78df..02b40c46d8 100644
--- a/source4/scripting/ejs/smbcalls.c
+++ b/source4/scripting/ejs/smbcalls.c
@@ -24,6 +24,7 @@
 #include "lib/ejs/ejs.h"
 #include "param/loadparm.h"
 #include "lib/ldb/include/ldb.h"
+#include "librpc/gen_ndr/ndr_nbt.h"
 
 /*
   return the type of a variable
@@ -246,6 +247,55 @@ failed:
 	return -1;
 }
 
+/*
+  look up a netbios name
+
+  syntax:
+    resolveName("frogurt");
+    resolveName("frogurt", 0x1c);
+*/
+
+static int ejs_resolve_name(MprVarHandle eid, int argc, struct MprVar **argv)
+{
+	struct nbt_name name;
+	TALLOC_CTX *tmp_ctx = talloc_new(mprMemCtx());	
+	NTSTATUS result;
+	const char *reply_addr;
+
+	/* validate arguments */
+	if (argc == 1) {
+		if (argv[0]->type != MPR_TYPE_STRING) {
+			ejsSetErrorMsg(eid, "resolveName invalid arguments");
+			goto failed;
+		}
+		make_nbt_name_client(&name, mprToString(argv[0]));
+	} else if (argc == 2) {
+		if (argv[1]->type != MPR_TYPE_INT) {
+			ejsSetErrorMsg(eid, "resolveName invalid arguments");
+			goto failed;
+		}
+		make_nbt_name(&name, mprToString(argv[0]), mprToInt(argv[1]));
+	} else {
+		ejsSetErrorMsg(eid, "resolveName invalid arguments");
+		goto failed;
+	}
+
+	result = resolve_name(&name, tmp_ctx, &reply_addr);
+
+	if (!NT_STATUS_IS_OK(result)) {
+		ejsSetErrorMsg(eid, "resolveName name not found");
+		goto failed;
+	}
+		
+	ejsSetReturnString(eid, reply_addr);
+
+	talloc_free(tmp_ctx);
+	return 0;
+
+ failed:
+	talloc_free(tmp_ctx);
+	return -1;
+}
 
 /*
   setup the C functions that be called from ejs
@@ -256,4 +306,5 @@ void smb_setup_ejs_functions(void)
 	ejsDefineStringCFunction(-1, "lpServices", ejs_lpServices, NULL, MPR_VAR_SCRIPT_HANDLE);
 	ejsDefineCFunction(-1, "typeof", ejs_typeof, NULL, MPR_VAR_SCRIPT_HANDLE);
 	ejsDefineCFunction(-1, "ldbSearch", ejs_ldbSearch, NULL, MPR_VAR_SCRIPT_HANDLE);
+	ejsDefineCFunction(-1, "resolveName", ejs_resolve_name, NULL, MPR_VAR_SCRIPT_HANDLE);
 }
-- 
cgit 


From a05bd5e9d654b97e1a2128a5048b68b7efd9ccd7 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Tue, 31 May 2005 04:12:55 +0000
Subject: r7135: make typeof() complient with ECMA 11.4.3 (This used to be
 commit 29ab4cc6cb244255ab75af7ae2076b51209f4f2d)

---
 source4/scripting/ejs/smbcalls.c | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls.c b/source4/scripting/ejs/smbcalls.c
index 02b40c46d8..fc2c16a456 100644
--- a/source4/scripting/ejs/smbcalls.c
+++ b/source4/scripting/ejs/smbcalls.c
@@ -35,20 +35,20 @@ static int ejs_typeof(MprVarHandle eid, int argc, struct MprVar **argv)
 		MprType type;
 		const char *name;
 	} types[] = {
-		{ MPR_TYPE_UNDEFINED, "undefined" },
-		{ MPR_TYPE_NULL, "null" },
-		{ MPR_TYPE_BOOL, "boolean" },
-		{ MPR_TYPE_CFUNCTION, "function" },
-		{ MPR_TYPE_FLOAT, "float" },
-		{ MPR_TYPE_INT, "int" },
-		{ MPR_TYPE_INT64, "int64" },
-		{ MPR_TYPE_OBJECT, "object" },
-		{ MPR_TYPE_FUNCTION, "function" },
-		{ MPR_TYPE_STRING, "string" },
+		{ MPR_TYPE_UNDEFINED,        "undefined" },
+		{ MPR_TYPE_NULL,             "object" },
+		{ MPR_TYPE_BOOL,             "boolean" },
+		{ MPR_TYPE_CFUNCTION,        "function" },
+		{ MPR_TYPE_FLOAT,            "number" },
+		{ MPR_TYPE_INT,              "number" },
+		{ MPR_TYPE_INT64,            "number" },
+		{ MPR_TYPE_OBJECT,           "object" },
+		{ MPR_TYPE_FUNCTION,         "function" },
+		{ MPR_TYPE_STRING,           "string" },
 		{ MPR_TYPE_STRING_CFUNCTION, "function" }
 	};
 	int i;
-	const char *type = "unknown";
+	const char *type = NULL;
 
 	if (argc != 1) return -1;
 	
@@ -58,6 +58,7 @@ static int ejs_typeof(MprVarHandle eid, int argc, struct MprVar **argv)
 			break;
 		}
 	}
+	if (type == NULL) return -1;
 
 	ejsSetReturnString(eid, type);
 	return 0;
-- 
cgit 


From afeaf137c4cbcbde1d6e4c9921bb769a1d486aff Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Fri, 3 Jun 2005 08:00:42 +0000
Subject: r7215: Convert smbscript to use ejsEvalScript() and file_load()
 instead of ejsEvalFile().

Still need to add advancement of the script past the hash-bang line but
it's home time now!!
(This used to be commit 14a2053c045a2df1d68838900c833c2a15cb5a36)
---
 source4/scripting/ejs/smbscript.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbscript.c b/source4/scripting/ejs/smbscript.c
index 754a49ccb1..323e604f8d 100644
--- a/source4/scripting/ejs/smbscript.c
+++ b/source4/scripting/ejs/smbscript.c
@@ -35,7 +35,8 @@ void ejs_exception(const char *reason)
 	EjsId eid;
 	EjsHandle handle = 0;
 	MprVar result;
-	char *emsg;
+	char *emsg, *script;
+	size_t script_size;
 	TALLOC_CTX *mem_ctx = talloc_new(NULL);
 	const char **argv_list = NULL;
 	struct MprVar v;
@@ -79,10 +80,12 @@ void ejs_exception(const char *reason)
 	v = mprList("ARGV", argv_list);
 	mprCreateProperty(ejsGetGlobalObject(eid), "ARGV", &v);
 
+	/* load the script and advance past interpreter line*/
+	script = file_load(argv[1], &script_size);
+
 	/* run the script */
-	if (ejsEvalFile(eid, discard_const_p(char, argv[1]), &result,
-			&emsg) == -1) {
-		fprintf(stderr, "smbscript: ejsEvalFile(): %s\n", emsg);
+	if (ejsEvalScript(eid, script, &result, &emsg) == -1) {
+		fprintf(stderr, "smbscript: ejsEvalScript(): %s\n", emsg);
 		exit(1);
 	}
 
-- 
cgit 


From c1b95bd467109793333c15ea44ec910ffe3e86b4 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Fri, 3 Jun 2005 12:04:26 +0000
Subject: r7223: Advance script past interpreter line. (This used to be commit
 31b9fadbed656f666f587a9dcb5a7627a2d388aa)

---
 source4/scripting/ejs/smbscript.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbscript.c b/source4/scripting/ejs/smbscript.c
index 323e604f8d..43a9377143 100644
--- a/source4/scripting/ejs/smbscript.c
+++ b/source4/scripting/ejs/smbscript.c
@@ -83,6 +83,17 @@ void ejs_exception(const char *reason)
 	/* load the script and advance past interpreter line*/
 	script = file_load(argv[1], &script_size);
 
+	if ((script_size > 2) && script[0] == '#' && script[1] == '!') {
+		script += 2;
+		script_size -= 2;
+		while (script_size) {
+			if (*script == '\r' || *script == '\n')
+				break;
+			script++;
+			script_size--;
+		}
+	}
+
 	/* run the script */
 	if (ejsEvalScript(eid, script, &result, &emsg) == -1) {
 		fprintf(stderr, "smbscript: ejsEvalScript(): %s\n", emsg);
-- 
cgit 


From e8cbe7f3a4d828619285cdfebf5b786ddebf7928 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Fri, 3 Jun 2005 12:31:56 +0000
Subject: r7225: Create a MprVar object from a NTSTATUS, e.g:

res: {
  is_err: true,
  is_ok: false,
  errstr: "NT_STATUS_IO_TIMEOUT",
  v: -1073741643
}
(This used to be commit d81d5f8317ca82a08e6fc38ef7313fad2e631281)
---
 source4/scripting/ejs/mprutil.c | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/mprutil.c b/source4/scripting/ejs/mprutil.c
index 3e47fdf9a3..4aee7d1c50 100644
--- a/source4/scripting/ejs/mprutil.c
+++ b/source4/scripting/ejs/mprutil.c
@@ -166,3 +166,26 @@ const char **mprToList(TALLOC_CTX *mem_ctx, struct MprVar *v)
 	return list;
 }
 
+/*
+  turn a NTSTATUS into a MprVar object with lots of funky properties
+*/
+struct MprVar mprNTSTATUS(NTSTATUS status)
+{
+	struct MprVar res, val;
+
+	res = mprCreateObjVar("ntstatus", MPR_DEFAULT_HASH_SIZE);
+
+	val = mprCreateStringVar(nt_errstr(status), 1);
+	mprCreateProperty(&res, "errstr", &val);
+
+	val = mprCreateIntegerVar(NT_STATUS_V(status));
+	mprCreateProperty(&res, "v", &val);
+
+	val = mprCreateBoolVar(NT_STATUS_IS_OK(status));
+	mprCreateProperty(&res, "is_ok", &val);
+
+	val = mprCreateBoolVar(NT_STATUS_IS_ERR(status));
+	mprCreateProperty(&res, "is_err", &val);
+
+	return res;
+}
-- 
cgit 


From 266c37e5dc97879e30e790cd87d2ec1f43907477 Mon Sep 17 00:00:00 2001
From: Simo Sorce <idra@samba.org>
Date: Fri, 3 Jun 2005 14:17:18 +0000
Subject: r7238: Add pam auth support in swat (This used to be commit
 8a98572a3b5dba58181dc402dbebae5452656012)

---
 source4/scripting/config.mk      |  2 +-
 source4/scripting/ejs/smbcalls.c | 82 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 83 insertions(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/config.mk b/source4/scripting/config.mk
index a6c4f73430..078c04297e 100644
--- a/source4/scripting/config.mk
+++ b/source4/scripting/config.mk
@@ -4,7 +4,7 @@
 OBJ_FILES = \
 		scripting/ejs/smbcalls.o \
 		scripting/ejs/mprutil.o
-REQUIRED_SUBSYSTEMS = EJS LIBBASIC
+REQUIRED_SUBSYSTEMS = AUTH EJS LIBBASIC
 # End SUBSYSTEM SMBCALLS
 #######################
 
diff --git a/source4/scripting/ejs/smbcalls.c b/source4/scripting/ejs/smbcalls.c
index fc2c16a456..8a02111bd5 100644
--- a/source4/scripting/ejs/smbcalls.c
+++ b/source4/scripting/ejs/smbcalls.c
@@ -25,6 +25,7 @@
 #include "param/loadparm.h"
 #include "lib/ldb/include/ldb.h"
 #include "librpc/gen_ndr/ndr_nbt.h"
+#include "auth/auth.h"
 
 /*
   return the type of a variable
@@ -298,6 +299,85 @@ static int ejs_resolve_name(MprVarHandle eid, int argc, struct MprVar **argv)
 	return -1;
 }
 
+static int ejs_userAuth(MprVarHandle eid, int argc, char **argv)
+{
+	struct auth_usersupplied_info *user_info = NULL;
+	struct auth_serversupplied_info *server_info = NULL;
+	struct auth_context *auth_context;
+	TALLOC_CTX *tmp_ctx;
+	struct MprVar auth;
+	NTSTATUS nt_status;
+	DATA_BLOB pw_blob;
+	int ret;
+
+	if (argc != 3 || *argv[0] == 0 || *argv[2] == 0) {
+		ejsSetErrorMsg(eid, "userAuth invalid arguments");
+		return -1;
+	}
+
+ 	tmp_ctx = talloc_new(mprMemCtx());	
+	auth = mprCreateObjVar("auth", MPR_DEFAULT_HASH_SIZE);
+
+	if (strcmp("System User", argv[2]) == 0) {
+		const char *auth_unix[] = { "unix", NULL };
+
+		nt_status = auth_context_create(tmp_ctx, auth_unix, &auth_context);
+		if (!NT_STATUS_IS_OK(nt_status)) {
+			mprSetPropertyValue(&auth, "result", mprCreateBoolVar(False));
+			mprSetPropertyValue(&auth, "report", mprCreateStringVar("Auth System Failure", 0));
+			goto done;
+		}
+
+		pw_blob = data_blob(argv[1], strlen(argv[1])),
+		make_user_info(tmp_ctx, argv[0], argv[0],
+					argv[2], argv[2],
+					"foowks", "fooip",
+					NULL, NULL,
+					NULL, NULL,
+					&pw_blob, False,
+					0x05, &user_info);
+		nt_status = auth_check_password(auth_context, tmp_ctx, user_info, &server_info);
+		if (!NT_STATUS_IS_OK(nt_status)) {
+			mprSetPropertyValue(&auth, "result", mprCreateBoolVar(False));
+			mprSetPropertyValue(&auth, "report", mprCreateStringVar("Login Failed", 0));
+			goto done;
+		}
+
+		mprSetPropertyValue(&auth, "result", mprCreateBoolVar(server_info->authenticated));
+		mprSetPropertyValue(&auth, "username", mprCreateStringVar(server_info->account_name, 0));
+		mprSetPropertyValue(&auth, "domain", mprCreateStringVar(server_info->domain_name, 0));
+
+	}  else {
+		mprSetPropertyValue(&auth, "result", mprCreateBoolVar(False));
+		mprSetPropertyValue(&auth, "report", mprCreateStringVar("Unknown Domain", 0));
+	}
+
+done:
+	ejsSetReturnValue(eid, auth);
+	talloc_free(tmp_ctx);
+	return 0;
+}
+
+static int ejs_domain_list(MprVarHandle eid, int argc, char **argv)
+{
+	struct MprVar list;
+	struct MprVar dom;
+
+	if (argc != 0) {
+		ejsSetErrorMsg(eid, "domList invalid arguments");
+		return -1;
+	}
+
+	list = mprCreateObjVar("list", MPR_DEFAULT_HASH_SIZE);
+	dom = mprCreateStringVar("System User", 1);
+	mprCreateProperty(&list, "0", &dom);
+
+	ejsSetReturnValue(eid, list);
+
+	return 0;
+}
+
+
 /*
   setup the C functions that be called from ejs
 */
@@ -308,4 +388,6 @@ void smb_setup_ejs_functions(void)
 	ejsDefineCFunction(-1, "typeof", ejs_typeof, NULL, MPR_VAR_SCRIPT_HANDLE);
 	ejsDefineCFunction(-1, "ldbSearch", ejs_ldbSearch, NULL, MPR_VAR_SCRIPT_HANDLE);
 	ejsDefineCFunction(-1, "resolveName", ejs_resolve_name, NULL, MPR_VAR_SCRIPT_HANDLE);
+	ejsDefineStringCFunction(-1, "getDomainList", ejs_domain_list, NULL, MPR_VAR_SCRIPT_HANDLE);
+	ejsDefineStringCFunction(-1, "userAuth", ejs_userAuth, NULL, MPR_VAR_SCRIPT_HANDLE);
 }
-- 
cgit 


From 384ad5c71b012d11e61d5a9ad8059423f771cccb Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Sat, 4 Jun 2005 01:06:30 +0000
Subject: r7254: Add a mprWERROR() function with the same attributes as
 mprNTSTATUS. (This used to be commit
 2fa6f7bb2b8390f6486f6531212b556e98a6c528)

---
 source4/scripting/ejs/mprutil.c | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/mprutil.c b/source4/scripting/ejs/mprutil.c
index 4aee7d1c50..2a1036d9a4 100644
--- a/source4/scripting/ejs/mprutil.c
+++ b/source4/scripting/ejs/mprutil.c
@@ -189,3 +189,27 @@ struct MprVar mprNTSTATUS(NTSTATUS status)
 
 	return res;
 }
+
+/*
+  turn a WERROR into a MprVar object with lots of funky properties
+*/
+struct MprVar mprWERROR(WERROR status)
+{
+	struct MprVar res, val;
+
+	res = mprCreateObjVar("werror", MPR_DEFAULT_HASH_SIZE);
+
+	val = mprCreateStringVar(win_errstr(status), 1);
+	mprCreateProperty(&res, "errstr", &val);
+
+	val = mprCreateIntegerVar(W_ERROR_V(status));
+	mprCreateProperty(&res, "v", &val);
+
+	val = mprCreateBoolVar(W_ERROR_IS_OK(status));
+	mprCreateProperty(&res, "is_ok", &val);
+
+	val = mprCreateBoolVar(True);
+	mprCreateProperty(&res, "is_err", &val);
+
+	return res;
+}
-- 
cgit 


From 383c5fb68a212eed60750793ad4b7e4bbcbcd2d5 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Sat, 4 Jun 2005 01:08:52 +0000
Subject: r7255: Change syntax of resolveName() js function to be more like the
 resolve_name() C function.  I can't figure out how to return variables by
 reference though.  Writing to argv[] doesn't seem to work. (This used to be
 commit aef99859f28570b60f4fefe2981160269f6eb02a)

---
 source4/scripting/ejs/smbcalls.c | 54 +++++++++++++++++++++-------------------
 1 file changed, 28 insertions(+), 26 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls.c b/source4/scripting/ejs/smbcalls.c
index 8a02111bd5..5d4c61b04b 100644
--- a/source4/scripting/ejs/smbcalls.c
+++ b/source4/scripting/ejs/smbcalls.c
@@ -253,50 +253,53 @@ failed:
   look up a netbios name
 
   syntax:
-    resolveName("frogurt");
-    resolveName("frogurt", 0x1c);
+    resolveName(result, "frogurt");
+    resolveName(result, "frogurt", 0x1c);
 */
 
 static int ejs_resolve_name(MprVarHandle eid, int argc, struct MprVar **argv)
 {
+	int result = -1;
 	struct nbt_name name;
 	TALLOC_CTX *tmp_ctx = talloc_new(mprMemCtx());	
-	NTSTATUS result;
+	NTSTATUS nt_status;
 	const char *reply_addr;
 
 	/* validate arguments */
-	if (argc == 1) {
-		if (argv[0]->type != MPR_TYPE_STRING) {
-			ejsSetErrorMsg(eid, "resolveName invalid arguments");
-			goto failed;
-		}
-		make_nbt_name_client(&name, mprToString(argv[0]));
-	} else if (argc == 2) {
+	if (argc < 2 || argc > 3) {
+		ejsSetErrorMsg(eid, "resolveName invalid arguments");
+		goto done;
+	}
+
+	if (argv[1]->type != MPR_TYPE_STRING) {
+		ejsSetErrorMsg(eid, "resolveName invalid arguments");
+		goto done;
+	}
+	
+	if (argc == 2) {
+		make_nbt_name_client(&name, mprToString(argv[1]));
+	} else {
 		if (argv[1]->type != MPR_TYPE_INT) {
 			ejsSetErrorMsg(eid, "resolveName invalid arguments");
-			goto failed;
+			goto done;
 		}
-		make_nbt_name(&name, mprToString(argv[0]), mprToInt(argv[1]));
-	} else {
-		ejsSetErrorMsg(eid, "resolveName invalid arguments");
-		goto failed;
+		make_nbt_name(&name, mprToString(argv[1]), mprToInt(argv[2]));
 	}
 
-	result = resolve_name(&name, tmp_ctx, &reply_addr);
+	result = 0;
 
-	if (!NT_STATUS_IS_OK(result)) {
-		ejsSetErrorMsg(eid, "resolveName name not found");
-		goto failed;
+	nt_status = resolve_name(&name, tmp_ctx, &reply_addr);
+
+	if (NT_STATUS_IS_OK(nt_status)) {
+		mprDestroyAllVars(argv[0]);
+		*argv[0] = mprCreateStringVar(reply_addr, True);
 	}
-		
-	ejsSetReturnString(eid, reply_addr);
 
-	talloc_free(tmp_ctx);
-	return 0;
+	ejsSetReturnValue(eid, mprNTSTATUS(nt_status));
 
- failed:
+ done:
 	talloc_free(tmp_ctx);
-	return -1;
+	return result;
 }
 
 static int ejs_userAuth(MprVarHandle eid, int argc, char **argv)
@@ -308,7 +311,6 @@ static int ejs_userAuth(MprVarHandle eid, int argc, char **argv)
 	struct MprVar auth;
 	NTSTATUS nt_status;
 	DATA_BLOB pw_blob;
-	int ret;
 
 	if (argc != 3 || *argv[0] == 0 || *argv[2] == 0) {
 		ejsSetErrorMsg(eid, "userAuth invalid arguments");
-- 
cgit 


From b1243510793cd135f1464dcfeec0b7e88999d1a0 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Sat, 4 Jun 2005 03:32:18 +0000
Subject: r7261: Pass by reference is done in js via MPR_TYPE_OBJECT.  Update
 argument parsing and example for resolveName(). (This used to be commit
 1a4a54931733ebfa743401a184fe460c044427b4)

---
 source4/scripting/ejs/smbcalls.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls.c b/source4/scripting/ejs/smbcalls.c
index 5d4c61b04b..93496bd9c9 100644
--- a/source4/scripting/ejs/smbcalls.c
+++ b/source4/scripting/ejs/smbcalls.c
@@ -271,6 +271,11 @@ static int ejs_resolve_name(MprVarHandle eid, int argc, struct MprVar **argv)
 		goto done;
 	}
 
+	if (argv[0]->type != MPR_TYPE_OBJECT) {
+		ejsSetErrorMsg(eid, "resolvename invalid arguments");
+		goto done;
+	}
+
 	if (argv[1]->type != MPR_TYPE_STRING) {
 		ejsSetErrorMsg(eid, "resolveName invalid arguments");
 		goto done;
@@ -291,8 +296,8 @@ static int ejs_resolve_name(MprVarHandle eid, int argc, struct MprVar **argv)
 	nt_status = resolve_name(&name, tmp_ctx, &reply_addr);
 
 	if (NT_STATUS_IS_OK(nt_status)) {
-		mprDestroyAllVars(argv[0]);
-		*argv[0] = mprCreateStringVar(reply_addr, True);
+		mprSetPropertyValue(argv[0], "value", 
+				    mprCreateStringVar(reply_addr, 1));
 	}
 
 	ejsSetReturnValue(eid, mprNTSTATUS(nt_status));
-- 
cgit 


From d6555cadb7015d407a2a17538d8a1ccd073a41e6 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Sat, 4 Jun 2005 03:35:38 +0000
Subject: r7262: Add a length property to ARGV array. (This used to be commit
 4b775c619b7abed52d158ab70505320753a0c9cb)

---
 source4/scripting/ejs/smbscript.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbscript.c b/source4/scripting/ejs/smbscript.c
index 43a9377143..4bde40a955 100644
--- a/source4/scripting/ejs/smbscript.c
+++ b/source4/scripting/ejs/smbscript.c
@@ -78,6 +78,7 @@ void ejs_exception(const char *reason)
 		argv_list = str_list_add(argv_list, argv[i]);
 	}
 	v = mprList("ARGV", argv_list);
+	mprSetPropertyValue(&v, "length", mprCreateIntegerVar(argc - 2));
 	mprCreateProperty(ejsGetGlobalObject(eid), "ARGV", &v);
 
 	/* load the script and advance past interpreter line*/
-- 
cgit 


From 32f2e9806b267782125fed3a6162ea895e634eef Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Sat, 4 Jun 2005 03:51:38 +0000
Subject: r7263: Exit smbscript with the intepreter return value (defaults to
 0).

Change the exit value for an exception, usage error and other non-js
errors to 127 which is kinda like the return value for the system(3)
function.
(This used to be commit c77a232b1152a27e2d8ffb719aefba6c6b2ba6df)
---
 source4/scripting/ejs/smbscript.c | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbscript.c b/source4/scripting/ejs/smbscript.c
index 4bde40a955..02a3aff28e 100644
--- a/source4/scripting/ejs/smbscript.c
+++ b/source4/scripting/ejs/smbscript.c
@@ -1,7 +1,7 @@
 /* 
    Unix SMB/CIFS implementation.
 
-   Standalone client for ESP scripting.
+   Standalone client for ejs scripting.
 
    Copyright (C) Tim Potter <tpot@samba.org> 2005
 
@@ -27,7 +27,7 @@
 void ejs_exception(const char *reason)
 {
 	fprintf(stderr, "smbscript exception: %s", reason);
-	exit(1);
+	exit(127);
 }
 
  int main(int argc, const char *argv[])
@@ -39,12 +39,12 @@ void ejs_exception(const char *reason)
 	size_t script_size;
 	TALLOC_CTX *mem_ctx = talloc_new(NULL);
 	const char **argv_list = NULL;
-	struct MprVar v;
-	int i;
+	struct MprVar v, *return_var;
+	int exit_status, i;
 
 	if (argc < 2) {
 		fprintf(stderr, "Usage: %s <scriptfile>\n", argv[0]);
-		exit(1);
+		exit(127);
 	}
 
 	setup_logging(argv[0],DEBUG_STDOUT);
@@ -52,7 +52,7 @@ void ejs_exception(const char *reason)
 	if (!lp_load(dyn_CONFIGFILE, False, False, False)) {
 		fprintf(stderr, "%s: Can't load %s - run testparm to debug it\n",
 			argv[0], dyn_CONFIGFILE);
-		exit(1);
+		exit(127);
 	}
 
 	load_interfaces();
@@ -62,7 +62,7 @@ void ejs_exception(const char *reason)
 	if (ejsOpen(NULL, NULL, NULL) != 0) {
 		fprintf(stderr, "smbscript: ejsOpen(): unable to initialise "
 			"EJ subsystem\n");
-		exit(1);
+		exit(127);
 	}
 
 	smb_setup_ejs_functions();
@@ -70,7 +70,7 @@ void ejs_exception(const char *reason)
 	if ((eid = ejsOpenEngine(handle, 0)) == (EjsId)-1) {
 		fprintf(stderr, "smbscript: ejsOpenEngine(): unable to "
 			"initialise an EJS engine\n");
-		exit(1);
+		exit(127);
 	}
 
 	/* setup ARGV[] in the ejs environment */
@@ -98,12 +98,15 @@ void ejs_exception(const char *reason)
 	/* run the script */
 	if (ejsEvalScript(eid, script, &result, &emsg) == -1) {
 		fprintf(stderr, "smbscript: ejsEvalScript(): %s\n", emsg);
-		exit(1);
+		exit(127);
 	}
 
+	return_var = ejsGetReturnValue(eid);
+	exit_status = return_var->integer;
+
 	ejsClose();
 
 	talloc_free(mem_ctx);
 
-	return 0;
+	return exit_status;
 }
-- 
cgit 


From f84d007c438dd43f2cd5a9b6ca583976c8e777fa Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Sat, 4 Jun 2005 07:04:43 +0000
Subject: r7266: Split the different types of js function defines into separate
 files, as there are going to be a lot more of them. (This used to be commit
 b086768589ee27de6616945bbea42b18b40d25d5)

---
 source4/scripting/config.mk             |   3 +
 source4/scripting/ejs/smbcalls.c        | 250 +-------------------------------
 source4/scripting/ejs/smbcalls.h        |  25 ++++
 source4/scripting/ejs/smbcalls_config.c | 149 +++++++++++++++++++
 source4/scripting/ejs/smbcalls_ldb.c    |  93 ++++++++++++
 source4/scripting/ejs/smbcalls_nbt.c    |  91 ++++++++++++
 6 files changed, 368 insertions(+), 243 deletions(-)
 create mode 100644 source4/scripting/ejs/smbcalls.h
 create mode 100644 source4/scripting/ejs/smbcalls_config.c
 create mode 100644 source4/scripting/ejs/smbcalls_ldb.c
 create mode 100644 source4/scripting/ejs/smbcalls_nbt.c

(limited to 'source4/scripting')

diff --git a/source4/scripting/config.mk b/source4/scripting/config.mk
index 078c04297e..597fa1a84a 100644
--- a/source4/scripting/config.mk
+++ b/source4/scripting/config.mk
@@ -3,6 +3,9 @@
 [SUBSYSTEM::SMBCALLS]
 OBJ_FILES = \
 		scripting/ejs/smbcalls.o \
+		scripting/ejs/smbcalls_config.o \
+		scripting/ejs/smbcalls_ldb.o \
+		scripting/ejs/smbcalls_nbt.o \
 		scripting/ejs/mprutil.o
 REQUIRED_SUBSYSTEMS = AUTH EJS LIBBASIC
 # End SUBSYSTEM SMBCALLS
diff --git a/source4/scripting/ejs/smbcalls.c b/source4/scripting/ejs/smbcalls.c
index 93496bd9c9..54dc8d4e62 100644
--- a/source4/scripting/ejs/smbcalls.c
+++ b/source4/scripting/ejs/smbcalls.c
@@ -4,6 +4,7 @@
    provide hooks into smbd C calls from ejs scripts
 
    Copyright (C) Andrew Tridgell 2005
+   Copyright (C) Tim Potter 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
@@ -22,9 +23,6 @@
 
 #include "includes.h"
 #include "lib/ejs/ejs.h"
-#include "param/loadparm.h"
-#include "lib/ldb/include/ldb.h"
-#include "librpc/gen_ndr/ndr_nbt.h"
 #include "auth/auth.h"
 
 /*
@@ -68,245 +66,11 @@ static int ejs_typeof(MprVarHandle eid, int argc, struct MprVar **argv)
 /*
   setup a return of a string list
 */
-static void ejs_returnlist(MprVarHandle eid, 
-			   const char *name, const char **list)
+ void ejs_returnlist(MprVarHandle eid, const char *name, const char **list)
 {
 	ejsSetReturnValue(eid, mprList(name, list));
 }
 
-/*
-  return a list of defined services
-*/
-static int ejs_lpServices(MprVarHandle eid, int argc, char **argv)
-{
-	int i;
-	const char **list = NULL;
-	if (argc != 0) return -1;
-	
-	for (i=0;i<lp_numservices();i++) {
-		list = str_list_add(list, lp_servicename(i));
-	}
-	talloc_steal(mprMemCtx(), list);
-	ejs_returnlist(eid, "services", list);
-	return 0;
-}
-
-
-/*
-  allow access to loadparm variables from inside ejs scripts in swat
-  
-  can be called in 4 ways:
-
-    v = lpGet("type:parm");             gets a parametric variable
-    v = lpGet("share", "type:parm");    gets a parametric variable on a share
-    v = lpGet("parm");                  gets a global variable
-    v = lpGet("share", "parm");         gets a share variable
-
-  the returned variable is a ejs object. It is an array object for lists.  
-*/
-static int ejs_lpGet(MprVarHandle eid, int argc, char **argv)
-{
-	struct parm_struct *parm = NULL;
-	void *parm_ptr = NULL;
-	int i;
-
-	if (argc < 1) return -1;
-
-	if (argc == 2) {
-		/* its a share parameter */
-		int snum = lp_servicenumber(argv[0]);
-		if (snum == -1) {
-			return -1;
-		}
-		if (strchr(argv[1], ':')) {
-			/* its a parametric option on a share */
-			const char *type = talloc_strndup(mprMemCtx(), 
-							  argv[1], 
-							  strcspn(argv[1], ":"));
-			const char *option = strchr(argv[1], ':') + 1;
-			const char *value;
-			if (type == NULL || option == NULL) return -1;
-			value = lp_get_parametric(snum, type, option);
-			if (value == NULL) return -1;
-			ejsSetReturnString(eid, value);
-			return 0;
-		}
-
-		parm = lp_parm_struct(argv[1]);
-		if (parm == NULL || parm->class == P_GLOBAL) {
-			return -1;
-		}
-		parm_ptr = lp_parm_ptr(snum, parm);
-	} else if (strchr(argv[0], ':')) {
-		/* its a global parametric option */
-		const char *type = talloc_strndup(mprMemCtx(), 
-						  argv[0], strcspn(argv[0], ":"));
-		const char *option = strchr(argv[0], ':') + 1;
-		const char *value;
-		if (type == NULL || option == NULL) return -1;
-		value = lp_get_parametric(-1, type, option);
-		if (value == NULL) return -1;
-		ejsSetReturnString(eid, value);
-		return 0;
-	} else {
-		/* its a global parameter */
-		parm = lp_parm_struct(argv[0]);
-		if (parm == NULL) return -1;
-		parm_ptr = parm->ptr;
-	}
-
-	if (parm == NULL || parm_ptr == NULL) {
-		return -1;
-	}
-
-	/* construct and return the right type of ejs object */
-	switch (parm->type) {
-	case P_STRING:
-	case P_USTRING:
-		ejsSetReturnString(eid, *(char **)parm_ptr);
-		break;
-	case P_BOOL:
-		ejsSetReturnValue(eid, mprCreateBoolVar(*(BOOL *)parm_ptr));
-		break;
-	case P_INTEGER:
-		ejsSetReturnValue(eid, mprCreateIntegerVar(*(int *)parm_ptr));
-		break;
-	case P_ENUM:
-		for (i=0; parm->enum_list[i].name; i++) {
-			if (*(int *)parm_ptr == parm->enum_list[i].value) {
-				ejsSetReturnString(eid, parm->enum_list[i].name);
-				return 0;
-			}
-		}
-		return -1;	
-	case P_LIST: 
-		ejs_returnlist(eid, parm->label, *(const char ***)parm_ptr);
-		break;
-	case P_SEP:
-		return -1;
-	}
-	return 0;
-}
-
-
-/*
-  perform an ldb search, returning an array of results
-
-  syntax:
-     ldbSearch("dbfile", "expression");
-     var attrs = new Array("attr1", "attr2", "attr3");
-     ldbSearch("dbfile", "expression", attrs);
-*/
-static int ejs_ldbSearch(MprVarHandle eid, int argc, struct MprVar **argv)
-{
-	const char **attrs = NULL;
-	const char *expression, *dbfile;
-	TALLOC_CTX *tmp_ctx = talloc_new(mprMemCtx());
-	struct ldb_context *ldb;
-	int ret;
-	struct ldb_message **res;
-
-	/* validate arguments */
-	if (argc < 2 || argc > 3 ||
-	    argv[0]->type != MPR_TYPE_STRING) {
-		ejsSetErrorMsg(eid, "ldbSearch invalid arguments");
-		goto failed;
-	}
-	if (argc == 3 && argv[2]->type != MPR_TYPE_OBJECT) {
-		ejsSetErrorMsg(eid, "ldbSearch attributes must be an object");
-		goto failed;
-	}
-
-	dbfile     = mprToString(argv[0]);
-	expression = mprToString(argv[1]);
-	if (argc > 2) {
-		attrs = mprToList(tmp_ctx, argv[2]);
-	}
-	if (dbfile == NULL || expression == NULL) {
-		ejsSetErrorMsg(eid, "ldbSearch invalid arguments");
-		goto failed;
-	}
-
-	ldb = ldb_wrap_connect(tmp_ctx, dbfile, 0, NULL);
-	if (ldb == NULL) {
-		ejsSetErrorMsg(eid, "ldbSearch failed to open %s", dbfile);
-		goto failed;
-	}
-
-	ret = ldb_search(ldb, NULL, LDB_SCOPE_DEFAULT, expression, attrs, &res);
-	if (ret == -1) {
-		ejsSetErrorMsg(eid, "ldbSearch failed - %s", ldb_errstring(ldb));
-		goto failed;
-	}
-
-	ejsSetReturnValue(eid, mprLdbArray(res, ret, "ldb_message"));
-
-	talloc_free(tmp_ctx);
-	return 0;
-
-failed:
-	talloc_free(tmp_ctx);
-	return -1;
-}
-
-/*
-  look up a netbios name
-
-  syntax:
-    resolveName(result, "frogurt");
-    resolveName(result, "frogurt", 0x1c);
-*/
-
-static int ejs_resolve_name(MprVarHandle eid, int argc, struct MprVar **argv)
-{
-	int result = -1;
-	struct nbt_name name;
-	TALLOC_CTX *tmp_ctx = talloc_new(mprMemCtx());	
-	NTSTATUS nt_status;
-	const char *reply_addr;
-
-	/* validate arguments */
-	if (argc < 2 || argc > 3) {
-		ejsSetErrorMsg(eid, "resolveName invalid arguments");
-		goto done;
-	}
-
-	if (argv[0]->type != MPR_TYPE_OBJECT) {
-		ejsSetErrorMsg(eid, "resolvename invalid arguments");
-		goto done;
-	}
-
-	if (argv[1]->type != MPR_TYPE_STRING) {
-		ejsSetErrorMsg(eid, "resolveName invalid arguments");
-		goto done;
-	}
-	
-	if (argc == 2) {
-		make_nbt_name_client(&name, mprToString(argv[1]));
-	} else {
-		if (argv[1]->type != MPR_TYPE_INT) {
-			ejsSetErrorMsg(eid, "resolveName invalid arguments");
-			goto done;
-		}
-		make_nbt_name(&name, mprToString(argv[1]), mprToInt(argv[2]));
-	}
-
-	result = 0;
-
-	nt_status = resolve_name(&name, tmp_ctx, &reply_addr);
-
-	if (NT_STATUS_IS_OK(nt_status)) {
-		mprSetPropertyValue(argv[0], "value", 
-				    mprCreateStringVar(reply_addr, 1));
-	}
-
-	ejsSetReturnValue(eid, mprNTSTATUS(nt_status));
-
- done:
-	talloc_free(tmp_ctx);
-	return result;
-}
-
 static int ejs_userAuth(MprVarHandle eid, int argc, char **argv)
 {
 	struct auth_usersupplied_info *user_info = NULL;
@@ -386,15 +150,15 @@ static int ejs_domain_list(MprVarHandle eid, int argc, char **argv)
 
 
 /*
-  setup the C functions that be called from ejs
+  setup C functions that be called from ejs
 */
 void smb_setup_ejs_functions(void)
 {
-	ejsDefineStringCFunction(-1, "lpGet", ejs_lpGet, NULL, MPR_VAR_SCRIPT_HANDLE);
-	ejsDefineStringCFunction(-1, "lpServices", ejs_lpServices, NULL, MPR_VAR_SCRIPT_HANDLE);
+	smb_setup_ejs_config();
+	smb_setup_ejs_ldb();
+	smb_setup_ejs_nbt();
+
 	ejsDefineCFunction(-1, "typeof", ejs_typeof, NULL, MPR_VAR_SCRIPT_HANDLE);
-	ejsDefineCFunction(-1, "ldbSearch", ejs_ldbSearch, NULL, MPR_VAR_SCRIPT_HANDLE);
-	ejsDefineCFunction(-1, "resolveName", ejs_resolve_name, NULL, MPR_VAR_SCRIPT_HANDLE);
 	ejsDefineStringCFunction(-1, "getDomainList", ejs_domain_list, NULL, MPR_VAR_SCRIPT_HANDLE);
 	ejsDefineStringCFunction(-1, "userAuth", ejs_userAuth, NULL, MPR_VAR_SCRIPT_HANDLE);
 }
diff --git a/source4/scripting/ejs/smbcalls.h b/source4/scripting/ejs/smbcalls.h
new file mode 100644
index 0000000000..8b26e13873
--- /dev/null
+++ b/source4/scripting/ejs/smbcalls.h
@@ -0,0 +1,25 @@
+/* 
+   Unix SMB/CIFS implementation.
+
+   provide hooks into smbd C calls from ejs scripts
+
+   Copyright (C) Andrew Tridgell 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 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.
+*/
+
+#include "lib/ejs/ejs.h"
+
+void ejs_returnlist(MprVarHandle eid, const char *name, const char **list);
diff --git a/source4/scripting/ejs/smbcalls_config.c b/source4/scripting/ejs/smbcalls_config.c
new file mode 100644
index 0000000000..cd0ecbd767
--- /dev/null
+++ b/source4/scripting/ejs/smbcalls_config.c
@@ -0,0 +1,149 @@
+/* 
+   Unix SMB/CIFS implementation.
+
+   provide hooks into smbd C calls from ejs scripts
+
+   Copyright (C) Andrew Tridgell 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 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.
+*/
+
+#include "includes.h"
+#include "scripting/ejs/smbcalls.h"
+#include "lib/ejs/ejs.h"
+#include "param/loadparm.h"
+
+/*
+  return a list of defined services
+*/
+static int ejs_lpServices(MprVarHandle eid, int argc, char **argv)
+{
+	int i;
+	const char **list = NULL;
+	if (argc != 0) return -1;
+	
+	for (i=0;i<lp_numservices();i++) {
+		list = str_list_add(list, lp_servicename(i));
+	}
+	talloc_steal(mprMemCtx(), list);
+	ejs_returnlist(eid, "services", list);
+	return 0;
+}
+
+
+/*
+  allow access to loadparm variables from inside ejs scripts in swat
+  
+  can be called in 4 ways:
+
+    v = lpGet("type:parm");             gets a parametric variable
+    v = lpGet("share", "type:parm");    gets a parametric variable on a share
+    v = lpGet("parm");                  gets a global variable
+    v = lpGet("share", "parm");         gets a share variable
+
+  the returned variable is a ejs object. It is an array object for lists.  
+*/
+static int ejs_lpGet(MprVarHandle eid, int argc, char **argv)
+{
+	struct parm_struct *parm = NULL;
+	void *parm_ptr = NULL;
+	int i;
+
+	if (argc < 1) return -1;
+
+	if (argc == 2) {
+		/* its a share parameter */
+		int snum = lp_servicenumber(argv[0]);
+		if (snum == -1) {
+			return -1;
+		}
+		if (strchr(argv[1], ':')) {
+			/* its a parametric option on a share */
+			const char *type = talloc_strndup(mprMemCtx(), 
+							  argv[1], 
+							  strcspn(argv[1], ":"));
+			const char *option = strchr(argv[1], ':') + 1;
+			const char *value;
+			if (type == NULL || option == NULL) return -1;
+			value = lp_get_parametric(snum, type, option);
+			if (value == NULL) return -1;
+			ejsSetReturnString(eid, value);
+			return 0;
+		}
+
+		parm = lp_parm_struct(argv[1]);
+		if (parm == NULL || parm->class == P_GLOBAL) {
+			return -1;
+		}
+		parm_ptr = lp_parm_ptr(snum, parm);
+	} else if (strchr(argv[0], ':')) {
+		/* its a global parametric option */
+		const char *type = talloc_strndup(mprMemCtx(), 
+						  argv[0], strcspn(argv[0], ":"));
+		const char *option = strchr(argv[0], ':') + 1;
+		const char *value;
+		if (type == NULL || option == NULL) return -1;
+		value = lp_get_parametric(-1, type, option);
+		if (value == NULL) return -1;
+		ejsSetReturnString(eid, value);
+		return 0;
+	} else {
+		/* its a global parameter */
+		parm = lp_parm_struct(argv[0]);
+		if (parm == NULL) return -1;
+		parm_ptr = parm->ptr;
+	}
+
+	if (parm == NULL || parm_ptr == NULL) {
+		return -1;
+	}
+
+	/* construct and return the right type of ejs object */
+	switch (parm->type) {
+	case P_STRING:
+	case P_USTRING:
+		ejsSetReturnString(eid, *(char **)parm_ptr);
+		break;
+	case P_BOOL:
+		ejsSetReturnValue(eid, mprCreateBoolVar(*(BOOL *)parm_ptr));
+		break;
+	case P_INTEGER:
+		ejsSetReturnValue(eid, mprCreateIntegerVar(*(int *)parm_ptr));
+		break;
+	case P_ENUM:
+		for (i=0; parm->enum_list[i].name; i++) {
+			if (*(int *)parm_ptr == parm->enum_list[i].value) {
+				ejsSetReturnString(eid, parm->enum_list[i].name);
+				return 0;
+			}
+		}
+		return -1;	
+	case P_LIST: 
+		ejs_returnlist(eid, parm->label, *(const char ***)parm_ptr);
+		break;
+	case P_SEP:
+		return -1;
+	}
+	return 0;
+}
+
+/*
+  setup C functions that be called from ejs
+*/
+void smb_setup_ejs_config(void)
+{
+	ejsDefineStringCFunction(-1, "lpGet", ejs_lpGet, NULL, MPR_VAR_SCRIPT_HANDLE);
+	ejsDefineStringCFunction(-1, "lpServices", ejs_lpServices, NULL, MPR_VAR_SCRIPT_HANDLE);
+}
diff --git a/source4/scripting/ejs/smbcalls_ldb.c b/source4/scripting/ejs/smbcalls_ldb.c
new file mode 100644
index 0000000000..cae3857686
--- /dev/null
+++ b/source4/scripting/ejs/smbcalls_ldb.c
@@ -0,0 +1,93 @@
+/* 
+   Unix SMB/CIFS implementation.
+
+   provide hooks into smbd C calls from ejs scripts
+
+   Copyright (C) Andrew Tridgell 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 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.
+*/
+
+#include "includes.h"
+#include "lib/ejs/ejs.h"
+#include "lib/ldb/include/ldb.h"
+
+/*
+  perform an ldb search, returning an array of results
+
+  syntax:
+     ldbSearch("dbfile", "expression");
+     var attrs = new Array("attr1", "attr2", "attr3");
+     ldbSearch("dbfile", "expression", attrs);
+*/
+static int ejs_ldbSearch(MprVarHandle eid, int argc, struct MprVar **argv)
+{
+	const char **attrs = NULL;
+	const char *expression, *dbfile;
+	TALLOC_CTX *tmp_ctx = talloc_new(mprMemCtx());
+	struct ldb_context *ldb;
+	int ret;
+	struct ldb_message **res;
+
+	/* validate arguments */
+	if (argc < 2 || argc > 3 ||
+	    argv[0]->type != MPR_TYPE_STRING) {
+		ejsSetErrorMsg(eid, "ldbSearch invalid arguments");
+		goto failed;
+	}
+	if (argc == 3 && argv[2]->type != MPR_TYPE_OBJECT) {
+		ejsSetErrorMsg(eid, "ldbSearch attributes must be an object");
+		goto failed;
+	}
+
+	dbfile     = mprToString(argv[0]);
+	expression = mprToString(argv[1]);
+	if (argc > 2) {
+		attrs = mprToList(tmp_ctx, argv[2]);
+	}
+	if (dbfile == NULL || expression == NULL) {
+		ejsSetErrorMsg(eid, "ldbSearch invalid arguments");
+		goto failed;
+	}
+
+	ldb = ldb_wrap_connect(tmp_ctx, dbfile, 0, NULL);
+	if (ldb == NULL) {
+		ejsSetErrorMsg(eid, "ldbSearch failed to open %s", dbfile);
+		goto failed;
+	}
+
+	ret = ldb_search(ldb, NULL, LDB_SCOPE_DEFAULT, expression, attrs, &res);
+	if (ret == -1) {
+		ejsSetErrorMsg(eid, "ldbSearch failed - %s", ldb_errstring(ldb));
+		goto failed;
+	}
+
+	ejsSetReturnValue(eid, mprLdbArray(res, ret, "ldb_message"));
+
+	talloc_free(tmp_ctx);
+	return 0;
+
+failed:
+	talloc_free(tmp_ctx);
+	return -1;
+}
+
+/*
+  setup C functions that be called from ejs
+*/
+void smb_setup_ejs_ldb(void)
+{
+	ejsDefineCFunction(-1, "ldbSearch", ejs_ldbSearch, NULL, MPR_VAR_SCRIPT_HANDLE);
+}
diff --git a/source4/scripting/ejs/smbcalls_nbt.c b/source4/scripting/ejs/smbcalls_nbt.c
new file mode 100644
index 0000000000..a82b636c9c
--- /dev/null
+++ b/source4/scripting/ejs/smbcalls_nbt.c
@@ -0,0 +1,91 @@
+/* 
+   Unix SMB/CIFS implementation.
+
+   provide hooks into smbd C calls from ejs scripts
+
+   Copyright (C) Tim Potter 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 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.
+*/
+
+#include "includes.h"
+#include "lib/ejs/ejs.h"
+#include "librpc/gen_ndr/ndr_nbt.h"
+
+/*
+  look up a netbios name
+
+  syntax:
+    resolveName(result, "frogurt");
+    resolveName(result, "frogurt", 0x1c);
+*/
+
+static int ejs_resolve_name(MprVarHandle eid, int argc, struct MprVar **argv)
+{
+	int result = -1;
+	struct nbt_name name;
+	TALLOC_CTX *tmp_ctx = talloc_new(mprMemCtx());	
+	NTSTATUS nt_status;
+	const char *reply_addr;
+
+	/* validate arguments */
+	if (argc < 2 || argc > 3) {
+		ejsSetErrorMsg(eid, "resolveName invalid arguments");
+		goto done;
+	}
+
+	if (argv[0]->type != MPR_TYPE_OBJECT) {
+		ejsSetErrorMsg(eid, "resolvename invalid arguments");
+		goto done;
+	}
+
+	if (argv[1]->type != MPR_TYPE_STRING) {
+		ejsSetErrorMsg(eid, "resolveName invalid arguments");
+		goto done;
+	}
+	
+	if (argc == 2) {
+		make_nbt_name_client(&name, mprToString(argv[1]));
+	} else {
+		if (argv[1]->type != MPR_TYPE_INT) {
+			ejsSetErrorMsg(eid, "resolveName invalid arguments");
+			goto done;
+		}
+		make_nbt_name(&name, mprToString(argv[1]), mprToInt(argv[2]));
+	}
+
+	result = 0;
+
+	nt_status = resolve_name(&name, tmp_ctx, &reply_addr);
+
+	if (NT_STATUS_IS_OK(nt_status)) {
+		mprSetPropertyValue(argv[0], "value", 
+				    mprCreateStringVar(reply_addr, 1));
+	}
+
+	ejsSetReturnValue(eid, mprNTSTATUS(nt_status));
+
+ done:
+	talloc_free(tmp_ctx);
+	return result;
+}
+
+/*
+  setup C functions that be called from ejs
+*/
+void smb_setup_ejs_nbt(void)
+{
+	ejsDefineCFunction(-1, "resolveName", ejs_resolve_name, NULL, MPR_VAR_SCRIPT_HANDLE);
+}
-- 
cgit 


From b7bc13209f5133a117428f2ce58d995399fb684b Mon Sep 17 00:00:00 2001
From: Simo Sorce <idra@samba.org>
Date: Sat, 4 Jun 2005 08:23:15 +0000
Subject: r7267: REMOTE_HOST is a better choice (This used to be commit
 41bae267e29614d300ec2505c927ab17ccbbe64f)

---
 source4/scripting/ejs/smbcalls.c | 99 ++++++++++++++++++++++++++--------------
 1 file changed, 65 insertions(+), 34 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls.c b/source4/scripting/ejs/smbcalls.c
index 54dc8d4e62..3ca6003ee4 100644
--- a/source4/scripting/ejs/smbcalls.c
+++ b/source4/scripting/ejs/smbcalls.c
@@ -71,54 +71,85 @@ static int ejs_typeof(MprVarHandle eid, int argc, struct MprVar **argv)
 	ejsSetReturnValue(eid, mprList(name, list));
 }
 
-static int ejs_userAuth(MprVarHandle eid, int argc, char **argv)
+static int ejs_systemAuth(TALLOC_CTX *tmp_ctx, struct MprVar *auth, const char *username, const char *password, const char *domain, const char *remote_host)
 {
 	struct auth_usersupplied_info *user_info = NULL;
 	struct auth_serversupplied_info *server_info = NULL;
 	struct auth_context *auth_context;
-	TALLOC_CTX *tmp_ctx;
-	struct MprVar auth;
+	const char *auth_unix[] = { "unix", NULL };
 	NTSTATUS nt_status;
 	DATA_BLOB pw_blob;
 
-	if (argc != 3 || *argv[0] == 0 || *argv[2] == 0) {
-		ejsSetErrorMsg(eid, "userAuth invalid arguments");
-		return -1;
+	nt_status = auth_context_create(tmp_ctx, auth_unix, &auth_context);
+	if (!NT_STATUS_IS_OK(nt_status)) {
+		mprSetPropertyValue(auth, "result", mprCreateBoolVar(False));
+		mprSetPropertyValue(auth, "report", mprCreateStringVar("Auth System Failure", 0));
+		goto done;
 	}
 
- 	tmp_ctx = talloc_new(mprMemCtx());	
-	auth = mprCreateObjVar("auth", MPR_DEFAULT_HASH_SIZE);
+	pw_blob = data_blob(password, strlen(password)),
+	make_user_info(tmp_ctx, username, username,
+				domain, domain,
+				remote_host, remote_host,
+				NULL, NULL,
+				NULL, NULL,
+				&pw_blob, False,
+				USER_INFO_CASE_INSENSITIVE_USERNAME |
+				USER_INFO_DONT_CHECK_UNIX_ACCOUNT,
+				&user_info);
+	nt_status = auth_check_password(auth_context, tmp_ctx, user_info, &server_info);
+	if (!NT_STATUS_IS_OK(nt_status)) {
+		mprSetPropertyValue(auth, "result", mprCreateBoolVar(False));
+		mprSetPropertyValue(auth, "report", mprCreateStringVar("Login Failed", 0));
+		goto done;
+	}
 
-	if (strcmp("System User", argv[2]) == 0) {
-		const char *auth_unix[] = { "unix", NULL };
+	mprSetPropertyValue(auth, "result", mprCreateBoolVar(server_info->authenticated));
+	mprSetPropertyValue(auth, "username", mprCreateStringVar(server_info->account_name, 0));
+	mprSetPropertyValue(auth, "domain", mprCreateStringVar(server_info->domain_name, 0));
 
-		nt_status = auth_context_create(tmp_ctx, auth_unix, &auth_context);
-		if (!NT_STATUS_IS_OK(nt_status)) {
-			mprSetPropertyValue(&auth, "result", mprCreateBoolVar(False));
-			mprSetPropertyValue(&auth, "report", mprCreateStringVar("Auth System Failure", 0));
-			goto done;
-		}
+done:
+	return 0;
+}
 
-		pw_blob = data_blob(argv[1], strlen(argv[1])),
-		make_user_info(tmp_ctx, argv[0], argv[0],
-					argv[2], argv[2],
-					"foowks", "fooip",
-					NULL, NULL,
-					NULL, NULL,
-					&pw_blob, False,
-					0x05, &user_info);
-		nt_status = auth_check_password(auth_context, tmp_ctx, user_info, &server_info);
-		if (!NT_STATUS_IS_OK(nt_status)) {
-			mprSetPropertyValue(&auth, "result", mprCreateBoolVar(False));
-			mprSetPropertyValue(&auth, "report", mprCreateStringVar("Login Failed", 0));
-			goto done;
-		}
+/*
+  perform user authentication, returning an array of results
+
+  syntax:
+    var authinfo = new Object();
+    authinfo.username = myname;
+    authinfo.password = mypass;
+    authinfo.domain = mydom;
+    authinfo.rhost = request['REMOTE_HOST'];
+    auth = userAuth(authinfo);
+*/
+static int ejs_userAuth(MprVarHandle eid, int argc, struct MprVar **argv)
+{
+	TALLOC_CTX *tmp_ctx;
+	const char *username;
+	const char *password;
+	const char *domain;
+	const char *remote_host;
+	struct MprVar auth;
+
+	if (argc != 1 || argv[0]->type != MPR_TYPE_OBJECT) {
+		ejsSetErrorMsg(eid, "userAuth invalid arguments, this function requires an object.");
+		return -1;
+	}
+
+	username = mprToString(mprGetProperty(argv[0], "username", NULL));
+	password = mprToString(mprGetProperty(argv[0], "password", NULL));
+	domain = mprToString(mprGetProperty(argv[0], "domain", NULL));
+	remote_host = mprToString(mprGetProperty(argv[0], "rhost", NULL));
+
+ 	tmp_ctx = talloc_new(mprMemCtx());	
+	auth = mprCreateObjVar("auth", MPR_DEFAULT_HASH_SIZE);
 
-		mprSetPropertyValue(&auth, "result", mprCreateBoolVar(server_info->authenticated));
-		mprSetPropertyValue(&auth, "username", mprCreateStringVar(server_info->account_name, 0));
-		mprSetPropertyValue(&auth, "domain", mprCreateStringVar(server_info->domain_name, 0));
+	if (strcmp("System User", domain) == 0) {
 
+		ejs_systemAuth(tmp_ctx, &auth, username, password, domain, remote_host);
 	}  else {
+
 		mprSetPropertyValue(&auth, "result", mprCreateBoolVar(False));
 		mprSetPropertyValue(&auth, "report", mprCreateStringVar("Unknown Domain", 0));
 	}
@@ -160,5 +191,5 @@ void smb_setup_ejs_functions(void)
 
 	ejsDefineCFunction(-1, "typeof", ejs_typeof, NULL, MPR_VAR_SCRIPT_HANDLE);
 	ejsDefineStringCFunction(-1, "getDomainList", ejs_domain_list, NULL, MPR_VAR_SCRIPT_HANDLE);
-	ejsDefineStringCFunction(-1, "userAuth", ejs_userAuth, NULL, MPR_VAR_SCRIPT_HANDLE);
+	ejsDefineCFunction(-1, "userAuth", ejs_userAuth, NULL, MPR_VAR_SCRIPT_HANDLE);
 }
-- 
cgit 


From 791db4bf72f282840a7bfefa2a3ccf9b3191a6e6 Mon Sep 17 00:00:00 2001
From: Simo Sorce <idra@samba.org>
Date: Sat, 4 Jun 2005 08:54:07 +0000
Subject: r7268: allocate the strings to avoid them disappearing under our feet
 (This used to be commit ddd7454cb3e2445fd32682b380be89c70f8a22cb)

---
 source4/scripting/ejs/smbcalls.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls.c b/source4/scripting/ejs/smbcalls.c
index 3ca6003ee4..8ea5967ef4 100644
--- a/source4/scripting/ejs/smbcalls.c
+++ b/source4/scripting/ejs/smbcalls.c
@@ -83,7 +83,7 @@ static int ejs_systemAuth(TALLOC_CTX *tmp_ctx, struct MprVar *auth, const char *
 	nt_status = auth_context_create(tmp_ctx, auth_unix, &auth_context);
 	if (!NT_STATUS_IS_OK(nt_status)) {
 		mprSetPropertyValue(auth, "result", mprCreateBoolVar(False));
-		mprSetPropertyValue(auth, "report", mprCreateStringVar("Auth System Failure", 0));
+		mprSetPropertyValue(auth, "report", mprCreateStringVar("Auth System Failure", 1));
 		goto done;
 	}
 
@@ -100,13 +100,13 @@ static int ejs_systemAuth(TALLOC_CTX *tmp_ctx, struct MprVar *auth, const char *
 	nt_status = auth_check_password(auth_context, tmp_ctx, user_info, &server_info);
 	if (!NT_STATUS_IS_OK(nt_status)) {
 		mprSetPropertyValue(auth, "result", mprCreateBoolVar(False));
-		mprSetPropertyValue(auth, "report", mprCreateStringVar("Login Failed", 0));
+		mprSetPropertyValue(auth, "report", mprCreateStringVar("Login Failed", 1));
 		goto done;
 	}
 
 	mprSetPropertyValue(auth, "result", mprCreateBoolVar(server_info->authenticated));
-	mprSetPropertyValue(auth, "username", mprCreateStringVar(server_info->account_name, 0));
-	mprSetPropertyValue(auth, "domain", mprCreateStringVar(server_info->domain_name, 0));
+	mprSetPropertyValue(auth, "username", mprCreateStringVar(server_info->account_name, 1));
+	mprSetPropertyValue(auth, "domain", mprCreateStringVar(server_info->domain_name, 1));
 
 done:
 	return 0;
@@ -151,7 +151,7 @@ static int ejs_userAuth(MprVarHandle eid, int argc, struct MprVar **argv)
 	}  else {
 
 		mprSetPropertyValue(&auth, "result", mprCreateBoolVar(False));
-		mprSetPropertyValue(&auth, "report", mprCreateStringVar("Unknown Domain", 0));
+		mprSetPropertyValue(&auth, "report", mprCreateStringVar("Unknown Domain", 1));
 	}
 
 done:
-- 
cgit 


From 8a2e208e45001305a4fa18f92c4109a33b6ed407 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Tue, 7 Jun 2005 06:38:13 +0000
Subject: r7350: Remove unused label. (This used to be commit
 ada004595760605134eb741da9c549521938c2ce)

---
 source4/scripting/ejs/smbcalls.c | 1 -
 1 file changed, 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls.c b/source4/scripting/ejs/smbcalls.c
index 8ea5967ef4..00a2547bac 100644
--- a/source4/scripting/ejs/smbcalls.c
+++ b/source4/scripting/ejs/smbcalls.c
@@ -154,7 +154,6 @@ static int ejs_userAuth(MprVarHandle eid, int argc, struct MprVar **argv)
 		mprSetPropertyValue(&auth, "report", mprCreateStringVar("Unknown Domain", 1));
 	}
 
-done:
 	ejsSetReturnValue(eid, auth);
 	talloc_free(tmp_ctx);
 	return 0;
-- 
cgit 


From 6eae7eb3c446e26d8003846a79471e6232b1b92e Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Tue, 7 Jun 2005 07:00:28 +0000
Subject: r7351: Start of ejs smb client library.  I need to figure out a nice
 API here that doesn't expose too much of the cifs protocol but still allows
 people to do neat things.

Also, talloc lifetimes need to be thought about properly.
(This used to be commit 8062e808ef5102b96e1b3de046c858e4a69b4d82)
---
 source4/scripting/config.mk          |  1 +
 source4/scripting/ejs/smbcalls.c     |  1 +
 source4/scripting/ejs/smbcalls_cli.c | 89 ++++++++++++++++++++++++++++++++++++
 3 files changed, 91 insertions(+)
 create mode 100644 source4/scripting/ejs/smbcalls_cli.c

(limited to 'source4/scripting')

diff --git a/source4/scripting/config.mk b/source4/scripting/config.mk
index 597fa1a84a..8d6c5058cf 100644
--- a/source4/scripting/config.mk
+++ b/source4/scripting/config.mk
@@ -6,6 +6,7 @@ OBJ_FILES = \
 		scripting/ejs/smbcalls_config.o \
 		scripting/ejs/smbcalls_ldb.o \
 		scripting/ejs/smbcalls_nbt.o \
+		scripting/ejs/smbcalls_cli.o \
 		scripting/ejs/mprutil.o
 REQUIRED_SUBSYSTEMS = AUTH EJS LIBBASIC
 # End SUBSYSTEM SMBCALLS
diff --git a/source4/scripting/ejs/smbcalls.c b/source4/scripting/ejs/smbcalls.c
index 00a2547bac..46fce4b98e 100644
--- a/source4/scripting/ejs/smbcalls.c
+++ b/source4/scripting/ejs/smbcalls.c
@@ -187,6 +187,7 @@ void smb_setup_ejs_functions(void)
 	smb_setup_ejs_config();
 	smb_setup_ejs_ldb();
 	smb_setup_ejs_nbt();
+	smb_setup_ejs_cli();
 
 	ejsDefineCFunction(-1, "typeof", ejs_typeof, NULL, MPR_VAR_SCRIPT_HANDLE);
 	ejsDefineStringCFunction(-1, "getDomainList", ejs_domain_list, NULL, MPR_VAR_SCRIPT_HANDLE);
diff --git a/source4/scripting/ejs/smbcalls_cli.c b/source4/scripting/ejs/smbcalls_cli.c
new file mode 100644
index 0000000000..adb55a0184
--- /dev/null
+++ b/source4/scripting/ejs/smbcalls_cli.c
@@ -0,0 +1,89 @@
+/* 
+   Unix SMB/CIFS implementation.
+
+   provide hooks into smbd C calls from ejs scripts
+
+   Copyright (C) Tim Potter 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 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.
+*/
+
+#include "includes.h"
+#include "lib/ejs/ejs.h"
+#include "librpc/gen_ndr/ndr_nbt.h"
+
+/* Connect to a server */
+
+static int ejs_cli_connect(MprVarHandle eid, int argc, char **argv)
+{
+	struct smbcli_socket *sock;
+	struct smbcli_transport *transport;
+	struct nbt_name calling, called;
+	NTSTATUS result;
+
+	if (argc != 1) {
+		ejsSetErrorMsg(eid, "connect invalid arguments");
+		return -1;
+	}
+
+	/* Socket connect */
+
+	sock = smbcli_sock_init(NULL, NULL);
+
+	if (!sock) {
+		ejsSetErrorMsg(eid, "socket initialisation failed");
+		return -1;
+	}
+
+	if (!smbcli_sock_connect_byname(sock, argv[0], 0)) {
+		ejsSetErrorMsg(eid, "socket connect failed");
+		return -1;
+	}
+
+	transport = smbcli_transport_init(sock, sock, True);
+
+	if (!transport) {
+		ejsSetErrorMsg(eid, "transport init failed");
+		return -1;
+	}
+
+	/* Send a netbios session request */
+
+	make_nbt_name_client(&calling, lp_netbios_name());
+
+	nbt_choose_called_name(NULL, &called, argv[0], NBT_NAME_SERVER);
+		
+	if (!smbcli_transport_connect(transport, &calling, &called)) {
+		ejsSetErrorMsg(eid, "transport establishment failed");
+		return -1;
+	}
+
+	result = smb_raw_negotiate(transport, lp_maxprotocol());
+
+	if (!NT_STATUS_IS_OK(result)) {
+		ejsSetReturnValue(eid, mprNTSTATUS(result));
+		return 0;
+	}
+
+	return 0;
+}
+
+/*
+  setup C functions that be called from ejs
+*/
+void smb_setup_ejs_cli(void)
+{
+	ejsDefineStringCFunction(-1, "connect", ejs_cli_connect, NULL, MPR_VAR_SCRIPT_HANDLE);				
+}
-- 
cgit 


From 3feec91e6818c674a727ce67320580ca3175ae92 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Tue, 7 Jun 2005 07:42:12 +0000
Subject: r7355: this should fix the link problem metze hit with smbscript
 (This used to be commit 067255909ed381d397dfc82e4bca219da40810d9)

---
 source4/scripting/config.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/config.mk b/source4/scripting/config.mk
index 8d6c5058cf..81b7ab68fe 100644
--- a/source4/scripting/config.mk
+++ b/source4/scripting/config.mk
@@ -17,7 +17,7 @@ REQUIRED_SUBSYSTEMS = AUTH EJS LIBBASIC
 [BINARY::smbscript]
 OBJ_FILES = \
 		scripting/ejs/smbscript.o
-REQUIRED_SUBSYSTEMS = EJS LIBBASIC SMBCALLS CONFIG LIBSMB RPC
+REQUIRED_SUBSYSTEMS = EJS LIBBASIC SMBCALLS CONFIG LIBSMB RPC LIBCMDLINE
 
 # End BINARY SMBSCRIPT
 #######################
-- 
cgit 


From 0b119901d8d948e62d46f760b2dd40ba5331afc9 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Thu, 9 Jun 2005 07:28:21 +0000
Subject: r7422: Create a ejs object to wrap a smbcli_transport pointer. (This
 used to be commit a55e40651d06f416871ccbe04ad3b7d25444d645)

---
 source4/scripting/ejs/smbcalls_cli.c | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_cli.c b/source4/scripting/ejs/smbcalls_cli.c
index adb55a0184..de31d7a900 100644
--- a/source4/scripting/ejs/smbcalls_cli.c
+++ b/source4/scripting/ejs/smbcalls_cli.c
@@ -24,6 +24,20 @@
 #include "lib/ejs/ejs.h"
 #include "librpc/gen_ndr/ndr_nbt.h"
 
+static struct MprVar mprTransport(struct smbcli_transport *transport)
+{
+	struct MprVar res, val;
+
+	res = mprCreateObjVar("transport", MPR_DEFAULT_HASH_SIZE);
+
+	val = mprCreateStringVar(talloc_get_name(transport), 1);
+	mprCreateProperty(&res, "name", &val);
+
+	/* TODO: Create a C pointer "value" property */
+
+	return res;
+}
+
 /* Connect to a server */
 
 static int ejs_cli_connect(MprVarHandle eid, int argc, char **argv)
@@ -77,6 +91,10 @@ static int ejs_cli_connect(MprVarHandle eid, int argc, char **argv)
 		return 0;
 	}
 
+	/* Return a socket object */
+
+	ejsSetReturnValue(eid, mprTransport(transport));
+
 	return 0;
 }
 
-- 
cgit 


From aa7b6b3ea57b0e36b7b43ed2f312ee724e243541 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Fri, 10 Jun 2005 08:00:02 +0000
Subject: r7457: Return an ejs C pointer object from the ejs connect()
 function.

Add a session_setup() function that does an anonymous session setup.  Will
add credential passing later.
(This used to be commit 832332de5db7102085e7c44d4256fb199d8123eb)
---
 source4/scripting/ejs/smbcalls_cli.c | 78 ++++++++++++++++++++++++++++--------
 1 file changed, 62 insertions(+), 16 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_cli.c b/source4/scripting/ejs/smbcalls_cli.c
index de31d7a900..bfc71948b9 100644
--- a/source4/scripting/ejs/smbcalls_cli.c
+++ b/source4/scripting/ejs/smbcalls_cli.c
@@ -23,20 +23,8 @@
 #include "includes.h"
 #include "lib/ejs/ejs.h"
 #include "librpc/gen_ndr/ndr_nbt.h"
-
-static struct MprVar mprTransport(struct smbcli_transport *transport)
-{
-	struct MprVar res, val;
-
-	res = mprCreateObjVar("transport", MPR_DEFAULT_HASH_SIZE);
-
-	val = mprCreateStringVar(talloc_get_name(transport), 1);
-	mprCreateProperty(&res, "name", &val);
-
-	/* TODO: Create a C pointer "value" property */
-
-	return res;
-}
+#include "libcli/raw/libcliraw.h"
+#include "libcli/composite/composite.h"
 
 /* Connect to a server */
 
@@ -93,7 +81,64 @@ static int ejs_cli_connect(MprVarHandle eid, int argc, char **argv)
 
 	/* Return a socket object */
 
-	ejsSetReturnValue(eid, mprTransport(transport));
+	ejsSetReturnValue(eid, mprCreatePtrVar(transport, talloc_get_name(transport)));
+
+	return 0;
+}
+
+/* Perform a session setup:
+   
+     session_setup(conn, "DOMAIN\USERNAME%PASSWORD");
+     session_setup(conn, USERNAME, PASSWORD);
+     session_setup(conn, DOMAIN, USERNAME, PASSWORD);
+
+ */
+
+static int ejs_cli_ssetup(MprVarHandle eid, int argc, MprVar **argv)
+{
+	struct smbcli_transport *transport;
+	struct smbcli_session *session;
+	struct smb_composite_sesssetup setup;
+	struct cli_credentials *creds;
+	NTSTATUS status;
+
+	/* Argument parsing */
+
+	if (argc < 1 || argc > 3) {
+		ejsSetErrorMsg(eid, "session_setup invalid arguments");
+		return -1;
+	}
+
+	if (argv[0]->type != MPR_TYPE_PTR) {
+		ejsSetErrorMsg(eid, "first arg is not a connect handle");
+		return -1;
+	}
+
+	transport = argv[0]->ptr;
+
+	/* Do session setup */
+
+	session = smbcli_session_init(transport, transport, True);
+	if (!session) {
+		ejsSetErrorMsg(eid, "session init failed");
+		return -1;
+	}
+
+	creds = cli_credentials_init(session);
+	cli_credentials_set_anonymous(creds);
+
+	setup.in.sesskey = transport->negotiate.sesskey;
+	setup.in.capabilities = transport->negotiate.capabilities;
+	setup.in.credentials = creds;
+	setup.in.workgroup = lp_workgroup();
+
+	status = smb_composite_sesssetup(session, &setup);
+
+	session->vuid = setup.out.vuid;	
+
+	/* Return a session object */
+
+	ejsSetReturnValue(eid, mprCreatePtrVar(session, talloc_get_name(session)));
 
 	return 0;
 }
@@ -103,5 +148,6 @@ static int ejs_cli_connect(MprVarHandle eid, int argc, char **argv)
 */
 void smb_setup_ejs_cli(void)
 {
-	ejsDefineStringCFunction(-1, "connect", ejs_cli_connect, NULL, MPR_VAR_SCRIPT_HANDLE);				
+	ejsDefineStringCFunction(-1, "connect", ejs_cli_connect, NULL, MPR_VAR_SCRIPT_HANDLE);
+	ejsDefineCFunction(-1, "session_setup", ejs_cli_ssetup, NULL, MPR_VAR_SCRIPT_HANDLE);
 }
-- 
cgit 


From 6ef2a41aa1e6cfeb88ee621c63327593b51315ae Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Fri, 10 Jun 2005 12:43:11 +0000
Subject: r7461: this is the start of some code for mapping IDL onto ejs. This
 is hand written code, and it doesn't work or even compile yet. I am
 committing it to make it easier to discuss the approach with jelmer and tpot.

The intention is that this code will eventually end up being mostly
auto-generated (with the utility functions split out, just like
librpc/ndr/*.c)
(This used to be commit 30e876e9c2ba73a3bc26e7708110e00a8552a75e)
---
 source4/scripting/ejs/smbcalls_irpc.c | 197 ++++++++++++++++++++++++++++++++++
 1 file changed, 197 insertions(+)
 create mode 100644 source4/scripting/ejs/smbcalls_irpc.c

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_irpc.c b/source4/scripting/ejs/smbcalls_irpc.c
new file mode 100644
index 0000000000..9b0efc69e4
--- /dev/null
+++ b/source4/scripting/ejs/smbcalls_irpc.c
@@ -0,0 +1,197 @@
+/* 
+   Unix SMB/CIFS implementation.
+
+   provide hooks into IRPC calls from ejs scripts.
+
+   Copyright (C) Andrew Tridgell 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 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.
+*/
+/*
+  I hope that this code will eventually be autogenerated.
+
+
+  In this code, the convention is:
+
+    ejs_pull_*()   from MprVar -> C structure
+    ejs_push_*()   from C structure -> MprVar
+
+  note that for ejs calls, pull only ever needs to do
+  NDR_IN, and push only ever needs to do NDR_OUT. This is
+  because ejs code is (at least for the moment) only used for
+  the client, not the server
+
+  also note that we don't need the NDR_SCALARS/NDR_BUFFERS stuff, as
+  we aren't dealing with wire marshalling where scalars and buffers
+  are separated
+*/
+
+#include "includes.h"
+#include "lib/ejs/ejs.h"
+#include "librpc/gen_ndr/ndr_irpc.h"
+
+struct ndr_ejs {
+	/* nothing here yet */
+	int dummy;
+};
+
+struct enum_table {
+	uint32_t evalue;
+	const char *name;
+};
+
+#define EJS_ASSERT(condition) do { \
+	if (!(condition)) { \
+		DEBUG(0,("ejs assert failed at %s: %s\n", __location__, #condition)); \
+		return NT_STATUS_INVALID_PARAMETER; \
+	} \
+} while (0)
+
+
+/* first some common helper functions */
+
+static NTSTATUS ejs_pull_enum(struct ndr_ejs *ndr,
+			      uint32_t *evalue,
+			      struct MprVar *v,
+			      const struct enum_table *etable)
+{
+	const char *s;
+	int i;
+	EJS_ASSERT(v->type == MPR_TYPE_STRING);
+	s = v->string;
+	for (i=0;etable[i].name;i++) {
+		if (strcmp(s, etable[i].name) == 0) {
+			*evalue = etable[i].evalue;
+			return NT_STATUS_OK;
+		}
+	}
+	return NT_STATUS_INVALID_PARAMETER;
+}
+
+static NTSTATUS ejs_push_enum(struct ndr_ejs *ndr,
+			      uint32_t evalue,
+			      struct MprVar *v,
+			      const struct enum_table *etable)
+{
+	int i;
+	for (i=0;etable[i].name;i++) {
+		if (evalue == etable[i].evalue) {
+			*v = mprCreateStringVar(etable[i].name, 0);
+			return NT_STATUS_OK;
+		}
+	}
+	return NT_STATUS_INVALID_PARAMETER;
+}
+
+static NTSTATUS ejs_push_hyper(struct ndr_ejs *ndr,
+			       uint64_t evalue,
+			       struct MprVar *v,
+			       const char *name)
+{
+}
+
+
+NTSTATUS ejs_element(struct ndr_ejs *ndr,
+		     struct MprVar *v,
+		     const char *name,
+		     struct MprVar **e)
+{
+	*e = mprGetProperty(v, name, NULL);
+	if (*e == NULL) {
+		return NT_STATUS_INVALID_PARAMETER;
+	}
+	return NT_STATUS_OK;
+}
+
+
+/* when we auto-generate, the enum tables should also be used by
+   the ndr_print_*() functions for non-ejs handling of enums
+*/
+static const struct enum_table enum_table_nbdt_info_level[] = {
+	{NBTD_INFO_STATISTICS, "NBTD_INFO_STATISTICS"},
+	{-1, NULL}
+};
+
+
+
+/* pull-side functions for nbtd_information call */
+
+static NTSTATUS ejs_pull_nbtd_info_level(struct ndr_ejs *ndr, 
+					 enum nbtd_info_level *r,
+					 struct MprVar *v)
+{
+	uint32_t e;
+	NDR_CHECK(ejs_pull_enum(ndr, &e, v, enum_table_nbdt_info_level));
+	*r = e;
+	return NT_STATUS_OK;
+}
+
+static NTSTATUS ejs_pull_nbtd_information(struct ndr_ejs *ndr, 
+					  struct nbtd_information *r, 
+					  struct MprVar *v)
+{
+	struct MprVar *e;
+	NDR_CHECK(ejs_element(ndr, v, "level", &e));
+	NDR_CHECK(ejs_pull_nbtd_info_level(ndr, &r->in.level, e));
+	return NT_STATUS_OK;
+}
+
+
+/* push side functions for nbtd_information */
+
+static NTSTATUS ejs_push_nbtd_info_level(struct ndr_ejs *ndr, enum nbtd_info_level r, 
+					 struct MprVar *v)
+{
+	NDR_CHECK(ejs_push_enum(ndr, r, v, enum_table_nbdt_info_level));
+	return NT_STATUS_OK;
+}
+
+static NTSTATUS ejs_push_nbtd_statistics(struct ndr_ejs *ndr, struct nbtd_statistics *r,
+					 struct MprVar *v)
+{
+	NDR_CHECK(ejs_push_hyper(ndr, r->total_received, v, "total_received"));
+	NDR_CHECK(ejs_push_hyper(ndr, r->total_sent, v, "total_sent"));
+	NDR_CHECK(ejs_push_hyper(ndr, r->query_count, v, "query_count"));
+	NDR_CHECK(ejs_push_hyper(ndr, r->register_count, v, "register_count"));
+	NDR_CHECK(ejs_push_hyper(ndr, r->release_count, v, "release_count"));
+	NDR_CHECK(ejs_push_hyper(ndr, r->refresh_count, v, "refresh_count"));
+	return NT_STATUS_OK;
+}
+
+static NTSTATUS ejs_push_nbtd_info(struct ndr_ejs *ndr, union nbtd_info *r, 
+				   struct MprVar *v)
+{
+	int level;
+	level = ejs_push_get_switch_value(ndr, r);
+	switch (level) {
+	case NBTD_INFO_STATISTICS:
+		NDR_CHECK(ejs_push_object(ndr, r->stats, 
+					  (ejs_push_fn_t)ejs_push_nbtd_statistics, 
+					  v, "stats"));
+		break;
+	default:
+		return ejs_push_error(ndr, NDR_ERR_BAD_SWITCH, "Bad switch value %u", level);
+	}
+	return NT_STATUS_OK;
+}
+
+static NTSTATUS ndr_push_nbtd_information(struct ndr_push *ndr, 
+					  struct nbtd_information *r, struct MprVar *v)
+{
+	NDR_CHECK(ejs_push_set_switch_value(ndr, &r->out.info, r->in.level));
+	NDR_CHECK(ejs_push_object(ndr, &r->out.info, 
+				  (ejs_push_fn_t)ejs_push_nbtd_info, v, "info"));
+	return NT_STATUS_OK;
+}
-- 
cgit 


From 16a5d7c1755ece7f93db0eba42844152c916c11d Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Sat, 11 Jun 2005 02:39:14 +0000
Subject: r7477: Add MPR_TYPE_PTR to ejs_typeof(). (This used to be commit
 8574f64ca2bda864f472067ae594285b6f5dc957)

---
 source4/scripting/ejs/smbcalls.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls.c b/source4/scripting/ejs/smbcalls.c
index 46fce4b98e..1b5737db29 100644
--- a/source4/scripting/ejs/smbcalls.c
+++ b/source4/scripting/ejs/smbcalls.c
@@ -44,7 +44,8 @@ static int ejs_typeof(MprVarHandle eid, int argc, struct MprVar **argv)
 		{ MPR_TYPE_OBJECT,           "object" },
 		{ MPR_TYPE_FUNCTION,         "function" },
 		{ MPR_TYPE_STRING,           "string" },
-		{ MPR_TYPE_STRING_CFUNCTION, "function" }
+		{ MPR_TYPE_STRING_CFUNCTION, "function" },
+		{ MPR_TYPE_PTR,              "C pointer" }
 	};
 	int i;
 	const char *type = NULL;
-- 
cgit 


From 9e555f75e2b4982804f8effb4f2b4da689d714e8 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Sun, 12 Jun 2005 06:37:25 +0000
Subject: r7500: Initialise module subsystems. (This used to be commit
 564dfe14d00e80a0d373ab0fc17803ffaac0892e)

---
 source4/scripting/ejs/smbscript.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbscript.c b/source4/scripting/ejs/smbscript.c
index 02a3aff28e..68d94f6d2a 100644
--- a/source4/scripting/ejs/smbscript.c
+++ b/source4/scripting/ejs/smbscript.c
@@ -57,6 +57,8 @@ void ejs_exception(const char *reason)
 
 	load_interfaces();
 
+	smbscript_init_subsystems;
+
 	mprSetCtx(mem_ctx);
 
 	if (ejsOpen(NULL, NULL, NULL) != 0) {
-- 
cgit 


From ae23fe35e28c38c3ce1c523c49ea03a4045c2ca2 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Sun, 12 Jun 2005 06:40:17 +0000
Subject: r7501: Fix credential initialisation in ejs session setup.  Implement
 four arg and anonymous version of command.

Implement ejs tconx.
(This used to be commit 3b7df1037de813d93b284d3b4438b083e668e29f)
---
 source4/scripting/ejs/smbcalls_cli.c | 134 +++++++++++++++++++++++++++++++++--
 1 file changed, 127 insertions(+), 7 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_cli.c b/source4/scripting/ejs/smbcalls_cli.c
index bfc71948b9..02459abd4b 100644
--- a/source4/scripting/ejs/smbcalls_cli.c
+++ b/source4/scripting/ejs/smbcalls_cli.c
@@ -81,7 +81,8 @@ static int ejs_cli_connect(MprVarHandle eid, int argc, char **argv)
 
 	/* Return a socket object */
 
-	ejsSetReturnValue(eid, mprCreatePtrVar(transport, talloc_get_name(transport)));
+	ejsSetReturnValue(eid, mprCreatePtrVar(transport, 
+					       talloc_get_name(transport)));
 
 	return 0;
 }
@@ -91,6 +92,7 @@ static int ejs_cli_connect(MprVarHandle eid, int argc, char **argv)
      session_setup(conn, "DOMAIN\USERNAME%PASSWORD");
      session_setup(conn, USERNAME, PASSWORD);
      session_setup(conn, DOMAIN, USERNAME, PASSWORD);
+     session_setup(conn);  // anonymous
 
  */
 
@@ -101,32 +103,68 @@ static int ejs_cli_ssetup(MprVarHandle eid, int argc, MprVar **argv)
 	struct smb_composite_sesssetup setup;
 	struct cli_credentials *creds;
 	NTSTATUS status;
+	int result = -1;
 
 	/* Argument parsing */
 
-	if (argc < 1 || argc > 3) {
+	if (argc < 1 || argc > 4) {
 		ejsSetErrorMsg(eid, "session_setup invalid arguments");
 		return -1;
 	}
 
-	if (argv[0]->type != MPR_TYPE_PTR) {
+	if (!mprVarIsPtr(argv[0]->type)) {
 		ejsSetErrorMsg(eid, "first arg is not a connect handle");
 		return -1;
 	}
 
 	transport = argv[0]->ptr;
+	creds = cli_credentials_init(transport);
+	cli_credentials_set_conf(creds);
+
+	if (argc == 4) {
+
+		/* DOMAIN, USERNAME, PASSWORD form */
+
+		if (!mprVarIsString(argv[1]->type)) {
+			ejsSetErrorMsg(eid, "arg 1 must be a string");
+			goto done;
+		}
+
+		cli_credentials_set_domain(creds, argv[1]->string, 
+					   CRED_SPECIFIED);
+
+		if (!mprVarIsString(argv[2]->type)) {
+			ejsSetErrorMsg(eid, "arg 2 must be a string");
+			goto done;
+		}
+
+		cli_credentials_set_username(creds, argv[2]->string, 
+					     CRED_SPECIFIED);
+
+		if (!mprVarIsString(argv[3]->type)) {
+			ejsSetErrorMsg(eid, "arg 3 must be a string");
+			goto done;
+		}
+
+		cli_credentials_set_password(creds, argv[3]->string,
+					     CRED_SPECIFIED);
+
+	} else {
+
+		/* Anonymous connection */
+
+		cli_credentials_set_anonymous(creds);
+	}
 
 	/* Do session setup */
 
 	session = smbcli_session_init(transport, transport, True);
+
 	if (!session) {
 		ejsSetErrorMsg(eid, "session init failed");
 		return -1;
 	}
 
-	creds = cli_credentials_init(session);
-	cli_credentials_set_anonymous(creds);
-
 	setup.in.sesskey = transport->negotiate.sesskey;
 	setup.in.capabilities = transport->negotiate.capabilities;
 	setup.in.credentials = creds;
@@ -134,11 +172,92 @@ static int ejs_cli_ssetup(MprVarHandle eid, int argc, MprVar **argv)
 
 	status = smb_composite_sesssetup(session, &setup);
 
+	if (!NT_STATUS_IS_OK(status)) {
+		ejsSetErrorMsg(eid, "session setup: %s", nt_errstr(status));
+		return -1;
+	}
+
 	session->vuid = setup.out.vuid;	
 
 	/* Return a session object */
 
-	ejsSetReturnValue(eid, mprCreatePtrVar(session, talloc_get_name(session)));
+	ejsSetReturnValue(eid, mprCreatePtrVar(session, 
+					       talloc_get_name(session)));
+
+	result = 0;
+
+ done:
+	talloc_free(creds);
+	return result;
+}
+
+/* Perform a tree connect
+   
+     session_setup(session, SHARE);
+
+ */
+
+static int ejs_cli_tcon(MprVarHandle eid, int argc, MprVar **argv)
+{
+	struct smbcli_session *session;
+	struct smbcli_tree *tree;
+	union smb_tcon tcon;
+	TALLOC_CTX *mem_ctx;
+	NTSTATUS status;
+	char *password = "";
+
+	/* Argument parsing */
+
+	if (argc != 2) {
+		ejsSetErrorMsg(eid, "tree_connect invalid arguments");
+		return -1;
+	}
+
+	if (!mprVarIsPtr(argv[0]->type)) {
+		ejsSetErrorMsg(eid, "first arg is not a session handle");
+		return -1;
+	}
+
+	session = argv[0]->ptr;
+	tree = smbcli_tree_init(session, session, True);
+
+	if (!tree) {
+		ejsSetErrorMsg(eid, "tree init failed");
+		return -1;
+	}
+
+	mem_ctx = talloc_init("tcon");
+	if (!mem_ctx) {
+		ejsSetErrorMsg(eid, "talloc_init failed");
+		return -1;
+	}
+
+	/* Do tree connect */
+
+	tcon.generic.level = RAW_TCON_TCONX;
+	tcon.tconx.in.flags = 0;
+
+	if (session->transport->negotiate.sec_mode & NEGOTIATE_SECURITY_USER_LEVEL) {
+		tcon.tconx.in.password = data_blob(NULL, 0);
+	} else if (session->transport->negotiate.sec_mode & NEGOTIATE_SECURITY_CHALLENGE_RESPONSE) {
+		tcon.tconx.in.password = data_blob_talloc(mem_ctx, NULL, 24);
+		if (session->transport->negotiate.secblob.length < 8) {
+			ejsSetErrorMsg(eid, "invalid security blob");
+			return -1;
+		}
+		SMBencrypt(password, session->transport->negotiate.secblob.data, tcon.tconx.in.password.data);
+	} else {
+		tcon.tconx.in.password = data_blob_talloc(mem_ctx, password, strlen(password)+1);
+	}
+
+	tcon.tconx.in.path = argv[1]->string;
+	tcon.tconx.in.device = "?????";
+	
+	status = smb_tree_connect(tree, mem_ctx, &tcon);
+
+	tree->tid = tcon.tconx.out.tid;
+
+	talloc_free(mem_ctx);	
 
 	return 0;
 }
@@ -150,4 +269,5 @@ void smb_setup_ejs_cli(void)
 {
 	ejsDefineStringCFunction(-1, "connect", ejs_cli_connect, NULL, MPR_VAR_SCRIPT_HANDLE);
 	ejsDefineCFunction(-1, "session_setup", ejs_cli_ssetup, NULL, MPR_VAR_SCRIPT_HANDLE);
+	ejsDefineCFunction(-1, "tree_connect", ejs_cli_tcon, NULL, MPR_VAR_SCRIPT_HANDLE);
 }
-- 
cgit 


From fb3874bfacb7fb7199e415f8ad16598790ec9c36 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Sun, 12 Jun 2005 07:03:32 +0000
Subject: r7505: Add more argument forms for session_setup().

Throw an exception if tree connect fails.
(This used to be commit 5b67f2c3d91487fec38b300b4f71792cd9164a78)
---
 source4/scripting/ejs/smbcalls_cli.c | 35 ++++++++++++++++++++++++++++++++++-
 1 file changed, 34 insertions(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_cli.c b/source4/scripting/ejs/smbcalls_cli.c
index 02459abd4b..b32917515d 100644
--- a/source4/scripting/ejs/smbcalls_cli.c
+++ b/source4/scripting/ejs/smbcalls_cli.c
@@ -89,7 +89,7 @@ static int ejs_cli_connect(MprVarHandle eid, int argc, char **argv)
 
 /* Perform a session setup:
    
-     session_setup(conn, "DOMAIN\USERNAME%PASSWORD");
+     session_setup(conn, "DOMAIN\\USERNAME%PASSWORD");
      session_setup(conn, USERNAME, PASSWORD);
      session_setup(conn, DOMAIN, USERNAME, PASSWORD);
      session_setup(conn);  // anonymous
@@ -149,6 +149,34 @@ static int ejs_cli_ssetup(MprVarHandle eid, int argc, MprVar **argv)
 		cli_credentials_set_password(creds, argv[3]->string,
 					     CRED_SPECIFIED);
 
+	} else if (argc == 3) {
+
+		/* USERNAME, PASSWORD form */
+
+		if (!mprVarIsString(argv[1]->type)) {
+			ejsSetErrorMsg(eid, "arg1 must be a string");
+			goto done;
+		}
+
+		cli_credentials_set_username(creds, argv[1]->string,
+					     CRED_SPECIFIED);
+
+		if (!mprVarIsString(argv[2]->type)) {
+
+			ejsSetErrorMsg(eid, "arg2 must be a string");
+			goto done;
+		}
+
+		cli_credentials_set_password(creds, argv[2]->string,
+					     CRED_SPECIFIED);
+
+	} else if (argc == 2) {
+
+		/* DOMAIN/USERNAME%PASSWORD form */
+
+		cli_credentials_parse_string(creds, argv[1]->string,
+					     CRED_SPECIFIED);
+
 	} else {
 
 		/* Anonymous connection */
@@ -255,6 +283,11 @@ static int ejs_cli_tcon(MprVarHandle eid, int argc, MprVar **argv)
 	
 	status = smb_tree_connect(tree, mem_ctx, &tcon);
 
+	if (!NT_STATUS_IS_OK(status)) {
+		ejsSetErrorMsg(eid, "session setup: %s", nt_errstr(status));
+		return -1;
+	}
+
 	tree->tid = tcon.tconx.out.tid;
 
 	talloc_free(mem_ctx);	
-- 
cgit 


From 00e2b7c1b49b128488cf977b40b086b935fb605a Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Mon, 13 Jun 2005 10:01:11 +0000
Subject: r7530: Simply calling convention of lp_load().

This always loads all the services, as we now don't have an easy way
to split out smbd.

Andrew Bartlett
(This used to be commit 990e061939c76b559c4f5914c5fc6ca1b13e19dd)
---
 source4/scripting/ejs/smbscript.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbscript.c b/source4/scripting/ejs/smbscript.c
index 68d94f6d2a..2795e4f127 100644
--- a/source4/scripting/ejs/smbscript.c
+++ b/source4/scripting/ejs/smbscript.c
@@ -49,7 +49,7 @@ void ejs_exception(const char *reason)
 
 	setup_logging(argv[0],DEBUG_STDOUT);
 
-	if (!lp_load(dyn_CONFIGFILE, False, False, False)) {
+	if (!lp_load(dyn_CONFIGFILE)) {
 		fprintf(stderr, "%s: Can't load %s - run testparm to debug it\n",
 			argv[0], dyn_CONFIGFILE);
 		exit(127);
-- 
cgit 


From 487d1afe3021844f96ed19861a03ea1958676f67 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Tue, 14 Jun 2005 07:14:59 +0000
Subject: r7570: Add tree, session and socket disconnect ejs functions. (This
 used to be commit 63577628b0ee7e6b33053484190189e99cb56a5b)

---
 source4/scripting/ejs/smbcalls_cli.c | 122 ++++++++++++++++++++++++++++++++---
 1 file changed, 114 insertions(+), 8 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_cli.c b/source4/scripting/ejs/smbcalls_cli.c
index b32917515d..fa147ca299 100644
--- a/source4/scripting/ejs/smbcalls_cli.c
+++ b/source4/scripting/ejs/smbcalls_cli.c
@@ -54,7 +54,7 @@ static int ejs_cli_connect(MprVarHandle eid, int argc, char **argv)
 		return -1;
 	}
 
-	transport = smbcli_transport_init(sock, sock, True);
+	transport = smbcli_transport_init(sock, sock, False);
 
 	if (!transport) {
 		ejsSetErrorMsg(eid, "transport init failed");
@@ -186,7 +186,7 @@ static int ejs_cli_ssetup(MprVarHandle eid, int argc, MprVar **argv)
 
 	/* Do session setup */
 
-	session = smbcli_session_init(transport, transport, True);
+	session = smbcli_session_init(transport, transport, False);
 
 	if (!session) {
 		ejsSetErrorMsg(eid, "session init failed");
@@ -201,7 +201,7 @@ static int ejs_cli_ssetup(MprVarHandle eid, int argc, MprVar **argv)
 	status = smb_composite_sesssetup(session, &setup);
 
 	if (!NT_STATUS_IS_OK(status)) {
-		ejsSetErrorMsg(eid, "session setup: %s", nt_errstr(status));
+		ejsSetErrorMsg(eid, "session_setup: %s", nt_errstr(status));
 		return -1;
 	}
 
@@ -221,11 +221,11 @@ static int ejs_cli_ssetup(MprVarHandle eid, int argc, MprVar **argv)
 
 /* Perform a tree connect
    
-     session_setup(session, SHARE);
+     tree_connect(session, SHARE);
 
  */
 
-static int ejs_cli_tcon(MprVarHandle eid, int argc, MprVar **argv)
+static int ejs_cli_tree_connect(MprVarHandle eid, int argc, MprVar **argv)
 {
 	struct smbcli_session *session;
 	struct smbcli_tree *tree;
@@ -247,7 +247,7 @@ static int ejs_cli_tcon(MprVarHandle eid, int argc, MprVar **argv)
 	}
 
 	session = argv[0]->ptr;
-	tree = smbcli_tree_init(session, session, True);
+	tree = smbcli_tree_init(session, session, False);
 
 	if (!tree) {
 		ejsSetErrorMsg(eid, "tree init failed");
@@ -284,7 +284,7 @@ static int ejs_cli_tcon(MprVarHandle eid, int argc, MprVar **argv)
 	status = smb_tree_connect(tree, mem_ctx, &tcon);
 
 	if (!NT_STATUS_IS_OK(status)) {
-		ejsSetErrorMsg(eid, "session setup: %s", nt_errstr(status));
+		ejsSetErrorMsg(eid, "tree_connect: %s", nt_errstr(status));
 		return -1;
 	}
 
@@ -292,6 +292,109 @@ static int ejs_cli_tcon(MprVarHandle eid, int argc, MprVar **argv)
 
 	talloc_free(mem_ctx);	
 
+	ejsSetReturnValue(eid, mprCreatePtrVar(tree, 
+					       talloc_get_name(tree)));
+
+	return 0;
+}
+
+/* Perform a tree disconnect
+   
+     tree_disconnect(tree);
+
+ */
+static int ejs_cli_tree_disconnect(MprVarHandle eid, int argc, MprVar **argv)
+{
+	struct smbcli_tree *tree;
+	NTSTATUS status;
+
+	/* Argument parsing */
+
+	if (argc != 1) {
+		ejsSetErrorMsg(eid, "tree_disconnect invalid arguments");
+		return -1;
+	}
+
+	if (!mprVarIsPtr(argv[0]->type)) {
+		ejsSetErrorMsg(eid, "first arg is not a tree handle");
+		return -1;
+	}	
+
+	tree = argv[0]->ptr;
+
+	status = smb_tree_disconnect(tree);
+
+	if (!NT_STATUS_IS_OK(status)) {
+		ejsSetErrorMsg(eid, "tree_disconnect: %s", nt_errstr(status));
+		return -1;
+	}
+
+	talloc_free(tree);
+
+	return 0;
+}
+
+/* Perform a ulogoff
+   
+     session_logoff(session);
+
+ */
+static int ejs_cli_session_logoff(MprVarHandle eid, int argc, MprVar **argv)
+{
+	struct smbcli_session *session;
+	NTSTATUS status;
+
+	/* Argument parsing */
+
+	if (argc != 1) {
+		ejsSetErrorMsg(eid, "session_logoff invalid arguments");
+		return -1;
+	}
+
+	if (!mprVarIsPtr(argv[0]->type)) {
+		ejsSetErrorMsg(eid, "first arg is not a session handle");
+		return -1;
+	}	
+
+	session = argv[0]->ptr;
+
+	status = smb_raw_ulogoff(session);
+
+	if (!NT_STATUS_IS_OK(status)) {
+		ejsSetErrorMsg(eid, "session_logoff: %s", nt_errstr(status));
+		return -1;
+	}
+
+	talloc_free(session);
+
+	return 0;
+}
+
+/* Perform a connection close
+   
+     disconnect(conn);
+
+ */
+static int ejs_cli_disconnect(MprVarHandle eid, int argc, MprVar **argv)
+{
+	struct smbcli_sock *sock;
+
+	/* Argument parsing */
+
+	if (argc != 1) {
+		ejsSetErrorMsg(eid, "disconnect invalid arguments");
+		return -1;
+	}
+
+	if (!mprVarIsPtr(argv[0]->type)) {
+		ejsSetErrorMsg(eid, "first arg is not a connect handle");
+		return -1;
+	}	
+
+	sock = argv[0]->ptr;
+
+	talloc_free(sock);
+
 	return 0;
 }
 
@@ -302,5 +405,8 @@ void smb_setup_ejs_cli(void)
 {
 	ejsDefineStringCFunction(-1, "connect", ejs_cli_connect, NULL, MPR_VAR_SCRIPT_HANDLE);
 	ejsDefineCFunction(-1, "session_setup", ejs_cli_ssetup, NULL, MPR_VAR_SCRIPT_HANDLE);
-	ejsDefineCFunction(-1, "tree_connect", ejs_cli_tcon, NULL, MPR_VAR_SCRIPT_HANDLE);
+	ejsDefineCFunction(-1, "tree_connect", ejs_cli_tree_connect, NULL, MPR_VAR_SCRIPT_HANDLE);
+	ejsDefineCFunction(-1, "tree_disconnect", ejs_cli_tree_disconnect, NULL, MPR_VAR_SCRIPT_HANDLE);
+	ejsDefineCFunction(-1, "session_logoff", ejs_cli_session_logoff, NULL, MPR_VAR_SCRIPT_HANDLE);
+	ejsDefineCFunction(-1, "disconnect", ejs_cli_disconnect, NULL, MPR_VAR_SCRIPT_HANDLE);
 }
-- 
cgit 


From af237084ecd4f9928c6c282b9c5c73598d5c73d6 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Thu, 16 Jun 2005 11:36:09 +0000
Subject: r7633: this patch started as an attempt to make the dcerpc code use a
 given event_context for the socket_connect() call, so that when things that
 use dcerpc are running alongside anything else it doesn't block the whole
 process during a connect.

Then of course I needed to change any code that created a dcerpc
connection (such as the auth code) to also take an event context, and
anything that called that and so on .... thus the size of the patch.

There were 3 places where I punted:

  - abartlet wanted me to add a gensec_set_event_context() call
    instead of adding it to the gensec init calls. Andrew, my
    apologies for not doing this. I didn't do it as adding a new
    parameter allowed me to catch all the callers with the
    compiler. Now that its done, we could go back and use
    gensec_set_event_context()

  - the ejs code calls auth initialisation, which means it should pass
    in the event context from the web server. I punted on that. Needs fixing.

  - I used a NULL event context in dcom_get_pipe(). This is equivalent
    to what we did already, but should be fixed to use a callers event
    context. Jelmer, can you think of a clean way to do that?

I also cleaned up a couple of things:

 - libnet_context_destroy() makes no sense. I removed it.

 - removed some unused vars in various places
(This used to be commit 3a3025485bdb8f600ab528c0b4b4eef0c65e3fc9)
---
 source4/scripting/ejs/smbcalls.c     | 5 ++++-
 source4/scripting/ejs/smbcalls_cli.c | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls.c b/source4/scripting/ejs/smbcalls.c
index 1b5737db29..6444ec63cc 100644
--- a/source4/scripting/ejs/smbcalls.c
+++ b/source4/scripting/ejs/smbcalls.c
@@ -81,7 +81,10 @@ static int ejs_systemAuth(TALLOC_CTX *tmp_ctx, struct MprVar *auth, const char *
 	NTSTATUS nt_status;
 	DATA_BLOB pw_blob;
 
-	nt_status = auth_context_create(tmp_ctx, auth_unix, &auth_context);
+	/*
+	  darn, we need some way to get the right event_context here
+	*/
+	nt_status = auth_context_create(tmp_ctx, auth_unix, &auth_context, NULL);
 	if (!NT_STATUS_IS_OK(nt_status)) {
 		mprSetPropertyValue(auth, "result", mprCreateBoolVar(False));
 		mprSetPropertyValue(auth, "report", mprCreateStringVar("Auth System Failure", 1));
diff --git a/source4/scripting/ejs/smbcalls_cli.c b/source4/scripting/ejs/smbcalls_cli.c
index fa147ca299..f144fd61e5 100644
--- a/source4/scripting/ejs/smbcalls_cli.c
+++ b/source4/scripting/ejs/smbcalls_cli.c
@@ -232,7 +232,7 @@ static int ejs_cli_tree_connect(MprVarHandle eid, int argc, MprVar **argv)
 	union smb_tcon tcon;
 	TALLOC_CTX *mem_ctx;
 	NTSTATUS status;
-	char *password = "";
+	const char *password = "";
 
 	/* Argument parsing */
 
-- 
cgit 


From 864de2a4ab9ed2cf2f8850516a021973941af87a Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Sun, 26 Jun 2005 05:18:50 +0000
Subject: r7922: Comment out complicated connect/session/tree API for the
 moment.  Replace with tree_connect() and tree_disconnect() functions. (This
 used to be commit 9ed763f7fa9e6138d8c1da29c1e0adf2e18cb5e1)

---
 source4/scripting/ejs/smbcalls_cli.c | 85 +++++++++++++++++++++++++++++++++++-
 1 file changed, 83 insertions(+), 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_cli.c b/source4/scripting/ejs/smbcalls_cli.c
index f144fd61e5..7a693fc180 100644
--- a/source4/scripting/ejs/smbcalls_cli.c
+++ b/source4/scripting/ejs/smbcalls_cli.c
@@ -22,10 +22,13 @@
 
 #include "includes.h"
 #include "lib/ejs/ejs.h"
-#include "librpc/gen_ndr/ndr_nbt.h"
 #include "libcli/raw/libcliraw.h"
 #include "libcli/composite/composite.h"
 
+#if 0
+
+#include "librpc/gen_ndr/ndr_nbt.h"
+
 /* Connect to a server */
 
 static int ejs_cli_connect(MprVarHandle eid, int argc, char **argv)
@@ -398,15 +401,93 @@ static int ejs_cli_disconnect(MprVarHandle eid, int argc, MprVar **argv)
 	return 0;
 }
 
+#endif
+
+/* Perform a tree connect:
+
+     tree_handle = tree_connect("\\\\frogurt\\homes", "user%pass");
+ */
+
+static int ejs_tree_connect(MprVarHandle eid, int argc, char **argv)
+{
+	struct cli_credentials *creds;
+	struct smbcli_tree *tree;
+	const char *hostname, *sharename;
+	NTSTATUS result;
+	TALLOC_CTX *mem_ctx;
+
+	if (argc != 2) {
+		ejsSetErrorMsg(eid, "tree_connect(): invalid number of args");
+		return -1;
+	}
+
+	/* Set up host, share destination */
+
+	mem_ctx = talloc_init(NULL);
+	smbcli_parse_unc(argv[0], mem_ctx, &hostname, &sharename);
+
+	/* Set up credentials */
+
+	creds = cli_credentials_init(NULL);
+	cli_credentials_set_conf(creds);
+	cli_credentials_parse_string(creds, argv[1], CRED_SPECIFIED);
+
+	/* Do connect */
+
+	result = smbcli_tree_full_connection(NULL, &tree, hostname, 0,
+					     sharename, "?????", creds, NULL);
+
+	talloc_free(mem_ctx);
+
+	if (!NT_STATUS_IS_OK(result)) {
+		ejsSetReturnValue(eid, mprNTSTATUS(result));
+		return 0;
+	}
+
+	ejsSetReturnValue(eid, mprCreatePtrVar(tree, talloc_get_name(tree)));
+
+	return 0;
+}
+
+/* Perform a tree disconnect:
+
+     tree_disconnect(tree_handle);
+ */
+
+static int ejs_tree_disconnect(MprVarHandle eid, int argc, MprVar **argv)
+{
+	struct smbcli_tree *tree;
+	NTSTATUS result;
+
+	if (!mprVarIsPtr(argv[0]->type) || 
+	    !talloc_check_name(argv[0]->ptr, "struct smbcli_tree")) {
+		ejsSetErrorMsg(eid, "first arg is not a tree handle");
+		return -1;
+	}
+
+	tree = talloc_check_name(argv[0]->ptr, "struct smbcli_tree");
+
+	result = smb_tree_disconnect(tree);
+
+	ejsSetReturnValue(eid, mprNTSTATUS(result));
+
+	return 0;
+}
+
 /*
   setup C functions that be called from ejs
 */
 void smb_setup_ejs_cli(void)
 {
+	ejsDefineStringCFunction(-1, "tree_connect", ejs_tree_connect, NULL, MPR_VAR_SCRIPT_HANDLE);
+	ejsDefineCFunction(-1, "tree_disconnect", ejs_tree_disconnect, NULL, MPR_VAR_SCRIPT_HANDLE);
+
+#if 0
 	ejsDefineStringCFunction(-1, "connect", ejs_cli_connect, NULL, MPR_VAR_SCRIPT_HANDLE);
 	ejsDefineCFunction(-1, "session_setup", ejs_cli_ssetup, NULL, MPR_VAR_SCRIPT_HANDLE);
 	ejsDefineCFunction(-1, "tree_connect", ejs_cli_tree_connect, NULL, MPR_VAR_SCRIPT_HANDLE);
 	ejsDefineCFunction(-1, "tree_disconnect", ejs_cli_tree_disconnect, NULL, MPR_VAR_SCRIPT_HANDLE);
 	ejsDefineCFunction(-1, "session_logoff", ejs_cli_session_logoff, NULL, MPR_VAR_SCRIPT_HANDLE);
-	ejsDefineCFunction(-1, "disconnect", ejs_cli_disconnect, NULL, MPR_VAR_SCRIPT_HANDLE);
+	ejsDefineCFunction(-1, "disconnect", ejs_cli_disconnect, NULL, MPR_VAR_SCRIPT_HANDLE);	
+#endif
 }
-- 
cgit 


From ae73a40ad4c09a93abe00ee99ea868b0196d3449 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Sun, 26 Jun 2005 05:43:16 +0000
Subject: r7924: Add mkdir() and rmdir() functions.

Write a macro to check tree handle parameters.
(This used to be commit 043feb131f1877886a9ab7e25ada5e54692f6487)
---
 source4/scripting/ejs/smbcalls_cli.c | 83 +++++++++++++++++++++++++++++++++++-
 1 file changed, 81 insertions(+), 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_cli.c b/source4/scripting/ejs/smbcalls_cli.c
index 7a693fc180..46813f8f23 100644
--- a/source4/scripting/ejs/smbcalls_cli.c
+++ b/source4/scripting/ejs/smbcalls_cli.c
@@ -449,6 +449,9 @@ static int ejs_tree_connect(MprVarHandle eid, int argc, char **argv)
 	return 0;
 }
 
+#define IS_TREE_HANDLE(x) (mprVarIsPtr((x)->type) && \
+                           talloc_check_name((x)->ptr, "struct smbcli_tree"))
+
 /* Perform a tree disconnect:
 
      tree_disconnect(tree_handle);
@@ -459,8 +462,13 @@ static int ejs_tree_disconnect(MprVarHandle eid, int argc, MprVar **argv)
 	struct smbcli_tree *tree;
 	NTSTATUS result;
 
-	if (!mprVarIsPtr(argv[0]->type) || 
-	    !talloc_check_name(argv[0]->ptr, "struct smbcli_tree")) {
+	if (argc != 1) {
+		ejsSetErrorMsg(eid, 
+			       "tree_disconnect(): invalid number of args");
+		return -1;
+	}
+
+	if (!IS_TREE_HANDLE(argv[0])) {
 		ejsSetErrorMsg(eid, "first arg is not a tree handle");
 		return -1;
 	}
@@ -474,6 +482,74 @@ static int ejs_tree_disconnect(MprVarHandle eid, int argc, MprVar **argv)
 	return 0;
 }
 
+/* Perform a tree connect:
+
+     result = mkdir(tree_handle, DIRNAME);
+ */
+
+static int ejs_mkdir(MprVarHandle eid, int argc, MprVar **argv)
+{
+	struct smbcli_tree *tree;
+	NTSTATUS result;
+
+	if (argc != 2) {
+		ejsSetErrorMsg(eid, "mkdir(): invalid number of args");
+		return -1;
+	}
+
+	if (!IS_TREE_HANDLE(argv[0])) {
+		ejsSetErrorMsg(eid, "first arg is not a tree handle");
+		return -1;
+	}
+
+	tree = argv[0]->ptr;
+
+	if (!mprVarIsString(argv[1]->type)) {
+		ejsSetErrorMsg(eid, "arg 2 must be a string");
+		return -1;
+	}
+
+	result = smbcli_mkdir(tree, argv[1]->string);
+
+	ejsSetReturnValue(eid, mprNTSTATUS(result));
+
+	return 0;
+}
+
+/* Perform a tree connect:
+
+     result = rmdir(tree_handle, DIRNAME);
+ */
+
+static int ejs_rmdir(MprVarHandle eid, int argc, MprVar **argv)
+{
+	struct smbcli_tree *tree;
+	NTSTATUS result;
+
+	if (argc != 2) {
+		ejsSetErrorMsg(eid, "rmdir(): invalid number of args");
+		return -1;
+	}
+
+	if (!IS_TREE_HANDLE(argv[0])) {
+		ejsSetErrorMsg(eid, "first arg is not a tree handle");
+		return -1;
+	}
+
+	tree = argv[0]->ptr;
+
+	if (!mprVarIsString(argv[1]->type)) {
+		ejsSetErrorMsg(eid, "arg 2 must be a string");
+		return -1;
+	}
+	
+	result = smbcli_rmdir(tree, argv[1]->string);
+
+	ejsSetReturnValue(eid, mprNTSTATUS(result));
+
+	return 0;
+}
+
 /*
   setup C functions that be called from ejs
 */
@@ -482,6 +558,9 @@ void smb_setup_ejs_cli(void)
 	ejsDefineStringCFunction(-1, "tree_connect", ejs_tree_connect, NULL, MPR_VAR_SCRIPT_HANDLE);
 	ejsDefineCFunction(-1, "tree_disconnect", ejs_tree_disconnect, NULL, MPR_VAR_SCRIPT_HANDLE);
 
+	ejsDefineCFunction(-1, "mkdir", ejs_mkdir, NULL, MPR_VAR_SCRIPT_HANDLE);
+	ejsDefineCFunction(-1, "rmdir", ejs_rmdir, NULL, MPR_VAR_SCRIPT_HANDLE);
+
 #if 0
 	ejsDefineStringCFunction(-1, "connect", ejs_cli_connect, NULL, MPR_VAR_SCRIPT_HANDLE);
 	ejsDefineCFunction(-1, "session_setup", ejs_cli_ssetup, NULL, MPR_VAR_SCRIPT_HANDLE);
-- 
cgit 


From c36e1ae46c266c9a6f012e5715a8df69faad04cd Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Sun, 26 Jun 2005 07:34:55 +0000
Subject: r7928: Add rename, unlink and list commands.

list() returns a list of strings, but maybe it should be a list of
objects with size, attrib, short name etc.
(This used to be commit 696aa182d5a159c26b80829e1eae9a9894cb7986)
---
 source4/scripting/ejs/smbcalls_cli.c | 141 ++++++++++++++++++++++++++++++++++-
 1 file changed, 139 insertions(+), 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_cli.c b/source4/scripting/ejs/smbcalls_cli.c
index 46813f8f23..ca8fbd3ea2 100644
--- a/source4/scripting/ejs/smbcalls_cli.c
+++ b/source4/scripting/ejs/smbcalls_cli.c
@@ -24,6 +24,7 @@
 #include "lib/ejs/ejs.h"
 #include "libcli/raw/libcliraw.h"
 #include "libcli/composite/composite.h"
+#include "clilist.h"
 
 #if 0
 
@@ -482,7 +483,7 @@ static int ejs_tree_disconnect(MprVarHandle eid, int argc, MprVar **argv)
 	return 0;
 }
 
-/* Perform a tree connect:
+/* Create a directory:
 
      result = mkdir(tree_handle, DIRNAME);
  */
@@ -516,7 +517,7 @@ static int ejs_mkdir(MprVarHandle eid, int argc, MprVar **argv)
 	return 0;
 }
 
-/* Perform a tree connect:
+/* Remove a directory:
 
      result = rmdir(tree_handle, DIRNAME);
  */
@@ -550,6 +551,138 @@ static int ejs_rmdir(MprVarHandle eid, int argc, MprVar **argv)
 	return 0;
 }
 
+/* Rename a file or directory:
+
+     result = rename(tree_handle, SRCFILE, DESTFILE);
+ */
+
+static int ejs_rename(MprVarHandle eid, int argc, MprVar **argv)
+{
+	struct smbcli_tree *tree;
+	NTSTATUS result;
+
+	if (argc != 3) {
+		ejsSetErrorMsg(eid, "rename(): invalid number of args");
+		return -1;
+	}
+
+	if (!IS_TREE_HANDLE(argv[0])) {
+		ejsSetErrorMsg(eid, "first arg is not a tree handle");
+		return -1;
+	}
+
+	tree = argv[0]->ptr;
+
+	if (!mprVarIsString(argv[1]->type)) {
+		ejsSetErrorMsg(eid, "arg 2 must be a string");
+		return -1;
+	}
+	
+	if (!mprVarIsString(argv[2]->type)) {
+		ejsSetErrorMsg(eid, "arg 3 must be a string");
+		return -1;
+	}
+	
+	result = smbcli_rename(tree, argv[1]->string, argv[2]->string);
+
+	ejsSetReturnValue(eid, mprNTSTATUS(result));
+
+	return 0;
+}
+
+/* Unlink a file or directory:
+
+     result = unlink(tree_handle, FILENAME);
+ */
+
+static int ejs_unlink(MprVarHandle eid, int argc, MprVar **argv)
+{
+	struct smbcli_tree *tree;
+	NTSTATUS result;
+
+	if (argc != 2) {
+		ejsSetErrorMsg(eid, "unlink(): invalid number of args");
+		return -1;
+	}
+
+	if (!IS_TREE_HANDLE(argv[0])) {
+		ejsSetErrorMsg(eid, "first arg is not a tree handle");
+		return -1;
+	}
+
+	tree = argv[0]->ptr;
+
+	if (!mprVarIsString(argv[1]->type)) {
+		ejsSetErrorMsg(eid, "arg 2 must be a string");
+		return -1;
+	}
+	
+	result = smbcli_unlink(tree, argv[1]->string);
+
+	ejsSetReturnValue(eid, mprNTSTATUS(result));
+
+	return 0;
+}
+
+/* List directory contents
+
+     result = list(tree_handle, ARG1, ...);
+ */
+
+static void ejs_list_helper(struct clilist_file_info *info, const char *mask, 
+			    void *state)
+
+{
+	MprVar *result = (MprVar *)state, value;
+	char idx[16];
+
+	mprItoa(result->properties->numDataItems, idx, sizeof(idx));
+	value = mprCreateStringVar(info->name, 1);
+	mprCreateProperty(result, idx, &value);
+}
+
+static int ejs_list(MprVarHandle eid, int argc, MprVar **argv)
+{
+	struct smbcli_tree *tree;
+	char *mask;
+	uint16_t attribute;
+	MprVar result;
+
+	if (argc != 3) {
+		ejsSetErrorMsg(eid, "list(): invalid number of args");
+		return -1;
+	}
+
+	if (!IS_TREE_HANDLE(argv[0])) {
+		ejsSetErrorMsg(eid, "first arg is not a tree handle");
+		return -1;
+	}
+
+	tree = argv[0]->ptr;
+
+	if (!mprVarIsString(argv[1]->type)) {
+		ejsSetErrorMsg(eid, "arg 2 must be a string");
+		return -1;
+	}
+	
+	mask = argv[1]->string;
+
+	if (!mprVarIsNumber(argv[2]->type)) {
+		ejsSetErrorMsg(eid, "arg 3 must be a number");
+		return -1;
+	}
+
+	attribute = mprVarToInteger(argv[2]);
+
+	result = mprCreateObjVar("list", MPR_DEFAULT_HASH_SIZE);
+
+	smbcli_list(tree, mask, attribute, ejs_list_helper, &result);
+
+	ejsSetReturnValue(eid, result);
+
+	return 0;
+}
+
 /*
   setup C functions that be called from ejs
 */
@@ -560,6 +693,10 @@ void smb_setup_ejs_cli(void)
 
 	ejsDefineCFunction(-1, "mkdir", ejs_mkdir, NULL, MPR_VAR_SCRIPT_HANDLE);
 	ejsDefineCFunction(-1, "rmdir", ejs_rmdir, NULL, MPR_VAR_SCRIPT_HANDLE);
+	ejsDefineCFunction(-1, "rename", ejs_rename, NULL, MPR_VAR_SCRIPT_HANDLE);
+	ejsDefineCFunction(-1, "unlink", ejs_unlink, NULL, MPR_VAR_SCRIPT_HANDLE);
+	ejsDefineCFunction(-1, "list", ejs_list, NULL, MPR_VAR_SCRIPT_HANDLE);
+	
 
 #if 0
 	ejsDefineStringCFunction(-1, "connect", ejs_cli_connect, NULL, MPR_VAR_SCRIPT_HANDLE);
-- 
cgit 


From 643e5d8239ba105a5ac99ecc513289a17402714b Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Sat, 2 Jul 2005 05:21:17 +0000
Subject: r8069: the beginnings of code to allow rpc calls to be made from ejs

tpot, note that this shows how you can modify passed in MprVar
variables in C call
(This used to be commit a782541db3de6ca3b599a220265cf9e6cb0c4d7b)
---
 source4/scripting/config.mk          |  24 --------
 source4/scripting/ejs/config.mk      |  23 +++++++
 source4/scripting/ejs/mprutil.c      |  26 ++++++++
 source4/scripting/ejs/smbcalls.c     |   1 +
 source4/scripting/ejs/smbcalls_rpc.c | 116 +++++++++++++++++++++++++++++++++++
 source4/scripting/ejs/smbscript.c    |  43 ++++++++-----
 6 files changed, 194 insertions(+), 39 deletions(-)
 create mode 100644 source4/scripting/ejs/config.mk
 create mode 100644 source4/scripting/ejs/smbcalls_rpc.c

(limited to 'source4/scripting')

diff --git a/source4/scripting/config.mk b/source4/scripting/config.mk
index 81b7ab68fe..779aef0b45 100644
--- a/source4/scripting/config.mk
+++ b/source4/scripting/config.mk
@@ -1,27 +1,3 @@
-#######################
-# Start LIBRARY SMBCALLS
-[SUBSYSTEM::SMBCALLS]
-OBJ_FILES = \
-		scripting/ejs/smbcalls.o \
-		scripting/ejs/smbcalls_config.o \
-		scripting/ejs/smbcalls_ldb.o \
-		scripting/ejs/smbcalls_nbt.o \
-		scripting/ejs/smbcalls_cli.o \
-		scripting/ejs/mprutil.o
-REQUIRED_SUBSYSTEMS = AUTH EJS LIBBASIC
-# End SUBSYSTEM SMBCALLS
-#######################
-
-#######################
-# Start BINARY SMBSCRIPT
-[BINARY::smbscript]
-OBJ_FILES = \
-		scripting/ejs/smbscript.o
-REQUIRED_SUBSYSTEMS = EJS LIBBASIC SMBCALLS CONFIG LIBSMB RPC LIBCMDLINE
-
-# End BINARY SMBSCRIPT
-#######################
-
 #######################
 # Start LIBRARY swig_tdb
 [LIBRARY::swig_tdb]
diff --git a/source4/scripting/ejs/config.mk b/source4/scripting/ejs/config.mk
new file mode 100644
index 0000000000..d5003d07e7
--- /dev/null
+++ b/source4/scripting/ejs/config.mk
@@ -0,0 +1,23 @@
+#######################
+# Start LIBRARY SMBCALLS
+[SUBSYSTEM::SMBCALLS]
+OBJ_FILES = \
+		scripting/ejs/smbcalls.o \
+		scripting/ejs/smbcalls_config.o \
+		scripting/ejs/smbcalls_ldb.o \
+		scripting/ejs/smbcalls_nbt.o \
+		scripting/ejs/smbcalls_cli.o \
+		scripting/ejs/smbcalls_rpc.o \
+		scripting/ejs/mprutil.o
+REQUIRED_SUBSYSTEMS = AUTH EJS LIBBASIC RPC_NDR_ECHO
+# End SUBSYSTEM SMBCALLS
+#######################
+
+#######################
+# Start BINARY SMBSCRIPT
+[BINARY::smbscript]
+OBJ_FILES = \
+		scripting/ejs/smbscript.o
+REQUIRED_SUBSYSTEMS = EJS LIBBASIC SMBCALLS CONFIG LIBSMB RPC LIBCMDLINE
+# End BINARY SMBSCRIPT
+#######################
diff --git a/source4/scripting/ejs/mprutil.c b/source4/scripting/ejs/mprutil.c
index 2a1036d9a4..cd5ec3b5cd 100644
--- a/source4/scripting/ejs/mprutil.c
+++ b/source4/scripting/ejs/mprutil.c
@@ -213,3 +213,29 @@ struct MprVar mprWERROR(WERROR status)
 
 	return res;
 }
+
+
+/*
+  set a pointer in a existing MprVar
+*/
+void mprSetPtr(struct MprVar *v, const char *propname, void *p)
+{
+	struct MprVar val = mprCreatePtrVar(p, talloc_get_name(p));
+	mprCreateProperty(v, propname, &val);
+}
+
+/*
+  get a pointer from a MprVar
+*/
+void *mprGetPtr(struct MprVar *v, const char *propname)
+{
+	struct MprVar *val;
+	val = mprGetProperty(v, propname, NULL);
+	if (val == NULL) {
+		return NULL;
+	}
+	if (val->type != MPR_TYPE_PTR) {
+		return NULL;
+	}
+	return val->ptr;
+}
diff --git a/source4/scripting/ejs/smbcalls.c b/source4/scripting/ejs/smbcalls.c
index 6444ec63cc..041bd59f1a 100644
--- a/source4/scripting/ejs/smbcalls.c
+++ b/source4/scripting/ejs/smbcalls.c
@@ -192,6 +192,7 @@ void smb_setup_ejs_functions(void)
 	smb_setup_ejs_ldb();
 	smb_setup_ejs_nbt();
 	smb_setup_ejs_cli();
+	smb_setup_ejs_rpc();
 
 	ejsDefineCFunction(-1, "typeof", ejs_typeof, NULL, MPR_VAR_SCRIPT_HANDLE);
 	ejsDefineStringCFunction(-1, "getDomainList", ejs_domain_list, NULL, MPR_VAR_SCRIPT_HANDLE);
diff --git a/source4/scripting/ejs/smbcalls_rpc.c b/source4/scripting/ejs/smbcalls_rpc.c
new file mode 100644
index 0000000000..22aa2b59f8
--- /dev/null
+++ b/source4/scripting/ejs/smbcalls_rpc.c
@@ -0,0 +1,116 @@
+/* 
+   Unix SMB/CIFS implementation.
+
+   provide interfaces to rpc calls from ejs scripts
+
+   Copyright (C) Andrew Tridgell 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 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.
+*/
+
+#include "includes.h"
+#include "lib/ejs/ejs.h"
+#include "librpc/gen_ndr/ndr_echo.h"
+#include "lib/cmdline/popt_common.h"
+
+/*
+  connect to an rpc server
+     example: 
+        var conn = new Object();
+        status = rpc_connect(conn, "ncacn_ip_tcp:localhost", "rpcecho");
+*/
+static int ejs_rpc_connect(MprVarHandle eid, int argc, struct MprVar **argv)
+{
+	const char *binding, *pipe_name;
+	const struct dcerpc_interface_table *iface;
+	NTSTATUS status;
+	struct dcerpc_pipe *p;
+	struct MprVar *conn;
+
+	/* validate arguments */
+	if (argc != 3 ||
+	    argv[0]->type != MPR_TYPE_OBJECT ||
+	    argv[1]->type != MPR_TYPE_STRING ||
+	    argv[2]->type != MPR_TYPE_STRING) {
+		ejsSetErrorMsg(eid, "rpc_connect invalid arguments");
+		return -1;
+	}
+
+	conn       = argv[0];
+	binding    = mprToString(argv[1]);
+	pipe_name  = mprToString(argv[2]);
+
+	iface = idl_iface_by_name(pipe_name);
+	if (iface == NULL) {
+		status = NT_STATUS_OBJECT_NAME_INVALID;
+		goto done;
+	}
+
+	status = dcerpc_pipe_connect(mprMemCtx(), &p, binding, 
+				     iface->uuid, iface->if_version, 
+				     cmdline_credentials, NULL);
+	if (NT_STATUS_IS_OK(status)) {
+		mprSetPtr(conn, "pipe", p);
+	}
+
+done:
+	ejsSetReturnValue(eid, mprNTSTATUS(status));
+	return 0;
+}
+
+
+/*
+  make an rpc call
+     example:
+            status = rpc_call(conn, "echo_AddOne", io);
+*/
+static int ejs_rpc_call(MprVarHandle eid, int argc, struct MprVar **argv)
+{
+	struct dcerpc_pipe *p;
+	struct MprVar *conn, *io;
+	const char *call;
+	NTSTATUS status;
+
+	if (argc != 3 ||
+	    argv[0]->type != MPR_TYPE_OBJECT ||
+	    argv[1]->type != MPR_TYPE_STRING ||
+	    argv[2]->type != MPR_TYPE_OBJECT) {
+		ejsSetErrorMsg(eid, "rpc_call invalid arguments");
+		return -1;
+	}
+	    
+	conn = argv[0];
+	call = mprToString(argv[1]);
+	io   = argv[2];
+
+	p = mprGetPtr(conn, "pipe");
+	if (p == NULL) {
+		ejsSetErrorMsg(eid, "rpc_call invalid pipe");
+		return -1;
+	}
+
+	status = NT_STATUS_NOT_IMPLEMENTED;
+	ejsSetReturnValue(eid, mprNTSTATUS(status));
+	return 0;
+}
+
+/*
+  setup C functions that be called from ejs
+*/
+void smb_setup_ejs_rpc(void)
+{
+	ejsDefineCFunction(-1, "rpc_connect", ejs_rpc_connect, NULL, MPR_VAR_SCRIPT_HANDLE);
+	ejsDefineCFunction(-1, "rpc_call", ejs_rpc_call, NULL, MPR_VAR_SCRIPT_HANDLE);
+}
diff --git a/source4/scripting/ejs/smbscript.c b/source4/scripting/ejs/smbscript.c
index 2795e4f127..aa0fc42c48 100644
--- a/source4/scripting/ejs/smbscript.c
+++ b/source4/scripting/ejs/smbscript.c
@@ -4,6 +4,7 @@
    Standalone client for ejs scripting.
 
    Copyright (C) Tim Potter <tpot@samba.org> 2005
+   Copyright (C) Andrew Tridgell 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
@@ -21,6 +22,7 @@
 */
 
 #include "includes.h"
+#include "lib/cmdline/popt_common.h"
 #include "dynconfig.h"
 #include "lib/ejs/ejs.h"
 
@@ -30,7 +32,7 @@ void ejs_exception(const char *reason)
 	exit(127);
 }
 
- int main(int argc, const char *argv[])
+ int main(int argc, const char **argv)
 {
 	EjsId eid;
 	EjsHandle handle = 0;
@@ -39,28 +41,39 @@ void ejs_exception(const char *reason)
 	size_t script_size;
 	TALLOC_CTX *mem_ctx = talloc_new(NULL);
 	const char **argv_list = NULL;
+	const char *fname;
 	struct MprVar v, *return_var;
 	int exit_status, i;
+	poptContext pc;
+	int opt;
+	struct poptOption long_options[] = {
+		POPT_AUTOHELP
+		POPT_COMMON_SAMBA
+		POPT_COMMON_CREDENTIALS
+		POPT_COMMON_VERSION
+		POPT_TABLEEND
+	};
 
-	if (argc < 2) {
-		fprintf(stderr, "Usage: %s <scriptfile>\n", argv[0]);
-		exit(127);
-	}
+	popt_common_dont_ask();
 
-	setup_logging(argv[0],DEBUG_STDOUT);
+	pc = poptGetContext("smbscript", argc, argv, long_options, 0);
 
-	if (!lp_load(dyn_CONFIGFILE)) {
-		fprintf(stderr, "%s: Can't load %s - run testparm to debug it\n",
-			argv[0], dyn_CONFIGFILE);
-		exit(127);
-	}
+	poptSetOtherOptionHelp(pc, "<script> <args> ...");
 
-	load_interfaces();
+	while((opt = poptGetNextOpt(pc)) != -1) /* noop */ ;
 
 	smbscript_init_subsystems;
 
 	mprSetCtx(mem_ctx);
 
+	argv = poptGetArgs(pc);
+	if (argv == NULL ||
+	    argv[0] == NULL) {
+		poptPrintUsage(pc, stdout, 0);
+		exit(1);
+	}
+	fname = argv[0];
+
 	if (ejsOpen(NULL, NULL, NULL) != 0) {
 		fprintf(stderr, "smbscript: ejsOpen(): unable to initialise "
 			"EJ subsystem\n");
@@ -76,15 +89,15 @@ void ejs_exception(const char *reason)
 	}
 
 	/* setup ARGV[] in the ejs environment */
-	for (i=2;i<argc;i++) {
+	for (i=1;argv[i];i++) {
 		argv_list = str_list_add(argv_list, argv[i]);
 	}
 	v = mprList("ARGV", argv_list);
-	mprSetPropertyValue(&v, "length", mprCreateIntegerVar(argc - 2));
+	mprSetPropertyValue(&v, "length", mprCreateIntegerVar(i-1));
 	mprCreateProperty(ejsGetGlobalObject(eid), "ARGV", &v);
 
 	/* load the script and advance past interpreter line*/
-	script = file_load(argv[1], &script_size);
+	script = file_load(fname, &script_size);
 
 	if ((script_size > 2) && script[0] == '#' && script[1] == '!') {
 		script += 2;
-- 
cgit 


From 9331714787f663a1b46447598a7edf0ebff7d355 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Sat, 2 Jul 2005 11:12:33 +0000
Subject: r8073: a successful rpc call from ejs!

the ejs_echo.c code is the stuff that needs to be auto-generated by
pidl. It only does echo_AddOne so far.

We also need a table for registering these calls. The code is
hard-wired for echo_AddOne for now.
(This used to be commit b1ea58ddc482c373783d16331dd07378010ba39a)
---
 source4/scripting/ejs/config.mk      |  13 +++-
 source4/scripting/ejs/ejs_echo.c     |  45 +++++++++++++
 source4/scripting/ejs/ejsrpc.c       | 118 +++++++++++++++++++++++++++++++++++
 source4/scripting/ejs/ejsrpc.h       |  48 ++++++++++++++
 source4/scripting/ejs/mprutil.c      |   4 +-
 source4/scripting/ejs/smbcalls_rpc.c |  77 ++++++++++++++++++++---
 6 files changed, 292 insertions(+), 13 deletions(-)
 create mode 100644 source4/scripting/ejs/ejs_echo.c
 create mode 100644 source4/scripting/ejs/ejsrpc.c
 create mode 100644 source4/scripting/ejs/ejsrpc.h

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/config.mk b/source4/scripting/ejs/config.mk
index d5003d07e7..0ce7f2df83 100644
--- a/source4/scripting/ejs/config.mk
+++ b/source4/scripting/ejs/config.mk
@@ -1,3 +1,14 @@
+#######################
+# Start LIBRARY EJSRPC
+[SUBSYSTEM::EJSRPC]
+OBJ_FILES = \
+		scripting/ejs/ejsrpc.o \
+		scripting/ejs/ejs_echo.o
+REQUIRED_SUBSYSTEMS = RPC_NDR_ECHO
+NOPROTO = YES
+# End SUBSYSTEM EJSRPC
+#######################
+
 #######################
 # Start LIBRARY SMBCALLS
 [SUBSYSTEM::SMBCALLS]
@@ -9,7 +20,7 @@ OBJ_FILES = \
 		scripting/ejs/smbcalls_cli.o \
 		scripting/ejs/smbcalls_rpc.o \
 		scripting/ejs/mprutil.o
-REQUIRED_SUBSYSTEMS = AUTH EJS LIBBASIC RPC_NDR_ECHO
+REQUIRED_SUBSYSTEMS = AUTH EJS LIBBASIC RPC_NDR_ECHO EJSRPC
 # End SUBSYSTEM SMBCALLS
 #######################
 
diff --git a/source4/scripting/ejs/ejs_echo.c b/source4/scripting/ejs/ejs_echo.c
new file mode 100644
index 0000000000..d24ddfa110
--- /dev/null
+++ b/source4/scripting/ejs/ejs_echo.c
@@ -0,0 +1,45 @@
+/* 
+   Unix SMB/CIFS implementation.
+
+   provide interfaces to rpc calls from ejs scripts
+
+   Copyright (C) Andrew Tridgell 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 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.
+*/
+
+#include "includes.h"
+#include "lib/ejs/ejs.h"
+#include "scripting/ejs/ejsrpc.h"
+#include "librpc/gen_ndr/ndr_echo.h"
+
+/*
+  this should be auto-generated by pidl, but isn't yet
+*/
+NTSTATUS ejs_pull_echo_AddOne(struct ejs_rpc *ejs, 
+			      struct MprVar *v, struct echo_AddOne *r)
+{
+	NDR_CHECK(ejs_pull_uint32(ejs, v, "in.in_data", &r->in.in_data));
+	return NT_STATUS_OK;
+}
+
+
+NTSTATUS ejs_push_echo_AddOne(struct ejs_rpc *ejs, 
+			      struct MprVar *v, 
+			      const struct echo_AddOne *r)
+{
+	NDR_CHECK(ejs_push_uint32(ejs, v, "out.out_data", *r->out.out_data));
+	return NT_STATUS_OK;
+}
diff --git a/source4/scripting/ejs/ejsrpc.c b/source4/scripting/ejs/ejsrpc.c
new file mode 100644
index 0000000000..bc5fdd647f
--- /dev/null
+++ b/source4/scripting/ejs/ejsrpc.c
@@ -0,0 +1,118 @@
+/* 
+   Unix SMB/CIFS implementation.
+
+   provide interfaces to rpc calls from ejs scripts
+
+   Copyright (C) Andrew Tridgell 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 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.
+*/
+
+#include "includes.h"
+#include "lib/ejs/ejs.h"
+#include "scripting/ejs/ejsrpc.h"
+
+NTSTATUS ejs_pull_rpc(struct MprVar *v, void *ptr, ejs_pull_function_t ejs_pull)
+{
+	struct ejs_rpc *ejs = talloc(ptr, struct ejs_rpc);
+	return ejs_pull(ejs, v, ptr);
+}
+
+
+NTSTATUS ejs_push_rpc(struct MprVar *v, const void *ptr, ejs_push_function_t ejs_push)
+{
+	struct ejs_rpc *ejs = talloc(ptr, struct ejs_rpc);
+	return ejs_push(ejs, v, ptr);
+}
+
+
+/*
+  find a mpr component, allowing for sub objects, using the '.' convention
+*/
+static struct MprVar *mprGetVar(struct MprVar *v, const char *name)
+{
+	const char *p = strchr(name, '.');
+	char *objname;
+	struct MprVar *v2;
+	if (p == NULL) {
+		return mprGetProperty(v, name, NULL);
+	}
+	objname = talloc_strndup(mprMemCtx(), name, p-name);
+	if (objname == NULL) {
+		return NULL;
+	}
+	v2 = mprGetProperty(v, objname, NULL);
+	if (v2 == NULL) {
+		talloc_free(objname);
+		return NULL;
+	}
+	v2 = mprGetVar(v2, p+1);
+	talloc_free(objname);
+	return v2;
+}
+
+
+/*
+  set a mpr component, allowing for sub objects, using the '.' convention
+*/
+static NTSTATUS mprSetVar(struct MprVar *v, const char *name, struct MprVar val)
+{
+	const char *p = strchr(name, '.');
+	char *objname;
+	struct MprVar *v2;
+	NTSTATUS status;
+	if (p == NULL) {
+		v2 = mprSetProperty(v, name, &val);
+		if (v2 == NULL) {
+			return NT_STATUS_INVALID_PARAMETER_MIX;
+		}
+		return NT_STATUS_OK;
+	}
+	objname = talloc_strndup(mprMemCtx(), name, p-name);
+	if (objname == NULL) {
+		return NT_STATUS_NO_MEMORY;
+	}
+	v2 = mprGetProperty(v, objname, NULL);
+	if (v2 == NULL) {
+		struct MprVar val2 = mprCreateObjVar(objname, MPR_DEFAULT_HASH_SIZE);
+		v2 = mprCreateProperty(v, objname, &val2);
+	}
+	status = mprSetVar(v2, p+1, val);
+	talloc_free(objname);
+	return status;
+}
+
+
+/*
+  pull a uint32 from a mpr variable to a C element
+*/
+NTSTATUS ejs_pull_uint32(struct ejs_rpc *ejs, 
+			 struct MprVar *v, const char *name, uint32_t *r)
+{
+	struct MprVar *var;
+	var = mprGetVar(v, name);
+	if (var == NULL) {
+		return NT_STATUS_INVALID_PARAMETER_MIX;
+	}
+	*r = mprVarToInteger(var);
+	return NT_STATUS_OK;
+	
+}
+
+NTSTATUS ejs_push_uint32(struct ejs_rpc *ejs, 
+			 struct MprVar *v, const char *name, uint32_t r)
+{
+	return mprSetVar(v, name, mprCreateIntegerVar(r));
+}
diff --git a/source4/scripting/ejs/ejsrpc.h b/source4/scripting/ejs/ejsrpc.h
new file mode 100644
index 0000000000..b2d491d94d
--- /dev/null
+++ b/source4/scripting/ejs/ejsrpc.h
@@ -0,0 +1,48 @@
+/* 
+   Unix SMB/CIFS implementation.
+
+   ejs <-> rpc interface definitions
+
+   Copyright (C) Andrew Tridgell 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 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.
+*/
+
+struct ejs_rpc {
+
+};
+
+typedef NTSTATUS (*ejs_pull_function_t)(struct ejs_rpc *, struct MprVar *, void *);
+typedef NTSTATUS (*ejs_push_function_t)(struct ejs_rpc *, struct MprVar *, const void *);
+
+
+NTSTATUS ejs_pull_rpc(struct MprVar *v, void *ptr, ejs_pull_function_t ejs_pull);
+NTSTATUS ejs_push_rpc(struct MprVar *v, const void *ptr, ejs_push_function_t ejs_push);
+NTSTATUS ejs_pull_uint32(struct ejs_rpc *ejs, 
+			 struct MprVar *v, const char *name, uint32_t *r);
+NTSTATUS ejs_push_uint32(struct ejs_rpc *ejs, 
+			 struct MprVar *v, const char *name, uint32_t r);
+
+
+/* echo calls */
+
+#include "librpc/gen_ndr/ndr_echo.h"
+
+NTSTATUS ejs_pull_echo_AddOne(struct ejs_rpc *ejs, 
+			      struct MprVar *v, struct echo_AddOne *r);
+NTSTATUS ejs_push_echo_AddOne(struct ejs_rpc *ejs, 
+			      struct MprVar *v, 
+			      const struct echo_AddOne *r);
+
diff --git a/source4/scripting/ejs/mprutil.c b/source4/scripting/ejs/mprutil.c
index cd5ec3b5cd..1c640a5d5e 100644
--- a/source4/scripting/ejs/mprutil.c
+++ b/source4/scripting/ejs/mprutil.c
@@ -218,9 +218,9 @@ struct MprVar mprWERROR(WERROR status)
 /*
   set a pointer in a existing MprVar
 */
-void mprSetPtr(struct MprVar *v, const char *propname, void *p)
+void mprSetPtr(struct MprVar *v, const char *propname, const void *p)
 {
-	struct MprVar val = mprCreatePtrVar(p, talloc_get_name(p));
+	struct MprVar val = mprCreatePtrVar(discard_const(p), NULL);
 	mprCreateProperty(v, propname, &val);
 }
 
diff --git a/source4/scripting/ejs/smbcalls_rpc.c b/source4/scripting/ejs/smbcalls_rpc.c
index 22aa2b59f8..ec47da0e9c 100644
--- a/source4/scripting/ejs/smbcalls_rpc.c
+++ b/source4/scripting/ejs/smbcalls_rpc.c
@@ -24,6 +24,7 @@
 #include "lib/ejs/ejs.h"
 #include "librpc/gen_ndr/ndr_echo.h"
 #include "lib/cmdline/popt_common.h"
+#include "scripting/ejs/ejsrpc.h"
 
 /*
   connect to an rpc server
@@ -61,9 +62,13 @@ static int ejs_rpc_connect(MprVarHandle eid, int argc, struct MprVar **argv)
 	status = dcerpc_pipe_connect(mprMemCtx(), &p, binding, 
 				     iface->uuid, iface->if_version, 
 				     cmdline_credentials, NULL);
-	if (NT_STATUS_IS_OK(status)) {
-		mprSetPtr(conn, "pipe", p);
-	}
+	if (!NT_STATUS_IS_OK(status)) goto done;
+
+	/* callers don't allocate ref vars in the ejs interface */
+	p->conn->flags |= DCERPC_NDR_REF_ALLOC;
+
+	mprSetPtr(conn, "pipe", p);
+	mprSetPtr(conn, "iface", iface);
 
 done:
 	ejsSetReturnValue(eid, mprNTSTATUS(status));
@@ -78,10 +83,15 @@ done:
 */
 static int ejs_rpc_call(MprVarHandle eid, int argc, struct MprVar **argv)
 {
-	struct dcerpc_pipe *p;
 	struct MprVar *conn, *io;
-	const char *call;
+	const struct dcerpc_interface_table *iface;
+	struct dcerpc_pipe *p;
+	const char *callname;
+	const struct dcerpc_interface_call *call;
 	NTSTATUS status;
+	void *ptr;
+	struct rpc_request *req;
+	int callnum;
 
 	if (argc != 3 ||
 	    argv[0]->type != MPR_TYPE_OBJECT ||
@@ -91,17 +101,62 @@ static int ejs_rpc_call(MprVarHandle eid, int argc, struct MprVar **argv)
 		return -1;
 	}
 	    
-	conn = argv[0];
-	call = mprToString(argv[1]);
-	io   = argv[2];
+	conn     = argv[0];
+	callname = mprToString(argv[1]);
+	io       = argv[2];
 
+	/* get the pipe info */
 	p = mprGetPtr(conn, "pipe");
-	if (p == NULL) {
+	iface = mprGetPtr(conn, "iface");
+	if (p == NULL || iface == NULL) {
 		ejsSetErrorMsg(eid, "rpc_call invalid pipe");
 		return -1;
 	}
 
-	status = NT_STATUS_NOT_IMPLEMENTED;
+	/* find the call by name */
+	call = dcerpc_iface_find_call(iface, callname);
+	if (call == NULL) {
+		status = NT_STATUS_OBJECT_NAME_INVALID;
+		goto done;
+	}
+	callnum = call - iface->calls;
+
+	/* allocate the C structure */
+	ptr = talloc_zero_size(mprMemCtx(), call->struct_size);
+	if (ptr == NULL) {
+		status = NT_STATUS_NO_MEMORY;
+		goto done;
+	}
+
+	/* convert the mpr object into a C structure */
+	status = ejs_pull_rpc(io, ptr, (ejs_pull_function_t)ejs_pull_echo_AddOne);
+	if (!NT_STATUS_IS_OK(status)) {
+		goto done;
+	}
+
+	/* if requested, print the structure */
+	if (p->conn->flags & DCERPC_DEBUG_PRINT_IN) {
+		ndr_print_function_debug(call->ndr_print, call->name, NDR_IN, ptr);
+	}
+
+	/* make the actual call */
+	req = dcerpc_ndr_request_send(p, NULL, iface, callnum, ptr, ptr);
+	if (req == NULL) {
+		status = NT_STATUS_NO_MEMORY;
+		talloc_free(ptr);
+		goto done;
+	}
+	status = dcerpc_ndr_request_recv(req);
+
+	/* print the 'out' structure, if needed */
+	if (p->conn->flags & DCERPC_DEBUG_PRINT_OUT) {
+		ndr_print_function_debug(call->ndr_print, call->name, NDR_OUT, ptr);
+	}
+
+	status = ejs_push_rpc(io, ptr, (ejs_push_function_t)ejs_push_echo_AddOne);
+
+	talloc_free(ptr);
+done:
 	ejsSetReturnValue(eid, mprNTSTATUS(status));
 	return 0;
 }
@@ -114,3 +169,5 @@ void smb_setup_ejs_rpc(void)
 	ejsDefineCFunction(-1, "rpc_connect", ejs_rpc_connect, NULL, MPR_VAR_SCRIPT_HANDLE);
 	ejsDefineCFunction(-1, "rpc_call", ejs_rpc_call, NULL, MPR_VAR_SCRIPT_HANDLE);
 }
+
+
-- 
cgit 


From 766e8e1acbd4f88b194baac17859706161d4644b Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Mon, 4 Jul 2005 01:31:34 +0000
Subject: r8105: Add ejsrpc push/pull functions for uint16 and uint8. (This
 used to be commit ee27943e215126a2048d1082437ef2597d913371)

---
 source4/scripting/ejs/ejsrpc.c | 44 ++++++++++++++++++++++++++++++++++++++++++
 source4/scripting/ejs/ejsrpc.h | 23 +++++++++++-----------
 2 files changed, 55 insertions(+), 12 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/ejsrpc.c b/source4/scripting/ejs/ejsrpc.c
index bc5fdd647f..990dee123c 100644
--- a/source4/scripting/ejs/ejsrpc.c
+++ b/source4/scripting/ejs/ejsrpc.c
@@ -95,6 +95,50 @@ static NTSTATUS mprSetVar(struct MprVar *v, const char *name, struct MprVar val)
 }
 
 
+/*
+  pull a uint8 from a mpr variable to a C element
+*/
+NTSTATUS ejs_pull_uint8(struct ejs_rpc *ejs, 
+			struct MprVar *v, const char *name, uint8_t *r)
+{
+	struct MprVar *var;
+	var = mprGetVar(v, name);
+	if (var == NULL) {
+		return NT_STATUS_INVALID_PARAMETER_MIX;
+	}
+	*r = mprVarToInteger(var);
+	return NT_STATUS_OK;
+	
+}
+
+NTSTATUS ejs_push_uint8(struct ejs_rpc *ejs, 
+			struct MprVar *v, const char *name, uint8_t r)
+{
+	return mprSetVar(v, name, mprCreateIntegerVar(r));
+}
+
+/*
+  pull a uint16 from a mpr variable to a C element
+*/
+NTSTATUS ejs_pull_uint16(struct ejs_rpc *ejs, 
+			 struct MprVar *v, const char *name, uint16_t *r)
+{
+	struct MprVar *var;
+	var = mprGetVar(v, name);
+	if (var == NULL) {
+		return NT_STATUS_INVALID_PARAMETER_MIX;
+	}
+	*r = mprVarToInteger(var);
+	return NT_STATUS_OK;
+	
+}
+
+NTSTATUS ejs_push_uint16(struct ejs_rpc *ejs, 
+			 struct MprVar *v, const char *name, uint16_t r)
+{
+	return mprSetVar(v, name, mprCreateIntegerVar(r));
+}
+
 /*
   pull a uint32 from a mpr variable to a C element
 */
diff --git a/source4/scripting/ejs/ejsrpc.h b/source4/scripting/ejs/ejsrpc.h
index b2d491d94d..252df9c235 100644
--- a/source4/scripting/ejs/ejsrpc.h
+++ b/source4/scripting/ejs/ejsrpc.h
@@ -30,19 +30,18 @@ typedef NTSTATUS (*ejs_push_function_t)(struct ejs_rpc *, struct MprVar *, const
 
 NTSTATUS ejs_pull_rpc(struct MprVar *v, void *ptr, ejs_pull_function_t ejs_pull);
 NTSTATUS ejs_push_rpc(struct MprVar *v, const void *ptr, ejs_push_function_t ejs_push);
+
+NTSTATUS ejs_pull_uint8(struct ejs_rpc *ejs, 
+			struct MprVar *v, const char *name, uint8_t *r);
+NTSTATUS ejs_push_uint8(struct ejs_rpc *ejs, 
+			struct MprVar *v, const char *name, uint8_t r);
+
+NTSTATUS ejs_pull_uint16(struct ejs_rpc *ejs, 
+			 struct MprVar *v, const char *name, uint16_t *r);
+NTSTATUS ejs_push_uint16(struct ejs_rpc *ejs, 
+			 struct MprVar *v, const char *name, uint16_t r);
+
 NTSTATUS ejs_pull_uint32(struct ejs_rpc *ejs, 
 			 struct MprVar *v, const char *name, uint32_t *r);
 NTSTATUS ejs_push_uint32(struct ejs_rpc *ejs, 
 			 struct MprVar *v, const char *name, uint32_t r);
-
-
-/* echo calls */
-
-#include "librpc/gen_ndr/ndr_echo.h"
-
-NTSTATUS ejs_pull_echo_AddOne(struct ejs_rpc *ejs, 
-			      struct MprVar *v, struct echo_AddOne *r);
-NTSTATUS ejs_push_echo_AddOne(struct ejs_rpc *ejs, 
-			      struct MprVar *v, 
-			      const struct echo_AddOne *r);
-
-- 
cgit 


From 319f19eb906c4bb542d96c9e5ceb4bc495e4e9f8 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Mon, 4 Jul 2005 04:20:34 +0000
Subject: r8114: fixed the build after tpots ejs commit .... (This used to be
 commit 8649945cf9932a169190727f99e352ad68b0589f)

---
 source4/scripting/ejs/ejsrpc.h | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/ejsrpc.h b/source4/scripting/ejs/ejsrpc.h
index 252df9c235..4ce1858474 100644
--- a/source4/scripting/ejs/ejsrpc.h
+++ b/source4/scripting/ejs/ejsrpc.h
@@ -45,3 +45,14 @@ NTSTATUS ejs_pull_uint32(struct ejs_rpc *ejs,
 			 struct MprVar *v, const char *name, uint32_t *r);
 NTSTATUS ejs_push_uint32(struct ejs_rpc *ejs, 
 			 struct MprVar *v, const char *name, uint32_t r);
+
+/* echo calls - PLEASE LEAVE THESE HERE TILL PIDL KNOWS HOW TO
+   GENERATE THEM */
+
+#include "librpc/gen_ndr/ndr_echo.h"
+
+NTSTATUS ejs_pull_echo_AddOne(struct ejs_rpc *ejs, 
+			      struct MprVar *v, struct echo_AddOne *r);
+NTSTATUS ejs_push_echo_AddOne(struct ejs_rpc *ejs, 
+			      struct MprVar *v, 
+			      const struct echo_AddOne *r);
-- 
cgit 


From 7c3fc18315645f2f7a31732c0b1505a2bef29cb7 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Thu, 7 Jul 2005 06:25:04 +0000
Subject: r8192: updated the glue code for the generated ejs functions from
 pidl

only handles a small subset of all IDL files so far
(This used to be commit 14b6436cc51f599572932bef72c49e0da4888073)
---
 source4/scripting/ejs/config.mk       |   7 +-
 source4/scripting/ejs/ejsrpc.c        | 121 +++++++++++++++++++++++++++++++++-
 source4/scripting/ejs/ejsrpc.h        |  32 +++++----
 source4/scripting/ejs/smbcalls_irpc.c |   2 +-
 source4/scripting/ejs/smbcalls_rpc.c  |  23 ++++---
 5 files changed, 155 insertions(+), 30 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/config.mk b/source4/scripting/ejs/config.mk
index 0ce7f2df83..0c0caa9ef0 100644
--- a/source4/scripting/ejs/config.mk
+++ b/source4/scripting/ejs/config.mk
@@ -2,9 +2,8 @@
 # Start LIBRARY EJSRPC
 [SUBSYSTEM::EJSRPC]
 OBJ_FILES = \
-		scripting/ejs/ejsrpc.o \
-		scripting/ejs/ejs_echo.o
-REQUIRED_SUBSYSTEMS = RPC_NDR_ECHO
+		scripting/ejs/ejsrpc.o
+REQUIRED_SUBSYSTEMS = RPC_EJS_ECHO
 NOPROTO = YES
 # End SUBSYSTEM EJSRPC
 #######################
@@ -20,7 +19,7 @@ OBJ_FILES = \
 		scripting/ejs/smbcalls_cli.o \
 		scripting/ejs/smbcalls_rpc.o \
 		scripting/ejs/mprutil.o
-REQUIRED_SUBSYSTEMS = AUTH EJS LIBBASIC RPC_NDR_ECHO EJSRPC
+REQUIRED_SUBSYSTEMS = AUTH EJS LIBBASIC EJSRPC
 # End SUBSYSTEM SMBCALLS
 #######################
 
diff --git a/source4/scripting/ejs/ejsrpc.c b/source4/scripting/ejs/ejsrpc.c
index 990dee123c..242d748b36 100644
--- a/source4/scripting/ejs/ejsrpc.c
+++ b/source4/scripting/ejs/ejsrpc.c
@@ -95,6 +95,32 @@ static NTSTATUS mprSetVar(struct MprVar *v, const char *name, struct MprVar val)
 }
 
 
+/*
+  start the ejs pull process for a structure
+*/
+NTSTATUS ejs_pull_struct_start(struct ejs_rpc *ejs, struct MprVar **v, const char *name)
+{
+	*v = mprGetProperty(*v, name, NULL);
+	if (*v == NULL) {
+		return NT_STATUS_INVALID_PARAMETER;
+	}
+	return NT_STATUS_OK;
+}
+
+
+/*
+  start the ejs push process for a structure
+*/
+NTSTATUS ejs_push_struct_start(struct ejs_rpc *ejs, struct MprVar **v, const char *name)
+{
+	struct MprVar s = mprCreateObjVar(name, MPR_DEFAULT_HASH_SIZE);
+	*v = mprSetProperty(*v, name, &s);
+	if (*v == NULL) {
+		return NT_STATUS_INVALID_PARAMETER;
+	}
+	return NT_STATUS_OK;
+}
+
 /*
   pull a uint8 from a mpr variable to a C element
 */
@@ -152,7 +178,6 @@ NTSTATUS ejs_pull_uint32(struct ejs_rpc *ejs,
 	}
 	*r = mprVarToInteger(var);
 	return NT_STATUS_OK;
-	
 }
 
 NTSTATUS ejs_push_uint32(struct ejs_rpc *ejs, 
@@ -160,3 +185,97 @@ NTSTATUS ejs_push_uint32(struct ejs_rpc *ejs,
 {
 	return mprSetVar(v, name, mprCreateIntegerVar(r));
 }
+
+NTSTATUS ejs_pull_hyper(struct ejs_rpc *ejs, 
+			struct MprVar *v, const char *name, uint64_t *r)
+{
+	struct MprVar *var;
+	var = mprGetVar(v, name);
+	if (var == NULL) {
+		return NT_STATUS_INVALID_PARAMETER_MIX;
+	}
+	*r = mprVarToInteger(var);
+	return NT_STATUS_OK;
+}
+
+NTSTATUS ejs_push_hyper(struct ejs_rpc *ejs, 
+			struct MprVar *v, const char *name, uint64_t r)
+{
+	return mprSetVar(v, name, mprCreateIntegerVar(r));
+}
+
+
+/*
+  pull a enum from a mpr variable to a C element
+  a enum is just treating as an unsigned integer at this level
+*/
+NTSTATUS ejs_pull_enum(struct ejs_rpc *ejs, 
+		       struct MprVar *v, const char *name, unsigned *r)
+{
+	struct MprVar *var;
+	var = mprGetVar(v, name);
+	if (var == NULL) {
+		return NT_STATUS_INVALID_PARAMETER_MIX;
+	}
+	*r = mprVarToInteger(var);
+	return NT_STATUS_OK;
+	
+}
+
+NTSTATUS ejs_push_enum(struct ejs_rpc *ejs, 
+		       struct MprVar *v, const char *name, unsigned r)
+{
+	return mprSetVar(v, name, mprCreateIntegerVar(r));
+}
+
+
+/*
+  pull an array of elements
+*/
+NTSTATUS ejs_pull_array(struct ejs_rpc *ejs, 
+			struct MprVar *v, const char *name, uint32_t length,
+			size_t elsize, void **r, ejs_pull_t ejs_pull)
+{
+	int i;
+	char *data;
+
+	NDR_CHECK(ejs_pull_struct_start(ejs, &v, name));
+
+	(*r) = talloc_array_size(ejs, elsize, length);
+	NT_STATUS_HAVE_NO_MEMORY(*r);
+
+	data = *r;
+
+	for (i=0;i<length;i++) {
+		char *id = talloc_asprintf(ejs, "%u", i);
+		NT_STATUS_HAVE_NO_MEMORY(id);
+		NDR_CHECK(ejs_pull(ejs, v, id, (i*elsize)+data));
+		talloc_free(id);
+	}
+	return mprSetVar(v, "length", mprCreateIntegerVar(i));
+}
+
+
+/*
+  push an array of elements
+*/
+NTSTATUS ejs_push_array(struct ejs_rpc *ejs, 
+			struct MprVar *v, const char *name, uint32_t length,
+			size_t elsize, void *r, ejs_push_t ejs_push)
+{
+	int i;
+	char *data;
+
+	NDR_CHECK(ejs_push_struct_start(ejs, &v, name));
+
+	data = r;
+
+	for (i=0;i<length;i++) {
+		char *id = talloc_asprintf(ejs, "%u", i);
+		NT_STATUS_HAVE_NO_MEMORY(id);
+		NDR_CHECK(ejs_push(ejs, v, id, (i*elsize)+data));
+		talloc_free(id);
+	}
+	return NT_STATUS_OK;
+}
+			
diff --git a/source4/scripting/ejs/ejsrpc.h b/source4/scripting/ejs/ejsrpc.h
index 4ce1858474..8ddd6a394e 100644
--- a/source4/scripting/ejs/ejsrpc.h
+++ b/source4/scripting/ejs/ejsrpc.h
@@ -24,35 +24,43 @@ struct ejs_rpc {
 
 };
 
+typedef NTSTATUS (*ejs_pull_t)(struct ejs_rpc *, struct MprVar *, const char *, void *);
+typedef NTSTATUS (*ejs_push_t)(struct ejs_rpc *, struct MprVar *, const char *, const void *);
 typedef NTSTATUS (*ejs_pull_function_t)(struct ejs_rpc *, struct MprVar *, void *);
 typedef NTSTATUS (*ejs_push_function_t)(struct ejs_rpc *, struct MprVar *, const void *);
 
+int ejs_rpc_call(int eid, int argc, struct MprVar **argv, const char *callname,
+		 ejs_pull_function_t ejs_pull, ejs_push_function_t ejs_push);
 
 NTSTATUS ejs_pull_rpc(struct MprVar *v, void *ptr, ejs_pull_function_t ejs_pull);
 NTSTATUS ejs_push_rpc(struct MprVar *v, const void *ptr, ejs_push_function_t ejs_push);
+NTSTATUS ejs_pull_struct_start(struct ejs_rpc *ejs, struct MprVar **v, const char *name);
+NTSTATUS ejs_push_struct_start(struct ejs_rpc *ejs, struct MprVar **v, const char *name);
 
 NTSTATUS ejs_pull_uint8(struct ejs_rpc *ejs, 
 			struct MprVar *v, const char *name, uint8_t *r);
 NTSTATUS ejs_push_uint8(struct ejs_rpc *ejs, 
 			struct MprVar *v, const char *name, uint8_t r);
-
 NTSTATUS ejs_pull_uint16(struct ejs_rpc *ejs, 
 			 struct MprVar *v, const char *name, uint16_t *r);
 NTSTATUS ejs_push_uint16(struct ejs_rpc *ejs, 
 			 struct MprVar *v, const char *name, uint16_t r);
-
 NTSTATUS ejs_pull_uint32(struct ejs_rpc *ejs, 
 			 struct MprVar *v, const char *name, uint32_t *r);
 NTSTATUS ejs_push_uint32(struct ejs_rpc *ejs, 
 			 struct MprVar *v, const char *name, uint32_t r);
+NTSTATUS ejs_pull_hyper(struct ejs_rpc *ejs, 
+			struct MprVar *v, const char *name, uint64_t *r);
+NTSTATUS ejs_push_hyper(struct ejs_rpc *ejs, 
+			struct MprVar *v, const char *name, uint64_t r);
+NTSTATUS ejs_pull_enum(struct ejs_rpc *ejs, 
+		       struct MprVar *v, const char *name, unsigned *r);
+NTSTATUS ejs_push_enum(struct ejs_rpc *ejs, 
+		       struct MprVar *v, const char *name, unsigned r);
+NTSTATUS ejs_pull_array(struct ejs_rpc *ejs, 
+			struct MprVar *v, const char *name, uint32_t length,
+			size_t elsize, void **r, ejs_pull_t ejs_pull);
+NTSTATUS ejs_push_array(struct ejs_rpc *ejs, 
+			struct MprVar *v, const char *name, uint32_t length,
+			size_t elsize, void *r, ejs_push_t ejs_push);
 
-/* echo calls - PLEASE LEAVE THESE HERE TILL PIDL KNOWS HOW TO
-   GENERATE THEM */
-
-#include "librpc/gen_ndr/ndr_echo.h"
-
-NTSTATUS ejs_pull_echo_AddOne(struct ejs_rpc *ejs, 
-			      struct MprVar *v, struct echo_AddOne *r);
-NTSTATUS ejs_push_echo_AddOne(struct ejs_rpc *ejs, 
-			      struct MprVar *v, 
-			      const struct echo_AddOne *r);
diff --git a/source4/scripting/ejs/smbcalls_irpc.c b/source4/scripting/ejs/smbcalls_irpc.c
index 9b0efc69e4..4fd4671732 100644
--- a/source4/scripting/ejs/smbcalls_irpc.c
+++ b/source4/scripting/ejs/smbcalls_irpc.c
@@ -187,7 +187,7 @@ static NTSTATUS ejs_push_nbtd_info(struct ndr_ejs *ndr, union nbtd_info *r,
 	return NT_STATUS_OK;
 }
 
-static NTSTATUS ndr_push_nbtd_information(struct ndr_push *ndr, 
+static NTSTATUS ndr_push_nbtd_information(struct ndr_ejs *ndr, 
 					  struct nbtd_information *r, struct MprVar *v)
 {
 	NDR_CHECK(ejs_push_set_switch_value(ndr, &r->out.info, r->in.level));
diff --git a/source4/scripting/ejs/smbcalls_rpc.c b/source4/scripting/ejs/smbcalls_rpc.c
index ec47da0e9c..631f1c3a37 100644
--- a/source4/scripting/ejs/smbcalls_rpc.c
+++ b/source4/scripting/ejs/smbcalls_rpc.c
@@ -81,29 +81,28 @@ done:
      example:
             status = rpc_call(conn, "echo_AddOne", io);
 */
-static int ejs_rpc_call(MprVarHandle eid, int argc, struct MprVar **argv)
+ int ejs_rpc_call(int eid, int argc, struct MprVar **argv,
+		  const char *callname,
+		  ejs_pull_function_t ejs_pull, ejs_push_function_t ejs_push)
 {
 	struct MprVar *conn, *io;
 	const struct dcerpc_interface_table *iface;
 	struct dcerpc_pipe *p;
-	const char *callname;
 	const struct dcerpc_interface_call *call;
 	NTSTATUS status;
 	void *ptr;
 	struct rpc_request *req;
 	int callnum;
 
-	if (argc != 3 ||
+	if (argc != 2 ||
 	    argv[0]->type != MPR_TYPE_OBJECT ||
-	    argv[1]->type != MPR_TYPE_STRING ||
-	    argv[2]->type != MPR_TYPE_OBJECT) {
+	    argv[1]->type != MPR_TYPE_OBJECT) {
 		ejsSetErrorMsg(eid, "rpc_call invalid arguments");
 		return -1;
 	}
 	    
 	conn     = argv[0];
-	callname = mprToString(argv[1]);
-	io       = argv[2];
+	io       = argv[1];
 
 	/* get the pipe info */
 	p = mprGetPtr(conn, "pipe");
@@ -129,7 +128,7 @@ static int ejs_rpc_call(MprVarHandle eid, int argc, struct MprVar **argv)
 	}
 
 	/* convert the mpr object into a C structure */
-	status = ejs_pull_rpc(io, ptr, (ejs_pull_function_t)ejs_pull_echo_AddOne);
+	status = ejs_pull_rpc(io, ptr, ejs_pull);
 	if (!NT_STATUS_IS_OK(status)) {
 		goto done;
 	}
@@ -153,7 +152,7 @@ static int ejs_rpc_call(MprVarHandle eid, int argc, struct MprVar **argv)
 		ndr_print_function_debug(call->ndr_print, call->name, NDR_OUT, ptr);
 	}
 
-	status = ejs_push_rpc(io, ptr, (ejs_push_function_t)ejs_push_echo_AddOne);
+	status = ejs_push_rpc(io, ptr, ejs_push);
 
 	talloc_free(ptr);
 done:
@@ -161,13 +160,13 @@ done:
 	return 0;
 }
 
+
 /*
   setup C functions that be called from ejs
 */
 void smb_setup_ejs_rpc(void)
 {
+	void setup_ejs_rpcecho(void);
 	ejsDefineCFunction(-1, "rpc_connect", ejs_rpc_connect, NULL, MPR_VAR_SCRIPT_HANDLE);
-	ejsDefineCFunction(-1, "rpc_call", ejs_rpc_call, NULL, MPR_VAR_SCRIPT_HANDLE);
+	setup_ejs_rpcecho();
 }
-
-
-- 
cgit 


From 3605d2d7abba2bf5476b5b8d2c22af90cfbc2a6c Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Thu, 7 Jul 2005 06:27:23 +0000
Subject: r8194: delete the old hand-written ejs code for echo_AddOne. This is
 now autogenerated by pidl (This used to be commit
 697b67ed572a458494fbf9172a341f6b621c84a3)

---
 source4/scripting/ejs/ejs_echo.c | 45 ----------------------------------------
 1 file changed, 45 deletions(-)
 delete mode 100644 source4/scripting/ejs/ejs_echo.c

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/ejs_echo.c b/source4/scripting/ejs/ejs_echo.c
deleted file mode 100644
index d24ddfa110..0000000000
--- a/source4/scripting/ejs/ejs_echo.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/* 
-   Unix SMB/CIFS implementation.
-
-   provide interfaces to rpc calls from ejs scripts
-
-   Copyright (C) Andrew Tridgell 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 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.
-*/
-
-#include "includes.h"
-#include "lib/ejs/ejs.h"
-#include "scripting/ejs/ejsrpc.h"
-#include "librpc/gen_ndr/ndr_echo.h"
-
-/*
-  this should be auto-generated by pidl, but isn't yet
-*/
-NTSTATUS ejs_pull_echo_AddOne(struct ejs_rpc *ejs, 
-			      struct MprVar *v, struct echo_AddOne *r)
-{
-	NDR_CHECK(ejs_pull_uint32(ejs, v, "in.in_data", &r->in.in_data));
-	return NT_STATUS_OK;
-}
-
-
-NTSTATUS ejs_push_echo_AddOne(struct ejs_rpc *ejs, 
-			      struct MprVar *v, 
-			      const struct echo_AddOne *r)
-{
-	NDR_CHECK(ejs_push_uint32(ejs, v, "out.out_data", *r->out.out_data));
-	return NT_STATUS_OK;
-}
-- 
cgit 


From 74ac1686d5d0fcadbdacc8ff1bf9ab200e748737 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Thu, 7 Jul 2005 07:42:47 +0000
Subject: r8195: - fixed handling of simple arrays. To keep the logic simple, I
 moved to making all push   functions taking a constant pointer to the type
 rather than having a different calling   convention for scalars and pointers

- fixed the setting of the 'length' element in arrays
(This used to be commit 431b4b6888434daa8d1306f0e98bae7b2fe0fddd)
---
 source4/scripting/ejs/ejsrpc.c | 24 ++++++++++++------------
 source4/scripting/ejs/ejsrpc.h | 10 +++++-----
 2 files changed, 17 insertions(+), 17 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/ejsrpc.c b/source4/scripting/ejs/ejsrpc.c
index 242d748b36..4984518c7f 100644
--- a/source4/scripting/ejs/ejsrpc.c
+++ b/source4/scripting/ejs/ejsrpc.c
@@ -138,9 +138,9 @@ NTSTATUS ejs_pull_uint8(struct ejs_rpc *ejs,
 }
 
 NTSTATUS ejs_push_uint8(struct ejs_rpc *ejs, 
-			struct MprVar *v, const char *name, uint8_t r)
+			struct MprVar *v, const char *name, const uint8_t *r)
 {
-	return mprSetVar(v, name, mprCreateIntegerVar(r));
+	return mprSetVar(v, name, mprCreateIntegerVar(*r));
 }
 
 /*
@@ -160,9 +160,9 @@ NTSTATUS ejs_pull_uint16(struct ejs_rpc *ejs,
 }
 
 NTSTATUS ejs_push_uint16(struct ejs_rpc *ejs, 
-			 struct MprVar *v, const char *name, uint16_t r)
+			 struct MprVar *v, const char *name, const uint16_t *r)
 {
-	return mprSetVar(v, name, mprCreateIntegerVar(r));
+	return mprSetVar(v, name, mprCreateIntegerVar(*r));
 }
 
 /*
@@ -181,9 +181,9 @@ NTSTATUS ejs_pull_uint32(struct ejs_rpc *ejs,
 }
 
 NTSTATUS ejs_push_uint32(struct ejs_rpc *ejs, 
-			 struct MprVar *v, const char *name, uint32_t r)
+			 struct MprVar *v, const char *name, const uint32_t *r)
 {
-	return mprSetVar(v, name, mprCreateIntegerVar(r));
+	return mprSetVar(v, name, mprCreateIntegerVar(*r));
 }
 
 NTSTATUS ejs_pull_hyper(struct ejs_rpc *ejs, 
@@ -199,9 +199,9 @@ NTSTATUS ejs_pull_hyper(struct ejs_rpc *ejs,
 }
 
 NTSTATUS ejs_push_hyper(struct ejs_rpc *ejs, 
-			struct MprVar *v, const char *name, uint64_t r)
+			struct MprVar *v, const char *name, const uint64_t *r)
 {
-	return mprSetVar(v, name, mprCreateIntegerVar(r));
+	return mprSetVar(v, name, mprCreateIntegerVar(*r));
 }
 
 
@@ -223,9 +223,9 @@ NTSTATUS ejs_pull_enum(struct ejs_rpc *ejs,
 }
 
 NTSTATUS ejs_push_enum(struct ejs_rpc *ejs, 
-		       struct MprVar *v, const char *name, unsigned r)
+		       struct MprVar *v, const char *name, const unsigned *r)
 {
-	return mprSetVar(v, name, mprCreateIntegerVar(r));
+	return mprSetVar(v, name, mprCreateIntegerVar(*r));
 }
 
 
@@ -252,7 +252,7 @@ NTSTATUS ejs_pull_array(struct ejs_rpc *ejs,
 		NDR_CHECK(ejs_pull(ejs, v, id, (i*elsize)+data));
 		talloc_free(id);
 	}
-	return mprSetVar(v, "length", mprCreateIntegerVar(i));
+	return NT_STATUS_OK;
 }
 
 
@@ -276,6 +276,6 @@ NTSTATUS ejs_push_array(struct ejs_rpc *ejs,
 		NDR_CHECK(ejs_push(ejs, v, id, (i*elsize)+data));
 		talloc_free(id);
 	}
-	return NT_STATUS_OK;
+	return mprSetVar(v, "length", mprCreateIntegerVar(i));
 }
 			
diff --git a/source4/scripting/ejs/ejsrpc.h b/source4/scripting/ejs/ejsrpc.h
index 8ddd6a394e..1febb90ad6 100644
--- a/source4/scripting/ejs/ejsrpc.h
+++ b/source4/scripting/ejs/ejsrpc.h
@@ -40,23 +40,23 @@ NTSTATUS ejs_push_struct_start(struct ejs_rpc *ejs, struct MprVar **v, const cha
 NTSTATUS ejs_pull_uint8(struct ejs_rpc *ejs, 
 			struct MprVar *v, const char *name, uint8_t *r);
 NTSTATUS ejs_push_uint8(struct ejs_rpc *ejs, 
-			struct MprVar *v, const char *name, uint8_t r);
+			struct MprVar *v, const char *name, const uint8_t *r);
 NTSTATUS ejs_pull_uint16(struct ejs_rpc *ejs, 
 			 struct MprVar *v, const char *name, uint16_t *r);
 NTSTATUS ejs_push_uint16(struct ejs_rpc *ejs, 
-			 struct MprVar *v, const char *name, uint16_t r);
+			 struct MprVar *v, const char *name, const uint16_t *r);
 NTSTATUS ejs_pull_uint32(struct ejs_rpc *ejs, 
 			 struct MprVar *v, const char *name, uint32_t *r);
 NTSTATUS ejs_push_uint32(struct ejs_rpc *ejs, 
-			 struct MprVar *v, const char *name, uint32_t r);
+			 struct MprVar *v, const char *name, const uint32_t *r);
 NTSTATUS ejs_pull_hyper(struct ejs_rpc *ejs, 
 			struct MprVar *v, const char *name, uint64_t *r);
 NTSTATUS ejs_push_hyper(struct ejs_rpc *ejs, 
-			struct MprVar *v, const char *name, uint64_t r);
+			struct MprVar *v, const char *name, const uint64_t *r);
 NTSTATUS ejs_pull_enum(struct ejs_rpc *ejs, 
 		       struct MprVar *v, const char *name, unsigned *r);
 NTSTATUS ejs_push_enum(struct ejs_rpc *ejs, 
-		       struct MprVar *v, const char *name, unsigned r);
+		       struct MprVar *v, const char *name, const unsigned *r);
 NTSTATUS ejs_pull_array(struct ejs_rpc *ejs, 
 			struct MprVar *v, const char *name, uint32_t length,
 			size_t elsize, void **r, ejs_pull_t ejs_pull);
-- 
cgit 


From f44b9ae3e6e7d37020d4e644862772428b3a68ae Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Thu, 7 Jul 2005 08:20:57 +0000
Subject: r8198: - handled push/pull of simple strings in ejs

- improved the error handling, so the ejs wrappers don't just ignore a type they
  don't handle, instead an exception is issued saying what isn't handled
(This used to be commit a77c2aa8606ad668f6a513211a1d9e7d6193d741)
---
 source4/scripting/ejs/ejsrpc.c       | 47 +++++++++++++++++++++++++++++++++---
 source4/scripting/ejs/ejsrpc.h       | 14 ++++++++---
 source4/scripting/ejs/smbcalls_rpc.c |  4 +--
 3 files changed, 56 insertions(+), 9 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/ejsrpc.c b/source4/scripting/ejs/ejsrpc.c
index 4984518c7f..75f748f146 100644
--- a/source4/scripting/ejs/ejsrpc.c
+++ b/source4/scripting/ejs/ejsrpc.c
@@ -24,20 +24,37 @@
 #include "lib/ejs/ejs.h"
 #include "scripting/ejs/ejsrpc.h"
 
-NTSTATUS ejs_pull_rpc(struct MprVar *v, void *ptr, ejs_pull_function_t ejs_pull)
+NTSTATUS ejs_pull_rpc(int eid, const char *callname, 
+		      struct MprVar *v, void *ptr, ejs_pull_function_t ejs_pull)
 {
-	struct ejs_rpc *ejs = talloc(ptr, struct ejs_rpc);
+	struct ejs_rpc *ejs = talloc(ptr, struct ejs_rpc);	
+	NT_STATUS_HAVE_NO_MEMORY(ejs);
+	ejs->eid = eid;
+	ejs->callname = callname;
 	return ejs_pull(ejs, v, ptr);
 }
 
 
-NTSTATUS ejs_push_rpc(struct MprVar *v, const void *ptr, ejs_push_function_t ejs_push)
+NTSTATUS ejs_push_rpc(int eid, const char *callname, 
+		      struct MprVar *v, const void *ptr, ejs_push_function_t ejs_push)
 {
 	struct ejs_rpc *ejs = talloc(ptr, struct ejs_rpc);
+	NT_STATUS_HAVE_NO_MEMORY(ejs);
+	ejs->eid = eid;
+	ejs->callname = callname;
 	return ejs_push(ejs, v, ptr);
 }
 
 
+/*
+  panic in the ejs wrapper code
+ */
+NTSTATUS ejs_panic(struct ejs_rpc *ejs, const char *why)
+{
+	ejsSetErrorMsg(ejs->eid, "rpc_call '%s' failed - %s", ejs->callname, why);
+	return NT_STATUS_INTERNAL_ERROR;
+}
+
 /*
   find a mpr component, allowing for sub objects, using the '.' convention
 */
@@ -279,3 +296,27 @@ NTSTATUS ejs_push_array(struct ejs_rpc *ejs,
 	return mprSetVar(v, "length", mprCreateIntegerVar(i));
 }
 			
+
+/*
+  pull a string
+*/
+NTSTATUS ejs_pull_string(struct ejs_rpc *ejs, 
+			 struct MprVar *v, const char *name, const char **s)
+{
+	struct MprVar *var;
+	var = mprGetVar(v, name);
+	if (var == NULL) {
+		return NT_STATUS_INVALID_PARAMETER_MIX;
+	}
+	*s = mprToString(var);
+	return NT_STATUS_OK;
+}
+
+/*
+  push a string
+*/
+NTSTATUS ejs_push_string(struct ejs_rpc *ejs, 
+			 struct MprVar *v, const char *name, const char *s)
+{
+	return mprSetVar(v, name, mprCreateStringVar(s, True));
+}
diff --git a/source4/scripting/ejs/ejsrpc.h b/source4/scripting/ejs/ejsrpc.h
index 1febb90ad6..5fb6ace863 100644
--- a/source4/scripting/ejs/ejsrpc.h
+++ b/source4/scripting/ejs/ejsrpc.h
@@ -21,7 +21,8 @@
 */
 
 struct ejs_rpc {
-
+	int eid;
+	const char *callname;
 };
 
 typedef NTSTATUS (*ejs_pull_t)(struct ejs_rpc *, struct MprVar *, const char *, void *);
@@ -29,11 +30,13 @@ typedef NTSTATUS (*ejs_push_t)(struct ejs_rpc *, struct MprVar *, const char *,
 typedef NTSTATUS (*ejs_pull_function_t)(struct ejs_rpc *, struct MprVar *, void *);
 typedef NTSTATUS (*ejs_push_function_t)(struct ejs_rpc *, struct MprVar *, const void *);
 
+NTSTATUS ejs_panic(struct ejs_rpc *ejs, const char *why);
+
 int ejs_rpc_call(int eid, int argc, struct MprVar **argv, const char *callname,
 		 ejs_pull_function_t ejs_pull, ejs_push_function_t ejs_push);
 
-NTSTATUS ejs_pull_rpc(struct MprVar *v, void *ptr, ejs_pull_function_t ejs_pull);
-NTSTATUS ejs_push_rpc(struct MprVar *v, const void *ptr, ejs_push_function_t ejs_push);
+NTSTATUS ejs_pull_rpc(int eid, const char *callname, struct MprVar *v, void *ptr, ejs_pull_function_t ejs_pull);
+NTSTATUS ejs_push_rpc(int eid, const char *callname, struct MprVar *v, const void *ptr, ejs_push_function_t ejs_push);
 NTSTATUS ejs_pull_struct_start(struct ejs_rpc *ejs, struct MprVar **v, const char *name);
 NTSTATUS ejs_push_struct_start(struct ejs_rpc *ejs, struct MprVar **v, const char *name);
 
@@ -63,4 +66,7 @@ NTSTATUS ejs_pull_array(struct ejs_rpc *ejs,
 NTSTATUS ejs_push_array(struct ejs_rpc *ejs, 
 			struct MprVar *v, const char *name, uint32_t length,
 			size_t elsize, void *r, ejs_push_t ejs_push);
-
+NTSTATUS ejs_pull_string(struct ejs_rpc *ejs, 
+			 struct MprVar *v, const char *name, const char **s);
+NTSTATUS ejs_push_string(struct ejs_rpc *ejs, 
+			 struct MprVar *v, const char *name, const char *s);
diff --git a/source4/scripting/ejs/smbcalls_rpc.c b/source4/scripting/ejs/smbcalls_rpc.c
index 631f1c3a37..00675165ea 100644
--- a/source4/scripting/ejs/smbcalls_rpc.c
+++ b/source4/scripting/ejs/smbcalls_rpc.c
@@ -128,7 +128,7 @@ done:
 	}
 
 	/* convert the mpr object into a C structure */
-	status = ejs_pull_rpc(io, ptr, ejs_pull);
+	status = ejs_pull_rpc(eid, callname, io, ptr, ejs_pull);
 	if (!NT_STATUS_IS_OK(status)) {
 		goto done;
 	}
@@ -152,7 +152,7 @@ done:
 		ndr_print_function_debug(call->ndr_print, call->name, NDR_OUT, ptr);
 	}
 
-	status = ejs_push_rpc(io, ptr, ejs_push);
+	status = ejs_push_rpc(eid, callname, io, ptr, ejs_push);
 
 	talloc_free(ptr);
 done:
-- 
cgit 


From 65ddc6e9b93f5e0527febe1c6bb9dd7f9355530e Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Thu, 7 Jul 2005 08:32:35 +0000
Subject: r8200: - added stub functions for union pull/push

- kill the js interpreter with an exception on internal errors
(This used to be commit 5f062d71481a0aa2d8c89099abb2d171b789879e)
---
 source4/scripting/ejs/smbcalls_rpc.c | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_rpc.c b/source4/scripting/ejs/smbcalls_rpc.c
index 00675165ea..6ec3e29e50 100644
--- a/source4/scripting/ejs/smbcalls_rpc.c
+++ b/source4/scripting/ejs/smbcalls_rpc.c
@@ -157,6 +157,9 @@ done:
 	talloc_free(ptr);
 done:
 	ejsSetReturnValue(eid, mprNTSTATUS(status));
+	if (NT_STATUS_EQUAL(status, NT_STATUS_INTERNAL_ERROR)) {
+		return -1;
+	}
 	return 0;
 }
 
-- 
cgit 


From ceb277ced9ccd13936384e94c567b37c5db2c46e Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Fri, 8 Jul 2005 03:10:30 +0000
Subject: r8213: I've started to understand the LEVELS stuff in pidl much
 better now, and have re-coded the push side of the ejs generator to use it
 properly. It ends up being very neat and small, and should handle much more
 complex structures (like arrays of pointers to unions etc).

Also added push side support for unions. This should get more of the
echo pipe working via ejs.
(This used to be commit 2e306be1d83f722c259c4a63233e77d8bb1d5a72)
---
 source4/scripting/ejs/ejsrpc.c | 33 ++++++++-------------------------
 source4/scripting/ejs/ejsrpc.h |  9 +++++----
 2 files changed, 13 insertions(+), 29 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/ejsrpc.c b/source4/scripting/ejs/ejsrpc.c
index 75f748f146..965fd8d447 100644
--- a/source4/scripting/ejs/ejsrpc.c
+++ b/source4/scripting/ejs/ejsrpc.c
@@ -45,6 +45,13 @@ NTSTATUS ejs_push_rpc(int eid, const char *callname,
 	return ejs_push(ejs, v, ptr);
 }
 
+/*
+  set the switch var to be used by the next union switch
+*/
+void ejs_set_switch(struct ejs_rpc *ejs, uint32_t switch_var)
+{
+	ejs->switch_var = switch_var;
+}
 
 /*
   panic in the ejs wrapper code
@@ -273,35 +280,11 @@ NTSTATUS ejs_pull_array(struct ejs_rpc *ejs,
 }
 
 
-/*
-  push an array of elements
-*/
-NTSTATUS ejs_push_array(struct ejs_rpc *ejs, 
-			struct MprVar *v, const char *name, uint32_t length,
-			size_t elsize, void *r, ejs_push_t ejs_push)
-{
-	int i;
-	char *data;
-
-	NDR_CHECK(ejs_push_struct_start(ejs, &v, name));
-
-	data = r;
-
-	for (i=0;i<length;i++) {
-		char *id = talloc_asprintf(ejs, "%u", i);
-		NT_STATUS_HAVE_NO_MEMORY(id);
-		NDR_CHECK(ejs_push(ejs, v, id, (i*elsize)+data));
-		talloc_free(id);
-	}
-	return mprSetVar(v, "length", mprCreateIntegerVar(i));
-}
-			
-
 /*
   pull a string
 */
 NTSTATUS ejs_pull_string(struct ejs_rpc *ejs, 
-			 struct MprVar *v, const char *name, const char **s)
+			 struct MprVar *v, const char *name, char **s)
 {
 	struct MprVar *var;
 	var = mprGetVar(v, name);
diff --git a/source4/scripting/ejs/ejsrpc.h b/source4/scripting/ejs/ejsrpc.h
index 5fb6ace863..67b81b3411 100644
--- a/source4/scripting/ejs/ejsrpc.h
+++ b/source4/scripting/ejs/ejsrpc.h
@@ -23,6 +23,9 @@
 struct ejs_rpc {
 	int eid;
 	const char *callname;
+	/* as ejs does only one pass, we can use a single var for switch 
+	   handling */
+	uint32_t switch_var;
 };
 
 typedef NTSTATUS (*ejs_pull_t)(struct ejs_rpc *, struct MprVar *, const char *, void *);
@@ -31,6 +34,7 @@ typedef NTSTATUS (*ejs_pull_function_t)(struct ejs_rpc *, struct MprVar *, void
 typedef NTSTATUS (*ejs_push_function_t)(struct ejs_rpc *, struct MprVar *, const void *);
 
 NTSTATUS ejs_panic(struct ejs_rpc *ejs, const char *why);
+void ejs_set_switch(struct ejs_rpc *ejs, uint32_t switch_var);
 
 int ejs_rpc_call(int eid, int argc, struct MprVar **argv, const char *callname,
 		 ejs_pull_function_t ejs_pull, ejs_push_function_t ejs_push);
@@ -63,10 +67,7 @@ NTSTATUS ejs_push_enum(struct ejs_rpc *ejs,
 NTSTATUS ejs_pull_array(struct ejs_rpc *ejs, 
 			struct MprVar *v, const char *name, uint32_t length,
 			size_t elsize, void **r, ejs_pull_t ejs_pull);
-NTSTATUS ejs_push_array(struct ejs_rpc *ejs, 
-			struct MprVar *v, const char *name, uint32_t length,
-			size_t elsize, void *r, ejs_push_t ejs_push);
 NTSTATUS ejs_pull_string(struct ejs_rpc *ejs, 
-			 struct MprVar *v, const char *name, const char **s);
+			 struct MprVar *v, const char *name, char **s);
 NTSTATUS ejs_push_string(struct ejs_rpc *ejs, 
 			 struct MprVar *v, const char *name, const char *s);
-- 
cgit 


From 7fded3c856735050e7d72972da8bc2cd19f01cd8 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Fri, 8 Jul 2005 03:33:32 +0000
Subject: r8215: switched the pull side of the ejs generator over to the
 recursive LEVELS based approach. This allows for much more complex structure
 mappings to be generated. (This used to be commit
 49fc14d13291b02f7b16ab0eefe7bfb26f51b1c8)

---
 source4/scripting/ejs/ejsrpc.c | 27 ---------------------------
 source4/scripting/ejs/ejsrpc.h | 17 ++++++++++++++---
 2 files changed, 14 insertions(+), 30 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/ejsrpc.c b/source4/scripting/ejs/ejsrpc.c
index 965fd8d447..574c75b7de 100644
--- a/source4/scripting/ejs/ejsrpc.c
+++ b/source4/scripting/ejs/ejsrpc.c
@@ -253,33 +253,6 @@ NTSTATUS ejs_push_enum(struct ejs_rpc *ejs,
 }
 
 
-/*
-  pull an array of elements
-*/
-NTSTATUS ejs_pull_array(struct ejs_rpc *ejs, 
-			struct MprVar *v, const char *name, uint32_t length,
-			size_t elsize, void **r, ejs_pull_t ejs_pull)
-{
-	int i;
-	char *data;
-
-	NDR_CHECK(ejs_pull_struct_start(ejs, &v, name));
-
-	(*r) = talloc_array_size(ejs, elsize, length);
-	NT_STATUS_HAVE_NO_MEMORY(*r);
-
-	data = *r;
-
-	for (i=0;i<length;i++) {
-		char *id = talloc_asprintf(ejs, "%u", i);
-		NT_STATUS_HAVE_NO_MEMORY(id);
-		NDR_CHECK(ejs_pull(ejs, v, id, (i*elsize)+data));
-		talloc_free(id);
-	}
-	return NT_STATUS_OK;
-}
-
-
 /*
   pull a string
 */
diff --git a/source4/scripting/ejs/ejsrpc.h b/source4/scripting/ejs/ejsrpc.h
index 67b81b3411..fdf15c027c 100644
--- a/source4/scripting/ejs/ejsrpc.h
+++ b/source4/scripting/ejs/ejsrpc.h
@@ -64,10 +64,21 @@ NTSTATUS ejs_pull_enum(struct ejs_rpc *ejs,
 		       struct MprVar *v, const char *name, unsigned *r);
 NTSTATUS ejs_push_enum(struct ejs_rpc *ejs, 
 		       struct MprVar *v, const char *name, const unsigned *r);
-NTSTATUS ejs_pull_array(struct ejs_rpc *ejs, 
-			struct MprVar *v, const char *name, uint32_t length,
-			size_t elsize, void **r, ejs_pull_t ejs_pull);
 NTSTATUS ejs_pull_string(struct ejs_rpc *ejs, 
 			 struct MprVar *v, const char *name, char **s);
 NTSTATUS ejs_push_string(struct ejs_rpc *ejs, 
 			 struct MprVar *v, const char *name, const char *s);
+
+#define EJS_ALLOC_SIZE(ejs, s, size) do { \
+  (s) = talloc_size(ejs, size); \
+  if (!(s)) return ejs_panic(ejs, "out of memory"); \
+} while (0)
+
+#define EJS_ALLOC(ejs, s) EJS_ALLOC_SIZE(ejs, s, sizeof(*(s)))
+
+#define EJS_ALLOC_N_SIZE(ejs, s, n, elsize) do { \
+	(s) = talloc_array_size(ejs, elsize, n); \
+	if (!(s)) return ejs_panic(ejs, "out of memory"); \
+} while (0)
+
+#define EJS_ALLOC_N(ejs, s, n) EJS_ALLOC_N_SIZE(ejs, s, n, sizeof(*(s)))
-- 
cgit 


From 5fa5eb1da002a64d48779d89e2fab0d53e9f15f7 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Fri, 8 Jul 2005 04:07:26 +0000
Subject: r8216: - handle union pull in ejs pidl generation

- added debugging calls for missing structure/union elements
(This used to be commit f3ff48204cb8edeb9f42afbbefe13f7d49305506)
---
 source4/scripting/ejs/ejsrpc.c | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/ejsrpc.c b/source4/scripting/ejs/ejsrpc.c
index 574c75b7de..19c1a2fc8d 100644
--- a/source4/scripting/ejs/ejsrpc.c
+++ b/source4/scripting/ejs/ejsrpc.c
@@ -100,6 +100,7 @@ static NTSTATUS mprSetVar(struct MprVar *v, const char *name, struct MprVar val)
 	if (p == NULL) {
 		v2 = mprSetProperty(v, name, &val);
 		if (v2 == NULL) {
+			DEBUG(1,("mprSetVar unable to set '%s'\n", name));
 			return NT_STATUS_INVALID_PARAMETER_MIX;
 		}
 		return NT_STATUS_OK;
@@ -126,6 +127,7 @@ NTSTATUS ejs_pull_struct_start(struct ejs_rpc *ejs, struct MprVar **v, const cha
 {
 	*v = mprGetProperty(*v, name, NULL);
 	if (*v == NULL) {
+		DEBUG(1,("ejs_pull_struct_start: missing structure '%s'\n", name));
 		return NT_STATUS_INVALID_PARAMETER;
 	}
 	return NT_STATUS_OK;
@@ -140,6 +142,7 @@ NTSTATUS ejs_push_struct_start(struct ejs_rpc *ejs, struct MprVar **v, const cha
 	struct MprVar s = mprCreateObjVar(name, MPR_DEFAULT_HASH_SIZE);
 	*v = mprSetProperty(*v, name, &s);
 	if (*v == NULL) {
+		DEBUG(1,("ejs_push_struct_start: unable to set structure '%s'\n", name));
 		return NT_STATUS_INVALID_PARAMETER;
 	}
 	return NT_STATUS_OK;
@@ -154,6 +157,7 @@ NTSTATUS ejs_pull_uint8(struct ejs_rpc *ejs,
 	struct MprVar *var;
 	var = mprGetVar(v, name);
 	if (var == NULL) {
+		DEBUG(1,("ejs_pull_uint8: unable to find '%s'\n", name));
 		return NT_STATUS_INVALID_PARAMETER_MIX;
 	}
 	*r = mprVarToInteger(var);
@@ -176,6 +180,7 @@ NTSTATUS ejs_pull_uint16(struct ejs_rpc *ejs,
 	struct MprVar *var;
 	var = mprGetVar(v, name);
 	if (var == NULL) {
+		DEBUG(1,("ejs_pull_uint16: unable to find '%s'\n", name));
 		return NT_STATUS_INVALID_PARAMETER_MIX;
 	}
 	*r = mprVarToInteger(var);
@@ -198,6 +203,7 @@ NTSTATUS ejs_pull_uint32(struct ejs_rpc *ejs,
 	struct MprVar *var;
 	var = mprGetVar(v, name);
 	if (var == NULL) {
+		DEBUG(1,("ejs_push_uint32: unable to find '%s'\n", name));
 		return NT_STATUS_INVALID_PARAMETER_MIX;
 	}
 	*r = mprVarToInteger(var);
@@ -216,6 +222,7 @@ NTSTATUS ejs_pull_hyper(struct ejs_rpc *ejs,
 	struct MprVar *var;
 	var = mprGetVar(v, name);
 	if (var == NULL) {
+		DEBUG(1,("ejs_pull_hyper: unable to find '%s'\n", name));
 		return NT_STATUS_INVALID_PARAMETER_MIX;
 	}
 	*r = mprVarToInteger(var);
@@ -239,6 +246,7 @@ NTSTATUS ejs_pull_enum(struct ejs_rpc *ejs,
 	struct MprVar *var;
 	var = mprGetVar(v, name);
 	if (var == NULL) {
+		DEBUG(1,("ejs_pull_enum: unable to find '%s'\n", name));
 		return NT_STATUS_INVALID_PARAMETER_MIX;
 	}
 	*r = mprVarToInteger(var);
@@ -262,6 +270,7 @@ NTSTATUS ejs_pull_string(struct ejs_rpc *ejs,
 	struct MprVar *var;
 	var = mprGetVar(v, name);
 	if (var == NULL) {
+		DEBUG(1,("ejs_pull_string: unable to find '%s'\n", name));
 		return NT_STATUS_INVALID_PARAMETER_MIX;
 	}
 	*s = mprToString(var);
-- 
cgit 


From c11204339ae86604a6edd6491f5ee03bf5e3c950 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Fri, 8 Jul 2005 04:55:07 +0000
Subject: r8220: added auto-generation of ENUM constants in ejs wrapper. So we
 can now use the enum name instead of a integer in ejs scripts making rpc
 calls (This used to be commit a61cdee384c3002860016c1740276529493d318d)

---
 source4/scripting/ejs/ejsrpc.c       | 21 ++++++++++++++++++++-
 source4/scripting/ejs/ejsrpc.h       |  2 ++
 source4/scripting/ejs/smbcalls.c     |  8 ++++++++
 source4/scripting/ejs/smbcalls_rpc.c |  9 +++++++++
 source4/scripting/ejs/smbscript.c    |  2 ++
 5 files changed, 41 insertions(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/ejsrpc.c b/source4/scripting/ejs/ejsrpc.c
index 19c1a2fc8d..6536b94ca4 100644
--- a/source4/scripting/ejs/ejsrpc.c
+++ b/source4/scripting/ejs/ejsrpc.c
@@ -273,7 +273,8 @@ NTSTATUS ejs_pull_string(struct ejs_rpc *ejs,
 		DEBUG(1,("ejs_pull_string: unable to find '%s'\n", name));
 		return NT_STATUS_INVALID_PARAMETER_MIX;
 	}
-	*s = mprToString(var);
+	*s = talloc_strdup(ejs, mprToString(var));
+	NT_STATUS_HAVE_NO_MEMORY(*s);
 	return NT_STATUS_OK;
 }
 
@@ -285,3 +286,21 @@ NTSTATUS ejs_push_string(struct ejs_rpc *ejs,
 {
 	return mprSetVar(v, name, mprCreateStringVar(s, True));
 }
+
+/*
+  setup a constant int
+*/
+void ejs_set_constant_int(int eid, const char *name, int value)
+{
+	struct MprVar *v = ejsGetGlobalObject(eid);
+	mprSetVar(v, name, mprCreateIntegerVar(value));
+}
+
+/*
+  setup a constant string
+*/
+void ejs_set_constant_string(int eid, const char *name, const char *value)
+{
+	struct MprVar *v = ejsGetGlobalObject(eid);
+	mprSetVar(v, name, mprCreateStringVar(value, False));
+}
diff --git a/source4/scripting/ejs/ejsrpc.h b/source4/scripting/ejs/ejsrpc.h
index fdf15c027c..0435b52365 100644
--- a/source4/scripting/ejs/ejsrpc.h
+++ b/source4/scripting/ejs/ejsrpc.h
@@ -68,6 +68,8 @@ NTSTATUS ejs_pull_string(struct ejs_rpc *ejs,
 			 struct MprVar *v, const char *name, char **s);
 NTSTATUS ejs_push_string(struct ejs_rpc *ejs, 
 			 struct MprVar *v, const char *name, const char *s);
+void ejs_set_constant_int(int eid, const char *name, int value);
+void ejs_set_constant_string(int eid, const char *name, const char *value);
 
 #define EJS_ALLOC_SIZE(ejs, s, size) do { \
   (s) = talloc_size(ejs, size); \
diff --git a/source4/scripting/ejs/smbcalls.c b/source4/scripting/ejs/smbcalls.c
index 041bd59f1a..0f43da349d 100644
--- a/source4/scripting/ejs/smbcalls.c
+++ b/source4/scripting/ejs/smbcalls.c
@@ -198,3 +198,11 @@ void smb_setup_ejs_functions(void)
 	ejsDefineStringCFunction(-1, "getDomainList", ejs_domain_list, NULL, MPR_VAR_SCRIPT_HANDLE);
 	ejsDefineCFunction(-1, "userAuth", ejs_userAuth, NULL, MPR_VAR_SCRIPT_HANDLE);
 }
+
+/*
+  setup constants that can be used from ejs
+*/
+void smb_setup_ejs_constants(int eid)
+{
+	smb_setup_ejs_rpc_constants(eid);
+}
diff --git a/source4/scripting/ejs/smbcalls_rpc.c b/source4/scripting/ejs/smbcalls_rpc.c
index 6ec3e29e50..f8ea37b754 100644
--- a/source4/scripting/ejs/smbcalls_rpc.c
+++ b/source4/scripting/ejs/smbcalls_rpc.c
@@ -173,3 +173,12 @@ void smb_setup_ejs_rpc(void)
 	ejsDefineCFunction(-1, "rpc_connect", ejs_rpc_connect, NULL, MPR_VAR_SCRIPT_HANDLE);
 	setup_ejs_rpcecho();
 }
+
+/*
+  setup constants for rpc calls
+*/
+void smb_setup_ejs_rpc_constants(int eid)
+{
+	void setup_ejs_constants_rpcecho(int);
+	setup_ejs_constants_rpcecho(eid);
+}
diff --git a/source4/scripting/ejs/smbscript.c b/source4/scripting/ejs/smbscript.c
index aa0fc42c48..244ae0b42a 100644
--- a/source4/scripting/ejs/smbscript.c
+++ b/source4/scripting/ejs/smbscript.c
@@ -88,6 +88,8 @@ void ejs_exception(const char *reason)
 		exit(127);
 	}
 
+	smb_setup_ejs_constants(eid);
+
 	/* setup ARGV[] in the ejs environment */
 	for (i=1;argv[i];i++) {
 		argv_list = str_list_add(argv_list, argv[i]);
-- 
cgit 


From c851532bece629e114382e2c3571a18bf9b42be4 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Fri, 8 Jul 2005 07:26:45 +0000
Subject: r8230: prevent authentication dying on a NULL domain (This used to be
 commit e1cfc6d03244e04d59a96ef2abb5b48fcb157b0a)

---
 source4/scripting/ejs/smbcalls.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls.c b/source4/scripting/ejs/smbcalls.c
index 0f43da349d..ab5101db6d 100644
--- a/source4/scripting/ejs/smbcalls.c
+++ b/source4/scripting/ejs/smbcalls.c
@@ -149,7 +149,7 @@ static int ejs_userAuth(MprVarHandle eid, int argc, struct MprVar **argv)
  	tmp_ctx = talloc_new(mprMemCtx());	
 	auth = mprCreateObjVar("auth", MPR_DEFAULT_HASH_SIZE);
 
-	if (strcmp("System User", domain) == 0) {
+	if (domain && strcmp("System User", domain) == 0) {
 
 		ejs_systemAuth(tmp_ctx, &auth, username, password, domain, remote_host);
 	}  else {
-- 
cgit 


From f55b2b96108d71197807b46af16085167556bf6e Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Fri, 8 Jul 2005 08:18:52 +0000
Subject: r8233: - added support for more base types in pidl ejs

- added auto generation of a header with prototypes for public ejs functions

- make public functions non-static

- fixed allocation of fixed sized arrays

- added 'noejs' flag indicating that a typedef will be handled manually by ejs

- added manual functions for sid and GUID, so they show up as nice
  strings in ejs scripts

This allows ejs to bring in samr, security, lsa and misc IDL functions
(This used to be commit a8cb2dbdcc2871090a26f580f67db8f0636d1e7e)
---
 source4/scripting/ejs/config.mk      |   2 +-
 source4/scripting/ejs/ejsrpc.c       | 108 ++++++++++++++++++++++++++++++++++-
 source4/scripting/ejs/ejsrpc.h       |  25 +++++++-
 source4/scripting/ejs/smbcalls_rpc.c |  13 +++++
 4 files changed, 143 insertions(+), 5 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/config.mk b/source4/scripting/ejs/config.mk
index 0c0caa9ef0..f56b75e537 100644
--- a/source4/scripting/ejs/config.mk
+++ b/source4/scripting/ejs/config.mk
@@ -3,7 +3,7 @@
 [SUBSYSTEM::EJSRPC]
 OBJ_FILES = \
 		scripting/ejs/ejsrpc.o
-REQUIRED_SUBSYSTEMS = RPC_EJS_ECHO
+REQUIRED_SUBSYSTEMS = RPC_EJS_ECHO RPC_EJS_SAMR RPC_EJS_MISC RPC_EJS_SECURITY RPC_EJS_LSA
 NOPROTO = YES
 # End SUBSYSTEM EJSRPC
 #######################
diff --git a/source4/scripting/ejs/ejsrpc.c b/source4/scripting/ejs/ejsrpc.c
index 6536b94ca4..ab0f64d5aa 100644
--- a/source4/scripting/ejs/ejsrpc.c
+++ b/source4/scripting/ejs/ejsrpc.c
@@ -23,6 +23,7 @@
 #include "includes.h"
 #include "lib/ejs/ejs.h"
 #include "scripting/ejs/ejsrpc.h"
+#include "librpc/gen_ndr/ndr_security.h"
 
 NTSTATUS ejs_pull_rpc(int eid, const char *callname, 
 		      struct MprVar *v, void *ptr, ejs_pull_function_t ejs_pull)
@@ -235,6 +236,63 @@ NTSTATUS ejs_push_hyper(struct ejs_rpc *ejs,
 	return mprSetVar(v, name, mprCreateIntegerVar(*r));
 }
 
+NTSTATUS ejs_pull_dlong(struct ejs_rpc *ejs, 
+			struct MprVar *v, const char *name, uint64_t *r)
+{
+	struct MprVar *var;
+	var = mprGetVar(v, name);
+	if (var == NULL) {
+		DEBUG(1,("ejs_pull_dlong: unable to find '%s'\n", name));
+		return NT_STATUS_INVALID_PARAMETER_MIX;
+	}
+	*r = mprVarToInteger(var);
+	return NT_STATUS_OK;
+}
+
+NTSTATUS ejs_push_dlong(struct ejs_rpc *ejs, 
+			struct MprVar *v, const char *name, const uint64_t *r)
+{
+	return mprSetVar(v, name, mprCreateIntegerVar(*r));
+}
+
+NTSTATUS ejs_pull_udlong(struct ejs_rpc *ejs, 
+			struct MprVar *v, const char *name, uint64_t *r)
+{
+	struct MprVar *var;
+	var = mprGetVar(v, name);
+	if (var == NULL) {
+		DEBUG(1,("ejs_pull_udlong: unable to find '%s'\n", name));
+		return NT_STATUS_INVALID_PARAMETER_MIX;
+	}
+	*r = mprVarToInteger(var);
+	return NT_STATUS_OK;
+}
+
+NTSTATUS ejs_push_udlong(struct ejs_rpc *ejs, 
+			struct MprVar *v, const char *name, const uint64_t *r)
+{
+	return mprSetVar(v, name, mprCreateIntegerVar(*r));
+}
+
+NTSTATUS ejs_pull_NTTIME(struct ejs_rpc *ejs, 
+			struct MprVar *v, const char *name, uint64_t *r)
+{
+	struct MprVar *var;
+	var = mprGetVar(v, name);
+	if (var == NULL) {
+		DEBUG(1,("ejs_pull_NTTIME: unable to find '%s'\n", name));
+		return NT_STATUS_INVALID_PARAMETER_MIX;
+	}
+	*r = mprVarToInteger(var);
+	return NT_STATUS_OK;
+}
+
+NTSTATUS ejs_push_NTTIME(struct ejs_rpc *ejs, 
+			struct MprVar *v, const char *name, const uint64_t *r)
+{
+	return mprSetVar(v, name, mprCreateIntegerVar(*r));
+}
+
 
 /*
   pull a enum from a mpr variable to a C element
@@ -265,7 +323,7 @@ NTSTATUS ejs_push_enum(struct ejs_rpc *ejs,
   pull a string
 */
 NTSTATUS ejs_pull_string(struct ejs_rpc *ejs, 
-			 struct MprVar *v, const char *name, char **s)
+			 struct MprVar *v, const char *name, const char **s)
 {
 	struct MprVar *var;
 	var = mprGetVar(v, name);
@@ -273,8 +331,7 @@ NTSTATUS ejs_pull_string(struct ejs_rpc *ejs,
 		DEBUG(1,("ejs_pull_string: unable to find '%s'\n", name));
 		return NT_STATUS_INVALID_PARAMETER_MIX;
 	}
-	*s = talloc_strdup(ejs, mprToString(var));
-	NT_STATUS_HAVE_NO_MEMORY(*s);
+	*s = mprToString(var);
 	return NT_STATUS_OK;
 }
 
@@ -304,3 +361,48 @@ void ejs_set_constant_string(int eid, const char *name, const char *value)
 	struct MprVar *v = ejsGetGlobalObject(eid);
 	mprSetVar(v, name, mprCreateStringVar(value, False));
 }
+
+
+NTSTATUS ejs_pull_dom_sid(struct ejs_rpc *ejs, 
+			  struct MprVar *v, const char *name, struct dom_sid *r)
+{
+	struct MprVar *var;
+	struct dom_sid *sid;
+	var = mprGetVar(v, name);
+	if (var == NULL) {
+		DEBUG(1,("ejs_pull_dom_sid: unable to find '%s'\n", name));
+		return NT_STATUS_INVALID_PARAMETER_MIX;
+	}
+	sid = dom_sid_parse_talloc(ejs, mprToString(var));
+	NT_STATUS_HAVE_NO_MEMORY(sid);
+	*r = *sid;
+	return NT_STATUS_OK;
+}
+
+NTSTATUS ejs_push_dom_sid(struct ejs_rpc *ejs, 
+			  struct MprVar *v, const char *name, const struct dom_sid *r)
+{
+	char *sidstr = dom_sid_string(ejs, r);
+	NT_STATUS_HAVE_NO_MEMORY(sidstr);
+	return mprSetVar(v, name, mprCreateStringVar(sidstr, True));
+}
+
+NTSTATUS ejs_pull_GUID(struct ejs_rpc *ejs, 
+		       struct MprVar *v, const char *name, struct GUID *r)
+{
+	struct MprVar *var;
+	var = mprGetVar(v, name);
+	if (var == NULL) {
+		DEBUG(1,("ejs_pull_GUID: unable to find '%s'\n", name));
+		return NT_STATUS_INVALID_PARAMETER_MIX;
+	}
+	return GUID_from_string(mprToString(var), r);
+}
+
+NTSTATUS ejs_push_GUID(struct ejs_rpc *ejs, 
+		       struct MprVar *v, const char *name, const struct GUID *r)
+{
+	char *guid = GUID_string(ejs, r);
+	NT_STATUS_HAVE_NO_MEMORY(guid);
+	return mprSetVar(v, name, mprCreateStringVar(guid, True));
+}
diff --git a/source4/scripting/ejs/ejsrpc.h b/source4/scripting/ejs/ejsrpc.h
index 0435b52365..624a5fad3d 100644
--- a/source4/scripting/ejs/ejsrpc.h
+++ b/source4/scripting/ejs/ejsrpc.h
@@ -60,17 +60,34 @@ NTSTATUS ejs_pull_hyper(struct ejs_rpc *ejs,
 			struct MprVar *v, const char *name, uint64_t *r);
 NTSTATUS ejs_push_hyper(struct ejs_rpc *ejs, 
 			struct MprVar *v, const char *name, const uint64_t *r);
+NTSTATUS ejs_pull_dlong(struct ejs_rpc *ejs, 
+			struct MprVar *v, const char *name, uint64_t *r);
+NTSTATUS ejs_push_dlong(struct ejs_rpc *ejs, 
+			struct MprVar *v, const char *name, const uint64_t *r);
+NTSTATUS ejs_pull_udlong(struct ejs_rpc *ejs, 
+			struct MprVar *v, const char *name, uint64_t *r);
+NTSTATUS ejs_push_udlong(struct ejs_rpc *ejs, 
+			struct MprVar *v, const char *name, const uint64_t *r);
+NTSTATUS ejs_pull_NTTIME(struct ejs_rpc *ejs, 
+			struct MprVar *v, const char *name, uint64_t *r);
+NTSTATUS ejs_push_NTTIME(struct ejs_rpc *ejs, 
+			struct MprVar *v, const char *name, const uint64_t *r);
 NTSTATUS ejs_pull_enum(struct ejs_rpc *ejs, 
 		       struct MprVar *v, const char *name, unsigned *r);
 NTSTATUS ejs_push_enum(struct ejs_rpc *ejs, 
 		       struct MprVar *v, const char *name, const unsigned *r);
 NTSTATUS ejs_pull_string(struct ejs_rpc *ejs, 
-			 struct MprVar *v, const char *name, char **s);
+			 struct MprVar *v, const char *name, const char **s);
 NTSTATUS ejs_push_string(struct ejs_rpc *ejs, 
 			 struct MprVar *v, const char *name, const char *s);
 void ejs_set_constant_int(int eid, const char *name, int value);
 void ejs_set_constant_string(int eid, const char *name, const char *value);
 
+NTSTATUS ejs_pull_dom_sid(struct ejs_rpc *ejs, 
+			  struct MprVar *v, const char *name, struct dom_sid *r);
+NTSTATUS ejs_push_dom_sid(struct ejs_rpc *ejs, 
+			  struct MprVar *v, const char *name, const struct dom_sid *r);
+
 #define EJS_ALLOC_SIZE(ejs, s, size) do { \
   (s) = talloc_size(ejs, size); \
   if (!(s)) return ejs_panic(ejs, "out of memory"); \
@@ -84,3 +101,9 @@ void ejs_set_constant_string(int eid, const char *name, const char *value);
 } while (0)
 
 #define EJS_ALLOC_N(ejs, s, n) EJS_ALLOC_N_SIZE(ejs, s, n, sizeof(*(s)))
+
+/* some types are equivalent for ejs */
+#define ejs_pull_dom_sid2 ejs_pull_dom_sid
+#define ejs_push_dom_sid2 ejs_push_dom_sid
+#define ejs_pull_NTTIME_hyper ejs_pull_NTTIME
+#define ejs_push_NTTIME_hyper ejs_push_NTTIME
diff --git a/source4/scripting/ejs/smbcalls_rpc.c b/source4/scripting/ejs/smbcalls_rpc.c
index f8ea37b754..17f1716b2e 100644
--- a/source4/scripting/ejs/smbcalls_rpc.c
+++ b/source4/scripting/ejs/smbcalls_rpc.c
@@ -170,8 +170,12 @@ done:
 void smb_setup_ejs_rpc(void)
 {
 	void setup_ejs_rpcecho(void);
+	void setup_ejs_samr(void);
+	void setup_ejs_misc(void);
 	ejsDefineCFunction(-1, "rpc_connect", ejs_rpc_connect, NULL, MPR_VAR_SCRIPT_HANDLE);
 	setup_ejs_rpcecho();
+	setup_ejs_samr();
+	setup_ejs_misc();
 }
 
 /*
@@ -179,6 +183,15 @@ void smb_setup_ejs_rpc(void)
 */
 void smb_setup_ejs_rpc_constants(int eid)
 {
+	struct MprVar v;
+
 	void setup_ejs_constants_rpcecho(int);
+	void setup_ejs_constants_samr(int);
+	void setup_ejs_constants_misc(int);
 	setup_ejs_constants_rpcecho(eid);
+	setup_ejs_constants_samr(eid);
+	setup_ejs_constants_misc(eid);
+	
+	v = mprCreatePtrVar(NULL, "NULL");
+	mprSetProperty(ejsGetGlobalObject(eid), "NULL", &v);
 }
-- 
cgit 


From e897a570673d4c79361ed386ebdb14b0ec5a106c Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Fri, 8 Jul 2005 09:37:54 +0000
Subject: r8236: fixed support for arrays of structures (This used to be commit
 cbe5289ac9a8adfe68704dc16a2b32ecbd15a4eb)

---
 source4/scripting/ejs/ejsrpc.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/ejsrpc.c b/source4/scripting/ejs/ejsrpc.c
index ab0f64d5aa..94987d69e1 100644
--- a/source4/scripting/ejs/ejsrpc.c
+++ b/source4/scripting/ejs/ejsrpc.c
@@ -126,7 +126,7 @@ static NTSTATUS mprSetVar(struct MprVar *v, const char *name, struct MprVar val)
 */
 NTSTATUS ejs_pull_struct_start(struct ejs_rpc *ejs, struct MprVar **v, const char *name)
 {
-	*v = mprGetProperty(*v, name, NULL);
+	*v = mprGetVar(*v, name);
 	if (*v == NULL) {
 		DEBUG(1,("ejs_pull_struct_start: missing structure '%s'\n", name));
 		return NT_STATUS_INVALID_PARAMETER;
@@ -140,10 +140,10 @@ NTSTATUS ejs_pull_struct_start(struct ejs_rpc *ejs, struct MprVar **v, const cha
 */
 NTSTATUS ejs_push_struct_start(struct ejs_rpc *ejs, struct MprVar **v, const char *name)
 {
-	struct MprVar s = mprCreateObjVar(name, MPR_DEFAULT_HASH_SIZE);
-	*v = mprSetProperty(*v, name, &s);
+	NDR_CHECK(mprSetVar(*v, name, mprCreateObjVar(name, MPR_DEFAULT_HASH_SIZE)));
+	*v = mprGetVar(*v, name);
 	if (*v == NULL) {
-		DEBUG(1,("ejs_push_struct_start: unable to set structure '%s'\n", name));
+		DEBUG(1,("ejs_push_struct_start: missing structure '%s'\n", name));
 		return NT_STATUS_INVALID_PARAMETER;
 	}
 	return NT_STATUS_OK;
-- 
cgit 


From 987e67df52ad906db5c80df736eea762d52814b6 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Fri, 8 Jul 2005 10:29:18 +0000
Subject: r8238: - fixed handling of NULL pointers from ejs

- added automatic creation of all constants in IDL as ejs variables
(This used to be commit 9398b02e4ba51145e447668e321ca927f44c0078)
---
 source4/scripting/ejs/ejsrpc.c       | 17 +++++++++++++++++
 source4/scripting/ejs/ejsrpc.h       |  2 ++
 source4/scripting/ejs/smbcalls_rpc.c |  7 +++++++
 3 files changed, 26 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/ejsrpc.c b/source4/scripting/ejs/ejsrpc.c
index 94987d69e1..992defe8bb 100644
--- a/source4/scripting/ejs/ejsrpc.c
+++ b/source4/scripting/ejs/ejsrpc.c
@@ -406,3 +406,20 @@ NTSTATUS ejs_push_GUID(struct ejs_rpc *ejs,
 	NT_STATUS_HAVE_NO_MEMORY(guid);
 	return mprSetVar(v, name, mprCreateStringVar(guid, True));
 }
+
+NTSTATUS ejs_push_null(struct ejs_rpc *ejs, struct MprVar *v, const char *name)
+{
+	return mprSetVar(v, name, mprCreatePtrVar(NULL, name));
+}
+
+BOOL ejs_pull_null(struct ejs_rpc *ejs, struct MprVar *v, const char *name)
+{
+	v = mprGetVar(v, name);
+	if (v == NULL) {
+		return True;
+	}
+	if (v->type == MPR_TYPE_PTR && v->ptr == NULL) {
+		return True;
+	}
+	return False;
+}
diff --git a/source4/scripting/ejs/ejsrpc.h b/source4/scripting/ejs/ejsrpc.h
index 624a5fad3d..d86c4eb71f 100644
--- a/source4/scripting/ejs/ejsrpc.h
+++ b/source4/scripting/ejs/ejsrpc.h
@@ -87,6 +87,8 @@ NTSTATUS ejs_pull_dom_sid(struct ejs_rpc *ejs,
 			  struct MprVar *v, const char *name, struct dom_sid *r);
 NTSTATUS ejs_push_dom_sid(struct ejs_rpc *ejs, 
 			  struct MprVar *v, const char *name, const struct dom_sid *r);
+NTSTATUS ejs_push_null(struct ejs_rpc *ejs, struct MprVar *v, const char *name);
+BOOL ejs_pull_null(struct ejs_rpc *ejs, struct MprVar *v, const char *name);
 
 #define EJS_ALLOC_SIZE(ejs, s, size) do { \
   (s) = talloc_size(ejs, size); \
diff --git a/source4/scripting/ejs/smbcalls_rpc.c b/source4/scripting/ejs/smbcalls_rpc.c
index 17f1716b2e..e1d9c93be6 100644
--- a/source4/scripting/ejs/smbcalls_rpc.c
+++ b/source4/scripting/ejs/smbcalls_rpc.c
@@ -172,10 +172,14 @@ void smb_setup_ejs_rpc(void)
 	void setup_ejs_rpcecho(void);
 	void setup_ejs_samr(void);
 	void setup_ejs_misc(void);
+	void setup_ejs_security(void);
+
 	ejsDefineCFunction(-1, "rpc_connect", ejs_rpc_connect, NULL, MPR_VAR_SCRIPT_HANDLE);
+
 	setup_ejs_rpcecho();
 	setup_ejs_samr();
 	setup_ejs_misc();
+	setup_ejs_security();
 }
 
 /*
@@ -188,9 +192,12 @@ void smb_setup_ejs_rpc_constants(int eid)
 	void setup_ejs_constants_rpcecho(int);
 	void setup_ejs_constants_samr(int);
 	void setup_ejs_constants_misc(int);
+	void setup_ejs_constants_security(int);
+
 	setup_ejs_constants_rpcecho(eid);
 	setup_ejs_constants_samr(eid);
 	setup_ejs_constants_misc(eid);
+	setup_ejs_constants_security(eid);
 	
 	v = mprCreatePtrVar(NULL, "NULL");
 	mprSetProperty(ejsGetGlobalObject(eid), "NULL", &v);
-- 
cgit 


From fe1cf1eeb7c1b5955cdd2a44540bb46f82490f9a Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Sat, 9 Jul 2005 05:24:35 +0000
Subject: r8254: fixed a valgrind error in the unix auth code (This used to be
 commit ad1a4802d0634960646a6efe039fe8b62ead63dd)

---
 source4/scripting/ejs/smbcalls.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls.c b/source4/scripting/ejs/smbcalls.c
index ab5101db6d..d8bb0c20a5 100644
--- a/source4/scripting/ejs/smbcalls.c
+++ b/source4/scripting/ejs/smbcalls.c
@@ -91,7 +91,7 @@ static int ejs_systemAuth(TALLOC_CTX *tmp_ctx, struct MprVar *auth, const char *
 		goto done;
 	}
 
-	pw_blob = data_blob(password, strlen(password)),
+	pw_blob = data_blob(password, strlen(password)+1),
 	make_user_info(tmp_ctx, username, username,
 				domain, domain,
 				remote_host, remote_host,
-- 
cgit 


From 7efeb8f451345b54ce125bcbb601ba2475ef9e59 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Sat, 9 Jul 2005 05:28:42 +0000
Subject: r8256: - allow rpc calls from non-command line ejs contexts by
 creating a set   of null credentials to use if cmdline_credentials is not
 setup

- hide the length and size elements of a lsa_String from js scripts,
  so you can use a lsa_String just as an ordinary string without
  knowing its a structure. We won't do this with all structures, just
  a few core ones that are used often enough to warrant it.

- make sure returned ldb arrays have a length property
(This used to be commit 12d2092dd8668de41776132ccbcd634790c371a9)
---
 source4/scripting/ejs/ejsrpc.c       | 21 ++++++++++++++++++++-
 source4/scripting/ejs/ejsrpc.h       |  1 +
 source4/scripting/ejs/mprutil.c      |  1 +
 source4/scripting/ejs/smbcalls_rpc.c | 13 ++++++++++++-
 4 files changed, 34 insertions(+), 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/ejsrpc.c b/source4/scripting/ejs/ejsrpc.c
index 992defe8bb..32728ebfe4 100644
--- a/source4/scripting/ejs/ejsrpc.c
+++ b/source4/scripting/ejs/ejsrpc.c
@@ -22,8 +22,9 @@
 
 #include "includes.h"
 #include "lib/ejs/ejs.h"
-#include "scripting/ejs/ejsrpc.h"
 #include "librpc/gen_ndr/ndr_security.h"
+#include "librpc/gen_ndr/ndr_lsa.h"
+#include "scripting/ejs/ejsrpc.h"
 
 NTSTATUS ejs_pull_rpc(int eid, const char *callname, 
 		      struct MprVar *v, void *ptr, ejs_pull_function_t ejs_pull)
@@ -423,3 +424,21 @@ BOOL ejs_pull_null(struct ejs_rpc *ejs, struct MprVar *v, const char *name)
 	}
 	return False;
 }
+
+/*
+  pull a lsa_String
+*/
+NTSTATUS ejs_pull_lsa_String(struct ejs_rpc *ejs, 
+			     struct MprVar *v, const char *name, struct lsa_String *r)
+{
+	return ejs_pull_string(ejs, v, name, &r->string);
+}
+
+/*
+  push a lsa_String
+*/
+NTSTATUS ejs_push_lsa_String(struct ejs_rpc *ejs, 
+			     struct MprVar *v, const char *name, const struct lsa_String *r)
+{
+	return ejs_push_string(ejs, v, name, r->string);
+}
diff --git a/source4/scripting/ejs/ejsrpc.h b/source4/scripting/ejs/ejsrpc.h
index d86c4eb71f..c45b66d385 100644
--- a/source4/scripting/ejs/ejsrpc.h
+++ b/source4/scripting/ejs/ejsrpc.h
@@ -90,6 +90,7 @@ NTSTATUS ejs_push_dom_sid(struct ejs_rpc *ejs,
 NTSTATUS ejs_push_null(struct ejs_rpc *ejs, struct MprVar *v, const char *name);
 BOOL ejs_pull_null(struct ejs_rpc *ejs, struct MprVar *v, const char *name);
 
+
 #define EJS_ALLOC_SIZE(ejs, s, size) do { \
   (s) = talloc_size(ejs, size); \
   if (!(s)) return ejs_panic(ejs, "out of memory"); \
diff --git a/source4/scripting/ejs/mprutil.c b/source4/scripting/ejs/mprutil.c
index 1c640a5d5e..7b64d042f5 100644
--- a/source4/scripting/ejs/mprutil.c
+++ b/source4/scripting/ejs/mprutil.c
@@ -119,6 +119,7 @@ struct MprVar mprLdbArray(struct ldb_message **msg, int count, const char *name)
 	for (i=0;i<count;i++) {
 		mprAddArray(&res, i, mprLdbMessage(msg[i]));
 	}
+	mprSetPropertyValue(&res, "length", mprCreateIntegerVar(i));
 	return res;	
 }
 
diff --git a/source4/scripting/ejs/smbcalls_rpc.c b/source4/scripting/ejs/smbcalls_rpc.c
index e1d9c93be6..3c3b8515f1 100644
--- a/source4/scripting/ejs/smbcalls_rpc.c
+++ b/source4/scripting/ejs/smbcalls_rpc.c
@@ -39,6 +39,8 @@ static int ejs_rpc_connect(MprVarHandle eid, int argc, struct MprVar **argv)
 	NTSTATUS status;
 	struct dcerpc_pipe *p;
 	struct MprVar *conn;
+	struct cli_credentials *creds = cmdline_credentials;
+	struct event_context *ev;
 
 	/* validate arguments */
 	if (argc != 3 ||
@@ -59,9 +61,18 @@ static int ejs_rpc_connect(MprVarHandle eid, int argc, struct MprVar **argv)
 		goto done;
 	}
 
+	if (creds == NULL) {
+		creds = cli_credentials_init(mprMemCtx());
+		cli_credentials_guess(creds);
+		cli_credentials_set_username(creds, "", CRED_GUESSED);
+		cli_credentials_set_password(creds, "", CRED_GUESSED);
+	}
+
+	ev = talloc_find_parent_bytype(mprMemCtx(), struct event_context);
+
 	status = dcerpc_pipe_connect(mprMemCtx(), &p, binding, 
 				     iface->uuid, iface->if_version, 
-				     cmdline_credentials, NULL);
+				     creds, ev);
 	if (!NT_STATUS_IS_OK(status)) goto done;
 
 	/* callers don't allocate ref vars in the ejs interface */
-- 
cgit 


From cd88764ba16bc35f0209fbdf1a975f10bd3eb9ac Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Sat, 9 Jul 2005 11:48:59 +0000
Subject: r8260: added an init based registration system for the generated ejs
 rpc code, so adding a new pipe only involves changes to librpc/config.mk
 (This used to be commit 0e54fa446665f380e9c46723a6e2be5a08b8d51c)

---
 source4/scripting/ejs/ejsrpc.h       |  7 +++++
 source4/scripting/ejs/smbcalls_rpc.c | 58 +++++++++++++++++++++++++-----------
 2 files changed, 47 insertions(+), 18 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/ejsrpc.h b/source4/scripting/ejs/ejsrpc.h
index c45b66d385..44b4b7dd96 100644
--- a/source4/scripting/ejs/ejsrpc.h
+++ b/source4/scripting/ejs/ejsrpc.h
@@ -36,6 +36,13 @@ typedef NTSTATUS (*ejs_push_function_t)(struct ejs_rpc *, struct MprVar *, const
 NTSTATUS ejs_panic(struct ejs_rpc *ejs, const char *why);
 void ejs_set_switch(struct ejs_rpc *ejs, uint32_t switch_var);
 
+typedef void (*ejs_setup_t)(void);
+typedef void (*ejs_constants_t)(int);
+
+NTSTATUS smbcalls_register_ejs(const char *name, 
+			       ejs_setup_t setup,
+			       ejs_constants_t constants);
+
 int ejs_rpc_call(int eid, int argc, struct MprVar **argv, const char *callname,
 		 ejs_pull_function_t ejs_pull, ejs_push_function_t ejs_push);
 
diff --git a/source4/scripting/ejs/smbcalls_rpc.c b/source4/scripting/ejs/smbcalls_rpc.c
index 3c3b8515f1..12b0d95e8e 100644
--- a/source4/scripting/ejs/smbcalls_rpc.c
+++ b/source4/scripting/ejs/smbcalls_rpc.c
@@ -25,6 +25,7 @@
 #include "librpc/gen_ndr/ndr_echo.h"
 #include "lib/cmdline/popt_common.h"
 #include "scripting/ejs/ejsrpc.h"
+#include "dlinklist.h"
 
 /*
   connect to an rpc server
@@ -175,22 +176,46 @@ done:
 }
 
 
+/* a list of registered ejs rpc modules */
+static struct ejs_register {
+	struct ejs_register *next, *prev;
+	const char *name;
+	ejs_setup_t setup;
+	ejs_constants_t constants;
+} *ejs_registered;
+
+/*
+  register a generated ejs module
+*/
+ NTSTATUS smbcalls_register_ejs(const char *name, 
+				ejs_setup_t setup,
+				ejs_constants_t constants)
+{
+	struct ejs_register *r;
+	void *ctx = ejs_registered;
+	if (ctx == NULL) {
+		ctx = talloc_autofree_context();
+	}
+	r = talloc(ctx, struct ejs_register);
+	NT_STATUS_HAVE_NO_MEMORY(r);
+	r->name = name;
+	r->setup = setup;
+	r->constants = constants;
+	DLIST_ADD(ejs_registered, r);
+	return NT_STATUS_OK;
+}
+
 /*
   setup C functions that be called from ejs
 */
 void smb_setup_ejs_rpc(void)
 {
-	void setup_ejs_rpcecho(void);
-	void setup_ejs_samr(void);
-	void setup_ejs_misc(void);
-	void setup_ejs_security(void);
+	struct ejs_register *r;
 
 	ejsDefineCFunction(-1, "rpc_connect", ejs_rpc_connect, NULL, MPR_VAR_SCRIPT_HANDLE);
-
-	setup_ejs_rpcecho();
-	setup_ejs_samr();
-	setup_ejs_misc();
-	setup_ejs_security();
+	for (r=ejs_registered;r;r=r->next) {
+		r->setup();
+	}
 }
 
 /*
@@ -198,18 +223,15 @@ void smb_setup_ejs_rpc(void)
 */
 void smb_setup_ejs_rpc_constants(int eid)
 {
+	struct ejs_register *r;
 	struct MprVar v;
 
-	void setup_ejs_constants_rpcecho(int);
-	void setup_ejs_constants_samr(int);
-	void setup_ejs_constants_misc(int);
-	void setup_ejs_constants_security(int);
+	for (r=ejs_registered;r;r=r->next) {
+		r->constants(eid);
+	}
 
-	setup_ejs_constants_rpcecho(eid);
-	setup_ejs_constants_samr(eid);
-	setup_ejs_constants_misc(eid);
-	setup_ejs_constants_security(eid);
-	
 	v = mprCreatePtrVar(NULL, "NULL");
 	mprSetProperty(ejsGetGlobalObject(eid), "NULL", &v);
 }
+
+
-- 
cgit 


From b4e53e6705064d889b343d90b0013e844cdb76f5 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Sat, 9 Jul 2005 12:53:50 +0000
Subject: r8262: - simplify the dependency handling for ejs modules

- added config.mk entries for some more pipes

- simplify the handling of ejs variables in the pidl code
(This used to be commit 595304708db69229495c5739b5cacab732afd55f)
---
 source4/scripting/ejs/config.mk |   2 +-
 source4/scripting/ejs/ejsrpc.c  | 163 ++++++++++++++--------------------------
 source4/scripting/ejs/ejsrpc.h  |   4 +
 3 files changed, 63 insertions(+), 106 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/config.mk b/source4/scripting/ejs/config.mk
index f56b75e537..fce69fdb55 100644
--- a/source4/scripting/ejs/config.mk
+++ b/source4/scripting/ejs/config.mk
@@ -3,7 +3,7 @@
 [SUBSYSTEM::EJSRPC]
 OBJ_FILES = \
 		scripting/ejs/ejsrpc.o
-REQUIRED_SUBSYSTEMS = RPC_EJS_ECHO RPC_EJS_SAMR RPC_EJS_MISC RPC_EJS_SECURITY RPC_EJS_LSA
+REQUIRED_SUBSYSTEMS = RPC_EJS
 NOPROTO = YES
 # End SUBSYSTEM EJSRPC
 #######################
diff --git a/source4/scripting/ejs/ejsrpc.c b/source4/scripting/ejs/ejsrpc.c
index 32728ebfe4..cd7e0c9211 100644
--- a/source4/scripting/ejs/ejsrpc.c
+++ b/source4/scripting/ejs/ejsrpc.c
@@ -67,26 +67,26 @@ NTSTATUS ejs_panic(struct ejs_rpc *ejs, const char *why)
 /*
   find a mpr component, allowing for sub objects, using the '.' convention
 */
-static struct MprVar *mprGetVar(struct MprVar *v, const char *name)
+static NTSTATUS mprGetVar(struct MprVar **v, const char *name)
 {
 	const char *p = strchr(name, '.');
 	char *objname;
-	struct MprVar *v2;
+	NTSTATUS status;
 	if (p == NULL) {
-		return mprGetProperty(v, name, NULL);
+		*v = mprGetProperty(*v, name, NULL);
+		if (*v == NULL) {
+			DEBUG(1,("mprGetVar unable to find '%s'\n", name));
+			return NT_STATUS_INVALID_PARAMETER;
+		}
+		return NT_STATUS_OK;
 	}
 	objname = talloc_strndup(mprMemCtx(), name, p-name);
-	if (objname == NULL) {
-		return NULL;
-	}
-	v2 = mprGetProperty(v, objname, NULL);
-	if (v2 == NULL) {
-		talloc_free(objname);
-		return NULL;
-	}
-	v2 = mprGetVar(v2, p+1);
+	NT_STATUS_HAVE_NO_MEMORY(objname);
+	*v = mprGetProperty(*v, objname, NULL);
+	NT_STATUS_HAVE_NO_MEMORY(*v);
+	status = mprGetVar(v, p+1);
 	talloc_free(objname);
-	return v2;
+	return status;
 }
 
 
@@ -127,12 +127,7 @@ static NTSTATUS mprSetVar(struct MprVar *v, const char *name, struct MprVar val)
 */
 NTSTATUS ejs_pull_struct_start(struct ejs_rpc *ejs, struct MprVar **v, const char *name)
 {
-	*v = mprGetVar(*v, name);
-	if (*v == NULL) {
-		DEBUG(1,("ejs_pull_struct_start: missing structure '%s'\n", name));
-		return NT_STATUS_INVALID_PARAMETER;
-	}
-	return NT_STATUS_OK;
+	return mprGetVar(v, name);
 }
 
 
@@ -142,12 +137,7 @@ NTSTATUS ejs_pull_struct_start(struct ejs_rpc *ejs, struct MprVar **v, const cha
 NTSTATUS ejs_push_struct_start(struct ejs_rpc *ejs, struct MprVar **v, const char *name)
 {
 	NDR_CHECK(mprSetVar(*v, name, mprCreateObjVar(name, MPR_DEFAULT_HASH_SIZE)));
-	*v = mprGetVar(*v, name);
-	if (*v == NULL) {
-		DEBUG(1,("ejs_push_struct_start: missing structure '%s'\n", name));
-		return NT_STATUS_INVALID_PARAMETER;
-	}
-	return NT_STATUS_OK;
+	return mprGetVar(v, name);
 }
 
 /*
@@ -156,13 +146,8 @@ NTSTATUS ejs_push_struct_start(struct ejs_rpc *ejs, struct MprVar **v, const cha
 NTSTATUS ejs_pull_uint8(struct ejs_rpc *ejs, 
 			struct MprVar *v, const char *name, uint8_t *r)
 {
-	struct MprVar *var;
-	var = mprGetVar(v, name);
-	if (var == NULL) {
-		DEBUG(1,("ejs_pull_uint8: unable to find '%s'\n", name));
-		return NT_STATUS_INVALID_PARAMETER_MIX;
-	}
-	*r = mprVarToInteger(var);
+	NDR_CHECK(mprGetVar(&v, name));
+	*r = mprVarToInteger(v);
 	return NT_STATUS_OK;
 	
 }
@@ -179,13 +164,8 @@ NTSTATUS ejs_push_uint8(struct ejs_rpc *ejs,
 NTSTATUS ejs_pull_uint16(struct ejs_rpc *ejs, 
 			 struct MprVar *v, const char *name, uint16_t *r)
 {
-	struct MprVar *var;
-	var = mprGetVar(v, name);
-	if (var == NULL) {
-		DEBUG(1,("ejs_pull_uint16: unable to find '%s'\n", name));
-		return NT_STATUS_INVALID_PARAMETER_MIX;
-	}
-	*r = mprVarToInteger(var);
+	NDR_CHECK(mprGetVar(&v, name));
+	*r = mprVarToInteger(v);
 	return NT_STATUS_OK;
 	
 }
@@ -202,13 +182,8 @@ NTSTATUS ejs_push_uint16(struct ejs_rpc *ejs,
 NTSTATUS ejs_pull_uint32(struct ejs_rpc *ejs, 
 			 struct MprVar *v, const char *name, uint32_t *r)
 {
-	struct MprVar *var;
-	var = mprGetVar(v, name);
-	if (var == NULL) {
-		DEBUG(1,("ejs_push_uint32: unable to find '%s'\n", name));
-		return NT_STATUS_INVALID_PARAMETER_MIX;
-	}
-	*r = mprVarToInteger(var);
+	NDR_CHECK(mprGetVar(&v, name));
+	*r = mprVarToInteger(v);
 	return NT_STATUS_OK;
 }
 
@@ -218,16 +193,28 @@ NTSTATUS ejs_push_uint32(struct ejs_rpc *ejs,
 	return mprSetVar(v, name, mprCreateIntegerVar(*r));
 }
 
+/*
+  pull a int32 from a mpr variable to a C element
+*/
+NTSTATUS ejs_pull_int32(struct ejs_rpc *ejs, 
+			 struct MprVar *v, const char *name, int32_t *r)
+{
+	NDR_CHECK(mprGetVar(&v, name));
+	*r = mprVarToInteger(v);
+	return NT_STATUS_OK;
+}
+
+NTSTATUS ejs_push_int32(struct ejs_rpc *ejs, 
+			 struct MprVar *v, const char *name, const int32_t *r)
+{
+	return mprSetVar(v, name, mprCreateIntegerVar(*r));
+}
+
 NTSTATUS ejs_pull_hyper(struct ejs_rpc *ejs, 
 			struct MprVar *v, const char *name, uint64_t *r)
 {
-	struct MprVar *var;
-	var = mprGetVar(v, name);
-	if (var == NULL) {
-		DEBUG(1,("ejs_pull_hyper: unable to find '%s'\n", name));
-		return NT_STATUS_INVALID_PARAMETER_MIX;
-	}
-	*r = mprVarToInteger(var);
+	NDR_CHECK(mprGetVar(&v, name));
+	*r = mprVarToInteger(v);
 	return NT_STATUS_OK;
 }
 
@@ -240,13 +227,8 @@ NTSTATUS ejs_push_hyper(struct ejs_rpc *ejs,
 NTSTATUS ejs_pull_dlong(struct ejs_rpc *ejs, 
 			struct MprVar *v, const char *name, uint64_t *r)
 {
-	struct MprVar *var;
-	var = mprGetVar(v, name);
-	if (var == NULL) {
-		DEBUG(1,("ejs_pull_dlong: unable to find '%s'\n", name));
-		return NT_STATUS_INVALID_PARAMETER_MIX;
-	}
-	*r = mprVarToInteger(var);
+	NDR_CHECK(mprGetVar(&v, name));
+	*r = mprVarToInteger(v);
 	return NT_STATUS_OK;
 }
 
@@ -259,13 +241,8 @@ NTSTATUS ejs_push_dlong(struct ejs_rpc *ejs,
 NTSTATUS ejs_pull_udlong(struct ejs_rpc *ejs, 
 			struct MprVar *v, const char *name, uint64_t *r)
 {
-	struct MprVar *var;
-	var = mprGetVar(v, name);
-	if (var == NULL) {
-		DEBUG(1,("ejs_pull_udlong: unable to find '%s'\n", name));
-		return NT_STATUS_INVALID_PARAMETER_MIX;
-	}
-	*r = mprVarToInteger(var);
+	NDR_CHECK(mprGetVar(&v, name));
+	*r = mprVarToInteger(v);
 	return NT_STATUS_OK;
 }
 
@@ -278,13 +255,8 @@ NTSTATUS ejs_push_udlong(struct ejs_rpc *ejs,
 NTSTATUS ejs_pull_NTTIME(struct ejs_rpc *ejs, 
 			struct MprVar *v, const char *name, uint64_t *r)
 {
-	struct MprVar *var;
-	var = mprGetVar(v, name);
-	if (var == NULL) {
-		DEBUG(1,("ejs_pull_NTTIME: unable to find '%s'\n", name));
-		return NT_STATUS_INVALID_PARAMETER_MIX;
-	}
-	*r = mprVarToInteger(var);
+	NDR_CHECK(mprGetVar(&v, name));
+	*r = mprVarToInteger(v);
 	return NT_STATUS_OK;
 }
 
@@ -302,13 +274,8 @@ NTSTATUS ejs_push_NTTIME(struct ejs_rpc *ejs,
 NTSTATUS ejs_pull_enum(struct ejs_rpc *ejs, 
 		       struct MprVar *v, const char *name, unsigned *r)
 {
-	struct MprVar *var;
-	var = mprGetVar(v, name);
-	if (var == NULL) {
-		DEBUG(1,("ejs_pull_enum: unable to find '%s'\n", name));
-		return NT_STATUS_INVALID_PARAMETER_MIX;
-	}
-	*r = mprVarToInteger(var);
+	NDR_CHECK(mprGetVar(&v, name));
+	*r = mprVarToInteger(v);
 	return NT_STATUS_OK;
 	
 }
@@ -326,13 +293,8 @@ NTSTATUS ejs_push_enum(struct ejs_rpc *ejs,
 NTSTATUS ejs_pull_string(struct ejs_rpc *ejs, 
 			 struct MprVar *v, const char *name, const char **s)
 {
-	struct MprVar *var;
-	var = mprGetVar(v, name);
-	if (var == NULL) {
-		DEBUG(1,("ejs_pull_string: unable to find '%s'\n", name));
-		return NT_STATUS_INVALID_PARAMETER_MIX;
-	}
-	*s = mprToString(var);
+	NDR_CHECK(mprGetVar(&v, name));
+	*s = mprToString(v);
 	return NT_STATUS_OK;
 }
 
@@ -367,14 +329,9 @@ void ejs_set_constant_string(int eid, const char *name, const char *value)
 NTSTATUS ejs_pull_dom_sid(struct ejs_rpc *ejs, 
 			  struct MprVar *v, const char *name, struct dom_sid *r)
 {
-	struct MprVar *var;
 	struct dom_sid *sid;
-	var = mprGetVar(v, name);
-	if (var == NULL) {
-		DEBUG(1,("ejs_pull_dom_sid: unable to find '%s'\n", name));
-		return NT_STATUS_INVALID_PARAMETER_MIX;
-	}
-	sid = dom_sid_parse_talloc(ejs, mprToString(var));
+	NDR_CHECK(mprGetVar(&v, name));
+	sid = dom_sid_parse_talloc(ejs, mprToString(v));
 	NT_STATUS_HAVE_NO_MEMORY(sid);
 	*r = *sid;
 	return NT_STATUS_OK;
@@ -391,13 +348,8 @@ NTSTATUS ejs_push_dom_sid(struct ejs_rpc *ejs,
 NTSTATUS ejs_pull_GUID(struct ejs_rpc *ejs, 
 		       struct MprVar *v, const char *name, struct GUID *r)
 {
-	struct MprVar *var;
-	var = mprGetVar(v, name);
-	if (var == NULL) {
-		DEBUG(1,("ejs_pull_GUID: unable to find '%s'\n", name));
-		return NT_STATUS_INVALID_PARAMETER_MIX;
-	}
-	return GUID_from_string(mprToString(var), r);
+	NDR_CHECK(mprGetVar(&v, name));
+	return GUID_from_string(mprToString(v), r);
 }
 
 NTSTATUS ejs_push_GUID(struct ejs_rpc *ejs, 
@@ -415,9 +367,9 @@ NTSTATUS ejs_push_null(struct ejs_rpc *ejs, struct MprVar *v, const char *name)
 
 BOOL ejs_pull_null(struct ejs_rpc *ejs, struct MprVar *v, const char *name)
 {
-	v = mprGetVar(v, name);
-	if (v == NULL) {
-		return True;
+	NTSTATUS status = mprGetVar(&v, name);
+	if (!NT_STATUS_IS_OK(status)) {
+		return False;
 	}
 	if (v->type == MPR_TYPE_PTR && v->ptr == NULL) {
 		return True;
@@ -442,3 +394,4 @@ NTSTATUS ejs_push_lsa_String(struct ejs_rpc *ejs,
 {
 	return ejs_push_string(ejs, v, name, r->string);
 }
+
diff --git a/source4/scripting/ejs/ejsrpc.h b/source4/scripting/ejs/ejsrpc.h
index 44b4b7dd96..6914988bc8 100644
--- a/source4/scripting/ejs/ejsrpc.h
+++ b/source4/scripting/ejs/ejsrpc.h
@@ -61,6 +61,10 @@ NTSTATUS ejs_push_uint16(struct ejs_rpc *ejs,
 			 struct MprVar *v, const char *name, const uint16_t *r);
 NTSTATUS ejs_pull_uint32(struct ejs_rpc *ejs, 
 			 struct MprVar *v, const char *name, uint32_t *r);
+NTSTATUS ejs_push_int32(struct ejs_rpc *ejs, 
+			 struct MprVar *v, const char *name, const int32_t *r);
+NTSTATUS ejs_pull_int32(struct ejs_rpc *ejs, 
+			 struct MprVar *v, const char *name, int32_t *r);
 NTSTATUS ejs_push_uint32(struct ejs_rpc *ejs, 
 			 struct MprVar *v, const char *name, const uint32_t *r);
 NTSTATUS ejs_pull_hyper(struct ejs_rpc *ejs, 
-- 
cgit 


From 76ecf81428c161a98a5621b55a64cb8515f80585 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Sun, 10 Jul 2005 01:10:09 +0000
Subject: r8273: fixed some memory leaks in smbscript. This required converting
 file_load() to use talloc, which impacted quite a few bits of code, including
 our smb.conf processing.

took the opportunity to remove the gloabls in params.c while doing this
(This used to be commit b220756cb4f1d201ba3e771ca67e4bfae5eae748)
---
 source4/scripting/ejs/ejsrpc.c       | 21 ---------------------
 source4/scripting/ejs/ejsrpc.h       |  2 --
 source4/scripting/ejs/smbcalls_rpc.c | 19 ++++++++++++++-----
 source4/scripting/ejs/smbscript.c    |  3 ++-
 4 files changed, 16 insertions(+), 29 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/ejsrpc.c b/source4/scripting/ejs/ejsrpc.c
index cd7e0c9211..f2c2b258e4 100644
--- a/source4/scripting/ejs/ejsrpc.c
+++ b/source4/scripting/ejs/ejsrpc.c
@@ -26,27 +26,6 @@
 #include "librpc/gen_ndr/ndr_lsa.h"
 #include "scripting/ejs/ejsrpc.h"
 
-NTSTATUS ejs_pull_rpc(int eid, const char *callname, 
-		      struct MprVar *v, void *ptr, ejs_pull_function_t ejs_pull)
-{
-	struct ejs_rpc *ejs = talloc(ptr, struct ejs_rpc);	
-	NT_STATUS_HAVE_NO_MEMORY(ejs);
-	ejs->eid = eid;
-	ejs->callname = callname;
-	return ejs_pull(ejs, v, ptr);
-}
-
-
-NTSTATUS ejs_push_rpc(int eid, const char *callname, 
-		      struct MprVar *v, const void *ptr, ejs_push_function_t ejs_push)
-{
-	struct ejs_rpc *ejs = talloc(ptr, struct ejs_rpc);
-	NT_STATUS_HAVE_NO_MEMORY(ejs);
-	ejs->eid = eid;
-	ejs->callname = callname;
-	return ejs_push(ejs, v, ptr);
-}
-
 /*
   set the switch var to be used by the next union switch
 */
diff --git a/source4/scripting/ejs/ejsrpc.h b/source4/scripting/ejs/ejsrpc.h
index 6914988bc8..e410535b6c 100644
--- a/source4/scripting/ejs/ejsrpc.h
+++ b/source4/scripting/ejs/ejsrpc.h
@@ -46,8 +46,6 @@ NTSTATUS smbcalls_register_ejs(const char *name,
 int ejs_rpc_call(int eid, int argc, struct MprVar **argv, const char *callname,
 		 ejs_pull_function_t ejs_pull, ejs_push_function_t ejs_push);
 
-NTSTATUS ejs_pull_rpc(int eid, const char *callname, struct MprVar *v, void *ptr, ejs_pull_function_t ejs_pull);
-NTSTATUS ejs_push_rpc(int eid, const char *callname, struct MprVar *v, const void *ptr, ejs_push_function_t ejs_push);
 NTSTATUS ejs_pull_struct_start(struct ejs_rpc *ejs, struct MprVar **v, const char *name);
 NTSTATUS ejs_push_struct_start(struct ejs_rpc *ejs, struct MprVar **v, const char *name);
 
diff --git a/source4/scripting/ejs/smbcalls_rpc.c b/source4/scripting/ejs/smbcalls_rpc.c
index 12b0d95e8e..8a5389fbab 100644
--- a/source4/scripting/ejs/smbcalls_rpc.c
+++ b/source4/scripting/ejs/smbcalls_rpc.c
@@ -105,6 +105,7 @@ done:
 	void *ptr;
 	struct rpc_request *req;
 	int callnum;
+	struct ejs_rpc *ejs;
 
 	if (argc != 2 ||
 	    argv[0]->type != MPR_TYPE_OBJECT ||
@@ -132,15 +133,24 @@ done:
 	}
 	callnum = call - iface->calls;
 
+	ejs = talloc(mprMemCtx(), struct ejs_rpc);
+	if (ejs == NULL) {
+		status = NT_STATUS_NO_MEMORY;
+		goto done;
+	}
+
+	ejs->eid = eid;
+	ejs->callname = callname;
+
 	/* allocate the C structure */
-	ptr = talloc_zero_size(mprMemCtx(), call->struct_size);
+	ptr = talloc_zero_size(ejs, call->struct_size);
 	if (ptr == NULL) {
 		status = NT_STATUS_NO_MEMORY;
 		goto done;
 	}
 
 	/* convert the mpr object into a C structure */
-	status = ejs_pull_rpc(eid, callname, io, ptr, ejs_pull);
+	status = ejs_pull(ejs, io, ptr);
 	if (!NT_STATUS_IS_OK(status)) {
 		goto done;
 	}
@@ -154,7 +164,6 @@ done:
 	req = dcerpc_ndr_request_send(p, NULL, iface, callnum, ptr, ptr);
 	if (req == NULL) {
 		status = NT_STATUS_NO_MEMORY;
-		talloc_free(ptr);
 		goto done;
 	}
 	status = dcerpc_ndr_request_recv(req);
@@ -164,10 +173,10 @@ done:
 		ndr_print_function_debug(call->ndr_print, call->name, NDR_OUT, ptr);
 	}
 
-	status = ejs_push_rpc(eid, callname, io, ptr, ejs_push);
+	status = ejs_push(ejs, io, ptr);
 
-	talloc_free(ptr);
 done:
+	talloc_free(ejs);
 	ejsSetReturnValue(eid, mprNTSTATUS(status));
 	if (NT_STATUS_EQUAL(status, NT_STATUS_INTERNAL_ERROR)) {
 		return -1;
diff --git a/source4/scripting/ejs/smbscript.c b/source4/scripting/ejs/smbscript.c
index 244ae0b42a..f7556b5384 100644
--- a/source4/scripting/ejs/smbscript.c
+++ b/source4/scripting/ejs/smbscript.c
@@ -94,12 +94,13 @@ void ejs_exception(const char *reason)
 	for (i=1;argv[i];i++) {
 		argv_list = str_list_add(argv_list, argv[i]);
 	}
+	talloc_steal(mem_ctx, argv_list);
 	v = mprList("ARGV", argv_list);
 	mprSetPropertyValue(&v, "length", mprCreateIntegerVar(i-1));
 	mprCreateProperty(ejsGetGlobalObject(eid), "ARGV", &v);
 
 	/* load the script and advance past interpreter line*/
-	script = file_load(fname, &script_size);
+	script = file_load(fname, &script_size, mem_ctx);
 
 	if ((script_size > 2) && script[0] == '#' && script[1] == '!') {
 		script += 2;
-- 
cgit 


From 60ec75cbc7dccfceec9c57799e2af5be21a08609 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Sun, 10 Jul 2005 02:37:50 +0000
Subject: r8276: fixed the remaining memory leaks in smbscript. We can now loop
 doing lots of rpc calls without memory usage increasing. (This used to be
 commit 9c885a7edb771486793eb287288158157b34e8f3)

---
 source4/scripting/ejs/ejsrpc.c          |  59 +--------------
 source4/scripting/ejs/mprutil.c         | 126 ++++++++++++++++++++++++--------
 source4/scripting/ejs/smbcalls.c        |  15 ++--
 source4/scripting/ejs/smbcalls.h        |   6 +-
 source4/scripting/ejs/smbcalls_cli.c    |  30 ++++----
 source4/scripting/ejs/smbcalls_config.c |  12 +--
 source4/scripting/ejs/smbcalls_ldb.c    |   3 +-
 source4/scripting/ejs/smbcalls_nbt.c    |   3 +-
 source4/scripting/ejs/smbcalls_rpc.c    |   5 +-
 source4/scripting/ejs/smbscript.c       |   3 +-
 10 files changed, 138 insertions(+), 124 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/ejsrpc.c b/source4/scripting/ejs/ejsrpc.c
index f2c2b258e4..8b6bc328dd 100644
--- a/source4/scripting/ejs/ejsrpc.c
+++ b/source4/scripting/ejs/ejsrpc.c
@@ -22,6 +22,7 @@
 
 #include "includes.h"
 #include "lib/ejs/ejs.h"
+#include "scripting/ejs/smbcalls.h"
 #include "librpc/gen_ndr/ndr_security.h"
 #include "librpc/gen_ndr/ndr_lsa.h"
 #include "scripting/ejs/ejsrpc.h"
@@ -43,64 +44,6 @@ NTSTATUS ejs_panic(struct ejs_rpc *ejs, const char *why)
 	return NT_STATUS_INTERNAL_ERROR;
 }
 
-/*
-  find a mpr component, allowing for sub objects, using the '.' convention
-*/
-static NTSTATUS mprGetVar(struct MprVar **v, const char *name)
-{
-	const char *p = strchr(name, '.');
-	char *objname;
-	NTSTATUS status;
-	if (p == NULL) {
-		*v = mprGetProperty(*v, name, NULL);
-		if (*v == NULL) {
-			DEBUG(1,("mprGetVar unable to find '%s'\n", name));
-			return NT_STATUS_INVALID_PARAMETER;
-		}
-		return NT_STATUS_OK;
-	}
-	objname = talloc_strndup(mprMemCtx(), name, p-name);
-	NT_STATUS_HAVE_NO_MEMORY(objname);
-	*v = mprGetProperty(*v, objname, NULL);
-	NT_STATUS_HAVE_NO_MEMORY(*v);
-	status = mprGetVar(v, p+1);
-	talloc_free(objname);
-	return status;
-}
-
-
-/*
-  set a mpr component, allowing for sub objects, using the '.' convention
-*/
-static NTSTATUS mprSetVar(struct MprVar *v, const char *name, struct MprVar val)
-{
-	const char *p = strchr(name, '.');
-	char *objname;
-	struct MprVar *v2;
-	NTSTATUS status;
-	if (p == NULL) {
-		v2 = mprSetProperty(v, name, &val);
-		if (v2 == NULL) {
-			DEBUG(1,("mprSetVar unable to set '%s'\n", name));
-			return NT_STATUS_INVALID_PARAMETER_MIX;
-		}
-		return NT_STATUS_OK;
-	}
-	objname = talloc_strndup(mprMemCtx(), name, p-name);
-	if (objname == NULL) {
-		return NT_STATUS_NO_MEMORY;
-	}
-	v2 = mprGetProperty(v, objname, NULL);
-	if (v2 == NULL) {
-		struct MprVar val2 = mprCreateObjVar(objname, MPR_DEFAULT_HASH_SIZE);
-		v2 = mprCreateProperty(v, objname, &val2);
-	}
-	status = mprSetVar(v2, p+1, val);
-	talloc_free(objname);
-	return status;
-}
-
-
 /*
   start the ejs pull process for a structure
 */
diff --git a/source4/scripting/ejs/mprutil.c b/source4/scripting/ejs/mprutil.c
index 7b64d042f5..3c28cb4bf1 100644
--- a/source4/scripting/ejs/mprutil.c
+++ b/source4/scripting/ejs/mprutil.c
@@ -24,6 +24,67 @@
 #include "lib/ejs/ejs.h"
 #include "lib/ldb/include/ldb.h"
 
+/*
+  find a mpr component, allowing for sub objects, using the '.' convention
+*/
+ NTSTATUS mprGetVar(struct MprVar **v, const char *name)
+{
+	const char *p = strchr(name, '.');
+	char *objname;
+	NTSTATUS status;
+	if (p == NULL) {
+		*v = mprGetProperty(*v, name, NULL);
+		if (*v == NULL) {
+			DEBUG(1,("mprGetVar unable to find '%s'\n", name));
+			return NT_STATUS_INVALID_PARAMETER;
+		}
+		return NT_STATUS_OK;
+	}
+	objname = talloc_strndup(mprMemCtx(), name, p-name);
+	NT_STATUS_HAVE_NO_MEMORY(objname);
+	*v = mprGetProperty(*v, objname, NULL);
+	NT_STATUS_HAVE_NO_MEMORY(*v);
+	status = mprGetVar(v, p+1);
+	talloc_free(objname);
+	return status;
+}
+
+
+/*
+  set a mpr component, allowing for sub objects, using the '.' convention
+  destroys 'val' after setting
+*/
+ NTSTATUS mprSetVar(struct MprVar *v, const char *name, struct MprVar val)
+{
+	const char *p = strchr(name, '.');
+	char *objname;
+	struct MprVar *v2;
+	NTSTATUS status;
+	if (p == NULL) {
+		v2 = mprSetProperty(v, name, &val);
+		if (v2 == NULL) {
+			DEBUG(1,("mprSetVar unable to set '%s'\n", name));
+			return NT_STATUS_INVALID_PARAMETER_MIX;
+		}
+		mprDestroyVar(&val);
+		return NT_STATUS_OK;
+	}
+	objname = talloc_strndup(mprMemCtx(), name, p-name);
+	if (objname == NULL) {
+		return NT_STATUS_NO_MEMORY;
+	}
+	v2 = mprGetProperty(v, objname, NULL);
+	if (v2 == NULL) {
+		mprSetVar(v, objname, mprCreateObjVar(objname, MPR_DEFAULT_HASH_SIZE));
+		v2 = mprGetProperty(v, objname, NULL);
+	}
+	status = mprSetVar(v2, p+1, val);
+	talloc_free(objname);
+	return status;
+}
+
+
+
 /*
   add an indexed array element to a property
 */
@@ -31,7 +92,7 @@ static void mprAddArray(struct MprVar *var, int i, struct MprVar v)
 {
 	char idx[16];
 	mprItoa(i, idx, sizeof(idx));
-	mprCreateProperty(var, idx, &v);
+	mprSetVar(var, idx, v);
 }
 
 /*
@@ -76,12 +137,12 @@ struct MprVar mprLdbMessage(struct ldb_message *msg)
 	   need a special case for the single value case */
 	const char *multivalued[] = { "objectClass", "memberOf", "privilege", 
 					    "member", NULL };
-	struct MprVar val;
 
 	var = mprCreateObjVar(msg->dn, MPR_DEFAULT_HASH_SIZE);
 
 	for (i=0;i<msg->num_elements;i++) {
 		struct ldb_message_element *el = &msg->elements[i];
+		struct MprVar val;
 		if (el->num_values == 1 &&
 		    !str_list_check_ci(multivalued, el->name)) {
 			val = mprData(el->values[0].data, el->values[0].length);
@@ -94,13 +155,12 @@ struct MprVar mprLdbMessage(struct ldb_message *msg)
 						    el->values[j].length));
 			}
 		}
-		mprCreateProperty(&var, el->name, &val);
+		mprSetVar(&var, el->name, val);
 	}
 
 	/* add the dn if it is not already specified */
 	if (mprGetProperty(&var, "dn", 0) == 0) {
-		val = mprCreateStringVar(msg->dn, 1);
-		mprCreateProperty(&var, "dn", &val);
+		mprSetVar(&var, "dn", mprCreateStringVar(msg->dn, 1));
 	}
 	
 	return var;		
@@ -172,21 +232,14 @@ const char **mprToList(TALLOC_CTX *mem_ctx, struct MprVar *v)
 */
 struct MprVar mprNTSTATUS(NTSTATUS status)
 {
-	struct MprVar res, val;
+	struct MprVar res;
 
 	res = mprCreateObjVar("ntstatus", MPR_DEFAULT_HASH_SIZE);
 
-	val = mprCreateStringVar(nt_errstr(status), 1);
-	mprCreateProperty(&res, "errstr", &val);
-
-	val = mprCreateIntegerVar(NT_STATUS_V(status));
-	mprCreateProperty(&res, "v", &val);
-
-	val = mprCreateBoolVar(NT_STATUS_IS_OK(status));
-	mprCreateProperty(&res, "is_ok", &val);
-
-	val = mprCreateBoolVar(NT_STATUS_IS_ERR(status));
-	mprCreateProperty(&res, "is_err", &val);
+	mprSetVar(&res, "errstr", mprCreateStringVar(nt_errstr(status), 1));
+	mprSetVar(&res, "v", mprCreateIntegerVar(NT_STATUS_V(status)));
+	mprSetVar(&res, "is_ok", mprCreateBoolVar(NT_STATUS_IS_OK(status)));
+	mprSetVar(&res, "is_err", mprCreateBoolVar(NT_STATUS_IS_ERR(status)));
 
 	return res;
 }
@@ -196,21 +249,14 @@ struct MprVar mprNTSTATUS(NTSTATUS status)
 */
 struct MprVar mprWERROR(WERROR status)
 {
-	struct MprVar res, val;
+	struct MprVar res;
 
 	res = mprCreateObjVar("werror", MPR_DEFAULT_HASH_SIZE);
 
-	val = mprCreateStringVar(win_errstr(status), 1);
-	mprCreateProperty(&res, "errstr", &val);
-
-	val = mprCreateIntegerVar(W_ERROR_V(status));
-	mprCreateProperty(&res, "v", &val);
-
-	val = mprCreateBoolVar(W_ERROR_IS_OK(status));
-	mprCreateProperty(&res, "is_ok", &val);
-
-	val = mprCreateBoolVar(True);
-	mprCreateProperty(&res, "is_err", &val);
+	mprSetVar(&res, "errstr", mprCreateStringVar(win_errstr(status), 1));
+	mprSetVar(&res, "v", mprCreateIntegerVar(W_ERROR_V(status)));
+	mprSetVar(&res, "is_ok", mprCreateBoolVar(W_ERROR_IS_OK(status)));
+	mprSetVar(&res, "is_err", mprCreateBoolVar(!W_ERROR_IS_OK(status)));
 
 	return res;
 }
@@ -221,8 +267,7 @@ struct MprVar mprWERROR(WERROR status)
 */
 void mprSetPtr(struct MprVar *v, const char *propname, const void *p)
 {
-	struct MprVar val = mprCreatePtrVar(discard_const(p), NULL);
-	mprCreateProperty(v, propname, &val);
+	mprSetVar(v, propname, mprCreatePtrVar(discard_const(p), NULL));
 }
 
 /*
@@ -240,3 +285,22 @@ void *mprGetPtr(struct MprVar *v, const char *propname)
 	}
 	return val->ptr;
 }
+
+/*
+  set the return value then free the variable
+*/
+ void mpr_Return(int eid, struct MprVar v)
+{ 
+	ejsSetReturnValue(eid, v);
+	mprDestroyVar(&v);
+}
+
+/*
+  set the return value then free the variable
+*/
+void mpr_ReturnString(int eid, const char *s)
+{ 
+	mpr_Return(eid, mprCreateStringVar(s, False));
+}
+
+
diff --git a/source4/scripting/ejs/smbcalls.c b/source4/scripting/ejs/smbcalls.c
index d8bb0c20a5..75702e4e76 100644
--- a/source4/scripting/ejs/smbcalls.c
+++ b/source4/scripting/ejs/smbcalls.c
@@ -24,6 +24,7 @@
 #include "includes.h"
 #include "lib/ejs/ejs.h"
 #include "auth/auth.h"
+#include "scripting/ejs/smbcalls.h"
 
 /*
   return the type of a variable
@@ -60,16 +61,16 @@ static int ejs_typeof(MprVarHandle eid, int argc, struct MprVar **argv)
 	}
 	if (type == NULL) return -1;
 
-	ejsSetReturnString(eid, type);
+	mpr_ReturnString(eid, type);
 	return 0;
 }
 
 /*
   setup a return of a string list
 */
- void ejs_returnlist(MprVarHandle eid, const char *name, const char **list)
+void ejs_returnlist(int eid, const char *name, const char **list)
 {
-	ejsSetReturnValue(eid, mprList(name, list));
+	mpr_Return(eid, mprList(name, list));
 }
 
 static int ejs_systemAuth(TALLOC_CTX *tmp_ctx, struct MprVar *auth, const char *username, const char *password, const char *domain, const char *remote_host)
@@ -158,7 +159,7 @@ static int ejs_userAuth(MprVarHandle eid, int argc, struct MprVar **argv)
 		mprSetPropertyValue(&auth, "report", mprCreateStringVar("Unknown Domain", 1));
 	}
 
-	ejsSetReturnValue(eid, auth);
+	mpr_Return(eid, auth);
 	talloc_free(tmp_ctx);
 	return 0;
 }
@@ -166,7 +167,6 @@ static int ejs_userAuth(MprVarHandle eid, int argc, struct MprVar **argv)
 static int ejs_domain_list(MprVarHandle eid, int argc, char **argv)
 {
 	struct MprVar list;
-	struct MprVar dom;
 
 	if (argc != 0) {
 		ejsSetErrorMsg(eid, "domList invalid arguments");
@@ -174,10 +174,9 @@ static int ejs_domain_list(MprVarHandle eid, int argc, char **argv)
 	}
 
 	list = mprCreateObjVar("list", MPR_DEFAULT_HASH_SIZE);
-	dom = mprCreateStringVar("System User", 1);
-	mprCreateProperty(&list, "0", &dom);
+	mprSetVar(&list, "0", mprCreateStringVar("System User", 1));
 
-	ejsSetReturnValue(eid, list);
+	mpr_Return(eid, list);
 
 	return 0;
 }
diff --git a/source4/scripting/ejs/smbcalls.h b/source4/scripting/ejs/smbcalls.h
index 8b26e13873..c16b65b3c1 100644
--- a/source4/scripting/ejs/smbcalls.h
+++ b/source4/scripting/ejs/smbcalls.h
@@ -22,4 +22,8 @@
 
 #include "lib/ejs/ejs.h"
 
-void ejs_returnlist(MprVarHandle eid, const char *name, const char **list);
+void mpr_Return(int eid, struct MprVar);
+NTSTATUS mprSetVar(struct MprVar *v, const char *name, struct MprVar val);
+NTSTATUS mprGetVar(struct MprVar **v, const char *name);
+
+
diff --git a/source4/scripting/ejs/smbcalls_cli.c b/source4/scripting/ejs/smbcalls_cli.c
index ca8fbd3ea2..8d00b80362 100644
--- a/source4/scripting/ejs/smbcalls_cli.c
+++ b/source4/scripting/ejs/smbcalls_cli.c
@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "scripting/ejs/smbcalls.h"
 #include "lib/ejs/ejs.h"
 #include "libcli/raw/libcliraw.h"
 #include "libcli/composite/composite.h"
@@ -79,13 +80,13 @@ static int ejs_cli_connect(MprVarHandle eid, int argc, char **argv)
 	result = smb_raw_negotiate(transport, lp_maxprotocol());
 
 	if (!NT_STATUS_IS_OK(result)) {
-		ejsSetReturnValue(eid, mprNTSTATUS(result));
+		mpr_Return(eid, mprNTSTATUS(result));
 		return 0;
 	}
 
 	/* Return a socket object */
 
-	ejsSetReturnValue(eid, mprCreatePtrVar(transport, 
+	mpr_Return(eid, mprCreatePtrVar(transport, 
 					       talloc_get_name(transport)));
 
 	return 0;
@@ -213,7 +214,7 @@ static int ejs_cli_ssetup(MprVarHandle eid, int argc, MprVar **argv)
 
 	/* Return a session object */
 
-	ejsSetReturnValue(eid, mprCreatePtrVar(session, 
+	mpr_Return(eid, mprCreatePtrVar(session, 
 					       talloc_get_name(session)));
 
 	result = 0;
@@ -296,7 +297,7 @@ static int ejs_cli_tree_connect(MprVarHandle eid, int argc, MprVar **argv)
 
 	talloc_free(mem_ctx);	
 
-	ejsSetReturnValue(eid, mprCreatePtrVar(tree, 
+	mpr_Return(eid, mprCreatePtrVar(tree, 
 					       talloc_get_name(tree)));
 
 	return 0;
@@ -441,11 +442,11 @@ static int ejs_tree_connect(MprVarHandle eid, int argc, char **argv)
 	talloc_free(mem_ctx);
 
 	if (!NT_STATUS_IS_OK(result)) {
-		ejsSetReturnValue(eid, mprNTSTATUS(result));
+		mpr_Return(eid, mprNTSTATUS(result));
 		return 0;
 	}
 
-	ejsSetReturnValue(eid, mprCreatePtrVar(tree, talloc_get_name(tree)));
+	mpr_Return(eid, mprCreatePtrVar(tree, talloc_get_name(tree)));
 
 	return 0;
 }
@@ -478,7 +479,7 @@ static int ejs_tree_disconnect(MprVarHandle eid, int argc, MprVar **argv)
 
 	result = smb_tree_disconnect(tree);
 
-	ejsSetReturnValue(eid, mprNTSTATUS(result));
+	mpr_Return(eid, mprNTSTATUS(result));
 
 	return 0;
 }
@@ -512,7 +513,7 @@ static int ejs_mkdir(MprVarHandle eid, int argc, MprVar **argv)
 
 	result = smbcli_mkdir(tree, argv[1]->string);
 
-	ejsSetReturnValue(eid, mprNTSTATUS(result));
+	mpr_Return(eid, mprNTSTATUS(result));
 
 	return 0;
 }
@@ -546,7 +547,7 @@ static int ejs_rmdir(MprVarHandle eid, int argc, MprVar **argv)
 	
 	result = smbcli_rmdir(tree, argv[1]->string);
 
-	ejsSetReturnValue(eid, mprNTSTATUS(result));
+	mpr_Return(eid, mprNTSTATUS(result));
 
 	return 0;
 }
@@ -585,7 +586,7 @@ static int ejs_rename(MprVarHandle eid, int argc, MprVar **argv)
 	
 	result = smbcli_rename(tree, argv[1]->string, argv[2]->string);
 
-	ejsSetReturnValue(eid, mprNTSTATUS(result));
+	mpr_Return(eid, mprNTSTATUS(result));
 
 	return 0;
 }
@@ -619,7 +620,7 @@ static int ejs_unlink(MprVarHandle eid, int argc, MprVar **argv)
 	
 	result = smbcli_unlink(tree, argv[1]->string);
 
-	ejsSetReturnValue(eid, mprNTSTATUS(result));
+	mpr_Return(eid, mprNTSTATUS(result));
 
 	return 0;
 }
@@ -633,12 +634,11 @@ static void ejs_list_helper(struct clilist_file_info *info, const char *mask,
 			    void *state)
 
 {
-	MprVar *result = (MprVar *)state, value;
+	MprVar *result = (MprVar *)state;
 	char idx[16];
 
 	mprItoa(result->properties->numDataItems, idx, sizeof(idx));
-	value = mprCreateStringVar(info->name, 1);
-	mprCreateProperty(result, idx, &value);
+	mprSetVar(result, idx, mprCreateStringVar(info->name, 1));
 }
 
 static int ejs_list(MprVarHandle eid, int argc, MprVar **argv)
@@ -678,7 +678,7 @@ static int ejs_list(MprVarHandle eid, int argc, MprVar **argv)
 
 	smbcli_list(tree, mask, attribute, ejs_list_helper, &result);
 
-	ejsSetReturnValue(eid, result);
+	mpr_Return(eid, result);
 
 	return 0;
 }
diff --git a/source4/scripting/ejs/smbcalls_config.c b/source4/scripting/ejs/smbcalls_config.c
index cd0ecbd767..19e7a1c744 100644
--- a/source4/scripting/ejs/smbcalls_config.c
+++ b/source4/scripting/ejs/smbcalls_config.c
@@ -79,7 +79,7 @@ static int ejs_lpGet(MprVarHandle eid, int argc, char **argv)
 			if (type == NULL || option == NULL) return -1;
 			value = lp_get_parametric(snum, type, option);
 			if (value == NULL) return -1;
-			ejsSetReturnString(eid, value);
+			mpr_ReturnString(eid, value);
 			return 0;
 		}
 
@@ -97,7 +97,7 @@ static int ejs_lpGet(MprVarHandle eid, int argc, char **argv)
 		if (type == NULL || option == NULL) return -1;
 		value = lp_get_parametric(-1, type, option);
 		if (value == NULL) return -1;
-		ejsSetReturnString(eid, value);
+		mpr_ReturnString(eid, value);
 		return 0;
 	} else {
 		/* its a global parameter */
@@ -114,18 +114,18 @@ static int ejs_lpGet(MprVarHandle eid, int argc, char **argv)
 	switch (parm->type) {
 	case P_STRING:
 	case P_USTRING:
-		ejsSetReturnString(eid, *(char **)parm_ptr);
+		mpr_ReturnString(eid, *(char **)parm_ptr);
 		break;
 	case P_BOOL:
-		ejsSetReturnValue(eid, mprCreateBoolVar(*(BOOL *)parm_ptr));
+		mpr_Return(eid, mprCreateBoolVar(*(BOOL *)parm_ptr));
 		break;
 	case P_INTEGER:
-		ejsSetReturnValue(eid, mprCreateIntegerVar(*(int *)parm_ptr));
+		mpr_Return(eid, mprCreateIntegerVar(*(int *)parm_ptr));
 		break;
 	case P_ENUM:
 		for (i=0; parm->enum_list[i].name; i++) {
 			if (*(int *)parm_ptr == parm->enum_list[i].value) {
-				ejsSetReturnString(eid, parm->enum_list[i].name);
+				mpr_ReturnString(eid, parm->enum_list[i].name);
 				return 0;
 			}
 		}
diff --git a/source4/scripting/ejs/smbcalls_ldb.c b/source4/scripting/ejs/smbcalls_ldb.c
index cae3857686..414251a31c 100644
--- a/source4/scripting/ejs/smbcalls_ldb.c
+++ b/source4/scripting/ejs/smbcalls_ldb.c
@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "scripting/ejs/smbcalls.h"
 #include "lib/ejs/ejs.h"
 #include "lib/ldb/include/ldb.h"
 
@@ -74,7 +75,7 @@ static int ejs_ldbSearch(MprVarHandle eid, int argc, struct MprVar **argv)
 		goto failed;
 	}
 
-	ejsSetReturnValue(eid, mprLdbArray(res, ret, "ldb_message"));
+	mpr_Return(eid, mprLdbArray(res, ret, "ldb_message"));
 
 	talloc_free(tmp_ctx);
 	return 0;
diff --git a/source4/scripting/ejs/smbcalls_nbt.c b/source4/scripting/ejs/smbcalls_nbt.c
index a82b636c9c..a4dc943f51 100644
--- a/source4/scripting/ejs/smbcalls_nbt.c
+++ b/source4/scripting/ejs/smbcalls_nbt.c
@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "scripting/ejs/smbcalls.h"
 #include "lib/ejs/ejs.h"
 #include "librpc/gen_ndr/ndr_nbt.h"
 
@@ -75,7 +76,7 @@ static int ejs_resolve_name(MprVarHandle eid, int argc, struct MprVar **argv)
 				    mprCreateStringVar(reply_addr, 1));
 	}
 
-	ejsSetReturnValue(eid, mprNTSTATUS(nt_status));
+	mpr_Return(eid, mprNTSTATUS(nt_status));
 
  done:
 	talloc_free(tmp_ctx);
diff --git a/source4/scripting/ejs/smbcalls_rpc.c b/source4/scripting/ejs/smbcalls_rpc.c
index 8a5389fbab..9546dc5b01 100644
--- a/source4/scripting/ejs/smbcalls_rpc.c
+++ b/source4/scripting/ejs/smbcalls_rpc.c
@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "scripting/ejs/smbcalls.h"
 #include "lib/ejs/ejs.h"
 #include "librpc/gen_ndr/ndr_echo.h"
 #include "lib/cmdline/popt_common.h"
@@ -83,7 +84,7 @@ static int ejs_rpc_connect(MprVarHandle eid, int argc, struct MprVar **argv)
 	mprSetPtr(conn, "iface", iface);
 
 done:
-	ejsSetReturnValue(eid, mprNTSTATUS(status));
+	mpr_Return(eid, mprNTSTATUS(status));
 	return 0;
 }
 
@@ -177,7 +178,7 @@ done:
 
 done:
 	talloc_free(ejs);
-	ejsSetReturnValue(eid, mprNTSTATUS(status));
+	mpr_Return(eid, mprNTSTATUS(status));
 	if (NT_STATUS_EQUAL(status, NT_STATUS_INTERNAL_ERROR)) {
 		return -1;
 	}
diff --git a/source4/scripting/ejs/smbscript.c b/source4/scripting/ejs/smbscript.c
index f7556b5384..80ef96e1af 100644
--- a/source4/scripting/ejs/smbscript.c
+++ b/source4/scripting/ejs/smbscript.c
@@ -25,6 +25,7 @@
 #include "lib/cmdline/popt_common.h"
 #include "dynconfig.h"
 #include "lib/ejs/ejs.h"
+#include "scripting/ejs/smbcalls.h"
 
 void ejs_exception(const char *reason)
 {
@@ -97,7 +98,7 @@ void ejs_exception(const char *reason)
 	talloc_steal(mem_ctx, argv_list);
 	v = mprList("ARGV", argv_list);
 	mprSetPropertyValue(&v, "length", mprCreateIntegerVar(i-1));
-	mprCreateProperty(ejsGetGlobalObject(eid), "ARGV", &v);
+	mprSetVar(ejsGetGlobalObject(eid), "ARGV", v);
 
 	/* load the script and advance past interpreter line*/
 	script = file_load(fname, &script_size, mem_ctx);
-- 
cgit 


From f3c6f290f0c2ba84d8dbbae8d6d2bb50330a27c1 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Sun, 10 Jul 2005 06:21:03 +0000
Subject: r8280: - added irpc_connect() for connecting to a irpc server by name

- make the dcerpc pipe in rpc_connect() a talloc child of the ejs
  connection variable. That means when the connection variable goes out
  of scope, the connection is automatically closed. That makes for a
  more natural interface for closing connections in a scripting language
  (tpot, you may wish to use mprSetPtrChild() in your smb glue code too)
(This used to be commit 1c170138a8e82cb42958b88b94a1d567ffa88a92)
---
 source4/scripting/ejs/config.mk      |  2 +-
 source4/scripting/ejs/mprutil.c      |  9 ++++
 source4/scripting/ejs/smbcalls_rpc.c | 79 +++++++++++++++++++++++++++++++++++-
 3 files changed, 87 insertions(+), 3 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/config.mk b/source4/scripting/ejs/config.mk
index fce69fdb55..5c14dccfe3 100644
--- a/source4/scripting/ejs/config.mk
+++ b/source4/scripting/ejs/config.mk
@@ -19,7 +19,7 @@ OBJ_FILES = \
 		scripting/ejs/smbcalls_cli.o \
 		scripting/ejs/smbcalls_rpc.o \
 		scripting/ejs/mprutil.o
-REQUIRED_SUBSYSTEMS = AUTH EJS LIBBASIC EJSRPC
+REQUIRED_SUBSYSTEMS = AUTH EJS LIBBASIC EJSRPC MESSAGING
 # End SUBSYSTEM SMBCALLS
 #######################
 
diff --git a/source4/scripting/ejs/mprutil.c b/source4/scripting/ejs/mprutil.c
index 3c28cb4bf1..c614792d8e 100644
--- a/source4/scripting/ejs/mprutil.c
+++ b/source4/scripting/ejs/mprutil.c
@@ -270,6 +270,15 @@ void mprSetPtr(struct MprVar *v, const char *propname, const void *p)
 	mprSetVar(v, propname, mprCreatePtrVar(discard_const(p), NULL));
 }
 
+/*
+  set a pointer in a existing MprVar, making it a child of the property
+*/
+void mprSetPtrChild(struct MprVar *v, const char *propname, const void *p)
+{
+	mprSetVar(v, propname, mprCreatePtrVar(discard_const(p), NULL));
+	talloc_steal(mprGetProperty(v, propname, NULL), p);
+}
+
 /*
   get a pointer from a MprVar
 */
diff --git a/source4/scripting/ejs/smbcalls_rpc.c b/source4/scripting/ejs/smbcalls_rpc.c
index 9546dc5b01..857d590aa1 100644
--- a/source4/scripting/ejs/smbcalls_rpc.c
+++ b/source4/scripting/ejs/smbcalls_rpc.c
@@ -25,9 +25,81 @@
 #include "lib/ejs/ejs.h"
 #include "librpc/gen_ndr/ndr_echo.h"
 #include "lib/cmdline/popt_common.h"
+#include "lib/messaging/irpc.h"
 #include "scripting/ejs/ejsrpc.h"
 #include "dlinklist.h"
 
+/*
+  state of a irpc 'connection'
+*/
+struct ejs_irpc_connection {
+	const char *server_name;
+	uint32_t *dest_ids;
+	struct messaging_context *msg_ctx;
+};
+
+/*
+  messaging clients need server IDs as well ...
+ */
+#define EJS_ID_BASE 0x30000000
+
+/*
+  setup a context for talking to a irpc server
+     example: 
+        var conn = new Object();
+        status = irpc_connect(conn, "smb_server");
+*/
+static int ejs_irpc_connect(MprVarHandle eid, int argc, struct MprVar **argv)
+{
+	NTSTATUS status;
+	int i;
+	struct MprVar *conn;
+	struct event_context *ev;
+	struct ejs_irpc_connection *p;
+
+	/* validate arguments */
+	if (argc != 2 ||
+	    argv[0]->type != MPR_TYPE_OBJECT ||
+	    argv[1]->type != MPR_TYPE_STRING) {
+		ejsSetErrorMsg(eid, "rpc_connect invalid arguments");
+		return -1;
+	}
+
+	p = talloc(conn, struct ejs_irpc_connection);
+	if (p == NULL) {
+		return -1;
+	}
+
+	conn           = argv[0];
+	p->server_name = mprToString(argv[2]);
+
+	ev = talloc_find_parent_bytype(mprMemCtx(), struct event_context);
+
+	/* create a messaging context, looping as we have no way to
+	   allocate temporary server ids automatically */
+	for (i=0;i<10000;i++) {
+		p->msg_ctx = messaging_init(p, EJS_ID_BASE + i, ev);
+		if (p->msg_ctx) break;
+	}
+	if (p->msg_ctx == NULL) {
+		ejsSetErrorMsg(eid, "irpc_connect unable to create a messaging context");
+		talloc_free(p);
+		return -1;
+	}
+
+	p->dest_ids = irpc_servers_byname(p->msg_ctx, p->server_name);
+	if (p->dest_ids == NULL || p->dest_ids[0] == 0) {
+		talloc_free(p);
+		status = NT_STATUS_OBJECT_NAME_NOT_FOUND;
+	} else {
+		mprSetPtrChild(conn, "pipe", p);
+	}
+
+	mpr_Return(eid, mprNTSTATUS(status));
+	return 0;
+}
+
+
 /*
   connect to an rpc server
      example: 
@@ -72,7 +144,7 @@ static int ejs_rpc_connect(MprVarHandle eid, int argc, struct MprVar **argv)
 
 	ev = talloc_find_parent_bytype(mprMemCtx(), struct event_context);
 
-	status = dcerpc_pipe_connect(mprMemCtx(), &p, binding, 
+	status = dcerpc_pipe_connect(conn, &p, binding, 
 				     iface->uuid, iface->if_version, 
 				     creds, ev);
 	if (!NT_STATUS_IS_OK(status)) goto done;
@@ -80,7 +152,9 @@ static int ejs_rpc_connect(MprVarHandle eid, int argc, struct MprVar **argv)
 	/* callers don't allocate ref vars in the ejs interface */
 	p->conn->flags |= DCERPC_NDR_REF_ALLOC;
 
-	mprSetPtr(conn, "pipe", p);
+	/* by making the pipe a child of the connection variable, it will
+	   auto close when it goes out of scope in the script */
+	mprSetPtrChild(conn, "pipe", p);
 	mprSetPtr(conn, "iface", iface);
 
 done:
@@ -223,6 +297,7 @@ void smb_setup_ejs_rpc(void)
 	struct ejs_register *r;
 
 	ejsDefineCFunction(-1, "rpc_connect", ejs_rpc_connect, NULL, MPR_VAR_SCRIPT_HANDLE);
+	ejsDefineCFunction(-1, "irpc_connect", ejs_irpc_connect, NULL, MPR_VAR_SCRIPT_HANDLE);
 	for (r=ejs_registered;r;r=r->next) {
 		r->setup();
 	}
-- 
cgit 


From 0871be3f351e80de8b97717f7975d98702112376 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Sun, 10 Jul 2005 06:51:00 +0000
Subject: r8281: pass the callnum and rpc interface table directly from the
 generated code in pidl for ejs calls. This means that ejs_rpc_call() doesn't
 need to scan the rpc tables for the right interface, and doesn't need to scan
 for the call name (This used to be commit
 1c6b1102e5c2529206b917e7c6b279c4f63d0e9a)

---
 source4/scripting/ejs/ejsrpc.h       |  3 ++-
 source4/scripting/ejs/smbcalls_rpc.c | 42 ++++++++++++++++++++----------------
 2 files changed, 26 insertions(+), 19 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/ejsrpc.h b/source4/scripting/ejs/ejsrpc.h
index e410535b6c..e4b623750d 100644
--- a/source4/scripting/ejs/ejsrpc.h
+++ b/source4/scripting/ejs/ejsrpc.h
@@ -43,7 +43,8 @@ NTSTATUS smbcalls_register_ejs(const char *name,
 			       ejs_setup_t setup,
 			       ejs_constants_t constants);
 
-int ejs_rpc_call(int eid, int argc, struct MprVar **argv, const char *callname,
+int ejs_rpc_call(int eid, int argc, struct MprVar **argv,
+		 const struct dcerpc_interface_table *iface, int callnum,
 		 ejs_pull_function_t ejs_pull, ejs_push_function_t ejs_push);
 
 NTSTATUS ejs_pull_struct_start(struct ejs_rpc *ejs, struct MprVar **v, const char *name);
diff --git a/source4/scripting/ejs/smbcalls_rpc.c b/source4/scripting/ejs/smbcalls_rpc.c
index 857d590aa1..735383df08 100644
--- a/source4/scripting/ejs/smbcalls_rpc.c
+++ b/source4/scripting/ejs/smbcalls_rpc.c
@@ -164,23 +164,31 @@ done:
 
 
 /*
-  make an rpc call
-     example:
-            status = rpc_call(conn, "echo_AddOne", io);
+  make an irpc call - called via the same interface as rpc
+*/
+static int ejs_irpc_call(int eid, struct MprVar *conn, struct MprVar *io, 
+			 const struct dcerpc_interface_table *iface, int callnum,
+			 ejs_pull_function_t ejs_pull, ejs_push_function_t ejs_push)
+{
+	return 0;
+}
+
+
+/*
+  backend code for making an rpc call - this is called from the pidl generated ejs
+  code
 */
  int ejs_rpc_call(int eid, int argc, struct MprVar **argv,
-		  const char *callname,
+		  const struct dcerpc_interface_table *iface, int callnum,
 		  ejs_pull_function_t ejs_pull, ejs_push_function_t ejs_push)
 {
 	struct MprVar *conn, *io;
-	const struct dcerpc_interface_table *iface;
 	struct dcerpc_pipe *p;
-	const struct dcerpc_interface_call *call;
 	NTSTATUS status;
 	void *ptr;
 	struct rpc_request *req;
-	int callnum;
 	struct ejs_rpc *ejs;
+	const struct dcerpc_interface_call *call;
 
 	if (argc != 2 ||
 	    argv[0]->type != MPR_TYPE_OBJECT ||
@@ -192,30 +200,28 @@ done:
 	conn     = argv[0];
 	io       = argv[1];
 
+	if (mprGetPtr(conn, "irpc")) {
+		/* its an irpc call */
+		return ejs_irpc_call(eid, conn, io, iface, callnum, ejs_pull, ejs_push);
+	}
+
 	/* get the pipe info */
 	p = mprGetPtr(conn, "pipe");
-	iface = mprGetPtr(conn, "iface");
-	if (p == NULL || iface == NULL) {
+	if (p == NULL) {
 		ejsSetErrorMsg(eid, "rpc_call invalid pipe");
 		return -1;
 	}
 
-	/* find the call by name */
-	call = dcerpc_iface_find_call(iface, callname);
-	if (call == NULL) {
-		status = NT_STATUS_OBJECT_NAME_INVALID;
-		goto done;
-	}
-	callnum = call - iface->calls;
-
 	ejs = talloc(mprMemCtx(), struct ejs_rpc);
 	if (ejs == NULL) {
 		status = NT_STATUS_NO_MEMORY;
 		goto done;
 	}
 
+	call = &iface->calls[callnum];
+
 	ejs->eid = eid;
-	ejs->callname = callname;
+	ejs->callname = call->name;
 
 	/* allocate the C structure */
 	ptr = talloc_zero_size(ejs, call->struct_size);
-- 
cgit 


From 056096c30ba73cbc5304c99af5d5a08d89111aab Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Sun, 10 Jul 2005 08:35:18 +0000
Subject: r8284: - fixed some uninitialised variables in the irpc code

- added code to send multiple irpc calls in parallel, to all servers
  that have registered the given name, with output going in
  io.results[i]. This allows you to make rpc calls to multiple servers
  at once, which is needed for clients like smbstatus
(This used to be commit 061e20e509d95ffe16d7dd6fba7db39fc7a165ed)
---
 source4/scripting/ejs/mprutil.c      |  6 +--
 source4/scripting/ejs/smbcalls.h     |  2 +
 source4/scripting/ejs/smbcalls_rpc.c | 97 ++++++++++++++++++++++++++++++++++--
 source4/scripting/ejs/smbscript.c    |  1 -
 4 files changed, 99 insertions(+), 7 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/mprutil.c b/source4/scripting/ejs/mprutil.c
index c614792d8e..c915174126 100644
--- a/source4/scripting/ejs/mprutil.c
+++ b/source4/scripting/ejs/mprutil.c
@@ -88,11 +88,12 @@
 /*
   add an indexed array element to a property
 */
-static void mprAddArray(struct MprVar *var, int i, struct MprVar v)
+ void mprAddArray(struct MprVar *var, int i, struct MprVar v)
 {
 	char idx[16];
 	mprItoa(i, idx, sizeof(idx));
 	mprSetVar(var, idx, v);
+	mprSetVar(var, "length", mprCreateIntegerVar(i+1));
 }
 
 /*
@@ -179,8 +180,7 @@ struct MprVar mprLdbArray(struct ldb_message **msg, int count, const char *name)
 	for (i=0;i<count;i++) {
 		mprAddArray(&res, i, mprLdbMessage(msg[i]));
 	}
-	mprSetPropertyValue(&res, "length", mprCreateIntegerVar(i));
-	return res;	
+	return res;
 }
 
 
diff --git a/source4/scripting/ejs/smbcalls.h b/source4/scripting/ejs/smbcalls.h
index c16b65b3c1..5bd7d4e448 100644
--- a/source4/scripting/ejs/smbcalls.h
+++ b/source4/scripting/ejs/smbcalls.h
@@ -25,5 +25,7 @@
 void mpr_Return(int eid, struct MprVar);
 NTSTATUS mprSetVar(struct MprVar *v, const char *name, struct MprVar val);
 NTSTATUS mprGetVar(struct MprVar **v, const char *name);
+void mprAddArray(struct MprVar *var, int i, struct MprVar v);
+
 
 
diff --git a/source4/scripting/ejs/smbcalls_rpc.c b/source4/scripting/ejs/smbcalls_rpc.c
index 735383df08..bb05eda426 100644
--- a/source4/scripting/ejs/smbcalls_rpc.c
+++ b/source4/scripting/ejs/smbcalls_rpc.c
@@ -65,13 +65,14 @@ static int ejs_irpc_connect(MprVarHandle eid, int argc, struct MprVar **argv)
 		return -1;
 	}
 
+	conn           = argv[0];
+
 	p = talloc(conn, struct ejs_irpc_connection);
 	if (p == NULL) {
 		return -1;
 	}
 
-	conn           = argv[0];
-	p->server_name = mprToString(argv[2]);
+	p->server_name = mprToString(argv[1]);
 
 	ev = talloc_find_parent_bytype(mprMemCtx(), struct event_context);
 
@@ -92,7 +93,8 @@ static int ejs_irpc_connect(MprVarHandle eid, int argc, struct MprVar **argv)
 		talloc_free(p);
 		status = NT_STATUS_OBJECT_NAME_NOT_FOUND;
 	} else {
-		mprSetPtrChild(conn, "pipe", p);
+		mprSetPtrChild(conn, "irpc", p);
+		status = NT_STATUS_OK;
 	}
 
 	mpr_Return(eid, mprNTSTATUS(status));
@@ -170,6 +172,95 @@ static int ejs_irpc_call(int eid, struct MprVar *conn, struct MprVar *io,
 			 const struct dcerpc_interface_table *iface, int callnum,
 			 ejs_pull_function_t ejs_pull, ejs_push_function_t ejs_push)
 {
+	NTSTATUS status;
+	void *ptr;
+	struct ejs_rpc *ejs;
+	const struct dcerpc_interface_call *call;
+	struct ejs_irpc_connection *p;
+	struct irpc_request **reqs;
+	int i, count;
+	struct MprVar *results;
+
+	p = mprGetPtr(conn, "irpc");
+
+	ejs = talloc(mprMemCtx(), struct ejs_rpc);
+	if (ejs == NULL) {
+		status = NT_STATUS_NO_MEMORY;
+		goto done;
+	}
+
+	call = &iface->calls[callnum];
+
+	ejs->eid = eid;
+	ejs->callname = call->name;
+
+	/* allocate the C structure */
+	ptr = talloc_zero_size(ejs, call->struct_size);
+	if (ptr == NULL) {
+		status = NT_STATUS_NO_MEMORY;
+		goto done;
+	}
+
+	/* convert the mpr object into a C structure */
+	status = ejs_pull(ejs, io, ptr);
+	if (!NT_STATUS_IS_OK(status)) {
+		goto done;
+	}
+
+	for (count=0;p->dest_ids[count];count++) /* noop */ ;
+
+	/* we need to make a call per server */
+	reqs = talloc_array(ejs, struct irpc_request *, count);
+	if (reqs == NULL) {
+		status = NT_STATUS_NO_MEMORY;
+		goto done;
+	}
+
+	/* make the actual calls */
+	for (i=0;i<count;i++) {
+		reqs[i] = irpc_call_send(p->msg_ctx, p->dest_ids[i], 
+					 iface, callnum, ptr);
+		if (reqs[i] == NULL) {
+			status = NT_STATUS_NO_MEMORY;
+			goto done;
+		}
+		talloc_steal(reqs, reqs[i]);
+	}
+	
+	mprSetVar(io, "results", mprCreateObjVar("results", MPR_DEFAULT_HASH_SIZE));
+	results = mprGetProperty(io, "results", NULL);
+
+	/* and receive the results, placing them in io.results[i] */
+	for (i=0;i<count;i++) {
+		struct MprVar *output;
+
+		status = irpc_call_recv(reqs[i]);
+		if (!NT_STATUS_IS_OK(status)) {
+			goto done;
+		}
+		status = ejs_push(ejs, io, ptr);
+		if (!NT_STATUS_IS_OK(status)) {
+			goto done;
+		}
+		talloc_free(reqs[i]);
+
+		/* add to the results array */
+		output = mprGetProperty(io, "output", NULL);
+		if (output) {
+			char idx[16];
+			mprItoa(i, idx, sizeof(idx));
+			mprSetProperty(results, idx, output);
+			mprDeleteProperty(io, "output");
+		}
+	}
+	mprSetVar(results, "length", mprCreateIntegerVar(i));
+
+done:
+	talloc_free(ejs);
+	mpr_Return(eid, mprNTSTATUS(status));
+	if (NT_STATUS_EQUAL(status, NT_STATUS_INTERNAL_ERROR)) {
+		return -1;
+	}
 	return 0;
 }
 
diff --git a/source4/scripting/ejs/smbscript.c b/source4/scripting/ejs/smbscript.c
index 80ef96e1af..bf9049af36 100644
--- a/source4/scripting/ejs/smbscript.c
+++ b/source4/scripting/ejs/smbscript.c
@@ -97,7 +97,6 @@ void ejs_exception(const char *reason)
 	}
 	talloc_steal(mem_ctx, argv_list);
 	v = mprList("ARGV", argv_list);
-	mprSetPropertyValue(&v, "length", mprCreateIntegerVar(i-1));
 	mprSetVar(ejsGetGlobalObject(eid), "ARGV", v);
 
 	/* load the script and advance past interpreter line*/
-- 
cgit 


From b2f84fef133fb4c59e78fd0cf861f553efcbc1ef Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Sun, 10 Jul 2005 23:25:42 +0000
Subject: r8296: - split out the ejs auth functions into a separate file

- got rid of the one line ejs_returnlist()
(This used to be commit 6961fe29058cffd8e69d9ce7e7d3902f973411c0)
---
 source4/scripting/ejs/config.mk         |   1 +
 source4/scripting/ejs/smbcalls.c        | 120 +-------------------------
 source4/scripting/ejs/smbcalls_auth.c   | 144 ++++++++++++++++++++++++++++++++
 source4/scripting/ejs/smbcalls_config.c |   4 +-
 4 files changed, 148 insertions(+), 121 deletions(-)
 create mode 100644 source4/scripting/ejs/smbcalls_auth.c

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/config.mk b/source4/scripting/ejs/config.mk
index 5c14dccfe3..c9afc3d0e1 100644
--- a/source4/scripting/ejs/config.mk
+++ b/source4/scripting/ejs/config.mk
@@ -18,6 +18,7 @@ OBJ_FILES = \
 		scripting/ejs/smbcalls_nbt.o \
 		scripting/ejs/smbcalls_cli.o \
 		scripting/ejs/smbcalls_rpc.o \
+		scripting/ejs/smbcalls_auth.o \
 		scripting/ejs/mprutil.o
 REQUIRED_SUBSYSTEMS = AUTH EJS LIBBASIC EJSRPC MESSAGING
 # End SUBSYSTEM SMBCALLS
diff --git a/source4/scripting/ejs/smbcalls.c b/source4/scripting/ejs/smbcalls.c
index 75702e4e76..ff57eff129 100644
--- a/source4/scripting/ejs/smbcalls.c
+++ b/source4/scripting/ejs/smbcalls.c
@@ -23,7 +23,6 @@
 
 #include "includes.h"
 #include "lib/ejs/ejs.h"
-#include "auth/auth.h"
 #include "scripting/ejs/smbcalls.h"
 
 /*
@@ -65,122 +64,6 @@ static int ejs_typeof(MprVarHandle eid, int argc, struct MprVar **argv)
 	return 0;
 }
 
-/*
-  setup a return of a string list
-*/
-void ejs_returnlist(int eid, const char *name, const char **list)
-{
-	mpr_Return(eid, mprList(name, list));
-}
-
-static int ejs_systemAuth(TALLOC_CTX *tmp_ctx, struct MprVar *auth, const char *username, const char *password, const char *domain, const char *remote_host)
-{
-	struct auth_usersupplied_info *user_info = NULL;
-	struct auth_serversupplied_info *server_info = NULL;
-	struct auth_context *auth_context;
-	const char *auth_unix[] = { "unix", NULL };
-	NTSTATUS nt_status;
-	DATA_BLOB pw_blob;
-
-	/*
-	  darn, we need some way to get the right event_context here
-	*/
-	nt_status = auth_context_create(tmp_ctx, auth_unix, &auth_context, NULL);
-	if (!NT_STATUS_IS_OK(nt_status)) {
-		mprSetPropertyValue(auth, "result", mprCreateBoolVar(False));
-		mprSetPropertyValue(auth, "report", mprCreateStringVar("Auth System Failure", 1));
-		goto done;
-	}
-
-	pw_blob = data_blob(password, strlen(password)+1),
-	make_user_info(tmp_ctx, username, username,
-				domain, domain,
-				remote_host, remote_host,
-				NULL, NULL,
-				NULL, NULL,
-				&pw_blob, False,
-				USER_INFO_CASE_INSENSITIVE_USERNAME |
-				USER_INFO_DONT_CHECK_UNIX_ACCOUNT,
-				&user_info);
-	nt_status = auth_check_password(auth_context, tmp_ctx, user_info, &server_info);
-	if (!NT_STATUS_IS_OK(nt_status)) {
-		mprSetPropertyValue(auth, "result", mprCreateBoolVar(False));
-		mprSetPropertyValue(auth, "report", mprCreateStringVar("Login Failed", 1));
-		goto done;
-	}
-
-	mprSetPropertyValue(auth, "result", mprCreateBoolVar(server_info->authenticated));
-	mprSetPropertyValue(auth, "username", mprCreateStringVar(server_info->account_name, 1));
-	mprSetPropertyValue(auth, "domain", mprCreateStringVar(server_info->domain_name, 1));
-
-done:
-	return 0;
-}
-
-/*
-  perform user authentication, returning an array of results
-
-  syntax:
-    var authinfo = new Object();
-    authinfo.username = myname;
-    authinfo.password = mypass;
-    authinfo.domain = mydom;
-    authinfo.rhost = request['REMOTE_HOST'];
-    auth = userAuth(authinfo);
-*/
-static int ejs_userAuth(MprVarHandle eid, int argc, struct MprVar **argv)
-{
-	TALLOC_CTX *tmp_ctx;
-	const char *username;
-	const char *password;
-	const char *domain;
-	const char *remote_host;
-	struct MprVar auth;
-
-	if (argc != 1 || argv[0]->type != MPR_TYPE_OBJECT) {
-		ejsSetErrorMsg(eid, "userAuth invalid arguments, this function requires an object.");
-		return -1;
-	}
-
-	username = mprToString(mprGetProperty(argv[0], "username", NULL));
-	password = mprToString(mprGetProperty(argv[0], "password", NULL));
-	domain = mprToString(mprGetProperty(argv[0], "domain", NULL));
-	remote_host = mprToString(mprGetProperty(argv[0], "rhost", NULL));
-
- 	tmp_ctx = talloc_new(mprMemCtx());	
-	auth = mprCreateObjVar("auth", MPR_DEFAULT_HASH_SIZE);
-
-	if (domain && strcmp("System User", domain) == 0) {
-
-		ejs_systemAuth(tmp_ctx, &auth, username, password, domain, remote_host);
-	}  else {
-
-		mprSetPropertyValue(&auth, "result", mprCreateBoolVar(False));
-		mprSetPropertyValue(&auth, "report", mprCreateStringVar("Unknown Domain", 1));
-	}
-
-	mpr_Return(eid, auth);
-	talloc_free(tmp_ctx);
-	return 0;
-}
-
-static int ejs_domain_list(MprVarHandle eid, int argc, char **argv)
-{
-	struct MprVar list;
-
-	if (argc != 0) {
-		ejsSetErrorMsg(eid, "domList invalid arguments");
-		return -1;
-	}
-
-	list = mprCreateObjVar("list", MPR_DEFAULT_HASH_SIZE);
-	mprSetVar(&list, "0", mprCreateStringVar("System User", 1));
-
-	mpr_Return(eid, list);
-
-	return 0;
-}
-
 
 /*
   setup C functions that be called from ejs
@@ -192,10 +75,9 @@ void smb_setup_ejs_functions(void)
 	smb_setup_ejs_nbt();
 	smb_setup_ejs_cli();
 	smb_setup_ejs_rpc();
+	smb_setup_ejs_auth();
 
 	ejsDefineCFunction(-1, "typeof", ejs_typeof, NULL, MPR_VAR_SCRIPT_HANDLE);
-	ejsDefineStringCFunction(-1, "getDomainList", ejs_domain_list, NULL, MPR_VAR_SCRIPT_HANDLE);
-	ejsDefineCFunction(-1, "userAuth", ejs_userAuth, NULL, MPR_VAR_SCRIPT_HANDLE);
 }
 
 /*
diff --git a/source4/scripting/ejs/smbcalls_auth.c b/source4/scripting/ejs/smbcalls_auth.c
new file mode 100644
index 0000000000..8e72f68fc1
--- /dev/null
+++ b/source4/scripting/ejs/smbcalls_auth.c
@@ -0,0 +1,144 @@
+/* 
+   Unix SMB/CIFS implementation.
+
+   ejs auth functions
+
+   Copyright (C) Simo Sorce 2005
+   Copyright (C) Andrew Tridgell 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 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.
+*/
+
+#include "includes.h"
+#include "lib/ejs/ejs.h"
+#include "auth/auth.h"
+#include "scripting/ejs/smbcalls.h"
+
+static int ejs_systemAuth(TALLOC_CTX *tmp_ctx, struct MprVar *auth, const char *username, const char *password, const char *domain, const char *remote_host)
+{
+	struct auth_usersupplied_info *user_info = NULL;
+	struct auth_serversupplied_info *server_info = NULL;
+	struct auth_context *auth_context;
+	const char *auth_unix[] = { "unix", NULL };
+	NTSTATUS nt_status;
+	DATA_BLOB pw_blob;
+
+	/*
+	  darn, we need some way to get the right event_context here
+	*/
+	nt_status = auth_context_create(tmp_ctx, auth_unix, &auth_context, NULL);
+	if (!NT_STATUS_IS_OK(nt_status)) {
+		mprSetPropertyValue(auth, "result", mprCreateBoolVar(False));
+		mprSetPropertyValue(auth, "report", mprCreateStringVar("Auth System Failure", 1));
+		goto done;
+	}
+
+	pw_blob = data_blob(password, strlen(password)+1),
+	make_user_info(tmp_ctx, username, username,
+				domain, domain,
+				remote_host, remote_host,
+				NULL, NULL,
+				NULL, NULL,
+				&pw_blob, False,
+				USER_INFO_CASE_INSENSITIVE_USERNAME |
+				USER_INFO_DONT_CHECK_UNIX_ACCOUNT,
+				&user_info);
+	nt_status = auth_check_password(auth_context, tmp_ctx, user_info, &server_info);
+	if (!NT_STATUS_IS_OK(nt_status)) {
+		mprSetPropertyValue(auth, "result", mprCreateBoolVar(False));
+		mprSetPropertyValue(auth, "report", mprCreateStringVar("Login Failed", 1));
+		goto done;
+	}
+
+	mprSetPropertyValue(auth, "result", mprCreateBoolVar(server_info->authenticated));
+	mprSetPropertyValue(auth, "username", mprCreateStringVar(server_info->account_name, 1));
+	mprSetPropertyValue(auth, "domain", mprCreateStringVar(server_info->domain_name, 1));
+
+done:
+	return 0;
+}
+
+/*
+  perform user authentication, returning an array of results
+
+  syntax:
+    var authinfo = new Object();
+    authinfo.username = myname;
+    authinfo.password = mypass;
+    authinfo.domain = mydom;
+    authinfo.rhost = request['REMOTE_HOST'];
+    auth = userAuth(authinfo);
+*/
+static int ejs_userAuth(MprVarHandle eid, int argc, struct MprVar **argv)
+{
+	TALLOC_CTX *tmp_ctx;
+	const char *username;
+	const char *password;
+	const char *domain;
+	const char *remote_host;
+	struct MprVar auth;
+
+	if (argc != 1 || argv[0]->type != MPR_TYPE_OBJECT) {
+		ejsSetErrorMsg(eid, "userAuth invalid arguments, this function requires an object.");
+		return -1;
+	}
+
+	username = mprToString(mprGetProperty(argv[0], "username", NULL));
+	password = mprToString(mprGetProperty(argv[0], "password", NULL));
+	domain = mprToString(mprGetProperty(argv[0], "domain", NULL));
+	remote_host = mprToString(mprGetProperty(argv[0], "rhost", NULL));
+
+ 	tmp_ctx = talloc_new(mprMemCtx());	
+	auth = mprCreateObjVar("auth", MPR_DEFAULT_HASH_SIZE);
+
+	if (domain && strcmp("System User", domain) == 0) {
+
+		ejs_systemAuth(tmp_ctx, &auth, username, password, domain, remote_host);
+	}  else {
+
+		mprSetPropertyValue(&auth, "result", mprCreateBoolVar(False));
+		mprSetPropertyValue(&auth, "report", mprCreateStringVar("Unknown Domain", 1));
+	}
+
+	mpr_Return(eid, auth);
+	talloc_free(tmp_ctx);
+	return 0;
+}
+
+static int ejs_domain_list(MprVarHandle eid, int argc, char **argv)
+{
+	struct MprVar list;
+
+	if (argc != 0) {
+		ejsSetErrorMsg(eid, "domList invalid arguments");
+		return -1;
+	}
+
+	list = mprCreateObjVar("list", MPR_DEFAULT_HASH_SIZE);
+	mprSetVar(&list, "0", mprCreateStringVar("System User", 1));
+
+	mpr_Return(eid, list);
+
+	return 0;
+}
+
+/*
+  setup C functions that be called from ejs
+*/
+void smb_setup_ejs_auth(void)
+{
+	ejsDefineStringCFunction(-1, "getDomainList", ejs_domain_list, NULL, MPR_VAR_SCRIPT_HANDLE);
+	ejsDefineCFunction(-1, "userAuth", ejs_userAuth, NULL, MPR_VAR_SCRIPT_HANDLE);
+}
diff --git a/source4/scripting/ejs/smbcalls_config.c b/source4/scripting/ejs/smbcalls_config.c
index 19e7a1c744..97c90c8f5a 100644
--- a/source4/scripting/ejs/smbcalls_config.c
+++ b/source4/scripting/ejs/smbcalls_config.c
@@ -38,7 +38,7 @@ static int ejs_lpServices(MprVarHandle eid, int argc, char **argv)
 		list = str_list_add(list, lp_servicename(i));
 	}
 	talloc_steal(mprMemCtx(), list);
-	ejs_returnlist(eid, "services", list);
+	mpr_Return(eid, mprList("services", list));
 	return 0;
 }
 
@@ -131,7 +131,7 @@ static int ejs_lpGet(MprVarHandle eid, int argc, char **argv)
 		}
 		return -1;	
 	case P_LIST: 
-		ejs_returnlist(eid, parm->label, *(const char ***)parm_ptr);
+		mpr_Return(eid, mprList(parm->label, *(const char ***)parm_ptr));
 		break;
 	case P_SEP:
 		return -1;
-- 
cgit 


From b2f132182174d13c8bcb535f62522687675947c2 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Mon, 11 Jul 2005 00:13:11 +0000
Subject: r8297: add libinclude() function in ejs, which is like include() but
 searches a js library path set in "js include" in smb.conf.

This will allow us to start building up a library of common js code,
while avoiding the problem of hard-coding include paths in scripts
(This used to be commit ff60529ba2515df29a20b4a417327a3565ec8ee9)
---
 source4/scripting/ejs/smbcalls.c | 47 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls.c b/source4/scripting/ejs/smbcalls.c
index ff57eff129..1abbb52819 100644
--- a/source4/scripting/ejs/smbcalls.c
+++ b/source4/scripting/ejs/smbcalls.c
@@ -65,6 +65,52 @@ static int ejs_typeof(MprVarHandle eid, int argc, struct MprVar **argv)
 }
 
 
+/*
+  libinclude() allows you to include js files using a search path specified
+  in "js include =" in smb.conf. 
+*/
+static int ejs_libinclude(int eid, int argc, char **argv)
+{
+	int i, j;
+	const char **js_include = lp_js_include();
+
+	if (js_include == NULL || js_include[0] == NULL) {
+		return -1;
+	}
+
+	for (i = 0; i < argc; i++) {
+		const char *script = argv[i];
+
+		for (j=0;js_include[j];j++) {
+			char *path;
+			path = talloc_asprintf(mprMemCtx(), "%s/%s", js_include[j], script);
+			if (path == NULL) {
+				return -1;
+			}
+			if (file_exist(path)) {
+				int ret;
+				struct MprVar result;
+				char *emsg;
+
+				ret = ejsEvalFile(eid, path, &result, &emsg);
+				talloc_free(path);
+				if (ret < 0) {
+					ejsSetErrorMsg(eid, "%s: %s", script, emsg);
+					return -1;
+				}
+				break;
+			}
+			talloc_free(path);
+		}
+		if (js_include[j] == NULL) {
+			ejsSetErrorMsg(eid, "unable to include '%s'", script);
+			return -1;
+		}
+	}
+	return 0;
+}
+
+
 /*
   setup C functions that be called from ejs
 */
@@ -78,6 +124,7 @@ void smb_setup_ejs_functions(void)
 	smb_setup_ejs_auth();
 
 	ejsDefineCFunction(-1, "typeof", ejs_typeof, NULL, MPR_VAR_SCRIPT_HANDLE);
+	ejsDefineStringCFunction(-1, "libinclude", ejs_libinclude, NULL, MPR_VAR_SCRIPT_HANDLE);
 }
 
 /*
-- 
cgit 


From f9ff72cbda6b4e59448fd79ef9e12f264d48015f Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Mon, 11 Jul 2005 00:23:57 +0000
Subject: r8298: - started building a library of js routines in
 scripting/libjs/

- switched the existing test programs over to using the library

- added install of js lib
(This used to be commit 2a444dedbe44347268affc6458196f93ca7d372b)
---
 source4/scripting/libjs/base.js |  53 +++++++++++++
 source4/scripting/libjs/samr.js | 170 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 223 insertions(+)
 create mode 100644 source4/scripting/libjs/base.js
 create mode 100644 source4/scripting/libjs/samr.js

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/base.js b/source4/scripting/libjs/base.js
new file mode 100644
index 0000000000..504cd82259
--- /dev/null
+++ b/source4/scripting/libjs/base.js
@@ -0,0 +1,53 @@
+/*
+	base js library functions
+	Copyright Andrew Tridgell 2005
+	released under the GNU GPL v2 or later
+*/
+
+if (global["HAVE_BASE_JS"] != undefined) {
+   return;
+}
+HAVE_BASE_JS=1
+
+/*
+  helper function to setup a rpc io object, ready for input
+*/
+function irpcObj()
+{
+	var o = new Object();
+	o.input = new Object();
+	return o;
+}
+
+/*
+  check that a status result is OK
+*/
+function check_status_ok(status)
+{
+	if (status.is_ok != true) {
+		printVars(status);
+	}
+	assert(status.is_ok == true);
+}
+
+/*
+  check that two arrays are equal
+*/
+function check_array_equal(a1, a2)
+{
+	assert(a1.length == a2.length);
+	for (i=0; i<a1.length; i++) {
+		assert(a1[i] == a2[i]);
+	}
+}
+
+/*
+  check that an array is all zeros
+*/
+function check_array_zero(a)
+{
+	for (i=0; i<a.length; i++) {
+		assert(a[i] == 0);
+	}
+}
+
diff --git a/source4/scripting/libjs/samr.js b/source4/scripting/libjs/samr.js
new file mode 100644
index 0000000000..a1f79b541a
--- /dev/null
+++ b/source4/scripting/libjs/samr.js
@@ -0,0 +1,170 @@
+/*
+	samr rpc utility functions 
+	Copyright Andrew Tridgell 2005
+	released under the GNU GPL v2 or later
+*/	
+
+if (global["HAVE_SAMR_JS"] != undefined) {
+   return;
+}
+HAVE_SAMR_JS=1
+
+/*
+  return a list of names and indexes from a samArray
+*/
+function samArray(output)
+{
+	var list = new Array(output.num_entries);
+	if (output.sam == NULL) {
+		return list;
+	}
+	var entries = output.sam.entries;
+	for (i=0;i<output.num_entries;i++) {
+		list[i] = new Object();
+                list[i].name = entries[i].name;
+                list[i].idx  = entries[i].idx;
+	}
+	return list;
+}
+
+/*
+	connect to the sam database
+*/
+function samrConnect(conn)
+{
+	var io = irpcObj();
+	io.input.system_name = NULL;
+	io.input.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
+	status = dcerpc_samr_Connect(conn, io);
+	check_status_ok(status);
+	return io.output.connect_handle;
+}
+
+/*
+	close a handle
+*/
+function samrClose(conn, handle)
+{
+	var io = irpcObj();
+	io.input.handle = handle;
+	status = dcerpc_samr_Close(conn, io);
+	check_status_ok(status);
+}
+
+/*
+   get the sid for a domain
+*/
+function samrLookupDomain(conn, handle, domain)
+{
+	var io = irpcObj();
+	io.input.connect_handle = handle;
+	io.input.domain_name = domain;
+	status = dcerpc_samr_LookupDomain(conn, io);
+	check_status_ok(status);
+	return io.output.sid;
+}
+
+/*
+  open a domain by sid
+*/
+function samrOpenDomain(conn, handle, sid)
+{
+	var io = irpcObj();
+	io.input.connect_handle = handle;
+	io.input.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
+	io.input.sid = sid;
+	status = dcerpc_samr_OpenDomain(conn, io);
+	check_status_ok(status);
+	return io.output.domain_handle;
+}
+
+/*
+  open a user by rid
+*/
+function samrOpenUser(conn, handle, rid)
+{
+	var io = irpcObj();
+	io.input.domain_handle = handle;
+	io.input.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
+	io.input.rid = rid;
+	status = dcerpc_samr_OpenUser(conn, io);
+	check_status_ok(status);
+	return io.output.user_handle;
+}
+
+/*
+  return a list of all users
+*/
+function samrEnumDomainUsers(conn, dom_handle)
+{
+	var io = irpcObj();
+	io.input.domain_handle = dom_handle;
+	io.input.resume_handle = 0;
+	io.input.acct_flags = 0;
+	io.input.max_size = -1;
+	status = dcerpc_samr_EnumDomainUsers(conn, io);
+	check_status_ok(status);
+	return samArray(io.output);
+}
+
+/*
+  return a list of all groups
+*/
+function samrEnumDomainGroups(conn, dom_handle)
+{
+	var io = irpcObj();
+	io.input.domain_handle = dom_handle;
+	io.input.resume_handle = 0;
+	io.input.acct_flags = 0;
+	io.input.max_size = -1;
+	status = dcerpc_samr_EnumDomainGroups(conn, io);
+	check_status_ok(status);
+	return samArray(io.output);
+}
+
+/*
+  return a list of domains
+*/
+function samrEnumDomains(conn, handle)
+{
+	var io = irpcObj();
+	io.input.connect_handle = handle;
+	io.input.resume_handle = 0;
+	io.input.buf_size = -1;
+	status = dcerpc_samr_EnumDomains(conn, io);
+	check_status_ok(status);
+	return samArray(io.output);
+}
+
+/*
+  return information about a user
+*/
+function samrQueryUserInfo(conn, user_handle, level)
+{
+	var r, io = irpcObj();
+	io.input.user_handle = user_handle;
+	io.input.level = level;
+	status = dcerpc_samr_QueryUserInfo(conn, io);
+	check_status_ok(status);
+	return io.output.info.info3;
+}
+
+
+/*
+  fill a user array with user information from samrQueryUserInfo
+*/
+function samrFillUserInfo(conn, dom_handle, users, level)
+{
+	var i;
+	for (i=0;i<users.length;i++) {
+		var r, user_handle, info;
+		user_handle = samrOpenUser(conn, dom_handle, users[i].idx);
+		info = samrQueryUserInfo(conn, user_handle, level);
+		info.name = users[i].name;
+		info.idx  = users[i].idx;
+		users[i] = info;
+		samrClose(conn, user_handle);
+	}
+}
+
+
-- 
cgit 


From f583a85d4d520b0ab6ca83efd36e71563108b370 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Mon, 11 Jul 2005 07:42:43 +0000
Subject: r8316: give full access to the popt command line parsing in ejs
 scripts, including access to the samba common options. For example:

ok = GetOptions(ARGV, options,
		"POPT_AUTOHELP",
		"POPT_COMMON_SAMBA",
		"myopt=s",
		"intopt=i",
		"noopt");

this allows scripts to support their own extended options properly
(This used to be commit 775fb56ac287b8d485b38f633b9480d7b7ab64e3)
---
 source4/scripting/ejs/config.mk          |   1 +
 source4/scripting/ejs/mprutil.c          |   3 +
 source4/scripting/ejs/smbcalls.c         |   1 +
 source4/scripting/ejs/smbcalls_options.c | 193 +++++++++++++++++++++++++++++++
 source4/scripting/ejs/smbscript.c        |  33 +-----
 5 files changed, 204 insertions(+), 27 deletions(-)
 create mode 100644 source4/scripting/ejs/smbcalls_options.c

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/config.mk b/source4/scripting/ejs/config.mk
index c9afc3d0e1..7afcacbdf5 100644
--- a/source4/scripting/ejs/config.mk
+++ b/source4/scripting/ejs/config.mk
@@ -19,6 +19,7 @@ OBJ_FILES = \
 		scripting/ejs/smbcalls_cli.o \
 		scripting/ejs/smbcalls_rpc.o \
 		scripting/ejs/smbcalls_auth.o \
+		scripting/ejs/smbcalls_options.o \
 		scripting/ejs/mprutil.o
 REQUIRED_SUBSYSTEMS = AUTH EJS LIBBASIC EJSRPC MESSAGING
 # End SUBSYSTEM SMBCALLS
diff --git a/source4/scripting/ejs/mprutil.c b/source4/scripting/ejs/mprutil.c
index c915174126..6b5c02c48d 100644
--- a/source4/scripting/ejs/mprutil.c
+++ b/source4/scripting/ejs/mprutil.c
@@ -108,6 +108,9 @@ struct MprVar mprList(const char *name, const char **list)
 	for (i=0;list && list[i];i++) {
 		mprAddArray(&var, i, mprCreateStringVar(list[i], 1));
 	}
+	if (i==0) {
+		mprSetVar(&var, "length", mprCreateIntegerVar(i));
+	}
 	return var;
 }
 
diff --git a/source4/scripting/ejs/smbcalls.c b/source4/scripting/ejs/smbcalls.c
index 1abbb52819..328bd14ab5 100644
--- a/source4/scripting/ejs/smbcalls.c
+++ b/source4/scripting/ejs/smbcalls.c
@@ -122,6 +122,7 @@ void smb_setup_ejs_functions(void)
 	smb_setup_ejs_cli();
 	smb_setup_ejs_rpc();
 	smb_setup_ejs_auth();
+	smb_setup_ejs_options();
 
 	ejsDefineCFunction(-1, "typeof", ejs_typeof, NULL, MPR_VAR_SCRIPT_HANDLE);
 	ejsDefineStringCFunction(-1, "libinclude", ejs_libinclude, NULL, MPR_VAR_SCRIPT_HANDLE);
diff --git a/source4/scripting/ejs/smbcalls_options.c b/source4/scripting/ejs/smbcalls_options.c
new file mode 100644
index 0000000000..335663acfe
--- /dev/null
+++ b/source4/scripting/ejs/smbcalls_options.c
@@ -0,0 +1,193 @@
+/* 
+   Unix SMB/CIFS implementation.
+
+   provide a command line options parsing function for ejs
+
+   Copyright (C) Andrew Tridgell 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 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.
+*/
+
+#include "includes.h"
+#include "lib/cmdline/popt_common.h"
+#include "scripting/ejs/smbcalls.h"
+#include "lib/ejs/ejs.h"
+
+
+/*
+  usage:
+      var options = new Object();
+      result = GetOptions(argv, options, 
+                          "realm=s", 
+                          "enablexx", 
+                          "myint=i");
+
+      the special options POPT_COMMON_* options are recognised and replaced
+      with the Samba internal options
+
+      resulting parsed options are placed in the options object
+
+      additional command line arguments are placed in options.ARGV
+*/
+static int ejs_GetOptions(MprVarHandle eid, int argc, struct MprVar **argv)
+{
+	poptContext pc;
+	int opt;
+	struct {
+		const char *name;
+		struct poptOption *table;
+		const char *description;
+	} tables[] = {
+		{ "POPT_AUTOHELP", poptHelpOptions, "Help options:" },
+		{ "POPT_COMMON_SAMBA", popt_common_samba, "Common Samba options:" },
+		{ "POPT_COMMON_CONNECTION", popt_common_connection, "Connection options:" },
+		{ "POPT_COMMON_CREDENTIALS", popt_common_credentials, "Authentication options:" },
+		{ "POPT_COMMON_VERSION", popt_common_version, "Common Samba options:" }
+	};
+	TALLOC_CTX *tmp_ctx = talloc_new(mprMemCtx());
+	struct poptOption *long_options = NULL;
+	struct MprVar *options;
+	int i, num_options = 0;
+	int opt_argc;
+	const char **opt_argv;
+	const char **opt_names = NULL;
+	const int BASE_OPTNUM = 0x100000;
+
+	/* validate arguments */
+	if (argc < 2 ||
+	    argv[0]->type != MPR_TYPE_OBJECT ||
+	    argv[1]->type != MPR_TYPE_OBJECT) {
+		ejsSetErrorMsg(eid, "GetOptions invalid arguments");
+		return -1;
+	}
+
+	opt_argv = mprToList(tmp_ctx, argv[0]);
+	options  = argv[1];
+	opt_argc = str_list_length(opt_argv);
+
+	long_options = talloc_array(tmp_ctx, struct poptOption, 1);
+	if (long_options == NULL) {
+		return -1;
+	}
+
+	/* create the long_options array */
+	for (i=2;i<argc;i++) {
+		const char *optstr = mprToString(argv[i]);
+		int t, opt_type = POPT_ARG_NONE;
+		const char *s;
+		if (argv[i]->type != MPR_TYPE_STRING) {
+			ejsSetErrorMsg(eid, "GetOptions string argument");
+			return -1;
+		}
+
+		long_options = talloc_realloc(tmp_ctx, long_options, 
+					      struct poptOption, num_options+2);
+		if (long_options == NULL) {
+			return -1;
+		}
+		ZERO_STRUCT(long_options[num_options]);
+
+		/* see if its one of the special samba option tables */
+		for (t=0;t<ARRAY_SIZE(tables);t++) {
+			if (strcmp(tables[t].name, optstr) == 0) {
+				break;
+			}
+		}
+		if (t < ARRAY_SIZE(tables)) {
+			opt_names = str_list_add(opt_names, optstr);
+			talloc_steal(tmp_ctx, opt_names);
+			long_options[num_options].argInfo = POPT_ARG_INCLUDE_TABLE;
+			long_options[num_options].arg     = tables[t].table;
+			long_options[num_options].descrip = tables[t].description;
+			num_options++;
+			continue;
+		}
+
+		s = strchr(optstr, '=');
+		if (s) {
+			char *name = talloc_strndup(tmp_ctx, optstr, (int)(s-optstr));
+			opt_names = str_list_add(opt_names, name);
+			if (s[1] == 's') {
+				opt_type = POPT_ARG_STRING;
+			} else if (s[1] == 'i') {
+				opt_type = POPT_ARG_INT;
+			} else {
+				ejsSetErrorMsg(eid, "GetOptions invalid option type");
+				return -1;
+			}
+			talloc_free(name);
+		} else {
+			opt_names = str_list_add(opt_names, optstr);
+		}
+		talloc_steal(tmp_ctx, opt_names);
+		if (strlen(opt_names[num_options]) == 1) {
+			long_options[num_options].shortName = opt_names[num_options][0];
+		} else {
+			long_options[num_options].longName = opt_names[num_options];
+		}
+		long_options[num_options].argInfo = opt_type;
+		long_options[num_options].val = num_options + BASE_OPTNUM;
+		num_options++;
+	}
+
+	ZERO_STRUCT(long_options[num_options]);
+
+	pc = poptGetContext("smbscript", opt_argc, opt_argv, long_options, 0);
+
+	/* parse the options */
+	while((opt = poptGetNextOpt(pc)) != -1) {
+		const char *arg;
+
+		if (opt < BASE_OPTNUM || opt >= num_options + BASE_OPTNUM) {
+			char *err;
+			err = talloc_asprintf(tmp_ctx, "%s: %s",
+					      poptBadOption(pc, POPT_BADOPTION_NOALIAS),
+					      poptStrerror(opt));
+			mprSetVar(options, "ERROR", mprCreateStringVar(err, 1));
+			talloc_free(tmp_ctx);
+			mpr_Return(eid, mprCreateBoolVar(0));
+			return 0;
+		}
+		opt -= BASE_OPTNUM;
+		arg = poptGetOptArg(pc);
+		if (arg == NULL) {
+			mprSetVar(options, opt_names[opt], mprCreateBoolVar(1));
+		} else if (long_options[opt].argInfo == POPT_ARG_INT) {
+			int v = strtol(arg, NULL, 0);
+			mprSetVar(options, opt_names[opt], mprCreateIntegerVar(v));
+		} else {
+			mprSetVar(options, opt_names[opt], mprCreateStringVar(arg, 1));
+		}
+	}
+
+	/* setup options.argv list */
+	mprSetVar(options, "ARGV", mprList("ARGV", poptGetArgs(pc)));
+
+	poptFreeContext(pc);
+
+	talloc_free(tmp_ctx);
+	mpr_Return(eid, mprCreateBoolVar(1));
+	return 0;
+}
+
+
+
+/*
+  setup C functions that be called from ejs
+*/
+void smb_setup_ejs_options(void)
+{
+	ejsDefineCFunction(-1, "GetOptions", ejs_GetOptions, NULL, MPR_VAR_SCRIPT_HANDLE);
+}
diff --git a/source4/scripting/ejs/smbscript.c b/source4/scripting/ejs/smbscript.c
index bf9049af36..691cd44730 100644
--- a/source4/scripting/ejs/smbscript.c
+++ b/source4/scripting/ejs/smbscript.c
@@ -22,7 +22,6 @@
 */
 
 #include "includes.h"
-#include "lib/cmdline/popt_common.h"
 #include "dynconfig.h"
 #include "lib/ejs/ejs.h"
 #include "scripting/ejs/smbcalls.h"
@@ -43,37 +42,18 @@ void ejs_exception(const char *reason)
 	TALLOC_CTX *mem_ctx = talloc_new(NULL);
 	const char **argv_list = NULL;
 	const char *fname;
-	struct MprVar v, *return_var;
+	struct MprVar *return_var;
 	int exit_status, i;
-	poptContext pc;
-	int opt;
-	struct poptOption long_options[] = {
-		POPT_AUTOHELP
-		POPT_COMMON_SAMBA
-		POPT_COMMON_CREDENTIALS
-		POPT_COMMON_VERSION
-		POPT_TABLEEND
-	};
-
-	popt_common_dont_ask();
-
-	pc = poptGetContext("smbscript", argc, argv, long_options, 0);
-
-	poptSetOtherOptionHelp(pc, "<script> <args> ...");
-
-	while((opt = poptGetNextOpt(pc)) != -1) /* noop */ ;
 
 	smbscript_init_subsystems;
-
 	mprSetCtx(mem_ctx);
 
-	argv = poptGetArgs(pc);
-	if (argv == NULL ||
-	    argv[0] == NULL) {
-		poptPrintUsage(pc, stdout, 0);
+	if (argc < 2) {
+		fprintf(stderr, "You must supply a script name\n");
 		exit(1);
 	}
-	fname = argv[0];
+
+	fname = argv[1];
 
 	if (ejsOpen(NULL, NULL, NULL) != 0) {
 		fprintf(stderr, "smbscript: ejsOpen(): unable to initialise "
@@ -96,8 +76,7 @@ void ejs_exception(const char *reason)
 		argv_list = str_list_add(argv_list, argv[i]);
 	}
 	talloc_steal(mem_ctx, argv_list);
-	v = mprList("ARGV", argv_list);
-	mprSetVar(ejsGetGlobalObject(eid), "ARGV", v);
+	mprSetVar(ejsGetGlobalObject(eid), "ARGV", mprList("ARGV", argv_list));
 
 	/* load the script and advance past interpreter line*/
 	script = file_load(fname, &script_size, mem_ctx);
-- 
cgit 


From 683432660ea53304d25212c56fd119aaabe2c0e3 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Mon, 11 Jul 2005 09:19:50 +0000
Subject: r8318: added a bunch more ejs calls.

  getgr*()
  getpw*()
  strlower()
  strupper()
  IfaceList()
(This used to be commit 1517ad490dd67302f38ab9dcd8a3b24b73b8d550)
---
 source4/scripting/ejs/config.mk         |   2 +
 source4/scripting/ejs/mprutil.c         |  12 +++
 source4/scripting/ejs/smbcalls.c        |  17 ++++
 source4/scripting/ejs/smbcalls.h        |   3 -
 source4/scripting/ejs/smbcalls_nss.c    | 148 ++++++++++++++++++++++++++++++++
 source4/scripting/ejs/smbcalls_string.c |  70 +++++++++++++++
 source4/scripting/libjs/base.js         |   1 -
 7 files changed, 249 insertions(+), 4 deletions(-)
 create mode 100644 source4/scripting/ejs/smbcalls_nss.c
 create mode 100644 source4/scripting/ejs/smbcalls_string.c

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/config.mk b/source4/scripting/ejs/config.mk
index 7afcacbdf5..5e061cb2a3 100644
--- a/source4/scripting/ejs/config.mk
+++ b/source4/scripting/ejs/config.mk
@@ -20,6 +20,8 @@ OBJ_FILES = \
 		scripting/ejs/smbcalls_rpc.o \
 		scripting/ejs/smbcalls_auth.o \
 		scripting/ejs/smbcalls_options.o \
+		scripting/ejs/smbcalls_nss.o \
+		scripting/ejs/smbcalls_string.o \
 		scripting/ejs/mprutil.o
 REQUIRED_SUBSYSTEMS = AUTH EJS LIBBASIC EJSRPC MESSAGING
 # End SUBSYSTEM SMBCALLS
diff --git a/source4/scripting/ejs/mprutil.c b/source4/scripting/ejs/mprutil.c
index 6b5c02c48d..a9cf71b15d 100644
--- a/source4/scripting/ejs/mprutil.c
+++ b/source4/scripting/ejs/mprutil.c
@@ -114,6 +114,18 @@ struct MprVar mprList(const char *name, const char **list)
 	return var;
 }
 
+/*
+  construct a MprVar from a string, using NULL if needed
+*/
+struct MprVar mprString(const char *s)
+{
+	struct MprVar var;
+	if (s == NULL) {
+		return mprCreatePtrVar(NULL, "NULL");
+	}
+	return mprCreateStringVar(s, 1);
+}
+
 /*
   construct a string MprVar from a lump of data
 */
diff --git a/source4/scripting/ejs/smbcalls.c b/source4/scripting/ejs/smbcalls.c
index 328bd14ab5..5972518036 100644
--- a/source4/scripting/ejs/smbcalls.c
+++ b/source4/scripting/ejs/smbcalls.c
@@ -64,6 +64,20 @@ static int ejs_typeof(MprVarHandle eid, int argc, struct MprVar **argv)
 	return 0;
 }
 
+/*
+  return the list of configured network interfaces
+*/
+static int ejs_IfaceList(MprVarHandle eid, int argc, struct MprVar **argv)
+{
+	int i, count = iface_count();
+	struct MprVar ret = mprCreateObjVar("interfaces", MPR_DEFAULT_HASH_SIZE);
+	for (i=0;i<count;i++) {
+		mprAddArray(&ret, i, mprString(iface_n_ip(i)));
+	}
+	mpr_Return(eid, ret);
+	return 0;	
+}
+
 
 /*
   libinclude() allows you to include js files using a search path specified
@@ -123,8 +137,11 @@ void smb_setup_ejs_functions(void)
 	smb_setup_ejs_rpc();
 	smb_setup_ejs_auth();
 	smb_setup_ejs_options();
+	smb_setup_ejs_nss();
+	smb_setup_ejs_string();
 
 	ejsDefineCFunction(-1, "typeof", ejs_typeof, NULL, MPR_VAR_SCRIPT_HANDLE);
+	ejsDefineCFunction(-1, "IfaceList", ejs_IfaceList, NULL, MPR_VAR_SCRIPT_HANDLE);
 	ejsDefineStringCFunction(-1, "libinclude", ejs_libinclude, NULL, MPR_VAR_SCRIPT_HANDLE);
 }
 
diff --git a/source4/scripting/ejs/smbcalls.h b/source4/scripting/ejs/smbcalls.h
index 5bd7d4e448..57242fac0b 100644
--- a/source4/scripting/ejs/smbcalls.h
+++ b/source4/scripting/ejs/smbcalls.h
@@ -26,6 +26,3 @@ void mpr_Return(int eid, struct MprVar);
 NTSTATUS mprSetVar(struct MprVar *v, const char *name, struct MprVar val);
 NTSTATUS mprGetVar(struct MprVar **v, const char *name);
 void mprAddArray(struct MprVar *var, int i, struct MprVar v);
-
-
-
diff --git a/source4/scripting/ejs/smbcalls_nss.c b/source4/scripting/ejs/smbcalls_nss.c
new file mode 100644
index 0000000000..1eef1eff79
--- /dev/null
+++ b/source4/scripting/ejs/smbcalls_nss.c
@@ -0,0 +1,148 @@
+/* 
+   Unix SMB/CIFS implementation.
+
+   provide access to getpwnam() and related calls
+
+   Copyright (C) Andrew Tridgell 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 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.
+*/
+
+#include "includes.h"
+#include "scripting/ejs/smbcalls.h"
+#include "lib/ejs/ejs.h"
+#include "system/passwd.h"
+
+
+/*
+  return a struct passwd as an object
+*/
+static struct MprVar mpr_passwd(struct passwd *pwd)
+{
+	struct MprVar ret;
+	if (pwd == NULL) {
+		return mprCreateUndefinedVar();
+	}
+	ret = mprCreateObjVar("passwd", MPR_DEFAULT_HASH_SIZE);
+
+	mprSetVar(&ret, "pw_name",   mprString(pwd->pw_name));
+	mprSetVar(&ret, "pw_passwd", mprString(pwd->pw_passwd));
+	mprSetVar(&ret, "pw_uid",    mprCreateIntegerVar(pwd->pw_uid));
+	mprSetVar(&ret, "pw_gid",    mprCreateIntegerVar(pwd->pw_gid));
+	mprSetVar(&ret, "pw_gecos",  mprString(pwd->pw_gecos));
+	mprSetVar(&ret, "pw_dir",    mprString(pwd->pw_dir));
+	mprSetVar(&ret, "pw_shell",  mprString(pwd->pw_shell));
+	return ret;
+}
+
+/*
+  return a struct passwd as an object
+*/
+static struct MprVar mpr_group(struct group *grp)
+{
+	struct MprVar ret;
+	if (grp == NULL) {
+		return mprCreateUndefinedVar();
+	}
+	ret = mprCreateObjVar("group", MPR_DEFAULT_HASH_SIZE);
+
+	mprSetVar(&ret, "gr_name",   mprString(grp->gr_name));
+	mprSetVar(&ret, "gr_passwd", mprString(grp->gr_passwd));
+	mprSetVar(&ret, "gr_gid",    mprCreateIntegerVar(grp->gr_gid));
+	mprSetVar(&ret, "gr_mem",    mprList("gr_mem", (const char **)grp->gr_mem));
+	return ret;
+}
+
+
+/*
+  usage:
+      var pw = getpwnam("root");
+
+  returns an object containing struct passwd entries
+*/
+static int ejs_getpwnam(MprVarHandle eid, int argc, struct MprVar **argv)
+{
+	/* validate arguments */
+	if (argc != 1 || argv[0]->type != MPR_TYPE_STRING) {
+		ejsSetErrorMsg(eid, "getpwnam invalid arguments");
+		return -1;
+	}
+
+	mpr_Return(eid, mpr_passwd(getpwnam(mprToString(argv[0]))));
+	return 0;
+}
+
+/*
+  usage:
+      var pw = getpwuid(0);
+
+  returns an object containing struct passwd entries
+*/
+static int ejs_getpwuid(MprVarHandle eid, int argc, struct MprVar **argv)
+{
+	/* validate arguments */
+	if (argc != 1 || argv[0]->type != MPR_TYPE_INT) {
+		ejsSetErrorMsg(eid, "getpwuid invalid arguments");
+		return -1;
+	}
+	mpr_Return(eid, mpr_passwd(getpwuid(mprToInt(argv[0]))));
+	return 0;
+}
+
+/*
+  usage:
+      var pw = getgrnam("users");
+
+  returns an object containing struct group entries
+*/
+static int ejs_getgrnam(MprVarHandle eid, int argc, struct MprVar **argv)
+{
+	/* validate arguments */
+	if (argc != 1 || argv[0]->type != MPR_TYPE_STRING) {
+		ejsSetErrorMsg(eid, "getgrnam invalid arguments");
+		return -1;
+	}
+	mpr_Return(eid, mpr_group(getgrnam(mprToString(argv[0]))));
+	return 0;
+}
+
+/*
+  usage:
+      var pw = getgrgid(0);
+
+  returns an object containing struct group entries
+*/
+static int ejs_getgrgid(MprVarHandle eid, int argc, struct MprVar **argv)
+{
+	/* validate arguments */
+	if (argc != 1 || argv[0]->type != MPR_TYPE_STRING) {
+		ejsSetErrorMsg(eid, "getgrgid invalid arguments");
+		return -1;
+	}
+	mpr_Return(eid, mpr_group(getgrgid(mprToInt(argv[0]))));
+	return 0;
+}
+
+
+/*
+  setup C functions that be called from ejs
+*/
+void smb_setup_ejs_nss(void)
+{
+	ejsDefineCFunction(-1, "getpwnam", ejs_getpwnam, NULL, MPR_VAR_SCRIPT_HANDLE);
+	ejsDefineCFunction(-1, "getpwuid", ejs_getpwuid, NULL, MPR_VAR_SCRIPT_HANDLE);
+	ejsDefineCFunction(-1, "getgrnam", ejs_getgrnam, NULL, MPR_VAR_SCRIPT_HANDLE);
+	ejsDefineCFunction(-1, "getgrgid", ejs_getgrgid, NULL, MPR_VAR_SCRIPT_HANDLE);
+}
diff --git a/source4/scripting/ejs/smbcalls_string.c b/source4/scripting/ejs/smbcalls_string.c
new file mode 100644
index 0000000000..7817de1b0d
--- /dev/null
+++ b/source4/scripting/ejs/smbcalls_string.c
@@ -0,0 +1,70 @@
+/* 
+   Unix SMB/CIFS implementation.
+
+   provide access to string functions
+
+   Copyright (C) Andrew Tridgell 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 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.
+*/
+
+#include "includes.h"
+#include "scripting/ejs/smbcalls.h"
+#include "lib/ejs/ejs.h"
+#include "system/passwd.h"
+
+/*
+  usage:
+      var s = strlower("UPPER");
+*/
+static int ejs_strlower(MprVarHandle eid, int argc, char **argv)
+{
+	char *s;
+	if (argc != 1) {
+		ejsSetErrorMsg(eid, "strlower invalid arguments");
+		return -1;
+	}
+	s = strlower_talloc(mprMemCtx(), argv[0]);
+	mpr_Return(eid, mprString(s));
+	talloc_free(s);
+	return 0;
+}
+
+/*
+  usage:
+      var s = strupper("lower");
+*/
+static int ejs_strupper(MprVarHandle eid, int argc, char **argv)
+{
+	char *s;
+	if (argc != 1) {
+		ejsSetErrorMsg(eid, "strupper invalid arguments");
+		return -1;
+	}
+	s = strupper_talloc(mprMemCtx(), argv[0]);
+	mpr_Return(eid, mprString(s));
+	talloc_free(s);
+	return 0;
+}
+
+
+/*
+  setup C functions that be called from ejs
+*/
+void smb_setup_ejs_string(void)
+{
+	ejsDefineStringCFunction(-1, "strlower", ejs_strlower, NULL, MPR_VAR_SCRIPT_HANDLE);
+	ejsDefineStringCFunction(-1, "strupper", ejs_strupper, NULL, MPR_VAR_SCRIPT_HANDLE);
+}
diff --git a/source4/scripting/libjs/base.js b/source4/scripting/libjs/base.js
index 504cd82259..f5498789c5 100644
--- a/source4/scripting/libjs/base.js
+++ b/source4/scripting/libjs/base.js
@@ -50,4 +50,3 @@ function check_array_zero(a)
 		assert(a[i] == 0);
 	}
 }
-
-- 
cgit 


From 887461327a93e1677de44438a5e4a1abd5b91f11 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Mon, 11 Jul 2005 10:18:26 +0000
Subject: r8320: make sure all our returned objects are full objects, which
 means they have the toString() and valueOf() default attributes

this allows all our returned objects to be used in logical expressions
(This used to be commit 570f071b1544b497d5f480b8ad50df097fe4c843)
---
 source4/scripting/ejs/ejsrpc.c        |  2 +-
 source4/scripting/ejs/mprutil.c       | 23 +++++++++++++++--------
 source4/scripting/ejs/smbcalls.c      |  2 +-
 source4/scripting/ejs/smbcalls_auth.c |  4 ++--
 source4/scripting/ejs/smbcalls_cli.c  |  2 +-
 source4/scripting/ejs/smbcalls_nss.c  |  4 ++--
 source4/scripting/ejs/smbcalls_rpc.c  |  2 +-
 7 files changed, 23 insertions(+), 16 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/ejsrpc.c b/source4/scripting/ejs/ejsrpc.c
index 8b6bc328dd..57e0a8f690 100644
--- a/source4/scripting/ejs/ejsrpc.c
+++ b/source4/scripting/ejs/ejsrpc.c
@@ -58,7 +58,7 @@ NTSTATUS ejs_pull_struct_start(struct ejs_rpc *ejs, struct MprVar **v, const cha
 */
 NTSTATUS ejs_push_struct_start(struct ejs_rpc *ejs, struct MprVar **v, const char *name)
 {
-	NDR_CHECK(mprSetVar(*v, name, mprCreateObjVar(name, MPR_DEFAULT_HASH_SIZE)));
+	NDR_CHECK(mprSetVar(*v, name, mprObject(name)));
 	return mprGetVar(v, name);
 }
 
diff --git a/source4/scripting/ejs/mprutil.c b/source4/scripting/ejs/mprutil.c
index a9cf71b15d..40ca050a96 100644
--- a/source4/scripting/ejs/mprutil.c
+++ b/source4/scripting/ejs/mprutil.c
@@ -24,6 +24,14 @@
 #include "lib/ejs/ejs.h"
 #include "lib/ldb/include/ldb.h"
 
+/*
+  return a default mpr object
+*/
+struct MprVar mprObject(const char *name)
+{
+	return ejsCreateObj(name?name:"(NULL)", MPR_DEFAULT_HASH_SIZE);
+}
+
 /*
   find a mpr component, allowing for sub objects, using the '.' convention
 */
@@ -75,7 +83,7 @@
 	}
 	v2 = mprGetProperty(v, objname, NULL);
 	if (v2 == NULL) {
-		mprSetVar(v, objname, mprCreateObjVar(objname, MPR_DEFAULT_HASH_SIZE));
+		mprSetVar(v, objname, mprObject(objname));
 		v2 = mprGetProperty(v, objname, NULL);
 	}
 	status = mprSetVar(v2, p+1, val);
@@ -104,7 +112,7 @@ struct MprVar mprList(const char *name, const char **list)
 	struct MprVar var;
 	int i;
 
-	var = mprCreateObjVar(name, MPR_DEFAULT_HASH_SIZE);
+	var = mprObject(name);
 	for (i=0;list && list[i];i++) {
 		mprAddArray(&var, i, mprCreateStringVar(list[i], 1));
 	}
@@ -119,7 +127,6 @@ struct MprVar mprList(const char *name, const char **list)
 */
 struct MprVar mprString(const char *s)
 {
-	struct MprVar var;
 	if (s == NULL) {
 		return mprCreatePtrVar(NULL, "NULL");
 	}
@@ -154,7 +161,7 @@ struct MprVar mprLdbMessage(struct ldb_message *msg)
 	const char *multivalued[] = { "objectClass", "memberOf", "privilege", 
 					    "member", NULL };
 
-	var = mprCreateObjVar(msg->dn, MPR_DEFAULT_HASH_SIZE);
+	var = mprObject(msg->dn);
 
 	for (i=0;i<msg->num_elements;i++) {
 		struct ldb_message_element *el = &msg->elements[i];
@@ -164,7 +171,7 @@ struct MprVar mprLdbMessage(struct ldb_message *msg)
 			val = mprData(el->values[0].data, el->values[0].length);
 		} else {
 			int j;
-			val = mprCreateObjVar(el->name, MPR_DEFAULT_HASH_SIZE);
+			val = mprObject(el->name);
 			for (j=0;j<el->num_values;j++) {
 				mprAddArray(&val, j, 
 					    mprData(el->values[j].data, 
@@ -191,7 +198,7 @@ struct MprVar mprLdbArray(struct ldb_message **msg, int count, const char *name)
 	struct MprVar res;
 	int i;
 
-	res = mprCreateObjVar(name?name:"(NULL)", MPR_DEFAULT_HASH_SIZE);
+	res = mprObject(name);
 	for (i=0;i<count;i++) {
 		mprAddArray(&res, i, mprLdbMessage(msg[i]));
 	}
@@ -249,7 +256,7 @@ struct MprVar mprNTSTATUS(NTSTATUS status)
 {
 	struct MprVar res;
 
-	res = mprCreateObjVar("ntstatus", MPR_DEFAULT_HASH_SIZE);
+	res = mprObject("ntstatus");
 
 	mprSetVar(&res, "errstr", mprCreateStringVar(nt_errstr(status), 1));
 	mprSetVar(&res, "v", mprCreateIntegerVar(NT_STATUS_V(status)));
@@ -266,7 +273,7 @@ struct MprVar mprWERROR(WERROR status)
 {
 	struct MprVar res;
 
-	res = mprCreateObjVar("werror", MPR_DEFAULT_HASH_SIZE);
+	res = mprObject("werror");
 
 	mprSetVar(&res, "errstr", mprCreateStringVar(win_errstr(status), 1));
 	mprSetVar(&res, "v", mprCreateIntegerVar(W_ERROR_V(status)));
diff --git a/source4/scripting/ejs/smbcalls.c b/source4/scripting/ejs/smbcalls.c
index 5972518036..2da1e8c669 100644
--- a/source4/scripting/ejs/smbcalls.c
+++ b/source4/scripting/ejs/smbcalls.c
@@ -70,7 +70,7 @@ static int ejs_typeof(MprVarHandle eid, int argc, struct MprVar **argv)
 static int ejs_IfaceList(MprVarHandle eid, int argc, struct MprVar **argv)
 {
 	int i, count = iface_count();
-	struct MprVar ret = mprCreateObjVar("interfaces", MPR_DEFAULT_HASH_SIZE);
+	struct MprVar ret = mprObject("interfaces");
 	for (i=0;i<count;i++) {
 		mprAddArray(&ret, i, mprString(iface_n_ip(i)));
 	}
diff --git a/source4/scripting/ejs/smbcalls_auth.c b/source4/scripting/ejs/smbcalls_auth.c
index 8e72f68fc1..089d4b6bea 100644
--- a/source4/scripting/ejs/smbcalls_auth.c
+++ b/source4/scripting/ejs/smbcalls_auth.c
@@ -101,7 +101,7 @@ static int ejs_userAuth(MprVarHandle eid, int argc, struct MprVar **argv)
 	remote_host = mprToString(mprGetProperty(argv[0], "rhost", NULL));
 
  	tmp_ctx = talloc_new(mprMemCtx());	
-	auth = mprCreateObjVar("auth", MPR_DEFAULT_HASH_SIZE);
+	auth = mprObject("auth");
 
 	if (domain && strcmp("System User", domain) == 0) {
 
@@ -126,7 +126,7 @@ static int ejs_domain_list(MprVarHandle eid, int argc, char **argv)
 		return -1;
 	}
 
-	list = mprCreateObjVar("list", MPR_DEFAULT_HASH_SIZE);
+	list = mprObject("list");
 	mprSetVar(&list, "0", mprCreateStringVar("System User", 1));
 
 	mpr_Return(eid, list);
diff --git a/source4/scripting/ejs/smbcalls_cli.c b/source4/scripting/ejs/smbcalls_cli.c
index 8d00b80362..c5611d555d 100644
--- a/source4/scripting/ejs/smbcalls_cli.c
+++ b/source4/scripting/ejs/smbcalls_cli.c
@@ -674,7 +674,7 @@ static int ejs_list(MprVarHandle eid, int argc, MprVar **argv)
 
 	attribute = mprVarToInteger(argv[2]);
 
-	result = mprCreateObjVar("list", MPR_DEFAULT_HASH_SIZE);
+	result = mprObject("list");
 
 	smbcli_list(tree, mask, attribute, ejs_list_helper, &result);
 
diff --git a/source4/scripting/ejs/smbcalls_nss.c b/source4/scripting/ejs/smbcalls_nss.c
index 1eef1eff79..abbf6cf10f 100644
--- a/source4/scripting/ejs/smbcalls_nss.c
+++ b/source4/scripting/ejs/smbcalls_nss.c
@@ -35,7 +35,7 @@ static struct MprVar mpr_passwd(struct passwd *pwd)
 	if (pwd == NULL) {
 		return mprCreateUndefinedVar();
 	}
-	ret = mprCreateObjVar("passwd", MPR_DEFAULT_HASH_SIZE);
+	ret = mprObject("passwd");
 
 	mprSetVar(&ret, "pw_name",   mprString(pwd->pw_name));
 	mprSetVar(&ret, "pw_passwd", mprString(pwd->pw_passwd));
@@ -56,7 +56,7 @@ static struct MprVar mpr_group(struct group *grp)
 	if (grp == NULL) {
 		return mprCreateUndefinedVar();
 	}
-	ret = mprCreateObjVar("group", MPR_DEFAULT_HASH_SIZE);
+	ret = mprObject("group");
 
 	mprSetVar(&ret, "gr_name",   mprString(grp->gr_name));
 	mprSetVar(&ret, "gr_passwd", mprString(grp->gr_passwd));
diff --git a/source4/scripting/ejs/smbcalls_rpc.c b/source4/scripting/ejs/smbcalls_rpc.c
index bb05eda426..53f7bc2e55 100644
--- a/source4/scripting/ejs/smbcalls_rpc.c
+++ b/source4/scripting/ejs/smbcalls_rpc.c
@@ -227,7 +227,7 @@ static int ejs_irpc_call(int eid, struct MprVar *conn, struct MprVar *io,
 		talloc_steal(reqs, reqs[i]);
 	}
 	
-	mprSetVar(io, "results", mprCreateObjVar("results", MPR_DEFAULT_HASH_SIZE));
+	mprSetVar(io, "results", mprObject("results"));
 	results = mprGetProperty(io, "results", NULL);
 
 	/* and receive the results, placing them in io.results[i] */
-- 
cgit 


From c30c711292321b70f5c7c468a8bc245217be67ba Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Mon, 11 Jul 2005 21:52:06 +0000
Subject: r8331: added split(), join() and FileLoad() functions to ejs.

this gets me most of the way through a ejs provision script
(This used to be commit 0ef8f0282e0490328bbcdc8c6daff3f8fac99087)
---
 source4/scripting/ejs/smbcalls_string.c | 103 ++++++++++++++++++++++++++++++++
 1 file changed, 103 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_string.c b/source4/scripting/ejs/smbcalls_string.c
index 7817de1b0d..b52a6d2182 100644
--- a/source4/scripting/ejs/smbcalls_string.c
+++ b/source4/scripting/ejs/smbcalls_string.c
@@ -59,6 +59,106 @@ static int ejs_strupper(MprVarHandle eid, int argc, char **argv)
 	return 0;
 }
 
+/*
+  usage:
+     list = split(".", "a.foo.bar");
+
+  NOTE: does not take a regular expression, unlink perl split()
+*/
+static int ejs_split(MprVarHandle eid, int argc, char **argv)
+{
+	const char *separator;
+	char *s, *p;
+	struct MprVar ret;
+	int count = 0;
+	TALLOC_CTX *tmp_ctx = talloc_new(mprMemCtx());
+	if (argc != 2) {
+		ejsSetErrorMsg(eid, "split invalid arguments");
+		return -1;
+	}
+	separator = argv[0];
+	s = argv[1];
+
+	ret = mprObject("list");
+
+	while ((p = strstr(s, separator))) {
+		char *s2 = talloc_strndup(tmp_ctx, s, (int)(p-s));
+		mprAddArray(&ret, count++, mprString(s2));
+		talloc_free(s2);
+		s = p + strlen(separator);
+	}
+	if (*s) {
+		mprAddArray(&ret, count++, mprString(s));
+	}
+	talloc_free(tmp_ctx);
+	mpr_Return(eid, ret);
+	return 0;
+}
+
+
+/*
+  usage:
+     str = join("DC=", list);
+*/
+static int ejs_join(MprVarHandle eid, int argc, struct MprVar **argv)
+{
+	int i;
+	const char *separator;
+	char *ret = NULL;
+	const char **list;
+	TALLOC_CTX *tmp_ctx = talloc_new(mprMemCtx());
+	if (argc != 2 ||
+	    argv[0]->type != MPR_TYPE_STRING ||
+	    argv[1]->type != MPR_TYPE_OBJECT) {
+		ejsSetErrorMsg(eid, "join invalid arguments");
+		return -1;
+	}
+
+	separator = mprToString(argv[0]);
+	list      = mprToList(tmp_ctx, argv[1]);
+
+	if (list == NULL || list[0] == NULL) {
+		talloc_free(tmp_ctx);
+		mpr_Return(eid, mprString(NULL));
+		return 0;
+	}
+	
+	ret = talloc_strdup(tmp_ctx, list[0]);
+	if (ret == NULL) {
+		goto failed;
+	}
+	for (i=1;list[i];i++) {
+		ret = talloc_asprintf_append(ret, "%s%s", separator, list[i]);
+		if (ret == NULL) {
+			goto failed;
+		}
+	}
+	mpr_Return(eid, mprString(ret));
+	talloc_free(tmp_ctx);
+	return 0;
+failed:
+	ejsSetErrorMsg(eid, "out of memory");
+	return -1;
+}
+
+/*
+  load a file as a string
+  usage:
+     string = FileLoad(filename);
+*/
+static int ejs_FileLoad(MprVarHandle eid, int argc, char **argv)
+{
+	char *s;
+	if (argc != 1) {
+		ejsSetErrorMsg(eid, "FileLoad invalid arguments");
+		return -1;
+	}
+
+	s = file_load(argv[0], NULL, mprMemCtx());
+	mpr_Return(eid, mprString(s));
+	talloc_free(s);
+	return 0;
+}
 
 /*
   setup C functions that be called from ejs
@@ -67,4 +167,7 @@ void smb_setup_ejs_string(void)
 {
 	ejsDefineStringCFunction(-1, "strlower", ejs_strlower, NULL, MPR_VAR_SCRIPT_HANDLE);
 	ejsDefineStringCFunction(-1, "strupper", ejs_strupper, NULL, MPR_VAR_SCRIPT_HANDLE);
+	ejsDefineStringCFunction(-1, "split", ejs_split, NULL, MPR_VAR_SCRIPT_HANDLE);
+	ejsDefineStringCFunction(-1, "FileLoad", ejs_FileLoad, NULL, MPR_VAR_SCRIPT_HANDLE);
+	ejsDefineCFunction(-1, "join", ejs_join, NULL, MPR_VAR_SCRIPT_HANDLE);
 }
-- 
cgit 


From ba1ee57df43fe93c8b650478324ddd6cc1a3c7bc Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Mon, 11 Jul 2005 22:40:32 +0000
Subject: r8333: merged with latest upstream ejs sources (This used to be
 commit b0f9ddafe95d4e8d846bc72a39e94d22da271348)

---
 source4/scripting/ejs/ejsrpc.c       |  2 +-
 source4/scripting/ejs/mprutil.c      |  6 +++---
 source4/scripting/ejs/smbcalls_cli.c | 11 ++++-------
 source4/scripting/ejs/smbcalls_rpc.c |  2 +-
 4 files changed, 9 insertions(+), 12 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/ejsrpc.c b/source4/scripting/ejs/ejsrpc.c
index 57e0a8f690..fe61eac502 100644
--- a/source4/scripting/ejs/ejsrpc.c
+++ b/source4/scripting/ejs/ejsrpc.c
@@ -284,7 +284,7 @@ NTSTATUS ejs_push_GUID(struct ejs_rpc *ejs,
 
 NTSTATUS ejs_push_null(struct ejs_rpc *ejs, struct MprVar *v, const char *name)
 {
-	return mprSetVar(v, name, mprCreatePtrVar(NULL, name));
+	return mprSetVar(v, name, mprCreatePtrVar(NULL));
 }
 
 BOOL ejs_pull_null(struct ejs_rpc *ejs, struct MprVar *v, const char *name)
diff --git a/source4/scripting/ejs/mprutil.c b/source4/scripting/ejs/mprutil.c
index 40ca050a96..4f799b2066 100644
--- a/source4/scripting/ejs/mprutil.c
+++ b/source4/scripting/ejs/mprutil.c
@@ -128,7 +128,7 @@ struct MprVar mprList(const char *name, const char **list)
 struct MprVar mprString(const char *s)
 {
 	if (s == NULL) {
-		return mprCreatePtrVar(NULL, "NULL");
+		return mprCreatePtrVar(NULL);
 	}
 	return mprCreateStringVar(s, 1);
 }
@@ -289,7 +289,7 @@ struct MprVar mprWERROR(WERROR status)
 */
 void mprSetPtr(struct MprVar *v, const char *propname, const void *p)
 {
-	mprSetVar(v, propname, mprCreatePtrVar(discard_const(p), NULL));
+	mprSetVar(v, propname, mprCreatePtrVar(discard_const(p)));
 }
 
 /*
@@ -297,7 +297,7 @@ void mprSetPtr(struct MprVar *v, const char *propname, const void *p)
 */
 void mprSetPtrChild(struct MprVar *v, const char *propname, const void *p)
 {
-	mprSetVar(v, propname, mprCreatePtrVar(discard_const(p), NULL));
+	mprSetVar(v, propname, mprCreatePtrVar(discard_const(p)));
 	talloc_steal(mprGetProperty(v, propname, NULL), p);
 }
 
diff --git a/source4/scripting/ejs/smbcalls_cli.c b/source4/scripting/ejs/smbcalls_cli.c
index c5611d555d..2433b33352 100644
--- a/source4/scripting/ejs/smbcalls_cli.c
+++ b/source4/scripting/ejs/smbcalls_cli.c
@@ -86,8 +86,7 @@ static int ejs_cli_connect(MprVarHandle eid, int argc, char **argv)
 
 	/* Return a socket object */
 
-	mpr_Return(eid, mprCreatePtrVar(transport, 
-					       talloc_get_name(transport)));
+	mpr_Return(eid, mprCreatePtrVar(transport));
 
 	return 0;
 }
@@ -214,8 +213,7 @@ static int ejs_cli_ssetup(MprVarHandle eid, int argc, MprVar **argv)
 
 	/* Return a session object */
 
-	mpr_Return(eid, mprCreatePtrVar(session, 
-					       talloc_get_name(session)));
+	mpr_Return(eid, mprCreatePtrVar(session));
 
 	result = 0;
 
@@ -297,8 +295,7 @@ static int ejs_cli_tree_connect(MprVarHandle eid, int argc, MprVar **argv)
 
 	talloc_free(mem_ctx);	
 
-	mpr_Return(eid, mprCreatePtrVar(tree, 
-					       talloc_get_name(tree)));
+	mpr_Return(eid, mprCreatePtrVar(tree));
 
 	return 0;
 }
@@ -446,7 +443,7 @@ static int ejs_tree_connect(MprVarHandle eid, int argc, char **argv)
 		return 0;
 	}
 
-	mpr_Return(eid, mprCreatePtrVar(tree, talloc_get_name(tree)));
+	mpr_Return(eid, mprCreatePtrVar(tree));
 
 	return 0;
 }
diff --git a/source4/scripting/ejs/smbcalls_rpc.c b/source4/scripting/ejs/smbcalls_rpc.c
index 53f7bc2e55..6aef216ca4 100644
--- a/source4/scripting/ejs/smbcalls_rpc.c
+++ b/source4/scripting/ejs/smbcalls_rpc.c
@@ -412,7 +412,7 @@ void smb_setup_ejs_rpc_constants(int eid)
 		r->constants(eid);
 	}
 
-	v = mprCreatePtrVar(NULL, "NULL");
+	v = mprCreatePtrVar(NULL);
 	mprSetProperty(ejsGetGlobalObject(eid), "NULL", &v);
 }
 
-- 
cgit 


From b1e93b296ea8f62ce0f15ccef5f6ae5339f4929f Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Tue, 12 Jul 2005 02:34:49 +0000
Subject: r8337: - use 64 bit access functions in ejs calls

- added access to smbd random functions

- fixed ordering in join()

- added sys_interfaces(), sys_hostname(), sys_nttime() and sys_ldaptime()
(This used to be commit 28c1a1f3c0cd2f8228fd8c3c695ab6f45226fa3f)
---
 source4/scripting/ejs/config.mk          |  2 +
 source4/scripting/ejs/mprutil.c          | 38 ++++++++++++-
 source4/scripting/ejs/smbcalls.c         | 18 +-----
 source4/scripting/ejs/smbcalls_nbt.c     |  2 +-
 source4/scripting/ejs/smbcalls_nss.c     |  2 +-
 source4/scripting/ejs/smbcalls_options.c |  2 +-
 source4/scripting/ejs/smbcalls_rand.c    | 92 +++++++++++++++++++++++++++++++
 source4/scripting/ejs/smbcalls_string.c  |  2 +-
 source4/scripting/ejs/smbcalls_sys.c     | 95 ++++++++++++++++++++++++++++++++
 9 files changed, 230 insertions(+), 23 deletions(-)
 create mode 100644 source4/scripting/ejs/smbcalls_rand.c
 create mode 100644 source4/scripting/ejs/smbcalls_sys.c

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/config.mk b/source4/scripting/ejs/config.mk
index 5e061cb2a3..770bb67b86 100644
--- a/source4/scripting/ejs/config.mk
+++ b/source4/scripting/ejs/config.mk
@@ -22,6 +22,8 @@ OBJ_FILES = \
 		scripting/ejs/smbcalls_options.o \
 		scripting/ejs/smbcalls_nss.o \
 		scripting/ejs/smbcalls_string.o \
+		scripting/ejs/smbcalls_rand.o \
+		scripting/ejs/smbcalls_sys.o \
 		scripting/ejs/mprutil.o
 REQUIRED_SUBSYSTEMS = AUTH EJS LIBBASIC EJSRPC MESSAGING
 # End SUBSYSTEM SMBCALLS
diff --git a/source4/scripting/ejs/mprutil.c b/source4/scripting/ejs/mprutil.c
index 4f799b2066..95571da245 100644
--- a/source4/scripting/ejs/mprutil.c
+++ b/source4/scripting/ejs/mprutil.c
@@ -211,7 +211,7 @@ struct MprVar mprLdbArray(struct ldb_message **msg, int count, const char *name)
  */
 const char *mprToString(const struct MprVar *v)
 {
-	if (v->type != MPR_TYPE_STRING) return NULL;
+	if (!mprVarIsString(v->type)) return NULL;
 	return v->string;
 }
 
@@ -220,8 +220,8 @@ const char *mprToString(const struct MprVar *v)
  */
 int mprToInt(const struct MprVar *v)
 {
-	if (v->type != MPR_TYPE_INT) return 0;
-	return v->integer;
+	if (!mprVarIsNumber(v->type)) return 0;
+	return mprVarToNumber(v);
 }
 
 /*
@@ -249,6 +249,38 @@ const char **mprToList(TALLOC_CTX *mem_ctx, struct MprVar *v)
 	return list;
 }
 
+
+/*
+  turn a MprVar object variable into a string list
+  this assumes the object variable is an array of strings
+*/
+const char **mprToArray(TALLOC_CTX *mem_ctx, struct MprVar *v)
+{
+	const char **list = NULL;
+	struct MprVar *len;
+	int length, i;
+
+	len = mprGetProperty(v, "length", NULL);
+	if (len == NULL) {
+		return NULL;
+	}
+	length = mprToInt(len);
+
+	for (i=0;i<length;i++) {
+		char idx[16];
+		struct MprVar *vs;
+		mprItoa(i, idx, sizeof(idx));		
+		vs = mprGetProperty(v, idx, NULL);
+		if (vs == NULL || vs->type != MPR_TYPE_STRING) {
+			talloc_free(list);
+			return NULL;
+		}
+		list = str_list_add(list, mprToString(vs));
+	}
+	talloc_steal(mem_ctx, list);
+	return list;
+}
+
 /*
   turn a NTSTATUS into a MprVar object with lots of funky properties
 */
diff --git a/source4/scripting/ejs/smbcalls.c b/source4/scripting/ejs/smbcalls.c
index 2da1e8c669..e58151620f 100644
--- a/source4/scripting/ejs/smbcalls.c
+++ b/source4/scripting/ejs/smbcalls.c
@@ -64,21 +64,6 @@ static int ejs_typeof(MprVarHandle eid, int argc, struct MprVar **argv)
 	return 0;
 }
 
-/*
-  return the list of configured network interfaces
-*/
-static int ejs_IfaceList(MprVarHandle eid, int argc, struct MprVar **argv)
-{
-	int i, count = iface_count();
-	struct MprVar ret = mprObject("interfaces");
-	for (i=0;i<count;i++) {
-		mprAddArray(&ret, i, mprString(iface_n_ip(i)));
-	}
-	mpr_Return(eid, ret);
-	return 0;	
-}
-
-
 /*
   libinclude() allows you to include js files using a search path specified
   in "js include =" in smb.conf. 
@@ -139,9 +124,10 @@ void smb_setup_ejs_functions(void)
 	smb_setup_ejs_options();
 	smb_setup_ejs_nss();
 	smb_setup_ejs_string();
+	smb_setup_ejs_random();
+	smb_setup_ejs_system();
 
 	ejsDefineCFunction(-1, "typeof", ejs_typeof, NULL, MPR_VAR_SCRIPT_HANDLE);
-	ejsDefineCFunction(-1, "IfaceList", ejs_IfaceList, NULL, MPR_VAR_SCRIPT_HANDLE);
 	ejsDefineStringCFunction(-1, "libinclude", ejs_libinclude, NULL, MPR_VAR_SCRIPT_HANDLE);
 }
 
diff --git a/source4/scripting/ejs/smbcalls_nbt.c b/source4/scripting/ejs/smbcalls_nbt.c
index a4dc943f51..16c4e6aaee 100644
--- a/source4/scripting/ejs/smbcalls_nbt.c
+++ b/source4/scripting/ejs/smbcalls_nbt.c
@@ -60,7 +60,7 @@ static int ejs_resolve_name(MprVarHandle eid, int argc, struct MprVar **argv)
 	if (argc == 2) {
 		make_nbt_name_client(&name, mprToString(argv[1]));
 	} else {
-		if (argv[1]->type != MPR_TYPE_INT) {
+		if (!mprVarIsNumber(argv[1]->type)) {
 			ejsSetErrorMsg(eid, "resolveName invalid arguments");
 			goto done;
 		}
diff --git a/source4/scripting/ejs/smbcalls_nss.c b/source4/scripting/ejs/smbcalls_nss.c
index abbf6cf10f..81ab02729a 100644
--- a/source4/scripting/ejs/smbcalls_nss.c
+++ b/source4/scripting/ejs/smbcalls_nss.c
@@ -93,7 +93,7 @@ static int ejs_getpwnam(MprVarHandle eid, int argc, struct MprVar **argv)
 static int ejs_getpwuid(MprVarHandle eid, int argc, struct MprVar **argv)
 {
 	/* validate arguments */
-	if (argc != 1 || argv[0]->type != MPR_TYPE_INT) {
+	if (argc != 1 || !mprVarIsNumber(argv[0]->type)) {
 		ejsSetErrorMsg(eid, "getpwuid invalid arguments");
 		return -1;
 	}
diff --git a/source4/scripting/ejs/smbcalls_options.c b/source4/scripting/ejs/smbcalls_options.c
index 335663acfe..df871cbb96 100644
--- a/source4/scripting/ejs/smbcalls_options.c
+++ b/source4/scripting/ejs/smbcalls_options.c
@@ -73,7 +73,7 @@ static int ejs_GetOptions(MprVarHandle eid, int argc, struct MprVar **argv)
 		return -1;
 	}
 
-	opt_argv = mprToList(tmp_ctx, argv[0]);
+	opt_argv = mprToArray(tmp_ctx, argv[0]);
 	options  = argv[1];
 	opt_argc = str_list_length(opt_argv);
 
diff --git a/source4/scripting/ejs/smbcalls_rand.c b/source4/scripting/ejs/smbcalls_rand.c
new file mode 100644
index 0000000000..d07c6ce233
--- /dev/null
+++ b/source4/scripting/ejs/smbcalls_rand.c
@@ -0,0 +1,92 @@
+/* 
+   Unix SMB/CIFS implementation.
+
+   provide access to randomisation functions
+
+   Copyright (C) Andrew Tridgell 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 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.
+*/
+
+#include "includes.h"
+#include "scripting/ejs/smbcalls.h"
+#include "lib/ejs/ejs.h"
+#include "system/passwd.h"
+
+/*
+  usage:
+      var i = random();
+*/
+static int ejs_random(MprVarHandle eid, int argc, struct MprVar **argv)
+{
+	mpr_Return(eid, mprCreateIntegerVar(generate_random()));
+	return 0;
+}
+
+/*
+  usage:
+      var s = randpass(len);
+*/
+static int ejs_randpass(MprVarHandle eid, int argc, struct MprVar **argv)
+{
+	char *s;
+	if (argc != 1 || !mprVarIsNumber(argv[0]->type)) {
+		ejsSetErrorMsg(eid, "randpass invalid arguments");
+		return -1;
+	}
+	s = generate_random_str(mprMemCtx(), mprToInt(argv[0]));
+	mpr_Return(eid, mprString(s));
+	talloc_free(s);
+	return 0;
+}
+
+/*
+  usage:
+      var guid = randguid();
+*/
+static int ejs_randguid(MprVarHandle eid, int argc, struct MprVar **argv)
+{
+	struct GUID guid = GUID_random();
+	char *s = GUID_string(mprMemCtx(), &guid);
+	mpr_Return(eid, mprString(s));
+	talloc_free(s);
+	return 0;
+}
+
+/*
+  usage:
+      var sid = randsid();
+*/
+static int ejs_randsid(MprVarHandle eid, int argc, struct MprVar **argv)
+{
+	char *s = talloc_asprintf(mprMemCtx(), "S-1-5-21-%8u-%8u-%8u", 
+				  (unsigned)generate_random(), 
+				  (unsigned)generate_random(), 
+				  (unsigned)generate_random());
+	mpr_Return(eid, mprString(s));
+	talloc_free(s);
+	return 0;
+}
+
+/*
+  setup C functions that be called from ejs
+*/
+void smb_setup_ejs_random(void)
+{
+	ejsDefineCFunction(-1, "random", ejs_random, NULL, MPR_VAR_SCRIPT_HANDLE);
+	ejsDefineCFunction(-1, "randpass", ejs_randpass, NULL, MPR_VAR_SCRIPT_HANDLE);
+	ejsDefineCFunction(-1, "randguid", ejs_randguid, NULL, MPR_VAR_SCRIPT_HANDLE);
+	ejsDefineCFunction(-1, "randsid", ejs_randsid, NULL, MPR_VAR_SCRIPT_HANDLE);
+}
diff --git a/source4/scripting/ejs/smbcalls_string.c b/source4/scripting/ejs/smbcalls_string.c
index b52a6d2182..b729f5dd3a 100644
--- a/source4/scripting/ejs/smbcalls_string.c
+++ b/source4/scripting/ejs/smbcalls_string.c
@@ -115,7 +115,7 @@ static int ejs_join(MprVarHandle eid, int argc, struct MprVar **argv)
 	}
 
 	separator = mprToString(argv[0]);
-	list      = mprToList(tmp_ctx, argv[1]);
+	list      = mprToArray(tmp_ctx, argv[1]);
 
 	if (list == NULL || list[0] == NULL) {
 		talloc_free(tmp_ctx);
diff --git a/source4/scripting/ejs/smbcalls_sys.c b/source4/scripting/ejs/smbcalls_sys.c
new file mode 100644
index 0000000000..a76690b597
--- /dev/null
+++ b/source4/scripting/ejs/smbcalls_sys.c
@@ -0,0 +1,95 @@
+/* 
+   Unix SMB/CIFS implementation.
+
+   provide access to system functions
+
+   Copyright (C) Andrew Tridgell 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 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.
+*/
+
+#include "includes.h"
+#include "scripting/ejs/smbcalls.h"
+#include "lib/ejs/ejs.h"
+
+/*
+  return the list of configured network interfaces
+*/
+static int ejs_sys_interfaces(MprVarHandle eid, int argc, struct MprVar **argv)
+{
+	int i, count = iface_count();
+	struct MprVar ret = mprObject("interfaces");
+	for (i=0;i<count;i++) {
+		mprAddArray(&ret, i, mprString(iface_n_ip(i)));
+	}
+	mpr_Return(eid, ret);
+	return 0;	
+}
+
+/*
+  return the hostname from gethostname()
+*/
+static int ejs_sys_hostname(MprVarHandle eid, int argc, struct MprVar **argv)
+{
+	char name[200];
+	if (gethostname(name, sizeof(name)-1) == -1) {
+		ejsSetErrorMsg(eid, "gethostname failed - %s", strerror(errno));
+		return -1;
+	}
+	mpr_Return(eid, mprString(name));
+	return 0;	
+}
+
+
+/*
+  return current time as a 64 bit nttime value
+*/
+static int ejs_sys_nttime(MprVarHandle eid, int argc, struct MprVar **argv)
+{
+	struct timeval tv = timeval_current();
+	struct MprVar v = mprCreateNumberVar(timeval_to_nttime(&tv));
+	mpr_Return(eid, v);
+	return 0;
+}
+
+/*
+  return a ldap time string from a nttime
+*/
+static int ejs_sys_ldaptime(MprVarHandle eid, int argc, struct MprVar **argv)
+{
+	char *s;
+	time_t t;
+	if (argc != 1 || !mprVarIsNumber(argv[0]->type)) {
+		ejsSetErrorMsg(eid, "sys_ldaptime invalid arguments");
+		return -1;
+	}
+	t = nt_time_to_unix(mprVarToNumber(argv[0]));
+	s = ldap_timestring(mprMemCtx(), t);
+	mpr_Return(eid, mprString(s));
+	talloc_free(s);
+	return 0;
+}
+
+
+/*
+  setup C functions that be called from ejs
+*/
+void smb_setup_ejs_system(void)
+{
+	ejsDefineCFunction(-1, "sys_interfaces", ejs_sys_interfaces, NULL, MPR_VAR_SCRIPT_HANDLE);
+	ejsDefineCFunction(-1, "sys_hostname", ejs_sys_hostname, NULL, MPR_VAR_SCRIPT_HANDLE);
+	ejsDefineCFunction(-1, "sys_nttime", ejs_sys_nttime, NULL, MPR_VAR_SCRIPT_HANDLE);
+	ejsDefineCFunction(-1, "sys_ldaptime", ejs_sys_ldaptime, NULL, MPR_VAR_SCRIPT_HANDLE);
+}
-- 
cgit 


From 2dce83de0c4de67f15e95456d6a63864d2f6ad85 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Tue, 12 Jul 2005 02:36:07 +0000
Subject: r8338: - added a substitute_var() js library function for doing hash
 driven   substitution of variables in strings

- the js provision script now correctly processes provision.ldif
(This used to be commit c2946003e06c4898ba0444cd0b69d3203753be94)
---
 source4/scripting/libjs/base.js | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/base.js b/source4/scripting/libjs/base.js
index f5498789c5..c6b05755c4 100644
--- a/source4/scripting/libjs/base.js
+++ b/source4/scripting/libjs/base.js
@@ -50,3 +50,32 @@ function check_array_zero(a)
 		assert(a[i] == 0);
 	}
 }
+
+/*
+  substitute strings of the form ${NAME} in str, replacing
+  with substitutions from subobj
+*/
+function substitute_var(str, subobj)
+{
+	var list = split("${", str);
+	var i;
+	for (i=1;i<list.length;i++) {
+		var list2 = split("}", list[i]);
+		if (list2.length < 2) {
+			return undefined;
+		}
+		var key = list2[0];
+		var val;
+		if (typeof(subobj[key]) == "undefined") {
+			val = "${" + key + "}";
+		} else if (typeof(subobj[key]) == "string") {
+			val = subobj[key];
+		} else {
+			var fn = subobj[key];
+			val = fn(key);
+		}
+		list2[0] = "" + val;
+		list[i] = join("", list2);
+	}
+	return join("", list);
+}
-- 
cgit 


From 1bb2b0603126188e639d7adb6309166c64b5e9df Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Tue, 12 Jul 2005 02:54:09 +0000
Subject: r8339: added ldbAdd(), ldbModify(), ldbDelete() and ldbRename() to
 ejs ldb functions (This used to be commit
 322c2137835ff2d76b3183901bf680780f164b5e)

---
 source4/scripting/ejs/smbcalls_ldb.c | 144 +++++++++++++++++++++++++++++++++++
 1 file changed, 144 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_ldb.c b/source4/scripting/ejs/smbcalls_ldb.c
index 414251a31c..309271a29d 100644
--- a/source4/scripting/ejs/smbcalls_ldb.c
+++ b/source4/scripting/ejs/smbcalls_ldb.c
@@ -85,10 +85,154 @@ failed:
 	return -1;
 }
 
+
+/*
+  perform an ldb add or modify
+*/
+static int ejs_ldbAddModify(MprVarHandle eid, int argc, char **argv,
+			    int fn(struct ldb_context *, const struct ldb_message *))
+{
+	const char *ldifstring, *dbfile;
+	struct ldb_context *ldb;
+	struct ldb_ldif *ldif;
+	int ret;
+
+	if (argc != 2) {
+		ejsSetErrorMsg(eid, "ldbAddModify invalid arguments");
+		return -1;
+	}
+
+	dbfile     = argv[0];
+	ldifstring = argv[1];
+
+	ldb = ldb_wrap_connect(mprMemCtx(), dbfile, 0, NULL);
+	if (ldb == NULL) {
+		ejsSetErrorMsg(eid, "ldbAddModify failed to open %s", dbfile);
+		goto failed;
+	}
+
+	ldif = ldb_ldif_read_string(ldb, ldifstring);
+	if (ldif == NULL) {
+		ejsSetErrorMsg(eid, "ldbAddModify invalid ldif");
+		goto failed;
+	}
+	ret = fn(ldb, ldif->msg);
+
+	mpr_Return(eid, mprCreateBoolVar(ret == 0));
+	talloc_free(ldb);
+	return 0;
+
+failed:
+	talloc_free(ldb);
+	return -1;
+}
+
+
+/*
+  perform an ldb delete
+  usage:
+   ok = ldbDelete(dbfile, dn);
+*/
+static int ejs_ldbDelete(MprVarHandle eid, int argc, char **argv)
+{
+	const char *dn, *dbfile;
+	struct ldb_context *ldb;
+	int ret;
+
+	if (argc != 2) {
+		ejsSetErrorMsg(eid, "ldbDelete invalid arguments");
+		return -1;
+	}
+
+	dbfile  = argv[0];
+	dn      = argv[1];
+
+	ldb = ldb_wrap_connect(mprMemCtx(), dbfile, 0, NULL);
+	if (ldb == NULL) {
+		ejsSetErrorMsg(eid, "ldbDelete failed to open %s", dbfile);
+		goto failed;
+	}
+
+	ret = ldb_delete(ldb, dn);
+
+	mpr_Return(eid, mprCreateBoolVar(ret == 0));
+	talloc_free(ldb);
+	return 0;
+
+failed:
+	talloc_free(ldb);
+	return -1;
+}
+
+/*
+  perform an ldb rename
+  usage:
+   ok = ldbRename(dbfile, dn1, dn2);
+*/
+static int ejs_ldbRename(MprVarHandle eid, int argc, char **argv)
+{
+	const char *dn1, *dn2, *dbfile;
+	struct ldb_context *ldb;
+	int ret;
+
+	if (argc != 3) {
+		ejsSetErrorMsg(eid, "ldbRename invalid arguments");
+		return -1;
+	}
+
+	dbfile = argv[0];
+	dn1    = argv[1];
+	dn2    = argv[2];
+
+	ldb = ldb_wrap_connect(mprMemCtx(), dbfile, 0, NULL);
+	if (ldb == NULL) {
+		ejsSetErrorMsg(eid, "ldbRename failed to open %s", dbfile);
+		goto failed;
+	}
+
+	ret = ldb_rename(ldb, dn1, dn2);
+
+	mpr_Return(eid, mprCreateBoolVar(ret == 0));
+	talloc_free(ldb);
+	return 0;
+
+failed:
+	talloc_free(ldb);
+	return -1;
+}
+
+/*
+  perform an ldb modify
+
+  syntax:
+    ok = ldbModify("dbfile", ldifstring);
+*/
+static int ejs_ldbAdd(MprVarHandle eid, int argc, char **argv)
+{
+	return ejs_ldbAddModify(eid, argc, argv, ldb_add);
+}
+
+/*
+  perform an ldb add
+
+  syntax:
+    ok = ldbAdd("dbfile", ldifstring);
+*/
+static int ejs_ldbModify(MprVarHandle eid, int argc, char **argv)
+{
+	return ejs_ldbAddModify(eid, argc, argv, ldb_modify);
+}
+
+
+
 /*
   setup C functions that be called from ejs
 */
 void smb_setup_ejs_ldb(void)
 {
 	ejsDefineCFunction(-1, "ldbSearch", ejs_ldbSearch, NULL, MPR_VAR_SCRIPT_HANDLE);
+	ejsDefineStringCFunction(-1, "ldbAdd", ejs_ldbAdd, NULL, MPR_VAR_SCRIPT_HANDLE);
+	ejsDefineStringCFunction(-1, "ldbModify", ejs_ldbModify, NULL, MPR_VAR_SCRIPT_HANDLE);
+	ejsDefineStringCFunction(-1, "ldbDelete", ejs_ldbDelete, NULL, MPR_VAR_SCRIPT_HANDLE);
+	ejsDefineStringCFunction(-1, "ldbRename", ejs_ldbRename, NULL, MPR_VAR_SCRIPT_HANDLE);
 }
-- 
cgit 


From 9f86e202865807ed898eff684d7cf3be7daae0fc Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Tue, 12 Jul 2005 05:53:51 +0000
Subject: r8340: - added sys_gmtime()

- added sys_unlink()

- added sys_file_load() and sys_file_save()

- use mprString() instead of mprCreateStringVar() to cope with NULL strings

- removed smbcalls_irpc.c as its not needed any more

- allow ldbAdd() and ldbModify() to take multiple ldif records

- added a sprintf() function to ejs. Quite complex, but very useful!
(This used to be commit 625628a3f6e78349d2240ebcc79081f350672070)
---
 source4/scripting/ejs/ejsrpc.c           |   6 +-
 source4/scripting/ejs/mprutil.c          |  14 +--
 source4/scripting/ejs/smbcalls_auth.c    |  12 +-
 source4/scripting/ejs/smbcalls_cli.c     |   2 +-
 source4/scripting/ejs/smbcalls_irpc.c    | 197 -------------------------------
 source4/scripting/ejs/smbcalls_ldb.c     |   8 +-
 source4/scripting/ejs/smbcalls_nbt.c     |   3 +-
 source4/scripting/ejs/smbcalls_options.c |   4 +-
 source4/scripting/ejs/smbcalls_string.c  | 133 +++++++++++++++++++--
 source4/scripting/ejs/smbcalls_sys.c     |  91 ++++++++++++++
 10 files changed, 236 insertions(+), 234 deletions(-)
 delete mode 100644 source4/scripting/ejs/smbcalls_irpc.c

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/ejsrpc.c b/source4/scripting/ejs/ejsrpc.c
index fe61eac502..e84fcbeb32 100644
--- a/source4/scripting/ejs/ejsrpc.c
+++ b/source4/scripting/ejs/ejsrpc.c
@@ -226,7 +226,7 @@ NTSTATUS ejs_pull_string(struct ejs_rpc *ejs,
 NTSTATUS ejs_push_string(struct ejs_rpc *ejs, 
 			 struct MprVar *v, const char *name, const char *s)
 {
-	return mprSetVar(v, name, mprCreateStringVar(s, True));
+	return mprSetVar(v, name, mprString(s));
 }
 
 /*
@@ -264,7 +264,7 @@ NTSTATUS ejs_push_dom_sid(struct ejs_rpc *ejs,
 {
 	char *sidstr = dom_sid_string(ejs, r);
 	NT_STATUS_HAVE_NO_MEMORY(sidstr);
-	return mprSetVar(v, name, mprCreateStringVar(sidstr, True));
+	return mprSetVar(v, name, mprString(sidstr));
 }
 
 NTSTATUS ejs_pull_GUID(struct ejs_rpc *ejs, 
@@ -279,7 +279,7 @@ NTSTATUS ejs_push_GUID(struct ejs_rpc *ejs,
 {
 	char *guid = GUID_string(ejs, r);
 	NT_STATUS_HAVE_NO_MEMORY(guid);
-	return mprSetVar(v, name, mprCreateStringVar(guid, True));
+	return mprSetVar(v, name, mprString(guid));
 }
 
 NTSTATUS ejs_push_null(struct ejs_rpc *ejs, struct MprVar *v, const char *name)
diff --git a/source4/scripting/ejs/mprutil.c b/source4/scripting/ejs/mprutil.c
index 95571da245..30dec22af1 100644
--- a/source4/scripting/ejs/mprutil.c
+++ b/source4/scripting/ejs/mprutil.c
@@ -114,7 +114,7 @@ struct MprVar mprList(const char *name, const char **list)
 
 	var = mprObject(name);
 	for (i=0;list && list[i];i++) {
-		mprAddArray(&var, i, mprCreateStringVar(list[i], 1));
+		mprAddArray(&var, i, mprString(list[i]));
 	}
 	if (i==0) {
 		mprSetVar(&var, "length", mprCreateIntegerVar(i));
@@ -130,7 +130,7 @@ struct MprVar mprString(const char *s)
 	if (s == NULL) {
 		return mprCreatePtrVar(NULL);
 	}
-	return mprCreateStringVar(s, 1);
+	return mprCreateStringVar(s, True);
 }
 
 /*
@@ -143,7 +143,7 @@ struct MprVar mprData(const uint8_t *p, size_t length)
 	if (s == NULL) {
 		return mprCreateUndefinedVar();
 	}
-	var = mprCreateStringVar(s, 1);
+	var = mprString(s);
 	talloc_free(s);
 	return var;
 }
@@ -183,7 +183,7 @@ struct MprVar mprLdbMessage(struct ldb_message *msg)
 
 	/* add the dn if it is not already specified */
 	if (mprGetProperty(&var, "dn", 0) == 0) {
-		mprSetVar(&var, "dn", mprCreateStringVar(msg->dn, 1));
+		mprSetVar(&var, "dn", mprString(msg->dn));
 	}
 	
 	return var;		
@@ -290,7 +290,7 @@ struct MprVar mprNTSTATUS(NTSTATUS status)
 
 	res = mprObject("ntstatus");
 
-	mprSetVar(&res, "errstr", mprCreateStringVar(nt_errstr(status), 1));
+	mprSetVar(&res, "errstr", mprString(nt_errstr(status)));
 	mprSetVar(&res, "v", mprCreateIntegerVar(NT_STATUS_V(status)));
 	mprSetVar(&res, "is_ok", mprCreateBoolVar(NT_STATUS_IS_OK(status)));
 	mprSetVar(&res, "is_err", mprCreateBoolVar(NT_STATUS_IS_ERR(status)));
@@ -307,7 +307,7 @@ struct MprVar mprWERROR(WERROR status)
 
 	res = mprObject("werror");
 
-	mprSetVar(&res, "errstr", mprCreateStringVar(win_errstr(status), 1));
+	mprSetVar(&res, "errstr", mprString(win_errstr(status)));
 	mprSetVar(&res, "v", mprCreateIntegerVar(W_ERROR_V(status)));
 	mprSetVar(&res, "is_ok", mprCreateBoolVar(W_ERROR_IS_OK(status)));
 	mprSetVar(&res, "is_err", mprCreateBoolVar(!W_ERROR_IS_OK(status)));
@@ -363,7 +363,7 @@ void *mprGetPtr(struct MprVar *v, const char *propname)
 */
 void mpr_ReturnString(int eid, const char *s)
 { 
-	mpr_Return(eid, mprCreateStringVar(s, False));
+	mpr_Return(eid, mprString(s));
 }
 
 
diff --git a/source4/scripting/ejs/smbcalls_auth.c b/source4/scripting/ejs/smbcalls_auth.c
index 089d4b6bea..81a7ee1bac 100644
--- a/source4/scripting/ejs/smbcalls_auth.c
+++ b/source4/scripting/ejs/smbcalls_auth.c
@@ -41,7 +41,7 @@ static int ejs_systemAuth(TALLOC_CTX *tmp_ctx, struct MprVar *auth, const char *
 	nt_status = auth_context_create(tmp_ctx, auth_unix, &auth_context, NULL);
 	if (!NT_STATUS_IS_OK(nt_status)) {
 		mprSetPropertyValue(auth, "result", mprCreateBoolVar(False));
-		mprSetPropertyValue(auth, "report", mprCreateStringVar("Auth System Failure", 1));
+		mprSetPropertyValue(auth, "report", mprString("Auth System Failure"));
 		goto done;
 	}
 
@@ -58,13 +58,13 @@ static int ejs_systemAuth(TALLOC_CTX *tmp_ctx, struct MprVar *auth, const char *
 	nt_status = auth_check_password(auth_context, tmp_ctx, user_info, &server_info);
 	if (!NT_STATUS_IS_OK(nt_status)) {
 		mprSetPropertyValue(auth, "result", mprCreateBoolVar(False));
-		mprSetPropertyValue(auth, "report", mprCreateStringVar("Login Failed", 1));
+		mprSetPropertyValue(auth, "report", mprString("Login Failed"));
 		goto done;
 	}
 
 	mprSetPropertyValue(auth, "result", mprCreateBoolVar(server_info->authenticated));
-	mprSetPropertyValue(auth, "username", mprCreateStringVar(server_info->account_name, 1));
-	mprSetPropertyValue(auth, "domain", mprCreateStringVar(server_info->domain_name, 1));
+	mprSetPropertyValue(auth, "username", mprString(server_info->account_name));
+	mprSetPropertyValue(auth, "domain", mprString(server_info->domain_name));
 
 done:
 	return 0;
@@ -109,7 +109,7 @@ static int ejs_userAuth(MprVarHandle eid, int argc, struct MprVar **argv)
 	}  else {
 
 		mprSetPropertyValue(&auth, "result", mprCreateBoolVar(False));
-		mprSetPropertyValue(&auth, "report", mprCreateStringVar("Unknown Domain", 1));
+		mprSetPropertyValue(&auth, "report", mprString("Unknown Domain"));
 	}
 
 	mpr_Return(eid, auth);
@@ -127,7 +127,7 @@ static int ejs_domain_list(MprVarHandle eid, int argc, char **argv)
 	}
 
 	list = mprObject("list");
-	mprSetVar(&list, "0", mprCreateStringVar("System User", 1));
+	mprSetVar(&list, "0", mprString("System User"));
 
 	mpr_Return(eid, list);
 
diff --git a/source4/scripting/ejs/smbcalls_cli.c b/source4/scripting/ejs/smbcalls_cli.c
index 2433b33352..fb18d442a0 100644
--- a/source4/scripting/ejs/smbcalls_cli.c
+++ b/source4/scripting/ejs/smbcalls_cli.c
@@ -635,7 +635,7 @@ static void ejs_list_helper(struct clilist_file_info *info, const char *mask,
 	char idx[16];
 
 	mprItoa(result->properties->numDataItems, idx, sizeof(idx));
-	mprSetVar(result, idx, mprCreateStringVar(info->name, 1));
+	mprSetVar(result, idx, mprString(info->name));
 }
 
 static int ejs_list(MprVarHandle eid, int argc, MprVar **argv)
diff --git a/source4/scripting/ejs/smbcalls_irpc.c b/source4/scripting/ejs/smbcalls_irpc.c
deleted file mode 100644
index 4fd4671732..0000000000
--- a/source4/scripting/ejs/smbcalls_irpc.c
+++ /dev/null
@@ -1,197 +0,0 @@
-/* 
-   Unix SMB/CIFS implementation.
-
-   provide hooks into IRPC calls from ejs scripts.
-
-   Copyright (C) Andrew Tridgell 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 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.
-*/
-/*
-  I hope that this code will eventually be autogenerated.
-
-
-  In this code, the convention is:
-
-    ejs_pull_*()   from MprVar -> C structure
-    ejs_push_*()   from C structure -> MprVar
-
-  note that for ejs calls, pull only ever needs to do
-  NDR_IN, and push only ever needs to do NDR_OUT. This is
-  because ejs code is (at least for the moment) only used for
-  the client, not the server
-
-  also note that we don't need the NDR_SCALARS/NDR_BUFFERS stuff, as
-  we aren't dealing with wire marshalling where scalars and buffers
-  are separated
-*/
-
-#include "includes.h"
-#include "lib/ejs/ejs.h"
-#include "librpc/gen_ndr/ndr_irpc.h"
-
-struct ndr_ejs {
-	/* nothing here yet */
-	int dummy;
-};
-
-struct enum_table {
-	uint32_t evalue;
-	const char *name;
-};
-
-#define EJS_ASSERT(condition) do { \
-	if (!(condition)) { \
-		DEBUG(0,("ejs assert failed at %s: %s\n", __location__, #condition)); \
-		return NT_STATUS_INVALID_PARAMETER; \
-	} \
-} while (0)
-
-
-/* first some common helper functions */
-
-static NTSTATUS ejs_pull_enum(struct ndr_ejs *ndr,
-			      uint32_t *evalue,
-			      struct MprVar *v,
-			      const struct enum_table *etable)
-{
-	const char *s;
-	int i;
-	EJS_ASSERT(v->type == MPR_TYPE_STRING);
-	s = v->string;
-	for (i=0;etable[i].name;i++) {
-		if (strcmp(s, etable[i].name) == 0) {
-			*evalue = etable[i].evalue;
-			return NT_STATUS_OK;
-		}
-	}
-	return NT_STATUS_INVALID_PARAMETER;
-}
-
-static NTSTATUS ejs_push_enum(struct ndr_ejs *ndr,
-			      uint32_t evalue,
-			      struct MprVar *v,
-			      const struct enum_table *etable)
-{
-	int i;
-	for (i=0;etable[i].name;i++) {
-		if (evalue == etable[i].evalue) {
-			*v = mprCreateStringVar(etable[i].name, 0);
-			return NT_STATUS_OK;
-		}
-	}
-	return NT_STATUS_INVALID_PARAMETER;
-}
-
-static NTSTATUS ejs_push_hyper(struct ndr_ejs *ndr,
-			       uint64_t evalue,
-			       struct MprVar *v,
-			       const char *name)
-{
-}
-
-
-NTSTATUS ejs_element(struct ndr_ejs *ndr,
-		     struct MprVar *v,
-		     const char *name,
-		     struct MprVar **e)
-{
-	*e = mprGetProperty(v, name, NULL);
-	if (*e == NULL) {
-		return NT_STATUS_INVALID_PARAMETER;
-	}
-	return NT_STATUS_OK;
-}
-
-
-/* when we auto-generate, the enum tables should also be used by
-   the ndr_print_*() functions for non-ejs handling of enums
-*/
-static const struct enum_table enum_table_nbdt_info_level[] = {
-	{NBTD_INFO_STATISTICS, "NBTD_INFO_STATISTICS"},
-	{-1, NULL}
-};
-
-
-
-/* pull-side functions for nbtd_information call */
-
-static NTSTATUS ejs_pull_nbtd_info_level(struct ndr_ejs *ndr, 
-					 enum nbtd_info_level *r,
-					 struct MprVar *v)
-{
-	uint32_t e;
-	NDR_CHECK(ejs_pull_enum(ndr, &e, v, enum_table_nbdt_info_level));
-	*r = e;
-	return NT_STATUS_OK;
-}
-
-static NTSTATUS ejs_pull_nbtd_information(struct ndr_ejs *ndr, 
-					  struct nbtd_information *r, 
-					  struct MprVar *v)
-{
-	struct MprVar *e;
-	NDR_CHECK(ejs_element(ndr, v, "level", &e));
-	NDR_CHECK(ejs_pull_nbtd_info_level(ndr, &r->in.level, e));
-	return NT_STATUS_OK;
-}
-
-
-/* push side functions for nbtd_information */
-
-static NTSTATUS ejs_push_nbtd_info_level(struct ndr_ejs *ndr, enum nbtd_info_level r, 
-					 struct MprVar *v)
-{
-	NDR_CHECK(ejs_push_enum(ndr, r, v, enum_table_nbdt_info_level));
-	return NT_STATUS_OK;
-}
-
-static NTSTATUS ejs_push_nbtd_statistics(struct ndr_ejs *ndr, struct nbtd_statistics *r,
-					 struct MprVar *v)
-{
-	NDR_CHECK(ejs_push_hyper(ndr, r->total_received, v, "total_received"));
-	NDR_CHECK(ejs_push_hyper(ndr, r->total_sent, v, "total_sent"));
-	NDR_CHECK(ejs_push_hyper(ndr, r->query_count, v, "query_count"));
-	NDR_CHECK(ejs_push_hyper(ndr, r->register_count, v, "register_count"));
-	NDR_CHECK(ejs_push_hyper(ndr, r->release_count, v, "release_count"));
-	NDR_CHECK(ejs_push_hyper(ndr, r->refresh_count, v, "refresh_count"));
-	return NT_STATUS_OK;
-}
-
-static NTSTATUS ejs_push_nbtd_info(struct ndr_ejs *ndr, union nbtd_info *r, 
-				   struct MprVar *v)
-{
-	int level;
-	level = ejs_push_get_switch_value(ndr, r);
-	switch (level) {
-	case NBTD_INFO_STATISTICS:
-		NDR_CHECK(ejs_push_object(ndr, r->stats, 
-					  (ejs_push_fn_t)ejs_push_nbtd_statistics, 
-					  v, "stats"));
-		break;
-	default:
-		return ejs_push_error(ndr, NDR_ERR_BAD_SWITCH, "Bad switch value %u", level);
-	}
-	return NT_STATUS_OK;
-}
-
-static NTSTATUS ndr_push_nbtd_information(struct ndr_ejs *ndr, 
-					  struct nbtd_information *r, struct MprVar *v)
-{
-	NDR_CHECK(ejs_push_set_switch_value(ndr, &r->out.info, r->in.level));
-	NDR_CHECK(ejs_push_object(ndr, &r->out.info, 
-				  (ejs_push_fn_t)ejs_push_nbtd_info, v, "info"));
-	return NT_STATUS_OK;
-}
diff --git a/source4/scripting/ejs/smbcalls_ldb.c b/source4/scripting/ejs/smbcalls_ldb.c
index 309271a29d..9876fe151f 100644
--- a/source4/scripting/ejs/smbcalls_ldb.c
+++ b/source4/scripting/ejs/smbcalls_ldb.c
@@ -111,12 +111,10 @@ static int ejs_ldbAddModify(MprVarHandle eid, int argc, char **argv,
 		goto failed;
 	}
 
-	ldif = ldb_ldif_read_string(ldb, ldifstring);
-	if (ldif == NULL) {
-		ejsSetErrorMsg(eid, "ldbAddModify invalid ldif");
-		goto failed;
+	while ((ldif = ldb_ldif_read_string(ldb, &ldifstring))) {
+		ret = fn(ldb, ldif->msg);
+		talloc_free(ldif);
 	}
-	ret = fn(ldb, ldif->msg);
 
 	mpr_Return(eid, mprCreateBoolVar(ret == 0));
 	talloc_free(ldb);
diff --git a/source4/scripting/ejs/smbcalls_nbt.c b/source4/scripting/ejs/smbcalls_nbt.c
index 16c4e6aaee..721a5beb22 100644
--- a/source4/scripting/ejs/smbcalls_nbt.c
+++ b/source4/scripting/ejs/smbcalls_nbt.c
@@ -72,8 +72,7 @@ static int ejs_resolve_name(MprVarHandle eid, int argc, struct MprVar **argv)
 	nt_status = resolve_name(&name, tmp_ctx, &reply_addr);
 
 	if (NT_STATUS_IS_OK(nt_status)) {
-		mprSetPropertyValue(argv[0], "value", 
-				    mprCreateStringVar(reply_addr, 1));
+		mprSetPropertyValue(argv[0], "value", mprString(reply_addr));
 	}
 
 	mpr_Return(eid, mprNTSTATUS(nt_status));
diff --git a/source4/scripting/ejs/smbcalls_options.c b/source4/scripting/ejs/smbcalls_options.c
index df871cbb96..005a3bcb9a 100644
--- a/source4/scripting/ejs/smbcalls_options.c
+++ b/source4/scripting/ejs/smbcalls_options.c
@@ -155,7 +155,7 @@ static int ejs_GetOptions(MprVarHandle eid, int argc, struct MprVar **argv)
 			err = talloc_asprintf(tmp_ctx, "%s: %s",
 					      poptBadOption(pc, POPT_BADOPTION_NOALIAS),
 					      poptStrerror(opt));
-			mprSetVar(options, "ERROR", mprCreateStringVar(err, 1));
+			mprSetVar(options, "ERROR", mprString(err));
 			talloc_free(tmp_ctx);
 			mpr_Return(eid, mprCreateBoolVar(0));
 			return 0;
@@ -168,7 +168,7 @@ static int ejs_GetOptions(MprVarHandle eid, int argc, struct MprVar **argv)
 			int v = strtol(arg, NULL, 0);
 			mprSetVar(options, opt_names[opt], mprCreateIntegerVar(v));
 		} else {
-			mprSetVar(options, opt_names[opt], mprCreateStringVar(arg, 1));
+			mprSetVar(options, opt_names[opt], mprString(arg));
 		}
 	}
 
diff --git a/source4/scripting/ejs/smbcalls_string.c b/source4/scripting/ejs/smbcalls_string.c
index b729f5dd3a..7a19ecdf2c 100644
--- a/source4/scripting/ejs/smbcalls_string.c
+++ b/source4/scripting/ejs/smbcalls_string.c
@@ -141,23 +141,134 @@ failed:
 	return -1;
 }
 
+
 /*
-  load a file as a string
+  blergh, C certainly makes this hard!
   usage:
-     string = FileLoad(filename);
+     str = sprintf("i=%d s=%7s", 7, "foo");
 */
-static int ejs_FileLoad(MprVarHandle eid, int argc, char **argv)
+static int ejs_sprintf(MprVarHandle eid, int argc, struct MprVar **argv)
 {
-	char *s;
-	if (argc != 1) {
-		ejsSetErrorMsg(eid, "FileLoad invalid arguments");
+	const char *format;
+	const char *p;
+	char *ret;
+	int a = 1;
+	char *(*_asprintf_append)(char *, const char *, ...);
+	TALLOC_CTX *tmp_ctx;
+	if (argc < 1 || argv[0]->type != MPR_TYPE_STRING) {
+		ejsSetErrorMsg(eid, "sprintf invalid arguments");
 		return -1;
 	}
+	format = mprToString(argv[0]);
+	tmp_ctx = talloc_new(mprMemCtx());
+	ret = talloc_strdup(tmp_ctx, "");
 
-	s = file_load(argv[0], NULL, mprMemCtx());
-	mpr_Return(eid, mprString(s));
-	talloc_free(s);
-	return 0;
+	/* avoid all the format string warnings */
+	_asprintf_append = talloc_asprintf_append;
+
+	/*
+	  hackity hack ...
+	*/
+	while ((p = strchr(format, '%'))) {
+		char *fmt2;
+		int len, len_count=0;
+		char *tstr;
+		ret = talloc_asprintf_append(ret, "%*.*s", 
+					     (int)(p-format), (int)(p-format), 
+					     format);
+		if (ret == NULL) goto failed;
+		format += (int)(p-format);
+		len = strcspn(p+1, "dxuiofgGpXeEFcs%") + 1;
+		fmt2 = talloc_strndup(tmp_ctx, p, len+1);
+		if (fmt2 == NULL) goto failed;
+		len_count = count_chars(fmt2, '*');
+		/* find the type string */
+		tstr = &fmt2[len];
+		while (tstr > fmt2 && isalpha(tstr[-1])) {
+			tstr--;
+		}
+		if (strcmp(tstr, "%") == 0) {
+			ret = talloc_asprintf_append(ret, "%%");
+			if (ret == NULL) {
+				goto failed;
+			}
+			format += len+1;
+			continue;
+		}
+		if (len_count > 2 || 
+		    argc < a + len_count + 1) {
+			ejsSetErrorMsg(eid, "sprintf: not enough arguments for format");
+			goto failed;
+		}
+#define FMT_ARG(fn, type) do { \
+			switch (len_count) { \
+			case 0: \
+				ret = _asprintf_append(ret, fmt2, \
+							     (type)fn(argv[a])); \
+				break; \
+			case 1: \
+				ret = _asprintf_append(ret, fmt2, \
+							     (int)mprVarToNumber(argv[a]), \
+							     (type)fn(argv[a+1])); \
+				break; \
+			case 2: \
+				ret = _asprintf_append(ret, fmt2, \
+							     (int)mprVarToNumber(argv[a]), \
+							     (int)mprVarToNumber(argv[a+1]), \
+							     (type)fn(argv[a+2])); \
+				break; \
+			} \
+			a += len_count + 1; \
+			if (ret == NULL) { \
+				goto failed; \
+			} \
+} while (0)
+
+		if (strcmp(tstr, "s")==0)        FMT_ARG(mprToString,    const char *);
+		else if (strcmp(tstr, "c")==0)   FMT_ARG(*mprToString,   char);
+		else if (strcmp(tstr, "d")==0)   FMT_ARG(mprVarToNumber, int);
+		else if (strcmp(tstr, "ld")==0)  FMT_ARG(mprVarToNumber, long);
+		else if (strcmp(tstr, "lld")==0) FMT_ARG(mprVarToNumber, long long);
+		else if (strcmp(tstr, "x")==0)   FMT_ARG(mprVarToNumber, int);
+		else if (strcmp(tstr, "lx")==0)  FMT_ARG(mprVarToNumber, long);
+		else if (strcmp(tstr, "llx")==0) FMT_ARG(mprVarToNumber, long long);
+		else if (strcmp(tstr, "X")==0)   FMT_ARG(mprVarToNumber, int);
+		else if (strcmp(tstr, "lX")==0)  FMT_ARG(mprVarToNumber, long);
+		else if (strcmp(tstr, "llX")==0) FMT_ARG(mprVarToNumber, long long);
+		else if (strcmp(tstr, "u")==0)   FMT_ARG(mprVarToNumber, int);
+		else if (strcmp(tstr, "lu")==0)  FMT_ARG(mprVarToNumber, long);
+		else if (strcmp(tstr, "llu")==0) FMT_ARG(mprVarToNumber, long long);
+		else if (strcmp(tstr, "i")==0)   FMT_ARG(mprVarToNumber, int);
+		else if (strcmp(tstr, "li")==0)  FMT_ARG(mprVarToNumber, long);
+		else if (strcmp(tstr, "lli")==0) FMT_ARG(mprVarToNumber, long long);
+		else if (strcmp(tstr, "o")==0)   FMT_ARG(mprVarToNumber, int);
+		else if (strcmp(tstr, "lo")==0)  FMT_ARG(mprVarToNumber, long);
+		else if (strcmp(tstr, "llo")==0) FMT_ARG(mprVarToNumber, long long);
+		else if (strcmp(tstr, "f")==0)   FMT_ARG(mprVarToFloat,  double);
+		else if (strcmp(tstr, "lf")==0)  FMT_ARG(mprVarToFloat,  double);
+		else if (strcmp(tstr, "g")==0)   FMT_ARG(mprVarToFloat,  double);
+		else if (strcmp(tstr, "lg")==0)  FMT_ARG(mprVarToFloat,  double);
+		else if (strcmp(tstr, "e")==0)   FMT_ARG(mprVarToFloat,  double);
+		else if (strcmp(tstr, "le")==0)  FMT_ARG(mprVarToFloat,  double);
+		else if (strcmp(tstr, "E")==0)   FMT_ARG(mprVarToFloat,  double);
+		else if (strcmp(tstr, "lE")==0)  FMT_ARG(mprVarToFloat,  double);
+		else if (strcmp(tstr, "F")==0)   FMT_ARG(mprVarToFloat,  double);
+		else if (strcmp(tstr, "lF")==0)  FMT_ARG(mprVarToFloat,  double);
+		else {
+			ejsSetErrorMsg(eid, "sprintf: unknown format string '%s'", fmt2);
+			goto failed;
+		}
+		format += len+1;
+	}
+
+	ret = talloc_asprintf_append(ret, "%s", format);
+	mpr_Return(eid, mprString(ret));
+	talloc_free(tmp_ctx);
+	return 0;	   
+	
+failed:
+	talloc_free(tmp_ctx);
+	return -1;
 }
 
 /*
@@ -168,6 +279,6 @@ void smb_setup_ejs_string(void)
 	ejsDefineStringCFunction(-1, "strlower", ejs_strlower, NULL, MPR_VAR_SCRIPT_HANDLE);
 	ejsDefineStringCFunction(-1, "strupper", ejs_strupper, NULL, MPR_VAR_SCRIPT_HANDLE);
 	ejsDefineStringCFunction(-1, "split", ejs_split, NULL, MPR_VAR_SCRIPT_HANDLE);
-	ejsDefineStringCFunction(-1, "FileLoad", ejs_FileLoad, NULL, MPR_VAR_SCRIPT_HANDLE);
 	ejsDefineCFunction(-1, "join", ejs_join, NULL, MPR_VAR_SCRIPT_HANDLE);
+	ejsDefineCFunction(-1, "sprintf", ejs_sprintf, NULL, MPR_VAR_SCRIPT_HANDLE);
 }
diff --git a/source4/scripting/ejs/smbcalls_sys.c b/source4/scripting/ejs/smbcalls_sys.c
index a76690b597..f098f884bb 100644
--- a/source4/scripting/ejs/smbcalls_sys.c
+++ b/source4/scripting/ejs/smbcalls_sys.c
@@ -23,6 +23,7 @@
 #include "includes.h"
 #include "scripting/ejs/smbcalls.h"
 #include "lib/ejs/ejs.h"
+#include "system/time.h"
 
 /*
   return the list of configured network interfaces
@@ -64,6 +65,40 @@ static int ejs_sys_nttime(MprVarHandle eid, int argc, struct MprVar **argv)
 	return 0;
 }
 
+/*
+  return the given time as a gmtime structure
+*/
+static int ejs_sys_gmtime(MprVarHandle eid, int argc, struct MprVar **argv)
+{
+	time_t t;
+	struct MprVar ret;
+	struct tm *tm;
+	if (argc != 1 || !mprVarIsNumber(argv[0]->type)) {
+		ejsSetErrorMsg(eid, "sys_gmtime invalid arguments");
+		return -1;
+	}
+	t = nt_time_to_unix(mprVarToNumber(argv[0]));
+	tm = gmtime(&t);
+	if (tm == NULL) {
+		mpr_Return(eid, mprCreateUndefinedVar());
+		return 0;
+	}
+	ret = mprObject("gmtime");
+#define TM_EL(n) mprSetVar(&ret, #n, mprCreateIntegerVar(tm->n))
+	TM_EL(tm_sec);
+	TM_EL(tm_min);
+	TM_EL(tm_hour);
+	TM_EL(tm_mday);
+	TM_EL(tm_mon);
+	TM_EL(tm_year);
+	TM_EL(tm_wday);
+	TM_EL(tm_yday);
+	TM_EL(tm_isdst);
+
+	mpr_Return(eid, ret);
+	return 0;
+}
+
 /*
   return a ldap time string from a nttime
 */
@@ -82,6 +117,58 @@ static int ejs_sys_ldaptime(MprVarHandle eid, int argc, struct MprVar **argv)
 	return 0;
 }
 
+/*
+  unlink a file
+   ok = unlink(fname);
+*/
+static int ejs_sys_unlink(MprVarHandle eid, int argc, char **argv)
+{
+	int ret;
+	if (argc != 1) {
+		ejsSetErrorMsg(eid, "sys_unlink invalid arguments");
+		return -1;
+	}
+	ret = unlink(argv[0]);
+	mpr_Return(eid, mprCreateBoolVar(ret == 0));
+	return 0;
+}
+
+/*
+  load a file as a string
+  usage:
+     string = sys_file_load(filename);
+*/
+static int ejs_sys_file_load(MprVarHandle eid, int argc, char **argv)
+{
+	char *s;
+	if (argc != 1) {
+		ejsSetErrorMsg(eid, "sys_file_load invalid arguments");
+		return -1;
+	}
+
+	s = file_load(argv[0], NULL, mprMemCtx());
+	mpr_Return(eid, mprString(s));
+	talloc_free(s);
+	return 0;
+}
+
+/*
+  save a file from a string
+  usage:
+     ok = sys_file_save(filename, str);
+*/
+static int ejs_sys_file_save(MprVarHandle eid, int argc, char **argv)
+{
+	BOOL ret;
+	if (argc != 2) {
+		ejsSetErrorMsg(eid, "sys_file_save invalid arguments");
+		return -1;
+	}
+	ret = file_save(argv[0], argv[1], strlen(argv[1]));
+	mpr_Return(eid, mprCreateBoolVar(ret));
+	return 0;
+}
+
 
 /*
   setup C functions that be called from ejs
@@ -91,5 +178,9 @@ void smb_setup_ejs_system(void)
 	ejsDefineCFunction(-1, "sys_interfaces", ejs_sys_interfaces, NULL, MPR_VAR_SCRIPT_HANDLE);
 	ejsDefineCFunction(-1, "sys_hostname", ejs_sys_hostname, NULL, MPR_VAR_SCRIPT_HANDLE);
 	ejsDefineCFunction(-1, "sys_nttime", ejs_sys_nttime, NULL, MPR_VAR_SCRIPT_HANDLE);
+	ejsDefineCFunction(-1, "sys_gmtime", ejs_sys_gmtime, NULL, MPR_VAR_SCRIPT_HANDLE);
 	ejsDefineCFunction(-1, "sys_ldaptime", ejs_sys_ldaptime, NULL, MPR_VAR_SCRIPT_HANDLE);
+	ejsDefineStringCFunction(-1, "sys_unlink", ejs_sys_unlink, NULL, MPR_VAR_SCRIPT_HANDLE);
+	ejsDefineStringCFunction(-1, "sys_file_load", ejs_sys_file_load, NULL, MPR_VAR_SCRIPT_HANDLE);
+	ejsDefineStringCFunction(-1, "sys_file_save", ejs_sys_file_save, NULL, MPR_VAR_SCRIPT_HANDLE);
 }
-- 
cgit 


From 26a55c330a8cd79da290b2ad0e15aaf94be6ebcf Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Tue, 12 Jul 2005 06:57:25 +0000
Subject: r8355: - added a vsprintf() function

- removed the --outputdir option from provision, as its not used any
  more (as ejs knows the real paths)
(This used to be commit abbf9c703c17c2edc2d978dade3619a96c38d0d9)
---
 source4/scripting/ejs/smbcalls_string.c | 36 +++++++++++++++++++++++++++++++++
 source4/scripting/libjs/base.js         |  8 ++++++++
 2 files changed, 44 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_string.c b/source4/scripting/ejs/smbcalls_string.c
index 7a19ecdf2c..ad998701f6 100644
--- a/source4/scripting/ejs/smbcalls_string.c
+++ b/source4/scripting/ejs/smbcalls_string.c
@@ -271,6 +271,41 @@ failed:
 	return -1;
 }
 
+/*
+  used to build your own print function
+     str = vsprintf(args);
+*/
+static int ejs_vsprintf(MprVarHandle eid, int argc, struct MprVar **argv)
+{
+	struct MprVar **args, *len, *v;
+	int i, ret, length;
+	if (argc != 1 || argv[0]->type != MPR_TYPE_OBJECT) {
+		ejsSetErrorMsg(eid, "vsprintf invalid arguments");
+		return -1;
+	}
+	v = argv[0];
+	len = mprGetProperty(v, "length", NULL);
+	if (len == NULL) {
+		ejsSetErrorMsg(eid, "vsprintf takes an array");
+		return -1;
+	}
+	length = mprToInt(len);
+	args = talloc_array(mprMemCtx(), struct MprVar *, length);
+	if (args == NULL) {
+		return -1;
+	}
+
+	for (i=0;i<length;i++) {
+		char idx[16];
+		mprItoa(i, idx, sizeof(idx));
+		args[i] = mprGetProperty(v, idx, NULL);
+	}
+	
+	ret = ejs_sprintf(eid, length, args);
+	talloc_free(args);
+	return ret;
+}
+
 /*
   setup C functions that be called from ejs
 */
@@ -281,4 +316,5 @@ void smb_setup_ejs_string(void)
 	ejsDefineStringCFunction(-1, "split", ejs_split, NULL, MPR_VAR_SCRIPT_HANDLE);
 	ejsDefineCFunction(-1, "join", ejs_join, NULL, MPR_VAR_SCRIPT_HANDLE);
 	ejsDefineCFunction(-1, "sprintf", ejs_sprintf, NULL, MPR_VAR_SCRIPT_HANDLE);
+	ejsDefineCFunction(-1, "vsprintf", ejs_vsprintf, NULL, MPR_VAR_SCRIPT_HANDLE);
 }
diff --git a/source4/scripting/libjs/base.js b/source4/scripting/libjs/base.js
index c6b05755c4..181b3ca959 100644
--- a/source4/scripting/libjs/base.js
+++ b/source4/scripting/libjs/base.js
@@ -9,6 +9,14 @@ if (global["HAVE_BASE_JS"] != undefined) {
 }
 HAVE_BASE_JS=1
 
+/*
+  an essential function!
+*/
+function printf()
+{
+	print(vsprintf(arguments));
+}
+
 /*
   helper function to setup a rpc io object, ready for input
 */
-- 
cgit 


From 6b38e62f0a004103def69244d39c6bc3e607aa9f Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Tue, 12 Jul 2005 07:15:22 +0000
Subject: r8357: Call lp_load() so we can access the various lp_functions().
 (This used to be commit f76a7ec2a2ef5db7ca7dced519474495d7ea02dc)

---
 source4/scripting/ejs/smbscript.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbscript.c b/source4/scripting/ejs/smbscript.c
index 691cd44730..d999ba072a 100644
--- a/source4/scripting/ejs/smbscript.c
+++ b/source4/scripting/ejs/smbscript.c
@@ -48,6 +48,8 @@ void ejs_exception(const char *reason)
 	smbscript_init_subsystems;
 	mprSetCtx(mem_ctx);
 
+	lp_load(dyn_CONFIGFILE);
+
 	if (argc < 2) {
 		fprintf(stderr, "You must supply a script name\n");
 		exit(1);
-- 
cgit 


From 24f4236a9f24bdef8cbbfa868318df31152dea5d Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Tue, 12 Jul 2005 07:17:04 +0000
Subject: r8358: Return an error message if js include path not set instead of
 silently failing. (This used to be commit
 797d9cf0c72992b2d5b9912d0f41873b6acc3195)

---
 source4/scripting/ejs/smbcalls.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls.c b/source4/scripting/ejs/smbcalls.c
index e58151620f..abcde06e30 100644
--- a/source4/scripting/ejs/smbcalls.c
+++ b/source4/scripting/ejs/smbcalls.c
@@ -74,6 +74,7 @@ static int ejs_libinclude(int eid, int argc, char **argv)
 	const char **js_include = lp_js_include();
 
 	if (js_include == NULL || js_include[0] == NULL) {
+		ejsSetErrorMsg(eid, "js include path not set");
 		return -1;
 	}
 
-- 
cgit 


From adb7fd18e5e58bc466bdd31d68423e5f958a1d5d Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Tue, 12 Jul 2005 11:46:34 +0000
Subject: r8372: - split out provisioning logic into a separate ejs library

- added a provisioning web page
(This used to be commit 7476cb94132cf2849ec19360468904ca6fe8de2c)
---
 source4/scripting/ejs/smbcalls_string.c |  15 +++
 source4/scripting/libjs/provision.js    | 222 ++++++++++++++++++++++++++++++++
 2 files changed, 237 insertions(+)
 create mode 100644 source4/scripting/libjs/provision.js

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_string.c b/source4/scripting/ejs/smbcalls_string.c
index ad998701f6..6597f3b27b 100644
--- a/source4/scripting/ejs/smbcalls_string.c
+++ b/source4/scripting/ejs/smbcalls_string.c
@@ -25,6 +25,20 @@
 #include "lib/ejs/ejs.h"
 #include "system/passwd.h"
 
+/*
+  usage:
+      var len = strlen(str);
+*/
+static int ejs_strlen(MprVarHandle eid, int argc, char **argv)
+{
+	if (argc != 1) {
+		ejsSetErrorMsg(eid, "strlen invalid arguments");
+		return -1;
+	}
+	mpr_Return(eid, mprCreateIntegerVar(strlen_m(argv[0])));
+	return 0;
+}
+
 /*
   usage:
       var s = strlower("UPPER");
@@ -311,6 +325,7 @@ static int ejs_vsprintf(MprVarHandle eid, int argc, struct MprVar **argv)
 */
 void smb_setup_ejs_string(void)
 {
+	ejsDefineStringCFunction(-1, "strlen", ejs_strlen, NULL, MPR_VAR_SCRIPT_HANDLE);
 	ejsDefineStringCFunction(-1, "strlower", ejs_strlower, NULL, MPR_VAR_SCRIPT_HANDLE);
 	ejsDefineStringCFunction(-1, "strupper", ejs_strupper, NULL, MPR_VAR_SCRIPT_HANDLE);
 	ejsDefineStringCFunction(-1, "split", ejs_split, NULL, MPR_VAR_SCRIPT_HANDLE);
diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
new file mode 100644
index 0000000000..ba6807ce44
--- /dev/null
+++ b/source4/scripting/libjs/provision.js
@@ -0,0 +1,222 @@
+/*
+	backend code for provisioning a Samba4 server
+	Copyright Andrew Tridgell 2005
+	Released under the GNU GPL v2 or later
+*/
+
+/* used to generate sequence numbers for records */
+provision_next_usn = 1;
+
+/*
+  find a user or group from a list of possibilities
+*/
+function findnss()
+{
+	var i;
+	assert(arguments.length >= 2);
+	var nssfn = arguments[0];
+	for (i=1;i<arguments.length;i++) {
+		if (nssfn(arguments[i]) != undefined) {
+			return arguments[i];
+		}
+	}
+	printf("Unable to find user/group for %s\n", arguments[1]);
+	assert(i<arguments.length);
+}
+
+/*
+   add a foreign security principle
+ */
+function add_foreign(str, sid, desc, unixname)
+{
+	var add = "
+dn: CN=${SID},CN=ForeignSecurityPrincipals,${BASEDN}
+objectClass: top
+objectClass: foreignSecurityPrincipal
+cn: ${SID}
+description: ${DESC}
+instanceType: 4
+whenCreated: ${LDAPTIME}
+whenChanged: ${LDAPTIME}
+uSNCreated: 1
+uSNChanged: 1
+showInAdvancedViewOnly: TRUE
+name: ${SID}
+objectGUID: ${NEWGUID}
+objectSid: ${SID}
+objectCategory: CN=Foreign-Security-Principal,CN=Schema,CN=Configuration,${BASEDN}
+unixName: ${UNIXNAME}
+";
+	var sub = new Object();
+	sub.SID = sid;
+	sub.DESC = desc;
+	sub.UNIXNAME = unixname;
+	return str + substitute_var(add, sub);
+}
+
+/*
+  return current time as a nt time string
+*/
+function nttime()
+{
+	return "" + sys_nttime();
+}
+
+/*
+  return current time as a ldap time string
+*/
+function ldaptime()
+{
+	return sys_ldaptime(sys_nttime());
+}
+
+/*
+  return a date string suitable for a dns zone serial number
+*/
+function datestring()
+{
+	var t = sys_gmtime(sys_nttime());
+	return sprintf("%04u%02u%02u%02u",
+		       t.tm_year+1900, t.tm_mon+1, t.tm_mday, t.tm_hour);
+}
+
+/*
+  return first host IP
+*/
+function hostip()
+{
+	var list = sys_interfaces();
+	return list[0];
+}
+
+/*
+  return current time as a ldap time string
+*/
+function nextusn()
+{
+	provision_next_usn = provision_next_usn+1;
+	return provision_next_usn;
+}
+
+/*
+  return first part of hostname
+*/
+function hostname()
+{
+	var s = split(".", sys_hostname());
+	return s[0];
+}
+
+
+/*
+  setup a ldb in the private dir
+ */
+function setup_ldb(ldif, dbname, subobj)
+{
+	var extra = "";
+	if (arguments.length == 4) {
+		extra = arguments[3];
+	}
+
+	var db = lpGet("private dir") + "/" + dbname;
+	var src = lpGet("setup directory") + "/" + ldif;
+
+	sys_unlink(db);
+
+	var data = sys_file_load(src);
+	data = data + extra;
+	data = substitute_var(data, subobj);
+
+	ok = ldbAdd(db, data);
+	assert(ok);
+}
+
+/*
+  setup a file in the private dir
+ */
+function setup_file(template, fname, subobj)
+{
+	var f = lpGet("private dir") + "/" + fname;
+	var src = lpGet("setup directory") + "/" + template;
+
+	sys_unlink(f);
+
+	var data = sys_file_load(src);
+	data = substitute_var(data, subobj);
+
+	ok = sys_file_save(f, data);
+	assert(ok);
+}
+
+/*
+  provision samba4 - caution, this wipes all existing data!
+*/
+function provision(subobj, message)
+{
+	var data = "";
+
+	/*
+	  some options need to be upper/lower case
+	*/
+	subobj.REALM       = strlower(subobj.REALM);
+	subobj.HOSTNAME    = strlower(subobj.HOSTNAME);
+	subobj.DOMAIN      = strupper(subobj.DOMAIN);
+	subobj.NETBIOSNAME = strupper(subobj.HOSTNAME);
+
+	data = add_foreign(data, "S-1-5-7",  "Anonymous",           "${NOBODY}");
+	data = add_foreign(data, "S-1-1-0",  "World",               "${NOGROUP}");
+	data = add_foreign(data, "S-1-5-2",  "Network",             "${NOGROUP}");
+	data = add_foreign(data, "S-1-5-18", "System",              "${ROOT}");
+	data = add_foreign(data, "S-1-5-11", "Authenticated Users", "${USERS}");
+
+	provision_next_usn = 1;
+
+	message("Setting up hklm.ldb\n");
+	setup_ldb("hklm.ldif", "hklm.ldb", subobj);
+	message("Setting up sam.ldb\n");
+	setup_ldb("provision.ldif", "sam.ldb", subobj, data);
+	message("Setting up rootdse.ldb\n");
+	setup_ldb("rootdse.ldif", "rootdse.ldb", subobj);
+	message("Setting up secrets.ldb\n");
+	setup_ldb("secrets.ldif", "secrets.ldb", subobj);
+	message("Setting up DNS zone file\n");
+	setup_file("provision.zone", subobj.DNSDOMAIN + ".zone", subobj);
+}
+
+/*
+  guess reasonably default options for provisioning
+*/
+function provision_guess()
+{
+	var subobj = new Object();
+	subobj.REALM        = lpGet("realm");
+	subobj.DOMAIN       = lpGet("workgroup");
+	subobj.HOSTNAME     = hostname();
+	subobj.HOSTIP       = hostip();
+	subobj.DOMAINGUID   = randguid();
+	subobj.DOMAINSID    = randsid();
+	subobj.HOSTGUID     = randguid();
+	subobj.INVOCATIONID = randguid();
+	subobj.KRBTGTPASS   = randpass(12);
+	subobj.MACHINEPASS  = randpass(12);
+	subobj.ADMINPASS    = randpass(12);
+	subobj.DEFAULTSITE  = "Default-First-Site-Name";
+	subobj.NEWGUID      = randguid;
+	subobj.NTTIME       = nttime;
+	subobj.LDAPTIME     = ldaptime;
+	subobj.DATESTRING   = datestring;
+	subobj.USN          = nextusn;
+	subobj.ROOT         = findnss(getpwnam, "root");
+	subobj.NOBODY       = findnss(getpwnam, "nobody");
+	subobj.NOGROUP      = findnss(getgrnam, "nogroup");
+	subobj.WHEEL        = findnss(getgrnam, "wheel", "root");
+	subobj.USERS        = findnss(getgrnam, "users", "guest", "other");
+	subobj.DNSDOMAIN    = strlower(subobj.REALM);
+	subobj.DNSNAME      = sprintf("%s.%s", 
+				      strlower(subobj.HOSTNAME), 
+				      subobj.DNSDOMAIN);
+	subobj.BASEDN       = "DC=" + join(",DC=", split(".", subobj.REALM));
+	return subobj;
+}
+
+return 0;
-- 
cgit 


From 61edb97bdfabf1ab313fbec5f47f5e6c8a79da1a Mon Sep 17 00:00:00 2001
From: Love Hörnquist Åstrand <lha@samba.org>
Date: Tue, 12 Jul 2005 22:22:59 +0000
Subject: r8394: Make sure the argument to ctype is*(3) macros are unsigned
 char as required by ISO C99. (This used to be commit
 56fd21c806e816cf4c3d23881f26474f858b45e2)

---
 source4/scripting/ejs/smbcalls_string.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_string.c b/source4/scripting/ejs/smbcalls_string.c
index 6597f3b27b..46369cdee7 100644
--- a/source4/scripting/ejs/smbcalls_string.c
+++ b/source4/scripting/ejs/smbcalls_string.c
@@ -198,7 +198,7 @@ static int ejs_sprintf(MprVarHandle eid, int argc, struct MprVar **argv)
 		len_count = count_chars(fmt2, '*');
 		/* find the type string */
 		tstr = &fmt2[len];
-		while (tstr > fmt2 && isalpha(tstr[-1])) {
+		while (tstr > fmt2 && isalpha((unsigned char)tstr[-1])) {
 			tstr--;
 		}
 		if (strcmp(tstr, "%") == 0) {
-- 
cgit 


From adbb1612c12d03fa94e4ee23fbc2fa96c09d9dcd Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Wed, 13 Jul 2005 00:06:38 +0000
Subject: r8399: move the ejs and esp code closer to the directory layout used
 by the upstream sources. This makes it much easier to keep it up to date.

I will separate out the mpr code into lib/appweb/mpr next
(This used to be commit 52db7a052baeb0f11361ed69b71cb790039e3cc9)
---
 source4/scripting/ejs/ejsrpc.c           | 2 +-
 source4/scripting/ejs/mprutil.c          | 2 +-
 source4/scripting/ejs/smbcalls.c         | 2 +-
 source4/scripting/ejs/smbcalls.h         | 2 +-
 source4/scripting/ejs/smbcalls_auth.c    | 2 +-
 source4/scripting/ejs/smbcalls_cli.c     | 2 +-
 source4/scripting/ejs/smbcalls_config.c  | 2 +-
 source4/scripting/ejs/smbcalls_ldb.c     | 2 +-
 source4/scripting/ejs/smbcalls_nbt.c     | 2 +-
 source4/scripting/ejs/smbcalls_nss.c     | 2 +-
 source4/scripting/ejs/smbcalls_options.c | 2 +-
 source4/scripting/ejs/smbcalls_rand.c    | 2 +-
 source4/scripting/ejs/smbcalls_rpc.c     | 2 +-
 source4/scripting/ejs/smbcalls_string.c  | 2 +-
 source4/scripting/ejs/smbcalls_sys.c     | 2 +-
 source4/scripting/ejs/smbscript.c        | 2 +-
 16 files changed, 16 insertions(+), 16 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/ejsrpc.c b/source4/scripting/ejs/ejsrpc.c
index e84fcbeb32..e152c8fcd1 100644
--- a/source4/scripting/ejs/ejsrpc.c
+++ b/source4/scripting/ejs/ejsrpc.c
@@ -21,7 +21,7 @@
 */
 
 #include "includes.h"
-#include "lib/ejs/ejs.h"
+#include "lib/appweb/ejs/ejs.h"
 #include "scripting/ejs/smbcalls.h"
 #include "librpc/gen_ndr/ndr_security.h"
 #include "librpc/gen_ndr/ndr_lsa.h"
diff --git a/source4/scripting/ejs/mprutil.c b/source4/scripting/ejs/mprutil.c
index 30dec22af1..49c4f74cd6 100644
--- a/source4/scripting/ejs/mprutil.c
+++ b/source4/scripting/ejs/mprutil.c
@@ -21,7 +21,7 @@
 */
 
 #include "includes.h"
-#include "lib/ejs/ejs.h"
+#include "lib/appweb/ejs/ejs.h"
 #include "lib/ldb/include/ldb.h"
 
 /*
diff --git a/source4/scripting/ejs/smbcalls.c b/source4/scripting/ejs/smbcalls.c
index abcde06e30..49bcc64c96 100644
--- a/source4/scripting/ejs/smbcalls.c
+++ b/source4/scripting/ejs/smbcalls.c
@@ -22,7 +22,7 @@
 */
 
 #include "includes.h"
-#include "lib/ejs/ejs.h"
+#include "lib/appweb/ejs/ejs.h"
 #include "scripting/ejs/smbcalls.h"
 
 /*
diff --git a/source4/scripting/ejs/smbcalls.h b/source4/scripting/ejs/smbcalls.h
index 57242fac0b..8002e3d8bb 100644
--- a/source4/scripting/ejs/smbcalls.h
+++ b/source4/scripting/ejs/smbcalls.h
@@ -20,7 +20,7 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include "lib/ejs/ejs.h"
+#include "lib/appweb/ejs/ejs.h"
 
 void mpr_Return(int eid, struct MprVar);
 NTSTATUS mprSetVar(struct MprVar *v, const char *name, struct MprVar val);
diff --git a/source4/scripting/ejs/smbcalls_auth.c b/source4/scripting/ejs/smbcalls_auth.c
index 81a7ee1bac..10c63fb4dd 100644
--- a/source4/scripting/ejs/smbcalls_auth.c
+++ b/source4/scripting/ejs/smbcalls_auth.c
@@ -22,7 +22,7 @@
 */
 
 #include "includes.h"
-#include "lib/ejs/ejs.h"
+#include "lib/appweb/ejs/ejs.h"
 #include "auth/auth.h"
 #include "scripting/ejs/smbcalls.h"
 
diff --git a/source4/scripting/ejs/smbcalls_cli.c b/source4/scripting/ejs/smbcalls_cli.c
index fb18d442a0..4f262bd350 100644
--- a/source4/scripting/ejs/smbcalls_cli.c
+++ b/source4/scripting/ejs/smbcalls_cli.c
@@ -22,7 +22,7 @@
 
 #include "includes.h"
 #include "scripting/ejs/smbcalls.h"
-#include "lib/ejs/ejs.h"
+#include "lib/appweb/ejs/ejs.h"
 #include "libcli/raw/libcliraw.h"
 #include "libcli/composite/composite.h"
 #include "clilist.h"
diff --git a/source4/scripting/ejs/smbcalls_config.c b/source4/scripting/ejs/smbcalls_config.c
index 97c90c8f5a..18bdd0547e 100644
--- a/source4/scripting/ejs/smbcalls_config.c
+++ b/source4/scripting/ejs/smbcalls_config.c
@@ -22,7 +22,7 @@
 
 #include "includes.h"
 #include "scripting/ejs/smbcalls.h"
-#include "lib/ejs/ejs.h"
+#include "lib/appweb/ejs/ejs.h"
 #include "param/loadparm.h"
 
 /*
diff --git a/source4/scripting/ejs/smbcalls_ldb.c b/source4/scripting/ejs/smbcalls_ldb.c
index 9876fe151f..69ebe39567 100644
--- a/source4/scripting/ejs/smbcalls_ldb.c
+++ b/source4/scripting/ejs/smbcalls_ldb.c
@@ -22,7 +22,7 @@
 
 #include "includes.h"
 #include "scripting/ejs/smbcalls.h"
-#include "lib/ejs/ejs.h"
+#include "lib/appweb/ejs/ejs.h"
 #include "lib/ldb/include/ldb.h"
 
 /*
diff --git a/source4/scripting/ejs/smbcalls_nbt.c b/source4/scripting/ejs/smbcalls_nbt.c
index 721a5beb22..c5722202f7 100644
--- a/source4/scripting/ejs/smbcalls_nbt.c
+++ b/source4/scripting/ejs/smbcalls_nbt.c
@@ -22,7 +22,7 @@
 
 #include "includes.h"
 #include "scripting/ejs/smbcalls.h"
-#include "lib/ejs/ejs.h"
+#include "lib/appweb/ejs/ejs.h"
 #include "librpc/gen_ndr/ndr_nbt.h"
 
 /*
diff --git a/source4/scripting/ejs/smbcalls_nss.c b/source4/scripting/ejs/smbcalls_nss.c
index 81ab02729a..212eb88eb4 100644
--- a/source4/scripting/ejs/smbcalls_nss.c
+++ b/source4/scripting/ejs/smbcalls_nss.c
@@ -22,7 +22,7 @@
 
 #include "includes.h"
 #include "scripting/ejs/smbcalls.h"
-#include "lib/ejs/ejs.h"
+#include "lib/appweb/ejs/ejs.h"
 #include "system/passwd.h"
 
 
diff --git a/source4/scripting/ejs/smbcalls_options.c b/source4/scripting/ejs/smbcalls_options.c
index 005a3bcb9a..9fbfd312a9 100644
--- a/source4/scripting/ejs/smbcalls_options.c
+++ b/source4/scripting/ejs/smbcalls_options.c
@@ -23,7 +23,7 @@
 #include "includes.h"
 #include "lib/cmdline/popt_common.h"
 #include "scripting/ejs/smbcalls.h"
-#include "lib/ejs/ejs.h"
+#include "lib/appweb/ejs/ejs.h"
 
 
 /*
diff --git a/source4/scripting/ejs/smbcalls_rand.c b/source4/scripting/ejs/smbcalls_rand.c
index d07c6ce233..81473ad737 100644
--- a/source4/scripting/ejs/smbcalls_rand.c
+++ b/source4/scripting/ejs/smbcalls_rand.c
@@ -22,7 +22,7 @@
 
 #include "includes.h"
 #include "scripting/ejs/smbcalls.h"
-#include "lib/ejs/ejs.h"
+#include "lib/appweb/ejs/ejs.h"
 #include "system/passwd.h"
 
 /*
diff --git a/source4/scripting/ejs/smbcalls_rpc.c b/source4/scripting/ejs/smbcalls_rpc.c
index 6aef216ca4..ccb2026446 100644
--- a/source4/scripting/ejs/smbcalls_rpc.c
+++ b/source4/scripting/ejs/smbcalls_rpc.c
@@ -22,7 +22,7 @@
 
 #include "includes.h"
 #include "scripting/ejs/smbcalls.h"
-#include "lib/ejs/ejs.h"
+#include "lib/appweb/ejs/ejs.h"
 #include "librpc/gen_ndr/ndr_echo.h"
 #include "lib/cmdline/popt_common.h"
 #include "lib/messaging/irpc.h"
diff --git a/source4/scripting/ejs/smbcalls_string.c b/source4/scripting/ejs/smbcalls_string.c
index 46369cdee7..657c8efc61 100644
--- a/source4/scripting/ejs/smbcalls_string.c
+++ b/source4/scripting/ejs/smbcalls_string.c
@@ -22,7 +22,7 @@
 
 #include "includes.h"
 #include "scripting/ejs/smbcalls.h"
-#include "lib/ejs/ejs.h"
+#include "lib/appweb/ejs/ejs.h"
 #include "system/passwd.h"
 
 /*
diff --git a/source4/scripting/ejs/smbcalls_sys.c b/source4/scripting/ejs/smbcalls_sys.c
index f098f884bb..4dc5045ff6 100644
--- a/source4/scripting/ejs/smbcalls_sys.c
+++ b/source4/scripting/ejs/smbcalls_sys.c
@@ -22,7 +22,7 @@
 
 #include "includes.h"
 #include "scripting/ejs/smbcalls.h"
-#include "lib/ejs/ejs.h"
+#include "lib/appweb/ejs/ejs.h"
 #include "system/time.h"
 
 /*
diff --git a/source4/scripting/ejs/smbscript.c b/source4/scripting/ejs/smbscript.c
index d999ba072a..7e014716c2 100644
--- a/source4/scripting/ejs/smbscript.c
+++ b/source4/scripting/ejs/smbscript.c
@@ -23,7 +23,7 @@
 
 #include "includes.h"
 #include "dynconfig.h"
-#include "lib/ejs/ejs.h"
+#include "lib/appweb/ejs/ejs.h"
 #include "scripting/ejs/smbcalls.h"
 
 void ejs_exception(const char *reason)
-- 
cgit 


From e2881aca86936ef4712c431b01dfab11427aea89 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Wed, 13 Jul 2005 02:16:58 +0000
Subject: r8406: make sure we give an error in ldbAdd() if any record fails
 (This used to be commit 632f99017ded607c80022f730b6ec7e37bd13642)

---
 source4/scripting/ejs/smbcalls_ldb.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_ldb.c b/source4/scripting/ejs/smbcalls_ldb.c
index 69ebe39567..2df53ace4f 100644
--- a/source4/scripting/ejs/smbcalls_ldb.c
+++ b/source4/scripting/ejs/smbcalls_ldb.c
@@ -114,6 +114,7 @@ static int ejs_ldbAddModify(MprVarHandle eid, int argc, char **argv,
 	while ((ldif = ldb_ldif_read_string(ldb, &ldifstring))) {
 		ret = fn(ldb, ldif->msg);
 		talloc_free(ldif);
+		if (ret != 0) break;
 	}
 
 	mpr_Return(eid, mprCreateBoolVar(ret == 0));
-- 
cgit 


From a3b0bb89b433925110a00b8e87853131856e5ee9 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Wed, 13 Jul 2005 05:30:23 +0000
Subject: r8411: we need to use mprVarToNumber() instead of var->integer now,
 to cope with the 64 bit integer support

this fixes the exit status from smbscript
(This used to be commit f476e7aeec56a921fd286d3fe2cb0a229e57a9e8)
---
 source4/scripting/ejs/smbscript.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbscript.c b/source4/scripting/ejs/smbscript.c
index 7e014716c2..dec9592c46 100644
--- a/source4/scripting/ejs/smbscript.c
+++ b/source4/scripting/ejs/smbscript.c
@@ -101,7 +101,7 @@ void ejs_exception(const char *reason)
 	}
 
 	return_var = ejsGetReturnValue(eid);
-	exit_status = return_var->integer;
+	exit_status = mprVarToNumber(return_var);
 
 	ejsClose();
 
-- 
cgit 


From 2d0468ac9a6dc07ac3efee4160bba285d92b890b Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Thu, 14 Jul 2005 03:10:17 +0000
Subject: r8445: if a system doesn't have "nogroup" then try "nobody" (This
 used to be commit 433f9d0a619ff34a4b7506950ee091fb8d34870d)

---
 source4/scripting/libjs/provision.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index ba6807ce44..03360654c7 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -208,7 +208,7 @@ function provision_guess()
 	subobj.USN          = nextusn;
 	subobj.ROOT         = findnss(getpwnam, "root");
 	subobj.NOBODY       = findnss(getpwnam, "nobody");
-	subobj.NOGROUP      = findnss(getgrnam, "nogroup");
+	subobj.NOGROUP      = findnss(getgrnam, "nogroup", "nobody");
 	subobj.WHEEL        = findnss(getgrnam, "wheel", "root");
 	subobj.USERS        = findnss(getgrnam, "users", "guest", "other");
 	subobj.DNSDOMAIN    = strlower(subobj.REALM);
-- 
cgit 


From 0e5907d57cdfb0c1ce3f151161a9260c14466bd0 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Thu, 14 Jul 2005 07:21:59 +0000
Subject: r8452: allow for the ugly hack:

#!/bin/sh
exec smbscript "$0" ${1+"$@"}

which is needed because bloody solaris puts 'env' in /bin instead of /usr/bin

also neaten up the #! handling code.
(This used to be commit 778bcd3738e42d8adfd4529f790c898f0d904363)
---
 source4/scripting/ejs/smbscript.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbscript.c b/source4/scripting/ejs/smbscript.c
index dec9592c46..d71d084779 100644
--- a/source4/scripting/ejs/smbscript.c
+++ b/source4/scripting/ejs/smbscript.c
@@ -83,15 +83,15 @@ void ejs_exception(const char *reason)
 	/* load the script and advance past interpreter line*/
 	script = file_load(fname, &script_size, mem_ctx);
 
-	if ((script_size > 2) && script[0] == '#' && script[1] == '!') {
-		script += 2;
-		script_size -= 2;
-		while (script_size) {
-			if (*script == '\r' || *script == '\n')
-				break;
-			script++;
-			script_size--;
-		}
+	/* allow scriptable js */
+	if (strncmp(script, "#!", 2) == 0) {
+		script += strcspn(script, "\r\n");
+		script += strspn(script, "\r\n");
+	}
+	/* and this copes with the ugly exec hack */
+	if (strncmp(script, "exec ", 5) == 0) {
+		script += strcspn(script, "\r\n");
+		script += strspn(script, "\r\n");
 	}
 
 	/* run the script */
-- 
cgit 


From 63535f566e2fbe9244fd3e50b9c8d1281b822fc0 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Fri, 15 Jul 2005 05:40:34 +0000
Subject: r8481: switched ldb ejs called over to an OO interface, so you do:

var ldb = ldb_init();

res = ldb.search(dbfile, "(objectClass=user)");

you can also do:

ldbSearch = ldb.search;
res = ldbSearch(dbfile, "(objectClass=user)");

if you want the old interface (ie. you can use this to import
functions into the global or local namespace).
(This used to be commit 3093057d9735cbb62f57e7159264d5a28b85320f)
---
 source4/scripting/ejs/mprutil.c      | 15 +++++++++++++++
 source4/scripting/ejs/smbcalls.h     |  3 +++
 source4/scripting/ejs/smbcalls_ldb.c | 22 +++++++++++++++++-----
 source4/scripting/libjs/provision.js |  4 +++-
 4 files changed, 38 insertions(+), 6 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/mprutil.c b/source4/scripting/ejs/mprutil.c
index 49c4f74cd6..247cea0b06 100644
--- a/source4/scripting/ejs/mprutil.c
+++ b/source4/scripting/ejs/mprutil.c
@@ -367,3 +367,18 @@ void mpr_ReturnString(int eid, const char *s)
 }
 
 
+/*
+  set a C function in a variable
+*/
+ void mprSetCFunction(struct MprVar *obj, const char *name, MprCFunction fn)
+{
+	mprSetVar(obj, name, mprCreateCFunctionVar(fn, NULL, MPR_VAR_SCRIPT_HANDLE));
+}
+
+/*
+  set a string C function in a variable
+*/
+ void mprSetStringCFunction(struct MprVar *obj, const char *name, MprStringCFunction fn)
+{
+	mprSetVar(obj, name, mprCreateStringCFunctionVar(fn, NULL, MPR_VAR_SCRIPT_HANDLE));
+}
diff --git a/source4/scripting/ejs/smbcalls.h b/source4/scripting/ejs/smbcalls.h
index 8002e3d8bb..aa5c27b4f5 100644
--- a/source4/scripting/ejs/smbcalls.h
+++ b/source4/scripting/ejs/smbcalls.h
@@ -26,3 +26,6 @@ void mpr_Return(int eid, struct MprVar);
 NTSTATUS mprSetVar(struct MprVar *v, const char *name, struct MprVar val);
 NTSTATUS mprGetVar(struct MprVar **v, const char *name);
 void mprAddArray(struct MprVar *var, int i, struct MprVar v);
+void mprSetCFunction(struct MprVar *obj, const char *name, MprCFunction fn);
+void mprSetStringCFunction(struct MprVar *obj, const char *name, MprStringCFunction fn);
+
diff --git a/source4/scripting/ejs/smbcalls_ldb.c b/source4/scripting/ejs/smbcalls_ldb.c
index 2df53ace4f..659ac11b1b 100644
--- a/source4/scripting/ejs/smbcalls_ldb.c
+++ b/source4/scripting/ejs/smbcalls_ldb.c
@@ -222,6 +222,22 @@ static int ejs_ldbModify(MprVarHandle eid, int argc, char **argv)
 	return ejs_ldbAddModify(eid, argc, argv, ldb_modify);
 }
 
+/*
+  initialise ldb ejs subsystem
+*/
+static int ejs_ldb_init(MprVarHandle eid, int argc, struct MprVar **argv)
+{
+	struct MprVar ldb = mprObject("ldb");
+
+	mprSetCFunction(&ldb, "search", ejs_ldbSearch);
+	mprSetStringCFunction(&ldb, "add", ejs_ldbAdd);
+	mprSetStringCFunction(&ldb, "modify", ejs_ldbModify);
+	mprSetStringCFunction(&ldb, "delete", ejs_ldbDelete);
+	mprSetStringCFunction(&ldb, "rename", ejs_ldbRename);
+
+	mpr_Return(eid, ldb);
+	return 0;
+}
 
 
 /*
@@ -229,9 +245,5 @@ static int ejs_ldbModify(MprVarHandle eid, int argc, char **argv)
 */
 void smb_setup_ejs_ldb(void)
 {
-	ejsDefineCFunction(-1, "ldbSearch", ejs_ldbSearch, NULL, MPR_VAR_SCRIPT_HANDLE);
-	ejsDefineStringCFunction(-1, "ldbAdd", ejs_ldbAdd, NULL, MPR_VAR_SCRIPT_HANDLE);
-	ejsDefineStringCFunction(-1, "ldbModify", ejs_ldbModify, NULL, MPR_VAR_SCRIPT_HANDLE);
-	ejsDefineStringCFunction(-1, "ldbDelete", ejs_ldbDelete, NULL, MPR_VAR_SCRIPT_HANDLE);
-	ejsDefineStringCFunction(-1, "ldbRename", ejs_ldbRename, NULL, MPR_VAR_SCRIPT_HANDLE);
+	ejsDefineCFunction(-1, "ldb_init", ejs_ldb_init, NULL, MPR_VAR_SCRIPT_HANDLE);
 }
diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index 03360654c7..6d4e4a3bc0 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -114,6 +114,8 @@ function hostname()
 function setup_ldb(ldif, dbname, subobj)
 {
 	var extra = "";
+	var ldb = ldb_init();
+
 	if (arguments.length == 4) {
 		extra = arguments[3];
 	}
@@ -127,7 +129,7 @@ function setup_ldb(ldif, dbname, subobj)
 	data = data + extra;
 	data = substitute_var(data, subobj);
 
-	ok = ldbAdd(db, data);
+	ok = ldb.add(db, data);
 	assert(ok);
 }
 
-- 
cgit 


From a0bc4da1a307753e3b28a11863f50d66b0894190 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Fri, 15 Jul 2005 07:18:23 +0000
Subject: r8483: switched our generated ejs rpc code over to the new OO
 interface. This means we don't pollute the name space, and also makes for
 faster startup times as we only create variables for the pipes that we use,
 not all pipes (This used to be commit
 57d7a585e8162d21c7152952aa0cc7471968784f)

---
 source4/scripting/ejs/ejsrpc.c       | 19 -------------------
 source4/scripting/ejs/ejsrpc.h       |  7 ++-----
 source4/scripting/ejs/smbcalls.c     |  7 -------
 source4/scripting/ejs/smbcalls.h     |  1 -
 source4/scripting/ejs/smbcalls_rpc.c | 30 ++++--------------------------
 source4/scripting/ejs/smbscript.c    |  2 --
 source4/scripting/libjs/samr.js      | 29 +++++++++++++++--------------
 7 files changed, 21 insertions(+), 74 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/ejsrpc.c b/source4/scripting/ejs/ejsrpc.c
index e152c8fcd1..08bc4a94ba 100644
--- a/source4/scripting/ejs/ejsrpc.c
+++ b/source4/scripting/ejs/ejsrpc.c
@@ -229,25 +229,6 @@ NTSTATUS ejs_push_string(struct ejs_rpc *ejs,
 	return mprSetVar(v, name, mprString(s));
 }
 
-/*
-  setup a constant int
-*/
-void ejs_set_constant_int(int eid, const char *name, int value)
-{
-	struct MprVar *v = ejsGetGlobalObject(eid);
-	mprSetVar(v, name, mprCreateIntegerVar(value));
-}
-
-/*
-  setup a constant string
-*/
-void ejs_set_constant_string(int eid, const char *name, const char *value)
-{
-	struct MprVar *v = ejsGetGlobalObject(eid);
-	mprSetVar(v, name, mprCreateStringVar(value, False));
-}
-
-
 NTSTATUS ejs_pull_dom_sid(struct ejs_rpc *ejs, 
 			  struct MprVar *v, const char *name, struct dom_sid *r)
 {
diff --git a/source4/scripting/ejs/ejsrpc.h b/source4/scripting/ejs/ejsrpc.h
index e4b623750d..dbd147fe1d 100644
--- a/source4/scripting/ejs/ejsrpc.h
+++ b/source4/scripting/ejs/ejsrpc.h
@@ -36,12 +36,8 @@ typedef NTSTATUS (*ejs_push_function_t)(struct ejs_rpc *, struct MprVar *, const
 NTSTATUS ejs_panic(struct ejs_rpc *ejs, const char *why);
 void ejs_set_switch(struct ejs_rpc *ejs, uint32_t switch_var);
 
-typedef void (*ejs_setup_t)(void);
-typedef void (*ejs_constants_t)(int);
+NTSTATUS smbcalls_register_ejs(const char *name, MprCFunction fn);
 
-NTSTATUS smbcalls_register_ejs(const char *name, 
-			       ejs_setup_t setup,
-			       ejs_constants_t constants);
 
 int ejs_rpc_call(int eid, int argc, struct MprVar **argv,
 		 const struct dcerpc_interface_table *iface, int callnum,
@@ -120,3 +116,4 @@ BOOL ejs_pull_null(struct ejs_rpc *ejs, struct MprVar *v, const char *name);
 #define ejs_push_dom_sid2 ejs_push_dom_sid
 #define ejs_pull_NTTIME_hyper ejs_pull_NTTIME
 #define ejs_push_NTTIME_hyper ejs_push_NTTIME
+
diff --git a/source4/scripting/ejs/smbcalls.c b/source4/scripting/ejs/smbcalls.c
index 49bcc64c96..59e5b17034 100644
--- a/source4/scripting/ejs/smbcalls.c
+++ b/source4/scripting/ejs/smbcalls.c
@@ -132,10 +132,3 @@ void smb_setup_ejs_functions(void)
 	ejsDefineStringCFunction(-1, "libinclude", ejs_libinclude, NULL, MPR_VAR_SCRIPT_HANDLE);
 }
 
-/*
-  setup constants that can be used from ejs
-*/
-void smb_setup_ejs_constants(int eid)
-{
-	smb_setup_ejs_rpc_constants(eid);
-}
diff --git a/source4/scripting/ejs/smbcalls.h b/source4/scripting/ejs/smbcalls.h
index aa5c27b4f5..927c3ccf2f 100644
--- a/source4/scripting/ejs/smbcalls.h
+++ b/source4/scripting/ejs/smbcalls.h
@@ -28,4 +28,3 @@ NTSTATUS mprGetVar(struct MprVar **v, const char *name);
 void mprAddArray(struct MprVar *var, int i, struct MprVar v);
 void mprSetCFunction(struct MprVar *obj, const char *name, MprCFunction fn);
 void mprSetStringCFunction(struct MprVar *obj, const char *name, MprStringCFunction fn);
-
diff --git a/source4/scripting/ejs/smbcalls_rpc.c b/source4/scripting/ejs/smbcalls_rpc.c
index ccb2026446..8e7bf57972 100644
--- a/source4/scripting/ejs/smbcalls_rpc.c
+++ b/source4/scripting/ejs/smbcalls_rpc.c
@@ -361,16 +361,13 @@ done:
 static struct ejs_register {
 	struct ejs_register *next, *prev;
 	const char *name;
-	ejs_setup_t setup;
-	ejs_constants_t constants;
+	MprCFunction fn;
 } *ejs_registered;
 
 /*
   register a generated ejs module
 */
- NTSTATUS smbcalls_register_ejs(const char *name, 
-				ejs_setup_t setup,
-				ejs_constants_t constants)
+ NTSTATUS smbcalls_register_ejs(const char *name, MprCFunction fn)
 {
 	struct ejs_register *r;
 	void *ctx = ejs_registered;
@@ -380,8 +377,7 @@ static struct ejs_register {
 	r = talloc(ctx, struct ejs_register);
 	NT_STATUS_HAVE_NO_MEMORY(r);
 	r->name = name;
-	r->setup = setup;
-	r->constants = constants;
+	r->fn = fn;
 	DLIST_ADD(ejs_registered, r);
 	return NT_STATUS_OK;
 }
@@ -396,24 +392,6 @@ void smb_setup_ejs_rpc(void)
 	ejsDefineCFunction(-1, "rpc_connect", ejs_rpc_connect, NULL, MPR_VAR_SCRIPT_HANDLE);
 	ejsDefineCFunction(-1, "irpc_connect", ejs_irpc_connect, NULL, MPR_VAR_SCRIPT_HANDLE);
 	for (r=ejs_registered;r;r=r->next) {
-		r->setup();
+		ejsDefineCFunction(-1, r->name, r->fn, NULL, MPR_VAR_SCRIPT_HANDLE);
 	}
 }
-
-/*
-  setup constants for rpc calls
-*/
-void smb_setup_ejs_rpc_constants(int eid)
-{
-	struct ejs_register *r;
-	struct MprVar v;
-
-	for (r=ejs_registered;r;r=r->next) {
-		r->constants(eid);
-	}
-
-	v = mprCreatePtrVar(NULL);
-	mprSetProperty(ejsGetGlobalObject(eid), "NULL", &v);
-}
-
-
diff --git a/source4/scripting/ejs/smbscript.c b/source4/scripting/ejs/smbscript.c
index d71d084779..8359629a85 100644
--- a/source4/scripting/ejs/smbscript.c
+++ b/source4/scripting/ejs/smbscript.c
@@ -71,8 +71,6 @@ void ejs_exception(const char *reason)
 		exit(127);
 	}
 
-	smb_setup_ejs_constants(eid);
-
 	/* setup ARGV[] in the ejs environment */
 	for (i=1;argv[i];i++) {
 		argv_list = str_list_add(argv_list, argv[i]);
diff --git a/source4/scripting/libjs/samr.js b/source4/scripting/libjs/samr.js
index a1f79b541a..2363dde686 100644
--- a/source4/scripting/libjs/samr.js
+++ b/source4/scripting/libjs/samr.js
@@ -18,7 +18,7 @@ function samArray(output)
 	if (output.sam == NULL) {
 		return list;
 	}
-	var entries = output.sam.entries;
+	var i, entries = output.sam.entries;
 	for (i=0;i<output.num_entries;i++) {
 		list[i] = new Object();
                 list[i].name = entries[i].name;
@@ -32,10 +32,12 @@ function samArray(output)
 */
 function samrConnect(conn)
 {
+	conn.samr = samr_init();
+	conn.sec = security_init();
 	var io = irpcObj();
 	io.input.system_name = NULL;
-	io.input.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
-	status = dcerpc_samr_Connect(conn, io);
+	io.input.access_mask = conn.sec.SEC_FLAG_MAXIMUM_ALLOWED;
+	var status = conn.samr.samr_Connect2(conn, io);
 	check_status_ok(status);
 	return io.output.connect_handle;
 }
@@ -47,7 +49,7 @@ function samrClose(conn, handle)
 {
 	var io = irpcObj();
 	io.input.handle = handle;
-	status = dcerpc_samr_Close(conn, io);
+	var status = conn.samr.samr_Close(conn, io);
 	check_status_ok(status);
 }
 
@@ -59,7 +61,7 @@ function samrLookupDomain(conn, handle, domain)
 	var io = irpcObj();
 	io.input.connect_handle = handle;
 	io.input.domain_name = domain;
-	status = dcerpc_samr_LookupDomain(conn, io);
+	var status = conn.samr.samr_LookupDomain(conn, io);
 	check_status_ok(status);
 	return io.output.sid;
 }
@@ -71,9 +73,9 @@ function samrOpenDomain(conn, handle, sid)
 {
 	var io = irpcObj();
 	io.input.connect_handle = handle;
-	io.input.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
+	io.input.access_mask = conn.sec.SEC_FLAG_MAXIMUM_ALLOWED;
 	io.input.sid = sid;
-	status = dcerpc_samr_OpenDomain(conn, io);
+	var status = conn.samr.samr_OpenDomain(conn, io);
 	check_status_ok(status);
 	return io.output.domain_handle;
 }
@@ -85,9 +87,9 @@ function samrOpenUser(conn, handle, rid)
 {
 	var io = irpcObj();
 	io.input.domain_handle = handle;
-	io.input.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
+	io.input.access_mask = conn.sec.SEC_FLAG_MAXIMUM_ALLOWED;
 	io.input.rid = rid;
-	status = dcerpc_samr_OpenUser(conn, io);
+	var status = conn.samr.samr_OpenUser(conn, io);
 	check_status_ok(status);
 	return io.output.user_handle;
 }
@@ -102,7 +104,7 @@ function samrEnumDomainUsers(conn, dom_handle)
 	io.input.resume_handle = 0;
 	io.input.acct_flags = 0;
 	io.input.max_size = -1;
-	status = dcerpc_samr_EnumDomainUsers(conn, io);
+	var status = conn.samr.samr_EnumDomainUsers(conn, io);
 	check_status_ok(status);
 	return samArray(io.output);
 }
@@ -117,7 +119,7 @@ function samrEnumDomainGroups(conn, dom_handle)
 	io.input.resume_handle = 0;
 	io.input.acct_flags = 0;
 	io.input.max_size = -1;
-	status = dcerpc_samr_EnumDomainGroups(conn, io);
+	var status = conn.samr.samr_EnumDomainGroups(conn, io);
 	check_status_ok(status);
 	return samArray(io.output);
 }
@@ -131,7 +133,7 @@ function samrEnumDomains(conn, handle)
 	io.input.connect_handle = handle;
 	io.input.resume_handle = 0;
 	io.input.buf_size = -1;
-	status = dcerpc_samr_EnumDomains(conn, io);
+	var status = conn.samr.samr_EnumDomains(conn, io);
 	check_status_ok(status);
 	return samArray(io.output);
 }
@@ -144,7 +146,7 @@ function samrQueryUserInfo(conn, user_handle, level)
 	var r, io = irpcObj();
 	io.input.user_handle = user_handle;
 	io.input.level = level;
-	status = dcerpc_samr_QueryUserInfo(conn, io);
+	var status = conn.samr.samr_QueryUserInfo(conn, io);
 	check_status_ok(status);
 	return io.output.info.info3;
 }
@@ -167,4 +169,3 @@ function samrFillUserInfo(conn, dom_handle, users, level)
 	}
 }
 
-
-- 
cgit 


From 7913cbbe11075c75770d37cf2e0da8f7af51a7fc Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Fri, 15 Jul 2005 07:45:40 +0000
Subject: r8484: switched the sys_*() calls to the OO interface

tim, do you want to do the cli_*() calls now?
(This used to be commit 9991e924e9dacec663a5d040ccfc878927fc3afa)
---
 source4/scripting/ejs/smbcalls_sys.c | 30 ++++++++++++++++++++++--------
 source4/scripting/libjs/provision.js | 22 ++++++++++++----------
 2 files changed, 34 insertions(+), 18 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_sys.c b/source4/scripting/ejs/smbcalls_sys.c
index 4dc5045ff6..af51c815dc 100644
--- a/source4/scripting/ejs/smbcalls_sys.c
+++ b/source4/scripting/ejs/smbcalls_sys.c
@@ -170,17 +170,31 @@ static int ejs_sys_file_save(MprVarHandle eid, int argc, char **argv)
 }
 
 
+/*
+  initialise sys ejs subsystem
+*/
+static int ejs_sys_init(MprVarHandle eid, int argc, struct MprVar **argv)
+{
+	struct MprVar obj = mprObject("sys");
+
+	mprSetCFunction(&obj, "interfaces", ejs_sys_interfaces);
+	mprSetCFunction(&obj, "hostname", ejs_sys_hostname);
+	mprSetCFunction(&obj, "nttime", ejs_sys_nttime);
+	mprSetCFunction(&obj, "gmtime", ejs_sys_gmtime);
+	mprSetCFunction(&obj, "ldaptime", ejs_sys_ldaptime);
+	mprSetStringCFunction(&obj, "unlink", ejs_sys_unlink);
+	mprSetStringCFunction(&obj, "file_load", ejs_sys_file_load);
+	mprSetStringCFunction(&obj, "file_save", ejs_sys_file_save);
+
+	mpr_Return(eid, obj);
+	return 0;
+}
+
+
 /*
   setup C functions that be called from ejs
 */
 void smb_setup_ejs_system(void)
 {
-	ejsDefineCFunction(-1, "sys_interfaces", ejs_sys_interfaces, NULL, MPR_VAR_SCRIPT_HANDLE);
-	ejsDefineCFunction(-1, "sys_hostname", ejs_sys_hostname, NULL, MPR_VAR_SCRIPT_HANDLE);
-	ejsDefineCFunction(-1, "sys_nttime", ejs_sys_nttime, NULL, MPR_VAR_SCRIPT_HANDLE);
-	ejsDefineCFunction(-1, "sys_gmtime", ejs_sys_gmtime, NULL, MPR_VAR_SCRIPT_HANDLE);
-	ejsDefineCFunction(-1, "sys_ldaptime", ejs_sys_ldaptime, NULL, MPR_VAR_SCRIPT_HANDLE);
-	ejsDefineStringCFunction(-1, "sys_unlink", ejs_sys_unlink, NULL, MPR_VAR_SCRIPT_HANDLE);
-	ejsDefineStringCFunction(-1, "sys_file_load", ejs_sys_file_load, NULL, MPR_VAR_SCRIPT_HANDLE);
-	ejsDefineStringCFunction(-1, "sys_file_save", ejs_sys_file_save, NULL, MPR_VAR_SCRIPT_HANDLE);
+	ejsDefineCFunction(-1, "sys_init", ejs_sys_init, NULL, MPR_VAR_SCRIPT_HANDLE);
 }
diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index 6d4e4a3bc0..06b6f03779 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -7,6 +7,8 @@
 /* used to generate sequence numbers for records */
 provision_next_usn = 1;
 
+sys = sys_init();
+
 /*
   find a user or group from a list of possibilities
 */
@@ -59,7 +61,7 @@ unixName: ${UNIXNAME}
 */
 function nttime()
 {
-	return "" + sys_nttime();
+	return "" + sys.nttime();
 }
 
 /*
@@ -67,7 +69,7 @@ function nttime()
 */
 function ldaptime()
 {
-	return sys_ldaptime(sys_nttime());
+	return sys.ldaptime(sys.nttime());
 }
 
 /*
@@ -75,7 +77,7 @@ function ldaptime()
 */
 function datestring()
 {
-	var t = sys_gmtime(sys_nttime());
+	var t = sys.gmtime(sys.nttime());
 	return sprintf("%04u%02u%02u%02u",
 		       t.tm_year+1900, t.tm_mon+1, t.tm_mday, t.tm_hour);
 }
@@ -85,7 +87,7 @@ function datestring()
 */
 function hostip()
 {
-	var list = sys_interfaces();
+	var list = sys.interfaces();
 	return list[0];
 }
 
@@ -103,7 +105,7 @@ function nextusn()
 */
 function hostname()
 {
-	var s = split(".", sys_hostname());
+	var s = split(".", sys.hostname());
 	return s[0];
 }
 
@@ -123,9 +125,9 @@ function setup_ldb(ldif, dbname, subobj)
 	var db = lpGet("private dir") + "/" + dbname;
 	var src = lpGet("setup directory") + "/" + ldif;
 
-	sys_unlink(db);
+	sys.unlink(db);
 
-	var data = sys_file_load(src);
+	var data = sys.file_load(src);
 	data = data + extra;
 	data = substitute_var(data, subobj);
 
@@ -141,12 +143,12 @@ function setup_file(template, fname, subobj)
 	var f = lpGet("private dir") + "/" + fname;
 	var src = lpGet("setup directory") + "/" + template;
 
-	sys_unlink(f);
+	sys.unlink(f);
 
-	var data = sys_file_load(src);
+	var data = sys.file_load(src);
 	data = substitute_var(data, subobj);
 
-	ok = sys_file_save(f, data);
+	ok = sys.file_save(f, data);
 	assert(ok);
 }
 
-- 
cgit 


From 4f62205cad46539cc459efe106c0a036f08ed0b9 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Fri, 15 Jul 2005 09:23:23 +0000
Subject: r8486: switched to a separate connection operation in ldb interface
 (a suggestion from simo) (This used to be commit
 98c9c4ecb87e1b140002390067892806464849da)

---
 source4/scripting/ejs/smbcalls_ldb.c | 174 ++++++++++++++++++++---------------
 source4/scripting/libjs/provision.js |   7 +-
 2 files changed, 106 insertions(+), 75 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_ldb.c b/source4/scripting/ejs/smbcalls_ldb.c
index 659ac11b1b..be54ac79ac 100644
--- a/source4/scripting/ejs/smbcalls_ldb.c
+++ b/source4/scripting/ejs/smbcalls_ldb.c
@@ -25,58 +25,67 @@
 #include "lib/appweb/ejs/ejs.h"
 #include "lib/ldb/include/ldb.h"
 
+/*
+  get the connected db
+ */
+static struct ldb_context *ejs_ldb_db(int eid, struct MprVar *v)
+{
+	struct ldb_context *ldb = mprGetPtr(v, "ldb");
+	if (ldb == NULL) {
+		ejsSetErrorMsg(eid, "invalid ldb connection");
+	}
+	return ldb;
+}
+
 /*
   perform an ldb search, returning an array of results
 
   syntax:
-     ldbSearch("dbfile", "expression");
+     res = ldb.search(db, "expression");
      var attrs = new Array("attr1", "attr2", "attr3");
-     ldbSearch("dbfile", "expression", attrs);
+     ldb.search(db, "expression", attrs);
 */
 static int ejs_ldbSearch(MprVarHandle eid, int argc, struct MprVar **argv)
 {
 	const char **attrs = NULL;
-	const char *expression, *dbfile;
+	const char *expression;
 	TALLOC_CTX *tmp_ctx = talloc_new(mprMemCtx());
 	struct ldb_context *ldb;
 	int ret;
 	struct ldb_message **res;
 
 	/* validate arguments */
-	if (argc < 2 || argc > 3 ||
-	    argv[0]->type != MPR_TYPE_STRING) {
-		ejsSetErrorMsg(eid, "ldbSearch invalid arguments");
+	if (argc < 2 || argc > 3) {
+		ejsSetErrorMsg(eid, "ldb.search invalid arguments");
 		goto failed;
 	}
 	if (argc == 3 && argv[2]->type != MPR_TYPE_OBJECT) {
-		ejsSetErrorMsg(eid, "ldbSearch attributes must be an object");
+		ejsSetErrorMsg(eid, "ldb.search attributes must be an object");
 		goto failed;
 	}
 
-	dbfile     = mprToString(argv[0]);
-	expression = mprToString(argv[1]);
-	if (argc > 2) {
-		attrs = mprToList(tmp_ctx, argv[2]);
+	ldb = ejs_ldb_db(eid, argv[0]);
+	if (ldb == NULL) {
+		return -1;
 	}
-	if (dbfile == NULL || expression == NULL) {
-		ejsSetErrorMsg(eid, "ldbSearch invalid arguments");
+	
+	expression = mprToString(argv[1]);
+	if (expression == NULL) {
+		ejsSetErrorMsg(eid, "ldb.search invalid arguments");
 		goto failed;
 	}
-
-	ldb = ldb_wrap_connect(tmp_ctx, dbfile, 0, NULL);
-	if (ldb == NULL) {
-		ejsSetErrorMsg(eid, "ldbSearch failed to open %s", dbfile);
-		goto failed;
+	if (argc > 2) {
+		attrs = mprToList(tmp_ctx, argv[2]);
 	}
 
 	ret = ldb_search(ldb, NULL, LDB_SCOPE_DEFAULT, expression, attrs, &res);
 	if (ret == -1) {
-		ejsSetErrorMsg(eid, "ldbSearch failed - %s", ldb_errstring(ldb));
-		goto failed;
+		ejsSetErrorMsg(eid, "ldb.search failed - %s", ldb_errstring(ldb));
+		mpr_Return(eid, mprCreateUndefinedVar());
+	} else {
+		mpr_Return(eid, mprLdbArray(res, ret, "ldb_message"));
 	}
 
-	mpr_Return(eid, mprLdbArray(res, ret, "ldb_message"));
-
 	talloc_free(tmp_ctx);
 	return 0;
 
@@ -89,26 +98,28 @@ failed:
 /*
   perform an ldb add or modify
 */
-static int ejs_ldbAddModify(MprVarHandle eid, int argc, char **argv,
+static int ejs_ldbAddModify(MprVarHandle eid, int argc, struct MprVar **argv,
 			    int fn(struct ldb_context *, const struct ldb_message *))
 {
-	const char *ldifstring, *dbfile;
+	const char *ldifstring;
 	struct ldb_context *ldb;
 	struct ldb_ldif *ldif;
 	int ret;
 
 	if (argc != 2) {
-		ejsSetErrorMsg(eid, "ldbAddModify invalid arguments");
+		ejsSetErrorMsg(eid, "ldb.add/modify invalid arguments");
 		return -1;
 	}
 
-	dbfile     = argv[0];
-	ldifstring = argv[1];
+	ldifstring = mprToString(argv[1]);
+	if (ldifstring == NULL) {
+		ejsSetErrorMsg(eid, "ldb.add/modify invalid arguments");
+		return -1;
+	}
 
-	ldb = ldb_wrap_connect(mprMemCtx(), dbfile, 0, NULL);
+	ldb = ejs_ldb_db(eid, argv[0]);
 	if (ldb == NULL) {
-		ejsSetErrorMsg(eid, "ldbAddModify failed to open %s", dbfile);
-		goto failed;
+		return -1;
 	}
 
 	while ((ldif = ldb_ldif_read_string(ldb, &ldifstring))) {
@@ -118,95 +129,79 @@ static int ejs_ldbAddModify(MprVarHandle eid, int argc, char **argv,
 	}
 
 	mpr_Return(eid, mprCreateBoolVar(ret == 0));
-	talloc_free(ldb);
 	return 0;
-
-failed:
-	talloc_free(ldb);
-	return -1;
 }
 
 
 /*
   perform an ldb delete
   usage:
-   ok = ldbDelete(dbfile, dn);
+   ok = ldb.delete(db, dn);
 */
-static int ejs_ldbDelete(MprVarHandle eid, int argc, char **argv)
+static int ejs_ldbDelete(MprVarHandle eid, int argc, struct MprVar **argv)
 {
-	const char *dn, *dbfile;
+	const char *dn;
 	struct ldb_context *ldb;
 	int ret;
 
 	if (argc != 2) {
-		ejsSetErrorMsg(eid, "ldbDelete invalid arguments");
+		ejsSetErrorMsg(eid, "ldb.delete invalid arguments");
 		return -1;
 	}
 
-	dbfile  = argv[0];
-	dn      = argv[1];
+	dn      = mprToString(argv[1]);
 
-	ldb = ldb_wrap_connect(mprMemCtx(), dbfile, 0, NULL);
+	ldb = ejs_ldb_db(eid, argv[0]);
 	if (ldb == NULL) {
-		ejsSetErrorMsg(eid, "ldbDelete failed to open %s", dbfile);
-		goto failed;
+		return -1;
 	}
-
 	ret = ldb_delete(ldb, dn);
 
 	mpr_Return(eid, mprCreateBoolVar(ret == 0));
-	talloc_free(ldb);
 	return 0;
-
-failed:
-	talloc_free(ldb);
-	return -1;
 }
 
 /*
   perform an ldb rename
   usage:
-   ok = ldbRename(dbfile, dn1, dn2);
+   ok = ldb.rename(db, dn1, dn2);
 */
-static int ejs_ldbRename(MprVarHandle eid, int argc, char **argv)
+static int ejs_ldbRename(MprVarHandle eid, int argc, struct MprVar **argv)
 {
-	const char *dn1, *dn2, *dbfile;
+	const char *dn1, *dn2;
 	struct ldb_context *ldb;
 	int ret;
 
 	if (argc != 3) {
-		ejsSetErrorMsg(eid, "ldbRename invalid arguments");
+		ejsSetErrorMsg(eid, "ldb.rename invalid arguments");
 		return -1;
 	}
 
-	dbfile = argv[0];
-	dn1    = argv[1];
-	dn2    = argv[2];
+	dn1    = mprToString(argv[1]);
+	dn2    = mprToString(argv[2]);
+	if (dn1 == NULL || dn2 == NULL) {
+		ejsSetErrorMsg(eid, "ldb.rename invalid arguments");
+		return -1;
+	}
 
-	ldb = ldb_wrap_connect(mprMemCtx(), dbfile, 0, NULL);
+	ldb = ejs_ldb_db(eid, argv[0]);
 	if (ldb == NULL) {
-		ejsSetErrorMsg(eid, "ldbRename failed to open %s", dbfile);
-		goto failed;
+		return -1;
 	}
 
 	ret = ldb_rename(ldb, dn1, dn2);
 
 	mpr_Return(eid, mprCreateBoolVar(ret == 0));
-	talloc_free(ldb);
 	return 0;
-
-failed:
-	talloc_free(ldb);
-	return -1;
 }
 
 /*
   perform an ldb modify
 
   syntax:
-    ok = ldbModify("dbfile", ldifstring);
+    ok = ldb.modify(db, ldifstring);
 */
-static int ejs_ldbAdd(MprVarHandle eid, int argc, char **argv)
+static int ejs_ldbAdd(MprVarHandle eid, int argc, struct MprVar **argv)
 {
 	return ejs_ldbAddModify(eid, argc, argv, ldb_add);
 }
@@ -215,13 +210,45 @@ static int ejs_ldbAdd(MprVarHandle eid, int argc, char **argv)
   perform an ldb add
 
   syntax:
-    ok = ldbAdd("dbfile", ldifstring);
+    ok = ldb.add(db, ldifstring);
 */
-static int ejs_ldbModify(MprVarHandle eid, int argc, char **argv)
+static int ejs_ldbModify(MprVarHandle eid, int argc, struct MprVar **argv)
 {
 	return ejs_ldbAddModify(eid, argc, argv, ldb_modify);
 }
 
+/*
+  connect to a database
+  usage:
+   db = ldb.connect(dbfile);
+*/
+static int ejs_ldbConnect(MprVarHandle eid, int argc, char **argv)
+{
+	struct ldb_context *ldb;
+	const char *dbfile;
+	struct MprVar v;
+
+	if (argc != 1) {
+		ejsSetErrorMsg(eid, "ldb.connect invalid arguments");
+		return -1;
+	}
+
+	dbfile = argv[0];
+
+	ldb = ldb_wrap_connect(mprMemCtx(), dbfile, 0, NULL);
+	if (ldb == NULL) {
+		ejsSetErrorMsg(eid, "ldb.connect failed to open %s", dbfile);
+		mpr_Return(eid, mprCreateUndefinedVar());
+	}
+
+	v = mprObject("db");
+	mprSetPtrChild(&v, "ldb", ldb);
+
+	mpr_Return(eid, v);
+	return 0;
+}
+
+
 /*
   initialise ldb ejs subsystem
 */
@@ -229,11 +256,12 @@ static int ejs_ldb_init(MprVarHandle eid, int argc, struct MprVar **argv)
 {
 	struct MprVar ldb = mprObject("ldb");
 
+	mprSetStringCFunction(&ldb, "connect", ejs_ldbConnect);
 	mprSetCFunction(&ldb, "search", ejs_ldbSearch);
-	mprSetStringCFunction(&ldb, "add", ejs_ldbAdd);
-	mprSetStringCFunction(&ldb, "modify", ejs_ldbModify);
-	mprSetStringCFunction(&ldb, "delete", ejs_ldbDelete);
-	mprSetStringCFunction(&ldb, "rename", ejs_ldbRename);
+	mprSetCFunction(&ldb, "add", ejs_ldbAdd);
+	mprSetCFunction(&ldb, "modify", ejs_ldbModify);
+	mprSetCFunction(&ldb, "delete", ejs_ldbDelete);
+	mprSetCFunction(&ldb, "rename", ejs_ldbRename);
 
 	mpr_Return(eid, ldb);
 	return 0;
diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index 06b6f03779..d4551945d1 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -122,15 +122,18 @@ function setup_ldb(ldif, dbname, subobj)
 		extra = arguments[3];
 	}
 
-	var db = lpGet("private dir") + "/" + dbname;
+	var dbfile = lpGet("private dir") + "/" + dbname;
 	var src = lpGet("setup directory") + "/" + ldif;
 
-	sys.unlink(db);
+	sys.unlink(dbfile);
 
 	var data = sys.file_load(src);
 	data = data + extra;
 	data = substitute_var(data, subobj);
 
+	var db = ldb.connect(dbfile);
+	assert(db != undefined);
+
 	ok = ldb.add(db, data);
 	assert(ok);
 }
-- 
cgit 


From 94d99612b9093ca83da3b6b66f875915eeabb389 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Fri, 15 Jul 2005 11:10:38 +0000
Subject: r8488: after discussions with simo, moved to a full OO interface, so
 you don't need to keep a 'db' variable around. The ldb object knows what it
 is connected to.

Added a simple ldb testsuite in testprogs/ldb.js
(This used to be commit cf35818648b5b649d0cd25f115a04b7b5b5311aa)
---
 source4/scripting/ejs/mprutil.c      |  7 +++-
 source4/scripting/ejs/smbcalls_ldb.c | 78 ++++++++++++++++++------------------
 source4/scripting/libjs/provision.js |  6 +--
 3 files changed, 47 insertions(+), 44 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/mprutil.c b/source4/scripting/ejs/mprutil.c
index 247cea0b06..f25064f245 100644
--- a/source4/scripting/ejs/mprutil.c
+++ b/source4/scripting/ejs/mprutil.c
@@ -202,6 +202,9 @@ struct MprVar mprLdbArray(struct ldb_message **msg, int count, const char *name)
 	for (i=0;i<count;i++) {
 		mprAddArray(&res, i, mprLdbMessage(msg[i]));
 	}
+	if (i==0) {
+		mprSetVar(&res, "length", mprCreateIntegerVar(0));
+	}
 	return res;
 }
 
@@ -372,7 +375,7 @@ void mpr_ReturnString(int eid, const char *s)
 */
  void mprSetCFunction(struct MprVar *obj, const char *name, MprCFunction fn)
 {
-	mprSetVar(obj, name, mprCreateCFunctionVar(fn, NULL, MPR_VAR_SCRIPT_HANDLE));
+	mprSetVar(obj, name, mprCreateCFunctionVar(fn, obj, MPR_VAR_SCRIPT_HANDLE));
 }
 
 /*
@@ -380,5 +383,5 @@ void mpr_ReturnString(int eid, const char *s)
 */
  void mprSetStringCFunction(struct MprVar *obj, const char *name, MprStringCFunction fn)
 {
-	mprSetVar(obj, name, mprCreateStringCFunctionVar(fn, NULL, MPR_VAR_SCRIPT_HANDLE));
+	mprSetVar(obj, name, mprCreateStringCFunctionVar(fn, obj, MPR_VAR_SCRIPT_HANDLE));
 }
diff --git a/source4/scripting/ejs/smbcalls_ldb.c b/source4/scripting/ejs/smbcalls_ldb.c
index be54ac79ac..924a9665b3 100644
--- a/source4/scripting/ejs/smbcalls_ldb.c
+++ b/source4/scripting/ejs/smbcalls_ldb.c
@@ -28,9 +28,10 @@
 /*
   get the connected db
  */
-static struct ldb_context *ejs_ldb_db(int eid, struct MprVar *v)
+static struct ldb_context *ejs_ldb_db(int eid)
 {
-	struct ldb_context *ldb = mprGetPtr(v, "ldb");
+	struct MprVar *this = mprGetProperty(ejsGetLocalObject(eid), "this", 0);
+	struct ldb_context *ldb = mprGetPtr(this, "db");
 	if (ldb == NULL) {
 		ejsSetErrorMsg(eid, "invalid ldb connection");
 	}
@@ -41,9 +42,9 @@ static struct ldb_context *ejs_ldb_db(int eid, struct MprVar *v)
   perform an ldb search, returning an array of results
 
   syntax:
-     res = ldb.search(db, "expression");
+     res = ldb.search("expression");
      var attrs = new Array("attr1", "attr2", "attr3");
-     ldb.search(db, "expression", attrs);
+     ldb.search("expression", attrs);
 */
 static int ejs_ldbSearch(MprVarHandle eid, int argc, struct MprVar **argv)
 {
@@ -55,27 +56,27 @@ static int ejs_ldbSearch(MprVarHandle eid, int argc, struct MprVar **argv)
 	struct ldb_message **res;
 
 	/* validate arguments */
-	if (argc < 2 || argc > 3) {
+	if (argc < 1 || argc > 2) {
 		ejsSetErrorMsg(eid, "ldb.search invalid arguments");
 		goto failed;
 	}
-	if (argc == 3 && argv[2]->type != MPR_TYPE_OBJECT) {
+	if (argc == 2 && argv[1]->type != MPR_TYPE_OBJECT) {
 		ejsSetErrorMsg(eid, "ldb.search attributes must be an object");
 		goto failed;
 	}
 
-	ldb = ejs_ldb_db(eid, argv[0]);
+	ldb = ejs_ldb_db(eid);
 	if (ldb == NULL) {
 		return -1;
 	}
 	
-	expression = mprToString(argv[1]);
+	expression = mprToString(argv[0]);
 	if (expression == NULL) {
 		ejsSetErrorMsg(eid, "ldb.search invalid arguments");
 		goto failed;
 	}
-	if (argc > 2) {
-		attrs = mprToList(tmp_ctx, argv[2]);
+	if (argc == 2) {
+		attrs = mprToList(tmp_ctx, argv[1]);
 	}
 
 	ret = ldb_search(ldb, NULL, LDB_SCOPE_DEFAULT, expression, attrs, &res);
@@ -106,18 +107,18 @@ static int ejs_ldbAddModify(MprVarHandle eid, int argc, struct MprVar **argv,
 	struct ldb_ldif *ldif;
 	int ret;
 
-	if (argc != 2) {
+	if (argc != 1) {
 		ejsSetErrorMsg(eid, "ldb.add/modify invalid arguments");
 		return -1;
 	}
 
-	ldifstring = mprToString(argv[1]);
+	ldifstring = mprToString(argv[0]);
 	if (ldifstring == NULL) {
 		ejsSetErrorMsg(eid, "ldb.add/modify invalid arguments");
 		return -1;
 	}
 
-	ldb = ejs_ldb_db(eid, argv[0]);
+	ldb = ejs_ldb_db(eid);
 	if (ldb == NULL) {
 		return -1;
 	}
@@ -136,7 +137,7 @@ static int ejs_ldbAddModify(MprVarHandle eid, int argc, struct MprVar **argv,
 /*
   perform an ldb delete
   usage:
-   ok = ldb.delete(db, dn);
+   ok = ldb.delete(dn);
 */
 static int ejs_ldbDelete(MprVarHandle eid, int argc, struct MprVar **argv)
 {
@@ -144,14 +145,14 @@ static int ejs_ldbDelete(MprVarHandle eid, int argc, struct MprVar **argv)
 	struct ldb_context *ldb;
 	int ret;
 
-	if (argc != 2) {
+	if (argc != 1) {
 		ejsSetErrorMsg(eid, "ldb.delete invalid arguments");
 		return -1;
 	}
 
-	dn      = mprToString(argv[1]);
+	dn = mprToString(argv[0]);
 
-	ldb = ejs_ldb_db(eid, argv[0]);
+	ldb = ejs_ldb_db(eid);
 	if (ldb == NULL) {
 		return -1;
 	}
@@ -164,7 +165,7 @@ static int ejs_ldbDelete(MprVarHandle eid, int argc, struct MprVar **argv)
 /*
   perform an ldb rename
   usage:
-   ok = ldb.rename(db, dn1, dn2);
+   ok = ldb.rename(dn1, dn2);
 */
 static int ejs_ldbRename(MprVarHandle eid, int argc, struct MprVar **argv)
 {
@@ -172,19 +173,19 @@ static int ejs_ldbRename(MprVarHandle eid, int argc, struct MprVar **argv)
 	struct ldb_context *ldb;
 	int ret;
 
-	if (argc != 3) {
+	if (argc != 2) {
 		ejsSetErrorMsg(eid, "ldb.rename invalid arguments");
 		return -1;
 	}
 
-	dn1    = mprToString(argv[1]);
-	dn2    = mprToString(argv[2]);
+	dn1 = mprToString(argv[0]);
+	dn2 = mprToString(argv[1]);
 	if (dn1 == NULL || dn2 == NULL) {
 		ejsSetErrorMsg(eid, "ldb.rename invalid arguments");
 		return -1;
 	}
 
-	ldb = ejs_ldb_db(eid, argv[0]);
+	ldb = ejs_ldb_db(eid);
 	if (ldb == NULL) {
 		return -1;
 	}
@@ -199,7 +200,7 @@ static int ejs_ldbRename(MprVarHandle eid, int argc, struct MprVar **argv)
   perform an ldb modify
 
   syntax:
-    ok = ldb.modify(db, ldifstring);
+    ok = ldb.modify(ldifstring);
 */
 static int ejs_ldbAdd(MprVarHandle eid, int argc, struct MprVar **argv)
 {
@@ -210,7 +211,7 @@ static int ejs_ldbAdd(MprVarHandle eid, int argc, struct MprVar **argv)
   perform an ldb add
 
   syntax:
-    ok = ldb.add(db, ldifstring);
+    ok = ldb.add(ldifstring);
 */
 static int ejs_ldbModify(MprVarHandle eid, int argc, struct MprVar **argv)
 {
@@ -220,13 +221,13 @@ static int ejs_ldbModify(MprVarHandle eid, int argc, struct MprVar **argv)
 /*
   connect to a database
   usage:
-   db = ldb.connect(dbfile);
+   ok = ldb.connect(dbfile);
 */
 static int ejs_ldbConnect(MprVarHandle eid, int argc, char **argv)
 {
 	struct ldb_context *ldb;
 	const char *dbfile;
-	struct MprVar v;
+	struct MprVar *this = mprGetProperty(ejsGetLocalObject(eid), "this", 0);
 
 	if (argc != 1) {
 		ejsSetErrorMsg(eid, "ldb.connect invalid arguments");
@@ -238,13 +239,10 @@ static int ejs_ldbConnect(MprVarHandle eid, int argc, char **argv)
 	ldb = ldb_wrap_connect(mprMemCtx(), dbfile, 0, NULL);
 	if (ldb == NULL) {
 		ejsSetErrorMsg(eid, "ldb.connect failed to open %s", dbfile);
-		mpr_Return(eid, mprCreateUndefinedVar());
 	}
 
-	v = mprObject("db");
-	mprSetPtrChild(&v, "ldb", ldb);
-
-	mpr_Return(eid, v);
+	mprSetPtrChild(this, "db", ldb);
+	mpr_Return(eid, mprCreateBoolVar(ldb != NULL));
 	return 0;
 }
 
@@ -254,16 +252,18 @@ static int ejs_ldbConnect(MprVarHandle eid, int argc, char **argv)
 */
 static int ejs_ldb_init(MprVarHandle eid, int argc, struct MprVar **argv)
 {
-	struct MprVar ldb = mprObject("ldb");
+	struct MprVar *ldb;
+	mpr_Return(eid, mprObject("ldb"));
+
+	ldb  = ejsGetReturnValue(eid);
 
-	mprSetStringCFunction(&ldb, "connect", ejs_ldbConnect);
-	mprSetCFunction(&ldb, "search", ejs_ldbSearch);
-	mprSetCFunction(&ldb, "add", ejs_ldbAdd);
-	mprSetCFunction(&ldb, "modify", ejs_ldbModify);
-	mprSetCFunction(&ldb, "delete", ejs_ldbDelete);
-	mprSetCFunction(&ldb, "rename", ejs_ldbRename);
+	mprSetStringCFunction(ldb, "connect", ejs_ldbConnect);
+	mprSetCFunction(ldb, "search", ejs_ldbSearch);
+	mprSetCFunction(ldb, "add", ejs_ldbAdd);
+	mprSetCFunction(ldb, "modify", ejs_ldbModify);
+	mprSetCFunction(ldb, "delete", ejs_ldbDelete);
+	mprSetCFunction(ldb, "rename", ejs_ldbRename);
 
-	mpr_Return(eid, ldb);
 	return 0;
 }
 
diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index d4551945d1..bf39bcb992 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -131,10 +131,10 @@ function setup_ldb(ldif, dbname, subobj)
 	data = data + extra;
 	data = substitute_var(data, subobj);
 
-	var db = ldb.connect(dbfile);
-	assert(db != undefined);
+	var ok = ldb.connect(dbfile);
+	assert(ok);
 
-	ok = ldb.add(db, data);
+	ok = ldb.add(data);
 	assert(ok);
 }
 
-- 
cgit 


From 84e3efd8ea1cdb48e20f2f42c32f3ffa7b822352 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Fri, 15 Jul 2005 11:23:17 +0000
Subject: r8489: neaten up the object handling (This used to be commit
 ccf20b2b13b11ac07b59988809b6c5160388a616)

---
 source4/scripting/ejs/mprutil.c      | 18 ++++++++++++++++++
 source4/scripting/ejs/smbcalls_ldb.c |  6 ++----
 2 files changed, 20 insertions(+), 4 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/mprutil.c b/source4/scripting/ejs/mprutil.c
index f25064f245..f9813f2597 100644
--- a/source4/scripting/ejs/mprutil.c
+++ b/source4/scripting/ejs/mprutil.c
@@ -385,3 +385,21 @@ void mpr_ReturnString(int eid, const char *s)
 {
 	mprSetVar(obj, name, mprCreateStringCFunctionVar(fn, obj, MPR_VAR_SCRIPT_HANDLE));
 }
+
+/*
+  get a poiner in the current object
+*/
+void *mprGetThisPtr(int eid, const char *name)
+{
+	struct MprVar *this = mprGetProperty(ejsGetLocalObject(eid), "this", 0);
+	return mprGetPtr(this, name);
+}
+
+/*
+  set a pointer as a child of the local object
+*/
+void mprSetThisPtr(int eid, const char *name, void *ptr)
+{
+	struct MprVar *this = mprGetProperty(ejsGetLocalObject(eid), "this", 0);
+	mprSetPtrChild(this, name, ptr);
+}
diff --git a/source4/scripting/ejs/smbcalls_ldb.c b/source4/scripting/ejs/smbcalls_ldb.c
index 924a9665b3..cdf3b3dd6c 100644
--- a/source4/scripting/ejs/smbcalls_ldb.c
+++ b/source4/scripting/ejs/smbcalls_ldb.c
@@ -30,8 +30,7 @@
  */
 static struct ldb_context *ejs_ldb_db(int eid)
 {
-	struct MprVar *this = mprGetProperty(ejsGetLocalObject(eid), "this", 0);
-	struct ldb_context *ldb = mprGetPtr(this, "db");
+	struct ldb_context *ldb = mprGetThisPtr(eid, "db");
 	if (ldb == NULL) {
 		ejsSetErrorMsg(eid, "invalid ldb connection");
 	}
@@ -227,7 +226,6 @@ static int ejs_ldbConnect(MprVarHandle eid, int argc, char **argv)
 {
 	struct ldb_context *ldb;
 	const char *dbfile;
-	struct MprVar *this = mprGetProperty(ejsGetLocalObject(eid), "this", 0);
 
 	if (argc != 1) {
 		ejsSetErrorMsg(eid, "ldb.connect invalid arguments");
@@ -241,7 +239,7 @@ static int ejs_ldbConnect(MprVarHandle eid, int argc, char **argv)
 		ejsSetErrorMsg(eid, "ldb.connect failed to open %s", dbfile);
 	}
 
-	mprSetPtrChild(this, "db", ldb);
+	mprSetThisPtr(eid, "db", ldb);
 	mpr_Return(eid, mprCreateBoolVar(ldb != NULL));
 	return 0;
 }
-- 
cgit 


From 7d4004a129c1daf0d9010ff61c45a57d8b19dd2d Mon Sep 17 00:00:00 2001
From: Simo Sorce <idra@samba.org>
Date: Fri, 15 Jul 2005 13:19:16 +0000
Subject: r8499: clearer function name (This used to be commit
 5a6c2170ff83c29ed1d7f0f5329f2d9aa00c223a)

---
 source4/scripting/ejs/smbcalls_ldb.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_ldb.c b/source4/scripting/ejs/smbcalls_ldb.c
index cdf3b3dd6c..c8c6366f2d 100644
--- a/source4/scripting/ejs/smbcalls_ldb.c
+++ b/source4/scripting/ejs/smbcalls_ldb.c
@@ -28,7 +28,7 @@
 /*
   get the connected db
  */
-static struct ldb_context *ejs_ldb_db(int eid)
+static struct ldb_context *ejs_get_ldb_context(int eid)
 {
 	struct ldb_context *ldb = mprGetThisPtr(eid, "db");
 	if (ldb == NULL) {
@@ -64,7 +64,7 @@ static int ejs_ldbSearch(MprVarHandle eid, int argc, struct MprVar **argv)
 		goto failed;
 	}
 
-	ldb = ejs_ldb_db(eid);
+	ldb = ejs_get_ldb_context(eid);
 	if (ldb == NULL) {
 		return -1;
 	}
@@ -117,7 +117,7 @@ static int ejs_ldbAddModify(MprVarHandle eid, int argc, struct MprVar **argv,
 		return -1;
 	}
 
-	ldb = ejs_ldb_db(eid);
+	ldb = ejs_get_ldb_context(eid);
 	if (ldb == NULL) {
 		return -1;
 	}
@@ -151,7 +151,7 @@ static int ejs_ldbDelete(MprVarHandle eid, int argc, struct MprVar **argv)
 
 	dn = mprToString(argv[0]);
 
-	ldb = ejs_ldb_db(eid);
+	ldb = ejs_get_ldb_context(eid);
 	if (ldb == NULL) {
 		return -1;
 	}
@@ -184,7 +184,7 @@ static int ejs_ldbRename(MprVarHandle eid, int argc, struct MprVar **argv)
 		return -1;
 	}
 
-	ldb = ejs_ldb_db(eid);
+	ldb = ejs_get_ldb_context(eid);
 	if (ldb == NULL) {
 		return -1;
 	}
-- 
cgit 


From 54c30b05854e15031eb490fc5f45205329c81001 Mon Sep 17 00:00:00 2001
From: Simo Sorce <idra@samba.org>
Date: Sat, 16 Jul 2005 18:17:08 +0000
Subject: r8516: let us use all parameters of ldbsearch in ldb.search (This
 used to be commit e709e3792846e2bd48b55112c74395d1ab3a1b6a)

---
 source4/scripting/ejs/smbcalls_ldb.c | 39 ++++++++++++++++++++++++++++--------
 1 file changed, 31 insertions(+), 8 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_ldb.c b/source4/scripting/ejs/smbcalls_ldb.c
index c8c6366f2d..4151eaedab 100644
--- a/source4/scripting/ejs/smbcalls_ldb.c
+++ b/source4/scripting/ejs/smbcalls_ldb.c
@@ -44,22 +44,26 @@ static struct ldb_context *ejs_get_ldb_context(int eid)
      res = ldb.search("expression");
      var attrs = new Array("attr1", "attr2", "attr3");
      ldb.search("expression", attrs);
+     var basedn = "cn=this,dc=is,dc=a,dc=test";
+     ldb.search("expression", attrs, ldb.SCOPE_SUBTREE, basedn);
 */
 static int ejs_ldbSearch(MprVarHandle eid, int argc, struct MprVar **argv)
 {
 	const char **attrs = NULL;
 	const char *expression;
+	const char *basedn = NULL;
+	int scope = LDB_SCOPE_DEFAULT;
 	TALLOC_CTX *tmp_ctx = talloc_new(mprMemCtx());
 	struct ldb_context *ldb;
 	int ret;
 	struct ldb_message **res;
 
 	/* validate arguments */
-	if (argc < 1 || argc > 2) {
-		ejsSetErrorMsg(eid, "ldb.search invalid arguments");
+	if (argc < 1 || argc > 4) {
+		ejsSetErrorMsg(eid, "ldb.search invalid number of arguments");
 		goto failed;
 	}
-	if (argc == 2 && argv[1]->type != MPR_TYPE_OBJECT) {
+	if (argc > 3 && argv[3]->type != MPR_TYPE_OBJECT) {
 		ejsSetErrorMsg(eid, "ldb.search attributes must be an object");
 		goto failed;
 	}
@@ -71,14 +75,30 @@ static int ejs_ldbSearch(MprVarHandle eid, int argc, struct MprVar **argv)
 	
 	expression = mprToString(argv[0]);
 	if (expression == NULL) {
-		ejsSetErrorMsg(eid, "ldb.search invalid arguments");
+		ejsSetErrorMsg(eid, "ldb.search invalid expression");
 		goto failed;
 	}
-	if (argc == 2) {
-		attrs = mprToList(tmp_ctx, argv[1]);
+	if (argc > 1) {
+		basedn = mprToString(argv[1]);
+		/* a null basedn is valid */
 	}
-
-	ret = ldb_search(ldb, NULL, LDB_SCOPE_DEFAULT, expression, attrs, &res);
+	if (argc > 2) {
+		scope = mprToInt(argv[2]);
+		switch (scope) {
+			case LDB_SCOPE_DEFAULT:
+			case LDB_SCOPE_BASE:
+			case LDB_SCOPE_ONELEVEL:
+			case LDB_SCOPE_SUBTREE:
+				break; /* ok */
+			default:
+				ejsSetErrorMsg(eid, "ldb.search invalid scope");
+				goto failed;
+		}
+	}
+	if (argc > 3) {
+		attrs = mprToList(tmp_ctx, argv[3]);
+	}
+	ret = ldb_search(ldb, basedn, scope, expression, attrs, &res);
 	if (ret == -1) {
 		ejsSetErrorMsg(eid, "ldb.search failed - %s", ldb_errstring(ldb));
 		mpr_Return(eid, mprCreateUndefinedVar());
@@ -261,6 +281,9 @@ static int ejs_ldb_init(MprVarHandle eid, int argc, struct MprVar **argv)
 	mprSetCFunction(ldb, "modify", ejs_ldbModify);
 	mprSetCFunction(ldb, "delete", ejs_ldbDelete);
 	mprSetCFunction(ldb, "rename", ejs_ldbRename);
+	mprSetVar(ldb, "SCOPE_BASE", mprCreateNumberVar(LDB_SCOPE_BASE));
+	mprSetVar(ldb, "SCOPE_ONE", mprCreateNumberVar(LDB_SCOPE_ONELEVEL));
+	mprSetVar(ldb, "SCOPE_SUBTREE", mprCreateNumberVar(LDB_SCOPE_SUBTREE));
 
 	return 0;
 }
-- 
cgit 


From e835621799647ee70630b389fb53d15b15d68355 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Sun, 17 Jul 2005 09:20:52 +0000
Subject: r8520: fixed a pile of warnings from the build farm gcc -Wall output
 on S390. This is an attempt to avoid the panic we're seeing in the automatic
 builds.

The main fixes are:

 - assumptions that sizeof(size_t) == sizeof(int), mostly in printf formats

 - use of NULL format statements to perform dn searches.

 - assumption that sizeof() returns an int
(This used to be commit a58ea6b3854973b694d2b1e22323ed7eb00e3a3f)
---
 source4/scripting/ejs/smbcalls_cli.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_cli.c b/source4/scripting/ejs/smbcalls_cli.c
index 4f262bd350..d7ffea29fe 100644
--- a/source4/scripting/ejs/smbcalls_cli.c
+++ b/source4/scripting/ejs/smbcalls_cli.c
@@ -422,7 +422,7 @@ static int ejs_tree_connect(MprVarHandle eid, int argc, char **argv)
 
 	/* Set up host, share destination */
 
-	mem_ctx = talloc_init(NULL);
+	mem_ctx = talloc_new(mprMemCtx());
 	smbcli_parse_unc(argv[0], mem_ctx, &hostname, &sharename);
 
 	/* Set up credentials */
-- 
cgit 


From 0752efe05554de05eea1812a4dd721692ca8bf95 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Mon, 18 Jul 2005 23:57:37 +0000
Subject: r8557: expose ldb_errstring() in ldb ejs code (This used to be commit
 21ca972d06bbf4694569855f39a1649d799c05c7)

---
 source4/scripting/ejs/smbcalls_ldb.c | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_ldb.c b/source4/scripting/ejs/smbcalls_ldb.c
index 4151eaedab..b56a3da7a1 100644
--- a/source4/scripting/ejs/smbcalls_ldb.c
+++ b/source4/scripting/ejs/smbcalls_ldb.c
@@ -215,6 +215,24 @@ static int ejs_ldbRename(MprVarHandle eid, int argc, struct MprVar **argv)
 	return 0;
 }
 
+/*
+  get last error message
+  usage:
+   ok = ldb.errstring();
+*/
+static int ejs_ldbErrstring(MprVarHandle eid, int argc, struct MprVar **argv)
+{
+	struct ldb_context *ldb;
+
+	ldb = ejs_get_ldb_context(eid);
+	if (ldb == NULL) {
+		return -1;
+	}
+
+	mpr_Return(eid, mprString(ldb_errstring(ldb)));
+	return 0;
+}
+
 /*
   perform an ldb modify
 
@@ -281,6 +299,7 @@ static int ejs_ldb_init(MprVarHandle eid, int argc, struct MprVar **argv)
 	mprSetCFunction(ldb, "modify", ejs_ldbModify);
 	mprSetCFunction(ldb, "delete", ejs_ldbDelete);
 	mprSetCFunction(ldb, "rename", ejs_ldbRename);
+	mprSetCFunction(ldb, "errstring", ejs_ldbErrstring);
 	mprSetVar(ldb, "SCOPE_BASE", mprCreateNumberVar(LDB_SCOPE_BASE));
 	mprSetVar(ldb, "SCOPE_ONE", mprCreateNumberVar(LDB_SCOPE_ONELEVEL));
 	mprSetVar(ldb, "SCOPE_SUBTREE", mprCreateNumberVar(LDB_SCOPE_SUBTREE));
-- 
cgit 


From 09fb6d2280187527898ae5af9c266c7474901dac Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Mon, 18 Jul 2005 23:58:18 +0000
Subject: r8558: move newuser logic into the provision.js lib (This used to be
 commit b6ef32ddd1fdca0d40a12f34fa5f7a484b3c2071)

---
 source4/scripting/libjs/provision.js | 84 ++++++++++++++++++++++++++++++++++++
 1 file changed, 84 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index bf39bcb992..c7fb1b5fc5 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -226,4 +226,88 @@ function provision_guess()
 	return subobj;
 }
 
+/*
+  search for one attribute as a string
+ */
+function searchone(ldb, expression, attribute)
+{
+	var attrs = new Array(attribute);
+	res = ldb.search(expression, attrs);
+	if (res.length != 1 ||
+	    res[0][attribute] == undefined) {
+		return undefined;
+	}
+	return res[0][attribute];
+}
+
+/*
+  add a new user record
+*/
+function newuser(username, unixname, password, message)
+{
+	var samdb = lpGet("sam database");
+	var ldb = ldb_init();
+
+	/* connect to the sam */
+	var ok = ldb.connect(samdb);
+	assert(ok);
+
+	/* find the DNs for the domain and the domain users group */
+	var domain_dn = searchone(ldb, "objectClass=domainDNS", "dn");
+	assert(domain_dn != undefined);
+	var dom_users = searchone(ldb, "name=Domain Users", "dn");
+	assert(dom_users != undefined);
+
+	var user_dn = sprintf("CN=%s,CN=Users,%s", username, domain_dn);
+
+
+	/*
+	  the new user record. note the reliance on the samdb module to fill
+	  in a sid, guid etc
+	*/
+	var ldif = sprintf("
+dn: %s
+sAMAccountName: %s
+name: %s
+memberOf: %s
+unixName: %s
+objectGUID: %s
+unicodePwd: %s
+objectClass: user
+",
+			   user_dn, username, username, dom_users,
+			   unixname, randguid(), password);
+	/*
+	  add the user to the users group as well
+	*/
+	var modgroup = sprintf("
+dn: %s
+changetype: modify
+add: member
+member: %s
+", 
+			       dom_users, user_dn);
+
+
+	/*
+	  now the real work
+	*/
+	message("Adding user %s\n", user_dn);
+	ok = ldb.add(ldif);
+	if (ok != true) {
+		message("Failed to add %s - %s\n", user_dn, ldb.errstring());
+		return false;
+	}
+
+	message("Modifying group %s\n", dom_users);
+	ok = ldb.modify(modgroup);
+	if (ok != true) {
+		message("Failed to modify %s - %s\n", dom_users, ldb.errstring());
+		return false;
+	}
+
+	return true;
+}
+
+
 return 0;
-- 
cgit 


From f1245d4ac1f06988dc4501c14c0e8161be8028aa Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Tue, 19 Jul 2005 00:16:43 +0000
Subject: r8561: as with the other ejs subsystems, make nss into a object (This
 used to be commit a3f3292e6698ce9be6a5036f47dd4fa81a1dfd4e)

---
 source4/scripting/ejs/smbcalls_nss.c | 31 +++++++++++++++++++++++--------
 source4/scripting/libjs/provision.js | 12 +++++++-----
 2 files changed, 30 insertions(+), 13 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_nss.c b/source4/scripting/ejs/smbcalls_nss.c
index 212eb88eb4..a804c14b7f 100644
--- a/source4/scripting/ejs/smbcalls_nss.c
+++ b/source4/scripting/ejs/smbcalls_nss.c
@@ -68,7 +68,7 @@ static struct MprVar mpr_group(struct group *grp)
 
 /*
   usage:
-      var pw = getpwnam("root");
+      var pw = nss.getpwnam("root");
 
   returns an object containing struct passwd entries
 */
@@ -86,7 +86,7 @@ static int ejs_getpwnam(MprVarHandle eid, int argc, struct MprVar **argv)
 
 /*
   usage:
-      var pw = getpwuid(0);
+      var pw = nss.getpwuid(0);
 
   returns an object containing struct passwd entries
 */
@@ -103,7 +103,7 @@ static int ejs_getpwuid(MprVarHandle eid, int argc, struct MprVar **argv)
 
 /*
   usage:
-      var pw = getgrnam("users");
+      var pw = nss.getgrnam("users");
 
   returns an object containing struct group entries
 */
@@ -120,7 +120,7 @@ static int ejs_getgrnam(MprVarHandle eid, int argc, struct MprVar **argv)
 
 /*
   usage:
-      var pw = getgrgid(0);
+      var pw = nss.getgrgid(0);
 
   returns an object containing struct group entries
 */
@@ -136,13 +136,28 @@ static int ejs_getgrgid(MprVarHandle eid, int argc, struct MprVar **argv)
 }
 
 
+/*
+  initialise nss ejs subsystem
+*/
+static int ejs_nss_init(MprVarHandle eid, int argc, struct MprVar **argv)
+{
+	struct MprVar *nss;
+	mpr_Return(eid, mprObject("nss"));
+
+	nss  = ejsGetReturnValue(eid);
+
+	mprSetCFunction(nss, "getpwnam", ejs_getpwnam);
+	mprSetCFunction(nss, "getpwuid", ejs_getpwuid);
+	mprSetCFunction(nss, "getgrnam", ejs_getgrnam);
+	mprSetCFunction(nss, "getgrgid", ejs_getgrgid);
+
+	return 0;
+}
+
 /*
   setup C functions that be called from ejs
 */
 void smb_setup_ejs_nss(void)
 {
-	ejsDefineCFunction(-1, "getpwnam", ejs_getpwnam, NULL, MPR_VAR_SCRIPT_HANDLE);
-	ejsDefineCFunction(-1, "getpwuid", ejs_getpwuid, NULL, MPR_VAR_SCRIPT_HANDLE);
-	ejsDefineCFunction(-1, "getgrnam", ejs_getgrnam, NULL, MPR_VAR_SCRIPT_HANDLE);
-	ejsDefineCFunction(-1, "getgrgid", ejs_getgrgid, NULL, MPR_VAR_SCRIPT_HANDLE);
+	ejsDefineCFunction(-1, "nss_init", ejs_nss_init, NULL, MPR_VAR_SCRIPT_HANDLE);
 }
diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index c7fb1b5fc5..7133e50b4c 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -196,6 +196,8 @@ function provision(subobj, message)
 function provision_guess()
 {
 	var subobj = new Object();
+	var nss = nss_init();
+
 	subobj.REALM        = lpGet("realm");
 	subobj.DOMAIN       = lpGet("workgroup");
 	subobj.HOSTNAME     = hostname();
@@ -213,11 +215,11 @@ function provision_guess()
 	subobj.LDAPTIME     = ldaptime;
 	subobj.DATESTRING   = datestring;
 	subobj.USN          = nextusn;
-	subobj.ROOT         = findnss(getpwnam, "root");
-	subobj.NOBODY       = findnss(getpwnam, "nobody");
-	subobj.NOGROUP      = findnss(getgrnam, "nogroup", "nobody");
-	subobj.WHEEL        = findnss(getgrnam, "wheel", "root");
-	subobj.USERS        = findnss(getgrnam, "users", "guest", "other");
+	subobj.ROOT         = findnss(nss.getpwnam, "root");
+	subobj.NOBODY       = findnss(nss.getpwnam, "nobody");
+	subobj.NOGROUP      = findnss(nss.getgrnam, "nogroup", "nobody");
+	subobj.WHEEL        = findnss(nss.getgrnam, "wheel", "root");
+	subobj.USERS        = findnss(nss.getgrnam, "users", "guest", "other");
 	subobj.DNSDOMAIN    = strlower(subobj.REALM);
 	subobj.DNSNAME      = sprintf("%s.%s", 
 				      strlower(subobj.HOSTNAME), 
-- 
cgit 


From 09708a2012330419db82f2fb45fdccc52cbd2b01 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Tue, 19 Jul 2005 02:09:05 +0000
Subject: r8569: delete is a js reserved word, so use del instead (This used to
 be commit 9af48b8fc201822e290a1071d9e61afe519558f5)

---
 source4/scripting/ejs/smbcalls_ldb.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_ldb.c b/source4/scripting/ejs/smbcalls_ldb.c
index b56a3da7a1..30d0d354b4 100644
--- a/source4/scripting/ejs/smbcalls_ldb.c
+++ b/source4/scripting/ejs/smbcalls_ldb.c
@@ -297,7 +297,7 @@ static int ejs_ldb_init(MprVarHandle eid, int argc, struct MprVar **argv)
 	mprSetCFunction(ldb, "search", ejs_ldbSearch);
 	mprSetCFunction(ldb, "add", ejs_ldbAdd);
 	mprSetCFunction(ldb, "modify", ejs_ldbModify);
-	mprSetCFunction(ldb, "delete", ejs_ldbDelete);
+	mprSetCFunction(ldb, "del", ejs_ldbDelete);
 	mprSetCFunction(ldb, "rename", ejs_ldbRename);
 	mprSetCFunction(ldb, "errstring", ejs_ldbErrstring);
 	mprSetVar(ldb, "SCOPE_BASE", mprCreateNumberVar(LDB_SCOPE_BASE));
-- 
cgit 


From 1bc4bd4c14e01788bdb4ed09b12eaf0abacab2c1 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Tue, 19 Jul 2005 02:10:08 +0000
Subject: r8570: delete all records in the old db when provisioning, rather
 than using sys.unlink(). This allows smbd to see the new db without
 restarting. (This used to be commit 71004aa165e88f5f448dc7d90ad11dea7143f0df)

---
 source4/scripting/libjs/provision.js | 28 ++++++++++++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index 7133e50b4c..5ce9c8886f 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -110,6 +110,30 @@ function hostname()
 }
 
 
+/*
+  erase an ldb, removing all records
+*/
+function ldb_erase(ldb)
+{
+	var attrs = new Array("dn");
+
+	/* delete the specials */
+	ldb.del("@INDEXLIST");
+	ldb.del("@ATTRIBUTES");
+	ldb.del("@SUBCLASSES");
+	ldb.del("@MODULES");
+
+	/* and the rest */
+	var res = ldb.search("(|(objectclass=*)(dn=*))", attrs);
+	var i;
+	for (i=0;i<res.length;i++) {
+		ldb.del(res[i].dn);
+	}
+	res = ldb.search("(objectclass=*)", attrs);
+	assert(res.length == 0);
+}
+
+
 /*
   setup a ldb in the private dir
  */
@@ -125,8 +149,6 @@ function setup_ldb(ldif, dbname, subobj)
 	var dbfile = lpGet("private dir") + "/" + dbname;
 	var src = lpGet("setup directory") + "/" + ldif;
 
-	sys.unlink(dbfile);
-
 	var data = sys.file_load(src);
 	data = data + extra;
 	data = substitute_var(data, subobj);
@@ -134,6 +156,8 @@ function setup_ldb(ldif, dbname, subobj)
 	var ok = ldb.connect(dbfile);
 	assert(ok);
 
+	ldb_erase(ldb);
+
 	ok = ldb.add(data);
 	assert(ok);
 }
-- 
cgit 


From 340b3d7301d81ed46af261d8c948f0e77e052243 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Tue, 19 Jul 2005 03:59:25 +0000
Subject: r8575: the beginnings of a smbstatus command (This used to be commit
 4ecaf72a31cde2722315a61cbe823d44f0c14586)

---
 source4/scripting/bin/smbstatus       | 26 ++++++++++++++++++++++++++
 source4/scripting/libjs/management.js | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 59 insertions(+)
 create mode 100755 source4/scripting/bin/smbstatus
 create mode 100644 source4/scripting/libjs/management.js

(limited to 'source4/scripting')

diff --git a/source4/scripting/bin/smbstatus b/source4/scripting/bin/smbstatus
new file mode 100755
index 0000000000..fd3009012b
--- /dev/null
+++ b/source4/scripting/bin/smbstatus
@@ -0,0 +1,26 @@
+#!/bin/sh
+exec smbscript "$0" ${1+"$@"}
+/*
+  provide information on connected users and open files
+  Copyright Andrew Tridgell 2005
+  Released under the GNU GPL v2 or later
+*/	
+
+libinclude("base.js");
+libinclude("management.js");
+
+var options = new Object();
+
+ok = GetOptions(ARGV, options,
+		"POPT_AUTOHELP",
+		"POPT_COMMON_SAMBA");
+if (ok == false) {
+   println("Failed to parse options: " + options.ERROR);
+   return -1;
+}
+
+
+var sessions = smbsrv_sessions();
+printVars(sessions);
+
+return 0;
diff --git a/source4/scripting/libjs/management.js b/source4/scripting/libjs/management.js
new file mode 100644
index 0000000000..371ddc026b
--- /dev/null
+++ b/source4/scripting/libjs/management.js
@@ -0,0 +1,33 @@
+/*
+	backend code for Samba4 management
+	Copyright Andrew Tridgell 2005
+	Released under the GNU GPL v2 or later
+*/
+
+/*
+  return a list of current sessions 
+*/
+function smbsrv_sessions()
+{
+	var conn = new Object();
+	var irpc = irpc_init();
+	status = irpc_connect(conn, "smb_server");
+	assert(status.is_ok == true);
+
+	var io = irpcObj();
+	io.input.level = irpc.SMBSRV_INFO_SESSIONS;
+	status = irpc.smbsrv_information(conn, io);
+
+	/* gather the results into a single array */
+	var i, count=0, ret = new Object();
+	for (i=0;i<io.results.length;i++) {
+		var sessions = io.results[i].info.sessions.sessions;
+		var j;
+		for (j=0;j<sessions.length;j++) {
+			ret[count] = sessions[j];
+			count++;
+		}
+	}
+	ret.length = count;
+	return ret;
+}
-- 
cgit 


From a32fe0f293fb86d69f3f7001daac2614adfb6b98 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Tue, 19 Jul 2005 04:26:58 +0000
Subject: r8577: added management calls to list current tree connects (This
 used to be commit 658befc1e4df44bee1f365a730951001f0f36640)

---
 source4/scripting/bin/smbstatus       | 11 ++++++++++
 source4/scripting/libjs/management.js | 41 ++++++++++++++++++++++++++++++++++-
 2 files changed, 51 insertions(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/bin/smbstatus b/source4/scripting/bin/smbstatus
index fd3009012b..9f7566a642 100755
--- a/source4/scripting/bin/smbstatus
+++ b/source4/scripting/bin/smbstatus
@@ -21,6 +21,17 @@ if (ok == false) {
 
 
 var sessions = smbsrv_sessions();
+if (sessions == undefined) {
+	println("No sessions");
+	exit(0);
+}
 printVars(sessions);
 
+var trees = smbsrv_trees();
+if (trees == undefined) {
+	println("No trees");
+	exit(0);
+}
+printVars(trees);
+
 return 0;
diff --git a/source4/scripting/libjs/management.js b/source4/scripting/libjs/management.js
index 371ddc026b..d989541661 100644
--- a/source4/scripting/libjs/management.js
+++ b/source4/scripting/libjs/management.js
@@ -4,6 +4,7 @@
 	Released under the GNU GPL v2 or later
 */
 
+
 /*
   return a list of current sessions 
 */
@@ -12,11 +13,16 @@ function smbsrv_sessions()
 	var conn = new Object();
 	var irpc = irpc_init();
 	status = irpc_connect(conn, "smb_server");
-	assert(status.is_ok == true);
+	if (status.is_ok != true) {
+		return undefined;
+	}
 
 	var io = irpcObj();
 	io.input.level = irpc.SMBSRV_INFO_SESSIONS;
 	status = irpc.smbsrv_information(conn, io);
+	if (status.is_ok != true) {
+		return undefined;
+	}
 
 	/* gather the results into a single array */
 	var i, count=0, ret = new Object();
@@ -31,3 +37,36 @@ function smbsrv_sessions()
 	ret.length = count;
 	return ret;
 }
+
+/*
+  return a list of current tree connects
+*/
+function smbsrv_trees()
+{
+	var conn = new Object();
+	var irpc = irpc_init();
+	status = irpc_connect(conn, "smb_server");
+	if (status.is_ok != true) {
+		return undefined;
+	}
+
+	var io = irpcObj();
+	io.input.level = irpc.SMBSRV_INFO_TREES;
+	status = irpc.smbsrv_information(conn, io);
+	if (status.is_ok != true) {
+		return undefined;
+	}
+
+	/* gather the results into a single array */
+	var i, count=0, ret = new Object();
+	for (i=0;i<io.results.length;i++) {
+		var trees = io.results[i].info.trees.trees;
+		var j;
+		for (j=0;j<trees.length;j++) {
+			ret[count] = trees[j];
+			count++;
+		}
+	}
+	ret.length = count;
+	return ret;
+}
-- 
cgit 


From 6615b40601fbb0d7c697d721907057d01995eb5a Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Tue, 19 Jul 2005 06:07:10 +0000
Subject: r8581: fixed handling of 64 bit integers in rpc calls from ejs (This
 used to be commit 2ae6a338466bf287ea2180d5ad7313ba116b88ca)

---
 source4/scripting/ejs/ejsrpc.c | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/ejsrpc.c b/source4/scripting/ejs/ejsrpc.c
index 08bc4a94ba..5e81e21e4f 100644
--- a/source4/scripting/ejs/ejsrpc.c
+++ b/source4/scripting/ejs/ejsrpc.c
@@ -136,56 +136,50 @@ NTSTATUS ejs_pull_hyper(struct ejs_rpc *ejs,
 			struct MprVar *v, const char *name, uint64_t *r)
 {
 	NDR_CHECK(mprGetVar(&v, name));
-	*r = mprVarToInteger(v);
+	*r = mprVarToNumber(v);
 	return NT_STATUS_OK;
 }
 
 NTSTATUS ejs_push_hyper(struct ejs_rpc *ejs, 
 			struct MprVar *v, const char *name, const uint64_t *r)
 {
-	return mprSetVar(v, name, mprCreateIntegerVar(*r));
+	return mprSetVar(v, name, mprCreateNumberVar(*r));
 }
 
 NTSTATUS ejs_pull_dlong(struct ejs_rpc *ejs, 
 			struct MprVar *v, const char *name, uint64_t *r)
 {
-	NDR_CHECK(mprGetVar(&v, name));
-	*r = mprVarToInteger(v);
-	return NT_STATUS_OK;
+	return ejs_pull_hyper(ejs, v, name, r);
 }
 
 NTSTATUS ejs_push_dlong(struct ejs_rpc *ejs, 
 			struct MprVar *v, const char *name, const uint64_t *r)
 {
-	return mprSetVar(v, name, mprCreateIntegerVar(*r));
+	return ejs_push_hyper(ejs, v, name, r);
 }
 
 NTSTATUS ejs_pull_udlong(struct ejs_rpc *ejs, 
 			struct MprVar *v, const char *name, uint64_t *r)
 {
-	NDR_CHECK(mprGetVar(&v, name));
-	*r = mprVarToInteger(v);
-	return NT_STATUS_OK;
+	return ejs_pull_hyper(ejs, v, name, r);
 }
 
 NTSTATUS ejs_push_udlong(struct ejs_rpc *ejs, 
 			struct MprVar *v, const char *name, const uint64_t *r)
 {
-	return mprSetVar(v, name, mprCreateIntegerVar(*r));
+	return ejs_push_hyper(ejs, v, name, r);
 }
 
 NTSTATUS ejs_pull_NTTIME(struct ejs_rpc *ejs, 
 			struct MprVar *v, const char *name, uint64_t *r)
 {
-	NDR_CHECK(mprGetVar(&v, name));
-	*r = mprVarToInteger(v);
-	return NT_STATUS_OK;
+	return ejs_pull_hyper(ejs, v, name, r);
 }
 
 NTSTATUS ejs_push_NTTIME(struct ejs_rpc *ejs, 
 			struct MprVar *v, const char *name, const uint64_t *r)
 {
-	return mprSetVar(v, name, mprCreateIntegerVar(*r));
+	return ejs_push_hyper(ejs, v, name, r);
 }
 
 
-- 
cgit 


From afe0fffc443861f39a9aca9bd1cb0ed73d4fc994 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Tue, 19 Jul 2005 06:07:34 +0000
Subject: r8582: added sys.httptime() call, to display a NTTIME as a http time
 string (This used to be commit 632f7bbe3e81af1ee89301765f8bfb72d4c9f3d7)

---
 source4/scripting/ejs/smbcalls_sys.c | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_sys.c b/source4/scripting/ejs/smbcalls_sys.c
index af51c815dc..b1fb854dfb 100644
--- a/source4/scripting/ejs/smbcalls_sys.c
+++ b/source4/scripting/ejs/smbcalls_sys.c
@@ -117,6 +117,24 @@ static int ejs_sys_ldaptime(MprVarHandle eid, int argc, struct MprVar **argv)
 	return 0;
 }
 
+/*
+  return a http time string from a nttime
+*/
+static int ejs_sys_httptime(MprVarHandle eid, int argc, struct MprVar **argv)
+{
+	char *s;
+	time_t t;
+	if (argc != 1 || !mprVarIsNumber(argv[0]->type)) {
+		ejsSetErrorMsg(eid, "sys_httptime invalid arguments");
+		return -1;
+	}
+	t = nt_time_to_unix(mprVarToNumber(argv[0]));
+	s = http_timestring(mprMemCtx(), t);
+	mpr_Return(eid, mprString(s));
+	talloc_free(s);
+	return 0;
+}
+
 /*
   unlink a file
    ok = unlink(fname);
@@ -182,6 +200,7 @@ static int ejs_sys_init(MprVarHandle eid, int argc, struct MprVar **argv)
 	mprSetCFunction(&obj, "nttime", ejs_sys_nttime);
 	mprSetCFunction(&obj, "gmtime", ejs_sys_gmtime);
 	mprSetCFunction(&obj, "ldaptime", ejs_sys_ldaptime);
+	mprSetCFunction(&obj, "httptime", ejs_sys_httptime);
 	mprSetStringCFunction(&obj, "unlink", ejs_sys_unlink);
 	mprSetStringCFunction(&obj, "file_load", ejs_sys_file_load);
 	mprSetStringCFunction(&obj, "file_save", ejs_sys_file_save);
-- 
cgit 


From ef948e53b7a4099663f55a9b1b3a23c6aa100b28 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Tue, 19 Jul 2005 06:08:06 +0000
Subject: r8583: nicer smbstatus output (This used to be commit
 0578bcdf7f8919509a78a5c64f94aa5de7e90416)

---
 source4/scripting/bin/smbstatus | 58 ++++++++++++++++++++++++++++++++---------
 1 file changed, 45 insertions(+), 13 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/bin/smbstatus b/source4/scripting/bin/smbstatus
index 9f7566a642..eaf3aa1616 100755
--- a/source4/scripting/bin/smbstatus
+++ b/source4/scripting/bin/smbstatus
@@ -15,23 +15,55 @@ ok = GetOptions(ARGV, options,
 		"POPT_AUTOHELP",
 		"POPT_COMMON_SAMBA");
 if (ok == false) {
-   println("Failed to parse options: " + options.ERROR);
-   return -1;
+	println("Failed to parse options: " + options.ERROR);
+	return -1;
 }
 
-
-var sessions = smbsrv_sessions();
-if (sessions == undefined) {
-	println("No sessions");
-	exit(0);
+/*
+  show open sessions
+*/
+function show_sessions()
+{
+	var sessions = smbsrv_sessions();
+	var i;
+	var sys = sys_init();
+	if (sessions == undefined) {
+		println("No sessions open");
+		return;
+	}
+	printf("User                                  Client      Connected at\n");
+	printf("-------------------------------------------------------------------------------\n");
+	for (i=0;i<sessions.length;i++) {
+		var info = sessions[i];
+		var fulluser = sprintf("%s/%s", info.account_name, info.domain_name);
+		printf("%-30s %16s   %s\n", 
+		       fulluser, info.client_ip, sys.httptime(info.connect_time));
+	}
+	printf("\n");
 }
-printVars(sessions);
 
-var trees = smbsrv_trees();
-if (trees == undefined) {
-	println("No trees");
-	exit(0);
+/*
+  show open tree connects
+*/
+function show_trees()
+{
+	var trees = smbsrv_trees();
+	var sys = sys_init();
+	if (trees == undefined) {
+		println("No tree connects");
+		return;
+	}
+	printf("Share                                 Client      Connected at\n");
+	printf("-------------------------------------------------------------------------------\n");
+	for (i=0;i<trees.length;i++) {
+		var info = trees[i];
+		printf("%-30s %16s   %s\n", 
+		       info.share_name, info.client_ip, sys.httptime(info.connect_time));
+	}
 }
-printVars(trees);
+
+
+show_sessions();
+show_trees();
 
 return 0;
-- 
cgit 


From cb060f8bac4114766a1945c2929a75848d0d7185 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Tue, 19 Jul 2005 06:18:48 +0000
Subject: r8584: added --nbt option to smbstatus for nbt server statistics
 (This used to be commit 26a676a4e3596d34aee391bf132f2525972c81df)

---
 source4/scripting/bin/smbstatus       | 29 ++++++++++++++++++++++++++---
 source4/scripting/libjs/management.js | 21 +++++++++++++++++++++
 2 files changed, 47 insertions(+), 3 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/bin/smbstatus b/source4/scripting/bin/smbstatus
index eaf3aa1616..df8864f7e8 100755
--- a/source4/scripting/bin/smbstatus
+++ b/source4/scripting/bin/smbstatus
@@ -13,7 +13,8 @@ var options = new Object();
 
 ok = GetOptions(ARGV, options,
 		"POPT_AUTOHELP",
-		"POPT_COMMON_SAMBA");
+		"POPT_COMMON_SAMBA",
+		"nbt");
 if (ok == false) {
 	println("Failed to parse options: " + options.ERROR);
 	return -1;
@@ -62,8 +63,30 @@ function show_trees()
 	}
 }
 
+/*
+  show nbtd information
+*/
+function show_nbt()
+{
+	var stats = nbtd_statistics();
+	if (stats == undefined) {
+		println("nbt server not running");
+		return;
+	}
+	var r;
+	println("NBT server statistics:");
+	for (r in stats) {
+		print("\t" + r + ":\t" + stats[r] + "\n");
+	}
+	println("");
+}
 
-show_sessions();
-show_trees();
+
+if (options['nbt'] != undefined) {
+	show_nbt();
+} else {
+	show_sessions();
+	show_trees();
+}
 
 return 0;
diff --git a/source4/scripting/libjs/management.js b/source4/scripting/libjs/management.js
index d989541661..8b04247248 100644
--- a/source4/scripting/libjs/management.js
+++ b/source4/scripting/libjs/management.js
@@ -70,3 +70,24 @@ function smbsrv_trees()
 	ret.length = count;
 	return ret;
 }
+
+/*
+  return nbtd statistics
+*/
+function nbtd_statistics()
+{
+	var conn = new Object();
+	var irpc = irpc_init();
+	status = irpc_connect(conn, "nbt_server");
+	if (status.is_ok != true) {
+		return undefined;
+	}
+
+	var io = irpcObj();
+	io.input.level = irpc.NBTD_INFO_STATISTICS;
+	status = irpc.nbtd_information(conn, io);
+	if (status.is_ok != true) {
+		return undefined;
+	}
+	return io.results[0].info.stats;
+}
-- 
cgit 


From 0e7b9f84ce2dcd5363409acc99a7b887a29be595 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Tue, 19 Jul 2005 09:29:30 +0000
Subject: r8589: - support --version option to smbstatus

- print samba version at startup
(This used to be commit eb3e4bbe7f4a8f48c9246275ad6ef21ed0b4d357)
---
 source4/scripting/bin/smbstatus | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/bin/smbstatus b/source4/scripting/bin/smbstatus
index df8864f7e8..7fefae6963 100755
--- a/source4/scripting/bin/smbstatus
+++ b/source4/scripting/bin/smbstatus
@@ -14,6 +14,7 @@ var options = new Object();
 ok = GetOptions(ARGV, options,
 		"POPT_AUTOHELP",
 		"POPT_COMMON_SAMBA",
+		"POPT_COMMON_VERSION",
 		"nbt");
 if (ok == false) {
 	println("Failed to parse options: " + options.ERROR);
@@ -81,6 +82,7 @@ function show_nbt()
 	println("");
 }
 
+printf("%s\n\n", lpGet("server string"));
 
 if (options['nbt'] != undefined) {
 	show_nbt();
-- 
cgit 


From 82f1a9474d85f75291d0af0e51d55fa904d42055 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Tue, 19 Jul 2005 09:30:53 +0000
Subject: r8590: added server status utility functions for checking on the
 status of a task via irpc

- for stream tasks, returns the number of connections

- for non-stream tasks, returns "RUNNING"

For both, return "DISABLED" or "NOT RESPONDING" appropriately
(This used to be commit 78d6303814382f7835212f5045f12180e396b540)
---
 source4/scripting/libjs/base.js       | 11 ++++++
 source4/scripting/libjs/management.js | 69 +++++++++++++++++++++++++++++++++++
 2 files changed, 80 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/base.js b/source4/scripting/libjs/base.js
index 181b3ca959..39b62b133e 100644
--- a/source4/scripting/libjs/base.js
+++ b/source4/scripting/libjs/base.js
@@ -87,3 +87,14 @@ function substitute_var(str, subobj)
 	}
 	return join("", list);
 }
+
+/*
+  return "s" if a number should be shown as plural
+*/
+function plural(n)
+{
+	if (n == 1) {
+		return "";
+	}
+	return "s";
+}
diff --git a/source4/scripting/libjs/management.js b/source4/scripting/libjs/management.js
index 8b04247248..7130cdc5dd 100644
--- a/source4/scripting/libjs/management.js
+++ b/source4/scripting/libjs/management.js
@@ -91,3 +91,72 @@ function nbtd_statistics()
 	}
 	return io.results[0].info.stats;
 }
+
+/*
+  see if a service is enabled
+*/
+function service_enabled(name)
+{
+	var services = lpGet("server services");
+	var i;
+	for (i=0;i<services.length;i++) {
+		if (services[i] == name) {
+			return true;
+		}
+	}
+	return false;
+}
+
+/*
+  show status of a server
+*/
+function server_status(name)
+{
+	var conn = new Object();
+	var i;
+	var io;
+	var irpc = irpc_init();
+
+	if (!service_enabled(name)) {
+		return "DISABLED";
+	}
+	
+	status = irpc_connect(conn, name + "_server");
+	if (status.is_ok != true) {
+		return "DOWN";
+	}
+
+	var io = irpcObj();
+	status = irpc.irpc_uptime(conn, io);
+	if (status.is_ok != true) {
+		return "NOT RESPONDING";
+	}
+
+	return "RUNNING";
+}
+
+/*
+  show status of a stream server
+*/
+function stream_server_status(name)
+{
+	var conn = new Object();
+	var irpc = irpc_init();
+
+	if (!service_enabled(name)) {
+		return "DISABLED";
+	}
+	status = irpc_connect(conn, name + "_server");
+	if (status.is_ok != true) {
+		return "0 connections";
+	}
+
+	var io = irpcObj();
+	status = irpc.irpc_uptime(conn, io);
+	if (status.is_ok != true) {
+		return "NOT RESPONDING";
+	}
+
+	var n = io.results.length;
+	return sprintf("%u connection%s", n, plural(n));
+}
-- 
cgit 


From da88ef65e0f625e8baab07251839171d0ae5aa1b Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Tue, 19 Jul 2005 11:54:33 +0000
Subject: r8602: allow options in ldb connect calls (This used to be commit
 4c1d6a97c0c9df2848a16afb1b4eed4b20963bef)

---
 source4/scripting/ejs/smbcalls_ldb.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_ldb.c b/source4/scripting/ejs/smbcalls_ldb.c
index 30d0d354b4..0795db9018 100644
--- a/source4/scripting/ejs/smbcalls_ldb.c
+++ b/source4/scripting/ejs/smbcalls_ldb.c
@@ -259,20 +259,21 @@ static int ejs_ldbModify(MprVarHandle eid, int argc, struct MprVar **argv)
   connect to a database
   usage:
    ok = ldb.connect(dbfile);
+   ok = ldb.connect(dbfile, "modules:modlist");
 */
 static int ejs_ldbConnect(MprVarHandle eid, int argc, char **argv)
 {
 	struct ldb_context *ldb;
 	const char *dbfile;
 
-	if (argc != 1) {
+	if (argc < 1) {
 		ejsSetErrorMsg(eid, "ldb.connect invalid arguments");
 		return -1;
 	}
 
 	dbfile = argv[0];
 
-	ldb = ldb_wrap_connect(mprMemCtx(), dbfile, 0, NULL);
+	ldb = ldb_wrap_connect(mprMemCtx(), dbfile, 0, argv+1);
 	if (ldb == NULL) {
 		ejsSetErrorMsg(eid, "ldb.connect failed to open %s", dbfile);
 	}
-- 
cgit 


From 8f16aa6c179a6157a4fbece3b30ef6ebfb3f5562 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Tue, 19 Jul 2005 11:55:35 +0000
Subject: r8603: we have to use the same db name as the rest of smbd uses so
 the ldb connect works when already open (This used to be commit
 1183f54c8dee28c136b4dc72bc059a6175fe09e4)

---
 source4/scripting/libjs/provision.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index 5ce9c8886f..d3b94c1d1c 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -146,7 +146,7 @@ function setup_ldb(ldif, dbname, subobj)
 		extra = arguments[3];
 	}
 
-	var dbfile = lpGet("private dir") + "/" + dbname;
+	var dbfile = dbname;
 	var src = lpGet("setup directory") + "/" + ldif;
 
 	var data = sys.file_load(src);
-- 
cgit 


From e9c925f8727a8fa01935129ba8209183d111bd86 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Wed, 20 Jul 2005 04:27:09 +0000
Subject: r8629: - moved the getDomainList() call out of smbcalls_auth.c and
 into libjs/auth.js

- tried to make the ejs_userAuth() call work for the sam, not just for
  unix auth. I didn't get this working. Andrew, when you get a chance
  can you see what I'm doing wrong? I suspect its because we aren't
  supplying a challenge, but a challenge doesn't really make sense in a
  'is this username/password' correct call.
(This used to be commit 9e07c08a71908e99c2f44efc40a3249facd6850f)
---
 source4/scripting/ejs/smbcalls_auth.c | 35 ++++++++---------------------------
 source4/scripting/libjs/auth.js       | 17 +++++++++++++++++
 2 files changed, 25 insertions(+), 27 deletions(-)
 create mode 100644 source4/scripting/libjs/auth.js

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_auth.c b/source4/scripting/ejs/smbcalls_auth.c
index 10c63fb4dd..4739922e38 100644
--- a/source4/scripting/ejs/smbcalls_auth.c
+++ b/source4/scripting/ejs/smbcalls_auth.c
@@ -26,19 +26,21 @@
 #include "auth/auth.h"
 #include "scripting/ejs/smbcalls.h"
 
-static int ejs_systemAuth(TALLOC_CTX *tmp_ctx, struct MprVar *auth, const char *username, const char *password, const char *domain, const char *remote_host)
+static int ejs_doauth(TALLOC_CTX *tmp_ctx, struct MprVar *auth, const char *username, 
+		      const char *password, const char *domain, const char *remote_host,
+		      const char *authtype)
 {
 	struct auth_usersupplied_info *user_info = NULL;
 	struct auth_serversupplied_info *server_info = NULL;
 	struct auth_context *auth_context;
-	const char *auth_unix[] = { "unix", NULL };
+	const char *auth_types[] = { authtype, NULL };
 	NTSTATUS nt_status;
 	DATA_BLOB pw_blob;
 
 	/*
 	  darn, we need some way to get the right event_context here
 	*/
-	nt_status = auth_context_create(tmp_ctx, auth_unix, &auth_context, NULL);
+	nt_status = auth_context_create(tmp_ctx, auth_types, &auth_context, NULL);
 	if (!NT_STATUS_IS_OK(nt_status)) {
 		mprSetPropertyValue(auth, "result", mprCreateBoolVar(False));
 		mprSetPropertyValue(auth, "report", mprString("Auth System Failure"));
@@ -104,12 +106,9 @@ static int ejs_userAuth(MprVarHandle eid, int argc, struct MprVar **argv)
 	auth = mprObject("auth");
 
 	if (domain && strcmp("System User", domain) == 0) {
-
-		ejs_systemAuth(tmp_ctx, &auth, username, password, domain, remote_host);
-	}  else {
-
-		mprSetPropertyValue(&auth, "result", mprCreateBoolVar(False));
-		mprSetPropertyValue(&auth, "report", mprString("Unknown Domain"));
+		ejs_doauth(tmp_ctx, &auth, username, password, domain, remote_host, "unix");
+	} else {
+		ejs_doauth(tmp_ctx, &auth, username, password, domain, remote_host, "sam");
 	}
 
 	mpr_Return(eid, auth);
@@ -117,28 +116,10 @@ static int ejs_userAuth(MprVarHandle eid, int argc, struct MprVar **argv)
 	return 0;
 }
 
-static int ejs_domain_list(MprVarHandle eid, int argc, char **argv)
-{
-	struct MprVar list;
-
-	if (argc != 0) {
-		ejsSetErrorMsg(eid, "domList invalid arguments");
-		return -1;
-	}
-
-	list = mprObject("list");
-	mprSetVar(&list, "0", mprString("System User"));
-
-	mpr_Return(eid, list);
-
-	return 0;
-}
-
 /*
   setup C functions that be called from ejs
 */
 void smb_setup_ejs_auth(void)
 {
-	ejsDefineStringCFunction(-1, "getDomainList", ejs_domain_list, NULL, MPR_VAR_SCRIPT_HANDLE);
 	ejsDefineCFunction(-1, "userAuth", ejs_userAuth, NULL, MPR_VAR_SCRIPT_HANDLE);
 }
diff --git a/source4/scripting/libjs/auth.js b/source4/scripting/libjs/auth.js
new file mode 100644
index 0000000000..a973cb4753
--- /dev/null
+++ b/source4/scripting/libjs/auth.js
@@ -0,0 +1,17 @@
+/*
+	auth js library functions
+	Copyright Andrew Tridgell 2005
+	released under the GNU GPL v2 or later
+*/
+
+
+/*
+  get a list of domains for SWAT authentication
+*/
+function getDomainList()
+{
+	var ret = new Array(2);
+	ret[0] = "System User";
+	ret[1] = lpGet("workgroup");
+	return ret;
+}
-- 
cgit 


From d6c20a5c8a50338535efcf41fb8cb1f8dcf87757 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Wed, 20 Jul 2005 05:41:29 +0000
Subject: r8633: check for valid input to ejs_userAuth() (This used to be
 commit 8e788ae3094220e5ea195cdf85abb6763a834abd)

---
 source4/scripting/ejs/smbcalls_auth.c | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_auth.c b/source4/scripting/ejs/smbcalls_auth.c
index 4739922e38..87d5327e04 100644
--- a/source4/scripting/ejs/smbcalls_auth.c
+++ b/source4/scripting/ejs/smbcalls_auth.c
@@ -102,6 +102,11 @@ static int ejs_userAuth(MprVarHandle eid, int argc, struct MprVar **argv)
 	domain = mprToString(mprGetProperty(argv[0], "domain", NULL));
 	remote_host = mprToString(mprGetProperty(argv[0], "rhost", NULL));
 
+	if (username == NULL || password == NULL || domain == NULL) {
+		mpr_Return(eid, mprCreateUndefinedVar());
+		return 0;
+	}
+
  	tmp_ctx = talloc_new(mprMemCtx());	
 	auth = mprObject("auth");
 
-- 
cgit 


From 240ca36cf2a3ceb89e46b73486865a4a57339c89 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Wed, 20 Jul 2005 06:20:36 +0000
Subject: r8635: make object inheritance with the builtin objects easy by
 allowing callers to optionally supply an existing object to add the
 properties to. So you can do:

 var rpc = samr_init();
 lsa_init(rpc);

and you end up with 'rpc' having both the samr and lsa functions and
constants available.
(This used to be commit 6a1ed328e27769bd52899fc2437a43fc17104eff)
---
 source4/scripting/ejs/mprutil.c      | 14 ++++++++++++++
 source4/scripting/ejs/smbcalls_ldb.c |  7 ++-----
 source4/scripting/ejs/smbcalls_nss.c |  5 +----
 source4/scripting/ejs/smbcalls_sys.c | 25 ++++++++++++-------------
 4 files changed, 29 insertions(+), 22 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/mprutil.c b/source4/scripting/ejs/mprutil.c
index f9813f2597..14d120c45a 100644
--- a/source4/scripting/ejs/mprutil.c
+++ b/source4/scripting/ejs/mprutil.c
@@ -403,3 +403,17 @@ void mprSetThisPtr(int eid, const char *name, void *ptr)
 	struct MprVar *this = mprGetProperty(ejsGetLocalObject(eid), "this", 0);
 	mprSetPtrChild(this, name, ptr);
 }
+
+/*
+  used by object xxx_init() routines to allow for the caller
+  to supply a pre-existing object to add properties to,
+  or create a new object. This makes inheritance easy
+*/
+struct MprVar *mprInitObject(int eid, const char *name, int argc, struct MprVar **argv)
+{
+	if (argc > 0 && mprVarIsObject(argv[0]->type)) {
+		return argv[0];
+	}
+	mpr_Return(eid, mprObject(name));
+	return ejsGetReturnValue(eid);
+}
diff --git a/source4/scripting/ejs/smbcalls_ldb.c b/source4/scripting/ejs/smbcalls_ldb.c
index 0795db9018..f09039731f 100644
--- a/source4/scripting/ejs/smbcalls_ldb.c
+++ b/source4/scripting/ejs/smbcalls_ldb.c
@@ -273,7 +273,7 @@ static int ejs_ldbConnect(MprVarHandle eid, int argc, char **argv)
 
 	dbfile = argv[0];
 
-	ldb = ldb_wrap_connect(mprMemCtx(), dbfile, 0, argv+1);
+	ldb = ldb_wrap_connect(mprMemCtx(), dbfile, 0, (const char **)(argv+1));
 	if (ldb == NULL) {
 		ejsSetErrorMsg(eid, "ldb.connect failed to open %s", dbfile);
 	}
@@ -289,10 +289,7 @@ static int ejs_ldbConnect(MprVarHandle eid, int argc, char **argv)
 */
 static int ejs_ldb_init(MprVarHandle eid, int argc, struct MprVar **argv)
 {
-	struct MprVar *ldb;
-	mpr_Return(eid, mprObject("ldb"));
-
-	ldb  = ejsGetReturnValue(eid);
+	struct MprVar *ldb = mprInitObject(eid, "ldb", argc, argv);
 
 	mprSetStringCFunction(ldb, "connect", ejs_ldbConnect);
 	mprSetCFunction(ldb, "search", ejs_ldbSearch);
diff --git a/source4/scripting/ejs/smbcalls_nss.c b/source4/scripting/ejs/smbcalls_nss.c
index a804c14b7f..6111ed57c2 100644
--- a/source4/scripting/ejs/smbcalls_nss.c
+++ b/source4/scripting/ejs/smbcalls_nss.c
@@ -141,10 +141,7 @@ static int ejs_getgrgid(MprVarHandle eid, int argc, struct MprVar **argv)
 */
 static int ejs_nss_init(MprVarHandle eid, int argc, struct MprVar **argv)
 {
-	struct MprVar *nss;
-	mpr_Return(eid, mprObject("nss"));
-
-	nss  = ejsGetReturnValue(eid);
+	struct MprVar *nss = mprInitObject(eid, "nss", argc, argv);
 
 	mprSetCFunction(nss, "getpwnam", ejs_getpwnam);
 	mprSetCFunction(nss, "getpwuid", ejs_getpwuid);
diff --git a/source4/scripting/ejs/smbcalls_sys.c b/source4/scripting/ejs/smbcalls_sys.c
index b1fb854dfb..61b89843dc 100644
--- a/source4/scripting/ejs/smbcalls_sys.c
+++ b/source4/scripting/ejs/smbcalls_sys.c
@@ -193,19 +193,18 @@ static int ejs_sys_file_save(MprVarHandle eid, int argc, char **argv)
 */
 static int ejs_sys_init(MprVarHandle eid, int argc, struct MprVar **argv)
 {
-	struct MprVar obj = mprObject("sys");
-
-	mprSetCFunction(&obj, "interfaces", ejs_sys_interfaces);
-	mprSetCFunction(&obj, "hostname", ejs_sys_hostname);
-	mprSetCFunction(&obj, "nttime", ejs_sys_nttime);
-	mprSetCFunction(&obj, "gmtime", ejs_sys_gmtime);
-	mprSetCFunction(&obj, "ldaptime", ejs_sys_ldaptime);
-	mprSetCFunction(&obj, "httptime", ejs_sys_httptime);
-	mprSetStringCFunction(&obj, "unlink", ejs_sys_unlink);
-	mprSetStringCFunction(&obj, "file_load", ejs_sys_file_load);
-	mprSetStringCFunction(&obj, "file_save", ejs_sys_file_save);
-
-	mpr_Return(eid, obj);
+	struct MprVar *obj = mprInitObject(eid, "sys", argc, argv);
+
+	mprSetCFunction(obj, "interfaces", ejs_sys_interfaces);
+	mprSetCFunction(obj, "hostname", ejs_sys_hostname);
+	mprSetCFunction(obj, "nttime", ejs_sys_nttime);
+	mprSetCFunction(obj, "gmtime", ejs_sys_gmtime);
+	mprSetCFunction(obj, "ldaptime", ejs_sys_ldaptime);
+	mprSetCFunction(obj, "httptime", ejs_sys_httptime);
+	mprSetStringCFunction(obj, "unlink", ejs_sys_unlink);
+	mprSetStringCFunction(obj, "file_load", ejs_sys_file_load);
+	mprSetStringCFunction(obj, "file_save", ejs_sys_file_save);
+
 	return 0;
 }
 
-- 
cgit 


From 3d59490a4010c00a35113d36c60737001e5c77bb Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Wed, 20 Jul 2005 07:01:09 +0000
Subject: r8637: added sys.stat() and sys.lstat() calls (This used to be commit
 5dbdf4fb3317964541339615b7ecbf174a2dc00b)

---
 source4/scripting/ejs/smbcalls_sys.c | 71 ++++++++++++++++++++++++++++++++++++
 1 file changed, 71 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_sys.c b/source4/scripting/ejs/smbcalls_sys.c
index 61b89843dc..3f1f4b0734 100644
--- a/source4/scripting/ejs/smbcalls_sys.c
+++ b/source4/scripting/ejs/smbcalls_sys.c
@@ -188,6 +188,75 @@ static int ejs_sys_file_save(MprVarHandle eid, int argc, char **argv)
 }
 
 
+/*
+  return fields of a stat() call
+*/
+static struct MprVar mpr_stat(struct stat *st)
+{
+	struct MprVar ret;
+	ret = mprObject("stat");
+
+#define ST_EL(n) mprSetVar(&ret, #n, mprCreateNumberVar(st->n))
+	ST_EL(st_dev);
+	ST_EL(st_ino);
+	ST_EL(st_mode);
+	ST_EL(st_nlink);
+	ST_EL(st_uid);
+	ST_EL(st_gid);
+	ST_EL(st_rdev);
+	ST_EL(st_size);
+	ST_EL(st_blksize);
+	ST_EL(st_blocks);
+	ST_EL(st_atime);
+	ST_EL(st_mtime);
+	ST_EL(st_ctime);
+
+	return ret;
+}
+
+/*
+  usage:
+      var st = sys.stat(filename);
+  returns an object containing struct stat elements
+*/
+static int ejs_sys_stat(MprVarHandle eid, int argc, char **argv)
+{
+	struct stat st;
+	/* validate arguments */
+	if (argc != 1) {
+		ejsSetErrorMsg(eid, "sys.stat invalid arguments");
+		return -1;
+	}
+	if (stat(argv[0], &st) != 0) {
+		mpr_Return(eid, mprCreateUndefinedVar());
+	} else {
+		mpr_Return(eid, mpr_stat(&st));
+	}
+	return 0;
+}
+
+/*
+  usage:
+      var st = sys.lstat(filename);
+  returns an object containing struct stat elements
+*/
+static int ejs_sys_lstat(MprVarHandle eid, int argc, char **argv)
+{
+	struct stat st;
+	/* validate arguments */
+	if (argc != 1) {
+		ejsSetErrorMsg(eid, "sys.stat invalid arguments");
+		return -1;
+	}
+	if (lstat(argv[0], &st) != 0) {
+		mpr_Return(eid, mprCreateUndefinedVar());
+	} else {
+		mpr_Return(eid, mpr_stat(&st));
+	}
+	return 0;
+}
+
+
 /*
   initialise sys ejs subsystem
 */
@@ -204,6 +273,8 @@ static int ejs_sys_init(MprVarHandle eid, int argc, struct MprVar **argv)
 	mprSetStringCFunction(obj, "unlink", ejs_sys_unlink);
 	mprSetStringCFunction(obj, "file_load", ejs_sys_file_load);
 	mprSetStringCFunction(obj, "file_save", ejs_sys_file_save);
+	mprSetStringCFunction(obj, "stat", ejs_sys_stat);
+	mprSetStringCFunction(obj, "lstat", ejs_sys_lstat);
 
 	return 0;
 }
-- 
cgit 


From 620301858a5b747002eebe2b9fcef10712ee8249 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Wed, 20 Jul 2005 07:04:07 +0000
Subject: r8638: continue the trend of maknig our C functions true ejs objects
 by making the string functions into an object. To keep existing code working
 I have added:

  string_init(global);

into base.js. That brings the functions into the global scope for our
existing scripts
(This used to be commit a978484738168b82441c4dc4f5f803d349769a4b)
---
 source4/scripting/ejs/smbcalls_string.c | 26 +++++++++++++++++++-------
 source4/scripting/libjs/base.js         |  3 +++
 2 files changed, 22 insertions(+), 7 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_string.c b/source4/scripting/ejs/smbcalls_string.c
index 657c8efc61..3d386abe2e 100644
--- a/source4/scripting/ejs/smbcalls_string.c
+++ b/source4/scripting/ejs/smbcalls_string.c
@@ -320,16 +320,28 @@ static int ejs_vsprintf(MprVarHandle eid, int argc, struct MprVar **argv)
 	return ret;
 }
 
+/*
+  initialise string ejs subsystem
+*/
+static int ejs_string_init(MprVarHandle eid, int argc, struct MprVar **argv)
+{
+	struct MprVar *obj = mprInitObject(eid, "string", argc, argv);
+
+	mprSetStringCFunction(obj, "strlen", ejs_strlen);
+	mprSetStringCFunction(obj, "strlower", ejs_strlower);
+	mprSetStringCFunction(obj, "strupper", ejs_strupper);
+	mprSetStringCFunction(obj, "split", ejs_split);
+	mprSetCFunction(obj, "join", ejs_join);
+	mprSetCFunction(obj, "sprintf", ejs_sprintf);
+	mprSetCFunction(obj, "vsprintf", ejs_vsprintf);
+
+	return 0;
+}
+
 /*
   setup C functions that be called from ejs
 */
 void smb_setup_ejs_string(void)
 {
-	ejsDefineStringCFunction(-1, "strlen", ejs_strlen, NULL, MPR_VAR_SCRIPT_HANDLE);
-	ejsDefineStringCFunction(-1, "strlower", ejs_strlower, NULL, MPR_VAR_SCRIPT_HANDLE);
-	ejsDefineStringCFunction(-1, "strupper", ejs_strupper, NULL, MPR_VAR_SCRIPT_HANDLE);
-	ejsDefineStringCFunction(-1, "split", ejs_split, NULL, MPR_VAR_SCRIPT_HANDLE);
-	ejsDefineCFunction(-1, "join", ejs_join, NULL, MPR_VAR_SCRIPT_HANDLE);
-	ejsDefineCFunction(-1, "sprintf", ejs_sprintf, NULL, MPR_VAR_SCRIPT_HANDLE);
-	ejsDefineCFunction(-1, "vsprintf", ejs_vsprintf, NULL, MPR_VAR_SCRIPT_HANDLE);
+	ejsDefineCFunction(-1, "string_init", ejs_string_init, NULL, MPR_VAR_SCRIPT_HANDLE);
 }
diff --git a/source4/scripting/libjs/base.js b/source4/scripting/libjs/base.js
index 39b62b133e..8a07f4e383 100644
--- a/source4/scripting/libjs/base.js
+++ b/source4/scripting/libjs/base.js
@@ -9,6 +9,9 @@ if (global["HAVE_BASE_JS"] != undefined) {
 }
 HAVE_BASE_JS=1
 
+/* bring the string functions into the global frame */
+string_init(global);
+
 /*
   an essential function!
 */
-- 
cgit 


From 86d628a292a22973597e0c06d4a36e20c58ae31c Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Wed, 20 Jul 2005 07:20:03 +0000
Subject: r8639: moved loadparm calls into an ejs object (This used to be
 commit 2dc493eea6f9d87c40ad0dc755f528ce0b33ca47)

---
 source4/scripting/bin/smbstatus         |  4 +++-
 source4/scripting/ejs/smbcalls_config.c | 15 +++++++++++++--
 source4/scripting/libjs/auth.js         |  3 ++-
 source4/scripting/libjs/management.js   |  3 ++-
 source4/scripting/libjs/provision.js    | 16 ++++++++++------
 5 files changed, 30 insertions(+), 11 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/bin/smbstatus b/source4/scripting/bin/smbstatus
index 7fefae6963..38f2ab06a9 100755
--- a/source4/scripting/bin/smbstatus
+++ b/source4/scripting/bin/smbstatus
@@ -82,7 +82,9 @@ function show_nbt()
 	println("");
 }
 
-printf("%s\n\n", lpGet("server string"));
+var lp = loadparm_init();
+
+printf("%s\n\n", lp.get("server string"));
 
 if (options['nbt'] != undefined) {
 	show_nbt();
diff --git a/source4/scripting/ejs/smbcalls_config.c b/source4/scripting/ejs/smbcalls_config.c
index 18bdd0547e..7fc58f237d 100644
--- a/source4/scripting/ejs/smbcalls_config.c
+++ b/source4/scripting/ejs/smbcalls_config.c
@@ -139,11 +139,22 @@ static int ejs_lpGet(MprVarHandle eid, int argc, char **argv)
 	return 0;
 }
 
+/*
+  initialise loadparm ejs subsystem
+*/
+static int ejs_loadparm_init(MprVarHandle eid, int argc, struct MprVar **argv)
+{
+	struct MprVar *obj = mprInitObject(eid, "loadparm", argc, argv);
+
+	mprSetStringCFunction(obj, "get", ejs_lpGet);
+	mprSetStringCFunction(obj, "services", ejs_lpServices);
+	return 0;
+}
+
 /*
   setup C functions that be called from ejs
 */
 void smb_setup_ejs_config(void)
 {
-	ejsDefineStringCFunction(-1, "lpGet", ejs_lpGet, NULL, MPR_VAR_SCRIPT_HANDLE);
-	ejsDefineStringCFunction(-1, "lpServices", ejs_lpServices, NULL, MPR_VAR_SCRIPT_HANDLE);
+	ejsDefineCFunction(-1, "loadparm_init", ejs_loadparm_init, NULL, MPR_VAR_SCRIPT_HANDLE);
 }
diff --git a/source4/scripting/libjs/auth.js b/source4/scripting/libjs/auth.js
index a973cb4753..73d8645218 100644
--- a/source4/scripting/libjs/auth.js
+++ b/source4/scripting/libjs/auth.js
@@ -11,7 +11,8 @@
 function getDomainList()
 {
 	var ret = new Array(2);
+	var lp = loadparm_init();
 	ret[0] = "System User";
-	ret[1] = lpGet("workgroup");
+	ret[1] = lp.get("workgroup");
 	return ret;
 }
diff --git a/source4/scripting/libjs/management.js b/source4/scripting/libjs/management.js
index 7130cdc5dd..e1c68ca1de 100644
--- a/source4/scripting/libjs/management.js
+++ b/source4/scripting/libjs/management.js
@@ -97,7 +97,8 @@ function nbtd_statistics()
 */
 function service_enabled(name)
 {
-	var services = lpGet("server services");
+	var lp = loadparm_init();
+	var services = lp.get("server services");
 	var i;
 	for (i=0;i<services.length;i++) {
 		if (services[i] == name) {
diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index d3b94c1d1c..e9a8aad0cc 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -141,13 +141,14 @@ function setup_ldb(ldif, dbname, subobj)
 {
 	var extra = "";
 	var ldb = ldb_init();
+	var lp = loadparm_init();
 
 	if (arguments.length == 4) {
 		extra = arguments[3];
 	}
 
 	var dbfile = dbname;
-	var src = lpGet("setup directory") + "/" + ldif;
+	var src = lp.get("setup directory") + "/" + ldif;
 
 	var data = sys.file_load(src);
 	data = data + extra;
@@ -167,8 +168,9 @@ function setup_ldb(ldif, dbname, subobj)
  */
 function setup_file(template, fname, subobj)
 {
-	var f = lpGet("private dir") + "/" + fname;
-	var src = lpGet("setup directory") + "/" + template;
+	var lp = loadparm_init();
+	var f = lp.get("private dir") + "/" + fname;
+	var src = lp.get("setup directory") + "/" + template;
 
 	sys.unlink(f);
 
@@ -221,9 +223,10 @@ function provision_guess()
 {
 	var subobj = new Object();
 	var nss = nss_init();
+	var lp = loadparm_init();
 
-	subobj.REALM        = lpGet("realm");
-	subobj.DOMAIN       = lpGet("workgroup");
+	subobj.REALM        = lp.get("realm");
+	subobj.DOMAIN       = lp.get("workgroup");
 	subobj.HOSTNAME     = hostname();
 	subobj.HOSTIP       = hostip();
 	subobj.DOMAINGUID   = randguid();
@@ -271,7 +274,8 @@ function searchone(ldb, expression, attribute)
 */
 function newuser(username, unixname, password, message)
 {
-	var samdb = lpGet("sam database");
+	var lp = loadparm_init();
+	var samdb = lp.get("sam database");
 	var ldb = ldb_init();
 
 	/* connect to the sam */
-- 
cgit 


From d5ac1f9bf4062139054fa2b4677f6bde952bec13 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Wed, 20 Jul 2005 07:29:23 +0000
Subject: r8640: continue the trend by moving the ejs random calls into an
 object (This used to be commit ed4fb68ef7c28e415408e923bd9eefcd2d60f355)

---
 source4/scripting/ejs/smbcalls_rand.c | 19 +++++++++++++++----
 source4/scripting/libjs/provision.js  |  2 ++
 2 files changed, 17 insertions(+), 4 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_rand.c b/source4/scripting/ejs/smbcalls_rand.c
index 81473ad737..043b9cca09 100644
--- a/source4/scripting/ejs/smbcalls_rand.c
+++ b/source4/scripting/ejs/smbcalls_rand.c
@@ -80,13 +80,24 @@ static int ejs_randsid(MprVarHandle eid, int argc, struct MprVar **argv)
 	return 0;
 }
 
+/*
+  initialise random ejs subsystem
+*/
+static int ejs_random_init(MprVarHandle eid, int argc, struct MprVar **argv)
+{
+	struct MprVar *obj = mprInitObject(eid, "random", argc, argv);
+
+	mprSetCFunction(obj, "random", ejs_random);
+	mprSetCFunction(obj, "randpass", ejs_randpass);
+	mprSetCFunction(obj, "randguid", ejs_randguid);
+	mprSetCFunction(obj, "randsid", ejs_randsid);
+	return 0;
+}
+
 /*
   setup C functions that be called from ejs
 */
 void smb_setup_ejs_random(void)
 {
-	ejsDefineCFunction(-1, "random", ejs_random, NULL, MPR_VAR_SCRIPT_HANDLE);
-	ejsDefineCFunction(-1, "randpass", ejs_randpass, NULL, MPR_VAR_SCRIPT_HANDLE);
-	ejsDefineCFunction(-1, "randguid", ejs_randguid, NULL, MPR_VAR_SCRIPT_HANDLE);
-	ejsDefineCFunction(-1, "randsid", ejs_randsid, NULL, MPR_VAR_SCRIPT_HANDLE);
+	ejsDefineCFunction(-1, "random_init", ejs_random_init, NULL, MPR_VAR_SCRIPT_HANDLE);
 }
diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index e9a8aad0cc..58f0e18240 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -224,6 +224,7 @@ function provision_guess()
 	var subobj = new Object();
 	var nss = nss_init();
 	var lp = loadparm_init();
+	random_init(local);
 
 	subobj.REALM        = lp.get("realm");
 	subobj.DOMAIN       = lp.get("workgroup");
@@ -277,6 +278,7 @@ function newuser(username, unixname, password, message)
 	var lp = loadparm_init();
 	var samdb = lp.get("sam database");
 	var ldb = ldb_init();
+	random_init(local);
 
 	/* connect to the sam */
 	var ok = ldb.connect(samdb);
-- 
cgit 


From 2f5f01567b4c30cd764843a1ca0c7ab6d9bc0882 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Wed, 20 Jul 2005 10:07:48 +0000
Subject: r8643: - make lp_configfile() work again

- get rid of redundeny dyn_CONFIGFILE argument to lp_load()

- fixed provisioning to work with completely pristine install,
  creating an initial smb.conf is none is present

- added lp.set() and lp.reload() to loadparm ejs object interface
(This used to be commit c2691ef7126ddcee5f95970b78759b40a049d0a7)
---
 source4/scripting/ejs/smbcalls_config.c | 45 ++++++++++++++++++++++++++++++---
 source4/scripting/ejs/smbscript.c       |  2 +-
 source4/scripting/libjs/provision.js    | 21 +++++++++++++--
 3 files changed, 61 insertions(+), 7 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_config.c b/source4/scripting/ejs/smbcalls_config.c
index 7fc58f237d..ddb06aa7d7 100644
--- a/source4/scripting/ejs/smbcalls_config.c
+++ b/source4/scripting/ejs/smbcalls_config.c
@@ -24,6 +24,7 @@
 #include "scripting/ejs/smbcalls.h"
 #include "lib/appweb/ejs/ejs.h"
 #include "param/loadparm.h"
+#include "dynconfig.h"
 
 /*
   return a list of defined services
@@ -48,10 +49,10 @@ static int ejs_lpServices(MprVarHandle eid, int argc, char **argv)
   
   can be called in 4 ways:
 
-    v = lpGet("type:parm");             gets a parametric variable
-    v = lpGet("share", "type:parm");    gets a parametric variable on a share
-    v = lpGet("parm");                  gets a global variable
-    v = lpGet("share", "parm");         gets a share variable
+    v = lp.get("type:parm");             gets a parametric variable
+    v = lp.get("share", "type:parm");    gets a parametric variable on a share
+    v = lp.get("parm");                  gets a global variable
+    v = lp.get("share", "parm");         gets a share variable
 
   the returned variable is a ejs object. It is an array object for lists.  
 */
@@ -139,6 +140,40 @@ static int ejs_lpGet(MprVarHandle eid, int argc, char **argv)
 	return 0;
 }
 
+
+/*
+  set a smb.conf parameter. Only sets in memory, not permanent
+  
+  can be called in 4 ways:
+
+    ok = lp.set("parm", "value");
+*/
+static int ejs_lpSet(MprVarHandle eid, int argc, char **argv)
+{
+	if (argc != 2) {
+		ejsSetErrorMsg(eid, "lp.set invalid arguments");
+		return -1;
+	}
+
+	mpr_Return(eid, mprCreateBoolVar(lp_set_cmdline(argv[0], argv[1])));
+	return 0;
+}
+
+/*
+  reload smb.conf
+  
+    ok = lp.reload();
+*/
+static int ejs_lpReload(MprVarHandle eid, int argc, char **argv)
+{
+	BOOL ret = lp_load();
+	if (ret) {
+		load_interfaces();
+	}
+	mpr_Return(eid, mprCreateBoolVar(ret));
+	return 0;
+}
+
 /*
   initialise loadparm ejs subsystem
 */
@@ -147,6 +182,8 @@ static int ejs_loadparm_init(MprVarHandle eid, int argc, struct MprVar **argv)
 	struct MprVar *obj = mprInitObject(eid, "loadparm", argc, argv);
 
 	mprSetStringCFunction(obj, "get", ejs_lpGet);
+	mprSetStringCFunction(obj, "set", ejs_lpSet);
+	mprSetStringCFunction(obj, "reload", ejs_lpReload);
 	mprSetStringCFunction(obj, "services", ejs_lpServices);
 	return 0;
 }
diff --git a/source4/scripting/ejs/smbscript.c b/source4/scripting/ejs/smbscript.c
index 8359629a85..c6155dcbeb 100644
--- a/source4/scripting/ejs/smbscript.c
+++ b/source4/scripting/ejs/smbscript.c
@@ -48,7 +48,7 @@ void ejs_exception(const char *reason)
 	smbscript_init_subsystems;
 	mprSetCtx(mem_ctx);
 
-	lp_load(dyn_CONFIGFILE);
+	lp_load();
 
 	if (argc < 2) {
 		fprintf(stderr, "You must supply a script name\n");
diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index 58f0e18240..f5aaeafe89 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -169,7 +169,7 @@ function setup_ldb(ldif, dbname, subobj)
 function setup_file(template, fname, subobj)
 {
 	var lp = loadparm_init();
-	var f = lp.get("private dir") + "/" + fname;
+	var f = fname;
 	var src = lp.get("setup directory") + "/" + template;
 
 	sys.unlink(f);
@@ -187,6 +187,9 @@ function setup_file(template, fname, subobj)
 function provision(subobj, message)
 {
 	var data = "";
+	var lp = loadparm_init();
+	var sys = sys_init();
+	var smbconf = lp.get("config file");
 
 	/*
 	  some options need to be upper/lower case
@@ -204,6 +207,13 @@ function provision(subobj, message)
 
 	provision_next_usn = 1;
 
+	/* only install a new smb.conf if there isn't one there already */
+	var st = sys.stat(smbconf);
+	if (st == undefined) {
+		message("Setting up smb.conf\n");
+		setup_file("provision.smb.conf", smbconf, subobj);
+		lp.reload();
+	}
 	message("Setting up hklm.ldb\n");
 	setup_ldb("hklm.ldif", "hklm.ldb", subobj);
 	message("Setting up sam.ldb\n");
@@ -213,7 +223,9 @@ function provision(subobj, message)
 	message("Setting up secrets.ldb\n");
 	setup_ldb("secrets.ldif", "secrets.ldb", subobj);
 	message("Setting up DNS zone file\n");
-	setup_file("provision.zone", subobj.DNSDOMAIN + ".zone", subobj);
+	setup_file("provision.zone", 
+		   lp.get("private dir") + "/" + subobj.DNSDOMAIN + ".zone", 
+		   subobj);
 }
 
 /*
@@ -229,6 +241,11 @@ function provision_guess()
 	subobj.REALM        = lp.get("realm");
 	subobj.DOMAIN       = lp.get("workgroup");
 	subobj.HOSTNAME     = hostname();
+
+	assert(subobj.REALM);
+	assert(subobj.DOMAIN);
+	assert(subobj.HOSTNAME);
+
 	subobj.HOSTIP       = hostip();
 	subobj.DOMAINGUID   = randguid();
 	subobj.DOMAINSID    = randsid();
-- 
cgit 


From 2fd92cb1b4986909aff79ee88e48d1bb513e9062 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Wed, 20 Jul 2005 11:26:17 +0000
Subject: r8648: automatically redirect to provisioning if not yet provisioned
 when the home page in swat is accessed (This used to be commit
 78fb559c08d55c01f5ede81d43cdd857cce8d338)

---
 source4/scripting/libjs/provision.js | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index f5aaeafe89..894b42ceb7 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -9,6 +9,27 @@ provision_next_usn = 1;
 
 sys = sys_init();
 
+/*
+  return true if the current install seems to be OK
+*/
+function install_ok()
+{
+	var lp = loadparm_init();
+	var ldb = ldb_init();
+	if (lp.get("realm") == "") {
+		return false;
+	}
+	var ok = ldb.connect(lp.get("sam database"));
+	if (!ok) {
+		return false;
+	}
+	var res = ldb.search("(name=Administrator)");
+	if (res.length != 1) {
+		return false;
+	}
+	return true;
+}
+
 /*
   find a user or group from a list of possibilities
 */
-- 
cgit 


From 24d2107324982d8ad69fb89d13037ba591f49534 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Wed, 20 Jul 2005 11:43:23 +0000
Subject: r8650: Use the timestamps and a new objectguid module rather than
 placing boilerplate attributes in every entry in provision.ldif.

The next step will be to use templates.

Andrew Bartlett
(This used to be commit 940ed9827f5ab83b668a60a2b0110567dd54c3e2)
---
 source4/scripting/libjs/provision.js | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index 894b42ceb7..db71392d8c 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -113,7 +113,7 @@ function hostip()
 }
 
 /*
-  return current time as a ldap time string
+  return next USN in the sequence
 */
 function nextusn()
 {
@@ -160,14 +160,19 @@ function ldb_erase(ldb)
  */
 function setup_ldb(ldif, dbname, subobj)
 {
+	var erase = true;
 	var extra = "";
 	var ldb = ldb_init();
 	var lp = loadparm_init();
 
-	if (arguments.length == 4) {
+	if (arguments.length >= 4) {
 		extra = arguments[3];
 	}
 
+	if (arguments.length == 5) {
+	        erase = arguments[4];
+        }
+
 	var dbfile = dbname;
 	var src = lp.get("setup directory") + "/" + ldif;
 
@@ -178,7 +183,9 @@ function setup_ldb(ldif, dbname, subobj)
 	var ok = ldb.connect(dbfile);
 	assert(ok);
 
-	ldb_erase(ldb);
+	if (erase) {
+		ldb_erase(ldb);	
+	}
 
 	ok = ldb.add(data);
 	assert(ok);
@@ -237,8 +244,10 @@ function provision(subobj, message)
 	}
 	message("Setting up hklm.ldb\n");
 	setup_ldb("hklm.ldif", "hklm.ldb", subobj);
-	message("Setting up sam.ldb\n");
-	setup_ldb("provision.ldif", "sam.ldb", subobj, data);
+	message("Setting up sam.ldb attributes\n");
+	setup_ldb("provision_init.ldif", "sam.ldb", subobj);
+	message("Setting up sam.ldb data\n");
+	setup_ldb("provision.ldif", "sam.ldb", subobj, data, false);
 	message("Setting up rootdse.ldb\n");
 	setup_ldb("rootdse.ldif", "rootdse.ldb", subobj);
 	message("Setting up secrets.ldb\n");
-- 
cgit 


From 7a8ac7588720ebd1ea61a539ca4040d322c4fcf2 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Thu, 21 Jul 2005 01:56:22 +0000
Subject: r8659: return ldif formatted attributes in the ejs ldb search call,
 so sids show up as strings not binary blobs (This used to be commit
 d2c29a5a51f68cabb9ef587376bf0a6b936cdd76)

---
 source4/scripting/ejs/mprutil.c      | 30 +++++++++++++++++++++++-------
 source4/scripting/ejs/smbcalls_ldb.c |  2 +-
 2 files changed, 24 insertions(+), 8 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/mprutil.c b/source4/scripting/ejs/mprutil.c
index 14d120c45a..99eff80276 100644
--- a/source4/scripting/ejs/mprutil.c
+++ b/source4/scripting/ejs/mprutil.c
@@ -151,7 +151,7 @@ struct MprVar mprData(const uint8_t *p, size_t length)
 /*
   turn a ldb_message into a ejs object variable
 */
-struct MprVar mprLdbMessage(struct ldb_message *msg)
+static struct MprVar mprLdbMessage(struct ldb_context *ldb, struct ldb_message *msg)
 {
 	struct MprVar var;
 	int i;
@@ -166,16 +166,29 @@ struct MprVar mprLdbMessage(struct ldb_message *msg)
 	for (i=0;i<msg->num_elements;i++) {
 		struct ldb_message_element *el = &msg->elements[i];
 		struct MprVar val;
+		const struct ldb_attrib_handler *attr;
+		struct ldb_val v;
+
+		attr = ldb_attrib_handler(ldb, el->name);
+		if (attr == NULL) {
+			goto failed;
+		}
+
 		if (el->num_values == 1 &&
 		    !str_list_check_ci(multivalued, el->name)) {
-			val = mprData(el->values[0].data, el->values[0].length);
+			if (attr->ldif_write_fn(ldb, msg, &el->values[0], &v) != 0) {
+				goto failed;
+			}
+			val = mprData(v.data, v.length);
 		} else {
 			int j;
 			val = mprObject(el->name);
 			for (j=0;j<el->num_values;j++) {
-				mprAddArray(&val, j, 
-					    mprData(el->values[j].data, 
-						    el->values[j].length));
+				if (attr->ldif_write_fn(ldb, msg, 
+							&el->values[j], &v) != 0) {
+					goto failed;
+				}
+				mprAddArray(&val, j, mprData(v.data, v.length));
 			}
 		}
 		mprSetVar(&var, el->name, val);
@@ -187,20 +200,23 @@ struct MprVar mprLdbMessage(struct ldb_message *msg)
 	}
 	
 	return var;		
+failed:
+	return mprCreateUndefinedVar();
 }
 
 
 /*
   turn an array of ldb_messages into a ejs object variable
 */
-struct MprVar mprLdbArray(struct ldb_message **msg, int count, const char *name)
+struct MprVar mprLdbArray(struct ldb_context *ldb, 
+			  struct ldb_message **msg, int count, const char *name)
 {
 	struct MprVar res;
 	int i;
 
 	res = mprObject(name);
 	for (i=0;i<count;i++) {
-		mprAddArray(&res, i, mprLdbMessage(msg[i]));
+		mprAddArray(&res, i, mprLdbMessage(ldb, msg[i]));
 	}
 	if (i==0) {
 		mprSetVar(&res, "length", mprCreateIntegerVar(0));
diff --git a/source4/scripting/ejs/smbcalls_ldb.c b/source4/scripting/ejs/smbcalls_ldb.c
index f09039731f..50ba6fce68 100644
--- a/source4/scripting/ejs/smbcalls_ldb.c
+++ b/source4/scripting/ejs/smbcalls_ldb.c
@@ -103,7 +103,7 @@ static int ejs_ldbSearch(MprVarHandle eid, int argc, struct MprVar **argv)
 		ejsSetErrorMsg(eid, "ldb.search failed - %s", ldb_errstring(ldb));
 		mpr_Return(eid, mprCreateUndefinedVar());
 	} else {
-		mpr_Return(eid, mprLdbArray(res, ret, "ldb_message"));
+		mpr_Return(eid, mprLdbArray(ldb, res, ret, "ldb_message"));
 	}
 
 	talloc_free(tmp_ctx);
-- 
cgit 


From 6173fad23171add5b1d143f6c15fb36842811135 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Thu, 21 Jul 2005 02:12:20 +0000
Subject: r8660: Use templates for the initial provision of user and computer
 accounts.

This ensures the templating code is used, and also makes it clearer
what I need to duplicate in the vampire area.

Also fix a silly bug in the template application code (the samdb
module) that caused templates to be compleatly unused (my fault, from
my commit last night).

Andrew Bartlett
(This used to be commit 4a8ef7197ff938942832034453f843cb8a50f2d1)
---
 source4/scripting/libjs/provision.js | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index db71392d8c..38f3fc066e 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -246,6 +246,8 @@ function provision(subobj, message)
 	setup_ldb("hklm.ldif", "hklm.ldb", subobj);
 	message("Setting up sam.ldb attributes\n");
 	setup_ldb("provision_init.ldif", "sam.ldb", subobj);
+	message("Setting up sam.ldb templates\n");
+	setup_ldb("provision_templates.ldif", "sam.ldb", subobj, NULL, false);
 	message("Setting up sam.ldb data\n");
 	setup_ldb("provision.ldif", "sam.ldb", subobj, data, false);
 	message("Setting up rootdse.ldb\n");
-- 
cgit 


From 4163622a0b30cd4f8ab2467e3bf8f8ba87ec2c5a Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Thu, 21 Jul 2005 04:10:35 +0000
Subject: r8661: added strstr() ejs function in string lib (This used to be
 commit a569fc8924e8c8edbdfa7efc89ad99659af8c379)

---
 source4/scripting/ejs/smbcalls_string.c | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_string.c b/source4/scripting/ejs/smbcalls_string.c
index 3d386abe2e..cd5db1f574 100644
--- a/source4/scripting/ejs/smbcalls_string.c
+++ b/source4/scripting/ejs/smbcalls_string.c
@@ -73,6 +73,22 @@ static int ejs_strupper(MprVarHandle eid, int argc, char **argv)
 	return 0;
 }
 
+/*
+  usage:
+      var s = strstr(string, substring);
+*/
+static int ejs_strstr(MprVarHandle eid, int argc, char **argv)
+{
+	char *s;
+	if (argc != 2) {
+		ejsSetErrorMsg(eid, "strstr invalid arguments");
+		return -1;
+	}
+	s = strstr(argv[0], argv[1]);
+	mpr_Return(eid, mprString(s));
+	return 0;
+}
+
 /*
   usage:
      list = split(".", "a.foo.bar");
@@ -330,6 +346,7 @@ static int ejs_string_init(MprVarHandle eid, int argc, struct MprVar **argv)
 	mprSetStringCFunction(obj, "strlen", ejs_strlen);
 	mprSetStringCFunction(obj, "strlower", ejs_strlower);
 	mprSetStringCFunction(obj, "strupper", ejs_strupper);
+	mprSetStringCFunction(obj, "strstr", ejs_strstr);
 	mprSetStringCFunction(obj, "split", ejs_split);
 	mprSetCFunction(obj, "join", ejs_join);
 	mprSetCFunction(obj, "sprintf", ejs_sprintf);
-- 
cgit 


From f8c1258d01fa631b719579e186b28027a34887cf Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Thu, 21 Jul 2005 11:28:24 +0000
Subject: r8677: The first part of the domain name may not be equal to the
 netbios domain name.

Remove the use of flatname from the main domain object, we no longer
reference it.

Andrew Bartlett
(This used to be commit 2303e24be74570187b23c3d31d0433263c83ba7e)
---
 source4/scripting/libjs/provision.js | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index 38f3fc066e..b6a7c5978b 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -268,6 +268,7 @@ function provision_guess()
 	var subobj = new Object();
 	var nss = nss_init();
 	var lp = loadparm_init();
+	var rdn_list;
 	random_init(local);
 
 	subobj.REALM        = lp.get("realm");
@@ -302,6 +303,8 @@ function provision_guess()
 				      strlower(subobj.HOSTNAME), 
 				      subobj.DNSDOMAIN);
 	subobj.BASEDN       = "DC=" + join(",DC=", split(".", subobj.REALM));
+	rdn_list = split(".", subobj.REALM);
+	subobj.RDN_DC       = rdn_list[0];
 	return subobj;
 }
 
-- 
cgit 


From a369f0ecaf35fb49652873c4c1ddcaf28629c26e Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Thu, 21 Jul 2005 12:11:52 +0000
Subject: r8678: setup for gdb backtrace in 'make test' (This used to be commit
 acf8c8fd4995acef47390df5a7d4e611c597367d)

---
 source4/scripting/ejs/smbscript.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbscript.c b/source4/scripting/ejs/smbscript.c
index c6155dcbeb..b16536a575 100644
--- a/source4/scripting/ejs/smbscript.c
+++ b/source4/scripting/ejs/smbscript.c
@@ -45,6 +45,7 @@ void ejs_exception(const char *reason)
 	struct MprVar *return_var;
 	int exit_status, i;
 
+	fault_setup(argv[0]);
 	smbscript_init_subsystems;
 	mprSetCtx(mem_ctx);
 
-- 
cgit 


From b16362fab65d0700bd6a8cf6569a9e21c7e6b069 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Fri, 22 Jul 2005 04:10:07 +0000
Subject: r8700: Propmted by tridge's need to do plaintext auth in ejs, rework
 the user_info strcture in auth/

This moves it to a pattern much like that found in ntvfs, with
functions to migrate between PAIN, HASH and RESPONSE passwords.

Instead of make_user_info*() functions, we simply fill in the control
block in the callers, per recent dicussions on the lists.  This
removed a lot of data copies as well as error paths, as we can grab
much of it with talloc.

Andrew Bartlett
(This used to be commit ecbd2235a3e2be937440fa1dc0aecc5a047eda88)
---
 source4/scripting/ejs/smbcalls_auth.c | 35 +++++++++++++++++++++++++----------
 1 file changed, 25 insertions(+), 10 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_auth.c b/source4/scripting/ejs/smbcalls_auth.c
index 87d5327e04..4b3534b4cc 100644
--- a/source4/scripting/ejs/smbcalls_auth.c
+++ b/source4/scripting/ejs/smbcalls_auth.c
@@ -47,16 +47,31 @@ static int ejs_doauth(TALLOC_CTX *tmp_ctx, struct MprVar *auth, const char *user
 		goto done;
 	}
 
-	pw_blob = data_blob(password, strlen(password)+1),
-	make_user_info(tmp_ctx, username, username,
-				domain, domain,
-				remote_host, remote_host,
-				NULL, NULL,
-				NULL, NULL,
-				&pw_blob, False,
-				USER_INFO_CASE_INSENSITIVE_USERNAME |
-				USER_INFO_DONT_CHECK_UNIX_ACCOUNT,
-				&user_info);
+	pw_blob = data_blob(password, strlen(password)+1);
+	
+	user_info = talloc(tmp_ctx, struct auth_usersupplied_info);
+	if (!user_info) {
+		mprSetPropertyValue(auth, "result", mprCreateBoolVar(False));
+		mprSetPropertyValue(auth, "report", mprString("talloc failed"));
+		goto done;
+	}
+
+	user_info->mapped_state = True;
+	user_info->client.account_name = username;
+	user_info->mapped.account_name = username;
+	user_info->client.domain_name = domain;
+	user_info->mapped.domain_name = domain;
+
+	user_info->workstation_name = remote_host;
+
+	user_info->remote_host = remote_host;
+
+	user_info->password_state = AUTH_PASSWORD_PLAIN;
+	user_info->password.plaintext = talloc_strdup(user_info, password);
+
+	user_info->flags = USER_INFO_CASE_INSENSITIVE_USERNAME |
+		USER_INFO_DONT_CHECK_UNIX_ACCOUNT;
+
 	nt_status = auth_check_password(auth_context, tmp_ctx, user_info, &server_info);
 	if (!NT_STATUS_IS_OK(nt_status)) {
 		mprSetPropertyValue(auth, "result", mprCreateBoolVar(False));
-- 
cgit 


From 8fbcde9450037115aeab087395575dc027b213a6 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Mon, 25 Jul 2005 02:23:04 +0000
Subject: r8742: fixed handling of zero length names in mprObject() (This used
 to be commit 8086c37df65ac666aa340141d3584e9bc2c81278)

---
 source4/scripting/ejs/mprutil.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/mprutil.c b/source4/scripting/ejs/mprutil.c
index 99eff80276..5a29ddc144 100644
--- a/source4/scripting/ejs/mprutil.c
+++ b/source4/scripting/ejs/mprutil.c
@@ -29,7 +29,7 @@
 */
 struct MprVar mprObject(const char *name)
 {
-	return ejsCreateObj(name?name:"(NULL)", MPR_DEFAULT_HASH_SIZE);
+	return ejsCreateObj(name && *name?name:"(NULL)", MPR_DEFAULT_HASH_SIZE);
 }
 
 /*
-- 
cgit 


From 66b2a04346a568e6564b9cb21a89cf887cad3d03 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Wed, 27 Jul 2005 00:23:09 +0000
Subject: r8790: Finish the migration of aliases and privilages with SamSync,
 by adding templating support for foreignSecurityPrincipals to the samdb
 module. This is an extension beyond what microsoft does, and has been very
 useful :-)

The setup scripts have been modified to use the new template, as has
the SAMR and LSA code.

Other cleanups in LSA remove the assumption that the short domain name
is the first component of the realm.

Also add a lot of useful debug messages, to make it clear how/why the
SamSync may have gone wrong.  Many of these should perhaps be hooked
into an error string.

Andrew Bartlett
(This used to be commit 1f071b0609c5c83024db1d4a7d04334a932b8253)
---
 source4/scripting/libjs/provision.js | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index b6a7c5978b..0bcb2fa761 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -56,19 +56,10 @@ function add_foreign(str, sid, desc, unixname)
 dn: CN=${SID},CN=ForeignSecurityPrincipals,${BASEDN}
 objectClass: top
 objectClass: foreignSecurityPrincipal
-cn: ${SID}
 description: ${DESC}
-instanceType: 4
-whenCreated: ${LDAPTIME}
-whenChanged: ${LDAPTIME}
+unixName: ${UNIXNAME}
 uSNCreated: 1
 uSNChanged: 1
-showInAdvancedViewOnly: TRUE
-name: ${SID}
-objectGUID: ${NEWGUID}
-objectSid: ${SID}
-objectCategory: CN=Foreign-Security-Principal,CN=Schema,CN=Configuration,${BASEDN}
-unixName: ${UNIXNAME}
 ";
 	var sub = new Object();
 	sub.SID = sid;
@@ -212,7 +203,7 @@ function setup_file(template, fname, subobj)
 /*
   provision samba4 - caution, this wipes all existing data!
 */
-function provision(subobj, message)
+function provision(subobj, message, blank)
 {
 	var data = "";
 	var lp = loadparm_init();
@@ -249,7 +240,11 @@ function provision(subobj, message)
 	message("Setting up sam.ldb templates\n");
 	setup_ldb("provision_templates.ldif", "sam.ldb", subobj, NULL, false);
 	message("Setting up sam.ldb data\n");
-	setup_ldb("provision.ldif", "sam.ldb", subobj, data, false);
+	setup_ldb("provision.ldif", "sam.ldb", subobj, NULL, false);
+	if (blank == false) {
+		message("Setting up sam.ldb users and groups\n");
+		setup_ldb("provision_users.ldif", "sam.ldb", subobj, data, false);
+	}
 	message("Setting up rootdse.ldb\n");
 	setup_ldb("rootdse.ldif", "rootdse.ldb", subobj);
 	message("Setting up secrets.ldb\n");
-- 
cgit 


From f6d2892faab30e6f205a81a008168b07e521ab85 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Thu, 28 Jul 2005 06:46:03 +0000
Subject: r8821: continue the trend to move to a more OO style of interface for
 our js calls. This changes the generated RPC and IRPC calls to use the 'this'
 object pointer instead of requiring the passing of the object on each call.
 So typical usage is now:

var echo = echo_init();
var io = irpcObj();

status = echo.connect("ncacn_np:server");
assert(status.is_ok);

io.input.in_data = 7;
status = echo.AddOne(io);
assert(status.is_ok);
(This used to be commit f7b49ecd0868c1f0fec75b371f132bbf357ad8c6)
---
 source4/scripting/ejs/smbcalls_rpc.c  | 88 +++++++++++++++++++----------------
 source4/scripting/libjs/management.js | 25 ++++------
 source4/scripting/libjs/samr.js       | 31 ++++++------
 3 files changed, 73 insertions(+), 71 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_rpc.c b/source4/scripting/ejs/smbcalls_rpc.c
index 8e7bf57972..223ac5c972 100644
--- a/source4/scripting/ejs/smbcalls_rpc.c
+++ b/source4/scripting/ejs/smbcalls_rpc.c
@@ -46,33 +46,28 @@ struct ejs_irpc_connection {
 /*
   setup a context for talking to a irpc server
      example: 
-        var conn = new Object();
-        status = irpc_connect(conn, "smb_server");
+        status = irpc.connect("smb_server");
 */
-static int ejs_irpc_connect(MprVarHandle eid, int argc, struct MprVar **argv)
+static int ejs_irpc_connect(MprVarHandle eid, int argc, char **argv)
 {
 	NTSTATUS status;
 	int i;
-	struct MprVar *conn;
 	struct event_context *ev;
 	struct ejs_irpc_connection *p;
+	struct MprVar *this = mprGetProperty(ejsGetLocalObject(eid), "this", 0);
 
 	/* validate arguments */
-	if (argc != 2 ||
-	    argv[0]->type != MPR_TYPE_OBJECT ||
-	    argv[1]->type != MPR_TYPE_STRING) {
+	if (argc != 1) {
 		ejsSetErrorMsg(eid, "rpc_connect invalid arguments");
 		return -1;
 	}
 
-	conn           = argv[0];
-
-	p = talloc(conn, struct ejs_irpc_connection);
+	p = talloc(this, struct ejs_irpc_connection);
 	if (p == NULL) {
 		return -1;
 	}
 
-	p->server_name = mprToString(argv[1]);
+	p->server_name = argv[0];
 
 	ev = talloc_find_parent_bytype(mprMemCtx(), struct event_context);
 
@@ -93,7 +88,7 @@ static int ejs_irpc_connect(MprVarHandle eid, int argc, struct MprVar **argv)
 		talloc_free(p);
 		status = NT_STATUS_OBJECT_NAME_NOT_FOUND;
 	} else {
-		mprSetPtrChild(conn, "irpc", p);
+		mprSetPtrChild(this, "irpc", p);
 		status = NT_STATUS_OK;
 	}
 
@@ -104,32 +99,37 @@ static int ejs_irpc_connect(MprVarHandle eid, int argc, struct MprVar **argv)
 
 /*
   connect to an rpc server
-     example: 
-        var conn = new Object();
-        status = rpc_connect(conn, "ncacn_ip_tcp:localhost", "rpcecho");
+     examples: 
+        status = rpc.connect("ncacn_ip_tcp:localhost");
+        status = rpc.connect("ncacn_ip_tcp:localhost", "pipe_name");
 */
-static int ejs_rpc_connect(MprVarHandle eid, int argc, struct MprVar **argv)
+static int ejs_rpc_connect(MprVarHandle eid, int argc, char **argv)
 {
 	const char *binding, *pipe_name;
 	const struct dcerpc_interface_table *iface;
 	NTSTATUS status;
 	struct dcerpc_pipe *p;
-	struct MprVar *conn;
 	struct cli_credentials *creds = cmdline_credentials;
 	struct event_context *ev;
+	struct MprVar *this = mprGetProperty(ejsGetLocalObject(eid), "this", 0);
 
 	/* validate arguments */
-	if (argc != 3 ||
-	    argv[0]->type != MPR_TYPE_OBJECT ||
-	    argv[1]->type != MPR_TYPE_STRING ||
-	    argv[2]->type != MPR_TYPE_STRING) {
+	if (argc < 1) {
 		ejsSetErrorMsg(eid, "rpc_connect invalid arguments");
 		return -1;
 	}
 
-	conn       = argv[0];
-	binding    = mprToString(argv[1]);
-	pipe_name  = mprToString(argv[2]);
+	binding    = argv[0];
+	if (strchr(binding, ':') == NULL) {
+		/* its an irpc connect */
+		return ejs_irpc_connect(eid, argc, argv);
+	}
+
+	if (argc > 1) {
+		pipe_name = argv[1];
+	} else {
+		pipe_name = mprToString(mprGetProperty(this, "pipe_name", NULL));
+	}
 
 	iface = idl_iface_by_name(pipe_name);
 	if (iface == NULL) {
@@ -146,7 +146,7 @@ static int ejs_rpc_connect(MprVarHandle eid, int argc, struct MprVar **argv)
 
 	ev = talloc_find_parent_bytype(mprMemCtx(), struct event_context);
 
-	status = dcerpc_pipe_connect(conn, &p, binding, 
+	status = dcerpc_pipe_connect(this, &p, binding, 
 				     iface->uuid, iface->if_version, 
 				     creds, ev);
 	if (!NT_STATUS_IS_OK(status)) goto done;
@@ -156,8 +156,8 @@ static int ejs_rpc_connect(MprVarHandle eid, int argc, struct MprVar **argv)
 
 	/* by making the pipe a child of the connection variable, it will
 	   auto close when it goes out of scope in the script */
-	mprSetPtrChild(conn, "pipe", p);
-	mprSetPtr(conn, "iface", iface);
+	mprSetPtrChild(this, "pipe", p);
+	mprSetPtr(this, "iface", iface);
 
 done:
 	mpr_Return(eid, mprNTSTATUS(status));
@@ -168,7 +168,7 @@ done:
 /*
   make an irpc call - called via the same interface as rpc
 */
-static int ejs_irpc_call(int eid, struct MprVar *conn, struct MprVar *io, 
+static int ejs_irpc_call(int eid, struct MprVar *io, 
 			 const struct dcerpc_interface_table *iface, int callnum,
 			 ejs_pull_function_t ejs_pull, ejs_push_function_t ejs_push)
 {
@@ -181,7 +181,7 @@ static int ejs_irpc_call(int eid, struct MprVar *conn, struct MprVar *io,
 	int i, count;
 	struct MprVar *results;
 
-	p = mprGetPtr(conn, "irpc");
+	p = mprGetThisPtr(eid, "irpc");
 
 	ejs = talloc(mprMemCtx(), struct ejs_rpc);
 	if (ejs == NULL) {
@@ -273,7 +273,7 @@ done:
 		  const struct dcerpc_interface_table *iface, int callnum,
 		  ejs_pull_function_t ejs_pull, ejs_push_function_t ejs_push)
 {
-	struct MprVar *conn, *io;
+	struct MprVar *io;
 	struct dcerpc_pipe *p;
 	NTSTATUS status;
 	void *ptr;
@@ -281,23 +281,20 @@ done:
 	struct ejs_rpc *ejs;
 	const struct dcerpc_interface_call *call;
 
-	if (argc != 2 ||
-	    argv[0]->type != MPR_TYPE_OBJECT ||
-	    argv[1]->type != MPR_TYPE_OBJECT) {
+	if (argc != 1 || argv[0]->type != MPR_TYPE_OBJECT) {
 		ejsSetErrorMsg(eid, "rpc_call invalid arguments");
 		return -1;
 	}
 	    
-	conn     = argv[0];
-	io       = argv[1];
+	io       = argv[0];
 
-	if (mprGetPtr(conn, "irpc")) {
+	if (mprGetThisPtr(eid, "irpc")) {
 		/* its an irpc call */
-		return ejs_irpc_call(eid, conn, io, iface, callnum, ejs_pull, ejs_push);
+		return ejs_irpc_call(eid, io, iface, callnum, ejs_pull, ejs_push);
 	}
 
 	/* get the pipe info */
-	p = mprGetPtr(conn, "pipe");
+	p = mprGetThisPtr(eid, "pipe");
 	if (p == NULL) {
 		ejsSetErrorMsg(eid, "rpc_call invalid pipe");
 		return -1;
@@ -389,9 +386,20 @@ void smb_setup_ejs_rpc(void)
 {
 	struct ejs_register *r;
 
-	ejsDefineCFunction(-1, "rpc_connect", ejs_rpc_connect, NULL, MPR_VAR_SCRIPT_HANDLE);
-	ejsDefineCFunction(-1, "irpc_connect", ejs_irpc_connect, NULL, MPR_VAR_SCRIPT_HANDLE);
 	for (r=ejs_registered;r;r=r->next) {
 		ejsDefineCFunction(-1, r->name, r->fn, NULL, MPR_VAR_SCRIPT_HANDLE);
 	}
 }
+
+/*
+  hook called by generated RPC interfaces at the end of their init routines
+  used to add generic operations on the pipe
+*/
+int ejs_rpc_init(struct MprVar *obj, const char *name)
+{
+	mprSetStringCFunction(obj, "connect", ejs_rpc_connect);
+	if (mprGetProperty(obj, "pipe_name", NULL) == NULL) {
+		mprSetVar(obj, "pipe_name", mprString(name));
+	}
+	return 0;
+}
diff --git a/source4/scripting/libjs/management.js b/source4/scripting/libjs/management.js
index e1c68ca1de..26c1c0a34a 100644
--- a/source4/scripting/libjs/management.js
+++ b/source4/scripting/libjs/management.js
@@ -10,16 +10,15 @@
 */
 function smbsrv_sessions()
 {
-	var conn = new Object();
 	var irpc = irpc_init();
-	status = irpc_connect(conn, "smb_server");
+	status = irpc.connect("smb_server");
 	if (status.is_ok != true) {
 		return undefined;
 	}
 
 	var io = irpcObj();
 	io.input.level = irpc.SMBSRV_INFO_SESSIONS;
-	status = irpc.smbsrv_information(conn, io);
+	status = irpc.smbsrv_information(io);
 	if (status.is_ok != true) {
 		return undefined;
 	}
@@ -43,16 +42,15 @@ function smbsrv_sessions()
 */
 function smbsrv_trees()
 {
-	var conn = new Object();
 	var irpc = irpc_init();
-	status = irpc_connect(conn, "smb_server");
+	status = irpc.connect("smb_server");
 	if (status.is_ok != true) {
 		return undefined;
 	}
 
 	var io = irpcObj();
 	io.input.level = irpc.SMBSRV_INFO_TREES;
-	status = irpc.smbsrv_information(conn, io);
+	status = irpc.smbsrv_information(io);
 	if (status.is_ok != true) {
 		return undefined;
 	}
@@ -76,16 +74,15 @@ function smbsrv_trees()
 */
 function nbtd_statistics()
 {
-	var conn = new Object();
 	var irpc = irpc_init();
-	status = irpc_connect(conn, "nbt_server");
+	status = irpc.connect("nbt_server");
 	if (status.is_ok != true) {
 		return undefined;
 	}
 
 	var io = irpcObj();
 	io.input.level = irpc.NBTD_INFO_STATISTICS;
-	status = irpc.nbtd_information(conn, io);
+	status = irpc.nbtd_information(io);
 	if (status.is_ok != true) {
 		return undefined;
 	}
@@ -113,7 +110,6 @@ function service_enabled(name)
 */
 function server_status(name)
 {
-	var conn = new Object();
 	var i;
 	var io;
 	var irpc = irpc_init();
@@ -122,13 +118,13 @@ function server_status(name)
 		return "DISABLED";
 	}
 	
-	status = irpc_connect(conn, name + "_server");
+	status = irpc.connect(name + "_server");
 	if (status.is_ok != true) {
 		return "DOWN";
 	}
 
 	var io = irpcObj();
-	status = irpc.irpc_uptime(conn, io);
+	status = irpc.irpc_uptime(io);
 	if (status.is_ok != true) {
 		return "NOT RESPONDING";
 	}
@@ -141,19 +137,18 @@ function server_status(name)
 */
 function stream_server_status(name)
 {
-	var conn = new Object();
 	var irpc = irpc_init();
 
 	if (!service_enabled(name)) {
 		return "DISABLED";
 	}
-	status = irpc_connect(conn, name + "_server");
+	status = irpc.connect(name + "_server");
 	if (status.is_ok != true) {
 		return "0 connections";
 	}
 
 	var io = irpcObj();
-	status = irpc.irpc_uptime(conn, io);
+	status = irpc.irpc_uptime(io);
 	if (status.is_ok != true) {
 		return "NOT RESPONDING";
 	}
diff --git a/source4/scripting/libjs/samr.js b/source4/scripting/libjs/samr.js
index 2363dde686..d0c2b89822 100644
--- a/source4/scripting/libjs/samr.js
+++ b/source4/scripting/libjs/samr.js
@@ -32,12 +32,11 @@ function samArray(output)
 */
 function samrConnect(conn)
 {
-	conn.samr = samr_init();
-	conn.sec = security_init();
+	security_init(conn);
 	var io = irpcObj();
 	io.input.system_name = NULL;
-	io.input.access_mask = conn.sec.SEC_FLAG_MAXIMUM_ALLOWED;
-	var status = conn.samr.samr_Connect2(conn, io);
+	io.input.access_mask = conn.SEC_FLAG_MAXIMUM_ALLOWED;
+	var status = conn.samr_Connect2(io);
 	check_status_ok(status);
 	return io.output.connect_handle;
 }
@@ -49,7 +48,7 @@ function samrClose(conn, handle)
 {
 	var io = irpcObj();
 	io.input.handle = handle;
-	var status = conn.samr.samr_Close(conn, io);
+	var status = conn.samr_Close(io);
 	check_status_ok(status);
 }
 
@@ -61,7 +60,7 @@ function samrLookupDomain(conn, handle, domain)
 	var io = irpcObj();
 	io.input.connect_handle = handle;
 	io.input.domain_name = domain;
-	var status = conn.samr.samr_LookupDomain(conn, io);
+	var status = conn.samr_LookupDomain(io);
 	check_status_ok(status);
 	return io.output.sid;
 }
@@ -73,9 +72,9 @@ function samrOpenDomain(conn, handle, sid)
 {
 	var io = irpcObj();
 	io.input.connect_handle = handle;
-	io.input.access_mask = conn.sec.SEC_FLAG_MAXIMUM_ALLOWED;
+	io.input.access_mask = conn.SEC_FLAG_MAXIMUM_ALLOWED;
 	io.input.sid = sid;
-	var status = conn.samr.samr_OpenDomain(conn, io);
+	var status = conn.samr_OpenDomain(io);
 	check_status_ok(status);
 	return io.output.domain_handle;
 }
@@ -87,9 +86,9 @@ function samrOpenUser(conn, handle, rid)
 {
 	var io = irpcObj();
 	io.input.domain_handle = handle;
-	io.input.access_mask = conn.sec.SEC_FLAG_MAXIMUM_ALLOWED;
+	io.input.access_mask = conn.SEC_FLAG_MAXIMUM_ALLOWED;
 	io.input.rid = rid;
-	var status = conn.samr.samr_OpenUser(conn, io);
+	var status = conn.samr_OpenUser(io);
 	check_status_ok(status);
 	return io.output.user_handle;
 }
@@ -104,7 +103,7 @@ function samrEnumDomainUsers(conn, dom_handle)
 	io.input.resume_handle = 0;
 	io.input.acct_flags = 0;
 	io.input.max_size = -1;
-	var status = conn.samr.samr_EnumDomainUsers(conn, io);
+	var status = conn.samr_EnumDomainUsers(io);
 	check_status_ok(status);
 	return samArray(io.output);
 }
@@ -119,7 +118,7 @@ function samrEnumDomainGroups(conn, dom_handle)
 	io.input.resume_handle = 0;
 	io.input.acct_flags = 0;
 	io.input.max_size = -1;
-	var status = conn.samr.samr_EnumDomainGroups(conn, io);
+	var status = conn.samr_EnumDomainGroups(io);
 	check_status_ok(status);
 	return samArray(io.output);
 }
@@ -133,7 +132,7 @@ function samrEnumDomains(conn, handle)
 	io.input.connect_handle = handle;
 	io.input.resume_handle = 0;
 	io.input.buf_size = -1;
-	var status = conn.samr.samr_EnumDomains(conn, io);
+	var status = conn.samr_EnumDomains(io);
 	check_status_ok(status);
 	return samArray(io.output);
 }
@@ -146,7 +145,7 @@ function samrQueryUserInfo(conn, user_handle, level)
 	var r, io = irpcObj();
 	io.input.user_handle = user_handle;
 	io.input.level = level;
-	var status = conn.samr.samr_QueryUserInfo(conn, io);
+	var status = conn.samr_QueryUserInfo(io);
 	check_status_ok(status);
 	return io.output.info.info3;
 }
@@ -160,8 +159,8 @@ function samrFillUserInfo(conn, dom_handle, users, level)
 	var i;
 	for (i=0;i<users.length;i++) {
 		var r, user_handle, info;
-		user_handle = samrOpenUser(conn, dom_handle, users[i].idx);
-		info = samrQueryUserInfo(conn, user_handle, level);
+		user_handle = samrOpenUser(dom_handle, users[i].idx);
+		info = samrQueryUserInfo(user_handle, level);
 		info.name = users[i].name;
 		info.idx  = users[i].idx;
 		users[i] = info;
-- 
cgit 


From bab1eb1e3432f5cc5b0d42eebed4079d23264105 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Thu, 28 Jul 2005 07:14:49 +0000
Subject: r8822: fixed number of arguments in samr lib (This used to be commit
 8eee26bb85472aa45bd42fd28f968a38730e286c)

---
 source4/scripting/libjs/samr.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/samr.js b/source4/scripting/libjs/samr.js
index d0c2b89822..a7d7d964fb 100644
--- a/source4/scripting/libjs/samr.js
+++ b/source4/scripting/libjs/samr.js
@@ -159,8 +159,8 @@ function samrFillUserInfo(conn, dom_handle, users, level)
 	var i;
 	for (i=0;i<users.length;i++) {
 		var r, user_handle, info;
-		user_handle = samrOpenUser(dom_handle, users[i].idx);
-		info = samrQueryUserInfo(user_handle, level);
+		user_handle = samrOpenUser(conn, dom_handle, users[i].idx);
+		info = samrQueryUserInfo(conn, user_handle, level);
 		info.name = users[i].name;
 		info.idx  = users[i].idx;
 		users[i] = info;
-- 
cgit 


From fc585709402e6840a5dd16c9a3fb22792ddacf3e Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Mon, 1 Aug 2005 17:33:43 +0000
Subject: r8887: fixed the irpc error that caused ia64 to fail the LOCAL-IRPC
 test (This used to be commit ce9a262d379b946717d0d4be4731c837e6f7373d)

---
 source4/scripting/ejs/smbcalls_rpc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_rpc.c b/source4/scripting/ejs/smbcalls_rpc.c
index 223ac5c972..8a08ba0d8d 100644
--- a/source4/scripting/ejs/smbcalls_rpc.c
+++ b/source4/scripting/ejs/smbcalls_rpc.c
@@ -219,7 +219,7 @@ static int ejs_irpc_call(int eid, struct MprVar *io,
 	/* make the actual calls */
 	for (i=0;i<count;i++) {
 		reqs[i] = irpc_call_send(p->msg_ctx, p->dest_ids[i], 
-					 iface, callnum, ptr);
+					 iface, callnum, ptr, ptr);
 		if (reqs[i] == NULL) {
 			status = NT_STATUS_NO_MEMORY;
 			goto done;
-- 
cgit 


From 9f611ffddeced5661b81fbe6264502a0d59f187b Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Wed, 3 Aug 2005 00:08:28 +0000
Subject: r8966: Simplify the makefile generation system a bit. Autogenerate
 list of binaries (rather then having them hardcoded in
 build/smb_build/makefile.pm) Add INSTALLDIR keyword to .mk files (This used
 to be commit ce0935112b846486cf705ec69f12350be9c4c89d)

---
 source4/scripting/ejs/config.mk | 1 +
 1 file changed, 1 insertion(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/config.mk b/source4/scripting/ejs/config.mk
index 770bb67b86..8eced504ed 100644
--- a/source4/scripting/ejs/config.mk
+++ b/source4/scripting/ejs/config.mk
@@ -32,6 +32,7 @@ REQUIRED_SUBSYSTEMS = AUTH EJS LIBBASIC EJSRPC MESSAGING
 #######################
 # Start BINARY SMBSCRIPT
 [BINARY::smbscript]
+INSTALLDIR = BINDIR
 OBJ_FILES = \
 		scripting/ejs/smbscript.o
 REQUIRED_SUBSYSTEMS = EJS LIBBASIC SMBCALLS CONFIG LIBSMB RPC LIBCMDLINE
-- 
cgit 


From 36f64c0f057fc80186e3493f9e723677131c3c34 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Wed, 3 Aug 2005 04:15:16 +0000
Subject: r8979: Bunch of makefile fragment inclusion fixes:  - support
 whitespace  - support "include " keyword  - move swig stuff to .mk file  -
 support autogenerated makefile portions (use "include echo foo|") (This used
 to be commit 43779c09b6a75e03f4cf6e8953a837cddd318aa5)

---
 source4/scripting/config.mk | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/config.mk b/source4/scripting/config.mk
index 779aef0b45..d292e01f1f 100644
--- a/source4/scripting/config.mk
+++ b/source4/scripting/config.mk
@@ -11,3 +11,26 @@ REQUIRED_SUBSYSTEMS = LIBTDB
 REQUIRED_SUBSYSTEMS = LIBCLI NDR_MISC LIBBASIC CONFIG RPC_NDR_SAMR RPC_NDR_LSA
 # End LIBRARY swig_dcerpc
 #######################
+
+# Swig extensions
+swig: scripting/swig/_tdb.so scripting/swig/_dcerpc.so
+
+scripting/swig/tdb_wrap.c: scripting/swig/tdb.i
+	swig -python scripting/swig/tdb.i
+
+scripting/swig/_tdb.so: scripting/swig/tdb_wrap.o $(LIBRARY_swig_tdb_DEPEND_LIST)
+	$(SHLD) $(SHLD_FLAGS) -o scripting/swig/_tdb.so scripting/swig/tdb_wrap.o \
+		$(LIBRARY_swig_tdb_SHARED_LINK_LIST) $(LIBRARY_swig_tdb_SHARED_LINK_FLAGS)
+
+SWIG_INCLUDES = librpc/gen_ndr/samr.i librpc/gen_ndr/lsa.i librpc/gen_ndr/spoolss.i
+
+scripting/swig/dcerpc_wrap.c: scripting/swig/dcerpc.i scripting/swig/samba.i scripting/swig/status_codes.i $(SWIG_INCLUDES)
+	swig -python scripting/swig/dcerpc.i
+
+scripting/swig/_dcerpc.so: scripting/swig/dcerpc_wrap.o $(LIBRARY_swig_dcerpc_DEPEND_LIST)
+	$(SHLD) $(SHLD_FLAGS) -o scripting/swig/_dcerpc.so scripting/swig/dcerpc_wrap.o $(LIBRARY_swig_dcerpc_SHARED_LINK_LIST) $(LIBRARY_swig_dcerpc_SHARED_LINK_FLAGS)
+
+swig_clean:
+	-rm -f scripting/swig/_tdb.so scripting/swig/tdb.pyc \
+		scripting/swig/tdb.py scripting/swig/tdb_wrap.c \
+		scripting/swig/tdb_wrap.o
-- 
cgit 


From 7facdcc161b75c7a3a85a0f6380f5b83394183c4 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Wed, 3 Aug 2005 05:28:08 +0000
Subject: r8985: Automatically generate make dependency rules for the asn1 and
 error table files.

This removes the need for HEIMDAL_EXTERNAL
(This used to be commit 2f481ac93c0151b82dab737d49ae8d0d3cbbbbbe)
---
 source4/scripting/config.mk | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/config.mk b/source4/scripting/config.mk
index d292e01f1f..9e6be54457 100644
--- a/source4/scripting/config.mk
+++ b/source4/scripting/config.mk
@@ -31,6 +31,4 @@ scripting/swig/_dcerpc.so: scripting/swig/dcerpc_wrap.o $(LIBRARY_swig_dcerpc_DE
 	$(SHLD) $(SHLD_FLAGS) -o scripting/swig/_dcerpc.so scripting/swig/dcerpc_wrap.o $(LIBRARY_swig_dcerpc_SHARED_LINK_LIST) $(LIBRARY_swig_dcerpc_SHARED_LINK_FLAGS)
 
 swig_clean:
-	-rm -f scripting/swig/_tdb.so scripting/swig/tdb.pyc \
-		scripting/swig/tdb.py scripting/swig/tdb_wrap.c \
-		scripting/swig/tdb_wrap.o
+	-rm -f scripting/swig/_tdb.so scripting/swig/tdb.pyc scripting/swig/tdb.py scripting/swig/tdb_wrap.c scripting/swig/tdb_wrap.o
-- 
cgit 


From 2a533ec684c8297f893fdd23e919937d92c58c15 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Thu, 4 Aug 2005 16:10:13 +0000
Subject: r9059: add a basic credentials object for mimir (This used to be
 commit 36a9277e878d4db599fcfc02b96d2aaeac0b74dd)

---
 source4/scripting/ejs/config.mk        |   1 +
 source4/scripting/ejs/smbcalls.c       |   1 +
 source4/scripting/ejs/smbcalls_creds.c | 107 +++++++++++++++++++++++++++++++++
 3 files changed, 109 insertions(+)
 create mode 100644 source4/scripting/ejs/smbcalls_creds.c

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/config.mk b/source4/scripting/ejs/config.mk
index 8eced504ed..191b139c66 100644
--- a/source4/scripting/ejs/config.mk
+++ b/source4/scripting/ejs/config.mk
@@ -24,6 +24,7 @@ OBJ_FILES = \
 		scripting/ejs/smbcalls_string.o \
 		scripting/ejs/smbcalls_rand.o \
 		scripting/ejs/smbcalls_sys.o \
+		scripting/ejs/smbcalls_creds.o \
 		scripting/ejs/mprutil.o
 REQUIRED_SUBSYSTEMS = AUTH EJS LIBBASIC EJSRPC MESSAGING
 # End SUBSYSTEM SMBCALLS
diff --git a/source4/scripting/ejs/smbcalls.c b/source4/scripting/ejs/smbcalls.c
index 59e5b17034..4b03e2f404 100644
--- a/source4/scripting/ejs/smbcalls.c
+++ b/source4/scripting/ejs/smbcalls.c
@@ -127,6 +127,7 @@ void smb_setup_ejs_functions(void)
 	smb_setup_ejs_string();
 	smb_setup_ejs_random();
 	smb_setup_ejs_system();
+	smb_setup_ejs_credentials();
 
 	ejsDefineCFunction(-1, "typeof", ejs_typeof, NULL, MPR_VAR_SCRIPT_HANDLE);
 	ejsDefineStringCFunction(-1, "libinclude", ejs_libinclude, NULL, MPR_VAR_SCRIPT_HANDLE);
diff --git a/source4/scripting/ejs/smbcalls_creds.c b/source4/scripting/ejs/smbcalls_creds.c
new file mode 100644
index 0000000000..eb937aebb6
--- /dev/null
+++ b/source4/scripting/ejs/smbcalls_creds.c
@@ -0,0 +1,107 @@
+/* 
+   Unix SMB/CIFS implementation.
+
+   provide hooks credentials calls
+
+   Copyright (C) Andrew Tridgell 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 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.
+*/
+
+#include "includes.h"
+#include "scripting/ejs/smbcalls.h"
+#include "lib/appweb/ejs/ejs.h"
+
+/*
+  helper function to get the local objects credentials ptr
+*/
+static struct cli_credentials *ejs_creds_get_credentials(int eid)
+{
+	struct cli_credentials *creds = mprGetThisPtr(eid, "creds");
+	if (creds == NULL) {
+		ejsSetErrorMsg(eid, "NULL ejs credentials");
+	}
+	return creds;
+}
+
+/*
+  get a domain
+*/
+static int ejs_creds_get_domain(MprVarHandle eid, int argc, struct MprVar **argv)
+{
+	struct cli_credentials *creds = ejs_creds_get_credentials(eid);
+
+	mpr_Return(eid, mprString(cli_credentials_get_domain(creds)));
+	return 0;
+}
+
+
+static int ejs_creds_get_username(MprVarHandle eid, int argc, struct MprVar **argv)
+{
+	struct cli_credentials *creds = ejs_creds_get_credentials(eid);
+
+	mpr_Return(eid, mprString(cli_credentials_get_username(creds)));
+	return 0;
+}
+
+static int ejs_creds_set_username(MprVarHandle eid, int argc, char **argv)
+{
+	struct cli_credentials *creds = ejs_creds_get_credentials(eid);
+	if (argc != 1) {
+		ejsSetErrorMsg(eid, "bad arguments to set_username");
+		return -1;
+	}
+
+	cli_credentials_set_username(creds, argv[0], CRED_SPECIFIED);
+	mpr_Return(eid, mprCreateBoolVar(True));
+	return 0;
+}
+
+
+/*
+  initialise credentials ejs object
+*/
+static int ejs_credentials_init(MprVarHandle eid, int argc, struct MprVar **argv)
+{
+	struct MprVar *obj = mprInitObject(eid, "credentials", argc, argv);
+	struct cli_credentials *creds;
+
+	creds = cli_credentials_init(mprMemCtx());
+	if (creds == NULL) {
+		return -1;
+	}
+
+	cli_credentials_guess(creds);
+	cli_credentials_set_username(creds, "", CRED_GUESSED);
+	cli_credentials_set_password(creds, "", CRED_GUESSED);
+
+	mprSetPtrChild(obj, "creds", creds);
+
+	/* setup our object methods */
+	mprSetCFunction(obj, "get_domain", ejs_creds_get_domain);
+	mprSetCFunction(obj, "get_username", ejs_creds_get_username);
+	mprSetStringCFunction(obj, "set_username", ejs_creds_set_username);
+
+	return 0;
+}
+
+
+/*
+  setup C functions that be called from ejs
+*/
+void smb_setup_ejs_credentials(void)
+{
+	ejsDefineCFunction(-1, "credentials_init", ejs_credentials_init, NULL, MPR_VAR_SCRIPT_HANDLE);
+}
-- 
cgit 


From 1702f5ba11de18e5566ea8b28c2583ea73ba8b65 Mon Sep 17 00:00:00 2001
From: Rafal Szczesniak <mimir@samba.org>
Date: Thu, 4 Aug 2005 19:59:57 +0000
Subject: r9070: More fields in ejs credentials object.

rafal
(This used to be commit e819c035f79477b5dd8ee62292a18c9e8532c9f7)
---
 source4/scripting/ejs/smbcalls_creds.c | 56 ++++++++++++++++++++++++++++++++++
 1 file changed, 56 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_creds.c b/source4/scripting/ejs/smbcalls_creds.c
index eb937aebb6..546ae84d17 100644
--- a/source4/scripting/ejs/smbcalls_creds.c
+++ b/source4/scripting/ejs/smbcalls_creds.c
@@ -48,6 +48,26 @@ static int ejs_creds_get_domain(MprVarHandle eid, int argc, struct MprVar **argv
 }
 
 
+/*
+  set a domain
+*/
+static int ejs_creds_set_domain(MprVarHandle eid, int argc, char **argv)
+{
+	struct cli_credentials *creds = ejs_creds_get_credentials(eid);
+	if (argc != 1) {
+		ejsSetErrorMsg(eid, "bad arguments to set_domain");
+		return -1;
+	}
+
+	cli_credentials_set_domain(creds, argv[0], CRED_SPECIFIED);
+	mpr_Return(eid, mprCreateBoolVar(True));
+	return 0;
+}
+
+
+/*
+  get a username
+*/
 static int ejs_creds_get_username(MprVarHandle eid, int argc, struct MprVar **argv)
 {
 	struct cli_credentials *creds = ejs_creds_get_credentials(eid);
@@ -56,6 +76,10 @@ static int ejs_creds_get_username(MprVarHandle eid, int argc, struct MprVar **ar
 	return 0;
 }
 
+
+/*
+  set a username
+*/
 static int ejs_creds_set_username(MprVarHandle eid, int argc, char **argv)
 {
 	struct cli_credentials *creds = ejs_creds_get_credentials(eid);
@@ -70,6 +94,35 @@ static int ejs_creds_set_username(MprVarHandle eid, int argc, char **argv)
 }
 
 
+/*
+  get user password
+*/
+static int ejs_creds_get_password(MprVarHandle eid, int argc, struct MprVar **argv)
+{
+	struct cli_credentials *creds = ejs_creds_get_credentials(eid);
+	
+	mpr_Return(eid, mprString(cli_credentials_get_password(creds)));
+	return 0;
+}
+
+
+/*
+  set user password
+*/
+static int ejs_creds_set_password(MprVarHandle eid, int argc, char **argv)
+{
+	struct cli_credentials *creds = ejs_creds_get_credentials(eid);
+	if (argc != 1) {
+		ejsSetErrorMsg(eid, "bad arguments to set_password");
+		return -1;
+	}
+
+	cli_credentials_set_password(creds, argv[0], CRED_SPECIFIED);
+	mpr_Return(eid, mprCreateBoolVar(True));
+	return 0;
+}
+
+
 /*
   initialise credentials ejs object
 */
@@ -91,8 +144,11 @@ static int ejs_credentials_init(MprVarHandle eid, int argc, struct MprVar **argv
 
 	/* setup our object methods */
 	mprSetCFunction(obj, "get_domain", ejs_creds_get_domain);
+	mprSetStringCFunction(obj, "set_domain", ejs_creds_set_domain);
 	mprSetCFunction(obj, "get_username", ejs_creds_get_username);
 	mprSetStringCFunction(obj, "set_username", ejs_creds_set_username);
+	mprSetCFunction(obj, "get_password", ejs_creds_get_password);
+	mprSetStringCFunction(obj, "set_password", ejs_creds_set_password);
 
 	return 0;
 }
-- 
cgit 


From c11e266cba9e850382f5c5e4a0d927b183906e66 Mon Sep 17 00:00:00 2001
From: Rafal Szczesniak <mimir@samba.org>
Date: Thu, 4 Aug 2005 20:22:25 +0000
Subject: r9071: Set real and workstation fields in ejs credentials object.

rafal
(This used to be commit eb7a5d09c7a469f94357434c6dadbdf54b52d5db)
---
 source4/scripting/ejs/smbcalls_creds.c | 62 ++++++++++++++++++++++++++++++++++
 1 file changed, 62 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_creds.c b/source4/scripting/ejs/smbcalls_creds.c
index 546ae84d17..61a5139cda 100644
--- a/source4/scripting/ejs/smbcalls_creds.c
+++ b/source4/scripting/ejs/smbcalls_creds.c
@@ -123,6 +123,64 @@ static int ejs_creds_set_password(MprVarHandle eid, int argc, char **argv)
 }
 
 
+/*
+  set realm
+*/
+static int ejs_creds_set_realm(MprVarHandle eid, int argc, char **argv)
+{
+	struct cli_credentials *creds = ejs_creds_get_credentials(eid);
+	if (argc != 1) {
+		ejsSetErrorMsg(eid, "bad arguments to set_realm");
+		return -1;
+	}
+
+	cli_credentials_set_realm(creds, argv[0], CRED_SPECIFIED);
+	mpr_Return(eid, mprCreateBoolVar(True));
+	return 0;
+}
+
+
+/*
+  get realm
+*/
+static int ejs_creds_get_realm(MprVarHandle eid, int argc, struct MprVar **argv)
+{
+	struct cli_credentials *creds = ejs_creds_get_credentials(eid);
+	
+	mpr_Return(eid, mprString(cli_credentials_get_realm(creds)));
+	return 0;
+}
+
+
+/*
+  set workstation
+*/
+static int ejs_creds_set_workstation(MprVarHandle eid, int argc, char **argv)
+{
+	struct cli_credentials *creds = ejs_creds_get_credentials(eid);
+	if (argc != 1) {
+		ejsSetErrorMsg(eid, "bad arguments to set_workstation");
+		return -1;
+	}
+	
+	cli_credentials_set_workstation(creds, argv[0], CRED_SPECIFIED);
+	mpr_Return(eid, mprCreateBoolVar(True));
+	return 0;
+}
+
+
+/*
+  get workstation
+*/
+static int ejs_creds_get_workstation(MprVarHandle eid, int argc, struct MprVar **argv)
+{
+	struct cli_credentials *creds = ejs_creds_get_credentials(eid);
+	
+	mpr_Return(eid, mprString(cli_credentials_get_workstation(creds)));
+	return 0;
+}
+
+
 /*
   initialise credentials ejs object
 */
@@ -149,6 +207,10 @@ static int ejs_credentials_init(MprVarHandle eid, int argc, struct MprVar **argv
 	mprSetStringCFunction(obj, "set_username", ejs_creds_set_username);
 	mprSetCFunction(obj, "get_password", ejs_creds_get_password);
 	mprSetStringCFunction(obj, "set_password", ejs_creds_set_password);
+	mprSetCFunction(obj, "get_realm", ejs_creds_get_realm);
+	mprSetStringCFunction(obj, "set_realm", ejs_creds_set_realm);
+	mprSetCFunction(obj, "get_workstation", ejs_creds_get_workstation);
+	mprSetStringCFunction(obj, "set_workstation", ejs_creds_set_workstation);
 
 	return 0;
 }
-- 
cgit 


From 84da1a1050ee0f0cf5b2ecfec78291424b648c30 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Fri, 5 Aug 2005 00:31:06 +0000
Subject: r9082: added the ECMA functions encodeURIComponent() and
 decodeURIComponent(), which I am using as part of my object linearisation
 code (This used to be commit f91f705a143b24c2e01b9176850a7089e1a99b86)

---
 source4/scripting/ejs/smbcalls_string.c | 81 +++++++++++++++++++++++++++++++++
 1 file changed, 81 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_string.c b/source4/scripting/ejs/smbcalls_string.c
index cd5db1f574..b4c85dbd28 100644
--- a/source4/scripting/ejs/smbcalls_string.c
+++ b/source4/scripting/ejs/smbcalls_string.c
@@ -336,6 +336,85 @@ static int ejs_vsprintf(MprVarHandle eid, int argc, struct MprVar **argv)
 	return ret;
 }
 
+
+/*
+  encode a string, replacing all non-alpha with %02x form
+*/
+static int ejs_encodeURIComponent(MprVarHandle eid, int argc, char **argv)
+{
+	int i, j, count=0;
+	const char *s;
+	char *ret;
+	if (argc != 1) {
+		ejsSetErrorMsg(eid, "encodeURIComponent invalid arguments");
+		return -1;
+	}
+	
+	s = argv[0];
+
+	for (i=0;s[i];i++) {
+		if (!isalnum(s[i])) count++;
+	}
+	
+	ret = talloc_size(mprMemCtx(), i + count*2 + 1);
+	if (ret == NULL) {
+		return -1;
+	}
+	for (i=j=0;s[i];i++,j++) {
+		if (!isalnum(s[i])) {
+			snprintf(ret+j, 4, "%%%02X", (unsigned)s[i]);
+			j += 2;
+		} else {
+			ret[j] = s[i];
+		}
+	}
+	ret[j] = 0;
+	mpr_Return(eid, mprString(ret));
+	talloc_free(ret);
+	return 0;
+}
+
+/*
+  encode a string, replacing all non-alpha of %02x form
+*/
+static int ejs_decodeURIComponent(MprVarHandle eid, int argc, char **argv)
+{
+	int i, j, count=0;
+	const char *s;
+	char *ret;
+	if (argc != 1) {
+		ejsSetErrorMsg(eid, "decodeURIComponent invalid arguments");
+		return -1;
+	}
+	
+	s = argv[0];
+
+	ret = talloc_size(mprMemCtx(), strlen(s) + 1);
+	if (ret == NULL) {
+		return -1;
+	}
+
+	for (i=j=0;s[i];i++,j++) {
+		if (s[i] == '%') {
+			unsigned c;
+			if (sscanf(s+i+1, "%02X", &c) != 1) {
+				ejsSetErrorMsg(eid, "decodeURIComponent bad format");
+				return -1;
+			}
+			ret[j] = c;
+			i += 2;
+		} else {
+			ret[j] = s[i];
+		}
+		if (!isalnum(s[i])) count++;
+	}
+	
+	ret[j] = 0;
+	mpr_Return(eid, mprString(ret));
+	talloc_free(ret);
+	return 0;
+}
+
 /*
   initialise string ejs subsystem
 */
@@ -351,6 +430,8 @@ static int ejs_string_init(MprVarHandle eid, int argc, struct MprVar **argv)
 	mprSetCFunction(obj, "join", ejs_join);
 	mprSetCFunction(obj, "sprintf", ejs_sprintf);
 	mprSetCFunction(obj, "vsprintf", ejs_vsprintf);
+	mprSetStringCFunction(obj, "encodeURIComponent", ejs_encodeURIComponent);
+	mprSetStringCFunction(obj, "decodeURIComponent", ejs_decodeURIComponent);
 
 	return 0;
 }
-- 
cgit 


From 1b42035bd904f192d5fcc325c6e1d23daeead77c Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Fri, 5 Aug 2005 04:36:31 +0000
Subject: r9096: Spelling. (This used to be commit
 c61b29bdf043792d885528bd7666c9bea9107928)

---
 source4/scripting/ejs/mprutil.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/mprutil.c b/source4/scripting/ejs/mprutil.c
index 5a29ddc144..657078e7c7 100644
--- a/source4/scripting/ejs/mprutil.c
+++ b/source4/scripting/ejs/mprutil.c
@@ -403,7 +403,7 @@ void mpr_ReturnString(int eid, const char *s)
 }
 
 /*
-  get a poiner in the current object
+  get a pointer in the current object
 */
 void *mprGetThisPtr(int eid, const char *name)
 {
-- 
cgit 


From beed5b8532400d79fd40fc53ebae1666adc9af34 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Fri, 5 Aug 2005 15:30:33 +0000
Subject: r9119: added a lp.categories() call in the loadparm js object, to
 allow retrieval of the smb.conf parameter categories. This will make writing
 a smb.conf editor easier. (This used to be commit
 8db549b1506b5260c9eb16f40bbdae6a7c006fa2)

---
 source4/scripting/ejs/smbcalls_config.c | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_config.c b/source4/scripting/ejs/smbcalls_config.c
index ddb06aa7d7..a69c3d81f9 100644
--- a/source4/scripting/ejs/smbcalls_config.c
+++ b/source4/scripting/ejs/smbcalls_config.c
@@ -44,6 +44,27 @@ static int ejs_lpServices(MprVarHandle eid, int argc, char **argv)
 }
 
 
+/*
+  return a list of parameter categories
+*/
+static int ejs_lpCategories(MprVarHandle eid, int argc, char **argv)
+{
+	struct parm_struct *parm_table = lp_parm_table();
+	int i;
+	const char **list = NULL;
+	if (argc != 0) return -1;
+	
+	for (i=0;parm_table[i].label;i++) {
+		if (parm_table[i].class == P_SEPARATOR) {
+			list = str_list_add(list, parm_table[i].label);
+		}
+	}
+	talloc_steal(mprMemCtx(), list);
+	mpr_Return(eid, mprList("categories", list));
+	return 0;
+}
+
+
 /*
   allow access to loadparm variables from inside ejs scripts in swat
   
@@ -185,6 +206,7 @@ static int ejs_loadparm_init(MprVarHandle eid, int argc, struct MprVar **argv)
 	mprSetStringCFunction(obj, "set", ejs_lpSet);
 	mprSetStringCFunction(obj, "reload", ejs_lpReload);
 	mprSetStringCFunction(obj, "services", ejs_lpServices);
+	mprSetStringCFunction(obj, "categories", ejs_lpCategories);
 	return 0;
 }
 
-- 
cgit 


From b056c7ac3460db7c893527b55305d17417ae5e63 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Fri, 5 Aug 2005 15:53:04 +0000
Subject: r9123: Add ejs_pull_DATA_BLOB() and ejs_pull_BOOL() although leave
 DATA_BLOB unimplemented for the moment. (This used to be commit
 0e022f8d45a99f0edbbd6369dbf41f73906c6fc4)

---
 source4/scripting/ejs/ejsrpc.c | 26 ++++++++++++++++++++++++++
 source4/scripting/ejs/ejsrpc.h |  9 ++++++++-
 2 files changed, 34 insertions(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/ejsrpc.c b/source4/scripting/ejs/ejsrpc.c
index 5e81e21e4f..f3abc3c34a 100644
--- a/source4/scripting/ejs/ejsrpc.c
+++ b/source4/scripting/ejs/ejsrpc.c
@@ -292,3 +292,29 @@ NTSTATUS ejs_push_lsa_String(struct ejs_rpc *ejs,
 	return ejs_push_string(ejs, v, name, r->string);
 }
 
+NTSTATUS ejs_pull_DATA_BLOB(struct ejs_rpc *ejs, 
+			    struct MprVar *v, const char *name, DATA_BLOB *r)
+{
+	return NT_STATUS_NOT_IMPLEMENTED;
+}
+
+NTSTATUS ejs_push_DATA_BLOB(struct ejs_rpc *ejs, 
+			    struct MprVar *v, const char *name, 
+			    const DATA_BLOB *r)
+{
+	return NT_STATUS_NOT_IMPLEMENTED;
+}
+
+NTSTATUS ejs_pull_BOOL(struct ejs_rpc *ejs, 
+		       struct MprVar *v, const char *name, BOOL *r)
+{
+	NDR_CHECK(mprGetVar(&v, name));
+	*r = mprVarToBool(v);
+	return NT_STATUS_OK;
+}
+
+NTSTATUS ejs_push_BOOL(struct ejs_rpc *ejs, 
+		       struct MprVar *v, const char *name, const BOOL *r)
+{
+	return mprSetVar(v, name, mprCreateBoolVar(*r));
+}
diff --git a/source4/scripting/ejs/ejsrpc.h b/source4/scripting/ejs/ejsrpc.h
index dbd147fe1d..8bd735c739 100644
--- a/source4/scripting/ejs/ejsrpc.h
+++ b/source4/scripting/ejs/ejsrpc.h
@@ -95,7 +95,14 @@ NTSTATUS ejs_push_dom_sid(struct ejs_rpc *ejs,
 			  struct MprVar *v, const char *name, const struct dom_sid *r);
 NTSTATUS ejs_push_null(struct ejs_rpc *ejs, struct MprVar *v, const char *name);
 BOOL ejs_pull_null(struct ejs_rpc *ejs, struct MprVar *v, const char *name);
-
+NTSTATUS ejs_pull_DATA_BLOB(struct ejs_rpc *ejs, 
+			    struct MprVar *v, const char *name, DATA_BLOB *r);
+NTSTATUS ejs_push_DATA_BLOB(struct ejs_rpc *ejs, 
+			    struct MprVar *v, const char *name, const DATA_BLOB *r);
+NTSTATUS ejs_pull_BOOL(struct ejs_rpc *ejs, 
+		       struct MprVar *v, const char *name, BOOL *r);
+NTSTATUS ejs_push_BOOL(struct ejs_rpc *ejs, 
+		       struct MprVar *v, const char *name, const BOOL *r);
 
 #define EJS_ALLOC_SIZE(ejs, s, size) do { \
   (s) = talloc_size(ejs, size); \
-- 
cgit 


From 67180c4ccdab56fe1f41b293f6bbea1f955e3d91 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Fri, 5 Aug 2005 19:02:01 +0000
Subject: r9131: started adding the server side code for "AJAJ" (asynchronous
 javascript and javascript)

This is rather like AJAX, but passes around javascript objects between
the client and server, taking advantage of the fact that we have the
same language on both client and server.
(This used to be commit 5f9e00fb7f36f3351f40da93acfe47c911f6f65f)
---
 source4/scripting/libjs/encoder.js     | 100 +++++++++++++++++++++++++++++++++
 source4/scripting/libjs/server_call.js |  95 +++++++++++++++++++++++++++++++
 2 files changed, 195 insertions(+)
 create mode 100644 source4/scripting/libjs/encoder.js
 create mode 100644 source4/scripting/libjs/server_call.js

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/encoder.js b/source4/scripting/libjs/encoder.js
new file mode 100644
index 0000000000..65b2854d30
--- /dev/null
+++ b/source4/scripting/libjs/encoder.js
@@ -0,0 +1,100 @@
+/*
+	server side js functions for encoding/decoding objects into linear strings
+
+	Copyright Andrew Tridgell 2005
+	released under the GNU GPL Version 2 or later
+*/
+/*
+	usage:
+
+	  enc = encodeObject(obj);
+	  obj = decodeObject(enc);
+
+       The encoded format of the object is a string that is safe to
+       use in URLs
+
+       Note that only data elements are encoded, not functions
+*/
+
+function __count_members(o) {
+	var i, count = 0;
+	for (i in o) { 
+		count++;  
+	}
+	return count;
+}
+
+function __replace(str, old, rep) {
+	var s = string_init();
+	var a = s.split(old, str);
+	var j = s.join(rep, a);
+	return s.join(rep, a);
+}
+
+function encodeObject(o) {
+	var s = string_init();
+	var i, r = s.sprintf("%u:", __count_members(o));
+	for (i in o) {
+		var t = typeof(o[i]);
+		if (t == 'object' && o[i] == null) {
+			t = 'null';
+		}
+		if (t == 'object') {
+			r = s.sprintf("%s%s:%s:%s", r, i, t, encodeObject(o[i]));
+		} else if (t == "string") {
+			var enc = s.encodeURIComponent(o[i]);
+			var rep = __replace(enc, '%', '#');
+			r = s.sprintf("%s%s:%s:%s:", 
+				      r, i, t, __replace(s.encodeURIComponent(o[i]),'%','#'));
+		} else if (t == "boolean" || t == "number") {
+			r = s.sprintf("%s%s:%s:%s:", r, i, t, "" + o[i]);
+		} else if (t == "undefined" || t == "null") {
+			r = s.sprintf("%s%s:%s:", r, i, t);
+		} else {
+			println("Unable to linearise type " + t);
+		}
+	}
+	return r;
+}
+
+function decodeObjectArray(a) {
+	var s = string_init();
+	var o = new Object();
+	var i, count = a[a.i]; a.i++;
+	for (i=0;i<count;i++) {
+		var name  = a[a.i]; a.i++;
+		var type  = a[a.i]; a.i++;
+		var value;
+		if (type == 'object') {
+			o[name] = decodeObjectArray(a);
+		} else if (type == "string") {
+			value = s.decodeURIComponent(__replace(a[a.i],'#','%')); a.i++;
+			o[name] = value;
+		} else if (type == "boolean") {
+			value = a[a.i]; a.i++;
+			if (value == 'true') {
+				o[name] = true;
+			} else {
+				o[name] = false;
+			}
+		} else if (type == "undefined") {
+			o[name] = undefined;
+		} else if (type == "null") {
+			o[name] = null;
+		} else if (type == "number") {
+			value = a[a.i]; a.i++;
+			o[name] = value + 0;
+		} else {
+			println("Unable to delinearise type " + t);
+			assert(t == "supported type");
+		}
+	}
+	return o;
+}
+
+function decodeObject(str) {
+	var s = string_init();
+	var a = s.split(':', str);
+	a.i = 0;
+	return decodeObjectArray(a);
+}
diff --git a/source4/scripting/libjs/server_call.js b/source4/scripting/libjs/server_call.js
new file mode 100644
index 0000000000..1ed3053206
--- /dev/null
+++ b/source4/scripting/libjs/server_call.js
@@ -0,0 +1,95 @@
+/*
+	server side js functions for handling async calls from js clients
+
+	Copyright Andrew Tridgell 2005
+	released under the GNU GPL Version 2 or later
+*/
+
+libinclude("encoder.js");
+
+/*
+  a remote printf, for displaying stuff on smbd stdout
+*/
+function __server_printf()
+{
+	print(vsprintf(arguments));
+	return undefined;
+}
+
+/*
+  register a new call
+*/
+function __register_call(name, func)
+{
+	var c = this;
+	c.calls[name] = func;
+}
+
+/*
+  run a call sent from the client, and output the returned object (if any)
+*/
+function __run_call() {
+	var c = this;
+	var name = form['func'];
+	if (name == undefined) {
+		println("no function name given in run_call");
+		return;
+	}
+	var args = form['args'];
+	if (args == undefined) {
+		println("no function arguments given in run_call");
+		return;
+	}
+	args = decodeObject(args);
+	if (c.calls[name] == undefined) {
+		println("undefined remote call " + name);
+		return;
+	}
+	var f = c.calls[name];
+	var res;
+	/* oh what a hack - should write a varargs ejs helper */
+	if (args.length == 0) {
+		res = f();
+	} else if (args.length == 1) {
+		res = f(args[0]);
+	} else if (args.length == 2) {
+		res = f(args[0], args[1]);
+	} else if (args.length == 3) {
+		res = f(args[0], args[1], args[2]);
+	} else if (args.length == 4) {
+		res = f(args[0], args[1], args[2], args[3]);
+	} else if (args.length == 5) {
+		res = f(args[0], args[1], args[2], args[3], args[4]);
+	} else if (args.length == 6) {
+		res = f(args[0], args[1], args[2], args[3], args[4], args[5]);
+	} else if (args.length == 7) {
+		res = f(args[0], args[1], args[2], args[3], args[4], args[5], args[6]);
+	} else if (args.length == 8) {
+		res = f(args[0], args[1], args[2], args[3], args[4], args[5], args[6], args[7]);
+	} else {
+		println("too many arguments for remote call: " + name);
+		return;
+	}
+	var repobj = new Object();
+	repobj.res = res;
+	write(encodeObject(repobj));
+}
+
+
+
+/*
+  initialise a server call object
+*/
+function servCallObj()
+{
+	var c = new Object();
+	c.add = __register_call;
+	c.run = __run_call;
+	c.calls = new Object();
+
+	/* add some basic calls */
+	c.add('printf', __server_printf);
+
+	return c;
+}
+
-- 
cgit 


From b99bca56570c0b146128bc243d770bb354ae0cd5 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Fri, 5 Aug 2005 19:02:28 +0000
Subject: r9132: 'pointer' is better for typedef than 'C pointer' (This used to
 be commit f91f5eeac9a8b62928233c3925c8ad1b99b32b4e)

---
 source4/scripting/ejs/smbcalls.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls.c b/source4/scripting/ejs/smbcalls.c
index 4b03e2f404..cc4a3d703a 100644
--- a/source4/scripting/ejs/smbcalls.c
+++ b/source4/scripting/ejs/smbcalls.c
@@ -45,7 +45,7 @@ static int ejs_typeof(MprVarHandle eid, int argc, struct MprVar **argv)
 		{ MPR_TYPE_FUNCTION,         "function" },
 		{ MPR_TYPE_STRING,           "string" },
 		{ MPR_TYPE_STRING_CFUNCTION, "function" },
-		{ MPR_TYPE_PTR,              "C pointer" }
+		{ MPR_TYPE_PTR,              "pointer" }
 	};
 	int i;
 	const char *type = NULL;
-- 
cgit 


From 31fa87f23b68785665411ab49dee5f920b239a5c Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Fri, 5 Aug 2005 23:01:57 +0000
Subject: r9146: - enable winreg pipe from ejs

- map the result code from rpc calls into the ejs objects

- treat winreg_String like lsa_String, hiding the length elements
(This used to be commit 2f6311c9a34db46f9a4b1f31e865a373b15702bf)
---
 source4/scripting/ejs/ejsrpc.c | 31 +++++++++++++++++++++++++++++++
 source4/scripting/ejs/ejsrpc.h |  4 ++++
 2 files changed, 35 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/ejsrpc.c b/source4/scripting/ejs/ejsrpc.c
index f3abc3c34a..f107c84b73 100644
--- a/source4/scripting/ejs/ejsrpc.c
+++ b/source4/scripting/ejs/ejsrpc.c
@@ -25,6 +25,7 @@
 #include "scripting/ejs/smbcalls.h"
 #include "librpc/gen_ndr/ndr_security.h"
 #include "librpc/gen_ndr/ndr_lsa.h"
+#include "librpc/gen_ndr/ndr_winreg.h"
 #include "scripting/ejs/ejsrpc.h"
 
 /*
@@ -182,6 +183,18 @@ NTSTATUS ejs_push_NTTIME(struct ejs_rpc *ejs,
 	return ejs_push_hyper(ejs, v, name, r);
 }
 
+NTSTATUS ejs_push_WERROR(struct ejs_rpc *ejs, 
+			struct MprVar *v, const char *name, const WERROR *r)
+{
+	return ejs_push_string(ejs, v, name, win_errstr(*r));
+}
+
+NTSTATUS ejs_push_NTSTATUS(struct ejs_rpc *ejs, 
+			   struct MprVar *v, const char *name, const NTSTATUS *r)
+{
+	return ejs_push_string(ejs, v, name, nt_errstr(*r));
+}
+
 
 /*
   pull a enum from a mpr variable to a C element
@@ -292,6 +305,24 @@ NTSTATUS ejs_push_lsa_String(struct ejs_rpc *ejs,
 	return ejs_push_string(ejs, v, name, r->string);
 }
 
+/*
+  pull a winreg_String
+*/
+NTSTATUS ejs_pull_winreg_String(struct ejs_rpc *ejs, 
+			     struct MprVar *v, const char *name, struct winreg_String *r)
+{
+	return ejs_pull_string(ejs, v, name, &r->name);
+}
+
+/*
+  push a winreg_String
+*/
+NTSTATUS ejs_push_winreg_String(struct ejs_rpc *ejs, 
+			     struct MprVar *v, const char *name, const struct winreg_String *r)
+{
+	return ejs_push_string(ejs, v, name, r->name);
+}
+
 NTSTATUS ejs_pull_DATA_BLOB(struct ejs_rpc *ejs, 
 			    struct MprVar *v, const char *name, DATA_BLOB *r)
 {
diff --git a/source4/scripting/ejs/ejsrpc.h b/source4/scripting/ejs/ejsrpc.h
index 8bd735c739..99da0d35ea 100644
--- a/source4/scripting/ejs/ejsrpc.h
+++ b/source4/scripting/ejs/ejsrpc.h
@@ -95,6 +95,10 @@ NTSTATUS ejs_push_dom_sid(struct ejs_rpc *ejs,
 			  struct MprVar *v, const char *name, const struct dom_sid *r);
 NTSTATUS ejs_push_null(struct ejs_rpc *ejs, struct MprVar *v, const char *name);
 BOOL ejs_pull_null(struct ejs_rpc *ejs, struct MprVar *v, const char *name);
+NTSTATUS ejs_push_WERROR(struct ejs_rpc *ejs, 
+			 struct MprVar *v, const char *name, const WERROR *r);
+NTSTATUS ejs_push_NTSTATUS(struct ejs_rpc *ejs, 
+			 struct MprVar *v, const char *name, const NTSTATUS *r);
 NTSTATUS ejs_pull_DATA_BLOB(struct ejs_rpc *ejs, 
 			    struct MprVar *v, const char *name, DATA_BLOB *r);
 NTSTATUS ejs_push_DATA_BLOB(struct ejs_rpc *ejs, 
-- 
cgit 


From 772d58066dd074b961b39fcdfc01bc956b193cb5 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Sat, 6 Aug 2005 01:09:27 +0000
Subject: r9159: abstract the winreg js functions into a nice library interface
 (This used to be commit 5e398700627fb2c16bf39b9c851f640f5412c7d4)

---
 source4/scripting/libjs/winreg.js | 115 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 115 insertions(+)
 create mode 100644 source4/scripting/libjs/winreg.js

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/winreg.js b/source4/scripting/libjs/winreg.js
new file mode 100644
index 0000000000..129cfe0898
--- /dev/null
+++ b/source4/scripting/libjs/winreg.js
@@ -0,0 +1,115 @@
+/*
+	winreg rpc utility functions 
+	Copyright Andrew Tridgell 2005
+	released under the GNU GPL v2 or later
+*/	
+
+
+/*
+  open a hive
+*/
+function winreg_open_hive(reg, hive)
+{
+	var io = irpcObj();
+	io.input.system_name = NULL;
+	io.input.access_required = reg.SEC_FLAG_MAXIMUM_ALLOWED;
+	var status;
+	if (hive == "HKLM") {
+		status = reg.winreg_OpenHKLM(io);
+	} else if (hive == "HKCR") {
+		status = reg.winreg_OpenHKCR(io);
+	} else if (hive == "HKPD") {
+		status = reg.winreg_OpenHKPD(io);
+	} else if (hive == "HKU") {
+		status = reg.winreg_OpenHKU(io);
+	} else {
+		println("Unknown hive " + hive);
+		return undefined;
+	}
+	if (!status.is_ok) {
+		return undefined;
+	}
+	return io.output.handle;
+}
+
+/*
+  open a handle to a path
+*/
+function winreg_open_path(reg, path)
+{
+	var s = string_init();
+	var i, components = s.split('\\', path);
+	var list = new Object();
+
+	list.length = 0;
+	
+	var handle = winreg_open_hive(reg, components[0]);
+	if (handle == undefined) {
+		return undefined;
+	}
+
+	for (i=1;i<components.length;i++) {
+		io = irpcObj();
+		io.input.handle  = handle;
+		io.input.keyname = components[i];
+		io.input.unknown = 0;
+		io.input.access_mask = reg.SEC_FLAG_MAXIMUM_ALLOWED;
+		var status = reg.winreg_OpenKey(io);
+		if (!status.is_ok) {
+			return undefined;
+		}
+		if (io.output.result != "WERR_OK") {
+			return undefined;
+		}
+
+		handle = io.output.handle;
+	}
+	return handle;
+}
+
+/*
+	return a list of keys for a winreg server given a path
+	usage:
+	   list = winreg_enum_path(reg, path);
+*/
+function winreg_enum_path(reg, path)
+{
+	var list = new Object();
+	list.length = 0;
+	
+	handle = winreg_open_path(reg, path);
+	if (handle == undefined) {
+		return undefined;
+	}
+
+	var io = irpcObj();
+	var wtime = new Object();
+	wtime.low  = 2147483647;
+	wtime.high = 2147483647;
+	var keyname = new Object();
+	keyname.unknown  = 522;
+	keyname.key_name = NULL;
+
+	io.input.handle            = handle;
+	io.input.key_name_len      = 0;
+	io.input.unknown           = 1044;
+	io.input.in_name           = keyname;
+	io.input.class             = "";
+	io.input.last_changed_time = wtime;
+	
+	var idx = 0;
+	for (idx=0;idx >= 0;idx++) {
+		io.input.enum_index        = idx;
+		var status = reg.winreg_EnumKey(io);
+		if (!status.is_ok) return;
+		var out = io.output;
+		if (out.result != "WERR_OK") {
+			return list;
+		}
+
+		list[list.length] = out.out_name.name;
+		list.length++;
+	}
+
+	return list;
+}
-- 
cgit 


From 2ed26253c1cc84fce6d9a00c642f3e7baffb5c80 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Sun, 7 Aug 2005 06:13:55 +0000
Subject: r9171: - support putting a credentials object in a rpc pipe object to
 allow authentication   with other than the command line credentials in a rpc
 pipe (This used to be commit aae05ebc9c3dc7ad367aed09c54b85184ba7a82e)

---
 source4/scripting/ejs/mprutil.c      |  9 ++++-----
 source4/scripting/ejs/smbcalls_rpc.c | 11 ++++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/mprutil.c b/source4/scripting/ejs/mprutil.c
index 657078e7c7..748f28c681 100644
--- a/source4/scripting/ejs/mprutil.c
+++ b/source4/scripting/ejs/mprutil.c
@@ -357,15 +357,14 @@ void mprSetPtrChild(struct MprVar *v, const char *propname, const void *p)
 */
 void *mprGetPtr(struct MprVar *v, const char *propname)
 {
-	struct MprVar *val;
-	val = mprGetProperty(v, propname, NULL);
-	if (val == NULL) {
+	NTSTATUS status = mprGetVar(&v, propname);
+	if (!NT_STATUS_IS_OK(status)) {
 		return NULL;
 	}
-	if (val->type != MPR_TYPE_PTR) {
+	if (v->type != MPR_TYPE_PTR) {
 		return NULL;
 	}
-	return val->ptr;
+	return v->ptr;
 }
 
 /*
diff --git a/source4/scripting/ejs/smbcalls_rpc.c b/source4/scripting/ejs/smbcalls_rpc.c
index 8a08ba0d8d..f5b71b6715 100644
--- a/source4/scripting/ejs/smbcalls_rpc.c
+++ b/source4/scripting/ejs/smbcalls_rpc.c
@@ -109,7 +109,7 @@ static int ejs_rpc_connect(MprVarHandle eid, int argc, char **argv)
 	const struct dcerpc_interface_table *iface;
 	NTSTATUS status;
 	struct dcerpc_pipe *p;
-	struct cli_credentials *creds = cmdline_credentials;
+	struct cli_credentials *creds;
 	struct event_context *ev;
 	struct MprVar *this = mprGetProperty(ejsGetLocalObject(eid), "this", 0);
 
@@ -137,11 +137,14 @@ static int ejs_rpc_connect(MprVarHandle eid, int argc, char **argv)
 		goto done;
 	}
 
+	creds = mprGetPtr(this, "credentials.creds");
+	if (creds == NULL) {
+		creds = cmdline_credentials;
+	}
 	if (creds == NULL) {
 		creds = cli_credentials_init(mprMemCtx());
 		cli_credentials_guess(creds);
-		cli_credentials_set_username(creds, "", CRED_GUESSED);
-		cli_credentials_set_password(creds, "", CRED_GUESSED);
+		cli_credentials_set_anonymous(creds);
 	}
 
 	ev = talloc_find_parent_bytype(mprMemCtx(), struct event_context);
@@ -157,7 +160,6 @@ static int ejs_rpc_connect(MprVarHandle eid, int argc, char **argv)
 	/* by making the pipe a child of the connection variable, it will
 	   auto close when it goes out of scope in the script */
 	mprSetPtrChild(this, "pipe", p);
-	mprSetPtr(this, "iface", iface);
 
 done:
 	mpr_Return(eid, mprNTSTATUS(status));
@@ -353,7 +355,6 @@ done:
 	return 0;
 }
 
-
 /* a list of registered ejs rpc modules */
 static struct ejs_register {
 	struct ejs_register *next, *prev;
-- 
cgit 


From 0c15c024118debc4e87908ed8d23c314f38f28ed Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Sun, 7 Aug 2005 06:19:17 +0000
Subject: r9174: ejs does not include the special variable 'length' in for
 loops over objects, so we need to check for it separately in the object
 lineariser (This used to be commit ea3c3d0a0f79c49c2e93da4956cc509614f92f37)

---
 source4/scripting/libjs/encoder.js | 50 ++++++++++++++++++++++++--------------
 1 file changed, 32 insertions(+), 18 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/encoder.js b/source4/scripting/libjs/encoder.js
index 65b2854d30..24508f3f6b 100644
--- a/source4/scripting/libjs/encoder.js
+++ b/source4/scripting/libjs/encoder.js
@@ -21,6 +21,9 @@ function __count_members(o) {
 	for (i in o) { 
 		count++;  
 	}
+	if (o.length != undefined) {
+		count++;
+	}
 	return count;
 }
 
@@ -31,28 +34,39 @@ function __replace(str, old, rep) {
 	return s.join(rep, a);
 }
 
+function encodeElement(e, name) {
+	var t = typeof(e);
+	var r;
+	var s = string_init();
+	if (t == 'object' && e == null) {
+		t = 'null';
+	}
+	if (t == 'object') {
+		r = s.sprintf("%s:%s:%s", name, t, encodeObject(e));
+	} else if (t == "string") {
+		var enc = s.encodeURIComponent(e);
+		var rep = __replace(enc, '%', '#');
+		r = s.sprintf("%s:%s:%s:", 
+			      name, t, __replace(s.encodeURIComponent(e),'%','#'));
+	} else if (t == "boolean" || t == "number") {
+		r = s.sprintf("%s:%s:%s:", name, t, "" + e);
+	} else if (t == "undefined" || t == "null") {
+		r = s.sprintf("%s:%s:", name, t);
+	} else {
+		println("Unable to linearise type " + t);
+		r = "";
+	}
+	return r;
+}
+
 function encodeObject(o) {
 	var s = string_init();
 	var i, r = s.sprintf("%u:", __count_members(o));
 	for (i in o) {
-		var t = typeof(o[i]);
-		if (t == 'object' && o[i] == null) {
-			t = 'null';
-		}
-		if (t == 'object') {
-			r = s.sprintf("%s%s:%s:%s", r, i, t, encodeObject(o[i]));
-		} else if (t == "string") {
-			var enc = s.encodeURIComponent(o[i]);
-			var rep = __replace(enc, '%', '#');
-			r = s.sprintf("%s%s:%s:%s:", 
-				      r, i, t, __replace(s.encodeURIComponent(o[i]),'%','#'));
-		} else if (t == "boolean" || t == "number") {
-			r = s.sprintf("%s%s:%s:%s:", r, i, t, "" + o[i]);
-		} else if (t == "undefined" || t == "null") {
-			r = s.sprintf("%s%s:%s:", r, i, t);
-		} else {
-			println("Unable to linearise type " + t);
-		}
+		r = r + encodeElement(o[i], i);
+	}
+	if (o.length != undefined) {
+		r = r + encodeElement(o.length, 'length');
 	}
 	return r;
 }
-- 
cgit 


From e49aeef2323b8432133e502152796b97119890d5 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Sun, 7 Aug 2005 07:01:03 +0000
Subject: r9178: remove the old server printf code (This used to be commit
 0b96b3bfe370f5f4e44cc1a2a249f766a04c5b07)

---
 source4/scripting/libjs/server_call.js | 13 -------------
 1 file changed, 13 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/server_call.js b/source4/scripting/libjs/server_call.js
index 1ed3053206..316e764a53 100644
--- a/source4/scripting/libjs/server_call.js
+++ b/source4/scripting/libjs/server_call.js
@@ -7,15 +7,6 @@
 
 libinclude("encoder.js");
 
-/*
-  a remote printf, for displaying stuff on smbd stdout
-*/
-function __server_printf()
-{
-	print(vsprintf(arguments));
-	return undefined;
-}
-
 /*
   register a new call
 */
@@ -86,10 +77,6 @@ function servCallObj()
 	c.add = __register_call;
 	c.run = __run_call;
 	c.calls = new Object();
-
-	/* add some basic calls */
-	c.add('printf', __server_printf);
-
 	return c;
 }
 
-- 
cgit 


From 2b31c6d9d0d853d6be0a7e4f42977029389fc5ce Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Mon, 8 Aug 2005 03:20:17 +0000
Subject: r9210: fixed support for a credentials element in a rpc object in ejs
 to not give lots of warnings of missing properties (This used to be commit
 15737abd747cea561eca92103919f4adc22c6fcd)

---
 source4/scripting/ejs/mprutil.c      | 9 +++++----
 source4/scripting/ejs/smbcalls_rpc.c | 7 +++++--
 2 files changed, 10 insertions(+), 6 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/mprutil.c b/source4/scripting/ejs/mprutil.c
index 748f28c681..657078e7c7 100644
--- a/source4/scripting/ejs/mprutil.c
+++ b/source4/scripting/ejs/mprutil.c
@@ -357,14 +357,15 @@ void mprSetPtrChild(struct MprVar *v, const char *propname, const void *p)
 */
 void *mprGetPtr(struct MprVar *v, const char *propname)
 {
-	NTSTATUS status = mprGetVar(&v, propname);
-	if (!NT_STATUS_IS_OK(status)) {
+	struct MprVar *val;
+	val = mprGetProperty(v, propname, NULL);
+	if (val == NULL) {
 		return NULL;
 	}
-	if (v->type != MPR_TYPE_PTR) {
+	if (val->type != MPR_TYPE_PTR) {
 		return NULL;
 	}
-	return v->ptr;
+	return val->ptr;
 }
 
 /*
diff --git a/source4/scripting/ejs/smbcalls_rpc.c b/source4/scripting/ejs/smbcalls_rpc.c
index f5b71b6715..cbb8d9dd9d 100644
--- a/source4/scripting/ejs/smbcalls_rpc.c
+++ b/source4/scripting/ejs/smbcalls_rpc.c
@@ -112,6 +112,7 @@ static int ejs_rpc_connect(MprVarHandle eid, int argc, char **argv)
 	struct cli_credentials *creds;
 	struct event_context *ev;
 	struct MprVar *this = mprGetProperty(ejsGetLocalObject(eid), "this", 0);
+	struct MprVar *credentials;
 
 	/* validate arguments */
 	if (argc < 1) {
@@ -137,8 +138,10 @@ static int ejs_rpc_connect(MprVarHandle eid, int argc, char **argv)
 		goto done;
 	}
 
-	creds = mprGetPtr(this, "credentials.creds");
-	if (creds == NULL) {
+	credentials = mprGetProperty(this, "credentials", NULL);
+	if (credentials) {
+		creds = mprGetPtr(credentials, "creds");
+	} else {
 		creds = cmdline_credentials;
 	}
 	if (creds == NULL) {
-- 
cgit 


From 924b3cc953182c4f72d6356b7209c4ccb5647fb1 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Mon, 8 Aug 2005 22:29:44 +0000
Subject: r9218: make the winreg library code handle arbitrary paths more
 efficiently and more conveniently (caller doesn't need to know the hive names
 now) (This used to be commit dadd7e22fb439f7b18c429a95c75902e4741ba8d)

---
 source4/scripting/libjs/winreg.js | 54 +++++++++++++++++++++++++++------------
 1 file changed, 38 insertions(+), 16 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/winreg.js b/source4/scripting/libjs/winreg.js
index 129cfe0898..703b8da2a7 100644
--- a/source4/scripting/libjs/winreg.js
+++ b/source4/scripting/libjs/winreg.js
@@ -42,29 +42,48 @@ function winreg_open_path(reg, path)
 	var list = new Object();
 
 	list.length = 0;
+
+	/* cope with a leading slash */
+	if (components[0] == '') {
+		for (i=0;i<(components.length-1);i++) {
+			components[i] = components[i+1];
+		}
+		components.length--;
+	}
 	
+	if (components.length == 0) {
+		return undefined;
+	}
+
 	var handle = winreg_open_hive(reg, components[0]);
 	if (handle == undefined) {
 		return undefined;
 	}
 
-	for (i=1;i<components.length;i++) {
-		io = irpcObj();
-		io.input.handle  = handle;
-		io.input.keyname = components[i];
-		io.input.unknown = 0;
-		io.input.access_mask = reg.SEC_FLAG_MAXIMUM_ALLOWED;
-		var status = reg.winreg_OpenKey(io);
-		if (!status.is_ok) {
-			return undefined;
-		}
-		if (io.output.result != "WERR_OK") {
-			return undefined;
-		}
+	if (components.length == 1) {
+		return handle;
+	}
 
-		handle = io.output.handle;
+	var hpath = components[1];
+
+	for (i=2;i<components.length;i++) {
+		hpath = hpath + "\\" + components[i];
 	}
-	return handle;
+
+	io = irpcObj();
+	io.input.handle  = handle;
+	io.input.keyname = hpath;
+	io.input.unknown = 0;
+	io.input.access_mask = reg.SEC_FLAG_MAXIMUM_ALLOWED;
+	var status = reg.winreg_OpenKey(io);
+	if (!status.is_ok) {
+		return undefined;
+	}
+	if (io.output.result != "WERR_OK") {
+		return undefined;
+	}
+	
+	return io.output.handle;
 }
 
 /*
@@ -76,6 +95,10 @@ function winreg_enum_path(reg, path)
 {
 	var list = new Object();
 	list.length = 0;
+
+	if (path == null || path == "\\" || path == "") {
+		return new Array("HKLM", "HKU");
+	}
 	
 	handle = winreg_open_path(reg, path);
 	if (handle == undefined) {
@@ -106,7 +129,6 @@ function winreg_enum_path(reg, path)
 		if (out.result != "WERR_OK") {
 			return list;
 		}
-
 		list[list.length] = out.out_name.name;
 		list.length++;
 	}
-- 
cgit 


From 922f28fcbda983dcd6141f7c746d0f228302d368 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Wed, 10 Aug 2005 06:55:46 +0000
Subject: r9226: make sure we catch rpc faults in the ejs rpc wrappers (This
 used to be commit 3ec376141e64f0a504f04b470cb5df78c2e0f5c2)

---
 source4/scripting/ejs/smbcalls_rpc.c | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_rpc.c b/source4/scripting/ejs/smbcalls_rpc.c
index cbb8d9dd9d..d10e68f731 100644
--- a/source4/scripting/ejs/smbcalls_rpc.c
+++ b/source4/scripting/ejs/smbcalls_rpc.c
@@ -341,6 +341,9 @@ done:
 		goto done;
 	}
 	status = dcerpc_ndr_request_recv(req);
+	if (!NT_STATUS_IS_OK(status)) {
+		goto done;
+	}
 
 	/* print the 'out' structure, if needed */
 	if (p->conn->flags & DCERPC_DEBUG_PRINT_OUT) {
-- 
cgit 


From 8942ac69f01acc2e09a56e6accef6034622d40d4 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Wed, 10 Aug 2005 06:58:05 +0000
Subject: r9227: cleanup and simplify the AJAJ code (This used to be commit
 ceb7669e5991e9dda759d60a09a0a65e6caba991)

---
 source4/scripting/libjs/server_call.js | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/server_call.js b/source4/scripting/libjs/server_call.js
index 316e764a53..a8c08780f9 100644
--- a/source4/scripting/libjs/server_call.js
+++ b/source4/scripting/libjs/server_call.js
@@ -21,20 +21,20 @@ function __register_call(name, func)
 */
 function __run_call() {
 	var c = this;
-	var name = form['func'];
+	var name = form['ajaj_func'];
 	if (name == undefined) {
-		println("no function name given in run_call");
+		/* no function to run */
 		return;
 	}
-	var args = form['args'];
+	var args = form['ajaj_args'];
 	if (args == undefined) {
 		println("no function arguments given in run_call");
-		return;
+		exit(0);
 	}
 	args = decodeObject(args);
 	if (c.calls[name] == undefined) {
 		println("undefined remote call " + name);
-		return;
+		exit(0);
 	}
 	var f = c.calls[name];
 	var res;
@@ -59,11 +59,12 @@ function __run_call() {
 		res = f(args[0], args[1], args[2], args[3], args[4], args[5], args[6], args[7]);
 	} else {
 		println("too many arguments for remote call: " + name);
-		return;
+		exit(0);
 	}
 	var repobj = new Object();
 	repobj.res = res;
 	write(encodeObject(repobj));
+	exit(0);
 }
 
 
-- 
cgit 


From 9fffd12799239219a276b1ca83319d1340d97232 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Wed, 17 Aug 2005 01:25:58 +0000
Subject: r9338: fixed the winreg IDL to be correct for the EnumKey and
 EnumValue calls. The previous IDL was just a workaround for the limitations
 of our older rpc infrastructure. Now that Jelmer has added much improved
 string support using the charset keyword we can correctly implemenent the
 unusual winreg string buffers.

Jelmer, note the little comment I put on winreg_StringBuf() about why
I couldn't use [value()] for the length field.

This also fixes EnumKey() and EnumValue() to use NTTIME fields for the
last_changed_time. I don't know why we were using a pair of uint32's,
as it is just a NTTIME.
(This used to be commit 8354b016122cc4f3cff042b3ada1de07e1614eb7)
---
 source4/scripting/libjs/winreg.js | 127 +++++++++++++++++++++++++++++++++-----
 1 file changed, 110 insertions(+), 17 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/winreg.js b/source4/scripting/libjs/winreg.js
index 703b8da2a7..5323e91ae5 100644
--- a/source4/scripting/libjs/winreg.js
+++ b/source4/scripting/libjs/winreg.js
@@ -4,6 +4,18 @@
 	released under the GNU GPL v2 or later
 */	
 
+libinclude("base.js");
+
+/*
+  close a handle
+*/
+function winreg_close(reg, handle)
+{
+	var io = irpcObj();
+	io.input.handle = handle;
+	reg.winreg_CloseKey(io);
+}
+
 
 /*
   open a hive
@@ -76,6 +88,9 @@ function winreg_open_path(reg, path)
 	io.input.unknown = 0;
 	io.input.access_mask = reg.SEC_FLAG_MAXIMUM_ALLOWED;
 	var status = reg.winreg_OpenKey(io);
+
+	winreg_close(reg, handle);
+
 	if (!status.is_ok) {
 		return undefined;
 	}
@@ -100,38 +115,116 @@ function winreg_enum_path(reg, path)
 		return new Array("HKLM", "HKU");
 	}
 	
-	handle = winreg_open_path(reg, path);
+	var handle = winreg_open_path(reg, path);
 	if (handle == undefined) {
 		return undefined;
 	}
 
 	var io = irpcObj();
-	var wtime = new Object();
-	wtime.low  = 2147483647;
-	wtime.high = 2147483647;
-	var keyname = new Object();
-	keyname.unknown  = 522;
-	keyname.key_name = NULL;
-
 	io.input.handle            = handle;
-	io.input.key_name_len      = 0;
-	io.input.unknown           = 1044;
-	io.input.in_name           = keyname;
-	io.input.class             = "";
-	io.input.last_changed_time = wtime;
-	
+	io.input.name = new Object();
+	io.input.name.length = 0;
+	io.input.name.size   = 32;
+	io.input.name.name   = NULL;
+	io.input.class = new Object();
+	io.input.class.length = 0;
+	io.input.class.size   = 1024;
+	io.input.class.name   = NULL;
+	io.input.last_changed_time = 0;
+
 	var idx = 0;
 	for (idx=0;idx >= 0;idx++) {
-		io.input.enum_index        = idx;
+		io.input.enum_index = idx;
 		var status = reg.winreg_EnumKey(io);
-		if (!status.is_ok) return;
+		if (!status.is_ok) {
+			winreg_close(reg, handle);
+			return;
+		}
+		var out = io.output;
+		if (out.result == "WERR_MORE_DATA") {
+			io.input.name.size = io.input.name.size * 2;
+			idx--;
+			if (io.input.name.size > 32000) {
+				winreg_close(reg, handle);
+				return undefined;
+			}
+			continue;
+		}
+		if (out.result != "WERR_OK") {
+			winreg_close(reg, handle);
+			return list;
+		}
+		list[list.length] = out.name.name;
+		list.length++;
+	}
+
+	winreg_close(reg, handle);
+	return list;
+}
+
+
+/*
+	return a list of values for a winreg server given a path
+	usage:
+	   list = winreg_enum_values(reg, path);
+
+	each returned list element is an object containing a name, a
+	type and a value
+*/
+function winreg_enum_values(reg, path)
+{
+	var list = new Object();
+	list.length = 0;
+
+	var handle = winreg_open_path(reg, path);
+	if (handle == undefined) {
+		return undefined;
+	}
+
+	var io = irpcObj();
+	io.input.handle      = handle;
+	io.input.name        = new Object();
+	io.input.name.length = 0;
+	io.input.name.size   = 128;
+	io.input.name.name   = "";
+	io.input.type        = 0;
+	io.input.value       = new Array(0);
+	io.input.size        = 1024;
+	io.input.length      = 0;
+
+	var idx;
+	for (idx=0;idx >= 0;idx++) {
+		io.input.enum_index = idx;
+		var status = reg.winreg_EnumValue(io);
+		if (!status.is_ok) {
+			winreg_close(reg, handle);
+			return;
+		}
 		var out = io.output;
+		if (out.result == "WERR_MORE_DATA") {
+			io.input.size = io.input.size * 2;
+			io.input.name.size = io.input.name.size * 2;
+			idx--;
+			/* limit blobs to 1M */
+			if (io.input.size > 1000000) {
+				winreg_close(reg, handle);
+				return undefined;
+			}
+			continue;
+		}
 		if (out.result != "WERR_OK") {
+			winreg_close(reg, handle);
 			return list;
 		}
-		list[list.length] = out.out_name.name;
+		var el   = new Object();
+		el.name  = out.name.name;
+		el.type  = out.type;
+		el.value = out.value;
+		el.size  = out.size;
+		list[list.length] = el;
 		list.length++;
 	}
 
+	winreg_close(reg, handle);
 	return list;
 }
-- 
cgit 


From ba6d3075bc7806878ed22f0bde7abf83142a714b Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Wed, 17 Aug 2005 01:29:35 +0000
Subject: r9339: treat arrays of uint8 values as a special DATA_BLOB type in
 the ejs interfaces to RPC. This makes large blobs of data much saner. Tim,
 you will probably want to do the same for the smb_interfaces.h generated
 code.

Next we will need ways of extracting different data types from these
blobs, for example asking for the blob to be interpreted as a utf16
string, or as a little-endian integer. That will allow for registry
scripting to be quite sane.
(This used to be commit a8bca2e8e27c953c0413693326ec3b5ecf17ba41)
---
 source4/scripting/ejs/ejsrpc.c  | 37 +++++++++++++++++++++++++++++++++++++
 source4/scripting/ejs/ejsrpc.h  |  7 +++++++
 source4/scripting/ejs/mprutil.c | 25 +++++++++++++++++++++++++
 3 files changed, 69 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/ejsrpc.c b/source4/scripting/ejs/ejsrpc.c
index f107c84b73..de25d3a0f0 100644
--- a/source4/scripting/ejs/ejsrpc.c
+++ b/source4/scripting/ejs/ejsrpc.c
@@ -349,3 +349,40 @@ NTSTATUS ejs_push_BOOL(struct ejs_rpc *ejs,
 {
 	return mprSetVar(v, name, mprCreateBoolVar(*r));
 }
+
+
+/*
+  pull a uint8 array from a mpr variable to a C element - treating as a data blob
+*/
+NTSTATUS ejs_pull_array_uint8(struct ejs_rpc *ejs, 
+			      struct MprVar *v, const char *name, 
+			      uint8_t *r, uint32_t length)
+{
+	NTSTATUS status;
+	DATA_BLOB *blob;
+
+	status = mprGetVar(&v, name);
+	NT_STATUS_NOT_OK_RETURN(status);
+
+	blob = mprToDataBlob(v);
+	if (blob == NULL) {
+		return NT_STATUS_OBJECT_NAME_INVALID;
+	}
+	if (blob->length != length) {
+		return NT_STATUS_INFO_LENGTH_MISMATCH;
+	}
+	memcpy(r, blob->data, length);
+	return NT_STATUS_OK;
+	
+}
+
+NTSTATUS ejs_push_array_uint8(struct ejs_rpc *ejs, 
+			      struct MprVar *v, const char *name, 
+			      const uint8_t *r, uint32_t length)
+{
+	DATA_BLOB blob;
+	blob.data = discard_const(r);
+	blob.length = length;
+	mprSetVar(v, name, mprDataBlob(blob));
+	return NT_STATUS_OK;
+}
diff --git a/source4/scripting/ejs/ejsrpc.h b/source4/scripting/ejs/ejsrpc.h
index 99da0d35ea..03919c3602 100644
--- a/source4/scripting/ejs/ejsrpc.h
+++ b/source4/scripting/ejs/ejsrpc.h
@@ -108,6 +108,13 @@ NTSTATUS ejs_pull_BOOL(struct ejs_rpc *ejs,
 NTSTATUS ejs_push_BOOL(struct ejs_rpc *ejs, 
 		       struct MprVar *v, const char *name, const BOOL *r);
 
+NTSTATUS ejs_pull_array_uint8(struct ejs_rpc *ejs, 
+			      struct MprVar *v, const char *name, 
+			      uint8_t *r, uint32_t length);
+NTSTATUS ejs_push_array_uint8(struct ejs_rpc *ejs, 
+			      struct MprVar *v, const char *name, 
+			      const uint8_t *r, uint32_t length);
+
 #define EJS_ALLOC_SIZE(ejs, s, size) do { \
   (s) = talloc_size(ejs, size); \
   if (!(s)) return ejs_panic(ejs, "out of memory"); \
diff --git a/source4/scripting/ejs/mprutil.c b/source4/scripting/ejs/mprutil.c
index 657078e7c7..700185f07e 100644
--- a/source4/scripting/ejs/mprutil.c
+++ b/source4/scripting/ejs/mprutil.c
@@ -317,6 +317,31 @@ struct MprVar mprNTSTATUS(NTSTATUS status)
 	return res;
 }
 
+/*
+  create a data-blob in a mpr variable
+*/
+struct MprVar mprDataBlob(DATA_BLOB blob)
+{
+	struct MprVar res;
+	struct data_blob *pblob = talloc(mprMemCtx(), struct data_blob);
+	*pblob = data_blob_talloc(pblob, blob.data, blob.length);
+
+	res = mprObject("DATA_BLOB");
+
+	mprSetVar(&res, "size", mprCreateIntegerVar(blob.length));
+	mprSetPtrChild(&res, "blob", pblob);
+
+	return res;
+}
+
+/*
+  return a data blob from a mpr var created using mprDataBlob
+*/
+struct data_blob *mprToDataBlob(struct MprVar *v)
+{
+	return talloc_get_type(mprGetPtr(v, "blob"), struct data_blob);
+}
+
 /*
   turn a WERROR into a MprVar object with lots of funky properties
 */
-- 
cgit 


From bc6d35135d02185c2c28efbc7a2955317af87548 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Wed, 17 Aug 2005 01:30:47 +0000
Subject: r9340: print the [in] contents when debugging even if the marshalling
 failed. This makes it easier to track down marshalling bugs. (This used to be
 commit a7a1752ca47a18b325a0ad0984cf7d02da1e2afe)

---
 source4/scripting/ejs/smbcalls_rpc.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_rpc.c b/source4/scripting/ejs/smbcalls_rpc.c
index d10e68f731..6da8cb351c 100644
--- a/source4/scripting/ejs/smbcalls_rpc.c
+++ b/source4/scripting/ejs/smbcalls_rpc.c
@@ -329,17 +329,19 @@ done:
 		goto done;
 	}
 
+	/* make the actual call */
+	req = dcerpc_ndr_request_send(p, NULL, iface, callnum, ptr, ptr);
+
 	/* if requested, print the structure */
 	if (p->conn->flags & DCERPC_DEBUG_PRINT_IN) {
 		ndr_print_function_debug(call->ndr_print, call->name, NDR_IN, ptr);
 	}
 
-	/* make the actual call */
-	req = dcerpc_ndr_request_send(p, NULL, iface, callnum, ptr, ptr);
 	if (req == NULL) {
 		status = NT_STATUS_NO_MEMORY;
 		goto done;
 	}
+
 	status = dcerpc_ndr_request_recv(req);
 	if (!NT_STATUS_IS_OK(status)) {
 		goto done;
-- 
cgit 


From 29e5e9e1e3b8f463bf782f3f42ce4a02cd55fca2 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Wed, 17 Aug 2005 02:55:31 +0000
Subject: r9344: started adding calls for manipulation of data blobs in ejs

added:

  blobToArray()
  blobFromArray()
  blobCompare()
(This used to be commit cc5a3e9cc3b44f418eb5dfcd4e855a36c5ac8327)
---
 source4/scripting/ejs/config.mk         |   1 +
 source4/scripting/ejs/smbcalls.c        |   1 +
 source4/scripting/ejs/smbcalls_data.c   | 165 ++++++++++++++++++++++++++++++++
 source4/scripting/ejs/smbcalls_string.c |   1 -
 4 files changed, 167 insertions(+), 1 deletion(-)
 create mode 100644 source4/scripting/ejs/smbcalls_data.c

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/config.mk b/source4/scripting/ejs/config.mk
index 191b139c66..096c2049ab 100644
--- a/source4/scripting/ejs/config.mk
+++ b/source4/scripting/ejs/config.mk
@@ -22,6 +22,7 @@ OBJ_FILES = \
 		scripting/ejs/smbcalls_options.o \
 		scripting/ejs/smbcalls_nss.o \
 		scripting/ejs/smbcalls_string.o \
+		scripting/ejs/smbcalls_data.o \
 		scripting/ejs/smbcalls_rand.o \
 		scripting/ejs/smbcalls_sys.o \
 		scripting/ejs/smbcalls_creds.o \
diff --git a/source4/scripting/ejs/smbcalls.c b/source4/scripting/ejs/smbcalls.c
index cc4a3d703a..3981e1dd7a 100644
--- a/source4/scripting/ejs/smbcalls.c
+++ b/source4/scripting/ejs/smbcalls.c
@@ -128,6 +128,7 @@ void smb_setup_ejs_functions(void)
 	smb_setup_ejs_random();
 	smb_setup_ejs_system();
 	smb_setup_ejs_credentials();
+	smb_setup_ejs_datablob();
 
 	ejsDefineCFunction(-1, "typeof", ejs_typeof, NULL, MPR_VAR_SCRIPT_HANDLE);
 	ejsDefineStringCFunction(-1, "libinclude", ejs_libinclude, NULL, MPR_VAR_SCRIPT_HANDLE);
diff --git a/source4/scripting/ejs/smbcalls_data.c b/source4/scripting/ejs/smbcalls_data.c
new file mode 100644
index 0000000000..3b431dc8c3
--- /dev/null
+++ b/source4/scripting/ejs/smbcalls_data.c
@@ -0,0 +1,165 @@
+/* 
+   Unix SMB/CIFS implementation.
+
+   provide access to data blobs
+
+   Copyright (C) Andrew Tridgell 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 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.
+*/
+
+#include "includes.h"
+#include "scripting/ejs/smbcalls.h"
+#include "lib/appweb/ejs/ejs.h"
+
+/*
+  create a data blob object from a ejs array of integers
+*/
+static int ejs_blobFromArray(MprVarHandle eid, int argc, struct MprVar **argv)
+{
+	struct MprVar *array, *v;
+	unsigned length, i;
+	DATA_BLOB blob;
+
+	if (argc != 1) {
+		ejsSetErrorMsg(eid, "blobFromArray invalid arguments");
+		return -1;		
+	}
+	array = argv[0];
+
+	v = mprGetProperty(array, "length", NULL);
+	if (v == NULL) {
+		goto failed;
+	}
+	length = mprToInt(v);
+
+	blob = data_blob_talloc(mprMemCtx(), NULL, length);
+	if (length != 0 && blob.data == NULL) {
+		goto failed;
+	}
+
+	for (i=0;i<length;i++) {
+		struct MprVar *vs;
+		char idx[16];
+		mprItoa(i, idx, sizeof(idx));		
+		vs = mprGetProperty(array, idx, NULL);
+		if (vs == NULL) {
+			goto failed;
+		}
+		blob.data[i] = mprVarToNumber(vs);
+	}
+
+	mpr_Return(eid, mprDataBlob(blob));
+	return 0;
+
+failed:
+	mpr_Return(eid, mprCreateUndefinedVar());
+	return 0;
+}
+
+/*
+  create a ejs array of integers from a data blob
+*/
+static int ejs_blobToArray(MprVarHandle eid, int argc, struct MprVar **argv)
+{
+	DATA_BLOB *blob;
+	struct MprVar array;
+	int i;
+
+	if (argc != 1) {
+		ejsSetErrorMsg(eid, "blobToArray invalid arguments");
+		return -1;		
+	}
+	blob = mprToDataBlob(argv[0]);
+	if (blob == NULL) {
+		goto failed;
+	}
+
+	array = mprObject("array");
+	
+	for (i=0;i<blob->length;i++) {
+		mprAddArray(&array, i, mprCreateNumberVar(blob->data[i]));
+	}
+	mpr_Return(eid, array);
+	return 0;
+
+failed:
+	mpr_Return(eid, mprCreateUndefinedVar());
+	return 0;
+}
+
+
+/*
+  compare two data blobs
+*/
+static int ejs_blobCompare(MprVarHandle eid, int argc, struct MprVar **argv)
+{
+	DATA_BLOB *blob1, *blob2;
+	BOOL ret = False;
+
+	if (argc != 2) {
+		ejsSetErrorMsg(eid, "blobCompare invalid arguments");
+		return -1;		
+	}
+	
+	blob1 = mprToDataBlob(argv[0]);
+	blob2 = mprToDataBlob(argv[1]);
+
+	if (blob1 == blob2) {
+		ret = True;
+		goto done;
+	}
+	if (blob1 == NULL || blob2 == NULL) {
+		ret = False;
+		goto done;
+	}
+
+	if (blob1->length != blob2->length) {
+		ret = False;
+		goto done;
+	}
+
+	if (memcmp(blob1->data, blob2->data, blob1->length) != 0) {
+		ret = False;
+		goto done;
+	}
+	ret = True;
+
+done:
+	mpr_Return(eid, mprCreateBoolVar(ret));
+	return 0;
+}
+
+/*
+  initialise datablob ejs subsystem
+*/
+static int ejs_datablob_init(MprVarHandle eid, int argc, struct MprVar **argv)
+{
+	struct MprVar *obj = mprInitObject(eid, "datablob", argc, argv);
+
+	mprSetCFunction(obj, "blobFromArray", ejs_blobFromArray);
+	mprSetCFunction(obj, "blobToArray", ejs_blobToArray);
+	mprSetCFunction(obj, "blobCompare", ejs_blobCompare);
+
+	return 0;
+}
+
+/*
+  setup C functions that be called from ejs
+*/
+void smb_setup_ejs_datablob(void)
+{
+	ejsDefineCFunction(-1, "datablob_init", ejs_datablob_init, NULL, MPR_VAR_SCRIPT_HANDLE);
+}
diff --git a/source4/scripting/ejs/smbcalls_string.c b/source4/scripting/ejs/smbcalls_string.c
index b4c85dbd28..1b6b7d09dd 100644
--- a/source4/scripting/ejs/smbcalls_string.c
+++ b/source4/scripting/ejs/smbcalls_string.c
@@ -23,7 +23,6 @@
 #include "includes.h"
 #include "scripting/ejs/smbcalls.h"
 #include "lib/appweb/ejs/ejs.h"
-#include "system/passwd.h"
 
 /*
   usage:
-- 
cgit 


From 4e3cacdaa83638b705c4fa6e79e8f17456c3e233 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Wed, 17 Aug 2005 12:27:28 +0000
Subject: r9355: return the EnumKey and EnumValue list we have so far when we
 get a rpc fault (This used to be commit
 3a9c63923fbb21dfb8e5fc549dde8fad8cb8f354)

---
 source4/scripting/libjs/winreg.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/winreg.js b/source4/scripting/libjs/winreg.js
index 5323e91ae5..8befd36045 100644
--- a/source4/scripting/libjs/winreg.js
+++ b/source4/scripting/libjs/winreg.js
@@ -138,7 +138,7 @@ function winreg_enum_path(reg, path)
 		var status = reg.winreg_EnumKey(io);
 		if (!status.is_ok) {
 			winreg_close(reg, handle);
-			return;
+			return list;
 		}
 		var out = io.output;
 		if (out.result == "WERR_MORE_DATA") {
@@ -146,7 +146,7 @@ function winreg_enum_path(reg, path)
 			idx--;
 			if (io.input.name.size > 32000) {
 				winreg_close(reg, handle);
-				return undefined;
+				return list;
 			}
 			continue;
 		}
@@ -198,7 +198,7 @@ function winreg_enum_values(reg, path)
 		var status = reg.winreg_EnumValue(io);
 		if (!status.is_ok) {
 			winreg_close(reg, handle);
-			return;
+			return list;
 		}
 		var out = io.output;
 		if (out.result == "WERR_MORE_DATA") {
@@ -208,7 +208,7 @@ function winreg_enum_values(reg, path)
 			/* limit blobs to 1M */
 			if (io.input.size > 1000000) {
 				winreg_close(reg, handle);
-				return undefined;
+				return list;
 			}
 			continue;
 		}
-- 
cgit 


From 80f75d4138029f9d3548c02513aa2484cd400574 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Thu, 18 Aug 2005 05:09:26 +0000
Subject: r9377: made winreg a user tool (I find it quite useful). I expect it
 to get the ability to add/remove keys and values in the future.

add it to the standard tests, ensuring that we know if winreg
breaks. This is particularly important as winreg uses such unusual IDL
constructs
(This used to be commit e4ca36bda34cf5e6fecaef5fe60e5dd397ebee3c)
---
 source4/scripting/bin/winreg | 75 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 75 insertions(+)
 create mode 100755 source4/scripting/bin/winreg

(limited to 'source4/scripting')

diff --git a/source4/scripting/bin/winreg b/source4/scripting/bin/winreg
new file mode 100755
index 0000000000..d869d356fd
--- /dev/null
+++ b/source4/scripting/bin/winreg
@@ -0,0 +1,75 @@
+#!/bin/sh
+exec smbscript "$0" ${1+"$@"}
+/*
+  tool to manipulate a remote registry
+  Copyright Andrew Tridgell 2005
+  Released under the GNU GPL v2 or later
+*/	
+
+libinclude("base.js");
+libinclude("winreg.js");
+
+var options = new Object();
+
+ok = GetOptions(ARGV, options,
+		"POPT_AUTOHELP",
+		"POPT_COMMON_SAMBA",
+		"POPT_COMMON_CREDENTIALS");
+if (ok == false) {
+	println("Failed to parse options: " + options.ERROR);
+	return -1;
+}
+
+if (options.ARGV.length < 1) {
+	println("Usage: winreg.js <BINDING> [path]");
+	return -1;
+}
+var binding = options.ARGV[0];
+reg = winreg_init();
+security_init(reg);
+
+print("Connecting to " + binding + "\n");
+status = reg.connect(binding);
+if (status.is_ok != true) {
+	print("Failed to connect to " + binding + " - " + status.errstr + "\n");
+	return -1;
+}
+
+function list_values(path) {
+	var list = winreg_enum_values(reg, path);
+	var i;
+	if (list == undefined) {
+		return;
+	}
+	for (i=0;i<list.length;i++) {
+		printf("\ttype=%2d size=%4d  '%s'\n", list[i].type, list[i].size, list[i].name);
+	}
+}
+
+function list_path(path) {
+	var list = winreg_enum_path(reg, path);
+	var i;
+	list_values(path);
+	for (i=0;i<list.length;i++) {
+		var npath;
+		if (path) {
+			npath = path + "\\" + list[i];
+		} else {
+			npath = list[i];
+		}
+		println(npath);
+		list_path(npath);
+	}
+}
+
+var root;
+
+if (options.ARGV.length > 1) {
+	root = options.ARGV[1];
+} else {
+	root = '';
+}
+
+printf("Listing registry tree '%s'\n", root);
+list_path(root);
+return 0;
-- 
cgit 


From 3e4c4cff2177af33efdb15f03a1bbcb639505cee Mon Sep 17 00:00:00 2001
From: Simo Sorce <idra@samba.org>
Date: Thu, 18 Aug 2005 15:02:01 +0000
Subject: r9391: Convert all the code to use struct ldb_dn to ohandle ldap like
 distinguished names Provide more functions to handle DNs in this form (This
 used to be commit 692e35b7797e39533dd2a1c4b63d9da30f1eb5ba)

---
 source4/scripting/ejs/mprutil.c      |  4 ++--
 source4/scripting/ejs/smbcalls_ldb.c | 42 +++++++++++++++++++++++++-----------
 2 files changed, 32 insertions(+), 14 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/mprutil.c b/source4/scripting/ejs/mprutil.c
index 700185f07e..8f1e5f71c8 100644
--- a/source4/scripting/ejs/mprutil.c
+++ b/source4/scripting/ejs/mprutil.c
@@ -161,7 +161,7 @@ static struct MprVar mprLdbMessage(struct ldb_context *ldb, struct ldb_message *
 	const char *multivalued[] = { "objectClass", "memberOf", "privilege", 
 					    "member", NULL };
 
-	var = mprObject(msg->dn);
+	var = mprObject(ldb_dn_linearize(msg, msg->dn));
 
 	for (i=0;i<msg->num_elements;i++) {
 		struct ldb_message_element *el = &msg->elements[i];
@@ -196,7 +196,7 @@ static struct MprVar mprLdbMessage(struct ldb_context *ldb, struct ldb_message *
 
 	/* add the dn if it is not already specified */
 	if (mprGetProperty(&var, "dn", 0) == 0) {
-		mprSetVar(&var, "dn", mprString(msg->dn));
+		mprSetVar(&var, "dn", mprString(ldb_dn_linearize(msg, msg->dn)));
 	}
 	
 	return var;		
diff --git a/source4/scripting/ejs/smbcalls_ldb.c b/source4/scripting/ejs/smbcalls_ldb.c
index 50ba6fce68..7d268d09f6 100644
--- a/source4/scripting/ejs/smbcalls_ldb.c
+++ b/source4/scripting/ejs/smbcalls_ldb.c
@@ -51,7 +51,8 @@ static int ejs_ldbSearch(MprVarHandle eid, int argc, struct MprVar **argv)
 {
 	const char **attrs = NULL;
 	const char *expression;
-	const char *basedn = NULL;
+	const char *base = NULL;
+	struct ldb_dn *basedn = NULL;
 	int scope = LDB_SCOPE_DEFAULT;
 	TALLOC_CTX *tmp_ctx = talloc_new(mprMemCtx());
 	struct ldb_context *ldb;
@@ -79,9 +80,16 @@ static int ejs_ldbSearch(MprVarHandle eid, int argc, struct MprVar **argv)
 		goto failed;
 	}
 	if (argc > 1) {
-		basedn = mprToString(argv[1]);
+		base = mprToString(argv[1]);
 		/* a null basedn is valid */
 	}
+	if (base != NULL) {
+		basedn = ldb_dn_explode(tmp_ctx, base);
+		if (basedn == NULL) {
+			ejsSetErrorMsg(eid, "ldb.search malformed base dn");
+			goto failed;
+		}
+	}
 	if (argc > 2) {
 		scope = mprToInt(argv[2]);
 		switch (scope) {
@@ -160,7 +168,7 @@ static int ejs_ldbAddModify(MprVarHandle eid, int argc, struct MprVar **argv,
 */
 static int ejs_ldbDelete(MprVarHandle eid, int argc, struct MprVar **argv)
 {
-	const char *dn;
+	struct ldb_dn *dn;
 	struct ldb_context *ldb;
 	int ret;
 
@@ -169,14 +177,21 @@ static int ejs_ldbDelete(MprVarHandle eid, int argc, struct MprVar **argv)
 		return -1;
 	}
 
-	dn = mprToString(argv[0]);
-
 	ldb = ejs_get_ldb_context(eid);
 	if (ldb == NULL) {
 		return -1;
 	}
+
+	dn = ldb_dn_explode(ldb, mprToString(argv[0]));
+	if (dn == NULL) {
+		ejsSetErrorMsg(eid, "ldb.delete malformed dn");
+		return -1;
+	}
+
 	ret = ldb_delete(ldb, dn);
 
+	talloc_free(dn);
+
 	mpr_Return(eid, mprCreateBoolVar(ret == 0));
 	return 0;
 }
@@ -188,7 +203,7 @@ static int ejs_ldbDelete(MprVarHandle eid, int argc, struct MprVar **argv)
 */
 static int ejs_ldbRename(MprVarHandle eid, int argc, struct MprVar **argv)
 {
-	const char *dn1, *dn2;
+	struct ldb_dn *dn1, *dn2;
 	struct ldb_context *ldb;
 	int ret;
 
@@ -197,20 +212,23 @@ static int ejs_ldbRename(MprVarHandle eid, int argc, struct MprVar **argv)
 		return -1;
 	}
 
-	dn1 = mprToString(argv[0]);
-	dn2 = mprToString(argv[1]);
-	if (dn1 == NULL || dn2 == NULL) {
-		ejsSetErrorMsg(eid, "ldb.rename invalid arguments");
+	ldb = ejs_get_ldb_context(eid);
+	if (ldb == NULL) {
 		return -1;
 	}
 
-	ldb = ejs_get_ldb_context(eid);
-	if (ldb == NULL) {
+	dn1 = ldb_dn_explode(ldb, mprToString(argv[0]));
+	dn2 = ldb_dn_explode(ldb, mprToString(argv[1]));
+	if (dn1 == NULL || dn2 == NULL) {
+		ejsSetErrorMsg(eid, "ldb.rename invalid or malformed arguments");
 		return -1;
 	}
 
 	ret = ldb_rename(ldb, dn1, dn2);
 
+	talloc_free(dn1);
+	talloc_free(dn2);
+
 	mpr_Return(eid, mprCreateBoolVar(ret == 0));
 	return 0;
 }
-- 
cgit 


From 81556a90785c90f928690929c5735bc3ee9c8eca Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Mon, 22 Aug 2005 01:51:02 +0000
Subject: r9464: fixed a problem with child pointers copied into non-allocated
 mpr variables. We now use the same free technique as is used for mpr strings,
 rather than relying on being a child of the variable (This used to be commit
 3d6739eaa6e1b56d67bc7d9b5350a6911c96597a)

---
 source4/scripting/ejs/mprutil.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/mprutil.c b/source4/scripting/ejs/mprutil.c
index 8f1e5f71c8..38cfd2c493 100644
--- a/source4/scripting/ejs/mprutil.c
+++ b/source4/scripting/ejs/mprutil.c
@@ -369,12 +369,14 @@ void mprSetPtr(struct MprVar *v, const char *propname, const void *p)
 }
 
 /*
-  set a pointer in a existing MprVar, making it a child of the property
+  set a pointer in a existing MprVar, freeing it when the property goes away
 */
 void mprSetPtrChild(struct MprVar *v, const char *propname, const void *p)
 {
 	mprSetVar(v, propname, mprCreatePtrVar(discard_const(p)));
-	talloc_steal(mprGetProperty(v, propname, NULL), p);
+	v = mprGetProperty(v, propname, NULL);
+	v->allocatedData = 1;
+	talloc_steal(mprMemCtx(), p);
 }
 
 /*
-- 
cgit 


From f4aa80d88f768d4edbfca2bf0907de0e1c319ec5 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Mon, 22 Aug 2005 01:52:22 +0000
Subject: r9465: handle encoding and decoding of pointers, representing them as
 a string containing "(POINTER)" (This used to be commit
 6f69eeb8f258063f1ac911ab38e667e7743ccba3)

---
 source4/scripting/libjs/encoder.js | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/encoder.js b/source4/scripting/libjs/encoder.js
index 24508f3f6b..d96b859547 100644
--- a/source4/scripting/libjs/encoder.js
+++ b/source4/scripting/libjs/encoder.js
@@ -52,6 +52,8 @@ function encodeElement(e, name) {
 		r = s.sprintf("%s:%s:%s:", name, t, "" + e);
 	} else if (t == "undefined" || t == "null") {
 		r = s.sprintf("%s:%s:", name, t);
+	} else if (t == "pointer") {
+		r = s.sprintf("%s:string:(POINTER):", name);
 	} else {
 		println("Unable to linearise type " + t);
 		r = "";
-- 
cgit 


From 55e746ad560d4406821bc2d721cbb929b79a7a0a Mon Sep 17 00:00:00 2001
From: Rafal Szczesniak <mimir@samba.org>
Date: Mon, 22 Aug 2005 14:32:58 +0000
Subject: r9477: Convert popt options to an ejs object. Doesn't seem to break
 anything except of popt help (-h) option (unexpected ?).

rafal
(This used to be commit 1990793b23d6198a85ce1bdf6ad43e12015db203)
---
 source4/scripting/bin/smbstatus          |  4 ++--
 source4/scripting/ejs/smbcalls_auth.c    | 11 ++++++----
 source4/scripting/ejs/smbcalls_creds.c   | 37 ++++++++++++++++++++++----------
 source4/scripting/ejs/smbcalls_options.c | 20 +++++++++--------
 4 files changed, 46 insertions(+), 26 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/bin/smbstatus b/source4/scripting/bin/smbstatus
index 38f2ab06a9..d5610023d6 100755
--- a/source4/scripting/bin/smbstatus
+++ b/source4/scripting/bin/smbstatus
@@ -11,12 +11,12 @@ libinclude("management.js");
 
 var options = new Object();
 
-ok = GetOptions(ARGV, options,
+options = GetOptions(ARGV,
 		"POPT_AUTOHELP",
 		"POPT_COMMON_SAMBA",
 		"POPT_COMMON_VERSION",
 		"nbt");
-if (ok == false) {
+if (options == undefined) {
 	println("Failed to parse options: " + options.ERROR);
 	return -1;
 }
diff --git a/source4/scripting/ejs/smbcalls_auth.c b/source4/scripting/ejs/smbcalls_auth.c
index 4b3534b4cc..37ac9543cc 100644
--- a/source4/scripting/ejs/smbcalls_auth.c
+++ b/source4/scripting/ejs/smbcalls_auth.c
@@ -105,16 +105,19 @@ static int ejs_userAuth(MprVarHandle eid, int argc, struct MprVar **argv)
 	const char *password;
 	const char *domain;
 	const char *remote_host;
-	struct MprVar auth;
+	struct MprVar auth, *creds_obj;
+	struct cli_credentials *creds;
 
 	if (argc != 1 || argv[0]->type != MPR_TYPE_OBJECT) {
 		ejsSetErrorMsg(eid, "userAuth invalid arguments, this function requires an object.");
 		return -1;
 	}
 
-	username = mprToString(mprGetProperty(argv[0], "username", NULL));
-	password = mprToString(mprGetProperty(argv[0], "password", NULL));
-	domain = mprToString(mprGetProperty(argv[0], "domain", NULL));
+	/* get credential values from credentials object */
+	creds = mprGetPtr(argv[0], "creds");
+	username    = cli_credentials_get_username(creds);
+	password    = cli_credentials_get_password(creds);
+	domain      = cli_credentials_get_domain(creds);
 	remote_host = mprToString(mprGetProperty(argv[0], "rhost", NULL));
 
 	if (username == NULL || password == NULL || domain == NULL) {
diff --git a/source4/scripting/ejs/smbcalls_creds.c b/source4/scripting/ejs/smbcalls_creds.c
index 61a5139cda..45da5895e4 100644
--- a/source4/scripting/ejs/smbcalls_creds.c
+++ b/source4/scripting/ejs/smbcalls_creds.c
@@ -23,6 +23,7 @@
 #include "includes.h"
 #include "scripting/ejs/smbcalls.h"
 #include "lib/appweb/ejs/ejs.h"
+#include "lib/cmdline/popt_common.h"
 
 /*
   helper function to get the local objects credentials ptr
@@ -184,19 +185,9 @@ static int ejs_creds_get_workstation(MprVarHandle eid, int argc, struct MprVar *
 /*
   initialise credentials ejs object
 */
-static int ejs_credentials_init(MprVarHandle eid, int argc, struct MprVar **argv)
+static int ejs_credentials_obj(MprVarHandle eid, int argc, struct MprVar **argv, struct cli_credentials *creds)
 {
 	struct MprVar *obj = mprInitObject(eid, "credentials", argc, argv);
-	struct cli_credentials *creds;
-
-	creds = cli_credentials_init(mprMemCtx());
-	if (creds == NULL) {
-		return -1;
-	}
-
-	cli_credentials_guess(creds);
-	cli_credentials_set_username(creds, "", CRED_GUESSED);
-	cli_credentials_set_password(creds, "", CRED_GUESSED);
 
 	mprSetPtrChild(obj, "creds", creds);
 
@@ -216,6 +207,30 @@ static int ejs_credentials_init(MprVarHandle eid, int argc, struct MprVar **argv
 }
 
 
+/*
+  initialise credentials ejs object
+*/
+static int ejs_credentials_init(MprVarHandle eid, int argc, struct MprVar **argv)
+{
+	struct cli_credentials *creds;
+
+	creds = cli_credentials_init(mprMemCtx());
+	if (creds == NULL) {
+		return -1;
+	}
+
+	return ejs_credentials_obj(eid, argc, argv, creds);
+}
+
+/*
+  initialise cmdline credentials ejs object
+*/
+int ejs_credentials_cmdline(int eid, int argc, struct MprVar **argv)
+{
+	return ejs_credentials_obj(eid, argc, argv, cmdline_credentials);
+}
+
+
 /*
   setup C functions that be called from ejs
 */
diff --git a/source4/scripting/ejs/smbcalls_options.c b/source4/scripting/ejs/smbcalls_options.c
index 9fbfd312a9..8eca9ebcaa 100644
--- a/source4/scripting/ejs/smbcalls_options.c
+++ b/source4/scripting/ejs/smbcalls_options.c
@@ -28,8 +28,7 @@
 
 /*
   usage:
-      var options = new Object();
-      result = GetOptions(argv, options, 
+      options = GetOptions(argv, 
                           "realm=s", 
                           "enablexx", 
                           "myint=i");
@@ -41,6 +40,7 @@
 
       additional command line arguments are placed in options.ARGV
 */
+
 static int ejs_GetOptions(MprVarHandle eid, int argc, struct MprVar **argv)
 {
 	poptContext pc;
@@ -52,13 +52,15 @@ static int ejs_GetOptions(MprVarHandle eid, int argc, struct MprVar **argv)
 	} tables[] = {
 		{ "POPT_AUTOHELP", poptHelpOptions, "Help options:" },
 		{ "POPT_COMMON_SAMBA", popt_common_samba, "Common Samba options:" },
-		{ "POPT_COMMON_CONNECTION", popt_common_connection, "Connection options:" },
+ 		{ "POPT_COMMON_CONNECTION", popt_common_connection, "Connection options:" },
 		{ "POPT_COMMON_CREDENTIALS", popt_common_credentials, "Authentication options:" },
 		{ "POPT_COMMON_VERSION", popt_common_version, "Common Samba options:" }
 	};
+
+	struct MprVar *options = mprInitObject(eid, "options", 0, NULL);
+
 	TALLOC_CTX *tmp_ctx = talloc_new(mprMemCtx());
 	struct poptOption *long_options = NULL;
-	struct MprVar *options;
 	int i, num_options = 0;
 	int opt_argc;
 	const char **opt_argv;
@@ -66,15 +68,12 @@ static int ejs_GetOptions(MprVarHandle eid, int argc, struct MprVar **argv)
 	const int BASE_OPTNUM = 0x100000;
 
 	/* validate arguments */
-	if (argc < 2 ||
-	    argv[0]->type != MPR_TYPE_OBJECT ||
-	    argv[1]->type != MPR_TYPE_OBJECT) {
+	if (argc < 1 || argv[0]->type != MPR_TYPE_OBJECT) {
 		ejsSetErrorMsg(eid, "GetOptions invalid arguments");
 		return -1;
 	}
 
 	opt_argv = mprToArray(tmp_ctx, argv[0]);
-	options  = argv[1];
 	opt_argc = str_list_length(opt_argv);
 
 	long_options = talloc_array(tmp_ctx, struct poptOption, 1);
@@ -178,7 +177,10 @@ static int ejs_GetOptions(MprVarHandle eid, int argc, struct MprVar **argv)
 	poptFreeContext(pc);
 
 	talloc_free(tmp_ctx);
-	mpr_Return(eid, mprCreateBoolVar(1));
+
+	/* setup methods */
+	mprSetCFunction(options, "get_credentials", ejs_credentials_cmdline);
+
 	return 0;
 }
 
-- 
cgit 


From fef7a81478cb246a7d2fe29283a50d52501ccc33 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Mon, 22 Aug 2005 23:31:18 +0000
Subject: r9491: fixed up a few scripts that need to be updated for the new
 GetOptions syntax. Mimir, its a good idea to use grep -r to find places that
 need fixing when you change the syntax of a call :-) (This used to be commit
 1ead49f8e823a69dbd9cd3df3f5be04dc17e0d1f)

---
 source4/scripting/bin/winreg | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/bin/winreg b/source4/scripting/bin/winreg
index d869d356fd..7656c8a441 100755
--- a/source4/scripting/bin/winreg
+++ b/source4/scripting/bin/winreg
@@ -9,14 +9,12 @@ exec smbscript "$0" ${1+"$@"}
 libinclude("base.js");
 libinclude("winreg.js");
 
-var options = new Object();
-
-ok = GetOptions(ARGV, options,
-		"POPT_AUTOHELP",
-		"POPT_COMMON_SAMBA",
-		"POPT_COMMON_CREDENTIALS");
-if (ok == false) {
-	println("Failed to parse options: " + options.ERROR);
+var options = GetOptions(ARGV,
+			 "POPT_AUTOHELP",
+			 "POPT_COMMON_SAMBA",
+			 "POPT_COMMON_CREDENTIALS");
+if (options == undefined) {
+	println("Failed to parse options");
 	return -1;
 }
 
-- 
cgit 


From da6dc01ae2c7bc26a14af2189d345e0ec38a9660 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Mon, 22 Aug 2005 23:33:47 +0000
Subject: r9492: it is more usual to return 'undefined' instead of 'false' on a
 call failing (unless the call is returning a boolean anyway).

Unfortunately the new GetOptions syntax loses the ability for the caller to know why the
command line arguments were bad. Maybe we would be better always returning an object and
having an is_error element?
(This used to be commit 516ba6d20bd1bd8d0235028515e94a8c4fd6574d)
---
 source4/scripting/ejs/smbcalls_options.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_options.c b/source4/scripting/ejs/smbcalls_options.c
index 8eca9ebcaa..3ba51bb2f4 100644
--- a/source4/scripting/ejs/smbcalls_options.c
+++ b/source4/scripting/ejs/smbcalls_options.c
@@ -156,7 +156,7 @@ static int ejs_GetOptions(MprVarHandle eid, int argc, struct MprVar **argv)
 					      poptStrerror(opt));
 			mprSetVar(options, "ERROR", mprString(err));
 			talloc_free(tmp_ctx);
-			mpr_Return(eid, mprCreateBoolVar(0));
+			mpr_Return(eid, mprCreateUndefinedVar());
 			return 0;
 		}
 		opt -= BASE_OPTNUM;
-- 
cgit 


From 2dd966a465a96917ea0986de3fcd50a1e8f4c556 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Tue, 23 Aug 2005 01:59:08 +0000
Subject: r9496: added a regToVar() function that converts a registry blob
 variable to a ejs variable. (This used to be commit
 76ffc200794cdae6dcd7d07adb5617f1b09fe435)

---
 source4/scripting/ejs/smbcalls_data.c | 119 ++++++++++++++++++++++++++++++++++
 1 file changed, 119 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_data.c b/source4/scripting/ejs/smbcalls_data.c
index 3b431dc8c3..a3501b7d31 100644
--- a/source4/scripting/ejs/smbcalls_data.c
+++ b/source4/scripting/ejs/smbcalls_data.c
@@ -23,6 +23,7 @@
 #include "includes.h"
 #include "scripting/ejs/smbcalls.h"
 #include "lib/appweb/ejs/ejs.h"
+#include "librpc/gen_ndr/winreg.h"
 
 /*
   create a data blob object from a ejs array of integers
@@ -142,6 +143,123 @@ done:
 	return 0;
 }
 
+
+/*
+  convert a blob in winreg format to a mpr variable
+  
+  usage:
+     v = data.regToVar(blob, type);
+*/
+static int ejs_regToVar(MprVarHandle eid, int argc, struct MprVar **argv)
+{
+	DATA_BLOB *blob;
+	enum winreg_Type type;
+	struct MprVar v;
+
+	if (argc != 2) {
+		ejsSetErrorMsg(eid, "regToVar invalid arguments");
+		return -1;		
+	}
+	
+	blob = mprToDataBlob(argv[0]);
+	type = mprToInt(argv[1]);
+
+	if (blob == NULL) {
+		ejsSetErrorMsg(eid, "regToVar null data");
+		return -1;
+	}
+
+	switch (type) {
+	case REG_NONE:
+		v = mprCreateUndefinedVar();
+		break;
+
+	case REG_SZ:
+	case REG_EXPAND_SZ: {
+		char *s;
+		ssize_t len;
+		len = convert_string_talloc(mprMemCtx(), CH_UTF16, CH_UNIX, 
+					    blob->data, blob->length, &s);
+		if (len == -1) {
+			ejsSetErrorMsg(eid, "regToVar invalid REG_SZ string");
+			return -1;
+		}
+		v = mprString(s);
+		talloc_free(s);
+		break;
+	}
+
+	case REG_DWORD: {
+		if (blob->length != 4) {
+			ejsSetErrorMsg(eid, "regToVar invalid REG_DWORD length %d", blob->length);
+			return -1;
+		}
+		v = mprCreateNumberVar(IVAL(blob->data, 0));
+		break;
+	}
+
+	case REG_DWORD_BIG_ENDIAN: {
+		if (blob->length != 4) {
+			ejsSetErrorMsg(eid, "regToVar invalid REG_DWORD_BIG_ENDIAN length %d", blob->length);
+			return -1;
+		}
+		v = mprCreateNumberVar(RIVAL(blob->data, 0));
+		break;
+	}
+
+	case REG_QWORD: {
+		if (blob->length != 8) {
+			ejsSetErrorMsg(eid, "regToVar invalid REG_QWORD length %d", blob->length);
+			return -1;
+		}
+		v = mprCreateNumberVar(BVAL(blob->data, 0));
+		break;
+	}
+
+	case REG_MULTI_SZ: {
+		DATA_BLOB b = *blob;
+		char **list = NULL;
+		while (b.length > 0) {
+			char *s;
+			ssize_t len;
+			size_t slen = utf16_len_n(b.data, b.length);
+			if (slen == 2 && b.length == 2 && SVAL(b.data, 0) == 0) {
+				break;
+			}
+			len = convert_string_talloc(mprMemCtx(), CH_UTF16, CH_UNIX, 
+						    b.data, slen, &s);
+			if (len == -1) {
+				ejsSetErrorMsg(eid, "regToVar invalid REG_MULTI_SZ string");
+				return -1;
+			}
+			list = str_list_add(list, s);
+			talloc_free(s);
+			talloc_steal(mprMemCtx(), list);
+			b.data += slen;
+			b.length -= slen;
+		}
+		v = mprList("REG_MULTI_SZ", list);
+		talloc_free(list);
+		break;
+	}
+		
+
+	case REG_FULL_RESOURCE_DESCRIPTOR:
+	case REG_RESOURCE_LIST:
+	case REG_BINARY:
+	case REG_RESOURCE_REQUIREMENTS_LIST:
+	case REG_LINK:
+		return ejs_blobToArray(eid, 1, argv);
+
+	default:
+		ejsSetErrorMsg(eid, "regToVar invalid type %d", type);
+		return -1;		
+	}
+	
+	mpr_Return(eid, v);
+	return 0;
+}
+
 /*
   initialise datablob ejs subsystem
 */
@@ -152,6 +270,7 @@ static int ejs_datablob_init(MprVarHandle eid, int argc, struct MprVar **argv)
 	mprSetCFunction(obj, "blobFromArray", ejs_blobFromArray);
 	mprSetCFunction(obj, "blobToArray", ejs_blobToArray);
 	mprSetCFunction(obj, "blobCompare", ejs_blobCompare);
+	mprSetCFunction(obj, "regToVar", ejs_regToVar);
 
 	return 0;
 }
-- 
cgit 


From 60eb9f87a0a0c96cf67a33516b34ea8cd14dd5e9 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Tue, 23 Aug 2005 02:00:09 +0000
Subject: r9497: - converted the winreg library to a more OO style of interface

- added a reg.typestring() method that returns a string representation of a type
(This used to be commit 47cf409cdf501fc3e2b0c65688a9ef1d702278a5)
---
 source4/scripting/bin/winreg      | 25 ++++++++---
 source4/scripting/libjs/winreg.js | 93 ++++++++++++++++++++++++++-------------
 2 files changed, 83 insertions(+), 35 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/bin/winreg b/source4/scripting/bin/winreg
index 7656c8a441..7845f1034c 100755
--- a/source4/scripting/bin/winreg
+++ b/source4/scripting/bin/winreg
@@ -23,8 +23,7 @@ if (options.ARGV.length < 1) {
 	return -1;
 }
 var binding = options.ARGV[0];
-reg = winreg_init();
-security_init(reg);
+reg = winregObj();
 
 print("Connecting to " + binding + "\n");
 status = reg.connect(binding);
@@ -34,18 +33,34 @@ if (status.is_ok != true) {
 }
 
 function list_values(path) {
-	var list = winreg_enum_values(reg, path);
+	var list = reg.enum_values(path);
 	var i;
 	if (list == undefined) {
 		return;
 	}
 	for (i=0;i<list.length;i++) {
-		printf("\ttype=%2d size=%4d  '%s'\n", list[i].type, list[i].size, list[i].name);
+		var v = list[i];
+		printf("\ttype=%-30s size=%4d  '%s'\n", reg.typestring(v.type), v.size, v.name);
+		if (v.type == reg.REG_SZ || v.type == reg.REG_EXPAND_SZ) {
+			printf("\t\t'%s'\n", v.value);
+		}
+		if (v.type == reg.REG_MULTI_SZ) {
+			var j;
+			for (j in v.value) {
+				printf("\t\t'%s'\n", v.value[j]);
+			}
+		}
+		if (v.type == reg.REG_DWORD || v.type == reg.REG_DWORD_BIG_ENDIAN) {
+			printf("\t\t0x%08x (%d)\n", v.value, v.value);
+		}
+		if (v.type == reg.REG_QWORD) {
+			printf("\t\t0x%llx (%lld)\n", v.value, v.value);
+		}
 	}
 }
 
 function list_path(path) {
-	var list = winreg_enum_path(reg, path);
+	var list = reg.enum_path(path);
 	var i;
 	list_values(path);
 	for (i=0;i<list.length;i++) {
diff --git a/source4/scripting/libjs/winreg.js b/source4/scripting/libjs/winreg.js
index 8befd36045..1e9dbcbb52 100644
--- a/source4/scripting/libjs/winreg.js
+++ b/source4/scripting/libjs/winreg.js
@@ -9,31 +9,31 @@ libinclude("base.js");
 /*
   close a handle
 */
-function winreg_close(reg, handle)
+function __winreg_close(handle)
 {
 	var io = irpcObj();
 	io.input.handle = handle;
-	reg.winreg_CloseKey(io);
+	this.winreg_CloseKey(io);
 }
 
 
 /*
   open a hive
 */
-function winreg_open_hive(reg, hive)
+function __winreg_open_hive(hive)
 {
 	var io = irpcObj();
 	io.input.system_name = NULL;
-	io.input.access_required = reg.SEC_FLAG_MAXIMUM_ALLOWED;
+	io.input.access_required = this.SEC_FLAG_MAXIMUM_ALLOWED;
 	var status;
 	if (hive == "HKLM") {
-		status = reg.winreg_OpenHKLM(io);
+		status = this.winreg_OpenHKLM(io);
 	} else if (hive == "HKCR") {
-		status = reg.winreg_OpenHKCR(io);
+		status = this.winreg_OpenHKCR(io);
 	} else if (hive == "HKPD") {
-		status = reg.winreg_OpenHKPD(io);
+		status = this.winreg_OpenHKPD(io);
 	} else if (hive == "HKU") {
-		status = reg.winreg_OpenHKU(io);
+		status = this.winreg_OpenHKU(io);
 	} else {
 		println("Unknown hive " + hive);
 		return undefined;
@@ -47,7 +47,7 @@ function winreg_open_hive(reg, hive)
 /*
   open a handle to a path
 */
-function winreg_open_path(reg, path)
+function __winreg_open_path(path)
 {
 	var s = string_init();
 	var i, components = s.split('\\', path);
@@ -67,7 +67,7 @@ function winreg_open_path(reg, path)
 		return undefined;
 	}
 
-	var handle = winreg_open_hive(reg, components[0]);
+	var handle = this.open_hive(components[0]);
 	if (handle == undefined) {
 		return undefined;
 	}
@@ -86,10 +86,10 @@ function winreg_open_path(reg, path)
 	io.input.handle  = handle;
 	io.input.keyname = hpath;
 	io.input.unknown = 0;
-	io.input.access_mask = reg.SEC_FLAG_MAXIMUM_ALLOWED;
-	var status = reg.winreg_OpenKey(io);
+	io.input.access_mask = this.SEC_FLAG_MAXIMUM_ALLOWED;
+	var status = this.winreg_OpenKey(io);
 
-	winreg_close(reg, handle);
+	this.close(handle);
 
 	if (!status.is_ok) {
 		return undefined;
@@ -104,9 +104,9 @@ function winreg_open_path(reg, path)
 /*
 	return a list of keys for a winreg server given a path
 	usage:
-	   list = winreg_enum_path(reg, path);
+	   list = reg.enum_path(path);
 */
-function winreg_enum_path(reg, path)
+function __winreg_enum_path(path)
 {
 	var list = new Object();
 	list.length = 0;
@@ -115,7 +115,7 @@ function winreg_enum_path(reg, path)
 		return new Array("HKLM", "HKU");
 	}
 	
-	var handle = winreg_open_path(reg, path);
+	var handle = this.open_path(path);
 	if (handle == undefined) {
 		return undefined;
 	}
@@ -135,9 +135,9 @@ function winreg_enum_path(reg, path)
 	var idx = 0;
 	for (idx=0;idx >= 0;idx++) {
 		io.input.enum_index = idx;
-		var status = reg.winreg_EnumKey(io);
+		var status = this.winreg_EnumKey(io);
 		if (!status.is_ok) {
-			winreg_close(reg, handle);
+			this.close(handle);
 			return list;
 		}
 		var out = io.output;
@@ -145,20 +145,20 @@ function winreg_enum_path(reg, path)
 			io.input.name.size = io.input.name.size * 2;
 			idx--;
 			if (io.input.name.size > 32000) {
-				winreg_close(reg, handle);
+				this.close(handle);
 				return list;
 			}
 			continue;
 		}
 		if (out.result != "WERR_OK") {
-			winreg_close(reg, handle);
+			this.close(handle);
 			return list;
 		}
 		list[list.length] = out.name.name;
 		list.length++;
 	}
 
-	winreg_close(reg, handle);
+	this.close(handle);
 	return list;
 }
 
@@ -166,17 +166,18 @@ function winreg_enum_path(reg, path)
 /*
 	return a list of values for a winreg server given a path
 	usage:
-	   list = winreg_enum_values(reg, path);
+	   list = reg.enum_values(path);
 
 	each returned list element is an object containing a name, a
 	type and a value
 */
-function winreg_enum_values(reg, path)
+function __winreg_enum_values(path)
 {
+	var data = datablob_init();
 	var list = new Object();
 	list.length = 0;
 
-	var handle = winreg_open_path(reg, path);
+	var handle = this.open_path(path);
 	if (handle == undefined) {
 		return undefined;
 	}
@@ -195,9 +196,9 @@ function winreg_enum_values(reg, path)
 	var idx;
 	for (idx=0;idx >= 0;idx++) {
 		io.input.enum_index = idx;
-		var status = reg.winreg_EnumValue(io);
+		var status = this.winreg_EnumValue(io);
 		if (!status.is_ok) {
-			winreg_close(reg, handle);
+			this.close(handle);
 			return list;
 		}
 		var out = io.output;
@@ -207,24 +208,56 @@ function winreg_enum_values(reg, path)
 			idx--;
 			/* limit blobs to 1M */
 			if (io.input.size > 1000000) {
-				winreg_close(reg, handle);
+				this.close(handle);
 				return list;
 			}
 			continue;
 		}
 		if (out.result != "WERR_OK") {
-			winreg_close(reg, handle);
+			this.close(handle);
 			return list;
 		}
 		var el   = new Object();
 		el.name  = out.name.name;
 		el.type  = out.type;
-		el.value = out.value;
+		el.rawvalue = out.value;
+		el.value = data.regToVar(el.rawvalue, el.type);
 		el.size  = out.size;
 		list[list.length] = el;
 		list.length++;
 	}
 
-	winreg_close(reg, handle);
+	this.close(handle);
 	return list;
 }
+
+/*
+  return a string for a winreg type
+*/
+function __winreg_typestring(type)
+{
+	return this.typenames[type];
+}
+
+/*
+  initialise the winreg lib, returning an object
+*/
+function winregObj()
+{
+	var reg = winreg_init();
+	security_init(reg);
+
+	reg.typenames = new Array("REG_NONE", "REG_SZ", "REG_EXPAND_SZ", "REG_BINARY", 
+				  "REG_DWORD", "REG_DWORD_BIG_ENDIAN", "REG_LINK", "REG_MULTI_SZ",
+				  "REG_RESOURCE_LIST", "REG_FULL_RESOURCE_DESCRIPTOR", 
+				  "REG_RESOURCE_REQUIREMENTS_LIST", "REG_QWORD");
+
+	reg.close = __winreg_close;
+	reg.open_hive = __winreg_open_hive;
+	reg.open_path = __winreg_open_path;
+	reg.enum_path = __winreg_enum_path;
+	reg.enum_values = __winreg_enum_values;
+	reg.typestring = __winreg_typestring;
+
+	return reg;
+}
-- 
cgit 


From 185adae2f90ed187c7c4e0d415defb35b9c78722 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Tue, 23 Aug 2005 02:05:53 +0000
Subject: r9499: added error checking to the userAuth() call. SWAT is still
 failing, but at least it now tells us why (This used to be commit
 4afb16d7b24b1d1ed359048a89950924b363e44a)

---
 source4/scripting/ejs/smbcalls_auth.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_auth.c b/source4/scripting/ejs/smbcalls_auth.c
index 37ac9543cc..06d17ed01a 100644
--- a/source4/scripting/ejs/smbcalls_auth.c
+++ b/source4/scripting/ejs/smbcalls_auth.c
@@ -105,7 +105,7 @@ static int ejs_userAuth(MprVarHandle eid, int argc, struct MprVar **argv)
 	const char *password;
 	const char *domain;
 	const char *remote_host;
-	struct MprVar auth, *creds_obj;
+	struct MprVar auth;
 	struct cli_credentials *creds;
 
 	if (argc != 1 || argv[0]->type != MPR_TYPE_OBJECT) {
@@ -115,6 +115,10 @@ static int ejs_userAuth(MprVarHandle eid, int argc, struct MprVar **argv)
 
 	/* get credential values from credentials object */
 	creds = mprGetPtr(argv[0], "creds");
+	if (creds == NULL) {
+		ejsSetErrorMsg(eid, "userAuth requires a 'creds' element");
+		return -1;
+	}
 	username    = cli_credentials_get_username(creds);
 	password    = cli_credentials_get_password(creds);
 	domain      = cli_credentials_get_domain(creds);
-- 
cgit 


From d857d1a9650efdf26b49e3939721dfc6fc0a1edb Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Tue, 23 Aug 2005 02:11:49 +0000
Subject: r9500: userAuth() takes a creds object, not a general object now ...
 (This used to be commit 57e6eb9c66ba539a593524d8cfd8836a840ac1ba)

---
 source4/scripting/ejs/smbcalls_auth.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_auth.c b/source4/scripting/ejs/smbcalls_auth.c
index 06d17ed01a..ef3b86a8b4 100644
--- a/source4/scripting/ejs/smbcalls_auth.c
+++ b/source4/scripting/ejs/smbcalls_auth.c
@@ -122,7 +122,7 @@ static int ejs_userAuth(MprVarHandle eid, int argc, struct MprVar **argv)
 	username    = cli_credentials_get_username(creds);
 	password    = cli_credentials_get_password(creds);
 	domain      = cli_credentials_get_domain(creds);
-	remote_host = mprToString(mprGetProperty(argv[0], "rhost", NULL));
+	remote_host = cli_credentials_get_workstation(creds);
 
 	if (username == NULL || password == NULL || domain == NULL) {
 		mpr_Return(eid, mprCreateUndefinedVar());
-- 
cgit 


From 8f9478b09d39d8c13871684a6af3d3e1629a0e84 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Tue, 23 Aug 2005 05:21:04 +0000
Subject: r9504: use some low level ejs hackery to give much better exception
 error messages in both the web server and smbscript. We can now give
 backtraces for all internal asserts, not just high level errors (This used to
 be commit 84c756b25ccb2bd75360bdb9b7b7643975d1f3b3)

---
 source4/scripting/ejs/smbscript.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbscript.c b/source4/scripting/ejs/smbscript.c
index b16536a575..a35b988e56 100644
--- a/source4/scripting/ejs/smbscript.c
+++ b/source4/scripting/ejs/smbscript.c
@@ -24,17 +24,21 @@
 #include "includes.h"
 #include "dynconfig.h"
 #include "lib/appweb/ejs/ejs.h"
+#include "lib/appweb/ejs/ejsInternal.h"
 #include "scripting/ejs/smbcalls.h"
 
+static EjsId eid;
+
 void ejs_exception(const char *reason)
 {
-	fprintf(stderr, "smbscript exception: %s", reason);
+	Ejs *ep = ejsPtr(eid);
+	ejsSetErrorMsg(eid, "%s", reason);
+	fprintf(stderr, "%s", ep->error);
 	exit(127);
 }
 
  int main(int argc, const char **argv)
 {
-	EjsId eid;
 	EjsHandle handle = 0;
 	MprVar result;
 	char *emsg, *script;
-- 
cgit 


From cfa981c65667fb63c2c2af8a48149dc6e89f461c Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Wed, 24 Aug 2005 08:28:49 +0000
Subject: r9566: fix an uninitialised variable (This used to be commit
 7082440a70c5f85606538b7a35a1cc8f41eb7eeb)

---
 source4/scripting/ejs/smbcalls_ldb.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_ldb.c b/source4/scripting/ejs/smbcalls_ldb.c
index 7d268d09f6..899cba5460 100644
--- a/source4/scripting/ejs/smbcalls_ldb.c
+++ b/source4/scripting/ejs/smbcalls_ldb.c
@@ -132,7 +132,7 @@ static int ejs_ldbAddModify(MprVarHandle eid, int argc, struct MprVar **argv,
 	const char *ldifstring;
 	struct ldb_context *ldb;
 	struct ldb_ldif *ldif;
-	int ret;
+	int ret = 0;
 
 	if (argc != 1) {
 		ejsSetErrorMsg(eid, "ldb.add/modify invalid arguments");
-- 
cgit 


From 4a37c7ebbe0beec064f11ea075e1a5285290d7e1 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Wed, 24 Aug 2005 08:32:51 +0000
Subject: r9568: updated the winreg js library for CreateKey, and add a
 --createkey option to the winreg tool (This used to be commit
 881452c7b7cc00222328f743c2c0c4ece39f4c96)

---
 source4/scripting/bin/winreg      | 18 ++++++++++++---
 source4/scripting/libjs/winreg.js | 47 ++++++++++++++++++++++++++++++++++-----
 2 files changed, 56 insertions(+), 9 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/bin/winreg b/source4/scripting/bin/winreg
index 7845f1034c..12f40f1155 100755
--- a/source4/scripting/bin/winreg
+++ b/source4/scripting/bin/winreg
@@ -12,7 +12,8 @@ libinclude("winreg.js");
 var options = GetOptions(ARGV,
 			 "POPT_AUTOHELP",
 			 "POPT_COMMON_SAMBA",
-			 "POPT_COMMON_CREDENTIALS");
+			 "POPT_COMMON_CREDENTIALS",
+			 "createkey=s");
 if (options == undefined) {
 	println("Failed to parse options");
 	return -1;
@@ -61,6 +62,10 @@ function list_values(path) {
 
 function list_path(path) {
 	var list = reg.enum_path(path);
+	if (list == undefined) {
+		println("Unable to list " + path);
+		return;
+	}
 	var i;
 	list_values(path);
 	for (i=0;i<list.length;i++) {
@@ -83,6 +88,13 @@ if (options.ARGV.length > 1) {
 	root = '';
 }
 
-printf("Listing registry tree '%s'\n", root);
-list_path(root);
+if (options.createkey) {
+	var ok = reg.create_key("HKLM\\SOFTWARE", options.createkey);
+	if (!ok) {
+		
+	}
+} else {
+	printf("Listing registry tree '%s'\n", root);
+	list_path(root);
+}
 return 0;
diff --git a/source4/scripting/libjs/winreg.js b/source4/scripting/libjs/winreg.js
index 1e9dbcbb52..adcefcae85 100644
--- a/source4/scripting/libjs/winreg.js
+++ b/source4/scripting/libjs/winreg.js
@@ -35,7 +35,7 @@ function __winreg_open_hive(hive)
 	} else if (hive == "HKU") {
 		status = this.winreg_OpenHKU(io);
 	} else {
-		println("Unknown hive " + hive);
+		this._last_error = "Unknown hive " + hive;
 		return undefined;
 	}
 	if (!status.is_ok) {
@@ -231,6 +231,40 @@ function __winreg_enum_values(path)
 	return list;
 }
 
+
+/*
+  create a new key
+    ok = reg.create_key(path, key);
+*/
+function __winreg_create_key(path, key)
+{
+	var handle = this.open_path(path);
+	if (handle == undefined) {
+		return undefined;
+	}
+
+	var io = irpcObj();
+	io.input.handle = handle;
+	io.input.name = key;
+	io.input.class = NULL;
+	io.input.options = 0;
+	io.input.access_required = this.SEC_FLAG_MAXIMUM_ALLOWED;
+	io.input.secdesc = NULL;
+	io.input.action_taken = 0;	
+
+	var status = this.winreg_CreateKey(io);
+	this.close(handle);
+	if (!status.is_ok) {
+		return false;
+	}
+	if (io.output.result != "WERR_OK") {
+		return false;
+	}
+	this.close(io.output.new_handle);
+	return true;
+}
+
+
 /*
   return a string for a winreg type
 */
@@ -252,12 +286,13 @@ function winregObj()
 				  "REG_RESOURCE_LIST", "REG_FULL_RESOURCE_DESCRIPTOR", 
 				  "REG_RESOURCE_REQUIREMENTS_LIST", "REG_QWORD");
 
-	reg.close = __winreg_close;
-	reg.open_hive = __winreg_open_hive;
-	reg.open_path = __winreg_open_path;
-	reg.enum_path = __winreg_enum_path;
+	reg.close       = __winreg_close;
+	reg.open_hive   = __winreg_open_hive;
+	reg.open_path   = __winreg_open_path;
+	reg.enum_path   = __winreg_enum_path;
 	reg.enum_values = __winreg_enum_values;
-	reg.typestring = __winreg_typestring;
+	reg.create_key  = __winreg_create_key;
+	reg.typestring  = __winreg_typestring;
 
 	return reg;
 }
-- 
cgit 


From 10dcfca9f18648f3fb32f0810d36af4e1eaf76e0 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Wed, 24 Aug 2005 12:19:59 +0000
Subject: r9580: put the libinclude() after the GetOptions so the smb.conf is
 loaded to get the libjs path (This used to be commit
 ee0b693ffaf02e75d3d740c36fffb9ea75e54431)

---
 source4/scripting/bin/winreg | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/bin/winreg b/source4/scripting/bin/winreg
index 12f40f1155..ac6f9e61ba 100755
--- a/source4/scripting/bin/winreg
+++ b/source4/scripting/bin/winreg
@@ -6,9 +6,6 @@ exec smbscript "$0" ${1+"$@"}
   Released under the GNU GPL v2 or later
 */	
 
-libinclude("base.js");
-libinclude("winreg.js");
-
 var options = GetOptions(ARGV,
 			 "POPT_AUTOHELP",
 			 "POPT_COMMON_SAMBA",
@@ -19,6 +16,9 @@ if (options == undefined) {
 	return -1;
 }
 
+libinclude("base.js");
+libinclude("winreg.js");
+
 if (options.ARGV.length < 1) {
 	println("Usage: winreg.js <BINDING> [path]");
 	return -1;
@@ -91,7 +91,7 @@ if (options.ARGV.length > 1) {
 if (options.createkey) {
 	var ok = reg.create_key("HKLM\\SOFTWARE", options.createkey);
 	if (!ok) {
-		
+		println("Failed to create key");
 	}
 } else {
 	printf("Listing registry tree '%s'\n", root);
-- 
cgit 


From 2e35b720862e1a48a8b3ff1400262d4185258121 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Fri, 26 Aug 2005 11:37:52 +0000
Subject: r9645: fixed the ejs GetOptions() call to look at the first option
 passed (this is what broke --help) (This used to be commit
 88a7e9e00f3714f89067ef97dfca46bc0688222e)

---
 source4/scripting/ejs/smbcalls_options.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_options.c b/source4/scripting/ejs/smbcalls_options.c
index 3ba51bb2f4..2e94b7d72b 100644
--- a/source4/scripting/ejs/smbcalls_options.c
+++ b/source4/scripting/ejs/smbcalls_options.c
@@ -82,7 +82,7 @@ static int ejs_GetOptions(MprVarHandle eid, int argc, struct MprVar **argv)
 	}
 
 	/* create the long_options array */
-	for (i=2;i<argc;i++) {
+	for (i=1;i<argc;i++) {
 		const char *optstr = mprToString(argv[i]);
 		int t, opt_type = POPT_ARG_NONE;
 		const char *s;
-- 
cgit 


From 95ed275dbbff7c1e3a58a3d0c5408087ef9a0432 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sat, 27 Aug 2005 23:47:17 +0000
Subject: r9698: Fix a bit of memory management More minor bugfixes Support
 mapping objectclasses and do mapping on 'dn' field as well (not just msg->dn)
 (This used to be commit b7b079167d5c6616f7c5c4afb7dd80c15707cfd9)

---
 source4/scripting/ejs/mprutil.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/mprutil.c b/source4/scripting/ejs/mprutil.c
index 38cfd2c493..0e23738b30 100644
--- a/source4/scripting/ejs/mprutil.c
+++ b/source4/scripting/ejs/mprutil.c
@@ -323,7 +323,7 @@ struct MprVar mprNTSTATUS(NTSTATUS status)
 struct MprVar mprDataBlob(DATA_BLOB blob)
 {
 	struct MprVar res;
-	struct data_blob *pblob = talloc(mprMemCtx(), struct data_blob);
+	DATA_BLOB *pblob = talloc(mprMemCtx(), DATA_BLOB);
 	*pblob = data_blob_talloc(pblob, blob.data, blob.length);
 
 	res = mprObject("DATA_BLOB");
-- 
cgit 


From 37059d70d9ef905bbcea715e93f5057caf0759d1 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sun, 28 Aug 2005 01:37:27 +0000
Subject: r9700: Change DATA_BLOB in ejs back to struct datablob Support
 writing idmap mappings to winbind.ldif (This used to be commit
 3709def35303f1afed0f344628fe2c89250ee087)

---
 source4/scripting/ejs/mprutil.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/mprutil.c b/source4/scripting/ejs/mprutil.c
index 0e23738b30..9634c9bf42 100644
--- a/source4/scripting/ejs/mprutil.c
+++ b/source4/scripting/ejs/mprutil.c
@@ -323,7 +323,7 @@ struct MprVar mprNTSTATUS(NTSTATUS status)
 struct MprVar mprDataBlob(DATA_BLOB blob)
 {
 	struct MprVar res;
-	DATA_BLOB *pblob = talloc(mprMemCtx(), DATA_BLOB);
+	struct datablob *pblob = talloc(mprMemCtx(), struct datablob);
 	*pblob = data_blob_talloc(pblob, blob.data, blob.length);
 
 	res = mprObject("DATA_BLOB");
@@ -337,9 +337,9 @@ struct MprVar mprDataBlob(DATA_BLOB blob)
 /*
   return a data blob from a mpr var created using mprDataBlob
 */
-struct data_blob *mprToDataBlob(struct MprVar *v)
+struct datablob *mprToDataBlob(struct MprVar *v)
 {
-	return talloc_get_type(mprGetPtr(v, "blob"), struct data_blob);
+	return talloc_get_type(mprGetPtr(v, "blob"), struct datablob);
 }
 
 /*
-- 
cgit 


From c98c6aa5611f26ab591c50fcded1fc55e81a0d07 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Sun, 28 Aug 2005 02:37:14 +0000
Subject: r9702:  r9680@blu:  tridge | 2005-08-27 18:45:08 +1000  - fixed
 ncacn_ip_tcp to use the generic async name resolution methods,    so NBT
 names now work (as requested several times by abartlet!)

 - changed resolve_name() to take an event_context, so it doesn't cause
   the whole process to block

 - cleaned up the talloc_find_parent_bytype() calls to go via a cleaner
   event_context_find() call
(This used to be commit b3d491b210a8b889a25efcb273e70fefbd01b7f7)
---
 source4/scripting/ejs/smbcalls_nbt.c | 3 ++-
 source4/scripting/ejs/smbcalls_rpc.c | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_nbt.c b/source4/scripting/ejs/smbcalls_nbt.c
index c5722202f7..f72b4b46ac 100644
--- a/source4/scripting/ejs/smbcalls_nbt.c
+++ b/source4/scripting/ejs/smbcalls_nbt.c
@@ -24,6 +24,7 @@
 #include "scripting/ejs/smbcalls.h"
 #include "lib/appweb/ejs/ejs.h"
 #include "librpc/gen_ndr/ndr_nbt.h"
+#include "lib/events/events.h"
 
 /*
   look up a netbios name
@@ -69,7 +70,7 @@ static int ejs_resolve_name(MprVarHandle eid, int argc, struct MprVar **argv)
 
 	result = 0;
 
-	nt_status = resolve_name(&name, tmp_ctx, &reply_addr);
+	nt_status = resolve_name(&name, tmp_ctx, &reply_addr, event_context_find(tmp_ctx));
 
 	if (NT_STATUS_IS_OK(nt_status)) {
 		mprSetPropertyValue(argv[0], "value", mprString(reply_addr));
diff --git a/source4/scripting/ejs/smbcalls_rpc.c b/source4/scripting/ejs/smbcalls_rpc.c
index 6da8cb351c..4163896e71 100644
--- a/source4/scripting/ejs/smbcalls_rpc.c
+++ b/source4/scripting/ejs/smbcalls_rpc.c
@@ -28,6 +28,7 @@
 #include "lib/messaging/irpc.h"
 #include "scripting/ejs/ejsrpc.h"
 #include "dlinklist.h"
+#include "lib/events/events.h"
 
 /*
   state of a irpc 'connection'
@@ -69,7 +70,7 @@ static int ejs_irpc_connect(MprVarHandle eid, int argc, char **argv)
 
 	p->server_name = argv[0];
 
-	ev = talloc_find_parent_bytype(mprMemCtx(), struct event_context);
+	ev = event_context_find(p);
 
 	/* create a messaging context, looping as we have no way to
 	   allocate temporary server ids automatically */
@@ -150,7 +151,7 @@ static int ejs_rpc_connect(MprVarHandle eid, int argc, char **argv)
 		cli_credentials_set_anonymous(creds);
 	}
 
-	ev = talloc_find_parent_bytype(mprMemCtx(), struct event_context);
+	ev = event_context_find(mprMemCtx());
 
 	status = dcerpc_pipe_connect(this, &p, binding, 
 				     iface->uuid, iface->if_version, 
-- 
cgit 


From 8da7ab52ebcb6fb20aa87a19f5065d931cac853c Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Sun, 28 Aug 2005 02:38:00 +0000
Subject: r9706:  r11042@blu:  tridge | 2005-08-28 12:40:09 +1000  a NULL
 expression is valid in a ldb search (This used to be commit
 a8748cab865c765f844336087a386c01e60add62)

---
 source4/scripting/ejs/smbcalls_ldb.c | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_ldb.c b/source4/scripting/ejs/smbcalls_ldb.c
index 899cba5460..aaed14dd8c 100644
--- a/source4/scripting/ejs/smbcalls_ldb.c
+++ b/source4/scripting/ejs/smbcalls_ldb.c
@@ -75,10 +75,6 @@ static int ejs_ldbSearch(MprVarHandle eid, int argc, struct MprVar **argv)
 	}
 	
 	expression = mprToString(argv[0]);
-	if (expression == NULL) {
-		ejsSetErrorMsg(eid, "ldb.search invalid expression");
-		goto failed;
-	}
 	if (argc > 1) {
 		base = mprToString(argv[1]);
 		/* a null basedn is valid */
-- 
cgit 


From 9b0662bb4478ba6b8c75de1e7e5e272a0d14c2d6 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Sun, 28 Aug 2005 02:38:11 +0000
Subject: r9707:  r11080@blu:  tridge | 2005-08-28 12:41:12 +1000  make sure we
 leave the account enabled after creating a new user (This used to be commit
 a22d0d02eed8b960f5fde4211b0d2967c500f4a4)

---
 source4/scripting/libjs/provision.js | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index 0bcb2fa761..afa5adaa9f 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -317,6 +317,28 @@ function searchone(ldb, expression, attribute)
 	return res[0][attribute];
 }
 
+/*
+  modify an account to remove the 
+*/
+function enable_account(ldb, user_dn)
+{
+	var attrs = new Array("userAccountControl");
+	var res = ldb.search(NULL, user_dn, ldb.SCOPE_ONELEVEL, attrs);
+	assert(res.length == 1);
+	var userAccountControl = res[0].userAccountControl;
+	userAccountControl = userAccountControl - 2; /* remove disabled bit */
+	var mod = sprintf("
+dn: %s
+changetype: modify
+replace: userAccountControl
+userAccountControl: %u
+", 
+			  user_dn, userAccountControl);
+	var ok = ldb.modify(mod);
+	return ok;	
+}
+
+
 /*
   add a new user record
 */
@@ -385,7 +407,10 @@ member: %s
 		return false;
 	}
 
-	return true;
+	/*
+	  modify the userAccountControl to remove the disabled bit
+	*/
+	return enable_account(ldb, user_dn);
 }
 
 
-- 
cgit 


From d6cd54fb0a1c3ac51479d1fdcff91893c27ef9d7 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sun, 28 Aug 2005 22:17:07 +0000
Subject: r9718: Work a bit on the SWAT interface (This used to be commit
 b1844905d2c1ca26aef0ccba799ff16383348fc1)

---
 source4/scripting/libjs/samba3.js | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 source4/scripting/libjs/samba3.js

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/samba3.js b/source4/scripting/libjs/samba3.js
new file mode 100644
index 0000000000..7f50c8c4b2
--- /dev/null
+++ b/source4/scripting/libjs/samba3.js
@@ -0,0 +1,8 @@
+/*
+	backend code for upgrading from Samba3
+	Copyright Jelmer Vernooij 2005
+	Released under the GNU GPL v2 or later
+*/
+
+
+return 0;
-- 
cgit 


From d152839e299e7e406bb938c5b413ad975a895d6f Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sun, 28 Aug 2005 23:03:49 +0000
Subject: r9722: Initial attempt at converting samba3dump to EJS.. (This used
 to be commit 7e3b94dfb9c421793dab7813b96ca63da4b33960)

---
 source4/scripting/bin/samba3dump        | 220 +++++++++++++++++++++++++++
 source4/scripting/ejs/config.mk         |   3 +-
 source4/scripting/ejs/smbcalls.c        |   1 +
 source4/scripting/ejs/smbcalls_samba3.c | 255 ++++++++++++++++++++++++++++++++
 source4/scripting/ejs/smbscript.c       |   5 +
 source4/scripting/libjs/samba3.js       |   8 -
 source4/scripting/libjs/upgrade.js      |  13 ++
 7 files changed, 496 insertions(+), 9 deletions(-)
 create mode 100644 source4/scripting/bin/samba3dump
 create mode 100644 source4/scripting/ejs/smbcalls_samba3.c
 delete mode 100644 source4/scripting/libjs/samba3.js
 create mode 100644 source4/scripting/libjs/upgrade.js

(limited to 'source4/scripting')

diff --git a/source4/scripting/bin/samba3dump b/source4/scripting/bin/samba3dump
new file mode 100644
index 0000000000..71937c27c7
--- /dev/null
+++ b/source4/scripting/bin/samba3dump
@@ -0,0 +1,220 @@
+#!/bin/sh
+exec smbscript "$0" ${1+"$@"}
+/*
+	Dump Samba3 data
+	Copyright Jelmer Vernooij 2005
+	Released under the GNU GPL v2 or later
+*/
+
+options = GetOptions(ARGV,
+		"POPT_AUTOHELP",
+		"POPT_COMMON_SAMBA",
+		"POPT_COMMON_VERSION",
+		'format=s',
+		'quiet', 'blank');
+
+if (options == undefined) {
+   println("Failed to parse options");
+   return -1;
+}
+
+if (options.format == undefined) {
+	options.format = "summary";
+}
+
+if (options.format != "summary" && options.format != "full") {
+	printf("Unknown format %s\n", options.format);
+	return -1;
+}
+
+libinclude("base.js");
+
+if (ARGV.length != 3) {
+	println("Usage: samba3dump <libdir> <smb.conf>");
+	return -1;
+}
+
+function print_header(txt)
+{
+	printf("\n%s\n", txt);
+	for (i = 0; txt[i]; i++) putchar('=');
+	putchar('\n');
+}
+
+function print_samba3_policy(pol)
+{
+	print_header("Account Policies");
+	printf("Min password length: %d\n", pol.min_password_length);
+	printf("Password history length: %d\n", pol.password_history);
+	printf("User must logon to change password: %d\n", pol.user_must_logon_to_change_password);
+	printf("Maximum password age: %d\n", pol.maximum_password_age);
+	printf("Minimum password age: %d\n", pol.minimum_password_age);
+	printf("Lockout duration: %d\n", pol.lockout_duration);
+	printf("Reset Count Minutes: %d\n", pol.reset_count_minutes);
+	printf("Bad Lockout Minutes: %d\n", pol.bad_lockout_minutes);
+	printf("Disconnect Time: %d\n", pol.disconnect_time);
+	printf("Refuse Machine Password Change: %d\n", pol.refuse_machine_password_change);
+}
+
+function print_samba3_sam(samba3)
+{
+	print_header("SAM Database");
+	
+	for (i = 0; i < samba3.samaccount_count; i++) {
+		printf("%d: %s\n", samba3.samaccounts[i].user_rid, samba3.samaccounts[i].username);
+	}
+}
+
+function print_samba3_shares(samba3)
+{
+	print_header("Configured shares");
+	for (i = 0; i < samba3.share_count; i++) {
+		printf("--- %s ---\n", samba3.shares[i].name);
+
+		for (j = 0; j < samba3.shares[i].parameter_count; j++) {
+			printf("\t%s = %s\n", samba3.shares[i].parameters[j].name, samba3.shares[i].parameters[j].value);
+		}
+
+		println("");
+	}
+}
+
+function print_samba3_secrets(secrets)
+{
+	print_header("Secrets");
+
+	println("IPC Credentials:");
+	if (secrets.ipc_cred.username_obtained) 
+		printf("	User: %s\n", secrets.ipc_cred.username);
+	if (secrets.ipc_cred.password_obtained)
+		printf("	Password: %s\n", secrets.ipc_cred.password);
+
+	if (secrets.ipc_cred.domain_obtained)
+		printf("	Domain: %s\n\n", secrets.ipc_cred.domain);
+
+	println("LDAP passwords:");
+	for (i = 0; i < secrets.ldappw_count; i++) {
+		printf("\t%s -> %s\n", secrets.ldappws[i].dn, secrets.ldappws[i].password);
+	}
+	println("");
+
+	println("Domains:");
+	for (i = 0; i < secrets.domain_count; i++) {
+		printf("\t--- %s ---\n", secrets.domains[i].name);
+		printf("\tSID: %s\n", secrets.domains[i].sid);
+		printf("\tGUID: %s\n", secrets.domains[i].guid);
+		printf("\tPlaintext pwd: %s\n", secrets.domains[i].plaintext_pw);
+		printf("\tLast Changed: %lu\n", secrets.domains[i].last_change_time);
+		printf("\tSecure Channel Type: %d\n\n", secrets.domains[i].sec_channel_type);
+	}
+
+	println("Trusted domains:");
+	for (i = 0; i < secrets.trusted_domain_count; i++) {
+		for (j = 0; j < secrets.trusted_domains[i].uni_name_len; j++) {
+			printf("\t--- %s ---\n", secrets.trusted_domains[i].uni_name[j]);
+		}
+		printf("\tPassword: %s\n", secrets.trusted_domains[i].pass);
+		printf("\tModified: %lu\n", secrets.trusted_domains[i].mod_time);
+		printf("\tSID: %s\n", secrets.trusted_domains[i].domain_sid);
+	}
+}
+
+function print_samba3_regdb(regdb)
+{
+	print_header("Registry");
+
+	for (i = 0; i < regdb.key_count; i++) {
+		printf("%s\n", regdb.keys[i].name);
+		for (j = 0; j < regdb.keys[i].value_count; j++) {
+			printf("\t%s: type %d, length %d\n", 
+				   regdb.keys[i].values[j].name,
+				   regdb.keys[i].values[j].type,
+				   regdb.keys[i].values[j].data.length);
+		}
+	}
+}
+
+function print_samba3_winsdb(samba3)
+{
+	print_header("WINS Database");
+
+	for (i = 0; i < samba3.winsdb_count; i++) {
+		printf("%s, nb_flags: %x, type: %d, ttl: %lu, %d ips\n", samba3.winsdb_entries[i].name, samba3.winsdb_entries[i].nb_flags, samba3.winsdb_entries[i].type, samba3.winsdb_entries[i].ttl, samba3.winsdb_entries[i].ip_count);
+	}
+}
+
+function print_samba3_groupdb(groupdb)
+{
+	int i;
+	print_header("Group Mappings");
+	
+	for (i = 0; i < groupdb.groupmap_count; i++) 
+	{
+		printf("\t--- Group: %s ---\n", groupdb.groupmappings[i].nt_name);
+		printf("\tComment: %s\n", groupdb.groupmappings[i].comment);
+		printf("\tGID: %d\n", groupdb.groupmappings[i].gid);
+		printf("\tSID Name Use: %d\n", groupdb.groupmappings[i].sid_name_use);
+		printf("\tSID: %s\n\n", groupdb.groupmappings[i].sid);
+	}
+
+	for (i = 0; i < groupdb.alias_count; i++)
+	{
+		int j;
+		printf("\t--- Alias: %s ---\n", groupdb.aliases[i].sid);
+		for (j = 0; j < groupdb.aliases[i].member_count; j++) {
+			printf("\t%s\n", groupdb.aliases[i].members[j]);
+		}
+	}
+}
+
+function print_samba3_idmapdb(idmapdb)
+{
+	print_header("Winbindd SID<->GID/UID mappings");
+
+	printf("User High Water Mark: %d\n", idmapdb.user_hwm);
+	printf("Group High Water Mark: %d\n\n", idmapdb.group_hwm);
+
+	for (i = 0; i < idmapdb.mapping_count; i++) {
+		printf("%s -> ", 
+			  idmapdb.mappings[i].sid);
+
+		if (idmapdb.mappings[i].type == IDMAP_GROUP) { 
+			printf("GID %d", idmapdb.mappings[i].unix_id);
+		} else {
+			printf("UID %d", idmapdb.mappings[i].unix_id);
+		}
+	}
+}
+
+function print_samba3(samba3)
+{
+	print_samba3_sam(samba3);
+	print_samba3_policy(samba3.policy);
+	print_samba3_shares(samba3);
+	print_samba3_winsdb(samba3);
+	print_samba3_regdb(samba3.registry);
+	print_samba3_secrets(samba3.secrets);
+	print_samba3_groupdb(samba3.group);
+	print_samba3_idmapdb(samba3.idmap);
+}
+
+function print_samba3_summary(samba3)
+{
+	printf("WINS db entries: %d\n", samba3.winsdb_count);
+	printf("SAM Accounts: %d\n", samba3.samaccount_count);
+	printf("Registry key count: %d\n", samba3.registry.key_count);
+	printf("Shares (including [global]): %d\n", samba3.share_count);
+	printf("Groupmap count: %d\n", samba3.group.groupmap_count);
+	printf("Alias count: %d\n", samba3.group.alias_count);
+	printf("Idmap count: %d\n", samba3.idmap.mapping_count);
+}
+
+samba3 = samba3_read(ARGV[1], ARGV[2]);
+
+if (options.format == "summary") {
+	print_samba3_summary(samba3);
+} else if (options.format == "full") {
+	print_samba3(samba3);
+}
+
+return 0;
diff --git a/source4/scripting/ejs/config.mk b/source4/scripting/ejs/config.mk
index 096c2049ab..e5711f1424 100644
--- a/source4/scripting/ejs/config.mk
+++ b/source4/scripting/ejs/config.mk
@@ -26,8 +26,9 @@ OBJ_FILES = \
 		scripting/ejs/smbcalls_rand.o \
 		scripting/ejs/smbcalls_sys.o \
 		scripting/ejs/smbcalls_creds.o \
+		scripting/ejs/smbcalls_samba3.o \
 		scripting/ejs/mprutil.o
-REQUIRED_SUBSYSTEMS = AUTH EJS LIBBASIC EJSRPC MESSAGING
+REQUIRED_SUBSYSTEMS = AUTH EJS LIBBASIC EJSRPC MESSAGING LIBSAMBA3
 # End SUBSYSTEM SMBCALLS
 #######################
 
diff --git a/source4/scripting/ejs/smbcalls.c b/source4/scripting/ejs/smbcalls.c
index 3981e1dd7a..a73fbe52c3 100644
--- a/source4/scripting/ejs/smbcalls.c
+++ b/source4/scripting/ejs/smbcalls.c
@@ -128,6 +128,7 @@ void smb_setup_ejs_functions(void)
 	smb_setup_ejs_random();
 	smb_setup_ejs_system();
 	smb_setup_ejs_credentials();
+	smb_setup_ejs_samba3();
 	smb_setup_ejs_datablob();
 
 	ejsDefineCFunction(-1, "typeof", ejs_typeof, NULL, MPR_VAR_SCRIPT_HANDLE);
diff --git a/source4/scripting/ejs/smbcalls_samba3.c b/source4/scripting/ejs/smbcalls_samba3.c
new file mode 100644
index 0000000000..0cb3a2160c
--- /dev/null
+++ b/source4/scripting/ejs/smbcalls_samba3.c
@@ -0,0 +1,255 @@
+/* 
+   Unix SMB/CIFS implementation.
+
+   provide hooks into smbd C calls from ejs scripts
+
+   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 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.
+*/
+
+#include "includes.h"
+#include "scripting/ejs/smbcalls.h"
+#include "lib/appweb/ejs/ejs.h"
+#include "lib/samba3/samba3.h"
+
+#if 0
+struct samba3_samaccount {
+	uint32_t logon_time,
+		logoff_time,
+		kickoff_time,
+		bad_password_time,
+		pass_last_set_time,
+		pass_can_change_time,
+		pass_must_change_time;
+	char *username;
+	char *domain;
+	char *nt_username;
+	char *dir_drive;
+	char *unknown_str;
+	char *munged_dial;
+	char *fullname;
+	char *homedir;
+	char *logon_script;
+	char *profile_path;
+	char *acct_desc;
+	char *workstations;
+	uint32_t user_rid, group_rid, hours_len, unknown_6;
+	uint16_t acct_ctrl, logon_divs;
+	uint16_t bad_password_count, logon_count;
+	uint8_t	*lm_pw_ptr, *nt_pw_ptr;
+	uint8_t *nt_pw_hist_ptr;
+	uint8_t	*hours;
+};
+
+struct samba3_groupmapping {
+	gid_t gid;
+	struct dom_sid *sid;
+	int sid_name_use;
+	const char *nt_name;
+	const char *comment;
+};
+
+struct samba3_alias {
+	struct dom_sid *sid;
+	uint32_t member_count;
+	struct dom_sid **members;
+};
+
+struct samba3_groupdb {
+	uint32_t groupmap_count;
+	struct samba3_groupmapping *groupmappings;
+
+	uint32_t alias_count;
+	struct samba3_alias *aliases;
+};
+
+struct samba3_idmap_mapping
+{
+	enum { IDMAP_GROUP, IDMAP_USER } type;
+	uint32_t unix_id;
+	struct dom_sid *sid;
+};
+
+struct samba3_idmapdb
+{
+	/* High water marks */
+	uint32_t user_hwm;
+	uint32_t group_hwm;
+
+	uint32_t mapping_count;
+	struct samba3_idmap_mapping *mappings;
+};
+
+struct samba3_winsdb_entry 
+{
+	char *name;
+	int nb_flags;
+	int type;
+	time_t ttl;
+	uint32_t ip_count;
+	struct ipv4_addr *ips;
+};
+
+struct samba3_policy
+{
+	uint32_t min_password_length;
+	uint32_t password_history;
+	uint32_t user_must_logon_to_change_password;
+	uint32_t maximum_password_age;
+	uint32_t minimum_password_age;
+	uint32_t lockout_duration;
+	uint32_t reset_count_minutes;
+	uint32_t bad_lockout_minutes;
+	uint32_t disconnect_time;
+	uint32_t refuse_machine_password_change;
+};
+
+struct samba3_regval {
+	char *name;
+	uint16_t		type;
+	DATA_BLOB 		data;
+};
+
+struct samba3_regkey {
+	char *name;
+	
+	uint32_t value_count;
+	struct samba3_regval *values;
+
+	uint32_t subkey_count;
+	char **subkeys;
+};
+
+struct samba3_regdb
+{
+	uint32_t key_count;
+	struct samba3_regkey *keys;
+};
+
+struct samba3_secrets
+{
+	struct cli_credentials *ipc_cred;
+	
+	uint32_t ldappw_count;
+	struct samba3_ldappw 
+	{
+		char *dn;
+		char *password;
+	} *ldappws;
+
+	uint32_t domain_count;
+	struct samba3_domainsecrets 
+	{
+		char *name;
+		struct dom_sid sid;
+		struct GUID guid;
+		char *plaintext_pw;
+		time_t last_change_time;
+		struct {
+			uint8_t hash[16];
+			time_t mod_time;
+		} hash_pw;;
+		int sec_channel_type;
+	} *domains;
+
+	uint32_t trusted_domain_count;
+	struct samba3_trusted_dom_pass {
+		uint32_t uni_name_len;
+		const char *uni_name[32]; /* unicode domain name */
+		const char *pass;		/* trust relationship's password */
+		time_t mod_time;
+		struct dom_sid domain_sid;	/* remote domain's sid */
+	} *trusted_domains;
+
+	uint32_t afs_keyfile_count;
+
+	struct samba3_afs_keyfile {
+		uint32_t nkeys;
+		struct {
+			uint32_t kvno;
+			char key[8];
+		} entry[8];
+		char *cell;
+	} *afs_keyfiles;
+};
+
+struct samba3_parameter {
+	char *name;
+	char *value;
+};
+
+struct samba3_share_info {
+	char *name;
+	struct security_descriptor secdesc;
+
+	uint32_t parameter_count;
+	struct samba3_parameter *parameters;
+};
+
+struct samba3 
+{
+	uint32_t winsdb_count;
+	struct samba3_winsdb_entry *winsdb_entries;
+	
+	uint32_t samaccount_count;
+	struct samba3_samaccount *samaccounts;
+
+	uint32_t share_count;
+	struct samba3_share_info *shares;
+
+	struct samba3_secrets secrets;
+	struct samba3_groupdb group;
+	struct samba3_idmapdb idmap;
+	struct samba3_policy policy;
+	struct samba3_regdb registry;
+};
+
+#endif 
+
+/*
+  initialise samba3 ejs subsystem
+*/
+static int ejs_samba3_read(MprVarHandle eid, int argc, struct MprVar **argv)
+{
+	struct MprVar *mpv = mprInitObject(eid, "samba3", argc, argv);
+	struct samba3 *samba3;
+	NTSTATUS status;
+
+	if (argc < 2) {
+		ejsSetErrorMsg(eid, "samba3_read invalid arguments");
+		return -1;
+	}
+
+	status = samba3_read(mprToString(argv[0]), mprToString(argv[0]), mprMemCtx(), &samba3);
+
+	if (NT_STATUS_IS_ERR(status)) {
+		ejsSetErrorMsg(eid, "samba3_read: error");
+		return -1;
+	}
+
+	mprSetThisPtr(eid, "db", samba3);
+	
+	return 0;
+}
+
+
+/*
+  setup C functions that be called from ejs
+*/
+void smb_setup_ejs_samba3(void)
+{
+	ejsDefineCFunction(-1, "samba3_read", ejs_samba3_read, NULL, MPR_VAR_SCRIPT_HANDLE);
+}
diff --git a/source4/scripting/ejs/smbscript.c b/source4/scripting/ejs/smbscript.c
index a35b988e56..f8d6d507d4 100644
--- a/source4/scripting/ejs/smbscript.c
+++ b/source4/scripting/ejs/smbscript.c
@@ -86,6 +86,11 @@ void ejs_exception(const char *reason)
 	/* load the script and advance past interpreter line*/
 	script = file_load(fname, &script_size, mem_ctx);
 
+	if (!script) {
+		fprintf(stderr, "Unable to load script from '%s'\n", fname);
+		exit(1);
+	}
+
 	/* allow scriptable js */
 	if (strncmp(script, "#!", 2) == 0) {
 		script += strcspn(script, "\r\n");
diff --git a/source4/scripting/libjs/samba3.js b/source4/scripting/libjs/samba3.js
deleted file mode 100644
index 7f50c8c4b2..0000000000
--- a/source4/scripting/libjs/samba3.js
+++ /dev/null
@@ -1,8 +0,0 @@
-/*
-	backend code for upgrading from Samba3
-	Copyright Jelmer Vernooij 2005
-	Released under the GNU GPL v2 or later
-*/
-
-
-return 0;
diff --git a/source4/scripting/libjs/upgrade.js b/source4/scripting/libjs/upgrade.js
new file mode 100644
index 0000000000..604bbac2c0
--- /dev/null
+++ b/source4/scripting/libjs/upgrade.js
@@ -0,0 +1,13 @@
+/*
+	backend code for upgrading from Samba3
+	Copyright Jelmer Vernooij 2005
+	Released under the GNU GPL v2 or later
+*/
+
+libinclude("base.js");
+
+function foo() 
+{
+
+	return 0;
+}
-- 
cgit 


From 176da2a2813aa00fed8a485548f98e61ffa9350c Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 29 Aug 2005 00:48:24 +0000
Subject: r9724: Rewrite samba3dump in JS. The summary works now, but the full
 output is triggering some obscure EJS assert.. (This used to be commit
 42605f4444998e3063ffd1bea17425ff825f6132)

---
 source4/scripting/bin/samba3dump        | 125 ++++----
 source4/scripting/ejs/smbcalls_creds.c  |  20 +-
 source4/scripting/ejs/smbcalls_samba3.c | 500 +++++++++++++++++++++-----------
 3 files changed, 411 insertions(+), 234 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/bin/samba3dump b/source4/scripting/bin/samba3dump
index 71937c27c7..059af26e7e 100644
--- a/source4/scripting/bin/samba3dump
+++ b/source4/scripting/bin/samba3dump
@@ -29,7 +29,7 @@ if (options.format != "summary" && options.format != "full") {
 
 libinclude("base.js");
 
-if (ARGV.length != 3) {
+if (options.ARGV.length != 2) {
 	println("Usage: samba3dump <libdir> <smb.conf>");
 	return -1;
 }
@@ -37,8 +37,7 @@ if (ARGV.length != 3) {
 function print_header(txt)
 {
 	printf("\n%s\n", txt);
-	for (i = 0; txt[i]; i++) putchar('=');
-	putchar('\n');
+	println("==========================================");
 }
 
 function print_samba3_policy(pol)
@@ -60,19 +59,19 @@ function print_samba3_sam(samba3)
 {
 	print_header("SAM Database");
 	
-	for (i = 0; i < samba3.samaccount_count; i++) {
-		printf("%d: %s\n", samba3.samaccounts[i].user_rid, samba3.samaccounts[i].username);
+	for (a in samba3.samaccounts) {
+		printf("%d: %s\n", a.user_rid, a.username);
 	}
 }
 
 function print_samba3_shares(samba3)
 {
 	print_header("Configured shares");
-	for (i = 0; i < samba3.share_count; i++) {
-		printf("--- %s ---\n", samba3.shares[i].name);
+	for (s in samba3.shares) {
+		printf("--- %s ---\n", s.name);
 
-		for (j = 0; j < samba3.shares[i].parameter_count; j++) {
-			printf("\t%s = %s\n", samba3.shares[i].parameters[j].name, samba3.shares[i].parameters[j].value);
+		for (p in s.parameters) {
+			printf("\t%s = %s\n", p.name, p.value);
 		}
 
 		println("");
@@ -85,37 +84,37 @@ function print_samba3_secrets(secrets)
 
 	println("IPC Credentials:");
 	if (secrets.ipc_cred.username_obtained) 
-		printf("	User: %s\n", secrets.ipc_cred.username);
+		printf("	User: %s\n", secrets.ipc_cred.get_username);
 	if (secrets.ipc_cred.password_obtained)
-		printf("	Password: %s\n", secrets.ipc_cred.password);
+		printf("	Password: %s\n", secrets.ipc_cred.get_password);
 
 	if (secrets.ipc_cred.domain_obtained)
-		printf("	Domain: %s\n\n", secrets.ipc_cred.domain);
+		printf("	Domain: %s\n\n", secrets.ipc_cred.get_domain);
 
 	println("LDAP passwords:");
-	for (i = 0; i < secrets.ldappw_count; i++) {
-		printf("\t%s -> %s\n", secrets.ldappws[i].dn, secrets.ldappws[i].password);
+	for (pw in secrets.ldappws) {
+		printf("\t%s -> %s\n", pw.dn, pw.password);
 	}
 	println("");
 
 	println("Domains:");
-	for (i = 0; i < secrets.domain_count; i++) {
-		printf("\t--- %s ---\n", secrets.domains[i].name);
-		printf("\tSID: %s\n", secrets.domains[i].sid);
-		printf("\tGUID: %s\n", secrets.domains[i].guid);
-		printf("\tPlaintext pwd: %s\n", secrets.domains[i].plaintext_pw);
-		printf("\tLast Changed: %lu\n", secrets.domains[i].last_change_time);
-		printf("\tSecure Channel Type: %d\n\n", secrets.domains[i].sec_channel_type);
+	for (d in secrets.domains) {
+		printf("\t--- %s ---\n", d.name);
+		printf("\tSID: %s\n", d.sid);
+		printf("\tGUID: %s\n", d.guid);
+		printf("\tPlaintext pwd: %s\n", d.plaintext_pw);
+		printf("\tLast Changed: %lu\n", d.last_change_time);
+		printf("\tSecure Channel Type: %d\n\n", d.sec_channel_type);
 	}
 
 	println("Trusted domains:");
-	for (i = 0; i < secrets.trusted_domain_count; i++) {
-		for (j = 0; j < secrets.trusted_domains[i].uni_name_len; j++) {
-			printf("\t--- %s ---\n", secrets.trusted_domains[i].uni_name[j]);
+	for (td in secrets.trusted_domains) {
+		for (j = 0; j < td.uni_name_len; j++) {
+			printf("\t--- %s ---\n", td.uni_name[j]);
 		}
-		printf("\tPassword: %s\n", secrets.trusted_domains[i].pass);
-		printf("\tModified: %lu\n", secrets.trusted_domains[i].mod_time);
-		printf("\tSID: %s\n", secrets.trusted_domains[i].domain_sid);
+		printf("\tPassword: %s\n", td.pass);
+		printf("\tModified: %lu\n", td.mod_time);
+		printf("\tSID: %s\n", td.domain_sid);
 	}
 }
 
@@ -123,13 +122,10 @@ function print_samba3_regdb(regdb)
 {
 	print_header("Registry");
 
-	for (i = 0; i < regdb.key_count; i++) {
-		printf("%s\n", regdb.keys[i].name);
-		for (j = 0; j < regdb.keys[i].value_count; j++) {
-			printf("\t%s: type %d, length %d\n", 
-				   regdb.keys[i].values[j].name,
-				   regdb.keys[i].values[j].type,
-				   regdb.keys[i].values[j].data.length);
+	for (k in regdb.keys) {
+		printf("%s\n", k.name);
+		for (v in k.values) {
+			printf("\t%s: type %d, length %d\n", v.name, v.type, v.data.length);
 		}
 	}
 }
@@ -138,31 +134,32 @@ function print_samba3_winsdb(samba3)
 {
 	print_header("WINS Database");
 
-	for (i = 0; i < samba3.winsdb_count; i++) {
-		printf("%s, nb_flags: %x, type: %d, ttl: %lu, %d ips\n", samba3.winsdb_entries[i].name, samba3.winsdb_entries[i].nb_flags, samba3.winsdb_entries[i].type, samba3.winsdb_entries[i].ttl, samba3.winsdb_entries[i].ip_count);
+	for (e in samba3.winsentries) {
+		printf("%s, nb_flags: %x, type: %d, ttl: %lu, %d ips\n", e.name, e.nb_flags, e.type, e.ttl, e.ip_count);
 	}
 }
 
-function print_samba3_groupdb(groupdb)
+function print_samba3_groupmappings(groupdb)
 {
 	int i;
 	print_header("Group Mappings");
 	
-	for (i = 0; i < groupdb.groupmap_count; i++) 
-	{
-		printf("\t--- Group: %s ---\n", groupdb.groupmappings[i].nt_name);
-		printf("\tComment: %s\n", groupdb.groupmappings[i].comment);
-		printf("\tGID: %d\n", groupdb.groupmappings[i].gid);
-		printf("\tSID Name Use: %d\n", groupdb.groupmappings[i].sid_name_use);
-		printf("\tSID: %s\n\n", groupdb.groupmappings[i].sid);
+	for (g in groupdb.groupmappings) {
+		printf("\t--- Group: %s ---\n", g.nt_name);
+		printf("\tComment: %s\n", g.comment);
+		printf("\tGID: %d\n", g.gid);
+		printf("\tSID Name Use: %d\n", g.sid_name_use);
+		printf("\tSID: %s\n\n", g.sid);
 	}
+}
 
-	for (i = 0; i < groupdb.alias_count; i++)
-	{
+function print_samba3_aliases(groupdb)
+{
+	for (a in groupdb.aliases) {
 		int j;
-		printf("\t--- Alias: %s ---\n", groupdb.aliases[i].sid);
-		for (j = 0; j < groupdb.aliases[i].member_count; j++) {
-			printf("\t%s\n", groupdb.aliases[i].members[j]);
+		printf("\t--- Alias: %s ---\n", a.sid);
+		for (j = 0; j < a.member_count; j++) {
+			printf("\t%s\n", a.members[j]);
 		}
 	}
 }
@@ -174,14 +171,13 @@ function print_samba3_idmapdb(idmapdb)
 	printf("User High Water Mark: %d\n", idmapdb.user_hwm);
 	printf("Group High Water Mark: %d\n\n", idmapdb.group_hwm);
 
-	for (i = 0; i < idmapdb.mapping_count; i++) {
-		printf("%s -> ", 
-			  idmapdb.mappings[i].sid);
+	for (e in idmapdb.mappings) {
+		printf("%s -> ", e.sid);
 
-		if (idmapdb.mappings[i].type == IDMAP_GROUP) { 
-			printf("GID %d", idmapdb.mappings[i].unix_id);
+		if (e.type == IDMAP_GROUP) { 
+			printf("GID %d", e.unix_id);
 		} else {
-			printf("UID %d", idmapdb.mappings[i].unix_id);
+			printf("UID %d", e.unix_id);
 		}
 	}
 }
@@ -194,22 +190,23 @@ function print_samba3(samba3)
 	print_samba3_winsdb(samba3);
 	print_samba3_regdb(samba3.registry);
 	print_samba3_secrets(samba3.secrets);
-	print_samba3_groupdb(samba3.group);
+	print_samba3_groupmappings(samba3);
+	print_samba3_aliases(samba3);
 	print_samba3_idmapdb(samba3.idmap);
 }
 
 function print_samba3_summary(samba3)
 {
-	printf("WINS db entries: %d\n", samba3.winsdb_count);
-	printf("SAM Accounts: %d\n", samba3.samaccount_count);
-	printf("Registry key count: %d\n", samba3.registry.key_count);
-	printf("Shares (including [global]): %d\n", samba3.share_count);
-	printf("Groupmap count: %d\n", samba3.group.groupmap_count);
-	printf("Alias count: %d\n", samba3.group.alias_count);
-	printf("Idmap count: %d\n", samba3.idmap.mapping_count);
+	printf("WINS db entries: %d\n", samba3.winsentries.length);
+	printf("SAM Accounts: %d\n", samba3.samaccounts.length);
+	printf("Registry key count: %d\n", samba3.registry.keys.length);
+	printf("Shares (including [global]): %d\n", samba3.shares.length);
+	printf("Groupmap count: %d\n", samba3.groupmappings.length);
+	printf("Alias count: %d\n", samba3.aliases.length);
+	printf("Idmap count: %d\n", samba3.idmapdb.mappings.length);
 }
 
-samba3 = samba3_read(ARGV[1], ARGV[2]);
+samba3 = samba3_read(options.ARGV[0], options.ARGV[1]);
 
 if (options.format == "summary") {
 	print_samba3_summary(samba3);
diff --git a/source4/scripting/ejs/smbcalls_creds.c b/source4/scripting/ejs/smbcalls_creds.c
index 45da5895e4..cc2ccf8c47 100644
--- a/source4/scripting/ejs/smbcalls_creds.c
+++ b/source4/scripting/ejs/smbcalls_creds.c
@@ -185,10 +185,8 @@ static int ejs_creds_get_workstation(MprVarHandle eid, int argc, struct MprVar *
 /*
   initialise credentials ejs object
 */
-static int ejs_credentials_obj(MprVarHandle eid, int argc, struct MprVar **argv, struct cli_credentials *creds)
+static int ejs_credentials_obj(struct MprVar *obj, struct cli_credentials *creds)
 {
-	struct MprVar *obj = mprInitObject(eid, "credentials", argc, argv);
-
 	mprSetPtrChild(obj, "creds", creds);
 
 	/* setup our object methods */
@@ -207,19 +205,30 @@ static int ejs_credentials_obj(MprVarHandle eid, int argc, struct MprVar **argv,
 }
 
 
+struct MprVar mprCredentials(struct cli_credentials *creds)
+{
+	struct MprVar mpv = mprObject("credentials");
+
+	ejs_credentials_obj(&mpv, creds);
+	
+	return mpv;
+}
+
+
 /*
   initialise credentials ejs object
 */
 static int ejs_credentials_init(MprVarHandle eid, int argc, struct MprVar **argv)
 {
 	struct cli_credentials *creds;
+	struct MprVar *obj = mprInitObject(eid, "credentials", argc, argv);
 
 	creds = cli_credentials_init(mprMemCtx());
 	if (creds == NULL) {
 		return -1;
 	}
 
-	return ejs_credentials_obj(eid, argc, argv, creds);
+	return ejs_credentials_obj(obj, creds);
 }
 
 /*
@@ -227,7 +236,8 @@ static int ejs_credentials_init(MprVarHandle eid, int argc, struct MprVar **argv
 */
 int ejs_credentials_cmdline(int eid, int argc, struct MprVar **argv)
 {
-	return ejs_credentials_obj(eid, argc, argv, cmdline_credentials);
+	struct MprVar *obj = mprInitObject(eid, "credentials", argc, argv);
+	return ejs_credentials_obj(obj, cmdline_credentials);
 }
 
 
diff --git a/source4/scripting/ejs/smbcalls_samba3.c b/source4/scripting/ejs/smbcalls_samba3.c
index 0cb3a2160c..7a7175fe5c 100644
--- a/source4/scripting/ejs/smbcalls_samba3.c
+++ b/source4/scripting/ejs/smbcalls_samba3.c
@@ -25,206 +25,366 @@
 #include "lib/appweb/ejs/ejs.h"
 #include "lib/samba3/samba3.h"
 
+
 #if 0
-struct samba3_samaccount {
-	uint32_t logon_time,
-		logoff_time,
-		kickoff_time,
-		bad_password_time,
-		pass_last_set_time,
-		pass_can_change_time,
-		pass_must_change_time;
-	char *username;
-	char *domain;
-	char *nt_username;
-	char *dir_drive;
-	char *unknown_str;
-	char *munged_dial;
-	char *fullname;
-	char *homedir;
-	char *logon_script;
-	char *profile_path;
-	char *acct_desc;
-	char *workstations;
-	uint32_t user_rid, group_rid, hours_len, unknown_6;
-	uint16_t acct_ctrl, logon_divs;
-	uint16_t bad_password_count, logon_count;
-	uint8_t	*lm_pw_ptr, *nt_pw_ptr;
-	uint8_t *nt_pw_hist_ptr;
-	uint8_t	*hours;
-};
 
-struct samba3_groupmapping {
-	gid_t gid;
-	struct dom_sid *sid;
-	int sid_name_use;
-	const char *nt_name;
-	const char *comment;
+struct samba3_secrets
+{
 };
 
-struct samba3_alias {
-	struct dom_sid *sid;
-	uint32_t member_count;
-	struct dom_sid **members;
-};
+#endif 
 
-struct samba3_groupdb {
-	uint32_t groupmap_count;
-	struct samba3_groupmapping *groupmappings;
+static struct MprVar mprRegistry(struct samba3_regdb *reg)
+{
+	struct MprVar mpv = mprObject("registry"), ks, vs, k, v;
+	int i, j;
 
-	uint32_t alias_count;
-	struct samba3_alias *aliases;
-};
+	ks = mprObject("array");
+
+	for (i = 0; i < reg->key_count; i++) {
+		k = mprObject("regkey");
+
+		mprSetVar(&k, "name", mprString(reg->keys[i].name));
+
+		vs = mprObject("array");
+		
+		for (j = 0; j < reg->keys[i].value_count; j++) {
+			v = mprObject("regval");
+
+			mprSetVar(&v, "name", mprString(reg->keys[i].values[j].name));
+			mprSetVar(&v, "type", mprCreateIntegerVar(reg->keys[i].values[j].type));
+			mprSetVar(&v, "data", mprDataBlob(reg->keys[i].values[j].data));
+
+			mprAddArray(&vs, j, v);
+		}
+
+		mprSetVar(&k, "values", vs);
+
+		mprAddArray(&ks, i, k);
+	}
+
+	mprSetVar(&mpv, "keys", ks);
+
+	return mpv;
+}
 
-struct samba3_idmap_mapping
+static struct MprVar mprPolicy(struct samba3_policy *pol)
 {
-	enum { IDMAP_GROUP, IDMAP_USER } type;
-	uint32_t unix_id;
-	struct dom_sid *sid;
-};
+	struct MprVar mpv = mprObject("policy");
+
+	mprSetVar(&mpv, "min_password_length", mprCreateIntegerVar(pol->min_password_length));
+	mprSetVar(&mpv, "password_history", mprCreateIntegerVar(pol->password_history));
+	mprSetVar(&mpv, "user_must_logon_to_change_password", mprCreateIntegerVar(pol->user_must_logon_to_change_password));
+	mprSetVar(&mpv, "maximum_password_age", mprCreateIntegerVar(pol->maximum_password_age));
+	mprSetVar(&mpv, "minimum_password_age", mprCreateIntegerVar(pol->minimum_password_age));
+	mprSetVar(&mpv, "lockout_duration", mprCreateIntegerVar(pol->lockout_duration));
+	mprSetVar(&mpv, "reset_count_minutes", mprCreateIntegerVar(pol->reset_count_minutes));
+	mprSetVar(&mpv, "bad_lockout_minutes", mprCreateIntegerVar(pol->bad_lockout_minutes));
+	mprSetVar(&mpv, "disconnect_time", mprCreateIntegerVar(pol->disconnect_time));
+	mprSetVar(&mpv, "refuse_machine_password_change", mprCreateIntegerVar(pol->refuse_machine_password_change));
+
+	return mpv;
+}
 
-struct samba3_idmapdb
+static struct MprVar mprIdmapDb(struct samba3_idmapdb *db)
 {
-	/* High water marks */
-	uint32_t user_hwm;
-	uint32_t group_hwm;
+	struct MprVar mpv = mprObject("idmapdb"), mps, mp;
+	int i;
 
-	uint32_t mapping_count;
-	struct samba3_idmap_mapping *mappings;
-};
+	mprSetVar(&mpv, "user_hwm", mprCreateIntegerVar(db->user_hwm));
+	mprSetVar(&mpv, "group_hwm", mprCreateIntegerVar(db->group_hwm));
 
-struct samba3_winsdb_entry 
-{
-	char *name;
-	int nb_flags;
-	int type;
-	time_t ttl;
-	uint32_t ip_count;
-	struct ipv4_addr *ips;
-};
+	mps = mprObject("array");
+
+	for (i = 0; i < db->mapping_count; i++) {
+		char *tmp;
+		mp = mprObject("idmap");
+
+		mprSetVar(&mp, "type", mprCreateIntegerVar(db->mappings[i].type));
+		mprSetVar(&mp, "unix_id", mprCreateIntegerVar(db->mappings[i].unix_id));
+
+		tmp = dom_sid_string(NULL, db->mappings[i].sid);
+		mprSetVar(&mp, "sid", mprString(tmp));
+		talloc_free(tmp);
+
+		mprAddArray(&mps, i, mp);
+	}
+
+	mprSetVar(&mpv, "mappings", mps);
 
-struct samba3_policy
+	return mpv;
+}
+
+static struct MprVar mprGroupMappings(struct samba3_groupdb *db)
 {
-	uint32_t min_password_length;
-	uint32_t password_history;
-	uint32_t user_must_logon_to_change_password;
-	uint32_t maximum_password_age;
-	uint32_t minimum_password_age;
-	uint32_t lockout_duration;
-	uint32_t reset_count_minutes;
-	uint32_t bad_lockout_minutes;
-	uint32_t disconnect_time;
-	uint32_t refuse_machine_password_change;
-};
+	struct MprVar mpv = mprObject("array"), g;
+	int i;
 
-struct samba3_regval {
-	char *name;
-	uint16_t		type;
-	DATA_BLOB 		data;
-};
+	for (i = 0; i < db->groupmap_count; i++) {
+		char *tmp;
+		g = mprObject("group");
 
-struct samba3_regkey {
-	char *name;
-	
-	uint32_t value_count;
-	struct samba3_regval *values;
+		mprSetVar(&g, "gid", mprCreateIntegerVar(db->groupmappings[i].gid));
 
-	uint32_t subkey_count;
-	char **subkeys;
-};
+		tmp = dom_sid_string(NULL, db->groupmappings[i].sid);
+		mprSetVar(&g, "sid", mprString(tmp));
+		talloc_free(tmp);
 
-struct samba3_regdb
+		mprSetVar(&g, "sid_name_use", mprCreateIntegerVar(db->groupmappings[i].sid_name_use));
+		mprSetVar(&g, "nt_name", mprString(db->groupmappings[i].nt_name));
+		mprSetVar(&g, "comment", mprString(db->groupmappings[i].comment));
+
+		mprAddArray(&mpv, i, g);
+	}
+
+	return mpv;
+}
+
+static struct MprVar mprAliases(struct samba3_groupdb *db)
 {
-	uint32_t key_count;
-	struct samba3_regkey *keys;
-};
+	struct MprVar mpv = mprObject("array"), a, am;
+	int i, j;
 
-struct samba3_secrets
+	for (i = 0; i < db->alias_count; i++) {
+		char *tmp;
+		a = mprObject("alias");
+
+		tmp = dom_sid_string(NULL, db->aliases[i].sid);
+		mprSetVar(&a, "sid", mprString(tmp));
+		talloc_free(tmp);
+
+		am = mprObject("array");
+
+		for (j = 0; j < db->aliases[i].member_count; j++) {
+			tmp = dom_sid_string(NULL, db->aliases[i].members[j]);
+			mprAddArray(&am, j, mprString(tmp));
+			talloc_free(tmp);
+		}
+
+		mprSetVar(&a, "members", am);
+	}
+
+	return mpv;
+}
+
+static struct MprVar mprSecrets(struct samba3_secrets *sec)
 {
-	struct cli_credentials *ipc_cred;
+	struct MprVar mpv = mprObject("samba3_secrets"), es, e;
+	int i;
+
+	es = mprObject("array");
+
+	for (i = 0; i < sec->ldappw_count; i++) {
+		e = mprObject("ldappw");
+
+		mprSetVar(&e, "dn", mprString(sec->ldappws[i].dn));
+		mprSetVar(&e, "password", mprString(sec->ldappws[i].password));
+
+		mprAddArray(&es, i, e);
+	}
+
+	mprSetVar(&mpv, "ldappws", es);
+
+	for (i = 0; i < sec->domain_count; i++) {
+		char *tmp;
+		struct MprVar v;
+		e = mprObject("domainsecrets");
+
+		mprSetVar(&e, "name", mprString(sec->domains[i].name));
+		
+		tmp = dom_sid_string(NULL, &sec->domains[i].sid);
+		mprSetVar(&e, "sid", mprString(tmp));
+		talloc_free(tmp);
+
+		tmp = GUID_string(NULL, &sec->domains[i].guid);
+		mprSetVar(&e, "guid", mprString(tmp));
+		talloc_free(tmp);
+
+		mprSetVar(&e, "plaintext_pw", mprString(sec->domains[i].plaintext_pw));
+
+		mprSetVar(&e, "last_change_time", mprCreateIntegerVar(sec->domains[i].last_change_time));
+		mprSetVar(&e, "sec_channel_type", mprCreateIntegerVar(sec->domains[i].sec_channel_type));
+
+		v = mprObject("hash_pw");
+
+		mprSetVar(&v, "hash", mprData(sec->domains[i].hash_pw.hash, 16));
+
+		mprSetVar(&v, "mod_time", mprCreateIntegerVar(sec->domains[i].hash_pw.mod_time));
+
+		mprSetVar(&e, "hash_pw", v);
+
+		mprAddArray(&es, i, e);
+	}
+
+	mprSetVar(&mpv, "domains", es);
+
+	es = mprObject("trusted_domains");
+
+	for (i = 0; i < sec->trusted_domain_count; i++) {
+		struct MprVar ns;
+		char *tmp;
+		int j;
+		e = mprObject("trusted_domain");
+
+		ns = mprObject("array");
+
+		for (j = 0; j < sec->trusted_domains[i].uni_name_len; j++) {
+			mprAddArray(&ns, j, mprString(sec->trusted_domains[i].uni_name[j]));
+		}
+
+		mprSetVar(&e, "uni_name", ns);
+
+		mprSetVar(&e, "pass", mprString(sec->trusted_domains[i].pass));
+		mprSetVar(&e, "mod_time", mprCreateIntegerVar(sec->trusted_domains[i].mod_time));
+
+		tmp = dom_sid_string(NULL, &sec->trusted_domains[i].domain_sid);
+		mprSetVar(&e, "domains_sid", mprString(tmp));
+		talloc_free(tmp);
+
+		mprAddArray(&es, i, e);
+	}
+
+	mprSetVar(&mpv, "trusted_domains", es);
 	
-	uint32_t ldappw_count;
-	struct samba3_ldappw 
-	{
-		char *dn;
-		char *password;
-	} *ldappws;
-
-	uint32_t domain_count;
-	struct samba3_domainsecrets 
-	{
-		char *name;
-		struct dom_sid sid;
-		struct GUID guid;
-		char *plaintext_pw;
-		time_t last_change_time;
-		struct {
-			uint8_t hash[16];
-			time_t mod_time;
-		} hash_pw;;
-		int sec_channel_type;
-	} *domains;
-
-	uint32_t trusted_domain_count;
-	struct samba3_trusted_dom_pass {
-		uint32_t uni_name_len;
-		const char *uni_name[32]; /* unicode domain name */
-		const char *pass;		/* trust relationship's password */
-		time_t mod_time;
-		struct dom_sid domain_sid;	/* remote domain's sid */
-	} *trusted_domains;
-
-	uint32_t afs_keyfile_count;
-
-	struct samba3_afs_keyfile {
-		uint32_t nkeys;
-		struct {
-			uint32_t kvno;
-			char key[8];
-		} entry[8];
-		char *cell;
-	} *afs_keyfiles;
-};
+	es = mprObject("array");
 
-struct samba3_parameter {
-	char *name;
-	char *value;
-};
+	for (i = 0; i < sec->afs_keyfile_count; i++) {
+		struct MprVar ks;
+		int j;
+		e = mprObject("afs_keyfile");
 
-struct samba3_share_info {
-	char *name;
-	struct security_descriptor secdesc;
+		mprSetVar(&e, "cell", mprString(sec->afs_keyfiles[i].cell));
 
-	uint32_t parameter_count;
-	struct samba3_parameter *parameters;
-};
+		ks = mprObject("array");
+		
+		for (j = 0; j < 8; j++) {
+			struct MprVar k = mprObject("entry");
+			
+			mprSetVar(&k, "kvno", mprCreateIntegerVar(sec->afs_keyfiles[i].entry[j].kvno));
+			mprSetVar(&k, "key", mprData((uint8_t*)sec->afs_keyfiles[i].entry[j].key, 8));
+
+			mprAddArray(&ks, j, k);
+		}
+
+		mprSetVar(&e, "entry", ks);
+
+		mprSetVar(&e, "nkeys", mprCreateIntegerVar(sec->afs_keyfiles[i].nkeys));
+
+		mprAddArray(&es, i, e);
+	}
+
+	mprSetVar(&mpv, "afs_keyfiles", es);
 
-struct samba3 
+	mprSetVar(&mpv, "ipc_cred", mprCredentials(sec->ipc_cred));
+
+	return mpv;
+}
+
+static struct MprVar mprShares(struct samba3 *samba3)
 {
-	uint32_t winsdb_count;
-	struct samba3_winsdb_entry *winsdb_entries;
-	
-	uint32_t samaccount_count;
-	struct samba3_samaccount *samaccounts;
+	struct MprVar mpv = mprObject("array"), s, ps, p;
+	int i, j;
 
-	uint32_t share_count;
-	struct samba3_share_info *shares;
+	for (i = 0; i < samba3->share_count; i++) {
+		s = mprObject("share");
 
-	struct samba3_secrets secrets;
-	struct samba3_groupdb group;
-	struct samba3_idmapdb idmap;
-	struct samba3_policy policy;
-	struct samba3_regdb registry;
-};
+		mprSetVar(&s, "name", mprString(samba3->shares[i].name));
 
-#endif 
+		/* FIXME: secdesc */
+
+		ps = mprObject("array");
+
+		for (j = 0; j < samba3->shares[i].parameter_count; j++) {
+			p = mprObject("parameter");
+
+			mprSetVar(&p, "name", mprString(samba3->shares[i].parameters[j].name));
+			mprSetVar(&p, "value", mprString(samba3->shares[i].parameters[j].value));
+
+			mprAddArray(&ps, j, p);
+		}
+
+		mprSetVar(&s, "parameters", ps);
+	}
+
+	return mpv;
+}
+
+static struct MprVar mprSamAccounts(struct samba3 *samba3)
+{
+	struct MprVar mpv = mprObject("array"), m;
+	int i;
+
+	for (i = 0; i < samba3->samaccount_count; i++) {
+		struct samba3_samaccount *a = &samba3->samaccounts[i];
+
+		m = mprObject("samba3_samaccount");
+
+		mprSetVar(&m, "logon_time", mprCreateIntegerVar(a->logon_time));
+		mprSetVar(&m, "logoff_time", mprCreateIntegerVar(a->logoff_time));
+		mprSetVar(&m, "kickoff_time", mprCreateIntegerVar(a->kickoff_time));
+		mprSetVar(&m, "bad_password_time", mprCreateIntegerVar(a->bad_password_time));
+		mprSetVar(&m, "pass_last_set_time", mprCreateIntegerVar(a->pass_last_set_time));
+		mprSetVar(&m, "pass_can_change_time", mprCreateIntegerVar(a->pass_can_change_time));
+		mprSetVar(&m, "pass_must_change_time", mprCreateIntegerVar(a->pass_must_change_time));
+		mprSetVar(&m, "user_rid", mprCreateIntegerVar(a->user_rid));
+		mprSetVar(&m, "group_rid", mprCreateIntegerVar(a->group_rid));
+		mprSetVar(&m, "acct_ctrl", mprCreateIntegerVar(a->acct_ctrl));
+		mprSetVar(&m, "logon_divs", mprCreateIntegerVar(a->logon_divs));
+		mprSetVar(&m, "bad_password_count", mprCreateIntegerVar(a->bad_password_count));
+		mprSetVar(&m, "logon_count", mprCreateIntegerVar(a->logon_count));
+		mprSetVar(&m, "username", mprString(a->username));
+		mprSetVar(&m, "domain", mprString(a->domain));
+		mprSetVar(&m, "nt_username", mprString(a->nt_username));
+		mprSetVar(&m, "dir_drive", mprString(a->dir_drive));
+		mprSetVar(&m, "munged_dial", mprString(a->munged_dial));
+		mprSetVar(&m, "fullname", mprString(a->fullname));
+		mprSetVar(&m, "homedir", mprString(a->homedir));
+		mprSetVar(&m, "logon_script", mprString(a->logon_script));
+		mprSetVar(&m, "profile_path", mprString(a->profile_path));
+		mprSetVar(&m, "acct_desc", mprString(a->acct_desc));
+		mprSetVar(&m, "workstations", mprString(a->workstations));
+
+		/* FIXME: lm_pw_ptr, nt_pw_ptr */
+
+		mprAddArray(&mpv, i, m);
+	}
+
+	return mpv;
+}
+
+static struct MprVar mprWinsEntries(struct samba3 *samba3)
+{
+	struct MprVar mpv = mprObject("array");
+	int i, j;
+
+	for (i = 0; i < samba3->winsdb_count; i++) {
+		struct MprVar w = mprObject("wins_entry"), ips;
+
+		mprSetVar(&w, "name", mprString(samba3->winsdb_entries[i].name));
+		mprSetVar(&w, "nb_flags", mprCreateIntegerVar(samba3->winsdb_entries[i].nb_flags));
+		mprSetVar(&w, "type", mprCreateIntegerVar(samba3->winsdb_entries[i].type));
+		mprSetVar(&w, "ttl", mprCreateIntegerVar(samba3->winsdb_entries[i].ttl));
+
+		ips = mprObject("array");
+
+		for (j = 0; j < samba3->winsdb_entries[i].ip_count; j++) {
+			mprAddArray(&ips, j, mprString(iface_n_ip(i)));
+		}
+
+		mprSetVar(&w, "ips", ips);
+		
+		mprAddArray(&mpv, i, w);
+	}
+
+	return mpv;
+}
 
 /*
   initialise samba3 ejs subsystem
 */
 static int ejs_samba3_read(MprVarHandle eid, int argc, struct MprVar **argv)
 {
-	struct MprVar *mpv = mprInitObject(eid, "samba3", argc, argv);
+	struct MprVar mpv = mprObject("samba3");
 	struct samba3 *samba3;
 	NTSTATUS status;
 
@@ -240,7 +400,17 @@ static int ejs_samba3_read(MprVarHandle eid, int argc, struct MprVar **argv)
 		return -1;
 	}
 
-	mprSetThisPtr(eid, "db", samba3);
+	mprSetVar(&mpv, "winsentries", mprWinsEntries(samba3));
+	mprSetVar(&mpv, "samaccounts", mprSamAccounts(samba3));
+	mprSetVar(&mpv, "shares", mprShares(samba3));
+	mprSetVar(&mpv, "secrets", mprSecrets(&samba3->secrets));
+	mprSetVar(&mpv, "groupmappings", mprGroupMappings(&samba3->group));
+	mprSetVar(&mpv, "aliases", mprAliases(&samba3->group));
+	mprSetVar(&mpv, "idmapdb", mprIdmapDb(&samba3->idmap));
+	mprSetVar(&mpv, "policy", mprPolicy(&samba3->policy));
+	mprSetVar(&mpv, "registry", mprRegistry(&samba3->registry));
+
+	mpr_Return(eid, mpv);
 	
 	return 0;
 }
-- 
cgit 


From 14ebeffc463426b969acfb611033ff57a18916d6 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 29 Aug 2005 01:17:20 +0000
Subject: r9725: Fix full output mode of samba3dump as well. Thanks to tridge
 for a bit for explanation about js. (This used to be commit
 765a30a0493cbd150f53335c6648e8e56ef6dc23)

---
 source4/scripting/bin/samba3dump        | 58 +++++++++++++++++++++------------
 source4/scripting/ejs/smbcalls_samba3.c |  2 ++
 2 files changed, 40 insertions(+), 20 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/bin/samba3dump b/source4/scripting/bin/samba3dump
index 059af26e7e..3960962f8b 100644
--- a/source4/scripting/bin/samba3dump
+++ b/source4/scripting/bin/samba3dump
@@ -57,20 +57,25 @@ function print_samba3_policy(pol)
 
 function print_samba3_sam(samba3)
 {
+	var i;
 	print_header("SAM Database");
 	
-	for (a in samba3.samaccounts) {
+	for (i in samba3.samaccounts) {
+		var a = samba3.samaccounts[i];
 		printf("%d: %s\n", a.user_rid, a.username);
 	}
 }
 
 function print_samba3_shares(samba3)
 {
+	var i, j;
 	print_header("Configured shares");
-	for (s in samba3.shares) {
+	for (i in samba3.shares) {
+		var s = samba3.shares[i];
 		printf("--- %s ---\n", s.name);
 
-		for (p in s.parameters) {
+		for (j in s.parameters) {
+			var p = s.parameters[j];
 			printf("\t%s = %s\n", p.name, p.value);
 		}
 
@@ -80,6 +85,7 @@ function print_samba3_shares(samba3)
 
 function print_samba3_secrets(secrets)
 {
+	var i;
 	print_header("Secrets");
 
 	println("IPC Credentials:");
@@ -92,13 +98,15 @@ function print_samba3_secrets(secrets)
 		printf("	Domain: %s\n\n", secrets.ipc_cred.get_domain);
 
 	println("LDAP passwords:");
-	for (pw in secrets.ldappws) {
+	for (i in secrets.ldappws) {
+		var pw = secrets.ldappws[i];
 		printf("\t%s -> %s\n", pw.dn, pw.password);
 	}
 	println("");
 
 	println("Domains:");
-	for (d in secrets.domains) {
+	for (i in secrets.domains) {
+		var d = secrets.domains[i];
 		printf("\t--- %s ---\n", d.name);
 		printf("\tSID: %s\n", d.sid);
 		printf("\tGUID: %s\n", d.guid);
@@ -108,7 +116,8 @@ function print_samba3_secrets(secrets)
 	}
 
 	println("Trusted domains:");
-	for (td in secrets.trusted_domains) {
+	for (i in secrets.trusted_domains) {
+		var td = secrets.trusted_domains[i];
 		for (j = 0; j < td.uni_name_len; j++) {
 			printf("\t--- %s ---\n", td.uni_name[j]);
 		}
@@ -120,11 +129,14 @@ function print_samba3_secrets(secrets)
 
 function print_samba3_regdb(regdb)
 {
+	var i, j;
 	print_header("Registry");
 
-	for (k in regdb.keys) {
+	for (i in regdb.keys) {
+		var k = regdb.keys[i];
 		printf("%s\n", k.name);
-		for (v in k.values) {
+		for (j in k.values) {
+			var v = k.values[j];
 			printf("\t%s: type %d, length %d\n", v.name, v.type, v.data.length);
 		}
 	}
@@ -132,19 +144,22 @@ function print_samba3_regdb(regdb)
 
 function print_samba3_winsdb(samba3)
 {
+	var i;
 	print_header("WINS Database");
 
-	for (e in samba3.winsentries) {
-		printf("%s, nb_flags: %x, type: %d, ttl: %lu, %d ips\n", e.name, e.nb_flags, e.type, e.ttl, e.ip_count);
+	for (i in samba3.winsentries) {
+		var e = samba3.winsentries[i];
+		printf("%s, nb_flags: %x, type: %d, ttl: %lu, %d ips, fst: %s\n", e.name, e.nb_flags, e.type, e.ttl, e.ips.length, e.ips[0]);
 	}
 }
 
 function print_samba3_groupmappings(groupdb)
 {
-	int i;
+	var i;
 	print_header("Group Mappings");
 	
-	for (g in groupdb.groupmappings) {
+	for (i in groupdb.groupmappings) {
+		var g = groupdb.groupmappings[i];
 		printf("\t--- Group: %s ---\n", g.nt_name);
 		printf("\tComment: %s\n", g.comment);
 		printf("\tGID: %d\n", g.gid);
@@ -155,10 +170,11 @@ function print_samba3_groupmappings(groupdb)
 
 function print_samba3_aliases(groupdb)
 {
-	for (a in groupdb.aliases) {
-		int j;
+	var i, j;
+	for (i in groupdb.aliases) {
+		var a = groupdb.aliases[i];
 		printf("\t--- Alias: %s ---\n", a.sid);
-		for (j = 0; j < a.member_count; j++) {
+		for (j in a.members) {
 			printf("\t%s\n", a.members[j]);
 		}
 	}
@@ -166,18 +182,20 @@ function print_samba3_aliases(groupdb)
 
 function print_samba3_idmapdb(idmapdb)
 {
+	var i;
 	print_header("Winbindd SID<->GID/UID mappings");
 
 	printf("User High Water Mark: %d\n", idmapdb.user_hwm);
 	printf("Group High Water Mark: %d\n\n", idmapdb.group_hwm);
 
-	for (e in idmapdb.mappings) {
+	for (i in idmapdb.mappings) {
+		var e = idmapdb.mappings[i];
 		printf("%s -> ", e.sid);
 
-		if (e.type == IDMAP_GROUP) { 
-			printf("GID %d", e.unix_id);
+		if (e.type == e.IDMAP_GROUP) { 
+			printf("GID %d\n", e.unix_id);
 		} else {
-			printf("UID %d", e.unix_id);
+			printf("UID %d\n", e.unix_id);
 		}
 	}
 }
@@ -192,7 +210,7 @@ function print_samba3(samba3)
 	print_samba3_secrets(samba3.secrets);
 	print_samba3_groupmappings(samba3);
 	print_samba3_aliases(samba3);
-	print_samba3_idmapdb(samba3.idmap);
+	print_samba3_idmapdb(samba3.idmapdb);
 }
 
 function print_samba3_summary(samba3)
diff --git a/source4/scripting/ejs/smbcalls_samba3.c b/source4/scripting/ejs/smbcalls_samba3.c
index 7a7175fe5c..bad8a7e58e 100644
--- a/source4/scripting/ejs/smbcalls_samba3.c
+++ b/source4/scripting/ejs/smbcalls_samba3.c
@@ -100,6 +100,8 @@ static struct MprVar mprIdmapDb(struct samba3_idmapdb *db)
 		char *tmp;
 		mp = mprObject("idmap");
 
+		mprSetVar(&mp, "IDMAP_GROUP", mprCreateIntegerVar(IDMAP_GROUP));
+		mprSetVar(&mp, "IDMAP_USER", mprCreateIntegerVar(IDMAP_USER));
 		mprSetVar(&mp, "type", mprCreateIntegerVar(db->mappings[i].type));
 		mprSetVar(&mp, "unix_id", mprCreateIntegerVar(db->mappings[i].unix_id));
 
-- 
cgit 


From 24186a80eb4887b5fb3e72e4b877b456cbe8e35f Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Mon, 29 Aug 2005 04:30:22 +0000
Subject: r9728: A *major* update to the credentials system, to incorporate the
 Kerberos CCACHE into the system.

This again allows the use of the system ccache when no username is
specified, and brings more code in common between gensec_krb5 and
gensec_gssapi.

It also has a side-effect that may (or may not) be expected: If there
is a ccache, even if it is not used (perhaps the remote server didn't
want kerberos), it will change the default username.

Andrew Bartlett
(This used to be commit 6202267f6ec1446d6bd11d1d37d05a977bc8d315)
---
 source4/scripting/ejs/smbcalls_auth.c  | 2 +-
 source4/scripting/ejs/smbcalls_creds.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_auth.c b/source4/scripting/ejs/smbcalls_auth.c
index ef3b86a8b4..8df69cf087 100644
--- a/source4/scripting/ejs/smbcalls_auth.c
+++ b/source4/scripting/ejs/smbcalls_auth.c
@@ -119,7 +119,7 @@ static int ejs_userAuth(MprVarHandle eid, int argc, struct MprVar **argv)
 		ejsSetErrorMsg(eid, "userAuth requires a 'creds' element");
 		return -1;
 	}
-	username    = cli_credentials_get_username(creds);
+	username    = cli_credentials_get_username(creds, tmp_ctx);
 	password    = cli_credentials_get_password(creds);
 	domain      = cli_credentials_get_domain(creds);
 	remote_host = cli_credentials_get_workstation(creds);
diff --git a/source4/scripting/ejs/smbcalls_creds.c b/source4/scripting/ejs/smbcalls_creds.c
index cc2ccf8c47..f9d231293a 100644
--- a/source4/scripting/ejs/smbcalls_creds.c
+++ b/source4/scripting/ejs/smbcalls_creds.c
@@ -73,7 +73,7 @@ static int ejs_creds_get_username(MprVarHandle eid, int argc, struct MprVar **ar
 {
 	struct cli_credentials *creds = ejs_creds_get_credentials(eid);
 
-	mpr_Return(eid, mprString(cli_credentials_get_username(creds)));
+	mpr_Return(eid, mprString(cli_credentials_get_username(creds, mprMemCtx())));
 	return 0;
 }
 
-- 
cgit 


From 0549763600b26fadac443555e1cbec5680f91340 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 29 Aug 2005 12:31:32 +0000
Subject: r9735: More work on generating a valid Samba4 configuration using the
 Samba3 data (both console and SWAT) (This used to be commit
 d569465dc4def55c27878028f2fc762960f453d8)

---
 source4/scripting/bin/samba3dump        |   3 +-
 source4/scripting/ejs/smbcalls_samba3.c | 121 +++++++++-----
 source4/scripting/libjs/upgrade.js      | 271 +++++++++++++++++++++++++++++++-
 3 files changed, 355 insertions(+), 40 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/bin/samba3dump b/source4/scripting/bin/samba3dump
index 3960962f8b..6b3d999803 100644
--- a/source4/scripting/bin/samba3dump
+++ b/source4/scripting/bin/samba3dump
@@ -155,10 +155,9 @@ function print_samba3_winsdb(samba3)
 
 function print_samba3_groupmappings(groupdb)
 {
-	var i;
 	print_header("Group Mappings");
 	
-	for (i in groupdb.groupmappings) {
+	for (var i in groupdb.groupmappings) {
 		var g = groupdb.groupmappings[i];
 		printf("\t--- Group: %s ---\n", g.nt_name);
 		printf("\tComment: %s\n", g.comment);
diff --git a/source4/scripting/ejs/smbcalls_samba3.c b/source4/scripting/ejs/smbcalls_samba3.c
index bad8a7e58e..66e1299566 100644
--- a/source4/scripting/ejs/smbcalls_samba3.c
+++ b/source4/scripting/ejs/smbcalls_samba3.c
@@ -26,14 +26,6 @@
 #include "lib/samba3/samba3.h"
 
 
-#if 0
-
-struct samba3_secrets
-{
-};
-
-#endif 
-
 static struct MprVar mprRegistry(struct samba3_regdb *reg)
 {
 	struct MprVar mpv = mprObject("registry"), ks, vs, k, v;
@@ -169,6 +161,37 @@ static struct MprVar mprAliases(struct samba3_groupdb *db)
 	return mpv;
 }
 
+static struct MprVar mprDomainSecrets(struct samba3_domainsecrets *ds)
+{
+	struct MprVar v, e = mprObject("domainsecrets");
+	char *tmp;
+
+	mprSetVar(&e, "name", mprString(ds->name));
+
+	tmp = dom_sid_string(NULL, &ds->sid);
+	mprSetVar(&e, "sid", mprString(tmp));
+	talloc_free(tmp);
+
+	tmp = GUID_string(NULL, &ds->guid);
+	mprSetVar(&e, "guid", mprString(tmp));
+	talloc_free(tmp);
+
+	mprSetVar(&e, "plaintext_pw", mprString(ds->plaintext_pw));
+
+	mprSetVar(&e, "last_change_time", mprCreateIntegerVar(ds->last_change_time));
+	mprSetVar(&e, "sec_channel_type", mprCreateIntegerVar(ds->sec_channel_type));
+
+	v = mprObject("hash_pw");
+
+	mprSetVar(&v, "hash", mprData(ds->hash_pw.hash, 16));
+
+	mprSetVar(&v, "mod_time", mprCreateIntegerVar(ds->hash_pw.mod_time));
+
+	mprSetVar(&e, "hash_pw", v);
+
+	return e;
+}
+
 static struct MprVar mprSecrets(struct samba3_secrets *sec)
 {
 	struct MprVar mpv = mprObject("samba3_secrets"), es, e;
@@ -188,34 +211,7 @@ static struct MprVar mprSecrets(struct samba3_secrets *sec)
 	mprSetVar(&mpv, "ldappws", es);
 
 	for (i = 0; i < sec->domain_count; i++) {
-		char *tmp;
-		struct MprVar v;
-		e = mprObject("domainsecrets");
-
-		mprSetVar(&e, "name", mprString(sec->domains[i].name));
-		
-		tmp = dom_sid_string(NULL, &sec->domains[i].sid);
-		mprSetVar(&e, "sid", mprString(tmp));
-		talloc_free(tmp);
-
-		tmp = GUID_string(NULL, &sec->domains[i].guid);
-		mprSetVar(&e, "guid", mprString(tmp));
-		talloc_free(tmp);
-
-		mprSetVar(&e, "plaintext_pw", mprString(sec->domains[i].plaintext_pw));
-
-		mprSetVar(&e, "last_change_time", mprCreateIntegerVar(sec->domains[i].last_change_time));
-		mprSetVar(&e, "sec_channel_type", mprCreateIntegerVar(sec->domains[i].sec_channel_type));
-
-		v = mprObject("hash_pw");
-
-		mprSetVar(&v, "hash", mprData(sec->domains[i].hash_pw.hash, 16));
-
-		mprSetVar(&v, "mod_time", mprCreateIntegerVar(sec->domains[i].hash_pw.mod_time));
-
-		mprSetVar(&e, "hash_pw", v);
-
-		mprAddArray(&es, i, e);
+		mprAddArray(&es, i, mprDomainSecrets(&sec->domains[i]));
 	}
 
 	mprSetVar(&mpv, "domains", es);
@@ -381,6 +377,54 @@ static struct MprVar mprWinsEntries(struct samba3 *samba3)
 	return mpv;
 }
 
+static int ejs_get_param(MprVarHandle eid, int argc, struct MprVar **argv)
+{
+	struct samba3 *samba3;
+	const char *tmp;
+
+	if (argc < 2) {
+		ejsSetErrorMsg(eid, "get_param invalid arguments");
+		return -1;
+	}
+
+	samba3 = mprGetThisPtr(eid, "samba3");
+	mprAssert(samba3);
+	tmp = samba3_get_param(samba3, mprToString(argv[0]), mprToString(argv[1]));
+
+	if (tmp == NULL) {
+		mpr_Return(eid, mprCreateUndefinedVar());
+	} else {
+		mpr_Return(eid, mprString(tmp));
+	}
+
+	return 0;
+}
+
+static int ejs_find_domainsecrets(MprVarHandle eid, int argc, struct MprVar **argv)
+{
+	struct samba3 *samba3 = NULL;
+	struct samba3_domainsecrets *sec;
+
+	if (argc < 1) {
+		ejsSetErrorMsg(eid, "find_domainsecrets invalid arguments");
+		return -1;
+	}
+
+	samba3 = mprGetThisPtr(eid, "samba3");
+	mprAssert(samba3);
+	sec = samba3_find_domainsecrets(samba3, mprToString(argv[0]));
+
+	if (sec == NULL) {
+		mpr_Return(eid, mprCreateUndefinedVar());
+	} else {
+		mpr_Return(eid, mprDomainSecrets(sec));
+	}
+
+	return 0;
+}
+
+
+
 /*
   initialise samba3 ejs subsystem
 */
@@ -402,6 +446,9 @@ static int ejs_samba3_read(MprVarHandle eid, int argc, struct MprVar **argv)
 		return -1;
 	}
 
+	mprAssert(samba3);
+	
+	mprSetThisPtr(eid, "samba3", samba3);
 	mprSetVar(&mpv, "winsentries", mprWinsEntries(samba3));
 	mprSetVar(&mpv, "samaccounts", mprSamAccounts(samba3));
 	mprSetVar(&mpv, "shares", mprShares(samba3));
@@ -411,6 +458,8 @@ static int ejs_samba3_read(MprVarHandle eid, int argc, struct MprVar **argv)
 	mprSetVar(&mpv, "idmapdb", mprIdmapDb(&samba3->idmap));
 	mprSetVar(&mpv, "policy", mprPolicy(&samba3->policy));
 	mprSetVar(&mpv, "registry", mprRegistry(&samba3->registry));
+	mprSetCFunction(&mpv, "get_param", ejs_get_param);
+	mprSetCFunction(&mpv, "find_domainsecrets", ejs_find_domainsecrets);
 
 	mpr_Return(eid, mpv);
 	
diff --git a/source4/scripting/libjs/upgrade.js b/source4/scripting/libjs/upgrade.js
index 604bbac2c0..60570935f6 100644
--- a/source4/scripting/libjs/upgrade.js
+++ b/source4/scripting/libjs/upgrade.js
@@ -6,8 +6,275 @@
 
 libinclude("base.js");
 
-function foo() 
+function regkey_to_dn(name)
 {
+	var dn = "hive=NONE";
+	var i = 0;
 
-	return 0;
+	var as = split("/", name);
+
+	for (i in as) {
+		if (i > 0) {
+			dn = sprintf("key=%s,", as[i]) + dn;
+		}
+	}
+
+	return dn;
+}
+
+/* Where prefix is any of:
+ * - HKLM
+ *   HKU
+ *   HKCR
+ *   HKPD
+ *   HKPT
+ */
+
+function upgrade_registry(regdb,prefix)
+{
+	var prefix_up = strupper(prefix);
+
+	var ldif = "";
+
+	for (var i in regdb.keys) {
+		var rk = regdb.keys[i];
+		/* Only handle selected hive */
+		if (strncmp(prefix_up, rk.name, strlen(prefix_up)) != 0) {
+			continue;
+		}
+
+		var keydn = regkey_to_dn(rk.name);
+
+		var pts = split("/", rk.name);
+
+		/* Convert key name to dn */
+		ldif = ldif + sprintf("
+dn: %s
+name: %s
+
+", keydn, pts[0]);
+		
+		for (var j in rk.values) {
+			var rv = rk.values[j];
+
+			ldif = ldif + sprintf("
+dn: %s,value=%s
+value: %s
+type: %d
+data:: %s", keydn, rv.value, rv.type, base64(rv.data));
+		}
+	}
+
+	return ldif;
+}
+
+function upgrade_sam_domain(samba3)
+{
+	var ldif = sprintf("
+dn: %s
+dc: FIXME
+objectClass: top
+objectClass: domain
+objectSid: %s
+objectGUID: %s
+name: %s
+oEMInformation: Provisioned by Samba4 (upgraded from Samba3)
+minPwdLength: %d
+pwdHistoryLength: %d
+minPwdAge: %d
+maxPwdAge: %d
+lockoutDuration: %d
+samba3ResetCountMinutes: %d
+samba3UserMustLogonToChangePassword: %d
+samba3BadLockoutMinutes: %d
+samba3DisconnectTime: %d
+samba3RefuseMachinePwdChange: %d
+
+", domaindn, domsec.sid, domsec.guid, domainname, samba3.policy.min_password_length, 
+	samba3.policy.password_history, samba3.policy.minimum_password_age,
+	samba3.policy.maximum_password_age, samba3.policy.lockout_duration,
+	samba3.policy.reset_count_minutes, samba3.policy.user_must_logon_to_change_password,
+	samba3.policy.bad_lockout_minutes, samba3.policy.disconnect_time, 
+	samba3.policy.refuse_machine_password_change
+);
+
+	return ldif;
+}
+
+function upgrade_sam_account(acc,domaindn)
+{
+	var ldif = sprintf(
+"dn: cn=%s,%s
+objectClass: top
+objectClass: person
+objectClass: user
+lastLogon: %d
+lastLogoff: %d
+unixName: %s
+name: %s
+cn: %s
+description: %s
+primaryGroupID: %d
+badPwdcount: %d
+logonCount: %d
+samba3Domain: %s
+samba3DirDrive: %s
+samba3MungedDial: %s
+samba3Homedir: %s
+samba3LogonScript: %s
+samba3ProfilePath: %s
+samba3Workstations: %s
+samba3KickOffTime: %d
+samba3BadPwdTime: %d
+samba3PassLastSetTime: %d
+samba3PassCanChangeTime: %d
+samba3PassMustChangeTime: %d
+samba3Rid: %d
+
+", acc.fullname, domaindn, sam.logon_time, acc.logoff_time, acc.username, acc.nt_username, 
+acc.fullname, acc.acct_desc, acc.group_rid, acc.bad_password_count, acc.logon_count,
+acc.domain, acc.dir_drive, acc.munged_dial, acc.homedir, acc.logon_script, 
+acc.profile_path, acc.workstations, acc.kickoff_time, acc.bad_password_time, 
+acc.pass_last_set_time, acc.pass_can_change_time, acc.pass_must_change_time, acc.user_rid); 
+
+		/* FIXME: Passwords */
+
+	return ldif;
+}
+
+function upgrade_sam_group(grp,domaindn)
+{
+	var ldif = sprintf(
+"dn: cn=%s,%s
+objectClass: top
+objectClass: group
+description: %s
+cn: %s
+objectSid: %s
+unixName: FIXME
+samba3SidNameUse: %d", grp.nt_name, domaindn, 
+grp.comment, grp.nt_name, grp.sid, grp.sid_name_use);
+
+	return ldif;
+}
+
+function upgrade_sam(samba3,domaindn)
+{
+	domainname = samba3.get_param("global", "workgroup");
+
+	if (domainname == undefined) {
+		DEBUG(0, ("No domain name specified in smb.conf!\n"));
+		return -1;
+	}
+
+	domsec = samba3.find_domainsecrets(domainname);
+
+	var ldif = upgrade_sam_domain(samba3,domaindn);
+
+	/* Users */
+	for (var i in samba3.samaccounts) {
+		ldif = ldif + upgrade_sam_account(samba3.samaccounts[i],domaindn);
+	}
+
+	/* Groups */
+	for (var i in samba3.group.groupmappings) {
+		ldif = ldif + upgrade_sam_group(samba3.group.groupmappings[i],domaindn);
+
+	}
+
+	return count;
+}
+
+function upgrade_winbind(samba3,domaindn)
+{
+	var ldif = sprintf("
+		
+dn: dc=none
+userHwm: %d
+groupHwm: %d
+
+", samba3.idmap.user_hwm, samba3.idmap.group_hwm);
+
+	for (var i in samba3.idmap.mappings) {
+		var m = samba3.idmap.mappings[i];
+		ldif = ldif + sprintf("
+dn: SID=%s,%s
+SID: %s
+type: %d
+unixID: %d", m.sid, domaindn, m.sid, m.type, m.unix_id);
+	}
+	
+	return ldif;
+}
+*/
+
+function upgrade_wins(samba3)
+{
+	var ldif = "";
+	for (i in samba3.winsentries) {
+		var e = samba3.winsentries[i];
+		
+		ldif = ldif + sprintf("
+dn: type=%d,name=%s
+name: %s
+objectClass: wins
+nbFlags: %x
+expires: %s", e.type, e.name, e.name, e.type, e.nb_flags, sys.ldap_time(e.ttl));
+
+		for (var i in e.ips) {
+			ldif = ldif + sprintf("address: %s\n", e.ips[i]);
+		}
+	}
+
+	return ldif;
+}
+
+function upgrade_provision(samba3)
+{
+	var subobj = new Object();
+	var nss = nss_init();
+	var lp = loadparm_init();
+	var rdn_list;
+
+	var domainname = samba3.get_param("global", "workgroup");
+	var domsec = samba3.find_domainsecrets(domainname);
+	var hostsec = samba3.find_domainsecrets(hostname());
+	var realm = samba3.get_param("global", "realm");
+	random_init(local);
+
+	subobj.REALM        = realm;
+	subobj.DOMAIN       = domainname;
+	subobj.HOSTNAME     = hostname();
+
+	assert(subobj.REALM);
+	assert(subobj.DOMAIN);
+	assert(subobj.HOSTNAME);
+
+	subobj.HOSTIP       = hostip();
+	subobj.DOMAINGUID   = domsec.guid;
+	subobj.DOMAINSID    = domsec.sid;
+	subobj.HOSTGUID     = hostsec.guid;
+	subobj.INVOCATIONID = randguid();
+	subobj.KRBTGTPASS   = randpass(12);
+	subobj.MACHINEPASS  = randpass(12);
+	subobj.ADMINPASS    = randpass(12);
+	subobj.DEFAULTSITE  = "Default-First-Site-Name";
+	subobj.NEWGUID      = randguid;
+	subobj.NTTIME       = nttime;
+	subobj.LDAPTIME     = ldaptime;
+	subobj.DATESTRING   = datestring;
+	subobj.USN          = nextusn;
+	subobj.ROOT         = findnss(nss.getpwnam, split(samba3.get_param("global", "admin users")));
+	subobj.NOBODY       = findnss(nss.getpwnam, "nobody");
+	subobj.NOGROUP      = findnss(nss.getgrnam, "nogroup", "nobody");
+	subobj.WHEEL        = findnss(nss.getgrnam, "wheel", "root");
+	subobj.USERS        = findnss(nss.getgrnam, "users", "guest", "other");
+	subobj.DNSDOMAIN    = strlower(subobj.REALM);
+	subobj.DNSNAME      = sprintf("%s.%s", 
+				      strlower(subobj.HOSTNAME), 
+				      subobj.DNSDOMAIN);
+	subobj.BASEDN       = "DC=" + join(",DC=", split(".", subobj.REALM));
+	rdn_list = split(".", subobj.REALM);
+	subobj.RDN_DC       = rdn_list[0];
+	return subobj;
 }
-- 
cgit 


From 0a72d9a5f7c8705a68b03e2f391603252d896342 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 29 Aug 2005 15:54:10 +0000
Subject: r9744: - [upgrade.js] Start working on smb.conf conversion. -
 [ldb_map] Support storing non-mappable data in a fallback LDB (This used to
 be commit 435e4c6389b9d9b545beec8036289620ee5883db)

---
 source4/scripting/libjs/upgrade.js | 159 ++++++++++++++++++++++++++++---------
 1 file changed, 123 insertions(+), 36 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/upgrade.js b/source4/scripting/libjs/upgrade.js
index 60570935f6..3a6d2eec0a 100644
--- a/source4/scripting/libjs/upgrade.js
+++ b/source4/scripting/libjs/upgrade.js
@@ -68,17 +68,10 @@ data:: %s", keydn, rv.value, rv.type, base64(rv.data));
 	return ldif;
 }
 
-function upgrade_sam_domain(samba3)
+function upgrade_sam_policy(samba3,dn)
 {
 	var ldif = sprintf("
 dn: %s
-dc: FIXME
-objectClass: top
-objectClass: domain
-objectSid: %s
-objectGUID: %s
-name: %s
-oEMInformation: Provisioned by Samba4 (upgraded from Samba3)
 minPwdLength: %d
 pwdHistoryLength: %d
 minPwdAge: %d
@@ -90,7 +83,7 @@ samba3BadLockoutMinutes: %d
 samba3DisconnectTime: %d
 samba3RefuseMachinePwdChange: %d
 
-", domaindn, domsec.sid, domsec.guid, domainname, samba3.policy.min_password_length, 
+", dn, samba3.policy.min_password_length, 
 	samba3.policy.password_history, samba3.policy.minimum_password_age,
 	samba3.policy.maximum_password_age, samba3.policy.lockout_duration,
 	samba3.policy.reset_count_minutes, samba3.policy.user_must_logon_to_change_password,
@@ -158,33 +151,6 @@ grp.comment, grp.nt_name, grp.sid, grp.sid_name_use);
 	return ldif;
 }
 
-function upgrade_sam(samba3,domaindn)
-{
-	domainname = samba3.get_param("global", "workgroup");
-
-	if (domainname == undefined) {
-		DEBUG(0, ("No domain name specified in smb.conf!\n"));
-		return -1;
-	}
-
-	domsec = samba3.find_domainsecrets(domainname);
-
-	var ldif = upgrade_sam_domain(samba3,domaindn);
-
-	/* Users */
-	for (var i in samba3.samaccounts) {
-		ldif = ldif + upgrade_sam_account(samba3.samaccounts[i],domaindn);
-	}
-
-	/* Groups */
-	for (var i in samba3.group.groupmappings) {
-		ldif = ldif + upgrade_sam_group(samba3.group.groupmappings[i],domaindn);
-
-	}
-
-	return count;
-}
-
 function upgrade_winbind(samba3,domaindn)
 {
 	var ldif = sprintf("
@@ -278,3 +244,124 @@ function upgrade_provision(samba3)
 	subobj.RDN_DC       = rdn_list[0];
 	return subobj;
 }
+
+var keep = new Array(
+	"dos charset", 
+	"unix charset",
+	"display charset",
+	"comment",
+	"path",
+	"directory",
+	"workgroup",
+	"realm",
+	"netbios name",
+	"netbios aliases",
+	"netbios scope",
+	"server string",
+	"interfaces",
+	"bind interfaces only",
+	"security",
+	"auth methods",
+	"encrypt passwords",
+	"null passwords",
+	"obey pam restrictions",
+	"password server",
+	"smb passwd file",
+	"sam database",
+	"spoolss database",
+	"wins database",
+	"private dir",
+	"passwd chat",
+	"password level",
+	"lanman auth",
+	"ntlm auth",
+	"client NTLMv2 auth",
+	"client lanman auth",
+	"client plaintext auth",
+	"read only",
+	"hosts allow",
+	"hosts deny",
+	"log level",
+	"debuglevel",
+	"log file",
+	"smb ports",
+	"nbt port",
+	"dgram port",
+	"cldap port",
+	"krb5 port",
+	"web port",
+	"tls enabled",
+	"tls keyfile",
+	"tls certfile",
+	"tls cafile",
+	"tls crlfile",
+	"swat directory",
+	"large readwrite",
+	"max protocol",
+	"min protocol",
+	"unicode",
+	"read raw",
+	"write raw",
+	"disable netbios",
+	"nt status support",
+	"announce version",
+	"announce as",
+	"max mux",
+	"max xmit",
+	"name resolve order",
+	"max wins ttl",
+	"min wins ttl",
+	"time server",
+	"unix extensions",
+	"use spnego",
+	"server signing",
+	"client signing",
+	"rpc big endian",
+	"max connections",
+	"paranoid server security",
+	"socket options",
+	"strict sync",
+	"case insensitive filesystem",
+	"max print jobs",
+	"printable",
+	"print ok",
+	"printer name",
+	"printer",
+	"map system",
+	"map hidden",
+	"map archive",
+	"domain logons",
+	"preferred master",
+	"prefered master",
+	"local master",
+	"domain master",
+	"browseable",
+	"browsable",
+	"wins server",
+	"wins support",
+	"csc policy",
+	"strict locking",
+	"config file",
+	"preload",
+	"auto services",
+	"lock dir",
+	"lock directory",
+	"pid directory",
+	"js include",
+	"setup directory",
+	"socket address",
+	"-valid",
+	"copy",
+	"include",
+	"available",
+	"volume",
+	"fstype",
+	"panic action",
+	"msdfs root",
+	"host msdfs",
+	"winbind separator");
+
+function upgrade_smbconf(samba3)
+{
+	//FIXME
+}
-- 
cgit 


From 442d147f6d39a9ac9545a096c7f62386cbe8b480 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 29 Aug 2005 15:55:35 +0000
Subject: r9746: Add "staff" as possible alternative to wheel (should fix
 standard provisioning on AIX) (This used to be commit
 b1d9ef899821376d7883fa126a14c06ed1b16601)

---
 source4/scripting/libjs/provision.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index afa5adaa9f..e166f3101f 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -291,7 +291,7 @@ function provision_guess()
 	subobj.ROOT         = findnss(nss.getpwnam, "root");
 	subobj.NOBODY       = findnss(nss.getpwnam, "nobody");
 	subobj.NOGROUP      = findnss(nss.getgrnam, "nogroup", "nobody");
-	subobj.WHEEL        = findnss(nss.getgrnam, "wheel", "root");
+	subobj.WHEEL        = findnss(nss.getgrnam, "wheel", "root", "staff");
 	subobj.USERS        = findnss(nss.getgrnam, "users", "guest", "other");
 	subobj.DNSDOMAIN    = strlower(subobj.REALM);
 	subobj.DNSNAME      = sprintf("%s.%s", 
-- 
cgit 


From 11f3f0fa6cfb0486bdc526465dc4c0e19467a30f Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 29 Aug 2005 18:52:24 +0000
Subject: r9754: Upgrading with the command line utility now works, at least
 partially (-: Upgrading using SWAT should work as well now. (This used to be
 commit 8baa2ac377315ae8b365f58c2bda0bf3d0c5aec3)

---
 source4/scripting/ejs/smbcalls_samba3.c |   4 +-
 source4/scripting/libjs/upgrade.js      | 103 +++++++++++++++++++++++++++++---
 2 files changed, 98 insertions(+), 9 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_samba3.c b/source4/scripting/ejs/smbcalls_samba3.c
index 66e1299566..e6f6481060 100644
--- a/source4/scripting/ejs/smbcalls_samba3.c
+++ b/source4/scripting/ejs/smbcalls_samba3.c
@@ -210,6 +210,8 @@ static struct MprVar mprSecrets(struct samba3_secrets *sec)
 
 	mprSetVar(&mpv, "ldappws", es);
 
+	es = mprObject("array");
+
 	for (i = 0; i < sec->domain_count; i++) {
 		mprAddArray(&es, i, mprDomainSecrets(&sec->domains[i]));
 	}
@@ -448,7 +450,7 @@ static int ejs_samba3_read(MprVarHandle eid, int argc, struct MprVar **argv)
 
 	mprAssert(samba3);
 	
-	mprSetThisPtr(eid, "samba3", samba3);
+	mprSetPtrChild(&mpv, "samba3", samba3);
 	mprSetVar(&mpv, "winsentries", mprWinsEntries(samba3));
 	mprSetVar(&mpv, "samaccounts", mprSamAccounts(samba3));
 	mprSetVar(&mpv, "shares", mprShares(samba3));
diff --git a/source4/scripting/libjs/upgrade.js b/source4/scripting/libjs/upgrade.js
index 3a6d2eec0a..c8539c9fcb 100644
--- a/source4/scripting/libjs/upgrade.js
+++ b/source4/scripting/libjs/upgrade.js
@@ -32,14 +32,17 @@ function regkey_to_dn(name)
 
 function upgrade_registry(regdb,prefix)
 {
+	assert(regdb != undefined);
 	var prefix_up = strupper(prefix);
 
 	var ldif = "";
 
 	for (var i in regdb.keys) {
 		var rk = regdb.keys[i];
+		var pts = split("/", rk.name);
+
 		/* Only handle selected hive */
-		if (strncmp(prefix_up, rk.name, strlen(prefix_up)) != 0) {
+		if (strupper(pts[0]) != prefix_up) {
 			continue;
 		}
 
@@ -72,6 +75,8 @@ function upgrade_sam_policy(samba3,dn)
 {
 	var ldif = sprintf("
 dn: %s
+changetype: modify
+replace: minPwdLength
 minPwdLength: %d
 pwdHistoryLength: %d
 minPwdAge: %d
@@ -124,7 +129,7 @@ samba3PassCanChangeTime: %d
 samba3PassMustChangeTime: %d
 samba3Rid: %d
 
-", acc.fullname, domaindn, sam.logon_time, acc.logoff_time, acc.username, acc.nt_username, 
+", acc.fullname, domaindn, acc.logon_time, acc.logoff_time, acc.username, acc.nt_username, 
 acc.fullname, acc.acct_desc, acc.group_rid, acc.bad_password_count, acc.logon_count,
 acc.domain, acc.dir_drive, acc.munged_dial, acc.homedir, acc.logon_script, 
 acc.profile_path, acc.workstations, acc.kickoff_time, acc.bad_password_time, 
@@ -145,7 +150,8 @@ description: %s
 cn: %s
 objectSid: %s
 unixName: FIXME
-samba3SidNameUse: %d", grp.nt_name, domaindn, 
+samba3SidNameUse: %d
+", grp.nt_name, domaindn, 
 grp.comment, grp.nt_name, grp.sid, grp.sid_name_use);
 
 	return ldif;
@@ -185,7 +191,8 @@ dn: type=%d,name=%s
 name: %s
 objectClass: wins
 nbFlags: %x
-expires: %s", e.type, e.name, e.name, e.type, e.nb_flags, sys.ldap_time(e.ttl));
+expires: %s
+", e.type, e.name, e.name, e.type, e.nb_flags, sys.ldaptime(e.ttl));
 
 		for (var i in e.ips) {
 			ldif = ldif + sprintf("address: %s\n", e.ips[i]);
@@ -203,9 +210,20 @@ function upgrade_provision(samba3)
 	var rdn_list;
 
 	var domainname = samba3.get_param("global", "workgroup");
+
+	if (domainname == undefined) {
+		domainname = samba3.secrets.domains[0].name;
+		println("No domain specified in smb.conf file, assuming '" + domainname + "'");
+	}
+	
 	var domsec = samba3.find_domainsecrets(domainname);
 	var hostsec = samba3.find_domainsecrets(hostname());
 	var realm = samba3.get_param("global", "realm");
+
+	if (realm == undefined) {
+		realm = domainname;
+		println("No realm specified in smb.conf file, assuming '" + realm + "'");
+	}
 	random_init(local);
 
 	subobj.REALM        = realm;
@@ -217,9 +235,20 @@ function upgrade_provision(samba3)
 	assert(subobj.HOSTNAME);
 
 	subobj.HOSTIP       = hostip();
-	subobj.DOMAINGUID   = domsec.guid;
-	subobj.DOMAINSID    = domsec.sid;
-	subobj.HOSTGUID     = hostsec.guid;
+	if (domsec != undefined) {
+		subobj.DOMAINGUID   = domsec.guid;
+		subobj.DOMAINSID    = domsec.sid;
+	} else {
+		println("Can't find domain secrets for '" + domainname + "'; using random SID and GUID");
+		subobj.DOMAINGUID = randguid();
+		subobj.DOMAINSID = randguid();
+	}
+	
+	if (hostsec) {
+		subobj.HOSTGUID     = hostsec.guid;
+	} else {
+		subobj.HOSTGUID = randguid();
+	}
 	subobj.INVOCATIONID = randguid();
 	subobj.KRBTGTPASS   = randpass(12);
 	subobj.MACHINEPASS  = randpass(12);
@@ -230,7 +259,7 @@ function upgrade_provision(samba3)
 	subobj.LDAPTIME     = ldaptime;
 	subobj.DATESTRING   = datestring;
 	subobj.USN          = nextusn;
-	subobj.ROOT         = findnss(nss.getpwnam, split(samba3.get_param("global", "admin users")));
+	subobj.ROOT         = findnss(nss.getpwnam, "root");
 	subobj.NOBODY       = findnss(nss.getpwnam, "nobody");
 	subobj.NOGROUP      = findnss(nss.getgrnam, "nogroup", "nobody");
 	subobj.WHEEL        = findnss(nss.getgrnam, "wheel", "root");
@@ -365,3 +394,61 @@ function upgrade_smbconf(samba3)
 {
 	//FIXME
 }
+
+function upgrade(subobj, samba3, message)
+{
+	var samdb = ldb_init();
+	var ok = samdb.connect("sam.ldb");
+	assert(ok);
+
+	message("Importing account policies\n");
+	var ldif = upgrade_sam_policy(samba3,subobj.BASEDN);
+	ldifprint(ldif);
+	ok = samdb.modify(ldif);
+	assert(ok);
+
+	// FIXME: Enable samba3sam module if original passdb backend was ldap
+
+	message("Importing users\n");
+	for (var i in samba3.samaccounts) {
+		message("Importing user '" + samba3.samaccounts[i].username + "'\n");
+		var ldif = upgrade_sam_account(samba3.samaccounts[i],subobj.BASEDN);
+		ldifprint(ldif);
+		ok = samdb.add(ldif);
+		assert(ok);
+	}
+
+	message("Importing groups\n");
+	for (var i in samba3.groupmappings) {
+		message("Importing group '" + samba3.groupmappings[i].username + "'\n");
+		var ldif = upgrade_sam_group(samba3.groupmappings[i],subobj.BASEDN);
+		ldifprint(ldif);
+		ok = samdb.add(ldif);
+		assert(ok);
+	}
+
+	message("Importing registry data\n");
+	var hives = new Array("hkcr","hkcu","hklm","hkpd"); 
+	for (var i in hives) {
+		println("... " + hives[i]);
+		var regdb = ldb_init();
+		ok = regdb.connect(hives[i] + ".ldb");
+		assert(ok);
+		var ldif = upgrade_registry(samba3.registry, hives[i]);
+		ldifprint(ldif);
+		ok = regdb.add(ldif);
+		assert(ok);
+	}
+
+	message("Importing WINS data\n");
+	var winsdb = ldb_init();
+	ok = winsdb.connect("wins.ldb");
+	assert(ok);
+
+	var ldif = upgrade_wins(samba3);
+	ldifprint(ldif);
+	ok = winsdb.add(ldif);
+	assert(ok);
+
+	return ok;
+}
-- 
cgit 


From d4f22109ee5b939d34fe11ad4cef29d22fd82cc8 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 29 Aug 2005 19:08:18 +0000
Subject: r9755: Fix crash bug in SWAT login (This used to be commit
 6e3e964fb4529260c2fcb09b41eda1a100e690eb)

---
 source4/scripting/ejs/smbcalls_auth.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_auth.c b/source4/scripting/ejs/smbcalls_auth.c
index 8df69cf087..e3b48490f6 100644
--- a/source4/scripting/ejs/smbcalls_auth.c
+++ b/source4/scripting/ejs/smbcalls_auth.c
@@ -119,6 +119,9 @@ static int ejs_userAuth(MprVarHandle eid, int argc, struct MprVar **argv)
 		ejsSetErrorMsg(eid, "userAuth requires a 'creds' element");
 		return -1;
 	}
+
+ 	tmp_ctx = talloc_new(mprMemCtx());	
+	
 	username    = cli_credentials_get_username(creds, tmp_ctx);
 	password    = cli_credentials_get_password(creds);
 	domain      = cli_credentials_get_domain(creds);
@@ -126,10 +129,10 @@ static int ejs_userAuth(MprVarHandle eid, int argc, struct MprVar **argv)
 
 	if (username == NULL || password == NULL || domain == NULL) {
 		mpr_Return(eid, mprCreateUndefinedVar());
+		talloc_free(tmp_ctx);
 		return 0;
 	}
 
- 	tmp_ctx = talloc_new(mprMemCtx());	
 	auth = mprObject("auth");
 
 	if (domain && strcmp("System User", domain) == 0) {
-- 
cgit 


From c9ace93ce22fed9e1b4e44a853e23bf66cf99184 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 29 Aug 2005 20:18:51 +0000
Subject: r9756: One-way upgrade from Samba3->Samba4 basically works now Still
 need to polish some rough edges (This used to be commit
 a8f309aa812533f57a90410722dfb342c8cf3b48)

---
 source4/scripting/ejs/smbcalls_string.c | 57 +++++++++++++++++++++++++++++++++
 source4/scripting/libjs/provision.js    |  5 +--
 source4/scripting/libjs/upgrade.js      | 16 +++------
 3 files changed, 65 insertions(+), 13 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_string.c b/source4/scripting/ejs/smbcalls_string.c
index 1b6b7d09dd..e127cdf8af 100644
--- a/source4/scripting/ejs/smbcalls_string.c
+++ b/source4/scripting/ejs/smbcalls_string.c
@@ -4,6 +4,7 @@
    provide access to string functions
 
    Copyright (C) Andrew Tridgell 2005
+   Copyright (C) Jelmer Vernooij 2005 (substr)
    
    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
@@ -124,6 +125,61 @@ static int ejs_split(MprVarHandle eid, int argc, char **argv)
 	return 0;
 }
 
+/*
+  usage:
+    str = substr(orig[, start_offset[, length]]);
+
+	special cases:
+		if start_offset < 0 then start_offset+=strlen(orig)
+		if length < 0 then length+=strlen(orig)-start_offset
+
+	(as found in many other languages)
+*/
+static int ejs_substr(MprVarHandle eid, int argc, struct MprVar **argv)
+{
+	int start_offset = 0;
+	int length = 0;
+	const char *orig;
+	char *target;
+	
+	if (argc < 1 || argc > 3 ||
+	    argv[0]->type != MPR_TYPE_STRING) {
+		ejsSetErrorMsg(eid, "substr invalid arguments");
+		return -1;
+	}
+
+	if (argc == 1) {
+		mpr_Return(eid, *argv[0]);
+		return 0;
+	}
+
+	orig = mprToString(argv[0]);
+	start_offset = mprToInt(argv[1]);
+	if (start_offset < 0) start_offset += strlen(orig);
+	if (start_offset < 0 || start_offset > strlen(orig)) {
+		ejsSetErrorMsg(eid, "substr arg 2 out of bounds");
+		return -1;
+	}
+
+	if (argc == 3) {
+		length = mprToInt(argv[1]);
+		if (length < 0) length += strlen(orig) - start_offset;
+		if (length < 0 || length+start_offset > strlen(orig)) {
+			ejsSetErrorMsg(eid, "substr arg 3 out of bounds");
+			return -1;
+		}
+	} else {
+		length = strlen(orig);
+	}
+
+	target = talloc_strndup(mprMemCtx(), orig+start_offset, length);
+	
+	mpr_Return(eid, mprString(target));
+
+	talloc_free(target);
+
+	return 0;
+}
 
 /*
   usage:
@@ -421,6 +477,7 @@ static int ejs_string_init(MprVarHandle eid, int argc, struct MprVar **argv)
 {
 	struct MprVar *obj = mprInitObject(eid, "string", argc, argv);
 
+	mprSetCFunction(obj, "substr", ejs_substr);
 	mprSetStringCFunction(obj, "strlen", ejs_strlen);
 	mprSetStringCFunction(obj, "strlower", ejs_strlower);
 	mprSetStringCFunction(obj, "strupper", ejs_strupper);
diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index e166f3101f..b43d435ca9 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -217,6 +217,8 @@ function provision(subobj, message, blank)
 	subobj.HOSTNAME    = strlower(subobj.HOSTNAME);
 	subobj.DOMAIN      = strupper(subobj.DOMAIN);
 	subobj.NETBIOSNAME = strupper(subobj.HOSTNAME);
+	var rdns = split(",", subobj.BASEDN);
+	subobj.RDN_DC = substr(rdns[0], strlen("DC="));
 
 	data = add_foreign(data, "S-1-5-7",  "Anonymous",           "${NOBODY}");
 	data = add_foreign(data, "S-1-1-0",  "World",               "${NOGROUP}");
@@ -297,9 +299,8 @@ function provision_guess()
 	subobj.DNSNAME      = sprintf("%s.%s", 
 				      strlower(subobj.HOSTNAME), 
 				      subobj.DNSDOMAIN);
-	subobj.BASEDN       = "DC=" + join(",DC=", split(".", subobj.REALM));
 	rdn_list = split(".", subobj.REALM);
-	subobj.RDN_DC       = rdn_list[0];
+	subobj.BASEDN       = "DC=" + join(",DC=", rdn_list);
 	return subobj;
 }
 
diff --git a/source4/scripting/libjs/upgrade.js b/source4/scripting/libjs/upgrade.js
index c8539c9fcb..682721e931 100644
--- a/source4/scripting/libjs/upgrade.js
+++ b/source4/scripting/libjs/upgrade.js
@@ -241,7 +241,7 @@ function upgrade_provision(samba3)
 	} else {
 		println("Can't find domain secrets for '" + domainname + "'; using random SID and GUID");
 		subobj.DOMAINGUID = randguid();
-		subobj.DOMAINSID = randguid();
+		subobj.DOMAINSID = randsid();
 	}
 	
 	if (hostsec) {
@@ -270,7 +270,6 @@ function upgrade_provision(samba3)
 				      subobj.DNSDOMAIN);
 	subobj.BASEDN       = "DC=" + join(",DC=", split(".", subobj.REALM));
 	rdn_list = split(".", subobj.REALM);
-	subobj.RDN_DC       = rdn_list[0];
 	return subobj;
 }
 
@@ -403,7 +402,6 @@ function upgrade(subobj, samba3, message)
 
 	message("Importing account policies\n");
 	var ldif = upgrade_sam_policy(samba3,subobj.BASEDN);
-	ldifprint(ldif);
 	ok = samdb.modify(ldif);
 	assert(ok);
 
@@ -411,31 +409,28 @@ function upgrade(subobj, samba3, message)
 
 	message("Importing users\n");
 	for (var i in samba3.samaccounts) {
-		message("Importing user '" + samba3.samaccounts[i].username + "'\n");
+		message("... " + samba3.samaccounts[i].username + "\n");
 		var ldif = upgrade_sam_account(samba3.samaccounts[i],subobj.BASEDN);
-		ldifprint(ldif);
 		ok = samdb.add(ldif);
 		assert(ok);
 	}
 
 	message("Importing groups\n");
 	for (var i in samba3.groupmappings) {
-		message("Importing group '" + samba3.groupmappings[i].username + "'\n");
+		message("... " + samba3.groupmappings[i].nt_name + "\n");
 		var ldif = upgrade_sam_group(samba3.groupmappings[i],subobj.BASEDN);
-		ldifprint(ldif);
 		ok = samdb.add(ldif);
 		assert(ok);
 	}
 
 	message("Importing registry data\n");
-	var hives = new Array("hkcr","hkcu","hklm","hkpd"); 
+	var hives = new Array("hkcr","hkcu","hklm","hkpd","hku","hkpt"); 
 	for (var i in hives) {
-		println("... " + hives[i]);
+		message("... " + hives[i] + "\n");
 		var regdb = ldb_init();
 		ok = regdb.connect(hives[i] + ".ldb");
 		assert(ok);
 		var ldif = upgrade_registry(samba3.registry, hives[i]);
-		ldifprint(ldif);
 		ok = regdb.add(ldif);
 		assert(ok);
 	}
@@ -446,7 +441,6 @@ function upgrade(subobj, samba3, message)
 	assert(ok);
 
 	var ldif = upgrade_wins(samba3);
-	ldifprint(ldif);
 	ok = winsdb.add(ldif);
 	assert(ok);
 
-- 
cgit 


From ec934124db8a5234d8c83799a23c7bdced5dd95a Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 29 Aug 2005 22:01:18 +0000
Subject: r9762: Add support for reading good old smbpasswd files Fix password
 support Make base64 decode/encode functions available to EJS (This used to be
 commit 1376a1fe44cd6b01709819095a711c14626b1d3e)

---
 source4/scripting/ejs/smbcalls_ldb.c    | 61 +++++++++++++++++++++++++++++++++
 source4/scripting/ejs/smbcalls_samba3.c |  4 +--
 source4/scripting/libjs/upgrade.js      | 59 ++++++++++++++++++-------------
 3 files changed, 99 insertions(+), 25 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_ldb.c b/source4/scripting/ejs/smbcalls_ldb.c
index aaed14dd8c..662da0d971 100644
--- a/source4/scripting/ejs/smbcalls_ldb.c
+++ b/source4/scripting/ejs/smbcalls_ldb.c
@@ -4,6 +4,7 @@
    provide hooks into smbd C calls from ejs scripts
 
    Copyright (C) Andrew Tridgell 2005
+   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
@@ -247,6 +248,64 @@ static int ejs_ldbErrstring(MprVarHandle eid, int argc, struct MprVar **argv)
 	return 0;
 }
 
+/* 
+   base64 encode 
+   usage: 
+    dataout = ldb.encode(datain)
+ */
+static int ejs_base64encode(MprVarHandle eid, int argc, struct MprVar **argv)
+{
+	char *ret;
+	DATA_BLOB *blob;
+
+	if (argc != 1) {
+		ejsSetErrorMsg(eid, "ldb.base64encode invalid argument count");
+		return -1;
+	}
+
+	blob = mprToDataBlob(argv[0]);
+	ret = ldb_base64_encode(mprMemCtx(), (char *)blob->data, blob->length);
+
+	if (!ret) {
+		mpr_Return(eid, mprCreateUndefinedVar());
+	} else {
+		mpr_Return(eid, mprString(ret));
+	}
+
+	talloc_free(ret);
+
+	return 0;
+}
+
+/* 
+   base64 decode
+   usage:
+     dataout = ldb.decode(datain)
+ */
+static int ejs_base64decode(MprVarHandle eid, int argc, struct MprVar **argv)
+{
+	char *tmp;
+	int ret;
+	
+	if (argc != 1) {
+		ejsSetErrorMsg(eid, "ldb.base64encode invalid argument count");
+		return -1;
+	}
+
+	tmp = talloc_strdup(mprMemCtx(), mprToString(argv[0]));
+	ret = ldb_base64_decode(tmp);
+	if (ret == -1) {
+		mpr_Return(eid, mprCreateUndefinedVar());
+	} else {
+		mpr_Return(eid, mprData((uint8_t *)tmp, ret));
+	}
+
+	talloc_free(tmp);
+
+	return 0;
+}
+  
+
 /*
   perform an ldb modify
 
@@ -312,6 +371,8 @@ static int ejs_ldb_init(MprVarHandle eid, int argc, struct MprVar **argv)
 	mprSetCFunction(ldb, "del", ejs_ldbDelete);
 	mprSetCFunction(ldb, "rename", ejs_ldbRename);
 	mprSetCFunction(ldb, "errstring", ejs_ldbErrstring);
+	mprSetCFunction(ldb, "encode", ejs_base64encode);
+	mprSetCFunction(ldb, "decode", ejs_base64decode);
 	mprSetVar(ldb, "SCOPE_BASE", mprCreateNumberVar(LDB_SCOPE_BASE));
 	mprSetVar(ldb, "SCOPE_ONE", mprCreateNumberVar(LDB_SCOPE_ONELEVEL));
 	mprSetVar(ldb, "SCOPE_SUBTREE", mprCreateNumberVar(LDB_SCOPE_SUBTREE));
diff --git a/source4/scripting/ejs/smbcalls_samba3.c b/source4/scripting/ejs/smbcalls_samba3.c
index e6f6481060..eb37168bc8 100644
--- a/source4/scripting/ejs/smbcalls_samba3.c
+++ b/source4/scripting/ejs/smbcalls_samba3.c
@@ -343,8 +343,8 @@ static struct MprVar mprSamAccounts(struct samba3 *samba3)
 		mprSetVar(&m, "profile_path", mprString(a->profile_path));
 		mprSetVar(&m, "acct_desc", mprString(a->acct_desc));
 		mprSetVar(&m, "workstations", mprString(a->workstations));
-
-		/* FIXME: lm_pw_ptr, nt_pw_ptr */
+		mprSetVar(&m, "lm_pw", mprData(a->lm_pw.hash, 16));
+		mprSetVar(&m, "nt_pw", mprData(a->nt_pw.hash, 16));
 
 		mprAddArray(&mpv, i, m);
 	}
diff --git a/source4/scripting/libjs/upgrade.js b/source4/scripting/libjs/upgrade.js
index 682721e931..dbf1c0f2c3 100644
--- a/source4/scripting/libjs/upgrade.js
+++ b/source4/scripting/libjs/upgrade.js
@@ -101,6 +101,7 @@ samba3RefuseMachinePwdChange: %d
 
 function upgrade_sam_account(acc,domaindn)
 {
+	var ldb = ldb_init();
 	var ldif = sprintf(
 "dn: cn=%s,%s
 objectClass: top
@@ -115,6 +116,8 @@ description: %s
 primaryGroupID: %d
 badPwdcount: %d
 logonCount: %d
+ntPwdHash:: %s
+lmPwdHash:: %s
 samba3Domain: %s
 samba3DirDrive: %s
 samba3MungedDial: %s
@@ -133,9 +136,8 @@ samba3Rid: %d
 acc.fullname, acc.acct_desc, acc.group_rid, acc.bad_password_count, acc.logon_count,
 acc.domain, acc.dir_drive, acc.munged_dial, acc.homedir, acc.logon_script, 
 acc.profile_path, acc.workstations, acc.kickoff_time, acc.bad_password_time, 
-acc.pass_last_set_time, acc.pass_can_change_time, acc.pass_must_change_time, acc.user_rid); 
-
-		/* FIXME: Passwords */
+acc.pass_last_set_time, acc.pass_can_change_time, acc.pass_must_change_time, acc.user_rid,
+	ldb.encode(acc.lm_pw), ldb.encode(acc.nt_pw)); 
 
 	return ldif;
 }
@@ -295,9 +297,6 @@ var keep = new Array(
 	"obey pam restrictions",
 	"password server",
 	"smb passwd file",
-	"sam database",
-	"spoolss database",
-	"wins database",
 	"private dir",
 	"passwd chat",
 	"password level",
@@ -313,17 +312,6 @@ var keep = new Array(
 	"debuglevel",
 	"log file",
 	"smb ports",
-	"nbt port",
-	"dgram port",
-	"cldap port",
-	"krb5 port",
-	"web port",
-	"tls enabled",
-	"tls keyfile",
-	"tls certfile",
-	"tls cafile",
-	"tls crlfile",
-	"swat directory",
 	"large readwrite",
 	"max protocol",
 	"min protocol",
@@ -344,12 +332,10 @@ var keep = new Array(
 	"use spnego",
 	"server signing",
 	"client signing",
-	"rpc big endian",
 	"max connections",
 	"paranoid server security",
 	"socket options",
 	"strict sync",
-	"case insensitive filesystem",
 	"max print jobs",
 	"printable",
 	"print ok",
@@ -375,10 +361,7 @@ var keep = new Array(
 	"lock dir",
 	"lock directory",
 	"pid directory",
-	"js include",
-	"setup directory",
 	"socket address",
-	"-valid",
 	"copy",
 	"include",
 	"available",
@@ -394,6 +377,23 @@ function upgrade_smbconf(samba3)
 	//FIXME
 }
 
+function save_smbconf(path,smbconf)
+{
+	var data = "
+# Generated by upgrade.js";
+
+	for (var i in smbconf.shares) {
+		var s = smbconf.shares[i];
+		data = data + "\n[" + s.name + "]\n";
+		for (var j in s.parameters) {
+			var p = s.parameters[j];
+			data = data + "\t" + p.name + " = " + p + "\n";
+		}
+	}
+	
+	sys.file_save(path,data);
+}
+
 function upgrade(subobj, samba3, message)
 {
 	var samdb = ldb_init();
@@ -405,7 +405,20 @@ function upgrade(subobj, samba3, message)
 	ok = samdb.modify(ldif);
 	assert(ok);
 
-	// FIXME: Enable samba3sam module if original passdb backend was ldap
+	var ldapurl = undefined;
+
+	// FIXME: figure out ldapurl
+
+	// Enable samba3sam module if original passdb backend was ldap
+	if (ldapurl != undefined) {
+		var ldif = sprintf("
+dn: @MAP=samba3sam
+@MAP_URL: %s", ldapurl);
+		samdb.add(ldif);
+
+		samdb.modify("dn: @MODULES
+@LIST: samldb,timestamps,objectguid,rdn_name");
+	}
 
 	message("Importing users\n");
 	for (var i in samba3.samaccounts) {
-- 
cgit 


From 7be4cf8c1ded42daf7e86ecd2c0dbfeeed312b22 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 30 Aug 2005 00:41:02 +0000
Subject: r9770: Couple other bugfixes Update TODO-list (This used to be commit
 d9541535e3f9e1c058410eeb0a54d60181572f2b)

---
 source4/scripting/ejs/smbcalls_ldb.c    |  6 +++++-
 source4/scripting/ejs/smbcalls_samba3.c | 18 ++++++++++++++----
 source4/scripting/libjs/provision.js    |  3 +--
 source4/scripting/libjs/upgrade.js      | 14 ++++++++------
 4 files changed, 28 insertions(+), 13 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_ldb.c b/source4/scripting/ejs/smbcalls_ldb.c
index 662da0d971..aabd43d1ac 100644
--- a/source4/scripting/ejs/smbcalls_ldb.c
+++ b/source4/scripting/ejs/smbcalls_ldb.c
@@ -264,6 +264,7 @@ static int ejs_base64encode(MprVarHandle eid, int argc, struct MprVar **argv)
 	}
 
 	blob = mprToDataBlob(argv[0]);
+	mprAssert(blob);
 	ret = ldb_base64_encode(mprMemCtx(), (char *)blob->data, blob->length);
 
 	if (!ret) {
@@ -297,7 +298,10 @@ static int ejs_base64decode(MprVarHandle eid, int argc, struct MprVar **argv)
 	if (ret == -1) {
 		mpr_Return(eid, mprCreateUndefinedVar());
 	} else {
-		mpr_Return(eid, mprData((uint8_t *)tmp, ret));
+		DATA_BLOB blob;
+		blob.data = (uint8_t *)tmp;
+		blob.length = ret;
+		mpr_Return(eid, mprDataBlob(blob));
 	}
 
 	talloc_free(tmp);
diff --git a/source4/scripting/ejs/smbcalls_samba3.c b/source4/scripting/ejs/smbcalls_samba3.c
index eb37168bc8..936426c2da 100644
--- a/source4/scripting/ejs/smbcalls_samba3.c
+++ b/source4/scripting/ejs/smbcalls_samba3.c
@@ -165,6 +165,7 @@ static struct MprVar mprDomainSecrets(struct samba3_domainsecrets *ds)
 {
 	struct MprVar v, e = mprObject("domainsecrets");
 	char *tmp;
+	DATA_BLOB blob;
 
 	mprSetVar(&e, "name", mprString(ds->name));
 
@@ -183,7 +184,9 @@ static struct MprVar mprDomainSecrets(struct samba3_domainsecrets *ds)
 
 	v = mprObject("hash_pw");
 
-	mprSetVar(&v, "hash", mprData(ds->hash_pw.hash, 16));
+	blob.data = ds->hash_pw.hash;
+	blob.length = 16;
+	mprSetVar(&v, "hash", mprDataBlob(blob));
 
 	mprSetVar(&v, "mod_time", mprCreateIntegerVar(ds->hash_pw.mod_time));
 
@@ -259,9 +262,12 @@ static struct MprVar mprSecrets(struct samba3_secrets *sec)
 		
 		for (j = 0; j < 8; j++) {
 			struct MprVar k = mprObject("entry");
+			DATA_BLOB blob;
 			
 			mprSetVar(&k, "kvno", mprCreateIntegerVar(sec->afs_keyfiles[i].entry[j].kvno));
-			mprSetVar(&k, "key", mprData((uint8_t*)sec->afs_keyfiles[i].entry[j].key, 8));
+			blob.data = (uint8_t*)sec->afs_keyfiles[i].entry[j].key;
+			blob.length = 8;
+			mprSetVar(&k, "key", mprDataBlob(blob));
 
 			mprAddArray(&ks, j, k);
 		}
@@ -316,6 +322,7 @@ static struct MprVar mprSamAccounts(struct samba3 *samba3)
 
 	for (i = 0; i < samba3->samaccount_count; i++) {
 		struct samba3_samaccount *a = &samba3->samaccounts[i];
+		DATA_BLOB blob;
 
 		m = mprObject("samba3_samaccount");
 
@@ -343,8 +350,11 @@ static struct MprVar mprSamAccounts(struct samba3 *samba3)
 		mprSetVar(&m, "profile_path", mprString(a->profile_path));
 		mprSetVar(&m, "acct_desc", mprString(a->acct_desc));
 		mprSetVar(&m, "workstations", mprString(a->workstations));
-		mprSetVar(&m, "lm_pw", mprData(a->lm_pw.hash, 16));
-		mprSetVar(&m, "nt_pw", mprData(a->nt_pw.hash, 16));
+		blob.length = 16;
+		blob.data = a->lm_pw.hash;
+		mprSetVar(&m, "lm_pw", mprDataBlob(blob));
+		blob.data = a->nt_pw.hash;
+		mprSetVar(&m, "nt_pw", mprDataBlob(blob));
 
 		mprAddArray(&mpv, i, m);
 	}
diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index b43d435ca9..9607d6f274 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -164,14 +164,13 @@ function setup_ldb(ldif, dbname, subobj)
 	        erase = arguments[4];
         }
 
-	var dbfile = dbname;
 	var src = lp.get("setup directory") + "/" + ldif;
 
 	var data = sys.file_load(src);
 	data = data + extra;
 	data = substitute_var(data, subobj);
 
-	var ok = ldb.connect(dbfile);
+	var ok = ldb.connect(dbname);
 	assert(ok);
 
 	if (erase) {
diff --git a/source4/scripting/libjs/upgrade.js b/source4/scripting/libjs/upgrade.js
index dbf1c0f2c3..c78afd6a91 100644
--- a/source4/scripting/libjs/upgrade.js
+++ b/source4/scripting/libjs/upgrade.js
@@ -116,8 +116,6 @@ description: %s
 primaryGroupID: %d
 badPwdcount: %d
 logonCount: %d
-ntPwdHash:: %s
-lmPwdHash:: %s
 samba3Domain: %s
 samba3DirDrive: %s
 samba3MungedDial: %s
@@ -131,6 +129,8 @@ samba3PassLastSetTime: %d
 samba3PassCanChangeTime: %d
 samba3PassMustChangeTime: %d
 samba3Rid: %d
+ntPwdHash:: %s
+lmPwdHash:: %s
 
 ", acc.fullname, domaindn, acc.logon_time, acc.logoff_time, acc.username, acc.nt_username, 
 acc.fullname, acc.acct_desc, acc.group_rid, acc.bad_password_count, acc.logon_count,
@@ -422,18 +422,20 @@ dn: @MAP=samba3sam
 
 	message("Importing users\n");
 	for (var i in samba3.samaccounts) {
-		message("... " + samba3.samaccounts[i].username + "\n");
+		message("... " + samba3.samaccounts[i].username);
 		var ldif = upgrade_sam_account(samba3.samaccounts[i],subobj.BASEDN);
 		ok = samdb.add(ldif);
-		assert(ok);
+		if (!ok) { message("... error!"); }
+		message("\n");
 	}
 
 	message("Importing groups\n");
 	for (var i in samba3.groupmappings) {
-		message("... " + samba3.groupmappings[i].nt_name + "\n");
+		message("... " + samba3.groupmappings[i].nt_name);
 		var ldif = upgrade_sam_group(samba3.groupmappings[i],subobj.BASEDN);
 		ok = samdb.add(ldif);
-		assert(ok);
+		if (!ok) { message("... error!"); }
+		message("\n");
 	}
 
 	message("Importing registry data\n");
-- 
cgit 


From 6cf1b0c07c819e9e2afdcb87b2e4fd31ed680b72 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 30 Aug 2005 12:27:53 +0000
Subject: r9793: Be more verbose, check for errors in upgrade script. (This
 used to be commit b7c09df9e506f8048f69c4bdd1c3351e3b554e18)

---
 source4/scripting/libjs/upgrade.js | 32 +++++++++++++++++++++++---------
 1 file changed, 23 insertions(+), 9 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/upgrade.js b/source4/scripting/libjs/upgrade.js
index c78afd6a91..c6a65e01c0 100644
--- a/source4/scripting/libjs/upgrade.js
+++ b/source4/scripting/libjs/upgrade.js
@@ -34,8 +34,7 @@ function upgrade_registry(regdb,prefix)
 {
 	assert(regdb != undefined);
 	var prefix_up = strupper(prefix);
-
-	var ldif = "";
+	var ldif = new Array();
 
 	for (var i in regdb.keys) {
 		var rk = regdb.keys[i];
@@ -51,7 +50,7 @@ function upgrade_registry(regdb,prefix)
 		var pts = split("/", rk.name);
 
 		/* Convert key name to dn */
-		ldif = ldif + sprintf("
+		ldif[rk.name] = sprintf("
 dn: %s
 name: %s
 
@@ -60,7 +59,7 @@ name: %s
 		for (var j in rk.values) {
 			var rv = rk.values[j];
 
-			ldif = ldif + sprintf("
+			ldif[rk.name + " (" + rv.name + ")"] = sprintf("
 dn: %s,value=%s
 value: %s
 type: %d
@@ -396,6 +395,7 @@ function save_smbconf(path,smbconf)
 
 function upgrade(subobj, samba3, message)
 {
+	var ret = 0;
 	var samdb = ldb_init();
 	var ok = samdb.connect("sam.ldb");
 	assert(ok);
@@ -425,7 +425,10 @@ dn: @MAP=samba3sam
 		message("... " + samba3.samaccounts[i].username);
 		var ldif = upgrade_sam_account(samba3.samaccounts[i],subobj.BASEDN);
 		ok = samdb.add(ldif);
-		if (!ok) { message("... error!"); }
+		if (!ok) { 
+			message("... error: " + samdb.errstring()); 
+			ret = ret + 1; 
+		}
 		message("\n");
 	}
 
@@ -434,7 +437,10 @@ dn: @MAP=samba3sam
 		message("... " + samba3.groupmappings[i].nt_name);
 		var ldif = upgrade_sam_group(samba3.groupmappings[i],subobj.BASEDN);
 		ok = samdb.add(ldif);
-		if (!ok) { message("... error!"); }
+		if (!ok) { 
+			message("... error: " + samdb.errstring()); 
+			ret = ret + 1; 
+		}
 		message("\n");
 	}
 
@@ -446,18 +452,26 @@ dn: @MAP=samba3sam
 		ok = regdb.connect(hives[i] + ".ldb");
 		assert(ok);
 		var ldif = upgrade_registry(samba3.registry, hives[i]);
-		ok = regdb.add(ldif);
-		assert(ok);
+		for (var j in ldif) {
+			message("... ... " + j);
+			ok = regdb.add(ldif[j]);
+			if (!ok) { 
+				message("... error: " + regdb.errstring()); 
+				ret = ret + 1; 
+			}
+			message("\n");
+		}
 	}
 
 	message("Importing WINS data\n");
 	var winsdb = ldb_init();
 	ok = winsdb.connect("wins.ldb");
 	assert(ok);
+	ldb_erase(winsdb);
 
 	var ldif = upgrade_wins(samba3);
 	ok = winsdb.add(ldif);
 	assert(ok);
 
-	return ok;
+	return ret;
 }
-- 
cgit 


From a3a7881d39d0c294d0cd2ce13203478fb889b07c Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 30 Aug 2005 13:58:48 +0000
Subject: r9798: Add generic functions for handling smb.conf files (the
 parameters don't to be pre-declared). Also doesn't use any globals, so
 multiple files can be loaded at once.

Currently uses the prefix "param" for all functions and structures; suggestions for better ones are welcome...

Remove old smb.conf-parsing code from libsamba3.
(This used to be commit 414e5f7f6dc38a8fde3b61d524a664f56f9ea592)
---
 source4/scripting/ejs/smbcalls_samba3.c | 43 +++------------------------------
 1 file changed, 3 insertions(+), 40 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_samba3.c b/source4/scripting/ejs/smbcalls_samba3.c
index 936426c2da..e8e6b416e2 100644
--- a/source4/scripting/ejs/smbcalls_samba3.c
+++ b/source4/scripting/ejs/smbcalls_samba3.c
@@ -288,8 +288,8 @@ static struct MprVar mprSecrets(struct samba3_secrets *sec)
 
 static struct MprVar mprShares(struct samba3 *samba3)
 {
-	struct MprVar mpv = mprObject("array"), s, ps, p;
-	int i, j;
+	struct MprVar mpv = mprObject("array"), s;
+	int i;
 
 	for (i = 0; i < samba3->share_count; i++) {
 		s = mprObject("share");
@@ -298,18 +298,7 @@ static struct MprVar mprShares(struct samba3 *samba3)
 
 		/* FIXME: secdesc */
 
-		ps = mprObject("array");
-
-		for (j = 0; j < samba3->shares[i].parameter_count; j++) {
-			p = mprObject("parameter");
-
-			mprSetVar(&p, "name", mprString(samba3->shares[i].parameters[j].name));
-			mprSetVar(&p, "value", mprString(samba3->shares[i].parameters[j].value));
-
-			mprAddArray(&ps, j, p);
-		}
-
-		mprSetVar(&s, "parameters", ps);
+		mprAddArray(&mpv, i, s);
 	}
 
 	return mpv;
@@ -389,29 +378,6 @@ static struct MprVar mprWinsEntries(struct samba3 *samba3)
 	return mpv;
 }
 
-static int ejs_get_param(MprVarHandle eid, int argc, struct MprVar **argv)
-{
-	struct samba3 *samba3;
-	const char *tmp;
-
-	if (argc < 2) {
-		ejsSetErrorMsg(eid, "get_param invalid arguments");
-		return -1;
-	}
-
-	samba3 = mprGetThisPtr(eid, "samba3");
-	mprAssert(samba3);
-	tmp = samba3_get_param(samba3, mprToString(argv[0]), mprToString(argv[1]));
-
-	if (tmp == NULL) {
-		mpr_Return(eid, mprCreateUndefinedVar());
-	} else {
-		mpr_Return(eid, mprString(tmp));
-	}
-
-	return 0;
-}
-
 static int ejs_find_domainsecrets(MprVarHandle eid, int argc, struct MprVar **argv)
 {
 	struct samba3 *samba3 = NULL;
@@ -435,8 +401,6 @@ static int ejs_find_domainsecrets(MprVarHandle eid, int argc, struct MprVar **ar
 	return 0;
 }
 
-
-
 /*
   initialise samba3 ejs subsystem
 */
@@ -470,7 +434,6 @@ static int ejs_samba3_read(MprVarHandle eid, int argc, struct MprVar **argv)
 	mprSetVar(&mpv, "idmapdb", mprIdmapDb(&samba3->idmap));
 	mprSetVar(&mpv, "policy", mprPolicy(&samba3->policy));
 	mprSetVar(&mpv, "registry", mprRegistry(&samba3->registry));
-	mprSetCFunction(&mpv, "get_param", ejs_get_param);
 	mprSetCFunction(&mpv, "find_domainsecrets", ejs_find_domainsecrets);
 
 	mpr_Return(eid, mpv);
-- 
cgit 


From 9f4b32996c1c97122b198a13216c35ad40f6ea2d Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 30 Aug 2005 14:44:33 +0000
Subject: r9800: Add EJS interface to param. tridge, sorry this overlaps a bit
 with your loadparm interface. :-/ (This used to be commit
 bb0cef581a09a86113f3212c776c011ae73def14)

---
 source4/scripting/ejs/config.mk         |   1 +
 source4/scripting/ejs/smbcalls.c        |   1 +
 source4/scripting/ejs/smbcalls_param.c  | 207 ++++++++++++++++++++++++++++++++
 source4/scripting/ejs/smbcalls_samba3.c |   5 +-
 source4/scripting/libjs/upgrade.js      |   6 +-
 5 files changed, 216 insertions(+), 4 deletions(-)
 create mode 100644 source4/scripting/ejs/smbcalls_param.c

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/config.mk b/source4/scripting/ejs/config.mk
index e5711f1424..b997a656ab 100644
--- a/source4/scripting/ejs/config.mk
+++ b/source4/scripting/ejs/config.mk
@@ -27,6 +27,7 @@ OBJ_FILES = \
 		scripting/ejs/smbcalls_sys.o \
 		scripting/ejs/smbcalls_creds.o \
 		scripting/ejs/smbcalls_samba3.o \
+		scripting/ejs/smbcalls_param.o \
 		scripting/ejs/mprutil.o
 REQUIRED_SUBSYSTEMS = AUTH EJS LIBBASIC EJSRPC MESSAGING LIBSAMBA3
 # End SUBSYSTEM SMBCALLS
diff --git a/source4/scripting/ejs/smbcalls.c b/source4/scripting/ejs/smbcalls.c
index a73fbe52c3..d0ce1366a5 100644
--- a/source4/scripting/ejs/smbcalls.c
+++ b/source4/scripting/ejs/smbcalls.c
@@ -129,6 +129,7 @@ void smb_setup_ejs_functions(void)
 	smb_setup_ejs_system();
 	smb_setup_ejs_credentials();
 	smb_setup_ejs_samba3();
+	smb_setup_ejs_param();
 	smb_setup_ejs_datablob();
 
 	ejsDefineCFunction(-1, "typeof", ejs_typeof, NULL, MPR_VAR_SCRIPT_HANDLE);
diff --git a/source4/scripting/ejs/smbcalls_param.c b/source4/scripting/ejs/smbcalls_param.c
new file mode 100644
index 0000000000..e5553cac0b
--- /dev/null
+++ b/source4/scripting/ejs/smbcalls_param.c
@@ -0,0 +1,207 @@
+/* 
+   Unix SMB/CIFS implementation.
+
+   provide hooks into smbd C calls from ejs scripts
+
+   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 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.
+*/
+
+#include "includes.h"
+#include "scripting/ejs/smbcalls.h"
+#include "lib/appweb/ejs/ejs.h"
+#include "param/generic.h"
+#include "dynconfig.h"
+
+/*
+  get parameter
+
+  value = param.get("name");
+  value = param.get("section", "name");
+*/
+static int ejs_param_get(MprVarHandle eid, int argc, char **argv)
+{
+	struct param_context *ctx;
+	const char *ret;
+	if (argc != 1 && argc != 2) {
+		ejsSetErrorMsg(eid, "param.get invalid argument count");
+		return -1;
+	}
+
+	ctx = mprGetThisPtr(eid, "param");
+	mprAssert(ctx);
+	
+	if (argc == 2) {
+		ret = param_get_string(ctx, argv[0], argv[1]);
+	} else {
+		ret = param_get_string(ctx, NULL, argv[0]);
+	}
+
+	if (ret) {
+		mpr_Return(eid, mprString(ret));
+	} else {
+		mpr_Return(eid, mprCreateUndefinedVar());
+	}
+	return 0;
+}
+
+/*
+  get list parameter
+
+  ok = param.get_list("name");
+  ok = param.get_list("section", "name");
+*/
+static int ejs_param_get_list(MprVarHandle eid, int argc, char **argv)
+{
+	struct param_context *ctx;
+	const char **ret;
+
+	if (argc != 1 && argc != 2) {
+		ejsSetErrorMsg(eid, "param.get invalid argument count");
+		return -1;
+	}
+
+	ctx = mprGetThisPtr(eid, "param");
+	mprAssert(ctx);
+	
+	if (argc == 2) {
+		ret = param_get_string_list(ctx, argv[0], argv[1], NULL);
+	} else {
+		ret = param_get_string_list(ctx, NULL, argv[0], NULL);
+	}
+
+	if (ret) {
+		mpr_Return(eid, mprList("array", ret));
+	} else {
+		mpr_Return(eid, mprCreateUndefinedVar());
+	}
+	return 0;
+}
+
+/*
+  set parameter
+
+  ok = param.set("name", "value");
+  ok = param.set("section", "name", "value");
+*/
+static int ejs_param_set(MprVarHandle eid, int argc, char **argv)
+{
+	struct param_context *ctx;
+	bool ret;
+	if (argc != 2 && argc != 3) {
+		ejsSetErrorMsg(eid, "param.set invalid argument count");
+		return -1;
+	}
+
+	ctx = mprGetThisPtr(eid, "param");
+	mprAssert(ctx);
+	
+	if (argc == 3) {
+		ret = param_set_string(ctx, argv[0], argv[1], argv[2]);
+	} else {
+		ret = param_set_string(ctx, NULL, argv[0], argv[2]);
+	}
+
+	mpr_Return(eid, mprCreateBoolVar(ret));
+	return 0;
+}
+
+/*
+  load file
+  
+  ok = param.load(file);
+*/
+static int ejs_param_load(MprVarHandle eid, int argc, char **argv)
+{
+	struct param_context *ctx;
+	bool ret;
+
+	if (argc != 1) {
+		ejsSetErrorMsg(eid, "param.load invalid argument count");
+		return -1;
+	}
+
+	ctx = mprGetThisPtr(eid, "param");
+	mprAssert(ctx);
+
+	ret = param_read(ctx, argv[0]);
+	
+	mpr_Return(eid, mprCreateBoolVar(ret));
+	return 0;
+}
+
+/*
+  save file
+  
+  ok = param.save(file);
+*/
+static int ejs_param_save(MprVarHandle eid, int argc, char **argv)
+{
+	struct param_context *ctx;
+	bool ret;
+
+	if (argc != 1) {
+		ejsSetErrorMsg(eid, "param.save invalid argument count");
+		return -1;
+	}
+
+	ctx = mprGetThisPtr(eid, "param");
+	mprAssert(ctx);
+
+	ret = param_write(ctx, argv[0]);
+	
+	mpr_Return(eid, mprCreateBoolVar(ret));
+	return 0;
+}
+
+static void param_add_members(struct MprVar *obj)
+{
+	mprSetStringCFunction(obj, "get", ejs_param_get);
+	mprSetStringCFunction(obj, "get_list", ejs_param_get_list);
+	mprSetStringCFunction(obj, "set", ejs_param_set);
+	mprSetStringCFunction(obj, "load", ejs_param_load);
+	mprSetStringCFunction(obj, "save", ejs_param_save);
+}
+
+/*
+  initialise param ejs subsystem
+*/
+static int ejs_param_init(MprVarHandle eid, int argc, struct MprVar **argv)
+{
+	struct MprVar *obj = mprInitObject(eid, "param", argc, argv);
+
+	mprSetPtrChild(obj, "param", param_init(mprMemCtx()));
+
+	param_add_members(obj);
+
+	return 0;
+}
+
+struct MprVar mprParam(struct param_context *ctx)
+{
+	struct MprVar mpv = mprObject("param");
+	mprSetPtrChild(&mpv, "param", ctx);
+	param_add_members(&mpv);
+	return mpv;
+}
+
+/*
+  setup C functions that be called from ejs
+*/
+void smb_setup_ejs_param(void)
+{
+	ejsDefineCFunction(-1, "param_init", ejs_param_init, NULL, MPR_VAR_SCRIPT_HANDLE);
+}
diff --git a/source4/scripting/ejs/smbcalls_samba3.c b/source4/scripting/ejs/smbcalls_samba3.c
index e8e6b416e2..0d54d54dcc 100644
--- a/source4/scripting/ejs/smbcalls_samba3.c
+++ b/source4/scripting/ejs/smbcalls_samba3.c
@@ -403,6 +403,8 @@ static int ejs_find_domainsecrets(MprVarHandle eid, int argc, struct MprVar **ar
 
 /*
   initialise samba3 ejs subsystem
+
+  samba3 = samba3_read(libdir,smbconf)
 */
 static int ejs_samba3_read(MprVarHandle eid, int argc, struct MprVar **argv)
 {
@@ -415,7 +417,7 @@ static int ejs_samba3_read(MprVarHandle eid, int argc, struct MprVar **argv)
 		return -1;
 	}
 
-	status = samba3_read(mprToString(argv[0]), mprToString(argv[0]), mprMemCtx(), &samba3);
+	status = samba3_read(mprToString(argv[0]), mprToString(argv[1]), mprMemCtx(), &samba3);
 
 	if (NT_STATUS_IS_ERR(status)) {
 		ejsSetErrorMsg(eid, "samba3_read: error");
@@ -434,6 +436,7 @@ static int ejs_samba3_read(MprVarHandle eid, int argc, struct MprVar **argv)
 	mprSetVar(&mpv, "idmapdb", mprIdmapDb(&samba3->idmap));
 	mprSetVar(&mpv, "policy", mprPolicy(&samba3->policy));
 	mprSetVar(&mpv, "registry", mprRegistry(&samba3->registry));
+	mprSetVar(&mpv, "configuration", mprParam(samba3->configuration));
 	mprSetCFunction(&mpv, "find_domainsecrets", ejs_find_domainsecrets);
 
 	mpr_Return(eid, mpv);
diff --git a/source4/scripting/libjs/upgrade.js b/source4/scripting/libjs/upgrade.js
index c6a65e01c0..aa94dbbbc4 100644
--- a/source4/scripting/libjs/upgrade.js
+++ b/source4/scripting/libjs/upgrade.js
@@ -210,8 +210,8 @@ function upgrade_provision(samba3)
 	var lp = loadparm_init();
 	var rdn_list;
 
-	var domainname = samba3.get_param("global", "workgroup");
-
+	var domainname = samba3.configuration.get("workgroup");
+	
 	if (domainname == undefined) {
 		domainname = samba3.secrets.domains[0].name;
 		println("No domain specified in smb.conf file, assuming '" + domainname + "'");
@@ -219,7 +219,7 @@ function upgrade_provision(samba3)
 	
 	var domsec = samba3.find_domainsecrets(domainname);
 	var hostsec = samba3.find_domainsecrets(hostname());
-	var realm = samba3.get_param("global", "realm");
+	var realm = samba3.configuration.get("realm");
 
 	if (realm == undefined) {
 		realm = domainname;
-- 
cgit 


From cf016f972b931b54c155ca8e6df485e05c37b034 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 30 Aug 2005 16:09:38 +0000
Subject: r9805: Add 'data' property to param EJS object Write out new smb.conf
 file. Parameters that have disappeared between Samba 3 and 4 will optionally
 be prefixed with 'samba3:' (This used to be commit
 27eefbd9059fe0a3daca15a71da7b4cb88ed22ec)

---
 source4/scripting/ejs/smbcalls_param.c | 62 +++++++++++++++++++++++++++++--
 source4/scripting/libjs/upgrade.js     | 68 ++++++++++++++++++++++++----------
 2 files changed, 107 insertions(+), 23 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_param.c b/source4/scripting/ejs/smbcalls_param.c
index e5553cac0b..ddd2b44c82 100644
--- a/source4/scripting/ejs/smbcalls_param.c
+++ b/source4/scripting/ejs/smbcalls_param.c
@@ -97,9 +97,12 @@ static int ejs_param_get_list(MprVarHandle eid, int argc, char **argv)
   ok = param.set("name", "value");
   ok = param.set("section", "name", "value");
 */
-static int ejs_param_set(MprVarHandle eid, int argc, char **argv)
+static int ejs_param_set(MprVarHandle eid, int argc, struct MprVar **argv)
 {
 	struct param_context *ctx;
+	const char **list;
+	const char *section, *paramname;
+	struct MprVar *value;
 	bool ret;
 	if (argc != 2 && argc != 3) {
 		ejsSetErrorMsg(eid, "param.set invalid argument count");
@@ -108,17 +111,66 @@ static int ejs_param_set(MprVarHandle eid, int argc, char **argv)
 
 	ctx = mprGetThisPtr(eid, "param");
 	mprAssert(ctx);
+
 	
 	if (argc == 3) {
-		ret = param_set_string(ctx, argv[0], argv[1], argv[2]);
+		section = mprToString(argv[0]);
+		paramname = mprToString(argv[1]);
+		value = argv[2];
+	} else {
+		section = NULL;
+		paramname = mprToString(argv[0]);
+		value = argv[1];
+	}
+	
+	list = mprToList(mprMemCtx(), value);
+	if (list) {
+		ret = param_set_string_list(ctx, section, paramname, list);
 	} else {
-		ret = param_set_string(ctx, NULL, argv[0], argv[2]);
+		ret = param_set_string(ctx, section, paramname, mprToString(value));
 	}
 
 	mpr_Return(eid, mprCreateBoolVar(ret));
 	return 0;
 }
 
+/* 
+  param data as a two-level array
+
+  data = param.data;
+  */
+static int ejs_param_data(MprVarHandle eid, int argc, char **argv)
+{
+	struct param_context *ctx;
+	struct MprVar ret;
+	struct param_section *sec;
+
+	if (argc != 0) {
+		ejsSetErrorMsg(eid, "param.data does not take arguments");
+		return -1;
+	}
+
+	ctx = mprGetThisPtr(eid, "param");
+	mprAssert(ctx);
+
+	ret = mprObject("array");
+
+	for (sec = ctx->sections; sec; sec = sec->next) {
+		struct MprVar ps = mprObject("array");
+		struct param *p;
+
+		for (p = sec->parameters; p; p = p->next) {
+			mprSetVar(&ps, p->name, mprString(p->value));
+		}
+		
+		mprSetVar(&ret, sec->name, ps);
+	}
+
+	mpr_Return(eid, ret);
+	
+	return 0;
+}
+
 /*
   load file
   
@@ -143,6 +195,7 @@ static int ejs_param_load(MprVarHandle eid, int argc, char **argv)
 	return 0;
 }
 
+
 /*
   save file
   
@@ -171,9 +224,10 @@ static void param_add_members(struct MprVar *obj)
 {
 	mprSetStringCFunction(obj, "get", ejs_param_get);
 	mprSetStringCFunction(obj, "get_list", ejs_param_get_list);
-	mprSetStringCFunction(obj, "set", ejs_param_set);
+	mprSetCFunction(obj, "set", ejs_param_set);
 	mprSetStringCFunction(obj, "load", ejs_param_load);
 	mprSetStringCFunction(obj, "save", ejs_param_save);
+	mprSetStringCFunction(obj, "data", ejs_param_data);
 }
 
 /*
diff --git a/source4/scripting/libjs/upgrade.js b/source4/scripting/libjs/upgrade.js
index aa94dbbbc4..0e12d7c345 100644
--- a/source4/scripting/libjs/upgrade.js
+++ b/source4/scripting/libjs/upgrade.js
@@ -274,7 +274,7 @@ function upgrade_provision(samba3)
 	return subobj;
 }
 
-var keep = new Array(
+smbconf_keep = new Array(
 	"dos charset", 
 	"unix charset",
 	"display charset",
@@ -371,43 +371,70 @@ var keep = new Array(
 	"host msdfs",
 	"winbind separator");
 
-function upgrade_smbconf(samba3)
+/*
+   Remove configuration variables not present in Samba4
+	oldconf: Old configuration structure
+	mark: Whether removed configuration variables should be 
+		kept in the new configuration as "samba3:<name>"
+ */
+function upgrade_smbconf(oldconf,mark)
 {
-	//FIXME
-}
+	var data = oldconf.data();
+	var newconf = param_init();
+
+	for (var s in data) {
+		for (var p in data[s]) {
+			var keep = false;
+			for (var k in smbconf_keep) { 
+				if (smbconf_keep[k] == p) {
+					keep = true;
+					break;
+				}
+			}
 
-function save_smbconf(path,smbconf)
-{
-	var data = "
-# Generated by upgrade.js";
-
-	for (var i in smbconf.shares) {
-		var s = smbconf.shares[i];
-		data = data + "\n[" + s.name + "]\n";
-		for (var j in s.parameters) {
-			var p = s.parameters[j];
-			data = data + "\t" + p.name + " = " + p + "\n";
+			if (keep) {
+				newconf.set(s, p, oldconf.get(s, p));
+			} else if (mark) {
+				newconf.set(s, "samba3:"+p, oldconf.get(s,p));
+			}
 		}
 	}
-	
-	sys.file_save(path,data);
+
+	return newconf;
 }
 
 function upgrade(subobj, samba3, message)
 {
 	var ret = 0;
+	var lp = loadparm_init();
 	var samdb = ldb_init();
 	var ok = samdb.connect("sam.ldb");
 	assert(ok);
 
+	message("Writing configuration\n");
+	var newconf = upgrade_smbconf(samba3.configuration,true);
+	newconf.save(lp.get("config file"));
+
 	message("Importing account policies\n");
 	var ldif = upgrade_sam_policy(samba3,subobj.BASEDN);
 	ok = samdb.modify(ldif);
 	assert(ok);
 
+	// figure out ldapurl, if applicable
 	var ldapurl = undefined;
+	var pdb = samba3.configuration.get_list("passdb backends");
+	if (pdb != undefined) {
+		for (var b in pdb) {
+			if (substr(pdb[b], 0, 7) == "ldapsam") {
+				ldapurl = substr(pdb[b], 8);
+			}
+		}
+	}
 
-	// FIXME: figure out ldapurl
+	// URL was not specified in passdb backend but ldap /is/ used
+	if (ldapurl == "") {
+		ldapurl = "ldap://" + samba3.configuration.get("ldap server");
+	}
 
 	// Enable samba3sam module if original passdb backend was ldap
 	if (ldapurl != undefined) {
@@ -417,7 +444,7 @@ dn: @MAP=samba3sam
 		samdb.add(ldif);
 
 		samdb.modify("dn: @MODULES
-@LIST: samldb,timestamps,objectguid,rdn_name");
+@LIST: samldb,timestamps,objectguid,rdn_name,samba3sam");
 	}
 
 	message("Importing users\n");
@@ -473,5 +500,8 @@ dn: @MAP=samba3sam
 	ok = winsdb.add(ldif);
 	assert(ok);
 
+	message("Reloading smb.conf\n");
+	lp.reload();
+
 	return ret;
 }
-- 
cgit 


From 40f85ace04abad7460d0f0afe9211c4280482c6c Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 30 Aug 2005 22:38:34 +0000
Subject: r9813: Conver testsuite for samba3sam module to EJS (This used to be
 commit 77f24ed131bf57c30bb500e1d8d387bd4b403ddc)

---
 source4/scripting/ejs/smbcalls_sys.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_sys.c b/source4/scripting/ejs/smbcalls_sys.c
index 3f1f4b0734..f32605c3d5 100644
--- a/source4/scripting/ejs/smbcalls_sys.c
+++ b/source4/scripting/ejs/smbcalls_sys.c
@@ -137,7 +137,7 @@ static int ejs_sys_httptime(MprVarHandle eid, int argc, struct MprVar **argv)
 
 /*
   unlink a file
-   ok = unlink(fname);
+   ok = sys.unlink(fname);
 */
 static int ejs_sys_unlink(MprVarHandle eid, int argc, char **argv)
 {
@@ -154,7 +154,7 @@ static int ejs_sys_unlink(MprVarHandle eid, int argc, char **argv)
 /*
   load a file as a string
   usage:
-     string = sys_file_load(filename);
+     string = sys.file_load(filename);
 */
 static int ejs_sys_file_load(MprVarHandle eid, int argc, char **argv)
 {
@@ -173,7 +173,7 @@ static int ejs_sys_file_load(MprVarHandle eid, int argc, char **argv)
 /*
   save a file from a string
   usage:
-     ok = sys_file_save(filename, str);
+     ok = sys.file_save(filename, str);
 */
 static int ejs_sys_file_save(MprVarHandle eid, int argc, char **argv)
 {
-- 
cgit 


From f58a74aabab3d5c0d1185ac2f77a5f54feb781e9 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Wed, 31 Aug 2005 02:39:57 +0000
Subject: r9816: Work on testsuite for upgrade Add 'paths' object to provision
 code. (This used to be commit 488d737fb0ebbc2535d0ec17c14f0dc1eaf2a578)

---
 source4/scripting/libjs/provision.js | 44 +++++++++++++++++++++++++-----------
 source4/scripting/libjs/upgrade.js   | 18 +++++++--------
 2 files changed, 39 insertions(+), 23 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index 9607d6f274..ef99dc43c5 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -199,16 +199,34 @@ function setup_file(template, fname, subobj)
 	assert(ok);
 }
 
+function provision_default_paths(subobj)
+{
+	var lp = loadparm_init();
+	var paths = new Object();
+	paths.smbconf = lp.get("config file");
+	paths.hklm = "hklm.ldb";
+	paths.hkcu = "hkcu.ldb";
+	paths.hkcr = "hkcr.ldb";
+	paths.hku = "hku.ldb";
+	paths.hkpd = "hkpd.ldb";
+	paths.hkpt = "hkpt.ldb";
+	paths.samdb = "sam.ldb";
+	paths.rootdse = "rootdse.ldb";
+	paths.secrets = "secrets.ldb";
+	paths.dns = lp.get("private dir") + "/" + subobj.DNSDOMAIN + ".zone";
+	paths.winsdb = "wins.ldb";
+	return paths;
+}
+
 /*
   provision samba4 - caution, this wipes all existing data!
 */
-function provision(subobj, message, blank)
+function provision(subobj, message, blank, paths)
 {
 	var data = "";
 	var lp = loadparm_init();
 	var sys = sys_init();
-	var smbconf = lp.get("config file");
-
+	
 	/*
 	  some options need to be upper/lower case
 	*/
@@ -228,31 +246,31 @@ function provision(subobj, message, blank)
 	provision_next_usn = 1;
 
 	/* only install a new smb.conf if there isn't one there already */
-	var st = sys.stat(smbconf);
+	var st = sys.stat(paths.smbconf);
 	if (st == undefined) {
 		message("Setting up smb.conf\n");
-		setup_file("provision.smb.conf", smbconf, subobj);
+		setup_file("provision.smb.conf", paths.smbconf, subobj);
 		lp.reload();
 	}
 	message("Setting up hklm.ldb\n");
-	setup_ldb("hklm.ldif", "hklm.ldb", subobj);
+	setup_ldb("hklm.ldif", paths.hklm, subobj);
 	message("Setting up sam.ldb attributes\n");
-	setup_ldb("provision_init.ldif", "sam.ldb", subobj);
+	setup_ldb("provision_init.ldif", paths.samdb, subobj);
 	message("Setting up sam.ldb templates\n");
-	setup_ldb("provision_templates.ldif", "sam.ldb", subobj, NULL, false);
+	setup_ldb("provision_templates.ldif", paths.samdb, subobj, NULL, false);
 	message("Setting up sam.ldb data\n");
-	setup_ldb("provision.ldif", "sam.ldb", subobj, NULL, false);
+	setup_ldb("provision.ldif", paths.samdb, subobj, NULL, false);
 	if (blank == false) {
 		message("Setting up sam.ldb users and groups\n");
-		setup_ldb("provision_users.ldif", "sam.ldb", subobj, data, false);
+		setup_ldb("provision_users.ldif", paths.samdb, subobj, data, false);
 	}
 	message("Setting up rootdse.ldb\n");
-	setup_ldb("rootdse.ldif", "rootdse.ldb", subobj);
+	setup_ldb("rootdse.ldif", paths.rootdse, subobj);
 	message("Setting up secrets.ldb\n");
-	setup_ldb("secrets.ldif", "secrets.ldb", subobj);
+	setup_ldb("secrets.ldif", paths.secrets, subobj);
 	message("Setting up DNS zone file\n");
 	setup_file("provision.zone", 
-		   lp.get("private dir") + "/" + subobj.DNSDOMAIN + ".zone", 
+		   paths.dns, 
 		   subobj);
 }
 
diff --git a/source4/scripting/libjs/upgrade.js b/source4/scripting/libjs/upgrade.js
index 0e12d7c345..4fe6b8cc1e 100644
--- a/source4/scripting/libjs/upgrade.js
+++ b/source4/scripting/libjs/upgrade.js
@@ -403,17 +403,17 @@ function upgrade_smbconf(oldconf,mark)
 	return newconf;
 }
 
-function upgrade(subobj, samba3, message)
+function upgrade(subobj, samba3, message, paths)
 {
 	var ret = 0;
 	var lp = loadparm_init();
 	var samdb = ldb_init();
-	var ok = samdb.connect("sam.ldb");
+	var ok = samdb.connect(paths.samdb);
 	assert(ok);
 
 	message("Writing configuration\n");
 	var newconf = upgrade_smbconf(samba3.configuration,true);
-	newconf.save(lp.get("config file"));
+	newconf.save(paths.smbconf);
 
 	message("Importing account policies\n");
 	var ldif = upgrade_sam_policy(samba3,subobj.BASEDN);
@@ -474,11 +474,12 @@ dn: @MAP=samba3sam
 	message("Importing registry data\n");
 	var hives = new Array("hkcr","hkcu","hklm","hkpd","hku","hkpt"); 
 	for (var i in hives) {
-		message("... " + hives[i] + "\n");
+		var hn = hives[i];
+		message("... " + hn + "\n");
 		var regdb = ldb_init();
-		ok = regdb.connect(hives[i] + ".ldb");
+		ok = regdb.connect(paths[hn]);
 		assert(ok);
-		var ldif = upgrade_registry(samba3.registry, hives[i]);
+		var ldif = upgrade_registry(samba3.registry, hn);
 		for (var j in ldif) {
 			message("... ... " + j);
 			ok = regdb.add(ldif[j]);
@@ -492,7 +493,7 @@ dn: @MAP=samba3sam
 
 	message("Importing WINS data\n");
 	var winsdb = ldb_init();
-	ok = winsdb.connect("wins.ldb");
+	ok = winsdb.connect(paths.winsdb);
 	assert(ok);
 	ldb_erase(winsdb);
 
@@ -500,8 +501,5 @@ dn: @MAP=samba3sam
 	ok = winsdb.add(ldif);
 	assert(ok);
 
-	message("Reloading smb.conf\n");
-	lp.reload();
-
 	return ret;
 }
-- 
cgit 


From 06db5396966819b3124034d25d814cc0843bd6e9 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Wed, 31 Aug 2005 14:25:18 +0000
Subject: r9825: Correctly handle length argument to substr() (This used to be
 commit edf380cb5fa2c168fc05dd54580f024239ef835f)

---
 source4/scripting/ejs/smbcalls_string.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_string.c b/source4/scripting/ejs/smbcalls_string.c
index e127cdf8af..66e2210ea8 100644
--- a/source4/scripting/ejs/smbcalls_string.c
+++ b/source4/scripting/ejs/smbcalls_string.c
@@ -155,6 +155,7 @@ static int ejs_substr(MprVarHandle eid, int argc, struct MprVar **argv)
 
 	orig = mprToString(argv[0]);
 	start_offset = mprToInt(argv[1]);
+	length = strlen(orig);
 	if (start_offset < 0) start_offset += strlen(orig);
 	if (start_offset < 0 || start_offset > strlen(orig)) {
 		ejsSetErrorMsg(eid, "substr arg 2 out of bounds");
@@ -162,14 +163,12 @@ static int ejs_substr(MprVarHandle eid, int argc, struct MprVar **argv)
 	}
 
 	if (argc == 3) {
-		length = mprToInt(argv[1]);
+		length = mprToInt(argv[2]);
 		if (length < 0) length += strlen(orig) - start_offset;
 		if (length < 0 || length+start_offset > strlen(orig)) {
 			ejsSetErrorMsg(eid, "substr arg 3 out of bounds");
 			return -1;
 		}
-	} else {
-		length = strlen(orig);
 	}
 
 	target = talloc_strndup(mprMemCtx(), orig+start_offset, length);
-- 
cgit 


From adf31c5042497cbdf10d3542672bf8a5d0956216 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Wed, 31 Aug 2005 14:26:20 +0000
Subject: r9826: Add some more OOM checks (This used to be commit
 213bcb7e16290da0c26492ced65509a63942d4ce)

---
 source4/scripting/ejs/smbcalls_param.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_param.c b/source4/scripting/ejs/smbcalls_param.c
index ddd2b44c82..578df1b087 100644
--- a/source4/scripting/ejs/smbcalls_param.c
+++ b/source4/scripting/ejs/smbcalls_param.c
@@ -70,7 +70,7 @@ static int ejs_param_get_list(MprVarHandle eid, int argc, char **argv)
 	const char **ret;
 
 	if (argc != 1 && argc != 2) {
-		ejsSetErrorMsg(eid, "param.get invalid argument count");
+		ejsSetErrorMsg(eid, "param.get_list invalid argument count");
 		return -1;
 	}
 
@@ -83,7 +83,7 @@ static int ejs_param_get_list(MprVarHandle eid, int argc, char **argv)
 		ret = param_get_string_list(ctx, NULL, argv[0], NULL);
 	}
 
-	if (ret) {
+	if (ret != NULL) {
 		mpr_Return(eid, mprList("array", ret));
 	} else {
 		mpr_Return(eid, mprCreateUndefinedVar());
-- 
cgit 


From d991196655a5102275736a32bf4861ae193a3761 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Wed, 31 Aug 2005 14:27:17 +0000
Subject: r9827: Convert 'passdb backend' rather then 'passdb backends' Be a
 bit more verbose (This used to be commit
 fb2fd8da10b281b2064d4cae5d5a0630e8a207da)

---
 source4/scripting/libjs/upgrade.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/upgrade.js b/source4/scripting/libjs/upgrade.js
index 4fe6b8cc1e..0b5a71e50c 100644
--- a/source4/scripting/libjs/upgrade.js
+++ b/source4/scripting/libjs/upgrade.js
@@ -422,7 +422,7 @@ function upgrade(subobj, samba3, message, paths)
 
 	// figure out ldapurl, if applicable
 	var ldapurl = undefined;
-	var pdb = samba3.configuration.get_list("passdb backends");
+	var pdb = samba3.configuration.get_list("passdb backend");
 	if (pdb != undefined) {
 		for (var b in pdb) {
 			if (substr(pdb[b], 0, 7) == "ldapsam") {
@@ -438,6 +438,7 @@ function upgrade(subobj, samba3, message, paths)
 
 	// Enable samba3sam module if original passdb backend was ldap
 	if (ldapurl != undefined) {
+		message("Enabling Samba3 LDAP mappings for SAM database\n");
 		var ldif = sprintf("
 dn: @MAP=samba3sam
 @MAP_URL: %s", ldapurl);
-- 
cgit 


From 2f23a8cec1537439fef3456389d55d95c5e78493 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Wed, 31 Aug 2005 15:46:41 +0000
Subject: r9830: Fix support for importing registry values. Extended the
 examplre registry tdb. (This used to be commit
 11e2a1938966f3aa9e9c25433181c20843951a6b)

---
 source4/scripting/libjs/upgrade.js | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/upgrade.js b/source4/scripting/libjs/upgrade.js
index 0b5a71e50c..e78865f196 100644
--- a/source4/scripting/libjs/upgrade.js
+++ b/source4/scripting/libjs/upgrade.js
@@ -30,7 +30,7 @@ function regkey_to_dn(name)
  *   HKPT
  */
 
-function upgrade_registry(regdb,prefix)
+function upgrade_registry(regdb,prefix,ldb)
 {
 	assert(regdb != undefined);
 	var prefix_up = strupper(prefix);
@@ -63,7 +63,7 @@ name: %s
 dn: %s,value=%s
 value: %s
 type: %d
-data:: %s", keydn, rv.value, rv.type, base64(rv.data));
+data:: %s", keydn, rv.name, rv.name, rv.type, ldb.encode(rv.data));
 		}
 	}
 
@@ -103,8 +103,6 @@ function upgrade_sam_account(acc,domaindn)
 	var ldb = ldb_init();
 	var ldif = sprintf(
 "dn: cn=%s,%s
-objectClass: top
-objectClass: person
 objectClass: user
 lastLogon: %d
 lastLogoff: %d
@@ -480,7 +478,7 @@ dn: @MAP=samba3sam
 		var regdb = ldb_init();
 		ok = regdb.connect(paths[hn]);
 		assert(ok);
-		var ldif = upgrade_registry(samba3.registry, hn);
+		var ldif = upgrade_registry(samba3.registry, hn, regdb);
 		for (var j in ldif) {
 			message("... ... " + j);
 			ok = regdb.add(ldif[j]);
-- 
cgit 


From 0712cbdab4c397b9f74fcd681f40df9c9c2c59a8 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Wed, 31 Aug 2005 16:51:09 +0000
Subject: r9834: More tests for the upgrade from Samba3 (This used to be commit
 d2db164d6f674cada470e871c558c75f98244141)

---
 source4/scripting/ejs/smbcalls_samba3.c | 42 +++++++++++++++++++++++++++++++++
 source4/scripting/libjs/upgrade.js      | 30 ++++++++++++++++-------
 2 files changed, 63 insertions(+), 9 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_samba3.c b/source4/scripting/ejs/smbcalls_samba3.c
index 0d54d54dcc..0e4743eca9 100644
--- a/source4/scripting/ejs/smbcalls_samba3.c
+++ b/source4/scripting/ejs/smbcalls_samba3.c
@@ -55,6 +55,10 @@ static struct MprVar mprRegistry(struct samba3_regdb *reg)
 		mprAddArray(&ks, i, k);
 	}
 
+	if (i == 0) {
+		mprSetVar(&ks, "length", mprCreateIntegerVar(i));
+	}
+
 	mprSetVar(&mpv, "keys", ks);
 
 	return mpv;
@@ -104,6 +108,11 @@ static struct MprVar mprIdmapDb(struct samba3_idmapdb *db)
 		mprAddArray(&mps, i, mp);
 	}
 
+	if (i == 0) {
+		mprSetVar(&mpv, "length", mprCreateIntegerVar(i));
+	}
+
+
 	mprSetVar(&mpv, "mappings", mps);
 
 	return mpv;
@@ -131,6 +140,11 @@ static struct MprVar mprGroupMappings(struct samba3_groupdb *db)
 		mprAddArray(&mpv, i, g);
 	}
 
+	if (i == 0) {
+		mprSetVar(&mpv, "length", mprCreateIntegerVar(i));
+	}
+
+
 	return mpv;
 }
 
@@ -158,6 +172,10 @@ static struct MprVar mprAliases(struct samba3_groupdb *db)
 		mprSetVar(&a, "members", am);
 	}
 
+	if (i == 0) {
+		mprSetVar(&mpv, "length", mprCreateIntegerVar(i));
+	}
+
 	return mpv;
 }
 
@@ -219,6 +237,10 @@ static struct MprVar mprSecrets(struct samba3_secrets *sec)
 		mprAddArray(&es, i, mprDomainSecrets(&sec->domains[i]));
 	}
 
+	if (i == 0) {
+		mprSetVar(&es, "length", mprCreateIntegerVar(i));
+	}
+
 	mprSetVar(&mpv, "domains", es);
 
 	es = mprObject("trusted_domains");
@@ -247,6 +269,10 @@ static struct MprVar mprSecrets(struct samba3_secrets *sec)
 		mprAddArray(&es, i, e);
 	}
 
+	if (i == 0) {
+		mprSetVar(&es, "length", mprCreateIntegerVar(i));
+	}
+
 	mprSetVar(&mpv, "trusted_domains", es);
 	
 	es = mprObject("array");
@@ -279,6 +305,10 @@ static struct MprVar mprSecrets(struct samba3_secrets *sec)
 		mprAddArray(&es, i, e);
 	}
 
+	if (i == 0) {
+		mprSetVar(&es, "length", mprCreateIntegerVar(i));
+	}
+
 	mprSetVar(&mpv, "afs_keyfiles", es);
 
 	mprSetVar(&mpv, "ipc_cred", mprCredentials(sec->ipc_cred));
@@ -301,6 +331,10 @@ static struct MprVar mprShares(struct samba3 *samba3)
 		mprAddArray(&mpv, i, s);
 	}
 
+	if (i == 0) {
+		mprSetVar(&mpv, "length", mprCreateIntegerVar(i));
+	}
+
 	return mpv;
 }
 
@@ -348,6 +382,10 @@ static struct MprVar mprSamAccounts(struct samba3 *samba3)
 		mprAddArray(&mpv, i, m);
 	}
 
+	if (i == 0) {
+		mprSetVar(&mpv, "length", mprCreateIntegerVar(i));
+	}
+
 	return mpv;
 }
 
@@ -375,6 +413,10 @@ static struct MprVar mprWinsEntries(struct samba3 *samba3)
 		mprAddArray(&mpv, i, w);
 	}
 
+	if (i == 0) {
+		mprSetVar(&mpv, "length", mprCreateIntegerVar(i));
+	}
+
 	return mpv;
 }
 
diff --git a/source4/scripting/libjs/upgrade.js b/source4/scripting/libjs/upgrade.js
index e78865f196..59e433b0f2 100644
--- a/source4/scripting/libjs/upgrade.js
+++ b/source4/scripting/libjs/upgrade.js
@@ -448,26 +448,26 @@ dn: @MAP=samba3sam
 
 	message("Importing users\n");
 	for (var i in samba3.samaccounts) {
-		message("... " + samba3.samaccounts[i].username);
+		var msg = "... " + samba3.samaccounts[i].username;
 		var ldif = upgrade_sam_account(samba3.samaccounts[i],subobj.BASEDN);
 		ok = samdb.add(ldif);
 		if (!ok) { 
-			message("... error: " + samdb.errstring()); 
+			msg = msg + "... error: " + samdb.errstring();
 			ret = ret + 1; 
 		}
-		message("\n");
+		message(msg + "\n");
 	}
 
 	message("Importing groups\n");
 	for (var i in samba3.groupmappings) {
-		message("... " + samba3.groupmappings[i].nt_name);
+		var msg = "... " + samba3.groupmappings[i].nt_name;
 		var ldif = upgrade_sam_group(samba3.groupmappings[i],subobj.BASEDN);
 		ok = samdb.add(ldif);
 		if (!ok) { 
-			message("... error: " + samdb.errstring()); 
+			msg = msg + "... error: " + samdb.errstring();
 			ret = ret + 1; 
 		}
-		message("\n");
+		message(msg + "\n");
 	}
 
 	message("Importing registry data\n");
@@ -480,13 +480,13 @@ dn: @MAP=samba3sam
 		assert(ok);
 		var ldif = upgrade_registry(samba3.registry, hn, regdb);
 		for (var j in ldif) {
-			message("... ... " + j);
+			var msg = "... ... " + j;
 			ok = regdb.add(ldif[j]);
 			if (!ok) { 
-				message("... error: " + regdb.errstring()); 
+				msg = msg + "... error: " + regdb.errstring();
 				ret = ret + 1; 
 			}
-			message("\n");
+			message(msg + "\n");
 		}
 	}
 
@@ -502,3 +502,15 @@ dn: @MAP=samba3sam
 
 	return ret;
 }
+
+function upgrade_verify(subobj, samba3,paths,message)
+{
+	message("Verifying account policies\n");
+	var samldb = ldb_init();
+	var ne = 0;
+
+	var ok = samldb.connect(paths.samdb);
+	assert(ok);
+	
+	// FIXME
+}
-- 
cgit 


From 222fdd5237c1fd8551c39ce544171df3a5a41831 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Wed, 31 Aug 2005 21:04:17 +0000
Subject: r9842: More error checks in the ldb_map modules, extend testsuite
 (This used to be commit b7992de4b7d42a55e00509c887a269a07c19627d)

---
 source4/scripting/ejs/smbcalls_ldb.c |  8 ++---
 source4/scripting/libjs/upgrade.js   | 59 +++++++++++++++++++-----------------
 2 files changed, 35 insertions(+), 32 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_ldb.c b/source4/scripting/ejs/smbcalls_ldb.c
index aabd43d1ac..855dd157f7 100644
--- a/source4/scripting/ejs/smbcalls_ldb.c
+++ b/source4/scripting/ejs/smbcalls_ldb.c
@@ -311,10 +311,10 @@ static int ejs_base64decode(MprVarHandle eid, int argc, struct MprVar **argv)
   
 
 /*
-  perform an ldb modify
+  perform an ldb add 
 
   syntax:
-    ok = ldb.modify(ldifstring);
+    ok = ldb.add(ldifstring);
 */
 static int ejs_ldbAdd(MprVarHandle eid, int argc, struct MprVar **argv)
 {
@@ -322,10 +322,10 @@ static int ejs_ldbAdd(MprVarHandle eid, int argc, struct MprVar **argv)
 }
 
 /*
-  perform an ldb add
+  perform an ldb modify
 
   syntax:
-    ok = ldb.add(ldifstring);
+    ok = ldb.modify(ldifstring);
 */
 static int ejs_ldbModify(MprVarHandle eid, int argc, struct MprVar **argv)
 {
diff --git a/source4/scripting/libjs/upgrade.js b/source4/scripting/libjs/upgrade.js
index 59e433b0f2..ac7e445330 100644
--- a/source4/scripting/libjs/upgrade.js
+++ b/source4/scripting/libjs/upgrade.js
@@ -418,34 +418,6 @@ function upgrade(subobj, samba3, message, paths)
 	ok = samdb.modify(ldif);
 	assert(ok);
 
-	// figure out ldapurl, if applicable
-	var ldapurl = undefined;
-	var pdb = samba3.configuration.get_list("passdb backend");
-	if (pdb != undefined) {
-		for (var b in pdb) {
-			if (substr(pdb[b], 0, 7) == "ldapsam") {
-				ldapurl = substr(pdb[b], 8);
-			}
-		}
-	}
-
-	// URL was not specified in passdb backend but ldap /is/ used
-	if (ldapurl == "") {
-		ldapurl = "ldap://" + samba3.configuration.get("ldap server");
-	}
-
-	// Enable samba3sam module if original passdb backend was ldap
-	if (ldapurl != undefined) {
-		message("Enabling Samba3 LDAP mappings for SAM database\n");
-		var ldif = sprintf("
-dn: @MAP=samba3sam
-@MAP_URL: %s", ldapurl);
-		samdb.add(ldif);
-
-		samdb.modify("dn: @MODULES
-@LIST: samldb,timestamps,objectguid,rdn_name,samba3sam");
-	}
-
 	message("Importing users\n");
 	for (var i in samba3.samaccounts) {
 		var msg = "... " + samba3.samaccounts[i].username;
@@ -500,6 +472,37 @@ dn: @MAP=samba3sam
 	ok = winsdb.add(ldif);
 	assert(ok);
 
+	// figure out ldapurl, if applicable
+	var ldapurl = undefined;
+	var pdb = samba3.configuration.get_list("passdb backend");
+	if (pdb != undefined) {
+		for (var b in pdb) {
+			if (substr(pdb[b], 0, 7) == "ldapsam") {
+				ldapurl = substr(pdb[b], 8);
+			}
+		}
+	}
+
+	// URL was not specified in passdb backend but ldap /is/ used
+	if (ldapurl == "") {
+		ldapurl = "ldap://" + samba3.configuration.get("ldap server");
+	}
+
+	// Enable samba3sam module if original passdb backend was ldap
+	if (ldapurl != undefined) {
+		message("Enabling Samba3 LDAP mappings for SAM database\n");
+		var ldif = sprintf("
+dn: @MAP=samba3sam
+@MAP_URL: %s", ldapurl);
+		ok = samdb.add(ldif);
+		assert(ok);
+
+		ok = samdb.modify("dn: @MODULES
+replace: @LIST
+@LIST: samldb,timestamps,objectguid,rdn_name,samba3sam");
+		assert(ok);
+	}
+
 	return ret;
 }
 
-- 
cgit 


From 05db3024ba6a8cd0b3182595f4f6f2f1f0987e44 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Thu, 1 Sep 2005 00:37:52 +0000
Subject: r9854: Finish ldb_map testsuite Update PLAN Some more small other
 fixes (This used to be commit de2bde2526ffaf521253e3b9e58fc11417986321)

---
 source4/scripting/libjs/upgrade.js | 97 +++++++++++++++++++++++++++++++-------
 1 file changed, 79 insertions(+), 18 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/upgrade.js b/source4/scripting/libjs/upgrade.js
index ac7e445330..45e6884e9f 100644
--- a/source4/scripting/libjs/upgrade.js
+++ b/source4/scripting/libjs/upgrade.js
@@ -94,20 +94,40 @@ samba3RefuseMachinePwdChange: %d
 	samba3.policy.bad_lockout_minutes, samba3.policy.disconnect_time, 
 	samba3.policy.refuse_machine_password_change
 );
-
+	
 	return ldif;
 }
 
-function upgrade_sam_account(acc,domaindn)
+function upgrade_sam_account(ldb,acc,domaindn,domainsid)
 {
-	var ldb = ldb_init();
+	if (acc.nt_username == undefined) {
+		acc.nt_username = acc.username;
+	}	
+
+	if (acc.nt_username == "") {
+		acc.nt_username = acc.username;
+	}	
+
+	if (acc.fullname == undefined) {
+		var pw = nss.getpwnam(acc.fullname);
+		acc.fullname = pw.pw_gecos;
+	}
+
+	var pts = split(',', acc.fullname);
+	acc.fullname = pts[0];
+	
+	assert(acc.fullname != undefined);
+	assert(acc.nt_username != undefined);
+
 	var ldif = sprintf(
 "dn: cn=%s,%s
+objectClass: top
 objectClass: user
 lastLogon: %d
 lastLogoff: %d
 unixName: %s
 name: %s
+sAMAccountName: %s
 cn: %s
 description: %s
 primaryGroupID: %d
@@ -125,15 +145,16 @@ samba3BadPwdTime: %d
 samba3PassLastSetTime: %d
 samba3PassCanChangeTime: %d
 samba3PassMustChangeTime: %d
-samba3Rid: %d
+objectSid: %s-%d
 ntPwdHash:: %s
 lmPwdHash:: %s
 
-", acc.fullname, domaindn, acc.logon_time, acc.logoff_time, acc.username, acc.nt_username, 
+", acc.fullname, domaindn, acc.logon_time, acc.logoff_time, acc.username, acc.nt_username, acc.nt_username, 
+
 acc.fullname, acc.acct_desc, acc.group_rid, acc.bad_password_count, acc.logon_count,
 acc.domain, acc.dir_drive, acc.munged_dial, acc.homedir, acc.logon_script, 
 acc.profile_path, acc.workstations, acc.kickoff_time, acc.bad_password_time, 
-acc.pass_last_set_time, acc.pass_can_change_time, acc.pass_must_change_time, acc.user_rid,
+acc.pass_last_set_time, acc.pass_can_change_time, acc.pass_must_change_time, domainsid, acc.user_rid,
 	ldb.encode(acc.lm_pw), ldb.encode(acc.nt_pw)); 
 
 	return ldif;
@@ -141,6 +162,33 @@ acc.pass_last_set_time, acc.pass_can_change_time, acc.pass_must_change_time, acc
 
 function upgrade_sam_group(grp,domaindn)
 {
+	var nss = nss_init();
+
+	var gr;
+	if (grp.sid_name_use == 5) { // Well-known group
+		return undefined;
+	}
+
+	if (grp.nt_name == "Domain Guests" ||
+	    grp.nt_name == "Domain Users" ||
+	    grp.nt_name == "Domain Admins") {
+		return undefined;
+	}
+	
+	if (grp.gid == -1) {
+		gr = nss.getgrnam(grp.nt_name);
+	} else {
+		gr = nss.getgrgid(grp.gid);
+	}
+
+	if (gr == undefined) {
+		grp.unixname = "UNKNOWN";
+	} else {
+		grp.unixname = gr.gr_name;
+	}
+
+	assert(grp.unixname != undefined);
+	
 	var ldif = sprintf(
 "dn: cn=%s,%s
 objectClass: top
@@ -148,10 +196,10 @@ objectClass: group
 description: %s
 cn: %s
 objectSid: %s
-unixName: FIXME
+unixName: %s
 samba3SidNameUse: %d
 ", grp.nt_name, domaindn, 
-grp.comment, grp.nt_name, grp.sid, grp.sid_name_use);
+grp.comment, grp.nt_name, grp.sid, grp.unixname, grp.sid_name_use);
 
 	return ldif;
 }
@@ -421,9 +469,9 @@ function upgrade(subobj, samba3, message, paths)
 	message("Importing users\n");
 	for (var i in samba3.samaccounts) {
 		var msg = "... " + samba3.samaccounts[i].username;
-		var ldif = upgrade_sam_account(samba3.samaccounts[i],subobj.BASEDN);
+		var ldif = upgrade_sam_account(samdb,samba3.samaccounts[i],subobj.BASEDN,subobj.DOMAINSID);
 		ok = samdb.add(ldif);
-		if (!ok) { 
+		if (!ok && samdb.errstring() != "Record exists") { 
 			msg = msg + "... error: " + samdb.errstring();
 			ret = ret + 1; 
 		}
@@ -434,10 +482,12 @@ function upgrade(subobj, samba3, message, paths)
 	for (var i in samba3.groupmappings) {
 		var msg = "... " + samba3.groupmappings[i].nt_name;
 		var ldif = upgrade_sam_group(samba3.groupmappings[i],subobj.BASEDN);
-		ok = samdb.add(ldif);
-		if (!ok) { 
-			msg = msg + "... error: " + samdb.errstring();
-			ret = ret + 1; 
+		if (ldif != undefined) {
+			ok = samdb.add(ldif);
+			if (!ok && samdb.errstring() != "Record exists") { 
+				msg = msg + "... error: " + samdb.errstring();
+				ret = ret + 1; 
+			}
 		}
 		message(msg + "\n");
 	}
@@ -454,7 +504,7 @@ function upgrade(subobj, samba3, message, paths)
 		for (var j in ldif) {
 			var msg = "... ... " + j;
 			ok = regdb.add(ldif[j]);
-			if (!ok) { 
+			if (!ok && regdb.errstring() != "Record exists") { 
 				msg = msg + "... error: " + regdb.errstring();
 				ret = ret + 1; 
 			}
@@ -497,10 +547,16 @@ dn: @MAP=samba3sam
 		ok = samdb.add(ldif);
 		assert(ok);
 
-		ok = samdb.modify("dn: @MODULES
+		ok = samdb.modify("
+dn: @MODULES
+changetype: modify
 replace: @LIST
-@LIST: samldb,timestamps,objectguid,rdn_name,samba3sam");
-		assert(ok);
+@LIST: samldb,timestamps,objectguid,rdn_name,samba3sam
+");
+		if (!ok) {
+			message("Error enabling samba3sam module: " + samdb.errstring() + "\n");
+			ret = ret + 1;
+		}
 	}
 
 	return ret;
@@ -514,6 +570,11 @@ function upgrade_verify(subobj, samba3,paths,message)
 
 	var ok = samldb.connect(paths.samdb);
 	assert(ok);
+
+	for (var i in samba3.samaccounts) {
+		var msg = samldb.search("(&(sAMAccountName=" + samba3.samaccounts[i].nt_username + ")(objectclass=user))");
+		assert(msg.length >= 1);
+	}
 	
 	// FIXME
 }
-- 
cgit 


From e2e2508b586a112e612bf3660f80d25c9bf8bc90 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Thu, 1 Sep 2005 15:33:31 +0000
Subject: r9899: Be more conservative about what is sent to the remote server
 in ldb_map. (This used to be commit 76e943d4416e38ce4cce27d5403bc3e133d0025b)

---
 source4/scripting/libjs/upgrade.js | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/upgrade.js b/source4/scripting/libjs/upgrade.js
index 45e6884e9f..07fa8f34cc 100644
--- a/source4/scripting/libjs/upgrade.js
+++ b/source4/scripting/libjs/upgrade.js
@@ -541,11 +541,6 @@ function upgrade(subobj, samba3, message, paths)
 	// Enable samba3sam module if original passdb backend was ldap
 	if (ldapurl != undefined) {
 		message("Enabling Samba3 LDAP mappings for SAM database\n");
-		var ldif = sprintf("
-dn: @MAP=samba3sam
-@MAP_URL: %s", ldapurl);
-		ok = samdb.add(ldif);
-		assert(ok);
 
 		ok = samdb.modify("
 dn: @MODULES
@@ -557,6 +552,12 @@ replace: @LIST
 			message("Error enabling samba3sam module: " + samdb.errstring() + "\n");
 			ret = ret + 1;
 		}
+
+		ok = samdb.add(sprintf("
+dn: @MAP=samba3sam
+@MAP_URL: %s", ldapurl));
+		assert(ok);
+
 	}
 
 	return ret;
-- 
cgit 


From 08f630be8230ce061badd84bef952d5753afdff0 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Thu, 1 Sep 2005 20:28:03 +0000
Subject: r9915: Some more mappings. Fix weird sAMAccountName values. (This
 used to be commit 8ff1358f401e0086b941f4ff73af5d4c38a1f8bf)

---
 source4/scripting/ejs/smbcalls_ldb.c | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_ldb.c b/source4/scripting/ejs/smbcalls_ldb.c
index 855dd157f7..f536fbe547 100644
--- a/source4/scripting/ejs/smbcalls_ldb.c
+++ b/source4/scripting/ejs/smbcalls_ldb.c
@@ -256,17 +256,23 @@ static int ejs_ldbErrstring(MprVarHandle eid, int argc, struct MprVar **argv)
 static int ejs_base64encode(MprVarHandle eid, int argc, struct MprVar **argv)
 {
 	char *ret;
-	DATA_BLOB *blob;
 
 	if (argc != 1) {
 		ejsSetErrorMsg(eid, "ldb.base64encode invalid argument count");
 		return -1;
 	}
 
-	blob = mprToDataBlob(argv[0]);
-	mprAssert(blob);
-	ret = ldb_base64_encode(mprMemCtx(), (char *)blob->data, blob->length);
+	if (argv[0]->type == MPR_TYPE_STRING) {
+		const char *orig = mprToString(argv[0]);
+		ret = ldb_base64_encode(mprMemCtx(), orig, strlen(orig));
+	} else {
+		DATA_BLOB *blob;
 
+		blob = mprToDataBlob(argv[0]);
+		mprAssert(blob);
+		ret = ldb_base64_encode(mprMemCtx(), (char *)blob->data, blob->length);
+	}
+		
 	if (!ret) {
 		mpr_Return(eid, mprCreateUndefinedVar());
 	} else {
-- 
cgit 


From 1170f02e23b3c3597b6871cdf64e7d4fbee5ee08 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Thu, 1 Sep 2005 23:06:20 +0000
Subject: r9925: Fix swapped nt/lm password hashes - caught by Andrew Bartlett
 (This used to be commit 4f0ee80f6cc1639f612a50ddb8d99ee36d8ce8d6)

---
 source4/scripting/libjs/upgrade.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/upgrade.js b/source4/scripting/libjs/upgrade.js
index 07fa8f34cc..e11af26aa7 100644
--- a/source4/scripting/libjs/upgrade.js
+++ b/source4/scripting/libjs/upgrade.js
@@ -146,8 +146,8 @@ samba3PassLastSetTime: %d
 samba3PassCanChangeTime: %d
 samba3PassMustChangeTime: %d
 objectSid: %s-%d
-ntPwdHash:: %s
 lmPwdHash:: %s
+ntPwdHash:: %s
 
 ", acc.fullname, domaindn, acc.logon_time, acc.logoff_time, acc.username, acc.nt_username, acc.nt_username, 
 
-- 
cgit 


From aae4b1a95193796ef0368cd3f2b65d59f9805b7f Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Fri, 2 Sep 2005 12:06:25 +0000
Subject: r9951: Add another value to the default HKLM. Convert Samba3 policy
 "refuse machine pw change" to registry value. (This used to be commit
 a143234ac7622ef3ef87c80224927551a1452e4b)

---
 source4/scripting/libjs/upgrade.js | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/upgrade.js b/source4/scripting/libjs/upgrade.js
index e11af26aa7..62556ed8d9 100644
--- a/source4/scripting/libjs/upgrade.js
+++ b/source4/scripting/libjs/upgrade.js
@@ -85,14 +85,12 @@ samba3ResetCountMinutes: %d
 samba3UserMustLogonToChangePassword: %d
 samba3BadLockoutMinutes: %d
 samba3DisconnectTime: %d
-samba3RefuseMachinePwdChange: %d
 
 ", dn, samba3.policy.min_password_length, 
 	samba3.policy.password_history, samba3.policy.minimum_password_age,
 	samba3.policy.maximum_password_age, samba3.policy.lockout_duration,
 	samba3.policy.reset_count_minutes, samba3.policy.user_must_logon_to_change_password,
-	samba3.policy.bad_lockout_minutes, samba3.policy.disconnect_time, 
-	samba3.policy.refuse_machine_password_change
+	samba3.policy.bad_lockout_minutes, samba3.policy.disconnect_time
 );
 	
 	return ldif;
@@ -466,6 +464,18 @@ function upgrade(subobj, samba3, message, paths)
 	ok = samdb.modify(ldif);
 	assert(ok);
 
+	var regdb = ldb_init();
+	ok = regdb.connect(paths.hklm);
+	assert(ok);
+	ok = regdb.modify(sprintf("
+dn: value=RefusePasswordChange,key=Parameters,key=Netlogon,key=Services,key=CurrentControlSet,key=System,HIVE=NONE
+replace: type
+type: 4
+replace: data
+data: %d
+", samba3.policy.refuse_machine_password_change));
+	assert(ok);
+
 	message("Importing users\n");
 	for (var i in samba3.samaccounts) {
 		var msg = "... " + samba3.samaccounts[i].username;
@@ -497,7 +507,7 @@ function upgrade(subobj, samba3, message, paths)
 	for (var i in hives) {
 		var hn = hives[i];
 		message("... " + hn + "\n");
-		var regdb = ldb_init();
+		regdb = ldb_init();
 		ok = regdb.connect(paths[hn]);
 		assert(ok);
 		var ldif = upgrade_registry(samba3.registry, hn, regdb);
@@ -512,6 +522,7 @@ function upgrade(subobj, samba3, message, paths)
 		}
 	}
 
+
 	message("Importing WINS data\n");
 	var winsdb = ldb_init();
 	ok = winsdb.connect(paths.winsdb);
-- 
cgit 


From ed4913d45d07c754f8d3eb971af5af80c725240a Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Sat, 3 Sep 2005 11:50:33 +0000
Subject: r9990: Fix some 64-bit size_t warnings. (This used to be commit
 dd148451d7d554dc0b102023e6a22439fd3b4b81)

---
 source4/scripting/ejs/smbcalls_data.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_data.c b/source4/scripting/ejs/smbcalls_data.c
index a3501b7d31..4859de94d7 100644
--- a/source4/scripting/ejs/smbcalls_data.c
+++ b/source4/scripting/ejs/smbcalls_data.c
@@ -191,7 +191,7 @@ static int ejs_regToVar(MprVarHandle eid, int argc, struct MprVar **argv)
 
 	case REG_DWORD: {
 		if (blob->length != 4) {
-			ejsSetErrorMsg(eid, "regToVar invalid REG_DWORD length %d", blob->length);
+			ejsSetErrorMsg(eid, "regToVar invalid REG_DWORD length %ld", (long)blob->length);
 			return -1;
 		}
 		v = mprCreateNumberVar(IVAL(blob->data, 0));
@@ -200,7 +200,7 @@ static int ejs_regToVar(MprVarHandle eid, int argc, struct MprVar **argv)
 
 	case REG_DWORD_BIG_ENDIAN: {
 		if (blob->length != 4) {
-			ejsSetErrorMsg(eid, "regToVar invalid REG_DWORD_BIG_ENDIAN length %d", blob->length);
+			ejsSetErrorMsg(eid, "regToVar invalid REG_DWORD_BIG_ENDIAN length %ld", (long)blob->length);
 			return -1;
 		}
 		v = mprCreateNumberVar(RIVAL(blob->data, 0));
@@ -209,7 +209,7 @@ static int ejs_regToVar(MprVarHandle eid, int argc, struct MprVar **argv)
 
 	case REG_QWORD: {
 		if (blob->length != 8) {
-			ejsSetErrorMsg(eid, "regToVar invalid REG_QWORD length %d", blob->length);
+			ejsSetErrorMsg(eid, "regToVar invalid REG_QWORD length %ld", (long)blob->length);
 			return -1;
 		}
 		v = mprCreateNumberVar(BVAL(blob->data, 0));
-- 
cgit 


From 342d229b4082004d30fa7018c04bba66da48a91b Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 12 Sep 2005 23:52:25 +0000
Subject: r10190: Do some very basic input checking when provisioning. (This
 used to be commit 87f25fe49caa78422582337c5208a331ef5b8c15)

---
 source4/scripting/libjs/provision.js | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index ef99dc43c5..33bfafac13 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -233,7 +233,9 @@ function provision(subobj, message, blank, paths)
 	subobj.REALM       = strlower(subobj.REALM);
 	subobj.HOSTNAME    = strlower(subobj.HOSTNAME);
 	subobj.DOMAIN      = strupper(subobj.DOMAIN);
+	assert(valid_netbios_name(subobj.DOMAIN));
 	subobj.NETBIOSNAME = strupper(subobj.HOSTNAME);
+	assert(valid_netbios_name(subobj.NETBIOSNAME));
 	var rdns = split(",", subobj.BASEDN);
 	subobj.RDN_DC = substr(rdns[0], strlen("DC="));
 
@@ -431,5 +433,29 @@ member: %s
 	return enable_account(ldb, user_dn);
 }
 
+// Check whether a name is valid as a NetBIOS name. 
+// FIXME: There are probably more constraints here
+function valid_netbios_name(name)
+{
+	if (strlen(name) > 13) return false;
+	if (strstr(name, ".")) return false;
+	return true;
+}
+
+function provision_validate(subobj, message)
+{
+	if (!valid_netbios_name(subobj.DOMAIN)) {
+		message("Invalid NetBIOS name for domain\n");
+		return false;
+	}
+
+	if (!valid_netbios_name(subobj.NETBIOSNAME)) {
+		message("Invalid NetBIOS name for host\n");
+		return false;
+	}
+
+	return true;
+}
+
 
 return 0;
-- 
cgit 


From 68974a1c7205a4b06045217ed01a2f75ea8bccdd Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Tue, 13 Sep 2005 01:01:55 +0000
Subject: r10192:  r11631@blu:  tridge | 2005-08-30 23:06:37 +1000  added a
 ldb.close() method in js. Useful for re-opening the db (This used to be
 commit 1f12364a0f23ba39fd3d29b510fdef2423685f0d)

---
 source4/scripting/ejs/smbcalls_ldb.c | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_ldb.c b/source4/scripting/ejs/smbcalls_ldb.c
index f536fbe547..8c66bde571 100644
--- a/source4/scripting/ejs/smbcalls_ldb.c
+++ b/source4/scripting/ejs/smbcalls_ldb.c
@@ -367,6 +367,31 @@ static int ejs_ldbConnect(MprVarHandle eid, int argc, char **argv)
 }
 
 
+/*
+  close a db connection
+*/
+static int ejs_ldbClose(MprVarHandle eid, int argc, struct MprVar **argv)
+{
+	struct ldb_context *ldb;
+
+	if (argc != 0) {
+		ejsSetErrorMsg(eid, "ldb.close invalid arguments");
+		return -1;
+	}
+
+	ldb = ejs_get_ldb_context(eid);
+	if (ldb == NULL) {
+		return -1;
+	}
+
+	talloc_free(ldb);
+
+	mprSetThisPtr(eid, "db", NULL);
+	mpr_Return(eid, mprCreateBoolVar(True));
+	return 0;
+}
+
+
 /*
   initialise ldb ejs subsystem
 */
@@ -383,6 +408,7 @@ static int ejs_ldb_init(MprVarHandle eid, int argc, struct MprVar **argv)
 	mprSetCFunction(ldb, "errstring", ejs_ldbErrstring);
 	mprSetCFunction(ldb, "encode", ejs_base64encode);
 	mprSetCFunction(ldb, "decode", ejs_base64decode);
+	mprSetCFunction(ldb, "close", ejs_ldbClose);
 	mprSetVar(ldb, "SCOPE_BASE", mprCreateNumberVar(LDB_SCOPE_BASE));
 	mprSetVar(ldb, "SCOPE_ONE", mprCreateNumberVar(LDB_SCOPE_ONELEVEL));
 	mprSetVar(ldb, "SCOPE_SUBTREE", mprCreateNumberVar(LDB_SCOPE_SUBTREE));
-- 
cgit 


From bcc3ce695e9290013ab7fab230a5b0ab27b65ac4 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Tue, 13 Sep 2005 01:02:06 +0000
Subject: r10193:  r11632@blu:  tridge | 2005-08-30 23:08:27 +1000  if we fail
 to erase a ldb during provision by traversing  and deleting records (an
 in-place erase) then just unlink it  and start it again. This makes
 provisioning much more robust  to changes in ldb that make it not backward
 compatible with  old DBs. (This used to be commit
 173655aec25c462b8b90b850df65ae6f95f44efb)

---
 source4/scripting/libjs/provision.js | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index 33bfafac13..d700ecd539 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -122,6 +122,18 @@ function hostname()
 }
 
 
+/* the ldb is in bad shape, possibly due to being built from an
+   incompatible previous version of the code, so delete it
+   completely */
+function ldb_delete(ldb)
+{
+	println("Deleting " + ldb.filename);
+	sys.unlink(ldb.filename);
+	ldb.close();
+	var ok = ldb.connect(ldb.filename);
+	assert(ok);
+}
+
 /*
   erase an ldb, removing all records
 */
@@ -138,10 +150,18 @@ function ldb_erase(ldb)
 	/* and the rest */
 	var res = ldb.search("(|(objectclass=*)(dn=*))", attrs);
 	var i;
+	if (typeof(res) == "undefined") {
+		ldb_delete(ldb);
+		return;
+	}
 	for (i=0;i<res.length;i++) {
 		ldb.del(res[i].dn);
 	}
 	res = ldb.search("(objectclass=*)", attrs);
+	if (res.length != 0) {
+		ldb_delete(ldb);
+		return;
+	}
 	assert(res.length == 0);
 }
 
@@ -170,6 +190,8 @@ function setup_ldb(ldif, dbname, subobj)
 	data = data + extra;
 	data = substitute_var(data, subobj);
 
+	ldb.filename = dbname;
+
 	var ok = ldb.connect(dbname);
 	assert(ok);
 
-- 
cgit 


From 95040e934175eb877ce6d83690fd06ce5d2b028c Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Fri, 16 Sep 2005 03:18:49 +0000
Subject: r10252: a recent checkin from simo changed the handling of BASE and
 SUBTREE searches in ldb to be more ldap compliant, but broke the wins server
 and the ejs ldb code. This fixes those up so 'make test' passes again. (This
 used to be commit dff660c23c97114d0c1be705f4d6a9c114b60456)

---
 source4/scripting/ejs/smbcalls_ldb.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_ldb.c b/source4/scripting/ejs/smbcalls_ldb.c
index 8c66bde571..ec2748a426 100644
--- a/source4/scripting/ejs/smbcalls_ldb.c
+++ b/source4/scripting/ejs/smbcalls_ldb.c
@@ -412,6 +412,7 @@ static int ejs_ldb_init(MprVarHandle eid, int argc, struct MprVar **argv)
 	mprSetVar(ldb, "SCOPE_BASE", mprCreateNumberVar(LDB_SCOPE_BASE));
 	mprSetVar(ldb, "SCOPE_ONE", mprCreateNumberVar(LDB_SCOPE_ONELEVEL));
 	mprSetVar(ldb, "SCOPE_SUBTREE", mprCreateNumberVar(LDB_SCOPE_SUBTREE));
+	mprSetVar(ldb, "SCOPE_DEFAULT", mprCreateNumberVar(LDB_SCOPE_DEFAULT));
 
 	return 0;
 }
-- 
cgit 


From d2a666acbe04f741387ff4351e3971b24f1c3b14 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 19 Sep 2005 13:26:07 +0000
Subject: r10316: More dynconfig fixes (This used to be commit
 0963ab9c148772b961f17ec779213b0eb861e1dd)

---
 source4/scripting/ejs/smbcalls_config.c | 1 -
 source4/scripting/ejs/smbcalls_param.c  | 1 -
 source4/scripting/ejs/smbscript.c       | 1 -
 3 files changed, 3 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_config.c b/source4/scripting/ejs/smbcalls_config.c
index a69c3d81f9..a64d57a359 100644
--- a/source4/scripting/ejs/smbcalls_config.c
+++ b/source4/scripting/ejs/smbcalls_config.c
@@ -24,7 +24,6 @@
 #include "scripting/ejs/smbcalls.h"
 #include "lib/appweb/ejs/ejs.h"
 #include "param/loadparm.h"
-#include "dynconfig.h"
 
 /*
   return a list of defined services
diff --git a/source4/scripting/ejs/smbcalls_param.c b/source4/scripting/ejs/smbcalls_param.c
index 578df1b087..23f90c971e 100644
--- a/source4/scripting/ejs/smbcalls_param.c
+++ b/source4/scripting/ejs/smbcalls_param.c
@@ -24,7 +24,6 @@
 #include "scripting/ejs/smbcalls.h"
 #include "lib/appweb/ejs/ejs.h"
 #include "param/generic.h"
-#include "dynconfig.h"
 
 /*
   get parameter
diff --git a/source4/scripting/ejs/smbscript.c b/source4/scripting/ejs/smbscript.c
index f8d6d507d4..e0123eee87 100644
--- a/source4/scripting/ejs/smbscript.c
+++ b/source4/scripting/ejs/smbscript.c
@@ -22,7 +22,6 @@
 */
 
 #include "includes.h"
-#include "dynconfig.h"
 #include "lib/appweb/ejs/ejs.h"
 #include "lib/appweb/ejs/ejsInternal.h"
 #include "scripting/ejs/smbcalls.h"
-- 
cgit 


From 6812c73534001d2dd05a9a74358d2b6d0029f1a7 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 20 Sep 2005 11:59:03 +0000
Subject: r10348: Add scons scripts for remaining subsystems. Most subsystems
 build now, but final linking still fails (as does generating files asn1, et,
 idl and proto files) (This used to be commit
 4f0d7f75b99c7f4388d8acb0838577d86baf68b5)

---
 source4/scripting/SConscript     |  3 +++
 source4/scripting/ejs/SConscript | 12 ++++++++++++
 2 files changed, 15 insertions(+)
 create mode 100644 source4/scripting/SConscript
 create mode 100644 source4/scripting/ejs/SConscript

(limited to 'source4/scripting')

diff --git a/source4/scripting/SConscript b/source4/scripting/SConscript
new file mode 100644
index 0000000000..f32e93aae1
--- /dev/null
+++ b/source4/scripting/SConscript
@@ -0,0 +1,3 @@
+Import('hostenv')
+
+SConscript(dirs=['ejs'],exports='hostenv')
diff --git a/source4/scripting/ejs/SConscript b/source4/scripting/ejs/SConscript
new file mode 100644
index 0000000000..5ba45d8e77
--- /dev/null
+++ b/source4/scripting/ejs/SConscript
@@ -0,0 +1,12 @@
+Import('hostenv')
+
+hostenv.StaticLibrary('ejsrpc',['ejsrpc.c'])
+hostenv.StaticLibrary('ejs_smbcalls',
+		['smbcalls.c','smbcalls_config.c','smbcalls_ldb.c',
+		 'smbcalls_nbt.c','smbcalls_cli.c','smbcalls_rpc.c',
+		 'smbcalls_auth.c','smbcalls_options.c','smbcalls_nss.c',
+		 'smbcalls_string.c','smbcalls_data.c','smbcalls_rand.c',
+		 'smbcalls_sys.c','smbcalls_creds.c','smbcalls_samba3.c',
+		 'smbcalls_param.c','mprutil.c'])
+
+hostenv.Program('smbscript',['smbscript.c'])
-- 
cgit 


From 51cbc188df03f9ee38599fe5a87ec2608117a845 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Thu, 22 Sep 2005 01:50:58 +0000
Subject: r10402: Make the RPC-SAMLOGON test pass against Win2k3 SP0 again.

I still have issues with Win2k3 SP1, and Samba4 doesn't pass it's own
test for the moment, but I'm working on these issues :-)

This required a change to the credentials API, so that the special
case for NTLM logins using a principal was indeed handled as a
special, not general case.

Also don't set the realm from a ccache, as then it overrides --option=realm=.

Andrew Bartlett
(This used to be commit 194e8f07c0cb4685797c5a7a074577c62dfdebe3)
---
 source4/scripting/ejs/smbcalls_auth.c  | 2 +-
 source4/scripting/ejs/smbcalls_creds.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_auth.c b/source4/scripting/ejs/smbcalls_auth.c
index e3b48490f6..672694bbc5 100644
--- a/source4/scripting/ejs/smbcalls_auth.c
+++ b/source4/scripting/ejs/smbcalls_auth.c
@@ -122,7 +122,7 @@ static int ejs_userAuth(MprVarHandle eid, int argc, struct MprVar **argv)
 
  	tmp_ctx = talloc_new(mprMemCtx());	
 	
-	username    = cli_credentials_get_username(creds, tmp_ctx);
+	username    = cli_credentials_get_username(creds);
 	password    = cli_credentials_get_password(creds);
 	domain      = cli_credentials_get_domain(creds);
 	remote_host = cli_credentials_get_workstation(creds);
diff --git a/source4/scripting/ejs/smbcalls_creds.c b/source4/scripting/ejs/smbcalls_creds.c
index f9d231293a..cc2ccf8c47 100644
--- a/source4/scripting/ejs/smbcalls_creds.c
+++ b/source4/scripting/ejs/smbcalls_creds.c
@@ -73,7 +73,7 @@ static int ejs_creds_get_username(MprVarHandle eid, int argc, struct MprVar **ar
 {
 	struct cli_credentials *creds = ejs_creds_get_credentials(eid);
 
-	mpr_Return(eid, mprString(cli_credentials_get_username(creds, mprMemCtx())));
+	mpr_Return(eid, mprString(cli_credentials_get_username(creds)));
 	return 0;
 }
 
-- 
cgit 


From f801ad359290c51d3216c755fb2a8344babb484f Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 26 Sep 2005 15:59:43 +0000
Subject: r10510: Decrease the amount of data included by includes.h a bit
 (This used to be commit 03647e1321cf6c9bd6ced3945265f635e9468973)

---
 source4/scripting/ejs/smbcalls_cli.c   | 1 +
 source4/scripting/ejs/smbcalls_creds.c | 1 +
 2 files changed, 2 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_cli.c b/source4/scripting/ejs/smbcalls_cli.c
index d7ffea29fe..3b0905d7d3 100644
--- a/source4/scripting/ejs/smbcalls_cli.c
+++ b/source4/scripting/ejs/smbcalls_cli.c
@@ -26,6 +26,7 @@
 #include "libcli/raw/libcliraw.h"
 #include "libcli/composite/composite.h"
 #include "clilist.h"
+#include "credentials.h"
 
 #if 0
 
diff --git a/source4/scripting/ejs/smbcalls_creds.c b/source4/scripting/ejs/smbcalls_creds.c
index cc2ccf8c47..d615bcbed2 100644
--- a/source4/scripting/ejs/smbcalls_creds.c
+++ b/source4/scripting/ejs/smbcalls_creds.c
@@ -24,6 +24,7 @@
 #include "scripting/ejs/smbcalls.h"
 #include "lib/appweb/ejs/ejs.h"
 #include "lib/cmdline/popt_common.h"
+#include "credentials.h"
 
 /*
   helper function to get the local objects credentials ptr
-- 
cgit 


From bb9c9ec69c58c9707381e37a7d984e1fab32548f Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 26 Sep 2005 18:15:24 +0000
Subject: r10515: Handle replacement of "domain logons" and "domain master" by
 "server role" (This used to be commit
 c5e3a1c55d9e21f9ee618169dc05c69ee9c9c5b1)

---
 source4/scripting/libjs/upgrade.js | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/upgrade.js b/source4/scripting/libjs/upgrade.js
index 62556ed8d9..6109371338 100644
--- a/source4/scripting/libjs/upgrade.js
+++ b/source4/scripting/libjs/upgrade.js
@@ -387,11 +387,9 @@ smbconf_keep = new Array(
 	"map system",
 	"map hidden",
 	"map archive",
-	"domain logons",
 	"preferred master",
 	"prefered master",
 	"local master",
-	"domain master",
 	"browseable",
 	"browsable",
 	"wins server",
@@ -444,6 +442,20 @@ function upgrade_smbconf(oldconf,mark)
 		}
 	}
 
+	if (oldconf.get("domain logons") == "True") {
+		if (oldconf.get("domain master") == "True") {
+			newconf.set("role", "pdc");
+		} else {
+			newconf.set("role", "bdc");
+		}
+	} else {
+		if (oldconf.get("domain master") == "True") {
+			newconf.set("role", "standalone");
+		} else {
+			newconf.set("role", "member server");
+		}
+	}
+
 	return newconf;
 }
 
-- 
cgit 


From 42b81d7c3e8ac9ad4c35d5377decbdd5ab18ffbb Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 27 Sep 2005 10:00:27 +0000
Subject: r10528: Add credentials.h back into includes.h as some compilers
 don't seem to be able to handle incomplete enum types. (This used to be
 commit 540155fad3c8e3d79fb631bb3f14273f82130a73)

---
 source4/scripting/ejs/smbcalls_cli.c   | 1 -
 source4/scripting/ejs/smbcalls_creds.c | 1 -
 2 files changed, 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_cli.c b/source4/scripting/ejs/smbcalls_cli.c
index 3b0905d7d3..d7ffea29fe 100644
--- a/source4/scripting/ejs/smbcalls_cli.c
+++ b/source4/scripting/ejs/smbcalls_cli.c
@@ -26,7 +26,6 @@
 #include "libcli/raw/libcliraw.h"
 #include "libcli/composite/composite.h"
 #include "clilist.h"
-#include "credentials.h"
 
 #if 0
 
diff --git a/source4/scripting/ejs/smbcalls_creds.c b/source4/scripting/ejs/smbcalls_creds.c
index d615bcbed2..cc2ccf8c47 100644
--- a/source4/scripting/ejs/smbcalls_creds.c
+++ b/source4/scripting/ejs/smbcalls_creds.c
@@ -24,7 +24,6 @@
 #include "scripting/ejs/smbcalls.h"
 #include "lib/appweb/ejs/ejs.h"
 #include "lib/cmdline/popt_common.h"
-#include "credentials.h"
 
 /*
   helper function to get the local objects credentials ptr
-- 
cgit 


From 5058f4b9e82ca8b9f2405930db3a46b8c37f06ed Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Wed, 28 Sep 2005 18:18:09 +0000
Subject: r10586: Add MergedObject() builder. Default to Library() rather then
 StaticLibrary() (This used to be commit
 b53313dc517986c69a4e4cb8fe3885b696f8faa1)

---
 source4/scripting/ejs/SConscript | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/SConscript b/source4/scripting/ejs/SConscript
index 5ba45d8e77..43a73a92a0 100644
--- a/source4/scripting/ejs/SConscript
+++ b/source4/scripting/ejs/SConscript
@@ -1,7 +1,7 @@
 Import('hostenv')
 
-hostenv.StaticLibrary('ejsrpc',['ejsrpc.c'])
-hostenv.StaticLibrary('ejs_smbcalls',
+hostenv.Library('ejsrpc',['ejsrpc.c'])
+hostenv.Library('ejs_smbcalls',
 		['smbcalls.c','smbcalls_config.c','smbcalls_ldb.c',
 		 'smbcalls_nbt.c','smbcalls_cli.c','smbcalls_rpc.c',
 		 'smbcalls_auth.c','smbcalls_options.c','smbcalls_nss.c',
-- 
cgit 


From 33da2fabe6c3b1e20a955d72e1ebd0e850751df0 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Wed, 12 Oct 2005 06:30:47 +0000
Subject: r10914: moved the ldap time string functions into ldb so they can be
 used by the time attribute handling functions (This used to be commit
 93c296d52718e77f8b702e1721b548eaadc56c76)

---
 source4/scripting/ejs/smbcalls_sys.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_sys.c b/source4/scripting/ejs/smbcalls_sys.c
index f32605c3d5..340671cf0b 100644
--- a/source4/scripting/ejs/smbcalls_sys.c
+++ b/source4/scripting/ejs/smbcalls_sys.c
@@ -23,6 +23,7 @@
 #include "includes.h"
 #include "scripting/ejs/smbcalls.h"
 #include "lib/appweb/ejs/ejs.h"
+#include "lib/ldb/include/ldb.h"
 #include "system/time.h"
 
 /*
@@ -111,7 +112,7 @@ static int ejs_sys_ldaptime(MprVarHandle eid, int argc, struct MprVar **argv)
 		return -1;
 	}
 	t = nt_time_to_unix(mprVarToNumber(argv[0]));
-	s = ldap_timestring(mprMemCtx(), t);
+	s = ldb_timestring(mprMemCtx(), t);
 	mpr_Return(eid, mprString(s));
 	talloc_free(s);
 	return 0;
-- 
cgit 


From a59cca6f9796ad44e7899e463b20260da1e78fdb Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Sat, 15 Oct 2005 09:25:43 +0000
Subject: r11083: use the addresses from the record

metze
(This used to be commit 5d46cdd1ee8ae2a49a81f0a36a4c3f12d7635de9)
---
 source4/scripting/ejs/smbcalls_samba3.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_samba3.c b/source4/scripting/ejs/smbcalls_samba3.c
index 0e4743eca9..4a4977be60 100644
--- a/source4/scripting/ejs/smbcalls_samba3.c
+++ b/source4/scripting/ejs/smbcalls_samba3.c
@@ -405,7 +405,9 @@ static struct MprVar mprWinsEntries(struct samba3 *samba3)
 		ips = mprObject("array");
 
 		for (j = 0; j < samba3->winsdb_entries[i].ip_count; j++) {
-			mprAddArray(&ips, j, mprString(iface_n_ip(i)));
+			const char *addr;
+			addr = sys_inet_ntoa(samba3->winsdb_entries[i].ips[j]);
+			mprAddArray(&ips, j, mprString(addr));
 		}
 
 		mprSetVar(&w, "ips", ips);
-- 
cgit 


From a8504e1061d248a54be93716ead545b2f066f2cf Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Sat, 15 Oct 2005 09:32:04 +0000
Subject: r11085: as ejs doesn't support '&' '|' bitwise AND and OR, we need
 some helper functions for this

metze
(This used to be commit e27e36909d367748fc653ddc0fd1c699b77780e9)
---
 source4/scripting/ejs/smbcalls_sys.c | 47 ++++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_sys.c b/source4/scripting/ejs/smbcalls_sys.c
index 340671cf0b..5f6a756f8f 100644
--- a/source4/scripting/ejs/smbcalls_sys.c
+++ b/source4/scripting/ejs/smbcalls_sys.c
@@ -257,6 +257,51 @@ static int ejs_sys_lstat(MprVarHandle eid, int argc, char **argv)
 	return 0;
 }
 
+/*
+  bitwise AND
+  usage:
+      var z = sys.bitAND(x, 0x70);
+*/
+static int ejs_sys_bitAND(MprVarHandle eid, int argc, struct MprVar **argv)
+{
+	int x, y, z;
+
+	if (argc != 2 || 
+	    !mprVarIsNumber(argv[0]->type) ||
+	    !mprVarIsNumber(argv[1]->type)) {
+		ejsSetErrorMsg(eid, "bitand invalid arguments");
+		return -1;
+	}
+	x = mprToInt(argv[0]);
+	y = mprToInt(argv[1]);
+	z = x & y;
+
+	mpr_Return(eid, mprCreateIntegerVar(z));
+	return 0;
+}
+
+/*
+  bitwise OR
+  usage:
+      var z = sys.bitOR(x, 0x70);
+*/
+static int ejs_sys_bitOR(MprVarHandle eid, int argc, struct MprVar **argv)
+{
+	int x, y, z;
+
+	if (argc != 2 || 
+	    !mprVarIsNumber(argv[0]->type) ||
+	    !mprVarIsNumber(argv[1]->type)) {
+		ejsSetErrorMsg(eid, "bitand invalid arguments");
+		return -1;
+	}
+	x = mprToInt(argv[0]);
+	y = mprToInt(argv[1]);
+	z = x | y;
+
+	mpr_Return(eid, mprCreateIntegerVar(z));
+	return 0;
+}
 
 /*
   initialise sys ejs subsystem
@@ -276,6 +321,8 @@ static int ejs_sys_init(MprVarHandle eid, int argc, struct MprVar **argv)
 	mprSetStringCFunction(obj, "file_save", ejs_sys_file_save);
 	mprSetStringCFunction(obj, "stat", ejs_sys_stat);
 	mprSetStringCFunction(obj, "lstat", ejs_sys_lstat);
+	mprSetCFunction(obj, "bitAND", ejs_sys_bitAND);
+	mprSetCFunction(obj, "bitOR", ejs_sys_bitOR);
 
 	return 0;
 }
-- 
cgit 


From dab2b6858315909cd26fa5ce5aba84b6b4c3e62e Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Sat, 15 Oct 2005 10:04:33 +0000
Subject: r11086: add sys.unix2nttime() function

metze
(This used to be commit a3abf10d431f82b12b0795d5bc217c8ec3ce89f7)
---
 source4/scripting/ejs/smbcalls_sys.c | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_sys.c b/source4/scripting/ejs/smbcalls_sys.c
index 5f6a756f8f..c4ad668112 100644
--- a/source4/scripting/ejs/smbcalls_sys.c
+++ b/source4/scripting/ejs/smbcalls_sys.c
@@ -66,6 +66,22 @@ static int ejs_sys_nttime(MprVarHandle eid, int argc, struct MprVar **argv)
 	return 0;
 }
 
+/*
+  return time as a 64 bit nttime value from a 32 bit time_t value
+*/
+static int ejs_sys_unix2nttime(MprVarHandle eid, int argc, struct MprVar **argv)
+{
+	NTTIME nt;
+	if (argc != 1 || !mprVarIsNumber(argv[0]->type)) {
+		ejsSetErrorMsg(eid, "sys_unix2nttime invalid arguments");
+		return -1;
+	}
+	unix_to_nt_time(&nt, mprVarToNumber(argv[0]));
+	struct MprVar v = mprCreateNumberVar(nt);
+	mpr_Return(eid, v);
+	return 0;
+}
+
 /*
   return the given time as a gmtime structure
 */
@@ -313,6 +329,7 @@ static int ejs_sys_init(MprVarHandle eid, int argc, struct MprVar **argv)
 	mprSetCFunction(obj, "interfaces", ejs_sys_interfaces);
 	mprSetCFunction(obj, "hostname", ejs_sys_hostname);
 	mprSetCFunction(obj, "nttime", ejs_sys_nttime);
+	mprSetCFunction(obj, "unix2nttime", ejs_sys_unix2nttime);
 	mprSetCFunction(obj, "gmtime", ejs_sys_gmtime);
 	mprSetCFunction(obj, "ldaptime", ejs_sys_ldaptime);
 	mprSetCFunction(obj, "httptime", ejs_sys_httptime);
-- 
cgit 


From c3c26c90088141272affb591702f3c2124eec89f Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Sat, 15 Oct 2005 10:15:42 +0000
Subject: r11087: - add type,name,scope as attributes to winsRecords,   so you
 can use them in search filters,   only for administration not used inside the
 winserver code - fix the samba3 ugrade scripts to create a correct samba4
 wins.ldb

metze
(This used to be commit 9f3b6746d86583c48097da48c28f50f075bbd3e3)
---
 source4/scripting/libjs/upgrade.js | 65 ++++++++++++++++++++++++++++++++++----
 1 file changed, 58 insertions(+), 7 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/upgrade.js b/source4/scripting/libjs/upgrade.js
index 6109371338..60a9725b43 100644
--- a/source4/scripting/libjs/upgrade.js
+++ b/source4/scripting/libjs/upgrade.js
@@ -228,22 +228,73 @@ unixID: %d", m.sid, domaindn, m.sid, m.type, m.unix_id);
 function upgrade_wins(samba3)
 {
 	var ldif = "";
+	var version_id = 0;
+
 	for (i in samba3.winsentries) {
+		var rType;
+		var rState;
+		var nType;
+		var numIPs = 0;
 		var e = samba3.winsentries[i];
-		
+		var now = sys.nttime();
+		var ttl = sys.unix2nttime(e.ttl);
+
+		version_id++;
+
+		for (var i in e.ips) {
+			numIPs++;
+		}
+
+		if (e.type == 0x1C) {
+			rType = 0x2;
+		} else if (sys.bitAND(e.type, 0x80)) {
+			if (numIPs > 1) {
+				rType = 0x2;
+			} else {
+				rType = 0x1;
+			}
+		} else {
+			if (numIPs > 1) {
+				rType = 0x3;
+			} else {
+				rType = 0x0;
+			}
+		}
+
+		if (ttl > now) {
+			rState = 0x0;/* active */
+		} else {
+			rState = 0x1;/* released */		
+		}
+
+		nType = (sys.bitAND(e.nb_flags,0x60)>>5);
+
 		ldif = ldif + sprintf("
-dn: type=%d,name=%s
+dn: name:%s,type=0x%02X
+type: 0x%02X
 name: %s
-objectClass: wins
-nbFlags: %x
-expires: %s
-", e.type, e.name, e.name, e.type, e.nb_flags, sys.ldaptime(e.ttl));
+objectClass: winsRecord
+recordType: %u
+recordState: %u
+nodeType: %u
+isStatic: 0
+expireTime: %s
+versionID: %llu
+", e.name, e.type, e.type, e.name, 
+   rType, rState, nType, 
+   sys.ldaptime(ttl), version_id);
 
 		for (var i in e.ips) {
 			ldif = ldif + sprintf("address: %s\n", e.ips[i]);
 		}
 	}
 
+	ldif = ldif + sprintf("
+dn: CN=VERSION
+objectClass: winsMaxVersion
+maxVersion: %llu
+", version_id);
+
 	return ldif;
 }
 
@@ -569,7 +620,7 @@ data: %d
 dn: @MODULES
 changetype: modify
 replace: @LIST
-@LIST: samldb,timestamps,objectguid,rdn_name,samba3sam
+@LIST: samldb,operational,objectguid,rdn_name,samba3sam
 ");
 		if (!ok) {
 			message("Error enabling samba3sam module: " + samdb.errstring() + "\n");
-- 
cgit 


From e627a90362ca4fd4d00b1aa78b9743a047ba0498 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Wed, 19 Oct 2005 06:09:14 +0000
Subject: r11171: fix the build

metze
(This used to be commit 0d948cf430f34757a17170cdd26ac6b87341a75f)
---
 source4/scripting/ejs/smbcalls_sys.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_sys.c b/source4/scripting/ejs/smbcalls_sys.c
index c4ad668112..f39d5cbddc 100644
--- a/source4/scripting/ejs/smbcalls_sys.c
+++ b/source4/scripting/ejs/smbcalls_sys.c
@@ -72,12 +72,13 @@ static int ejs_sys_nttime(MprVarHandle eid, int argc, struct MprVar **argv)
 static int ejs_sys_unix2nttime(MprVarHandle eid, int argc, struct MprVar **argv)
 {
 	NTTIME nt;
+	struct MprVar v;
 	if (argc != 1 || !mprVarIsNumber(argv[0]->type)) {
 		ejsSetErrorMsg(eid, "sys_unix2nttime invalid arguments");
 		return -1;
 	}
 	unix_to_nt_time(&nt, mprVarToNumber(argv[0]));
-	struct MprVar v = mprCreateNumberVar(nt);
+	v = mprCreateNumberVar(nt);
 	mpr_Return(eid, v);
 	return 0;
 }
-- 
cgit 


From 642b42424a75102c83cd8d1fbd67186db0623e76 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Thu, 20 Oct 2005 04:35:30 +0000
Subject: r11203: Use different variable names to make it easier to tell which
 assert fired.

Andrew Bartlett
(This used to be commit df6a40c2d261804f1cd4feb24572135a4c62a802)
---
 source4/scripting/libjs/provision.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index d700ecd539..56f8251015 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -192,15 +192,15 @@ function setup_ldb(ldif, dbname, subobj)
 
 	ldb.filename = dbname;
 
-	var ok = ldb.connect(dbname);
-	assert(ok);
+	var connect_ok = ldb.connect(dbname);
+	assert(connect_ok);
 
 	if (erase) {
 		ldb_erase(ldb);	
 	}
 
-	ok = ldb.add(data);
-	assert(ok);
+	var add_ok = ldb.add(data);
+	assert(add_ok);
 }
 
 /*
-- 
cgit 


From f4d590662effeb80c2b55ae5ad869b4b7810cf08 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Thu, 20 Oct 2005 10:04:57 +0000
Subject: r11214: Remove scons files (see
 http://lists.samba.org/archive/samba-technical/2005-October/043443.html)
 (This used to be commit 7fffc5c9178158249be632ac0ca179c13bd1f98f)

---
 source4/scripting/SConscript     |  3 ---
 source4/scripting/ejs/SConscript | 12 ------------
 2 files changed, 15 deletions(-)
 delete mode 100644 source4/scripting/SConscript
 delete mode 100644 source4/scripting/ejs/SConscript

(limited to 'source4/scripting')

diff --git a/source4/scripting/SConscript b/source4/scripting/SConscript
deleted file mode 100644
index f32e93aae1..0000000000
--- a/source4/scripting/SConscript
+++ /dev/null
@@ -1,3 +0,0 @@
-Import('hostenv')
-
-SConscript(dirs=['ejs'],exports='hostenv')
diff --git a/source4/scripting/ejs/SConscript b/source4/scripting/ejs/SConscript
deleted file mode 100644
index 43a73a92a0..0000000000
--- a/source4/scripting/ejs/SConscript
+++ /dev/null
@@ -1,12 +0,0 @@
-Import('hostenv')
-
-hostenv.Library('ejsrpc',['ejsrpc.c'])
-hostenv.Library('ejs_smbcalls',
-		['smbcalls.c','smbcalls_config.c','smbcalls_ldb.c',
-		 'smbcalls_nbt.c','smbcalls_cli.c','smbcalls_rpc.c',
-		 'smbcalls_auth.c','smbcalls_options.c','smbcalls_nss.c',
-		 'smbcalls_string.c','smbcalls_data.c','smbcalls_rand.c',
-		 'smbcalls_sys.c','smbcalls_creds.c','smbcalls_samba3.c',
-		 'smbcalls_param.c','mprutil.c'])
-
-hostenv.Program('smbscript',['smbscript.c'])
-- 
cgit 


From 8103ef397409dc4b780ea9bcd98da090a3b01d1e Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Thu, 20 Oct 2005 10:18:45 +0000
Subject: r11217: Ensure the realm is substituted in UPPER case.

Andrew Bartlett
(This used to be commit 0c29f0e30d64be09baad792eb2850aa0b8fa9981)
---
 source4/scripting/libjs/provision.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index 56f8251015..3090626d04 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -252,7 +252,7 @@ function provision(subobj, message, blank, paths)
 	/*
 	  some options need to be upper/lower case
 	*/
-	subobj.REALM       = strlower(subobj.REALM);
+	subobj.REALM       = strupper(subobj.REALM);
 	subobj.HOSTNAME    = strlower(subobj.HOSTNAME);
 	subobj.DOMAIN      = strupper(subobj.DOMAIN);
 	assert(valid_netbios_name(subobj.DOMAIN));
@@ -309,7 +309,7 @@ function provision_guess()
 	var rdn_list;
 	random_init(local);
 
-	subobj.REALM        = lp.get("realm");
+	subobj.REALM        = strupper(lp.get("realm"));
 	subobj.DOMAIN       = lp.get("workgroup");
 	subobj.HOSTNAME     = hostname();
 
-- 
cgit 


From 17be61b7b9cff8bfc668ec1d08dc442a8ad30088 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Thu, 20 Oct 2005 11:19:03 +0000
Subject: r11222: Small provision fixes: canonicalName is now generated, and
 the DC= list should be from the dnsdomain (ie lowercae).

Andrew Bartlett
(This used to be commit 10d692a1c216134b301b5851ce1e71ed93cc6164)
---
 source4/scripting/libjs/provision.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index 3090626d04..101110ea3e 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -340,7 +340,7 @@ function provision_guess()
 	subobj.DNSNAME      = sprintf("%s.%s", 
 				      strlower(subobj.HOSTNAME), 
 				      subobj.DNSDOMAIN);
-	rdn_list = split(".", subobj.REALM);
+	rdn_list = split(".", subobj.DNSDOMAIN);
 	subobj.BASEDN       = "DC=" + join(",DC=", rdn_list);
 	return subobj;
 }
-- 
cgit 


From 4c5a4a7e0288e9ac0b2f795befd5684059e4c429 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Fri, 21 Oct 2005 16:29:54 +0000
Subject: r11244: Relative path names in .mk files (This used to be commit
 24e10300906c380919d2d631bfb3b8fd6b3f54ba)

---
 source4/scripting/config.mk     |  2 ++
 source4/scripting/ejs/config.mk | 38 +++++++++++++++++++-------------------
 2 files changed, 21 insertions(+), 19 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/config.mk b/source4/scripting/config.mk
index 9e6be54457..69a5dd4efe 100644
--- a/source4/scripting/config.mk
+++ b/source4/scripting/config.mk
@@ -1,3 +1,5 @@
+include ejs/config.mk
+
 #######################
 # Start LIBRARY swig_tdb
 [LIBRARY::swig_tdb]
diff --git a/source4/scripting/ejs/config.mk b/source4/scripting/ejs/config.mk
index b997a656ab..a53c378e9d 100644
--- a/source4/scripting/ejs/config.mk
+++ b/source4/scripting/ejs/config.mk
@@ -2,7 +2,7 @@
 # Start LIBRARY EJSRPC
 [SUBSYSTEM::EJSRPC]
 OBJ_FILES = \
-		scripting/ejs/ejsrpc.o
+		ejsrpc.o
 REQUIRED_SUBSYSTEMS = RPC_EJS
 NOPROTO = YES
 # End SUBSYSTEM EJSRPC
@@ -12,23 +12,23 @@ NOPROTO = YES
 # Start LIBRARY SMBCALLS
 [SUBSYSTEM::SMBCALLS]
 OBJ_FILES = \
-		scripting/ejs/smbcalls.o \
-		scripting/ejs/smbcalls_config.o \
-		scripting/ejs/smbcalls_ldb.o \
-		scripting/ejs/smbcalls_nbt.o \
-		scripting/ejs/smbcalls_cli.o \
-		scripting/ejs/smbcalls_rpc.o \
-		scripting/ejs/smbcalls_auth.o \
-		scripting/ejs/smbcalls_options.o \
-		scripting/ejs/smbcalls_nss.o \
-		scripting/ejs/smbcalls_string.o \
-		scripting/ejs/smbcalls_data.o \
-		scripting/ejs/smbcalls_rand.o \
-		scripting/ejs/smbcalls_sys.o \
-		scripting/ejs/smbcalls_creds.o \
-		scripting/ejs/smbcalls_samba3.o \
-		scripting/ejs/smbcalls_param.o \
-		scripting/ejs/mprutil.o
+		smbcalls.o \
+		smbcalls_config.o \
+		smbcalls_ldb.o \
+		smbcalls_nbt.o \
+		smbcalls_cli.o \
+		smbcalls_rpc.o \
+		smbcalls_auth.o \
+		smbcalls_options.o \
+		smbcalls_nss.o \
+		smbcalls_string.o \
+		smbcalls_data.o \
+		smbcalls_rand.o \
+		smbcalls_sys.o \
+		smbcalls_creds.o \
+		smbcalls_samba3.o \
+		smbcalls_param.o \
+		mprutil.o
 REQUIRED_SUBSYSTEMS = AUTH EJS LIBBASIC EJSRPC MESSAGING LIBSAMBA3
 # End SUBSYSTEM SMBCALLS
 #######################
@@ -38,7 +38,7 @@ REQUIRED_SUBSYSTEMS = AUTH EJS LIBBASIC EJSRPC MESSAGING LIBSAMBA3
 [BINARY::smbscript]
 INSTALLDIR = BINDIR
 OBJ_FILES = \
-		scripting/ejs/smbscript.o
+		smbscript.o
 REQUIRED_SUBSYSTEMS = EJS LIBBASIC SMBCALLS CONFIG LIBSMB RPC LIBCMDLINE
 # End BINARY SMBSCRIPT
 #######################
-- 
cgit 


From ab6ae6838eaad3f7e31cb7dd3ce8ac4a75fd2c84 Mon Sep 17 00:00:00 2001
From: Rafal Szczesniak <mimir@samba.org>
Date: Mon, 24 Oct 2005 21:10:53 +0000
Subject: r11281: Initial ejs interface for libnet functions.

rafal
(This used to be commit f9c436bbdf0f071247da025f6984f9ee1c48dca8)
---
 source4/scripting/ejs/config.mk  |   3 +-
 source4/scripting/ejs/ejsnet.c   | 119 +++++++++++++++++++++++++++++++++++++++
 source4/scripting/ejs/ejsnet.h   |  27 +++++++++
 source4/scripting/ejs/smbcalls.c |   1 +
 4 files changed, 149 insertions(+), 1 deletion(-)
 create mode 100644 source4/scripting/ejs/ejsnet.c
 create mode 100644 source4/scripting/ejs/ejsnet.h

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/config.mk b/source4/scripting/ejs/config.mk
index a53c378e9d..bc24671921 100644
--- a/source4/scripting/ejs/config.mk
+++ b/source4/scripting/ejs/config.mk
@@ -28,8 +28,9 @@ OBJ_FILES = \
 		smbcalls_creds.o \
 		smbcalls_samba3.o \
 		smbcalls_param.o \
+		ejsnet.o \
 		mprutil.o
-REQUIRED_SUBSYSTEMS = AUTH EJS LIBBASIC EJSRPC MESSAGING LIBSAMBA3
+REQUIRED_SUBSYSTEMS = AUTH EJS LIBBASIC EJSRPC MESSAGING LIBSAMBA3 LIBNET
 # End SUBSYSTEM SMBCALLS
 #######################
 
diff --git a/source4/scripting/ejs/ejsnet.c b/source4/scripting/ejs/ejsnet.c
new file mode 100644
index 0000000000..fea1608170
--- /dev/null
+++ b/source4/scripting/ejs/ejsnet.c
@@ -0,0 +1,119 @@
+/* 
+   Unix SMB/CIFS implementation.
+
+   provide interfaces to libnet calls from ejs scripts
+
+   Copyright (C) Rafal Szczesniak  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 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.
+*/
+
+#include "includes.h"
+#include "lib/appweb/ejs/ejs.h"
+#include "scripting/ejs/smbcalls.h"
+#include "scripting/ejs/ejsnet.h"
+#include "libnet/libnet.h"
+
+
+static int ejs_net_context(MprVarHandle eid, int argc, struct MprVar **argv)
+{
+	struct cli_credentials *creds;
+	struct libnet_context *ctx;
+	struct MprVar *obj;
+
+	ctx = libnet_context_init(NULL);
+	creds = talloc(ctx, struct cli_credentials);
+	ctx->cred = creds;
+
+	if (argc == 0) {
+		cli_credentials_set_anonymous(creds);
+
+	} else if (argc == 2 || argc == 4 ) {
+
+		if (!mprVarIsString(argv[0]->type)) {
+			ejsSetErrorMsg(eid, "argument 1 must be a string");
+			goto done;
+		}
+		cli_credentials_set_username(creds, argv[0]->string, CRED_SPECIFIED);
+
+		if (!mprVarIsString(argv[1]->type)) {
+			ejsSetErrorMsg(eid, "argument 2 must be a string");
+			goto done;
+		}
+		cli_credentials_set_password(creds, argv[1]->string, CRED_SPECIFIED);
+
+	} else {
+		ejsSetErrorMsg(eid, "invalid number of arguments");
+		goto done;
+	}
+
+		
+	if (argc == 4) {
+
+		if (!mprVarIsString(argv[2]->type)) {
+			ejsSetErrorMsg(eid, "argument 3 must be a string");
+			goto done;
+		}
+		cli_credentials_set_domain(creds, argv[2]->string, CRED_SPECIFIED);
+		
+		if (!mprVarIsString(argv[3]->type)) {
+			ejsSetErrorMsg(eid, "argument 4 must be a string");
+			goto done;
+		}
+		cli_credentials_set_realm(creds, argv[3]->string, CRED_SPECIFIED);
+	}
+
+	obj = mprInitObject(eid, "NetCtx", argc, argv);
+
+	mprSetStringCFunction(obj, "CreateUser", ejs_net_createuser);
+	mprSetPtrChild(obj, "ctx", ctx);
+
+	return 0;
+done:
+	talloc_free(ctx);
+	return -1;
+}
+
+
+static int ejs_net_createuser(MprVarHandle eid, int argc, char **argv)
+{
+	NTSTATUS status = NT_STATUS_UNSUCCESSFUL;
+	TALLOC_CTX *mem_ctx;
+	struct libnet_context *ctx;
+	struct libnet_CreateUser req;
+
+	if (argc != 1) {
+		ejsSetErrorMsg(eid, "argument 1 must be a string");
+		goto done;
+	}
+
+	ctx = mprGetThisPtr(eid, "ctx");
+	mem_ctx = talloc_init(NULL);
+	
+	req.in.domain_name = cli_credentials_get_domain(ctx->cred);
+	req.in.user_name   = argv[0];
+
+	status = libnet_CreateUser(ctx, mem_ctx, &req);
+
+	talloc_free(mem_ctx);
+done:
+	return NT_STATUS_IS_OK(status) ? 0 : -1;
+}
+
+
+void ejsnet_setup(void)
+{
+	ejsDefineCFunction(-1, "NetContext", ejs_net_context, NULL, MPR_VAR_SCRIPT_HANDLE);
+}
diff --git a/source4/scripting/ejs/ejsnet.h b/source4/scripting/ejs/ejsnet.h
new file mode 100644
index 0000000000..4ea64df36b
--- /dev/null
+++ b/source4/scripting/ejs/ejsnet.h
@@ -0,0 +1,27 @@
+/* 
+   Unix SMB/CIFS implementation.
+
+   provide interfaces to libnet calls from ejs scripts
+
+   Copyright (C) Rafal Szczesniak  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 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.
+*/
+
+#include "lib/appweb/ejs/ejs.h"
+
+
+void ejsnet_setup(void);
+static int ejs_net_createuser(MprVarHandle, int, char**);
diff --git a/source4/scripting/ejs/smbcalls.c b/source4/scripting/ejs/smbcalls.c
index d0ce1366a5..3e5035b272 100644
--- a/source4/scripting/ejs/smbcalls.c
+++ b/source4/scripting/ejs/smbcalls.c
@@ -131,6 +131,7 @@ void smb_setup_ejs_functions(void)
 	smb_setup_ejs_samba3();
 	smb_setup_ejs_param();
 	smb_setup_ejs_datablob();
+	ejsnet_setup();
 
 	ejsDefineCFunction(-1, "typeof", ejs_typeof, NULL, MPR_VAR_SCRIPT_HANDLE);
 	ejsDefineStringCFunction(-1, "libinclude", ejs_libinclude, NULL, MPR_VAR_SCRIPT_HANDLE);
-- 
cgit 


From 75d3a8f6dc74601e30f667a1dbd09a4dad0ebe1c Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Tue, 25 Oct 2005 09:30:48 +0000
Subject: r11285: fixed winreg.js for the recent change to winreg.idl (This
 used to be commit 27f46b4f18346ea03d8626a380e417b00f7a88d1)

---
 source4/scripting/libjs/winreg.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/winreg.js b/source4/scripting/libjs/winreg.js
index adcefcae85..63435ac22b 100644
--- a/source4/scripting/libjs/winreg.js
+++ b/source4/scripting/libjs/winreg.js
@@ -24,7 +24,7 @@ function __winreg_open_hive(hive)
 {
 	var io = irpcObj();
 	io.input.system_name = NULL;
-	io.input.access_required = this.SEC_FLAG_MAXIMUM_ALLOWED;
+	io.input.access_mask = this.SEC_FLAG_MAXIMUM_ALLOWED;
 	var status;
 	if (hive == "HKLM") {
 		status = this.winreg_OpenHKLM(io);
@@ -248,7 +248,7 @@ function __winreg_create_key(path, key)
 	io.input.name = key;
 	io.input.class = NULL;
 	io.input.options = 0;
-	io.input.access_required = this.SEC_FLAG_MAXIMUM_ALLOWED;
+	io.input.access_mask = this.SEC_FLAG_MAXIMUM_ALLOWED;
 	io.input.secdesc = NULL;
 	io.input.action_taken = 0;	
 
-- 
cgit 


From 8ee1ee66edb1c98b63cbc26741080932995156a4 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Wed, 26 Oct 2005 14:18:27 +0000
Subject: r11303: Support defining and installing public headers for libraries.
 Support installing libraries. Get rid of pkg-config file (will be
 autogenerated later on). (This used to be commit
 b4745032a2c55752c527026feb221ccc3dce10c8)

---
 source4/scripting/ejs/config.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/config.mk b/source4/scripting/ejs/config.mk
index bc24671921..f789cbad0e 100644
--- a/source4/scripting/ejs/config.mk
+++ b/source4/scripting/ejs/config.mk
@@ -40,6 +40,6 @@ REQUIRED_SUBSYSTEMS = AUTH EJS LIBBASIC EJSRPC MESSAGING LIBSAMBA3 LIBNET
 INSTALLDIR = BINDIR
 OBJ_FILES = \
 		smbscript.o
-REQUIRED_SUBSYSTEMS = EJS LIBBASIC SMBCALLS CONFIG LIBSMB RPC LIBCMDLINE
+REQUIRED_SUBSYSTEMS = EJS LIBBASIC SMBCALLS CONFIG LIBSMB LIBRPC LIBCMDLINE
 # End BINARY SMBSCRIPT
 #######################
-- 
cgit 


From b22bda753390b19e85296cf547ce3f7abaf7fb1a Mon Sep 17 00:00:00 2001
From: Rafal Szczesniak <mimir@samba.org>
Date: Wed, 26 Oct 2005 21:04:53 +0000
Subject: r11308: Correctly return status code in case of js error or libnet
 function execution error.

rafal
(This used to be commit a50a5bef6e4c0051d13ed59fe5ddade709a98ba7)
---
 source4/scripting/ejs/ejsnet.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/ejsnet.c b/source4/scripting/ejs/ejsnet.c
index fea1608170..bed660aceb 100644
--- a/source4/scripting/ejs/ejsnet.c
+++ b/source4/scripting/ejs/ejsnet.c
@@ -106,10 +106,17 @@ static int ejs_net_createuser(MprVarHandle eid, int argc, char **argv)
 	req.in.user_name   = argv[0];
 
 	status = libnet_CreateUser(ctx, mem_ctx, &req);
+	if (!NT_STATUS_IS_OK(status)) {
+		ejsSetErrorMsg(eid, "error when creating user: %s", nt_errstr(status));
+	}
 
 	talloc_free(mem_ctx);
+	mpr_Return(eid, mprNTSTATUS(status));
+	return 0;
+
 done:
-	return NT_STATUS_IS_OK(status) ? 0 : -1;
+	talloc_free(mem_ctx);
+	return -1;
 }
 
 
-- 
cgit 


From e0ab3485eeeee130cf43b333562f30f09a29cfd8 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Fri, 28 Oct 2005 04:10:47 +0000
Subject: r11354: - generate a ejs error on bad ldif to add/modify

- fixed a double free error in ldb.close()
(This used to be commit 7f797e7097cffa1f5b5bac34e100af77d4026f89)
---
 source4/scripting/ejs/smbcalls_ldb.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_ldb.c b/source4/scripting/ejs/smbcalls_ldb.c
index ec2748a426..83d5f1ae44 100644
--- a/source4/scripting/ejs/smbcalls_ldb.c
+++ b/source4/scripting/ejs/smbcalls_ldb.c
@@ -129,7 +129,7 @@ static int ejs_ldbAddModify(MprVarHandle eid, int argc, struct MprVar **argv,
 	const char *ldifstring;
 	struct ldb_context *ldb;
 	struct ldb_ldif *ldif;
-	int ret = 0;
+	int ret = 0, count=0;
 
 	if (argc != 1) {
 		ejsSetErrorMsg(eid, "ldb.add/modify invalid arguments");
@@ -148,11 +148,17 @@ static int ejs_ldbAddModify(MprVarHandle eid, int argc, struct MprVar **argv,
 	}
 
 	while ((ldif = ldb_ldif_read_string(ldb, &ldifstring))) {
+		count++;
 		ret = fn(ldb, ldif->msg);
 		talloc_free(ldif);
 		if (ret != 0) break;
 	}
 
+	if (count == 0) {
+		ejsSetErrorMsg(eid, "ldb.add/modify invalid ldif");
+		return -1;
+	}
+
 	mpr_Return(eid, mprCreateBoolVar(ret == 0));
 	return 0;
 }
@@ -384,8 +390,6 @@ static int ejs_ldbClose(MprVarHandle eid, int argc, struct MprVar **argv)
 		return -1;
 	}
 
-	talloc_free(ldb);
-
 	mprSetThisPtr(eid, "db", NULL);
 	mpr_Return(eid, mprCreateBoolVar(True));
 	return 0;
-- 
cgit 


From c5b99e3c696939f432b865e938caf31439385edf Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Fri, 28 Oct 2005 07:00:52 +0000
Subject: r11363: fixed a problem with provisioning when hklm already exists
 (the problem is really caused by hklm not having objectclass attributes on
 its records, but this is a workaround) (This used to be commit
 62d5253a033f47335ceefade9ad7d98ddfc19584)

---
 source4/scripting/libjs/provision.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index 101110ea3e..6b76d2bc1f 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -157,7 +157,7 @@ function ldb_erase(ldb)
 	for (i=0;i<res.length;i++) {
 		ldb.del(res[i].dn);
 	}
-	res = ldb.search("(objectclass=*)", attrs);
+	res = ldb.search("(|(objectclass=*)(dn=*))", attrs);
 	if (res.length != 0) {
 		ldb_delete(ldb);
 		return;
@@ -165,7 +165,6 @@ function ldb_erase(ldb)
 	assert(res.length == 0);
 }
 
-
 /*
   setup a ldb in the private dir
  */
-- 
cgit 


From ea4ad9152a0cea08914580a71c3e4987d65ba284 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Fri, 28 Oct 2005 07:05:56 +0000
Subject: r11365: fixed a comment typo (This used to be commit
 3333d71ab6594c1e8977098c31c9437686039f1c)

---
 source4/scripting/ejs/smbcalls_string.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_string.c b/source4/scripting/ejs/smbcalls_string.c
index 66e2210ea8..5976e42251 100644
--- a/source4/scripting/ejs/smbcalls_string.c
+++ b/source4/scripting/ejs/smbcalls_string.c
@@ -93,7 +93,7 @@ static int ejs_strstr(MprVarHandle eid, int argc, char **argv)
   usage:
      list = split(".", "a.foo.bar");
 
-  NOTE: does not take a regular expression, unlink perl split()
+  NOTE: does not take a regular expression, unlike perl split()
 */
 static int ejs_split(MprVarHandle eid, int argc, char **argv)
 {
-- 
cgit 


From 4e052d1fe472d8a60c76988c17d291c958ceb46d Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Tue, 1 Nov 2005 13:32:09 +0000
Subject: r11439: Make presedence on strcmp comparison clear, and fill in
 logon_parameters for the auth subsystem.

Andrew Bartlett
(This used to be commit 767c5ca7bec3737d1261e209cd895d1300354f25)
---
 source4/scripting/ejs/smbcalls_auth.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_auth.c b/source4/scripting/ejs/smbcalls_auth.c
index 672694bbc5..ba20332aaa 100644
--- a/source4/scripting/ejs/smbcalls_auth.c
+++ b/source4/scripting/ejs/smbcalls_auth.c
@@ -72,6 +72,8 @@ static int ejs_doauth(TALLOC_CTX *tmp_ctx, struct MprVar *auth, const char *user
 	user_info->flags = USER_INFO_CASE_INSENSITIVE_USERNAME |
 		USER_INFO_DONT_CHECK_UNIX_ACCOUNT;
 
+	user_info->logon_parameters = 0;
+
 	nt_status = auth_check_password(auth_context, tmp_ctx, user_info, &server_info);
 	if (!NT_STATUS_IS_OK(nt_status)) {
 		mprSetPropertyValue(auth, "result", mprCreateBoolVar(False));
@@ -135,7 +137,7 @@ static int ejs_userAuth(MprVarHandle eid, int argc, struct MprVar **argv)
 
 	auth = mprObject("auth");
 
-	if (domain && strcmp("System User", domain) == 0) {
+	if (domain && (strcmp("System User", domain) == 0)) {
 		ejs_doauth(tmp_ctx, &auth, username, password, domain, remote_host, "unix");
 	} else {
 		ejs_doauth(tmp_ctx, &auth, username, password, domain, remote_host, "sam");
-- 
cgit 


From 783851099b43236666b2fc0cc866834773d6e7b7 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Wed, 2 Nov 2005 01:04:00 +0000
Subject: r11458: fixed our ejs smbscript interfaces to use arrays where
 appropriate. In js arrays are a special type of object where the length
 property is automatic, and cannot be modified manually. Our code was manually
 setting length, which made it abort when someone passed in a real ejs array.
 To fix this we need to create real arrays instead of objects, and remove the
 code that manually sets the length (This used to be commit
 ebdd1393fde44a0a35446d1a922d29a7c1769ba7)

---
 source4/scripting/bin/winreg            | 13 ++++++++++---
 source4/scripting/ejs/mprutil.c         | 27 +++++++++++++++++----------
 source4/scripting/ejs/smbcalls_data.c   |  2 +-
 source4/scripting/ejs/smbcalls_samba3.c | 28 ++++++++++++++--------------
 source4/scripting/ejs/smbcalls_string.c |  2 +-
 source4/scripting/ejs/smbcalls_sys.c    |  2 +-
 source4/scripting/libjs/management.js   |  3 +--
 source4/scripting/libjs/winreg.js       | 13 +++----------
 8 files changed, 48 insertions(+), 42 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/bin/winreg b/source4/scripting/bin/winreg
index ac6f9e61ba..2114394f45 100755
--- a/source4/scripting/bin/winreg
+++ b/source4/scripting/bin/winreg
@@ -61,13 +61,15 @@ function list_values(path) {
 }
 
 function list_path(path) {
+	var count = 0;
 	var list = reg.enum_path(path);
 	if (list == undefined) {
 		println("Unable to list " + path);
-		return;
+		return 0;
 	}
 	var i;
 	list_values(path);
+	count = count + list.length;
 	for (i=0;i<list.length;i++) {
 		var npath;
 		if (path) {
@@ -76,8 +78,9 @@ function list_path(path) {
 			npath = list[i];
 		}
 		println(npath);
-		list_path(npath);
+		count = count + list_path(npath);
 	}
+	return count;
 }
 
 var root;
@@ -95,6 +98,10 @@ if (options.createkey) {
 	}
 } else {
 	printf("Listing registry tree '%s'\n", root);
-	list_path(root);
+	var count = list_path(root);
+	if (count == 0) {
+		println("No entries found");
+		return 1;
+	}
 }
 return 0;
diff --git a/source4/scripting/ejs/mprutil.c b/source4/scripting/ejs/mprutil.c
index 9634c9bf42..91683db6bd 100644
--- a/source4/scripting/ejs/mprutil.c
+++ b/source4/scripting/ejs/mprutil.c
@@ -32,6 +32,14 @@ struct MprVar mprObject(const char *name)
 	return ejsCreateObj(name && *name?name:"(NULL)", MPR_DEFAULT_HASH_SIZE);
 }
 
+/*
+  return a empty mpr array
+*/
+struct MprVar mprArray(const char *name)
+{
+	return ejsCreateArray(name && *name?name:"(NULL)", 0);
+}
+
 /*
   find a mpr component, allowing for sub objects, using the '.' convention
 */
@@ -101,7 +109,6 @@ struct MprVar mprObject(const char *name)
 	char idx[16];
 	mprItoa(i, idx, sizeof(idx));
 	mprSetVar(var, idx, v);
-	mprSetVar(var, "length", mprCreateIntegerVar(i+1));
 }
 
 /*
@@ -112,13 +119,10 @@ struct MprVar mprList(const char *name, const char **list)
 	struct MprVar var;
 	int i;
 
-	var = mprObject(name);
+	var = mprArray(name);
 	for (i=0;list && list[i];i++) {
 		mprAddArray(&var, i, mprString(list[i]));
 	}
-	if (i==0) {
-		mprSetVar(&var, "length", mprCreateIntegerVar(i));
-	}
 	return var;
 }
 
@@ -182,7 +186,7 @@ static struct MprVar mprLdbMessage(struct ldb_context *ldb, struct ldb_message *
 			val = mprData(v.data, v.length);
 		} else {
 			int j;
-			val = mprObject(el->name);
+			val = mprArray(el->name);
 			for (j=0;j<el->num_values;j++) {
 				if (attr->ldif_write_fn(ldb, msg, 
 							&el->values[j], &v) != 0) {
@@ -214,13 +218,10 @@ struct MprVar mprLdbArray(struct ldb_context *ldb,
 	struct MprVar res;
 	int i;
 
-	res = mprObject(name);
+	res = mprArray(name);
 	for (i=0;i<count;i++) {
 		mprAddArray(&res, i, mprLdbMessage(ldb, msg[i]));
 	}
-	if (i==0) {
-		mprSetVar(&res, "length", mprCreateIntegerVar(0));
-	}
 	return res;
 }
 
@@ -230,6 +231,9 @@ struct MprVar mprLdbArray(struct ldb_context *ldb,
  */
 const char *mprToString(const struct MprVar *v)
 {
+	if (v->trigger) {
+		mprReadProperty(v, 0);
+	}
 	if (!mprVarIsString(v->type)) return NULL;
 	return v->string;
 }
@@ -239,6 +243,9 @@ const char *mprToString(const struct MprVar *v)
  */
 int mprToInt(const struct MprVar *v)
 {
+	if (v->trigger) {
+		mprReadProperty(v, 0);
+	}
 	if (!mprVarIsNumber(v->type)) return 0;
 	return mprVarToNumber(v);
 }
diff --git a/source4/scripting/ejs/smbcalls_data.c b/source4/scripting/ejs/smbcalls_data.c
index 4859de94d7..54e496ea57 100644
--- a/source4/scripting/ejs/smbcalls_data.c
+++ b/source4/scripting/ejs/smbcalls_data.c
@@ -88,7 +88,7 @@ static int ejs_blobToArray(MprVarHandle eid, int argc, struct MprVar **argv)
 		goto failed;
 	}
 
-	array = mprObject("array");
+	array = mprArray("array");
 	
 	for (i=0;i<blob->length;i++) {
 		mprAddArray(&array, i, mprCreateNumberVar(blob->data[i]));
diff --git a/source4/scripting/ejs/smbcalls_samba3.c b/source4/scripting/ejs/smbcalls_samba3.c
index 4a4977be60..0a05e4584f 100644
--- a/source4/scripting/ejs/smbcalls_samba3.c
+++ b/source4/scripting/ejs/smbcalls_samba3.c
@@ -31,14 +31,14 @@ static struct MprVar mprRegistry(struct samba3_regdb *reg)
 	struct MprVar mpv = mprObject("registry"), ks, vs, k, v;
 	int i, j;
 
-	ks = mprObject("array");
+	ks = mprArray("array");
 
 	for (i = 0; i < reg->key_count; i++) {
 		k = mprObject("regkey");
 
 		mprSetVar(&k, "name", mprString(reg->keys[i].name));
 
-		vs = mprObject("array");
+		vs = mprArray("array");
 		
 		for (j = 0; j < reg->keys[i].value_count; j++) {
 			v = mprObject("regval");
@@ -90,7 +90,7 @@ static struct MprVar mprIdmapDb(struct samba3_idmapdb *db)
 	mprSetVar(&mpv, "user_hwm", mprCreateIntegerVar(db->user_hwm));
 	mprSetVar(&mpv, "group_hwm", mprCreateIntegerVar(db->group_hwm));
 
-	mps = mprObject("array");
+	mps = mprArray("array");
 
 	for (i = 0; i < db->mapping_count; i++) {
 		char *tmp;
@@ -120,7 +120,7 @@ static struct MprVar mprIdmapDb(struct samba3_idmapdb *db)
 
 static struct MprVar mprGroupMappings(struct samba3_groupdb *db)
 {
-	struct MprVar mpv = mprObject("array"), g;
+	struct MprVar mpv = mprArray("array"), g;
 	int i;
 
 	for (i = 0; i < db->groupmap_count; i++) {
@@ -161,7 +161,7 @@ static struct MprVar mprAliases(struct samba3_groupdb *db)
 		mprSetVar(&a, "sid", mprString(tmp));
 		talloc_free(tmp);
 
-		am = mprObject("array");
+		am = mprArray("array");
 
 		for (j = 0; j < db->aliases[i].member_count; j++) {
 			tmp = dom_sid_string(NULL, db->aliases[i].members[j]);
@@ -218,7 +218,7 @@ static struct MprVar mprSecrets(struct samba3_secrets *sec)
 	struct MprVar mpv = mprObject("samba3_secrets"), es, e;
 	int i;
 
-	es = mprObject("array");
+	es = mprArray("array");
 
 	for (i = 0; i < sec->ldappw_count; i++) {
 		e = mprObject("ldappw");
@@ -231,7 +231,7 @@ static struct MprVar mprSecrets(struct samba3_secrets *sec)
 
 	mprSetVar(&mpv, "ldappws", es);
 
-	es = mprObject("array");
+	es = mprArray("array");
 
 	for (i = 0; i < sec->domain_count; i++) {
 		mprAddArray(&es, i, mprDomainSecrets(&sec->domains[i]));
@@ -243,7 +243,7 @@ static struct MprVar mprSecrets(struct samba3_secrets *sec)
 
 	mprSetVar(&mpv, "domains", es);
 
-	es = mprObject("trusted_domains");
+	es = mprArray("trusted_domains");
 
 	for (i = 0; i < sec->trusted_domain_count; i++) {
 		struct MprVar ns;
@@ -251,7 +251,7 @@ static struct MprVar mprSecrets(struct samba3_secrets *sec)
 		int j;
 		e = mprObject("trusted_domain");
 
-		ns = mprObject("array");
+		ns = mprArray("array");
 
 		for (j = 0; j < sec->trusted_domains[i].uni_name_len; j++) {
 			mprAddArray(&ns, j, mprString(sec->trusted_domains[i].uni_name[j]));
@@ -275,7 +275,7 @@ static struct MprVar mprSecrets(struct samba3_secrets *sec)
 
 	mprSetVar(&mpv, "trusted_domains", es);
 	
-	es = mprObject("array");
+	es = mprArray("array");
 
 	for (i = 0; i < sec->afs_keyfile_count; i++) {
 		struct MprVar ks;
@@ -284,7 +284,7 @@ static struct MprVar mprSecrets(struct samba3_secrets *sec)
 
 		mprSetVar(&e, "cell", mprString(sec->afs_keyfiles[i].cell));
 
-		ks = mprObject("array");
+		ks = mprArray("array");
 		
 		for (j = 0; j < 8; j++) {
 			struct MprVar k = mprObject("entry");
@@ -318,7 +318,7 @@ static struct MprVar mprSecrets(struct samba3_secrets *sec)
 
 static struct MprVar mprShares(struct samba3 *samba3)
 {
-	struct MprVar mpv = mprObject("array"), s;
+	struct MprVar mpv = mprArray("array"), s;
 	int i;
 
 	for (i = 0; i < samba3->share_count; i++) {
@@ -340,7 +340,7 @@ static struct MprVar mprShares(struct samba3 *samba3)
 
 static struct MprVar mprSamAccounts(struct samba3 *samba3)
 {
-	struct MprVar mpv = mprObject("array"), m;
+	struct MprVar mpv = mprArray("array"), m;
 	int i;
 
 	for (i = 0; i < samba3->samaccount_count; i++) {
@@ -391,7 +391,7 @@ static struct MprVar mprSamAccounts(struct samba3 *samba3)
 
 static struct MprVar mprWinsEntries(struct samba3 *samba3)
 {
-	struct MprVar mpv = mprObject("array");
+	struct MprVar mpv = mprArray("array");
 	int i, j;
 
 	for (i = 0; i < samba3->winsdb_count; i++) {
diff --git a/source4/scripting/ejs/smbcalls_string.c b/source4/scripting/ejs/smbcalls_string.c
index 5976e42251..e9e6e148d1 100644
--- a/source4/scripting/ejs/smbcalls_string.c
+++ b/source4/scripting/ejs/smbcalls_string.c
@@ -109,7 +109,7 @@ static int ejs_split(MprVarHandle eid, int argc, char **argv)
 	separator = argv[0];
 	s = argv[1];
 
-	ret = mprObject("list");
+	ret = mprArray("list");
 
 	while ((p = strstr(s, separator))) {
 		char *s2 = talloc_strndup(tmp_ctx, s, (int)(p-s));
diff --git a/source4/scripting/ejs/smbcalls_sys.c b/source4/scripting/ejs/smbcalls_sys.c
index f39d5cbddc..1a876c9e87 100644
--- a/source4/scripting/ejs/smbcalls_sys.c
+++ b/source4/scripting/ejs/smbcalls_sys.c
@@ -32,7 +32,7 @@
 static int ejs_sys_interfaces(MprVarHandle eid, int argc, struct MprVar **argv)
 {
 	int i, count = iface_count();
-	struct MprVar ret = mprObject("interfaces");
+	struct MprVar ret = mprArray("interfaces");
 	for (i=0;i<count;i++) {
 		mprAddArray(&ret, i, mprString(iface_n_ip(i)));
 	}
diff --git a/source4/scripting/libjs/management.js b/source4/scripting/libjs/management.js
index 26c1c0a34a..1258368e90 100644
--- a/source4/scripting/libjs/management.js
+++ b/source4/scripting/libjs/management.js
@@ -24,7 +24,7 @@ function smbsrv_sessions()
 	}
 
 	/* gather the results into a single array */
-	var i, count=0, ret = new Object();
+	var i, count=0, ret = new Array(0);
 	for (i=0;i<io.results.length;i++) {
 		var sessions = io.results[i].info.sessions.sessions;
 		var j;
@@ -33,7 +33,6 @@ function smbsrv_sessions()
 			count++;
 		}
 	}
-	ret.length = count;
 	return ret;
 }
 
diff --git a/source4/scripting/libjs/winreg.js b/source4/scripting/libjs/winreg.js
index 63435ac22b..3b05f89c93 100644
--- a/source4/scripting/libjs/winreg.js
+++ b/source4/scripting/libjs/winreg.js
@@ -51,16 +51,13 @@ function __winreg_open_path(path)
 {
 	var s = string_init();
 	var i, components = s.split('\\', path);
-	var list = new Object();
-
-	list.length = 0;
 
 	/* cope with a leading slash */
 	if (components[0] == '') {
 		for (i=0;i<(components.length-1);i++) {
 			components[i] = components[i+1];
 		}
-		components.length--;
+		delete(components[i]);
 	}
 	
 	if (components.length == 0) {
@@ -108,8 +105,7 @@ function __winreg_open_path(path)
 */
 function __winreg_enum_path(path)
 {
-	var list = new Object();
-	list.length = 0;
+	var list = new Array(0);
 
 	if (path == null || path == "\\" || path == "") {
 		return new Array("HKLM", "HKU");
@@ -155,7 +151,6 @@ function __winreg_enum_path(path)
 			return list;
 		}
 		list[list.length] = out.name.name;
-		list.length++;
 	}
 
 	this.close(handle);
@@ -174,8 +169,7 @@ function __winreg_enum_path(path)
 function __winreg_enum_values(path)
 {
 	var data = datablob_init();
-	var list = new Object();
-	list.length = 0;
+	var list = new Array(0);
 
 	var handle = this.open_path(path);
 	if (handle == undefined) {
@@ -224,7 +218,6 @@ function __winreg_enum_values(path)
 		el.value = data.regToVar(el.rawvalue, el.type);
 		el.size  = out.size;
 		list[list.length] = el;
-		list.length++;
 	}
 
 	this.close(handle);
-- 
cgit 


From c845ab1e60f2c97410fa4d530aa594f1f3d5fe55 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Wed, 2 Nov 2005 06:41:11 +0000
Subject: r11474: - enable ldb transactions from ejs

- speed up provisioning a bit using a ldb transaction (also means you
  can't end up with a ldb being half done)
(This used to be commit 91dfe304cf688bb81b69ff3192ac84b78b34b311)
---
 source4/scripting/ejs/smbcalls_ldb.c | 81 ++++++++++++++++++++++++++++++++++++
 source4/scripting/libjs/provision.js | 23 ++++++++--
 2 files changed, 100 insertions(+), 4 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_ldb.c b/source4/scripting/ejs/smbcalls_ldb.c
index 83d5f1ae44..b77736dc36 100644
--- a/source4/scripting/ejs/smbcalls_ldb.c
+++ b/source4/scripting/ejs/smbcalls_ldb.c
@@ -396,6 +396,84 @@ static int ejs_ldbClose(MprVarHandle eid, int argc, struct MprVar **argv)
 }
 
 
+/*
+  start a ldb transaction
+  usage:
+   ok = ldb.transaction_start();
+*/
+static int ejs_ldbTransactionStart(MprVarHandle eid, int argc, struct MprVar **argv)
+{
+	struct ldb_context *ldb;
+	int ret;
+
+	if (argc != 0) {
+		ejsSetErrorMsg(eid, "ldb.transaction_start invalid arguments");
+		return -1;
+	}
+
+	ldb = ejs_get_ldb_context(eid);
+	if (ldb == NULL) {
+		return -1;
+	}
+
+	ret = ldb_transaction_start(ldb);
+
+	mpr_Return(eid, mprCreateBoolVar(ret == 0));
+	return 0;
+}
+
+/*
+  cancel a ldb transaction
+  usage:
+   ok = ldb.transaction_cancel();
+*/
+static int ejs_ldbTransactionCancel(MprVarHandle eid, int argc, struct MprVar **argv)
+{
+	struct ldb_context *ldb;
+	int ret;
+
+	if (argc != 0) {
+		ejsSetErrorMsg(eid, "ldb.transaction_cancel invalid arguments");
+		return -1;
+	}
+
+	ldb = ejs_get_ldb_context(eid);
+	if (ldb == NULL) {
+		return -1;
+	}
+
+	ret = ldb_transaction_cancel(ldb);
+
+	mpr_Return(eid, mprCreateBoolVar(ret == 0));
+	return 0;
+}
+
+/*
+  commit a ldb transaction
+  usage:
+   ok = ldb.transaction_commit();
+*/
+static int ejs_ldbTransactionCommit(MprVarHandle eid, int argc, struct MprVar **argv)
+{
+	struct ldb_context *ldb;
+	int ret;
+
+	if (argc != 0) {
+		ejsSetErrorMsg(eid, "ldb.transaction_commit invalid arguments");
+		return -1;
+	}
+
+	ldb = ejs_get_ldb_context(eid);
+	if (ldb == NULL) {
+		return -1;
+	}
+
+	ret = ldb_transaction_commit(ldb);
+
+	mpr_Return(eid, mprCreateBoolVar(ret == 0));
+	return 0;
+}
+
 /*
   initialise ldb ejs subsystem
 */
@@ -413,6 +491,9 @@ static int ejs_ldb_init(MprVarHandle eid, int argc, struct MprVar **argv)
 	mprSetCFunction(ldb, "encode", ejs_base64encode);
 	mprSetCFunction(ldb, "decode", ejs_base64decode);
 	mprSetCFunction(ldb, "close", ejs_ldbClose);
+	mprSetCFunction(ldb, "transaction_start", ejs_ldbTransactionStart);
+	mprSetCFunction(ldb, "transaction_cancel", ejs_ldbTransactionCancel);
+	mprSetCFunction(ldb, "transaction_commit", ejs_ldbTransactionCommit);
 	mprSetVar(ldb, "SCOPE_BASE", mprCreateNumberVar(LDB_SCOPE_BASE));
 	mprSetVar(ldb, "SCOPE_ONE", mprCreateNumberVar(LDB_SCOPE_ONELEVEL));
 	mprSetVar(ldb, "SCOPE_SUBTREE", mprCreateNumberVar(LDB_SCOPE_SUBTREE));
diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index 6b76d2bc1f..8c2398e74e 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -128,9 +128,12 @@ function hostname()
 function ldb_delete(ldb)
 {
 	println("Deleting " + ldb.filename);
-	sys.unlink(ldb.filename);
+	var lp = loadparm_init();
+	sys.unlink(sprintf("%s/%s", lp.get("private dir"), ldb.filename));
+	ldb.transaction_cancel();
 	ldb.close();
 	var ok = ldb.connect(ldb.filename);
+	ldb.transaction_start();
 	assert(ok);
 }
 
@@ -148,7 +151,7 @@ function ldb_erase(ldb)
 	ldb.del("@MODULES");
 
 	/* and the rest */
-	var res = ldb.search("(|(objectclass=*)(dn=*))", attrs);
+	var res = ldb.search("(&(|(objectclass=*)(dn=*))(!(dn=@BASEINFO)))", attrs);
 	var i;
 	if (typeof(res) == "undefined") {
 		ldb_delete(ldb);
@@ -157,12 +160,13 @@ function ldb_erase(ldb)
 	for (i=0;i<res.length;i++) {
 		ldb.del(res[i].dn);
 	}
-	res = ldb.search("(|(objectclass=*)(dn=*))", attrs);
+	var res = ldb.search("(&(|(objectclass=*)(dn=*))(!(dn=@BASEINFO)))", attrs);
 	if (res.length != 0) {
 		ldb_delete(ldb);
 		return;
 	}
 	assert(res.length == 0);
+	ldb_delete(ldb);
 }
 
 /*
@@ -194,12 +198,15 @@ function setup_ldb(ldif, dbname, subobj)
 	var connect_ok = ldb.connect(dbname);
 	assert(connect_ok);
 
+	ldb.transaction_start();
+
 	if (erase) {
 		ldb_erase(ldb);	
 	}
 
 	var add_ok = ldb.add(data);
 	assert(add_ok);
+	ldb.transaction_commit();
 }
 
 /*
@@ -279,6 +286,8 @@ function provision(subobj, message, blank, paths)
 	setup_ldb("hklm.ldif", paths.hklm, subobj);
 	message("Setting up sam.ldb attributes\n");
 	setup_ldb("provision_init.ldif", paths.samdb, subobj);
+//	message("Setting up sam.ldb objectclasses\n");
+//	setup_ldb("schema_classes.ldif", paths.samdb, subobj, NULL, false);
 	message("Setting up sam.ldb templates\n");
 	setup_ldb("provision_templates.ldif", paths.samdb, subobj, NULL, false);
 	message("Setting up sam.ldb data\n");
@@ -394,6 +403,8 @@ function newuser(username, unixname, password, message)
 	var ok = ldb.connect(samdb);
 	assert(ok);
 
+	ldb.transaction_start();
+
 	/* find the DNs for the domain and the domain users group */
 	var domain_dn = searchone(ldb, "objectClass=domainDNS", "dn");
 	assert(domain_dn != undefined);
@@ -451,7 +462,11 @@ member: %s
 	/*
 	  modify the userAccountControl to remove the disabled bit
 	*/
-	return enable_account(ldb, user_dn);
+	ok = enable_account(ldb, user_dn);
+	if (ok) {
+		ldb.transaction_commit();
+	}
+	return ok;
 }
 
 // Check whether a name is valid as a NetBIOS name. 
-- 
cgit 


From 917ca215bb72dd9b7a93a8d883c286b140c4300c Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Wed, 2 Nov 2005 06:49:08 +0000
Subject: r11475: removed a extraneous ldb_delete() call (i had it there for
 debugging) (This used to be commit daa9dcd8f4b1dde801091ec64faa8158481d171c)

---
 source4/scripting/libjs/provision.js | 1 -
 1 file changed, 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index 8c2398e74e..959b71b6b3 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -166,7 +166,6 @@ function ldb_erase(ldb)
 		return;
 	}
 	assert(res.length == 0);
-	ldb_delete(ldb);
 }
 
 /*
-- 
cgit 


From 4764eb7a937ebd7ae5fc300dc384434c616a0662 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Fri, 4 Nov 2005 02:23:50 +0000
Subject: r11496: add a minimal ads-compatible schema into our sam.ldb setup.
 This is needed for mmc management of Samba4. (This used to be commit
 cbbce4fe403efc0b9e63052c2aa1fbb5972f2abe)

---
 source4/scripting/libjs/provision.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index 959b71b6b3..1584cb18ec 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -285,8 +285,8 @@ function provision(subobj, message, blank, paths)
 	setup_ldb("hklm.ldif", paths.hklm, subobj);
 	message("Setting up sam.ldb attributes\n");
 	setup_ldb("provision_init.ldif", paths.samdb, subobj);
-//	message("Setting up sam.ldb objectclasses\n");
-//	setup_ldb("schema_classes.ldif", paths.samdb, subobj, NULL, false);
+	message("Setting up sam.ldb schema\n");
+	setup_ldb("schema.ldif", paths.samdb, subobj, NULL, false);
 	message("Setting up sam.ldb templates\n");
 	setup_ldb("provision_templates.ldif", paths.samdb, subobj, NULL, false);
 	message("Setting up sam.ldb data\n");
-- 
cgit 


From 218d306ece7f4c0cf962fdc4178dedc759869f4b Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Fri, 4 Nov 2005 04:05:48 +0000
Subject: r11498: added an optional extra argument to split to limit the number
 of pieces a string is split into. This allows for a fix in the variable
 substitution used in provisioning (This used to be commit
 be06785d4835abcbc7d75c0176c85a8ecc0cc11d)

---
 source4/scripting/ejs/smbcalls_string.c | 27 +++++++++++++++++++--------
 1 file changed, 19 insertions(+), 8 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_string.c b/source4/scripting/ejs/smbcalls_string.c
index e9e6e148d1..d742d43173 100644
--- a/source4/scripting/ejs/smbcalls_string.c
+++ b/source4/scripting/ejs/smbcalls_string.c
@@ -92,22 +92,30 @@ static int ejs_strstr(MprVarHandle eid, int argc, char **argv)
 /*
   usage:
      list = split(".", "a.foo.bar");
+     list = split(".", "a.foo.bar", count);
+
+  count is an optional count of how many splits to make
 
   NOTE: does not take a regular expression, unlike perl split()
 */
-static int ejs_split(MprVarHandle eid, int argc, char **argv)
+static int ejs_split(MprVarHandle eid, int argc, struct MprVar **argv)
 {
-	const char *separator;
-	char *s, *p;
+	const char *separator, *s;
+	char *p;
 	struct MprVar ret;
-	int count = 0;
+	int count = 0, maxcount=0;
 	TALLOC_CTX *tmp_ctx = talloc_new(mprMemCtx());
-	if (argc != 2) {
+	if (argc < 2 ||
+	    argv[0]->type != MPR_TYPE_STRING ||
+	    argv[1]->type != MPR_TYPE_STRING) {
 		ejsSetErrorMsg(eid, "split invalid arguments");
 		return -1;
 	}
-	separator = argv[0];
-	s = argv[1];
+	separator = mprToString(argv[0]);
+	s         = mprToString(argv[1]);
+	if (argc == 3) {
+		maxcount = mprToInt(argv[2]);
+	}
 
 	ret = mprArray("list");
 
@@ -116,6 +124,9 @@ static int ejs_split(MprVarHandle eid, int argc, char **argv)
 		mprAddArray(&ret, count++, mprString(s2));
 		talloc_free(s2);
 		s = p + strlen(separator);
+		if (maxcount != 0 && count >= maxcount) {
+			break;
+		}
 	}
 	if (*s) {
 		mprAddArray(&ret, count++, mprString(s));
@@ -481,7 +492,7 @@ static int ejs_string_init(MprVarHandle eid, int argc, struct MprVar **argv)
 	mprSetStringCFunction(obj, "strlower", ejs_strlower);
 	mprSetStringCFunction(obj, "strupper", ejs_strupper);
 	mprSetStringCFunction(obj, "strstr", ejs_strstr);
-	mprSetStringCFunction(obj, "split", ejs_split);
+	mprSetCFunction(obj, "split", ejs_split);
 	mprSetCFunction(obj, "join", ejs_join);
 	mprSetCFunction(obj, "sprintf", ejs_sprintf);
 	mprSetCFunction(obj, "vsprintf", ejs_vsprintf);
-- 
cgit 


From 318ac84440754b467cdfb363a47e3fafce1b0fec Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Fri, 4 Nov 2005 04:07:24 +0000
Subject: r11500: fixed a bug in the variable substition code using the new
 limit argument to split() (This used to be commit
 25131efea8c1a2b0bfa7f999766ebcbab8fa8006)

---
 source4/scripting/libjs/base.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/base.js b/source4/scripting/libjs/base.js
index 8a07f4e383..fbceabf993 100644
--- a/source4/scripting/libjs/base.js
+++ b/source4/scripting/libjs/base.js
@@ -71,7 +71,7 @@ function substitute_var(str, subobj)
 	var list = split("${", str);
 	var i;
 	for (i=1;i<list.length;i++) {
-		var list2 = split("}", list[i]);
+		var list2 = split("}", list[i], 1);
 		if (list2.length < 2) {
 			return undefined;
 		}
-- 
cgit 


From b00252c5b8235a1c962db86b67d45417457a4337 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Fri, 4 Nov 2005 04:07:45 +0000
Subject: r11501: change provision code to use the new display specifiers (This
 used to be commit 696fa87a212e65d6337c39a84f682b64b52593a5)

---
 source4/scripting/libjs/provision.js | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index 1584cb18ec..a304076d22 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -287,6 +287,8 @@ function provision(subobj, message, blank, paths)
 	setup_ldb("provision_init.ldif", paths.samdb, subobj);
 	message("Setting up sam.ldb schema\n");
 	setup_ldb("schema.ldif", paths.samdb, subobj, NULL, false);
+	message("Setting up display specifiers\n");
+	setup_ldb("display_specifiers.ldif", paths.samdb, subobj, NULL, false);
 	message("Setting up sam.ldb templates\n");
 	setup_ldb("provision_templates.ldif", paths.samdb, subobj, NULL, false);
 	message("Setting up sam.ldb data\n");
-- 
cgit 


From 5c9590587197dcb95007fdc54318187d5716c7c6 Mon Sep 17 00:00:00 2001
From: Simo Sorce <idra@samba.org>
Date: Tue, 8 Nov 2005 00:11:45 +0000
Subject: r11567: Ldb API change patch.

This patch changes the way lsb_search is called and the meaning of the returned integer.
The last argument of ldb_search is changed from struct ldb_message to struct ldb_result
which contains a pointer to a struct ldb_message list and a count of the number of messages.
The return is not the count of messages anymore but instead it is an ldb error value.

I tryed to keep the patch as tiny as possible bu as you can guess I had to change a good
amount of places. I also tried to double check all my changes being sure that the calling
functions would still behave as before. But this patch is big enough that I fear some bug
may have been introduced anyway even if it passes the test suite. So if you are currently
working on any file being touched please give it a deep look and blame me for any error.

Simo.
(This used to be commit 22c8c97e6fb466b41859e090e959d7f1134be780)
---
 source4/scripting/ejs/smbcalls_ldb.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_ldb.c b/source4/scripting/ejs/smbcalls_ldb.c
index b77736dc36..d3db85db86 100644
--- a/source4/scripting/ejs/smbcalls_ldb.c
+++ b/source4/scripting/ejs/smbcalls_ldb.c
@@ -25,6 +25,7 @@
 #include "scripting/ejs/smbcalls.h"
 #include "lib/appweb/ejs/ejs.h"
 #include "lib/ldb/include/ldb.h"
+#include "lib/ldb/include/ldb_errors.h"
 
 /*
   get the connected db
@@ -58,7 +59,7 @@ static int ejs_ldbSearch(MprVarHandle eid, int argc, struct MprVar **argv)
 	TALLOC_CTX *tmp_ctx = talloc_new(mprMemCtx());
 	struct ldb_context *ldb;
 	int ret;
-	struct ldb_message **res;
+	struct ldb_result *res;
 
 	/* validate arguments */
 	if (argc < 1 || argc > 4) {
@@ -104,11 +105,11 @@ static int ejs_ldbSearch(MprVarHandle eid, int argc, struct MprVar **argv)
 		attrs = mprToList(tmp_ctx, argv[3]);
 	}
 	ret = ldb_search(ldb, basedn, scope, expression, attrs, &res);
-	if (ret == -1) {
+	if (ret != LDB_SUCCESS) {
 		ejsSetErrorMsg(eid, "ldb.search failed - %s", ldb_errstring(ldb));
 		mpr_Return(eid, mprCreateUndefinedVar());
 	} else {
-		mpr_Return(eid, mprLdbArray(ldb, res, ret, "ldb_message"));
+		mpr_Return(eid, mprLdbArray(ldb, res->msgs, res->count, "ldb_message"));
 	}
 
 	talloc_free(tmp_ctx);
-- 
cgit 


From 2a006a7e6bf4a8813b1c5d9b07643082d98a4988 Mon Sep 17 00:00:00 2001
From: Rafal Szczesniak <mimir@samba.org>
Date: Tue, 8 Nov 2005 23:22:21 +0000
Subject: r11586: Further work on ejs interface for libnet. The idea is to
 split libnet functionalities into groups of subcontexts of net subcontext
 just the way it's done in net tool. This way we can pass common arguments
 when creating subcontext. Also, this may allow easier writing net tool
 completely as a script.

At the moment there's a name resolve code segfault to be fixed.

rafal
(This used to be commit 25310d05927dab69d37248977f974bcaedbd081b)
---
 source4/scripting/ejs/ejsnet.c | 60 +++++++++++++++++++++++++++++++++++++++---
 source4/scripting/ejs/ejsnet.h |  1 +
 2 files changed, 57 insertions(+), 4 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/ejsnet.c b/source4/scripting/ejs/ejsnet.c
index bed660aceb..4dc52f5771 100644
--- a/source4/scripting/ejs/ejsnet.c
+++ b/source4/scripting/ejs/ejsnet.c
@@ -76,10 +76,10 @@ static int ejs_net_context(MprVarHandle eid, int argc, struct MprVar **argv)
 	}
 
 	obj = mprInitObject(eid, "NetCtx", argc, argv);
-
-	mprSetStringCFunction(obj, "CreateUser", ejs_net_createuser);
 	mprSetPtrChild(obj, "ctx", ctx);
 
+	mprSetCFunction(obj, "UserMgr", ejs_net_userman);
+
 	return 0;
 done:
 	talloc_free(ctx);
@@ -87,11 +87,52 @@ done:
 }
 
 
+static int ejs_net_userman(MprVarHandle eid, int argc, struct MprVar **argv)
+{
+	NTSTATUS status = NT_STATUS_UNSUCCESSFUL;
+	TALLOC_CTX *mem_ctx;
+	struct libnet_context *ctx;
+	const char *userman_domain = NULL;
+	struct MprVar *obj = NULL;
+
+	ctx = mprGetThisPtr(eid, "ctx");
+	mem_ctx = talloc_init(NULL);
+
+	if (argc == 0) {
+		userman_domain = cli_credentials_get_domain(ctx->cred);
+
+	} else if (argc == 1 && mprVarIsString(argv[0]->type)) {
+		userman_domain = talloc_strdup(ctx, mprToString(argv[0]));
+
+	} else {
+		ejsSetErrorMsg(eid, "too many arguments");
+		goto done;
+	}
+	
+	if (!userman_domain) {
+		ejsSetErrorMsg(eid, "a domain must be specified for user management");
+		goto done;
+	}
+
+	obj = mprInitObject(eid, "NetUsrCtx", argc, argv);
+	mprSetPtrChild(obj, "ctx", ctx);
+	mprSetPtrChild(obj, "domain", userman_domain);
+
+	mprSetStringCFunction(obj, "Create", ejs_net_createuser);
+
+	return 0;
+done:
+	talloc_free(mem_ctx);
+	return -1;
+}
+
+
 static int ejs_net_createuser(MprVarHandle eid, int argc, char **argv)
 {
 	NTSTATUS status = NT_STATUS_UNSUCCESSFUL;
 	TALLOC_CTX *mem_ctx;
 	struct libnet_context *ctx;
+	const char *userman_domain = NULL;
 	struct libnet_CreateUser req;
 
 	if (argc != 1) {
@@ -100,9 +141,20 @@ static int ejs_net_createuser(MprVarHandle eid, int argc, char **argv)
 	}
 
 	ctx = mprGetThisPtr(eid, "ctx");
-	mem_ctx = talloc_init(NULL);
+	if (!ctx) {
+		ejsSetErrorMsg(eid, "ctx property returns null pointer");
+		goto done;
+	}
+
+	userman_domain = mprGetThisPtr(eid, "domain");
+	if (!userman_domain) {
+		ejsSetErrorMsg(eid, "domain property returns null pointer");
+		goto done;
+	}
 	
-	req.in.domain_name = cli_credentials_get_domain(ctx->cred);
+	mem_ctx = talloc_init(NULL);
+
+    	req.in.domain_name = userman_domain;
 	req.in.user_name   = argv[0];
 
 	status = libnet_CreateUser(ctx, mem_ctx, &req);
diff --git a/source4/scripting/ejs/ejsnet.h b/source4/scripting/ejs/ejsnet.h
index 4ea64df36b..50978c648d 100644
--- a/source4/scripting/ejs/ejsnet.h
+++ b/source4/scripting/ejs/ejsnet.h
@@ -24,4 +24,5 @@
 
 
 void ejsnet_setup(void);
+static int ejs_net_userman(MprVarHandle, int, struct MprVar**);
 static int ejs_net_createuser(MprVarHandle, int, char**);
-- 
cgit 


From 8aae0d3d63779f3921668c56fc9a237001ff53a8 Mon Sep 17 00:00:00 2001
From: Rafal Szczesniak <mimir@samba.org>
Date: Wed, 9 Nov 2005 00:38:46 +0000
Subject: r11588: Remove unused (at the moment) variable and quiet compiler
 warning.

rafal
(This used to be commit 90db7f13bc0df0a276dc736d2f9439616cb3b2f7)
---
 source4/scripting/ejs/ejsnet.c | 1 -
 1 file changed, 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/ejsnet.c b/source4/scripting/ejs/ejsnet.c
index 4dc52f5771..f26cea6d3a 100644
--- a/source4/scripting/ejs/ejsnet.c
+++ b/source4/scripting/ejs/ejsnet.c
@@ -89,7 +89,6 @@ done:
 
 static int ejs_net_userman(MprVarHandle eid, int argc, struct MprVar **argv)
 {
-	NTSTATUS status = NT_STATUS_UNSUCCESSFUL;
 	TALLOC_CTX *mem_ctx;
 	struct libnet_context *ctx;
 	const char *userman_domain = NULL;
-- 
cgit 


From 5518741f3fb350cd08fc09e18deca1eede7e26f5 Mon Sep 17 00:00:00 2001
From: Rafal Szczesniak <mimir@samba.org>
Date: Wed, 16 Nov 2005 20:37:15 +0000
Subject: r11748: By default, use name resolution method provided by means of
 smb.conf.

rafal
(This used to be commit 739169e8eda74ad53d728fe6d11a30513c218853)
---
 source4/scripting/ejs/ejsnet.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/ejsnet.c b/source4/scripting/ejs/ejsnet.c
index f26cea6d3a..82e0eb81fe 100644
--- a/source4/scripting/ejs/ejsnet.c
+++ b/source4/scripting/ejs/ejsnet.c
@@ -36,6 +36,7 @@ static int ejs_net_context(MprVarHandle eid, int argc, struct MprVar **argv)
 	ctx = libnet_context_init(NULL);
 	creds = talloc(ctx, struct cli_credentials);
 	ctx->cred = creds;
+	ctx->name_res_methods = lp_name_resolve_order();
 
 	if (argc == 0) {
 		cli_credentials_set_anonymous(creds);
-- 
cgit 


From 509be8d902038ec2a75ece5fd28d43d73218f0b2 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Fri, 18 Nov 2005 12:20:16 +0000
Subject: r11781: rename tree to tcons to match the sessions substructure of
 smbsrv_connection

metze
(This used to be commit acd3e644e030a3544ddc6cdcd4e0ec9617732cba)
---
 source4/scripting/libjs/management.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/management.js b/source4/scripting/libjs/management.js
index 1258368e90..e54b5e283b 100644
--- a/source4/scripting/libjs/management.js
+++ b/source4/scripting/libjs/management.js
@@ -39,7 +39,7 @@ function smbsrv_sessions()
 /*
   return a list of current tree connects
 */
-function smbsrv_trees()
+function smbsrv_tcons()
 {
 	var irpc = irpc_init();
 	status = irpc.connect("smb_server");
@@ -48,7 +48,7 @@ function smbsrv_trees()
 	}
 
 	var io = irpcObj();
-	io.input.level = irpc.SMBSRV_INFO_TREES;
+	io.input.level = irpc.SMBSRV_INFO_TCONS;
 	status = irpc.smbsrv_information(io);
 	if (status.is_ok != true) {
 		return undefined;
@@ -57,10 +57,10 @@ function smbsrv_trees()
 	/* gather the results into a single array */
 	var i, count=0, ret = new Object();
 	for (i=0;i<io.results.length;i++) {
-		var trees = io.results[i].info.trees.trees;
+		var tcons = io.results[i].info.tcons.tcons;
 		var j;
-		for (j=0;j<trees.length;j++) {
-			ret[count] = trees[j];
+		for (j=0;j<tcons.length;j++) {
+			ret[count] = tcons[j];
 			count++;
 		}
 	}
-- 
cgit 


From 9aef045b2719e85fa2ede826b0b4fa2e592eab02 Mon Sep 17 00:00:00 2001
From: Rafal Szczesniak <mimir@samba.org>
Date: Sun, 20 Nov 2005 21:40:41 +0000
Subject: r11814: 1) Set name resolution methods according to smb.conf 2) Set
 credentials workstation name, otherwise rpc bind function    segfaults on
 auth stage

rafal
(This used to be commit 6dc67ba6a30e6fc3fc21821d009ea940b093eec2)
---
 source4/scripting/ejs/ejsnet.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/ejsnet.c b/source4/scripting/ejs/ejsnet.c
index 82e0eb81fe..5768fb4442 100644
--- a/source4/scripting/ejs/ejsnet.c
+++ b/source4/scripting/ejs/ejsnet.c
@@ -36,12 +36,15 @@ static int ejs_net_context(MprVarHandle eid, int argc, struct MprVar **argv)
 	ctx = libnet_context_init(NULL);
 	creds = talloc(ctx, struct cli_credentials);
 	ctx->cred = creds;
-	ctx->name_res_methods = lp_name_resolve_order();
+
+	ctx->name_res_methods = str_list_copy(ctx, lp_name_resolve_order());
 
 	if (argc == 0) {
 		cli_credentials_set_anonymous(creds);
 
 	} else if (argc == 2 || argc == 4 ) {
+	  
+		cli_credentials_set_workstation(creds, lp_netbios_name(), CRED_SPECIFIED);
 
 		if (!mprVarIsString(argv[0]->type)) {
 			ejsSetErrorMsg(eid, "argument 1 must be a string");
-- 
cgit 


From 09932e03837e7c41fdc3a2985f005a6b255fd26c Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Tue, 29 Nov 2005 08:58:39 +0000
Subject: r11956: removed the old rootdse.ldif, and the provision.js code that
 uses it (This used to be commit 4b56c129c6f1654f9dbe37bc950a836f15c48b3d)

---
 source4/scripting/libjs/provision.js | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index a304076d22..513fb23cd9 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -238,7 +238,6 @@ function provision_default_paths(subobj)
 	paths.hkpd = "hkpd.ldb";
 	paths.hkpt = "hkpt.ldb";
 	paths.samdb = "sam.ldb";
-	paths.rootdse = "rootdse.ldb";
 	paths.secrets = "secrets.ldb";
 	paths.dns = lp.get("private dir") + "/" + subobj.DNSDOMAIN + ".zone";
 	paths.winsdb = "wins.ldb";
@@ -297,8 +296,6 @@ function provision(subobj, message, blank, paths)
 		message("Setting up sam.ldb users and groups\n");
 		setup_ldb("provision_users.ldif", paths.samdb, subobj, data, false);
 	}
-	message("Setting up rootdse.ldb\n");
-	setup_ldb("rootdse.ldif", paths.rootdse, subobj);
 	message("Setting up secrets.ldb\n");
 	setup_ldb("secrets.ldif", paths.secrets, subobj);
 	message("Setting up DNS zone file\n");
-- 
cgit 


From 9c6b7f2d62e134a4bc15efc04e05be25e4a53dc7 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Thu, 1 Dec 2005 05:20:39 +0000
Subject: r11995: A big kerberos-related update.

This merges Samba4 up to current lorikeet-heimdal, which includes a
replacement for some Samba-specific hacks.

In particular, the credentials system now supplies GSS client and
server credentials.  These are imported into GSS with
gss_krb5_import_creds().  Unfortunetly this can't take an MEMORY
keytab, so we now create a FILE based keytab as provision and join
time.

Because the keytab is now created in advance, we don't spend .4s at
negprot doing sha1 s2k calls.  Also, because the keytab is read in
real time, any change in the server key will be correctly picked up by
the the krb5 code.

To mark entries in the secrets which should be exported to a keytab,
there is a new kerberosSecret objectClass.  The new routine
cli_credentials_update_all_keytabs() searches for these, and updates
the keytabs.

This is called in the provision.js via the ejs wrapper
credentials_update_all_keytabs().

We can now (in theory) use a system-provided /etc/krb5.keytab, if

krb5Keytab: FILE:/etc/krb5.keytab

is added to the secrets.ldb record.  By default the attribute

privateKeytab: secrets.keytab

is set, pointing to allow the whole private directory to be moved
without breaking the internal links.
(This used to be commit 6b75573df49c6210e1b9d71e108a9490976bd41d)
---
 source4/scripting/ejs/smbcalls_creds.c | 12 ++++++++++++
 source4/scripting/libjs/provision.js   |  3 +++
 2 files changed, 15 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_creds.c b/source4/scripting/ejs/smbcalls_creds.c
index cc2ccf8c47..3cd554b957 100644
--- a/source4/scripting/ejs/smbcalls_creds.c
+++ b/source4/scripting/ejs/smbcalls_creds.c
@@ -240,6 +240,16 @@ int ejs_credentials_cmdline(int eid, int argc, struct MprVar **argv)
 	return ejs_credentials_obj(obj, cmdline_credentials);
 }
 
+static int ejs_credentials_update_all_keytabs(MprVarHandle eid, int argc, struct MprVar **argv)
+{
+	if (!NT_STATUS_IS_OK(cli_credentials_update_all_keytabs(mprMemCtx()))) {
+		mpr_Return(eid, mprCreateBoolVar(False));
+	} else {
+		mpr_Return(eid, mprCreateBoolVar(True));
+	}
+	return 0;
+}
+
 
 /*
   setup C functions that be called from ejs
@@ -247,4 +257,6 @@ int ejs_credentials_cmdline(int eid, int argc, struct MprVar **argv)
 void smb_setup_ejs_credentials(void)
 {
 	ejsDefineCFunction(-1, "credentials_init", ejs_credentials_init, NULL, MPR_VAR_SCRIPT_HANDLE);
+	ejsDefineCFunction(-1, "credentials_update_all_keytabs", ejs_credentials_update_all_keytabs, NULL, MPR_VAR_SCRIPT_HANDLE);
 }
+
diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index 513fb23cd9..0b6a31ae4f 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -302,6 +302,9 @@ function provision(subobj, message, blank, paths)
 	setup_file("provision.zone", 
 		   paths.dns, 
 		   subobj);
+	message("Setting up keytabs\n");
+	var keytab_ok = credentials_update_all_keytabs();
+	assert(keytab_ok);
 }
 
 /*
-- 
cgit 


From d72e8aacaffeb2fbfb0a79c1a1a1ca10a52cf4bf Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Fri, 2 Dec 2005 07:02:38 +0000
Subject: r12012: fix renaming smbsrv_trees -> smbsrv_tcons

metze
(This used to be commit e5654f9791a2786e45108216344b2daea3ad9d91)
---
 source4/scripting/bin/smbstatus | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/bin/smbstatus b/source4/scripting/bin/smbstatus
index d5610023d6..ea41289dce 100755
--- a/source4/scripting/bin/smbstatus
+++ b/source4/scripting/bin/smbstatus
@@ -47,18 +47,18 @@ function show_sessions()
 /*
   show open tree connects
 */
-function show_trees()
+function show_tcons()
 {
-	var trees = smbsrv_trees();
+	var tcons = smbsrv_tcons();
 	var sys = sys_init();
-	if (trees == undefined) {
+	if (tcons == undefined) {
 		println("No tree connects");
 		return;
 	}
 	printf("Share                                 Client      Connected at\n");
 	printf("-------------------------------------------------------------------------------\n");
-	for (i=0;i<trees.length;i++) {
-		var info = trees[i];
+	for (i=0;i<tcons.length;i++) {
+		var info = tcons[i];
 		printf("%-30s %16s   %s\n", 
 		       info.share_name, info.client_ip, sys.httptime(info.connect_time));
 	}
@@ -90,7 +90,7 @@ if (options['nbt'] != undefined) {
 	show_nbt();
 } else {
 	show_sessions();
-	show_trees();
+	show_tcons();
 }
 
 return 0;
-- 
cgit 


From e4ed5dd5bc35df7ded773600f993603573e665ca Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Fri, 2 Dec 2005 07:11:43 +0000
Subject: r12013: fix compiler warnings

metze
(This used to be commit 4d35c2b8e671cc8fe44971cf2a577236afd1abbd)
---
 source4/scripting/ejs/ejsrpc.c | 8 ++++----
 source4/scripting/ejs/ejsrpc.h | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/ejsrpc.c b/source4/scripting/ejs/ejsrpc.c
index de25d3a0f0..a0fee2efe7 100644
--- a/source4/scripting/ejs/ejsrpc.c
+++ b/source4/scripting/ejs/ejsrpc.c
@@ -148,15 +148,15 @@ NTSTATUS ejs_push_hyper(struct ejs_rpc *ejs,
 }
 
 NTSTATUS ejs_pull_dlong(struct ejs_rpc *ejs, 
-			struct MprVar *v, const char *name, uint64_t *r)
+			struct MprVar *v, const char *name, int64_t *r)
 {
-	return ejs_pull_hyper(ejs, v, name, r);
+	return ejs_pull_hyper(ejs, v, name, (uint64_t *)r);
 }
 
 NTSTATUS ejs_push_dlong(struct ejs_rpc *ejs, 
-			struct MprVar *v, const char *name, const uint64_t *r)
+			struct MprVar *v, const char *name, const int64_t *r)
 {
-	return ejs_push_hyper(ejs, v, name, r);
+	return ejs_push_hyper(ejs, v, name, (const uint64_t *)r);
 }
 
 NTSTATUS ejs_pull_udlong(struct ejs_rpc *ejs, 
diff --git a/source4/scripting/ejs/ejsrpc.h b/source4/scripting/ejs/ejsrpc.h
index 03919c3602..a790beb804 100644
--- a/source4/scripting/ejs/ejsrpc.h
+++ b/source4/scripting/ejs/ejsrpc.h
@@ -67,9 +67,9 @@ NTSTATUS ejs_pull_hyper(struct ejs_rpc *ejs,
 NTSTATUS ejs_push_hyper(struct ejs_rpc *ejs, 
 			struct MprVar *v, const char *name, const uint64_t *r);
 NTSTATUS ejs_pull_dlong(struct ejs_rpc *ejs, 
-			struct MprVar *v, const char *name, uint64_t *r);
+			struct MprVar *v, const char *name, int64_t *r);
 NTSTATUS ejs_push_dlong(struct ejs_rpc *ejs, 
-			struct MprVar *v, const char *name, const uint64_t *r);
+			struct MprVar *v, const char *name, const int64_t *r);
 NTSTATUS ejs_pull_udlong(struct ejs_rpc *ejs, 
 			struct MprVar *v, const char *name, uint64_t *r);
 NTSTATUS ejs_push_udlong(struct ejs_rpc *ejs, 
-- 
cgit 


From 150848248a8b97c58a6f09c83a8784e61f858170 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Fri, 2 Dec 2005 07:30:34 +0000
Subject: r12014: free the irpc_request structure with the irpc_call_recv
 functions, to match all other _recv functions we have

metze
(This used to be commit bd4f85ab5f60c7430ac88062fa6a9f6cffa9596f)
---
 source4/scripting/ejs/smbcalls_rpc.c | 1 -
 1 file changed, 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_rpc.c b/source4/scripting/ejs/smbcalls_rpc.c
index 4163896e71..c71a475a92 100644
--- a/source4/scripting/ejs/smbcalls_rpc.c
+++ b/source4/scripting/ejs/smbcalls_rpc.c
@@ -248,7 +248,6 @@ static int ejs_irpc_call(int eid, struct MprVar *io,
 		if (!NT_STATUS_IS_OK(status)) {
 			goto done;
 		}
-		talloc_free(reqs[i]);
 
 		/* add to the results array */
 		output = mprGetProperty(io, "output", NULL);
-- 
cgit 


From 17280956c3c412102150aa8a9bda48efff0f0214 Mon Sep 17 00:00:00 2001
From: Rafal Szczesniak <mimir@samba.org>
Date: Tue, 6 Dec 2005 19:48:06 +0000
Subject: r12104: Move to (sync) smb_composite_connect from
 smbcli_tree_full_connection() This is one of the last places using the latter
 function.

rafal
(This used to be commit c95d30d38c4969c070766d320ed52e332e131195)
---
 source4/scripting/ejs/smbcalls_cli.c | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_cli.c b/source4/scripting/ejs/smbcalls_cli.c
index d7ffea29fe..cc97282038 100644
--- a/source4/scripting/ejs/smbcalls_cli.c
+++ b/source4/scripting/ejs/smbcalls_cli.c
@@ -25,6 +25,7 @@
 #include "lib/appweb/ejs/ejs.h"
 #include "libcli/raw/libcliraw.h"
 #include "libcli/composite/composite.h"
+#include "libcli/smb_composite/smb_composite.h"
 #include "clilist.h"
 
 #if 0
@@ -410,6 +411,7 @@ static int ejs_cli_disconnect(MprVarHandle eid, int argc, MprVar **argv)
 static int ejs_tree_connect(MprVarHandle eid, int argc, char **argv)
 {
 	struct cli_credentials *creds;
+	struct smb_composite_connect io;
 	struct smbcli_tree *tree;
 	const char *hostname, *sharename;
 	NTSTATUS result;
@@ -433,8 +435,17 @@ static int ejs_tree_connect(MprVarHandle eid, int argc, char **argv)
 
 	/* Do connect */
 
-	result = smbcli_tree_full_connection(NULL, &tree, hostname, 0,
-					     sharename, "?????", creds, NULL);
+	io.in.dest_host              = hostname;
+	io.in.port                   = 0;
+	io.in.called_name            = strupper_talloc(mem_ctx, hostname);
+	io.in.service                = sharename;
+	io.in.service_type           = "?????";
+	io.in.credentials            = creds;
+	io.in.fallback_to_anonymous  = False;
+	io.in.workgroup              = lp_workgroup();
+
+	result = smb_composite_connect(&io, mem_ctx, NULL);
+	tree = io.out.tree;
 
 	talloc_free(mem_ctx);
 
-- 
cgit 


From 085aac2e01f1f921a4b2d415872f5b8df3eb6635 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 13 Dec 2005 21:00:52 +0000
Subject: r12218: Use common functions for generating lists (This used to be
 commit ba913b86e866a67402785d9177711beb16db2cab)

---
 source4/scripting/config.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/config.mk b/source4/scripting/config.mk
index 69a5dd4efe..15e6e8539e 100644
--- a/source4/scripting/config.mk
+++ b/source4/scripting/config.mk
@@ -22,7 +22,7 @@ scripting/swig/tdb_wrap.c: scripting/swig/tdb.i
 
 scripting/swig/_tdb.so: scripting/swig/tdb_wrap.o $(LIBRARY_swig_tdb_DEPEND_LIST)
 	$(SHLD) $(SHLD_FLAGS) -o scripting/swig/_tdb.so scripting/swig/tdb_wrap.o \
-		$(LIBRARY_swig_tdb_SHARED_LINK_LIST) $(LIBRARY_swig_tdb_SHARED_LINK_FLAGS)
+		$(LIBRARY_swig_tdb_LINK_LIST) $(LIBRARY_swig_tdb_LINK_FLAGS)
 
 SWIG_INCLUDES = librpc/gen_ndr/samr.i librpc/gen_ndr/lsa.i librpc/gen_ndr/spoolss.i
 
@@ -30,7 +30,7 @@ scripting/swig/dcerpc_wrap.c: scripting/swig/dcerpc.i scripting/swig/samba.i scr
 	swig -python scripting/swig/dcerpc.i
 
 scripting/swig/_dcerpc.so: scripting/swig/dcerpc_wrap.o $(LIBRARY_swig_dcerpc_DEPEND_LIST)
-	$(SHLD) $(SHLD_FLAGS) -o scripting/swig/_dcerpc.so scripting/swig/dcerpc_wrap.o $(LIBRARY_swig_dcerpc_SHARED_LINK_LIST) $(LIBRARY_swig_dcerpc_SHARED_LINK_FLAGS)
+	$(SHLD) $(SHLD_FLAGS) -o scripting/swig/_dcerpc.so scripting/swig/dcerpc_wrap.o $(LIBRARY_swig_dcerpc_LINK_LIST) $(LIBRARY_swig_dcerpc_LINK_FLAGS)
 
 swig_clean:
 	-rm -f scripting/swig/_tdb.so scripting/swig/tdb.pyc scripting/swig/tdb.py scripting/swig/tdb_wrap.c scripting/swig/tdb_wrap.o
-- 
cgit 


From a1827a1deba04e0b4b2a508dc4e4e66603a46d16 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Wed, 14 Dec 2005 07:22:25 +0000
Subject: r12227: I realised that I wasn't yet seeing authenticated LDAP for
 the ldb backend.

The idea is that every time we open an LDB, we can provide a
session_info and/or credentials.  This would allow any ldb to be remote
to LDAP.  We should also support provisioning to a authenticated ldap
server.

(They are separate so we can say authenticate as foo for remote, but
here we just want a token of SYSTEM).

Andrew Bartlett
(This used to be commit ae2f3a64ee0b07575624120db45299c65204210b)
---
 source4/scripting/ejs/smbcalls_auth.c | 20 ++++++++++++++++----
 source4/scripting/ejs/smbcalls_ldb.c  | 14 +++++++++++++-
 source4/scripting/libjs/provision.js  | 18 +++++++++---------
 3 files changed, 38 insertions(+), 14 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_auth.c b/source4/scripting/ejs/smbcalls_auth.c
index ba20332aaa..80089f75a7 100644
--- a/source4/scripting/ejs/smbcalls_auth.c
+++ b/source4/scripting/ejs/smbcalls_auth.c
@@ -26,12 +26,14 @@
 #include "auth/auth.h"
 #include "scripting/ejs/smbcalls.h"
 
-static int ejs_doauth(TALLOC_CTX *tmp_ctx, struct MprVar *auth, const char *username, 
+static int ejs_doauth(MprVarHandle eid,
+		      TALLOC_CTX *tmp_ctx, struct MprVar *auth, const char *username, 
 		      const char *password, const char *domain, const char *remote_host,
 		      const char *authtype)
 {
 	struct auth_usersupplied_info *user_info = NULL;
 	struct auth_serversupplied_info *server_info = NULL;
+	struct auth_session_info *session_info = NULL;
 	struct auth_context *auth_context;
 	const char *auth_types[] = { authtype, NULL };
 	NTSTATUS nt_status;
@@ -76,11 +78,21 @@ static int ejs_doauth(TALLOC_CTX *tmp_ctx, struct MprVar *auth, const char *user
 
 	nt_status = auth_check_password(auth_context, tmp_ctx, user_info, &server_info);
 	if (!NT_STATUS_IS_OK(nt_status)) {
-		mprSetPropertyValue(auth, "result", mprCreateBoolVar(False));
 		mprSetPropertyValue(auth, "report", mprString("Login Failed"));
+		mprSetPropertyValue(auth, "result", mprCreateBoolVar(False));
+		goto done;
+	}
+
+	nt_status = auth_generate_session_info(tmp_ctx, server_info, &session_info);
+	if (!NT_STATUS_IS_OK(nt_status)) {
+		mprSetPropertyValue(auth, "report", mprString("Session Info generation failed"));
+		mprSetPropertyValue(auth, "result", mprCreateBoolVar(False));
 		goto done;
 	}
 
+	talloc_steal(mprMemCtx(), session_info);
+	mprSetThisPtr(eid, "session_info", session_info);
+
 	mprSetPropertyValue(auth, "result", mprCreateBoolVar(server_info->authenticated));
 	mprSetPropertyValue(auth, "username", mprString(server_info->account_name));
 	mprSetPropertyValue(auth, "domain", mprString(server_info->domain_name));
@@ -138,9 +150,9 @@ static int ejs_userAuth(MprVarHandle eid, int argc, struct MprVar **argv)
 	auth = mprObject("auth");
 
 	if (domain && (strcmp("System User", domain) == 0)) {
-		ejs_doauth(tmp_ctx, &auth, username, password, domain, remote_host, "unix");
+		ejs_doauth(eid, tmp_ctx, &auth, username, password, domain, remote_host, "unix");
 	} else {
-		ejs_doauth(tmp_ctx, &auth, username, password, domain, remote_host, "sam");
+		ejs_doauth(eid, tmp_ctx, &auth, username, password, domain, remote_host, "sam");
 	}
 
 	mpr_Return(eid, auth);
diff --git a/source4/scripting/ejs/smbcalls_ldb.c b/source4/scripting/ejs/smbcalls_ldb.c
index d3db85db86..709ed27e5e 100644
--- a/source4/scripting/ejs/smbcalls_ldb.c
+++ b/source4/scripting/ejs/smbcalls_ldb.c
@@ -350,10 +350,16 @@ static int ejs_ldbModify(MprVarHandle eid, int argc, struct MprVar **argv)
   usage:
    ok = ldb.connect(dbfile);
    ok = ldb.connect(dbfile, "modules:modlist");
+
+  ldb.credentials or ldb.session_info may be setup first
+
 */
 static int ejs_ldbConnect(MprVarHandle eid, int argc, char **argv)
 {
 	struct ldb_context *ldb;
+	struct auth_session_info *session_info;
+	struct cli_credentials *creds;
+
 	const char *dbfile;
 
 	if (argc < 1) {
@@ -361,9 +367,15 @@ static int ejs_ldbConnect(MprVarHandle eid, int argc, char **argv)
 		return -1;
 	}
 
+	session_info = mprGetThisPtr(eid, "session_info");
+
+	creds = mprGetThisPtr(eid, "credentials");
+
 	dbfile = argv[0];
 
-	ldb = ldb_wrap_connect(mprMemCtx(), dbfile, 0, (const char **)(argv+1));
+	ldb = ldb_wrap_connect(mprMemCtx(), dbfile, 
+			       session_info, creds,
+			       0, (const char **)(argv+1));
 	if (ldb == NULL) {
 		ejsSetErrorMsg(eid, "ldb.connect failed to open %s", dbfile);
 	}
diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index 0b6a31ae4f..aa4ea5bff8 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -280,6 +280,15 @@ function provision(subobj, message, blank, paths)
 		setup_file("provision.smb.conf", paths.smbconf, subobj);
 		lp.reload();
 	}
+	message("Setting up secrets.ldb\n");
+	setup_ldb("secrets.ldif", paths.secrets, subobj);
+	message("Setting up DNS zone file\n");
+	setup_file("provision.zone", 
+		   paths.dns, 
+		   subobj);
+	message("Setting up keytabs\n");
+	var keytab_ok = credentials_update_all_keytabs();
+	assert(keytab_ok);
 	message("Setting up hklm.ldb\n");
 	setup_ldb("hklm.ldif", paths.hklm, subobj);
 	message("Setting up sam.ldb attributes\n");
@@ -296,15 +305,6 @@ function provision(subobj, message, blank, paths)
 		message("Setting up sam.ldb users and groups\n");
 		setup_ldb("provision_users.ldif", paths.samdb, subobj, data, false);
 	}
-	message("Setting up secrets.ldb\n");
-	setup_ldb("secrets.ldif", paths.secrets, subobj);
-	message("Setting up DNS zone file\n");
-	setup_file("provision.zone", 
-		   paths.dns, 
-		   subobj);
-	message("Setting up keytabs\n");
-	var keytab_ok = credentials_update_all_keytabs();
-	assert(keytab_ok);
 }
 
 /*
-- 
cgit 


From 6589e93b1b8a61860931a171a0306b270597e1f2 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Thu, 15 Dec 2005 02:39:29 +0000
Subject: r12252: With this change (hack) we can now do an provision onto
 Samba4's LDAP server.  Now to try another one...

Andrew Bartlett
(This used to be commit 175f616d74ac3567a35713343be0c63c96c5aede)
---
 source4/scripting/libjs/provision.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index aa4ea5bff8..4cd9e5fa8d 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -160,6 +160,9 @@ function ldb_erase(ldb)
 	for (i=0;i<res.length;i++) {
 		ldb.del(res[i].dn);
 	}
+	/* extra hack to ensure it's gone on remote ldap */
+	ldb.del("cn=ROOTDSE");
+
 	var res = ldb.search("(&(|(objectclass=*)(dn=*))(!(dn=@BASEINFO)))", attrs);
 	if (res.length != 0) {
 		ldb_delete(ldb);
@@ -237,7 +240,7 @@ function provision_default_paths(subobj)
 	paths.hku = "hku.ldb";
 	paths.hkpd = "hkpd.ldb";
 	paths.hkpt = "hkpt.ldb";
-	paths.samdb = "sam.ldb";
+	paths.samdb = lp.get("sam database");
 	paths.secrets = "secrets.ldb";
 	paths.dns = lp.get("private dir") + "/" + subobj.DNSDOMAIN + ".zone";
 	paths.winsdb = "wins.ldb";
-- 
cgit 


From ac3f676f62f7a09339abfb7bb8e6790040d1551b Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Sun, 18 Dec 2005 22:14:14 +0000
Subject: r12322: automatically use cmdline_credentials if the ldb object
 doesn't have its own credentials element (This used to be commit
 de8975bdd3dc9b4f4d65000e126bbd11c43b3f06)

---
 source4/scripting/ejs/smbcalls_ldb.c | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_ldb.c b/source4/scripting/ejs/smbcalls_ldb.c
index 709ed27e5e..7c81b8c826 100644
--- a/source4/scripting/ejs/smbcalls_ldb.c
+++ b/source4/scripting/ejs/smbcalls_ldb.c
@@ -26,6 +26,7 @@
 #include "lib/appweb/ejs/ejs.h"
 #include "lib/ldb/include/ldb.h"
 #include "lib/ldb/include/ldb_errors.h"
+#include "lib/cmdline/popt_common.h"
 
 /*
   get the connected db
@@ -370,6 +371,9 @@ static int ejs_ldbConnect(MprVarHandle eid, int argc, char **argv)
 	session_info = mprGetThisPtr(eid, "session_info");
 
 	creds = mprGetThisPtr(eid, "credentials");
+	if (creds == NULL) {
+		creds = cmdline_credentials;
+	}
 
 	dbfile = argv[0];
 
-- 
cgit 


From 4ee24ce2ba9755184d516bd47d73b296a4640f3c Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Sun, 18 Dec 2005 22:27:26 +0000
Subject: r12323: fixeed the use of options.get_credentials() for ldb (This
 used to be commit b27d81dca9fd07c83b11a5bb3a883ec3f28cca6a)

---
 source4/scripting/ejs/smbcalls_ldb.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_ldb.c b/source4/scripting/ejs/smbcalls_ldb.c
index 7c81b8c826..e9dba94eaa 100644
--- a/source4/scripting/ejs/smbcalls_ldb.c
+++ b/source4/scripting/ejs/smbcalls_ldb.c
@@ -360,6 +360,8 @@ static int ejs_ldbConnect(MprVarHandle eid, int argc, char **argv)
 	struct ldb_context *ldb;
 	struct auth_session_info *session_info;
 	struct cli_credentials *creds;
+	struct MprVar *credentials;
+	struct MprVar *this = mprGetProperty(ejsGetLocalObject(eid), "this", 0);
 
 	const char *dbfile;
 
@@ -370,8 +372,10 @@ static int ejs_ldbConnect(MprVarHandle eid, int argc, char **argv)
 
 	session_info = mprGetThisPtr(eid, "session_info");
 
-	creds = mprGetThisPtr(eid, "credentials");
-	if (creds == NULL) {
+	credentials = mprGetProperty(this, "credentials", NULL);
+	if (credentials) {
+		creds = mprGetPtr(credentials, "creds");
+	} else {
 		creds = cmdline_credentials;
 	}
 
-- 
cgit 


From 4bbb73894c7e30a33cda97480e42aadb6fa56c92 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Fri, 23 Dec 2005 12:28:26 +0000
Subject: r12445: Fix header in manpage, make script executable (This used to
 be commit 7ca00cd918760dccc51e56234126ead8535a22ef)

---
 source4/scripting/bin/samba3dump | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 source4/scripting/bin/samba3dump

(limited to 'source4/scripting')

diff --git a/source4/scripting/bin/samba3dump b/source4/scripting/bin/samba3dump
old mode 100644
new mode 100755
-- 
cgit 


From 6aafed9600a3fa05932668c70fc0e20f3724dab6 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 26 Dec 2005 18:48:23 +0000
Subject: r12499: Move smb_build.h out of includes.h (This used to be commit
 c92ace494f92084ddf178626cdf392d151043bc7)

---
 source4/scripting/ejs/smbscript.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbscript.c b/source4/scripting/ejs/smbscript.c
index e0123eee87..0e131e0ba5 100644
--- a/source4/scripting/ejs/smbscript.c
+++ b/source4/scripting/ejs/smbscript.c
@@ -25,6 +25,7 @@
 #include "lib/appweb/ejs/ejs.h"
 #include "lib/appweb/ejs/ejsInternal.h"
 #include "scripting/ejs/smbcalls.h"
+#include "smb_build.h"
 
 static EjsId eid;
 
-- 
cgit 


From 09c44f6cae89621871d2e5475b0c0f99c25804b4 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 26 Dec 2005 21:58:31 +0000
Subject: r12500: Use init functions explicitly in a few more places. 'gensec'
 and 'librpc' are the only two subsystems left to convert. (This used to be
 commit f6bbc72996aeee8607fc583140fd60be0e06e969)

---
 source4/scripting/ejs/smbcalls.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls.c b/source4/scripting/ejs/smbcalls.c
index 3e5035b272..ee999402a5 100644
--- a/source4/scripting/ejs/smbcalls.c
+++ b/source4/scripting/ejs/smbcalls.c
@@ -24,6 +24,7 @@
 #include "includes.h"
 #include "lib/appweb/ejs/ejs.h"
 #include "scripting/ejs/smbcalls.h"
+#include "smb_build.h"
 
 /*
   return the type of a variable
@@ -116,6 +117,9 @@ static int ejs_libinclude(int eid, int argc, char **argv)
 */
 void smb_setup_ejs_functions(void)
 {
+	init_module_fn static_init[] = STATIC_SMBCALLS_MODULES;
+	init_module_fn *shared_init;
+
 	smb_setup_ejs_config();
 	smb_setup_ejs_ldb();
 	smb_setup_ejs_nbt();
@@ -131,8 +135,16 @@ void smb_setup_ejs_functions(void)
 	smb_setup_ejs_samba3();
 	smb_setup_ejs_param();
 	smb_setup_ejs_datablob();
+	
 	ejsnet_setup();
 
+	shared_init = load_samba_modules(NULL, "ejs");
+	
+	run_init_functions(static_init);
+	run_init_functions(shared_init);
+
+	talloc_free(shared_init);
+
 	ejsDefineCFunction(-1, "typeof", ejs_typeof, NULL, MPR_VAR_SCRIPT_HANDLE);
 	ejsDefineStringCFunction(-1, "libinclude", ejs_libinclude, NULL, MPR_VAR_SCRIPT_HANDLE);
 }
-- 
cgit 


From c1c01df22f7145ca86b97fce670131017b3df3b9 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 26 Dec 2005 22:47:40 +0000
Subject: r12501: Merge EJSHeader.pm into EJS.pm and simplify smbcalls_rpc.c a
 bit, now that it is guaranteed that the smbcalls modules are always
 initialized after the EJS subsystem itself. (This used to be commit
 1e8670874bb7415c3e00a42516680fdb4ee2fca1)

---
 source4/scripting/ejs/ejsrpc.h       | 17 +++++++++++++++++
 source4/scripting/ejs/smbcalls.c     |  1 -
 source4/scripting/ejs/smbcalls_rpc.c | 37 ------------------------------------
 3 files changed, 17 insertions(+), 38 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/ejsrpc.h b/source4/scripting/ejs/ejsrpc.h
index a790beb804..d710ff375c 100644
--- a/source4/scripting/ejs/ejsrpc.h
+++ b/source4/scripting/ejs/ejsrpc.h
@@ -115,6 +115,23 @@ NTSTATUS ejs_push_array_uint8(struct ejs_rpc *ejs,
 			      struct MprVar *v, const char *name, 
 			      const uint8_t *r, uint32_t length);
 
+NTSTATUS ejs_pull_GUID(struct ejs_rpc *ejs, 
+		       struct MprVar *v, const char *name, struct GUID *r);
+NTSTATUS ejs_push_GUID(struct ejs_rpc *ejs, 
+		       struct MprVar *v, const char *name, const struct GUID *r);
+
+struct lsa_String;
+NTSTATUS ejs_pull_lsa_String(struct ejs_rpc *ejs, 
+			    struct MprVar *v, const char *name, struct lsa_String *r);
+NTSTATUS ejs_push_lsa_String(struct ejs_rpc *ejs, 
+			    struct MprVar *v, const char *name, const struct lsa_String *r);
+
+struct winreg_String;
+NTSTATUS ejs_pull_winreg_String(struct ejs_rpc *ejs, 
+			     struct MprVar *v, const char *name, struct winreg_String *r);
+NTSTATUS ejs_push_winreg_String(struct ejs_rpc *ejs, 
+			     struct MprVar *v, const char *name, const struct winreg_String *r);
+
 #define EJS_ALLOC_SIZE(ejs, s, size) do { \
   (s) = talloc_size(ejs, size); \
   if (!(s)) return ejs_panic(ejs, "out of memory"); \
diff --git a/source4/scripting/ejs/smbcalls.c b/source4/scripting/ejs/smbcalls.c
index ee999402a5..3e96f8bef2 100644
--- a/source4/scripting/ejs/smbcalls.c
+++ b/source4/scripting/ejs/smbcalls.c
@@ -124,7 +124,6 @@ void smb_setup_ejs_functions(void)
 	smb_setup_ejs_ldb();
 	smb_setup_ejs_nbt();
 	smb_setup_ejs_cli();
-	smb_setup_ejs_rpc();
 	smb_setup_ejs_auth();
 	smb_setup_ejs_options();
 	smb_setup_ejs_nss();
diff --git a/source4/scripting/ejs/smbcalls_rpc.c b/source4/scripting/ejs/smbcalls_rpc.c
index c71a475a92..6d2d411957 100644
--- a/source4/scripting/ejs/smbcalls_rpc.c
+++ b/source4/scripting/ejs/smbcalls_rpc.c
@@ -363,43 +363,6 @@ done:
 	return 0;
 }
 
-/* a list of registered ejs rpc modules */
-static struct ejs_register {
-	struct ejs_register *next, *prev;
-	const char *name;
-	MprCFunction fn;
-} *ejs_registered;
-
-/*
-  register a generated ejs module
-*/
- NTSTATUS smbcalls_register_ejs(const char *name, MprCFunction fn)
-{
-	struct ejs_register *r;
-	void *ctx = ejs_registered;
-	if (ctx == NULL) {
-		ctx = talloc_autofree_context();
-	}
-	r = talloc(ctx, struct ejs_register);
-	NT_STATUS_HAVE_NO_MEMORY(r);
-	r->name = name;
-	r->fn = fn;
-	DLIST_ADD(ejs_registered, r);
-	return NT_STATUS_OK;
-}
-
-/*
-  setup C functions that be called from ejs
-*/
-void smb_setup_ejs_rpc(void)
-{
-	struct ejs_register *r;
-
-	for (r=ejs_registered;r;r=r->next) {
-		ejsDefineCFunction(-1, r->name, r->fn, NULL, MPR_VAR_SCRIPT_HANDLE);
-	}
-}
-
 /*
   hook called by generated RPC interfaces at the end of their init routines
   used to add generic operations on the pipe
-- 
cgit 


From acd6a086b341096fcbea1775ce748587fcc8020a Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 27 Dec 2005 14:28:01 +0000
Subject: r12510: Change the DCE/RPC interfaces to take a pointer to a
 dcerpc_interface_table struct rather then a tuple of interface name, UUID and
 version.

This removes the requirement for having a global list of DCE/RPC interfaces,
except for these parts of the code that use that list explicitly
(ndrdump and the scanner torture test).

This should also allow us to remove the hack that put the authservice parameter
in the dcerpc_binding struct as it can now be read directly from
dcerpc_interface_table.

I will now modify some of these functions to take a dcerpc_syntax_id
structure rather then a full dcerpc_interface_table.
(This used to be commit 8aae0f168e54c01d0866ad6e0da141dbd828574f)
---
 source4/scripting/ejs/smbcalls_rpc.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_rpc.c b/source4/scripting/ejs/smbcalls_rpc.c
index 6d2d411957..dff04a4c40 100644
--- a/source4/scripting/ejs/smbcalls_rpc.c
+++ b/source4/scripting/ejs/smbcalls_rpc.c
@@ -153,9 +153,7 @@ static int ejs_rpc_connect(MprVarHandle eid, int argc, char **argv)
 
 	ev = event_context_find(mprMemCtx());
 
-	status = dcerpc_pipe_connect(this, &p, binding, 
-				     iface->uuid, iface->if_version, 
-				     creds, ev);
+	status = dcerpc_pipe_connect(this, &p, binding, iface, creds, ev);
 	if (!NT_STATUS_IS_OK(status)) goto done;
 
 	/* callers don't allocate ref vars in the ejs interface */
-- 
cgit 


From 0ad7b308a1c602ddab73668952cdf3837623b877 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 27 Dec 2005 17:15:48 +0000
Subject: r12514: Move DCE/RPC interface table to a seperate file Be a bit more
 strict when checking for duplicate interfaces (This used to be commit
 b1286a6d27e2b5aa26f288f6aff70601b0d8ae74)

---
 source4/scripting/ejs/config.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/config.mk b/source4/scripting/ejs/config.mk
index f789cbad0e..93b053c0d1 100644
--- a/source4/scripting/ejs/config.mk
+++ b/source4/scripting/ejs/config.mk
@@ -30,7 +30,7 @@ OBJ_FILES = \
 		smbcalls_param.o \
 		ejsnet.o \
 		mprutil.o
-REQUIRED_SUBSYSTEMS = AUTH EJS LIBBASIC EJSRPC MESSAGING LIBSAMBA3 LIBNET
+REQUIRED_SUBSYSTEMS = AUTH EJS LIBBASIC EJSRPC MESSAGING LIBSAMBA3 LIBNET NDR_ALL
 # End SUBSYSTEM SMBCALLS
 #######################
 
-- 
cgit 


From 00ace36e07f128df4596cfc8b6743fbfda2252bd Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 27 Dec 2005 18:15:18 +0000
Subject: r12516: Fix drsuapi and netlogon javascript bindings (This used to be
 commit b46eeba9fcb059ef83743de8be7dab26f9ef21b2)

---
 source4/scripting/ejs/ejsrpc.c | 17 +++++++++++++++++
 source4/scripting/ejs/ejsrpc.h |  8 ++++++++
 2 files changed, 25 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/ejsrpc.c b/source4/scripting/ejs/ejsrpc.c
index a0fee2efe7..c84f9eb6fb 100644
--- a/source4/scripting/ejs/ejsrpc.c
+++ b/source4/scripting/ejs/ejsrpc.c
@@ -133,6 +133,23 @@ NTSTATUS ejs_push_int32(struct ejs_rpc *ejs,
 	return mprSetVar(v, name, mprCreateIntegerVar(*r));
 }
 
+/*
+  pull a uint32 from a mpr variable to a C element
+*/
+NTSTATUS ejs_pull_time_t(struct ejs_rpc *ejs, 
+			 struct MprVar *v, const char *name, time_t *r)
+{
+	NDR_CHECK(mprGetVar(&v, name));
+	*r = mprVarToInteger(v);
+	return NT_STATUS_OK;
+}
+
+NTSTATUS ejs_push_time_t(struct ejs_rpc *ejs, 
+			 struct MprVar *v, const char *name, const time_t *r)
+{
+	return mprSetVar(v, name, mprCreateIntegerVar(*r));
+}
+
 NTSTATUS ejs_pull_hyper(struct ejs_rpc *ejs, 
 			struct MprVar *v, const char *name, uint64_t *r)
 {
diff --git a/source4/scripting/ejs/ejsrpc.h b/source4/scripting/ejs/ejsrpc.h
index d710ff375c..80674fc43b 100644
--- a/source4/scripting/ejs/ejsrpc.h
+++ b/source4/scripting/ejs/ejsrpc.h
@@ -78,6 +78,10 @@ NTSTATUS ejs_pull_NTTIME(struct ejs_rpc *ejs,
 			struct MprVar *v, const char *name, uint64_t *r);
 NTSTATUS ejs_push_NTTIME(struct ejs_rpc *ejs, 
 			struct MprVar *v, const char *name, const uint64_t *r);
+NTSTATUS ejs_pull_time_t(struct ejs_rpc *ejs, 
+			 struct MprVar *v, const char *name, time_t *r);
+NTSTATUS ejs_push_time_t(struct ejs_rpc *ejs, 
+			struct MprVar *v, const char *name, const time_t *r);
 NTSTATUS ejs_pull_enum(struct ejs_rpc *ejs, 
 		       struct MprVar *v, const char *name, unsigned *r);
 NTSTATUS ejs_push_enum(struct ejs_rpc *ejs, 
@@ -149,6 +153,10 @@ NTSTATUS ejs_push_winreg_String(struct ejs_rpc *ejs,
 /* some types are equivalent for ejs */
 #define ejs_pull_dom_sid2 ejs_pull_dom_sid
 #define ejs_push_dom_sid2 ejs_push_dom_sid
+#define ejs_pull_dom_sid28 ejs_pull_dom_sid
+#define ejs_push_dom_sid28 ejs_push_dom_sid
 #define ejs_pull_NTTIME_hyper ejs_pull_NTTIME
 #define ejs_push_NTTIME_hyper ejs_push_NTTIME
+#define ejs_pull_NTTIME_1sec ejs_pull_NTTIME
+#define ejs_push_NTTIME_1sec ejs_push_NTTIME
 
-- 
cgit 


From d49f11df218699014af32d19eef8dcc0a70ff38f Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 27 Dec 2005 19:13:18 +0000
Subject: r12517: Don't generate empty init functions (This used to be commit
 832a1092c9c11c293b5748e2e78da872fcba2a42)

---
 source4/scripting/ejs/config.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/config.mk b/source4/scripting/ejs/config.mk
index 93b053c0d1..902fed2fd7 100644
--- a/source4/scripting/ejs/config.mk
+++ b/source4/scripting/ejs/config.mk
@@ -3,7 +3,6 @@
 [SUBSYSTEM::EJSRPC]
 OBJ_FILES = \
 		ejsrpc.o
-REQUIRED_SUBSYSTEMS = RPC_EJS
 NOPROTO = YES
 # End SUBSYSTEM EJSRPC
 #######################
@@ -30,7 +29,8 @@ OBJ_FILES = \
 		smbcalls_param.o \
 		ejsnet.o \
 		mprutil.o
-REQUIRED_SUBSYSTEMS = AUTH EJS LIBBASIC EJSRPC MESSAGING LIBSAMBA3 LIBNET NDR_ALL
+REQUIRED_SUBSYSTEMS = AUTH EJS LIBBASIC EJSRPC MESSAGING LIBSAMBA3 LIBNET \
+					  NDR_ALL
 # End SUBSYSTEM SMBCALLS
 #######################
 
-- 
cgit 


From e4dbcc0d5d6c9c68a7f3c437611b726f9f0211cf Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Wed, 28 Dec 2005 03:04:40 +0000
Subject: r12531: 'make quicktest' was taking 15 minutes on my system due to
 failing DNS lookups in load_interfaces(). The reason was my eth0 interface
 was down, and it was being interpreted as a DNS name.

This patch changes load_interfaces() to happening automatically when
interfaces are first needed instead of on the startup of every samba
binary. This means that (for example) ldbadd doesn't call
load_interfaces(), which means no slow DNS lookups.

I also reduced the number of static globals in interface.c to 1, and
changed from malloc to talloc

When you want to force a reload of the interfaces list, you now call
unload_interfaces(), which means the next call that needs the
interfaces list will reload it
(This used to be commit f79d90bd1364b970adb2981b2572e77066431f1e)
---
 source4/scripting/ejs/smbcalls_config.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_config.c b/source4/scripting/ejs/smbcalls_config.c
index a64d57a359..b0b1420ba2 100644
--- a/source4/scripting/ejs/smbcalls_config.c
+++ b/source4/scripting/ejs/smbcalls_config.c
@@ -188,7 +188,7 @@ static int ejs_lpReload(MprVarHandle eid, int argc, char **argv)
 {
 	BOOL ret = lp_load();
 	if (ret) {
-		load_interfaces();
+		unload_interfaces();
 	}
 	mpr_Return(eid, mprCreateBoolVar(ret));
 	return 0;
-- 
cgit 


From 5811b6dac51edb2b8fdb217c41a56c5122763157 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Wed, 28 Dec 2005 03:57:26 +0000
Subject: r12533: Get the ldb.errstring() out to the user on failure.  It helps
 a lot with debugging!

Andrew Bartlett
(This used to be commit fe36cb6767ce99432e2778037aad334170dca173)
---
 source4/scripting/libjs/provision.js | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index 4cd9e5fa8d..f26c69d15e 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -207,8 +207,15 @@ function setup_ldb(ldif, dbname, subobj)
 	}
 
 	var add_ok = ldb.add(data);
-	assert(add_ok);
-	ldb.transaction_commit();
+	if (!add_ok) {
+		message("ldb load failed: " + ldb.errstring() + "\n");
+		assert(add_ok);
+	}
+	var commit_ok = ldb.transaction_commit();
+	if (!commit_ok) {
+		message("ldb commit failed: " + ldb.errstring() + "\n");
+		assert(add_ok);
+	}
 }
 
 /*
-- 
cgit 


From 46aa296cc94933082dbb4b9b2b1ed210a600ad2d Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Thu, 29 Dec 2005 23:14:33 +0000
Subject: r12592: Remove some useless dependencies (This used to be commit
 ca8db1a0cd77682ac2c6dc4718f5d753a4fcc4db)

---
 source4/scripting/ejs/config.mk | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/config.mk b/source4/scripting/ejs/config.mk
index 902fed2fd7..47e4b99bec 100644
--- a/source4/scripting/ejs/config.mk
+++ b/source4/scripting/ejs/config.mk
@@ -30,7 +30,8 @@ OBJ_FILES = \
 		ejsnet.o \
 		mprutil.o
 REQUIRED_SUBSYSTEMS = AUTH EJS LIBBASIC EJSRPC MESSAGING LIBSAMBA3 LIBNET \
-					  NDR_ALL
+					  NDR_ALL LIBSMB LIBPOPT POPT_CREDENTIALS \
+					  POPT_SAMBA
 # End SUBSYSTEM SMBCALLS
 #######################
 
@@ -40,6 +41,6 @@ REQUIRED_SUBSYSTEMS = AUTH EJS LIBBASIC EJSRPC MESSAGING LIBSAMBA3 LIBNET \
 INSTALLDIR = BINDIR
 OBJ_FILES = \
 		smbscript.o
-REQUIRED_SUBSYSTEMS = EJS LIBBASIC SMBCALLS CONFIG LIBSMB LIBRPC LIBCMDLINE
+REQUIRED_SUBSYSTEMS = EJS LIBBASIC SMBCALLS CONFIG 
 # End BINARY SMBSCRIPT
 #######################
-- 
cgit 


From 02c8c376d57e91c27b7afb9cb3eab26794d0be59 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Fri, 30 Dec 2005 06:48:56 +0000
Subject: r12596: This variable is unused.

Andrew Bartlett
(This used to be commit 2853ccfc8ad58c6af751e01487b8a9e7e68a01e7)
---
 source4/scripting/ejs/smbcalls_auth.c | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_auth.c b/source4/scripting/ejs/smbcalls_auth.c
index 80089f75a7..8ef04bec97 100644
--- a/source4/scripting/ejs/smbcalls_auth.c
+++ b/source4/scripting/ejs/smbcalls_auth.c
@@ -37,7 +37,6 @@ static int ejs_doauth(MprVarHandle eid,
 	struct auth_context *auth_context;
 	const char *auth_types[] = { authtype, NULL };
 	NTSTATUS nt_status;
-	DATA_BLOB pw_blob;
 
 	/*
 	  darn, we need some way to get the right event_context here
@@ -49,8 +48,6 @@ static int ejs_doauth(MprVarHandle eid,
 		goto done;
 	}
 
-	pw_blob = data_blob(password, strlen(password)+1);
-	
 	user_info = talloc(tmp_ctx, struct auth_usersupplied_info);
 	if (!user_info) {
 		mprSetPropertyValue(auth, "result", mprCreateBoolVar(False));
-- 
cgit 


From d4de4c2d210d2e8c9b5aedf70695594809ad6a0b Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Fri, 30 Dec 2005 13:16:54 +0000
Subject: r12608: Remove some unused #include lines. (This used to be commit
 70e7449318aa0e9d2639c76730a7d1683b2f4981)

---
 source4/scripting/ejs/smbcalls_options.c | 1 -
 1 file changed, 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_options.c b/source4/scripting/ejs/smbcalls_options.c
index 2e94b7d72b..d24d689cf3 100644
--- a/source4/scripting/ejs/smbcalls_options.c
+++ b/source4/scripting/ejs/smbcalls_options.c
@@ -23,7 +23,6 @@
 #include "includes.h"
 #include "lib/cmdline/popt_common.h"
 #include "scripting/ejs/smbcalls.h"
-#include "lib/appweb/ejs/ejs.h"
 
 
 /*
-- 
cgit 


From aa9f67163cd2df2a815ef585edad1951343b82c8 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Fri, 30 Dec 2005 22:46:16 +0000
Subject: r12620: Get rid of automatically generated lists of init functions of
 subsystems. This allows Samba libraries to be used by other projects (and
 parts of Samba to be built as shared libraries). (This used to be commit
 44f0aba715bfedc7e1ee3d07e9a101a91dbd84b3)

---
 source4/scripting/ejs/smbcalls_rpc.c | 2 ++
 source4/scripting/ejs/smbscript.c    | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_rpc.c b/source4/scripting/ejs/smbcalls_rpc.c
index dff04a4c40..a104f0eb16 100644
--- a/source4/scripting/ejs/smbcalls_rpc.c
+++ b/source4/scripting/ejs/smbcalls_rpc.c
@@ -367,6 +367,8 @@ done:
 */
 int ejs_rpc_init(struct MprVar *obj, const char *name)
 {
+	dcerpc_table_init();
+
 	mprSetStringCFunction(obj, "connect", ejs_rpc_connect);
 	if (mprGetProperty(obj, "pipe_name", NULL) == NULL) {
 		mprSetVar(obj, "pipe_name", mprString(name));
diff --git a/source4/scripting/ejs/smbscript.c b/source4/scripting/ejs/smbscript.c
index 0e131e0ba5..20675dadf9 100644
--- a/source4/scripting/ejs/smbscript.c
+++ b/source4/scripting/ejs/smbscript.c
@@ -25,7 +25,7 @@
 #include "lib/appweb/ejs/ejs.h"
 #include "lib/appweb/ejs/ejsInternal.h"
 #include "scripting/ejs/smbcalls.h"
-#include "smb_build.h"
+#include "auth/gensec/gensec.h"
 
 static EjsId eid;
 
@@ -50,7 +50,7 @@ void ejs_exception(const char *reason)
 	int exit_status, i;
 
 	fault_setup(argv[0]);
-	smbscript_init_subsystems;
+	gensec_init();
 	mprSetCtx(mem_ctx);
 
 	lp_load();
-- 
cgit 


From 046a54f96394fe49226ab2b48fdeb7c07937ea57 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Fri, 30 Dec 2005 23:18:27 +0000
Subject: r12622: Move table.c prototypes to seperate header to prevent
 circular dependencies with proto.h (This used to be commit
 9e0ba380374db028358158b9e4457dd930b5ab13)

---
 source4/scripting/ejs/smbcalls_rpc.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_rpc.c b/source4/scripting/ejs/smbcalls_rpc.c
index a104f0eb16..4527f7385a 100644
--- a/source4/scripting/ejs/smbcalls_rpc.c
+++ b/source4/scripting/ejs/smbcalls_rpc.c
@@ -29,6 +29,7 @@
 #include "scripting/ejs/ejsrpc.h"
 #include "dlinklist.h"
 #include "lib/events/events.h"
+#include "librpc/rpc/dcerpc_table.h"
 
 /*
   state of a irpc 'connection'
-- 
cgit 


From 78c50015bb8bd5a1d831a6e7ec796b3367c73145 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 3 Jan 2006 15:40:05 +0000
Subject: r12694: Move some headers to the directory of the subsystem they
 belong to. (This used to be commit c722f665c90103f3ed57621c460e32ad33e7a8a3)

---
 source4/scripting/ejs/smbcalls_cli.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_cli.c b/source4/scripting/ejs/smbcalls_cli.c
index cc97282038..e165222a98 100644
--- a/source4/scripting/ejs/smbcalls_cli.c
+++ b/source4/scripting/ejs/smbcalls_cli.c
@@ -26,7 +26,7 @@
 #include "libcli/raw/libcliraw.h"
 #include "libcli/composite/composite.h"
 #include "libcli/smb_composite/smb_composite.h"
-#include "clilist.h"
+#include "libcli/libcli.h"
 
 #if 0
 
-- 
cgit 


From 92461359f79803d97f942912d347c692fa596dc4 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 3 Jan 2006 17:22:19 +0000
Subject: r12695: A dot is allowed in NetBIOS names. (This used to be commit
 f4ac7d6359b5a6de04a6ea518dec99f4c9b49b3d)

---
 source4/scripting/libjs/provision.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index f26c69d15e..b5f8527bd0 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -481,11 +481,11 @@ member: %s
 }
 
 // Check whether a name is valid as a NetBIOS name. 
-// FIXME: There are probably more constraints here
+// FIXME: There are probably more constraints here. 
+// crh has a paragraph on this in his book (1.4.1.1)
 function valid_netbios_name(name)
 {
 	if (strlen(name) > 13) return false;
-	if (strstr(name, ".")) return false;
 	return true;
 }
 
-- 
cgit 


From 6c81984ddbe79ace8348c08b4a7eb7dcba75fb98 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 3 Jan 2006 18:11:17 +0000
Subject: r12697: Support empty fullname fields in unix accounts (This used to
 be commit 3d70ebca0b706ae22bc7a3f48c2247c450c42026)

---
 source4/scripting/libjs/upgrade.js | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/upgrade.js b/source4/scripting/libjs/upgrade.js
index 60a9725b43..4ac6b6db34 100644
--- a/source4/scripting/libjs/upgrade.js
+++ b/source4/scripting/libjs/upgrade.js
@@ -113,6 +113,10 @@ function upgrade_sam_account(ldb,acc,domaindn,domainsid)
 
 	var pts = split(',', acc.fullname);
 	acc.fullname = pts[0];
+
+	if (acc.fullname == undefined) {
+		acc.fullname = acc.username;
+	}
 	
 	assert(acc.fullname != undefined);
 	assert(acc.nt_username != undefined);
-- 
cgit 


From 34be0772d2a24c3836cfe7a335184ba2d8902e81 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 3 Jan 2006 19:39:53 +0000
Subject: r12699: correctly escape invalid DN characters (reported by Steinar
 H. Gunderson). this still doesn't work as a bug in ldb causes it to not
 understand escaped characters in DNs when parsing DNs (This used to be commit
 10da56fb6cc57b6c0650a8dc81ded5faa643a96e)

---
 source4/scripting/ejs/smbcalls_ldb.c | 31 ++++++++++++++++++++++++++++++-
 source4/scripting/libjs/upgrade.js   |  2 +-
 2 files changed, 31 insertions(+), 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_ldb.c b/source4/scripting/ejs/smbcalls_ldb.c
index e9dba94eaa..78063ed6b4 100644
--- a/source4/scripting/ejs/smbcalls_ldb.c
+++ b/source4/scripting/ejs/smbcalls_ldb.c
@@ -322,7 +322,35 @@ static int ejs_base64decode(MprVarHandle eid, int argc, struct MprVar **argv)
 
 	return 0;
 }
-  
+
+/* 
+   escape a DN
+   usage:
+     dataout = ldb.dn_escape(datain)
+ */
+static int ejs_dn_escape(MprVarHandle eid, int argc, struct MprVar **argv)
+{
+	char *ret;
+	struct ldb_val val;
+	
+	if (argc != 1) {
+		ejsSetErrorMsg(eid, "ldb.dn_escape invalid argument count");
+		return -1;
+	}
+
+	val.data = mprToString(argv[0]);
+	val.length = strlen((const char *)val.data);
+
+	ret = ldb_dn_escape_value(mprMemCtx(), val);
+	if (ret == NULL) {
+		mpr_Return(eid, mprCreateUndefinedVar());
+	} else {
+		mpr_Return(eid, mprString(ret));
+		talloc_free(ret);
+	}
+
+	return 0;
+}
 
 /*
   perform an ldb add 
@@ -511,6 +539,7 @@ static int ejs_ldb_init(MprVarHandle eid, int argc, struct MprVar **argv)
 	mprSetCFunction(ldb, "errstring", ejs_ldbErrstring);
 	mprSetCFunction(ldb, "encode", ejs_base64encode);
 	mprSetCFunction(ldb, "decode", ejs_base64decode);
+	mprSetCFunction(ldb, "dn_escape", ejs_dn_escape);
 	mprSetCFunction(ldb, "close", ejs_ldbClose);
 	mprSetCFunction(ldb, "transaction_start", ejs_ldbTransactionStart);
 	mprSetCFunction(ldb, "transaction_cancel", ejs_ldbTransactionCancel);
diff --git a/source4/scripting/libjs/upgrade.js b/source4/scripting/libjs/upgrade.js
index 4ac6b6db34..0ffb790d5f 100644
--- a/source4/scripting/libjs/upgrade.js
+++ b/source4/scripting/libjs/upgrade.js
@@ -151,7 +151,7 @@ objectSid: %s-%d
 lmPwdHash:: %s
 ntPwdHash:: %s
 
-", acc.fullname, domaindn, acc.logon_time, acc.logoff_time, acc.username, acc.nt_username, acc.nt_username, 
+", ldb.dn_escape(acc.fullname), domaindn, acc.logon_time, acc.logoff_time, acc.username, acc.nt_username, acc.nt_username, 
 
 acc.fullname, acc.acct_desc, acc.group_rid, acc.bad_password_count, acc.logon_count,
 acc.domain, acc.dir_drive, acc.munged_dial, acc.homedir, acc.logon_script, 
-- 
cgit 


From 65bf7621d9cb40650478bb126332c5d5cf2301f1 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 3 Jan 2006 20:26:57 +0000
Subject: r12703: Fix handling of short passdb backends (also reported by
 Steinar Gunderson) (This used to be commit
 4c562c42b43d98f4c6bdbacc5cb1dd5e65bc3418)

---
 source4/scripting/libjs/upgrade.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/upgrade.js b/source4/scripting/libjs/upgrade.js
index 0ffb790d5f..51818487eb 100644
--- a/source4/scripting/libjs/upgrade.js
+++ b/source4/scripting/libjs/upgrade.js
@@ -605,8 +605,10 @@ data: %d
 	var pdb = samba3.configuration.get_list("passdb backend");
 	if (pdb != undefined) {
 		for (var b in pdb) {
-			if (substr(pdb[b], 0, 7) == "ldapsam") {
-				ldapurl = substr(pdb[b], 8);
+			if (strlen(pdb[b]) >= 7) {
+				if (substr(pdb[b], 0, 7) == "ldapsam") {
+					ldapurl = substr(pdb[b], 8);
+				}
 			}
 		}
 	}
-- 
cgit 


From a7d517d6daf8a55dbfbcde80fa7e61e31dfc49be Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 3 Jan 2006 21:20:48 +0000
Subject: r12704: role => server role (This used to be commit
 5884a7effff0b11e82c9d273dbd0407b0f2eb02d)

---
 source4/scripting/libjs/upgrade.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/upgrade.js b/source4/scripting/libjs/upgrade.js
index 51818487eb..158e22eadd 100644
--- a/source4/scripting/libjs/upgrade.js
+++ b/source4/scripting/libjs/upgrade.js
@@ -499,15 +499,15 @@ function upgrade_smbconf(oldconf,mark)
 
 	if (oldconf.get("domain logons") == "True") {
 		if (oldconf.get("domain master") == "True") {
-			newconf.set("role", "pdc");
+			newconf.set("server role", "pdc");
 		} else {
-			newconf.set("role", "bdc");
+			newconf.set("server role", "bdc");
 		}
 	} else {
 		if (oldconf.get("domain master") == "True") {
-			newconf.set("role", "standalone");
+			newconf.set("server role", "standalone");
 		} else {
-			newconf.set("role", "member server");
+			newconf.set("server role", "member server");
 		}
 	}
 
-- 
cgit 


From 81e05038b6fca971b060b649899999ae156091cd Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Wed, 4 Jan 2006 01:28:03 +0000
Subject: r12708: This is equivilant, but doesn't cause a warning.

Andrew Bartlett
(This used to be commit 964f7fc6ca4ac7578ca0d467392d4e174211b6e2)
---
 source4/scripting/ejs/smbcalls_ldb.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_ldb.c b/source4/scripting/ejs/smbcalls_ldb.c
index 78063ed6b4..f1d59ec2af 100644
--- a/source4/scripting/ejs/smbcalls_ldb.c
+++ b/source4/scripting/ejs/smbcalls_ldb.c
@@ -338,8 +338,7 @@ static int ejs_dn_escape(MprVarHandle eid, int argc, struct MprVar **argv)
 		return -1;
 	}
 
-	val.data = mprToString(argv[0]);
-	val.length = strlen((const char *)val.data);
+	val = data_blob_string_const(mprToString(argv[0]));
 
 	ret = ldb_dn_escape_value(mprMemCtx(), val);
 	if (ret == NULL) {
-- 
cgit 


From 8574fe2f8e07f15f129a7b53773c5a83278a9499 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Fri, 6 Jan 2006 12:24:49 +0000
Subject: r12738: Use a talloc_reference to ensure this doesn't get free()'ed
 too early.

Andrew Bartlett
(This used to be commit 0f8c162211662de59f42a96fe5bdf56ed5be883f)
---
 source4/scripting/ejs/smbcalls_creds.c | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_creds.c b/source4/scripting/ejs/smbcalls_creds.c
index 3cd554b957..bec70bc6f2 100644
--- a/source4/scripting/ejs/smbcalls_creds.c
+++ b/source4/scripting/ejs/smbcalls_creds.c
@@ -237,6 +237,9 @@ static int ejs_credentials_init(MprVarHandle eid, int argc, struct MprVar **argv
 int ejs_credentials_cmdline(int eid, int argc, struct MprVar **argv)
 {
 	struct MprVar *obj = mprInitObject(eid, "credentials", argc, argv);
+	if (talloc_reference(mprMemCtx(), cmdline_credentials) == NULL) {
+		return -1;
+	}
 	return ejs_credentials_obj(obj, cmdline_credentials);
 }
 
-- 
cgit 


From 8f4dc51345dc48f5a6bfb1a49297f205ba53ef0a Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Fri, 6 Jan 2006 12:29:06 +0000
Subject: r12739: Add support for using credentials in the provision process.

This should allow us to provision to a 'normal' LDAP server.

Also add in 'session info' hooks (unused).  Both of these need to be
hooked in on the webserver.

Andrew Bartlett
(This used to be commit b349d2fbfefd0e0d4620b9e8e0c4136f900be1ae)
---
 source4/scripting/libjs/provision.js | 37 ++++++++++++++++++++----------------
 1 file changed, 21 insertions(+), 16 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index b5f8527bd0..17382cc014 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -16,6 +16,7 @@ function install_ok()
 {
 	var lp = loadparm_init();
 	var ldb = ldb_init();
+	ldb.credentials = credentials_cmdline();
 	if (lp.get("realm") == "") {
 		return false;
 	}
@@ -174,19 +175,21 @@ function ldb_erase(ldb)
 /*
   setup a ldb in the private dir
  */
-function setup_ldb(ldif, dbname, subobj)
+function setup_ldb(ldif, session_info, credentials, dbname, subobj)
 {
 	var erase = true;
 	var extra = "";
 	var ldb = ldb_init();
 	var lp = loadparm_init();
+	ldb.session_info = session_info;
+	ldb.credentials = credentials;
 
-	if (arguments.length >= 4) {
-		extra = arguments[3];
+	if (arguments.length >= 6) {
+		extra = arguments[5];
 	}
 
-	if (arguments.length == 5) {
-	        erase = arguments[4];
+	if (arguments.length == 7) {
+	        erase = arguments[6];
         }
 
 	var src = lp.get("setup directory") + "/" + ldif;
@@ -257,12 +260,12 @@ function provision_default_paths(subobj)
 /*
   provision samba4 - caution, this wipes all existing data!
 */
-function provision(subobj, message, blank, paths)
+function provision(subobj, message, blank, paths, session_info, credentials)
 {
 	var data = "";
 	var lp = loadparm_init();
 	var sys = sys_init();
-	
+
 	/*
 	  some options need to be upper/lower case
 	*/
@@ -291,7 +294,7 @@ function provision(subobj, message, blank, paths)
 		lp.reload();
 	}
 	message("Setting up secrets.ldb\n");
-	setup_ldb("secrets.ldif", paths.secrets, subobj);
+	setup_ldb("secrets.ldif", session_info, credentials, paths.secrets, subobj);
 	message("Setting up DNS zone file\n");
 	setup_file("provision.zone", 
 		   paths.dns, 
@@ -300,20 +303,20 @@ function provision(subobj, message, blank, paths)
 	var keytab_ok = credentials_update_all_keytabs();
 	assert(keytab_ok);
 	message("Setting up hklm.ldb\n");
-	setup_ldb("hklm.ldif", paths.hklm, subobj);
+	setup_ldb("hklm.ldif", session_info, credentials, paths.hklm, subobj);
 	message("Setting up sam.ldb attributes\n");
-	setup_ldb("provision_init.ldif", paths.samdb, subobj);
+	setup_ldb("provision_init.ldif", session_info, credentials, paths.samdb, subobj);
 	message("Setting up sam.ldb schema\n");
-	setup_ldb("schema.ldif", paths.samdb, subobj, NULL, false);
+	setup_ldb("schema.ldif", session_info, credentials, paths.samdb, subobj, NULL, false);
 	message("Setting up display specifiers\n");
-	setup_ldb("display_specifiers.ldif", paths.samdb, subobj, NULL, false);
+	setup_ldb("display_specifiers.ldif", session_info, credentials, paths.samdb, subobj, NULL, false);
 	message("Setting up sam.ldb templates\n");
-	setup_ldb("provision_templates.ldif", paths.samdb, subobj, NULL, false);
+	setup_ldb("provision_templates.ldif", session_info, credentials, paths.samdb, subobj, NULL, false);
 	message("Setting up sam.ldb data\n");
-	setup_ldb("provision.ldif", paths.samdb, subobj, NULL, false);
+	setup_ldb("provision.ldif", session_info, credentials, paths.samdb, subobj, NULL, false);
 	if (blank == false) {
 		message("Setting up sam.ldb users and groups\n");
-		setup_ldb("provision_users.ldif", paths.samdb, subobj, data, false);
+		setup_ldb("provision_users.ldif", session_info, credentials, paths.samdb, subobj, data, false);
 	}
 }
 
@@ -403,12 +406,14 @@ userAccountControl: %u
 /*
   add a new user record
 */
-function newuser(username, unixname, password, message)
+function newuser(username, unixname, password, message, subobj, session_info, credentials)
 {
 	var lp = loadparm_init();
 	var samdb = lp.get("sam database");
 	var ldb = ldb_init();
 	random_init(local);
+	ldb.session_info = session_info;
+	ldb.credentials = credentials;
 
 	/* connect to the sam */
 	var ok = ldb.connect(samdb);
-- 
cgit 


From a2cad19bbddfdbef6a01d6cf300dabbc9cf96165 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Fri, 6 Jan 2006 19:37:13 +0000
Subject: r12744: For correctly written scripts, we don't need this anymore. 
 Only use the cmdline credentials if we ask for it.

Andrew Bartlett
(This used to be commit 874dd09759eb0243988f39363c94785ae2e68485)
---
 source4/scripting/ejs/smbcalls_ldb.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_ldb.c b/source4/scripting/ejs/smbcalls_ldb.c
index f1d59ec2af..798747b36c 100644
--- a/source4/scripting/ejs/smbcalls_ldb.c
+++ b/source4/scripting/ejs/smbcalls_ldb.c
@@ -386,7 +386,7 @@ static int ejs_ldbConnect(MprVarHandle eid, int argc, char **argv)
 {
 	struct ldb_context *ldb;
 	struct auth_session_info *session_info;
-	struct cli_credentials *creds;
+	struct cli_credentials *creds = NULL;
 	struct MprVar *credentials;
 	struct MprVar *this = mprGetProperty(ejsGetLocalObject(eid), "this", 0);
 
@@ -402,8 +402,6 @@ static int ejs_ldbConnect(MprVarHandle eid, int argc, char **argv)
 	credentials = mprGetProperty(this, "credentials", NULL);
 	if (credentials) {
 		creds = mprGetPtr(credentials, "creds");
-	} else {
-		creds = cmdline_credentials;
 	}
 
 	dbfile = argv[0];
-- 
cgit 


From a8eec313549905724a8186a1a4c14480658e2967 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Fri, 6 Jan 2006 21:04:32 +0000
Subject: r12746: An initial version of the kludge_acls module.

This should be replaced with real ACLs, which tridge is working on.
In the meantime, the rules are very simple:

- SYSTEM and Administrators can read all.

- Users and anonymous cannot read passwords, can read everything else

- list of 'password' attributes is hard-coded

Most of the difficult work in this was fighting with the C/js
interface to add a system_session() all, as it still doesn't get on
with me :-)

Andrew Bartlett
(This used to be commit be9d0cae8989429ef47a713d8f0a82f12966fc78)
---
 source4/scripting/ejs/smbcalls_auth.c | 17 +++++++++++++++++
 source4/scripting/ejs/smbcalls_ldb.c  | 11 +++++++----
 2 files changed, 24 insertions(+), 4 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_auth.c b/source4/scripting/ejs/smbcalls_auth.c
index 8ef04bec97..3ec376f4fe 100644
--- a/source4/scripting/ejs/smbcalls_auth.c
+++ b/source4/scripting/ejs/smbcalls_auth.c
@@ -157,10 +157,27 @@ static int ejs_userAuth(MprVarHandle eid, int argc, struct MprVar **argv)
 	return 0;
 }
 
+/*
+  initialise credentials ejs object
+*/
+static int ejs_system_session(MprVarHandle eid, int argc, struct MprVar **argv)
+{
+	struct MprVar *obj = mprInitObject(eid, "session_info", argc, argv);
+	struct auth_session_info *session_info = system_session(mprMemCtx());
+
+	if (session_info == NULL) {
+		return -1;
+	}
+
+	mprSetPtrChild(obj, "session_info", session_info);
+	return 0;
+}
+
 /*
   setup C functions that be called from ejs
 */
 void smb_setup_ejs_auth(void)
 {
 	ejsDefineCFunction(-1, "userAuth", ejs_userAuth, NULL, MPR_VAR_SCRIPT_HANDLE);
+	ejsDefineCFunction(-1, "system_session", ejs_system_session, NULL, MPR_VAR_SCRIPT_HANDLE);
 }
diff --git a/source4/scripting/ejs/smbcalls_ldb.c b/source4/scripting/ejs/smbcalls_ldb.c
index 798747b36c..39698947d7 100644
--- a/source4/scripting/ejs/smbcalls_ldb.c
+++ b/source4/scripting/ejs/smbcalls_ldb.c
@@ -385,9 +385,9 @@ static int ejs_ldbModify(MprVarHandle eid, int argc, struct MprVar **argv)
 static int ejs_ldbConnect(MprVarHandle eid, int argc, char **argv)
 {
 	struct ldb_context *ldb;
-	struct auth_session_info *session_info;
+	struct auth_session_info *session_info = NULL;
 	struct cli_credentials *creds = NULL;
-	struct MprVar *credentials;
+	struct MprVar *credentials, *session;
 	struct MprVar *this = mprGetProperty(ejsGetLocalObject(eid), "this", 0);
 
 	const char *dbfile;
@@ -397,13 +397,16 @@ static int ejs_ldbConnect(MprVarHandle eid, int argc, char **argv)
 		return -1;
 	}
 
-	session_info = mprGetThisPtr(eid, "session_info");
-
 	credentials = mprGetProperty(this, "credentials", NULL);
 	if (credentials) {
 		creds = mprGetPtr(credentials, "creds");
 	}
 
+	session = mprGetProperty(this, "session_info", NULL);
+	if (session) {
+		session_info = mprGetPtr(session, "session_info");
+	}
+
 	dbfile = argv[0];
 
 	ldb = ldb_wrap_connect(mprMemCtx(), dbfile, 
-- 
cgit 


From 27f997e6825827ec99e1580370218c294d455e79 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Fri, 6 Jan 2006 21:45:36 +0000
Subject: r12749: Fix the newuser script.

Andrew Bartlett
(This used to be commit 42cdad5e3f06c307baf80396fd8449b803ef84c3)
---
 source4/scripting/libjs/provision.js | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index 17382cc014..e71ea83523 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -406,7 +406,7 @@ userAccountControl: %u
 /*
   add a new user record
 */
-function newuser(username, unixname, password, message, subobj, session_info, credentials)
+function newuser(username, unixname, password, message, session_info, credentials)
 {
 	var lp = loadparm_init();
 	var samdb = lp.get("sam database");
@@ -437,15 +437,13 @@ function newuser(username, unixname, password, message, subobj, session_info, cr
 	var ldif = sprintf("
 dn: %s
 sAMAccountName: %s
-name: %s
 memberOf: %s
 unixName: %s
-objectGUID: %s
-unicodePwd: %s
+sambaPassword: %s
 objectClass: user
 ",
-			   user_dn, username, username, dom_users,
-			   unixname, randguid(), password);
+			   user_dn, username, dom_users,
+			   unixname, password);
 	/*
 	  add the user to the users group as well
 	*/
-- 
cgit 


From f55ea8bb3dca868e21663cd90eaea7a35cd7886c Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Mon, 9 Jan 2006 22:12:53 +0000
Subject: r12804: This patch reworks the Samba4 sockets layer to use a
 socket_address structure that is more generic than just 'IP/port'.

It now passes make test, and has been reviewed and updated by
metze. (Thankyou *very* much).

This passes 'make test' as well as kerberos use (not currently in the
testsuite).

The original purpose of this patch was to have Samba able to pass a
socket address stucture from the BSD layer into the kerberos routines
and back again.   It also removes nbt_peer_addr, which was being used
for a similar purpose.

It is a large change, but worthwhile I feel.

Andrew Bartlett
(This used to be commit 88198c4881d8620a37086f80e4da5a5b71c5bbb2)
---
 source4/scripting/ejs/smbcalls_auth.c | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_auth.c b/source4/scripting/ejs/smbcalls_auth.c
index 3ec376f4fe..c79f2af0ac 100644
--- a/source4/scripting/ejs/smbcalls_auth.c
+++ b/source4/scripting/ejs/smbcalls_auth.c
@@ -28,7 +28,7 @@
 
 static int ejs_doauth(MprVarHandle eid,
 		      TALLOC_CTX *tmp_ctx, struct MprVar *auth, const char *username, 
-		      const char *password, const char *domain, const char *remote_host,
+		      const char *password, const char *domain, const char *workstation,
 		      const char *authtype)
 {
 	struct auth_usersupplied_info *user_info = NULL;
@@ -61,9 +61,9 @@ static int ejs_doauth(MprVarHandle eid,
 	user_info->client.domain_name = domain;
 	user_info->mapped.domain_name = domain;
 
-	user_info->workstation_name = remote_host;
+	user_info->workstation_name = workstation;
 
-	user_info->remote_host = remote_host;
+	user_info->remote_host = NULL;
 
 	user_info->password_state = AUTH_PASSWORD_PLAIN;
 	user_info->password.plaintext = talloc_strdup(user_info, password);
@@ -101,13 +101,6 @@ done:
 /*
   perform user authentication, returning an array of results
 
-  syntax:
-    var authinfo = new Object();
-    authinfo.username = myname;
-    authinfo.password = mypass;
-    authinfo.domain = mydom;
-    authinfo.rhost = request['REMOTE_HOST'];
-    auth = userAuth(authinfo);
 */
 static int ejs_userAuth(MprVarHandle eid, int argc, struct MprVar **argv)
 {
@@ -115,7 +108,7 @@ static int ejs_userAuth(MprVarHandle eid, int argc, struct MprVar **argv)
 	const char *username;
 	const char *password;
 	const char *domain;
-	const char *remote_host;
+	const char *workstation;
 	struct MprVar auth;
 	struct cli_credentials *creds;
 
@@ -136,7 +129,7 @@ static int ejs_userAuth(MprVarHandle eid, int argc, struct MprVar **argv)
 	username    = cli_credentials_get_username(creds);
 	password    = cli_credentials_get_password(creds);
 	domain      = cli_credentials_get_domain(creds);
-	remote_host = cli_credentials_get_workstation(creds);
+	workstation = cli_credentials_get_workstation(creds);
 
 	if (username == NULL || password == NULL || domain == NULL) {
 		mpr_Return(eid, mprCreateUndefinedVar());
@@ -147,9 +140,9 @@ static int ejs_userAuth(MprVarHandle eid, int argc, struct MprVar **argv)
 	auth = mprObject("auth");
 
 	if (domain && (strcmp("System User", domain) == 0)) {
-		ejs_doauth(eid, tmp_ctx, &auth, username, password, domain, remote_host, "unix");
+		ejs_doauth(eid, tmp_ctx, &auth, username, password, domain, workstation, "unix");
 	} else {
-		ejs_doauth(eid, tmp_ctx, &auth, username, password, domain, remote_host, "sam");
+		ejs_doauth(eid, tmp_ctx, &auth, username, password, domain, workstation, "sam");
 	}
 
 	mpr_Return(eid, auth);
-- 
cgit 


From 8f86ddcd930e5f9214777e5b761e6eb1748b8e74 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Tue, 10 Jan 2006 09:21:13 +0000
Subject: r12819: Fix swat authentication again.  We need to pass the
 socket_address structure around, so the auth code knows where the request
 came from.

Andrew Bartlett
(This used to be commit 7a7b2668c00d4d22bcf8aa3ba256af88f70c38c4)
---
 source4/scripting/ejs/smbcalls_auth.c | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_auth.c b/source4/scripting/ejs/smbcalls_auth.c
index c79f2af0ac..a1310ded9c 100644
--- a/source4/scripting/ejs/smbcalls_auth.c
+++ b/source4/scripting/ejs/smbcalls_auth.c
@@ -29,7 +29,7 @@
 static int ejs_doauth(MprVarHandle eid,
 		      TALLOC_CTX *tmp_ctx, struct MprVar *auth, const char *username, 
 		      const char *password, const char *domain, const char *workstation,
-		      const char *authtype)
+		      struct socket_address *remote_host, const char *authtype)
 {
 	struct auth_usersupplied_info *user_info = NULL;
 	struct auth_serversupplied_info *server_info = NULL;
@@ -63,7 +63,7 @@ static int ejs_doauth(MprVarHandle eid,
 
 	user_info->workstation_name = workstation;
 
-	user_info->remote_host = NULL;
+	user_info->remote_host = remote_host;
 
 	user_info->password_state = AUTH_PASSWORD_PLAIN;
 	user_info->password.plaintext = talloc_strdup(user_info, password);
@@ -75,7 +75,9 @@ static int ejs_doauth(MprVarHandle eid,
 
 	nt_status = auth_check_password(auth_context, tmp_ctx, user_info, &server_info);
 	if (!NT_STATUS_IS_OK(nt_status)) {
-		mprSetPropertyValue(auth, "report", mprString("Login Failed"));
+		mprSetPropertyValue(auth, "report", 
+				    mprString(talloc_asprintf(mprMemCtx(), "Login Failed: %s", 
+							      get_friendly_nt_error_msg(nt_status))));
 		mprSetPropertyValue(auth, "result", mprCreateBoolVar(False));
 		goto done;
 	}
@@ -111,8 +113,9 @@ static int ejs_userAuth(MprVarHandle eid, int argc, struct MprVar **argv)
 	const char *workstation;
 	struct MprVar auth;
 	struct cli_credentials *creds;
+	struct socket_address *remote_host;
 
-	if (argc != 1 || argv[0]->type != MPR_TYPE_OBJECT) {
+	if (argc != 2 || argv[0]->type != MPR_TYPE_OBJECT || argv[1]->type != MPR_TYPE_OBJECT) {
 		ejsSetErrorMsg(eid, "userAuth invalid arguments, this function requires an object.");
 		return -1;
 	}
@@ -120,7 +123,13 @@ static int ejs_userAuth(MprVarHandle eid, int argc, struct MprVar **argv)
 	/* get credential values from credentials object */
 	creds = mprGetPtr(argv[0], "creds");
 	if (creds == NULL) {
-		ejsSetErrorMsg(eid, "userAuth requires a 'creds' element");
+		ejsSetErrorMsg(eid, "userAuth requires a 'creds' first parameter");
+		return -1;
+	}
+
+	remote_host = mprGetPtr(argv[1], "socket_address");
+	if (remote_host == NULL) {
+		ejsSetErrorMsg(eid, "userAuth requires a socket address second parameter");
 		return -1;
 	}
 
@@ -139,10 +148,10 @@ static int ejs_userAuth(MprVarHandle eid, int argc, struct MprVar **argv)
 
 	auth = mprObject("auth");
 
-	if (domain && (strcmp("System User", domain) == 0)) {
-		ejs_doauth(eid, tmp_ctx, &auth, username, password, domain, workstation, "unix");
+	if (domain && (strcmp("SYSTEM USER", domain) == 0)) {
+		ejs_doauth(eid, tmp_ctx, &auth, username, password, domain, workstation, remote_host, "unix");
 	} else {
-		ejs_doauth(eid, tmp_ctx, &auth, username, password, domain, workstation, "sam");
+		ejs_doauth(eid, tmp_ctx, &auth, username, password, domain, workstation, remote_host, "sam");
 	}
 
 	mpr_Return(eid, auth);
-- 
cgit 


From 195f5c3635159013fa14fbe0d34283b8237b0667 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Tue, 10 Jan 2006 09:43:00 +0000
Subject: r12822: Given that talloc gives us this extra level of safety, use
 it.

Andrew Bartlett
(This used to be commit a6028558dc19b0d105b1bfe4126a2b24afaf8dd2)
---
 source4/scripting/ejs/smbcalls_ldb.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_ldb.c b/source4/scripting/ejs/smbcalls_ldb.c
index 39698947d7..1a224605ee 100644
--- a/source4/scripting/ejs/smbcalls_ldb.c
+++ b/source4/scripting/ejs/smbcalls_ldb.c
@@ -399,12 +399,12 @@ static int ejs_ldbConnect(MprVarHandle eid, int argc, char **argv)
 
 	credentials = mprGetProperty(this, "credentials", NULL);
 	if (credentials) {
-		creds = mprGetPtr(credentials, "creds");
+		creds = talloc_get_type(mprGetPtr(credentials, "creds"), struct cli_credentials);
 	}
 
 	session = mprGetProperty(this, "session_info", NULL);
 	if (session) {
-		session_info = mprGetPtr(session, "session_info");
+		session_info = talloc_get_type(mprGetPtr(session, "session_info"), struct auth_session_info);
 	}
 
 	dbfile = argv[0];
-- 
cgit 


From 75ef0ba513489a85557cb486135d80286d620809 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Tue, 10 Jan 2006 10:35:47 +0000
Subject: r12823: Fix up the provison and newuser code in SWAT.  This also
 cleans up the main provision script a bit, as the argument list was getting
 out of control.  (It has been replaced in part with an object).

This also returns the session_info from the auth code into ejs.

We still need access control allowing only root to re-provision.

Andrew Bartlett
(This used to be commit 002cdcf3cab6563909d31edc5d825e857dc0a732)
---
 source4/scripting/ejs/smbcalls_auth.c |  6 ++++-
 source4/scripting/libjs/provision.js  | 51 ++++++++++++++++++++---------------
 2 files changed, 35 insertions(+), 22 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_auth.c b/source4/scripting/ejs/smbcalls_auth.c
index a1310ded9c..5c70b6908b 100644
--- a/source4/scripting/ejs/smbcalls_auth.c
+++ b/source4/scripting/ejs/smbcalls_auth.c
@@ -35,6 +35,7 @@ static int ejs_doauth(MprVarHandle eid,
 	struct auth_serversupplied_info *server_info = NULL;
 	struct auth_session_info *session_info = NULL;
 	struct auth_context *auth_context;
+	struct MprVar *session_info_obj;
 	const char *auth_types[] = { authtype, NULL };
 	NTSTATUS nt_status;
 
@@ -89,9 +90,12 @@ static int ejs_doauth(MprVarHandle eid,
 		goto done;
 	}
 
+	session_info_obj = mprInitObject(eid, "session_info", 0, NULL);
+
+	mprSetPtrChild(session_info_obj, "session_info", session_info);
 	talloc_steal(mprMemCtx(), session_info);
-	mprSetThisPtr(eid, "session_info", session_info);
 
+	mprSetProperty(auth, "session_info", session_info_obj);
 	mprSetPropertyValue(auth, "result", mprCreateBoolVar(server_info->authenticated));
 	mprSetPropertyValue(auth, "username", mprString(server_info->account_name));
 	mprSetPropertyValue(auth, "domain", mprString(server_info->domain_name));
diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index e71ea83523..8b1d93c056 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -12,11 +12,12 @@ sys = sys_init();
 /*
   return true if the current install seems to be OK
 */
-function install_ok()
+function install_ok(session_info, credentials)
 {
 	var lp = loadparm_init();
 	var ldb = ldb_init();
-	ldb.credentials = credentials_cmdline();
+	ldb.session_info = session_info;
+	ldb.credentials = credentials;
 	if (lp.get("realm") == "") {
 		return false;
 	}
@@ -24,7 +25,7 @@ function install_ok()
 	if (!ok) {
 		return false;
 	}
-	var res = ldb.search("(name=Administrator)");
+	var res = ldb.search("(cn=Administrator)");
 	if (res.length != 1) {
 		return false;
 	}
@@ -175,28 +176,28 @@ function ldb_erase(ldb)
 /*
   setup a ldb in the private dir
  */
-function setup_ldb(ldif, session_info, credentials, dbname, subobj)
+function setup_ldb(ldif, info, dbname)
 {
 	var erase = true;
 	var extra = "";
 	var ldb = ldb_init();
 	var lp = loadparm_init();
-	ldb.session_info = session_info;
-	ldb.credentials = credentials;
+	ldb.session_info = info.session_info;
+	ldb.credentials = info.credentials;
 
-	if (arguments.length >= 6) {
-		extra = arguments[5];
+	if (arguments.length >= 4) {
+		extra = arguments[3];
 	}
 
-	if (arguments.length == 7) {
-	        erase = arguments[6];
+	if (arguments.length == 5) {
+	        erase = arguments[4];
         }
 
 	var src = lp.get("setup directory") + "/" + ldif;
 
 	var data = sys.file_load(src);
 	data = data + extra;
-	data = substitute_var(data, subobj);
+	data = substitute_var(data, info.subobj);
 
 	ldb.filename = dbname;
 
@@ -211,12 +212,12 @@ function setup_ldb(ldif, session_info, credentials, dbname, subobj)
 
 	var add_ok = ldb.add(data);
 	if (!add_ok) {
-		message("ldb load failed: " + ldb.errstring() + "\n");
+		info.message("ldb load failed: " + ldb.errstring() + "\n");
 		assert(add_ok);
 	}
 	var commit_ok = ldb.transaction_commit();
 	if (!commit_ok) {
-		message("ldb commit failed: " + ldb.errstring() + "\n");
+		info.message("ldb commit failed: " + ldb.errstring() + "\n");
 		assert(add_ok);
 	}
 }
@@ -265,6 +266,7 @@ function provision(subobj, message, blank, paths, session_info, credentials)
 	var data = "";
 	var lp = loadparm_init();
 	var sys = sys_init();
+	var info = new Object();
 
 	/*
 	  some options need to be upper/lower case
@@ -286,6 +288,11 @@ function provision(subobj, message, blank, paths, session_info, credentials)
 
 	provision_next_usn = 1;
 
+	info.subobj = subobj;
+	info.message = message;
+	info.credentials = credentials;
+	info.session_info = session_info;
+
 	/* only install a new smb.conf if there isn't one there already */
 	var st = sys.stat(paths.smbconf);
 	if (st == undefined) {
@@ -294,7 +301,7 @@ function provision(subobj, message, blank, paths, session_info, credentials)
 		lp.reload();
 	}
 	message("Setting up secrets.ldb\n");
-	setup_ldb("secrets.ldif", session_info, credentials, paths.secrets, subobj);
+	setup_ldb("secrets.ldif", info, paths.secrets);
 	message("Setting up DNS zone file\n");
 	setup_file("provision.zone", 
 		   paths.dns, 
@@ -303,20 +310,22 @@ function provision(subobj, message, blank, paths, session_info, credentials)
 	var keytab_ok = credentials_update_all_keytabs();
 	assert(keytab_ok);
 	message("Setting up hklm.ldb\n");
-	setup_ldb("hklm.ldif", session_info, credentials, paths.hklm, subobj);
+	setup_ldb("hklm.ldif", info, paths.hklm);
+
+
 	message("Setting up sam.ldb attributes\n");
-	setup_ldb("provision_init.ldif", session_info, credentials, paths.samdb, subobj);
+	setup_ldb("provision_init.ldif", info, paths.samdb);
 	message("Setting up sam.ldb schema\n");
-	setup_ldb("schema.ldif", session_info, credentials, paths.samdb, subobj, NULL, false);
+	setup_ldb("schema.ldif", info, paths.samdb, NULL, false);
 	message("Setting up display specifiers\n");
-	setup_ldb("display_specifiers.ldif", session_info, credentials, paths.samdb, subobj, NULL, false);
+	setup_ldb("display_specifiers.ldif", info, paths.samdb, NULL, false);
 	message("Setting up sam.ldb templates\n");
-	setup_ldb("provision_templates.ldif", session_info, credentials, paths.samdb, subobj, NULL, false);
+	setup_ldb("provision_templates.ldif", info, paths.samdb, NULL, false);
 	message("Setting up sam.ldb data\n");
-	setup_ldb("provision.ldif", session_info, credentials, paths.samdb, subobj, NULL, false);
+	setup_ldb("provision.ldif", info, paths.samdb, NULL, false);
 	if (blank == false) {
 		message("Setting up sam.ldb users and groups\n");
-		setup_ldb("provision_users.ldif", session_info, credentials, paths.samdb, subobj, data, false);
+		setup_ldb("provision_users.ldif", info, paths.samdb, data, false);
 	}
 }
 
-- 
cgit 


From 792951a36535c9345e6027e0940d97d511282302 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Fri, 13 Jan 2006 03:34:00 +0000
Subject: r12891: We no longer manually set the 'name' attribute.

Andrew Bartlett
(This used to be commit 7b169aad3f94f1695b1f99cc91ff928cb2ca0389)
---
 source4/scripting/libjs/upgrade.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/upgrade.js b/source4/scripting/libjs/upgrade.js
index 158e22eadd..a8f717badc 100644
--- a/source4/scripting/libjs/upgrade.js
+++ b/source4/scripting/libjs/upgrade.js
@@ -128,7 +128,6 @@ objectClass: user
 lastLogon: %d
 lastLogoff: %d
 unixName: %s
-name: %s
 sAMAccountName: %s
 cn: %s
 description: %s
@@ -153,7 +152,7 @@ ntPwdHash:: %s
 
 ", ldb.dn_escape(acc.fullname), domaindn, acc.logon_time, acc.logoff_time, acc.username, acc.nt_username, acc.nt_username, 
 
-acc.fullname, acc.acct_desc, acc.group_rid, acc.bad_password_count, acc.logon_count,
+acc.acct_desc, acc.group_rid, acc.bad_password_count, acc.logon_count,
 acc.domain, acc.dir_drive, acc.munged_dial, acc.homedir, acc.logon_script, 
 acc.profile_path, acc.workstations, acc.kickoff_time, acc.bad_password_time, 
 acc.pass_last_set_time, acc.pass_can_change_time, acc.pass_must_change_time, domainsid, acc.user_rid,
-- 
cgit 


From 58f78fa182c4b4a046b957c89988d34ea2125696 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Fri, 13 Jan 2006 03:39:49 +0000
Subject: r12892: Add a 'Migrate from Windows' page to our installation section
 in SWAT.

Doing this required reworking ejsnet, particularly so it could take a
set of credentials, not just a username and password argument.

This required fixing the ejsnet.js test script, which now adds and
deletes a user, and is run from 'make test'.  This should prevent it
being broken again.

Deleting a user from ejsnet required that the matching backend be
added to libnet, hooking fortunetly onto already existing code for the
actual deletion.

The js credentials interface now handles the 'set machine account' flag.

New functions have been added to provision.js to wrap the basic
operations (so we can write a command line version, as well as the web
based version).

Andrew Bartlett
(This used to be commit a5e7c17c348c45e61699cc1626a0d5eae2df4636)
---
 source4/scripting/ejs/ejsnet.c         | 219 ++++++++++++++++++++++++++-------
 source4/scripting/ejs/ejsnet.h         |   2 -
 source4/scripting/ejs/smbcalls_creds.c |  22 ++++
 source4/scripting/libjs/provision.js   |  26 ++++
 4 files changed, 221 insertions(+), 48 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/ejsnet.c b/source4/scripting/ejs/ejsnet.c
index 5768fb4442..e129ba6867 100644
--- a/source4/scripting/ejs/ejsnet.c
+++ b/source4/scripting/ejs/ejsnet.c
@@ -27,70 +27,160 @@
 #include "libnet/libnet.h"
 
 
+static int ejs_net_userman(MprVarHandle, int, struct MprVar**);
+static int ejs_net_createuser(MprVarHandle, int, char**);
+static int ejs_net_deleteuser(MprVarHandle eid, int argc, char **argv);
+static int ejs_net_join_domain(MprVarHandle eid, int argc, struct MprVar **argv);
+static int ejs_net_samsync_ldb(MprVarHandle eid, int argc, struct MprVar **argv);
+
+/* Usage:
+   net = NetContext(credentials);
+*/
+
 static int ejs_net_context(MprVarHandle eid, int argc, struct MprVar **argv)
 {
 	struct cli_credentials *creds;
 	struct libnet_context *ctx;
-	struct MprVar *obj;
+	struct MprVar obj;
 
+	/* TODO:  Need to get the right event context in here */
 	ctx = libnet_context_init(NULL);
-	creds = talloc(ctx, struct cli_credentials);
-	ctx->cred = creds;
-
-	ctx->name_res_methods = str_list_copy(ctx, lp_name_resolve_order());
 
 	if (argc == 0) {
+		creds = cli_credentials_init(ctx);
+		if (creds == NULL) {
+			ejsSetErrorMsg(eid, "cli_credential_init() failed");
+			talloc_free(ctx);
+			return -1;
+		}
+		cli_credentials_set_conf(creds);
 		cli_credentials_set_anonymous(creds);
+	} else if (argc == 1 && argv[0]->type == MPR_TYPE_OBJECT) {
+		/* get credential values from credentials object */
+		creds = mprGetPtr(argv[0], "creds");
+		if (creds == NULL) {
+			ejsSetErrorMsg(eid, "userAuth requires a 'creds' first parameter");
+			talloc_free(ctx);
+			return -1;
+		}
+	} else {
+		ejsSetErrorMsg(eid, "NetContext invalid arguments, this function requires an object.");
+		talloc_free(ctx);
+		return -1;
+	}
+	ctx->cred = creds;
 
-	} else if (argc == 2 || argc == 4 ) {
-	  
-		cli_credentials_set_workstation(creds, lp_netbios_name(), CRED_SPECIFIED);
+	obj = mprObject("NetCtx");
+	mprSetPtrChild(&obj, "ctx", ctx);
+	
+	mprSetCFunction(&obj, "UserMgr", ejs_net_userman);
+	mprSetCFunction(&obj, "JoinDomain", ejs_net_join_domain);
+	mprSetCFunction(&obj, "SamSyncLdb", ejs_net_samsync_ldb);
+	mpr_Return(eid, obj);
 
-		if (!mprVarIsString(argv[0]->type)) {
-			ejsSetErrorMsg(eid, "argument 1 must be a string");
-			goto done;
-		}
-		cli_credentials_set_username(creds, argv[0]->string, CRED_SPECIFIED);
+	return 0;
+}
 
-		if (!mprVarIsString(argv[1]->type)) {
-			ejsSetErrorMsg(eid, "argument 2 must be a string");
-			goto done;
+static int ejs_net_join_domain(MprVarHandle eid, int argc, struct MprVar **argv)
+{
+	TALLOC_CTX *mem_ctx;
+	struct libnet_context *ctx;
+	struct libnet_Join *join;
+	NTSTATUS status;
+	ctx = mprGetThisPtr(eid, "ctx");
+	mem_ctx = talloc_new(mprMemCtx());
+
+	join = talloc(mem_ctx, struct libnet_Join);
+	if (!join) {
+		talloc_free(mem_ctx);
+		return -1;
+	}
+
+	/* prepare parameters for the join */
+	join->in.netbios_name  = NULL;
+	join->in.join_type     = SEC_CHAN_WKSTA;
+	join->in.domain_name   = cli_credentials_get_domain(ctx->cred);
+	join->in.level         = LIBNET_JOINDOMAIN_AUTOMATIC;
+	join->out.error_string = NULL;
+
+	if (argc == 1 && argv[0]->type == MPR_TYPE_OBJECT) {
+		MprVar *netbios_name = mprGetProperty(argv[0], "netbios_name", NULL);
+		MprVar *domain_name = mprGetProperty(argv[0], "domain_name", NULL);
+		MprVar *join_type = mprGetProperty(argv[0], "join_type", NULL);
+		if (netbios_name) {
+			join->in.netbios_name = mprToString(netbios_name);
+		}
+		if (domain_name) {
+			join->in.domain_name = mprToString(domain_name);
+		}
+		if (join_type) {
+			join->in.join_type = mprToInt(join_type);
 		}
-		cli_credentials_set_password(creds, argv[1]->string, CRED_SPECIFIED);
+	}
 
-	} else {
-		ejsSetErrorMsg(eid, "invalid number of arguments");
-		goto done;
+	if (!join->in.domain_name) {
+		ejsSetErrorMsg(eid, "a domain must be specified for to join");
+		talloc_free(mem_ctx);
+		return -1;
 	}
 
+	/* do the domain join */
+	status = libnet_Join(ctx, join, join);
+	
+	if (!NT_STATUS_IS_OK(status)) {
+		MprVar error_string = mprString(join->out.error_string);
 		
-	if (argc == 4) {
+		mprSetPropertyValue(argv[0], "error_string", error_string);
+		mpr_Return(eid, mprCreateBoolVar(False));
+	} else {
+		mpr_Return(eid, mprCreateBoolVar(True));
+	}
+	talloc_free(mem_ctx);
+	return 0;
+}
 
-		if (!mprVarIsString(argv[2]->type)) {
-			ejsSetErrorMsg(eid, "argument 3 must be a string");
-			goto done;
-		}
-		cli_credentials_set_domain(creds, argv[2]->string, CRED_SPECIFIED);
-		
-		if (!mprVarIsString(argv[3]->type)) {
-			ejsSetErrorMsg(eid, "argument 4 must be a string");
-			goto done;
-		}
-		cli_credentials_set_realm(creds, argv[3]->string, CRED_SPECIFIED);
+static int ejs_net_samsync_ldb(MprVarHandle eid, int argc, struct MprVar **argv)
+{
+	TALLOC_CTX *mem_ctx;
+	struct libnet_context *ctx;
+	struct libnet_samsync_ldb *samsync;
+	NTSTATUS status;
+	ctx = mprGetThisPtr(eid, "ctx");
+	mem_ctx = talloc_new(mprMemCtx());
+
+	samsync = talloc(mem_ctx, struct libnet_samsync_ldb);
+	if (!samsync) {
+		talloc_free(mem_ctx);
+		return -1;
 	}
 
-	obj = mprInitObject(eid, "NetCtx", argc, argv);
-	mprSetPtrChild(obj, "ctx", ctx);
+	/* prepare parameters for the samsync */
+	samsync->in.machine_account = NULL;
+	samsync->in.binding_string = NULL;
+	samsync->out.error_string = NULL;
 
-	mprSetCFunction(obj, "UserMgr", ejs_net_userman);
+	if (argc == 1 && argv[0]->type == MPR_TYPE_OBJECT) {
+		MprVar *credentials = mprGetProperty(argv[0], "machine_account", NULL);
+		if (credentials) {
+			samsync->in.machine_account = talloc_get_type(mprGetPtr(credentials, "creds"), struct cli_credentials);
+		}
+	}
 
+	/* do the domain samsync */
+	status = libnet_samsync_ldb(ctx, samsync, samsync);
+	
+	if (!NT_STATUS_IS_OK(status)) {
+		MprVar error_string = mprString(samsync->out.error_string);
+		
+		mprSetPropertyValue(argv[0], "error_string", error_string);
+		mpr_Return(eid, mprCreateBoolVar(False));
+	} else {
+		mpr_Return(eid, mprCreateBoolVar(True));
+	}
+	talloc_free(mem_ctx);
 	return 0;
-done:
-	talloc_free(ctx);
-	return -1;
 }
 
-
 static int ejs_net_userman(MprVarHandle eid, int argc, struct MprVar **argv)
 {
 	TALLOC_CTX *mem_ctx;
@@ -99,7 +189,7 @@ static int ejs_net_userman(MprVarHandle eid, int argc, struct MprVar **argv)
 	struct MprVar *obj = NULL;
 
 	ctx = mprGetThisPtr(eid, "ctx");
-	mem_ctx = talloc_init(NULL);
+	mem_ctx = talloc_new(mprMemCtx());
 
 	if (argc == 0) {
 		userman_domain = cli_credentials_get_domain(ctx->cred);
@@ -122,6 +212,7 @@ static int ejs_net_userman(MprVarHandle eid, int argc, struct MprVar **argv)
 	mprSetPtrChild(obj, "domain", userman_domain);
 
 	mprSetStringCFunction(obj, "Create", ejs_net_createuser);
+	mprSetStringCFunction(obj, "Delete", ejs_net_deleteuser);
 
 	return 0;
 done:
@@ -140,22 +231,22 @@ static int ejs_net_createuser(MprVarHandle eid, int argc, char **argv)
 
 	if (argc != 1) {
 		ejsSetErrorMsg(eid, "argument 1 must be a string");
-		goto done;
+		return -1;
 	}
 
 	ctx = mprGetThisPtr(eid, "ctx");
 	if (!ctx) {
 		ejsSetErrorMsg(eid, "ctx property returns null pointer");
-		goto done;
+		return -1;
 	}
 
 	userman_domain = mprGetThisPtr(eid, "domain");
 	if (!userman_domain) {
 		ejsSetErrorMsg(eid, "domain property returns null pointer");
-		goto done;
+		return -1;
 	}
 	
-	mem_ctx = talloc_init(NULL);
+	mem_ctx = talloc_new(mprMemCtx());
 
     	req.in.domain_name = userman_domain;
 	req.in.user_name   = argv[0];
@@ -168,10 +259,46 @@ static int ejs_net_createuser(MprVarHandle eid, int argc, char **argv)
 	talloc_free(mem_ctx);
 	mpr_Return(eid, mprNTSTATUS(status));
 	return 0;
+}
+
+static int ejs_net_deleteuser(MprVarHandle eid, int argc, char **argv)
+{
+	NTSTATUS status = NT_STATUS_UNSUCCESSFUL;
+	TALLOC_CTX *mem_ctx;
+	struct libnet_context *ctx;
+	const char *userman_domain = NULL;
+	struct libnet_DeleteUser req;
+
+	if (argc != 1) {
+		ejsSetErrorMsg(eid, "argument 1 must be a string");
+		return -1;
+	}
+
+	ctx = mprGetThisPtr(eid, "ctx");
+	if (!ctx) {
+		ejsSetErrorMsg(eid, "ctx property returns null pointer");
+		return -1;
+	}
+
+	userman_domain = mprGetThisPtr(eid, "domain");
+	if (!userman_domain) {
+		ejsSetErrorMsg(eid, "domain property returns null pointer");
+		return -1;
+	}
+	
+	mem_ctx = talloc_new(mprMemCtx());
+
+    	req.in.domain_name = userman_domain;
+	req.in.user_name   = argv[0];
+
+	status = libnet_DeleteUser(ctx, mem_ctx, &req);
+	if (!NT_STATUS_IS_OK(status)) {
+		ejsSetErrorMsg(eid, "error when creating user: %s", nt_errstr(status));
+	}
 
-done:
 	talloc_free(mem_ctx);
-	return -1;
+	mpr_Return(eid, mprNTSTATUS(status));
+	return 0;
 }
 
 
diff --git a/source4/scripting/ejs/ejsnet.h b/source4/scripting/ejs/ejsnet.h
index 50978c648d..7d4bc32753 100644
--- a/source4/scripting/ejs/ejsnet.h
+++ b/source4/scripting/ejs/ejsnet.h
@@ -24,5 +24,3 @@
 
 
 void ejsnet_setup(void);
-static int ejs_net_userman(MprVarHandle, int, struct MprVar**);
-static int ejs_net_createuser(MprVarHandle, int, char**);
diff --git a/source4/scripting/ejs/smbcalls_creds.c b/source4/scripting/ejs/smbcalls_creds.c
index bec70bc6f2..4b0312bf83 100644
--- a/source4/scripting/ejs/smbcalls_creds.c
+++ b/source4/scripting/ejs/smbcalls_creds.c
@@ -181,6 +181,25 @@ static int ejs_creds_get_workstation(MprVarHandle eid, int argc, struct MprVar *
 	return 0;
 }
 
+/*
+  set machine account 
+*/
+static int ejs_creds_set_machine_account(MprVarHandle eid, int argc, char **argv)
+{
+	struct cli_credentials *creds = ejs_creds_get_credentials(eid);
+	if (argc != 0) {
+		ejsSetErrorMsg(eid, "bad arguments to set_machine_account");
+		return -1;
+	}
+	
+	if (NT_STATUS_IS_OK(cli_credentials_set_machine_account(creds))) {
+		mpr_Return(eid, mprCreateBoolVar(True));
+	} else {
+		mpr_Return(eid, mprCreateBoolVar(False));
+	}
+	return 0;
+}
+
 
 /*
   initialise credentials ejs object
@@ -200,6 +219,7 @@ static int ejs_credentials_obj(struct MprVar *obj, struct cli_credentials *creds
 	mprSetStringCFunction(obj, "set_realm", ejs_creds_set_realm);
 	mprSetCFunction(obj, "get_workstation", ejs_creds_get_workstation);
 	mprSetStringCFunction(obj, "set_workstation", ejs_creds_set_workstation);
+	mprSetCFunction(obj, "set_machine_account", ejs_creds_set_machine_account);
 
 	return 0;
 }
@@ -228,6 +248,8 @@ static int ejs_credentials_init(MprVarHandle eid, int argc, struct MprVar **argv
 		return -1;
 	}
 
+	cli_credentials_set_conf(creds);
+
 	return ejs_credentials_obj(obj, creds);
 }
 
diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index 8b1d93c056..60f267f8d5 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -327,6 +327,7 @@ function provision(subobj, message, blank, paths, session_info, credentials)
 		message("Setting up sam.ldb users and groups\n");
 		setup_ldb("provision_users.ldif", info, paths.samdb, data, false);
 	}
+	return true;
 }
 
 /*
@@ -516,5 +517,30 @@ function provision_validate(subobj, message)
 	return true;
 }
 
+function join_domain(domain, netbios_name, join_type, creds, writefln) 
+{
+	ctx = NetContext(creds);
+	join = new Object();
+	join.domain = domain;
+	join.join_type = join_type;
+	join.netbios_name = netbios_name;
+	if (!ctx.JoinDomain(join)) {
+		writefln("Domain Join failed: " + join.error_string);
+		return false;
+	}
+	return true;
+}
+
+function vampire(machine_creds, writefln) 
+{
+	var ctx = NetContext();
+	vampire = new Object();
+	vampire.machine_creds = machine_creds;
+	if (!ctx.SamSyncLdb(vampire)) {
+		writefln("Migration of remote domain to Samba failed: " + vampire.error_string);
+		return false;
+	}
+	return true;
+}
 
 return 0;
-- 
cgit 


From 5d9f51064444f6d41f4e4c3766afdd77cd96b9e3 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Fri, 13 Jan 2006 22:55:23 +0000
Subject: r12918: Don't tell the user the difference between 'no such user' and
 'wrong password'.

Andrew Bartlett
(This used to be commit e13cb0ab175069eb670c8b2f57379ababacfcce3)
---
 source4/scripting/ejs/smbcalls_auth.c | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_auth.c b/source4/scripting/ejs/smbcalls_auth.c
index 5c70b6908b..4c943e6fb3 100644
--- a/source4/scripting/ejs/smbcalls_auth.c
+++ b/source4/scripting/ejs/smbcalls_auth.c
@@ -75,6 +75,11 @@ static int ejs_doauth(MprVarHandle eid,
 	user_info->logon_parameters = 0;
 
 	nt_status = auth_check_password(auth_context, tmp_ctx, user_info, &server_info);
+
+	/* Don't give the game away (any difference between no such
+	 * user and wrong password) */
+	nt_status = auth_nt_status_squash(nt_status);
+
 	if (!NT_STATUS_IS_OK(nt_status)) {
 		mprSetPropertyValue(auth, "report", 
 				    mprString(talloc_asprintf(mprMemCtx(), "Login Failed: %s", 
-- 
cgit 


From f3db23ac75578198ee411b21a7ba2ec49dedafab Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Sat, 14 Jan 2006 06:17:24 +0000
Subject: r12928: This patch improves the interaction between the vampire and
 provsion code.

Previously, we had to know (or guess) the host and domain guid at the
provision stage.  Now we query the database post-provision, to extract
the values and fill in the zone file.

This allows us to generate a correct zone file in the Windows migration case.

In an effort to make SWAT easier to use, I have removed and renamed
some of the provision options.

I have also fixed a nasty issue in my js code.  I had implictly
declared a global variable of the name 'join', with disasterious
results for any subsequent user of the string utility function:

esp exception - ASSERT at lib/appweb/ejs/ejsParser.c:2064, 0

Backtrace:
        [ 0]       substitute_var:20   ->               list[i] = join("", list2)
        [ 1]           setup_file:9    ->       data = substitute_var(data, subobj)

Andrew Bartlett
(This used to be commit a38ceefd11f8b748f30383ef36a4752f178bfca1)
---
 source4/scripting/ejs/ejsnet.c       |  7 +++-
 source4/scripting/libjs/provision.js | 64 +++++++++++++++++++++++++++---------
 2 files changed, 54 insertions(+), 17 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/ejsnet.c b/source4/scripting/ejs/ejsnet.c
index e129ba6867..8962025259 100644
--- a/source4/scripting/ejs/ejsnet.c
+++ b/source4/scripting/ejs/ejsnet.c
@@ -46,7 +46,7 @@ static int ejs_net_context(MprVarHandle eid, int argc, struct MprVar **argv)
 	/* TODO:  Need to get the right event context in here */
 	ctx = libnet_context_init(NULL);
 
-	if (argc == 0) {
+	if (argc == 0 || (argc == 1 && argv[0]->type == MPR_TYPE_NULL)) {
 		creds = cli_credentials_init(ctx);
 		if (creds == NULL) {
 			ejsSetErrorMsg(eid, "cli_credential_init() failed");
@@ -156,14 +156,19 @@ static int ejs_net_samsync_ldb(MprVarHandle eid, int argc, struct MprVar **argv)
 
 	/* prepare parameters for the samsync */
 	samsync->in.machine_account = NULL;
+	samsync->in.session_info = NULL;
 	samsync->in.binding_string = NULL;
 	samsync->out.error_string = NULL;
 
 	if (argc == 1 && argv[0]->type == MPR_TYPE_OBJECT) {
 		MprVar *credentials = mprGetProperty(argv[0], "machine_account", NULL);
+		MprVar *session_info = mprGetProperty(argv[0], "session_info", NULL);
 		if (credentials) {
 			samsync->in.machine_account = talloc_get_type(mprGetPtr(credentials, "creds"), struct cli_credentials);
 		}
+		if (session_info) {
+			samsync->in.session_info = talloc_get_type(mprGetPtr(session_info, "session_info"), struct auth_session_info);
+		}
 	}
 
 	/* do the domain samsync */
diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index 60f267f8d5..2b04aa6791 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -302,10 +302,6 @@ function provision(subobj, message, blank, paths, session_info, credentials)
 	}
 	message("Setting up secrets.ldb\n");
 	setup_ldb("secrets.ldif", info, paths.secrets);
-	message("Setting up DNS zone file\n");
-	setup_file("provision.zone", 
-		   paths.dns, 
-		   subobj);
 	message("Setting up keytabs\n");
 	var keytab_ok = credentials_update_all_keytabs();
 	assert(keytab_ok);
@@ -330,6 +326,32 @@ function provision(subobj, message, blank, paths, session_info, credentials)
 	return true;
 }
 
+/* Write out a DNS zone file, from the info in the current database */
+function provision_dns(subobj, message, paths, session_info, credentials)
+{
+	message("Setting up DNS zone: " + subobj.DNSDOMAIN + " \n");
+	var ldb = ldb_init();
+	ldb.session_info = session_info;
+	ldb.credentials = credentials;
+
+	/* connect to the sam */
+	var ok = ldb.connect(paths.samdb);
+	assert(ok);
+
+	/* These values may have changed, due to an incoming SamSync, so fetch them from the database */
+	subobj.DOMAINGUID = searchone(ldb, "(&(objectClass=domainDNS)(dnsDomain=" + subobj.DNSDOMAIN + "))", "objectGUID");
+	assert(subobj.DOMAINGUID != undefined);
+
+	subobj.HOSTGUID = searchone(ldb, "(&(objectClass=computer)(cn=" + subobj.NETBIOSNAME + "))", "objectGUID");
+	assert(subobj.HOSTGUID != undefined);
+
+	setup_file("provision.zone", 
+		   paths.dns, 
+		   subobj);
+
+	message("Please install the zone located in " + paths.dns + " into your DNS server\n");
+}
+
 /*
   guess reasonably default options for provisioning
 */
@@ -517,27 +539,37 @@ function provision_validate(subobj, message)
 	return true;
 }
 
-function join_domain(domain, netbios_name, join_type, creds, writefln) 
+function join_domain(domain, netbios_name, join_type, creds, message) 
 {
-	ctx = NetContext(creds);
-	join = new Object();
-	join.domain = domain;
-	join.join_type = join_type;
-	join.netbios_name = netbios_name;
-	if (!ctx.JoinDomain(join)) {
-		writefln("Domain Join failed: " + join.error_string);
+	var ctx = NetContext(creds);
+	var joindom = new Object();
+	joindom.domain = domain;
+	joindom.join_type = join_type;
+	joindom.netbios_name = netbios_name;
+	if (!ctx.JoinDomain(joindom)) {
+		message("Domain Join failed: " + join.error_string);
 		return false;
 	}
 	return true;
 }
 
-function vampire(machine_creds, writefln) 
-{
-	var ctx = NetContext();
+/* Vampire a remote domain.  Session info and credentials are required for for
+ * access to our local database (might be remote ldap)
+ */ 
+
+function vampire(domain, session_info, credentials, message) {
+	var ctx = NetContext(credentials);
 	vampire = new Object();
+	var machine_creds = credentials_init();
+	machine_creds.set_domain(form.DOMAIN);
+	if (!machine_creds.set_machine_account()) {
+		message("Failed to access domain join information!");
+		return false;
+	}
 	vampire.machine_creds = machine_creds;
+	vampire.session_info = session_info;
 	if (!ctx.SamSyncLdb(vampire)) {
-		writefln("Migration of remote domain to Samba failed: " + vampire.error_string);
+		message("Migration of remote domain to Samba failed: " + vampire.error_string);
 		return false;
 	}
 	return true;
-- 
cgit 


From 747b5cce535c51d78000bdf86d0ef8f35860624d Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Sat, 14 Jan 2006 07:24:15 +0000
Subject: r12929: Fix more implict global and shadowing variables.

Andrew Bartlett
(This used to be commit def31956181833db4c8e5079b745ca60fdf35136)
---
 source4/scripting/libjs/provision.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index 2b04aa6791..59bc9cac30 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -559,17 +559,17 @@ function join_domain(domain, netbios_name, join_type, creds, message)
 
 function vampire(domain, session_info, credentials, message) {
 	var ctx = NetContext(credentials);
-	vampire = new Object();
+	var vampire_ctx = new Object();
 	var machine_creds = credentials_init();
 	machine_creds.set_domain(form.DOMAIN);
 	if (!machine_creds.set_machine_account()) {
 		message("Failed to access domain join information!");
 		return false;
 	}
-	vampire.machine_creds = machine_creds;
-	vampire.session_info = session_info;
-	if (!ctx.SamSyncLdb(vampire)) {
-		message("Migration of remote domain to Samba failed: " + vampire.error_string);
+	vampire_ctx.machine_creds = machine_creds;
+	vampire_ctx.session_info = session_info;
+	if (!ctx.SamSyncLdb(vampire_ctx)) {
+		message("Migration of remote domain to Samba failed: " + vampire_ctx.error_string);
 		return false;
 	}
 	return true;
-- 
cgit 


From 2bb3a50c7ea48730a3305d86f2e1e92ce206bdd3 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Sat, 14 Jan 2006 07:46:04 +0000
Subject: r12931: Remove some prefixes.  We have:

Login failed: Login Failed: Logon failure - please try again

In SWAT currently...

Andrew Bartlett
(This used to be commit 51eded818093320e7d6b9e95ad11fa21a81c3f93)
---
 source4/scripting/ejs/smbcalls_auth.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_auth.c b/source4/scripting/ejs/smbcalls_auth.c
index 4c943e6fb3..9b71314d3f 100644
--- a/source4/scripting/ejs/smbcalls_auth.c
+++ b/source4/scripting/ejs/smbcalls_auth.c
@@ -82,8 +82,7 @@ static int ejs_doauth(MprVarHandle eid,
 
 	if (!NT_STATUS_IS_OK(nt_status)) {
 		mprSetPropertyValue(auth, "report", 
-				    mprString(talloc_asprintf(mprMemCtx(), "Login Failed: %s", 
-							      get_friendly_nt_error_msg(nt_status))));
+				    mprString(talloc_strdup(mprMemCtx(), get_friendly_nt_error_msg(nt_status))));
 		mprSetPropertyValue(auth, "result", mprCreateBoolVar(False));
 		goto done;
 	}
-- 
cgit 


From ba07f94438560830f9b4470ecd9577b8333475bf Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Sun, 15 Jan 2006 09:03:28 +0000
Subject: r12945: Try to move closer to getting Samba3 import working again.

There still a few things to work out

Andrew Bartlett
(This used to be commit 701558b5fe917555416eb0d100ef756f8ef7cf65)
---
 source4/scripting/libjs/upgrade.js | 26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/upgrade.js b/source4/scripting/libjs/upgrade.js
index a8f717badc..161195a60d 100644
--- a/source4/scripting/libjs/upgrade.js
+++ b/source4/scripting/libjs/upgrade.js
@@ -513,13 +513,18 @@ function upgrade_smbconf(oldconf,mark)
 	return newconf;
 }
 
-function upgrade(subobj, samba3, message, paths)
+function upgrade(subobj, samba3, message, paths, session_info, credentials)
 {
 	var ret = 0;
 	var lp = loadparm_init();
 	var samdb = ldb_init();
+	samdb.session_info = session_info;
+	samdb.credentials = credentials;
 	var ok = samdb.connect(paths.samdb);
-	assert(ok);
+	if (!ok) {
+		info.message("samdb connect failed: " + samdb.errstring() + "\n");
+		assert(ok);
+	}
 
 	message("Writing configuration\n");
 	var newconf = upgrade_smbconf(samba3.configuration,true);
@@ -528,11 +533,17 @@ function upgrade(subobj, samba3, message, paths)
 	message("Importing account policies\n");
 	var ldif = upgrade_sam_policy(samba3,subobj.BASEDN);
 	ok = samdb.modify(ldif);
-	assert(ok);
-
+	if (!ok) {
+		message("samdb load failed: " + samdb.errstring() + "\n");
+		assert(ok);
+	}
 	var regdb = ldb_init();
 	ok = regdb.connect(paths.hklm);
-	assert(ok);
+	if (!ok) {
+		message("registry connect: " + regdb.errstring() + "\n");
+		assert(ok);
+	}
+
 	ok = regdb.modify(sprintf("
 dn: value=RefusePasswordChange,key=Parameters,key=Netlogon,key=Services,key=CurrentControlSet,key=System,HIVE=NONE
 replace: type
@@ -540,7 +551,10 @@ type: 4
 replace: data
 data: %d
 ", samba3.policy.refuse_machine_password_change));
-	assert(ok);
+	if (!ok) {
+		message("registry load failed: " + regdb.errstring() + "\n");
+		assert(ok);
+	}
 
 	message("Importing users\n");
 	for (var i in samba3.samaccounts) {
-- 
cgit 


From 5d91a37002ce4e656100f63368807796c84cdc24 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Sun, 15 Jan 2006 16:24:55 +0000
Subject: r12947: added some error checking that I stumbled across while
 testing domain migration (This used to be commit
 c7951d17b1c4f53dd710d6a0fcf87ce678be3ff1)

---
 source4/scripting/libjs/provision.js | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index 59bc9cac30..ef6fe31285 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -526,6 +526,8 @@ function valid_netbios_name(name)
 
 function provision_validate(subobj, message)
 {
+	var lp = loadparm_init();
+
 	if (!valid_netbios_name(subobj.DOMAIN)) {
 		message("Invalid NetBIOS name for domain\n");
 		return false;
@@ -536,6 +538,19 @@ function provision_validate(subobj, message)
 		return false;
 	}
 
+
+	if (lp.get("workgroup") != subobj.DOMAIN) {
+		message("workgroup '%s' in smb.conf must match chosen domain '%s'\n",
+			lp.get("workgroup"), subobj.DOMAIN);
+		return false;
+	}
+
+	if (lp.get("realm") != subobj.REALM) {
+		message("realm '%s' in smb.conf must match chosen realm '%s'\n",
+			lp.get("realm"), subobj.REALM);
+		return false;
+	}
+
 	return true;
 }
 
@@ -547,7 +562,7 @@ function join_domain(domain, netbios_name, join_type, creds, message)
 	joindom.join_type = join_type;
 	joindom.netbios_name = netbios_name;
 	if (!ctx.JoinDomain(joindom)) {
-		message("Domain Join failed: " + join.error_string);
+		message("Domain Join failed: " + joindom.error_string);
 		return false;
 	}
 	return true;
-- 
cgit 


From ba8406fd3fb753deba9c3d5f8179dc70a200375d Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Wed, 18 Jan 2006 11:25:30 +0000
Subject: r12997: Feed the right event context to libnet in ejsnet and the auth
 code. This should give better behaviour in SWAT.

Fix authentication as Samba, rather than System, users in SWAT.

Andrew Bartlett
(This used to be commit 498d72c4ad4d57d10f43ca58830d6ee8292a55f4)
---
 source4/scripting/ejs/ejsnet.c        | 16 +++++++++++++---
 source4/scripting/ejs/smbcalls_auth.c | 17 +++++++++--------
 2 files changed, 22 insertions(+), 11 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/ejsnet.c b/source4/scripting/ejs/ejsnet.c
index 8962025259..6c7a0274cf 100644
--- a/source4/scripting/ejs/ejsnet.c
+++ b/source4/scripting/ejs/ejsnet.c
@@ -25,7 +25,7 @@
 #include "scripting/ejs/smbcalls.h"
 #include "scripting/ejs/ejsnet.h"
 #include "libnet/libnet.h"
-
+#include "events/events.h"
 
 static int ejs_net_userman(MprVarHandle, int, struct MprVar**);
 static int ejs_net_createuser(MprVarHandle, int, char**);
@@ -39,12 +39,22 @@ static int ejs_net_samsync_ldb(MprVarHandle eid, int argc, struct MprVar **argv)
 
 static int ejs_net_context(MprVarHandle eid, int argc, struct MprVar **argv)
 {
+	TALLOC_CTX *event_mem_ctx = talloc_new(mprMemCtx());
 	struct cli_credentials *creds;
 	struct libnet_context *ctx;
 	struct MprVar obj;
+	struct event_context *ev;
 
-	/* TODO:  Need to get the right event context in here */
-	ctx = libnet_context_init(NULL);
+	if (!event_mem_ctx) {
+		ejsSetErrorMsg(eid, "talloc_new() failed");
+		return -1;
+	}
+	ev = event_context_find(event_mem_ctx);
+	ctx = libnet_context_init(ev);
+	/* IF we generated a new event context, it will be under here,
+	 * and we need it to last as long as the libnet context, so
+	 * make it a child */
+	talloc_steal(ctx, event_mem_ctx);
 
 	if (argc == 0 || (argc == 1 && argv[0]->type == MPR_TYPE_NULL)) {
 		creds = cli_credentials_init(ctx);
diff --git a/source4/scripting/ejs/smbcalls_auth.c b/source4/scripting/ejs/smbcalls_auth.c
index 9b71314d3f..ea9aaf9739 100644
--- a/source4/scripting/ejs/smbcalls_auth.c
+++ b/source4/scripting/ejs/smbcalls_auth.c
@@ -25,24 +25,24 @@
 #include "lib/appweb/ejs/ejs.h"
 #include "auth/auth.h"
 #include "scripting/ejs/smbcalls.h"
+#include "lib/events/events.h"
 
 static int ejs_doauth(MprVarHandle eid,
 		      TALLOC_CTX *tmp_ctx, struct MprVar *auth, const char *username, 
 		      const char *password, const char *domain, const char *workstation,
-		      struct socket_address *remote_host, const char *authtype)
+		      struct socket_address *remote_host, const char **auth_types)
 {
 	struct auth_usersupplied_info *user_info = NULL;
 	struct auth_serversupplied_info *server_info = NULL;
 	struct auth_session_info *session_info = NULL;
 	struct auth_context *auth_context;
 	struct MprVar *session_info_obj;
-	const char *auth_types[] = { authtype, NULL };
 	NTSTATUS nt_status;
 
-	/*
-	  darn, we need some way to get the right event_context here
-	*/
-	nt_status = auth_context_create(tmp_ctx, auth_types, &auth_context, NULL);
+	/* Hope we can find the event context somewhere up there... */
+	struct event_context *ev = event_context_find(tmp_ctx);
+
+	nt_status = auth_context_create(tmp_ctx, auth_types, &auth_context, ev);
 	if (!NT_STATUS_IS_OK(nt_status)) {
 		mprSetPropertyValue(auth, "result", mprCreateBoolVar(False));
 		mprSetPropertyValue(auth, "report", mprString("Auth System Failure"));
@@ -122,6 +122,7 @@ static int ejs_userAuth(MprVarHandle eid, int argc, struct MprVar **argv)
 	struct MprVar auth;
 	struct cli_credentials *creds;
 	struct socket_address *remote_host;
+	const char *auth_types_unix[] = { "unix", NULL };
 
 	if (argc != 2 || argv[0]->type != MPR_TYPE_OBJECT || argv[1]->type != MPR_TYPE_OBJECT) {
 		ejsSetErrorMsg(eid, "userAuth invalid arguments, this function requires an object.");
@@ -157,9 +158,9 @@ static int ejs_userAuth(MprVarHandle eid, int argc, struct MprVar **argv)
 	auth = mprObject("auth");
 
 	if (domain && (strcmp("SYSTEM USER", domain) == 0)) {
-		ejs_doauth(eid, tmp_ctx, &auth, username, password, domain, workstation, remote_host, "unix");
+		ejs_doauth(eid, tmp_ctx, &auth, username, password, domain, workstation, remote_host, auth_types_unix);
 	} else {
-		ejs_doauth(eid, tmp_ctx, &auth, username, password, domain, workstation, remote_host, "sam");
+		ejs_doauth(eid, tmp_ctx, &auth, username, password, domain, workstation, remote_host, lp_auth_methods());
 	}
 
 	mpr_Return(eid, auth);
-- 
cgit 


From bade0ad9098153c26ec9a0f85e0a6e36b038b028 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Wed, 18 Jan 2006 21:41:24 +0000
Subject: r13018: Fix (correct) warning about mixing C/js interface function
 types.  I don't use the arguments, but you must connect as the right type
 anyway.

Andrew Bartlett
(This used to be commit f50186e9306714b25ae8f92eff9a3e95ad706274)
---
 source4/scripting/ejs/smbcalls_creds.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_creds.c b/source4/scripting/ejs/smbcalls_creds.c
index 4b0312bf83..a1b9446e9e 100644
--- a/source4/scripting/ejs/smbcalls_creds.c
+++ b/source4/scripting/ejs/smbcalls_creds.c
@@ -184,7 +184,7 @@ static int ejs_creds_get_workstation(MprVarHandle eid, int argc, struct MprVar *
 /*
   set machine account 
 */
-static int ejs_creds_set_machine_account(MprVarHandle eid, int argc, char **argv)
+static int ejs_creds_set_machine_account(MprVarHandle eid, int argc, struct MprVar **argv)
 {
 	struct cli_credentials *creds = ejs_creds_get_credentials(eid);
 	if (argc != 0) {
-- 
cgit 


From a54a66ddf1504ef1caccc54c1f16c7461916e3b5 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sun, 22 Jan 2006 08:31:04 +0000
Subject: r13062: Fix upgrade of WINS entries (This used to be commit
 cc4cab341e51d26c90534777eae65b7683ed93ce)

---
 source4/scripting/libjs/upgrade.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/upgrade.js b/source4/scripting/libjs/upgrade.js
index 161195a60d..9a5818c81f 100644
--- a/source4/scripting/libjs/upgrade.js
+++ b/source4/scripting/libjs/upgrade.js
@@ -273,7 +273,7 @@ function upgrade_wins(samba3)
 		nType = (sys.bitAND(e.nb_flags,0x60)>>5);
 
 		ldif = ldif + sprintf("
-dn: name:%s,type=0x%02X
+dn: name=%s,type=0x%02X
 type: 0x%02X
 name: %s
 objectClass: winsRecord
-- 
cgit 


From 82b6a5c9fcae38353bf24b0d9372f24c3c387924 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Mon, 23 Jan 2006 04:40:57 +0000
Subject: r13076: catch a easy to make error during vampire install (This used
 to be commit 1c49ce8df0fd2150c68d0bf4162f1ef69ff3392a)

---
 source4/scripting/libjs/provision.js | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index ef6fe31285..d05796001e 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -551,6 +551,11 @@ function provision_validate(subobj, message)
 		return false;
 	}
 
+	if (lp.get("server role") == "pdc") {
+		message("server role must not be set to 'pdc' during the install\n");
+		return false;
+	}
+
 	return true;
 }
 
-- 
cgit 


From 627983ced0d38b1a0734918af4d3759a28a25ef4 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Mon, 23 Jan 2006 14:29:10 +0000
Subject: r13084: fix 'make test'!

I would sugguest to run 'make test && make valgrind' before each commit
at this stage...

metze
(This used to be commit b7a0a778cc77f294aac589416b05dc676696d11e)
---
 source4/scripting/libjs/provision.js | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index d05796001e..ef6fe31285 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -551,11 +551,6 @@ function provision_validate(subobj, message)
 		return false;
 	}
 
-	if (lp.get("server role") == "pdc") {
-		message("server role must not be set to 'pdc' during the install\n");
-		return false;
-	}
-
 	return true;
 }
 
-- 
cgit 


From 0fb2e148d1e65ed5e55adb5b733d08ffded180e4 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Tue, 24 Jan 2006 00:11:32 +0000
Subject: r13097: move the creation of the default sam name -> unix name
 mappings into the main provision logic, so it can also be used as part of the
 vampire process (This used to be commit
 95e90169f4e5887ee88116179d96f28f9e06796e)

---
 source4/scripting/libjs/provision.js | 81 +++++++++++++++++++++++++++++++++---
 1 file changed, 75 insertions(+), 6 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index ef6fe31285..90bc082341 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -52,24 +52,50 @@ function findnss()
 /*
    add a foreign security principle
  */
-function add_foreign(str, sid, desc, unixname)
+function add_foreign(str, sid, desc)
 {
 	var add = "
 dn: CN=${SID},CN=ForeignSecurityPrincipals,${BASEDN}
 objectClass: top
 objectClass: foreignSecurityPrincipal
 description: ${DESC}
-unixName: ${UNIXNAME}
 uSNCreated: 1
 uSNChanged: 1
 ";
 	var sub = new Object();
 	sub.SID = sid;
 	sub.DESC = desc;
-	sub.UNIXNAME = unixname;
 	return str + substitute_var(add, sub);
 }
 
+
+/*
+  setup a mapping between a sam name and a unix name
+ */
+function setup_name_mapping(info, ldb, sid, unixname)
+{
+	var attrs = new Array("dn");
+	var res = ldb.search(sprintf("objectSid=%s", sid), 
+			     NULL, ldb.SCOPE_DEFAULT, attrs);
+	if (res.length != 1) {
+		return false;
+	}
+	var mod = sprintf("
+dn: %s
+changetype: modify
+replace: unixName
+unixName: %s
+",
+			  res[0].dn, unixname);
+	var ok = ldb.modify(mod);
+	if (!ok) {
+		info.message("name mapping for %s failed - %s\n",
+			     sid, ldb.errstring());
+		return false;
+	}
+	return true;
+}
+
 /*
   return current time as a nt time string
 */
@@ -258,6 +284,42 @@ function provision_default_paths(subobj)
 	return paths;
 }
 
+
+/*
+  setup reasonable name mappings for sam names to unix names
+*/
+function setup_name_mappings(info, subobj, session_info, credentials)
+{
+	var lp = loadparm_init();
+	var ldb = ldb_init();
+	ldb.session_info = session_info;
+	ldb.credentials = credentials;
+	var ok = ldb.connect(lp.get("sam database"));
+	if (!ok) {
+		return false;
+	}
+
+	/* some well known sids */
+	setup_name_mapping(info, ldb, "S-1-5-7",  subobj.NOBODY);
+	setup_name_mapping(info, ldb, "S-1-1-0",  subobj.NOGROUP);
+	setup_name_mapping(info, ldb, "S-1-5-2",  subobj.NOGROUP);
+	setup_name_mapping(info, ldb, "S-1-5-18", subobj.ROOT);
+	setup_name_mapping(info, ldb, "S-1-5-11", subobj.USERS);
+	setup_name_mapping(info, ldb, "S-1-5-32-544", subobj.WHEEL);
+	setup_name_mapping(info, ldb, "S-1-5-32-546", subobj.NOGROUP);
+
+	/* and some well known domain rids */
+	setup_name_mapping(info, ldb, subobj.DOMAINSID + "-500", subobj.ROOT);
+	setup_name_mapping(info, ldb, subobj.DOMAINSID + "-518", subobj.WHEEL);
+	setup_name_mapping(info, ldb, subobj.DOMAINSID + "-519", subobj.WHEEL);
+	setup_name_mapping(info, ldb, subobj.DOMAINSID + "-512", subobj.WHEEL);
+	setup_name_mapping(info, ldb, subobj.DOMAINSID + "-513", subobj.USERS);
+	setup_name_mapping(info, ldb, subobj.DOMAINSID + "-520", subobj.WHEEL);
+
+	return true;
+}
+
+
 /*
   provision samba4 - caution, this wipes all existing data!
 */
@@ -319,10 +381,17 @@ function provision(subobj, message, blank, paths, session_info, credentials)
 	setup_ldb("provision_templates.ldif", info, paths.samdb, NULL, false);
 	message("Setting up sam.ldb data\n");
 	setup_ldb("provision.ldif", info, paths.samdb, NULL, false);
-	if (blank == false) {
-		message("Setting up sam.ldb users and groups\n");
-		setup_ldb("provision_users.ldif", info, paths.samdb, data, false);
+	if (blank != false) {
+		return true;
 	}
+
+	message("Setting up sam.ldb users and groups\n");
+	setup_ldb("provision_users.ldif", info, paths.samdb, data, false);
+
+	if (setup_name_mappings(info, subobj, session_info, credentials) == false) {
+		return false;
+	}
+
 	return true;
 }
 
-- 
cgit 


From 29478d3c23d21067784f85b3c128de62837d186a Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Tue, 24 Jan 2006 00:16:54 +0000
Subject: r13098: make check for workgroup and realm case insensitive (This
 used to be commit 0cacd69dd57254cb1b51ad7969993bc24bae86c7)

---
 source4/scripting/libjs/provision.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index 90bc082341..14a81e898d 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -608,13 +608,13 @@ function provision_validate(subobj, message)
 	}
 
 
-	if (lp.get("workgroup") != subobj.DOMAIN) {
+	if (strupper(lp.get("workgroup")) != strupper(subobj.DOMAIN)) {
 		message("workgroup '%s' in smb.conf must match chosen domain '%s'\n",
 			lp.get("workgroup"), subobj.DOMAIN);
 		return false;
 	}
 
-	if (lp.get("realm") != subobj.REALM) {
+	if (strupper(lp.get("realm")) != strupper(subobj.REALM)) {
 		message("realm '%s' in smb.conf must match chosen realm '%s'\n",
 			lp.get("realm"), subobj.REALM);
 		return false;
-- 
cgit 


From f705108a8a14427f6ef114ad76d4f5e48759136e Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Tue, 24 Jan 2006 01:52:56 +0000
Subject: r13102: fixed the vampire code to correctly setup foreign sids and
 default unix name mappings (This used to be commit
 dc74d8ccf15b9324cd8b90ef9d41cf293b9de8e3)

---
 source4/scripting/libjs/provision.js | 56 ++++++++++++++++++++++--------------
 1 file changed, 35 insertions(+), 21 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index 14a81e898d..fe112eeb24 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -52,20 +52,20 @@ function findnss()
 /*
    add a foreign security principle
  */
-function add_foreign(str, sid, desc)
+function add_foreign(ldb, subobj, sid, desc)
 {
-	var add = "
-dn: CN=${SID},CN=ForeignSecurityPrincipals,${BASEDN}
+	var add = sprintf("
+dn: CN=%s,CN=ForeignSecurityPrincipals,%s
 objectClass: top
 objectClass: foreignSecurityPrincipal
-description: ${DESC}
+description: %s
 uSNCreated: 1
 uSNChanged: 1
-";
-	var sub = new Object();
-	sub.SID = sid;
-	sub.DESC = desc;
-	return str + substitute_var(add, sub);
+",
+			  sid, subobj.BASEDN, desc);
+	/* deliberately ignore errors from this, as the records may
+	   already exist */
+	ldb.add(add);
 }
 
 
@@ -78,6 +78,7 @@ function setup_name_mapping(info, ldb, sid, unixname)
 	var res = ldb.search(sprintf("objectSid=%s", sid), 
 			     NULL, ldb.SCOPE_DEFAULT, attrs);
 	if (res.length != 1) {
+		info.message("Failed to find record for objectSid %s\n", sid);
 		return false;
 	}
 	var mod = sprintf("
@@ -298,6 +299,21 @@ function setup_name_mappings(info, subobj, session_info, credentials)
 	if (!ok) {
 		return false;
 	}
+	var attrs = new Array("objectSid");
+	var res = ldb.search("dnsDomain=" + subobj.REALM,
+			     NULL, ldb.SCOPE_DEFAULT, attrs);
+	if (res.length != 1) {
+		info.message("Failed to find dnsDomain %s\n", subobj.REALM);
+		return false;
+	}
+	var sid = res[0].objectSid;
+
+	/* add some foreign sids if they are not present already */
+	add_foreign(ldb, subobj, "S-1-5-7",  "Anonymous");
+	add_foreign(ldb, subobj, "S-1-1-0",  "World");
+	add_foreign(ldb, subobj, "S-1-5-2",  "Network");
+	add_foreign(ldb, subobj, "S-1-5-18", "System");
+	add_foreign(ldb, subobj, "S-1-5-11", "Authenticated Users");
 
 	/* some well known sids */
 	setup_name_mapping(info, ldb, "S-1-5-7",  subobj.NOBODY);
@@ -307,14 +323,15 @@ function setup_name_mappings(info, subobj, session_info, credentials)
 	setup_name_mapping(info, ldb, "S-1-5-11", subobj.USERS);
 	setup_name_mapping(info, ldb, "S-1-5-32-544", subobj.WHEEL);
 	setup_name_mapping(info, ldb, "S-1-5-32-546", subobj.NOGROUP);
+	setup_name_mapping(info, ldb, "S-1-5-32-551", subobj.BACKUP);
 
 	/* and some well known domain rids */
-	setup_name_mapping(info, ldb, subobj.DOMAINSID + "-500", subobj.ROOT);
-	setup_name_mapping(info, ldb, subobj.DOMAINSID + "-518", subobj.WHEEL);
-	setup_name_mapping(info, ldb, subobj.DOMAINSID + "-519", subobj.WHEEL);
-	setup_name_mapping(info, ldb, subobj.DOMAINSID + "-512", subobj.WHEEL);
-	setup_name_mapping(info, ldb, subobj.DOMAINSID + "-513", subobj.USERS);
-	setup_name_mapping(info, ldb, subobj.DOMAINSID + "-520", subobj.WHEEL);
+	setup_name_mapping(info, ldb, sid + "-500", subobj.ROOT);
+	setup_name_mapping(info, ldb, sid + "-518", subobj.WHEEL);
+	setup_name_mapping(info, ldb, sid + "-519", subobj.WHEEL);
+	setup_name_mapping(info, ldb, sid + "-512", subobj.WHEEL);
+	setup_name_mapping(info, ldb, sid + "-513", subobj.USERS);
+	setup_name_mapping(info, ldb, sid + "-520", subobj.WHEEL);
 
 	return true;
 }
@@ -342,12 +359,6 @@ function provision(subobj, message, blank, paths, session_info, credentials)
 	var rdns = split(",", subobj.BASEDN);
 	subobj.RDN_DC = substr(rdns[0], strlen("DC="));
 
-	data = add_foreign(data, "S-1-5-7",  "Anonymous",           "${NOBODY}");
-	data = add_foreign(data, "S-1-1-0",  "World",               "${NOGROUP}");
-	data = add_foreign(data, "S-1-5-2",  "Network",             "${NOGROUP}");
-	data = add_foreign(data, "S-1-5-18", "System",              "${ROOT}");
-	data = add_foreign(data, "S-1-5-11", "Authenticated Users", "${USERS}");
-
 	provision_next_usn = 1;
 
 	info.subobj = subobj;
@@ -381,6 +392,7 @@ function provision(subobj, message, blank, paths, session_info, credentials)
 	setup_ldb("provision_templates.ldif", info, paths.samdb, NULL, false);
 	message("Setting up sam.ldb data\n");
 	setup_ldb("provision.ldif", info, paths.samdb, NULL, false);
+
 	if (blank != false) {
 		return true;
 	}
@@ -458,6 +470,7 @@ function provision_guess()
 	subobj.NOBODY       = findnss(nss.getpwnam, "nobody");
 	subobj.NOGROUP      = findnss(nss.getgrnam, "nogroup", "nobody");
 	subobj.WHEEL        = findnss(nss.getgrnam, "wheel", "root", "staff");
+	subobj.BACKUP       = findnss(nss.getgrnam, "backup", "wheel", "root", "staff");
 	subobj.USERS        = findnss(nss.getgrnam, "users", "guest", "other");
 	subobj.DNSDOMAIN    = strlower(subobj.REALM);
 	subobj.DNSNAME      = sprintf("%s.%s", 
@@ -656,6 +669,7 @@ function vampire(domain, session_info, credentials, message) {
 		message("Migration of remote domain to Samba failed: " + vampire_ctx.error_string);
 		return false;
 	}
+
 	return true;
 }
 
-- 
cgit 


From b56282dec786683055f65f25ec419113bd7aa297 Mon Sep 17 00:00:00 2001
From: Simo Sorce <idra@samba.org>
Date: Mon, 6 Feb 2006 18:29:57 +0000
Subject: r13369: let's have a way to show the samba4 version through ejs and
 use it in provisioning to fullfill rfc 3045 requirements (This used to be
 commit 3fb9571a76481560304a826fc945983d52123299)

---
 source4/scripting/ejs/smbcalls.c     | 11 +++++++++++
 source4/scripting/libjs/provision.js |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls.c b/source4/scripting/ejs/smbcalls.c
index 3e96f8bef2..b63687b304 100644
--- a/source4/scripting/ejs/smbcalls.c
+++ b/source4/scripting/ejs/smbcalls.c
@@ -25,6 +25,7 @@
 #include "lib/appweb/ejs/ejs.h"
 #include "scripting/ejs/smbcalls.h"
 #include "smb_build.h"
+#include "version.h"
 
 /*
   return the type of a variable
@@ -111,6 +112,15 @@ static int ejs_libinclude(int eid, int argc, char **argv)
 	return 0;
 }
 
+/*
+  return the current version
+*/
+static int ejs_version(MprVarHandle eid, int argc, struct MprVar **argv)
+{
+	mpr_ReturnString(eid, SAMBA_VERSION_STRING);
+	return 0;
+}
+
 
 /*
   setup C functions that be called from ejs
@@ -146,5 +156,6 @@ void smb_setup_ejs_functions(void)
 
 	ejsDefineCFunction(-1, "typeof", ejs_typeof, NULL, MPR_VAR_SCRIPT_HANDLE);
 	ejsDefineStringCFunction(-1, "libinclude", ejs_libinclude, NULL, MPR_VAR_SCRIPT_HANDLE);
+	ejsDefineCFunction(-1, "version", ejs_version, NULL, MPR_VAR_SCRIPT_HANDLE);
 }
 
diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index fe112eeb24..84ed69231b 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -150,7 +150,6 @@ function hostname()
 	return s[0];
 }
 
-
 /* the ldb is in bad shape, possibly due to being built from an
    incompatible previous version of the code, so delete it
    completely */
@@ -452,6 +451,7 @@ function provision_guess()
 	assert(subobj.DOMAIN);
 	assert(subobj.HOSTNAME);
 
+	subobj.VERSION      = version();
 	subobj.HOSTIP       = hostip();
 	subobj.DOMAINGUID   = randguid();
 	subobj.DOMAINSID    = randsid();
-- 
cgit 


From 80c8a522861068e7b0974986936f65052dd6f70f Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Thu, 23 Feb 2006 12:48:13 +0000
Subject: r13655: Use new name of build header (This used to be commit
 bca0e8054f6d9c7adc9d92e0c30d4323f994c9e9)

---
 source4/scripting/ejs/smbcalls.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls.c b/source4/scripting/ejs/smbcalls.c
index b63687b304..13281f88e9 100644
--- a/source4/scripting/ejs/smbcalls.c
+++ b/source4/scripting/ejs/smbcalls.c
@@ -24,7 +24,7 @@
 #include "includes.h"
 #include "lib/appweb/ejs/ejs.h"
 #include "scripting/ejs/smbcalls.h"
-#include "smb_build.h"
+#include "build.h"
 #include "version.h"
 
 /*
-- 
cgit 


From 760f5b4b39718e317e6a8f418e0ed156827ee0b1 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Mon, 27 Feb 2006 10:23:59 +0000
Subject: r13710: fix compiler warnings

metze
(This used to be commit 6ee7de9bbf6ff55221fc8e3a6f467e69e564e2e1)
---
 source4/scripting/ejs/mprutil.c       | 6 +++---
 source4/scripting/ejs/smbcalls_cli.c  | 2 +-
 source4/scripting/ejs/smbcalls_data.c | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/mprutil.c b/source4/scripting/ejs/mprutil.c
index 91683db6bd..d8c44c2450 100644
--- a/source4/scripting/ejs/mprutil.c
+++ b/source4/scripting/ejs/mprutil.c
@@ -143,7 +143,7 @@ struct MprVar mprString(const char *s)
 struct MprVar mprData(const uint8_t *p, size_t length)
 {
 	struct MprVar var;
-	char *s = talloc_strndup(mprMemCtx(), p, length);
+	char *s = talloc_strndup(mprMemCtx(), (const char *)p, length);
 	if (s == NULL) {
 		return mprCreateUndefinedVar();
 	}
@@ -229,7 +229,7 @@ struct MprVar mprLdbArray(struct ldb_context *ldb,
 /*
   turn a MprVar string variable into a const char *
  */
-const char *mprToString(const struct MprVar *v)
+const char *mprToString(struct MprVar *v)
 {
 	if (v->trigger) {
 		mprReadProperty(v, 0);
@@ -241,7 +241,7 @@ const char *mprToString(const struct MprVar *v)
 /*
   turn a MprVar integer variable into an int
  */
-int mprToInt(const struct MprVar *v)
+int mprToInt(struct MprVar *v)
 {
 	if (v->trigger) {
 		mprReadProperty(v, 0);
diff --git a/source4/scripting/ejs/smbcalls_cli.c b/source4/scripting/ejs/smbcalls_cli.c
index e165222a98..bc69c0653d 100644
--- a/source4/scripting/ejs/smbcalls_cli.c
+++ b/source4/scripting/ejs/smbcalls_cli.c
@@ -413,7 +413,7 @@ static int ejs_tree_connect(MprVarHandle eid, int argc, char **argv)
 	struct cli_credentials *creds;
 	struct smb_composite_connect io;
 	struct smbcli_tree *tree;
-	const char *hostname, *sharename;
+	char *hostname, *sharename;
 	NTSTATUS result;
 	TALLOC_CTX *mem_ctx;
 
diff --git a/source4/scripting/ejs/smbcalls_data.c b/source4/scripting/ejs/smbcalls_data.c
index 54e496ea57..a1686a71e1 100644
--- a/source4/scripting/ejs/smbcalls_data.c
+++ b/source4/scripting/ejs/smbcalls_data.c
@@ -179,7 +179,7 @@ static int ejs_regToVar(MprVarHandle eid, int argc, struct MprVar **argv)
 		char *s;
 		ssize_t len;
 		len = convert_string_talloc(mprMemCtx(), CH_UTF16, CH_UNIX, 
-					    blob->data, blob->length, &s);
+					    blob->data, blob->length, (void **)&s);
 		if (len == -1) {
 			ejsSetErrorMsg(eid, "regToVar invalid REG_SZ string");
 			return -1;
@@ -218,7 +218,7 @@ static int ejs_regToVar(MprVarHandle eid, int argc, struct MprVar **argv)
 
 	case REG_MULTI_SZ: {
 		DATA_BLOB b = *blob;
-		char **list = NULL;
+		const char **list = NULL;
 		while (b.length > 0) {
 			char *s;
 			ssize_t len;
@@ -227,7 +227,7 @@ static int ejs_regToVar(MprVarHandle eid, int argc, struct MprVar **argv)
 				break;
 			}
 			len = convert_string_talloc(mprMemCtx(), CH_UTF16, CH_UNIX, 
-						    b.data, slen, &s);
+						    b.data, slen, (void **)&s);
 			if (len == -1) {
 				ejsSetErrorMsg(eid, "regToVar invalid REG_MULTI_SZ string");
 				return -1;
-- 
cgit 


From 26af14c39b88b0e7eb53657b89be65d865804688 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Thu, 2 Mar 2006 16:32:53 +0000
Subject: r13786: [merge] Add registration functions for LDB modules

Applications that use LDB modules will now have to run ldb_global_init()
before they can use LDB.

The next step will be adding support for loading LDB modules from .so
files. This will also allow us to use one LDB without difference between the
standalone and the Samba-specific build
(This used to be commit 52a235650514039bf8ffee99a784bbc1b6ae6b92)
---
 source4/scripting/ejs/smbscript.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbscript.c b/source4/scripting/ejs/smbscript.c
index 20675dadf9..d470d33a22 100644
--- a/source4/scripting/ejs/smbscript.c
+++ b/source4/scripting/ejs/smbscript.c
@@ -26,6 +26,7 @@
 #include "lib/appweb/ejs/ejsInternal.h"
 #include "scripting/ejs/smbcalls.h"
 #include "auth/gensec/gensec.h"
+#include "ldb/include/ldb.h"
 
 static EjsId eid;
 
@@ -37,7 +38,7 @@ void ejs_exception(const char *reason)
 	exit(127);
 }
 
- int main(int argc, const char **argv)
+int main(int argc, const char **argv)
 {
 	EjsHandle handle = 0;
 	MprVar result;
@@ -50,6 +51,9 @@ void ejs_exception(const char *reason)
 	int exit_status, i;
 
 	fault_setup(argv[0]);
+
+	ldb_global_init();
+
 	gensec_init();
 	mprSetCtx(mem_ctx);
 
-- 
cgit 


From ba564a901e519b0f2cf2b7651bd260f618506b5c Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 6 Mar 2006 23:28:18 +0000
Subject: r13903: Don't generate prototypes for modules and binaries in
 include/proto.h by default. (This used to be commit
 c80a8f1102caf744b66c13bebde38fba74983dc4)

---
 source4/scripting/ejs/config.mk | 1 +
 1 file changed, 1 insertion(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/config.mk b/source4/scripting/ejs/config.mk
index 47e4b99bec..c3365388d2 100644
--- a/source4/scripting/ejs/config.mk
+++ b/source4/scripting/ejs/config.mk
@@ -39,6 +39,7 @@ REQUIRED_SUBSYSTEMS = AUTH EJS LIBBASIC EJSRPC MESSAGING LIBSAMBA3 LIBNET \
 # Start BINARY SMBSCRIPT
 [BINARY::smbscript]
 INSTALLDIR = BINDIR
+NOPROTO = NO
 OBJ_FILES = \
 		smbscript.o
 REQUIRED_SUBSYSTEMS = EJS LIBBASIC SMBCALLS CONFIG 
-- 
cgit 


From 5616971885f96342e011a07210fe3aa616f8a368 Mon Sep 17 00:00:00 2001
From: Simo Sorce <idra@samba.org>
Date: Tue, 7 Mar 2006 02:55:59 +0000
Subject: r13906: fix swig build (This used to be commit
 c5a9ba3e1cfe4fcd1a35c5764330ff385545d0aa)

---
 source4/scripting/swig/dcerpc.i | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/dcerpc.i b/source4/scripting/swig/dcerpc.i
index 60e661f180..395f1473d1 100644
--- a/source4/scripting/swig/dcerpc.i
+++ b/source4/scripting/swig/dcerpc.i
@@ -228,10 +228,9 @@ char *nt_errstr(NTSTATUS nt_code);
    pidl to automatically generating these instead of having to find
    them all by hand. */
 
-%array_functions(struct samr_String, samr_String_array);
 %array_functions(struct samr_SamEntry, samr_SamEntry_array);
 %array_functions(union samr_ConnectInfo, samr_ConnectInfo_array);
-%array_functions(struct samr_RidType, samr_RidType_array);
+%array_functions(struct samr_RidWithAttribute, samr_RidWithAttribute_array);
 
 %array_functions(struct lsa_SidPtr, lsa_SidPtr_array);
 
-- 
cgit 


From 4ac2be99588b48b0652a524bf12fb1aa9c3f5fbb Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 7 Mar 2006 11:07:23 +0000
Subject: r13924: Split more prototypes out of include/proto.h + initial work
 on header file dependencies (This used to be commit
 122835876748a3eaf5e8d31ad1abddab9acb8781)

---
 source4/scripting/ejs/config.mk         | 1 +
 source4/scripting/ejs/ejsrpc.c          | 1 +
 source4/scripting/ejs/mprutil.c         | 1 +
 source4/scripting/ejs/smbcalls.h        | 2 ++
 source4/scripting/ejs/smbcalls_config.c | 2 ++
 source4/scripting/ejs/smbcalls_ldb.c    | 1 +
 source4/scripting/ejs/smbcalls_nbt.c    | 1 +
 source4/scripting/ejs/smbcalls_sys.c    | 2 ++
 8 files changed, 11 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/config.mk b/source4/scripting/ejs/config.mk
index c3365388d2..6efa111949 100644
--- a/source4/scripting/ejs/config.mk
+++ b/source4/scripting/ejs/config.mk
@@ -10,6 +10,7 @@ NOPROTO = YES
 #######################
 # Start LIBRARY SMBCALLS
 [SUBSYSTEM::SMBCALLS]
+PRIVATE_PROTO_HEADER = proto.h
 OBJ_FILES = \
 		smbcalls.o \
 		smbcalls_config.o \
diff --git a/source4/scripting/ejs/ejsrpc.c b/source4/scripting/ejs/ejsrpc.c
index c84f9eb6fb..3fb2ac0903 100644
--- a/source4/scripting/ejs/ejsrpc.c
+++ b/source4/scripting/ejs/ejsrpc.c
@@ -27,6 +27,7 @@
 #include "librpc/gen_ndr/ndr_lsa.h"
 #include "librpc/gen_ndr/ndr_winreg.h"
 #include "scripting/ejs/ejsrpc.h"
+#include "libcli/security/proto.h"
 
 /*
   set the switch var to be used by the next union switch
diff --git a/source4/scripting/ejs/mprutil.c b/source4/scripting/ejs/mprutil.c
index d8c44c2450..419cb4869e 100644
--- a/source4/scripting/ejs/mprutil.c
+++ b/source4/scripting/ejs/mprutil.c
@@ -23,6 +23,7 @@
 #include "includes.h"
 #include "lib/appweb/ejs/ejs.h"
 #include "lib/ldb/include/ldb.h"
+#include "scripting/ejs/smbcalls.h"
 
 /*
   return a default mpr object
diff --git a/source4/scripting/ejs/smbcalls.h b/source4/scripting/ejs/smbcalls.h
index 927c3ccf2f..f47d27643d 100644
--- a/source4/scripting/ejs/smbcalls.h
+++ b/source4/scripting/ejs/smbcalls.h
@@ -28,3 +28,5 @@ NTSTATUS mprGetVar(struct MprVar **v, const char *name);
 void mprAddArray(struct MprVar *var, int i, struct MprVar v);
 void mprSetCFunction(struct MprVar *obj, const char *name, MprCFunction fn);
 void mprSetStringCFunction(struct MprVar *obj, const char *name, MprStringCFunction fn);
+
+#include "scripting/ejs/proto.h"
diff --git a/source4/scripting/ejs/smbcalls_config.c b/source4/scripting/ejs/smbcalls_config.c
index b0b1420ba2..949dd0321a 100644
--- a/source4/scripting/ejs/smbcalls_config.c
+++ b/source4/scripting/ejs/smbcalls_config.c
@@ -24,6 +24,8 @@
 #include "scripting/ejs/smbcalls.h"
 #include "lib/appweb/ejs/ejs.h"
 #include "param/loadparm.h"
+#include "system/network.h"
+#include "netif/netif.h"
 
 /*
   return a list of defined services
diff --git a/source4/scripting/ejs/smbcalls_ldb.c b/source4/scripting/ejs/smbcalls_ldb.c
index 1a224605ee..9ba7668a38 100644
--- a/source4/scripting/ejs/smbcalls_ldb.c
+++ b/source4/scripting/ejs/smbcalls_ldb.c
@@ -27,6 +27,7 @@
 #include "lib/ldb/include/ldb.h"
 #include "lib/ldb/include/ldb_errors.h"
 #include "lib/cmdline/popt_common.h"
+#include "db_wrap.h"
 
 /*
   get the connected db
diff --git a/source4/scripting/ejs/smbcalls_nbt.c b/source4/scripting/ejs/smbcalls_nbt.c
index f72b4b46ac..dcefd56a0c 100644
--- a/source4/scripting/ejs/smbcalls_nbt.c
+++ b/source4/scripting/ejs/smbcalls_nbt.c
@@ -25,6 +25,7 @@
 #include "lib/appweb/ejs/ejs.h"
 #include "librpc/gen_ndr/ndr_nbt.h"
 #include "lib/events/events.h"
+#include "libcli/resolve/resolve.h"
 
 /*
   look up a netbios name
diff --git a/source4/scripting/ejs/smbcalls_sys.c b/source4/scripting/ejs/smbcalls_sys.c
index 1a876c9e87..b8382db296 100644
--- a/source4/scripting/ejs/smbcalls_sys.c
+++ b/source4/scripting/ejs/smbcalls_sys.c
@@ -25,6 +25,8 @@
 #include "lib/appweb/ejs/ejs.h"
 #include "lib/ldb/include/ldb.h"
 #include "system/time.h"
+#include "system/network.h"
+#include "netif/netif.h"
 
 /*
   return the list of configured network interfaces
-- 
cgit 


From a8c023ea79b1eb4f4f268e23a3358e7bab7d8e93 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Tue, 7 Mar 2006 14:14:24 +0000
Subject: r13942: fix dependencies

metze
(This used to be commit 71d3fbf65ccb891f823f75384bccf2c7909258c8)
---
 source4/scripting/ejs/config.mk | 25 ++++++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/config.mk b/source4/scripting/ejs/config.mk
index 6efa111949..729b8782b6 100644
--- a/source4/scripting/ejs/config.mk
+++ b/source4/scripting/ejs/config.mk
@@ -30,9 +30,28 @@ OBJ_FILES = \
 		smbcalls_param.o \
 		ejsnet.o \
 		mprutil.o
-REQUIRED_SUBSYSTEMS = AUTH EJS LIBBASIC EJSRPC MESSAGING LIBSAMBA3 LIBNET \
-					  NDR_ALL LIBSMB LIBPOPT POPT_CREDENTIALS \
-					  POPT_SAMBA
+REQUIRED_SUBSYSTEMS = \
+		AUTH EJS LIBBASIC \
+		EJSRPC MESSAGING LIBSAMBA3 \
+		LIBNET LIBSMB LIBPOPT \
+		POPT_CREDENTIALS POPT_SAMBA \
+		LIBDCERPC \
+		NDR_ALL \
+		RPC_EJS_SECURITY \
+		RPC_EJS_LSA \
+		RPC_EJS_ECHO \
+		RPC_EJS_WINREG \
+		RPC_EJS_DFS \
+		RPC_EJS_MISC \
+		RPC_EJS_EVENTLOG \
+		RPC_EJS_SAMR \
+		RPC_EJS_WKSSVC \
+		RPC_EJS_SRVSVC \
+		RPC_EJS_SVCCTL \
+		RPC_EJS_INITSHUTDOWN \
+		RPC_EJS_NETLOGON \
+		RPC_EJS_DRSUAPI \
+		RPC_EJS_IRPC
 # End SUBSYSTEM SMBCALLS
 #######################
 
-- 
cgit 


From f8fdbc967c774a1d62f87a534e4990d83ecc6b67 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 7 Mar 2006 14:34:32 +0000
Subject: r13944: Yet another round of splitups. (This used to be commit
 f87debeb12cebd734b47314554ab671c9e06237e)

---
 source4/scripting/ejs/config.mk | 1 -
 1 file changed, 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/config.mk b/source4/scripting/ejs/config.mk
index 729b8782b6..1376234d51 100644
--- a/source4/scripting/ejs/config.mk
+++ b/source4/scripting/ejs/config.mk
@@ -59,7 +59,6 @@ REQUIRED_SUBSYSTEMS = \
 # Start BINARY SMBSCRIPT
 [BINARY::smbscript]
 INSTALLDIR = BINDIR
-NOPROTO = NO
 OBJ_FILES = \
 		smbscript.o
 REQUIRED_SUBSYSTEMS = EJS LIBBASIC SMBCALLS CONFIG 
-- 
cgit 


From ceb6e9717bf8ea5c83a01e159a7006fd8651620c Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 7 Mar 2006 16:41:04 +0000
Subject: r13960: Generate makefile rules for installing/removing shared
 modules. (This used to be commit 2c746980328431ab04852dc668899e3eb042da99)

---
 source4/scripting/ejs/config.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/config.mk b/source4/scripting/ejs/config.mk
index 1376234d51..3e71e48196 100644
--- a/source4/scripting/ejs/config.mk
+++ b/source4/scripting/ejs/config.mk
@@ -31,11 +31,11 @@ OBJ_FILES = \
 		ejsnet.o \
 		mprutil.o
 REQUIRED_SUBSYSTEMS = \
-		AUTH EJS LIBBASIC \
+		auth EJS LIBBASIC \
 		EJSRPC MESSAGING LIBSAMBA3 \
 		LIBNET LIBSMB LIBPOPT \
 		POPT_CREDENTIALS POPT_SAMBA \
-		LIBDCERPC \
+		dcerpc \
 		NDR_ALL \
 		RPC_EJS_SECURITY \
 		RPC_EJS_LSA \
-- 
cgit 


From e460cf7692ccf1fd1e6cd413e43bf90e2b33ee34 Mon Sep 17 00:00:00 2001
From: Simo Sorce <idra@samba.org>
Date: Tue, 7 Mar 2006 20:42:47 +0000
Subject: r13985: Slowly start swig_ldb

dcerpc still need fixing, the produced shared library misses some symbols.
Jelmer, can you look at it while you are playing with the build system ?
(This used to be commit af92996e30a50af92d70ac8d55ade3da4ce56077)
---
 source4/scripting/config.mk     | 16 +++++++-
 source4/scripting/swig/dcerpc.i |  3 +-
 source4/scripting/swig/ldb.i    | 88 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 104 insertions(+), 3 deletions(-)
 create mode 100644 source4/scripting/swig/ldb.i

(limited to 'source4/scripting')

diff --git a/source4/scripting/config.mk b/source4/scripting/config.mk
index 15e6e8539e..22437909ed 100644
--- a/source4/scripting/config.mk
+++ b/source4/scripting/config.mk
@@ -7,6 +7,13 @@ REQUIRED_SUBSYSTEMS = LIBTDB
 # End LIBRARY swig_tdb
 #######################
 
+#######################
+# Start LIBRARY swig_ldb
+[LIBRARY::swig_ldb]
+REQUIRED_SUBSYSTEMS = ldb
+# End LIBRARY swig_ldb
+#######################
+
 #######################
 # Start LIBRARY swig_dcerpc
 [LIBRARY::swig_dcerpc]
@@ -15,7 +22,7 @@ REQUIRED_SUBSYSTEMS = LIBCLI NDR_MISC LIBBASIC CONFIG RPC_NDR_SAMR RPC_NDR_LSA
 #######################
 
 # Swig extensions
-swig: scripting/swig/_tdb.so scripting/swig/_dcerpc.so
+swig: scripting/swig/_tdb.so scripting/swig/_ldb.so scripting/swig/_dcerpc.so
 
 scripting/swig/tdb_wrap.c: scripting/swig/tdb.i
 	swig -python scripting/swig/tdb.i
@@ -24,6 +31,13 @@ scripting/swig/_tdb.so: scripting/swig/tdb_wrap.o $(LIBRARY_swig_tdb_DEPEND_LIST
 	$(SHLD) $(SHLD_FLAGS) -o scripting/swig/_tdb.so scripting/swig/tdb_wrap.o \
 		$(LIBRARY_swig_tdb_LINK_LIST) $(LIBRARY_swig_tdb_LINK_FLAGS)
 
+scripting/swig/ldb_wrap.c: scripting/swig/ldb.i
+	swig -python scripting/swig/ldb.i
+
+scripting/swig/_ldb.so: scripting/swig/ldb_wrap.o $(LIBRARY_swig_ldb_DEPEND_LIST)
+	$(SHLD) $(SHLD_FLAGS) -o scripting/swig/_ldb.so scripting/swig/ldb_wrap.o \
+		$(LIBRARY_swig_ldb_LINK_LIST) $(LIBRARY_swig_ldb_LINK_FLAGS)
+
 SWIG_INCLUDES = librpc/gen_ndr/samr.i librpc/gen_ndr/lsa.i librpc/gen_ndr/spoolss.i
 
 scripting/swig/dcerpc_wrap.c: scripting/swig/dcerpc.i scripting/swig/samba.i scripting/swig/status_codes.i $(SWIG_INCLUDES)
diff --git a/source4/scripting/swig/dcerpc.i b/source4/scripting/swig/dcerpc.i
index 395f1473d1..2111404bc6 100644
--- a/source4/scripting/swig/dcerpc.i
+++ b/source4/scripting/swig/dcerpc.i
@@ -69,8 +69,7 @@ void set_werror_exception(int status)
 
 %init  %{
 	setup_logging("python", DEBUG_STDOUT);	
-	lp_load(dyn_CONFIGFILE, True, False, False);
-	load_interfaces();
+	lp_load();
 	ntstatus_exception = PyErr_NewException("_dcerpc.NTSTATUS", NULL, NULL);
 	werror_exception = PyErr_NewException("_dcerpc.WERROR", NULL, NULL);
 	PyDict_SetItemString(d, "NTSTATUS", ntstatus_exception);
diff --git a/source4/scripting/swig/ldb.i b/source4/scripting/swig/ldb.i
new file mode 100644
index 0000000000..5f11b6d2ec
--- /dev/null
+++ b/source4/scripting/swig/ldb.i
@@ -0,0 +1,88 @@
+/* 
+   Unix SMB/CIFS implementation.
+
+   Swig interface to ldb.
+
+   Copyright (C) 2005 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
+
+%{
+
+/* 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 ldb headers */
+
+/* Treat a uint8_t as an unsigned character */
+typedef unsigned char uint8_t;
+typedef unsigned long long uint64_t;
+typedef long long int64_t;
+
+#include "lib/ldb/include/ldb.h"
+
+%}
+
+/* The ldb functions will crash if a NULL tdb is passed */
+
+%include exception.i
+
+%typemap(check) struct ldb_context* {
+	if ($1 == NULL)
+		SWIG_exception(SWIG_ValueError, 
+			"ldb context must be non-NULL");
+}
+
+/* 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 ldb_init init;
+struct ldb_context *ldb_init(void *mem_ctx);
+
+%rename ldb_connect connect;
+int ldb_connect(struct ldb_context *ldb, const char *url, unsigned int flags, const char *options[]);
+
+%rename ldb_request request;
+int ldb_request(struct ldb_context *ldb, struct ldb_request *request);
-- 
cgit 


From c6519ad9c0a45981a4ae101ee961acc397d4140d Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Thu, 9 Mar 2006 22:06:54 +0000
Subject: r14109: Modulify the smbcalls subsystem. (This used to be commit
 d538eac9dbfdd786b533cb5fbbd35ab2fd7358ba)

---
 source4/scripting/ejs/config.mk  | 75 +++++++++++++++++++++++++++++++---------
 source4/scripting/ejs/smbcalls.c | 12 +------
 2 files changed, 60 insertions(+), 27 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/config.mk b/source4/scripting/ejs/config.mk
index 3e71e48196..e330e022a4 100644
--- a/source4/scripting/ejs/config.mk
+++ b/source4/scripting/ejs/config.mk
@@ -7,32 +7,75 @@ NOPROTO = YES
 # End SUBSYSTEM EJSRPC
 #######################
 
+[MODULE::smbcalls_config]
+OBJ_FILES = smbcalls_config.o
+SUBSYSTEM = smbcalls
+INIT_FUNCTION = smb_setup_ejs_config
+
+[MODULE::smbcalls_ldb]
+OBJ_FILES = smbcalls_ldb.o
+SUBSYSTEM = smbcalls
+INIT_FUNCTION = smb_setup_ejs_ldb
+
+[MODULE::smbcalls_nbt]
+OBJ_FILES = smbcalls_nbt.o
+SUBSYSTEM = smbcalls
+INIT_FUNCTION = smb_setup_ejs_nbt
+
+[MODULE::smbcalls_samba3]
+OBJ_FILES = smbcalls_samba3.o
+SUBSYSTEM = smbcalls
+INIT_FUNCTION = smb_setup_ejs_samba3
+REQUIRED_SUBSYSTEMS = LIBSAMBA3 
+
+
+[MODULE::smbcalls_rand]
+OBJ_FILES = smbcalls_rand.o
+SUBSYSTEM = smbcalls
+INIT_FUNCTION = smb_setup_ejs_random
+
+[MODULE::smbcalls_nss]
+OBJ_FILES = smbcalls_nss.o
+SUBSYSTEM = smbcalls
+INIT_FUNCTION = smb_setup_ejs_nss
+
+[MODULE::smbcalls_data]
+OBJ_FILES = smbcalls_data.o
+SUBSYSTEM = smbcalls
+INIT_FUNCTION = smb_setup_ejs_datablob
+
+[MODULE::smbcalls_auth]
+OBJ_FILES = smbcalls_auth.o
+SUBSYSTEM = smbcalls
+INIT_FUNCTION = smb_setup_ejs_auth
+REQUIRED_SUBSYSTEMS = auth
+
+[MODULE::smbcalls_string]
+OBJ_FILES = smbcalls_string.o
+SUBSYSTEM = smbcalls
+INIT_FUNCTION = smb_setup_ejs_string
+
+[MODULE::smbcalls_sys]
+OBJ_FILES = smbcalls_sys.o
+SUBSYSTEM = smbcalls
+INIT_FUNCTION = smb_setup_ejs_system
+
 #######################
-# Start LIBRARY SMBCALLS
-[SUBSYSTEM::SMBCALLS]
+# Start LIBRARY smbcalls
+[SUBSYSTEM::smbcalls]
 PRIVATE_PROTO_HEADER = proto.h
 OBJ_FILES = \
 		smbcalls.o \
-		smbcalls_config.o \
-		smbcalls_ldb.o \
-		smbcalls_nbt.o \
 		smbcalls_cli.o \
 		smbcalls_rpc.o \
-		smbcalls_auth.o \
 		smbcalls_options.o \
-		smbcalls_nss.o \
-		smbcalls_string.o \
-		smbcalls_data.o \
-		smbcalls_rand.o \
-		smbcalls_sys.o \
 		smbcalls_creds.o \
-		smbcalls_samba3.o \
 		smbcalls_param.o \
 		ejsnet.o \
 		mprutil.o
 REQUIRED_SUBSYSTEMS = \
-		auth EJS LIBBASIC \
-		EJSRPC MESSAGING LIBSAMBA3 \
+		EJS LIBBASIC \
+		EJSRPC MESSAGING \
 		LIBNET LIBSMB LIBPOPT \
 		POPT_CREDENTIALS POPT_SAMBA \
 		dcerpc \
@@ -52,7 +95,7 @@ REQUIRED_SUBSYSTEMS = \
 		RPC_EJS_NETLOGON \
 		RPC_EJS_DRSUAPI \
 		RPC_EJS_IRPC
-# End SUBSYSTEM SMBCALLS
+# End SUBSYSTEM smbcalls
 #######################
 
 #######################
@@ -61,6 +104,6 @@ REQUIRED_SUBSYSTEMS = \
 INSTALLDIR = BINDIR
 OBJ_FILES = \
 		smbscript.o
-REQUIRED_SUBSYSTEMS = EJS LIBBASIC SMBCALLS CONFIG 
+REQUIRED_SUBSYSTEMS = EJS LIBBASIC smbcalls CONFIG 
 # End BINARY SMBSCRIPT
 #######################
diff --git a/source4/scripting/ejs/smbcalls.c b/source4/scripting/ejs/smbcalls.c
index 13281f88e9..5aab8cf2c2 100644
--- a/source4/scripting/ejs/smbcalls.c
+++ b/source4/scripting/ejs/smbcalls.c
@@ -127,23 +127,13 @@ static int ejs_version(MprVarHandle eid, int argc, struct MprVar **argv)
 */
 void smb_setup_ejs_functions(void)
 {
-	init_module_fn static_init[] = STATIC_SMBCALLS_MODULES;
+	init_module_fn static_init[] = STATIC_smbcalls_MODULES;
 	init_module_fn *shared_init;
 
-	smb_setup_ejs_config();
-	smb_setup_ejs_ldb();
-	smb_setup_ejs_nbt();
 	smb_setup_ejs_cli();
-	smb_setup_ejs_auth();
 	smb_setup_ejs_options();
-	smb_setup_ejs_nss();
-	smb_setup_ejs_string();
-	smb_setup_ejs_random();
-	smb_setup_ejs_system();
 	smb_setup_ejs_credentials();
-	smb_setup_ejs_samba3();
 	smb_setup_ejs_param();
-	smb_setup_ejs_datablob();
 	
 	ejsnet_setup();
 
-- 
cgit 


From 429a23c48d81f6b02449f5a7d01b2002849ae4e1 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Thu, 9 Mar 2006 22:25:50 +0000
Subject: r14110: make ndr interface parsing code libraries, so it will not
 included in multiple modules or binaries

metze
(This used to be commit 13c105974744c510a62a7c8db2230b60c11b2315)
---
 source4/scripting/ejs/config.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/config.mk b/source4/scripting/ejs/config.mk
index e330e022a4..aae428cbff 100644
--- a/source4/scripting/ejs/config.mk
+++ b/source4/scripting/ejs/config.mk
@@ -79,7 +79,7 @@ REQUIRED_SUBSYSTEMS = \
 		LIBNET LIBSMB LIBPOPT \
 		POPT_CREDENTIALS POPT_SAMBA \
 		dcerpc \
-		NDR_ALL \
+		NDR_TABLE \
 		RPC_EJS_SECURITY \
 		RPC_EJS_LSA \
 		RPC_EJS_ECHO \
-- 
cgit 


From acd190d8f69ea270cd0a746faab2d1590cca7ae9 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Sat, 11 Mar 2006 07:07:28 +0000
Subject: r14200: Now we have real USN support, don't force the values in the
 provision scripts.

This tests the real module, and avoids duplication.

Andrew Bartlett
(This used to be commit 0859ba59ae00029177cd63366fc59efe8b19c973)
---
 source4/scripting/libjs/provision.js | 16 ----------------
 1 file changed, 16 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index 84ed69231b..b01fec82c7 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -4,9 +4,6 @@
 	Released under the GNU GPL v2 or later
 */
 
-/* used to generate sequence numbers for records */
-provision_next_usn = 1;
-
 sys = sys_init();
 
 /*
@@ -59,8 +56,6 @@ dn: CN=%s,CN=ForeignSecurityPrincipals,%s
 objectClass: top
 objectClass: foreignSecurityPrincipal
 description: %s
-uSNCreated: 1
-uSNChanged: 1
 ",
 			  sid, subobj.BASEDN, desc);
 	/* deliberately ignore errors from this, as the records may
@@ -132,14 +127,6 @@ function hostip()
 	return list[0];
 }
 
-/*
-  return next USN in the sequence
-*/
-function nextusn()
-{
-	provision_next_usn = provision_next_usn+1;
-	return provision_next_usn;
-}
 
 /*
   return first part of hostname
@@ -358,8 +345,6 @@ function provision(subobj, message, blank, paths, session_info, credentials)
 	var rdns = split(",", subobj.BASEDN);
 	subobj.RDN_DC = substr(rdns[0], strlen("DC="));
 
-	provision_next_usn = 1;
-
 	info.subobj = subobj;
 	info.message = message;
 	info.credentials = credentials;
@@ -465,7 +450,6 @@ function provision_guess()
 	subobj.NTTIME       = nttime;
 	subobj.LDAPTIME     = ldaptime;
 	subobj.DATESTRING   = datestring;
-	subobj.USN          = nextusn;
 	subobj.ROOT         = findnss(nss.getpwnam, "root");
 	subobj.NOBODY       = findnss(nss.getpwnam, "nobody");
 	subobj.NOGROUP      = findnss(nss.getgrnam, "nogroup", "nobody");
-- 
cgit 


From e153a8099e9a187e6bcac6507ed4b1ddfe7cb764 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 13 Mar 2006 16:32:44 +0000
Subject: r14327: Replace MAJOR_VERSION/MINOR_VERSION/RELEASE_VERSION with two
 parameters:  - VERSION: should contain the current version. Will be made part
 of the filename.  - SO_VERSION: should contain the latest version that this
 on is compatible to. Will be used for setting the soname of the shared
 library.

Fix sonames and use them on platforms that support them
Remove symlinking code. ldconfig will take care of creating the symlinks now
that we set the soname.
(This used to be commit 7871b07e21c85c63d0ecac4c31b98dc112d18af5)
---
 source4/scripting/ejs/config.mk | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/config.mk b/source4/scripting/ejs/config.mk
index aae428cbff..7111f307ff 100644
--- a/source4/scripting/ejs/config.mk
+++ b/source4/scripting/ejs/config.mk
@@ -79,22 +79,7 @@ REQUIRED_SUBSYSTEMS = \
 		LIBNET LIBSMB LIBPOPT \
 		POPT_CREDENTIALS POPT_SAMBA \
 		dcerpc \
-		NDR_TABLE \
-		RPC_EJS_SECURITY \
-		RPC_EJS_LSA \
-		RPC_EJS_ECHO \
-		RPC_EJS_WINREG \
-		RPC_EJS_DFS \
-		RPC_EJS_MISC \
-		RPC_EJS_EVENTLOG \
-		RPC_EJS_SAMR \
-		RPC_EJS_WKSSVC \
-		RPC_EJS_SRVSVC \
-		RPC_EJS_SVCCTL \
-		RPC_EJS_INITSHUTDOWN \
-		RPC_EJS_NETLOGON \
-		RPC_EJS_DRSUAPI \
-		RPC_EJS_IRPC
+		NDR_TABLE
 # End SUBSYSTEM smbcalls
 #######################
 
-- 
cgit 


From 3f16241a1d3243447d0244ebac05b447aec94df8 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 14 Mar 2006 01:29:56 +0000
Subject: r14363: Remove credentials.h from the global includes. (This used to
 be commit 98c4c3051391c6f89df5d133665f51bef66b1563)

---
 source4/scripting/ejs/ejsnet.c         | 1 +
 source4/scripting/ejs/smbcalls_cli.c   | 1 +
 source4/scripting/ejs/smbcalls_creds.c | 1 +
 source4/scripting/ejs/smbcalls_rpc.c   | 1 +
 4 files changed, 4 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/ejsnet.c b/source4/scripting/ejs/ejsnet.c
index 6c7a0274cf..952ebeb575 100644
--- a/source4/scripting/ejs/ejsnet.c
+++ b/source4/scripting/ejs/ejsnet.c
@@ -26,6 +26,7 @@
 #include "scripting/ejs/ejsnet.h"
 #include "libnet/libnet.h"
 #include "events/events.h"
+#include "auth/credentials/credentials.h"
 
 static int ejs_net_userman(MprVarHandle, int, struct MprVar**);
 static int ejs_net_createuser(MprVarHandle, int, char**);
diff --git a/source4/scripting/ejs/smbcalls_cli.c b/source4/scripting/ejs/smbcalls_cli.c
index bc69c0653d..914d163ec7 100644
--- a/source4/scripting/ejs/smbcalls_cli.c
+++ b/source4/scripting/ejs/smbcalls_cli.c
@@ -27,6 +27,7 @@
 #include "libcli/composite/composite.h"
 #include "libcli/smb_composite/smb_composite.h"
 #include "libcli/libcli.h"
+#include "auth/credentials/credentials.h"
 
 #if 0
 
diff --git a/source4/scripting/ejs/smbcalls_creds.c b/source4/scripting/ejs/smbcalls_creds.c
index a1b9446e9e..c6ad64933b 100644
--- a/source4/scripting/ejs/smbcalls_creds.c
+++ b/source4/scripting/ejs/smbcalls_creds.c
@@ -24,6 +24,7 @@
 #include "scripting/ejs/smbcalls.h"
 #include "lib/appweb/ejs/ejs.h"
 #include "lib/cmdline/popt_common.h"
+#include "auth/credentials/credentials.h"
 
 /*
   helper function to get the local objects credentials ptr
diff --git a/source4/scripting/ejs/smbcalls_rpc.c b/source4/scripting/ejs/smbcalls_rpc.c
index 4527f7385a..e666aa65cc 100644
--- a/source4/scripting/ejs/smbcalls_rpc.c
+++ b/source4/scripting/ejs/smbcalls_rpc.c
@@ -30,6 +30,7 @@
 #include "dlinklist.h"
 #include "lib/events/events.h"
 #include "librpc/rpc/dcerpc_table.h"
+#include "auth/credentials/credentials.h"
 
 /*
   state of a irpc 'connection'
-- 
cgit 


From e3f2414cf9e582a4e4deecc662b64a7bb2679a34 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 14 Mar 2006 15:03:25 +0000
Subject: r14380: Reduce the size of structs.h (This used to be commit
 1a16a6f1dfa66499af43a6b88b3ea69a6a75f1fe)

---
 source4/scripting/ejs/smbcalls.h | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls.h b/source4/scripting/ejs/smbcalls.h
index f47d27643d..5954d2385e 100644
--- a/source4/scripting/ejs/smbcalls.h
+++ b/source4/scripting/ejs/smbcalls.h
@@ -29,4 +29,7 @@ void mprAddArray(struct MprVar *var, int i, struct MprVar v);
 void mprSetCFunction(struct MprVar *obj, const char *name, MprCFunction fn);
 void mprSetStringCFunction(struct MprVar *obj, const char *name, MprStringCFunction fn);
 
+struct ldb_context;
+struct ldb_message;
+
 #include "scripting/ejs/proto.h"
-- 
cgit 


From 61933e159cc2a8399f8bb1fa53844a67f8bba55b Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 14 Mar 2006 15:22:36 +0000
Subject: r14381: Kill structs.h (This used to be commit
 1ffb82a7596f989c90df69573083a2c2e28f8808)

---
 source4/scripting/ejs/smbcalls_param.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_param.c b/source4/scripting/ejs/smbcalls_param.c
index 23f90c971e..0169e09709 100644
--- a/source4/scripting/ejs/smbcalls_param.c
+++ b/source4/scripting/ejs/smbcalls_param.c
@@ -23,7 +23,7 @@
 #include "includes.h"
 #include "scripting/ejs/smbcalls.h"
 #include "lib/appweb/ejs/ejs.h"
-#include "param/generic.h"
+#include "param/param.h"
 
 /*
   get parameter
-- 
cgit 


From 8528016978b084213ef53d66e1b6e831b1a01acc Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Thu, 16 Mar 2006 00:23:11 +0000
Subject: r14464: Don't include ndr_BASENAME.h files unless strictly required,
 instead try to include just the BASENAME.h files (containing only structs)
 (This used to be commit 3dd477ca5147f28a962b8437e2611a8222d706bd)

---
 source4/scripting/ejs/ejsrpc.c          | 4 ++--
 source4/scripting/ejs/smbcalls_nbt.c    | 2 +-
 source4/scripting/ejs/smbcalls_rpc.c    | 2 +-
 source4/scripting/ejs/smbcalls_samba3.c | 1 +
 4 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/ejsrpc.c b/source4/scripting/ejs/ejsrpc.c
index 3fb2ac0903..36d67790cd 100644
--- a/source4/scripting/ejs/ejsrpc.c
+++ b/source4/scripting/ejs/ejsrpc.c
@@ -24,8 +24,8 @@
 #include "lib/appweb/ejs/ejs.h"
 #include "scripting/ejs/smbcalls.h"
 #include "librpc/gen_ndr/ndr_security.h"
-#include "librpc/gen_ndr/ndr_lsa.h"
-#include "librpc/gen_ndr/ndr_winreg.h"
+#include "librpc/gen_ndr/lsa.h"
+#include "librpc/gen_ndr/winreg.h"
 #include "scripting/ejs/ejsrpc.h"
 #include "libcli/security/proto.h"
 
diff --git a/source4/scripting/ejs/smbcalls_nbt.c b/source4/scripting/ejs/smbcalls_nbt.c
index dcefd56a0c..4bcb450ee3 100644
--- a/source4/scripting/ejs/smbcalls_nbt.c
+++ b/source4/scripting/ejs/smbcalls_nbt.c
@@ -23,7 +23,7 @@
 #include "includes.h"
 #include "scripting/ejs/smbcalls.h"
 #include "lib/appweb/ejs/ejs.h"
-#include "librpc/gen_ndr/ndr_nbt.h"
+#include "librpc/gen_ndr/nbt.h"
 #include "lib/events/events.h"
 #include "libcli/resolve/resolve.h"
 
diff --git a/source4/scripting/ejs/smbcalls_rpc.c b/source4/scripting/ejs/smbcalls_rpc.c
index e666aa65cc..0d2d34a478 100644
--- a/source4/scripting/ejs/smbcalls_rpc.c
+++ b/source4/scripting/ejs/smbcalls_rpc.c
@@ -23,7 +23,7 @@
 #include "includes.h"
 #include "scripting/ejs/smbcalls.h"
 #include "lib/appweb/ejs/ejs.h"
-#include "librpc/gen_ndr/ndr_echo.h"
+#include "librpc/gen_ndr/echo.h"
 #include "lib/cmdline/popt_common.h"
 #include "lib/messaging/irpc.h"
 #include "scripting/ejs/ejsrpc.h"
diff --git a/source4/scripting/ejs/smbcalls_samba3.c b/source4/scripting/ejs/smbcalls_samba3.c
index 0a05e4584f..1cf0042741 100644
--- a/source4/scripting/ejs/smbcalls_samba3.c
+++ b/source4/scripting/ejs/smbcalls_samba3.c
@@ -24,6 +24,7 @@
 #include "scripting/ejs/smbcalls.h"
 #include "lib/appweb/ejs/ejs.h"
 #include "lib/samba3/samba3.h"
+#include "librpc/gen_ndr/ndr_security.h"
 
 
 static struct MprVar mprRegistry(struct samba3_regdb *reg)
-- 
cgit 


From 71b4fd97922933b24424924acee606389bfecb2d Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Thu, 16 Mar 2006 13:56:14 +0000
Subject: r14477: Remove the NOPROTO property - it's no longer used as proto.h
 is gone. (This used to be commit 9c37f847d32d2f327a88c53a90af0c73126b76be)

---
 source4/scripting/ejs/config.mk | 1 -
 1 file changed, 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/config.mk b/source4/scripting/ejs/config.mk
index 7111f307ff..ffda803f47 100644
--- a/source4/scripting/ejs/config.mk
+++ b/source4/scripting/ejs/config.mk
@@ -3,7 +3,6 @@
 [SUBSYSTEM::EJSRPC]
 OBJ_FILES = \
 		ejsrpc.o
-NOPROTO = YES
 # End SUBSYSTEM EJSRPC
 #######################
 
-- 
cgit 


From 5c79bbadd5cfa921c8b4f87b5b4cafe5c488ebda Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Fri, 17 Mar 2006 00:45:52 +0000
Subject: r14497: Fix build with shared libraries (This used to be commit
 c74fc55831ca24819ae7f5e0920d0351e2b46a08)

---
 source4/scripting/ejs/smbcalls.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls.c b/source4/scripting/ejs/smbcalls.c
index 5aab8cf2c2..e010f3fdb1 100644
--- a/source4/scripting/ejs/smbcalls.c
+++ b/source4/scripting/ejs/smbcalls.c
@@ -137,7 +137,7 @@ void smb_setup_ejs_functions(void)
 	
 	ejsnet_setup();
 
-	shared_init = load_samba_modules(NULL, "ejs");
+	shared_init = load_samba_modules(NULL, "smbcalls");
 	
 	run_init_functions(static_init);
 	run_init_functions(shared_init);
-- 
cgit 


From 2f65012d3d2d6af11af0c2673c733d0cc8e9fb02 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Fri, 17 Mar 2006 01:39:02 +0000
Subject: r14500: Make some more functions public (This used to be commit
 867fc489228a827fae08de3969e0db2a22192609)

---
 source4/scripting/ejs/smbscript.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbscript.c b/source4/scripting/ejs/smbscript.c
index d470d33a22..86947bdf8e 100644
--- a/source4/scripting/ejs/smbscript.c
+++ b/source4/scripting/ejs/smbscript.c
@@ -30,7 +30,7 @@
 
 static EjsId eid;
 
-void ejs_exception(const char *reason)
+_PUBLIC_ void ejs_exception(const char *reason)
 {
 	Ejs *ep = ejsPtr(eid);
 	ejsSetErrorMsg(eid, "%s", reason);
-- 
cgit 


From 35349a58df5b69446607fbd742a05f57f3515319 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sat, 18 Mar 2006 15:42:57 +0000
Subject: r14542: Remove librpc, libndr and libnbt from includes.h (This used
 to be commit 51b4270513752d2eafbe77f9de598de16ef84a1f)

---
 source4/scripting/ejs/ejsrpc.h        | 3 +++
 source4/scripting/ejs/smbcalls.h      | 1 +
 source4/scripting/ejs/smbcalls_rand.c | 1 +
 source4/scripting/ejs/smbcalls_rpc.c  | 1 +
 4 files changed, 6 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/ejsrpc.h b/source4/scripting/ejs/ejsrpc.h
index 80674fc43b..a320392201 100644
--- a/source4/scripting/ejs/ejsrpc.h
+++ b/source4/scripting/ejs/ejsrpc.h
@@ -20,6 +20,9 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
+#include "librpc/gen_ndr/security.h"
+#include "librpc/rpc/dcerpc.h"
+
 struct ejs_rpc {
 	int eid;
 	const char *callname;
diff --git a/source4/scripting/ejs/smbcalls.h b/source4/scripting/ejs/smbcalls.h
index 5954d2385e..5d5f6841d9 100644
--- a/source4/scripting/ejs/smbcalls.h
+++ b/source4/scripting/ejs/smbcalls.h
@@ -31,5 +31,6 @@ void mprSetStringCFunction(struct MprVar *obj, const char *name, MprStringCFunct
 
 struct ldb_context;
 struct ldb_message;
+struct cli_credentials;
 
 #include "scripting/ejs/proto.h"
diff --git a/source4/scripting/ejs/smbcalls_rand.c b/source4/scripting/ejs/smbcalls_rand.c
index 043b9cca09..9920c06958 100644
--- a/source4/scripting/ejs/smbcalls_rand.c
+++ b/source4/scripting/ejs/smbcalls_rand.c
@@ -24,6 +24,7 @@
 #include "scripting/ejs/smbcalls.h"
 #include "lib/appweb/ejs/ejs.h"
 #include "system/passwd.h"
+#include "librpc/gen_ndr/ndr_misc.h"
 
 /*
   usage:
diff --git a/source4/scripting/ejs/smbcalls_rpc.c b/source4/scripting/ejs/smbcalls_rpc.c
index 0d2d34a478..29346f2586 100644
--- a/source4/scripting/ejs/smbcalls_rpc.c
+++ b/source4/scripting/ejs/smbcalls_rpc.c
@@ -31,6 +31,7 @@
 #include "lib/events/events.h"
 #include "librpc/rpc/dcerpc_table.h"
 #include "auth/credentials/credentials.h"
+#include "librpc/rpc/dcerpc.h"
 
 /*
   state of a irpc 'connection'
-- 
cgit 


From 184955ffd711a5db8b1e1b7c179c232ce0e29145 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sun, 19 Mar 2006 19:47:05 +0000
Subject: r14572: Give libraries saner names, remove some .pc files, make some
 things subsystems in case a library doesn't make sense. (This used to be
 commit ed382873fd01457a53e0a1e1f5ba6753dfbc0646)

---
 source4/scripting/config.mk     | 2 +-
 source4/scripting/ejs/config.mk | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/config.mk b/source4/scripting/config.mk
index 22437909ed..c169680507 100644
--- a/source4/scripting/config.mk
+++ b/source4/scripting/config.mk
@@ -17,7 +17,7 @@ REQUIRED_SUBSYSTEMS = ldb
 #######################
 # Start LIBRARY swig_dcerpc
 [LIBRARY::swig_dcerpc]
-REQUIRED_SUBSYSTEMS = LIBCLI NDR_MISC LIBBASIC CONFIG RPC_NDR_SAMR RPC_NDR_LSA
+REQUIRED_SUBSYSTEMS = LIBCLI NDR_MISC LIBSAMBA-UTIL LIBSAMBA-CONFIG RPC_NDR_SAMR RPC_NDR_LSA
 # End LIBRARY swig_dcerpc
 #######################
 
diff --git a/source4/scripting/ejs/config.mk b/source4/scripting/ejs/config.mk
index ffda803f47..e5a20d20e1 100644
--- a/source4/scripting/ejs/config.mk
+++ b/source4/scripting/ejs/config.mk
@@ -73,9 +73,9 @@ OBJ_FILES = \
 		ejsnet.o \
 		mprutil.o
 REQUIRED_SUBSYSTEMS = \
-		EJS LIBBASIC \
+		EJS LIBSAMBA-UTIL \
 		EJSRPC MESSAGING \
-		LIBNET LIBSMB LIBPOPT \
+		LIBSAMBA-NET LIBSMB LIBPOPT \
 		POPT_CREDENTIALS POPT_SAMBA \
 		dcerpc \
 		NDR_TABLE
@@ -88,6 +88,6 @@ REQUIRED_SUBSYSTEMS = \
 INSTALLDIR = BINDIR
 OBJ_FILES = \
 		smbscript.o
-REQUIRED_SUBSYSTEMS = EJS LIBBASIC smbcalls CONFIG 
+REQUIRED_SUBSYSTEMS = EJS LIBSAMBA-UTIL smbcalls LIBSAMBA-CONFIG 
 # End BINARY SMBSCRIPT
 #######################
-- 
cgit 


From 508f2f5506a14814888718bf00f52b7788d0e9ea Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 20 Mar 2006 23:35:08 +0000
Subject: r14594: Fix some dependencies (required for shared library build)
 (This used to be commit 06f7a8c692a645830eb3dd9abad8556c66bba747)

---
 source4/scripting/ejs/config.mk | 1 -
 1 file changed, 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/config.mk b/source4/scripting/ejs/config.mk
index e5a20d20e1..ac24b58359 100644
--- a/source4/scripting/ejs/config.mk
+++ b/source4/scripting/ejs/config.mk
@@ -27,7 +27,6 @@ SUBSYSTEM = smbcalls
 INIT_FUNCTION = smb_setup_ejs_samba3
 REQUIRED_SUBSYSTEMS = LIBSAMBA3 
 
-
 [MODULE::smbcalls_rand]
 OBJ_FILES = smbcalls_rand.o
 SUBSYSTEM = smbcalls
-- 
cgit 


From dab516d3e72360a10962d37a06df6aee33b1a63f Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 21 Mar 2006 07:08:08 +0000
Subject: r14603: Fix building of ejs modules as shared libs Fix calling of
 ejs_exception() without requiring --export-dynamic (This used to be commit
 8575e9a4903450aae1f29f55aae516085a9528bb)

---
 source4/scripting/ejs/config.mk   |  4 +++-
 source4/scripting/ejs/smbcalls.c  | 10 +++++++++-
 source4/scripting/ejs/smbscript.c |  4 ++--
 3 files changed, 14 insertions(+), 4 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/config.mk b/source4/scripting/ejs/config.mk
index ac24b58359..c38caeabf1 100644
--- a/source4/scripting/ejs/config.mk
+++ b/source4/scripting/ejs/config.mk
@@ -60,7 +60,9 @@ INIT_FUNCTION = smb_setup_ejs_system
 
 #######################
 # Start LIBRARY smbcalls
-[SUBSYSTEM::smbcalls]
+[LIBRARY::smbcalls]
+SO_VERSION = 0
+VERSION = 0.0.1
 PRIVATE_PROTO_HEADER = proto.h
 OBJ_FILES = \
 		smbcalls.o \
diff --git a/source4/scripting/ejs/smbcalls.c b/source4/scripting/ejs/smbcalls.c
index e010f3fdb1..1bfbd3b47a 100644
--- a/source4/scripting/ejs/smbcalls.c
+++ b/source4/scripting/ejs/smbcalls.c
@@ -121,15 +121,23 @@ static int ejs_version(MprVarHandle eid, int argc, struct MprVar **argv)
 	return 0;
 }
 
+static void (*ejs_exception_handler) (const char *) = NULL;
+
+_PUBLIC_ void ejs_exception(const char *reason)
+{
+	ejs_exception_handler(reason);		
+}
 
 /*
   setup C functions that be called from ejs
 */
-void smb_setup_ejs_functions(void)
+void smb_setup_ejs_functions(void (*exception_handler)(const char *))
 {
 	init_module_fn static_init[] = STATIC_smbcalls_MODULES;
 	init_module_fn *shared_init;
 
+	ejs_exception_handler = exception_handler;
+
 	smb_setup_ejs_cli();
 	smb_setup_ejs_options();
 	smb_setup_ejs_credentials();
diff --git a/source4/scripting/ejs/smbscript.c b/source4/scripting/ejs/smbscript.c
index 86947bdf8e..d602a7733b 100644
--- a/source4/scripting/ejs/smbscript.c
+++ b/source4/scripting/ejs/smbscript.c
@@ -30,7 +30,7 @@
 
 static EjsId eid;
 
-_PUBLIC_ void ejs_exception(const char *reason)
+static void smbscript_ejs_exception(const char *reason)
 {
 	Ejs *ep = ejsPtr(eid);
 	ejsSetErrorMsg(eid, "%s", reason);
@@ -72,7 +72,7 @@ int main(int argc, const char **argv)
 		exit(127);
 	}
 
-	smb_setup_ejs_functions();
+	smb_setup_ejs_functions(smbscript_ejs_exception);
 
 	if ((eid = ejsOpenEngine(handle, 0)) == (EjsId)-1) {
 		fprintf(stderr, "smbscript: ejsOpenEngine(): unable to "
-- 
cgit 


From 86971ff3b930a93de55aae00fe66f3d1d10dbcb4 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Thu, 30 Mar 2006 04:39:37 +0000
Subject: r14798: Get swig building again (by commenting out dcerpc stuff for
 now).

Add the start of a test framework for swigged functionality.
(This used to be commit 3dfd0959f78518c021417f3f1158c51d70a1e88c)
---
 source4/scripting/config.mk                   |  9 +++++----
 source4/scripting/swig/torture/torture_tdb.py | 10 ++++++++++
 2 files changed, 15 insertions(+), 4 deletions(-)
 create mode 100755 source4/scripting/swig/torture/torture_tdb.py

(limited to 'source4/scripting')

diff --git a/source4/scripting/config.mk b/source4/scripting/config.mk
index c169680507..bbca5034eb 100644
--- a/source4/scripting/config.mk
+++ b/source4/scripting/config.mk
@@ -22,14 +22,15 @@ REQUIRED_SUBSYSTEMS = LIBCLI NDR_MISC LIBSAMBA-UTIL LIBSAMBA-CONFIG RPC_NDR_SAMR
 #######################
 
 # Swig extensions
-swig: scripting/swig/_tdb.so scripting/swig/_ldb.so scripting/swig/_dcerpc.so
+swig: scripting/swig/_tdb.so scripting/swig/_ldb.so
 
 scripting/swig/tdb_wrap.c: scripting/swig/tdb.i
 	swig -python scripting/swig/tdb.i
 
-scripting/swig/_tdb.so: scripting/swig/tdb_wrap.o $(LIBRARY_swig_tdb_DEPEND_LIST)
-	$(SHLD) $(SHLD_FLAGS) -o scripting/swig/_tdb.so scripting/swig/tdb_wrap.o \
-		$(LIBRARY_swig_tdb_LINK_LIST) $(LIBRARY_swig_tdb_LINK_FLAGS)
+scripting/swig/_tdb.so: scripting/swig/tdb_wrap.o bin/subsystems/LIBRARY_LIBTDB.o
+	$(SHLD) $(SHLD_FLAGS) -o scripting/swig/_tdb.so \
+		scripting/swig/tdb_wrap.o \
+		bin/subsystems/LIBRARY_LIBTDB.o
 
 scripting/swig/ldb_wrap.c: scripting/swig/ldb.i
 	swig -python scripting/swig/ldb.i
diff --git a/source4/scripting/swig/torture/torture_tdb.py b/source4/scripting/swig/torture/torture_tdb.py
new file mode 100755
index 0000000000..4c44096811
--- /dev/null
+++ b/source4/scripting/swig/torture/torture_tdb.py
@@ -0,0 +1,10 @@
+#!/usr/bin/python
+
+import sys, tdb
+from os import *
+
+t = tdb.open('foo.tdb', 0, 0, O_RDWR | O_CREAT, 0600)
+tdb.close(t)
+
+unlink('foo.tdb')
+
-- 
cgit 


From ea5a31293805961027471309d784df5213791952 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Thu, 30 Mar 2006 05:24:37 +0000
Subject: r14801: Move swig testing makefile fragment into swig's config.mk and
 out of main.mk (This used to be commit
 3721072fc531df2ffdc9ae323aa2e4e3d0fc58b7)

---
 source4/scripting/config.mk | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/config.mk b/source4/scripting/config.mk
index bbca5034eb..33c774cc4c 100644
--- a/source4/scripting/config.mk
+++ b/source4/scripting/config.mk
@@ -49,3 +49,8 @@ scripting/swig/_dcerpc.so: scripting/swig/dcerpc_wrap.o $(LIBRARY_swig_dcerpc_DE
 
 swig_clean:
 	-rm -f scripting/swig/_tdb.so scripting/swig/tdb.pyc scripting/swig/tdb.py scripting/swig/tdb_wrap.c scripting/swig/tdb_wrap.o
+
+# Swig testing
+
+swigtest: swig
+	./script/tests/test_swig.sh
-- 
cgit 


From 61ce5cd1c687041563873b679ece3ea2e1b7f1f7 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Thu, 30 Mar 2006 05:50:09 +0000
Subject: r14804: Start writing a more Pythonic tdb module. (This used to be
 commit 4c9af9c1495e0582de8353709d7b79b731a7fc75)

---
 source4/scripting/swig/Tdb.py                 | 45 +++++++++++++++++++++++++++
 source4/scripting/swig/torture/torture_tdb.py | 10 ++----
 2 files changed, 48 insertions(+), 7 deletions(-)
 create mode 100644 source4/scripting/swig/Tdb.py

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/Tdb.py b/source4/scripting/swig/Tdb.py
new file mode 100644
index 0000000000..65d40fc14b
--- /dev/null
+++ b/source4/scripting/swig/Tdb.py
@@ -0,0 +1,45 @@
+"""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, UserDict
+
+class Tdb:
+
+    def __init__(self, name, hash_size = 0, tdb_flags = tdb.TDB_DEFAULT,
+                 open_flags = os.O_RDWR | os.O_CREAT, mode = 0600):
+
+        self.tdb = tdb.open(name, hash_size, tdb_flags, open_flags, mode)
+
+    def __del__(self):
+        tdb.close(self.tdb)
+
+    def __getitem__(self, key):
+        pass
+
+    def __setitem__(self, key, item):
+        pass
+
+    def __delitem__(self, key):
+        pass
+
+    def keys(self):
+        pass
diff --git a/source4/scripting/swig/torture/torture_tdb.py b/source4/scripting/swig/torture/torture_tdb.py
index 4c44096811..d9ca4dedba 100755
--- a/source4/scripting/swig/torture/torture_tdb.py
+++ b/source4/scripting/swig/torture/torture_tdb.py
@@ -1,10 +1,6 @@
 #!/usr/bin/python
 
-import sys, tdb
-from os import *
-
-t = tdb.open('foo.tdb', 0, 0, O_RDWR | O_CREAT, 0600)
-tdb.close(t)
-
-unlink('foo.tdb')
+import Tdb, os
 
+t = Tdb.Tdb('foo.tdb')
+os.unlink('foo.tdb')
-- 
cgit 


From e29489d9b6c9089d63667541bb8cff4637089d75 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Sun, 2 Apr 2006 01:56:22 +0000
Subject: r14854: Finish off swig wrapper and torture tests for tdb. (This used
 to be commit 1c4042e23f3e99f95133313607e2c2904503cf74)

---
 source4/scripting/swig/Tdb.py                 | 78 ++++++++++++++++++++++---
 source4/scripting/swig/torture/torture_tdb.py | 82 ++++++++++++++++++++++++++-
 2 files changed, 149 insertions(+), 11 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/Tdb.py b/source4/scripting/swig/Tdb.py
index 65d40fc14b..571a18dbeb 100644
--- a/source4/scripting/swig/Tdb.py
+++ b/source4/scripting/swig/Tdb.py
@@ -22,24 +22,86 @@
 
 import tdb, os, UserDict
 
+# 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:
 
-    def __init__(self, name, hash_size = 0, tdb_flags = tdb.TDB_DEFAULT,
-                 open_flags = os.O_RDWR | os.O_CREAT, mode = 0600):
+    # Create and destroy Tdb objects
 
-        self.tdb = tdb.open(name, hash_size, tdb_flags, open_flags, mode)
+    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)
 
     def __del__(self):
-        tdb.close(self.tdb)
+        if hasattr(self, 'tdb'):
+            tdb.close(self.tdb)
+
+    # Random access to keys, values
 
     def __getitem__(self, key):
-        pass
+        result = tdb.fetch(self.tdb, key)
+        if result is None:
+            raise KeyError, key
+        return result
 
     def __setitem__(self, key, item):
-        pass
+        tdb.store(self.tdb, key, item)
 
     def __delitem__(self, key):
-        pass
+        if not tdb.exists(self.tdb, key):
+            raise KeyError, key
+        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):
-        pass
+        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/torture/torture_tdb.py b/source4/scripting/swig/torture/torture_tdb.py
index d9ca4dedba..59eb5fe1f0 100755
--- a/source4/scripting/swig/torture/torture_tdb.py
+++ b/source4/scripting/swig/torture/torture_tdb.py
@@ -1,6 +1,82 @@
 #!/usr/bin/python
 
-import Tdb, os
+import sys, os
+import Tdb
 
-t = Tdb.Tdb('foo.tdb')
-os.unlink('foo.tdb')
+def fail(msg):
+    print 'FAILED:', msg
+    sys.exit(1)
+
+tdb_file = '/tmp/torture_tdb.tdb'
+
+# Create temporary tdb file
+
+t = Tdb.Tdb(tdb_file, flags = Tdb.CLEAR_IF_FIRST)
+
+# Check non-existent key throws KeyError exception
+
+try:
+    t['__none__']
+except KeyError:
+    pass
+else:
+    fail('non-existent key did not throw KeyError')
+
+# Check storing key
+
+t['bar'] = '1234'
+if t['bar'] != '1234':
+    fail('store key failed')
+
+# Check key exists
+
+if not t.has_key('bar'):
+    fail('has_key() failed for existing key')
+
+if t.has_key('__none__'):
+    fail('has_key() succeeded for non-existent key')
+
+# Delete key
+
+try:
+    del(t['__none__'])
+except KeyError:
+    pass
+else:
+    fail('delete of non-existent key did not throw KeyError')
+
+del t['bar']
+if t.has_key('bar'):
+    fail('delete of existing key did not delete key')
+
+# Clear all keys
+
+t.clear()
+if len(t) != 0:
+    fail('clear failed to remove all keys')
+
+# Other dict functions
+
+t['a'] = '1'
+t['ab'] = '12'
+t['abc'] = '123'
+
+if len(t) != 3:
+    fail('len method produced wrong value')
+
+keys = t.keys()
+values = t.values()
+items = t.items()
+
+if set(keys) != set(['a', 'ab', 'abc']):
+    fail('keys method produced wrong values')
+
+if set(values) != set(['1', '12', '123']):
+    fail('values method produced wrong values')
+
+if set(items) != set([('a', '1'), ('ab', '12'), ('abc', '123')]):
+    fail('values method produced wrong values')
+
+# Clean up
+
+os.unlink(tdb_file)
-- 
cgit 


From 1af925f394b1084779f5b1b5a10c2ec512d7e5be Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Sun, 2 Apr 2006 12:02:01 +0000
Subject: r14860: create libcli/security/security.h

metze
(This used to be commit 9ec706238c173992dc938d537bdf1103bf519dbf)
---
 source4/scripting/ejs/ejsrpc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/ejsrpc.c b/source4/scripting/ejs/ejsrpc.c
index 36d67790cd..f3ec36c550 100644
--- a/source4/scripting/ejs/ejsrpc.c
+++ b/source4/scripting/ejs/ejsrpc.c
@@ -27,7 +27,7 @@
 #include "librpc/gen_ndr/lsa.h"
 #include "librpc/gen_ndr/winreg.h"
 #include "scripting/ejs/ejsrpc.h"
-#include "libcli/security/proto.h"
+#include "libcli/security/security.h"
 
 /*
   set the switch var to be used by the next union switch
-- 
cgit 


From f586b11f73809ee9cadaa5c781bbc41c21c81d47 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Mon, 3 Apr 2006 00:13:47 +0000
Subject: r14870: Update to link with dynamic instead of static objects. (This
 used to be commit 20d68c60b7b7dce1f4f82cb6d3af9431a0660854)

---
 source4/scripting/config.mk | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/config.mk b/source4/scripting/config.mk
index 33c774cc4c..70296cbc7c 100644
--- a/source4/scripting/config.mk
+++ b/source4/scripting/config.mk
@@ -27,17 +27,20 @@ swig: scripting/swig/_tdb.so scripting/swig/_ldb.so
 scripting/swig/tdb_wrap.c: scripting/swig/tdb.i
 	swig -python scripting/swig/tdb.i
 
-scripting/swig/_tdb.so: scripting/swig/tdb_wrap.o bin/subsystems/LIBRARY_LIBTDB.o
-	$(SHLD) $(SHLD_FLAGS) -o scripting/swig/_tdb.so \
-		scripting/swig/tdb_wrap.o \
-		bin/subsystems/LIBRARY_LIBTDB.o
+scripting/swig/_tdb.so: scripting/swig/tdb_wrap.o
+	$(SHLD) $(SHLD_FLAGS) -o scripting/swig/_tdb.so $(LOCAL_LINK_FLAGS) \
+		bin/libtdb.$(SHLIBEXT).0.0.1 \
+		scripting/swig/tdb_wrap.o
 
 scripting/swig/ldb_wrap.c: scripting/swig/ldb.i
 	swig -python scripting/swig/ldb.i
 
-scripting/swig/_ldb.so: scripting/swig/ldb_wrap.o $(LIBRARY_swig_ldb_DEPEND_LIST)
-	$(SHLD) $(SHLD_FLAGS) -o scripting/swig/_ldb.so scripting/swig/ldb_wrap.o \
-		$(LIBRARY_swig_ldb_LINK_LIST) $(LIBRARY_swig_ldb_LINK_FLAGS)
+scripting/swig/_ldb.so: scripting/swig/ldb_wrap.o $(LIBRARY_DYNCONFIG_OBJ_LIST)
+	$(SHLD) $(SHLD_FLAGS) -o scripting/swig/_ldb.so $(LOCAL_LINK_FLAGS) \
+		$(LIBRARY_DYNCONFIG_LINK_LIST) \
+		bin/libtdb.$(SHLIBEXT).0.0.1 \
+		bin/libldb.$(SHLIBEXT).0.0.1 \
+		scripting/swig/ldb_wrap.o
 
 SWIG_INCLUDES = librpc/gen_ndr/samr.i librpc/gen_ndr/lsa.i librpc/gen_ndr/spoolss.i
 
-- 
cgit 


From 0235d37b32f23b7a478c67376ed396381db94a21 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Mon, 3 Apr 2006 00:20:04 +0000
Subject: r14871: We don't need to import UserDict anymore. (This used to be
 commit c60a2335383eb277a82dbe073ce9b58f8abf0241)

---
 source4/scripting/swig/Tdb.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/Tdb.py b/source4/scripting/swig/Tdb.py
index 571a18dbeb..0de43688b3 100644
--- a/source4/scripting/swig/Tdb.py
+++ b/source4/scripting/swig/Tdb.py
@@ -20,7 +20,7 @@
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #
 
-import tdb, os, UserDict
+import tdb, os
 
 # Open flags
 
-- 
cgit 


From e9cf4f309899d9ec5413e16d1b6ec5748dcf12b4 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Mon, 3 Apr 2006 00:24:59 +0000
Subject: r14873: Add skeleton swig ldb interface. (This used to be commit
 c6c759e19f7fb9232d9c97b66d140c1bb0876dff)

---
 source4/scripting/swig/Ldb.py                 | 26 ++++++++++++++++++++++++++
 source4/scripting/swig/torture/torture_ldb.py |  8 ++++++++
 2 files changed, 34 insertions(+)
 create mode 100644 source4/scripting/swig/Ldb.py
 create mode 100755 source4/scripting/swig/torture/torture_ldb.py

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/Ldb.py b/source4/scripting/swig/Ldb.py
new file mode 100644
index 0000000000..fe105bdb09
--- /dev/null
+++ b/source4/scripting/swig/Ldb.py
@@ -0,0 +1,26 @@
+"""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 Ldb:
+    pass
diff --git a/source4/scripting/swig/torture/torture_ldb.py b/source4/scripting/swig/torture/torture_ldb.py
new file mode 100755
index 0000000000..76ff43bbea
--- /dev/null
+++ b/source4/scripting/swig/torture/torture_ldb.py
@@ -0,0 +1,8 @@
+#!/usr/bin/python
+
+import Ldb
+
+def fail(msg):
+    print 'FAILED:', msg
+    sys.exit(1)
+
-- 
cgit 


From 733b5af73f95d2344dd0f407a5b2435b5b765cd3 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 3 Apr 2006 00:51:28 +0000
Subject: r14875: Make better use of the build system (This used to be commit
 12429bb66f0f038f1a02932c012c9e9caae6d38c)

---
 source4/scripting/config.mk | 41 +++++++++++++++--------------------------
 1 file changed, 15 insertions(+), 26 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/config.mk b/source4/scripting/config.mk
index 70296cbc7c..b5d848ce2b 100644
--- a/source4/scripting/config.mk
+++ b/source4/scripting/config.mk
@@ -3,55 +3,44 @@ include ejs/config.mk
 #######################
 # Start LIBRARY swig_tdb
 [LIBRARY::swig_tdb]
-REQUIRED_SUBSYSTEMS = LIBTDB
+LIBRARY_REALNAME = swig/_tdb.$(SHLIBEXT)
+OBJ_FILES = swig/tdb_wrap.o
+REQUIRED_SUBSYSTEMS = LIBTDB DYNCONFIG
 # End LIBRARY swig_tdb
 #######################
 
 #######################
 # Start LIBRARY swig_ldb
 [LIBRARY::swig_ldb]
-REQUIRED_SUBSYSTEMS = ldb
+REQUIRED_SUBSYSTEMS = ldb DYNCONFIG
+LIBRARY_REALNAME = swig/_ldb.$(SHLIBEXT)
+OBJ_FILES = swig/ldb_wrap.o
 # End LIBRARY swig_ldb
 #######################
 
 #######################
 # Start LIBRARY swig_dcerpc
 [LIBRARY::swig_dcerpc]
-REQUIRED_SUBSYSTEMS = LIBCLI NDR_MISC LIBSAMBA-UTIL LIBSAMBA-CONFIG RPC_NDR_SAMR RPC_NDR_LSA
+LIBRARY_REALNAME = swig/_dcerpc.$(SHLIBEXT)
+REQUIRED_SUBSYSTEMS = LIBCLI NDR_MISC LIBSAMBA-UTIL LIBSAMBA-CONFIG RPC_NDR_SAMR RPC_NDR_LSA DYNCONFIG
+OBJ_FILES = swig/dcerpc_wrap.o
 # End LIBRARY swig_dcerpc
 #######################
 
 # Swig extensions
-swig: scripting/swig/_tdb.so scripting/swig/_ldb.so
+swig: scripting/swig/_tdb.$(SHLIBEXT) scripting/swig/_ldb.$(SHLIBEXT)
 
-scripting/swig/tdb_wrap.c: scripting/swig/tdb.i
-	swig -python scripting/swig/tdb.i
+.SUFFIXES: _wrap.c .i
 
-scripting/swig/_tdb.so: scripting/swig/tdb_wrap.o
-	$(SHLD) $(SHLD_FLAGS) -o scripting/swig/_tdb.so $(LOCAL_LINK_FLAGS) \
-		bin/libtdb.$(SHLIBEXT).0.0.1 \
-		scripting/swig/tdb_wrap.o
-
-scripting/swig/ldb_wrap.c: scripting/swig/ldb.i
-	swig -python scripting/swig/ldb.i
-
-scripting/swig/_ldb.so: scripting/swig/ldb_wrap.o $(LIBRARY_DYNCONFIG_OBJ_LIST)
-	$(SHLD) $(SHLD_FLAGS) -o scripting/swig/_ldb.so $(LOCAL_LINK_FLAGS) \
-		$(LIBRARY_DYNCONFIG_LINK_LIST) \
-		bin/libtdb.$(SHLIBEXT).0.0.1 \
-		bin/libldb.$(SHLIBEXT).0.0.1 \
-		scripting/swig/ldb_wrap.o
+.i_wrap.c:
+	swig -python $<
 
 SWIG_INCLUDES = librpc/gen_ndr/samr.i librpc/gen_ndr/lsa.i librpc/gen_ndr/spoolss.i
 
 scripting/swig/dcerpc_wrap.c: scripting/swig/dcerpc.i scripting/swig/samba.i scripting/swig/status_codes.i $(SWIG_INCLUDES)
-	swig -python scripting/swig/dcerpc.i
-
-scripting/swig/_dcerpc.so: scripting/swig/dcerpc_wrap.o $(LIBRARY_swig_dcerpc_DEPEND_LIST)
-	$(SHLD) $(SHLD_FLAGS) -o scripting/swig/_dcerpc.so scripting/swig/dcerpc_wrap.o $(LIBRARY_swig_dcerpc_LINK_LIST) $(LIBRARY_swig_dcerpc_LINK_FLAGS)
 
-swig_clean:
-	-rm -f scripting/swig/_tdb.so scripting/swig/tdb.pyc scripting/swig/tdb.py scripting/swig/tdb_wrap.c scripting/swig/tdb_wrap.o
+clean::
+	-rm -f scripting/swig/tdb.pyc scripting/swig/tdb.py
 
 # Swig testing
 
-- 
cgit 


From 574c9fd6854b743b8727af5f53cc184552446e4d Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Mon, 3 Apr 2006 08:03:44 +0000
Subject: r14878: Write swig wrappers for ldb_init() and ldb_connect().

Start wrapper for ldb_search().  Currently it returns a list of swig
ldb_message objects.  More unpacking of results required.
(This used to be commit 704787978aa705edba233249e8eab236ffe303a4)
---
 source4/scripting/swig/Ldb.py                 | 15 +++++-
 source4/scripting/swig/ldb.i                  | 70 +++++++++++++++++++++++----
 source4/scripting/swig/torture/torture_ldb.py |  6 +++
 3 files changed, 80 insertions(+), 11 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/Ldb.py b/source4/scripting/swig/Ldb.py
index fe105bdb09..705a790fef 100644
--- a/source4/scripting/swig/Ldb.py
+++ b/source4/scripting/swig/Ldb.py
@@ -23,4 +23,17 @@
 import ldb
 
 class Ldb:
-    pass
+
+    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):
+        return ldb.search(self.ldb_ctx, None, ldb.LDB_SCOPE_DEFAULT,
+                          expression, None);
diff --git a/source4/scripting/swig/ldb.i b/source4/scripting/swig/ldb.i
index 5f11b6d2ec..f7c3b5d709 100644
--- a/source4/scripting/swig/ldb.i
+++ b/source4/scripting/swig/ldb.i
@@ -54,10 +54,11 @@ typedef unsigned long long uint64_t;
 typedef long long int64_t;
 
 #include "lib/ldb/include/ldb.h"
+#include "lib/talloc/talloc.h"
 
 %}
 
-/* The ldb functions will crash if a NULL tdb is passed */
+/* The ldb functions will crash if a NULL ldb is passed */
 
 %include exception.i
 
@@ -67,22 +68,71 @@ typedef long long int64_t;
 			"ldb context must be non-NULL");
 }
 
-/* Throw an IOError exception if tdb_open() or tdb_open_ex() returns NULL */
+/* Use talloc_init() to create a parameter to pass to ldb_init().  Don't
+   forget to free it using talloc_free() afterwards. */
 
-%exception {
-	$action
-	if (result == NULL) {
-		PyErr_SetFromErrno(PyExc_IOError);
-		SWIG_fail;
+TALLOC_CTX *talloc_init(char *name);
+int talloc_free(TALLOC_CTX *ptr);
+
+/* In and out typemaps for struct ldb_val.  This is converted to and from
+   the Python string datatype. */
+
+%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};
+
+/* Typemap for passing a struct ldb_result by reference */
+
+%typemap(in, numinputs=0) struct ldb_result **OUT (struct ldb_result *temp_ldb_result) {
+	$1 = &temp_ldb_result;
+}
+
+%typemap(argout) struct ldb_result ** {
+	unsigned int i;
+
+	/* XXX: Handle resultobj by throwing an exception if required */
+
+	resultobj = PyList_New((*$1)->count);
+
+	for (i = 0; i < (*$1)->count; i++) {
+		PyList_SetItem(resultobj, i, SWIG_NewPointerObj(*$1, SWIGTYPE_p_ldb_message, 0));
+	}
+}	
+
+%types(struct ldb_result *);
+
+struct ldb_message {
+	struct ldb_dn *dn;
+	unsigned int num_elements;
+	struct ldb_message_element *elements;
+	void *private_data; /* private to the backend */
+};
+
+/* Wrap ldb functions */
 
 %rename ldb_init init;
-struct ldb_context *ldb_init(void *mem_ctx);
+struct ldb_context *ldb_init(TALLOC_CTX *mem_ctx);
 
 %rename ldb_connect connect;
 int ldb_connect(struct ldb_context *ldb, const char *url, unsigned int flags, const char *options[]);
 
-%rename ldb_request request;
-int ldb_request(struct ldb_context *ldb, struct ldb_request *request);
+%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);
diff --git a/source4/scripting/swig/torture/torture_ldb.py b/source4/scripting/swig/torture/torture_ldb.py
index 76ff43bbea..c9a3ded6da 100755
--- a/source4/scripting/swig/torture/torture_ldb.py
+++ b/source4/scripting/swig/torture/torture_ldb.py
@@ -6,3 +6,9 @@ def fail(msg):
     print 'FAILED:', msg
     sys.exit(1)
 
+l = Ldb.Ldb()
+
+l.connect('tdb:///tmp/foo.ldb')
+result = l.search('(dn=*)')
+
+print result
-- 
cgit 


From aae53f673fa177f5a7517e56d1f95d153f39cf40 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Mon, 3 Apr 2006 08:25:03 +0000
Subject: r14879: Fix bug unpacking ldb_messages.

Start decoding more of ldb_message and ldb_message_result.
(This used to be commit 60f7f14baa7ff212138ac2349b94d56918566f73)
---
 source4/scripting/swig/ldb.i | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/ldb.i b/source4/scripting/swig/ldb.i
index f7c3b5d709..12053d6ac9 100644
--- a/source4/scripting/swig/ldb.i
+++ b/source4/scripting/swig/ldb.i
@@ -113,12 +113,23 @@ enum ldb_scope {LDB_SCOPE_DEFAULT=-1,
 	resultobj = PyList_New((*$1)->count);
 
 	for (i = 0; i < (*$1)->count; i++) {
-		PyList_SetItem(resultobj, i, SWIG_NewPointerObj(*$1, SWIGTYPE_p_ldb_message, 0));
+		PyList_SetItem(resultobj, i, SWIG_NewPointerObj((*$1)->msgs[i], SWIGTYPE_p_ldb_message, 0));
 	}
 }	
 
 %types(struct ldb_result *);
 
+%typemap(out) struct ldb_dn * {
+	$result = PyString_FromString(ldb_dn_linearize($1, $1));
+}
+
+struct ldb_message_element {
+	unsigned int flags;
+	const char *name;
+	unsigned int num_values;
+	struct ldb_val *values;
+};
+
 struct ldb_message {
 	struct ldb_dn *dn;
 	unsigned int num_elements;
-- 
cgit 


From fab7e6605f4e14921b331a8883bf0753ced4b965 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Mon, 3 Apr 2006 09:18:34 +0000
Subject: r14880: Doc. (This used to be commit
 73b233ee1b7e25ec74c1764804690c6faab75fd0)

---
 source4/scripting/swig/tdb.i | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/tdb.i b/source4/scripting/swig/tdb.i
index 6c6c4af8cd..8f473c61e6 100644
--- a/source4/scripting/swig/tdb.i
+++ b/source4/scripting/swig/tdb.i
@@ -51,7 +51,7 @@
 
 %}
 
-/* The tdb functions will crash if a NULL tdb is passed */
+/* The tdb functions will crash if a NULL tdb context is passed */
 
 %include exception.i
 
-- 
cgit 


From dd8b8dc98ae2450647f3279e744f09d0a5128945 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Mon, 3 Apr 2006 09:26:38 +0000
Subject: r14881: Unpack ldb_message_element and ldb_val arrays.  Python can
 now access all parts of a ldb_result:

@BASEINFO has 2 elements
        elt[0]: val[0]: sequenceNumber = 2
        elt[1]: val[0]: distinguishedName = @BASEINFO
name=foo has 2 elements
        elt[0]: val[0]: foo = bar
        elt[1]: val[0]: distinguishedName = name=foo

Cleanup some swig junk that was only necessary when including config.h
and function prototypes that used the PRINTF_ATTRIBUTE() macro.

Add some more comments.
(This used to be commit 9327fd07d67da1845a60ccf2b7d1d43e9aed0d68)
---
 source4/scripting/swig/ldb.i | 67 +++++++++++++++++++++++++++-----------------
 1 file changed, 41 insertions(+), 26 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/ldb.i b/source4/scripting/swig/ldb.i
index 12053d6ac9..386c414450 100644
--- a/source4/scripting/swig/ldb.i
+++ b/source4/scripting/swig/ldb.i
@@ -3,7 +3,7 @@
 
    Swig interface to ldb.
 
-   Copyright (C) 2005 Tim Potter <tpot@samba.org>
+   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
@@ -29,38 +29,28 @@
 
 %{
 
-/* This symbol is used in both includes.h and Python.h which causes an
-   annoying compiler warning. */
+/* Some typedefs to help swig along */
 
-#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 ldb headers */
-
-/* Treat a uint8_t as an unsigned character */
 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"
 
 %}
 
-/* The ldb functions will crash if a NULL ldb is passed */
+%include "carrays.i"
+%include "exception.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)
@@ -68,14 +58,19 @@ typedef long long int64_t;
 			"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);
 
-/* In and out typemaps for struct ldb_val.  This is converted to and from
-   the Python string datatype. */
+/*
+ * Wrap struct ldb_val
+ */
 
 %typemap(in) struct ldb_val {
 	if (!PyString_Check($input)) {
@@ -99,7 +94,9 @@ enum ldb_scope {LDB_SCOPE_DEFAULT=-1,
 		LDB_SCOPE_ONELEVEL=1,
 		LDB_SCOPE_SUBTREE=2};
 
-/* Typemap for passing a struct ldb_result by reference */
+/*
+ * Wrap struct ldb_result
+ */
 
 %typemap(in, numinputs=0) struct ldb_result **OUT (struct ldb_result *temp_ldb_result) {
 	$1 = &temp_ldb_result;
@@ -119,10 +116,20 @@ enum ldb_scope {LDB_SCOPE_DEFAULT=-1,
 
 %types(struct ldb_result *);
 
+/*
+ * Wrap struct ldb_dn
+ */
+
 %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;
@@ -130,6 +137,12 @@ struct ldb_message_element {
 	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;
@@ -137,7 +150,9 @@ struct ldb_message {
 	void *private_data; /* private to the backend */
 };
 
-/* Wrap ldb functions */
+/*
+ * Wrap ldb functions 
+ */
 
 %rename ldb_init init;
 struct ldb_context *ldb_init(TALLOC_CTX *mem_ctx);
-- 
cgit 


From 6705f888d5a8a540e341ad782fa84036c400b753 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Mon, 3 Apr 2006 22:04:33 +0000
Subject: r14897: Do more error checking of tdb function returns and raise
 IOError or KeyError exceptions as appropriate.

Add a close() function to the wrapper as we can't rely on the
Python garbage collector destroying the object and closing the tdb file
at any particular time.
(This used to be commit a40d6c792257315d1eac955718db5ec1df7e07bb)
---
 source4/scripting/swig/Tdb.py | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/Tdb.py b/source4/scripting/swig/Tdb.py
index 0de43688b3..ef0165ed8b 100644
--- a/source4/scripting/swig/Tdb.py
+++ b/source4/scripting/swig/Tdb.py
@@ -39,25 +39,33 @@ class Tdb:
     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):
-        if hasattr(self, 'tdb'):
-            tdb.close(self.tdb)
+        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, key
+            raise KeyError, '%s: %s' % (key, tdb.errorstr(self.tdb))
         return result
 
     def __setitem__(self, key, item):
-        tdb.store(self.tdb, 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, key
+            raise KeyError, '%s: %s' % (key, tdb.errorstr(self.tdb))
         tdb.delete(self.tdb, key)
 
     def has_key(self, key):
-- 
cgit 


From b93e9b50ab6ef145d9bb1841b71625cf03a56a15 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Tue, 4 Apr 2006 01:22:38 +0000
Subject: r14901: More work on ldb swig interface.  Wrap some more functions.
 (This used to be commit 5b722fcd4b1e194532a86bed84d11d778ae16fcc)

---
 source4/scripting/swig/Ldb.py | 61 +++++++++++++++++++++++++++++++++++++++++--
 source4/scripting/swig/ldb.i  | 45 ++++++++++++++++++++++++++-----
 2 files changed, 97 insertions(+), 9 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/Ldb.py b/source4/scripting/swig/Ldb.py
index 705a790fef..995f421beb 100644
--- a/source4/scripting/swig/Ldb.py
+++ b/source4/scripting/swig/Ldb.py
@@ -22,7 +22,49 @@
 
 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):
+        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')
@@ -35,5 +77,20 @@ class Ldb:
         ldb.connect(self.ldb_ctx, url, flags, None)
 
     def search(self, expression):
-        return ldb.search(self.ldb_ctx, None, ldb.LDB_SCOPE_DEFAULT,
-                          expression, None);
+
+        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/ldb.i b/source4/scripting/swig/ldb.i
index 386c414450..6930ea4c9b 100644
--- a/source4/scripting/swig/ldb.i
+++ b/source4/scripting/swig/ldb.i
@@ -103,15 +103,10 @@ enum ldb_scope {LDB_SCOPE_DEFAULT=-1,
 }
 
 %typemap(argout) struct ldb_result ** {
-	unsigned int i;
 
-	/* XXX: Handle resultobj by throwing an exception if required */
+	/* XXX: Check result for error and throw exception if necessary */
 
-	resultobj = PyList_New((*$1)->count);
-
-	for (i = 0; i < (*$1)->count; i++) {
-		PyList_SetItem(resultobj, i, SWIG_NewPointerObj((*$1)->msgs[i], SWIGTYPE_p_ldb_message, 0));
-	}
+	resultobj = SWIG_NewPointerObj(*$1, SWIGTYPE_p_ldb_result, 0);
 }	
 
 %types(struct ldb_result *);
@@ -120,6 +115,17 @@ enum ldb_scope {LDB_SCOPE_DEFAULT=-1,
  * 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));
 }
@@ -150,6 +156,19 @@ struct ldb_message {
 	void *private_data; /* private to the backend */
 };
 
+/*
+ * 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 
  */
@@ -157,8 +176,20 @@ struct ldb_message {
 %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);
-- 
cgit 


From 6ad6506cb1483aad69c2273b539f876a8e948455 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 4 Apr 2006 14:39:00 +0000
Subject: r14906: Move SWIG-specific files to scripting/swig/ (This used to be
 commit 222723e4434b85748aa82f192c5c4ce136933ce3)

---
 source4/scripting/config.m4      | 27 ----------------------
 source4/scripting/config.mk      | 48 ----------------------------------------
 source4/scripting/swig/config.m4 | 27 ++++++++++++++++++++++
 source4/scripting/swig/config.mk | 46 ++++++++++++++++++++++++++++++++++++++
 4 files changed, 73 insertions(+), 75 deletions(-)
 delete mode 100644 source4/scripting/config.m4
 delete mode 100644 source4/scripting/config.mk
 create mode 100644 source4/scripting/swig/config.m4
 create mode 100644 source4/scripting/swig/config.mk

(limited to 'source4/scripting')

diff --git a/source4/scripting/config.m4 b/source4/scripting/config.m4
deleted file mode 100644
index 02a563e167..0000000000
--- a/source4/scripting/config.m4
+++ /dev/null
@@ -1,27 +0,0 @@
-dnl # Scripting subsystem
-
-# Check for python support
-
-PYTHON=
- 
-AC_ARG_WITH(python,
-[  --with-python=PYTHONNAME  build Python libraries],
-[ case "${withval-python}" in
-  yes)
-        PYTHON=python
-        ;;
-  no)
-        PYTHON=
-        ;;
-  *)
-        PYTHON=${withval-python}
-        ;;
-  esac ])
-
-if test x"$PYTHON" != "x"; then
-	incdir=`python -c 'import sys; print "%s/include/python%d.%d" % (sys.prefix, sys.version_info[[0]], sys.version_info[[1]])'`
-	CPPFLAGS="$CPPFLAGS -I $incdir"
-fi
-
-AC_SUBST(PYTHON)
-
diff --git a/source4/scripting/config.mk b/source4/scripting/config.mk
deleted file mode 100644
index b5d848ce2b..0000000000
--- a/source4/scripting/config.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-include ejs/config.mk
-
-#######################
-# Start LIBRARY swig_tdb
-[LIBRARY::swig_tdb]
-LIBRARY_REALNAME = swig/_tdb.$(SHLIBEXT)
-OBJ_FILES = swig/tdb_wrap.o
-REQUIRED_SUBSYSTEMS = LIBTDB DYNCONFIG
-# End LIBRARY swig_tdb
-#######################
-
-#######################
-# Start LIBRARY swig_ldb
-[LIBRARY::swig_ldb]
-REQUIRED_SUBSYSTEMS = ldb DYNCONFIG
-LIBRARY_REALNAME = swig/_ldb.$(SHLIBEXT)
-OBJ_FILES = swig/ldb_wrap.o
-# End LIBRARY swig_ldb
-#######################
-
-#######################
-# Start LIBRARY swig_dcerpc
-[LIBRARY::swig_dcerpc]
-LIBRARY_REALNAME = swig/_dcerpc.$(SHLIBEXT)
-REQUIRED_SUBSYSTEMS = LIBCLI NDR_MISC LIBSAMBA-UTIL LIBSAMBA-CONFIG RPC_NDR_SAMR RPC_NDR_LSA DYNCONFIG
-OBJ_FILES = swig/dcerpc_wrap.o
-# End LIBRARY swig_dcerpc
-#######################
-
-# Swig extensions
-swig: scripting/swig/_tdb.$(SHLIBEXT) scripting/swig/_ldb.$(SHLIBEXT)
-
-.SUFFIXES: _wrap.c .i
-
-.i_wrap.c:
-	swig -python $<
-
-SWIG_INCLUDES = librpc/gen_ndr/samr.i librpc/gen_ndr/lsa.i librpc/gen_ndr/spoolss.i
-
-scripting/swig/dcerpc_wrap.c: scripting/swig/dcerpc.i scripting/swig/samba.i scripting/swig/status_codes.i $(SWIG_INCLUDES)
-
-clean::
-	-rm -f scripting/swig/tdb.pyc scripting/swig/tdb.py
-
-# Swig testing
-
-swigtest: swig
-	./script/tests/test_swig.sh
diff --git a/source4/scripting/swig/config.m4 b/source4/scripting/swig/config.m4
new file mode 100644
index 0000000000..02a563e167
--- /dev/null
+++ b/source4/scripting/swig/config.m4
@@ -0,0 +1,27 @@
+dnl # Scripting subsystem
+
+# Check for python support
+
+PYTHON=
+ 
+AC_ARG_WITH(python,
+[  --with-python=PYTHONNAME  build Python libraries],
+[ case "${withval-python}" in
+  yes)
+        PYTHON=python
+        ;;
+  no)
+        PYTHON=
+        ;;
+  *)
+        PYTHON=${withval-python}
+        ;;
+  esac ])
+
+if test x"$PYTHON" != "x"; then
+	incdir=`python -c 'import sys; print "%s/include/python%d.%d" % (sys.prefix, sys.version_info[[0]], sys.version_info[[1]])'`
+	CPPFLAGS="$CPPFLAGS -I $incdir"
+fi
+
+AC_SUBST(PYTHON)
+
diff --git a/source4/scripting/swig/config.mk b/source4/scripting/swig/config.mk
new file mode 100644
index 0000000000..e0a265b679
--- /dev/null
+++ b/source4/scripting/swig/config.mk
@@ -0,0 +1,46 @@
+#######################
+# 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)
+REQUIRED_SUBSYSTEMS = LIBCLI NDR_MISC LIBSAMBA-UTIL LIBSAMBA-CONFIG RPC_NDR_SAMR RPC_NDR_LSA DYNCONFIG
+OBJ_FILES = dcerpc_wrap.o
+# End LIBRARY swig_dcerpc
+#######################
+
+# Swig extensions
+swig: scripting/swig/_tdb.$(SHLIBEXT) scripting/swig/_ldb.$(SHLIBEXT)
+
+.SUFFIXES: _wrap.c .i
+
+.i_wrap.c:
+	swig -python $<
+
+SWIG_INCLUDES = librpc/gen_ndr/samr.i librpc/gen_ndr/lsa.i librpc/gen_ndr/spoolss.i
+
+scripting/swig/dcerpc_wrap.c: scripting/swig/dcerpc.i scripting/swig/samba.i scripting/swig/status_codes.i $(SWIG_INCLUDES)
+
+clean::
+	-rm -f scripting/swig/tdb.pyc scripting/swig/tdb.py
+
+# Swig testing
+
+swigtest: swig
+	./script/tests/test_swig.sh
-- 
cgit 


From 9956009a41f2489abefa0a7a21553fb0b78e1fed Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Tue, 4 Apr 2006 22:15:27 +0000
Subject: r14915: Work in progress - getting ldb_add() working. (This used to
 be commit d50661ed4ef3f6c96811649a1acbe5d702e80654)

---
 source4/scripting/swig/Ldb.py | 22 ++++++++++++++--------
 source4/scripting/swig/ldb.i  | 24 ++++++++++++++++++++++++
 2 files changed, 38 insertions(+), 8 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/Ldb.py b/source4/scripting/swig/Ldb.py
index 995f421beb..f761aec398 100644
--- a/source4/scripting/swig/Ldb.py
+++ b/source4/scripting/swig/Ldb.py
@@ -44,14 +44,20 @@ class LdbElement:
 class LdbMessage:
     """A class representing a ldb message as a dict of ldb elements."""
     
-    def __init__(self, msg):
-        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 __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__,
diff --git a/source4/scripting/swig/ldb.i b/source4/scripting/swig/ldb.i
index 6930ea4c9b..31c1ffe3e4 100644
--- a/source4/scripting/swig/ldb.i
+++ b/source4/scripting/swig/ldb.i
@@ -156,6 +156,30 @@ struct ldb_message {
 	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
  */
-- 
cgit 


From 8c23f133c4a1cd58a83c837bcd8f77b739e87ff2 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Sat, 8 Apr 2006 00:40:52 +0000
Subject: r14968: Move tdb and ldb swig wrappers in to lib/tdb and lib/ldb
 directories. (This used to be commit
 fa8d0dc14a1af9567401d54a803b34a6498b7cd4)

---
 source4/scripting/swig/Ldb.py    | 102 ------------------
 source4/scripting/swig/Tdb.py    | 115 --------------------
 source4/scripting/swig/config.mk |  20 +---
 source4/scripting/swig/ldb.i     | 219 ---------------------------------------
 source4/scripting/swig/tdb.i     | 190 ---------------------------------
 5 files changed, 1 insertion(+), 645 deletions(-)
 delete mode 100644 source4/scripting/swig/Ldb.py
 delete mode 100644 source4/scripting/swig/Tdb.py
 delete mode 100644 source4/scripting/swig/ldb.i
 delete mode 100644 source4/scripting/swig/tdb.i

(limited to 'source4/scripting')

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,21 +1,3 @@
-#######################
-# 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]
@@ -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);
-- 
cgit 


From 683ca3c9ade394d782673dba80b56c84fd70b7d9 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Thu, 13 Apr 2006 12:17:12 +0000
Subject: r15077: map SID_BUILTIN_USERS

metze
(This used to be commit e896c32614fd4fd80a124ccfe49332e319f717f9)
---
 source4/scripting/libjs/provision.js | 1 +
 1 file changed, 1 insertion(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index b01fec82c7..73e3b6f4e4 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -308,6 +308,7 @@ function setup_name_mappings(info, subobj, session_info, credentials)
 	setup_name_mapping(info, ldb, "S-1-5-18", subobj.ROOT);
 	setup_name_mapping(info, ldb, "S-1-5-11", subobj.USERS);
 	setup_name_mapping(info, ldb, "S-1-5-32-544", subobj.WHEEL);
+	setup_name_mapping(info, ldb, "S-1-5-32-545", subobj.USERS);
 	setup_name_mapping(info, ldb, "S-1-5-32-546", subobj.NOGROUP);
 	setup_name_mapping(info, ldb, "S-1-5-32-551", subobj.BACKUP);
 
-- 
cgit 


From 9d9e5abdcee6581ff42d7bdcf7b236472cbec347 Mon Sep 17 00:00:00 2001
From: James Peach <jpeach@samba.org>
Date: Mon, 24 Apr 2006 00:38:53 +0000
Subject: r15187: Introduce new param type P_BYTES. This lets config options
 which specify byte counts be given in convenient units. (This used to be
 commit 1b8891a2f389c1016c3cfcbe635ed86d015554d8)

---
 source4/scripting/ejs/smbcalls_config.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_config.c b/source4/scripting/ejs/smbcalls_config.c
index 949dd0321a..fae497e2a5 100644
--- a/source4/scripting/ejs/smbcalls_config.c
+++ b/source4/scripting/ejs/smbcalls_config.c
@@ -126,7 +126,7 @@ static int ejs_lpGet(MprVarHandle eid, int argc, char **argv)
 		/* its a global parameter */
 		parm = lp_parm_struct(argv[0]);
 		if (parm == NULL) return -1;
-		parm_ptr = parm->ptr;
+		parm_ptr = lp_parm_ptr(-1, parm);
 	}
 
 	if (parm == NULL || parm_ptr == NULL) {
@@ -143,6 +143,7 @@ static int ejs_lpGet(MprVarHandle eid, int argc, char **argv)
 		mpr_Return(eid, mprCreateBoolVar(*(BOOL *)parm_ptr));
 		break;
 	case P_INTEGER:
+	case P_BYTES:
 		mpr_Return(eid, mprCreateIntegerVar(*(int *)parm_ptr));
 		break;
 	case P_ENUM:
-- 
cgit 


From 0eddf14b307e905663b95296aa695a10d3fb90f7 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 24 Apr 2006 09:36:09 +0000
Subject: r15191: Avoid uint_t as it's not standard. (This used to be commit
 7af59357b94e3819415b3a9257be0ced745ce130)

---
 source4/scripting/swig/config.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/config.mk b/source4/scripting/swig/config.mk
index 9dba88b299..a869446569 100644
--- a/source4/scripting/swig/config.mk
+++ b/source4/scripting/swig/config.mk
@@ -20,7 +20,8 @@ SWIG_INCLUDES = librpc/gen_ndr/samr.i librpc/gen_ndr/lsa.i librpc/gen_ndr/spools
 scripting/swig/dcerpc_wrap.c: scripting/swig/dcerpc.i scripting/swig/samba.i scripting/swig/status_codes.i $(SWIG_INCLUDES)
 
 clean::
-	-rm -f scripting/swig/tdb.pyc scripting/swig/tdb.py
+	@echo "Removing SWIG output files"
+	@-rm -f scripting/swig/tdb.pyc scripting/swig/tdb.py
 
 # Swig testing
 
-- 
cgit 


From 69b51f702af1ded825d5c17bdb97014cac12e752 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 24 Apr 2006 15:47:59 +0000
Subject: r15207: Introduce PRIVATE_DEPENDENCIES and PUBLIC_DEPENDENCIES as
 replacement for REQUIRED_SUBSYSTEMS. (This used to be commit
 adc8a019b6da256f104abed1b82bfde6998a2ac9)

---
 source4/scripting/ejs/config.mk  | 8 ++++----
 source4/scripting/swig/config.mk | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/config.mk b/source4/scripting/ejs/config.mk
index c38caeabf1..3884b514c6 100644
--- a/source4/scripting/ejs/config.mk
+++ b/source4/scripting/ejs/config.mk
@@ -25,7 +25,7 @@ INIT_FUNCTION = smb_setup_ejs_nbt
 OBJ_FILES = smbcalls_samba3.o
 SUBSYSTEM = smbcalls
 INIT_FUNCTION = smb_setup_ejs_samba3
-REQUIRED_SUBSYSTEMS = LIBSAMBA3 
+PUBLIC_DEPENDENCIES = LIBSAMBA3 
 
 [MODULE::smbcalls_rand]
 OBJ_FILES = smbcalls_rand.o
@@ -46,7 +46,7 @@ INIT_FUNCTION = smb_setup_ejs_datablob
 OBJ_FILES = smbcalls_auth.o
 SUBSYSTEM = smbcalls
 INIT_FUNCTION = smb_setup_ejs_auth
-REQUIRED_SUBSYSTEMS = auth
+PUBLIC_DEPENDENCIES = auth
 
 [MODULE::smbcalls_string]
 OBJ_FILES = smbcalls_string.o
@@ -73,7 +73,7 @@ OBJ_FILES = \
 		smbcalls_param.o \
 		ejsnet.o \
 		mprutil.o
-REQUIRED_SUBSYSTEMS = \
+PUBLIC_DEPENDENCIES = \
 		EJS LIBSAMBA-UTIL \
 		EJSRPC MESSAGING \
 		LIBSAMBA-NET LIBSMB LIBPOPT \
@@ -89,6 +89,6 @@ REQUIRED_SUBSYSTEMS = \
 INSTALLDIR = BINDIR
 OBJ_FILES = \
 		smbscript.o
-REQUIRED_SUBSYSTEMS = EJS LIBSAMBA-UTIL smbcalls LIBSAMBA-CONFIG 
+PRIVATE_DEPENDENCIES = EJS LIBSAMBA-UTIL smbcalls LIBSAMBA-CONFIG 
 # End BINARY SMBSCRIPT
 #######################
diff --git a/source4/scripting/swig/config.mk b/source4/scripting/swig/config.mk
index a869446569..2c1c57b0c1 100644
--- a/source4/scripting/swig/config.mk
+++ b/source4/scripting/swig/config.mk
@@ -2,7 +2,7 @@
 # Start LIBRARY swig_dcerpc
 [LIBRARY::swig_dcerpc]
 LIBRARY_REALNAME = _dcerpc.$(SHLIBEXT)
-REQUIRED_SUBSYSTEMS = LIBCLI NDR_MISC LIBSAMBA-UTIL LIBSAMBA-CONFIG RPC_NDR_SAMR RPC_NDR_LSA DYNCONFIG
+PUBLIC_DEPENDENCIES = LIBCLI NDR_MISC LIBSAMBA-UTIL LIBSAMBA-CONFIG RPC_NDR_SAMR RPC_NDR_LSA DYNCONFIG
 OBJ_FILES = dcerpc_wrap.o
 # End LIBRARY swig_dcerpc
 #######################
-- 
cgit 


From ab8fd44603c6ac140e6d0c29fd6a1a1065f616a3 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Thu, 27 Apr 2006 20:55:26 +0000
Subject: r15300: Only enable SWIG shared libs if python is available (This
 used to be commit d9f1c19f58578f97e7a20a54c474abfe6525849f)

---
 source4/scripting/swig/config.m4 | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/config.m4 b/source4/scripting/swig/config.m4
index 02a563e167..9988399f70 100644
--- a/source4/scripting/swig/config.m4
+++ b/source4/scripting/swig/config.m4
@@ -21,6 +21,8 @@ AC_ARG_WITH(python,
 if test x"$PYTHON" != "x"; then
 	incdir=`python -c 'import sys; print "%s/include/python%d.%d" % (sys.prefix, sys.version_info[[0]], sys.version_info[[1]])'`
 	CPPFLAGS="$CPPFLAGS -I $incdir"
+else
+	SMB_ENABLE(swig_dcerpc, NO)
 fi
 
 AC_SUBST(PYTHON)
-- 
cgit 


From e002300f238dd0937dd9f768e366c006945e8baa Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sat, 29 Apr 2006 17:34:49 +0000
Subject: r15328: Move some functions around, remove dependencies. Remove some
 autogenerated headers (which had prototypes now autogenerated by pidl) Remove
 ndr_security.h from a few places - it's no longer necessary (This used to be
 commit c19c2b51d3e1ad347120b06a22bda5ec586c22e8)

---
 source4/scripting/ejs/ejsrpc.c          | 1 -
 source4/scripting/ejs/smbcalls_samba3.c | 3 ++-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/ejsrpc.c b/source4/scripting/ejs/ejsrpc.c
index f3ec36c550..08a675a117 100644
--- a/source4/scripting/ejs/ejsrpc.c
+++ b/source4/scripting/ejs/ejsrpc.c
@@ -23,7 +23,6 @@
 #include "includes.h"
 #include "lib/appweb/ejs/ejs.h"
 #include "scripting/ejs/smbcalls.h"
-#include "librpc/gen_ndr/ndr_security.h"
 #include "librpc/gen_ndr/lsa.h"
 #include "librpc/gen_ndr/winreg.h"
 #include "scripting/ejs/ejsrpc.h"
diff --git a/source4/scripting/ejs/smbcalls_samba3.c b/source4/scripting/ejs/smbcalls_samba3.c
index 1cf0042741..0bcc670552 100644
--- a/source4/scripting/ejs/smbcalls_samba3.c
+++ b/source4/scripting/ejs/smbcalls_samba3.c
@@ -24,7 +24,8 @@
 #include "scripting/ejs/smbcalls.h"
 #include "lib/appweb/ejs/ejs.h"
 #include "lib/samba3/samba3.h"
-#include "librpc/gen_ndr/ndr_security.h"
+#include "libcli/security/security.h"
+#include "librpc/gen_ndr/ndr_misc.h"
 
 
 static struct MprVar mprRegistry(struct samba3_regdb *reg)
-- 
cgit 


From f7c86b912dd8033837a8411c7b99c9436de079c0 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sat, 29 Apr 2006 23:22:54 +0000
Subject: r15331: Integrate LIBSMB and LIBCLI into new LIBCLI_SMB (This used to
 be commit 4ec89bce8715f35f21fe05bb738dae13fc6c3066)

---
 source4/scripting/ejs/config.mk  | 2 +-
 source4/scripting/swig/config.mk | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/config.mk b/source4/scripting/ejs/config.mk
index 3884b514c6..ca73ce279a 100644
--- a/source4/scripting/ejs/config.mk
+++ b/source4/scripting/ejs/config.mk
@@ -76,7 +76,7 @@ OBJ_FILES = \
 PUBLIC_DEPENDENCIES = \
 		EJS LIBSAMBA-UTIL \
 		EJSRPC MESSAGING \
-		LIBSAMBA-NET LIBSMB LIBPOPT \
+		LIBSAMBA-NET LIBCLI_SMB LIBPOPT \
 		POPT_CREDENTIALS POPT_SAMBA \
 		dcerpc \
 		NDR_TABLE
diff --git a/source4/scripting/swig/config.mk b/source4/scripting/swig/config.mk
index 2c1c57b0c1..282758de52 100644
--- a/source4/scripting/swig/config.mk
+++ b/source4/scripting/swig/config.mk
@@ -2,7 +2,7 @@
 # Start LIBRARY swig_dcerpc
 [LIBRARY::swig_dcerpc]
 LIBRARY_REALNAME = _dcerpc.$(SHLIBEXT)
-PUBLIC_DEPENDENCIES = LIBCLI NDR_MISC LIBSAMBA-UTIL LIBSAMBA-CONFIG RPC_NDR_SAMR RPC_NDR_LSA DYNCONFIG
+PUBLIC_DEPENDENCIES = LIBCLI_SMB NDR_MISC LIBSAMBA-UTIL LIBSAMBA-CONFIG RPC_NDR_SAMR RPC_NDR_LSA DYNCONFIG
 OBJ_FILES = dcerpc_wrap.o
 # End LIBRARY swig_dcerpc
 #######################
-- 
cgit 


From 15a2fc8f36fb0156d58b5ba8d381ece959bcac2c Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Sun, 30 Apr 2006 01:00:57 +0000
Subject: r15345: Add a read-only test to tdb torture tester. (This used to be
 commit 370e5b0f8aca6972888f42b5d4a06f7895cb9858)

---
 source4/scripting/swig/torture/torture_tdb.py | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/torture/torture_tdb.py b/source4/scripting/swig/torture/torture_tdb.py
index 59eb5fe1f0..7f97caf6cb 100755
--- a/source4/scripting/swig/torture/torture_tdb.py
+++ b/source4/scripting/swig/torture/torture_tdb.py
@@ -77,6 +77,14 @@ if set(values) != set(['1', '12', '123']):
 if set(items) != set([('a', '1'), ('ab', '12'), ('abc', '123')]):
     fail('values method produced wrong values')
 
+t.close()
+
+# Re-open read-only
+
+t = Tdb.Tdb(tdb_file, open_flags = os.O_RDONLY)
+t.keys()
+t.close()
+
 # Clean up
 
 os.unlink(tdb_file)
-- 
cgit 


From 5abd8940f9bcfbab1b68018759a2405ec944f831 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Sun, 30 Apr 2006 01:08:52 +0000
Subject: r15348: Start adding a dict interface and tests to LdbMessage class.
 (This used to be commit 7e30e8ba57efe37314ebca02f964420f56b9eb52)

---
 source4/scripting/swig/torture/torture_ldb.py | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/torture/torture_ldb.py b/source4/scripting/swig/torture/torture_ldb.py
index c9a3ded6da..311a2b1d66 100755
--- a/source4/scripting/swig/torture/torture_ldb.py
+++ b/source4/scripting/swig/torture/torture_ldb.py
@@ -1,14 +1,18 @@
 #!/usr/bin/python
 
-import Ldb
+import Ldb, sys
 
-def fail(msg):
-    print 'FAILED:', msg
-    sys.exit(1)
+def test(cond, msg):
+    if not cond:
+        print 'FAILED:', msg
+        sys.exit(1)
 
-l = Ldb.Ldb()
+# Torture LdbMessage
 
-l.connect('tdb:///tmp/foo.ldb')
-result = l.search('(dn=*)')
+m = Ldb.LdbMessage()
+m['animal'] = 'dog'
+m['name'] = 'spotty'
 
-print result
+test(m.keys() == ['animal', 'name'], 'keys() test failed')
+test(m.values() == [['dog'], ['spotty']], 'values() test failed')
+test(m.items() == [('animal', ['dog']), ('name', ['spotty'])], 'items() test failed')
-- 
cgit 


From 684aa5adef7c8f61e626983ef2a79156fcb14f3d Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Tue, 2 May 2006 05:14:00 +0000
Subject: r15389: Add some better torture tests for LdbMessage.

Fix up behaviour of Ldb.__setitem__() function.  It should overwrite the
element data.

Add wrapper for ldb_msg_sanity_check().
(This used to be commit d67e055f86a62d0e61fd20d75b252a6211618f7b)
---
 source4/scripting/swig/torture/torture_ldb.py | 81 ++++++++++++++++++++++++---
 1 file changed, 73 insertions(+), 8 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/torture/torture_ldb.py b/source4/scripting/swig/torture/torture_ldb.py
index 311a2b1d66..fe79f4f843 100755
--- a/source4/scripting/swig/torture/torture_ldb.py
+++ b/source4/scripting/swig/torture/torture_ldb.py
@@ -1,18 +1,83 @@
 #!/usr/bin/python
+#
+# A torture test for the Python Ldb bindings.  Also a short guide on
+# how the API works.
+#
 
-import Ldb, sys
+from Ldb import *
 
-def test(cond, msg):
+# Helpers
+
+def t(cond, msg):
+    """Test a condition."""
     if not cond:
-        print 'FAILED:', msg
-        sys.exit(1)
+        raise RuntimeError('FAILED: %s' % msg)
 
+#
 # Torture LdbMessage
+#
+
+m = LdbMessage()
+
+# Empty message
+
+t(m.keys() == [], 'empty msg')
+t(m.dn == None, 'empty dn')
+
+t(m.sanity_check() == LDB_ERR_INVALID_DN_SYNTAX, 'sanity check')
+
+# Test invalid dn
+
+try:
+    m.dn = 'invalid dn'
+except LdbError, arg:
+    if arg[0] != LDB_ERR_INVALID_DN_SYNTAX:
+        raise
+else:
+    t(False, 'LdbError not raised')
+
+# Test valid dn
+
+m.dn = 'name=spotty'
+t(m.dn == 'name=spotty', 'specified dn')
+
+t(m.sanity_check() == LDB_SUCCESS, 'sanity check')
+
+# Test some single-valued attributes
 
-m = Ldb.LdbMessage()
 m['animal'] = 'dog'
 m['name'] = 'spotty'
 
-test(m.keys() == ['animal', 'name'], 'keys() test failed')
-test(m.values() == [['dog'], ['spotty']], 'values() test failed')
-test(m.items() == [('animal', ['dog']), ('name', ['spotty'])], 'items() test failed')
+t(m.keys() == ['animal', 'name'], 'keys() test failed')
+t(m.values() == [['dog'], ['spotty']], 'values() test failed')
+t(m.items() == [('animal', ['dog']), ('name', ['spotty'])],
+  'items() test failed')
+
+t(m.sanity_check() == LDB_SUCCESS, 'sanity check')
+
+m['animal'] = 'canine'
+t(m['animal'] == ['canine'], 'replace value failed')
+
+# Test a multi-valued attribute
+
+names = ['spotty', 'foot']
+m['name'] = names
+
+t(m['name'] == names, 'multi-valued attr failed')
+
+t(m.sanity_check() == LDB_SUCCESS, 'sanity check')
+
+# Test non-string attributes
+
+try:
+    m['foo'] = 42
+except TypeError:
+    pass
+else:
+    t(False, 'TypeError not raised')
+
+#
+# Torture Ldb
+#
+
+l = Ldb('foo.ldb')
-- 
cgit 


From ce3293c5b6864dd4e04638bf819cf0269b761fce Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Tue, 2 May 2006 10:59:31 +0000
Subject: r15391: Wrap up the nbt_name_query() function as a bit of an
 experiment.  It seemed to work quite well and this technique might be good
 for generating an interface to use for automated testing.

Tested by doing a nbt lookup against smbd.
(This used to be commit 11150b3140c91459f17c767adf07a54524338c18)
---
 source4/scripting/swig/config.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/config.mk b/source4/scripting/swig/config.mk
index 282758de52..6c62d3ded8 100644
--- a/source4/scripting/swig/config.mk
+++ b/source4/scripting/swig/config.mk
@@ -8,7 +8,8 @@ OBJ_FILES = dcerpc_wrap.o
 #######################
 
 # Swig extensions
-swig: lib/tdb/swig/_tdb.$(SHLIBEXT) lib/ldb/swig/_ldb.$(SHLIBEXT)
+swig: lib/tdb/swig/_tdb.$(SHLIBEXT) lib/ldb/swig/_ldb.$(SHLIBEXT) \
+	libcli/swig/_libcli_nbt.$(SHLIBEXT)
 
 .SUFFIXES: _wrap.c .i
 
-- 
cgit 


From 3064782735e927de63cdfa34a19c95a9d099a82a Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sat, 13 May 2006 21:03:47 +0000
Subject: r15581: Remove unused include (This used to be commit
 b79092d7ee0c463e644ead2bfeb9692fc82d9c74)

---
 source4/scripting/ejs/smbcalls_ldb.c | 1 -
 1 file changed, 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_ldb.c b/source4/scripting/ejs/smbcalls_ldb.c
index 9ba7668a38..f6b4ffc6b0 100644
--- a/source4/scripting/ejs/smbcalls_ldb.c
+++ b/source4/scripting/ejs/smbcalls_ldb.c
@@ -26,7 +26,6 @@
 #include "lib/appweb/ejs/ejs.h"
 #include "lib/ldb/include/ldb.h"
 #include "lib/ldb/include/ldb_errors.h"
-#include "lib/cmdline/popt_common.h"
 #include "db_wrap.h"
 
 /*
-- 
cgit 


From f9dd0263553c4f04fbc0d067e5384a9e46cd98bc Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sat, 13 May 2006 21:36:15 +0000
Subject: r15585: Revive pidl's SWIG file generator. It now generates simple
 object oriented wrappers for the interfaces (still need to fix the actual
 function calls) (This used to be commit
 bf5da20869eae29aea92386cbb13413b507fc55f)

---
 source4/scripting/swig/config.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/config.mk b/source4/scripting/swig/config.mk
index 6c62d3ded8..970c6ed71a 100644
--- a/source4/scripting/swig/config.mk
+++ b/source4/scripting/swig/config.mk
@@ -14,7 +14,7 @@ swig: lib/tdb/swig/_tdb.$(SHLIBEXT) lib/ldb/swig/_ldb.$(SHLIBEXT) \
 .SUFFIXES: _wrap.c .i
 
 .i_wrap.c:
-	swig -python $<
+	swig -I$(srcdir)/scripting/swig -python $<
 
 SWIG_INCLUDES = librpc/gen_ndr/samr.i librpc/gen_ndr/lsa.i librpc/gen_ndr/spoolss.i
 
-- 
cgit 


From 0dcecc314899b6f36e9215e0b3881220062ba4f9 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Sat, 20 May 2006 03:08:44 +0000
Subject: r15731: module init functions should return NTSTATUS, not void (This
 used to be commit c6d20c22454b87b4dea3527f0efcecd373679848)

---
 source4/scripting/ejs/smbcalls_auth.c   | 3 ++-
 source4/scripting/ejs/smbcalls_config.c | 3 ++-
 source4/scripting/ejs/smbcalls_data.c   | 3 ++-
 source4/scripting/ejs/smbcalls_ldb.c    | 3 ++-
 source4/scripting/ejs/smbcalls_nbt.c    | 3 ++-
 source4/scripting/ejs/smbcalls_nss.c    | 3 ++-
 source4/scripting/ejs/smbcalls_rand.c   | 3 ++-
 source4/scripting/ejs/smbcalls_samba3.c | 3 ++-
 source4/scripting/ejs/smbcalls_string.c | 3 ++-
 source4/scripting/ejs/smbcalls_sys.c    | 3 ++-
 10 files changed, 20 insertions(+), 10 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_auth.c b/source4/scripting/ejs/smbcalls_auth.c
index ea9aaf9739..568b24713c 100644
--- a/source4/scripting/ejs/smbcalls_auth.c
+++ b/source4/scripting/ejs/smbcalls_auth.c
@@ -187,8 +187,9 @@ static int ejs_system_session(MprVarHandle eid, int argc, struct MprVar **argv)
 /*
   setup C functions that be called from ejs
 */
-void smb_setup_ejs_auth(void)
+NTSTATUS smb_setup_ejs_auth(void)
 {
 	ejsDefineCFunction(-1, "userAuth", ejs_userAuth, NULL, MPR_VAR_SCRIPT_HANDLE);
 	ejsDefineCFunction(-1, "system_session", ejs_system_session, NULL, MPR_VAR_SCRIPT_HANDLE);
+	return NT_STATUS_OK;
 }
diff --git a/source4/scripting/ejs/smbcalls_config.c b/source4/scripting/ejs/smbcalls_config.c
index fae497e2a5..2827920bd0 100644
--- a/source4/scripting/ejs/smbcalls_config.c
+++ b/source4/scripting/ejs/smbcalls_config.c
@@ -215,7 +215,8 @@ static int ejs_loadparm_init(MprVarHandle eid, int argc, struct MprVar **argv)
 /*
   setup C functions that be called from ejs
 */
-void smb_setup_ejs_config(void)
+NTSTATUS smb_setup_ejs_config(void)
 {
 	ejsDefineCFunction(-1, "loadparm_init", ejs_loadparm_init, NULL, MPR_VAR_SCRIPT_HANDLE);
+	return NT_STATUS_OK;
 }
diff --git a/source4/scripting/ejs/smbcalls_data.c b/source4/scripting/ejs/smbcalls_data.c
index a1686a71e1..4ee4230aee 100644
--- a/source4/scripting/ejs/smbcalls_data.c
+++ b/source4/scripting/ejs/smbcalls_data.c
@@ -278,7 +278,8 @@ static int ejs_datablob_init(MprVarHandle eid, int argc, struct MprVar **argv)
 /*
   setup C functions that be called from ejs
 */
-void smb_setup_ejs_datablob(void)
+NTSTATUS smb_setup_ejs_datablob(void)
 {
 	ejsDefineCFunction(-1, "datablob_init", ejs_datablob_init, NULL, MPR_VAR_SCRIPT_HANDLE);
+	return NT_STATUS_OK;
 }
diff --git a/source4/scripting/ejs/smbcalls_ldb.c b/source4/scripting/ejs/smbcalls_ldb.c
index f6b4ffc6b0..ea6f70a41e 100644
--- a/source4/scripting/ejs/smbcalls_ldb.c
+++ b/source4/scripting/ejs/smbcalls_ldb.c
@@ -556,7 +556,8 @@ static int ejs_ldb_init(MprVarHandle eid, int argc, struct MprVar **argv)
 /*
   setup C functions that be called from ejs
 */
-void smb_setup_ejs_ldb(void)
+NTSTATUS smb_setup_ejs_ldb(void)
 {
 	ejsDefineCFunction(-1, "ldb_init", ejs_ldb_init, NULL, MPR_VAR_SCRIPT_HANDLE);
+	return NT_STATUS_OK;
 }
diff --git a/source4/scripting/ejs/smbcalls_nbt.c b/source4/scripting/ejs/smbcalls_nbt.c
index 4bcb450ee3..15b560bd93 100644
--- a/source4/scripting/ejs/smbcalls_nbt.c
+++ b/source4/scripting/ejs/smbcalls_nbt.c
@@ -87,7 +87,8 @@ static int ejs_resolve_name(MprVarHandle eid, int argc, struct MprVar **argv)
 /*
   setup C functions that be called from ejs
 */
-void smb_setup_ejs_nbt(void)
+NTSTATUS smb_setup_ejs_nbt(void)
 {
 	ejsDefineCFunction(-1, "resolveName", ejs_resolve_name, NULL, MPR_VAR_SCRIPT_HANDLE);
+	return NT_STATUS_OK;
 }
diff --git a/source4/scripting/ejs/smbcalls_nss.c b/source4/scripting/ejs/smbcalls_nss.c
index 6111ed57c2..6b18227845 100644
--- a/source4/scripting/ejs/smbcalls_nss.c
+++ b/source4/scripting/ejs/smbcalls_nss.c
@@ -154,7 +154,8 @@ static int ejs_nss_init(MprVarHandle eid, int argc, struct MprVar **argv)
 /*
   setup C functions that be called from ejs
 */
-void smb_setup_ejs_nss(void)
+NTSTATUS smb_setup_ejs_nss(void)
 {
 	ejsDefineCFunction(-1, "nss_init", ejs_nss_init, NULL, MPR_VAR_SCRIPT_HANDLE);
+	return NT_STATUS_OK;
 }
diff --git a/source4/scripting/ejs/smbcalls_rand.c b/source4/scripting/ejs/smbcalls_rand.c
index 9920c06958..9027efc3e6 100644
--- a/source4/scripting/ejs/smbcalls_rand.c
+++ b/source4/scripting/ejs/smbcalls_rand.c
@@ -98,7 +98,8 @@ static int ejs_random_init(MprVarHandle eid, int argc, struct MprVar **argv)
 /*
   setup C functions that be called from ejs
 */
-void smb_setup_ejs_random(void)
+NTSTATUS smb_setup_ejs_random(void)
 {
 	ejsDefineCFunction(-1, "random_init", ejs_random_init, NULL, MPR_VAR_SCRIPT_HANDLE);
+	return NT_STATUS_OK;
 }
diff --git a/source4/scripting/ejs/smbcalls_samba3.c b/source4/scripting/ejs/smbcalls_samba3.c
index 0bcc670552..64517bad28 100644
--- a/source4/scripting/ejs/smbcalls_samba3.c
+++ b/source4/scripting/ejs/smbcalls_samba3.c
@@ -494,7 +494,8 @@ static int ejs_samba3_read(MprVarHandle eid, int argc, struct MprVar **argv)
 /*
   setup C functions that be called from ejs
 */
-void smb_setup_ejs_samba3(void)
+NTSTATUS smb_setup_ejs_samba3(void)
 {
 	ejsDefineCFunction(-1, "samba3_read", ejs_samba3_read, NULL, MPR_VAR_SCRIPT_HANDLE);
+	return NT_STATUS_OK;
 }
diff --git a/source4/scripting/ejs/smbcalls_string.c b/source4/scripting/ejs/smbcalls_string.c
index d742d43173..2eb9a1b3f7 100644
--- a/source4/scripting/ejs/smbcalls_string.c
+++ b/source4/scripting/ejs/smbcalls_string.c
@@ -505,7 +505,8 @@ static int ejs_string_init(MprVarHandle eid, int argc, struct MprVar **argv)
 /*
   setup C functions that be called from ejs
 */
-void smb_setup_ejs_string(void)
+NTSTATUS smb_setup_ejs_string(void)
 {
 	ejsDefineCFunction(-1, "string_init", ejs_string_init, NULL, MPR_VAR_SCRIPT_HANDLE);
+	return NT_STATUS_OK;
 }
diff --git a/source4/scripting/ejs/smbcalls_sys.c b/source4/scripting/ejs/smbcalls_sys.c
index b8382db296..860002e1d7 100644
--- a/source4/scripting/ejs/smbcalls_sys.c
+++ b/source4/scripting/ejs/smbcalls_sys.c
@@ -351,7 +351,8 @@ static int ejs_sys_init(MprVarHandle eid, int argc, struct MprVar **argv)
 /*
   setup C functions that be called from ejs
 */
-void smb_setup_ejs_system(void)
+NTSTATUS smb_setup_ejs_system(void)
 {
 	ejsDefineCFunction(-1, "sys_init", ejs_sys_init, NULL, MPR_VAR_SCRIPT_HANDLE);
+	return NT_STATUS_OK;
 }
-- 
cgit 


From c82c88dccbff92f111d4127e2f58ba79d5f82010 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 22 May 2006 16:16:48 +0000
Subject: r15805: Fix incompatible type assignment. Caught by the IBM checker.
 (This used to be commit cef5cc6464001e1a1472e1029254c093942b6642)

---
 source4/scripting/ejs/ejsnet.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/ejsnet.c b/source4/scripting/ejs/ejsnet.c
index 952ebeb575..523e0e8a02 100644
--- a/source4/scripting/ejs/ejsnet.c
+++ b/source4/scripting/ejs/ejsnet.c
@@ -111,7 +111,7 @@ static int ejs_net_join_domain(MprVarHandle eid, int argc, struct MprVar **argv)
 	join->in.netbios_name  = NULL;
 	join->in.join_type     = SEC_CHAN_WKSTA;
 	join->in.domain_name   = cli_credentials_get_domain(ctx->cred);
-	join->in.level         = LIBNET_JOINDOMAIN_AUTOMATIC;
+	join->in.level         = LIBNET_JOIN_AUTOMATIC;
 	join->out.error_string = NULL;
 
 	if (argc == 1 && argv[0]->type == MPR_TYPE_OBJECT) {
-- 
cgit 


From 4f422081a79704827b13571540143b8b57e6b74c Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Tue, 6 Jun 2006 17:55:41 +0000
Subject: r16063: Make is clearer when we can't write to the smb.conf

Find more possible posix group names for the 'domain users' group, as
the existing options don't exist in OSX.

Andrew Bartlett
(This used to be commit 4e8d7b7fb310a668ae8653bc06036c94249b2b2a)
---
 source4/scripting/libjs/provision.js | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index 73e3b6f4e4..64485efa03 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -238,7 +238,7 @@ function setup_ldb(ldif, info, dbname)
 /*
   setup a file in the private dir
  */
-function setup_file(template, fname, subobj)
+function setup_file(template, message, fname, subobj)
 {
 	var lp = loadparm_init();
 	var f = fname;
@@ -250,7 +250,10 @@ function setup_file(template, fname, subobj)
 	data = substitute_var(data, subobj);
 
 	ok = sys.file_save(f, data);
-	assert(ok);
+	if (!ok) {
+		message("failed to create file: " + f + "\n");
+		assert(ok);
+	}
 }
 
 function provision_default_paths(subobj)
@@ -355,7 +358,7 @@ function provision(subobj, message, blank, paths, session_info, credentials)
 	var st = sys.stat(paths.smbconf);
 	if (st == undefined) {
 		message("Setting up smb.conf\n");
-		setup_file("provision.smb.conf", paths.smbconf, subobj);
+		setup_file("provision.smb.conf", info.message, paths.smbconf, subobj);
 		lp.reload();
 	}
 	message("Setting up secrets.ldb\n");
@@ -412,7 +415,7 @@ function provision_dns(subobj, message, paths, session_info, credentials)
 	assert(subobj.HOSTGUID != undefined);
 
 	setup_file("provision.zone", 
-		   paths.dns, 
+		   message, paths.dns, 
 		   subobj);
 
 	message("Please install the zone located in " + paths.dns + " into your DNS server\n");
@@ -456,7 +459,7 @@ function provision_guess()
 	subobj.NOGROUP      = findnss(nss.getgrnam, "nogroup", "nobody");
 	subobj.WHEEL        = findnss(nss.getgrnam, "wheel", "root", "staff");
 	subobj.BACKUP       = findnss(nss.getgrnam, "backup", "wheel", "root", "staff");
-	subobj.USERS        = findnss(nss.getgrnam, "users", "guest", "other");
+	subobj.USERS        = findnss(nss.getgrnam, "users", "guest", "other", "unknown");
 	subobj.DNSDOMAIN    = strlower(subobj.REALM);
 	subobj.DNSNAME      = sprintf("%s.%s", 
 				      strlower(subobj.HOSTNAME), 
-- 
cgit 


From 481991e1b99f83f3f855ac7028f9209c4e83b7b2 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Mon, 12 Jun 2006 20:08:19 +0000
Subject: r16168: Make the example match the actual function.

This was very confusing until I really looked at it.

Andrew Bartlett
(This used to be commit 0053d06d9f85f2304191ab8f68eee7f48b2f2aa8)
---
 source4/scripting/ejs/smbcalls_ldb.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_ldb.c b/source4/scripting/ejs/smbcalls_ldb.c
index ea6f70a41e..d5735dce70 100644
--- a/source4/scripting/ejs/smbcalls_ldb.c
+++ b/source4/scripting/ejs/smbcalls_ldb.c
@@ -48,7 +48,7 @@ static struct ldb_context *ejs_get_ldb_context(int eid)
      var attrs = new Array("attr1", "attr2", "attr3");
      ldb.search("expression", attrs);
      var basedn = "cn=this,dc=is,dc=a,dc=test";
-     ldb.search("expression", attrs, ldb.SCOPE_SUBTREE, basedn);
+     ldb.search("expression", basedn, ldb.SCOPE_SUBTREE, attrs);
 */
 static int ejs_ldbSearch(MprVarHandle eid, int argc, struct MprVar **argv)
 {
-- 
cgit 


From f77c4100842f8c5357fa90822e04319810a04b8d Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Thu, 15 Jun 2006 18:04:24 +0000
Subject: r16264: Add, but do not yet enable, the partitions module.

This required changes to the rootDSE module, to allow registration of
partitions.  In doing so I renamed the 'register' operation to
'register_control' and 'register_partition', which changed a few more
modules.

Due to the behaviour of certain LDAP servers, we create the baseDN
entry in two parts: Firstly, we allow the admin to export a simple
LDIF file to add to their server.  Then we perform a modify to add the
remaining attributes.

To delete all users in partitions, we must now search and delete all
objects in the partition, rather than a simple search from the root.
Against LDAP, this might not delete all objects, so we allow this to
fail.

In testing, we found that the 'Domain Controllers' container was
misnamed, and should be 'CN=', rather than 'OU='.

To avoid the Templates being found in default searches, they have been
moved to CN=Templates from CN=Templates,${BASEDN}.

Andrew Bartlett
(This used to be commit b49a4fbb57f10726bd288fdc9fc95c0cbbe9094a)
---
 source4/scripting/libjs/provision.js | 169 +++++++++++++++++++++++++++++++----
 1 file changed, 150 insertions(+), 19 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index 64485efa03..877d8530e5 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -71,7 +71,7 @@ function setup_name_mapping(info, ldb, sid, unixname)
 {
 	var attrs = new Array("dn");
 	var res = ldb.search(sprintf("objectSid=%s", sid), 
-			     NULL, ldb.SCOPE_DEFAULT, attrs);
+			     info.subobj.BASEDN, ldb.SCOPE_SUBTREE, attrs);
 	if (res.length != 1) {
 		info.message("Failed to find record for objectSid %s\n", sid);
 		return false;
@@ -186,6 +186,65 @@ function ldb_erase(ldb)
 	assert(res.length == 0);
 }
 
+/*
+  erase an ldb, removing all records
+*/
+function ldb_erase_partitions(info, dbname)
+{
+	var rootDSE_attrs = new Array("namingContexts");
+	var ldb = ldb_init();
+	var lp = loadparm_init();
+	var j;
+
+	ldb.session_info = info.session_info;
+	ldb.credentials = info.credentials;
+
+
+	ldb.filename = dbname;
+
+	var connect_ok = ldb.connect(dbname);
+	assert(connect_ok);
+
+	ldb.transaction_start();
+
+	var res = ldb.search("(objectClass=*)", "", ldb.SCOPE_BASE, rootDSE_attrs);
+	assert(typeof(res) != "undefined");
+	assert(res.length == 1);
+	for (j=0; j<res[0].namingContexts.length; j++) {
+		var attrs = new Array("dn");
+		var basedn = res[0].namingContexts[j];
+		var k;
+		var previous_remaining = 1;
+		var current_remaining = 0;
+
+			for (k=0; k < 10 && (previous_remaining != current_remaining); k++) {
+			/* and the rest */
+			var res2 = ldb.search("(|(objectclass=*)(dn=*))", basedn, ldb.SCOPE_SUBTREE, attrs);
+			var i;
+			if (typeof(res2) == "undefined") {
+				info.message("ldb search failed: " + ldb.errstring() + "\n");
+				continue;
+			}
+			previous_remaining = current_remaining;
+			current_remaining = res2.length;
+			for (i=0;i<res2.length;i++) {
+				ldb.del(res2[i].dn);
+			}
+			
+			var res3 = ldb.search("(|(objectclass=*)(dn=*))", basedn, ldb.SCOPE_SUBTREE, attrs);
+			if (res3.length != 0) {
+				info.message("Failed to delete all records under " + basedn + ", " + res3.length + " records remaining\n");
+			}
+		}
+	}
+
+	var commit_ok = ldb.transaction_commit();
+	if (!commit_ok) {
+		info.message("ldb commit failed: " + ldb.errstring() + "\n");
+		assert(add_ok);
+	}
+}
+
 /*
   setup a ldb in the private dir
  */
@@ -193,6 +252,7 @@ function setup_ldb(ldif, info, dbname)
 {
 	var erase = true;
 	var extra = "";
+	var failok = false;
 	var ldb = ldb_init();
 	var lp = loadparm_init();
 	ldb.session_info = info.session_info;
@@ -202,10 +262,14 @@ function setup_ldb(ldif, info, dbname)
 		extra = arguments[3];
 	}
 
-	if (arguments.length == 5) {
+	if (arguments.length >= 5) {
 	        erase = arguments[4];
         }
 
+	if (arguments.length == 6) {
+	        failok = arguments[5];
+        }
+
 	var src = lp.get("setup directory") + "/" + ldif;
 
 	var data = sys.file_load(src);
@@ -215,7 +279,11 @@ function setup_ldb(ldif, info, dbname)
 	ldb.filename = dbname;
 
 	var connect_ok = ldb.connect(dbname);
-	assert(connect_ok);
+	if (!connect_ok) {
+		sys.unlink(sprintf("%s/%s", lp.get("private dir"), dbname));
+		connect_ok = ldb.connect(dbname);
+		assert(connect_ok);
+	}
 
 	ldb.transaction_start();
 
@@ -226,12 +294,50 @@ function setup_ldb(ldif, info, dbname)
 	var add_ok = ldb.add(data);
 	if (!add_ok) {
 		info.message("ldb load failed: " + ldb.errstring() + "\n");
-		assert(add_ok);
+		if (!failok) {
+			assert(add_ok);
+	        }
+	}
+	if (add_ok) {
+		var commit_ok = ldb.transaction_commit();
+		if (!commit_ok) {
+			info.message("ldb commit failed: " + ldb.errstring() + "\n");
+			assert(commit_ok);
+		}
+	}
+}
+
+/*
+  setup a ldb in the private dir
+ */
+function setup_ldb_modify(ldif, info, dbname)
+{
+	var ldb = ldb_init();
+	var lp = loadparm_init();
+	ldb.session_info = info.session_info;
+	ldb.credentials = info.credentials;
+
+	var src = lp.get("setup directory") + "/" + ldif;
+
+	var data = sys.file_load(src);
+	data = substitute_var(data, info.subobj);
+
+	ldb.filename = dbname;
+
+	var connect_ok = ldb.connect(dbname);
+	assert(connect_ok);
+
+	ldb.transaction_start();
+
+	var mod_ok = ldb.modify(data);
+	if (!mod_ok) {
+		info.message("ldb load failed: " + ldb.errstring() + "\n");
+		assert(mod_ok);
 	}
 	var commit_ok = ldb.transaction_commit();
 	if (!commit_ok) {
 		info.message("ldb commit failed: " + ldb.errstring() + "\n");
-		assert(add_ok);
+		assert(commit_ok);
 	}
 }
 
@@ -271,6 +377,7 @@ function provision_default_paths(subobj)
 	paths.secrets = "secrets.ldb";
 	paths.dns = lp.get("private dir") + "/" + subobj.DNSDOMAIN + ".zone";
 	paths.winsdb = "wins.ldb";
+	paths.ldap_basedn_ldif = lp.get("private dir") + "/" + subobj.DNSDOMAIN + ".ldif";
 	return paths;
 }
 
@@ -289,12 +396,8 @@ function setup_name_mappings(info, subobj, session_info, credentials)
 		return false;
 	}
 	var attrs = new Array("objectSid");
-	var res = ldb.search("dnsDomain=" + subobj.REALM,
-			     NULL, ldb.SCOPE_DEFAULT, attrs);
-	if (res.length != 1) {
-		info.message("Failed to find dnsDomain %s\n", subobj.REALM);
-		return false;
-	}
+	res = ldb.search("objectSid=*", subobj.BASEDN, ldb.SCOPE_BASE, attrs);
+	assert(res.length == 1 && res[0].objectSid != undefined);
 	var sid = res[0].objectSid;
 
 	/* add some foreign sids if they are not present already */
@@ -369,9 +472,16 @@ function provision(subobj, message, blank, paths, session_info, credentials)
 	message("Setting up hklm.ldb\n");
 	setup_ldb("hklm.ldif", info, paths.hklm);
 
-
 	message("Setting up sam.ldb attributes\n");
 	setup_ldb("provision_init.ldif", info, paths.samdb);
+	message("Erasing data from partitions\n");
+	ldb_erase_partitions(info, paths.samdb);
+	
+	message("Adding baseDN: " + subobj.BASEDN + "\n");
+	setup_ldb("provision_basedn.ldif", info, paths.samdb, NULL, false, true);
+	message("Modifying baseDN: " + subobj.BASEDN + "\n");
+	setup_ldb_modify("provision_basedn_modify.ldif", info, paths.samdb)
+
 	message("Setting up sam.ldb schema\n");
 	setup_ldb("schema.ldif", info, paths.samdb, NULL, false);
 	message("Setting up display specifiers\n");
@@ -408,10 +518,12 @@ function provision_dns(subobj, message, paths, session_info, credentials)
 	assert(ok);
 
 	/* These values may have changed, due to an incoming SamSync, so fetch them from the database */
-	subobj.DOMAINGUID = searchone(ldb, "(&(objectClass=domainDNS)(dnsDomain=" + subobj.DNSDOMAIN + "))", "objectGUID");
-	assert(subobj.DOMAINGUID != undefined);
+	var attrs = new Array("objectGUID");
+	res = ldb.search("objectGUID=*", subobj.BASEDN, ldb.SCOPE_BASE, attrs);
+	assert(res.length == 1 && res[0].objectGUID != undefined)
+	subobj.DOMAINGUID = res[0].objectGUID;
 
-	subobj.HOSTGUID = searchone(ldb, "(&(objectClass=computer)(cn=" + subobj.NETBIOSNAME + "))", "objectGUID");
+	subobj.HOSTGUID = searchone(ldb, subobj.BASEDN, "(&(objectClass=computer)(cn=" + subobj.NETBIOSNAME + "))", "objectGUID");
 	assert(subobj.HOSTGUID != undefined);
 
 	setup_file("provision.zone", 
@@ -421,6 +533,21 @@ function provision_dns(subobj, message, paths, session_info, credentials)
 	message("Please install the zone located in " + paths.dns + " into your DNS server\n");
 }
 
+/* Write out a DNS zone file, from the info in the current database */
+function provision_ldapbase(subobj, message, paths)
+{
+	message("Setting up LDAP base entry: " + subobj.BASEDN + " \n");
+	var rdns = split(",", subobj.BASEDN);
+	subobj.RDN_DC = substr(rdns[0], strlen("DC="));
+
+	setup_file("provision_basedn.ldif", 
+		   message, paths.ldap_basedn_ldif, 
+		   subobj);
+
+	message("Please install the LDIF located in " + paths.ldap_basedn_ldif + " into your LDAP server, and re-run with --ldap-backend=ldap://my.ldap.server\n");
+}
+
+
 /*
   guess reasonably default options for provisioning
 */
@@ -466,16 +593,17 @@ function provision_guess()
 				      subobj.DNSDOMAIN);
 	rdn_list = split(".", subobj.DNSDOMAIN);
 	subobj.BASEDN       = "DC=" + join(",DC=", rdn_list);
+	subobj.LDAPBACKEND  = "users.ldb";
 	return subobj;
 }
 
 /*
   search for one attribute as a string
  */
-function searchone(ldb, expression, attribute)
+function searchone(ldb, basedn, expression, attribute)
 {
 	var attrs = new Array(attribute);
-	res = ldb.search(expression, attrs);
+	res = ldb.search(expression, basedn, ldb.SCOPE_SUBTREE, attrs);
 	if (res.length != 1 ||
 	    res[0][attribute] == undefined) {
 		return undefined;
@@ -524,9 +652,12 @@ function newuser(username, unixname, password, message, session_info, credential
 	ldb.transaction_start();
 
 	/* find the DNs for the domain and the domain users group */
-	var domain_dn = searchone(ldb, "objectClass=domainDNS", "dn");
+	var attrs = new Array("defaultNamingContext");
+	res = ldb.search("defaultNamingContext=*", "", ldb.SCOPE_BASE, attrs);
+	assert(res.length == 1 && res[0].defaultNamingContext != undefined)
+	var domain_dn = res[0].defaultNamingContext;
 	assert(domain_dn != undefined);
-	var dom_users = searchone(ldb, "name=Domain Users", "dn");
+	var dom_users = searchone(ldb, domain_dn, "name=Domain Users", "dn");
 	assert(dom_users != undefined);
 
 	var user_dn = sprintf("CN=%s,CN=Users,%s", username, domain_dn);
-- 
cgit 


From cc9d70bbba4e326ba89dec8cdc58b64b89f33091 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Thu, 15 Jun 2006 18:25:41 +0000
Subject: r16265: Fix 'newuser' command.

Andrew Bartlett
(This used to be commit 82f5f6c03d005741613c5b00705613c4078c844e)
---
 source4/scripting/libjs/provision.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index 877d8530e5..9ad2257ff3 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -654,7 +654,7 @@ function newuser(username, unixname, password, message, session_info, credential
 	/* find the DNs for the domain and the domain users group */
 	var attrs = new Array("defaultNamingContext");
 	res = ldb.search("defaultNamingContext=*", "", ldb.SCOPE_BASE, attrs);
-	assert(res.length == 1 && res[0].defaultNamingContext != undefined)
+	assert(res.length == 1 && res[0].defaultNamingContext != undefined);
 	var domain_dn = res[0].defaultNamingContext;
 	assert(domain_dn != undefined);
 	var dom_users = searchone(ldb, domain_dn, "name=Domain Users", "dn");
-- 
cgit 


From 9c66f601f1520a99b9236c32bc9f03a33bd4b2aa Mon Sep 17 00:00:00 2001
From: Simo Sorce <idra@samba.org>
Date: Sun, 23 Jul 2006 18:43:07 +0000
Subject: r17206: Add a modular API for share configuration. Commit the classic
 backwards compatible module which is the default one (This used to be commit
 a89cc346b9296cb49929898d257a064a6c2bae86)

---
 source4/scripting/libjs/provision.js | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index 9ad2257ff3..c4ffab6a30 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -367,6 +367,7 @@ function provision_default_paths(subobj)
 	var lp = loadparm_init();
 	var paths = new Object();
 	paths.smbconf = lp.get("config file");
+	paths.shareconf = lp.get("private dir") + "/" + "share.ldb";
 	paths.hklm = "hklm.ldb";
 	paths.hkcu = "hkcu.ldb";
 	paths.hkcr = "hkcr.ldb";
@@ -464,6 +465,12 @@ function provision(subobj, message, blank, paths, session_info, credentials)
 		setup_file("provision.smb.conf", info.message, paths.smbconf, subobj);
 		lp.reload();
 	}
+	/* only install a new shares config db if there is none */
+	st = sys.stat(paths.shareconf);
+	if (st == undefined) {
+		message("Setting up sconf.ldb\n");
+		setup_ldb("share.ldif", info, paths.shareconf);
+	}
 	message("Setting up secrets.ldb\n");
 	setup_ldb("secrets.ldif", info, paths.secrets);
 	message("Setting up keytabs\n");
-- 
cgit 


From 7b99b2048ef1cd5603d93ac94543838a049d0adc Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Mon, 31 Jul 2006 01:00:18 +0000
Subject: r17330: Enable the partitions module.

This module redirects various samdb requests into different modules,
depending on the prefix.  It also makes moving to an LDAP backend
easier, as it is just a different partition backend.

This adds yet another stage to the provision process, as we must setup
the partitions before we setup the magic attributes.

Andrew Bartlett
(This used to be commit 31225b9cb6ef6fcb7bd831043999b1b44ef1b128)
---
 source4/scripting/libjs/provision.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index c4ffab6a30..232d15d66f 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -479,8 +479,11 @@ function provision(subobj, message, blank, paths, session_info, credentials)
 	message("Setting up hklm.ldb\n");
 	setup_ldb("hklm.ldif", info, paths.hklm);
 
+	message("Setting up sam.ldb partitions\n");
+	setup_ldb("provision_partitions.ldif", info, paths.samdb);
+
 	message("Setting up sam.ldb attributes\n");
-	setup_ldb("provision_init.ldif", info, paths.samdb);
+	setup_ldb("provision_init.ldif", info, paths.samdb, NULL, false);
 	message("Erasing data from partitions\n");
 	ldb_erase_partitions(info, paths.samdb);
 	
-- 
cgit 


From 9b6f35edbf439fec4a0d32104ee8475bf1e313c9 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Mon, 31 Jul 2006 13:34:00 +0000
Subject: r17339: pass the event context and messaging context together to the
 smb ejs functions

metze
(This used to be commit 0397911b414518d54f6dba2a8c81a5872b90a034)
---
 source4/scripting/ejs/smbcalls.h      |  5 +++++
 source4/scripting/ejs/smbcalls_auth.c | 13 +++++++++++--
 2 files changed, 16 insertions(+), 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls.h b/source4/scripting/ejs/smbcalls.h
index 5d5f6841d9..9fa9100276 100644
--- a/source4/scripting/ejs/smbcalls.h
+++ b/source4/scripting/ejs/smbcalls.h
@@ -29,6 +29,11 @@ void mprAddArray(struct MprVar *var, int i, struct MprVar v);
 void mprSetCFunction(struct MprVar *obj, const char *name, MprCFunction fn);
 void mprSetStringCFunction(struct MprVar *obj, const char *name, MprStringCFunction fn);
 
+struct smbcalls_context {
+	struct event_context *event_ctx;
+	struct messaging_context *msg_ctx;
+};
+
 struct ldb_context;
 struct ldb_message;
 struct cli_credentials;
diff --git a/source4/scripting/ejs/smbcalls_auth.c b/source4/scripting/ejs/smbcalls_auth.c
index 568b24713c..678d3c6a7f 100644
--- a/source4/scripting/ejs/smbcalls_auth.c
+++ b/source4/scripting/ejs/smbcalls_auth.c
@@ -39,8 +39,17 @@ static int ejs_doauth(MprVarHandle eid,
 	struct MprVar *session_info_obj;
 	NTSTATUS nt_status;
 
-	/* Hope we can find the event context somewhere up there... */
-	struct event_context *ev = event_context_find(tmp_ctx);
+	struct smbcalls_context *c;
+	struct event_context *ev;
+
+	/* Hope we can find an smbcalls_context somewhere up there... */
+	c = talloc_find_parent_bytype(tmp_ctx, struct smbcalls_context);
+	if (c) {
+		ev = c->event_ctx;
+	} else {
+		/* Hope we can find the event context somewhere up there... */
+		ev = event_context_find(tmp_ctx);
+	}
 
 	nt_status = auth_context_create(tmp_ctx, auth_types, &auth_context, ev);
 	if (!NT_STATUS_IS_OK(nt_status)) {
-- 
cgit 


From 7a845bcb0141a895d5685afcef1ffe7f93428d0f Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Mon, 31 Jul 2006 14:05:08 +0000
Subject: r17341: pass a messaging context to auth_context_create() and
 gensec_server_start().

calling them with NULL for event context or messaging context
is no longer allowed!

metze
(This used to be commit 679ac74e71b111344f1097ab389c0b83a9247710)
---
 source4/scripting/ejs/smbcalls_auth.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_auth.c b/source4/scripting/ejs/smbcalls_auth.c
index 678d3c6a7f..281f35bb20 100644
--- a/source4/scripting/ejs/smbcalls_auth.c
+++ b/source4/scripting/ejs/smbcalls_auth.c
@@ -26,6 +26,7 @@
 #include "auth/auth.h"
 #include "scripting/ejs/smbcalls.h"
 #include "lib/events/events.h"
+#include "lib/messaging/irpc.h"
 
 static int ejs_doauth(MprVarHandle eid,
 		      TALLOC_CTX *tmp_ctx, struct MprVar *auth, const char *username, 
@@ -41,17 +42,20 @@ static int ejs_doauth(MprVarHandle eid,
 
 	struct smbcalls_context *c;
 	struct event_context *ev;
+	struct messaging_context *msg;
 
 	/* Hope we can find an smbcalls_context somewhere up there... */
 	c = talloc_find_parent_bytype(tmp_ctx, struct smbcalls_context);
 	if (c) {
 		ev = c->event_ctx;
+		msg = c->msg_ctx;
 	} else {
 		/* Hope we can find the event context somewhere up there... */
 		ev = event_context_find(tmp_ctx);
+		msg = messaging_client_init(tmp_ctx, ev);
 	}
 
-	nt_status = auth_context_create(tmp_ctx, auth_types, &auth_context, ev);
+	nt_status = auth_context_create(tmp_ctx, auth_types, ev, msg, &auth_context);
 	if (!NT_STATUS_IS_OK(nt_status)) {
 		mprSetPropertyValue(auth, "result", mprCreateBoolVar(False));
 		mprSetPropertyValue(auth, "report", mprString("Auth System Failure"));
-- 
cgit 


From 6e4940cf791c1a8009216a92b398e49250e71a53 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Fri, 11 Aug 2006 22:11:29 +0000
Subject: r17499: Open the main database only the minimum times during a
 provision.

This causes things to operate as just one transaction (locally), and
to make a minimum of TCP connections when connecting to a remote LDAP
server.

Taking advantage of this, create another file to handle loading the
Samba4 specific schema extensions.  Also comment out 'middleName' and
reassign the OID to one in the Samba4 range, as it is 'stolen' from a
netscape range that is used in OpenLDAP and interenet standards for
'ref'.

Andrew Bartlett
(This used to be commit 009d0905947dec9bab81d8e6de5cb424807ffd35)
---
 source4/scripting/libjs/provision.js | 146 +++++++++++++++--------------------
 1 file changed, 62 insertions(+), 84 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index 232d15d66f..8830c273f5 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -189,24 +189,12 @@ function ldb_erase(ldb)
 /*
   erase an ldb, removing all records
 */
-function ldb_erase_partitions(info, dbname)
+function ldb_erase_partitions(info, ldb)
 {
 	var rootDSE_attrs = new Array("namingContexts");
-	var ldb = ldb_init();
 	var lp = loadparm_init();
 	var j;
 
-	ldb.session_info = info.session_info;
-	ldb.credentials = info.credentials;
-
-
-	ldb.filename = dbname;
-
-	var connect_ok = ldb.connect(dbname);
-	assert(connect_ok);
-
-	ldb.transaction_start();
-
 	var res = ldb.search("(objectClass=*)", "", ldb.SCOPE_BASE, rootDSE_attrs);
 	assert(typeof(res) != "undefined");
 	assert(res.length == 1);
@@ -237,45 +225,13 @@ function ldb_erase_partitions(info, dbname)
 			}
 		}
 	}
-
-	var commit_ok = ldb.transaction_commit();
-	if (!commit_ok) {
-		info.message("ldb commit failed: " + ldb.errstring() + "\n");
-		assert(add_ok);
-	}
 }
 
-/*
-  setup a ldb in the private dir
- */
-function setup_ldb(ldif, info, dbname)
+function open_ldb(info, dbname, erase)
 {
-	var erase = true;
-	var extra = "";
-	var failok = false;
 	var ldb = ldb_init();
-	var lp = loadparm_init();
 	ldb.session_info = info.session_info;
 	ldb.credentials = info.credentials;
-
-	if (arguments.length >= 4) {
-		extra = arguments[3];
-	}
-
-	if (arguments.length >= 5) {
-	        erase = arguments[4];
-        }
-
-	if (arguments.length == 6) {
-	        failok = arguments[5];
-        }
-
-	var src = lp.get("setup directory") + "/" + ldif;
-
-	var data = sys.file_load(src);
-	data = data + extra;
-	data = substitute_var(data, info.subobj);
-
 	ldb.filename = dbname;
 
 	var connect_ok = ldb.connect(dbname);
@@ -290,6 +246,20 @@ function setup_ldb(ldif, info, dbname)
 	if (erase) {
 		ldb_erase(ldb);	
 	}
+	return ldb;
+}
+
+
+/*
+  setup a ldb in the private dir
+ */
+function setup_add_ldif(ldif, info, ldb, failok)
+{
+	var lp = loadparm_init();
+	var src = lp.get("setup directory") + "/" + ldif;
+
+	var data = sys.file_load(src);
+	data = substitute_var(data, info.subobj);
 
 	var add_ok = ldb.add(data);
 	if (!add_ok) {
@@ -298,7 +268,22 @@ function setup_ldb(ldif, info, dbname)
 			assert(add_ok);
 	        }
 	}
-	if (add_ok) {
+	return add_ok;
+}
+
+function setup_ldb(ldif, info, dbname) 
+{
+	var erase = true;
+	var failok = false;
+
+	if (arguments.length >= 4) {
+	        erase = arguments[3];
+        }
+	if (arguments.length == 5) {
+	        failok = arguments[4];
+        }
+	var ldb = open_ldb(info, dbname, erase);
+	if (setup_add_ldif(ldif, info, ldb, erase, failok)) {
 		var commit_ok = ldb.transaction_commit();
 		if (!commit_ok) {
 			info.message("ldb commit failed: " + ldb.errstring() + "\n");
@@ -310,35 +295,20 @@ function setup_ldb(ldif, info, dbname)
 /*
   setup a ldb in the private dir
  */
-function setup_ldb_modify(ldif, info, dbname)
+function setup_ldb_modify(ldif, info, ldb)
 {
-	var ldb = ldb_init();
 	var lp = loadparm_init();
-	ldb.session_info = info.session_info;
-	ldb.credentials = info.credentials;
 
 	var src = lp.get("setup directory") + "/" + ldif;
 
 	var data = sys.file_load(src);
 	data = substitute_var(data, info.subobj);
 
-	ldb.filename = dbname;
-
-	var connect_ok = ldb.connect(dbname);
-	assert(connect_ok);
-
-	ldb.transaction_start();
-
 	var mod_ok = ldb.modify(data);
 	if (!mod_ok) {
 		info.message("ldb load failed: " + ldb.errstring() + "\n");
 		assert(mod_ok);
 	}
-	var commit_ok = ldb.transaction_commit();
-	if (!commit_ok) {
-		info.message("ldb commit failed: " + ldb.errstring() + "\n");
-		assert(commit_ok);
-	}
 }
 
 /*
@@ -386,16 +356,9 @@ function provision_default_paths(subobj)
 /*
   setup reasonable name mappings for sam names to unix names
 */
-function setup_name_mappings(info, subobj, session_info, credentials)
+function setup_name_mappings(info, subobj, ldb)
 {
 	var lp = loadparm_init();
-	var ldb = ldb_init();
-	ldb.session_info = session_info;
-	ldb.credentials = credentials;
-	var ok = ldb.connect(lp.get("sam database"));
-	if (!ok) {
-		return false;
-	}
 	var attrs = new Array("objectSid");
 	res = ldb.search("objectSid=*", subobj.BASEDN, ldb.SCOPE_BASE, attrs);
 	assert(res.length == 1 && res[0].objectSid != undefined);
@@ -436,7 +399,6 @@ function setup_name_mappings(info, subobj, session_info, credentials)
 */
 function provision(subobj, message, blank, paths, session_info, credentials)
 {
-	var data = "";
 	var lp = loadparm_init();
 	var sys = sys_init();
 	var info = new Object();
@@ -480,38 +442,54 @@ function provision(subobj, message, blank, paths, session_info, credentials)
 	setup_ldb("hklm.ldif", info, paths.hklm);
 
 	message("Setting up sam.ldb partitions\n");
+	/* Also wipes the database */
 	setup_ldb("provision_partitions.ldif", info, paths.samdb);
 
+	var samdb = open_ldb(info, paths.samdb, false);
+
 	message("Setting up sam.ldb attributes\n");
-	setup_ldb("provision_init.ldif", info, paths.samdb, NULL, false);
+	setup_add_ldif("provision_init.ldif", info, samdb, false);
 	message("Erasing data from partitions\n");
-	ldb_erase_partitions(info, paths.samdb);
+	ldb_erase_partitions(info, samdb);
 	
-	message("Adding baseDN: " + subobj.BASEDN + "\n");
-	setup_ldb("provision_basedn.ldif", info, paths.samdb, NULL, false, true);
+	message("Adding baseDN: " + subobj.BASEDN + " (permitted to fail)\n");
+	setup_add_ldif("provision_basedn.ldif", info, samdb, true);
 	message("Modifying baseDN: " + subobj.BASEDN + "\n");
-	setup_ldb_modify("provision_basedn_modify.ldif", info, paths.samdb)
+	setup_ldb_modify("provision_basedn_modify.ldif", info, samdb);
 
-	message("Setting up sam.ldb schema\n");
-	setup_ldb("schema.ldif", info, paths.samdb, NULL, false);
+	message("Setting up sam.ldb Samba4 schema\n");
+	setup_add_ldif("schema_samba4.ldif", info, samdb, false);
+	message("Setting up sam.ldb AD schema\n");
+	setup_add_ldif("schema.ldif", info, samdb, false);
 	message("Setting up display specifiers\n");
-	setup_ldb("display_specifiers.ldif", info, paths.samdb, NULL, false);
+	setup_add_ldif("display_specifiers.ldif", info, samdb, false);
 	message("Setting up sam.ldb templates\n");
-	setup_ldb("provision_templates.ldif", info, paths.samdb, NULL, false);
+	setup_add_ldif("provision_templates.ldif", info, samdb, false);
 	message("Setting up sam.ldb data\n");
-	setup_ldb("provision.ldif", info, paths.samdb, NULL, false);
+	setup_add_ldif("provision.ldif", info, samdb, false);
 
 	if (blank != false) {
+		var commit_ok = samdb.transaction_commit();
+		if (!commit_ok) {
+			info.message("ldb commit failed: " + samdb.errstring() + "\n");
+			assert(commit_ok);
+		}
 		return true;
 	}
 
 	message("Setting up sam.ldb users and groups\n");
-	setup_ldb("provision_users.ldif", info, paths.samdb, data, false);
+	setup_add_ldif("provision_users.ldif", info, samdb, false);
 
-	if (setup_name_mappings(info, subobj, session_info, credentials) == false) {
+	if (setup_name_mappings(info, subobj, samdb) == false) {
 		return false;
 	}
 
+	var commit_ok = samdb.transaction_commit();
+	if (!commit_ok) {
+		info.message("samdb commit failed: " + samdb.errstring() + "\n");
+		assert(commit_ok);
+	}
+
 	return true;
 }
 
-- 
cgit 


From 1686d107f49102b95b782cc7ff15727f41512d94 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Mon, 14 Aug 2006 11:38:29 +0000
Subject: r17534: Try another group for 'wheel' on True64. (This used to be
 commit 177b713288be9c5d559a27d65e16521cbeefc958)

---
 source4/scripting/libjs/provision.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index 8830c273f5..7663f055f6 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -572,7 +572,7 @@ function provision_guess()
 	subobj.ROOT         = findnss(nss.getpwnam, "root");
 	subobj.NOBODY       = findnss(nss.getpwnam, "nobody");
 	subobj.NOGROUP      = findnss(nss.getgrnam, "nogroup", "nobody");
-	subobj.WHEEL        = findnss(nss.getgrnam, "wheel", "root", "staff");
+	subobj.WHEEL        = findnss(nss.getgrnam, "wheel", "root", "staff", "adm");
 	subobj.BACKUP       = findnss(nss.getgrnam, "backup", "wheel", "root", "staff");
 	subobj.USERS        = findnss(nss.getgrnam, "users", "guest", "other", "unknown");
 	subobj.DNSDOMAIN    = strlower(subobj.REALM);
-- 
cgit 


From c642680e5ba8cf8b58f89f9cad7140b4d1df96e1 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Tue, 15 Aug 2006 02:39:38 +0000
Subject: r17548: It is a good idea to commit the fix (from mkhl) before the
 test that shows the need for...

Martin Kuhl writes:

The ejs function `substitute_var' returns `undefined' when the first
argument ends in a pattern that should be substituted.

For that reason, the second assertion fails in the following test-case:

,----
| libinclude("base.js");
|
| var obj = new Object();
| obj.FOO = "foo";
| obj.BAR = "bar";
| var str1 = "${FOO}:${BAR}";
| var str2 = "${FOO}:${BAR} "; // note the space after the brace
| var sub1 = substitute_var(str1, obj);
| var sub2 = substitute_var(str2, obj);
|
| assert(str1 + " " == str2);
| assert(sub1 + " " == sub2);
`----

The problem is that the function `split' returns a single-element
array in both cases:
a) the string to split doesn't contain the split pattern
b) the string ends with the split pattern

To work around this, the following patch tests this condition and
returns `undefined' only if the string to split (`list[i]') really
didn't contain a closing brace.
(This used to be commit 8a6908200b1e459bc9067a9d1f9635185a7eee16)
---
 source4/scripting/libjs/base.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/base.js b/source4/scripting/libjs/base.js
index fbceabf993..df0bfe0ce9 100644
--- a/source4/scripting/libjs/base.js
+++ b/source4/scripting/libjs/base.js
@@ -72,7 +72,7 @@ function substitute_var(str, subobj)
 	var i;
 	for (i=1;i<list.length;i++) {
 		var list2 = split("}", list[i], 1);
-		if (list2.length < 2) {
+		if ((list2.length < 2) && (list2[0] + "}" != list[i])) {
 			return undefined;
 		}
 		var key = list2[0];
-- 
cgit 


From a2eca9174c7803732658a1e6f7e8ed873c4fb6fd Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Thu, 17 Aug 2006 13:37:04 +0000
Subject: r17586: merge lib/netif into lib/socket and use -lnsl -lsocket on the
 configure check for the interfaces.

should fix the build on some old sun boxes

metze
(This used to be commit f20e251bfd9f1eb7ce5c00739631b1625a2aa467)
---
 source4/scripting/ejs/smbcalls_config.c | 2 +-
 source4/scripting/ejs/smbcalls_sys.c    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_config.c b/source4/scripting/ejs/smbcalls_config.c
index 2827920bd0..5da0dd14f0 100644
--- a/source4/scripting/ejs/smbcalls_config.c
+++ b/source4/scripting/ejs/smbcalls_config.c
@@ -25,7 +25,7 @@
 #include "lib/appweb/ejs/ejs.h"
 #include "param/loadparm.h"
 #include "system/network.h"
-#include "netif/netif.h"
+#include "lib/socket/netif.h"
 
 /*
   return a list of defined services
diff --git a/source4/scripting/ejs/smbcalls_sys.c b/source4/scripting/ejs/smbcalls_sys.c
index 860002e1d7..d8aaf3898a 100644
--- a/source4/scripting/ejs/smbcalls_sys.c
+++ b/source4/scripting/ejs/smbcalls_sys.c
@@ -26,7 +26,7 @@
 #include "lib/ldb/include/ldb.h"
 #include "system/time.h"
 #include "system/network.h"
-#include "netif/netif.h"
+#include "lib/socket/netif.h"
 
 /*
   return the list of configured network interfaces
-- 
cgit 


From a46beefeb798f63a92f73b2658fd03fa96b55fcb Mon Sep 17 00:00:00 2001
From: Simo Sorce <idra@samba.org>
Date: Mon, 21 Aug 2006 03:52:43 +0000
Subject: r17648: update minschema.js this version returns also oMSyntax and
 oMObjectClass and also use the right value for the objects CNs

add a nasty hack to ejs' mprLdbMessage() to handle binary blobs situations
(This used to be commit 8dd1c1c05bc592d76d6e34b303048faf05c0fa6e)
---
 source4/scripting/ejs/mprutil.c | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/mprutil.c b/source4/scripting/ejs/mprutil.c
index 419cb4869e..e921b11475 100644
--- a/source4/scripting/ejs/mprutil.c
+++ b/source4/scripting/ejs/mprutil.c
@@ -184,7 +184,13 @@ static struct MprVar mprLdbMessage(struct ldb_context *ldb, struct ldb_message *
 			if (attr->ldif_write_fn(ldb, msg, &el->values[0], &v) != 0) {
 				goto failed;
 			}
-			val = mprData(v.data, v.length);
+			/* FIXME: nasty hack, remove me when ejs will support
+			 * arbitrary string and does not truncate on \0 */
+			if (strlen((char *)v.data) != v.length) {
+				val = mprDataBlob(v);
+			} else {
+				val = mprData(v.data, v.length);
+			}
 		} else {
 			int j;
 			val = mprArray(el->name);
@@ -193,7 +199,13 @@ static struct MprVar mprLdbMessage(struct ldb_context *ldb, struct ldb_message *
 							&el->values[j], &v) != 0) {
 					goto failed;
 				}
-				mprAddArray(&val, j, mprData(v.data, v.length));
+				/* FIXME: nasty hack, remove me when ejs will support
+				 * arbitrary string and does not truncate on \0 */
+				if (strlen((char *)v.data) != v.length) {
+					mprAddArray(&val, j, mprDataBlob(v));
+				} else {
+					mprAddArray(&val, j, mprData(v.data, v.length));
+				}
 			}
 		}
 		mprSetVar(&var, el->name, val);
-- 
cgit 


From 4c69b46944b9ddc765b5a48deb2e3edea5e240d8 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Tue, 22 Aug 2006 10:19:46 +0000
Subject: r17704: Add comments suggesting how to get the LDAP backend working.

Shutdown and reload the LDB, so the entryUUID module knows to read the
schema (will be changed once we have a central schema store and
notifications).

Andrew Bartlett
(This used to be commit d5814b689eedfc4c4701beb18a516db716a466f1)
---
 source4/scripting/libjs/provision.js | 26 +++++++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index 7663f055f6..f8d321e8cb 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -236,6 +236,7 @@ function open_ldb(info, dbname, erase)
 
 	var connect_ok = ldb.connect(dbname);
 	if (!connect_ok) {
+		var lp = loadparm_init();
 		sys.unlink(sprintf("%s/%s", lp.get("private dir"), dbname));
 		connect_ok = ldb.connect(dbname);
 		assert(connect_ok);
@@ -307,8 +308,9 @@ function setup_ldb_modify(ldif, info, ldb)
 	var mod_ok = ldb.modify(data);
 	if (!mod_ok) {
 		info.message("ldb load failed: " + ldb.errstring() + "\n");
-		assert(mod_ok);
+		return mod_ok;
 	}
+	return mod_ok;
 }
 
 /*
@@ -453,14 +455,32 @@ function provision(subobj, message, blank, paths, session_info, credentials)
 	ldb_erase_partitions(info, samdb);
 	
 	message("Adding baseDN: " + subobj.BASEDN + " (permitted to fail)\n");
-	setup_add_ldif("provision_basedn.ldif", info, samdb, true);
+	var add_ok = setup_add_ldif("provision_basedn.ldif", info, samdb, true);
 	message("Modifying baseDN: " + subobj.BASEDN + "\n");
-	setup_ldb_modify("provision_basedn_modify.ldif", info, samdb);
+	var modify_ok = setup_ldb_modify("provision_basedn_modify.ldif", info, samdb);
+	if (!modify_ok) {
+		if (!add_ok) {
+			message("Failed to both add and modify " + subobj.BASEDN + " in target " + subobj.LDAPBACKEND + "\n");
+			message("Perhaps you need to run the provision script with the --ldap-base-dn option, and add this record to the backend manually\n"); 
+		};
+		assert(modify_ok);
+	};
 
 	message("Setting up sam.ldb Samba4 schema\n");
 	setup_add_ldif("schema_samba4.ldif", info, samdb, false);
 	message("Setting up sam.ldb AD schema\n");
 	setup_add_ldif("schema.ldif", info, samdb, false);
+
+	// (hack) Reload, now we have the schema loaded.  
+	var commit_ok = samdb.transaction_commit();
+	if (!commit_ok) {
+		info.message("samdb commit failed: " + samdb.errstring() + "\n");
+		assert(commit_ok);
+	}
+	samdb.close();
+
+	samdb = open_ldb(info, paths.samdb, false);
+
 	message("Setting up display specifiers\n");
 	setup_add_ldif("display_specifiers.ldif", info, samdb, false);
 	message("Setting up sam.ldb templates\n");
-- 
cgit 


From 2fe8a02f98b6c5a1788f209b3e2ed4231323b6b0 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Thu, 24 Aug 2006 11:13:13 +0000
Subject: r17791: get rid of another compiler warning

metze
(This used to be commit ba866665f5baffc1dc703d60114b9f1856c4b886)
---
 source4/scripting/ejs/smbcalls_string.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_string.c b/source4/scripting/ejs/smbcalls_string.c
index 2eb9a1b3f7..d5884cb00f 100644
--- a/source4/scripting/ejs/smbcalls_string.c
+++ b/source4/scripting/ejs/smbcalls_string.c
@@ -242,13 +242,14 @@ failed:
   usage:
      str = sprintf("i=%d s=%7s", 7, "foo");
 */
+typedef char *(*_asprintf_append_t)(char *, const char *, ...);
 static int ejs_sprintf(MprVarHandle eid, int argc, struct MprVar **argv)
 {
 	const char *format;
 	const char *p;
 	char *ret;
 	int a = 1;
-	char *(*_asprintf_append)(char *, const char *, ...);
+	_asprintf_append_t _asprintf_append;
 	TALLOC_CTX *tmp_ctx;
 	if (argc < 1 || argv[0]->type != MPR_TYPE_STRING) {
 		ejsSetErrorMsg(eid, "sprintf invalid arguments");
@@ -259,7 +260,7 @@ static int ejs_sprintf(MprVarHandle eid, int argc, struct MprVar **argv)
 	ret = talloc_strdup(tmp_ctx, "");
 
 	/* avoid all the format string warnings */
-	_asprintf_append = talloc_asprintf_append;
+	_asprintf_append = (_asprintf_append_t)talloc_asprintf_append;
 
 	/*
 	  hackity hack ...
-- 
cgit 


From 2b99336a56a47838510f9b8a01aab05363c424b6 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Mon, 28 Aug 2006 05:26:42 +0000
Subject: r17876: Require one less patch for the LDAP backend to work.

This lets the modules or backend generate the host and domain GUID,
rather than the randguid() function.  These can still be specified
from the command line.

Andrew Bartlett
(This used to be commit 32996ca9d62568006f8bee85a1f2f37c64c04fb5)
---
 source4/scripting/libjs/provision.js | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index f8d321e8cb..d8abcc352f 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -164,6 +164,8 @@ function ldb_erase(ldb)
 	ldb.del("@ATTRIBUTES");
 	ldb.del("@SUBCLASSES");
 	ldb.del("@MODULES");
+	ldb.del("@PARTITION");
+	ldb.del("@KLUDGEACL");
 
 	/* and the rest */
 	var res = ldb.search("(&(|(objectclass=*)(dn=*))(!(dn=@BASEINFO)))", attrs);
@@ -198,6 +200,9 @@ function ldb_erase_partitions(info, ldb)
 	var res = ldb.search("(objectClass=*)", "", ldb.SCOPE_BASE, rootDSE_attrs);
 	assert(typeof(res) != "undefined");
 	assert(res.length == 1);
+	if (typeof(res[0].namingContexts) == "undefined") {
+		return;
+	}	
 	for (j=0; j<res[0].namingContexts.length; j++) {
 		var attrs = new Array("dn");
 		var basedn = res[0].namingContexts[j];
@@ -416,6 +421,18 @@ function provision(subobj, message, blank, paths, session_info, credentials)
 	assert(valid_netbios_name(subobj.NETBIOSNAME));
 	var rdns = split(",", subobj.BASEDN);
 	subobj.RDN_DC = substr(rdns[0], strlen("DC="));
+	
+	if (subobj.DOMAINGUID != undefined) {
+		subobj.DOMAINGUID_MOD = sprintf("replace: objectGUID\nobjectGUID: %s\n-", subobj.DOMAINGUID);
+	} else {
+		subobj.DOMAINGUID_MOD = "";
+	}
+
+	if (subobj.HOSTGUID != undefined) {
+		subobj.HOSTGUID_ADD = sprintf("objectGUID: %s", subobj.HOSTGUID);
+	} else {
+		subobj.HOSTGUID_ADD = "";
+	}
 
 	info.subobj = subobj;
 	info.message = message;
@@ -525,7 +542,9 @@ function provision_dns(subobj, message, paths, session_info, credentials)
 	var ok = ldb.connect(paths.samdb);
 	assert(ok);
 
-	/* These values may have changed, due to an incoming SamSync, so fetch them from the database */
+	/* These values may have changed, due to an incoming SamSync,
+           or may not have been specified, so fetch them from the database */
+
 	var attrs = new Array("objectGUID");
 	res = ldb.search("objectGUID=*", subobj.BASEDN, ldb.SCOPE_BASE, attrs);
 	assert(res.length == 1 && res[0].objectGUID != undefined)
@@ -574,12 +593,10 @@ function provision_guess()
 	assert(subobj.REALM);
 	assert(subobj.DOMAIN);
 	assert(subobj.HOSTNAME);
-
+	
 	subobj.VERSION      = version();
 	subobj.HOSTIP       = hostip();
-	subobj.DOMAINGUID   = randguid();
 	subobj.DOMAINSID    = randsid();
-	subobj.HOSTGUID     = randguid();
 	subobj.INVOCATIONID = randguid();
 	subobj.KRBTGTPASS   = randpass(12);
 	subobj.MACHINEPASS  = randpass(12);
-- 
cgit 


From 787a4d6f45007b8f04b7d14e347a7122676faff6 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Mon, 28 Aug 2006 17:17:39 +0000
Subject: r17888: use talloc_*_ptrtype() macros as wrappers arround the
 talloc_*_size() functions to get rid of c++ warnings

metze
(This used to be commit 7579503bb886e9c4cc08756013f5311ce550c9fd)
---
 source4/scripting/ejs/ejsrpc.h | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/ejsrpc.h b/source4/scripting/ejs/ejsrpc.h
index a320392201..bc9a38fcb3 100644
--- a/source4/scripting/ejs/ejsrpc.h
+++ b/source4/scripting/ejs/ejsrpc.h
@@ -139,20 +139,16 @@ NTSTATUS ejs_pull_winreg_String(struct ejs_rpc *ejs,
 NTSTATUS ejs_push_winreg_String(struct ejs_rpc *ejs, 
 			     struct MprVar *v, const char *name, const struct winreg_String *r);
 
-#define EJS_ALLOC_SIZE(ejs, s, size) do { \
-  (s) = talloc_size(ejs, size); \
+#define EJS_ALLOC(ejs, s) do { \
+  (s) = talloc_ptrtype(ejs, (s)); \
   if (!(s)) return ejs_panic(ejs, "out of memory"); \
 } while (0)
 
-#define EJS_ALLOC(ejs, s) EJS_ALLOC_SIZE(ejs, s, sizeof(*(s)))
-
-#define EJS_ALLOC_N_SIZE(ejs, s, n, elsize) do { \
-	(s) = talloc_array_size(ejs, elsize, n); \
+#define EJS_ALLOC_N(ejs, s, n) do { \
+	(s) = talloc_array_ptrtype(ejs, (s), n); \
 	if (!(s)) return ejs_panic(ejs, "out of memory"); \
 } while (0)
 
-#define EJS_ALLOC_N(ejs, s, n) EJS_ALLOC_N_SIZE(ejs, s, n, sizeof(*(s)))
-
 /* some types are equivalent for ejs */
 #define ejs_pull_dom_sid2 ejs_pull_dom_sid
 #define ejs_push_dom_sid2 ejs_push_dom_sid
-- 
cgit 


From 0329d755a7611ba3897fc1ee9bdce410cc33d7f8 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Wed, 30 Aug 2006 11:29:34 +0000
Subject: r17930: Merge noinclude branch:  * Move dlinklist.h, smb.h to
 subsystem-specific directories  * Clean up ads.h and move what is left of it
 to dsdb/    (only place where it's used) (This used to be commit
 f7afa1cb77f3cfa7020b57de12e6003db7cfcc42)

---
 source4/scripting/ejs/smbcalls_rpc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_rpc.c b/source4/scripting/ejs/smbcalls_rpc.c
index 29346f2586..76b5f0d695 100644
--- a/source4/scripting/ejs/smbcalls_rpc.c
+++ b/source4/scripting/ejs/smbcalls_rpc.c
@@ -27,7 +27,7 @@
 #include "lib/cmdline/popt_common.h"
 #include "lib/messaging/irpc.h"
 #include "scripting/ejs/ejsrpc.h"
-#include "dlinklist.h"
+#include "lib/util/dlinklist.h"
 #include "lib/events/events.h"
 #include "librpc/rpc/dcerpc_table.h"
 #include "auth/credentials/credentials.h"
-- 
cgit 


From ba1c80524ae34662b11b4c5acbaa90d831a5213a Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Fri, 1 Sep 2006 04:34:21 +0000
Subject: r17982: One final hack...

When against a real, schema-checking LDAP backend, we need
extensibleObject on the baseDN entry (as entryUUID isn't run for
creating this basic ldif) output.
(This used to be commit befac43f59c4688f6c6827eb2e4e916c1056a740)
---
 source4/scripting/libjs/provision.js | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index d8abcc352f..cd09962931 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -565,6 +565,8 @@ function provision_ldapbase(subobj, message, paths)
 {
 	message("Setting up LDAP base entry: " + subobj.BASEDN + " \n");
 	var rdns = split(",", subobj.BASEDN);
+	subobj.EXTENSIBLEOBJECT = "objectClass: extensibleObject";
+
 	subobj.RDN_DC = substr(rdns[0], strlen("DC="));
 
 	setup_file("provision_basedn.ldif", 
@@ -619,6 +621,7 @@ function provision_guess()
 	rdn_list = split(".", subobj.DNSDOMAIN);
 	subobj.BASEDN       = "DC=" + join(",DC=", rdn_list);
 	subobj.LDAPBACKEND  = "users.ldb";
+	subobj.EXTENSIBLEOBJECT = "# no objectClass: extensibleObject for local ldb";
 	return subobj;
 }
 
-- 
cgit 


From 3a70ec899a2d408bfc11cc21a3f470d22c080c15 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Tue, 5 Sep 2006 10:45:05 +0000
Subject: r18072: Really delete things in the base partition, after we changed
 where the default search scope points to.

Andrew Bartlett
(This used to be commit 1a111817a361faab04e73b666624ce554f000034)
---
 source4/scripting/libjs/provision.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index cd09962931..ea0f138260 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -168,7 +168,8 @@ function ldb_erase(ldb)
 	ldb.del("@KLUDGEACL");
 
 	/* and the rest */
-	var res = ldb.search("(&(|(objectclass=*)(dn=*))(!(dn=@BASEINFO)))", attrs);
+     	var basedn = "";
+     	var res = ldb.search("(&(|(objectclass=*)(dn=*))(!(dn=@BASEINFO)))", basedn, ldb.SCOPE_SUBTREE, attrs);
 	var i;
 	if (typeof(res) == "undefined") {
 		ldb_delete(ldb);
@@ -177,10 +178,8 @@ function ldb_erase(ldb)
 	for (i=0;i<res.length;i++) {
 		ldb.del(res[i].dn);
 	}
-	/* extra hack to ensure it's gone on remote ldap */
-	ldb.del("cn=ROOTDSE");
 
-	var res = ldb.search("(&(|(objectclass=*)(dn=*))(!(dn=@BASEINFO)))", attrs);
+     	var res = ldb.search("(&(|(objectclass=*)(dn=*))(!(dn=@BASEINFO)))", basedn, ldb.SCOPE_SUBTREE, attrs);
 	if (res.length != 0) {
 		ldb_delete(ldb);
 		return;
-- 
cgit 


From b7477fb3881ac4490da040b054094a865128b951 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Wed, 6 Sep 2006 00:35:29 +0000
Subject: r18117: first steps in making samba4 use libreplace (This used to be
 commit c079cedb084d621c5a0aac59310b237ba375df20)

---
 source4/scripting/ejs/config.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/config.mk b/source4/scripting/ejs/config.mk
index ca73ce279a..8c7e9cd53d 100644
--- a/source4/scripting/ejs/config.mk
+++ b/source4/scripting/ejs/config.mk
@@ -76,7 +76,7 @@ OBJ_FILES = \
 PUBLIC_DEPENDENCIES = \
 		EJS LIBSAMBA-UTIL \
 		EJSRPC MESSAGING \
-		LIBSAMBA-NET LIBCLI_SMB LIBPOPT \
+		LIBSAMBA-NET LIBCLI_SMB POPT_EXT \
 		POPT_CREDENTIALS POPT_SAMBA \
 		dcerpc \
 		NDR_TABLE
-- 
cgit 


From a59706f721c70e9a4f78eb2296bb746b912ce9d0 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Wed, 6 Sep 2006 01:36:02 +0000
Subject: r18121: Simplify m4 code, hopefully fix Samba4 build problems. (This
 used to be commit 1adf65b4d7c5d2d4f65d4b28575bdf2368a42139)

---
 source4/scripting/ejs/config.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/config.mk b/source4/scripting/ejs/config.mk
index 8c7e9cd53d..ca73ce279a 100644
--- a/source4/scripting/ejs/config.mk
+++ b/source4/scripting/ejs/config.mk
@@ -76,7 +76,7 @@ OBJ_FILES = \
 PUBLIC_DEPENDENCIES = \
 		EJS LIBSAMBA-UTIL \
 		EJSRPC MESSAGING \
-		LIBSAMBA-NET LIBCLI_SMB POPT_EXT \
+		LIBSAMBA-NET LIBCLI_SMB LIBPOPT \
 		POPT_CREDENTIALS POPT_SAMBA \
 		dcerpc \
 		NDR_TABLE
-- 
cgit 


From 0cee00cddc77ae9fd297ef9d09ee7b09edce6d66 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Wed, 6 Sep 2006 05:54:43 +0000
Subject: r18135: almost there .... (This used to be commit
 cefcccb51948fb17fbc803325e8ab13103164f93)

---
 source4/scripting/ejs/config.mk | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/config.mk b/source4/scripting/ejs/config.mk
index ca73ce279a..e363e36adf 100644
--- a/source4/scripting/ejs/config.mk
+++ b/source4/scripting/ejs/config.mk
@@ -10,6 +10,7 @@ OBJ_FILES = \
 OBJ_FILES = smbcalls_config.o
 SUBSYSTEM = smbcalls
 INIT_FUNCTION = smb_setup_ejs_config
+PUBLIC_DEPENDENCIES = LIBREPLACE
 
 [MODULE::smbcalls_ldb]
 OBJ_FILES = smbcalls_ldb.o
@@ -31,32 +32,38 @@ PUBLIC_DEPENDENCIES = LIBSAMBA3
 OBJ_FILES = smbcalls_rand.o
 SUBSYSTEM = smbcalls
 INIT_FUNCTION = smb_setup_ejs_random
+PUBLIC_DEPENDENCIES = LIBREPLACE
 
 [MODULE::smbcalls_nss]
 OBJ_FILES = smbcalls_nss.o
 SUBSYSTEM = smbcalls
 INIT_FUNCTION = smb_setup_ejs_nss
+PUBLIC_DEPENDENCIES = LIBREPLACE
 
 [MODULE::smbcalls_data]
 OBJ_FILES = smbcalls_data.o
 SUBSYSTEM = smbcalls
 INIT_FUNCTION = smb_setup_ejs_datablob
+PUBLIC_DEPENDENCIES = LIBREPLACE
 
 [MODULE::smbcalls_auth]
 OBJ_FILES = smbcalls_auth.o
 SUBSYSTEM = smbcalls
 INIT_FUNCTION = smb_setup_ejs_auth
 PUBLIC_DEPENDENCIES = auth
+PUBLIC_DEPENDENCIES = LIBREPLACE
 
 [MODULE::smbcalls_string]
 OBJ_FILES = smbcalls_string.o
 SUBSYSTEM = smbcalls
 INIT_FUNCTION = smb_setup_ejs_string
+PUBLIC_DEPENDENCIES = LIBREPLACE
 
 [MODULE::smbcalls_sys]
 OBJ_FILES = smbcalls_sys.o
 SUBSYSTEM = smbcalls
 INIT_FUNCTION = smb_setup_ejs_system
+PUBLIC_DEPENDENCIES = LIBREPLACE
 
 #######################
 # Start LIBRARY smbcalls
@@ -76,7 +83,7 @@ OBJ_FILES = \
 PUBLIC_DEPENDENCIES = \
 		EJS LIBSAMBA-UTIL \
 		EJSRPC MESSAGING \
-		LIBSAMBA-NET LIBCLI_SMB LIBPOPT \
+		LIBSAMBA-NET LIBCLI_SMB LIBPOPT LIBREPLACE \
 		POPT_CREDENTIALS POPT_SAMBA \
 		dcerpc \
 		NDR_TABLE
-- 
cgit 


From a46e12d0e07e1630f8ef15aff0f97cb2f1f4c273 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Thu, 7 Sep 2006 10:02:32 +0000
Subject: r18213: don't list LIBREPLACE depdendecies explicit and always at it
 as first private dependencies

metze
(This used to be commit 135d096776b53ae09ffc2b4f767dfbd18139570f)
---
 source4/scripting/ejs/config.mk | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/config.mk b/source4/scripting/ejs/config.mk
index e363e36adf..ca73ce279a 100644
--- a/source4/scripting/ejs/config.mk
+++ b/source4/scripting/ejs/config.mk
@@ -10,7 +10,6 @@ OBJ_FILES = \
 OBJ_FILES = smbcalls_config.o
 SUBSYSTEM = smbcalls
 INIT_FUNCTION = smb_setup_ejs_config
-PUBLIC_DEPENDENCIES = LIBREPLACE
 
 [MODULE::smbcalls_ldb]
 OBJ_FILES = smbcalls_ldb.o
@@ -32,38 +31,32 @@ PUBLIC_DEPENDENCIES = LIBSAMBA3
 OBJ_FILES = smbcalls_rand.o
 SUBSYSTEM = smbcalls
 INIT_FUNCTION = smb_setup_ejs_random
-PUBLIC_DEPENDENCIES = LIBREPLACE
 
 [MODULE::smbcalls_nss]
 OBJ_FILES = smbcalls_nss.o
 SUBSYSTEM = smbcalls
 INIT_FUNCTION = smb_setup_ejs_nss
-PUBLIC_DEPENDENCIES = LIBREPLACE
 
 [MODULE::smbcalls_data]
 OBJ_FILES = smbcalls_data.o
 SUBSYSTEM = smbcalls
 INIT_FUNCTION = smb_setup_ejs_datablob
-PUBLIC_DEPENDENCIES = LIBREPLACE
 
 [MODULE::smbcalls_auth]
 OBJ_FILES = smbcalls_auth.o
 SUBSYSTEM = smbcalls
 INIT_FUNCTION = smb_setup_ejs_auth
 PUBLIC_DEPENDENCIES = auth
-PUBLIC_DEPENDENCIES = LIBREPLACE
 
 [MODULE::smbcalls_string]
 OBJ_FILES = smbcalls_string.o
 SUBSYSTEM = smbcalls
 INIT_FUNCTION = smb_setup_ejs_string
-PUBLIC_DEPENDENCIES = LIBREPLACE
 
 [MODULE::smbcalls_sys]
 OBJ_FILES = smbcalls_sys.o
 SUBSYSTEM = smbcalls
 INIT_FUNCTION = smb_setup_ejs_system
-PUBLIC_DEPENDENCIES = LIBREPLACE
 
 #######################
 # Start LIBRARY smbcalls
@@ -83,7 +76,7 @@ OBJ_FILES = \
 PUBLIC_DEPENDENCIES = \
 		EJS LIBSAMBA-UTIL \
 		EJSRPC MESSAGING \
-		LIBSAMBA-NET LIBCLI_SMB LIBPOPT LIBREPLACE \
+		LIBSAMBA-NET LIBCLI_SMB LIBPOPT \
 		POPT_CREDENTIALS POPT_SAMBA \
 		dcerpc \
 		NDR_TABLE
-- 
cgit 


From 932265660e95cb2b4f0134bfec79e119fb89df8a Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Fri, 8 Sep 2006 04:36:00 +0000
Subject: r18248: Bail out with a error message if this search fails for some
 reason.

Andrew Bartlett
(This used to be commit 77b810f548fffc1298978cc92c842f5e4fc13786)
---
 source4/scripting/libjs/provision.js | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index ea0f138260..952112b3ae 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -224,6 +224,10 @@ function ldb_erase_partitions(info, ldb)
 			}
 			
 			var res3 = ldb.search("(|(objectclass=*)(dn=*))", basedn, ldb.SCOPE_SUBTREE, attrs);
+			if (typeof(res3) == "undefined") {
+				info.message("ldb search failed: " + ldb.errstring() + "\n");
+				continue;
+			}
 			if (res3.length != 0) {
 				info.message("Failed to delete all records under " + basedn + ", " + res3.length + " records remaining\n");
 			}
-- 
cgit 


From ee66b69a8bd6ec5291cdbc3071fdd01f3784c5a8 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Sun, 10 Sep 2006 12:12:24 +0000
Subject: r18334: AIX 5.1 doesn't have any of 'users', 'guest', 'other' or
 'unknown'

it does have 'usr'
(This used to be commit 96db975024a744f42a0418e379df1da6c4079fe6)
---
 source4/scripting/libjs/provision.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index 952112b3ae..1328cfe8fe 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -616,7 +616,7 @@ function provision_guess()
 	subobj.NOGROUP      = findnss(nss.getgrnam, "nogroup", "nobody");
 	subobj.WHEEL        = findnss(nss.getgrnam, "wheel", "root", "staff", "adm");
 	subobj.BACKUP       = findnss(nss.getgrnam, "backup", "wheel", "root", "staff");
-	subobj.USERS        = findnss(nss.getgrnam, "users", "guest", "other", "unknown");
+	subobj.USERS        = findnss(nss.getgrnam, "users", "guest", "other", "unknown", "usr");
 	subobj.DNSDOMAIN    = strlower(subobj.REALM);
 	subobj.DNSNAME      = sprintf("%s.%s", 
 				      strlower(subobj.HOSTNAME), 
-- 
cgit 


From 48f34499695c379d483da473b888aaa02bb5646d Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Fri, 15 Sep 2006 20:55:43 +0000
Subject: r18567: fixed the winreg js code for the new names of the fields in
 winreg.idl

When changing a field name in idl, please remember to check for use of
those functions in any js code as well.
(This used to be commit 7005806aa6842ffc3d5ed98682f2aefc59759580)
---
 source4/scripting/libjs/winreg.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/winreg.js b/source4/scripting/libjs/winreg.js
index 3b05f89c93..29338abc5a 100644
--- a/source4/scripting/libjs/winreg.js
+++ b/source4/scripting/libjs/winreg.js
@@ -80,7 +80,7 @@ function __winreg_open_path(path)
 	}
 
 	io = irpcObj();
-	io.input.handle  = handle;
+	io.input.parent_handle  = handle;
 	io.input.keyname = hpath;
 	io.input.unknown = 0;
 	io.input.access_mask = this.SEC_FLAG_MAXIMUM_ALLOWED;
@@ -122,10 +122,10 @@ function __winreg_enum_path(path)
 	io.input.name.length = 0;
 	io.input.name.size   = 32;
 	io.input.name.name   = NULL;
-	io.input.class = new Object();
-	io.input.class.length = 0;
-	io.input.class.size   = 1024;
-	io.input.class.name   = NULL;
+	io.input.keyclass = new Object();
+	io.input.keyclass.length = 0;
+	io.input.keyclass.size   = 1024;
+	io.input.keyclass.name   = NULL;
 	io.input.last_changed_time = 0;
 
 	var idx = 0;
@@ -239,7 +239,7 @@ function __winreg_create_key(path, key)
 	var io = irpcObj();
 	io.input.handle = handle;
 	io.input.name = key;
-	io.input.class = NULL;
+	io.input.keyclass = NULL;
 	io.input.options = 0;
 	io.input.access_mask = this.SEC_FLAG_MAXIMUM_ALLOWED;
 	io.input.secdesc = NULL;
-- 
cgit 


From 5be2871481af5607d0886a35d2608aabf2de83bc Mon Sep 17 00:00:00 2001
From: Derrell Lipman <derrell@samba.org>
Date: Sat, 23 Sep 2006 19:17:50 +0000
Subject: r18850: add strspn() function i ejs (This used to be commit
 e8f892bedc65042565442ac802df6eda96388f14)

---
 source4/scripting/ejs/smbcalls_string.c | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_string.c b/source4/scripting/ejs/smbcalls_string.c
index d5884cb00f..403de7ba35 100644
--- a/source4/scripting/ejs/smbcalls_string.c
+++ b/source4/scripting/ejs/smbcalls_string.c
@@ -89,6 +89,22 @@ static int ejs_strstr(MprVarHandle eid, int argc, char **argv)
 	return 0;
 }
 
+/*
+  usage:
+      var s = strspn(string, legal_chars_string);
+*/
+static int ejs_strspn(MprVarHandle eid, int argc, char **argv)
+{
+        int len;
+	if (argc != 2) {
+		ejsSetErrorMsg(eid, "strspn invalid arguments");
+		return -1;
+	}
+	len = strspn(argv[0], argv[1]);
+	mpr_Return(eid, mprCreateIntegerVar(len));
+	return 0;
+}
+
 /*
   usage:
      list = split(".", "a.foo.bar");
@@ -493,6 +509,7 @@ static int ejs_string_init(MprVarHandle eid, int argc, struct MprVar **argv)
 	mprSetStringCFunction(obj, "strlower", ejs_strlower);
 	mprSetStringCFunction(obj, "strupper", ejs_strupper);
 	mprSetStringCFunction(obj, "strstr", ejs_strstr);
+	mprSetStringCFunction(obj, "strspn", ejs_strspn);
 	mprSetCFunction(obj, "split", ejs_split);
 	mprSetCFunction(obj, "join", ejs_join);
 	mprSetCFunction(obj, "sprintf", ejs_sprintf);
-- 
cgit 


From c5718959e6a6d0454a870cbd311e707e69c98e85 Mon Sep 17 00:00:00 2001
From: Derrell Lipman <derrell@samba.org>
Date: Mon, 25 Sep 2006 02:49:56 +0000
Subject: r18880: JSON-RPC work in progress (This used to be commit
 34bffbaebf50c2a75c91285d5ec82e8f377981cc)

---
 source4/scripting/ejs/smbcalls.c     | 82 +++++++++++++++++++++++++++++++++++
 source4/scripting/ejs/smbcalls_sys.c | 84 ++++++++++++++++++++++++++++++++++++
 source4/scripting/libjs/provision.js |  2 +-
 3 files changed, 167 insertions(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls.c b/source4/scripting/ejs/smbcalls.c
index 1bfbd3b47a..85cc5f7027 100644
--- a/source4/scripting/ejs/smbcalls.c
+++ b/source4/scripting/ejs/smbcalls.c
@@ -66,6 +66,45 @@ static int ejs_typeof(MprVarHandle eid, int argc, struct MprVar **argv)
 	return 0;
 }
 
+/*
+  return the native type of a variable
+*/
+static int ejs_typeof_native(MprVarHandle eid, int argc, struct MprVar **argv)
+{
+	const struct {
+		MprType type;
+		const char *name;
+	} types[] = {
+		{ MPR_TYPE_UNDEFINED,        "undefined" },
+		{ MPR_TYPE_NULL,             "null" },
+		{ MPR_TYPE_BOOL,             "boolean" },
+		{ MPR_TYPE_CFUNCTION,        "c_function" },
+		{ MPR_TYPE_FLOAT,            "float" },
+		{ MPR_TYPE_INT,              "integer" },
+		{ MPR_TYPE_INT64,            "integer64" },
+		{ MPR_TYPE_OBJECT,           "object" },
+		{ MPR_TYPE_FUNCTION,         "function" },
+		{ MPR_TYPE_STRING,           "string" },
+		{ MPR_TYPE_STRING_CFUNCTION, "string_c_function" },
+		{ MPR_TYPE_PTR,              "pointer" }
+	};
+	int i;
+	const char *type = NULL;
+
+	if (argc != 1) return -1;
+	
+	for (i=0;i<ARRAY_SIZE(types);i++) {
+		if (argv[0]->type == types[i].type) {
+			type = types[i].name;
+			break;
+		}
+	}
+	if (type == NULL) return -1;
+
+	mpr_ReturnString(eid, type);
+	return 0;
+}
+
 /*
   libinclude() allows you to include js files using a search path specified
   in "js include =" in smb.conf. 
@@ -112,6 +151,47 @@ static int ejs_libinclude(int eid, int argc, char **argv)
 	return 0;
 }
 
+/*
+  jsonrpc_include() allows you to include jsonrpc files from a path
+  based at "jsonrpc base =" in smb.conf.
+*/
+static int ejs_jsonrpc_include(int eid, int argc, char **argv)
+{
+        int ret = -1;
+        char *path;
+        char *emsg;
+	const char *jsonrpc_base = lp_jsonrpc_base();
+        struct MprVar result;
+
+
+	if (jsonrpc_base == NULL || jsonrpc_base == NULL) {
+		ejsSetErrorMsg(eid, "js include path not set");
+		return -1;
+	}
+
+        if (argc != 1) {
+                mpr_Return(eid, mprCreateIntegerVar(-1));
+		return 0;
+        }
+
+        path = talloc_asprintf(mprMemCtx(), "%s/%s", jsonrpc_base, argv[0]);
+        if (path == NULL) {
+                mpr_Return(eid, mprCreateIntegerVar(-1));
+                return 0;
+        }
+
+        if (file_exist(path)) {
+                ret = ejsEvalFile(eid, path, &result, &emsg);
+                if (ret < 0) {
+                        printf("file found; ret=%d (%s)\n", ret, emsg);
+                }
+        }
+        
+        mpr_Return(eid, mprCreateIntegerVar(ret));
+        talloc_free(path);
+	return 0;
+}
+
 /*
   return the current version
 */
@@ -153,7 +233,9 @@ void smb_setup_ejs_functions(void (*exception_handler)(const char *))
 	talloc_free(shared_init);
 
 	ejsDefineCFunction(-1, "typeof", ejs_typeof, NULL, MPR_VAR_SCRIPT_HANDLE);
+	ejsDefineCFunction(-1, "nativeTypeOf", ejs_typeof_native, NULL, MPR_VAR_SCRIPT_HANDLE);
 	ejsDefineStringCFunction(-1, "libinclude", ejs_libinclude, NULL, MPR_VAR_SCRIPT_HANDLE);
+	ejsDefineStringCFunction(-1, "jsonrpc_include", ejs_jsonrpc_include, NULL, MPR_VAR_SCRIPT_HANDLE);
 	ejsDefineCFunction(-1, "version", ejs_version, NULL, MPR_VAR_SCRIPT_HANDLE);
 }
 
diff --git a/source4/scripting/ejs/smbcalls_sys.c b/source4/scripting/ejs/smbcalls_sys.c
index d8aaf3898a..42990f49c0 100644
--- a/source4/scripting/ejs/smbcalls_sys.c
+++ b/source4/scripting/ejs/smbcalls_sys.c
@@ -57,6 +57,22 @@ static int ejs_sys_hostname(MprVarHandle eid, int argc, struct MprVar **argv)
 }
 
 
+/*
+  return current time as seconds and microseconds
+*/
+static int ejs_sys_gettimeofday(MprVarHandle eid, int argc, struct MprVar **argv)
+{
+	struct timeval tv = timeval_current();
+        struct MprVar v = mprObject("timeval");
+	struct MprVar sec = mprCreateIntegerVar(tv.tv_sec);
+	struct MprVar usec = mprCreateIntegerVar(tv.tv_usec);
+
+        mprCreateProperty(&v, "sec", &sec);
+        mprCreateProperty(&v, "usec", &usec);
+	mpr_Return(eid, v);
+	return 0;
+}
+
 /*
   return current time as a 64 bit nttime value
 */
@@ -85,6 +101,35 @@ static int ejs_sys_unix2nttime(MprVarHandle eid, int argc, struct MprVar **argv)
 	return 0;
 }
 
+/*
+  return the GMT time represented by the struct tm argument, as a time_t value
+*/
+static int ejs_sys_gmmktime(MprVarHandle eid, int argc, struct MprVar **argv)
+{
+	struct MprVar *o;
+	struct tm tm;
+	if (argc != 1 || !mprVarIsObject(argv[0]->type)) {
+		ejsSetErrorMsg(eid, "sys_gmmktime invalid arguments");
+		return -1;
+	}
+
+        o = argv[0];
+#define TM_EL(n) tm.n = mprVarToNumber(mprGetProperty(o, #n, NULL))
+	TM_EL(tm_sec);
+	TM_EL(tm_min);
+	TM_EL(tm_hour);
+	TM_EL(tm_mday);
+	TM_EL(tm_mon);
+	TM_EL(tm_year);
+	TM_EL(tm_wday);
+	TM_EL(tm_yday);
+	TM_EL(tm_isdst);
+#undef TM_EL        
+
+	mpr_Return(eid, mprCreateIntegerVar(mktime(&tm)));
+	return 0;
+}
+
 /*
   return the given time as a gmtime structure
 */
@@ -97,6 +142,41 @@ static int ejs_sys_gmtime(MprVarHandle eid, int argc, struct MprVar **argv)
 		ejsSetErrorMsg(eid, "sys_gmtime invalid arguments");
 		return -1;
 	}
+	t = (time_t) mprVarToNumber(argv[0]);
+	tm = gmtime(&t);
+	if (tm == NULL) {
+		mpr_Return(eid, mprCreateUndefinedVar());
+		return 0;
+	}
+	ret = mprObject("gmtime");
+#define TM_EL(n) mprSetVar(&ret, #n, mprCreateIntegerVar(tm->n))
+	TM_EL(tm_sec);
+	TM_EL(tm_min);
+	TM_EL(tm_hour);
+	TM_EL(tm_mday);
+	TM_EL(tm_mon);
+	TM_EL(tm_year);
+	TM_EL(tm_wday);
+	TM_EL(tm_yday);
+	TM_EL(tm_isdst);
+#undef TM_EL
+
+	mpr_Return(eid, ret);
+	return 0;
+}
+
+/*
+  return the given NT time as a gmtime structure
+*/
+static int ejs_sys_ntgmtime(MprVarHandle eid, int argc, struct MprVar **argv)
+{
+	time_t t;
+	struct MprVar ret;
+	struct tm *tm;
+	if (argc != 1 || !mprVarIsNumber(argv[0]->type)) {
+		ejsSetErrorMsg(eid, "sys_ntgmtime invalid arguments");
+		return -1;
+	}
 	t = nt_time_to_unix(mprVarToNumber(argv[0]));
 	tm = gmtime(&t);
 	if (tm == NULL) {
@@ -114,6 +194,7 @@ static int ejs_sys_gmtime(MprVarHandle eid, int argc, struct MprVar **argv)
 	TM_EL(tm_wday);
 	TM_EL(tm_yday);
 	TM_EL(tm_isdst);
+#undef TM_EL
 
 	mpr_Return(eid, ret);
 	return 0;
@@ -332,8 +413,11 @@ static int ejs_sys_init(MprVarHandle eid, int argc, struct MprVar **argv)
 	mprSetCFunction(obj, "interfaces", ejs_sys_interfaces);
 	mprSetCFunction(obj, "hostname", ejs_sys_hostname);
 	mprSetCFunction(obj, "nttime", ejs_sys_nttime);
+	mprSetCFunction(obj, "getTimeOfDay", ejs_sys_gettimeofday);
 	mprSetCFunction(obj, "unix2nttime", ejs_sys_unix2nttime);
+	mprSetCFunction(obj, "gmmktime", ejs_sys_gmmktime);
 	mprSetCFunction(obj, "gmtime", ejs_sys_gmtime);
+	mprSetCFunction(obj, "ntgmtime", ejs_sys_ntgmtime);
 	mprSetCFunction(obj, "ldaptime", ejs_sys_ldaptime);
 	mprSetCFunction(obj, "httptime", ejs_sys_httptime);
 	mprSetStringCFunction(obj, "unlink", ejs_sys_unlink);
diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index 1328cfe8fe..bba3d124ff 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -113,7 +113,7 @@ function ldaptime()
 */
 function datestring()
 {
-	var t = sys.gmtime(sys.nttime());
+	var t = sys.ntgmtime(sys.nttime());
 	return sprintf("%04u%02u%02u%02u",
 		       t.tm_year+1900, t.tm_mon+1, t.tm_mday, t.tm_hour);
 }
-- 
cgit 


From eaa427801a3aadd92a467ca6df4d41e37fb74810 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Thu, 28 Sep 2006 16:58:28 +0000
Subject: r18977: Seperate these asserts, so we know which fired.

Andrew Bartlett
(This used to be commit 9b2003618b28cb045e74937803e9aad773781803)
---
 source4/scripting/libjs/provision.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index bba3d124ff..fdc86b1cf7 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -550,7 +550,8 @@ function provision_dns(subobj, message, paths, session_info, credentials)
 
 	var attrs = new Array("objectGUID");
 	res = ldb.search("objectGUID=*", subobj.BASEDN, ldb.SCOPE_BASE, attrs);
-	assert(res.length == 1 && res[0].objectGUID != undefined)
+	assert(res.length == 1);
+	assert(res[0].objectGUID != undefined);
 	subobj.DOMAINGUID = res[0].objectGUID;
 
 	subobj.HOSTGUID = searchone(ldb, subobj.BASEDN, "(&(objectClass=computer)(cn=" + subobj.NETBIOSNAME + "))", "objectGUID");
-- 
cgit 


From ad60ec590765607077ae6141b4613a762f69a539 Mon Sep 17 00:00:00 2001
From: Derrell Lipman <derrell@samba.org>
Date: Mon, 2 Oct 2006 02:36:27 +0000
Subject: r19019: Add a parser for javascript literals.  This is implemented
 for parsing JSON strings, but is generally useful for creating ejs variables
 from object or array literals, which aren't supported in the old version of
 ejs that we're using.

This parser is implemented in C, but is callable from an ejs script via
literal_to_var().
(This used to be commit 82fdcd9339a8ffb1016b96c06f7d6580aa759174)
---
 source4/scripting/ejs/config.mk |   3 +-
 source4/scripting/ejs/literal.c | 670 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 672 insertions(+), 1 deletion(-)
 create mode 100644 source4/scripting/ejs/literal.c

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/config.mk b/source4/scripting/ejs/config.mk
index ca73ce279a..09ad510a12 100644
--- a/source4/scripting/ejs/config.mk
+++ b/source4/scripting/ejs/config.mk
@@ -72,7 +72,8 @@ OBJ_FILES = \
 		smbcalls_creds.o \
 		smbcalls_param.o \
 		ejsnet.o \
-		mprutil.o
+		mprutil.o \
+		literal.o
 PUBLIC_DEPENDENCIES = \
 		EJS LIBSAMBA-UTIL \
 		EJSRPC MESSAGING \
diff --git a/source4/scripting/ejs/literal.c b/source4/scripting/ejs/literal.c
new file mode 100644
index 0000000000..f7168e2c4e
--- /dev/null
+++ b/source4/scripting/ejs/literal.c
@@ -0,0 +1,670 @@
+/*
+ * Copyright (c) 2004, 2005 Metaparadigm Pte. Ltd.
+ * Michael Clark <michael@metaparadigm.com>
+ * Copyright (c) 2006 Derrell Lipman
+ *
+ * This library is free software; you can redistribute it and/or modify
+ * it under the terms of the MIT license. See COPYING for details.
+ *
+ * Derrell Lipman:
+ * This version is modified from the original.  It has been modified to
+ * natively use EJS variables rather than the original C object interface, and
+ * to use the talloc() family of functions for memory allocation.
+ */
+
+#include "includes.h"
+#include "scripting/ejs/smbcalls.h"
+
+enum json_tokener_error {
+        json_tokener_success,
+        json_tokener_error_oom, /* out of memory */
+        json_tokener_error_parse_unexpected,
+        json_tokener_error_parse_null,
+        json_tokener_error_parse_boolean,
+        json_tokener_error_parse_number,
+        json_tokener_error_parse_array,
+        json_tokener_error_parse_object,
+        json_tokener_error_parse_string,
+        json_tokener_error_parse_comment,
+        json_tokener_error_parse_eof
+};
+
+enum json_tokener_state {
+        json_tokener_state_eatws,               /* 0 */
+        json_tokener_state_start,               /* 1 */
+        json_tokener_state_finish,              /* 2 */
+        json_tokener_state_null,                /* 3 */
+        json_tokener_state_comment_start,       /* 4 */
+        json_tokener_state_comment,             /* 5 */
+        json_tokener_state_comment_eol,         /* 6 */
+        json_tokener_state_comment_end,         /* 7 */
+        json_tokener_state_string,              /* 8 */
+        json_tokener_state_string_escape,       /* 9 */
+        json_tokener_state_escape_unicode,      /* 10 */
+        json_tokener_state_boolean,             /* 11 */
+        json_tokener_state_number,              /* 12 */
+        json_tokener_state_array,               /* 13 */
+        json_tokener_state_array_sep,           /* 14 */
+        json_tokener_state_object,              /* 15 */
+        json_tokener_state_object_field_start,  /* 16 */
+        json_tokener_state_object_field,        /* 17 */
+        json_tokener_state_object_field_end,    /* 18 */
+        json_tokener_state_object_value,        /* 19 */
+        json_tokener_state_object_sep           /* 20 */
+};
+
+struct json_tokener
+{
+        char *source;
+        int pos;
+        void *ctx;
+        void *pb;
+};
+
+static const char *json_number_chars = "0123456789.+-e";
+static const char *json_hex_chars = "0123456789abcdef";
+
+#define hexdigit(x) (((x) <= '9') ? (x) - '0' : ((x) & 7) + 9)
+
+extern struct MprVar json_tokener_parse(char *s);
+static struct MprVar json_tokener_do_parse(struct json_tokener *this,
+                                           enum json_tokener_error *err_p);
+
+/*
+ * literal_to_var() parses a string into an ejs variable.  The ejs
+ * variable is returned.  Upon error, the javascript variable will be
+ * `undefined`.  This was created for parsing JSON, but is generally useful
+ * for parsing the literal forms of objects and arrays, since ejs doesn't
+ * procide that functionality.
+ */
+int literal_to_var(int eid, int argc, char **argv)
+{
+        struct json_tokener tok;
+        struct MprVar obj;
+        enum json_tokener_error err = json_tokener_success;
+        
+        if (argc != 1) {
+		ejsSetErrorMsg(eid,
+                               "literal_to_var() requires one parameter: "
+                               "the string to be parsed.");
+		return -1;
+        }
+
+        tok.source = argv[0];
+        tok.pos = 0;
+        tok.ctx = talloc_new(NULL);
+        if (tok.ctx == NULL) {
+                mpr_Return(eid, mprCreateUndefinedVar());
+                return 0;
+        }
+        tok.pb = talloc_zero_size(tok.ctx, 1);
+        if (tok.pb == NULL) {
+                mpr_Return(eid, mprCreateUndefinedVar());
+                return 0;
+        }
+        obj = json_tokener_do_parse(&tok, &err);
+        talloc_free(tok.pb);
+        if (err != json_tokener_success) {
+                mprDestroyVar(&obj);
+                mpr_Return(eid, mprCreateUndefinedVar());
+                return 0;
+        }
+        mpr_Return(eid, obj);
+        return 0;
+}
+
+static void *append_string(void *ctx,
+                           char *orig,
+                           char *append,
+                           int size)
+{
+    char c;
+    char *end_p = append + size;
+    void *ret;
+
+    /*
+     * We need to null terminate the string to be copied.  Save character at
+     * the size limit of the source string.
+     */
+    c = *end_p;
+
+    /* Temporarily null-terminate it */
+    *end_p = '\0';
+
+    /* Append the requested data */
+    ret = talloc_append_string(ctx, orig, append);
+    
+    /* Restore the original character in place of our temporary null byte */
+    *end_p = c;
+
+    /* Give 'em what they came for */
+    return ret;
+}
+
+
+static struct MprVar json_tokener_do_parse(struct json_tokener *this,
+                                           enum json_tokener_error *err_p)
+{
+        enum json_tokener_state state, saved_state;
+        struct MprVar current = mprCreateUndefinedVar();
+        struct MprVar obj;
+        enum json_tokener_error err = json_tokener_success;
+        char *obj_field_name = NULL;
+        char quote_char;
+        int deemed_double;
+        int start_offset;
+        char c;
+        
+        state = json_tokener_state_eatws;
+        saved_state = json_tokener_state_start;
+
+        
+        do {
+                c = this->source[this->pos];
+                switch(state) {
+                        
+                case json_tokener_state_eatws:
+                        if(isspace(c)) {
+                                this->pos++;
+                        } else if(c == '/') {
+                                state = json_tokener_state_comment_start;
+                                start_offset = this->pos++;
+                        } else {
+                                state = saved_state;
+                        }
+                        break;
+                        
+                case json_tokener_state_start:
+                        switch(c) {
+                        case '{':
+                                state = json_tokener_state_eatws;
+                                saved_state = json_tokener_state_object;
+                                current = mprObject(NULL);
+                                this->pos++;
+                                break;
+                        case '[':
+                                state = json_tokener_state_eatws;
+                                saved_state = json_tokener_state_array;
+                                current = mprArray(NULL);
+                                this->pos++;
+                                break;
+                        case 'N':
+                        case 'n':
+                                state = json_tokener_state_null;
+                                start_offset = this->pos++;
+                                break;
+                        case '"':
+                        case '\'':
+                                quote_char = c;
+                                talloc_free(this->pb);
+                                this->pb = talloc_zero_size(this->ctx, 1);
+                                if (this->pb == NULL) {
+                                        *err_p = json_tokener_error_oom;
+                                        goto out;
+                                }
+                                state = json_tokener_state_string;
+                                start_offset = ++this->pos;
+                                break;
+                        case 'T':
+                        case 't':
+                        case 'F':
+                        case 'f':
+                                state = json_tokener_state_boolean;
+                                start_offset = this->pos++;
+                                break;
+#if defined(__GNUC__)
+                        case '0' ... '9':
+#else
+                        case '0':
+                        case '1':
+                        case '2':
+                        case '3':
+                        case '4':
+                        case '5':
+                        case '6':
+                        case '7':
+                        case '8':
+                        case '9':
+#endif
+                        case '-':
+                                deemed_double = 0;
+                                state = json_tokener_state_number;
+                                start_offset = this->pos++;
+                                break;
+                        default:
+                                err = json_tokener_error_parse_unexpected;
+                                goto out;
+                        }
+                        break;
+                        
+                case json_tokener_state_finish:
+                        goto out;
+                        
+                case json_tokener_state_null:
+                        if(strncasecmp("null", this->source + start_offset,
+                                       this->pos - start_offset)) {
+                                *err_p = json_tokener_error_parse_null;
+                                mprDestroyVar(&current);
+                                return mprCreateUndefinedVar();
+                        }
+                        
+                        if(this->pos - start_offset == 4) {
+                                mprDestroyVar(&current);
+                                current = mprCreateNullVar();
+                                saved_state = json_tokener_state_finish;
+                                state = json_tokener_state_eatws;
+                        } else {
+                                this->pos++;
+                        }
+                        break;
+                        
+                case json_tokener_state_comment_start:
+                        if(c == '*') {
+                                state = json_tokener_state_comment;
+                        } else if(c == '/') {
+                                state = json_tokener_state_comment_eol;
+                        } else {
+                                err = json_tokener_error_parse_comment;
+                                goto out;
+                        }
+                        this->pos++;
+                        break;
+                        
+                case json_tokener_state_comment:
+                        if(c == '*') state = json_tokener_state_comment_end;
+                        this->pos++;
+                        break;
+                        
+                case json_tokener_state_comment_eol:
+                        if(c == '\n') {
+                                state = json_tokener_state_eatws;
+                        }
+                        this->pos++;
+                        break;
+                        
+                case json_tokener_state_comment_end:
+                        if(c == '/') {
+                                state = json_tokener_state_eatws;
+                        } else {
+                                state = json_tokener_state_comment;
+                        }
+                        this->pos++;
+                        break;
+                        
+                case json_tokener_state_string:
+                        if(c == quote_char) {
+                                if ((this->pb = append_string(
+                                             this->ctx,
+                                             this->pb,
+                                             this->source + start_offset,
+                                             this->pos - start_offset)) == NULL) {
+                                        err = json_tokener_error_oom;
+                                        goto out;
+                                }
+                                current = mprString(this->pb);
+                                saved_state = json_tokener_state_finish;
+                                state = json_tokener_state_eatws;
+                        } else if(c == '\\') {
+                                saved_state = json_tokener_state_string;
+                                state = json_tokener_state_string_escape;
+                        }
+                        this->pos++;
+                        break;
+                        
+                case json_tokener_state_string_escape:
+                        switch(c) {
+                        case '"':
+                        case '\\':
+                                if ((this->pb = append_string(
+                                             this->ctx,
+                                             this->pb,
+                                             this->source + start_offset,
+                                             this->pos - start_offset - 1)) == NULL) {
+                                        err = json_tokener_error_oom;
+                                        goto out;
+                                }
+                                start_offset = this->pos++;
+                                state = saved_state;
+                                break;
+                        case 'b':
+                        case 'n':
+                        case 'r':
+                        case 't':
+                                if ((this->pb = append_string(
+                                             this->ctx,
+                                             this->pb,
+                                             this->source + start_offset,
+                                             this->pos - start_offset - 1)) == NULL) {
+                                        err = json_tokener_error_oom;
+                                        goto out;
+                                }
+                                if (c == 'b') {
+                                        /*
+                                         * second param to append_string()
+                                         * gets temporarily modified; can't
+                                         * pass string constant.
+                                         */
+                                        char buf[] = "\b";
+                                        if ((this->pb = append_string(
+                                                     this->ctx,
+                                                     this->pb,
+                                                     buf,
+                                                     1)) == NULL) {
+                                                err = json_tokener_error_oom;
+                                                goto out;
+                                        }
+                                } else if (c == 'n') {
+                                        char buf[] = "\n";
+                                        if ((this->pb = append_string(
+                                                     this->ctx,
+                                                     this->pb,
+                                                     buf,
+                                                     1)) == NULL) {
+                                                err = json_tokener_error_oom;
+                                                goto out;
+                                        }
+                                } else if (c == 'r') {
+                                        char buf[] = "\r";
+                                        if ((this->pb = append_string(
+                                                     this->ctx,
+                                                     this->pb,
+                                                     buf,
+                                                     1)) == NULL) {
+                                                err = json_tokener_error_oom;
+                                                goto out;
+                                        }
+                                } else if (c == 't') {
+                                        char buf[] = "\t";
+                                        if ((this->pb = append_string(
+                                                     this->ctx,
+                                                     this->pb,
+                                                     buf,
+                                                     1)) == NULL) {
+                                                err = json_tokener_error_oom;
+                                                goto out;
+                                        }
+                                }
+                                start_offset = ++this->pos;
+                                state = saved_state;
+                                break;
+                        case 'u':
+                                if ((this->pb = append_string(
+                                             this->ctx,
+                                             this->pb,
+                                             this->source + start_offset,
+                                             this->pos - start_offset - 1)) == NULL) {
+                                        err = json_tokener_error_oom;
+                                        goto out;
+                                }
+                                start_offset = ++this->pos;
+                                state = json_tokener_state_escape_unicode;
+                                break;
+                        default:
+                                err = json_tokener_error_parse_string;
+                                goto out;
+                        }
+                        break;
+                        
+                case json_tokener_state_escape_unicode:
+                        if(strchr(json_hex_chars, c)) {
+                                this->pos++;
+                                if(this->pos - start_offset == 4) {
+                                        unsigned char utf_out[3];
+                                        unsigned int ucs_char =
+                                                (hexdigit(*(this->source + start_offset)) << 12) +
+                                                (hexdigit(*(this->source + start_offset + 1)) << 8) +
+                                                (hexdigit(*(this->source + start_offset + 2)) << 4) +
+                                                hexdigit(*(this->source + start_offset + 3));
+                                        if (ucs_char < 0x80) {
+                                                utf_out[0] = ucs_char;
+                                                if ((this->pb = append_string(
+                                                             this->ctx,
+                                                             this->pb,
+                                                             (char *) utf_out,
+                                                             1)) == NULL) {
+                                                        err = json_tokener_error_oom;
+                                                        goto out;
+                                                }
+                                        } else if (ucs_char < 0x800) {
+                                                utf_out[0] = 0xc0 | (ucs_char >> 6);
+                                                utf_out[1] = 0x80 | (ucs_char & 0x3f);
+                                                if ((this->pb = append_string(
+                                                             this->ctx,
+                                                             this->pb,
+                                                             (char *) utf_out,
+                                                             2)) == NULL) {
+                                                        err = json_tokener_error_oom;
+                                                        goto out;
+                                                }
+                                        } else {
+                                                utf_out[0] = 0xe0 | (ucs_char >> 12);
+                                                utf_out[1] = 0x80 | ((ucs_char >> 6) & 0x3f);
+                                                utf_out[2] = 0x80 | (ucs_char & 0x3f);
+                                                if ((this->pb = append_string(
+                                                             this->ctx,
+                                                             this->pb,
+                                                             (char *) utf_out,
+                                                             3)) == NULL) {
+                                                        err = json_tokener_error_oom;
+                                                        goto out;
+                                                }
+                                        }
+                                        start_offset = this->pos;
+                                        state = saved_state;
+                                }
+                        } else {
+                                err = json_tokener_error_parse_string;
+                                goto out;
+                        }
+                        break;
+                        
+                case json_tokener_state_boolean:
+                        if(strncasecmp("true", this->source + start_offset,
+                                       this->pos - start_offset) == 0) {
+                                if(this->pos - start_offset == 4) {
+                                        current = mprCreateBoolVar(1);
+                                        saved_state = json_tokener_state_finish;
+                                        state = json_tokener_state_eatws;
+                                } else {
+                                        this->pos++;
+                                }
+                        } else if(strncasecmp("false", this->source + start_offset,
+                                              this->pos - start_offset) == 0) {
+                                if(this->pos - start_offset == 5) {
+                                        current = mprCreateBoolVar(0);
+                                        saved_state = json_tokener_state_finish;
+                                        state = json_tokener_state_eatws;
+                                } else {
+                                        this->pos++;
+                                }
+                        } else {
+                                err = json_tokener_error_parse_boolean;
+                                goto out;
+                        }
+                        break;
+                        
+                case json_tokener_state_number:
+                        if(!c || !strchr(json_number_chars, c)) {
+                                int numi;
+                                double numd;
+                                char *tmp = talloc_strndup(
+                                        this->ctx,
+                                        this->source + start_offset,
+                                        this->pos - start_offset);
+                                if (tmp == NULL) {
+                                        err = json_tokener_error_oom;
+                                        goto out;
+                                }
+                                if(!deemed_double && sscanf(tmp, "%d", &numi) == 1) {
+                                        current = mprCreateIntegerVar(numi);
+                                } else if(deemed_double && sscanf(tmp, "%lf", &numd) == 1) {
+                                        current = mprCreateFloatVar(numd);
+                                } else {
+                                        talloc_free(tmp);
+                                        err = json_tokener_error_parse_number;
+                                        goto out;
+                                }
+                                talloc_free(tmp);
+                                saved_state = json_tokener_state_finish;
+                                state = json_tokener_state_eatws;
+                        } else {
+                                if(c == '.' || c == 'e') deemed_double = 1;
+                                this->pos++;
+                        }
+                        break;
+                        
+                case json_tokener_state_array:
+                        if(c == ']') {
+                                this->pos++;
+                                saved_state = json_tokener_state_finish;
+                                state = json_tokener_state_eatws;
+                        } else {
+                                int oldlen;
+                                char idx[16];
+                                
+                                obj = json_tokener_do_parse(this, &err);
+                                if (err != json_tokener_success) {
+                                        goto out;
+                                }
+                                oldlen = mprToInt(mprGetProperty(&current,
+                                                                 "length",
+                                                                 NULL));
+                                mprItoa(oldlen, idx, sizeof(idx));
+                                mprSetVar(&current, idx, obj);
+                                saved_state = json_tokener_state_array_sep;
+                                state = json_tokener_state_eatws;
+                        }
+                        break;
+                        
+                case json_tokener_state_array_sep:
+                        if(c == ']') {
+                                this->pos++;
+                                saved_state = json_tokener_state_finish;
+                                state = json_tokener_state_eatws;
+                        } else if(c == ',') {
+                                this->pos++;
+                                saved_state = json_tokener_state_array;
+                                state = json_tokener_state_eatws;
+                        } else {
+                                *err_p = json_tokener_error_parse_array;
+                                mprDestroyVar(&current);
+                                return mprCreateUndefinedVar();
+                        }
+                        break;
+                        
+                case json_tokener_state_object:
+                        state = json_tokener_state_object_field_start;
+                        start_offset = this->pos;
+                        break;
+                        
+                case json_tokener_state_object_field_start:
+                        if(c == '}') {
+                                this->pos++;
+                                saved_state = json_tokener_state_finish;
+                                state = json_tokener_state_eatws;
+                        } else if (c == '"' || c == '\'') {
+                                quote_char = c;
+                                talloc_free(this->pb);
+                                this->pb = talloc_zero_size(this->ctx, 1);
+                                if (this->pb == NULL) {
+                                        *err_p = json_tokener_error_oom;
+                                        goto out;
+                                }
+                                state = json_tokener_state_object_field;
+                                start_offset = ++this->pos;
+                        } else {
+                                err = json_tokener_error_parse_object;
+                                goto out;
+                        }
+                        break;
+                        
+                case json_tokener_state_object_field:
+                        if(c == quote_char) {
+                                if ((this->pb = append_string(
+                                             this->ctx,
+                                             this->pb,
+                                             this->source + start_offset,
+                                             this->pos - start_offset)) == NULL) {
+                                        err = json_tokener_error_oom;
+                                        goto out;
+                                }
+                                if ((obj_field_name =
+                                     talloc_strdup(this->ctx,
+                                                   this->pb)) == NULL) {
+                                        err = json_tokener_error_oom;
+                                        goto out;
+                                }
+                                saved_state = json_tokener_state_object_field_end;
+                                state = json_tokener_state_eatws;
+                        } else if(c == '\\') {
+                                saved_state = json_tokener_state_object_field;
+                                state = json_tokener_state_string_escape;
+                        }
+                        this->pos++;
+                        break;
+                        
+                case json_tokener_state_object_field_end:
+                        if(c == ':') {
+                                this->pos++;
+                                saved_state = json_tokener_state_object_value;
+                                state = json_tokener_state_eatws;
+                        } else {
+                                *err_p = json_tokener_error_parse_object;
+                                mprDestroyVar(&current);
+                                return mprCreateUndefinedVar();
+                        }
+                        break;
+                        
+                case json_tokener_state_object_value:
+                        obj = json_tokener_do_parse(this, &err);
+                        if (err != json_tokener_success) {
+                                goto out;
+                        }
+                        mprSetVar(&current, obj_field_name, obj);
+                        talloc_free(obj_field_name);
+                        obj_field_name = NULL;
+                        saved_state = json_tokener_state_object_sep;
+                        state = json_tokener_state_eatws;
+                        break;
+                        
+                case json_tokener_state_object_sep:
+                        if(c == '}') {
+                                this->pos++;
+                                saved_state = json_tokener_state_finish;
+                                state = json_tokener_state_eatws;
+                        } else if(c == ',') {
+                                this->pos++;
+                                saved_state = json_tokener_state_object;
+                                state = json_tokener_state_eatws;
+                        } else {
+                                err = json_tokener_error_parse_object;
+                                goto out;
+                        }
+                        break;
+                        
+                }
+        } while(c);
+        
+        if(state != json_tokener_state_finish &&
+           saved_state != json_tokener_state_finish)
+                err = json_tokener_error_parse_eof;
+        
+out:
+        talloc_free(obj_field_name);
+        if(err == json_tokener_success) {
+                return current;
+        }
+        mprDestroyVar(&current);
+        *err_p = err;
+        return mprCreateUndefinedVar();
+}
+
+
+void smb_setup_ejs_literal(void)
+{
+	ejsDefineStringCFunction(-1,
+                                 "literal_to_var",
+                                 literal_to_var,
+                                 NULL,
+                                 MPR_VAR_SCRIPT_HANDLE);
+}
-- 
cgit 


From 882910a2a8f6e84509062d19720f4999af4761c4 Mon Sep 17 00:00:00 2001
From: Derrell Lipman <derrell@samba.org>
Date: Mon, 2 Oct 2006 02:38:02 +0000
Subject: r19020: move jsonrpc_include to a more appropriate location in the
 file, and call the setup function for parsing literals. (This used to be
 commit bb07f606dedde5c63f190229b8dbb85f3d1342f7)

---
 source4/scripting/ejs/smbcalls.c | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls.c b/source4/scripting/ejs/smbcalls.c
index 85cc5f7027..839ec7b634 100644
--- a/source4/scripting/ejs/smbcalls.c
+++ b/source4/scripting/ejs/smbcalls.c
@@ -83,7 +83,7 @@ static int ejs_typeof_native(MprVarHandle eid, int argc, struct MprVar **argv)
 		{ MPR_TYPE_INT,              "integer" },
 		{ MPR_TYPE_INT64,            "integer64" },
 		{ MPR_TYPE_OBJECT,           "object" },
-		{ MPR_TYPE_FUNCTION,         "function" },
+		{ MPR_TYPE_FUNCTION,         "js_function" },
 		{ MPR_TYPE_STRING,           "string" },
 		{ MPR_TYPE_STRING_CFUNCTION, "string_c_function" },
 		{ MPR_TYPE_PTR,              "pointer" }
@@ -152,10 +152,20 @@ static int ejs_libinclude(int eid, int argc, char **argv)
 }
 
 /*
-  jsonrpc_include() allows you to include jsonrpc files from a path
-  based at "jsonrpc base =" in smb.conf.
+  return the current version
 */
-static int ejs_jsonrpc_include(int eid, int argc, char **argv)
+static int ejs_version(MprVarHandle eid, int argc, struct MprVar **argv)
+{
+	mpr_ReturnString(eid, SAMBA_VERSION_STRING);
+	return 0;
+}
+
+
+/*
+ * jsonrpc_include() allows you to include jsonrpc files from a path based at
+ * "jsonrpc base =" in smb.conf.
+ */
+static int jsonrpc_include(int eid, int argc, char **argv)
 {
         int ret = -1;
         char *path;
@@ -192,14 +202,7 @@ static int ejs_jsonrpc_include(int eid, int argc, char **argv)
 	return 0;
 }
 
-/*
-  return the current version
-*/
-static int ejs_version(MprVarHandle eid, int argc, struct MprVar **argv)
-{
-	mpr_ReturnString(eid, SAMBA_VERSION_STRING);
-	return 0;
-}
+
 
 static void (*ejs_exception_handler) (const char *) = NULL;
 
@@ -222,6 +225,7 @@ void smb_setup_ejs_functions(void (*exception_handler)(const char *))
 	smb_setup_ejs_options();
 	smb_setup_ejs_credentials();
 	smb_setup_ejs_param();
+        smb_setup_ejs_literal();
 	
 	ejsnet_setup();
 
@@ -235,7 +239,7 @@ void smb_setup_ejs_functions(void (*exception_handler)(const char *))
 	ejsDefineCFunction(-1, "typeof", ejs_typeof, NULL, MPR_VAR_SCRIPT_HANDLE);
 	ejsDefineCFunction(-1, "nativeTypeOf", ejs_typeof_native, NULL, MPR_VAR_SCRIPT_HANDLE);
 	ejsDefineStringCFunction(-1, "libinclude", ejs_libinclude, NULL, MPR_VAR_SCRIPT_HANDLE);
-	ejsDefineStringCFunction(-1, "jsonrpc_include", ejs_jsonrpc_include, NULL, MPR_VAR_SCRIPT_HANDLE);
 	ejsDefineCFunction(-1, "version", ejs_version, NULL, MPR_VAR_SCRIPT_HANDLE);
+	ejsDefineStringCFunction(-1, "jsonrpc_include", jsonrpc_include, NULL, MPR_VAR_SCRIPT_HANDLE);
 }
 
-- 
cgit 


From 91814f4b00b7088cde5c610a7e2b60d4496662b2 Mon Sep 17 00:00:00 2001
From: Derrell Lipman <derrell@samba.org>
Date: Mon, 2 Oct 2006 15:23:03 +0000
Subject: r19048: ensure our memory gets cleaned up even upon exception (This
 used to be commit bcf5e98a8c83791db93a9024b3433f9d5ee3cc7e)

---
 source4/scripting/ejs/literal.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/literal.c b/source4/scripting/ejs/literal.c
index f7168e2c4e..4eeb35c423 100644
--- a/source4/scripting/ejs/literal.c
+++ b/source4/scripting/ejs/literal.c
@@ -92,7 +92,7 @@ int literal_to_var(int eid, int argc, char **argv)
 
         tok.source = argv[0];
         tok.pos = 0;
-        tok.ctx = talloc_new(NULL);
+        tok.ctx = talloc_new(mprMemCtx());
         if (tok.ctx == NULL) {
                 mpr_Return(eid, mprCreateUndefinedVar());
                 return 0;
-- 
cgit 


From 882d352151bd05c37e18de8f8f619787f831a311 Mon Sep 17 00:00:00 2001
From: Derrell Lipman <derrell@samba.org>
Date: Mon, 2 Oct 2006 20:39:31 +0000
Subject: r19051: JSON-RPC server work-in-progress.  It's almost working. (This
 used to be commit 6e9cb2ed1cf87aed322fd7821237d088c2fef340)

---
 source4/scripting/ejs/smbcalls.c     | 33 +++++++++++++++++++++++++++++++++
 source4/scripting/ejs/smbcalls_sys.c |  2 +-
 2 files changed, 34 insertions(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls.c b/source4/scripting/ejs/smbcalls.c
index 839ec7b634..815b3e2b5d 100644
--- a/source4/scripting/ejs/smbcalls.c
+++ b/source4/scripting/ejs/smbcalls.c
@@ -203,6 +203,38 @@ static int jsonrpc_include(int eid, int argc, char **argv)
 }
 
 
+static int ejs_debug(int eid, int argc, char **argv)
+{
+        int i;
+        int level;
+        void *ctx = mprMemCtx();
+        char *msg;
+
+
+        if (argc < 2) {
+		return -1;
+        }
+
+        level = atoi(argv[0]);
+
+        msg = talloc_zero_size(ctx, 1);
+        if (msg == NULL) {
+                DEBUG(0, ("out of memory in debug()\n"));
+                return 0;
+        }
+
+        for (i = 1; i < argc; i++) {
+                msg = talloc_append_string(ctx, msg, argv[i]);
+                if (msg == NULL) {
+                        DEBUG(0, ("out of memory in debug()\n"));
+                        return 0;
+                }
+        }
+
+        DEBUG(level, ("%s", msg));
+        talloc_free(msg);
+	return 0;
+}
 
 static void (*ejs_exception_handler) (const char *) = NULL;
 
@@ -241,5 +273,6 @@ void smb_setup_ejs_functions(void (*exception_handler)(const char *))
 	ejsDefineStringCFunction(-1, "libinclude", ejs_libinclude, NULL, MPR_VAR_SCRIPT_HANDLE);
 	ejsDefineCFunction(-1, "version", ejs_version, NULL, MPR_VAR_SCRIPT_HANDLE);
 	ejsDefineStringCFunction(-1, "jsonrpc_include", jsonrpc_include, NULL, MPR_VAR_SCRIPT_HANDLE);
+	ejsDefineStringCFunction(-1, "debug", ejs_debug, NULL, MPR_VAR_SCRIPT_HANDLE);
 }
 
diff --git a/source4/scripting/ejs/smbcalls_sys.c b/source4/scripting/ejs/smbcalls_sys.c
index 42990f49c0..97fcc19cd1 100644
--- a/source4/scripting/ejs/smbcalls_sys.c
+++ b/source4/scripting/ejs/smbcalls_sys.c
@@ -413,7 +413,7 @@ static int ejs_sys_init(MprVarHandle eid, int argc, struct MprVar **argv)
 	mprSetCFunction(obj, "interfaces", ejs_sys_interfaces);
 	mprSetCFunction(obj, "hostname", ejs_sys_hostname);
 	mprSetCFunction(obj, "nttime", ejs_sys_nttime);
-	mprSetCFunction(obj, "getTimeOfDay", ejs_sys_gettimeofday);
+	mprSetCFunction(obj, "gettimeofday", ejs_sys_gettimeofday);
 	mprSetCFunction(obj, "unix2nttime", ejs_sys_unix2nttime);
 	mprSetCFunction(obj, "gmmktime", ejs_sys_gmmktime);
 	mprSetCFunction(obj, "gmtime", ejs_sys_gmtime);
-- 
cgit 


From 4b17a6dfbbc2d6adafbc9103b97fd78c43c2efe4 Mon Sep 17 00:00:00 2001
From: Derrell Lipman <derrell@samba.org>
Date: Tue, 3 Oct 2006 02:38:08 +0000
Subject: r19055: JSON-RPC is working!  It passes the small qooxdoo JSON-RPC
 test suite perfectly.

This check in covers the remaining fixes and enhancements to complete the
server.  In a subsequent check-in, I need to learn about the new qooxdoo
packaging mechanism.  Although it'd be nice to have the whole source tree,
that's huge and needn't be in samba svn.  It's now supposed to be very easy to
package qooxdoo, so I'll figure out how that's done and then check in the
relevant small number of files.

Steps after that involve generating the stubs to allow various ejs functions
to be called via JSON-RPC.

Derrell
(This used to be commit 5bfebbda7a5d28d4deb31c54a8feb24c4416cbf6)
---
 source4/scripting/ejs/literal.c  | 323 ++++++++++++++++++++++++++++-----------
 source4/scripting/ejs/smbcalls.c |  34 -----
 2 files changed, 233 insertions(+), 124 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/literal.c b/source4/scripting/ejs/literal.c
index 4eeb35c423..d50e5afdb9 100644
--- a/source4/scripting/ejs/literal.c
+++ b/source4/scripting/ejs/literal.c
@@ -20,6 +20,7 @@ enum json_tokener_error {
         json_tokener_error_oom, /* out of memory */
         json_tokener_error_parse_unexpected,
         json_tokener_error_parse_null,
+        json_tokener_error_parse_date,
         json_tokener_error_parse_boolean,
         json_tokener_error_parse_number,
         json_tokener_error_parse_array,
@@ -30,27 +31,40 @@ enum json_tokener_error {
 };
 
 enum json_tokener_state {
-        json_tokener_state_eatws,               /* 0 */
-        json_tokener_state_start,               /* 1 */
-        json_tokener_state_finish,              /* 2 */
-        json_tokener_state_null,                /* 3 */
-        json_tokener_state_comment_start,       /* 4 */
-        json_tokener_state_comment,             /* 5 */
-        json_tokener_state_comment_eol,         /* 6 */
-        json_tokener_state_comment_end,         /* 7 */
-        json_tokener_state_string,              /* 8 */
-        json_tokener_state_string_escape,       /* 9 */
-        json_tokener_state_escape_unicode,      /* 10 */
-        json_tokener_state_boolean,             /* 11 */
-        json_tokener_state_number,              /* 12 */
-        json_tokener_state_array,               /* 13 */
-        json_tokener_state_array_sep,           /* 14 */
-        json_tokener_state_object,              /* 15 */
-        json_tokener_state_object_field_start,  /* 16 */
-        json_tokener_state_object_field,        /* 17 */
-        json_tokener_state_object_field_end,    /* 18 */
-        json_tokener_state_object_value,        /* 19 */
-        json_tokener_state_object_sep           /* 20 */
+        json_tokener_state_eatws,
+        json_tokener_state_start,
+        json_tokener_state_finish,
+        json_tokener_state_null,
+        json_tokener_state_date,
+        json_tokener_state_comment_start,
+        json_tokener_state_comment,
+        json_tokener_state_comment_eol,
+        json_tokener_state_comment_end,
+        json_tokener_state_string,
+        json_tokener_state_string_escape,
+        json_tokener_state_escape_unicode,
+        json_tokener_state_boolean,
+        json_tokener_state_number,
+        json_tokener_state_array,
+        json_tokener_state_datelist,
+        json_tokener_state_array_sep,
+        json_tokener_state_datelist_sep,
+        json_tokener_state_object,
+        json_tokener_state_object_field_start,
+        json_tokener_state_object_field,
+        json_tokener_state_object_field_end,
+        json_tokener_state_object_value,
+        json_tokener_state_object_sep
+};
+
+enum date_field {
+        date_field_year,
+        date_field_month,
+        date_field_day,
+        date_field_hour,
+        date_field_minute,
+        date_field_second,
+        date_field_millisecond
 };
 
 struct json_tokener
@@ -145,11 +159,16 @@ static void *append_string(void *ctx,
 static struct MprVar json_tokener_do_parse(struct json_tokener *this,
                                            enum json_tokener_error *err_p)
 {
-        enum json_tokener_state state, saved_state;
+        enum json_tokener_state state;
+        enum json_tokener_state saved_state;
+        enum date_field date_field;
         struct MprVar current = mprCreateUndefinedVar();
+        struct MprVar tempObj;
         struct MprVar obj;
         enum json_tokener_error err = json_tokener_success;
+        char date_script[] = "JSON_Date.create(0);";
         char *obj_field_name = NULL;
+        char *emsg = NULL;
         char quote_char;
         int deemed_double;
         int start_offset;
@@ -190,8 +209,12 @@ static struct MprVar json_tokener_do_parse(struct json_tokener *this,
                                 break;
                         case 'N':
                         case 'n':
-                                state = json_tokener_state_null;
                                 start_offset = this->pos++;
+                                if (this->source[this->pos] == 'e') {
+                                    state = json_tokener_state_date;
+                                } else {
+                                    state = json_tokener_state_null;
+                                }
                                 break;
                         case '"':
                         case '\'':
@@ -241,7 +264,8 @@ static struct MprVar json_tokener_do_parse(struct json_tokener *this,
                         goto out;
                         
                 case json_tokener_state_null:
-                        if(strncasecmp("null", this->source + start_offset,
+                        if(strncasecmp("null",
+                                       this->source + start_offset,
                                        this->pos - start_offset)) {
                                 *err_p = json_tokener_error_parse_null;
                                 mprDestroyVar(&current);
@@ -258,6 +282,38 @@ static struct MprVar json_tokener_do_parse(struct json_tokener *this,
                         }
                         break;
                         
+                case json_tokener_state_date:
+                        if (this->pos - start_offset <= 18) {
+                                if (strncasecmp("new Date(Date.UTC(",
+                                                this->source + start_offset,
+                                                this->pos - start_offset)) {
+                                        *err_p = json_tokener_error_parse_date;
+                                        mprDestroyVar(&current);
+                                        return mprCreateUndefinedVar();
+                                } else {
+                                        this->pos++;
+                                        break;
+                                }
+                        }
+                        
+                        this->pos--;            /* we went one too far */
+                        state = json_tokener_state_eatws;
+                        saved_state = json_tokener_state_datelist;
+
+                        /* Create a JsonDate object */
+                        if (ejsEvalScript(0,
+                                          date_script,
+                                          &tempObj,
+                                          &emsg) != 0) {
+                                *err_p = json_tokener_error_parse_date;
+                                mprDestroyVar(&current);
+                                return mprCreateUndefinedVar();
+                        }
+                        mprDestroyVar(&current);
+                        mprCopyVar(&current, &tempObj, MPR_DEEP_COPY);
+                        date_field = date_field_year;
+                        break;
+                        
                 case json_tokener_state_comment_start:
                         if(c == '*') {
                                 state = json_tokener_state_comment;
@@ -293,11 +349,12 @@ static struct MprVar json_tokener_do_parse(struct json_tokener *this,
                         
                 case json_tokener_state_string:
                         if(c == quote_char) {
-                                if ((this->pb = append_string(
-                                             this->ctx,
-                                             this->pb,
-                                             this->source + start_offset,
-                                             this->pos - start_offset)) == NULL) {
+                                this->pb = append_string(
+                                        this->ctx,
+                                        this->pb,
+                                        this->source + start_offset,
+                                        this->pos - start_offset);
+                                if (this->pb == NULL) {
                                         err = json_tokener_error_oom;
                                         goto out;
                                 }
@@ -315,11 +372,12 @@ static struct MprVar json_tokener_do_parse(struct json_tokener *this,
                         switch(c) {
                         case '"':
                         case '\\':
-                                if ((this->pb = append_string(
-                                             this->ctx,
-                                             this->pb,
-                                             this->source + start_offset,
-                                             this->pos - start_offset - 1)) == NULL) {
+                                this->pb = append_string(
+                                        this->ctx,
+                                        this->pb,
+                                        this->source + start_offset,
+                                        this->pos - start_offset - 1);
+                                if (this->pb == NULL) {
                                         err = json_tokener_error_oom;
                                         goto out;
                                 }
@@ -330,11 +388,12 @@ static struct MprVar json_tokener_do_parse(struct json_tokener *this,
                         case 'n':
                         case 'r':
                         case 't':
-                                if ((this->pb = append_string(
-                                             this->ctx,
-                                             this->pb,
-                                             this->source + start_offset,
-                                             this->pos - start_offset - 1)) == NULL) {
+                                this->pb = append_string(
+                                        this->ctx,
+                                        this->pb,
+                                        this->source + start_offset,
+                                        this->pos - start_offset - 1);
+                                if (this->pb == NULL) {
                                         err = json_tokener_error_oom;
                                         goto out;
                                 }
@@ -345,41 +404,41 @@ static struct MprVar json_tokener_do_parse(struct json_tokener *this,
                                          * pass string constant.
                                          */
                                         char buf[] = "\b";
-                                        if ((this->pb = append_string(
-                                                     this->ctx,
-                                                     this->pb,
-                                                     buf,
-                                                     1)) == NULL) {
+                                        this->pb = append_string(this->ctx,
+                                                                 this->pb,
+                                                                 buf,
+                                                                 1);
+                                        if (this->pb == NULL) {
                                                 err = json_tokener_error_oom;
                                                 goto out;
                                         }
                                 } else if (c == 'n') {
                                         char buf[] = "\n";
-                                        if ((this->pb = append_string(
-                                                     this->ctx,
-                                                     this->pb,
-                                                     buf,
-                                                     1)) == NULL) {
+                                        this->pb = append_string(this->ctx,
+                                                                 this->pb,
+                                                                 buf,
+                                                                 1);
+                                        if (this->pb == NULL) {
                                                 err = json_tokener_error_oom;
                                                 goto out;
                                         }
                                 } else if (c == 'r') {
                                         char buf[] = "\r";
-                                        if ((this->pb = append_string(
-                                                     this->ctx,
-                                                     this->pb,
-                                                     buf,
-                                                     1)) == NULL) {
+                                        this->pb = append_string(this->ctx,
+                                                                 this->pb,
+                                                                 buf,
+                                                                 1);
+                                        if (this->pb == NULL) {
                                                 err = json_tokener_error_oom;
                                                 goto out;
                                         }
                                 } else if (c == 't') {
                                         char buf[] = "\t";
-                                        if ((this->pb = append_string(
-                                                     this->ctx,
-                                                     this->pb,
-                                                     buf,
-                                                     1)) == NULL) {
+                                        this->pb = append_string(this->ctx,
+                                                                 this->pb,
+                                                                 buf,
+                                                                 1);
+                                        if (this->pb == NULL) {
                                                 err = json_tokener_error_oom;
                                                 goto out;
                                         }
@@ -388,11 +447,12 @@ static struct MprVar json_tokener_do_parse(struct json_tokener *this,
                                 state = saved_state;
                                 break;
                         case 'u':
-                                if ((this->pb = append_string(
-                                             this->ctx,
-                                             this->pb,
-                                             this->source + start_offset,
-                                             this->pos - start_offset - 1)) == NULL) {
+                                this->pb = append_string(
+                                        this->ctx,
+                                        this->pb,
+                                        this->source + start_offset,
+                                        this->pos - start_offset - 1);
+                                if (this->pb == NULL) {
                                         err = json_tokener_error_oom;
                                         goto out;
                                 }
@@ -417,22 +477,24 @@ static struct MprVar json_tokener_do_parse(struct json_tokener *this,
                                                 hexdigit(*(this->source + start_offset + 3));
                                         if (ucs_char < 0x80) {
                                                 utf_out[0] = ucs_char;
-                                                if ((this->pb = append_string(
-                                                             this->ctx,
-                                                             this->pb,
-                                                             (char *) utf_out,
-                                                             1)) == NULL) {
+                                                this->pb = append_string(
+                                                        this->ctx,
+                                                        this->pb,
+                                                        (char *) utf_out,
+                                                        1);
+                                                if (this->pb == NULL) {
                                                         err = json_tokener_error_oom;
                                                         goto out;
                                                 }
                                         } else if (ucs_char < 0x800) {
                                                 utf_out[0] = 0xc0 | (ucs_char >> 6);
                                                 utf_out[1] = 0x80 | (ucs_char & 0x3f);
-                                                if ((this->pb = append_string(
-                                                             this->ctx,
-                                                             this->pb,
-                                                             (char *) utf_out,
-                                                             2)) == NULL) {
+                                                this->pb = append_string(
+                                                        this->ctx,
+                                                        this->pb,
+                                                        (char *) utf_out,
+                                                        2);
+                                                if (this->pb == NULL) {
                                                         err = json_tokener_error_oom;
                                                         goto out;
                                                 }
@@ -440,11 +502,12 @@ static struct MprVar json_tokener_do_parse(struct json_tokener *this,
                                                 utf_out[0] = 0xe0 | (ucs_char >> 12);
                                                 utf_out[1] = 0x80 | ((ucs_char >> 6) & 0x3f);
                                                 utf_out[2] = 0x80 | (ucs_char & 0x3f);
-                                                if ((this->pb = append_string(
-                                                             this->ctx,
-                                                             this->pb,
-                                                             (char *) utf_out,
-                                                             3)) == NULL) {
+                                                this->pb = append_string(
+                                                        this->ctx,
+                                                        this->pb,
+                                                        (char *) utf_out,
+                                                        3);
+                                                if (this->pb == NULL) {
                                                         err = json_tokener_error_oom;
                                                         goto out;
                                                 }
@@ -536,6 +599,63 @@ static struct MprVar json_tokener_do_parse(struct json_tokener *this,
                         }
                         break;
                         
+                case json_tokener_state_datelist:
+                        if(c == ')') {
+                                if (this->source[this->pos+1] == ')') {
+                                        this->pos += 2;
+                                        saved_state = json_tokener_state_finish;
+                                        state = json_tokener_state_eatws;
+                                } else {
+                                        err = json_tokener_error_parse_date;
+                                        goto out;
+                                }
+                        } else {
+                                obj = json_tokener_do_parse(this, &err);
+                                if (err != json_tokener_success) {
+                                        goto out;
+                                }
+
+                                /* date list items must be integers */
+                                if (obj.type != MPR_TYPE_INT) {
+                                        err = json_tokener_error_parse_date;
+                                        goto out;
+                                }
+                                
+                                switch(date_field) {
+                                case date_field_year:
+                                        mprSetVar(&current, "year", obj);
+                                        break;
+                                case date_field_month:
+                                        mprSetVar(&current, "month", obj);
+                                        break;
+                                case date_field_day:
+                                        mprSetVar(&current, "day", obj);
+                                        break;
+                                case date_field_hour:
+                                        mprSetVar(&current, "hour", obj);
+                                        break;
+                                case date_field_minute:
+                                        mprSetVar(&current, "minute", obj);
+                                        break;
+                                case date_field_second:
+                                        mprSetVar(&current, "second", obj);
+                                        break;
+                                case date_field_millisecond:
+                                        mprSetVar(&current, "millisecond", obj);
+                                        break;
+                                default:
+                                        err = json_tokener_error_parse_date;
+                                        goto out;
+                                }
+
+                                /* advance to the next date field */
+                                date_field++;
+
+                                saved_state = json_tokener_state_datelist_sep;
+                                state = json_tokener_state_eatws;
+                        }
+                        break;
+                        
                 case json_tokener_state_array_sep:
                         if(c == ']') {
                                 this->pos++;
@@ -552,6 +672,27 @@ static struct MprVar json_tokener_do_parse(struct json_tokener *this,
                         }
                         break;
                         
+                case json_tokener_state_datelist_sep:
+                        if(c == ')') {
+                                if (this->source[this->pos+1] == ')') {
+                                        this->pos += 2;
+                                        saved_state = json_tokener_state_finish;
+                                        state = json_tokener_state_eatws;
+                                } else {
+                                        err = json_tokener_error_parse_date;
+                                        goto out;
+                                }
+                        } else if(c == ',') {
+                                this->pos++;
+                                saved_state = json_tokener_state_datelist;
+                                state = json_tokener_state_eatws;
+                        } else {
+                                *err_p = json_tokener_error_parse_date;
+                                mprDestroyVar(&current);
+                                return mprCreateUndefinedVar();
+                        }
+                        break;
+                        
                 case json_tokener_state_object:
                         state = json_tokener_state_object_field_start;
                         start_offset = this->pos;
@@ -580,17 +721,18 @@ static struct MprVar json_tokener_do_parse(struct json_tokener *this,
                         
                 case json_tokener_state_object_field:
                         if(c == quote_char) {
-                                if ((this->pb = append_string(
-                                             this->ctx,
-                                             this->pb,
-                                             this->source + start_offset,
-                                             this->pos - start_offset)) == NULL) {
+                                this->pb = append_string(
+                                        this->ctx,
+                                        this->pb,
+                                        this->source + start_offset,
+                                        this->pos - start_offset);
+                                if (this->pb == NULL) {
                                         err = json_tokener_error_oom;
                                         goto out;
                                 }
-                                if ((obj_field_name =
-                                     talloc_strdup(this->ctx,
-                                                   this->pb)) == NULL) {
+                                obj_field_name = talloc_strdup(this->ctx,
+                                                               this->pb);
+                                if (obj_field_name == NULL) {
                                         err = json_tokener_error_oom;
                                         goto out;
                                 }
@@ -653,10 +795,11 @@ out:
         talloc_free(obj_field_name);
         if(err == json_tokener_success) {
                 return current;
+        } else {
+                mprDestroyVar(&current);
+                *err_p = err;
+                return mprCreateUndefinedVar();
         }
-        mprDestroyVar(&current);
-        *err_p = err;
-        return mprCreateUndefinedVar();
 }
 
 
diff --git a/source4/scripting/ejs/smbcalls.c b/source4/scripting/ejs/smbcalls.c
index 815b3e2b5d..b0df390427 100644
--- a/source4/scripting/ejs/smbcalls.c
+++ b/source4/scripting/ejs/smbcalls.c
@@ -203,39 +203,6 @@ static int jsonrpc_include(int eid, int argc, char **argv)
 }
 
 
-static int ejs_debug(int eid, int argc, char **argv)
-{
-        int i;
-        int level;
-        void *ctx = mprMemCtx();
-        char *msg;
-
-
-        if (argc < 2) {
-		return -1;
-        }
-
-        level = atoi(argv[0]);
-
-        msg = talloc_zero_size(ctx, 1);
-        if (msg == NULL) {
-                DEBUG(0, ("out of memory in debug()\n"));
-                return 0;
-        }
-
-        for (i = 1; i < argc; i++) {
-                msg = talloc_append_string(ctx, msg, argv[i]);
-                if (msg == NULL) {
-                        DEBUG(0, ("out of memory in debug()\n"));
-                        return 0;
-                }
-        }
-
-        DEBUG(level, ("%s", msg));
-        talloc_free(msg);
-	return 0;
-}
-
 static void (*ejs_exception_handler) (const char *) = NULL;
 
 _PUBLIC_ void ejs_exception(const char *reason)
@@ -273,6 +240,5 @@ void smb_setup_ejs_functions(void (*exception_handler)(const char *))
 	ejsDefineStringCFunction(-1, "libinclude", ejs_libinclude, NULL, MPR_VAR_SCRIPT_HANDLE);
 	ejsDefineCFunction(-1, "version", ejs_version, NULL, MPR_VAR_SCRIPT_HANDLE);
 	ejsDefineStringCFunction(-1, "jsonrpc_include", jsonrpc_include, NULL, MPR_VAR_SCRIPT_HANDLE);
-	ejsDefineStringCFunction(-1, "debug", ejs_debug, NULL, MPR_VAR_SCRIPT_HANDLE);
 }
 
-- 
cgit 


From 1c681891b2d00a21efa02488d80bc48c3ddab783 Mon Sep 17 00:00:00 2001
From: Derrell Lipman <derrell@samba.org>
Date: Sat, 7 Oct 2006 20:31:27 +0000
Subject: r19165: handle errors better for jsonrpc.  generate an error object
 whenever possible (This used to be commit
 aa8e4227a11d997f7c4c5af2b7a3c7c371b8c1cd)

---
 source4/scripting/ejs/smbcalls.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls.c b/source4/scripting/ejs/smbcalls.c
index b0df390427..62a956bb96 100644
--- a/source4/scripting/ejs/smbcalls.c
+++ b/source4/scripting/ejs/smbcalls.c
@@ -193,6 +193,7 @@ static int jsonrpc_include(int eid, int argc, char **argv)
         if (file_exist(path)) {
                 ret = ejsEvalFile(eid, path, &result, &emsg);
                 if (ret < 0) {
+                        ejsSetErrorMsg(eid, "Could not eval file");
                         printf("file found; ret=%d (%s)\n", ret, emsg);
                 }
         }
-- 
cgit 


From 7135bb9e6372b5514dcbd27c64b140bb4025edec Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Tue, 10 Oct 2006 04:20:50 +0000
Subject: r19216: Merge from SAMBA_4_0_RELEASE:

Move default for subobj.LDAPMODULES into scripting/libjs/provision.js
so that SWAT can provision again.

Andrew Bartlett
(This used to be commit a4aafe307d6d1396fa79b0c48b0a36cbf682f0ce)
---
 source4/scripting/libjs/provision.js | 1 +
 1 file changed, 1 insertion(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index fdc86b1cf7..c20453a74d 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -625,6 +625,7 @@ function provision_guess()
 	rdn_list = split(".", subobj.DNSDOMAIN);
 	subobj.BASEDN       = "DC=" + join(",DC=", rdn_list);
 	subobj.LDAPBACKEND  = "users.ldb";
+	subobj.LDAPMODULES = "objectguid";
 	subobj.EXTENSIBLEOBJECT = "# no objectClass: extensibleObject for local ldb";
 	return subobj;
 }
-- 
cgit 


From 151e30e18aea131291bc53f167378192165bb89c Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Thu, 12 Oct 2006 08:32:58 +0000
Subject: r19252: - fixed 'erase' argument to setup_ldb()

- when wiping a ldb, wipe within each naming context first. By not
  wiping the naming contexts we didn't wipe the partitions, which
  caused a massive slowdown in re-provisioning due to re-indexing of
  the schema.
(This used to be commit b62437214cf7c98c81598c4f37c91ab284928dbb)
---
 source4/scripting/libjs/provision.js | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index c20453a74d..e020cc41bd 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -157,7 +157,24 @@ function ldb_delete(ldb)
 */
 function ldb_erase(ldb)
 {
-	var attrs = new Array("dn");
+	var attrs = new Array("namingContexts");
+	var res;
+
+	/* delete within each naming context - this copes with existing partitions */
+     	res = ldb.search("objectClass=*", "", ldb.SCOPE_BASE, attrs);
+	if (typeof(res) != "undefined") {
+		if (res.length > 0) {
+			var names = res[0].namingContexts;
+			for (i=0;i<names.length;i++) {
+				attrs = new Array("dn");
+				res = ldb.search("(objectclass=*)", names[i], ldb.SCOPE_SUBTREE, attrs);
+				var j;
+				for (j=0;j<res.length;j++) {
+					ldb.del(res[j].dn);
+				}
+			}
+		}
+	}
 
 	/* delete the specials */
 	ldb.del("@INDEXLIST");
@@ -168,6 +185,7 @@ function ldb_erase(ldb)
 	ldb.del("@KLUDGEACL");
 
 	/* and the rest */
+	attrs = new Array("dn");
      	var basedn = "";
      	var res = ldb.search("(&(|(objectclass=*)(dn=*))(!(dn=@BASEINFO)))", basedn, ldb.SCOPE_SUBTREE, attrs);
 	var i;
@@ -179,6 +197,7 @@ function ldb_erase(ldb)
 		ldb.del(res[i].dn);
 	}
 
+
      	var res = ldb.search("(&(|(objectclass=*)(dn=*))(!(dn=@BASEINFO)))", basedn, ldb.SCOPE_SUBTREE, attrs);
 	if (res.length != 0) {
 		ldb_delete(ldb);
@@ -292,7 +311,7 @@ function setup_ldb(ldif, info, dbname)
 	        failok = arguments[4];
         }
 	var ldb = open_ldb(info, dbname, erase);
-	if (setup_add_ldif(ldif, info, ldb, erase, failok)) {
+	if (setup_add_ldif(ldif, info, ldb, failok)) {
 		var commit_ok = ldb.transaction_commit();
 		if (!commit_ok) {
 			info.message("ldb commit failed: " + ldb.errstring() + "\n");
-- 
cgit 


From d70fbdbefa321825998b5bf558c23733fb46425a Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Fri, 13 Oct 2006 01:35:52 +0000
Subject: r19258: Don't delete the contents of the partitions twice, and in
 particular don't delete their contents until we have specified the new
 partition locations.

However, preserve the important part of tridge's change, that is to
ensure that no database index is present when the mass delete occours.
In my testing, it is best to leave the index until the provision is
compleated.

Andrew Bartlett
(This used to be commit 962219df7dc53ce6f6889f4b71ee19850c7ff7b5)
---
 source4/scripting/libjs/provision.js | 23 ++++++-----------------
 1 file changed, 6 insertions(+), 17 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index e020cc41bd..2dc6bb522b 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -157,25 +157,8 @@ function ldb_delete(ldb)
 */
 function ldb_erase(ldb)
 {
-	var attrs = new Array("namingContexts");
 	var res;
 
-	/* delete within each naming context - this copes with existing partitions */
-     	res = ldb.search("objectClass=*", "", ldb.SCOPE_BASE, attrs);
-	if (typeof(res) != "undefined") {
-		if (res.length > 0) {
-			var names = res[0].namingContexts;
-			for (i=0;i<names.length;i++) {
-				attrs = new Array("dn");
-				res = ldb.search("(objectclass=*)", names[i], ldb.SCOPE_SUBTREE, attrs);
-				var j;
-				for (j=0;j<res.length;j++) {
-					ldb.del(res[j].dn);
-				}
-			}
-		}
-	}
-
 	/* delete the specials */
 	ldb.del("@INDEXLIST");
 	ldb.del("@ATTRIBUTES");
@@ -528,6 +511,9 @@ function provision(subobj, message, blank, paths, session_info, credentials)
 	setup_add_ldif("provision.ldif", info, samdb, false);
 
 	if (blank != false) {
+		message("Setting up sam.ldb index\n");
+		setup_add_ldif("provision_index.ldif", info, samdb, false);
+
 		var commit_ok = samdb.transaction_commit();
 		if (!commit_ok) {
 			info.message("ldb commit failed: " + samdb.errstring() + "\n");
@@ -543,6 +529,9 @@ function provision(subobj, message, blank, paths, session_info, credentials)
 		return false;
 	}
 
+	message("Setting up sam.ldb index\n");
+	setup_add_ldif("provision_index.ldif", info, samdb, false);
+
 	var commit_ok = samdb.transaction_commit();
 	if (!commit_ok) {
 		info.message("samdb commit failed: " + samdb.errstring() + "\n");
-- 
cgit 


From d08f8ab4336583150ca072250bd71076a5c1e366 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Sun, 15 Oct 2006 21:40:49 +0000
Subject: r19297: fixed a leak in the ejs ldb interface (This used to be commit
 6978225ffcc12ffdda0d3404e855219808c0597c)

---
 source4/scripting/ejs/smbcalls_ldb.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_ldb.c b/source4/scripting/ejs/smbcalls_ldb.c
index d5735dce70..f8296b9d36 100644
--- a/source4/scripting/ejs/smbcalls_ldb.c
+++ b/source4/scripting/ejs/smbcalls_ldb.c
@@ -60,7 +60,7 @@ static int ejs_ldbSearch(MprVarHandle eid, int argc, struct MprVar **argv)
 	TALLOC_CTX *tmp_ctx = talloc_new(mprMemCtx());
 	struct ldb_context *ldb;
 	int ret;
-	struct ldb_result *res;
+	struct ldb_result *res=NULL;
 
 	/* validate arguments */
 	if (argc < 1 || argc > 4) {
@@ -112,7 +112,7 @@ static int ejs_ldbSearch(MprVarHandle eid, int argc, struct MprVar **argv)
 	} else {
 		mpr_Return(eid, mprLdbArray(ldb, res->msgs, res->count, "ldb_message"));
 	}
-
+	talloc_free(res);
 	talloc_free(tmp_ctx);
 	return 0;
 
-- 
cgit 


From 8afbf3a0ef63dfc5553e7de8dc498685d8fd2bc7 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Mon, 16 Oct 2006 03:53:12 +0000
Subject: r19318: Because we don't test the vampire code in SWAT very
 regularly, it bit-rotted.

Fix up interfaces and interaction between the two..

Andrew Bartlett
(This used to be commit 9b77d285d8cd8999547c0d17e97681d236acbdb0)
---
 source4/scripting/libjs/provision.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index 2dc6bb522b..05e6726244 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -368,10 +368,12 @@ function provision_default_paths(subobj)
 /*
   setup reasonable name mappings for sam names to unix names
 */
-function setup_name_mappings(info, subobj, ldb)
+function setup_name_mappings(info, ldb)
 {
 	var lp = loadparm_init();
 	var attrs = new Array("objectSid");
+	var subobj = info.subobj;
+
 	res = ldb.search("objectSid=*", subobj.BASEDN, ldb.SCOPE_BASE, attrs);
 	assert(res.length == 1 && res[0].objectSid != undefined);
 	var sid = res[0].objectSid;
@@ -525,7 +527,7 @@ function provision(subobj, message, blank, paths, session_info, credentials)
 	message("Setting up sam.ldb users and groups\n");
 	setup_add_ldif("provision_users.ldif", info, samdb, false);
 
-	if (setup_name_mappings(info, subobj, samdb) == false) {
+	if (setup_name_mappings(info, samdb) == false) {
 		return false;
 	}
 
-- 
cgit 


From 794a7f52235bbd7aa87629f47d2bf6a65835a615 Mon Sep 17 00:00:00 2001
From: Simo Sorce <idra@samba.org>
Date: Mon, 16 Oct 2006 12:05:44 +0000
Subject: r19334: Commit commented provisioning code to activate the schema
 (This used to be commit 57ee79c15579d1bbe7c0d3202b84a06b75320e40)

---
 source4/scripting/libjs/provision.js | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index 05e6726244..2eac2b731c 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -282,6 +282,25 @@ function setup_add_ldif(ldif, info, ldb, failok)
 	return add_ok;
 }
 
+function setup_modify_ldif(ldif, info, ldb, failok)
+{
+	var lp = loadparm_init();
+	var src = lp.get("setup directory") + "/" + ldif;
+
+	var data = sys.file_load(src);
+	data = substitute_var(data, info.subobj);
+
+	var mod_ok = ldb.modify(data);
+	if (!mod_ok) {
+		info.message("ldb load failed: " + ldb.errstring() + "\n");
+		if (!failok) {
+			assert(mod_ok);
+	        }
+	}
+	return mod_ok;
+}
+
+
 function setup_ldb(ldif, info, dbname) 
 {
 	var erase = true;
@@ -524,6 +543,19 @@ function provision(subobj, message, blank, paths, session_info, credentials)
 		return true;
 	}
 
+//	message("Activate schema module");
+//	setup_modify_ldif("schema_activation.ldif", info, samdb, false);
+//
+//	// (hack) Reload, now we have the schema loaded.  
+//	var commit_ok = samdb.transaction_commit();
+//	if (!commit_ok) {
+//		info.message("samdb commit failed: " + samdb.errstring() + "\n");
+//		assert(commit_ok);
+//	}
+//	samdb.close();
+//
+//	samdb = open_ldb(info, paths.samdb, false);
+//
 	message("Setting up sam.ldb users and groups\n");
 	setup_add_ldif("provision_users.ldif", info, samdb, false);
 
-- 
cgit 


From 8773e743c518578584d07d35ffdafdd598af88b0 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 16 Oct 2006 13:06:41 +0000
Subject: r19339: Merge my 4.0-unittest branch. This adds an API for more
 fine-grained output in the testsuite rather than just True or False for a set
 of tests.

The aim is to use this for:
 * known failure lists (run all tests and detect tests that
						started working or started failing). This
   would allow us to get rid of the RPC-SAMBA3-* tests
 * nicer torture output
 * simplification of the testsuite system
 * compatibility with other unit testing systems
 * easier usage of smbtorture (being able to run one test
						and automatically set up the environment for that)

This is still a work-in-progress; expect more updates over the next couple of
days.
(This used to be commit 0eb6097305776325c75081356309115f445a7218)
---
 source4/scripting/ejs/smbscript.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbscript.c b/source4/scripting/ejs/smbscript.c
index d602a7733b..23e2fe2d52 100644
--- a/source4/scripting/ejs/smbscript.c
+++ b/source4/scripting/ejs/smbscript.c
@@ -68,7 +68,7 @@ int main(int argc, const char **argv)
 
 	if (ejsOpen(NULL, NULL, NULL) != 0) {
 		fprintf(stderr, "smbscript: ejsOpen(): unable to initialise "
-			"EJ subsystem\n");
+			"EJS subsystem\n");
 		exit(127);
 	}
 
-- 
cgit 


From b316b78cd5d2c511f59ef325c5e8fec68e02ddfe Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Fri, 20 Oct 2006 15:20:48 +0000
Subject: r19427: print out the currect name

metze
(This used to be commit 0fcdc8c243f50da5a1203370740ac8d022a5cfdc)
---
 source4/scripting/libjs/provision.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index 2eac2b731c..b267cde575 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -475,7 +475,7 @@ function provision(subobj, message, blank, paths, session_info, credentials)
 	/* only install a new shares config db if there is none */
 	st = sys.stat(paths.shareconf);
 	if (st == undefined) {
-		message("Setting up sconf.ldb\n");
+		message("Setting up share.ldb\n");
 		setup_ldb("share.ldif", info, paths.shareconf);
 	}
 	message("Setting up secrets.ldb\n");
-- 
cgit 


From 68453d1da2ad68c1e9cb5d42eb71822ae6f0117b Mon Sep 17 00:00:00 2001
From: Derrell Lipman <derrell@samba.org>
Date: Sun, 22 Oct 2006 02:57:28 +0000
Subject: r19449: ldbbrowse: installation hopefully works now.  "Developer"
 installations ('configure.developer' or 'configure --enable-developer') may
 still have problems as I'm not sure I got all of the paths right for that.

With the changes Tridge has made to the Main Menu in swat, given a
non-developer installation, you should be able to get to ldbbrowse via:

  JSON/qooxdoo -> ldb browser

Derrell
(This used to be commit 2406af10791cd8545c598c8591a48de5515c7dc5)
---
 source4/scripting/ejs/smbcalls.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls.c b/source4/scripting/ejs/smbcalls.c
index 62a956bb96..1aee4cd9e2 100644
--- a/source4/scripting/ejs/smbcalls.c
+++ b/source4/scripting/ejs/smbcalls.c
@@ -163,19 +163,19 @@ static int ejs_version(MprVarHandle eid, int argc, struct MprVar **argv)
 
 /*
  * jsonrpc_include() allows you to include jsonrpc files from a path based at
- * "jsonrpc base =" in smb.conf.
+ * "jsonrpc services directory =" in smb.conf.
  */
 static int jsonrpc_include(int eid, int argc, char **argv)
 {
         int ret = -1;
         char *path;
         char *emsg;
-	const char *jsonrpc_base = lp_jsonrpc_base();
+	const char *jsonrpc_services_dir = lp_jsonrpc_services_dir();
         struct MprVar result;
 
 
-	if (jsonrpc_base == NULL || jsonrpc_base == NULL) {
-		ejsSetErrorMsg(eid, "js include path not set");
+	if (jsonrpc_services_dir == NULL || jsonrpc_services_dir == NULL) {
+		ejsSetErrorMsg(eid, "'jsonrpc services directory' not set");
 		return -1;
 	}
 
@@ -184,7 +184,9 @@ static int jsonrpc_include(int eid, int argc, char **argv)
 		return 0;
         }
 
-        path = talloc_asprintf(mprMemCtx(), "%s/%s", jsonrpc_base, argv[0]);
+        path = talloc_asprintf(mprMemCtx(), "%s/%s",
+                               jsonrpc_services_dir,
+                               argv[0]);
         if (path == NULL) {
                 mpr_Return(eid, mprCreateIntegerVar(-1));
                 return 0;
-- 
cgit 


From 13dbee3ffea6065a826f010e50c9b4eb2c6ad109 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Tue, 7 Nov 2006 00:48:36 +0000
Subject: r19598: Ahead of a merge to current lorikeet-heimdal:

Break up auth/auth.h not to include the world.

Add credentials_krb5.h with the kerberos dependent prototypes.

Andrew Bartlett
(This used to be commit 2b569c42e0fbb596ea82484d0e1cb22e193037b9)
---
 source4/scripting/ejs/config.mk       | 2 +-
 source4/scripting/ejs/smbcalls_auth.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/config.mk b/source4/scripting/ejs/config.mk
index 09ad510a12..0326bca857 100644
--- a/source4/scripting/ejs/config.mk
+++ b/source4/scripting/ejs/config.mk
@@ -78,7 +78,7 @@ PUBLIC_DEPENDENCIES = \
 		EJS LIBSAMBA-UTIL \
 		EJSRPC MESSAGING \
 		LIBSAMBA-NET LIBCLI_SMB LIBPOPT \
-		POPT_CREDENTIALS POPT_SAMBA \
+		CREDENTIALS POPT_CREDENTIALS POPT_SAMBA \
 		dcerpc \
 		NDR_TABLE
 # End SUBSYSTEM smbcalls
diff --git a/source4/scripting/ejs/smbcalls_auth.c b/source4/scripting/ejs/smbcalls_auth.c
index 281f35bb20..7b9fe2fc17 100644
--- a/source4/scripting/ejs/smbcalls_auth.c
+++ b/source4/scripting/ejs/smbcalls_auth.c
@@ -24,6 +24,7 @@
 #include "includes.h"
 #include "lib/appweb/ejs/ejs.h"
 #include "auth/auth.h"
+#include "auth/credentials/credentials.h"
 #include "scripting/ejs/smbcalls.h"
 #include "lib/events/events.h"
 #include "lib/messaging/irpc.h"
-- 
cgit 


From 84138215cade4bd427a4a04810696cbb89434928 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Thu, 16 Nov 2006 09:34:19 +0000
Subject: r19732: The 'res' from ldb_search is only valid if the call returns
 LDB_SUCCESS.

This seems to show up (as an abort() from talloc) particularly under
ldb_ildap.

Andrew Bartlett
(This used to be commit 9890af534d845d471d2a98268c408a907b29e016)
---
 source4/scripting/ejs/smbcalls_ldb.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_ldb.c b/source4/scripting/ejs/smbcalls_ldb.c
index f8296b9d36..0af9738b60 100644
--- a/source4/scripting/ejs/smbcalls_ldb.c
+++ b/source4/scripting/ejs/smbcalls_ldb.c
@@ -111,8 +111,8 @@ static int ejs_ldbSearch(MprVarHandle eid, int argc, struct MprVar **argv)
 		mpr_Return(eid, mprCreateUndefinedVar());
 	} else {
 		mpr_Return(eid, mprLdbArray(ldb, res->msgs, res->count, "ldb_message"));
+		talloc_free(res);
 	}
-	talloc_free(res);
 	talloc_free(tmp_ctx);
 	return 0;
 
-- 
cgit 


From 4889eb9f7aae9349e426d0f6d2217adff67eaebd Mon Sep 17 00:00:00 2001
From: Simo Sorce <idra@samba.org>
Date: Wed, 22 Nov 2006 00:59:34 +0000
Subject: r19831: Big ldb_dn optimization and interfaces enhancement patch

This patch changes a lot of the code in ldb_dn.c, and also
removes and add a number of manipulation functions around.

The aim is to avoid validating a dn if not necessary as the
validation code is necessarily slow. This is mainly to speed up
internal operations where input is not user generated and so we
can assume the DNs need no validation. The code is designed to
keep the data as a string if possible.

The code is not yet 100% perfect, but pass all the tests so far.
A memleak is certainly present, I'll work on that next.

Simo.
(This used to be commit a580c871d3784602a9cce32d33419e63c8236e63)
---
 source4/scripting/ejs/smbcalls_ldb.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_ldb.c b/source4/scripting/ejs/smbcalls_ldb.c
index 0af9738b60..3c368bba4f 100644
--- a/source4/scripting/ejs/smbcalls_ldb.c
+++ b/source4/scripting/ejs/smbcalls_ldb.c
@@ -83,8 +83,8 @@ static int ejs_ldbSearch(MprVarHandle eid, int argc, struct MprVar **argv)
 		/* a null basedn is valid */
 	}
 	if (base != NULL) {
-		basedn = ldb_dn_explode(tmp_ctx, base);
-		if (basedn == NULL) {
+		basedn = ldb_dn_new(tmp_ctx, ldb, base);
+		if ( ! ldb_dn_validate(basedn)) {
 			ejsSetErrorMsg(eid, "ldb.search malformed base dn");
 			goto failed;
 		}
@@ -187,8 +187,8 @@ static int ejs_ldbDelete(MprVarHandle eid, int argc, struct MprVar **argv)
 		return -1;
 	}
 
-	dn = ldb_dn_explode(ldb, mprToString(argv[0]));
-	if (dn == NULL) {
+	dn = ldb_dn_new(ldb, ldb, mprToString(argv[0]));
+	if ( ! ldb_dn_validate(dn)) {
 		ejsSetErrorMsg(eid, "ldb.delete malformed dn");
 		return -1;
 	}
@@ -222,9 +222,9 @@ static int ejs_ldbRename(MprVarHandle eid, int argc, struct MprVar **argv)
 		return -1;
 	}
 
-	dn1 = ldb_dn_explode(ldb, mprToString(argv[0]));
-	dn2 = ldb_dn_explode(ldb, mprToString(argv[1]));
-	if (dn1 == NULL || dn2 == NULL) {
+	dn1 = ldb_dn_new(ldb, ldb, mprToString(argv[0]));
+	dn2 = ldb_dn_new(ldb, ldb, mprToString(argv[1]));
+	if ( ! ldb_dn_validate(dn1) ||  ! ldb_dn_validate(dn2)) {
 		ejsSetErrorMsg(eid, "ldb.rename invalid or malformed arguments");
 		return -1;
 	}
-- 
cgit 


From a9e31b33b55a873c2f01db5e348560176adf863d Mon Sep 17 00:00:00 2001
From: Simo Sorce <idra@samba.org>
Date: Wed, 22 Nov 2006 02:05:19 +0000
Subject: r19832: better prototypes for the linearization functions:

- ldb_dn_get_linearized
  returns a const string

- ldb_dn_alloc_linearized
  allocs astring with the linearized dn
(This used to be commit 3929c086d5d0b3f08b1c4f2f3f9602c3f4a9a4bd)
---
 source4/scripting/ejs/mprutil.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/mprutil.c b/source4/scripting/ejs/mprutil.c
index e921b11475..6c989807a6 100644
--- a/source4/scripting/ejs/mprutil.c
+++ b/source4/scripting/ejs/mprutil.c
@@ -166,7 +166,7 @@ static struct MprVar mprLdbMessage(struct ldb_context *ldb, struct ldb_message *
 	const char *multivalued[] = { "objectClass", "memberOf", "privilege", 
 					    "member", NULL };
 
-	var = mprObject(ldb_dn_linearize(msg, msg->dn));
+	var = mprObject(ldb_dn_alloc_linearized(msg, msg->dn));
 
 	for (i=0;i<msg->num_elements;i++) {
 		struct ldb_message_element *el = &msg->elements[i];
@@ -213,7 +213,7 @@ static struct MprVar mprLdbMessage(struct ldb_context *ldb, struct ldb_message *
 
 	/* add the dn if it is not already specified */
 	if (mprGetProperty(&var, "dn", 0) == 0) {
-		mprSetVar(&var, "dn", mprString(ldb_dn_linearize(msg, msg->dn)));
+		mprSetVar(&var, "dn", mprString(ldb_dn_alloc_linearized(msg, msg->dn)));
 	}
 	
 	return var;		
-- 
cgit 


From 61cb5f807e3d0a3bbffbc317c882517c724c35da Mon Sep 17 00:00:00 2001
From: Rafal Szczesniak <mimir@samba.org>
Date: Thu, 30 Nov 2006 20:29:49 +0000
Subject: r19972: put a placeholder of a new js function and use error strings
 returned by each libnet call.

rafal
(This used to be commit bc88640bb51db381d91b797693bc04f7b2653eb6)
---
 source4/scripting/ejs/ejsnet.c | 65 ++++++++++++++++++++++++++++++++++++++----
 1 file changed, 59 insertions(+), 6 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/ejsnet.c b/source4/scripting/ejs/ejsnet.c
index 523e0e8a02..cef3b99d05 100644
--- a/source4/scripting/ejs/ejsnet.c
+++ b/source4/scripting/ejs/ejsnet.c
@@ -28,14 +28,16 @@
 #include "events/events.h"
 #include "auth/credentials/credentials.h"
 
-static int ejs_net_userman(MprVarHandle, int, struct MprVar**);
-static int ejs_net_createuser(MprVarHandle, int, char**);
+static int ejs_net_userman(MprVarHandle eid, int argc, struct MprVar** argv);
+static int ejs_net_createuser(MprVarHandle eid, int argc, char **argv);
 static int ejs_net_deleteuser(MprVarHandle eid, int argc, char **argv);
+static int ejs_net_userinfo(MprVarHandle eid, int argc, char **argv);
 static int ejs_net_join_domain(MprVarHandle eid, int argc, struct MprVar **argv);
 static int ejs_net_samsync_ldb(MprVarHandle eid, int argc, struct MprVar **argv);
 
-/* Usage:
-   net = NetContext(credentials);
+/*
+  Usage:
+  net = NetContext(credentials);
 */
 
 static int ejs_net_context(MprVarHandle eid, int argc, struct MprVar **argv)
@@ -92,6 +94,7 @@ static int ejs_net_context(MprVarHandle eid, int argc, struct MprVar **argv)
 	return 0;
 }
 
+
 static int ejs_net_join_domain(MprVarHandle eid, int argc, struct MprVar **argv)
 {
 	TALLOC_CTX *mem_ctx;
@@ -150,6 +153,7 @@ static int ejs_net_join_domain(MprVarHandle eid, int argc, struct MprVar **argv)
 	return 0;
 }
 
+
 static int ejs_net_samsync_ldb(MprVarHandle eid, int argc, struct MprVar **argv)
 {
 	TALLOC_CTX *mem_ctx;
@@ -197,6 +201,11 @@ static int ejs_net_samsync_ldb(MprVarHandle eid, int argc, struct MprVar **argv)
 	return 0;
 }
 
+
+/*
+  Usage:
+  usrCtx = net.UserMgr(domain);
+*/
 static int ejs_net_userman(MprVarHandle eid, int argc, struct MprVar **argv)
 {
 	TALLOC_CTX *mem_ctx;
@@ -229,6 +238,7 @@ static int ejs_net_userman(MprVarHandle eid, int argc, struct MprVar **argv)
 
 	mprSetStringCFunction(obj, "Create", ejs_net_createuser);
 	mprSetStringCFunction(obj, "Delete", ejs_net_deleteuser);
+	mprSetStringCFunction(obj, "Info", ejs_net_userinfo);
 
 	return 0;
 done:
@@ -269,7 +279,7 @@ static int ejs_net_createuser(MprVarHandle eid, int argc, char **argv)
 
 	status = libnet_CreateUser(ctx, mem_ctx, &req);
 	if (!NT_STATUS_IS_OK(status)) {
-		ejsSetErrorMsg(eid, "error when creating user: %s", nt_errstr(status));
+		ejsSetErrorMsg(eid, "%s", req.out.error_string);
 	}
 
 	talloc_free(mem_ctx);
@@ -277,6 +287,7 @@ static int ejs_net_createuser(MprVarHandle eid, int argc, char **argv)
 	return 0;
 }
 
+
 static int ejs_net_deleteuser(MprVarHandle eid, int argc, char **argv)
 {
 	NTSTATUS status = NT_STATUS_UNSUCCESSFUL;
@@ -309,7 +320,7 @@ static int ejs_net_deleteuser(MprVarHandle eid, int argc, char **argv)
 
 	status = libnet_DeleteUser(ctx, mem_ctx, &req);
 	if (!NT_STATUS_IS_OK(status)) {
-		ejsSetErrorMsg(eid, "error when creating user: %s", nt_errstr(status));
+		ejsSetErrorMsg(eid, "%s", req.out.error_string);
 	}
 
 	talloc_free(mem_ctx);
@@ -318,6 +329,48 @@ static int ejs_net_deleteuser(MprVarHandle eid, int argc, char **argv)
 }
 
 
+static int ejs_net_userinfo(MprVarHandle eid, int argc, char **argv)
+{
+	NTSTATUS status = NT_STATUS_UNSUCCESSFUL;
+	TALLOC_CTX *mem_ctx;
+	struct libnet_context *ctx;
+	const char *userman_domain = NULL;
+	struct libnet_UserInfo req;
+
+	if (argc != 1) {
+		ejsSetErrorMsg(eid, "argument 1 must be a string");
+		return -1;
+	}
+
+	ctx = mprGetThisPtr(eid, "ctx");
+	if (!ctx) {
+		ejsSetErrorMsg(eid, "ctx property returns null pointer");
+		return -1;
+	}
+
+	userman_domain = mprGetThisPtr(eid, "domain");
+	if (!userman_domain) {
+		ejsSetErrorMsg(eid, "domain property returns null pointer");
+		return -1;
+	}
+
+	mem_ctx = talloc_new(mprMemCtx());
+	
+	req.in.domain_name = userman_domain;
+	req.in.user_name   = argv[0];
+	
+	status = libnet_UserInfo(ctx, mem_ctx, &req);
+	if (!NT_STATUS_IS_OK(status)) {
+		ejsSetErrorMsg(eid, "%s", req.out.error_string);
+	}
+
+	/* TODO: create user info object and pass received properties */
+
+	talloc_free(mem_ctx);
+	return 0;
+}
+
+
 void ejsnet_setup(void)
 {
 	ejsDefineCFunction(-1, "NetContext", ejs_net_context, NULL, MPR_VAR_SCRIPT_HANDLE);
-- 
cgit 


From a1af18217b9876327647552df1f328924ae726c4 Mon Sep 17 00:00:00 2001
From: Rafal Szczesniak <mimir@samba.org>
Date: Tue, 12 Dec 2006 23:01:51 +0000
Subject: r20143: a bit of experiments before doing serious changes in ejsnet.

rafal
(This used to be commit 3cdd43ebcedfa7d1d59bd33b3bfed4e80560ec82)
---
 source4/scripting/ejs/ejsnet.c | 42 +++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 41 insertions(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/ejsnet.c b/source4/scripting/ejs/ejsnet.c
index cef3b99d05..5daf478506 100644
--- a/source4/scripting/ejs/ejsnet.c
+++ b/source4/scripting/ejs/ejsnet.c
@@ -336,6 +336,11 @@ static int ejs_net_userinfo(MprVarHandle eid, int argc, char **argv)
 	struct libnet_context *ctx;
 	const char *userman_domain = NULL;
 	struct libnet_UserInfo req;
+	struct MprVar mprUserInfo;
+	struct MprVar mprAccountName, mprFullName, mprDescription;
+	struct MprVar mprHomeDir, mprHomeDrive, mprComment;
+	struct MprVar mprLogonScript;
+	struct MprVar mprAcctExpiry, mprAllowPassChange, mprForcePassChange;
 
 	if (argc != 1) {
 		ejsSetErrorMsg(eid, "argument 1 must be a string");
@@ -364,9 +369,44 @@ static int ejs_net_userinfo(MprVarHandle eid, int argc, char **argv)
 		ejsSetErrorMsg(eid, "%s", req.out.error_string);
 	}
 
-	/* TODO: create user info object and pass received properties */
+	/* create UserInfo object */
+	mprUserInfo = mprObject("UserInfo");
+
+	mprAccountName = mprString(req.out.account_name);
+	mprFullName = mprString(req.out.full_name);
+	mprDescription = mprString(req.out.description);
+	mprHomeDir = mprString(req.out.home_directory);
+	mprHomeDrive = mprString(req.out.home_drive);
+	mprComment = mprString(req.out.comment);
+	mprLogonScript = mprString(req.out.logon_script);
+	mprAcctExpiry = mprString(timestring(mem_ctx, req.out.acct_expiry->tv_sec));
+	mprAllowPassChange = mprString(timestring(mem_ctx, req.out.allow_password_change->tv_sec));
+	mprForcePassChange = mprString(timestring(mem_ctx, req.out.force_password_change->tv_sec));
+
+	status = mprSetVar(&mprUserInfo, "AccountName", mprAccountName);
+	if (!NT_STATUS_IS_OK(status)) goto done;
+	status = mprSetVar(&mprUserInfo, "FullName", mprFullName);
+	if (!NT_STATUS_IS_OK(status)) goto done;
+	status = mprSetVar(&mprUserInfo, "Description", mprDescription);
+	if (!NT_STATUS_IS_OK(status)) goto done;
+	status = mprSetVar(&mprUserInfo, "HomeDirectory", mprHomeDir);
+	if (!NT_STATUS_IS_OK(status)) goto done;
+	status = mprSetVar(&mprUserInfo, "HomeDrive", mprHomeDrive);
+	if (!NT_STATUS_IS_OK(status)) goto done;
+	status = mprSetVar(&mprUserInfo, "Comment", mprComment);
+	if (!NT_STATUS_IS_OK(status)) goto done;
+	status = mprSetVar(&mprUserInfo, "LogonScript", mprLogonScript);
+	if (!NT_STATUS_IS_OK(status)) goto done;
+	status = mprSetVar(&mprUserInfo, "AcctExpiry", mprAcctExpiry);
+	if (!NT_STATUS_IS_OK(status)) goto done;
+	status = mprSetVar(&mprUserInfo, "AllowPasswordChange", mprAllowPassChange);
+	if (!NT_STATUS_IS_OK(status)) goto done;
+	status = mprSetVar(&mprUserInfo, "ForcePasswordChange", mprForcePassChange);
+	if (!NT_STATUS_IS_OK(status)) goto done;
 
+done:
 	talloc_free(mem_ctx);
+	mpr_Return(eid, mprUserInfo);
 	return 0;
 }
 
-- 
cgit 


From ecd5e432b708f27106dd8fbd8a2a2567fd18cff1 Mon Sep 17 00:00:00 2001
From: Rafal Szczesniak <mimir@samba.org>
Date: Wed, 13 Dec 2006 23:37:22 +0000
Subject: r20163: Return null object if no user is found.

rafal
(This used to be commit af539fec4acb3ad78b8f0fa4f7c2f4e6cebea0b7)
---
 source4/scripting/ejs/ejsnet.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/ejsnet.c b/source4/scripting/ejs/ejsnet.c
index 5daf478506..8662ae2caf 100644
--- a/source4/scripting/ejs/ejsnet.c
+++ b/source4/scripting/ejs/ejsnet.c
@@ -367,11 +367,15 @@ static int ejs_net_userinfo(MprVarHandle eid, int argc, char **argv)
 	status = libnet_UserInfo(ctx, mem_ctx, &req);
 	if (!NT_STATUS_IS_OK(status)) {
 		ejsSetErrorMsg(eid, "%s", req.out.error_string);
+		
+		/* create null object to return */
+		mprUserInfo = mprCreateNullVar();
+		goto done;
 	}
 
 	/* create UserInfo object */
 	mprUserInfo = mprObject("UserInfo");
-
+	
 	mprAccountName = mprString(req.out.account_name);
 	mprFullName = mprString(req.out.full_name);
 	mprDescription = mprString(req.out.description);
-- 
cgit 


From 765256d435cdee92d69e1fe8dad591e68bcb08b7 Mon Sep 17 00:00:00 2001
From: Rafal Szczesniak <mimir@samba.org>
Date: Thu, 14 Dec 2006 22:12:53 +0000
Subject: r20175: use libnet context instead mem_ctx as the latter gets freed
 just before the function returns.

rafal
(This used to be commit ca8259fd27d1e92bcb650441461afdfd613e93bf)
---
 source4/scripting/ejs/ejsnet.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/ejsnet.c b/source4/scripting/ejs/ejsnet.c
index 8662ae2caf..41ea1e2327 100644
--- a/source4/scripting/ejs/ejsnet.c
+++ b/source4/scripting/ejs/ejsnet.c
@@ -375,7 +375,7 @@ static int ejs_net_userinfo(MprVarHandle eid, int argc, char **argv)
 
 	/* create UserInfo object */
 	mprUserInfo = mprObject("UserInfo");
-	
+
 	mprAccountName = mprString(req.out.account_name);
 	mprFullName = mprString(req.out.full_name);
 	mprDescription = mprString(req.out.description);
@@ -384,8 +384,8 @@ static int ejs_net_userinfo(MprVarHandle eid, int argc, char **argv)
 	mprComment = mprString(req.out.comment);
 	mprLogonScript = mprString(req.out.logon_script);
 	mprAcctExpiry = mprString(timestring(mem_ctx, req.out.acct_expiry->tv_sec));
-	mprAllowPassChange = mprString(timestring(mem_ctx, req.out.allow_password_change->tv_sec));
-	mprForcePassChange = mprString(timestring(mem_ctx, req.out.force_password_change->tv_sec));
+	mprAllowPassChange = mprString(timestring(ctx, req.out.allow_password_change->tv_sec));
+	mprForcePassChange = mprString(timestring(ctx, req.out.force_password_change->tv_sec));
 
 	status = mprSetVar(&mprUserInfo, "AccountName", mprAccountName);
 	if (!NT_STATUS_IS_OK(status)) goto done;
@@ -407,7 +407,6 @@ static int ejs_net_userinfo(MprVarHandle eid, int argc, char **argv)
 	if (!NT_STATUS_IS_OK(status)) goto done;
 	status = mprSetVar(&mprUserInfo, "ForcePasswordChange", mprForcePassChange);
 	if (!NT_STATUS_IS_OK(status)) goto done;
-
 done:
 	talloc_free(mem_ctx);
 	mpr_Return(eid, mprUserInfo);
-- 
cgit 


From c69717755abeaf8bf93e76255d0912e3a24b7cb0 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Fri, 15 Dec 2006 13:08:57 +0000
Subject: r20184: change ldb_attrib_handler into ldb_schema_attribute, which
 has a pointer to a ldb_schema_syntax struct.

the default attribute handler is now registered dynamicly as "*"
attribute, instead of having its own code path.

ldb_schema_attribute's can be added to the ldb_schema given a
ldb_schema_syntax struct or the syntax name

we may also need to introduce a ldb_schema_matching_rule,
and add a pointer to a default ldb_schema_matching_rule
in the ldb_schema_syntax.

metze
(This used to be commit b97b8f5dcbce006f005e53ca79df3330e62f117b)
---
 source4/scripting/ejs/mprutil.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/mprutil.c b/source4/scripting/ejs/mprutil.c
index 6c989807a6..cfed69dbe0 100644
--- a/source4/scripting/ejs/mprutil.c
+++ b/source4/scripting/ejs/mprutil.c
@@ -171,17 +171,17 @@ static struct MprVar mprLdbMessage(struct ldb_context *ldb, struct ldb_message *
 	for (i=0;i<msg->num_elements;i++) {
 		struct ldb_message_element *el = &msg->elements[i];
 		struct MprVar val;
-		const struct ldb_attrib_handler *attr;
+		const struct ldb_schema_attribute *a;
 		struct ldb_val v;
 
-		attr = ldb_attrib_handler(ldb, el->name);
-		if (attr == NULL) {
+		a = ldb_schema_attribute_by_name(ldb, el->name);
+		if (a == NULL) {
 			goto failed;
 		}
 
 		if (el->num_values == 1 &&
 		    !str_list_check_ci(multivalued, el->name)) {
-			if (attr->ldif_write_fn(ldb, msg, &el->values[0], &v) != 0) {
+			if (a->syntax->ldif_write_fn(ldb, msg, &el->values[0], &v) != 0) {
 				goto failed;
 			}
 			/* FIXME: nasty hack, remove me when ejs will support
@@ -195,8 +195,8 @@ static struct MprVar mprLdbMessage(struct ldb_context *ldb, struct ldb_message *
 			int j;
 			val = mprArray(el->name);
 			for (j=0;j<el->num_values;j++) {
-				if (attr->ldif_write_fn(ldb, msg, 
-							&el->values[j], &v) != 0) {
+				if (a->syntax->ldif_write_fn(ldb, msg, 
+							     &el->values[j], &v) != 0) {
 					goto failed;
 				}
 				/* FIXME: nasty hack, remove me when ejs will support
-- 
cgit 


From ea4c64388bb00f41a083fb37a2689ae09f33399b Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Wed, 27 Dec 2006 02:01:38 +0000
Subject: r20353: Restructure the DRSUAPI DsGetDomainControllerInfo test,
 because as usual things are more complex than they appear.

Also remove the incorrect server-side implementation, which blindly
assumed some sense of consistancy across the API switch levels.

Andrew Bartlett
(This used to be commit 79941adbff843f5027dacd31b972deca4a1557ec)
---
 source4/scripting/ejs/ejsrpc.c | 20 ++++++++++++++++++++
 source4/scripting/ejs/ejsrpc.h |  4 ++++
 2 files changed, 24 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/ejsrpc.c b/source4/scripting/ejs/ejsrpc.c
index 08a675a117..c41cdd972b 100644
--- a/source4/scripting/ejs/ejsrpc.c
+++ b/source4/scripting/ejs/ejsrpc.c
@@ -253,6 +253,26 @@ NTSTATUS ejs_push_string(struct ejs_rpc *ejs,
 	return mprSetVar(v, name, mprString(s));
 }
 
+
+/*
+  pull a ipv4address (internally a string)
+*/
+NTSTATUS ejs_pull_ipv4address(struct ejs_rpc *ejs, 
+			      struct MprVar *v, const char *name, const char **s)
+{
+	return ejs_pull_string(ejs, v, name, s);
+}
+
+/*
+  push a ipv4address (internally a string)
+*/
+NTSTATUS ejs_push_ipv4address(struct ejs_rpc *ejs, 
+			 struct MprVar *v, const char *name, char * const *s)
+{
+	return ejs_push_string(ejs, v, name, *s);
+}
+
+
 NTSTATUS ejs_pull_dom_sid(struct ejs_rpc *ejs, 
 			  struct MprVar *v, const char *name, struct dom_sid *r)
 {
diff --git a/source4/scripting/ejs/ejsrpc.h b/source4/scripting/ejs/ejsrpc.h
index bc9a38fcb3..7288042120 100644
--- a/source4/scripting/ejs/ejsrpc.h
+++ b/source4/scripting/ejs/ejsrpc.h
@@ -93,6 +93,10 @@ NTSTATUS ejs_pull_string(struct ejs_rpc *ejs,
 			 struct MprVar *v, const char *name, const char **s);
 NTSTATUS ejs_push_string(struct ejs_rpc *ejs, 
 			 struct MprVar *v, const char *name, const char *s);
+NTSTATUS ejs_pull_ipv4address(struct ejs_rpc *ejs, 
+			 struct MprVar *v, const char *name, const char **s);
+NTSTATUS ejs_push_ipv4address(struct ejs_rpc *ejs, 
+			 struct MprVar *v, const char *name, char * const *s);
 void ejs_set_constant_int(int eid, const char *name, int value);
 void ejs_set_constant_string(int eid, const char *name, const char *value);
 
-- 
cgit 


From 3c20e210de357e4f7b6dd54880110a56ae1d7eb0 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Wed, 27 Dec 2006 15:36:50 +0000
Subject: r20358: - fix ejs generated code for ipv4address - (not
 Parse::Pidl::Typelist::scalar_is_reference($e->{TYPE}))   is much more
 generic than ($e->{TYPE} ne "string")   and handles ipv4address and other
 special types...

metze
(This used to be commit 02d2ce65e614a0c99ef3246bc738eb0f8d91b24a)
---
 source4/scripting/ejs/ejsrpc.c | 4 ++--
 source4/scripting/ejs/ejsrpc.h | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/ejsrpc.c b/source4/scripting/ejs/ejsrpc.c
index c41cdd972b..fa5d880a1c 100644
--- a/source4/scripting/ejs/ejsrpc.c
+++ b/source4/scripting/ejs/ejsrpc.c
@@ -267,9 +267,9 @@ NTSTATUS ejs_pull_ipv4address(struct ejs_rpc *ejs,
   push a ipv4address (internally a string)
 */
 NTSTATUS ejs_push_ipv4address(struct ejs_rpc *ejs, 
-			 struct MprVar *v, const char *name, char * const *s)
+			 struct MprVar *v, const char *name, const char *s)
 {
-	return ejs_push_string(ejs, v, name, *s);
+	return ejs_push_string(ejs, v, name, s);
 }
 
 
diff --git a/source4/scripting/ejs/ejsrpc.h b/source4/scripting/ejs/ejsrpc.h
index 7288042120..e4be242c91 100644
--- a/source4/scripting/ejs/ejsrpc.h
+++ b/source4/scripting/ejs/ejsrpc.h
@@ -96,7 +96,7 @@ NTSTATUS ejs_push_string(struct ejs_rpc *ejs,
 NTSTATUS ejs_pull_ipv4address(struct ejs_rpc *ejs, 
 			 struct MprVar *v, const char *name, const char **s);
 NTSTATUS ejs_push_ipv4address(struct ejs_rpc *ejs, 
-			 struct MprVar *v, const char *name, char * const *s);
+			 struct MprVar *v, const char *name, const char *s);
 void ejs_set_constant_int(int eid, const char *name, int value);
 void ejs_set_constant_string(int eid, const char *name, const char *value);
 
-- 
cgit 


From 2d132edbab902c59ca6ca39b0bb42ab12693cee5 Mon Sep 17 00:00:00 2001
From: Derrell Lipman <derrell@samba.org>
Date: Wed, 27 Dec 2006 21:22:01 +0000
Subject: r20364: SWAT updates, part 1

These next few check-ins will add a working Statistics module to SWAT, and add
an API Documentation module as well.

Next step will be to modify the LDB browser to work with this new module and
fsm structure.

Derrell
(This used to be commit 29db71587f1332a9c44d5993a2be389f3a392ce4)
---
 source4/scripting/ejs/smbcalls_sys.c | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_sys.c b/source4/scripting/ejs/smbcalls_sys.c
index 97fcc19cd1..ce3f3f5a98 100644
--- a/source4/scripting/ejs/smbcalls_sys.c
+++ b/source4/scripting/ejs/smbcalls_sys.c
@@ -165,6 +165,23 @@ static int ejs_sys_gmtime(MprVarHandle eid, int argc, struct MprVar **argv)
 	return 0;
 }
 
+/*
+  return the given NT time as a time_t value
+*/
+static int ejs_sys_nttime2unix(MprVarHandle eid, int argc, struct MprVar **argv)
+{
+	time_t t;
+	struct MprVar v;
+	if (argc != 1 || !mprVarIsNumber(argv[0]->type)) {
+		ejsSetErrorMsg(eid, "sys_ntgmtime invalid arguments");
+		return -1;
+	}
+	t = nt_time_to_unix(mprVarToNumber(argv[0]));
+	v = mprCreateNumberVar(t);
+	mpr_Return(eid, v);
+        return 0;
+}
+
 /*
   return the given NT time as a gmtime structure
 */
@@ -417,6 +434,7 @@ static int ejs_sys_init(MprVarHandle eid, int argc, struct MprVar **argv)
 	mprSetCFunction(obj, "unix2nttime", ejs_sys_unix2nttime);
 	mprSetCFunction(obj, "gmmktime", ejs_sys_gmmktime);
 	mprSetCFunction(obj, "gmtime", ejs_sys_gmtime);
+	mprSetCFunction(obj, "nttime2unix", ejs_sys_nttime2unix);
 	mprSetCFunction(obj, "ntgmtime", ejs_sys_ntgmtime);
 	mprSetCFunction(obj, "ldaptime", ejs_sys_ldaptime);
 	mprSetCFunction(obj, "httptime", ejs_sys_httptime);
-- 
cgit 


From 43470b5ec3d451aa75acf2cda40cf2dcc019efab Mon Sep 17 00:00:00 2001
From: Derrell Lipman <derrell@samba.org>
Date: Sun, 31 Dec 2006 20:05:29 +0000
Subject: r20444: WEB Application framework / SWAT.

We're now at the stage where the web application framework should build and
install automatically.

Derrell
(This used to be commit 0201baef46c1701007e0a4cdd95edee287939318)
---
 source4/scripting/ejs/smbcalls_config.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_config.c b/source4/scripting/ejs/smbcalls_config.c
index 5da0dd14f0..6ee9c8305b 100644
--- a/source4/scripting/ejs/smbcalls_config.c
+++ b/source4/scripting/ejs/smbcalls_config.c
@@ -67,7 +67,7 @@ static int ejs_lpCategories(MprVarHandle eid, int argc, char **argv)
 
 
 /*
-  allow access to loadparm variables from inside ejs scripts in swat
+  allow access to loadparm variables from inside ejs scripts in web apps
   
   can be called in 4 ways:
 
-- 
cgit 


From 9fc3e164df198f92134acb2b16c1a3236f680583 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Tue, 2 Jan 2007 11:50:04 +0000
Subject: r20468: Patch from Martin Kuehl <kuehl@univention.de> to make it
 easier to load into an exsting LDAP server.  (Allow some parts to pre-exist,
 and try to blow away less data).

Andrew Bartlett
(This used to be commit 99faff0ad8fa12d596c599064a0125a6b3365134)
---
 source4/scripting/libjs/provision.js | 45 ++++++++++++++++++++++++++++++------
 1 file changed, 38 insertions(+), 7 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index b267cde575..c14a9da55f 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -180,7 +180,6 @@ function ldb_erase(ldb)
 		ldb.del(res[i].dn);
 	}
 
-
      	var res = ldb.search("(&(|(objectclass=*)(dn=*))(!(dn=@BASEINFO)))", basedn, ldb.SCOPE_SUBTREE, attrs);
 	if (res.length != 0) {
 		ldb_delete(ldb);
@@ -192,7 +191,7 @@ function ldb_erase(ldb)
 /*
   erase an ldb, removing all records
 */
-function ldb_erase_partitions(info, ldb)
+function ldb_erase_partitions(info, ldb, ldapbackend)
 {
 	var rootDSE_attrs = new Array("namingContexts");
 	var lp = loadparm_init();
@@ -205,15 +204,21 @@ function ldb_erase_partitions(info, ldb)
 		return;
 	}	
 	for (j=0; j<res[0].namingContexts.length; j++) {
+		var anything = "(|(objectclass=*)(dn=*))";
 		var attrs = new Array("dn");
 		var basedn = res[0].namingContexts[j];
 		var k;
 		var previous_remaining = 1;
 		var current_remaining = 0;
 
-			for (k=0; k < 10 && (previous_remaining != current_remaining); k++) {
+		if (ldapbackend && (basedn == info.subobj.BASEDN)) {
+			/* Only delete objects that were created by provision */
+			anything = "(objectcategory=*)";
+		}
+
+		for (k=0; k < 10 && (previous_remaining != current_remaining); k++) {
 			/* and the rest */
-			var res2 = ldb.search("(|(objectclass=*)(dn=*))", basedn, ldb.SCOPE_SUBTREE, attrs);
+			var res2 = ldb.search(anything, basedn, ldb.SCOPE_SUBTREE, attrs);
 			var i;
 			if (typeof(res2) == "undefined") {
 				info.message("ldb search failed: " + ldb.errstring() + "\n");
@@ -225,7 +230,7 @@ function ldb_erase_partitions(info, ldb)
 				ldb.del(res2[i].dn);
 			}
 			
-			var res3 = ldb.search("(|(objectclass=*)(dn=*))", basedn, ldb.SCOPE_SUBTREE, attrs);
+			var res3 = ldb.search(anything, basedn, ldb.SCOPE_SUBTREE, attrs);
 			if (typeof(res3) == "undefined") {
 				info.message("ldb search failed: " + ldb.errstring() + "\n");
 				continue;
@@ -430,7 +435,7 @@ function setup_name_mappings(info, ldb)
 /*
   provision samba4 - caution, this wipes all existing data!
 */
-function provision(subobj, message, blank, paths, session_info, credentials)
+function provision(subobj, message, blank, paths, session_info, credentials, ldapbackend)
 {
 	var lp = loadparm_init();
 	var sys = sys_init();
@@ -495,7 +500,7 @@ function provision(subobj, message, blank, paths, session_info, credentials)
 	message("Setting up sam.ldb attributes\n");
 	setup_add_ldif("provision_init.ldif", info, samdb, false);
 	message("Erasing data from partitions\n");
-	ldb_erase_partitions(info, samdb);
+	ldb_erase_partitions(info, samdb, ldapbackend);
 	
 	message("Adding baseDN: " + subobj.BASEDN + " (permitted to fail)\n");
 	var add_ok = setup_add_ldif("provision_basedn.ldif", info, samdb, true);
@@ -528,8 +533,34 @@ function provision(subobj, message, blank, paths, session_info, credentials)
 	setup_add_ldif("display_specifiers.ldif", info, samdb, false);
 	message("Setting up sam.ldb templates\n");
 	setup_add_ldif("provision_templates.ldif", info, samdb, false);
+
+	message("Adding users container (permitted to fail)\n");
+	var add_ok = setup_add_ldif("provision_users_add.ldif", info, samdb, true);
+	message("Modifying users container\n");
+	var modify_ok = setup_ldb_modify("provision_help_users_mod.ldif", info, samdb);
+	if (!modify_ok) {
+		if (!add_ok) {
+			message("Failed to both add and modify the users container\n");
+			assert(modify_ok);
+		}
+		assert(modify_ok);
+	}
+	message("Adding computers container (permitted to fail)\n");
+	var add_ok = setup_add_ldif("provision_computers_add.ldif", info, samdb, true);
+	message("Modifying computers container\n");
+	var modify_ok = setup_ldb_modify("provision_computers_modify.ldif", info, samdb);
+	if (!modify_ok) {
+		if (!add_ok) {
+			message("Failed to both add and modify the computers container\n");
+			assert(modify_ok);
+		}
+		assert(modify_ok);
+	}
+
 	message("Setting up sam.ldb data\n");
 	setup_add_ldif("provision.ldif", info, samdb, false);
+	message("Setting up sam.ldb configuration data\n");
+	setup_add_ldif("provision_configuration.ldif", info, samdb, false);
 
 	if (blank != false) {
 		message("Setting up sam.ldb index\n");
-- 
cgit 


From bf4c652af7824478ca3f029cc653aace3da1022f Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Wed, 3 Jan 2007 03:19:02 +0000
Subject: r20492: Add in instructions/sample LDIF to setup Fedora DS as a
 backend.

Add a new module entrypoint to handle the new, interesting and
different mappings required for Fedora DS.

Andrew Bartlett
(This used to be commit 600c7f1a68c175b835ce45d13794a6f66bcc8493)
---
 source4/scripting/libjs/provision.js | 1 +
 1 file changed, 1 insertion(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index c14a9da55f..96e55bc4ae 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -698,6 +698,7 @@ function provision_guess()
 	rdn_list = split(".", subobj.DNSDOMAIN);
 	subobj.BASEDN       = "DC=" + join(",DC=", rdn_list);
 	subobj.LDAPBACKEND  = "users.ldb";
+	subobj.LDAPMODULE = "entryUUID";
 	subobj.LDAPMODULES = "objectguid";
 	subobj.EXTENSIBLEOBJECT = "# no objectClass: extensibleObject for local ldb";
 	return subobj;
-- 
cgit 


From e8dfa06d45b4aaa784b9f8795f4197451aed4188 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Wed, 3 Jan 2007 05:31:50 +0000
Subject: r20495: Further notes on joining with fedora DS.

Add in a hook for adding an ACI, needed to allow anonymous access
until we hook across a SYSTEM token to the LDAP server.

Andrew Bartlett
(This used to be commit f45504e2714680978f101b4a98516686a17531df)
---
 source4/scripting/libjs/provision.js | 1 +
 1 file changed, 1 insertion(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index 96e55bc4ae..954335d335 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -701,6 +701,7 @@ function provision_guess()
 	subobj.LDAPMODULE = "entryUUID";
 	subobj.LDAPMODULES = "objectguid";
 	subobj.EXTENSIBLEOBJECT = "# no objectClass: extensibleObject for local ldb";
+	subobj.ACI = "# no aci for local ldb";
 	return subobj;
 }
 
-- 
cgit 


From 2008bbcdea8dfdf39182824cbe4f4f8fbfed3c0e Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Wed, 3 Jan 2007 11:23:56 +0000
Subject: r20505: I had the wrong ldif name here.

Andrew Bartlett
(This used to be commit 5781d0f41ac1847c38ebda290f5e85423dd20186)
---
 source4/scripting/libjs/provision.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index 954335d335..286255491b 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -537,7 +537,7 @@ function provision(subobj, message, blank, paths, session_info, credentials, lda
 	message("Adding users container (permitted to fail)\n");
 	var add_ok = setup_add_ldif("provision_users_add.ldif", info, samdb, true);
 	message("Modifying users container\n");
-	var modify_ok = setup_ldb_modify("provision_help_users_mod.ldif", info, samdb);
+	var modify_ok = setup_ldb_modify("provision_users_modify.ldif", info, samdb);
 	if (!modify_ok) {
 		if (!add_ok) {
 			message("Failed to both add and modify the users container\n");
-- 
cgit 


From 8b70764038cd08020ab1c22b7f54cbec10acc6a0 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Fri, 5 Jan 2007 16:12:30 +0000
Subject: r20553: add ${CONFIGDN} and ${SCHEMADN} instead of using hardcoded
 paths under ${BASEDN}

metze
(This used to be commit 09ca6aae12d8e10b76971cf269f7c62f228a4c87)
---
 source4/scripting/libjs/provision.js | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index 286255491b..80362ce7f2 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -697,6 +697,8 @@ function provision_guess()
 				      subobj.DNSDOMAIN);
 	rdn_list = split(".", subobj.DNSDOMAIN);
 	subobj.BASEDN       = "DC=" + join(",DC=", rdn_list);
+	subobj.CONFIGDN     = "CN=Configuration," + subobj.BASEDN;
+	subobj.SCHEMADN     = "CN=Schema," + subobj.CONFIGDN;
 	subobj.LDAPBACKEND  = "users.ldb";
 	subobj.LDAPMODULE = "entryUUID";
 	subobj.LDAPMODULES = "objectguid";
-- 
cgit 


From 2c266fb217f7eccb45cebc95857ed968445c5742 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Fri, 5 Jan 2007 16:19:00 +0000
Subject: r20554: - use ${ROOTDN} for the rootDomainNamingContext - the
 ${CONFIGDN} is a child of the ${ROOTDN}

metze
(This used to be commit ebbd8a83c982efdc58e53798d1fd191f08731005)
---
 source4/scripting/libjs/provision.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index 80362ce7f2..60ab6f7093 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -697,7 +697,8 @@ function provision_guess()
 				      subobj.DNSDOMAIN);
 	rdn_list = split(".", subobj.DNSDOMAIN);
 	subobj.BASEDN       = "DC=" + join(",DC=", rdn_list);
-	subobj.CONFIGDN     = "CN=Configuration," + subobj.BASEDN;
+	subobj.ROOTDN       = subobj.ROOTDN;
+	subobj.CONFIGDN     = "CN=Configuration," + subobj.ROOTDN;
 	subobj.SCHEMADN     = "CN=Schema," + subobj.CONFIGDN;
 	subobj.LDAPBACKEND  = "users.ldb";
 	subobj.LDAPMODULE = "entryUUID";
-- 
cgit 


From bc511a646359df17ee21a021a734c149e1e5fc01 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Fri, 5 Jan 2007 16:26:16 +0000
Subject: r20555: fix typo...

metze
(This used to be commit 09622f01227093b4b351fcc79fe29d5b2f388376)
---
 source4/scripting/libjs/provision.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index 60ab6f7093..c3204587d0 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -697,7 +697,7 @@ function provision_guess()
 				      subobj.DNSDOMAIN);
 	rdn_list = split(".", subobj.DNSDOMAIN);
 	subobj.BASEDN       = "DC=" + join(",DC=", rdn_list);
-	subobj.ROOTDN       = subobj.ROOTDN;
+	subobj.ROOTDN       = subobj.BASEDN;
 	subobj.CONFIGDN     = "CN=Configuration," + subobj.ROOTDN;
 	subobj.SCHEMADN     = "CN=Schema," + subobj.CONFIGDN;
 	subobj.LDAPBACKEND  = "users.ldb";
-- 
cgit 


From 8f0a0ebcb380acf57d418a6598c75e42b0bf24dc Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Fri, 5 Jan 2007 17:40:43 +0000
Subject: r20557: use ${DOMAINDN} instead of ${BASEDN}

metze
(This used to be commit 2a6e6a2695b256411c91768c7bee748228e40e6f)
---
 source4/scripting/libjs/provision.js | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index c3204587d0..39810e1f94 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -57,7 +57,7 @@ objectClass: top
 objectClass: foreignSecurityPrincipal
 description: %s
 ",
-			  sid, subobj.BASEDN, desc);
+			  sid, subobj.DOMAINDN, desc);
 	/* deliberately ignore errors from this, as the records may
 	   already exist */
 	ldb.add(add);
@@ -71,7 +71,7 @@ function setup_name_mapping(info, ldb, sid, unixname)
 {
 	var attrs = new Array("dn");
 	var res = ldb.search(sprintf("objectSid=%s", sid), 
-			     info.subobj.BASEDN, ldb.SCOPE_SUBTREE, attrs);
+			     info.subobj.DOMAINDN, ldb.SCOPE_SUBTREE, attrs);
 	if (res.length != 1) {
 		info.message("Failed to find record for objectSid %s\n", sid);
 		return false;
@@ -211,7 +211,7 @@ function ldb_erase_partitions(info, ldb, ldapbackend)
 		var previous_remaining = 1;
 		var current_remaining = 0;
 
-		if (ldapbackend && (basedn == info.subobj.BASEDN)) {
+		if (ldapbackend && (basedn == info.subobj.DOMAINDN)) {
 			/* Only delete objects that were created by provision */
 			anything = "(objectcategory=*)";
 		}
@@ -398,7 +398,7 @@ function setup_name_mappings(info, ldb)
 	var attrs = new Array("objectSid");
 	var subobj = info.subobj;
 
-	res = ldb.search("objectSid=*", subobj.BASEDN, ldb.SCOPE_BASE, attrs);
+	res = ldb.search("objectSid=*", subobj.DOMAINDN, ldb.SCOPE_BASE, attrs);
 	assert(res.length == 1 && res[0].objectSid != undefined);
 	var sid = res[0].objectSid;
 
@@ -450,7 +450,7 @@ function provision(subobj, message, blank, paths, session_info, credentials, lda
 	assert(valid_netbios_name(subobj.DOMAIN));
 	subobj.NETBIOSNAME = strupper(subobj.HOSTNAME);
 	assert(valid_netbios_name(subobj.NETBIOSNAME));
-	var rdns = split(",", subobj.BASEDN);
+	var rdns = split(",", subobj.DOMAINDN);
 	subobj.RDN_DC = substr(rdns[0], strlen("DC="));
 	
 	if (subobj.DOMAINGUID != undefined) {
@@ -502,13 +502,13 @@ function provision(subobj, message, blank, paths, session_info, credentials, lda
 	message("Erasing data from partitions\n");
 	ldb_erase_partitions(info, samdb, ldapbackend);
 	
-	message("Adding baseDN: " + subobj.BASEDN + " (permitted to fail)\n");
+	message("Adding DomainDN: " + subobj.DOMAINDN + " (permitted to fail)\n");
 	var add_ok = setup_add_ldif("provision_basedn.ldif", info, samdb, true);
-	message("Modifying baseDN: " + subobj.BASEDN + "\n");
+	message("Modifying DomainDN: " + subobj.DOMAINDN + "\n");
 	var modify_ok = setup_ldb_modify("provision_basedn_modify.ldif", info, samdb);
 	if (!modify_ok) {
 		if (!add_ok) {
-			message("Failed to both add and modify " + subobj.BASEDN + " in target " + subobj.LDAPBACKEND + "\n");
+			message("Failed to both add and modify " + subobj.DOMAINDN + " in target " + subobj.LDAPBACKEND + "\n");
 			message("Perhaps you need to run the provision script with the --ldap-base-dn option, and add this record to the backend manually\n"); 
 		};
 		assert(modify_ok);
@@ -622,12 +622,12 @@ function provision_dns(subobj, message, paths, session_info, credentials)
            or may not have been specified, so fetch them from the database */
 
 	var attrs = new Array("objectGUID");
-	res = ldb.search("objectGUID=*", subobj.BASEDN, ldb.SCOPE_BASE, attrs);
+	res = ldb.search("objectGUID=*", subobj.DOMAINDN, ldb.SCOPE_BASE, attrs);
 	assert(res.length == 1);
 	assert(res[0].objectGUID != undefined);
 	subobj.DOMAINGUID = res[0].objectGUID;
 
-	subobj.HOSTGUID = searchone(ldb, subobj.BASEDN, "(&(objectClass=computer)(cn=" + subobj.NETBIOSNAME + "))", "objectGUID");
+	subobj.HOSTGUID = searchone(ldb, subobj.DOMAINDN, "(&(objectClass=computer)(cn=" + subobj.NETBIOSNAME + "))", "objectGUID");
 	assert(subobj.HOSTGUID != undefined);
 
 	setup_file("provision.zone", 
@@ -640,8 +640,8 @@ function provision_dns(subobj, message, paths, session_info, credentials)
 /* Write out a DNS zone file, from the info in the current database */
 function provision_ldapbase(subobj, message, paths)
 {
-	message("Setting up LDAP base entry: " + subobj.BASEDN + " \n");
-	var rdns = split(",", subobj.BASEDN);
+	message("Setting up LDAP base entry: " + subobj.DOMAINDN + " \n");
+	var rdns = split(",", subobj.DOMAINDN);
 	subobj.EXTENSIBLEOBJECT = "objectClass: extensibleObject";
 
 	subobj.RDN_DC = substr(rdns[0], strlen("DC="));
@@ -696,8 +696,8 @@ function provision_guess()
 				      strlower(subobj.HOSTNAME), 
 				      subobj.DNSDOMAIN);
 	rdn_list = split(".", subobj.DNSDOMAIN);
-	subobj.BASEDN       = "DC=" + join(",DC=", rdn_list);
-	subobj.ROOTDN       = subobj.BASEDN;
+	subobj.DOMAINDN       = "DC=" + join(",DC=", rdn_list);
+	subobj.ROOTDN       = subobj.DOMAINDN;
 	subobj.CONFIGDN     = "CN=Configuration," + subobj.ROOTDN;
 	subobj.SCHEMADN     = "CN=Schema," + subobj.CONFIGDN;
 	subobj.LDAPBACKEND  = "users.ldb";
-- 
cgit 


From 8a2636af4ac675ca427d5e1999672141a560e3c2 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Fri, 5 Jan 2007 20:10:38 +0000
Subject: r20560: make it possible to configure the backend and modules for all
 partitions and make it not use LDAP in the variable names because it isn't
 specific to the ldap backend case.

metze
(This used to be commit 3e337ec2764038e4ff05c3e926220abaa5583702)
---
 source4/scripting/libjs/provision.js | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index 39810e1f94..461550d5b5 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -508,7 +508,7 @@ function provision(subobj, message, blank, paths, session_info, credentials, lda
 	var modify_ok = setup_ldb_modify("provision_basedn_modify.ldif", info, samdb);
 	if (!modify_ok) {
 		if (!add_ok) {
-			message("Failed to both add and modify " + subobj.DOMAINDN + " in target " + subobj.LDAPBACKEND + "\n");
+			message("Failed to both add and modify " + subobj.DOMAINDN + " in target " + subobj.DOMAINDN_LDB + "\n");
 			message("Perhaps you need to run the provision script with the --ldap-base-dn option, and add this record to the backend manually\n"); 
 		};
 		assert(modify_ok);
@@ -691,20 +691,25 @@ function provision_guess()
 	subobj.WHEEL        = findnss(nss.getgrnam, "wheel", "root", "staff", "adm");
 	subobj.BACKUP       = findnss(nss.getgrnam, "backup", "wheel", "root", "staff");
 	subobj.USERS        = findnss(nss.getgrnam, "users", "guest", "other", "unknown", "usr");
+
 	subobj.DNSDOMAIN    = strlower(subobj.REALM);
 	subobj.DNSNAME      = sprintf("%s.%s", 
 				      strlower(subobj.HOSTNAME), 
 				      subobj.DNSDOMAIN);
 	rdn_list = split(".", subobj.DNSDOMAIN);
-	subobj.DOMAINDN       = "DC=" + join(",DC=", rdn_list);
+	subobj.DOMAINDN     = "DC=" + join(",DC=", rdn_list);
+	subobj.DOMAINDN_LDB = "users.ldb";
+	subobj.DOMAINDN_MOD = "objectguid";
 	subobj.ROOTDN       = subobj.DOMAINDN;
 	subobj.CONFIGDN     = "CN=Configuration," + subobj.ROOTDN;
+	subobj.CONFIGDN_LDB = "configuration.ldb";
+	subobj.CONFIGDN_MOD = "objectguid";
 	subobj.SCHEMADN     = "CN=Schema," + subobj.CONFIGDN;
-	subobj.LDAPBACKEND  = "users.ldb";
-	subobj.LDAPMODULE = "entryUUID";
-	subobj.LDAPMODULES = "objectguid";
+	subobj.SCHEMADN_LDB = "schema.ldb";
+	subobj.SCHEMADN_MOD = "objectguid";
+
 	subobj.EXTENSIBLEOBJECT = "# no objectClass: extensibleObject for local ldb";
-	subobj.ACI = "# no aci for local ldb";
+	subobj.ACI		= "# no aci for local ldb";
 	return subobj;
 }
 
-- 
cgit 


From 7d461ed48197af138e3959a17757936df9c9ce56 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Fri, 5 Jan 2007 20:31:24 +0000
Subject: r20565: configure the list of global ldb modules also in js code

metze
(This used to be commit cbebe559a2563a3ab9dd2e002c79676a803b71a4)
---
 source4/scripting/libjs/provision.js | 27 +++++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index 461550d5b5..731f95c6de 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -699,13 +699,36 @@ function provision_guess()
 	rdn_list = split(".", subobj.DNSDOMAIN);
 	subobj.DOMAINDN     = "DC=" + join(",DC=", rdn_list);
 	subobj.DOMAINDN_LDB = "users.ldb";
-	subobj.DOMAINDN_MOD = "objectguid";
 	subobj.ROOTDN       = subobj.DOMAINDN;
 	subobj.CONFIGDN     = "CN=Configuration," + subobj.ROOTDN;
 	subobj.CONFIGDN_LDB = "configuration.ldb";
-	subobj.CONFIGDN_MOD = "objectguid";
 	subobj.SCHEMADN     = "CN=Schema," + subobj.CONFIGDN;
 	subobj.SCHEMADN_LDB = "schema.ldb";
+
+	//Add modules to the list to activate them by default
+	//beware often order is important
+	//
+	// Some Known ordering constraints:
+	// - rootdse must be first, as it makes redirects from "" -> cn=rootdse
+	// - samldb must be before password_hash, because password_hash checks
+	//   that the objectclass is of type person (filled in by samldb)
+	// - partition must be last
+	// - each partition has its own module list then
+	modules_list        = new Array("rootdse",
+					"kludge_acl",
+					"paged_results",
+					"server_sort",
+					"extended_dn",
+					"asq",
+					"samldb",
+					"password_hash",
+					"operational",
+					"objectclass",
+					"rdn_name",
+					"partition");
+	subobj.MODULES_LIST = join(",", modules_list);
+	subobj.DOMAINDN_MOD = "objectguid";
+	subobj.CONFIGDN_MOD = "objectguid";
 	subobj.SCHEMADN_MOD = "objectguid";
 
 	subobj.EXTENSIBLEOBJECT = "# no objectClass: extensibleObject for local ldb";
-- 
cgit 


From d0e221c4e097b53184ad4a877a1d062eaa10390c Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Fri, 5 Jan 2007 20:58:21 +0000
Subject: r20568: split out the rootdse ldif

and set the isSyncronized = TRUE when we done

metze
(This used to be commit 5875ce1ac6ff694d07787ff0cf81b3429580311b)
---
 source4/scripting/libjs/provision.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index 731f95c6de..772505f569 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -499,6 +499,10 @@ function provision(subobj, message, blank, paths, session_info, credentials, lda
 
 	message("Setting up sam.ldb attributes\n");
 	setup_add_ldif("provision_init.ldif", info, samdb, false);
+
+	message("Setting up sam.ldb rootDSE\n");
+	setup_add_ldif("provision_rootdse_add.ldif", info, samdb, false);
+
 	message("Erasing data from partitions\n");
 	ldb_erase_partitions(info, samdb, ldapbackend);
 	
@@ -566,6 +570,9 @@ function provision(subobj, message, blank, paths, session_info, credentials, lda
 		message("Setting up sam.ldb index\n");
 		setup_add_ldif("provision_index.ldif", info, samdb, false);
 
+		message("Setting up sam.ldb rootDSE marking as syncronized\n");
+		setup_modify_ldif("provision_rootdse_modify.ldif", info, samdb, false);
+
 		var commit_ok = samdb.transaction_commit();
 		if (!commit_ok) {
 			info.message("ldb commit failed: " + samdb.errstring() + "\n");
@@ -597,6 +604,9 @@ function provision(subobj, message, blank, paths, session_info, credentials, lda
 	message("Setting up sam.ldb index\n");
 	setup_add_ldif("provision_index.ldif", info, samdb, false);
 
+	message("Setting up sam.ldb rootDSE marking as syncronized\n");
+	setup_modify_ldif("provision_rootdse_modify.ldif", info, samdb, false);
+
 	var commit_ok = samdb.transaction_commit();
 	if (!commit_ok) {
 		info.message("samdb commit failed: " + samdb.errstring() + "\n");
-- 
cgit 


From 46908530bc39e0ba3742650639b35a6d0c32852b Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Fri, 5 Jan 2007 21:27:24 +0000
Subject: r20572: - prepare a test_samdb.ldb in the NET-API-BECOME-DC torture
 test - we call a ejs script from the torture test for this task   so that we
 can use the provision template ldif's.

metze
(This used to be commit e84b0c7d4004df312ae58ed76dd708a2c3c37986)
---
 source4/scripting/libjs/provision.js | 59 ++++++++++++++++++++++++++++--------
 1 file changed, 47 insertions(+), 12 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index 772505f569..1ef569c908 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -431,6 +431,50 @@ function setup_name_mappings(info, ldb)
 	return true;
 }
 
+function provision_fix_subobj(subobj, message)
+{
+	subobj.REALM       = strupper(subobj.REALM);
+	subobj.HOSTNAME    = strlower(subobj.HOSTNAME);
+	subobj.DOMAIN      = strupper(subobj.DOMAIN);
+	assert(valid_netbios_name(subobj.DOMAIN));
+	subobj.NETBIOSNAME = strupper(subobj.HOSTNAME);
+	assert(valid_netbios_name(subobj.NETBIOSNAME));
+	var rdns = split(",", subobj.DOMAINDN);
+	subobj.RDN_DC = substr(rdns[0], strlen("DC="));
+
+	return true;
+}
+
+function provision_become_dc(subobj, message, paths, session_info)
+{
+	var lp = loadparm_init();
+	var sys = sys_init();
+	var info = new Object();
+
+	var ok = provision_fix_subobj(subobj, message);
+	assert(ok);
+
+	info.subobj = subobj;
+	info.message = message;
+	info.session_info = session_info;
+
+	/* Also wipes the database */
+	message("Setting up " + paths.samdb + " partitions\n");
+	setup_ldb("provision_partitions.ldif", info, paths.samdb);
+
+	var samdb = open_ldb(info, paths.samdb, false);
+
+	message("Setting up " + paths.samdb + " attributes\n");
+	setup_add_ldif("provision_init.ldif", info, samdb, false);
+
+	message("Setting up " + paths.samdb + " rootDSE\n");
+	setup_add_ldif("provision_rootdse_add.ldif", info, samdb, false);
+
+	ok = samdb.transaction_commit();
+	assert(ok);
+
+	return true;
+}
 
 /*
   provision samba4 - caution, this wipes all existing data!
@@ -441,18 +485,9 @@ function provision(subobj, message, blank, paths, session_info, credentials, lda
 	var sys = sys_init();
 	var info = new Object();
 
-	/*
-	  some options need to be upper/lower case
-	*/
-	subobj.REALM       = strupper(subobj.REALM);
-	subobj.HOSTNAME    = strlower(subobj.HOSTNAME);
-	subobj.DOMAIN      = strupper(subobj.DOMAIN);
-	assert(valid_netbios_name(subobj.DOMAIN));
-	subobj.NETBIOSNAME = strupper(subobj.HOSTNAME);
-	assert(valid_netbios_name(subobj.NETBIOSNAME));
-	var rdns = split(",", subobj.DOMAINDN);
-	subobj.RDN_DC = substr(rdns[0], strlen("DC="));
-	
+	var ok = provision_fix_subobj(subobj, message);
+	assert(ok);
+
 	if (subobj.DOMAINGUID != undefined) {
 		subobj.DOMAINGUID_MOD = sprintf("replace: objectGUID\nobjectGUID: %s\n-", subobj.DOMAINGUID);
 	} else {
-- 
cgit 


From b31875ba75057e94fff9df67ed025570245a282b Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Fri, 5 Jan 2007 23:00:46 +0000
Subject: r20575: apply records to the test_samdb.ldb (my birthday present to
 myself...:-)

we need to modify some modules to only handle originating changes...

metze
(This used to be commit 0f387d58e69a6ee806fea02229ef8fa030f2918d)
---
 source4/scripting/libjs/provision.js | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index 1ef569c908..6d5e9d4f70 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -470,6 +470,9 @@ function provision_become_dc(subobj, message, paths, session_info)
 	message("Setting up " + paths.samdb + " rootDSE\n");
 	setup_add_ldif("provision_rootdse_add.ldif", info, samdb, false);
 
+	message("Erasing data from partitions\n");
+	ldb_erase_partitions(info, samdb, undefined);
+
 	ok = samdb.transaction_commit();
 	assert(ok);
 
-- 
cgit 


From 1cd4339b9a2786aa26691ca4f02fa93ab0958b88 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Wed, 10 Jan 2007 10:52:09 +0000
Subject: r20646: first preparations for cluster enablement. This changes "  
 uint32_t server_id to   struct server_id server_id;

which allows a server ID to have an node number. The node number will
be zero in non-clustered case. This is the most basic hook needed for
clustering, and ctdb.
(This used to be commit 2365abaa991d57d68c6ebe9be608e01c907102eb)
---
 source4/scripting/ejs/smbcalls_rpc.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_rpc.c b/source4/scripting/ejs/smbcalls_rpc.c
index 76b5f0d695..4d4e12e855 100644
--- a/source4/scripting/ejs/smbcalls_rpc.c
+++ b/source4/scripting/ejs/smbcalls_rpc.c
@@ -32,13 +32,14 @@
 #include "librpc/rpc/dcerpc_table.h"
 #include "auth/credentials/credentials.h"
 #include "librpc/rpc/dcerpc.h"
+#include "cluster/cluster.h"
 
 /*
   state of a irpc 'connection'
 */
 struct ejs_irpc_connection {
 	const char *server_name;
-	uint32_t *dest_ids;
+	struct server_id *dest_ids;
 	struct messaging_context *msg_ctx;
 };
 
@@ -78,7 +79,7 @@ static int ejs_irpc_connect(MprVarHandle eid, int argc, char **argv)
 	/* create a messaging context, looping as we have no way to
 	   allocate temporary server ids automatically */
 	for (i=0;i<10000;i++) {
-		p->msg_ctx = messaging_init(p, EJS_ID_BASE + i, ev);
+		p->msg_ctx = messaging_init(p, cluster_id(EJS_ID_BASE + i), ev);
 		if (p->msg_ctx) break;
 	}
 	if (p->msg_ctx == NULL) {
@@ -88,7 +89,7 @@ static int ejs_irpc_connect(MprVarHandle eid, int argc, char **argv)
 	}
 
 	p->dest_ids = irpc_servers_byname(p->msg_ctx, p->server_name);
-	if (p->dest_ids == NULL || p->dest_ids[0] == 0) {
+	if (p->dest_ids == NULL || p->dest_ids[0].id == 0) {
 		talloc_free(p);
 		status = NT_STATUS_OBJECT_NAME_NOT_FOUND;
 	} else {
@@ -214,7 +215,7 @@ static int ejs_irpc_call(int eid, struct MprVar *io,
 		goto done;
 	}
 
-	for (count=0;p->dest_ids[count];count++) /* noop */ ;
+	for (count=0;p->dest_ids[count].id;count++) /* noop */ ;
 
 	/* we need to make a call per server */
 	reqs = talloc_array(ejs, struct irpc_request *, count);
-- 
cgit 


From bd96c74e144262643d3edb899c68583765ee0865 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Thu, 11 Jan 2007 11:11:34 +0000
Subject: r20683: load indexes before applying replicated objects, as for every
 object the repl_meta_data module needs to look up the object by objectGUID

metze
(This used to be commit 55f845377ce3a7aeb028805754dc9c05d429548e)
---
 source4/scripting/libjs/provision.js | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index 6d5e9d4f70..d77b2b6c04 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -473,6 +473,9 @@ function provision_become_dc(subobj, message, paths, session_info)
 	message("Erasing data from partitions\n");
 	ldb_erase_partitions(info, samdb, undefined);
 
+	message("Setting up " + paths.samdb + " indexes\n");
+	setup_add_ldif("provision_index.ldif", info, samdb, false);
+
 	ok = samdb.transaction_commit();
 	assert(ok);
 
-- 
cgit 


From f1c81fdecd658031e8b95eb943839159434c0846 Mon Sep 17 00:00:00 2001
From: Simo Sorce <idra@samba.org>
Date: Thu, 11 Jan 2007 23:09:57 +0000
Subject: r20689: "pdc" and "bdc" have been replaced by "domain controller"
 (This used to be commit 6976f283fc30a401bcc1d2c5089135c3fe8f1728)

---
 source4/scripting/libjs/upgrade.js | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/upgrade.js b/source4/scripting/libjs/upgrade.js
index 9a5818c81f..adb958a236 100644
--- a/source4/scripting/libjs/upgrade.js
+++ b/source4/scripting/libjs/upgrade.js
@@ -497,13 +497,9 @@ function upgrade_smbconf(oldconf,mark)
 	}
 
 	if (oldconf.get("domain logons") == "True") {
-		if (oldconf.get("domain master") == "True") {
-			newconf.set("server role", "pdc");
-		} else {
-			newconf.set("server role", "bdc");
-		}
+		newconf.set("server role", "domain controller");
 	} else {
-		if (oldconf.get("domain master") == "True") {
+		if (oldconf.get("security") == "user") {
 			newconf.set("server role", "standalone");
 		} else {
 			newconf.set("server role", "member server");
-- 
cgit 


From a6f6530c386713c8d81a69fde4e6e32cc5385de9 Mon Sep 17 00:00:00 2001
From: Rafal Szczesniak <mimir@samba.org>
Date: Sun, 14 Jan 2007 20:37:14 +0000
Subject: r20782: Place ejsnet files in a separate directory.

rafal
(This used to be commit 10968c3f4b0bb63a9902adcbd44d30ad7bfd4afe)
---
 source4/scripting/ejs/ejsnet/mpr_user.c | 165 +++++++++++++++++++
 source4/scripting/ejs/ejsnet/net_ctx.c  | 209 ++++++++++++++++++++++++
 source4/scripting/ejs/ejsnet/net_user.c | 277 ++++++++++++++++++++++++++++++++
 3 files changed, 651 insertions(+)
 create mode 100644 source4/scripting/ejs/ejsnet/mpr_user.c
 create mode 100644 source4/scripting/ejs/ejsnet/net_ctx.c
 create mode 100644 source4/scripting/ejs/ejsnet/net_user.c

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/ejsnet/mpr_user.c b/source4/scripting/ejs/ejsnet/mpr_user.c
new file mode 100644
index 0000000000..9a49262dc6
--- /dev/null
+++ b/source4/scripting/ejs/ejsnet/mpr_user.c
@@ -0,0 +1,165 @@
+/* 
+   Unix SMB/CIFS implementation.
+
+   provides interfaces to libnet calls from ejs scripts
+
+   Copyright (C) Rafal Szczesniak  2005-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 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.
+*/
+
+#include "includes.h"
+#include "lib/appweb/ejs/ejs.h"
+#include "libnet/libnet.h"
+#include "scripting/ejs/smbcalls.h"
+#include "events/events.h"
+#include "auth/credentials/credentials.h"
+
+
+/*
+  Properties:
+  UserInfo.AccountName
+  UserInfo.FullName
+  UserInfo.Description
+  UserInfo.HomeDirectory
+  UserInfo.HomeDrive
+  UserInfo.Comment
+  UserInfo.LogonScript
+  UserInfo.AcctExpiry
+  UserInfo.AllowPasswordChange
+  UserInfo.ForcePasswordChange
+ */
+struct MprVar mprCreateUserInfo(TALLOC_CTX *mem_ctx, struct libnet_UserInfo *info)
+{
+	const char *name = "UserInfo";
+	NTSTATUS status;
+	struct MprVar mprUserInfo;
+	struct MprVar mprAccountName, mprFullName, mprDescription;
+	struct MprVar mprHomeDir, mprHomeDrive, mprComment;
+	struct MprVar mprLogonScript;
+	struct MprVar mprAcctExpiry, mprAllowPassChange, mprForcePassChange;
+
+	if (info == NULL || mem_ctx == NULL) {
+		mprUserInfo = mprCreateNullVar();
+		goto done;
+	}
+
+	mprUserInfo = mprObject(name);
+
+	mprAccountName = mprString(info->out.account_name);
+	mprFullName = mprString(info->out.full_name);
+	mprDescription = mprString(info->out.description);
+	mprHomeDir = mprString(info->out.home_directory);
+	mprHomeDrive = mprString(info->out.home_drive);
+	mprComment = mprString(info->out.comment);
+	mprLogonScript = mprString(info->out.logon_script);
+	mprAcctExpiry = mprString(timestring(mem_ctx, info->out.acct_expiry->tv_sec));
+	mprAllowPassChange = mprString(timestring(mem_ctx, info->out.allow_password_change->tv_sec));
+	mprForcePassChange = mprString(timestring(mem_ctx, info->out.force_password_change->tv_sec));
+
+	status = mprSetVar(&mprUserInfo, "AccountName", mprAccountName);
+	if (!NT_STATUS_IS_OK(status)) goto done;
+	status = mprSetVar(&mprUserInfo, "FullName", mprFullName);
+	if (!NT_STATUS_IS_OK(status)) goto done;
+	status = mprSetVar(&mprUserInfo, "Description", mprDescription);
+	if (!NT_STATUS_IS_OK(status)) goto done;
+	status = mprSetVar(&mprUserInfo, "HomeDirectory", mprHomeDir);
+	if (!NT_STATUS_IS_OK(status)) goto done;
+	status = mprSetVar(&mprUserInfo, "HomeDrive", mprHomeDrive);
+	if (!NT_STATUS_IS_OK(status)) goto done;
+	status = mprSetVar(&mprUserInfo, "Comment", mprComment);
+	if (!NT_STATUS_IS_OK(status)) goto done;
+	status = mprSetVar(&mprUserInfo, "LogonScript", mprLogonScript);
+	if (!NT_STATUS_IS_OK(status)) goto done;
+	status = mprSetVar(&mprUserInfo, "AcctExpiry", mprAcctExpiry);
+	if (!NT_STATUS_IS_OK(status)) goto done;
+	status = mprSetVar(&mprUserInfo, "AllowPasswordChange", mprAllowPassChange);
+	if (!NT_STATUS_IS_OK(status)) goto done;
+	status = mprSetVar(&mprUserInfo, "ForcePasswordChange", mprForcePassChange);
+	if (!NT_STATUS_IS_OK(status)) goto done;
+
+done:
+	return mprUserInfo;
+}
+
+
+/*
+  Properties:
+  UserListCtx.Users[]
+  UserListCtx.ResumeIndex
+  UserListCtx.Count
+ */
+struct MprVar mprUserListCtx(TALLOC_CTX *mem_ctx, struct libnet_UserList *list)
+{
+	const char *name = "UserListCtx";
+	NTSTATUS status;
+	struct MprVar mprListCtx, mprUserList;
+	struct MprVar mprUser, mprSid, mprUsername;
+	int i;
+
+	if (list == NULL || mem_ctx == NULL) {
+		mprListCtx = mprCreateNullVar();
+		goto done;
+	}
+
+	mprUserList = mprArray("Users");
+	for (i = 0; i < list->out.count; i++) {
+		struct userlist u = list->out.users[i];
+		
+		/* get userlist fields */
+		mprSid      = mprString(u.sid);
+		mprUsername = mprString(u.username);
+		
+		/* create userlist object */
+		mprUser = mprObject("User");
+		mprSetVar(&mprUser, "Username", mprUsername);
+		mprSetVar(&mprUser, "SID", mprSid);
+		
+		/* add the object to the array being constructed */
+		mprAddArray(&mprUserList, 0, mprUser);
+	}
+
+	mprListCtx = mprObject(name);
+	status = mprSetVar(&mprListCtx, "Users", mprUserList);
+	if (!NT_STATUS_IS_OK(status)) goto done;
+	status = mprSetVar(&mprListCtx, "Count", mprCreateIntegerVar(list->out.count));
+	if (!NT_STATUS_IS_OK(status)) goto done;
+	status = mprSetVar(&mprListCtx, "ResumeIndex", mprCreateIntegerVar((int)list->out.resume_index));
+	if (!NT_STATUS_IS_OK(status)) goto done;
+
+done:
+	return mprListCtx;
+}
+
+
+/*
+  Returns UserListCtx.ResumeIndex out of passed UserListCtx
+ */
+unsigned int mprListGetResumeIndex(struct MprVar *listCtx)
+{
+	NTSTATUS status;
+	unsigned int resume = 0;
+	struct MprVar *mprResumeIndex;
+	if (listCtx == NULL) return 0;
+	
+	mprResumeIndex = listCtx;
+	status = mprGetVar(&mprResumeIndex, "ResumeIndex");
+	if (!NT_STATUS_IS_OK(status)) goto done;
+
+	resume = (unsigned int) mprVarToInteger(mprResumeIndex);
+
+done:
+	return resume;
+}
diff --git a/source4/scripting/ejs/ejsnet/net_ctx.c b/source4/scripting/ejs/ejsnet/net_ctx.c
new file mode 100644
index 0000000000..42c64540fb
--- /dev/null
+++ b/source4/scripting/ejs/ejsnet/net_ctx.c
@@ -0,0 +1,209 @@
+/* 
+   Unix SMB/CIFS implementation.
+
+   provides interfaces to libnet calls from ejs scripts
+
+   Copyright (C) Rafal Szczesniak  2005-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 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.
+*/
+
+#include "includes.h"
+#include "lib/appweb/ejs/ejs.h"
+#include "scripting/ejs/smbcalls.h"
+#include "libnet/libnet.h"
+#include "events/events.h"
+#include "auth/credentials/credentials.h"
+
+
+int ejs_net_userman(MprVarHandle eid, int argc, struct MprVar** argv);
+
+static int ejs_net_join_domain(MprVarHandle eid, int argc, struct MprVar **argv);
+static int ejs_net_samsync_ldb(MprVarHandle eid, int argc, struct MprVar **argv);
+
+/*
+  Usage:
+  net = NetContext(credentials);
+*/
+
+static int ejs_net_context(MprVarHandle eid, int argc, struct MprVar **argv)
+{
+	TALLOC_CTX *event_mem_ctx = talloc_new(mprMemCtx());
+	struct cli_credentials *creds;
+	struct libnet_context *ctx;
+	struct MprVar obj;
+	struct event_context *ev;
+
+	if (!event_mem_ctx) {
+		ejsSetErrorMsg(eid, "talloc_new() failed");
+		return -1;
+	}
+	ev = event_context_find(event_mem_ctx);
+	ctx = libnet_context_init(ev);
+	/* IF we generated a new event context, it will be under here,
+	 * and we need it to last as long as the libnet context, so
+	 * make it a child */
+	talloc_steal(ctx, event_mem_ctx);
+
+	if (argc == 0 || (argc == 1 && argv[0]->type == MPR_TYPE_NULL)) {
+		creds = cli_credentials_init(ctx);
+		if (creds == NULL) {
+			ejsSetErrorMsg(eid, "cli_credential_init() failed");
+			talloc_free(ctx);
+			return -1;
+		}
+		cli_credentials_set_conf(creds);
+		cli_credentials_set_anonymous(creds);
+
+	} else if (argc == 1 && argv[0]->type == MPR_TYPE_OBJECT) {
+		/* get credential values from credentials object */
+		creds = mprGetPtr(argv[0], "creds");
+		if (creds == NULL) {
+			ejsSetErrorMsg(eid, "userAuth requires a 'creds' first parameter");
+			talloc_free(ctx);
+			return -1;
+		}
+
+	} else {
+		ejsSetErrorMsg(eid, "NetContext invalid arguments, this function requires an object.");
+		talloc_free(ctx);
+		return -1;
+	}
+
+	ctx->cred = creds;
+
+	obj = mprObject("NetCtx");
+	mprSetPtrChild(&obj, "ctx", ctx);
+	
+	mprSetCFunction(&obj, "UserMgr", ejs_net_userman);
+	mprSetCFunction(&obj, "JoinDomain", ejs_net_join_domain);
+	mprSetCFunction(&obj, "SamSyncLdb", ejs_net_samsync_ldb);
+	mpr_Return(eid, obj);
+
+	return 0;
+}
+
+
+static int ejs_net_join_domain(MprVarHandle eid, int argc, struct MprVar **argv)
+{
+	TALLOC_CTX *mem_ctx;
+	struct libnet_context *ctx;
+	struct libnet_Join *join;
+	NTSTATUS status;
+	ctx = mprGetThisPtr(eid, "ctx");
+	mem_ctx = talloc_new(mprMemCtx());
+
+	join = talloc(mem_ctx, struct libnet_Join);
+	if (!join) {
+		talloc_free(mem_ctx);
+		return -1;
+	}
+
+	/* prepare parameters for the join */
+	join->in.netbios_name  = NULL;
+	join->in.join_type     = SEC_CHAN_WKSTA;
+	join->in.domain_name   = cli_credentials_get_domain(ctx->cred);
+	join->in.level         = LIBNET_JOIN_AUTOMATIC;
+	join->out.error_string = NULL;
+
+	if (argc == 1 && argv[0]->type == MPR_TYPE_OBJECT) {
+		MprVar *netbios_name = mprGetProperty(argv[0], "netbios_name", NULL);
+		MprVar *domain_name = mprGetProperty(argv[0], "domain_name", NULL);
+		MprVar *join_type = mprGetProperty(argv[0], "join_type", NULL);
+		if (netbios_name) {
+			join->in.netbios_name = mprToString(netbios_name);
+		}
+		if (domain_name) {
+			join->in.domain_name = mprToString(domain_name);
+		}
+		if (join_type) {
+			join->in.join_type = mprToInt(join_type);
+		}
+	}
+
+	if (!join->in.domain_name) {
+		ejsSetErrorMsg(eid, "a domain must be specified for to join");
+		talloc_free(mem_ctx);
+		return -1;
+	}
+
+	/* do the domain join */
+	status = libnet_Join(ctx, join, join);
+	
+	if (!NT_STATUS_IS_OK(status)) {
+		MprVar error_string = mprString(join->out.error_string);
+		
+		mprSetPropertyValue(argv[0], "error_string", error_string);
+		mpr_Return(eid, mprCreateBoolVar(False));
+	} else {
+		mpr_Return(eid, mprCreateBoolVar(True));
+	}
+	talloc_free(mem_ctx);
+	return 0;
+}
+
+
+static int ejs_net_samsync_ldb(MprVarHandle eid, int argc, struct MprVar **argv)
+{
+	TALLOC_CTX *mem_ctx;
+	struct libnet_context *ctx;
+	struct libnet_samsync_ldb *samsync;
+	NTSTATUS status;
+	ctx = mprGetThisPtr(eid, "ctx");
+	mem_ctx = talloc_new(mprMemCtx());
+
+	samsync = talloc(mem_ctx, struct libnet_samsync_ldb);
+	if (!samsync) {
+		talloc_free(mem_ctx);
+		return -1;
+	}
+
+	/* prepare parameters for the samsync */
+	samsync->in.machine_account = NULL;
+	samsync->in.session_info = NULL;
+	samsync->in.binding_string = NULL;
+	samsync->out.error_string = NULL;
+
+	if (argc == 1 && argv[0]->type == MPR_TYPE_OBJECT) {
+		MprVar *credentials = mprGetProperty(argv[0], "machine_account", NULL);
+		MprVar *session_info = mprGetProperty(argv[0], "session_info", NULL);
+		if (credentials) {
+			samsync->in.machine_account = talloc_get_type(mprGetPtr(credentials, "creds"), struct cli_credentials);
+		}
+		if (session_info) {
+			samsync->in.session_info = talloc_get_type(mprGetPtr(session_info, "session_info"), struct auth_session_info);
+		}
+	}
+
+	/* do the domain samsync */
+	status = libnet_samsync_ldb(ctx, samsync, samsync);
+	
+	if (!NT_STATUS_IS_OK(status)) {
+		MprVar error_string = mprString(samsync->out.error_string);
+		
+		mprSetPropertyValue(argv[0], "error_string", error_string);
+		mpr_Return(eid, mprCreateBoolVar(False));
+	} else {
+		mpr_Return(eid, mprCreateBoolVar(True));
+	}
+	talloc_free(mem_ctx);
+	return 0;
+}
+
+
+void ejsnet_setup(void)
+{
+	ejsDefineCFunction(-1, "NetContext", ejs_net_context, NULL, MPR_VAR_SCRIPT_HANDLE);
+}
diff --git a/source4/scripting/ejs/ejsnet/net_user.c b/source4/scripting/ejs/ejsnet/net_user.c
new file mode 100644
index 0000000000..731b4b9203
--- /dev/null
+++ b/source4/scripting/ejs/ejsnet/net_user.c
@@ -0,0 +1,277 @@
+/* 
+   Unix SMB/CIFS implementation.
+
+   provides interfaces to libnet calls from ejs scripts
+
+   Copyright (C) Rafal Szczesniak  2005-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 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.
+*/
+
+#include "includes.h"
+#include "lib/appweb/ejs/ejs.h"
+#include "libnet/libnet.h"
+#include "proto.h"
+#include "scripting/ejs/smbcalls.h"
+#include "events/events.h"
+#include "auth/credentials/credentials.h"
+
+
+static int ejs_net_createuser(MprVarHandle eid, int argc, char **argv);
+static int ejs_net_deleteuser(MprVarHandle eid, int argc, char **argv);
+static int ejs_net_userinfo(MprVarHandle eid, int argc, char **argv);
+static int ejs_net_userlist(MprVarHandle eid, int argc, struct MprVar **argv);
+
+
+/*
+  Usage:
+  usrCtx = net.UserMgr(domain);
+*/
+int ejs_net_userman(MprVarHandle eid, int argc, struct MprVar **argv)
+{
+	TALLOC_CTX *mem_ctx;
+	struct libnet_context *ctx;
+	const char *userman_domain = NULL;
+	struct MprVar *obj = NULL;
+
+	ctx = mprGetThisPtr(eid, "ctx");
+	mem_ctx = talloc_new(mprMemCtx());
+
+	if (argc == 0) {
+		userman_domain = cli_credentials_get_domain(ctx->cred);
+
+	} else if (argc == 1 && mprVarIsString(argv[0]->type)) {
+		userman_domain = talloc_strdup(ctx, mprToString(argv[0]));
+
+	} else {
+		ejsSetErrorMsg(eid, "too many arguments");
+		goto done;
+	}
+	
+	if (!userman_domain) {
+		ejsSetErrorMsg(eid, "a domain must be specified for user management");
+		goto done;
+	}
+
+	obj = mprInitObject(eid, "NetUsrCtx", argc, argv);
+	mprSetPtrChild(obj, "ctx", ctx);
+	mprSetPtrChild(obj, "domain", userman_domain);
+
+	mprSetStringCFunction(obj, "Create", ejs_net_createuser);
+	mprSetStringCFunction(obj, "Delete", ejs_net_deleteuser);
+	mprSetStringCFunction(obj, "Info", ejs_net_userinfo);
+	mprSetCFunction(obj, "List", ejs_net_userlist);
+
+	return 0;
+done:
+	talloc_free(mem_ctx);
+	return -1;
+}
+
+
+static int ejs_net_createuser(MprVarHandle eid, int argc, char **argv)
+{
+	NTSTATUS status = NT_STATUS_UNSUCCESSFUL;
+	TALLOC_CTX *mem_ctx;
+	struct libnet_context *ctx;
+	const char *userman_domain = NULL;
+	struct libnet_CreateUser req;
+
+	if (argc != 1) {
+		ejsSetErrorMsg(eid, "argument 1 must be a string");
+		return -1;
+	}
+
+	ctx = mprGetThisPtr(eid, "ctx");
+	if (!ctx) {
+		ejsSetErrorMsg(eid, "ctx property returns null pointer");
+		return -1;
+	}
+
+	userman_domain = mprGetThisPtr(eid, "domain");
+	if (!userman_domain) {
+		ejsSetErrorMsg(eid, "domain property returns null pointer");
+		return -1;
+	}
+	
+	mem_ctx = talloc_new(mprMemCtx());
+
+    	req.in.domain_name = userman_domain;
+	req.in.user_name   = argv[0];
+
+	status = libnet_CreateUser(ctx, mem_ctx, &req);
+	if (!NT_STATUS_IS_OK(status)) {
+		ejsSetErrorMsg(eid, "%s", req.out.error_string);
+	}
+
+	talloc_free(mem_ctx);
+	mpr_Return(eid, mprNTSTATUS(status));
+	return 0;
+}
+
+
+static int ejs_net_deleteuser(MprVarHandle eid, int argc, char **argv)
+{
+	NTSTATUS status = NT_STATUS_UNSUCCESSFUL;
+	TALLOC_CTX *mem_ctx;
+	struct libnet_context *ctx;
+	const char *userman_domain = NULL;
+	struct libnet_DeleteUser req;
+
+	if (argc != 1) {
+		ejsSetErrorMsg(eid, "argument 1 must be a string");
+		return -1;
+	}
+
+	ctx = mprGetThisPtr(eid, "ctx");
+	if (!ctx) {
+		ejsSetErrorMsg(eid, "ctx property returns null pointer");
+		return -1;
+	}
+
+	userman_domain = mprGetThisPtr(eid, "domain");
+	if (!userman_domain) {
+		ejsSetErrorMsg(eid, "domain property returns null pointer");
+		return -1;
+	}
+	
+	mem_ctx = talloc_new(mprMemCtx());
+
+    	req.in.domain_name = userman_domain;
+	req.in.user_name   = argv[0];
+
+	status = libnet_DeleteUser(ctx, mem_ctx, &req);
+	if (!NT_STATUS_IS_OK(status)) {
+		ejsSetErrorMsg(eid, "%s", req.out.error_string);
+	}
+
+	talloc_free(mem_ctx);
+	mpr_Return(eid, mprNTSTATUS(status));
+	return 0;
+}
+
+
+static int ejs_net_userinfo(MprVarHandle eid, int argc, char **argv)
+{
+	NTSTATUS status = NT_STATUS_UNSUCCESSFUL;
+	TALLOC_CTX *mem_ctx;
+	struct libnet_context *ctx;
+	const char *userman_domain;
+	struct libnet_UserInfo req;
+	struct MprVar mprUserInfo;
+
+	if (argc != 1) {
+		ejsSetErrorMsg(eid, "argument 1 must be a string");
+		return -1;
+	}
+
+	ctx = mprGetThisPtr(eid, "ctx");
+	if (ctx == NULL) {
+		ejsSetErrorMsg(eid, "ctx property returns null pointer");
+		return -1;
+	}
+
+	userman_domain = mprGetThisPtr(eid, "domain");
+	if (userman_domain == NULL) {
+		ejsSetErrorMsg(eid, "domain property returns null pointer");
+		return -1;
+	}
+
+	mem_ctx = talloc_new(mprMemCtx());
+	
+	req.in.domain_name = userman_domain;
+	req.in.user_name   = argv[0];
+	
+	status = libnet_UserInfo(ctx, mem_ctx, &req);
+	if (!NT_STATUS_IS_OK(status)) {
+		ejsSetErrorMsg(eid, "%s", req.out.error_string);
+		
+		/* create null object to return */
+		mprUserInfo = mprCreateNullVar();
+		goto done;
+	}
+
+	/* create UserInfo object */
+	mprUserInfo = mprCreateUserInfo(ctx, &req);
+
+done:
+	talloc_free(mem_ctx);
+	mpr_Return(eid, mprUserInfo);
+	return 0;
+}
+
+
+static int ejs_net_userlist(MprVarHandle eid, int argc, struct MprVar **argv)
+{
+	TALLOC_CTX *mem_ctx;
+	NTSTATUS status;
+	struct libnet_context *ctx;
+	const char *userlist_domain;
+	struct libnet_UserList req;
+	struct MprVar mprListCtx, *mprInListCtx;
+	
+	mem_ctx = talloc_new(mprMemCtx());
+	
+	if (argc == 0) {
+		ejsSetErrorMsg(eid, "too little arguments");
+
+	} else if (argc == 1) {
+		if (mprVarIsObject(argv[0]->type)) {
+			/* this is a continuation call */
+			mprInListCtx = argv[0];
+			req.in.resume_index = mprListGetResumeIndex(mprInListCtx);
+
+		} else {
+			req.in.resume_index = 0;
+		}
+
+	} else {
+		ejsSetErrorMsg(eid, "too many arguments");
+		goto done;
+	}
+
+	ctx = mprGetThisPtr(eid, "ctx");
+	if (!ctx) {
+		ejsSetErrorMsg(eid, "ctx property returns null pointer");
+		return -1;
+	}
+
+	userlist_domain = mprGetThisPtr(eid, "domain");
+	if (!userlist_domain) {
+		ejsSetErrorMsg(eid, "domain property returns null pointer");
+		return -1;
+	}
+
+	req.in.domain_name   = userlist_domain;
+	req.in.page_size     = 10;  /* TODO: this should be specified in a nicer way */
+	
+	status = libnet_UserList(ctx, mem_ctx, &req);
+	if (!NT_STATUS_IS_OK(status) &&
+	    !NT_STATUS_EQUAL(status, STATUS_MORE_ENTRIES) &&
+	    !NT_STATUS_EQUAL(status, NT_STATUS_NO_MORE_ENTRIES)) {
+
+		ejsSetErrorMsg(eid, "%s", req.out.error_string);
+		
+		mprListCtx = mprCreateNullVar();
+		goto done;
+	}
+
+	mprListCtx = mprUserListCtx(mem_ctx, &req);
+
+done:
+	talloc_free(mem_ctx);
+	mpr_Return(eid, mprListCtx);
+	return 0;
+}
-- 
cgit 


From 79cd3ada824c99cb4a2d62c1d41cd58142548bc6 Mon Sep 17 00:00:00 2001
From: Rafal Szczesniak <mimir@samba.org>
Date: Sun, 14 Jan 2007 20:47:46 +0000
Subject: r20783: Ejsnet files are now moved into a separate directory. I need
 to commit this as the change is getting bigger and bigger.

Jelmer, Metze, I don't know enough of our build system so please check
if .mk files are ok.

rafal
(This used to be commit 77ede0656c0b17a84ee8550776ab158007f0e71f)
---
 source4/scripting/ejs/config.mk        |   5 +-
 source4/scripting/ejs/ejsnet.c         | 420 ---------------------------------
 source4/scripting/ejs/ejsnet.h         |  26 --
 source4/scripting/ejs/ejsnet/config.mk |  13 +
 4 files changed, 15 insertions(+), 449 deletions(-)
 delete mode 100644 source4/scripting/ejs/ejsnet.c
 delete mode 100644 source4/scripting/ejs/ejsnet.h
 create mode 100644 source4/scripting/ejs/ejsnet/config.mk

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/config.mk b/source4/scripting/ejs/config.mk
index 0326bca857..38ed6778f7 100644
--- a/source4/scripting/ejs/config.mk
+++ b/source4/scripting/ejs/config.mk
@@ -71,11 +71,10 @@ OBJ_FILES = \
 		smbcalls_options.o \
 		smbcalls_creds.o \
 		smbcalls_param.o \
-		ejsnet.o \
 		mprutil.o \
 		literal.o
 PUBLIC_DEPENDENCIES = \
-		EJS LIBSAMBA-UTIL \
+		EJS EJSNET LIBSAMBA-UTIL \
 		EJSRPC MESSAGING \
 		LIBSAMBA-NET LIBCLI_SMB LIBPOPT \
 		CREDENTIALS POPT_CREDENTIALS POPT_SAMBA \
@@ -90,6 +89,6 @@ PUBLIC_DEPENDENCIES = \
 INSTALLDIR = BINDIR
 OBJ_FILES = \
 		smbscript.o
-PRIVATE_DEPENDENCIES = EJS LIBSAMBA-UTIL smbcalls LIBSAMBA-CONFIG 
+PRIVATE_DEPENDENCIES = EJS EJSNET LIBSAMBA-UTIL smbcalls LIBSAMBA-CONFIG
 # End BINARY SMBSCRIPT
 #######################
diff --git a/source4/scripting/ejs/ejsnet.c b/source4/scripting/ejs/ejsnet.c
deleted file mode 100644
index 41ea1e2327..0000000000
--- a/source4/scripting/ejs/ejsnet.c
+++ /dev/null
@@ -1,420 +0,0 @@
-/* 
-   Unix SMB/CIFS implementation.
-
-   provide interfaces to libnet calls from ejs scripts
-
-   Copyright (C) Rafal Szczesniak  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 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.
-*/
-
-#include "includes.h"
-#include "lib/appweb/ejs/ejs.h"
-#include "scripting/ejs/smbcalls.h"
-#include "scripting/ejs/ejsnet.h"
-#include "libnet/libnet.h"
-#include "events/events.h"
-#include "auth/credentials/credentials.h"
-
-static int ejs_net_userman(MprVarHandle eid, int argc, struct MprVar** argv);
-static int ejs_net_createuser(MprVarHandle eid, int argc, char **argv);
-static int ejs_net_deleteuser(MprVarHandle eid, int argc, char **argv);
-static int ejs_net_userinfo(MprVarHandle eid, int argc, char **argv);
-static int ejs_net_join_domain(MprVarHandle eid, int argc, struct MprVar **argv);
-static int ejs_net_samsync_ldb(MprVarHandle eid, int argc, struct MprVar **argv);
-
-/*
-  Usage:
-  net = NetContext(credentials);
-*/
-
-static int ejs_net_context(MprVarHandle eid, int argc, struct MprVar **argv)
-{
-	TALLOC_CTX *event_mem_ctx = talloc_new(mprMemCtx());
-	struct cli_credentials *creds;
-	struct libnet_context *ctx;
-	struct MprVar obj;
-	struct event_context *ev;
-
-	if (!event_mem_ctx) {
-		ejsSetErrorMsg(eid, "talloc_new() failed");
-		return -1;
-	}
-	ev = event_context_find(event_mem_ctx);
-	ctx = libnet_context_init(ev);
-	/* IF we generated a new event context, it will be under here,
-	 * and we need it to last as long as the libnet context, so
-	 * make it a child */
-	talloc_steal(ctx, event_mem_ctx);
-
-	if (argc == 0 || (argc == 1 && argv[0]->type == MPR_TYPE_NULL)) {
-		creds = cli_credentials_init(ctx);
-		if (creds == NULL) {
-			ejsSetErrorMsg(eid, "cli_credential_init() failed");
-			talloc_free(ctx);
-			return -1;
-		}
-		cli_credentials_set_conf(creds);
-		cli_credentials_set_anonymous(creds);
-	} else if (argc == 1 && argv[0]->type == MPR_TYPE_OBJECT) {
-		/* get credential values from credentials object */
-		creds = mprGetPtr(argv[0], "creds");
-		if (creds == NULL) {
-			ejsSetErrorMsg(eid, "userAuth requires a 'creds' first parameter");
-			talloc_free(ctx);
-			return -1;
-		}
-	} else {
-		ejsSetErrorMsg(eid, "NetContext invalid arguments, this function requires an object.");
-		talloc_free(ctx);
-		return -1;
-	}
-	ctx->cred = creds;
-
-	obj = mprObject("NetCtx");
-	mprSetPtrChild(&obj, "ctx", ctx);
-	
-	mprSetCFunction(&obj, "UserMgr", ejs_net_userman);
-	mprSetCFunction(&obj, "JoinDomain", ejs_net_join_domain);
-	mprSetCFunction(&obj, "SamSyncLdb", ejs_net_samsync_ldb);
-	mpr_Return(eid, obj);
-
-	return 0;
-}
-
-
-static int ejs_net_join_domain(MprVarHandle eid, int argc, struct MprVar **argv)
-{
-	TALLOC_CTX *mem_ctx;
-	struct libnet_context *ctx;
-	struct libnet_Join *join;
-	NTSTATUS status;
-	ctx = mprGetThisPtr(eid, "ctx");
-	mem_ctx = talloc_new(mprMemCtx());
-
-	join = talloc(mem_ctx, struct libnet_Join);
-	if (!join) {
-		talloc_free(mem_ctx);
-		return -1;
-	}
-
-	/* prepare parameters for the join */
-	join->in.netbios_name  = NULL;
-	join->in.join_type     = SEC_CHAN_WKSTA;
-	join->in.domain_name   = cli_credentials_get_domain(ctx->cred);
-	join->in.level         = LIBNET_JOIN_AUTOMATIC;
-	join->out.error_string = NULL;
-
-	if (argc == 1 && argv[0]->type == MPR_TYPE_OBJECT) {
-		MprVar *netbios_name = mprGetProperty(argv[0], "netbios_name", NULL);
-		MprVar *domain_name = mprGetProperty(argv[0], "domain_name", NULL);
-		MprVar *join_type = mprGetProperty(argv[0], "join_type", NULL);
-		if (netbios_name) {
-			join->in.netbios_name = mprToString(netbios_name);
-		}
-		if (domain_name) {
-			join->in.domain_name = mprToString(domain_name);
-		}
-		if (join_type) {
-			join->in.join_type = mprToInt(join_type);
-		}
-	}
-
-	if (!join->in.domain_name) {
-		ejsSetErrorMsg(eid, "a domain must be specified for to join");
-		talloc_free(mem_ctx);
-		return -1;
-	}
-
-	/* do the domain join */
-	status = libnet_Join(ctx, join, join);
-	
-	if (!NT_STATUS_IS_OK(status)) {
-		MprVar error_string = mprString(join->out.error_string);
-		
-		mprSetPropertyValue(argv[0], "error_string", error_string);
-		mpr_Return(eid, mprCreateBoolVar(False));
-	} else {
-		mpr_Return(eid, mprCreateBoolVar(True));
-	}
-	talloc_free(mem_ctx);
-	return 0;
-}
-
-
-static int ejs_net_samsync_ldb(MprVarHandle eid, int argc, struct MprVar **argv)
-{
-	TALLOC_CTX *mem_ctx;
-	struct libnet_context *ctx;
-	struct libnet_samsync_ldb *samsync;
-	NTSTATUS status;
-	ctx = mprGetThisPtr(eid, "ctx");
-	mem_ctx = talloc_new(mprMemCtx());
-
-	samsync = talloc(mem_ctx, struct libnet_samsync_ldb);
-	if (!samsync) {
-		talloc_free(mem_ctx);
-		return -1;
-	}
-
-	/* prepare parameters for the samsync */
-	samsync->in.machine_account = NULL;
-	samsync->in.session_info = NULL;
-	samsync->in.binding_string = NULL;
-	samsync->out.error_string = NULL;
-
-	if (argc == 1 && argv[0]->type == MPR_TYPE_OBJECT) {
-		MprVar *credentials = mprGetProperty(argv[0], "machine_account", NULL);
-		MprVar *session_info = mprGetProperty(argv[0], "session_info", NULL);
-		if (credentials) {
-			samsync->in.machine_account = talloc_get_type(mprGetPtr(credentials, "creds"), struct cli_credentials);
-		}
-		if (session_info) {
-			samsync->in.session_info = talloc_get_type(mprGetPtr(session_info, "session_info"), struct auth_session_info);
-		}
-	}
-
-	/* do the domain samsync */
-	status = libnet_samsync_ldb(ctx, samsync, samsync);
-	
-	if (!NT_STATUS_IS_OK(status)) {
-		MprVar error_string = mprString(samsync->out.error_string);
-		
-		mprSetPropertyValue(argv[0], "error_string", error_string);
-		mpr_Return(eid, mprCreateBoolVar(False));
-	} else {
-		mpr_Return(eid, mprCreateBoolVar(True));
-	}
-	talloc_free(mem_ctx);
-	return 0;
-}
-
-
-/*
-  Usage:
-  usrCtx = net.UserMgr(domain);
-*/
-static int ejs_net_userman(MprVarHandle eid, int argc, struct MprVar **argv)
-{
-	TALLOC_CTX *mem_ctx;
-	struct libnet_context *ctx;
-	const char *userman_domain = NULL;
-	struct MprVar *obj = NULL;
-
-	ctx = mprGetThisPtr(eid, "ctx");
-	mem_ctx = talloc_new(mprMemCtx());
-
-	if (argc == 0) {
-		userman_domain = cli_credentials_get_domain(ctx->cred);
-
-	} else if (argc == 1 && mprVarIsString(argv[0]->type)) {
-		userman_domain = talloc_strdup(ctx, mprToString(argv[0]));
-
-	} else {
-		ejsSetErrorMsg(eid, "too many arguments");
-		goto done;
-	}
-	
-	if (!userman_domain) {
-		ejsSetErrorMsg(eid, "a domain must be specified for user management");
-		goto done;
-	}
-
-	obj = mprInitObject(eid, "NetUsrCtx", argc, argv);
-	mprSetPtrChild(obj, "ctx", ctx);
-	mprSetPtrChild(obj, "domain", userman_domain);
-
-	mprSetStringCFunction(obj, "Create", ejs_net_createuser);
-	mprSetStringCFunction(obj, "Delete", ejs_net_deleteuser);
-	mprSetStringCFunction(obj, "Info", ejs_net_userinfo);
-
-	return 0;
-done:
-	talloc_free(mem_ctx);
-	return -1;
-}
-
-
-static int ejs_net_createuser(MprVarHandle eid, int argc, char **argv)
-{
-	NTSTATUS status = NT_STATUS_UNSUCCESSFUL;
-	TALLOC_CTX *mem_ctx;
-	struct libnet_context *ctx;
-	const char *userman_domain = NULL;
-	struct libnet_CreateUser req;
-
-	if (argc != 1) {
-		ejsSetErrorMsg(eid, "argument 1 must be a string");
-		return -1;
-	}
-
-	ctx = mprGetThisPtr(eid, "ctx");
-	if (!ctx) {
-		ejsSetErrorMsg(eid, "ctx property returns null pointer");
-		return -1;
-	}
-
-	userman_domain = mprGetThisPtr(eid, "domain");
-	if (!userman_domain) {
-		ejsSetErrorMsg(eid, "domain property returns null pointer");
-		return -1;
-	}
-	
-	mem_ctx = talloc_new(mprMemCtx());
-
-    	req.in.domain_name = userman_domain;
-	req.in.user_name   = argv[0];
-
-	status = libnet_CreateUser(ctx, mem_ctx, &req);
-	if (!NT_STATUS_IS_OK(status)) {
-		ejsSetErrorMsg(eid, "%s", req.out.error_string);
-	}
-
-	talloc_free(mem_ctx);
-	mpr_Return(eid, mprNTSTATUS(status));
-	return 0;
-}
-
-
-static int ejs_net_deleteuser(MprVarHandle eid, int argc, char **argv)
-{
-	NTSTATUS status = NT_STATUS_UNSUCCESSFUL;
-	TALLOC_CTX *mem_ctx;
-	struct libnet_context *ctx;
-	const char *userman_domain = NULL;
-	struct libnet_DeleteUser req;
-
-	if (argc != 1) {
-		ejsSetErrorMsg(eid, "argument 1 must be a string");
-		return -1;
-	}
-
-	ctx = mprGetThisPtr(eid, "ctx");
-	if (!ctx) {
-		ejsSetErrorMsg(eid, "ctx property returns null pointer");
-		return -1;
-	}
-
-	userman_domain = mprGetThisPtr(eid, "domain");
-	if (!userman_domain) {
-		ejsSetErrorMsg(eid, "domain property returns null pointer");
-		return -1;
-	}
-	
-	mem_ctx = talloc_new(mprMemCtx());
-
-    	req.in.domain_name = userman_domain;
-	req.in.user_name   = argv[0];
-
-	status = libnet_DeleteUser(ctx, mem_ctx, &req);
-	if (!NT_STATUS_IS_OK(status)) {
-		ejsSetErrorMsg(eid, "%s", req.out.error_string);
-	}
-
-	talloc_free(mem_ctx);
-	mpr_Return(eid, mprNTSTATUS(status));
-	return 0;
-}
-
-
-static int ejs_net_userinfo(MprVarHandle eid, int argc, char **argv)
-{
-	NTSTATUS status = NT_STATUS_UNSUCCESSFUL;
-	TALLOC_CTX *mem_ctx;
-	struct libnet_context *ctx;
-	const char *userman_domain = NULL;
-	struct libnet_UserInfo req;
-	struct MprVar mprUserInfo;
-	struct MprVar mprAccountName, mprFullName, mprDescription;
-	struct MprVar mprHomeDir, mprHomeDrive, mprComment;
-	struct MprVar mprLogonScript;
-	struct MprVar mprAcctExpiry, mprAllowPassChange, mprForcePassChange;
-
-	if (argc != 1) {
-		ejsSetErrorMsg(eid, "argument 1 must be a string");
-		return -1;
-	}
-
-	ctx = mprGetThisPtr(eid, "ctx");
-	if (!ctx) {
-		ejsSetErrorMsg(eid, "ctx property returns null pointer");
-		return -1;
-	}
-
-	userman_domain = mprGetThisPtr(eid, "domain");
-	if (!userman_domain) {
-		ejsSetErrorMsg(eid, "domain property returns null pointer");
-		return -1;
-	}
-
-	mem_ctx = talloc_new(mprMemCtx());
-	
-	req.in.domain_name = userman_domain;
-	req.in.user_name   = argv[0];
-	
-	status = libnet_UserInfo(ctx, mem_ctx, &req);
-	if (!NT_STATUS_IS_OK(status)) {
-		ejsSetErrorMsg(eid, "%s", req.out.error_string);
-		
-		/* create null object to return */
-		mprUserInfo = mprCreateNullVar();
-		goto done;
-	}
-
-	/* create UserInfo object */
-	mprUserInfo = mprObject("UserInfo");
-
-	mprAccountName = mprString(req.out.account_name);
-	mprFullName = mprString(req.out.full_name);
-	mprDescription = mprString(req.out.description);
-	mprHomeDir = mprString(req.out.home_directory);
-	mprHomeDrive = mprString(req.out.home_drive);
-	mprComment = mprString(req.out.comment);
-	mprLogonScript = mprString(req.out.logon_script);
-	mprAcctExpiry = mprString(timestring(mem_ctx, req.out.acct_expiry->tv_sec));
-	mprAllowPassChange = mprString(timestring(ctx, req.out.allow_password_change->tv_sec));
-	mprForcePassChange = mprString(timestring(ctx, req.out.force_password_change->tv_sec));
-
-	status = mprSetVar(&mprUserInfo, "AccountName", mprAccountName);
-	if (!NT_STATUS_IS_OK(status)) goto done;
-	status = mprSetVar(&mprUserInfo, "FullName", mprFullName);
-	if (!NT_STATUS_IS_OK(status)) goto done;
-	status = mprSetVar(&mprUserInfo, "Description", mprDescription);
-	if (!NT_STATUS_IS_OK(status)) goto done;
-	status = mprSetVar(&mprUserInfo, "HomeDirectory", mprHomeDir);
-	if (!NT_STATUS_IS_OK(status)) goto done;
-	status = mprSetVar(&mprUserInfo, "HomeDrive", mprHomeDrive);
-	if (!NT_STATUS_IS_OK(status)) goto done;
-	status = mprSetVar(&mprUserInfo, "Comment", mprComment);
-	if (!NT_STATUS_IS_OK(status)) goto done;
-	status = mprSetVar(&mprUserInfo, "LogonScript", mprLogonScript);
-	if (!NT_STATUS_IS_OK(status)) goto done;
-	status = mprSetVar(&mprUserInfo, "AcctExpiry", mprAcctExpiry);
-	if (!NT_STATUS_IS_OK(status)) goto done;
-	status = mprSetVar(&mprUserInfo, "AllowPasswordChange", mprAllowPassChange);
-	if (!NT_STATUS_IS_OK(status)) goto done;
-	status = mprSetVar(&mprUserInfo, "ForcePasswordChange", mprForcePassChange);
-	if (!NT_STATUS_IS_OK(status)) goto done;
-done:
-	talloc_free(mem_ctx);
-	mpr_Return(eid, mprUserInfo);
-	return 0;
-}
-
-
-void ejsnet_setup(void)
-{
-	ejsDefineCFunction(-1, "NetContext", ejs_net_context, NULL, MPR_VAR_SCRIPT_HANDLE);
-}
diff --git a/source4/scripting/ejs/ejsnet.h b/source4/scripting/ejs/ejsnet.h
deleted file mode 100644
index 7d4bc32753..0000000000
--- a/source4/scripting/ejs/ejsnet.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* 
-   Unix SMB/CIFS implementation.
-
-   provide interfaces to libnet calls from ejs scripts
-
-   Copyright (C) Rafal Szczesniak  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 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.
-*/
-
-#include "lib/appweb/ejs/ejs.h"
-
-
-void ejsnet_setup(void);
diff --git a/source4/scripting/ejs/ejsnet/config.mk b/source4/scripting/ejs/ejsnet/config.mk
new file mode 100644
index 0000000000..4a3a428e44
--- /dev/null
+++ b/source4/scripting/ejs/ejsnet/config.mk
@@ -0,0 +1,13 @@
+#######################
+# Start LIBRARY EJSNET
+[LIBRARY::EJSNET]
+SO_VERSION = 0
+VERSION = 0.0.1
+PRIVATE_PROTO_HEADER = proto.h
+OBJ_FILES = \
+		net_ctx.o \
+		net_user.o \
+		mpr_user.o
+PUBLIC_DEPENDENCIES = LIBSAMBA-NET LIBCLI_SMB CREDENTIALS
+# End SUBSYSTEM ejsnet
+#######################
-- 
cgit 


From c448896c7eda9a71c7ecc7debd46e977b507c183 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 15 Jan 2007 02:23:40 +0000
Subject: r20786: Fix the build. (This used to be commit
 42bb335bd50a5070ee59c9d9748db8a9e9d6a9b0)

---
 source4/scripting/ejs/smbcalls.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls.c b/source4/scripting/ejs/smbcalls.c
index 1aee4cd9e2..b75024cb4a 100644
--- a/source4/scripting/ejs/smbcalls.c
+++ b/source4/scripting/ejs/smbcalls.c
@@ -23,6 +23,7 @@
 
 #include "includes.h"
 #include "lib/appweb/ejs/ejs.h"
+#include "scripting/ejs/ejsnet/proto.h"
 #include "scripting/ejs/smbcalls.h"
 #include "build.h"
 #include "version.h"
-- 
cgit 


From 0ec7ff5b6b8c7d498037bb68fc9cfead9e44dfc0 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Mon, 15 Jan 2007 07:34:04 +0000
Subject: r20791: the ejsnet stuff can be a normal smbcalls module...

mimir: when you want to register more functions
       please do that in the smb_setup_ejs_net() function

metze
(This used to be commit 5828632931376c3982bf0b6d110d217a8e05d60e)
---
 source4/scripting/ejs/config.mk        |  2 ++
 source4/scripting/ejs/ejsnet/config.mk | 11 +++--------
 source4/scripting/ejs/ejsnet/net_ctx.c |  2 +-
 source4/scripting/ejs/smbcalls.c       |  2 --
 4 files changed, 6 insertions(+), 11 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/config.mk b/source4/scripting/ejs/config.mk
index 38ed6778f7..0439d25d89 100644
--- a/source4/scripting/ejs/config.mk
+++ b/source4/scripting/ejs/config.mk
@@ -58,6 +58,8 @@ OBJ_FILES = smbcalls_sys.o
 SUBSYSTEM = smbcalls
 INIT_FUNCTION = smb_setup_ejs_system
 
+include ejsnet/config.mk
+
 #######################
 # Start LIBRARY smbcalls
 [LIBRARY::smbcalls]
diff --git a/source4/scripting/ejs/ejsnet/config.mk b/source4/scripting/ejs/ejsnet/config.mk
index 4a3a428e44..6e624886d6 100644
--- a/source4/scripting/ejs/ejsnet/config.mk
+++ b/source4/scripting/ejs/ejsnet/config.mk
@@ -1,13 +1,8 @@
-#######################
-# Start LIBRARY EJSNET
-[LIBRARY::EJSNET]
-SO_VERSION = 0
-VERSION = 0.0.1
+[MODULE::smbcalls_net]
 PRIVATE_PROTO_HEADER = proto.h
+INIT_FUNCTION = smb_setup_ejs_net
 OBJ_FILES = \
 		net_ctx.o \
 		net_user.o \
 		mpr_user.o
-PUBLIC_DEPENDENCIES = LIBSAMBA-NET LIBCLI_SMB CREDENTIALS
-# End SUBSYSTEM ejsnet
-#######################
+PRIVATE_DEPENDENCIES = LIBSAMBA-NET LIBCLI_SMB CREDENTIALS
diff --git a/source4/scripting/ejs/ejsnet/net_ctx.c b/source4/scripting/ejs/ejsnet/net_ctx.c
index 42c64540fb..f58a59461a 100644
--- a/source4/scripting/ejs/ejsnet/net_ctx.c
+++ b/source4/scripting/ejs/ejsnet/net_ctx.c
@@ -203,7 +203,7 @@ static int ejs_net_samsync_ldb(MprVarHandle eid, int argc, struct MprVar **argv)
 }
 
 
-void ejsnet_setup(void)
+void smb_set_ejs_net(void)
 {
 	ejsDefineCFunction(-1, "NetContext", ejs_net_context, NULL, MPR_VAR_SCRIPT_HANDLE);
 }
diff --git a/source4/scripting/ejs/smbcalls.c b/source4/scripting/ejs/smbcalls.c
index b75024cb4a..40178d3754 100644
--- a/source4/scripting/ejs/smbcalls.c
+++ b/source4/scripting/ejs/smbcalls.c
@@ -230,8 +230,6 @@ void smb_setup_ejs_functions(void (*exception_handler)(const char *))
 	smb_setup_ejs_param();
         smb_setup_ejs_literal();
 	
-	ejsnet_setup();
-
 	shared_init = load_samba_modules(NULL, "smbcalls");
 	
 	run_init_functions(static_init);
-- 
cgit 


From 64f27395a10fbf9ad95921ff0a8481b7afb0d02d Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Mon, 15 Jan 2007 07:46:36 +0000
Subject: r20792: fix the build, sorry...

metze
(This used to be commit e2cdd882b5ab12396244a13e0e58d8ee52f234ab)
---
 source4/scripting/ejs/config.mk        | 4 ++--
 source4/scripting/ejs/ejsnet/config.mk | 5 +++--
 source4/scripting/ejs/ejsnet/net_ctx.c | 2 +-
 source4/scripting/ejs/smbcalls.c       | 2 --
 4 files changed, 6 insertions(+), 7 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/config.mk b/source4/scripting/ejs/config.mk
index 0439d25d89..98dad4596a 100644
--- a/source4/scripting/ejs/config.mk
+++ b/source4/scripting/ejs/config.mk
@@ -76,7 +76,7 @@ OBJ_FILES = \
 		mprutil.o \
 		literal.o
 PUBLIC_DEPENDENCIES = \
-		EJS EJSNET LIBSAMBA-UTIL \
+		EJS LIBSAMBA-UTIL \
 		EJSRPC MESSAGING \
 		LIBSAMBA-NET LIBCLI_SMB LIBPOPT \
 		CREDENTIALS POPT_CREDENTIALS POPT_SAMBA \
@@ -91,6 +91,6 @@ PUBLIC_DEPENDENCIES = \
 INSTALLDIR = BINDIR
 OBJ_FILES = \
 		smbscript.o
-PRIVATE_DEPENDENCIES = EJS EJSNET LIBSAMBA-UTIL smbcalls LIBSAMBA-CONFIG
+PRIVATE_DEPENDENCIES = EJS LIBSAMBA-UTIL smbcalls LIBSAMBA-CONFIG
 # End BINARY SMBSCRIPT
 #######################
diff --git a/source4/scripting/ejs/ejsnet/config.mk b/source4/scripting/ejs/ejsnet/config.mk
index 6e624886d6..ce71ff51df 100644
--- a/source4/scripting/ejs/ejsnet/config.mk
+++ b/source4/scripting/ejs/ejsnet/config.mk
@@ -1,8 +1,9 @@
 [MODULE::smbcalls_net]
-PRIVATE_PROTO_HEADER = proto.h
-INIT_FUNCTION = smb_setup_ejs_net
 OBJ_FILES = \
 		net_ctx.o \
 		net_user.o \
 		mpr_user.o
+SUBSYSTEM = smbcalls
+INIT_FUNCTION = smb_setup_ejs_net
+PRIVATE_PROTO_HEADER = proto.h
 PRIVATE_DEPENDENCIES = LIBSAMBA-NET LIBCLI_SMB CREDENTIALS
diff --git a/source4/scripting/ejs/ejsnet/net_ctx.c b/source4/scripting/ejs/ejsnet/net_ctx.c
index f58a59461a..e837702ff8 100644
--- a/source4/scripting/ejs/ejsnet/net_ctx.c
+++ b/source4/scripting/ejs/ejsnet/net_ctx.c
@@ -203,7 +203,7 @@ static int ejs_net_samsync_ldb(MprVarHandle eid, int argc, struct MprVar **argv)
 }
 
 
-void smb_set_ejs_net(void)
+void smb_setup_ejs_net(void)
 {
 	ejsDefineCFunction(-1, "NetContext", ejs_net_context, NULL, MPR_VAR_SCRIPT_HANDLE);
 }
diff --git a/source4/scripting/ejs/smbcalls.c b/source4/scripting/ejs/smbcalls.c
index 40178d3754..24f48f8b76 100644
--- a/source4/scripting/ejs/smbcalls.c
+++ b/source4/scripting/ejs/smbcalls.c
@@ -22,8 +22,6 @@
 */
 
 #include "includes.h"
-#include "lib/appweb/ejs/ejs.h"
-#include "scripting/ejs/ejsnet/proto.h"
 #include "scripting/ejs/smbcalls.h"
 #include "build.h"
 #include "version.h"
-- 
cgit 


From 03d2647bd002aff10e463ad45e26bce8148e1b49 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Mon, 15 Jan 2007 13:54:21 +0000
Subject: r20805: don't use hardcoded values for secrects.keytab and sam.ldb

metze
(This used to be commit c78e345feaef607b9297372aacb00ec068127785)
---
 source4/scripting/libjs/provision.js | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index d77b2b6c04..e9261888c6 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -382,6 +382,7 @@ function provision_default_paths(subobj)
 	paths.hkpt = "hkpt.ldb";
 	paths.samdb = lp.get("sam database");
 	paths.secrets = "secrets.ldb";
+	paths.keytab = "secrets.keytab";
 	paths.dns = lp.get("private dir") + "/" + subobj.DNSDOMAIN + ".zone";
 	paths.winsdb = "wins.ldb";
 	paths.ldap_basedn_ldif = lp.get("private dir") + "/" + subobj.DNSDOMAIN + ".ldif";
@@ -431,7 +432,7 @@ function setup_name_mappings(info, ldb)
 	return true;
 }
 
-function provision_fix_subobj(subobj, message)
+function provision_fix_subobj(subobj, message, paths)
 {
 	subobj.REALM       = strupper(subobj.REALM);
 	subobj.HOSTNAME    = strlower(subobj.HOSTNAME);
@@ -442,6 +443,10 @@ function provision_fix_subobj(subobj, message)
 	var rdns = split(",", subobj.DOMAINDN);
 	subobj.RDN_DC = substr(rdns[0], strlen("DC="));
 
+	subobj.SAM_LDB		= paths.samdb;
+	subobj.SECRETS_LDB	= paths.secrets;
+	subobj.SECRETS_KEYTAB	= paths.keytab;
+
 	return true;
 }
 
@@ -451,7 +456,7 @@ function provision_become_dc(subobj, message, paths, session_info)
 	var sys = sys_init();
 	var info = new Object();
 
-	var ok = provision_fix_subobj(subobj, message);
+	var ok = provision_fix_subobj(subobj, message, paths);
 	assert(ok);
 
 	info.subobj = subobj;
@@ -491,7 +496,7 @@ function provision(subobj, message, blank, paths, session_info, credentials, lda
 	var sys = sys_init();
 	var info = new Object();
 
-	var ok = provision_fix_subobj(subobj, message);
+	var ok = provision_fix_subobj(subobj, message, paths);
 	assert(ok);
 
 	if (subobj.DOMAINGUID != undefined) {
-- 
cgit 


From 9f802707d8623955c3ef173125e0837f6daa89cd Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Mon, 15 Jan 2007 14:17:26 +0000
Subject: r20806: make it possible to configure the secrets.ldb url via
 "secrets database = my_secrets.ldb"

metze
(This used to be commit a096a9741597105140845f59e54a76060da0010b)
---
 source4/scripting/libjs/provision.js | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index e9261888c6..1dbe08427e 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -381,7 +381,7 @@ function provision_default_paths(subobj)
 	paths.hkpd = "hkpd.ldb";
 	paths.hkpt = "hkpt.ldb";
 	paths.samdb = lp.get("sam database");
-	paths.secrets = "secrets.ldb";
+	paths.secrets = lp.get("secrets database");
 	paths.keytab = "secrets.keytab";
 	paths.dns = lp.get("private dir") + "/" + subobj.DNSDOMAIN + ".zone";
 	paths.winsdb = "wins.ldb";
@@ -484,6 +484,20 @@ function provision_become_dc(subobj, message, paths, session_info)
 	ok = samdb.transaction_commit();
 	assert(ok);
 
+	message("Setting up " + paths.secrets + "\n");
+	setup_ldb("secrets.ldif", info, paths.secrets);
+
+	tmp = lp.get("secrets database");
+	ok = lp.set("secrets database", paths.secrets);
+	assert(ok);
+
+	message("Setting up keytabs\n");
+	var keytab_ok = credentials_update_all_keytabs();
+	assert(keytab_ok);
+
+	ok = lp.set("secrets database", tmp);
+	assert(ok);
+
 	return true;
 }
 
@@ -529,11 +543,14 @@ function provision(subobj, message, blank, paths, session_info, credentials, lda
 		message("Setting up share.ldb\n");
 		setup_ldb("share.ldif", info, paths.shareconf);
 	}
+
 	message("Setting up secrets.ldb\n");
 	setup_ldb("secrets.ldif", info, paths.secrets);
+
 	message("Setting up keytabs\n");
 	var keytab_ok = credentials_update_all_keytabs();
 	assert(keytab_ok);
+
 	message("Setting up hklm.ldb\n");
 	setup_ldb("hklm.ldif", info, paths.hklm);
 
-- 
cgit 


From e6875ca215f6337e7c78ff7bbe82fa448f83c7bb Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Mon, 15 Jan 2007 18:38:43 +0000
Subject: r20813: fix the build with autodependencies

metze
(This used to be commit ad110d22fba621e7d15b457fb1ff5aa29b3fd3b0)
---
 source4/scripting/ejs/ejsnet/net_user.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/ejsnet/net_user.c b/source4/scripting/ejs/ejsnet/net_user.c
index 731b4b9203..e833787876 100644
--- a/source4/scripting/ejs/ejsnet/net_user.c
+++ b/source4/scripting/ejs/ejsnet/net_user.c
@@ -23,7 +23,7 @@
 #include "includes.h"
 #include "lib/appweb/ejs/ejs.h"
 #include "libnet/libnet.h"
-#include "proto.h"
+#include "scripting/ejs/ejsnet/proto.h"
 #include "scripting/ejs/smbcalls.h"
 #include "events/events.h"
 #include "auth/credentials/credentials.h"
-- 
cgit 


From fe5e7809b836e9dff7bb8bffaee852f1e6d4c7de Mon Sep 17 00:00:00 2001
From: Rafal Szczesniak <mimir@samba.org>
Date: Thu, 18 Jan 2007 21:50:24 +0000
Subject: r20881: Sorting out NetUsrCtx methods. Still a couple of things left.

rafal
(This used to be commit eebd00ba2bfdfe3bbbcc0a50b91e2e2b03371df6)
---
 source4/scripting/ejs/ejsnet/net_user.c | 175 ++++++++++++++++++++++++--------
 1 file changed, 133 insertions(+), 42 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/ejsnet/net_user.c b/source4/scripting/ejs/ejsnet/net_user.c
index e833787876..7563ef2e72 100644
--- a/source4/scripting/ejs/ejsnet/net_user.c
+++ b/source4/scripting/ejs/ejsnet/net_user.c
@@ -37,7 +37,7 @@ static int ejs_net_userlist(MprVarHandle eid, int argc, struct MprVar **argv);
 
 /*
   Usage:
-  usrCtx = net.UserMgr(domain);
+  usrCtx = net.UserMgr(domain = <default from credentials>);
 */
 int ejs_net_userman(MprVarHandle eid, int argc, struct MprVar **argv)
 {
@@ -46,68 +46,102 @@ int ejs_net_userman(MprVarHandle eid, int argc, struct MprVar **argv)
 	const char *userman_domain = NULL;
 	struct MprVar *obj = NULL;
 
-	ctx = mprGetThisPtr(eid, "ctx");
-	mem_ctx = talloc_new(mprMemCtx());
-
+	/* fetch the arguments: domain name */
 	if (argc == 0) {
+		/* default domain name is supplied in credentials */
 		userman_domain = cli_credentials_get_domain(ctx->cred);
 
 	} else if (argc == 1 && mprVarIsString(argv[0]->type)) {
+		/* domain name can also be specified explicitly 
+		   (e.g. to connect remote domain) */
 		userman_domain = talloc_strdup(ctx, mprToString(argv[0]));
 
 	} else {
 		ejsSetErrorMsg(eid, "too many arguments");
 		goto done;
 	}
+
+	/* libnet context */
+	ctx = mprGetThisPtr(eid, "ctx");
+	if (ctx == NULL) {
+		ejsSetErrorMsg(eid, "ctx property returns null pointer");
+		goto done;
+	}
 	
-	if (!userman_domain) {
+	mem_ctx = talloc_new(mprMemCtx());
+
+	/* any domain name must be specified anyway */
+	if (userman_domain == NULL) {
 		ejsSetErrorMsg(eid, "a domain must be specified for user management");
 		goto done;
 	}
-
+	
+	/* create 'net user' subcontext */
 	obj = mprInitObject(eid, "NetUsrCtx", argc, argv);
+
+	/* add properties */
 	mprSetPtrChild(obj, "ctx", ctx);
 	mprSetPtrChild(obj, "domain", userman_domain);
 
+	/* add methods */
 	mprSetStringCFunction(obj, "Create", ejs_net_createuser);
 	mprSetStringCFunction(obj, "Delete", ejs_net_deleteuser);
 	mprSetStringCFunction(obj, "Info", ejs_net_userinfo);
 	mprSetCFunction(obj, "List", ejs_net_userlist);
 
-	return 0;
 done:
 	talloc_free(mem_ctx);
-	return -1;
+	return 0;
 }
 
 
+/*
+  Usage:
+  NTSTATUS = NetUsrCtx.Create(Username)
+*/
 static int ejs_net_createuser(MprVarHandle eid, int argc, char **argv)
 {
 	NTSTATUS status = NT_STATUS_UNSUCCESSFUL;
 	TALLOC_CTX *mem_ctx;
 	struct libnet_context *ctx;
 	const char *userman_domain = NULL;
+	const char *username = NULL;
 	struct libnet_CreateUser req;
 
-	if (argc != 1) {
-		ejsSetErrorMsg(eid, "argument 1 must be a string");
-		return -1;
+	mem_ctx = talloc_new(mprMemCtx());
+	if (mem_ctx == NULL) {
+		ejsSetErrorMsg(eid, "could not create memory context - out of memory");
+		goto done;
 	}
 
+	/* fetch the arguments: username */
+	if (argc == 0) {
+		ejsSetErrorMsg(eid, "too little arguments");
+		goto done;
+
+	} else if (argc == 1) {
+		username = argv[0];
+
+	} else {
+		ejsSetErrorMsg(eid, "too many arguments");
+		goto done;
+	}
+	
+	/* libnet context */
 	ctx = mprGetThisPtr(eid, "ctx");
-	if (!ctx) {
+	if (ctx == NULL) {
 		ejsSetErrorMsg(eid, "ctx property returns null pointer");
-		return -1;
+		goto done;
 	}
 
+	/* domain where the account is to be created */
 	userman_domain = mprGetThisPtr(eid, "domain");
-	if (!userman_domain) {
+	if (userman_domain == NULL) {
 		ejsSetErrorMsg(eid, "domain property returns null pointer");
-		return -1;
+		goto done;
 	}
 	
-	mem_ctx = talloc_new(mprMemCtx());
-
+	/* call the libnet function */
     	req.in.domain_name = userman_domain;
 	req.in.user_name   = argv[0];
 
@@ -116,83 +150,125 @@ static int ejs_net_createuser(MprVarHandle eid, int argc, char **argv)
 		ejsSetErrorMsg(eid, "%s", req.out.error_string);
 	}
 
+done:
 	talloc_free(mem_ctx);
 	mpr_Return(eid, mprNTSTATUS(status));
 	return 0;
 }
 
 
+/*
+  Usage:
+  NTSTATUS = NetUsrCtx.Delete(Username)
+*/
 static int ejs_net_deleteuser(MprVarHandle eid, int argc, char **argv)
 {
 	NTSTATUS status = NT_STATUS_UNSUCCESSFUL;
 	TALLOC_CTX *mem_ctx;
 	struct libnet_context *ctx;
 	const char *userman_domain = NULL;
+	const char *username = NULL;
 	struct libnet_DeleteUser req;
 
-	if (argc != 1) {
-		ejsSetErrorMsg(eid, "argument 1 must be a string");
-		return -1;
+	mem_ctx = talloc_new(mprMemCtx());
+	if (mem_ctx == NULL) {
+		ejsSetErrorMsg(eid, "could not create memory context - out of memory");
+		goto done;
 	}
 
+	/* fetch the arguments: username */
+	if (argc == 0) {
+		ejsSetErrorMsg(eid, "too little arguments");
+		goto done;
+
+	} else if (argc == 1) {
+		username = argv[0];
+
+	} else {
+		ejsSetErrorMsg(eid, "too many arguments");
+		goto done;
+	}
+
+	/* libnet context */
 	ctx = mprGetThisPtr(eid, "ctx");
-	if (!ctx) {
+	if (ctx == NULL) {
 		ejsSetErrorMsg(eid, "ctx property returns null pointer");
-		return -1;
+		goto done;
 	}
-
+	
+	/* domain where the account is to be deleted */
 	userman_domain = mprGetThisPtr(eid, "domain");
 	if (!userman_domain) {
 		ejsSetErrorMsg(eid, "domain property returns null pointer");
-		return -1;
+		goto done;
 	}
 	
-	mem_ctx = talloc_new(mprMemCtx());
-
+	/* call the libnet function */
     	req.in.domain_name = userman_domain;
-	req.in.user_name   = argv[0];
+	req.in.user_name   = username;
 
 	status = libnet_DeleteUser(ctx, mem_ctx, &req);
 	if (!NT_STATUS_IS_OK(status)) {
 		ejsSetErrorMsg(eid, "%s", req.out.error_string);
 	}
 
+done:
 	talloc_free(mem_ctx);
 	mpr_Return(eid, mprNTSTATUS(status));
 	return 0;
 }
 
 
+/*
+  Usage:
+  UserInfo = NetUsrCtx.Info(Username)
+*/
 static int ejs_net_userinfo(MprVarHandle eid, int argc, char **argv)
 {
 	NTSTATUS status = NT_STATUS_UNSUCCESSFUL;
 	TALLOC_CTX *mem_ctx;
 	struct libnet_context *ctx;
-	const char *userman_domain;
+	const char *userman_domain = NULL;
+	const char *username = NULL;
 	struct libnet_UserInfo req;
 	struct MprVar mprUserInfo;
 
-	if (argc != 1) {
-		ejsSetErrorMsg(eid, "argument 1 must be a string");
-		return -1;
+	mem_ctx = talloc_new(mprMemCtx());
+	if (mem_ctx == NULL) {
+		ejsSetErrorMsg(eid, "could not create memory context - out of memory");
+		goto done;
 	}
+	
+	/* fetch the arguments: username */
+	if (argc == 0) {
+		ejsSetErrorMsg(eid, "too little arguments");
+		goto done;
 
+	} else if (argc == 1) {
+		username = argv[0];
+
+	} else {
+		ejsSetErrorMsg(eid, "too many arguments");
+		goto done;
+	}
+
+	/* libnet context */
 	ctx = mprGetThisPtr(eid, "ctx");
 	if (ctx == NULL) {
 		ejsSetErrorMsg(eid, "ctx property returns null pointer");
-		return -1;
+		goto done;
 	}
-
+	
+	/* domain where the user account is to be queried */
 	userman_domain = mprGetThisPtr(eid, "domain");
 	if (userman_domain == NULL) {
 		ejsSetErrorMsg(eid, "domain property returns null pointer");
 		return -1;
 	}
 
-	mem_ctx = talloc_new(mprMemCtx());
-	
+	/* call the libnet function */
 	req.in.domain_name = userman_domain;
-	req.in.user_name   = argv[0];
+	req.in.user_name   = username;
 	
 	status = libnet_UserInfo(ctx, mem_ctx, &req);
 	if (!NT_STATUS_IS_OK(status)) {
@@ -213,19 +289,30 @@ done:
 }
 
 
+/*
+  Usage:
+  UserListCtx = NetUsrCtx.List(UserListCtx)
+*/
 static int ejs_net_userlist(MprVarHandle eid, int argc, struct MprVar **argv)
 {
 	TALLOC_CTX *mem_ctx;
 	NTSTATUS status;
 	struct libnet_context *ctx;
 	const char *userlist_domain;
+	int page_size = 10;         /* TODO: this should be specified in a nicer way */
 	struct libnet_UserList req;
 	struct MprVar mprListCtx, *mprInListCtx;
 	
 	mem_ctx = talloc_new(mprMemCtx());
+	if (mem_ctx == NULL) {
+		ejsSetErrorMsg(eid, "could not create memory context - out of memory");
+		goto done;
+	}
 	
+	/* fetch the arguments */
 	if (argc == 0) {
 		ejsSetErrorMsg(eid, "too little arguments");
+		goto done;
 
 	} else if (argc == 1) {
 		if (mprVarIsObject(argv[0]->type)) {
@@ -234,6 +321,7 @@ static int ejs_net_userlist(MprVarHandle eid, int argc, struct MprVar **argv)
 			req.in.resume_index = mprListGetResumeIndex(mprInListCtx);
 
 		} else {
+			/* this is a first call */
 			req.in.resume_index = 0;
 		}
 
@@ -242,20 +330,23 @@ static int ejs_net_userlist(MprVarHandle eid, int argc, struct MprVar **argv)
 		goto done;
 	}
 
+	/* libnet context */
 	ctx = mprGetThisPtr(eid, "ctx");
-	if (!ctx) {
+	if (ctx == NULL) {
 		ejsSetErrorMsg(eid, "ctx property returns null pointer");
-		return -1;
+		goto done;
 	}
-
+	
+	/* domain where user accounts are to be enumerated */
 	userlist_domain = mprGetThisPtr(eid, "domain");
-	if (!userlist_domain) {
+	if (userlist_domain == NULL) {
 		ejsSetErrorMsg(eid, "domain property returns null pointer");
-		return -1;
+		goto done;
 	}
 
+	/* call the libnet function */
 	req.in.domain_name   = userlist_domain;
-	req.in.page_size     = 10;  /* TODO: this should be specified in a nicer way */
+	req.in.page_size     = page_size;
 	
 	status = libnet_UserList(ctx, mem_ctx, &req);
 	if (!NT_STATUS_IS_OK(status) &&
-- 
cgit 


From 875d8b4109ddc2c6b5d0ba33a3874e73b249ec91 Mon Sep 17 00:00:00 2001
From: Rafal Szczesniak <mimir@samba.org>
Date: Thu, 18 Jan 2007 21:50:46 +0000
Subject: r20882: Formatting.

rafal
(This used to be commit fd0650283b750aec7952b025db54ab46020a547d)
---
 source4/scripting/ejs/ejsnet/net_ctx.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/ejsnet/net_ctx.c b/source4/scripting/ejs/ejsnet/net_ctx.c
index e837702ff8..25239512d0 100644
--- a/source4/scripting/ejs/ejsnet/net_ctx.c
+++ b/source4/scripting/ejs/ejsnet/net_ctx.c
@@ -51,6 +51,7 @@ static int ejs_net_context(MprVarHandle eid, int argc, struct MprVar **argv)
 		return -1;
 	}
 	ev = event_context_find(event_mem_ctx);
+
 	ctx = libnet_context_init(ev);
 	/* IF we generated a new event context, it will be under here,
 	 * and we need it to last as long as the libnet context, so
-- 
cgit 


From c1aac87d34a9596e449a4baa661b44009552b5b4 Mon Sep 17 00:00:00 2001
From: Rafal Szczesniak <mimir@samba.org>
Date: Thu, 18 Jan 2007 23:21:59 +0000
Subject: r20885: - I forgot the page size passed to enumeration function is
 actually   size of a buffer for result returned, not number of entries - pass
 libnet function returned status to UserListCtx creation   to properly mark
 the last chunk of the list

rafal
(This used to be commit 05d307546f93794a0a981c3aa942669b9b18afd1)
---
 source4/scripting/ejs/ejsnet/mpr_user.c | 10 ++++++++--
 source4/scripting/ejs/ejsnet/net_user.c |  4 ++--
 2 files changed, 10 insertions(+), 4 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/ejsnet/mpr_user.c b/source4/scripting/ejs/ejsnet/mpr_user.c
index 9a49262dc6..efeb68ffc1 100644
--- a/source4/scripting/ejs/ejsnet/mpr_user.c
+++ b/source4/scripting/ejs/ejsnet/mpr_user.c
@@ -100,11 +100,13 @@ done:
   UserListCtx.Users[]
   UserListCtx.ResumeIndex
   UserListCtx.Count
+  UserListCtx.EndOfList
  */
-struct MprVar mprUserListCtx(TALLOC_CTX *mem_ctx, struct libnet_UserList *list)
+struct MprVar mprUserListCtx(TALLOC_CTX *mem_ctx, struct libnet_UserList *list, NTSTATUS result)
 {
 	const char *name = "UserListCtx";
 	NTSTATUS status;
+	bool endOfList;
 	struct MprVar mprListCtx, mprUserList;
 	struct MprVar mprUser, mprSid, mprUsername;
 	int i;
@@ -114,6 +116,9 @@ struct MprVar mprUserListCtx(TALLOC_CTX *mem_ctx, struct libnet_UserList *list)
 		goto done;
 	}
 
+	endOfList = (NT_STATUS_EQUAL(result, NT_STATUS_NO_MORE_ENTRIES) ||
+		     NT_STATUS_IS_OK(result));
+
 	mprUserList = mprArray("Users");
 	for (i = 0; i < list->out.count; i++) {
 		struct userlist u = list->out.users[i];
@@ -128,7 +133,7 @@ struct MprVar mprUserListCtx(TALLOC_CTX *mem_ctx, struct libnet_UserList *list)
 		mprSetVar(&mprUser, "SID", mprSid);
 		
 		/* add the object to the array being constructed */
-		mprAddArray(&mprUserList, 0, mprUser);
+		mprAddArray(&mprUserList, i, mprUser);
 	}
 
 	mprListCtx = mprObject(name);
@@ -138,6 +143,7 @@ struct MprVar mprUserListCtx(TALLOC_CTX *mem_ctx, struct libnet_UserList *list)
 	if (!NT_STATUS_IS_OK(status)) goto done;
 	status = mprSetVar(&mprListCtx, "ResumeIndex", mprCreateIntegerVar((int)list->out.resume_index));
 	if (!NT_STATUS_IS_OK(status)) goto done;
+	status = mprSetVar(&mprListCtx, "EndOfList", mprCreateBoolVar(endOfList));
 
 done:
 	return mprListCtx;
diff --git a/source4/scripting/ejs/ejsnet/net_user.c b/source4/scripting/ejs/ejsnet/net_user.c
index 7563ef2e72..a13e84c147 100644
--- a/source4/scripting/ejs/ejsnet/net_user.c
+++ b/source4/scripting/ejs/ejsnet/net_user.c
@@ -299,7 +299,7 @@ static int ejs_net_userlist(MprVarHandle eid, int argc, struct MprVar **argv)
 	NTSTATUS status;
 	struct libnet_context *ctx;
 	const char *userlist_domain;
-	int page_size = 10;         /* TODO: this should be specified in a nicer way */
+	int page_size = 512;         /* TODO: this should be specified in a nicer way */
 	struct libnet_UserList req;
 	struct MprVar mprListCtx, *mprInListCtx;
 	
@@ -359,7 +359,7 @@ static int ejs_net_userlist(MprVarHandle eid, int argc, struct MprVar **argv)
 		goto done;
 	}
 
-	mprListCtx = mprUserListCtx(mem_ctx, &req);
+	mprListCtx = mprUserListCtx(mem_ctx, &req, status);
 
 done:
 	talloc_free(mem_ctx);
-- 
cgit 


From cde247b7d052af6296cbb425e44eca90653fddae Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Fri, 19 Jan 2007 15:37:20 +0000
Subject: r20908: - fix uninitialized usage of 'ctx' - remove unused mem_ctx
 variable - copy the userman_domain string as child of obj

metze
(This used to be commit 575938753bb2f3b8593f240234cff71995a28df8)
---
 source4/scripting/ejs/ejsnet/net_user.c | 30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/ejsnet/net_user.c b/source4/scripting/ejs/ejsnet/net_user.c
index a13e84c147..24fc46f842 100644
--- a/source4/scripting/ejs/ejsnet/net_user.c
+++ b/source4/scripting/ejs/ejsnet/net_user.c
@@ -41,11 +41,17 @@ static int ejs_net_userlist(MprVarHandle eid, int argc, struct MprVar **argv);
 */
 int ejs_net_userman(MprVarHandle eid, int argc, struct MprVar **argv)
 {
-	TALLOC_CTX *mem_ctx;
 	struct libnet_context *ctx;
 	const char *userman_domain = NULL;
 	struct MprVar *obj = NULL;
 
+	/* libnet context */
+	ctx = mprGetThisPtr(eid, "ctx");
+	if (ctx == NULL) {
+		ejsSetErrorMsg(eid, "ctx property returns null pointer");
+		return 0;
+	}
+
 	/* fetch the arguments: domain name */
 	if (argc == 0) {
 		/* default domain name is supplied in credentials */
@@ -54,31 +60,25 @@ int ejs_net_userman(MprVarHandle eid, int argc, struct MprVar **argv)
 	} else if (argc == 1 && mprVarIsString(argv[0]->type)) {
 		/* domain name can also be specified explicitly 
 		   (e.g. to connect remote domain) */
-		userman_domain = talloc_strdup(ctx, mprToString(argv[0]));
+		userman_domain = mprToString(argv[0]);
 
 	} else {
 		ejsSetErrorMsg(eid, "too many arguments");
-		goto done;
+		return 0;
 	}
 
-	/* libnet context */
-	ctx = mprGetThisPtr(eid, "ctx");
-	if (ctx == NULL) {
-		ejsSetErrorMsg(eid, "ctx property returns null pointer");
-		goto done;
-	}
-	
-	mem_ctx = talloc_new(mprMemCtx());
-
 	/* any domain name must be specified anyway */
 	if (userman_domain == NULL) {
 		ejsSetErrorMsg(eid, "a domain must be specified for user management");
-		goto done;
+		return 0;
 	}
-	
+
 	/* create 'net user' subcontext */
 	obj = mprInitObject(eid, "NetUsrCtx", argc, argv);
 
+	/* we need to make a copy of the string for this object */
+	userman_domain = talloc_strdup(obj, userman_domain);
+
 	/* add properties */
 	mprSetPtrChild(obj, "ctx", ctx);
 	mprSetPtrChild(obj, "domain", userman_domain);
@@ -89,8 +89,6 @@ int ejs_net_userman(MprVarHandle eid, int argc, struct MprVar **argv)
 	mprSetStringCFunction(obj, "Info", ejs_net_userinfo);
 	mprSetCFunction(obj, "List", ejs_net_userlist);
 
-done:
-	talloc_free(mem_ctx);
 	return 0;
 }
 
-- 
cgit 


From 15446aadafbea9cf9d42ee64f45dd5de8d3d0e1b Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Fri, 19 Jan 2007 17:06:59 +0000
Subject: r20910: fix crash bug

metze
(This used to be commit e668d3bd6955f0bd4e37560925c4107fd870c02f)
---
 source4/scripting/ejs/ejsnet/net_user.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/ejsnet/net_user.c b/source4/scripting/ejs/ejsnet/net_user.c
index 24fc46f842..9a4f9473f6 100644
--- a/source4/scripting/ejs/ejsnet/net_user.c
+++ b/source4/scripting/ejs/ejsnet/net_user.c
@@ -77,7 +77,7 @@ int ejs_net_userman(MprVarHandle eid, int argc, struct MprVar **argv)
 	obj = mprInitObject(eid, "NetUsrCtx", argc, argv);
 
 	/* we need to make a copy of the string for this object */
-	userman_domain = talloc_strdup(obj, userman_domain);
+	userman_domain = talloc_strdup(ctx, userman_domain);
 
 	/* add properties */
 	mprSetPtrChild(obj, "ctx", ctx);
-- 
cgit 


From 5d8700c53c0aa8d1b7c6a7b209b4d740b1036583 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Sat, 20 Jan 2007 10:27:22 +0000
Subject: r20922: use the show_deleted module by default

metze
(This used to be commit edc37501d6ecdaf7b13006b732914e21ae0be657)
---
 source4/scripting/libjs/provision.js | 1 +
 1 file changed, 1 insertion(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index 1dbe08427e..d3fa216383 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -798,6 +798,7 @@ function provision_guess()
 					"operational",
 					"objectclass",
 					"rdn_name",
+					"show_deleted",
 					"partition");
 	subobj.MODULES_LIST = join(",", modules_list);
 	subobj.DOMAINDN_MOD = "objectguid";
-- 
cgit 


From 91ee0709b2a41268bc5d148130e2d3d2a1813b6e Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Mon, 22 Jan 2007 18:15:54 +0000
Subject: r20953: add templates in provision_become_dc()

metze
(This used to be commit 306ea74f85c8cd0df767a25c45304cb33410e03c)
---
 source4/scripting/libjs/provision.js | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index d3fa216383..3e409c0dfb 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -481,6 +481,9 @@ function provision_become_dc(subobj, message, paths, session_info)
 	message("Setting up " + paths.samdb + " indexes\n");
 	setup_add_ldif("provision_index.ldif", info, samdb, false);
 
+	message("Setting up " + paths.samdb + " templates\n");
+	setup_add_ldif("provision_templates.ldif", info, samdb, false);
+
 	ok = samdb.transaction_commit();
 	assert(ok);
 
-- 
cgit 


From 744dddd75be73e4e883241b808b37a12a7a39ac1 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Sun, 4 Feb 2007 07:17:03 +0000
Subject: r21135: Instead of having hooks to update keytabs as an explicit
 thing, update them as a hook on ldb modify, via a module.

This should allow the secrets.ldb to be edited by the admin, and to
have things update in the on-disk keytab just as an in-memory keytab
would.

This isn't really a dsdb plugin, but I don't have any other good ideas
about where to put it.

Andrew Bartlett
(This used to be commit 6ce557a1aff4754d2622be8f1c6695d9ee788d54)
---
 source4/scripting/ejs/smbcalls_creds.c | 12 ------------
 source4/scripting/libjs/provision.js   | 17 ++++++-----------
 2 files changed, 6 insertions(+), 23 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_creds.c b/source4/scripting/ejs/smbcalls_creds.c
index c6ad64933b..6e2c87a9b3 100644
--- a/source4/scripting/ejs/smbcalls_creds.c
+++ b/source4/scripting/ejs/smbcalls_creds.c
@@ -266,23 +266,11 @@ int ejs_credentials_cmdline(int eid, int argc, struct MprVar **argv)
 	return ejs_credentials_obj(obj, cmdline_credentials);
 }
 
-static int ejs_credentials_update_all_keytabs(MprVarHandle eid, int argc, struct MprVar **argv)
-{
-	if (!NT_STATUS_IS_OK(cli_credentials_update_all_keytabs(mprMemCtx()))) {
-		mpr_Return(eid, mprCreateBoolVar(False));
-	} else {
-		mpr_Return(eid, mprCreateBoolVar(True));
-	}
-	return 0;
-}
-
-
 /*
   setup C functions that be called from ejs
 */
 void smb_setup_ejs_credentials(void)
 {
 	ejsDefineCFunction(-1, "credentials_init", ejs_credentials_init, NULL, MPR_VAR_SCRIPT_HANDLE);
-	ejsDefineCFunction(-1, "credentials_update_all_keytabs", ejs_credentials_update_all_keytabs, NULL, MPR_VAR_SCRIPT_HANDLE);
 }
 
diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index 3e409c0dfb..23f26a6b86 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -488,16 +488,14 @@ function provision_become_dc(subobj, message, paths, session_info)
 	assert(ok);
 
 	message("Setting up " + paths.secrets + "\n");
-	setup_ldb("secrets.ldif", info, paths.secrets);
+	setup_ldb("secrets_init.ldif", info, paths.secrets);
+
+	setup_ldb("secrets.ldif", info, paths.secrets, false);
 
 	tmp = lp.get("secrets database");
 	ok = lp.set("secrets database", paths.secrets);
 	assert(ok);
 
-	message("Setting up keytabs\n");
-	var keytab_ok = credentials_update_all_keytabs();
-	assert(keytab_ok);
-
 	ok = lp.set("secrets database", tmp);
 	assert(ok);
 
@@ -547,12 +545,9 @@ function provision(subobj, message, blank, paths, session_info, credentials, lda
 		setup_ldb("share.ldif", info, paths.shareconf);
 	}
 
-	message("Setting up secrets.ldb\n");
-	setup_ldb("secrets.ldif", info, paths.secrets);
-
-	message("Setting up keytabs\n");
-	var keytab_ok = credentials_update_all_keytabs();
-	assert(keytab_ok);
+	message("Setting up " + paths.secrets + "\n");
+	setup_ldb("secrets_init.ldif", info, paths.secrets);
+	setup_ldb("secrets.ldif", info, paths.secrets, false);
 
 	message("Setting up hklm.ldb\n");
 	setup_ldb("hklm.ldif", info, paths.hklm);
-- 
cgit 


From 9e4a5cbe292865fe3067eb7e20a0875e5ff8d207 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Mon, 12 Feb 2007 11:16:06 +0000
Subject: r21294: this is useless, now that there's no operation in between...

metze
(This used to be commit 838d307e6ca0740bc330a5ebc46b95f3181a5c14)
---
 source4/scripting/libjs/provision.js | 7 -------
 1 file changed, 7 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index 23f26a6b86..9f24b5e48b 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -492,13 +492,6 @@ function provision_become_dc(subobj, message, paths, session_info)
 
 	setup_ldb("secrets.ldif", info, paths.secrets, false);
 
-	tmp = lp.get("secrets database");
-	ok = lp.set("secrets database", paths.secrets);
-	assert(ok);
-
-	ok = lp.set("secrets database", tmp);
-	assert(ok);
-
 	return true;
 }
 
-- 
cgit 


From 7ca399c0755e186508a4ed9796cbbbe6f50181e9 Mon Sep 17 00:00:00 2001
From: Simo Sorce <idra@samba.org>
Date: Wed, 14 Feb 2007 21:55:29 +0000
Subject: r21351: Change ldb ejs bindings return codes. We were returning just
 true/false and discarding error number and string.

This checking probably breaks swat, will fix it in next round as swat
is what made me look into this as I had no way to get back error messages
to show to the users.

Simo.
(This used to be commit 35886b4ae68be475b0fc8b2689ca04d766661261)
---
 source4/scripting/ejs/mprutil.c      |  31 +++++++---
 source4/scripting/ejs/smbcalls.h     |   1 +
 source4/scripting/ejs/smbcalls_ldb.c |  10 ++--
 source4/scripting/libjs/provision.js | 113 ++++++++++++++++++-----------------
 4 files changed, 87 insertions(+), 68 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/mprutil.c b/source4/scripting/ejs/mprutil.c
index cfed69dbe0..459f198dca 100644
--- a/source4/scripting/ejs/mprutil.c
+++ b/source4/scripting/ejs/mprutil.c
@@ -223,19 +223,32 @@ failed:
 
 
 /*
-  turn an array of ldb_messages into a ejs object variable
+  build a MprVar result object for ldb operations with lots of funky properties
 */
-struct MprVar mprLdbArray(struct ldb_context *ldb, 
-			  struct ldb_message **msg, int count, const char *name)
+struct MprVar mprLdbResult(struct ldb_context *ldb, int err, struct ldb_result *result)
 {
-	struct MprVar res;
-	int i;
+	struct MprVar ret;
+	struct MprVar ary;
+
+	ret = mprObject("ldbret");
+
+	mprSetVar(&ret, "error", mprCreateIntegerVar(err));
+	mprSetVar(&ret, "errstr", mprString(ldb_errstring(ldb)));
+
+	ary = mprArray("ldb_message");
+	if (result) {
+		int i;
 
-	res = mprArray(name);
-	for (i=0;i<count;i++) {
-		mprAddArray(&res, i, mprLdbMessage(ldb, msg[i]));
+		for (i = 0; i < result->count; i++) {
+			mprAddArray(&ary, i, mprLdbMessage(ldb, result->msgs[i]));
+		}
 	}
-	return res;
+
+	mprSetVar(&ret, "msgs", ary);
+
+	/* TODO: add referrals, exteded ops, and controls */
+
+	return ret;
 }
 
 
diff --git a/source4/scripting/ejs/smbcalls.h b/source4/scripting/ejs/smbcalls.h
index 9fa9100276..a525403493 100644
--- a/source4/scripting/ejs/smbcalls.h
+++ b/source4/scripting/ejs/smbcalls.h
@@ -21,6 +21,7 @@
 */
 
 #include "lib/appweb/ejs/ejs.h"
+#include "lib/ldb/include/ldb.h"
 
 void mpr_Return(int eid, struct MprVar);
 NTSTATUS mprSetVar(struct MprVar *v, const char *name, struct MprVar val);
diff --git a/source4/scripting/ejs/smbcalls_ldb.c b/source4/scripting/ejs/smbcalls_ldb.c
index 3c368bba4f..fc44862985 100644
--- a/source4/scripting/ejs/smbcalls_ldb.c
+++ b/source4/scripting/ejs/smbcalls_ldb.c
@@ -108,9 +108,9 @@ static int ejs_ldbSearch(MprVarHandle eid, int argc, struct MprVar **argv)
 	ret = ldb_search(ldb, basedn, scope, expression, attrs, &res);
 	if (ret != LDB_SUCCESS) {
 		ejsSetErrorMsg(eid, "ldb.search failed - %s", ldb_errstring(ldb));
-		mpr_Return(eid, mprCreateUndefinedVar());
+		mpr_Return(eid, mprLdbResult(ldb, ret, NULL));
 	} else {
-		mpr_Return(eid, mprLdbArray(ldb, res->msgs, res->count, "ldb_message"));
+		mpr_Return(eid, mprLdbResult(ldb, ret, res));
 		talloc_free(res);
 	}
 	talloc_free(tmp_ctx);
@@ -161,7 +161,7 @@ static int ejs_ldbAddModify(MprVarHandle eid, int argc, struct MprVar **argv,
 		return -1;
 	}
 
-	mpr_Return(eid, mprCreateBoolVar(ret == 0));
+	mpr_Return(eid, mprLdbResult(ldb, ret, NULL));
 	return 0;
 }
 
@@ -197,7 +197,7 @@ static int ejs_ldbDelete(MprVarHandle eid, int argc, struct MprVar **argv)
 
 	talloc_free(dn);
 
-	mpr_Return(eid, mprCreateBoolVar(ret == 0));
+	mpr_Return(eid, mprLdbResult(ldb, ret, NULL));
 	return 0;
 }
 
@@ -234,7 +234,7 @@ static int ejs_ldbRename(MprVarHandle eid, int argc, struct MprVar **argv)
 	talloc_free(dn1);
 	talloc_free(dn2);
 
-	mpr_Return(eid, mprCreateBoolVar(ret == 0));
+	mpr_Return(eid, mprLdbResult(ldb, ret, NULL));
 	return 0;
 }
 
diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index 9f24b5e48b..b50e9b5bcf 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -23,7 +23,7 @@ function install_ok(session_info, credentials)
 		return false;
 	}
 	var res = ldb.search("(cn=Administrator)");
-	if (res.length != 1) {
+	if (res.error != 0 || res.msgs.length != 1) {
 		return false;
 	}
 	return true;
@@ -72,7 +72,7 @@ function setup_name_mapping(info, ldb, sid, unixname)
 	var attrs = new Array("dn");
 	var res = ldb.search(sprintf("objectSid=%s", sid), 
 			     info.subobj.DOMAINDN, ldb.SCOPE_SUBTREE, attrs);
-	if (res.length != 1) {
+	if (res.error != 0 || res.msgs.length != 1) {
 		info.message("Failed to find record for objectSid %s\n", sid);
 		return false;
 	}
@@ -82,9 +82,9 @@ changetype: modify
 replace: unixName
 unixName: %s
 ",
-			  res[0].dn, unixname);
+			  res.msgs[0].dn, unixname);
 	var ok = ldb.modify(mod);
-	if (!ok) {
+	if (ok.error != 0) {
 		info.message("name mapping for %s failed - %s\n",
 			     sid, ldb.errstring());
 		return false;
@@ -172,20 +172,20 @@ function ldb_erase(ldb)
      	var basedn = "";
      	var res = ldb.search("(&(|(objectclass=*)(dn=*))(!(dn=@BASEINFO)))", basedn, ldb.SCOPE_SUBTREE, attrs);
 	var i;
-	if (typeof(res) == "undefined") {
+	if (res.error != 0) {
 		ldb_delete(ldb);
 		return;
 	}
-	for (i=0;i<res.length;i++) {
+	for (i=0;i<res.msgs.length;i++) {
 		ldb.del(res[i].dn);
 	}
 
      	var res = ldb.search("(&(|(objectclass=*)(dn=*))(!(dn=@BASEINFO)))", basedn, ldb.SCOPE_SUBTREE, attrs);
-	if (res.length != 0) {
+	if (res.error != 0 || res.msgs.length != 0) {
 		ldb_delete(ldb);
 		return;
 	}
-	assert(res.length == 0);
+	assert(res.msgs.length == 0);
 }
 
 /*
@@ -198,15 +198,15 @@ function ldb_erase_partitions(info, ldb, ldapbackend)
 	var j;
 
 	var res = ldb.search("(objectClass=*)", "", ldb.SCOPE_BASE, rootDSE_attrs);
-	assert(typeof(res) != "undefined");
-	assert(res.length == 1);
-	if (typeof(res[0].namingContexts) == "undefined") {
+	assert(res.error == 0);
+	assert(res.msgs.length == 1);
+	if (typeof(res.msgs[0].namingContexts) == "undefined") {
 		return;
 	}	
-	for (j=0; j<res[0].namingContexts.length; j++) {
+	for (j=0; j<res.msgs[0].namingContexts.length; j++) {
 		var anything = "(|(objectclass=*)(dn=*))";
 		var attrs = new Array("dn");
-		var basedn = res[0].namingContexts[j];
+		var basedn = res.msgs[0].namingContexts[j];
 		var k;
 		var previous_remaining = 1;
 		var current_remaining = 0;
@@ -220,23 +220,23 @@ function ldb_erase_partitions(info, ldb, ldapbackend)
 			/* and the rest */
 			var res2 = ldb.search(anything, basedn, ldb.SCOPE_SUBTREE, attrs);
 			var i;
-			if (typeof(res2) == "undefined") {
-				info.message("ldb search failed: " + ldb.errstring() + "\n");
+			if (res2.error != 0) {
+				info.message("ldb search failed: " + res.errstr + "\n");
 				continue;
 			}
 			previous_remaining = current_remaining;
-			current_remaining = res2.length;
-			for (i=0;i<res2.length;i++) {
-				ldb.del(res2[i].dn);
+			current_remaining = res2.msgs.length;
+			for (i=0;i<res2.msgs.length;i++) {
+				ldb.del(res2.msgs[i].dn);
 			}
 			
 			var res3 = ldb.search(anything, basedn, ldb.SCOPE_SUBTREE, attrs);
-			if (typeof(res3) == "undefined") {
-				info.message("ldb search failed: " + ldb.errstring() + "\n");
+			if (res3.error != 0) {
+				info.message("ldb search failed: " + res.errstr + "\n");
 				continue;
 			}
-			if (res3.length != 0) {
-				info.message("Failed to delete all records under " + basedn + ", " + res3.length + " records remaining\n");
+			if (res3.msgs.length != 0) {
+				info.message("Failed to delete all records under " + basedn + ", " + res3.msgs.length + " records remaining\n");
 			}
 		}
 	}
@@ -277,14 +277,14 @@ function setup_add_ldif(ldif, info, ldb, failok)
 	var data = sys.file_load(src);
 	data = substitute_var(data, info.subobj);
 
-	var add_ok = ldb.add(data);
-	if (!add_ok) {
-		info.message("ldb load failed: " + ldb.errstring() + "\n");
+	var add_res = ldb.add(data);
+	if (add_res.error != 0) {
+		info.message("ldb load failed: " + add_res.errstr + "\n");
 		if (!failok) {
-			assert(add_ok);
+			assert(add_res.error == 0);
 	        }
 	}
-	return add_ok;
+	return (add_res.error == 0);
 }
 
 function setup_modify_ldif(ldif, info, ldb, failok)
@@ -295,14 +295,14 @@ function setup_modify_ldif(ldif, info, ldb, failok)
 	var data = sys.file_load(src);
 	data = substitute_var(data, info.subobj);
 
-	var mod_ok = ldb.modify(data);
-	if (!mod_ok) {
-		info.message("ldb load failed: " + ldb.errstring() + "\n");
+	var mod_res = ldb.modify(data);
+	if (mod_res.error != 0) {
+		info.message("ldb load failed: " + mod_res.errstr + "\n");
 		if (!failok) {
-			assert(mod_ok);
+			assert(mod_res.error == 0);
 	        }
 	}
-	return mod_ok;
+	return (mod_res.error == 0);
 }
 
 
@@ -339,12 +339,12 @@ function setup_ldb_modify(ldif, info, ldb)
 	var data = sys.file_load(src);
 	data = substitute_var(data, info.subobj);
 
-	var mod_ok = ldb.modify(data);
-	if (!mod_ok) {
-		info.message("ldb load failed: " + ldb.errstring() + "\n");
-		return mod_ok;
+	var mod_res = ldb.modify(data);
+	if (mod_res.error != 0) {
+		info.message("ldb load failed: " + mod_res.errstr + "\n");
+		return (mod_res.error == 0);
 	}
-	return mod_ok;
+	return (mod_res.error == 0);
 }
 
 /*
@@ -400,8 +400,9 @@ function setup_name_mappings(info, ldb)
 	var subobj = info.subobj;
 
 	res = ldb.search("objectSid=*", subobj.DOMAINDN, ldb.SCOPE_BASE, attrs);
-	assert(res.length == 1 && res[0].objectSid != undefined);
-	var sid = res[0].objectSid;
+	assert(res.error == 0);
+	assert(res.msgs.length == 1 && res.msgs[0].objectSid != undefined);
+	var sid = res.msgs[0].objectSid;
 
 	/* add some foreign sids if they are not present already */
 	add_foreign(ldb, subobj, "S-1-5-7",  "Anonymous");
@@ -687,9 +688,10 @@ function provision_dns(subobj, message, paths, session_info, credentials)
 
 	var attrs = new Array("objectGUID");
 	res = ldb.search("objectGUID=*", subobj.DOMAINDN, ldb.SCOPE_BASE, attrs);
-	assert(res.length == 1);
-	assert(res[0].objectGUID != undefined);
-	subobj.DOMAINGUID = res[0].objectGUID;
+	assert(res.error == 0);
+	assert(res.msgs.length == 1);
+	assert(res.msgs[0].objectGUID != undefined);
+	subobj.DOMAINGUID = res.msgs[0].objectGUID;
 
 	subobj.HOSTGUID = searchone(ldb, subobj.DOMAINDN, "(&(objectClass=computer)(cn=" + subobj.NETBIOSNAME + "))", "objectGUID");
 	assert(subobj.HOSTGUID != undefined);
@@ -808,11 +810,12 @@ function searchone(ldb, basedn, expression, attribute)
 {
 	var attrs = new Array(attribute);
 	res = ldb.search(expression, basedn, ldb.SCOPE_SUBTREE, attrs);
-	if (res.length != 1 ||
-	    res[0][attribute] == undefined) {
+	if (res.error != 0 ||
+	    res.msgs.length != 1 ||
+	    res.msgs[0][attribute] == undefined) {
 		return undefined;
 	}
-	return res[0][attribute];
+	return res.msgs[0][attribute];
 }
 
 /*
@@ -822,8 +825,9 @@ function enable_account(ldb, user_dn)
 {
 	var attrs = new Array("userAccountControl");
 	var res = ldb.search(NULL, user_dn, ldb.SCOPE_ONELEVEL, attrs);
-	assert(res.length == 1);
-	var userAccountControl = res[0].userAccountControl;
+	assert(res.error == 0);
+	assert(res.msgs.length == 1);
+	var userAccountControl = res.msgs[0].userAccountControl;
 	userAccountControl = userAccountControl - 2; /* remove disabled bit */
 	var mod = sprintf("
 dn: %s
@@ -833,7 +837,7 @@ userAccountControl: %u
 ", 
 			  user_dn, userAccountControl);
 	var ok = ldb.modify(mod);
-	return ok;	
+	return (ok.error == 0);	
 }
 
 
@@ -858,8 +862,9 @@ function newuser(username, unixname, password, message, session_info, credential
 	/* find the DNs for the domain and the domain users group */
 	var attrs = new Array("defaultNamingContext");
 	res = ldb.search("defaultNamingContext=*", "", ldb.SCOPE_BASE, attrs);
-	assert(res.length == 1 && res[0].defaultNamingContext != undefined);
-	var domain_dn = res[0].defaultNamingContext;
+	assert(res.error == 0);
+	assert(res.msgs.length == 1 && res.msgs[0].defaultNamingContext != undefined);
+	var domain_dn = res.msgs[0].defaultNamingContext;
 	assert(domain_dn != undefined);
 	var dom_users = searchone(ldb, domain_dn, "name=Domain Users", "dn");
 	assert(dom_users != undefined);
@@ -898,15 +903,15 @@ member: %s
 	*/
 	message("Adding user %s\n", user_dn);
 	ok = ldb.add(ldif);
-	if (ok != true) {
-		message("Failed to add %s - %s\n", user_dn, ldb.errstring());
+	if (ok.error != 0) {
+		message("Failed to add %s - %s\n", user_dn, ok.errstr);
 		return false;
 	}
 
 	message("Modifying group %s\n", dom_users);
 	ok = ldb.modify(modgroup);
-	if (ok != true) {
-		message("Failed to modify %s - %s\n", dom_users, ldb.errstring());
+	if (ok.error != 0) {
+		message("Failed to modify %s - %s\n", dom_users, ok.errstr);
 		return false;
 	}
 
-- 
cgit 


From 4ea28ef7c0752a0907cac789b06a613580803721 Mon Sep 17 00:00:00 2001
From: Simo Sorce <idra@samba.org>
Date: Sun, 18 Feb 2007 02:21:21 +0000
Subject: r21419: Give some more clue about what's going on (This used to be
 commit 76b377d5ad5c115e5fbb24a10d543883f04283a6)

---
 source4/scripting/ejs/smbcalls_string.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_string.c b/source4/scripting/ejs/smbcalls_string.c
index 403de7ba35..ab5aecd847 100644
--- a/source4/scripting/ejs/smbcalls_string.c
+++ b/source4/scripting/ejs/smbcalls_string.c
@@ -185,7 +185,7 @@ static int ejs_substr(MprVarHandle eid, int argc, struct MprVar **argv)
 	length = strlen(orig);
 	if (start_offset < 0) start_offset += strlen(orig);
 	if (start_offset < 0 || start_offset > strlen(orig)) {
-		ejsSetErrorMsg(eid, "substr arg 2 out of bounds");
+		ejsSetErrorMsg(eid, "substr arg 2 out of bounds ([%s], %d)", orig, start_offset);
 		return -1;
 	}
 
@@ -193,7 +193,7 @@ static int ejs_substr(MprVarHandle eid, int argc, struct MprVar **argv)
 		length = mprToInt(argv[2]);
 		if (length < 0) length += strlen(orig) - start_offset;
 		if (length < 0 || length+start_offset > strlen(orig)) {
-			ejsSetErrorMsg(eid, "substr arg 3 out of bounds");
+			ejsSetErrorMsg(eid, "substr arg 3 out of bounds ([%s], %d, %d)", orig, start_offset, length);
 			return -1;
 		}
 	}
-- 
cgit 


From 7dc7156bd76425df129102a42dd29a85fd8c7ebc Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Thu, 22 Feb 2007 01:54:40 +0000
Subject: r21496: A number of ldb control and LDAP changes, surrounding the
 'phantom_root' flag in the search_options control

- Add in support for LDB controls to the js layer
- Test the behaviour
- Implement support for the 'phantom_root' flag in the partitions module
- Make the LDAP server set the 'phantom_root' flag in the search_options control
  - This replaces the global_catalog flag passed down as an opaque pointer
- Rework the string-format control parsing function into
  ldb_parse_control_strings(), returning errors by ldb_errorstring()
  method, rather than with printf to stderr
- Rework some of the ldb_control handling logic

Andrew Bartlett
(This used to be commit 2b3df7f38d7790358dbb4de1b8609bf794a351fb)
---
 source4/scripting/ejs/smbcalls_ldb.c | 48 +++++++++++++++++++++++++++++++++---
 1 file changed, 45 insertions(+), 3 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_ldb.c b/source4/scripting/ejs/smbcalls_ldb.c
index fc44862985..3f970cea58 100644
--- a/source4/scripting/ejs/smbcalls_ldb.c
+++ b/source4/scripting/ejs/smbcalls_ldb.c
@@ -49,6 +49,7 @@ static struct ldb_context *ejs_get_ldb_context(int eid)
      ldb.search("expression", attrs);
      var basedn = "cn=this,dc=is,dc=a,dc=test";
      ldb.search("expression", basedn, ldb.SCOPE_SUBTREE, attrs);
+     ldb.search("expression", basedn, ldb.SCOPE_SUBTREE, attrs, controls);
 */
 static int ejs_ldbSearch(MprVarHandle eid, int argc, struct MprVar **argv)
 {
@@ -60,10 +61,12 @@ static int ejs_ldbSearch(MprVarHandle eid, int argc, struct MprVar **argv)
 	TALLOC_CTX *tmp_ctx = talloc_new(mprMemCtx());
 	struct ldb_context *ldb;
 	int ret;
+	struct ldb_control **parsed_controls = NULL;
 	struct ldb_result *res=NULL;
+	struct ldb_request *req;
 
 	/* validate arguments */
-	if (argc < 1 || argc > 4) {
+	if (argc < 1 || argc > 5) {
 		ejsSetErrorMsg(eid, "ldb.search invalid number of arguments");
 		goto failed;
 	}
@@ -88,6 +91,8 @@ static int ejs_ldbSearch(MprVarHandle eid, int argc, struct MprVar **argv)
 			ejsSetErrorMsg(eid, "ldb.search malformed base dn");
 			goto failed;
 		}
+	} else {
+		basedn = ldb_get_default_basedn(ldb);
 	}
 	if (argc > 2) {
 		scope = mprToInt(argv[2]);
@@ -105,14 +110,51 @@ static int ejs_ldbSearch(MprVarHandle eid, int argc, struct MprVar **argv)
 	if (argc > 3) {
 		attrs = mprToList(tmp_ctx, argv[3]);
 	}
-	ret = ldb_search(ldb, basedn, scope, expression, attrs, &res);
+	if (argc > 4) {
+		const char **controls;
+		controls = mprToList(tmp_ctx, argv[4]);
+		if (controls) {
+			parsed_controls = ldb_parse_control_strings(ldb, tmp_ctx, controls);
+			if (!parsed_controls) {
+				ejsSetErrorMsg(eid, "ldb.search cannot parse controls: %s", 
+					       ldb_errstring(ldb));
+				goto failed;
+			}
+		}
+	}
+
+	res = talloc_zero(tmp_ctx, struct ldb_result);
+	if (!res) {
+		return LDB_ERR_OPERATIONS_ERROR;
+	}
+
+	ret = ldb_build_search_req(&req, ldb, tmp_ctx,
+				   basedn,
+				   scope,
+				   expression,
+				   attrs,
+				   parsed_controls,
+				   res,
+				   ldb_search_default_callback);
+
+	if (ret == LDB_SUCCESS) {
+
+		ldb_set_timeout(ldb, req, 0); /* use default timeout */
+		
+		ret = ldb_request(ldb, req);
+		
+		if (ret == LDB_SUCCESS) {
+			ret = ldb_wait(req->handle, LDB_WAIT_ALL);
+		}
+	}
+
 	if (ret != LDB_SUCCESS) {
 		ejsSetErrorMsg(eid, "ldb.search failed - %s", ldb_errstring(ldb));
 		mpr_Return(eid, mprLdbResult(ldb, ret, NULL));
 	} else {
 		mpr_Return(eid, mprLdbResult(ldb, ret, res));
-		talloc_free(res);
 	}
+
 	talloc_free(tmp_ctx);
 	return 0;
 
-- 
cgit 


From 28884a1cab5da9be8af9721badf65f1a236fd1e9 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Fri, 23 Feb 2007 10:04:20 +0000
Subject: r21513: I don't know how long this has been wrong, but fix this up so
 we can re-provision (as is required for the TEST_LDAP=yes version of make
 test).

Andrew Bartlett
(This used to be commit ea4c2ea22fb3975d80130f52edecaf6d1790adde)
---
 source4/scripting/libjs/provision.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index b50e9b5bcf..9340d43ed9 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -177,7 +177,7 @@ function ldb_erase(ldb)
 		return;
 	}
 	for (i=0;i<res.msgs.length;i++) {
-		ldb.del(res[i].dn);
+		ldb.del(res.msgs[i].dn);
 	}
 
      	var res = ldb.search("(&(|(objectclass=*)(dn=*))(!(dn=@BASEINFO)))", basedn, ldb.SCOPE_SUBTREE, attrs);
-- 
cgit 


From fd2d095048ef30292688a647af7a3d58c3b175a1 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 26 Feb 2007 16:18:23 +0000
Subject: r21541: Export mgmt, samr and atsvc for use in samba-gtk. (This used
 to be commit 7f451cbb8da26cfe27861c402e06b3f34f7ac647)

---
 source4/scripting/swig/config.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/config.mk b/source4/scripting/swig/config.mk
index 970c6ed71a..38c7afadd5 100644
--- a/source4/scripting/swig/config.mk
+++ b/source4/scripting/swig/config.mk
@@ -2,7 +2,7 @@
 # Start LIBRARY swig_dcerpc
 [LIBRARY::swig_dcerpc]
 LIBRARY_REALNAME = _dcerpc.$(SHLIBEXT)
-PUBLIC_DEPENDENCIES = LIBCLI_SMB NDR_MISC LIBSAMBA-UTIL LIBSAMBA-CONFIG RPC_NDR_SAMR RPC_NDR_LSA DYNCONFIG
+PUBLIC_DEPENDENCIES = LIBCLI_SMB NDR_MISC LIBSAMBA-UTIL LIBSAMBA-CONFIG dcerpc_samr RPC_NDR_LSA DYNCONFIG
 OBJ_FILES = dcerpc_wrap.o
 # End LIBRARY swig_dcerpc
 #######################
-- 
cgit 


From 99fb785ea1dcf8ccc7bcbceed350178884e824b1 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sat, 3 Mar 2007 02:06:54 +0000
Subject: r21673: Fix Samba 3 data read tests. I can't figure out why the
 upgrade one is broken, so that one is still disabled. (This used to be commit
 ef794f03d50022a77303c77045a04d9407d07cbc)

---
 source4/scripting/libjs/upgrade.js | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/upgrade.js b/source4/scripting/libjs/upgrade.js
index adb958a236..3504d850f2 100644
--- a/source4/scripting/libjs/upgrade.js
+++ b/source4/scripting/libjs/upgrade.js
@@ -357,7 +357,6 @@ function upgrade_provision(samba3)
 	subobj.NTTIME       = nttime;
 	subobj.LDAPTIME     = ldaptime;
 	subobj.DATESTRING   = datestring;
-	subobj.USN          = nextusn;
 	subobj.ROOT         = findnss(nss.getpwnam, "root");
 	subobj.NOBODY       = findnss(nss.getpwnam, "nobody");
 	subobj.NOGROUP      = findnss(nss.getgrnam, "nogroup", "nobody");
@@ -368,7 +367,26 @@ function upgrade_provision(samba3)
 				      strlower(subobj.HOSTNAME), 
 				      subobj.DNSDOMAIN);
 	subobj.BASEDN       = "DC=" + join(",DC=", split(".", subobj.REALM));
-	rdn_list = split(".", subobj.REALM);
+	rdn_list = split(".", subobj.DNSDOMAIN);
+	subobj.DOMAINDN     = "DC=" + join(",DC=", rdn_list);
+	subobj.DOMAINDN_LDB = "users.ldb";
+	subobj.ROOTDN       = subobj.DOMAINDN;
+
+	modules_list        = new Array("rootdse",
+					"kludge_acl",
+					"paged_results",
+					"server_sort",
+					"extended_dn",
+					"asq",
+					"samldb",
+					"password_hash",
+					"operational",
+					"objectclass",
+					"rdn_name",
+					"show_deleted",
+					"partition");
+	subobj.MODULES_LIST = join(",", modules_list);
+
 	return subobj;
 }
 
-- 
cgit 


From 4a23a696b957639a9f9ffbdd0121ce1ff453d20c Mon Sep 17 00:00:00 2001
From: Rafal Szczesniak <mimir@samba.org>
Date: Tue, 17 Apr 2007 23:06:43 +0000
Subject: r22323: - add credentials property to NetContext object - change a
 comment (matches the idea better)

rafal
(This used to be commit 4e8d9d3f6066d86af0e6dbe1f7091ce848dceb4f)
---
 source4/scripting/ejs/ejsnet/net_ctx.c  | 30 ++++++++++++++++++++++++------
 source4/scripting/ejs/ejsnet/net_user.c |  2 +-
 2 files changed, 25 insertions(+), 7 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/ejsnet/net_ctx.c b/source4/scripting/ejs/ejsnet/net_ctx.c
index 25239512d0..9a5e6bb3cc 100644
--- a/source4/scripting/ejs/ejsnet/net_ctx.c
+++ b/source4/scripting/ejs/ejsnet/net_ctx.c
@@ -43,7 +43,7 @@ static int ejs_net_context(MprVarHandle eid, int argc, struct MprVar **argv)
 	TALLOC_CTX *event_mem_ctx = talloc_new(mprMemCtx());
 	struct cli_credentials *creds;
 	struct libnet_context *ctx;
-	struct MprVar obj;
+	struct MprVar obj, mprCreds;
 	struct event_context *ev;
 
 	if (!event_mem_ctx) {
@@ -59,6 +59,9 @@ static int ejs_net_context(MprVarHandle eid, int argc, struct MprVar **argv)
 	talloc_steal(ctx, event_mem_ctx);
 
 	if (argc == 0 || (argc == 1 && argv[0]->type == MPR_TYPE_NULL)) {
+		/* 
+		   create the default credentials
+		*/
 		creds = cli_credentials_init(ctx);
 		if (creds == NULL) {
 			ejsSetErrorMsg(eid, "cli_credential_init() failed");
@@ -68,11 +71,16 @@ static int ejs_net_context(MprVarHandle eid, int argc, struct MprVar **argv)
 		cli_credentials_set_conf(creds);
 		cli_credentials_set_anonymous(creds);
 
+		mprCreds = mprCredentials(creds);
+
 	} else if (argc == 1 && argv[0]->type == MPR_TYPE_OBJECT) {
-		/* get credential values from credentials object */
-		creds = mprGetPtr(argv[0], "creds");
+		/*
+		  get credential values from credentials object
+		*/
+		mprCreds = *(argv[0]);
+		creds = mprGetPtr(&mprCreds, "creds");
 		if (creds == NULL) {
-			ejsSetErrorMsg(eid, "userAuth requires a 'creds' first parameter");
+			ejsSetErrorMsg(eid, "invalid credentials parameter");
 			talloc_free(ctx);
 			return -1;
 		}
@@ -82,15 +90,25 @@ static int ejs_net_context(MprVarHandle eid, int argc, struct MprVar **argv)
 		talloc_free(ctx);
 		return -1;
 	}
-
+	
+	/* setup libnet_context credentials */
 	ctx->cred = creds;
 
-	obj = mprObject("NetCtx");
+	/* create the NetContext object */
+	obj = mprObject("NetContext");
+
+	/* add internal libnet_context pointer to the NetContext object */
 	mprSetPtrChild(&obj, "ctx", ctx);
+
+	/* add properties publicly available from js code */
+	mprCreateProperty(&obj, "credentials", &mprCreds);
 	
+	/* add methods to the object */
 	mprSetCFunction(&obj, "UserMgr", ejs_net_userman);
 	mprSetCFunction(&obj, "JoinDomain", ejs_net_join_domain);
 	mprSetCFunction(&obj, "SamSyncLdb", ejs_net_samsync_ldb);
+
+	/* return the object */
 	mpr_Return(eid, obj);
 
 	return 0;
diff --git a/source4/scripting/ejs/ejsnet/net_user.c b/source4/scripting/ejs/ejsnet/net_user.c
index 9a4f9473f6..804ca04cd6 100644
--- a/source4/scripting/ejs/ejsnet/net_user.c
+++ b/source4/scripting/ejs/ejsnet/net_user.c
@@ -59,7 +59,7 @@ int ejs_net_userman(MprVarHandle eid, int argc, struct MprVar **argv)
 
 	} else if (argc == 1 && mprVarIsString(argv[0]->type)) {
 		/* domain name can also be specified explicitly 
-		   (e.g. to connect remote domain) */
+		   (e.g. to connect BUILTIN domain) */
 		userman_domain = mprToString(argv[0]);
 
 	} else {
-- 
cgit 


From 344cde462e460c5a6effa6651e039d6384681eea Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Fri, 20 Apr 2007 11:04:13 +0000
Subject: r22406: this dependencies should also be private

metze
(This used to be commit 7f07895cac3e933b39f81bf67812834352184af0)
---
 source4/scripting/ejs/config.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/config.mk b/source4/scripting/ejs/config.mk
index 98dad4596a..d5ce2dd614 100644
--- a/source4/scripting/ejs/config.mk
+++ b/source4/scripting/ejs/config.mk
@@ -25,7 +25,7 @@ INIT_FUNCTION = smb_setup_ejs_nbt
 OBJ_FILES = smbcalls_samba3.o
 SUBSYSTEM = smbcalls
 INIT_FUNCTION = smb_setup_ejs_samba3
-PUBLIC_DEPENDENCIES = LIBSAMBA3 
+PRIVATE_DEPENDENCIES = LIBSAMBA3 
 
 [MODULE::smbcalls_rand]
 OBJ_FILES = smbcalls_rand.o
@@ -46,7 +46,7 @@ INIT_FUNCTION = smb_setup_ejs_datablob
 OBJ_FILES = smbcalls_auth.o
 SUBSYSTEM = smbcalls
 INIT_FUNCTION = smb_setup_ejs_auth
-PUBLIC_DEPENDENCIES = auth
+PRIVATE_DEPENDENCIES = auth
 
 [MODULE::smbcalls_string]
 OBJ_FILES = smbcalls_string.o
@@ -75,7 +75,7 @@ OBJ_FILES = \
 		smbcalls_param.o \
 		mprutil.o \
 		literal.o
-PUBLIC_DEPENDENCIES = \
+PRIVATE_DEPENDENCIES = \
 		EJS LIBSAMBA-UTIL \
 		EJSRPC MESSAGING \
 		LIBSAMBA-NET LIBCLI_SMB LIBPOPT \
-- 
cgit 


From 3d4c4c5fa3596646e98fa50f8f735ffc1cbe8240 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Mon, 23 Apr 2007 07:33:15 +0000
Subject: r22478: Update the LDAP backend code to handle initialisation of
 multiple partitions onto the target LDAP server.

Make the LDAP provision run before smbd starts, then stop the LDAP
server.  This ensures this occurs synchronously, We then restart it
for the 'real run' (with slapd's stdin being the FIFO).

This required fixing a few things in the provision scripts, with more
containers being created via a add/modify pair.

Andrew Bartlett
(This used to be commit 860dfa4ea1ab2b62d4d4fe0644e0a9b882fdafa1)
---
 source4/scripting/libjs/provision.js | 42 +++++++++++++++++++++++++++++++++---
 1 file changed, 39 insertions(+), 3 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index 9340d43ed9..6af753e7eb 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -386,6 +386,8 @@ function provision_default_paths(subobj)
 	paths.dns = lp.get("private dir") + "/" + subobj.DNSDOMAIN + ".zone";
 	paths.winsdb = "wins.ldb";
 	paths.ldap_basedn_ldif = lp.get("private dir") + "/" + subobj.DNSDOMAIN + ".ldif";
+	paths.ldap_config_basedn_ldif = lp.get("private dir") + "/" + subobj.DNSDOMAIN + "-config.ldif";
+	paths.ldap_schema_basedn_ldif = lp.get("private dir") + "/" + subobj.DNSDOMAIN + "-schema.ldif";
 	return paths;
 }
 
@@ -573,6 +575,31 @@ function provision(subobj, message, blank, paths, session_info, credentials, lda
 		assert(modify_ok);
 	};
 
+	message("Adding configuration container (permitted to fail)\n");
+	var add_ok = setup_add_ldif("provision_configuration_basedn.ldif", info, samdb, true);
+	message("Modifying configuration container\n");
+	var modify_ok = setup_ldb_modify("provision_configuration_basedn_modify.ldif", info, samdb);
+	if (!modify_ok) {
+		if (!add_ok) {
+			message("Failed to both add and modify the configuration container\n");
+			assert(modify_ok);
+		}
+		assert(modify_ok);
+	}
+
+	message("Adding schema container (permitted to fail)\n");
+	var add_ok = setup_add_ldif("provision_schema_basedn.ldif", info, samdb, true);
+	message("Modifying schema container\n");
+	var modify_ok = setup_ldb_modify("provision_schema_basedn_modify.ldif", info, samdb);
+	if (!modify_ok) {
+		if (!add_ok) {
+			message("Failed to both add and modify the schema container: " + samdb.errstring() + "\n");
+			assert(modify_ok);
+		}
+		message("Failed to modify the schema container: " + samdb.errstring() + "\n");
+		assert(modify_ok);
+	}
+
 	message("Setting up sam.ldb Samba4 schema\n");
 	setup_add_ldif("schema_samba4.ldif", info, samdb, false);
 	message("Setting up sam.ldb AD schema\n");
@@ -588,6 +615,9 @@ function provision(subobj, message, blank, paths, session_info, credentials, lda
 
 	samdb = open_ldb(info, paths.samdb, false);
 
+	message("Setting up sam.ldb configuration data\n");
+	setup_add_ldif("provision_configuration.ldif", info, samdb, false);
+
 	message("Setting up display specifiers\n");
 	setup_add_ldif("display_specifiers.ldif", info, samdb, false);
 	message("Setting up sam.ldb templates\n");
@@ -618,8 +648,6 @@ function provision(subobj, message, blank, paths, session_info, credentials, lda
 
 	message("Setting up sam.ldb data\n");
 	setup_add_ldif("provision.ldif", info, samdb, false);
-	message("Setting up sam.ldb configuration data\n");
-	setup_add_ldif("provision_configuration.ldif", info, samdb, false);
 
 	if (blank != false) {
 		message("Setting up sam.ldb index\n");
@@ -716,7 +744,15 @@ function provision_ldapbase(subobj, message, paths)
 		   message, paths.ldap_basedn_ldif, 
 		   subobj);
 
-	message("Please install the LDIF located in " + paths.ldap_basedn_ldif + " into your LDAP server, and re-run with --ldap-backend=ldap://my.ldap.server\n");
+	setup_file("provision_configuration_basedn.ldif", 
+		   message, paths.ldap_config_basedn_ldif, 
+		   subobj);
+
+	setup_file("provision_schema_basedn.ldif", 
+		   message, paths.ldap_schema_basedn_ldif, 
+		   subobj);
+
+	message("Please install the LDIF located in " + paths.ldap_basedn_ldif + ", " + paths.ldap_config_basedn_ldif + " and " + paths.ldap_schema_basedn_ldif + " into your LDAP server, and re-run with --ldap-backend=ldap://my.ldap.server\n");
 }
 
 
-- 
cgit 


From 1e84e4026e3c8f0b94cfaf61a089b075f07417f1 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Sun, 29 Apr 2007 20:37:59 +0000
Subject: r22575: move script/tests/ -> selftest/

as discussed with jelmer and abartlet

metze
(This used to be commit e9fe3c40e10accb63d7a2124d3a7e77e499c4209)
---
 source4/scripting/swig/config.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/config.mk b/source4/scripting/swig/config.mk
index 38c7afadd5..61e8081268 100644
--- a/source4/scripting/swig/config.mk
+++ b/source4/scripting/swig/config.mk
@@ -27,4 +27,4 @@ clean::
 # Swig testing
 
 swigtest: swig
-	./script/tests/test_swig.sh
+	./selftest/test_swig.sh
-- 
cgit 


From f7e093572797e09d7bd78db2d452914092b68c5a Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Tue, 1 May 2007 03:25:17 +0000
Subject: r22622: make it possible to pass the config file via 'SMB_CONF_PATH'
 envvar

very usefull for make testenv!

this makes it also possible to pass a config file to smbscript

metze
(This used to be commit f65fcd764b656ba9953d88dc7b002e4977af5011)
---
 source4/scripting/ejs/smbscript.c | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbscript.c b/source4/scripting/ejs/smbscript.c
index 23e2fe2d52..26f4c0f070 100644
--- a/source4/scripting/ejs/smbscript.c
+++ b/source4/scripting/ejs/smbscript.c
@@ -52,6 +52,10 @@ int main(int argc, const char **argv)
 
 	fault_setup(argv[0]);
 
+	if (getenv("SMB_CONF_PATH")) {
+		lp_set_cmdline("config file", getenv("SMB_CONF_PATH"));
+	}
+
 	ldb_global_init();
 
 	gensec_init();
-- 
cgit 


From 68b531e81784d218b598e4ec403443bbc039ca77 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Mon, 7 May 2007 15:19:53 +0000
Subject: r22748: fix memleaks by passing an mem_ctx to irpc_servers_byname()

metze
(This used to be commit b54584dfabee77ec7743cab431bda9765057a295)
---
 source4/scripting/ejs/smbcalls_rpc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_rpc.c b/source4/scripting/ejs/smbcalls_rpc.c
index 4d4e12e855..73b6661cd3 100644
--- a/source4/scripting/ejs/smbcalls_rpc.c
+++ b/source4/scripting/ejs/smbcalls_rpc.c
@@ -88,7 +88,7 @@ static int ejs_irpc_connect(MprVarHandle eid, int argc, char **argv)
 		return -1;
 	}
 
-	p->dest_ids = irpc_servers_byname(p->msg_ctx, p->server_name);
+	p->dest_ids = irpc_servers_byname(p->msg_ctx, p, p->server_name);
 	if (p->dest_ids == NULL || p->dest_ids[0].id == 0) {
 		talloc_free(p);
 		status = NT_STATUS_OBJECT_NAME_NOT_FOUND;
-- 
cgit 


From 112728c65101948204fe9a7c1373ff21f1724cdb Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Tue, 8 May 2007 04:38:16 +0000
Subject: r22756: Make it easier to setup an LDAP replica.  Provision with
 --partitions-only (suggestions for a better name welcome) will setup the
 partitions records, but no any data in those partitions.  This can then point
 at the already configured remote LDAP server.

Andrew Bartlett
(This used to be commit ee7b06fc832ca7c572205c7c268c3c7c552effa0)
---
 source4/scripting/libjs/provision.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index 6af753e7eb..948c02470d 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -453,7 +453,7 @@ function provision_fix_subobj(subobj, message, paths)
 	return true;
 }
 
-function provision_become_dc(subobj, message, paths, session_info)
+function provision_become_dc(subobj, message, erase, paths, session_info)
 {
 	var lp = loadparm_init();
 	var sys = sys_init();
@@ -478,8 +478,10 @@ function provision_become_dc(subobj, message, paths, session_info)
 	message("Setting up " + paths.samdb + " rootDSE\n");
 	setup_add_ldif("provision_rootdse_add.ldif", info, samdb, false);
 
-	message("Erasing data from partitions\n");
-	ldb_erase_partitions(info, samdb, undefined);
+	if (erase) {
+		message("Erasing data from partitions\n");
+		ldb_erase_partitions(info, samdb, undefined);
+	}
 
 	message("Setting up " + paths.samdb + " indexes\n");
 	setup_add_ldif("provision_index.ldif", info, samdb, false);
-- 
cgit 


From 47e5c163d63ae04381a67cd4d5cc428f22374bb6 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Fri, 18 May 2007 08:16:50 +0000
Subject: r22993: - make it possible to load a dsdb_schema from ldif via the
 ejs bindings - make it possible to set ntds_objectGUID and ntds_invocationId
 via the ejy bindings

metze
(This used to be commit df7863ea1c964ec58feedd0bf72ef64456e3a3d1)
---
 source4/scripting/ejs/config.mk      |   1 +
 source4/scripting/ejs/smbcalls_ldb.c | 125 +++++++++++++++++++++++++++++++++++
 2 files changed, 126 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/config.mk b/source4/scripting/ejs/config.mk
index d5ce2dd614..f1c17ad21d 100644
--- a/source4/scripting/ejs/config.mk
+++ b/source4/scripting/ejs/config.mk
@@ -15,6 +15,7 @@ INIT_FUNCTION = smb_setup_ejs_config
 OBJ_FILES = smbcalls_ldb.o
 SUBSYSTEM = smbcalls
 INIT_FUNCTION = smb_setup_ejs_ldb
+PRIVATE_DEPENDENCIES = LIBLDB SAMDB LIBNDR
 
 [MODULE::smbcalls_nbt]
 OBJ_FILES = smbcalls_nbt.o
diff --git a/source4/scripting/ejs/smbcalls_ldb.c b/source4/scripting/ejs/smbcalls_ldb.c
index 3f970cea58..33f371cd4e 100644
--- a/source4/scripting/ejs/smbcalls_ldb.c
+++ b/source4/scripting/ejs/smbcalls_ldb.c
@@ -27,6 +27,8 @@
 #include "lib/ldb/include/ldb.h"
 #include "lib/ldb/include/ldb_errors.h"
 #include "db_wrap.h"
+#include "dsdb/samdb/samdb.h"
+#include "librpc/ndr/libndr.h"
 
 /*
   get the connected db
@@ -565,6 +567,123 @@ static int ejs_ldbTransactionCommit(MprVarHandle eid, int argc, struct MprVar **
 	return 0;
 }
 
+/*
+  commit a ldb attach a dsdb_schema from ldif files
+  usage:
+   ok = ldb.attach_dsdb_schema_from_ldif("prefixMap ldif content", "definition ldif content")
+*/
+static int ejs_ldb_attach_dsdb_schema_from_ldif(MprVarHandle eid, int argc, char **argv)
+{
+	struct ldb_context *ldb;
+	WERROR status;
+	char *pf_name;
+	char *df_name;
+	const char *pf;
+	const char *df;
+
+	if (argc != 2) {
+		ejsSetErrorMsg(eid, "ldb.attach_dsdb_schema_from_ldif invalid arguments");
+		return -1;
+	}
+
+	ldb = ejs_get_ldb_context(eid);
+	if (ldb == NULL) {
+		return -1;
+	}
+
+	pf = argv[0];
+	df = argv[1];
+
+	status = dsdb_attach_schema_from_ldif_file(ldb, pf, df);
+
+	mpr_Return(eid, mprWERROR(status));
+	return 0;
+}
+
+/*
+  commit a ldb attach a dsdb_schema from ldif files
+  usage:
+   ok = ldb.set_ntds_invocationId("7729aa4b-f990-41ad-b81a-8b6a14090f41");
+*/
+static int ejs_ldb_set_ntds_invocationId(MprVarHandle eid, int argc, char **argv)
+{
+	struct ldb_context *ldb;
+	NTSTATUS status;
+	struct GUID guid;
+	char *guid_str;
+	bool ok;
+
+	if (argc != 1) {
+		ejsSetErrorMsg(eid, "ldb.set_ntds_invocationId invalid arguments");
+		return -1;
+	}
+
+	ldb = ejs_get_ldb_context(eid);
+	if (ldb == NULL) {
+		return -1;
+	}
+
+	guid_str = argv[0];
+
+	status = GUID_from_string(guid_str, &guid);
+	if (!NT_STATUS_IS_OK(status)) {
+		ejsSetErrorMsg(eid, "ldb.set_ntds_invocationId - failed to parse GUID '%s' %s\n",
+				guid_str, nt_errstr(status));
+		return -1;
+	}
+
+	ok = samdb_set_ntds_invocation_id(ldb, &guid);
+	if (!ok) {
+		ejsSetErrorMsg(eid, "ldb.set_ntds_invocationId - failed to set cached ntds invocationId\n");
+		return -1;
+	}
+
+	mpr_Return(eid, mprCreateBoolVar(ok));
+	return 0;
+}
+
+/*
+  commit a ldb attach a dsdb_schema from ldif files
+  usage:
+   ok = ldb.get_ntds_objectGUID("7729aa4b-f990-41ad-b81a-8b6a14090f41");
+*/
+static int ejs_ldb_set_ntds_objectGUID(MprVarHandle eid, int argc, char **argv)
+{
+	struct ldb_context *ldb;
+	NTSTATUS status;
+	struct GUID guid;
+	char *guid_str;
+	bool ok;
+
+	if (argc != 1) {
+		ejsSetErrorMsg(eid, "ldb.set_ntds_objectGUID invalid arguments");
+		return -1;
+	}
+
+	ldb = ejs_get_ldb_context(eid);
+	if (ldb == NULL) {
+		return -1;
+	}
+
+	guid_str = argv[0];
+
+	status = GUID_from_string(guid_str, &guid);
+	if (!NT_STATUS_IS_OK(status)) {
+		ejsSetErrorMsg(eid, "ldb.set_ntds_objectGUID - failed to parse GUID '%s' %s\n",
+				guid_str, nt_errstr(status));
+		return -1;
+	}
+
+	ok = samdb_set_ntds_invocation_id(ldb, &guid);
+	if (!ok) {
+		ejsSetErrorMsg(eid, "ldb.set_ntds_objectGUID - failed to set cached ntds invocationId\n");
+		return -1;
+	}
+
+	mpr_Return(eid, mprCreateBoolVar(ok));
+	return 0;
+}
+
 /*
   initialise ldb ejs subsystem
 */
@@ -586,6 +705,12 @@ static int ejs_ldb_init(MprVarHandle eid, int argc, struct MprVar **argv)
 	mprSetCFunction(ldb, "transaction_start", ejs_ldbTransactionStart);
 	mprSetCFunction(ldb, "transaction_cancel", ejs_ldbTransactionCancel);
 	mprSetCFunction(ldb, "transaction_commit", ejs_ldbTransactionCommit);
+	mprSetStringCFunction(ldb, "attach_dsdb_schema_from_ldif",
+			      ejs_ldb_attach_dsdb_schema_from_ldif);
+	mprSetStringCFunction(ldb, "set_ntds_invocationId",
+			      ejs_ldb_set_ntds_invocationId);
+	mprSetStringCFunction(ldb, "set_ntds_objectGUID",
+			      ejs_ldb_set_ntds_objectGUID);
 	mprSetVar(ldb, "SCOPE_BASE", mprCreateNumberVar(LDB_SCOPE_BASE));
 	mprSetVar(ldb, "SCOPE_ONE", mprCreateNumberVar(LDB_SCOPE_ONELEVEL));
 	mprSetVar(ldb, "SCOPE_SUBTREE", mprCreateNumberVar(LDB_SCOPE_SUBTREE));
-- 
cgit 


From fdc0809b41c7abba1fcdaa86d23868c86fa9ff71 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Sat, 19 May 2007 06:49:01 +0000
Subject: r23011: initialisation functions must return NTSTATUS, otherwise we
 get bus errors on platforms like sparc. This is why sun1 died during
 provision. (This used to be commit ad6a672ec3cf077d419458e2f07ebe6d9a2b94b2)

---
 source4/scripting/ejs/ejsnet/net_ctx.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/ejsnet/net_ctx.c b/source4/scripting/ejs/ejsnet/net_ctx.c
index 9a5e6bb3cc..1c70dc107f 100644
--- a/source4/scripting/ejs/ejsnet/net_ctx.c
+++ b/source4/scripting/ejs/ejsnet/net_ctx.c
@@ -222,7 +222,8 @@ static int ejs_net_samsync_ldb(MprVarHandle eid, int argc, struct MprVar **argv)
 }
 
 
-void smb_setup_ejs_net(void)
+NTSTATUS smb_setup_ejs_net(void)
 {
 	ejsDefineCFunction(-1, "NetContext", ejs_net_context, NULL, MPR_VAR_SCRIPT_HANDLE);
+	return NT_STATUS_OK;
 }
-- 
cgit 


From 7bdc1a8ec9ead892b0b25e8f3b8c30f3fdde8e13 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Sat, 19 May 2007 06:51:34 +0000
Subject: r23012: we need a POLICYGUID in provision (This used to be commit
 b9f8650b20e5132410153f5b61a68dca5df548ff)

---
 source4/scripting/libjs/provision.js | 1 +
 1 file changed, 1 insertion(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index 948c02470d..3bbba6a9a6 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -781,6 +781,7 @@ function provision_guess()
 	subobj.HOSTIP       = hostip();
 	subobj.DOMAINSID    = randsid();
 	subobj.INVOCATIONID = randguid();
+	subobj.POLICYGUID   = randguid();
 	subobj.KRBTGTPASS   = randpass(12);
 	subobj.MACHINEPASS  = randpass(12);
 	subobj.ADMINPASS    = randpass(12);
-- 
cgit 


From d21bfc05ef1643039c7a5f602dd15f22408af4af Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Mon, 21 May 2007 08:33:22 +0000
Subject: r23032: Remove calls to println(), and ensure we print the ldb
 errstring().

Andrew Bartlett
(This used to be commit 5b6f704b24f7da40ce917fe8ed1a500684d1f3cd)
---
 source4/scripting/libjs/provision.js | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index 3bbba6a9a6..d9bdb3b16b 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -140,9 +140,9 @@ function hostname()
 /* the ldb is in bad shape, possibly due to being built from an
    incompatible previous version of the code, so delete it
    completely */
-function ldb_delete(ldb)
+function ldb_delete(info, ldb)
 {
-	println("Deleting " + ldb.filename);
+	info.message("Deleting " + ldb.filename + "\n");
 	var lp = loadparm_init();
 	sys.unlink(sprintf("%s/%s", lp.get("private dir"), ldb.filename));
 	ldb.transaction_cancel();
@@ -155,7 +155,7 @@ function ldb_delete(ldb)
 /*
   erase an ldb, removing all records
 */
-function ldb_erase(ldb)
+function ldb_erase(info, ldb)
 {
 	var res;
 
@@ -173,7 +173,7 @@ function ldb_erase(ldb)
      	var res = ldb.search("(&(|(objectclass=*)(dn=*))(!(dn=@BASEINFO)))", basedn, ldb.SCOPE_SUBTREE, attrs);
 	var i;
 	if (res.error != 0) {
-		ldb_delete(ldb);
+		ldb_delete(info, ldb);
 		return;
 	}
 	for (i=0;i<res.msgs.length;i++) {
@@ -182,7 +182,7 @@ function ldb_erase(ldb)
 
      	var res = ldb.search("(&(|(objectclass=*)(dn=*))(!(dn=@BASEINFO)))", basedn, ldb.SCOPE_SUBTREE, attrs);
 	if (res.error != 0 || res.msgs.length != 0) {
-		ldb_delete(ldb);
+		ldb_delete(info, ldb);
 		return;
 	}
 	assert(res.msgs.length == 0);
@@ -260,7 +260,7 @@ function open_ldb(info, dbname, erase)
 	ldb.transaction_start();
 
 	if (erase) {
-		ldb_erase(ldb);	
+		ldb_erase(info, ldb);	
 	}
 	return ldb;
 }
@@ -571,7 +571,7 @@ function provision(subobj, message, blank, paths, session_info, credentials, lda
 	var modify_ok = setup_ldb_modify("provision_basedn_modify.ldif", info, samdb);
 	if (!modify_ok) {
 		if (!add_ok) {
-			message("Failed to both add and modify " + subobj.DOMAINDN + " in target " + subobj.DOMAINDN_LDB + "\n");
+			message("Failed to both add and modify " + subobj.DOMAINDN + " in target " + subobj.DOMAINDN_LDB + ": " + samdb.errstring() + "\n");
 			message("Perhaps you need to run the provision script with the --ldap-base-dn option, and add this record to the backend manually\n"); 
 		};
 		assert(modify_ok);
@@ -583,7 +583,8 @@ function provision(subobj, message, blank, paths, session_info, credentials, lda
 	var modify_ok = setup_ldb_modify("provision_configuration_basedn_modify.ldif", info, samdb);
 	if (!modify_ok) {
 		if (!add_ok) {
-			message("Failed to both add and modify the configuration container\n");
+			message("Failed to both add and modify configuration dn: " + samdb.errstring() + "\n");
+			message("Perhaps you need to run the provision script with the --ldap-base-dn option, and add this record to the backend manually\n"); 
 			assert(modify_ok);
 		}
 		assert(modify_ok);
@@ -595,7 +596,8 @@ function provision(subobj, message, blank, paths, session_info, credentials, lda
 	var modify_ok = setup_ldb_modify("provision_schema_basedn_modify.ldif", info, samdb);
 	if (!modify_ok) {
 		if (!add_ok) {
-			message("Failed to both add and modify the schema container: " + samdb.errstring() + "\n");
+			message("Failed to both add and modify schema dn: + samdb.errstring() + "\n");
+			message("Perhaps you need to run the provision script with the --ldap-base-dn option, and add this record to the backend manually\n"); 
 			assert(modify_ok);
 		}
 		message("Failed to modify the schema container: " + samdb.errstring() + "\n");
-- 
cgit 


From fb1078dd1848220957815250aca195aaba85c614 Mon Sep 17 00:00:00 2001
From: Rafal Szczesniak <mimir@samba.org>
Date: Mon, 21 May 2007 19:53:57 +0000
Subject: r23047: Allow local inclusion of js files as well as from predefined
 path(s).

rafal
(This used to be commit 278d26576a625d0fa161f492b902074ea82ef1a8)
---
 source4/scripting/ejs/smbcalls.c | 26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls.c b/source4/scripting/ejs/smbcalls.c
index 24f48f8b76..9a4a9f9624 100644
--- a/source4/scripting/ejs/smbcalls.c
+++ b/source4/scripting/ejs/smbcalls.c
@@ -120,17 +120,34 @@ static int ejs_libinclude(int eid, int argc, char **argv)
 
 	for (i = 0; i < argc; i++) {
 		const char *script = argv[i];
+		struct MprVar result;
+		char *path, *emsg;
+		int ret;
 
+		/* First, try to include file from current working directory.
+		   This allows local includes which is handy sometimes. */
+		path = talloc_asprintf(mprMemCtx(), "%s", script);
+		if (path == NULL) {
+			return -1;
+		}
+		
+		if (file_exist(path)) {
+			ret = ejsEvalFile(eid, path, &result, &emsg);
+			talloc_free(path);
+			if (ret < 0) {
+				ejsSetErrorMsg(eid, "%s: %s", script, emsg);
+				return -1;
+			}
+			continue;
+		}
+
+		/* use specfied path to search for requested file */
 		for (j=0;js_include[j];j++) {
-			char *path;
 			path = talloc_asprintf(mprMemCtx(), "%s/%s", js_include[j], script);
 			if (path == NULL) {
 				return -1;
 			}
 			if (file_exist(path)) {
-				int ret;
-				struct MprVar result;
-				char *emsg;
 
 				ret = ejsEvalFile(eid, path, &result, &emsg);
 				talloc_free(path);
@@ -142,6 +159,7 @@ static int ejs_libinclude(int eid, int argc, char **argv)
 			}
 			talloc_free(path);
 		}
+
 		if (js_include[j] == NULL) {
 			ejsSetErrorMsg(eid, "unable to include '%s'", script);
 			return -1;
-- 
cgit 


From 5088c8add2f6dda66c17f4b238cd71ff7096e482 Mon Sep 17 00:00:00 2001
From: Rafal Szczesniak <mimir@samba.org>
Date: Tue, 22 May 2007 06:34:14 +0000
Subject: r23065: revert local includes to prevent security problems (at least
 temporarily...)

rafal
(This used to be commit 0ecb8fd81ebbd7327aa5c6b9347aa4dcb1ba6421)
---
 source4/scripting/ejs/smbcalls.c | 17 -----------------
 1 file changed, 17 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls.c b/source4/scripting/ejs/smbcalls.c
index 9a4a9f9624..04c534bdf5 100644
--- a/source4/scripting/ejs/smbcalls.c
+++ b/source4/scripting/ejs/smbcalls.c
@@ -124,23 +124,6 @@ static int ejs_libinclude(int eid, int argc, char **argv)
 		char *path, *emsg;
 		int ret;
 
-		/* First, try to include file from current working directory.
-		   This allows local includes which is handy sometimes. */
-		path = talloc_asprintf(mprMemCtx(), "%s", script);
-		if (path == NULL) {
-			return -1;
-		}
-		
-		if (file_exist(path)) {
-			ret = ejsEvalFile(eid, path, &result, &emsg);
-			talloc_free(path);
-			if (ret < 0) {
-				ejsSetErrorMsg(eid, "%s: %s", script, emsg);
-				return -1;
-			}
-			continue;
-		}
-
 		/* use specfied path to search for requested file */
 		for (j=0;js_include[j];j++) {
 			path = talloc_asprintf(mprMemCtx(), "%s/%s", js_include[j], script);
-- 
cgit 


From 9bd9acae1cdd0475235d5e8960a9a0d8d40de008 Mon Sep 17 00:00:00 2001
From: Rafal Szczesniak <mimir@samba.org>
Date: Thu, 24 May 2007 21:44:27 +0000
Subject: r23124: add host subcontext providing (at the moment) list of domains
 hosted on the server.

rafal
(This used to be commit 385a094443e29990a2895693f2b6435e3d32c0f3)
---
 source4/scripting/ejs/ejsnet/config.mk  |   4 +-
 source4/scripting/ejs/ejsnet/mpr_host.c |  75 +++++++++++++++++++
 source4/scripting/ejs/ejsnet/net_host.c | 125 ++++++++++++++++++++++++++++++++
 3 files changed, 203 insertions(+), 1 deletion(-)
 create mode 100644 source4/scripting/ejs/ejsnet/mpr_host.c
 create mode 100644 source4/scripting/ejs/ejsnet/net_host.c

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/ejsnet/config.mk b/source4/scripting/ejs/ejsnet/config.mk
index ce71ff51df..249a33121d 100644
--- a/source4/scripting/ejs/ejsnet/config.mk
+++ b/source4/scripting/ejs/ejsnet/config.mk
@@ -2,7 +2,9 @@
 OBJ_FILES = \
 		net_ctx.o \
 		net_user.o \
-		mpr_user.o
+		mpr_user.o \
+		net_host.o \
+		mpr_host.o
 SUBSYSTEM = smbcalls
 INIT_FUNCTION = smb_setup_ejs_net
 PRIVATE_PROTO_HEADER = proto.h
diff --git a/source4/scripting/ejs/ejsnet/mpr_host.c b/source4/scripting/ejs/ejsnet/mpr_host.c
new file mode 100644
index 0000000000..1755b23085
--- /dev/null
+++ b/source4/scripting/ejs/ejsnet/mpr_host.c
@@ -0,0 +1,75 @@
+/* 
+   Unix SMB/CIFS implementation.
+
+   provides interfaces to libnet calls from ejs scripts
+
+   Copyright (C) Rafal Szczesniak  2005-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 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.
+*/
+
+
+#include "includes.h"
+#include "lib/appweb/ejs/ejs.h"
+#include "libnet/libnet.h"
+#include "scripting/ejs/smbcalls.h"
+#include "events/events.h"
+#include "auth/credentials/credentials.h"
+
+
+/*
+  Properties:
+  DomainsList.Domains[0]
+  DomainsList.Status
+*/
+struct MprVar mprDomainsList(TALLOC_CTX *mem_ctx, struct libnet_DomainList *list, NTSTATUS result)
+{
+	const char *name = "DomainsList";
+	NTSTATUS status;
+	struct MprVar mprDomainList, mprDomains;
+	struct MprVar mprSid, mprDomainName;
+	struct MprVar mprDomain;
+	int i;
+
+	if (list == NULL || mem_ctx == NULL) {
+		mprDomainList = mprCreateNullVar();
+		goto done;
+	}
+
+	mprDomains = mprArray("Domains");
+	for (i = 0; i < list->out.count; i++) {
+		struct domainlist d = list->out.domains[i];
+
+		/* get domainlist fields */
+		mprSid        = mprString(d.sid);
+		mprDomainName = mprString(d.name);
+
+		mprDomain = mprObject("Domain");
+		mprSetVar(&mprDomain, "Name", mprDomainName);
+		mprSetVar(&mprDomain, "SID", mprSid);
+
+		mprAddArray(&mprDomains, i, mprDomain);
+	}
+
+	mprDomainList = mprObject(name);
+	status = mprSetVar(&mprDomainList, "Domains", mprDomains);
+	if (!NT_STATUS_IS_OK(status)) goto done;
+	status = mprSetVar(&mprDomainList, "Count", mprCreateIntegerVar(list->out.count));
+	if (!NT_STATUS_IS_OK(status)) goto done;
+	status = mprSetVar(&mprDomainList, "Status", mprNTSTATUS(result));
+
+done:
+	return mprDomainList;
+}
diff --git a/source4/scripting/ejs/ejsnet/net_host.c b/source4/scripting/ejs/ejsnet/net_host.c
new file mode 100644
index 0000000000..d98f1d118f
--- /dev/null
+++ b/source4/scripting/ejs/ejsnet/net_host.c
@@ -0,0 +1,125 @@
+/* 
+   Unix SMB/CIFS implementation.
+
+   provides interfaces to libnet calls from ejs scripts
+
+   Copyright (C) Rafal Szczesniak  2005-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 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.
+*/
+
+
+#include "includes.h"
+#include "lib/appweb/ejs/ejs.h"
+#include "libnet/libnet.h"
+#include "scripting/ejs/ejsnet/proto.h"
+#include "scripting/ejs/smbcalls.h"
+#include "events/events.h"
+#include "auth/credentials/credentials.h"
+
+
+static int ejs_net_domainlist(MprVarHandle eid, int argc, char **argv);
+
+
+/*
+  Usage:
+  hostCtx = net.HostMgr(hostname = <default from credentials>)
+*/
+int ejs_net_hostman(MprVarHandle eid, int argc, struct MprVar** argv)
+{
+	struct libnet_context *ctx;
+	const char *hostname;
+	struct MprVar obj;
+
+	/* libnet context */
+	ctx = mprGetThisPtr(eid, "ctx");
+	if (ctx == NULL) {
+		ejsSetErrorMsg(eid, "ctx property returns null pointer");
+		return 0;
+	}
+
+	/* fetch the arguments: host name */
+	if (argc == 0) {
+		/* default host (machine) name is supplied in credentials */
+		hostname = cli_credentials_get_workstation(ctx->cred);
+
+	} else if (argc == 1 && mprVarIsString(argv[0]->type)) {
+		/* host name has been specified */
+		hostname = mprToString(argv[0]);
+
+	} else {
+		ejsSetErrorMsg(eid, "too many arguments");
+		return 0;
+	}
+
+	/* create the NetHostCtx object */
+	obj = mprObject("NetHostCtx");
+	
+	/* create a copy of the string for the object */
+	hostname = talloc_strdup(ctx, hostname);
+
+	/* add internal libnet_context pointer to the NetHostCtx object */
+	mprSetPtrChild(&obj, "ctx", ctx);
+	mprSetPtrChild(&obj, "hostname", hostname);
+	
+	/* add methods to the object */
+	mprSetStringCFunction(&obj, "DomainList", ejs_net_domainlist);
+
+	/* set the object returned by this function */
+	mpr_Return(eid, obj);
+
+	return 0;
+}
+
+
+static int ejs_net_domainlist(MprVarHandle eid, int argc, char **argv)
+{
+	NTSTATUS status;
+	TALLOC_CTX *mem_ctx;
+	const char* hostname;
+	struct libnet_context *ctx;
+	struct libnet_DomainList req;
+	struct MprVar mprDomains;
+
+	mem_ctx = talloc_new(mprMemCtx());
+	if (mem_ctx == NULL) {
+		ejsSetErrorMsg(eid, "could not create memory context - out of memory");
+		goto done;
+	}
+
+	/* libnet context */
+	ctx = mprGetThisPtr(eid, "ctx");
+	if (ctx == NULL) {
+		ejsSetErrorMsg(eid, "ctx property returns null pointer");
+		goto done;
+	}
+
+	hostname = mprGetThisPtr(eid, "hostname");
+	if (hostname == NULL) {
+		ejsSetErrorMsg(eid, "hostname property returns null pointer");
+		goto done;
+	}
+
+	/* call the libnet function */
+	req.in.hostname = hostname;
+	
+	status = libnet_DomainList(ctx, mem_ctx, &req);
+	mprDomains = mprDomainsList(mem_ctx, &req, status);
+
+done:
+	talloc_free(mem_ctx);
+	mpr_Return(eid, mprDomains);
+	return 0;
+}
-- 
cgit 


From b0a1cf01e3cfba45273d636fd759fd2dd254f9d3 Mon Sep 17 00:00:00 2001
From: Rafal Szczesniak <mimir@samba.org>
Date: Thu, 24 May 2007 21:45:29 +0000
Subject: r23125: add host manager subcontext function.

rafal
(This used to be commit 2f16ff04d22e13cfb2dc5d8b69004d969a4c25fb)
---
 source4/scripting/ejs/ejsnet/net_ctx.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/ejsnet/net_ctx.c b/source4/scripting/ejs/ejsnet/net_ctx.c
index 1c70dc107f..e98ba59aee 100644
--- a/source4/scripting/ejs/ejsnet/net_ctx.c
+++ b/source4/scripting/ejs/ejsnet/net_ctx.c
@@ -29,6 +29,7 @@
 
 
 int ejs_net_userman(MprVarHandle eid, int argc, struct MprVar** argv);
+int ejs_net_hostman(MprVarHandle eid, int argc, struct MprVar** argv);
 
 static int ejs_net_join_domain(MprVarHandle eid, int argc, struct MprVar **argv);
 static int ejs_net_samsync_ldb(MprVarHandle eid, int argc, struct MprVar **argv);
@@ -105,6 +106,7 @@ static int ejs_net_context(MprVarHandle eid, int argc, struct MprVar **argv)
 	
 	/* add methods to the object */
 	mprSetCFunction(&obj, "UserMgr", ejs_net_userman);
+	mprSetCFunction(&obj, "HostMgr", ejs_net_hostman);
 	mprSetCFunction(&obj, "JoinDomain", ejs_net_join_domain);
 	mprSetCFunction(&obj, "SamSyncLdb", ejs_net_samsync_ldb);
 
-- 
cgit 


From c64358e339aed0adba3dc66c1e598a0d3e8073a7 Mon Sep 17 00:00:00 2001
From: Rafal Szczesniak <mimir@samba.org>
Date: Thu, 24 May 2007 21:51:25 +0000
Subject: r23126: this was sitting on my laptop for a while...

change the way the ejs object is being created and return listing
context (with status) rather than collecting all entries gathered
from libnet call.

rafal
(This used to be commit b16787a56120498c985f2617f43250df725c285a)
---
 source4/scripting/ejs/ejsnet/mpr_user.c |  3 +++
 source4/scripting/ejs/ejsnet/net_user.c | 29 +++++++++++------------------
 2 files changed, 14 insertions(+), 18 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/ejsnet/mpr_user.c b/source4/scripting/ejs/ejsnet/mpr_user.c
index efeb68ffc1..23be089fde 100644
--- a/source4/scripting/ejs/ejsnet/mpr_user.c
+++ b/source4/scripting/ejs/ejsnet/mpr_user.c
@@ -101,6 +101,7 @@ done:
   UserListCtx.ResumeIndex
   UserListCtx.Count
   UserListCtx.EndOfList
+  UserListCtx.Status
  */
 struct MprVar mprUserListCtx(TALLOC_CTX *mem_ctx, struct libnet_UserList *list, NTSTATUS result)
 {
@@ -144,6 +145,8 @@ struct MprVar mprUserListCtx(TALLOC_CTX *mem_ctx, struct libnet_UserList *list,
 	status = mprSetVar(&mprListCtx, "ResumeIndex", mprCreateIntegerVar((int)list->out.resume_index));
 	if (!NT_STATUS_IS_OK(status)) goto done;
 	status = mprSetVar(&mprListCtx, "EndOfList", mprCreateBoolVar(endOfList));
+	if (!NT_STATUS_IS_OK(status)) goto done;
+	status = mprSetVar(&mprListCtx, "Status", mprNTSTATUS(result));
 
 done:
 	return mprListCtx;
diff --git a/source4/scripting/ejs/ejsnet/net_user.c b/source4/scripting/ejs/ejsnet/net_user.c
index 804ca04cd6..ba0bad0953 100644
--- a/source4/scripting/ejs/ejsnet/net_user.c
+++ b/source4/scripting/ejs/ejsnet/net_user.c
@@ -43,7 +43,7 @@ int ejs_net_userman(MprVarHandle eid, int argc, struct MprVar **argv)
 {
 	struct libnet_context *ctx;
 	const char *userman_domain = NULL;
-	struct MprVar *obj = NULL;
+	struct MprVar obj;
 
 	/* libnet context */
 	ctx = mprGetThisPtr(eid, "ctx");
@@ -74,20 +74,23 @@ int ejs_net_userman(MprVarHandle eid, int argc, struct MprVar **argv)
 	}
 
 	/* create 'net user' subcontext */
-	obj = mprInitObject(eid, "NetUsrCtx", argc, argv);
+	obj = mprObject("NetUsrCtx");
 
 	/* we need to make a copy of the string for this object */
 	userman_domain = talloc_strdup(ctx, userman_domain);
 
 	/* add properties */
-	mprSetPtrChild(obj, "ctx", ctx);
-	mprSetPtrChild(obj, "domain", userman_domain);
+	mprSetPtrChild(&obj, "ctx", ctx);
+	mprSetPtrChild(&obj, "domain", userman_domain);
 
 	/* add methods */
-	mprSetStringCFunction(obj, "Create", ejs_net_createuser);
-	mprSetStringCFunction(obj, "Delete", ejs_net_deleteuser);
-	mprSetStringCFunction(obj, "Info", ejs_net_userinfo);
-	mprSetCFunction(obj, "List", ejs_net_userlist);
+	mprSetStringCFunction(&obj, "Create", ejs_net_createuser);
+	mprSetStringCFunction(&obj, "Delete", ejs_net_deleteuser);
+	mprSetStringCFunction(&obj, "Info", ejs_net_userinfo);
+	mprSetCFunction(&obj, "List", ejs_net_userlist);
+
+	/* set the object returned by this function */
+	mpr_Return(eid, obj);
 
 	return 0;
 }
@@ -347,16 +350,6 @@ static int ejs_net_userlist(MprVarHandle eid, int argc, struct MprVar **argv)
 	req.in.page_size     = page_size;
 	
 	status = libnet_UserList(ctx, mem_ctx, &req);
-	if (!NT_STATUS_IS_OK(status) &&
-	    !NT_STATUS_EQUAL(status, STATUS_MORE_ENTRIES) &&
-	    !NT_STATUS_EQUAL(status, NT_STATUS_NO_MORE_ENTRIES)) {
-
-		ejsSetErrorMsg(eid, "%s", req.out.error_string);
-		
-		mprListCtx = mprCreateNullVar();
-		goto done;
-	}
-
 	mprListCtx = mprUserListCtx(mem_ctx, &req, status);
 
 done:
-- 
cgit 


From 5fb459e4fa3201a3d5cbc22c5ff011bfc98a9519 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Tue, 29 May 2007 01:20:47 +0000
Subject: r23177: Add in a new provision-backend script.  This helps set up the
 OpenLDAP or Fedora DS backend.

This required a new mkdir() call in ejs.

We can now provision just the schema for ad2oLschema to operate on
(with provision_schema(), without performing the whole provision, just
to wipe it again (adjustments to 'make test' to come soon).

Andrew Bartlett
(This used to be commit 01d54d13dc66ef2127ac52c64ede53d0790738ec)
---
 source4/scripting/ejs/smbcalls_sys.c | 28 +++++++++++++++++++
 source4/scripting/libjs/provision.js | 54 ++++++++++++++++++++++++++++++++++--
 2 files changed, 80 insertions(+), 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_sys.c b/source4/scripting/ejs/smbcalls_sys.c
index ce3f3f5a98..1b1affc80d 100644
--- a/source4/scripting/ejs/smbcalls_sys.c
+++ b/source4/scripting/ejs/smbcalls_sys.c
@@ -305,6 +305,33 @@ static int ejs_sys_file_save(MprVarHandle eid, int argc, char **argv)
 	return 0;
 }
 
+/*
+  mkdir()
+  usage:
+     ok = sys.mkdir(dirname, mode);
+*/
+static int ejs_sys_mkdir(MprVarHandle eid, int argc, struct MprVar **argv)
+{
+	BOOL ret;
+	char *name;
+	if (argc != 2) {
+		ejsSetErrorMsg(eid, "sys_mkdir invalid arguments, need mkdir(dirname, mode)");
+		return -1;
+	}
+	if (!mprVarIsString(argv[0]->type)) {
+		ejsSetErrorMsg(eid, "sys_mkdir dirname not a string");
+		return -1;
+	}
+	if (!mprVarIsNumber(argv[1]->type)) {
+		ejsSetErrorMsg(eid, "sys_mkdir mode not a number");
+		return -1;
+	}
+	mprVarToString(&name, 0, NULL, argv[0]);
+	ret = mkdir(name, mprVarToNumber(argv[1]));
+	mpr_Return(eid, mprCreateBoolVar(ret == 0));
+	return 0;
+}
+
 
 /*
   return fields of a stat() call
@@ -438,6 +465,7 @@ static int ejs_sys_init(MprVarHandle eid, int argc, struct MprVar **argv)
 	mprSetCFunction(obj, "ntgmtime", ejs_sys_ntgmtime);
 	mprSetCFunction(obj, "ldaptime", ejs_sys_ldaptime);
 	mprSetCFunction(obj, "httptime", ejs_sys_httptime);
+	mprSetCFunction(obj, "mkdir", ejs_sys_mkdir);
 	mprSetStringCFunction(obj, "unlink", ejs_sys_unlink);
 	mprSetStringCFunction(obj, "file_load", ejs_sys_file_load);
 	mprSetStringCFunction(obj, "file_save", ejs_sys_file_save);
diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index d9bdb3b16b..d25c0f38eb 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -388,6 +388,7 @@ function provision_default_paths(subobj)
 	paths.ldap_basedn_ldif = lp.get("private dir") + "/" + subobj.DNSDOMAIN + ".ldif";
 	paths.ldap_config_basedn_ldif = lp.get("private dir") + "/" + subobj.DNSDOMAIN + "-config.ldif";
 	paths.ldap_schema_basedn_ldif = lp.get("private dir") + "/" + subobj.DNSDOMAIN + "-schema.ldif";
+	paths.ldapdir = lp.get("private dir") + "/ldap";
 	return paths;
 }
 
@@ -446,10 +447,11 @@ function provision_fix_subobj(subobj, message, paths)
 	var rdns = split(",", subobj.DOMAINDN);
 	subobj.RDN_DC = substr(rdns[0], strlen("DC="));
 
-	subobj.SAM_LDB		= paths.samdb;
-	subobj.SECRETS_LDB	= paths.secrets;
+	subobj.SAM_LDB		= "tdb://" + paths.samdb;
 	subobj.SECRETS_KEYTAB	= paths.keytab;
 
+	subobj.LDAPDIR = paths.ldapdir;
+
 	return true;
 }
 
@@ -703,6 +705,53 @@ function provision(subobj, message, blank, paths, session_info, credentials, lda
 	return true;
 }
 
+/*
+  provision just the schema into a temporary ldb, so we can run ad2oLschema on it
+*/
+function provision_schema(subobj, message, tmp_schema_path, paths)
+{
+	var lp = loadparm_init();
+	var sys = sys_init();
+	var info = new Object();
+
+	var ok = provision_fix_subobj(subobj, message, paths);
+	assert(ok);
+
+	info.subobj = subobj;
+	info.message = message;
+
+	message("Setting up sam.ldb partitions\n");
+
+	/* This will erase anything in the tmp db */
+	var samdb = open_ldb(info, tmp_schema_path, true);
+
+	message("Adding schema container (permitted to fail)\n");
+	var add_ok = setup_add_ldif("provision_schema_basedn.ldif", info, samdb, true);
+	message("Modifying schema container\n");
+	var modify_ok = setup_ldb_modify("provision_schema_basedn_modify.ldif", info, samdb);
+	if (!modify_ok) {
+		if (!add_ok) {
+			message("Failed to both add and modify schema dn: + samdb.errstring() + "\n");
+			message("Perhaps you need to run the provision script with the --ldap-base-dn option, and add this record to the backend manually\n"); 
+			assert(modify_ok);
+		}
+		message("Failed to modify the schema container: " + samdb.errstring() + "\n");
+		assert(modify_ok);
+	}
+
+	message("Setting up sam.ldb Samba4 schema\n");
+	setup_add_ldif("schema_samba4.ldif", info, samdb, false);
+	message("Setting up sam.ldb AD schema\n");
+	setup_add_ldif("schema.ldif", info, samdb, false);
+
+	var commit_ok = samdb.transaction_commit();
+	if (!commit_ok) {
+		info.message("samdb commit failed: " + samdb.errstring() + "\n");
+		assert(commit_ok);
+	}
+	samdb.close();
+}
+
 /* Write out a DNS zone file, from the info in the current database */
 function provision_dns(subobj, message, paths, session_info, credentials)
 {
@@ -787,6 +836,7 @@ function provision_guess()
 	subobj.KRBTGTPASS   = randpass(12);
 	subobj.MACHINEPASS  = randpass(12);
 	subobj.ADMINPASS    = randpass(12);
+	subobj.LDAPMANAGERPASS     = randpass(12);
 	subobj.DEFAULTSITE  = "Default-First-Site-Name";
 	subobj.NEWGUID      = randguid;
 	subobj.NTTIME       = nttime;
-- 
cgit 


From 86a4886e393189b7679ec6220d4d59bb6ef1b50e Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Tue, 29 May 2007 12:18:41 +0000
Subject: r23189: Work towards a totally scripted setup of LDAP backends, so
 others can easily try this out.

I also intend to use this for the selftest, but I'm chasing issues
with the OpenlDAP (but not Fedora DS) backend.

Andrew Bartlett
(This used to be commit 0f457b1d2e20c36ab220b4a6711ce7930c4c7d21)
---
 source4/scripting/libjs/provision.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index d25c0f38eb..7e55930a1a 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -385,10 +385,10 @@ function provision_default_paths(subobj)
 	paths.keytab = "secrets.keytab";
 	paths.dns = lp.get("private dir") + "/" + subobj.DNSDOMAIN + ".zone";
 	paths.winsdb = "wins.ldb";
-	paths.ldap_basedn_ldif = lp.get("private dir") + "/" + subobj.DNSDOMAIN + ".ldif";
-	paths.ldap_config_basedn_ldif = lp.get("private dir") + "/" + subobj.DNSDOMAIN + "-config.ldif";
-	paths.ldap_schema_basedn_ldif = lp.get("private dir") + "/" + subobj.DNSDOMAIN + "-schema.ldif";
 	paths.ldapdir = lp.get("private dir") + "/ldap";
+	paths.ldap_basedn_ldif = paths.ldapdir + "/" + subobj.DNSDOMAIN + ".ldif";
+	paths.ldap_config_basedn_ldif = paths.ldapdir + "/" + subobj.DNSDOMAIN + "-config.ldif";
+	paths.ldap_schema_basedn_ldif = paths.ldapdir + "/" + subobj.DNSDOMAIN + "-schema.ldif";
 	return paths;
 }
 
@@ -793,6 +793,8 @@ function provision_ldapbase(subobj, message, paths)
 
 	subobj.RDN_DC = substr(rdns[0], strlen("DC="));
 
+	sys.mkdir(paths.ldapdir, 0700);
+
 	setup_file("provision_basedn.ldif", 
 		   message, paths.ldap_basedn_ldif, 
 		   subobj);
@@ -805,7 +807,6 @@ function provision_ldapbase(subobj, message, paths)
 		   message, paths.ldap_schema_basedn_ldif, 
 		   subobj);
 
-	message("Please install the LDIF located in " + paths.ldap_basedn_ldif + ", " + paths.ldap_config_basedn_ldif + " and " + paths.ldap_schema_basedn_ldif + " into your LDAP server, and re-run with --ldap-backend=ldap://my.ldap.server\n");
 }
 
 
-- 
cgit 


From 6e68fe69ea016041ea042c9cfa62a47693faa33e Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Thu, 31 May 2007 12:08:03 +0000
Subject: r23264: Make it more clear what this is actually setting up (This
 used to be commit f687bc92aea00aa489d310ac31e08a5718a36ec4)

---
 source4/scripting/libjs/provision.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index 7e55930a1a..2832e28571 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -720,7 +720,7 @@ function provision_schema(subobj, message, tmp_schema_path, paths)
 	info.subobj = subobj;
 	info.message = message;
 
-	message("Setting up sam.ldb partitions\n");
+	message("Setting up " + tmp_schema_path + " as a temporary database to store the schema\n");
 
 	/* This will erase anything in the tmp db */
 	var samdb = open_ldb(info, tmp_schema_path, true);
-- 
cgit 


From 815cf409eb47de2f24b91a3eff31fc2d946d5d03 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Tue, 5 Jun 2007 05:35:39 +0000
Subject: r23351: Merge from SAMBA_4_0_RELEASE:

Fix a nasty issue we had with SWAT.  We could not provision into a
different domain, as we didn't re-calcuate the DOMAINDN after the user
changed it in the form.

Andrew Bartlett
(This used to be commit 430c998dc9ea41ea29cf184d03404b50ef14f78d)
---
 source4/scripting/libjs/provision.js | 40 ++++++++++++++++++++----------------
 1 file changed, 22 insertions(+), 18 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index 2832e28571..cccbebc51a 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -436,7 +436,7 @@ function setup_name_mappings(info, ldb)
 	return true;
 }
 
-function provision_fix_subobj(subobj, message, paths)
+function provision_fix_subobj(subobj, paths)
 {
 	subobj.REALM       = strupper(subobj.REALM);
 	subobj.HOSTNAME    = strlower(subobj.HOSTNAME);
@@ -444,6 +444,19 @@ function provision_fix_subobj(subobj, message, paths)
 	assert(valid_netbios_name(subobj.DOMAIN));
 	subobj.NETBIOSNAME = strupper(subobj.HOSTNAME);
 	assert(valid_netbios_name(subobj.NETBIOSNAME));
+	subobj.DNSDOMAIN    = strlower(subobj.REALM);
+	subobj.DNSNAME      = sprintf("%s.%s", 
+				      strlower(subobj.HOSTNAME), 
+				      subobj.DNSDOMAIN);
+	rdn_list = split(".", subobj.DNSDOMAIN);
+	subobj.DOMAINDN     = "DC=" + join(",DC=", rdn_list);
+	subobj.DOMAINDN_LDB = "users.ldb";
+	subobj.ROOTDN       = subobj.DOMAINDN;
+	subobj.CONFIGDN     = "CN=Configuration," + subobj.ROOTDN;
+	subobj.CONFIGDN_LDB = "configuration.ldb";
+	subobj.SCHEMADN     = "CN=Schema," + subobj.CONFIGDN;
+	subobj.SCHEMADN_LDB = "schema.ldb";
+
 	var rdns = split(",", subobj.DOMAINDN);
 	subobj.RDN_DC = substr(rdns[0], strlen("DC="));
 
@@ -461,7 +474,7 @@ function provision_become_dc(subobj, message, erase, paths, session_info)
 	var sys = sys_init();
 	var info = new Object();
 
-	var ok = provision_fix_subobj(subobj, message, paths);
+	var ok = provision_fix_subobj(subobj, paths);
 	assert(ok);
 
 	info.subobj = subobj;
@@ -511,7 +524,7 @@ function provision(subobj, message, blank, paths, session_info, credentials, lda
 	var sys = sys_init();
 	var info = new Object();
 
-	var ok = provision_fix_subobj(subobj, message, paths);
+	var ok = provision_fix_subobj(subobj, paths);
 	assert(ok);
 
 	if (subobj.DOMAINGUID != undefined) {
@@ -714,13 +727,13 @@ function provision_schema(subobj, message, tmp_schema_path, paths)
 	var sys = sys_init();
 	var info = new Object();
 
-	var ok = provision_fix_subobj(subobj, message, paths);
+	var ok = provision_fix_subobj(subobj, paths);
 	assert(ok);
 
 	info.subobj = subobj;
 	info.message = message;
 
-	message("Setting up " + tmp_schema_path + " as a temporary database to store the schema\n");
+	message("Setting up sam.ldb partitions\n");
 
 	/* This will erase anything in the tmp db */
 	var samdb = open_ldb(info, tmp_schema_path, true);
@@ -787,6 +800,9 @@ function provision_dns(subobj, message, paths, session_info, credentials)
 /* Write out a DNS zone file, from the info in the current database */
 function provision_ldapbase(subobj, message, paths)
 {
+	var ok = provision_fix_subobj(subobj, paths);
+	assert(ok);
+
 	message("Setting up LDAP base entry: " + subobj.DOMAINDN + " \n");
 	var rdns = split(",", subobj.DOMAINDN);
 	subobj.EXTENSIBLEOBJECT = "objectClass: extensibleObject";
@@ -850,19 +866,6 @@ function provision_guess()
 	subobj.BACKUP       = findnss(nss.getgrnam, "backup", "wheel", "root", "staff");
 	subobj.USERS        = findnss(nss.getgrnam, "users", "guest", "other", "unknown", "usr");
 
-	subobj.DNSDOMAIN    = strlower(subobj.REALM);
-	subobj.DNSNAME      = sprintf("%s.%s", 
-				      strlower(subobj.HOSTNAME), 
-				      subobj.DNSDOMAIN);
-	rdn_list = split(".", subobj.DNSDOMAIN);
-	subobj.DOMAINDN     = "DC=" + join(",DC=", rdn_list);
-	subobj.DOMAINDN_LDB = "users.ldb";
-	subobj.ROOTDN       = subobj.DOMAINDN;
-	subobj.CONFIGDN     = "CN=Configuration," + subobj.ROOTDN;
-	subobj.CONFIGDN_LDB = "configuration.ldb";
-	subobj.SCHEMADN     = "CN=Schema," + subobj.CONFIGDN;
-	subobj.SCHEMADN_LDB = "schema.ldb";
-
 	//Add modules to the list to activate them by default
 	//beware often order is important
 	//
@@ -892,6 +895,7 @@ function provision_guess()
 
 	subobj.EXTENSIBLEOBJECT = "# no objectClass: extensibleObject for local ldb";
 	subobj.ACI		= "# no aci for local ldb";
+
 	return subobj;
 }
 
-- 
cgit 


From 7f2709b3979864cf948e94e18cf268b6f8ffc483 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Wed, 6 Jun 2007 01:36:15 +0000
Subject: r23361: Merge from SAMBA_4_0_RELEASE:

Print the smb.conf path being created in provision.

Andrew Bartlett
(This used to be commit bb583463bf483e1b355647f9fc93afbfcb9d41d3)
---
 source4/scripting/libjs/provision.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index cccbebc51a..9adcab2679 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -547,7 +547,7 @@ function provision(subobj, message, blank, paths, session_info, credentials, lda
 	/* only install a new smb.conf if there isn't one there already */
 	var st = sys.stat(paths.smbconf);
 	if (st == undefined) {
-		message("Setting up smb.conf\n");
+		message("Setting up " + paths.smbconf +"\n");
 		setup_file("provision.smb.conf", info.message, paths.smbconf, subobj);
 		lp.reload();
 	}
-- 
cgit 


From e9d19477e43b65f91bd152f5249b684dbefa5cc6 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Thu, 21 Jun 2007 10:18:20 +0000
Subject: r23560: - Activate metze's schema modules (from metze's
 schema-loading-13 patch). - samba3sam.js: rework the samba3sam test to not
 use objectCategory,   as it's has special rules (dnsName a simple match) -
 ldap.js: Test the ordering of the objectClass attributes for the baseDN -
 schema_init.c: Load the mayContain and mustContain (and system...) attributes
 when   reading the schema from ldb - To make the schema load not suck in
 terms of performance, write the   schema into a static global variable -
 ldif_handlers.c: Match objectCategory for equality and canonicolisation  
 based on the loaded schema, not simple tring manipuation - ldb_msg.c: don't
 duplicate attributes when adding attributes to a list - kludge_acl.c: return
 allowedAttributesEffective based on schema results   and privilages

Andrew Bartlett
(This used to be commit dcff83ebe463bc7391841f55856d7915c204d000)
---
 source4/scripting/libjs/provision.js | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index 9adcab2679..f94c34e932 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -611,7 +611,7 @@ function provision(subobj, message, blank, paths, session_info, credentials, lda
 	var modify_ok = setup_ldb_modify("provision_schema_basedn_modify.ldif", info, samdb);
 	if (!modify_ok) {
 		if (!add_ok) {
-			message("Failed to both add and modify schema dn: + samdb.errstring() + "\n");
+			message("Failed to both add and modify schema dn:" + samdb.errstring() + "\n");
 			message("Perhaps you need to run the provision script with the --ldap-base-dn option, and add this record to the backend manually\n"); 
 			assert(modify_ok);
 		}
@@ -744,7 +744,7 @@ function provision_schema(subobj, message, tmp_schema_path, paths)
 	var modify_ok = setup_ldb_modify("provision_schema_basedn_modify.ldif", info, samdb);
 	if (!modify_ok) {
 		if (!add_ok) {
-			message("Failed to both add and modify schema dn: + samdb.errstring() + "\n");
+			message("Failed to both add and modify schema dn: " + samdb.errstring() + "\n");
 			message("Perhaps you need to run the provision script with the --ldap-base-dn option, and add this record to the backend manually\n"); 
 			assert(modify_ok);
 		}
@@ -882,16 +882,18 @@ function provision_guess()
 					"extended_dn",
 					"asq",
 					"samldb",
-					"password_hash",
 					"operational",
 					"objectclass",
 					"rdn_name",
 					"show_deleted",
 					"partition");
 	subobj.MODULES_LIST = join(",", modules_list);
-	subobj.DOMAINDN_MOD = "objectguid";
-	subobj.CONFIGDN_MOD = "objectguid";
-	subobj.SCHEMADN_MOD = "objectguid";
+	subobj.DOMAINDN_MOD = "pdc_fsmo,password_hash";
+	subobj.CONFIGDN_MOD = "naming_fsmo";
+	subobj.SCHEMADN_MOD = "schema_fsmo";
+	subobj.DOMAINDN_MOD2 = ",objectguid";
+	subobj.CONFIGDN_MOD2 = ",objectguid";
+	subobj.SCHEMADN_MOD2 = ",objectguid";
 
 	subobj.EXTENSIBLEOBJECT = "# no objectClass: extensibleObject for local ldb";
 	subobj.ACI		= "# no aci for local ldb";
-- 
cgit 


From 222c6dd7818c729540079cc480ee56812681854e Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Tue, 3 Jul 2007 08:05:55 +0000
Subject: r23680: Make it easier to setup a domain member server - the 'server
 role' will now control the auth methods, but an override is still available,
 ex:

auth methods:domain controller = <methods>

Andrew Bartlett
(This used to be commit b7e727186ed8eda6a68c873e089f655dc24fe8ae)
---
 source4/scripting/ejs/smbcalls_auth.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_auth.c b/source4/scripting/ejs/smbcalls_auth.c
index 7b9fe2fc17..5509e78357 100644
--- a/source4/scripting/ejs/smbcalls_auth.c
+++ b/source4/scripting/ejs/smbcalls_auth.c
@@ -56,7 +56,7 @@ static int ejs_doauth(MprVarHandle eid,
 		msg = messaging_client_init(tmp_ctx, ev);
 	}
 
-	nt_status = auth_context_create(tmp_ctx, auth_types, ev, msg, &auth_context);
+	nt_status = auth_context_create_methods(tmp_ctx, auth_types, ev, msg, &auth_context);
 	if (!NT_STATUS_IS_OK(nt_status)) {
 		mprSetPropertyValue(auth, "result", mprCreateBoolVar(False));
 		mprSetPropertyValue(auth, "report", mprString("Auth System Failure"));
-- 
cgit 


From 3a78f7323a986703c9b7100f551b1c907a9e104b Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Wed, 4 Jul 2007 11:06:32 +0000
Subject: r23703: Start to get Samba4 to again work with LDAP backends, after I
 turned on metze's schema work.

Andrew Bartlett
(This used to be commit 3111bbdf64f57bf8d2638fd9829c071dcfeb4af1)
---
 source4/scripting/libjs/provision.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index f94c34e932..2f3f738821 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -450,12 +450,9 @@ function provision_fix_subobj(subobj, paths)
 				      subobj.DNSDOMAIN);
 	rdn_list = split(".", subobj.DNSDOMAIN);
 	subobj.DOMAINDN     = "DC=" + join(",DC=", rdn_list);
-	subobj.DOMAINDN_LDB = "users.ldb";
 	subobj.ROOTDN       = subobj.DOMAINDN;
 	subobj.CONFIGDN     = "CN=Configuration," + subobj.ROOTDN;
-	subobj.CONFIGDN_LDB = "configuration.ldb";
 	subobj.SCHEMADN     = "CN=Schema," + subobj.CONFIGDN;
-	subobj.SCHEMADN_LDB = "schema.ldb";
 
 	var rdns = split(",", subobj.DOMAINDN);
 	subobj.RDN_DC = substr(rdns[0], strlen("DC="));
@@ -888,6 +885,9 @@ function provision_guess()
 					"show_deleted",
 					"partition");
 	subobj.MODULES_LIST = join(",", modules_list);
+	subobj.DOMAINDN_LDB = "users.ldb";
+	subobj.CONFIGDN_LDB = "configuration.ldb";
+	subobj.SCHEMADN_LDB = "schema.ldb";
 	subobj.DOMAINDN_MOD = "pdc_fsmo,password_hash";
 	subobj.CONFIGDN_MOD = "naming_fsmo";
 	subobj.SCHEMADN_MOD = "schema_fsmo";
-- 
cgit 


From c37cfae81e6f87feecb0737cb7e646c9a7da1114 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Thu, 5 Jul 2007 00:34:11 +0000
Subject: r23715: Make the provision-backend script print out the exact
 commands to run, to set up the LDAP backend.

Andrew Bartlett
(This used to be commit cc7900210a2e473060d5897ec729923ac6b2f18d)
---
 source4/scripting/libjs/provision.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index 2f3f738821..2ef0747f0d 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -448,7 +448,7 @@ function provision_fix_subobj(subobj, paths)
 	subobj.DNSNAME      = sprintf("%s.%s", 
 				      strlower(subobj.HOSTNAME), 
 				      subobj.DNSDOMAIN);
-	rdn_list = split(".", subobj.DNSDOMAIN);
+	var rdn_list = split(".", subobj.DNSDOMAIN);
 	subobj.DOMAINDN     = "DC=" + join(",DC=", rdn_list);
 	subobj.ROOTDN       = subobj.DOMAINDN;
 	subobj.CONFIGDN     = "CN=Configuration," + subobj.ROOTDN;
@@ -461,6 +461,8 @@ function provision_fix_subobj(subobj, paths)
 	subobj.SECRETS_KEYTAB	= paths.keytab;
 
 	subobj.LDAPDIR = paths.ldapdir;
+	var ldap_path_list = split("/", paths.ldapdir);
+	subobj.LDAPI_URI = "ldapi://" + join("%2F", ldap_path_list) + "%2Fldapi";
 
 	return true;
 }
@@ -583,7 +585,7 @@ function provision(subobj, message, blank, paths, session_info, credentials, lda
 	var modify_ok = setup_ldb_modify("provision_basedn_modify.ldif", info, samdb);
 	if (!modify_ok) {
 		if (!add_ok) {
-			message("Failed to both add and modify " + subobj.DOMAINDN + " in target " + subobj.DOMAINDN_LDB + ": " + samdb.errstring() + "\n");
+			message("%s", "Failed to both add and modify " + subobj.DOMAINDN + " in target " + subobj.DOMAINDN_LDB + ": " + samdb.errstring() + "\n");
 			message("Perhaps you need to run the provision script with the --ldap-base-dn option, and add this record to the backend manually\n"); 
 		};
 		assert(modify_ok);
@@ -595,7 +597,7 @@ function provision(subobj, message, blank, paths, session_info, credentials, lda
 	var modify_ok = setup_ldb_modify("provision_configuration_basedn_modify.ldif", info, samdb);
 	if (!modify_ok) {
 		if (!add_ok) {
-			message("Failed to both add and modify configuration dn: " + samdb.errstring() + "\n");
+			message("%s", "Failed to both add and modify " + subobj.CONFIGDN + " in target " + subobj.CONFIGDN_LDB + ": " + samdb.errstring() + "\n");
 			message("Perhaps you need to run the provision script with the --ldap-base-dn option, and add this record to the backend manually\n"); 
 			assert(modify_ok);
 		}
@@ -608,7 +610,7 @@ function provision(subobj, message, blank, paths, session_info, credentials, lda
 	var modify_ok = setup_ldb_modify("provision_schema_basedn_modify.ldif", info, samdb);
 	if (!modify_ok) {
 		if (!add_ok) {
-			message("Failed to both add and modify schema dn:" + samdb.errstring() + "\n");
+			message("%s", "Failed to both add and modify " + subobj.SCHEMADN + " in target " + subobj.SCHEMADN_LDB + ": " + samdb.errstring() + "\n");
 			message("Perhaps you need to run the provision script with the --ldap-base-dn option, and add this record to the backend manually\n"); 
 			assert(modify_ok);
 		}
-- 
cgit 


From 97172e11204b2863ab1e4021aea3c40668d33aef Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Thu, 5 Jul 2007 01:45:37 +0000
Subject: r23716: Clarify LDAP Manager DN and fix slapd startup syntax.

Andrew Bartlett
(This used to be commit 17dad5d8c345c2c3a7643bff7a43473339a22d40)
---
 source4/scripting/libjs/provision.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index 2ef0747f0d..4317a37a54 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -464,6 +464,8 @@ function provision_fix_subobj(subobj, paths)
 	var ldap_path_list = split("/", paths.ldapdir);
 	subobj.LDAPI_URI = "ldapi://" + join("%2F", ldap_path_list) + "%2Fldapi";
 
+	subobj.LDAP_MANAGERDN = "cn=Manager," + subobj.DOMAINDN;
+
 	return true;
 }
 
@@ -852,7 +854,7 @@ function provision_guess()
 	subobj.KRBTGTPASS   = randpass(12);
 	subobj.MACHINEPASS  = randpass(12);
 	subobj.ADMINPASS    = randpass(12);
-	subobj.LDAPMANAGERPASS     = randpass(12);
+	subobj.LDAP_MANAGERPASS     = randpass(12);
 	subobj.DEFAULTSITE  = "Default-First-Site-Name";
 	subobj.NEWGUID      = randguid;
 	subobj.NTTIME       = nttime;
-- 
cgit 


From 90b49dc5208a083922c75595749d9abd4ef5b652 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Thu, 5 Jul 2007 02:52:58 +0000
Subject: r23717: We need to remove the _ in LDAP_MANAGERPASS for the
 --ldap-manager-pass= option to work.

Andrew Bartlett
(This used to be commit fbcb1ec14125a4ca57922ec75b01af9a99dcd954)
---
 source4/scripting/libjs/provision.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index 4317a37a54..323c7cdacb 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -464,7 +464,7 @@ function provision_fix_subobj(subobj, paths)
 	var ldap_path_list = split("/", paths.ldapdir);
 	subobj.LDAPI_URI = "ldapi://" + join("%2F", ldap_path_list) + "%2Fldapi";
 
-	subobj.LDAP_MANAGERDN = "cn=Manager," + subobj.DOMAINDN;
+	subobj.LDAPMANAGERDN = "cn=Manager," + subobj.DOMAINDN;
 
 	return true;
 }
@@ -854,7 +854,7 @@ function provision_guess()
 	subobj.KRBTGTPASS   = randpass(12);
 	subobj.MACHINEPASS  = randpass(12);
 	subobj.ADMINPASS    = randpass(12);
-	subobj.LDAP_MANAGERPASS     = randpass(12);
+	subobj.LDAPMANAGERPASS     = randpass(12);
 	subobj.DEFAULTSITE  = "Default-First-Site-Name";
 	subobj.NEWGUID      = randguid;
 	subobj.NTTIME       = nttime;
-- 
cgit 


From 967866f17084df7a78ed6ecfcb9d2b31deaa28a1 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Thu, 5 Jul 2007 06:15:40 +0000
Subject: r23720: Allow the member server to work against an LDAP Backend. 
 Another case where LDB isn't as strict as OpenLDAP, the self join record
 contains duplicate servicePrincipalNames once the DNS name and domain name
 are made equal.  (Easier to just skip the useless self-join).

Andrew Bartlett
(This used to be commit 49ff929be6fcf57721532de13bdd7a7e1617af6f)
---
 source4/scripting/libjs/provision.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index 323c7cdacb..deaa97114a 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -700,6 +700,11 @@ function provision(subobj, message, blank, paths, session_info, credentials, lda
 	message("Setting up sam.ldb users and groups\n");
 	setup_add_ldif("provision_users.ldif", info, samdb, false);
 
+	if (lp.get("server role") == "domain controller") {
+		message("Setting up self join\n");
+		setup_add_ldif("provision_self_join.ldif", info, samdb, false);
+	}
+
 	if (setup_name_mappings(info, samdb) == false) {
 		return false;
 	}
@@ -769,6 +774,11 @@ function provision_schema(subobj, message, tmp_schema_path, paths)
 /* Write out a DNS zone file, from the info in the current database */
 function provision_dns(subobj, message, paths, session_info, credentials)
 {
+	var lp = loadparm_init();
+	if (lp.get("server role") != "domain controller") {
+		message("No DNS zone required for role %s\n", lp.get("server role"));
+		return;
+	}
 	message("Setting up DNS zone: " + subobj.DNSDOMAIN + " \n");
 	var ldb = ldb_init();
 	ldb.session_info = session_info;
-- 
cgit 


From 0479a2f1cbae51fcd8dbdc3c148c808421fb4d25 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Tue, 10 Jul 2007 02:07:03 +0000
Subject: r23792: convert Samba4 to GPLv3

There are still a few tidyups of old FSF addresses to come (in both s3
and s4). More commits soon.
(This used to be commit fcf38a38ac691abd0fa51b89dc951a08e89fdafa)
---
 source4/scripting/ejs/ejsnet/mpr_host.c  | 5 ++---
 source4/scripting/ejs/ejsnet/mpr_user.c  | 5 ++---
 source4/scripting/ejs/ejsnet/net_ctx.c   | 5 ++---
 source4/scripting/ejs/ejsnet/net_host.c  | 5 ++---
 source4/scripting/ejs/ejsnet/net_user.c  | 5 ++---
 source4/scripting/ejs/ejsrpc.c           | 5 ++---
 source4/scripting/ejs/ejsrpc.h           | 5 ++---
 source4/scripting/ejs/mprutil.c          | 5 ++---
 source4/scripting/ejs/smbcalls.c         | 5 ++---
 source4/scripting/ejs/smbcalls.h         | 5 ++---
 source4/scripting/ejs/smbcalls_auth.c    | 5 ++---
 source4/scripting/ejs/smbcalls_cli.c     | 5 ++---
 source4/scripting/ejs/smbcalls_config.c  | 5 ++---
 source4/scripting/ejs/smbcalls_creds.c   | 5 ++---
 source4/scripting/ejs/smbcalls_data.c    | 5 ++---
 source4/scripting/ejs/smbcalls_ldb.c     | 5 ++---
 source4/scripting/ejs/smbcalls_nbt.c     | 5 ++---
 source4/scripting/ejs/smbcalls_nss.c     | 5 ++---
 source4/scripting/ejs/smbcalls_options.c | 5 ++---
 source4/scripting/ejs/smbcalls_param.c   | 5 ++---
 source4/scripting/ejs/smbcalls_rand.c    | 5 ++---
 source4/scripting/ejs/smbcalls_rpc.c     | 5 ++---
 source4/scripting/ejs/smbcalls_samba3.c  | 5 ++---
 source4/scripting/ejs/smbcalls_string.c  | 5 ++---
 source4/scripting/ejs/smbcalls_sys.c     | 5 ++---
 source4/scripting/ejs/smbscript.c        | 5 ++---
 source4/scripting/swig/dcerpc.i          | 5 ++---
 27 files changed, 54 insertions(+), 81 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/ejsnet/mpr_host.c b/source4/scripting/ejs/ejsnet/mpr_host.c
index 1755b23085..8258ea5256 100644
--- a/source4/scripting/ejs/ejsnet/mpr_host.c
+++ b/source4/scripting/ejs/ejsnet/mpr_host.c
@@ -7,7 +7,7 @@
    
    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
+   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,
@@ -16,8 +16,7 @@
    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.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 
diff --git a/source4/scripting/ejs/ejsnet/mpr_user.c b/source4/scripting/ejs/ejsnet/mpr_user.c
index 23be089fde..6691a0f955 100644
--- a/source4/scripting/ejs/ejsnet/mpr_user.c
+++ b/source4/scripting/ejs/ejsnet/mpr_user.c
@@ -7,7 +7,7 @@
    
    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
+   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,
@@ -16,8 +16,7 @@
    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.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
diff --git a/source4/scripting/ejs/ejsnet/net_ctx.c b/source4/scripting/ejs/ejsnet/net_ctx.c
index e98ba59aee..411c98cc72 100644
--- a/source4/scripting/ejs/ejsnet/net_ctx.c
+++ b/source4/scripting/ejs/ejsnet/net_ctx.c
@@ -7,7 +7,7 @@
    
    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
+   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,
@@ -16,8 +16,7 @@
    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.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
diff --git a/source4/scripting/ejs/ejsnet/net_host.c b/source4/scripting/ejs/ejsnet/net_host.c
index d98f1d118f..478da19db3 100644
--- a/source4/scripting/ejs/ejsnet/net_host.c
+++ b/source4/scripting/ejs/ejsnet/net_host.c
@@ -7,7 +7,7 @@
    
    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
+   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,
@@ -16,8 +16,7 @@
    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.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 
diff --git a/source4/scripting/ejs/ejsnet/net_user.c b/source4/scripting/ejs/ejsnet/net_user.c
index ba0bad0953..8c9ab9f0eb 100644
--- a/source4/scripting/ejs/ejsnet/net_user.c
+++ b/source4/scripting/ejs/ejsnet/net_user.c
@@ -7,7 +7,7 @@
    
    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
+   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,
@@ -16,8 +16,7 @@
    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.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
diff --git a/source4/scripting/ejs/ejsrpc.c b/source4/scripting/ejs/ejsrpc.c
index fa5d880a1c..966c803a30 100644
--- a/source4/scripting/ejs/ejsrpc.c
+++ b/source4/scripting/ejs/ejsrpc.c
@@ -7,7 +7,7 @@
    
    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
+   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,
@@ -16,8 +16,7 @@
    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.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
diff --git a/source4/scripting/ejs/ejsrpc.h b/source4/scripting/ejs/ejsrpc.h
index e4be242c91..4c7e5d9ee5 100644
--- a/source4/scripting/ejs/ejsrpc.h
+++ b/source4/scripting/ejs/ejsrpc.h
@@ -7,7 +7,7 @@
    
    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
+   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,
@@ -16,8 +16,7 @@
    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.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "librpc/gen_ndr/security.h"
diff --git a/source4/scripting/ejs/mprutil.c b/source4/scripting/ejs/mprutil.c
index 459f198dca..b8271d97c5 100644
--- a/source4/scripting/ejs/mprutil.c
+++ b/source4/scripting/ejs/mprutil.c
@@ -7,7 +7,7 @@
    
    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
+   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,
@@ -16,8 +16,7 @@
    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.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
diff --git a/source4/scripting/ejs/smbcalls.c b/source4/scripting/ejs/smbcalls.c
index 04c534bdf5..bc7994a007 100644
--- a/source4/scripting/ejs/smbcalls.c
+++ b/source4/scripting/ejs/smbcalls.c
@@ -8,7 +8,7 @@
    
    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
+   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,
@@ -17,8 +17,7 @@
    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.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
diff --git a/source4/scripting/ejs/smbcalls.h b/source4/scripting/ejs/smbcalls.h
index a525403493..77d9dd3381 100644
--- a/source4/scripting/ejs/smbcalls.h
+++ b/source4/scripting/ejs/smbcalls.h
@@ -7,7 +7,7 @@
    
    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
+   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,
@@ -16,8 +16,7 @@
    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.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "lib/appweb/ejs/ejs.h"
diff --git a/source4/scripting/ejs/smbcalls_auth.c b/source4/scripting/ejs/smbcalls_auth.c
index 5509e78357..dfca4ffac0 100644
--- a/source4/scripting/ejs/smbcalls_auth.c
+++ b/source4/scripting/ejs/smbcalls_auth.c
@@ -8,7 +8,7 @@
    
    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
+   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,
@@ -17,8 +17,7 @@
    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.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
diff --git a/source4/scripting/ejs/smbcalls_cli.c b/source4/scripting/ejs/smbcalls_cli.c
index 914d163ec7..e94207bf36 100644
--- a/source4/scripting/ejs/smbcalls_cli.c
+++ b/source4/scripting/ejs/smbcalls_cli.c
@@ -7,7 +7,7 @@
    
    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
+   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,
@@ -16,8 +16,7 @@
    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.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
diff --git a/source4/scripting/ejs/smbcalls_config.c b/source4/scripting/ejs/smbcalls_config.c
index 6ee9c8305b..64310c08fd 100644
--- a/source4/scripting/ejs/smbcalls_config.c
+++ b/source4/scripting/ejs/smbcalls_config.c
@@ -7,7 +7,7 @@
    
    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
+   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,
@@ -16,8 +16,7 @@
    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.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
diff --git a/source4/scripting/ejs/smbcalls_creds.c b/source4/scripting/ejs/smbcalls_creds.c
index 6e2c87a9b3..0feead201e 100644
--- a/source4/scripting/ejs/smbcalls_creds.c
+++ b/source4/scripting/ejs/smbcalls_creds.c
@@ -7,7 +7,7 @@
    
    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
+   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,
@@ -16,8 +16,7 @@
    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.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
diff --git a/source4/scripting/ejs/smbcalls_data.c b/source4/scripting/ejs/smbcalls_data.c
index 4ee4230aee..60dadc5165 100644
--- a/source4/scripting/ejs/smbcalls_data.c
+++ b/source4/scripting/ejs/smbcalls_data.c
@@ -7,7 +7,7 @@
    
    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
+   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,
@@ -16,8 +16,7 @@
    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.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
diff --git a/source4/scripting/ejs/smbcalls_ldb.c b/source4/scripting/ejs/smbcalls_ldb.c
index 33f371cd4e..06384c8dbd 100644
--- a/source4/scripting/ejs/smbcalls_ldb.c
+++ b/source4/scripting/ejs/smbcalls_ldb.c
@@ -8,7 +8,7 @@
    
    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
+   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,
@@ -17,8 +17,7 @@
    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.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
diff --git a/source4/scripting/ejs/smbcalls_nbt.c b/source4/scripting/ejs/smbcalls_nbt.c
index 15b560bd93..4a7ef682f8 100644
--- a/source4/scripting/ejs/smbcalls_nbt.c
+++ b/source4/scripting/ejs/smbcalls_nbt.c
@@ -7,7 +7,7 @@
    
    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
+   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,
@@ -16,8 +16,7 @@
    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.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
diff --git a/source4/scripting/ejs/smbcalls_nss.c b/source4/scripting/ejs/smbcalls_nss.c
index 6b18227845..58f86d3b6c 100644
--- a/source4/scripting/ejs/smbcalls_nss.c
+++ b/source4/scripting/ejs/smbcalls_nss.c
@@ -7,7 +7,7 @@
    
    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
+   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,
@@ -16,8 +16,7 @@
    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.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
diff --git a/source4/scripting/ejs/smbcalls_options.c b/source4/scripting/ejs/smbcalls_options.c
index d24d689cf3..93872baa40 100644
--- a/source4/scripting/ejs/smbcalls_options.c
+++ b/source4/scripting/ejs/smbcalls_options.c
@@ -7,7 +7,7 @@
    
    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
+   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,
@@ -16,8 +16,7 @@
    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.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
diff --git a/source4/scripting/ejs/smbcalls_param.c b/source4/scripting/ejs/smbcalls_param.c
index 0169e09709..afdee28a65 100644
--- a/source4/scripting/ejs/smbcalls_param.c
+++ b/source4/scripting/ejs/smbcalls_param.c
@@ -7,7 +7,7 @@
    
    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
+   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,
@@ -16,8 +16,7 @@
    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.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
diff --git a/source4/scripting/ejs/smbcalls_rand.c b/source4/scripting/ejs/smbcalls_rand.c
index 9027efc3e6..7834d9552c 100644
--- a/source4/scripting/ejs/smbcalls_rand.c
+++ b/source4/scripting/ejs/smbcalls_rand.c
@@ -7,7 +7,7 @@
    
    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
+   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,
@@ -16,8 +16,7 @@
    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.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
diff --git a/source4/scripting/ejs/smbcalls_rpc.c b/source4/scripting/ejs/smbcalls_rpc.c
index 73b6661cd3..8fdb7d1414 100644
--- a/source4/scripting/ejs/smbcalls_rpc.c
+++ b/source4/scripting/ejs/smbcalls_rpc.c
@@ -7,7 +7,7 @@
    
    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
+   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,
@@ -16,8 +16,7 @@
    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.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
diff --git a/source4/scripting/ejs/smbcalls_samba3.c b/source4/scripting/ejs/smbcalls_samba3.c
index 64517bad28..3c550e57cd 100644
--- a/source4/scripting/ejs/smbcalls_samba3.c
+++ b/source4/scripting/ejs/smbcalls_samba3.c
@@ -7,7 +7,7 @@
    
    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
+   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,
@@ -16,8 +16,7 @@
    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.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
diff --git a/source4/scripting/ejs/smbcalls_string.c b/source4/scripting/ejs/smbcalls_string.c
index ab5aecd847..b83178dbba 100644
--- a/source4/scripting/ejs/smbcalls_string.c
+++ b/source4/scripting/ejs/smbcalls_string.c
@@ -8,7 +8,7 @@
    
    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
+   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,
@@ -17,8 +17,7 @@
    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.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
diff --git a/source4/scripting/ejs/smbcalls_sys.c b/source4/scripting/ejs/smbcalls_sys.c
index 1b1affc80d..96e665ab3a 100644
--- a/source4/scripting/ejs/smbcalls_sys.c
+++ b/source4/scripting/ejs/smbcalls_sys.c
@@ -7,7 +7,7 @@
    
    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
+   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,
@@ -16,8 +16,7 @@
    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.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
diff --git a/source4/scripting/ejs/smbscript.c b/source4/scripting/ejs/smbscript.c
index 26f4c0f070..c97bc1ff8d 100644
--- a/source4/scripting/ejs/smbscript.c
+++ b/source4/scripting/ejs/smbscript.c
@@ -8,7 +8,7 @@
 
    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
+   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,
@@ -17,8 +17,7 @@
    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.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
diff --git a/source4/scripting/swig/dcerpc.i b/source4/scripting/swig/dcerpc.i
index 2111404bc6..cf394ba338 100644
--- a/source4/scripting/swig/dcerpc.i
+++ b/source4/scripting/swig/dcerpc.i
@@ -9,7 +9,7 @@
    
    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
+   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,
@@ -18,8 +18,7 @@
    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.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 %module dcerpc
-- 
cgit 


From b8d69a7ea2505b706ff7c74d7c97bc89d82dfa07 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Tue, 10 Jul 2007 02:46:15 +0000
Subject: r23795: more v2->v3 conversion (This used to be commit
 84b468b2f8f2dffda89593f816e8bc6a8b6d42ac)

---
 source4/scripting/swig/samba.i | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/samba.i b/source4/scripting/swig/samba.i
index 1446f9a8d5..882af7a4ff 100644
--- a/source4/scripting/swig/samba.i
+++ b/source4/scripting/swig/samba.i
@@ -12,7 +12,7 @@
    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.
+   version 3 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
-- 
cgit 


From 6c973f4e8ccbcb6c9275f8a54e26abb19df7e15a Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Tue, 10 Jul 2007 03:42:26 +0000
Subject: r23798: updated old Temple Place FSF addresses to new URL (This used
 to be commit 40c0919aaa9c1b14bbaebb95ecce53eb0380fdbb)

---
 source4/scripting/swig/samba.i | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/samba.i b/source4/scripting/swig/samba.i
index 882af7a4ff..859bdb06e3 100644
--- a/source4/scripting/swig/samba.i
+++ b/source4/scripting/swig/samba.i
@@ -20,8 +20,7 @@
    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
+   License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
 
 %apply int { uint8_t };
-- 
cgit 


From a21ea3351af893618c0356c49b5033bf7509044d Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Thu, 12 Jul 2007 04:56:33 +0000
Subject: r23848: Thanks to derrell for pointing out that I had not finished my
 patch to split out the auth methods.

This caused all SWAT logins to fail, except when using local system
authentication.

Andrew Bartlett
(This used to be commit b5a9d507a37cd46bd325ff3118c08b4362f267f2)
---
 source4/scripting/ejs/smbcalls_auth.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_auth.c b/source4/scripting/ejs/smbcalls_auth.c
index dfca4ffac0..94a74e8e2a 100644
--- a/source4/scripting/ejs/smbcalls_auth.c
+++ b/source4/scripting/ejs/smbcalls_auth.c
@@ -55,7 +55,11 @@ static int ejs_doauth(MprVarHandle eid,
 		msg = messaging_client_init(tmp_ctx, ev);
 	}
 
-	nt_status = auth_context_create_methods(tmp_ctx, auth_types, ev, msg, &auth_context);
+	if (auth_types) {
+		nt_status = auth_context_create_methods(tmp_ctx, auth_types, ev, msg, &auth_context);
+	} else {
+		nt_status = auth_context_create(tmp_ctx, ev, msg, &auth_context);
+	}
 	if (!NT_STATUS_IS_OK(nt_status)) {
 		mprSetPropertyValue(auth, "result", mprCreateBoolVar(False));
 		mprSetPropertyValue(auth, "report", mprString("Auth System Failure"));
@@ -173,7 +177,7 @@ static int ejs_userAuth(MprVarHandle eid, int argc, struct MprVar **argv)
 	if (domain && (strcmp("SYSTEM USER", domain) == 0)) {
 		ejs_doauth(eid, tmp_ctx, &auth, username, password, domain, workstation, remote_host, auth_types_unix);
 	} else {
-		ejs_doauth(eid, tmp_ctx, &auth, username, password, domain, workstation, remote_host, lp_auth_methods());
+		ejs_doauth(eid, tmp_ctx, &auth, username, password, domain, workstation, remote_host, NULL);
 	}
 
 	mpr_Return(eid, auth);
-- 
cgit 


From 10f6e1657303dabcf7dbbaed8547f0cb6e845a5d Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Fri, 13 Jul 2007 08:01:36 +0000
Subject: r23859: Work to have Group Policy work 'out of the box' in Samba4.

This involves creating the SYSVOL and NETLOGON shares at provision
time, and creating the right subdirectories.

This also changes the behaviour of lp.get("foo") in ejs - we now
return undefined, rather than syntax error, if the parameter doesn't
exist (perhaps because the share isn't defined).

Andrew Bartlett
(This used to be commit 45cadf3bc0d38f6600666511a392e1ce353adee7)
---
 source4/scripting/ejs/smbcalls_config.c | 41 +++++++++++++++++++++++++--------
 source4/scripting/libjs/provision.js    | 26 +++++++++++++++++++++
 2 files changed, 57 insertions(+), 10 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_config.c b/source4/scripting/ejs/smbcalls_config.c
index 64310c08fd..6f15ee5a4a 100644
--- a/source4/scripting/ejs/smbcalls_config.c
+++ b/source4/scripting/ejs/smbcalls_config.c
@@ -89,7 +89,8 @@ static int ejs_lpGet(MprVarHandle eid, int argc, char **argv)
 		/* its a share parameter */
 		int snum = lp_servicenumber(argv[0]);
 		if (snum == -1) {
-			return -1;
+			mpr_Return(eid, mprCreateUndefinedVar());
+			return 0;
 		}
 		if (strchr(argv[1], ':')) {
 			/* its a parametric option on a share */
@@ -98,16 +99,23 @@ static int ejs_lpGet(MprVarHandle eid, int argc, char **argv)
 							  strcspn(argv[1], ":"));
 			const char *option = strchr(argv[1], ':') + 1;
 			const char *value;
-			if (type == NULL || option == NULL) return -1;
+			if (type == NULL || option == NULL) {
+				mpr_Return(eid, mprCreateUndefinedVar());
+				return 0;
+			}
 			value = lp_get_parametric(snum, type, option);
-			if (value == NULL) return -1;
+			if (value == NULL) {
+				mpr_Return(eid, mprCreateUndefinedVar());
+				return 0;
+			}
 			mpr_ReturnString(eid, value);
 			return 0;
 		}
 
 		parm = lp_parm_struct(argv[1]);
 		if (parm == NULL || parm->class == P_GLOBAL) {
-			return -1;
+			mpr_Return(eid, mprCreateUndefinedVar());
+			return 0;
 		}
 		parm_ptr = lp_parm_ptr(snum, parm);
 	} else if (strchr(argv[0], ':')) {
@@ -116,20 +124,30 @@ static int ejs_lpGet(MprVarHandle eid, int argc, char **argv)
 						  argv[0], strcspn(argv[0], ":"));
 		const char *option = strchr(argv[0], ':') + 1;
 		const char *value;
-		if (type == NULL || option == NULL) return -1;
+		if (type == NULL || option == NULL) {
+			mpr_Return(eid, mprCreateUndefinedVar());
+			return 0;
+		}
 		value = lp_get_parametric(-1, type, option);
-		if (value == NULL) return -1;
+		if (value == NULL) {
+			mpr_Return(eid, mprCreateUndefinedVar());
+			return 0;
+		}
 		mpr_ReturnString(eid, value);
 		return 0;
 	} else {
 		/* its a global parameter */
 		parm = lp_parm_struct(argv[0]);
-		if (parm == NULL) return -1;
+		if (parm == NULL) {
+			mpr_Return(eid, mprCreateUndefinedVar());
+			return 0;
+		}
 		parm_ptr = lp_parm_ptr(-1, parm);
 	}
 
 	if (parm == NULL || parm_ptr == NULL) {
-		return -1;
+		mpr_Return(eid, mprCreateUndefinedVar());
+		return 0;
 	}
 
 	/* construct and return the right type of ejs object */
@@ -142,6 +160,7 @@ static int ejs_lpGet(MprVarHandle eid, int argc, char **argv)
 		mpr_Return(eid, mprCreateBoolVar(*(BOOL *)parm_ptr));
 		break;
 	case P_INTEGER:
+	case P_OCTAL:
 	case P_BYTES:
 		mpr_Return(eid, mprCreateIntegerVar(*(int *)parm_ptr));
 		break;
@@ -152,12 +171,14 @@ static int ejs_lpGet(MprVarHandle eid, int argc, char **argv)
 				return 0;
 			}
 		}
-		return -1;	
+		mpr_Return(eid, mprCreateUndefinedVar());
+		return 0;	
 	case P_LIST: 
 		mpr_Return(eid, mprList(parm->label, *(const char ***)parm_ptr));
 		break;
 	case P_SEP:
-		return -1;
+		mpr_Return(eid, mprCreateUndefinedVar());
+		return 0;
 	}
 	return 0;
 }
diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index deaa97114a..c417d7b64b 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -389,6 +389,19 @@ function provision_default_paths(subobj)
 	paths.ldap_basedn_ldif = paths.ldapdir + "/" + subobj.DNSDOMAIN + ".ldif";
 	paths.ldap_config_basedn_ldif = paths.ldapdir + "/" + subobj.DNSDOMAIN + "-config.ldif";
 	paths.ldap_schema_basedn_ldif = paths.ldapdir + "/" + subobj.DNSDOMAIN + "-schema.ldif";
+
+	paths.netlogon = lp.get("netlogon", "path");
+	
+	if (paths.netlogon == undefined) {
+		paths.netlogon = lp.get("lock dir") + "/netlogon";
+	}
+
+	paths.sysvol = lp.get("sysvol", "path");
+
+	if (paths.sysvol == undefined) {
+		paths.sysvol = lp.get("lock dir") + "/sysvol";
+	}
+	
 	return paths;
 }
 
@@ -466,6 +479,9 @@ function provision_fix_subobj(subobj, paths)
 
 	subobj.LDAPMANAGERDN = "cn=Manager," + subobj.DOMAINDN;
 
+	subobj.NETLOGONPATH = paths.netlogon;
+	subobj.SYSVOLPATH = paths.sysvol;
+
 	return true;
 }
 
@@ -703,6 +719,16 @@ function provision(subobj, message, blank, paths, session_info, credentials, lda
 	if (lp.get("server role") == "domain controller") {
 		message("Setting up self join\n");
 		setup_add_ldif("provision_self_join.ldif", info, samdb, false);
+		setup_add_ldif("provision_group_policy.ldif", info, samdb, false);
+
+		sys.mkdir(paths.sysvol, 0755);
+		sys.mkdir(paths.sysvol + "/"+ subobj.DNSDOMAIN, 0755);
+		sys.mkdir(paths.sysvol + "/"+ subobj.DNSDOMAIN + "/Policies", 0755);
+		sys.mkdir(paths.sysvol + "/"+ subobj.DNSDOMAIN + "/Policies/{" + subobj.POLICYGUID + "}", 0755);
+		sys.mkdir(paths.sysvol + "/"+ subobj.DNSDOMAIN + "/Policies/{" + subobj.POLICYGUID + "}/Machine", 0755);
+		sys.mkdir(paths.sysvol + "/"+ subobj.DNSDOMAIN + "/Policies/{" + subobj.POLICYGUID + "}/User", 0755);
+
+		sys.mkdir(paths.netlogon, 0755);
 	}
 
 	if (setup_name_mappings(info, samdb) == false) {
-- 
cgit 


From d9a5e18ce0480bf99191c20a75216abfef10eab3 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Sat, 14 Jul 2007 00:12:25 +0000
Subject: r23875: As pointed out by mwallnoefer@yahoo.de: On default Active
 Directory installations, the NETLOGON share isn't an indipendent directory.
 In fact it's mapped to the subdirectory "scripts" from the share SYSVOL under
 <Domain name>.

Andrew Bartlett
(This used to be commit 923d67ea9d78da46235221375b49b6f1d0d6a862)
---
 source4/scripting/libjs/provision.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index c417d7b64b..c0816cc2a5 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -390,18 +390,18 @@ function provision_default_paths(subobj)
 	paths.ldap_config_basedn_ldif = paths.ldapdir + "/" + subobj.DNSDOMAIN + "-config.ldif";
 	paths.ldap_schema_basedn_ldif = paths.ldapdir + "/" + subobj.DNSDOMAIN + "-schema.ldif";
 
-	paths.netlogon = lp.get("netlogon", "path");
-	
-	if (paths.netlogon == undefined) {
-		paths.netlogon = lp.get("lock dir") + "/netlogon";
-	}
-
 	paths.sysvol = lp.get("sysvol", "path");
 
 	if (paths.sysvol == undefined) {
 		paths.sysvol = lp.get("lock dir") + "/sysvol";
 	}
 	
+	paths.netlogon = lp.get("netlogon", "path");
+	
+	if (paths.netlogon == undefined) {
+		paths.netlogon = paths.sysvol + "/" + subobj.DNSDOMAIN + "/scripts";
+	}
+
 	return paths;
 }
 
-- 
cgit 


From d1bfe56048e6dca7057b8687262714156e230af0 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Tue, 17 Jul 2007 00:10:53 +0000
Subject: r23907: Fix bug 4790 reported by mwallnoefer@yahoo.de:

Before the provisioning enters to the function provision_default_paths (in
scripting/libjs/provision.js), the variable subobj.DNSDOMAIN isn't properly set
(for example for the filename of the DNS zonefile).

Andrew Bartlett
(This used to be commit 07a9db1438df93442c5b50b1b97ca69662749608)
---
 source4/scripting/libjs/provision.js | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index c0816cc2a5..02b39068fc 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -370,6 +370,8 @@ function setup_file(template, message, fname, subobj)
 
 function provision_default_paths(subobj)
 {
+	/* subobj.DNSDOMAIN isn't available at this point */
+	var dnsdomain = strlower(subobj.REALM);
 	var lp = loadparm_init();
 	var paths = new Object();
 	paths.smbconf = lp.get("config file");
@@ -383,12 +385,12 @@ function provision_default_paths(subobj)
 	paths.samdb = lp.get("sam database");
 	paths.secrets = lp.get("secrets database");
 	paths.keytab = "secrets.keytab";
-	paths.dns = lp.get("private dir") + "/" + subobj.DNSDOMAIN + ".zone";
+	paths.dns = lp.get("private dir") + "/" + dnsdomain + ".zone";
 	paths.winsdb = "wins.ldb";
 	paths.ldapdir = lp.get("private dir") + "/ldap";
-	paths.ldap_basedn_ldif = paths.ldapdir + "/" + subobj.DNSDOMAIN + ".ldif";
-	paths.ldap_config_basedn_ldif = paths.ldapdir + "/" + subobj.DNSDOMAIN + "-config.ldif";
-	paths.ldap_schema_basedn_ldif = paths.ldapdir + "/" + subobj.DNSDOMAIN + "-schema.ldif";
+	paths.ldap_basedn_ldif = paths.ldapdir + "/" + dnsdomain + ".ldif";
+	paths.ldap_config_basedn_ldif = paths.ldapdir + "/" + dnsdomain + "-config.ldif";
+	paths.ldap_schema_basedn_ldif = paths.ldapdir + "/" + dnsdomain + "-schema.ldif";
 
 	paths.sysvol = lp.get("sysvol", "path");
 
@@ -399,7 +401,7 @@ function provision_default_paths(subobj)
 	paths.netlogon = lp.get("netlogon", "path");
 	
 	if (paths.netlogon == undefined) {
-		paths.netlogon = paths.sysvol + "/" + subobj.DNSDOMAIN + "/scripts";
+		paths.netlogon = paths.sysvol + "/" + dnsdomain + "/scripts";
 	}
 
 	return paths;
-- 
cgit 


From 3a1b90ec755d89d9d7a358c0f477e51b217218ea Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Thu, 19 Jul 2007 07:48:26 +0000
Subject: r23966: It isn't great, but at least now we have some access control
 in SWAT

This patch prevents non-root and non-administrator users from running
the provision, upgrade and vampire pages.  *I think* the rest of SWAT
is LDB operations, or otherwise authenticated, so we should now be
secure.

I wish I had a better way to 'prove' we got this right, but this is better than nothing, and moves us closer to an alpha.

Andrew Bartlett
(This used to be commit d61061052dc4711f886199e49bc303002c8f9b11)
---
 source4/scripting/ejs/smbcalls_auth.c | 45 +++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_auth.c b/source4/scripting/ejs/smbcalls_auth.c
index 94a74e8e2a..33d7f2cf0e 100644
--- a/source4/scripting/ejs/smbcalls_auth.c
+++ b/source4/scripting/ejs/smbcalls_auth.c
@@ -27,6 +27,7 @@
 #include "scripting/ejs/smbcalls.h"
 #include "lib/events/events.h"
 #include "lib/messaging/irpc.h"
+#include "libcli/security/security.h"
 
 static int ejs_doauth(MprVarHandle eid,
 		      TALLOC_CTX *tmp_ctx, struct MprVar *auth, const char *username, 
@@ -39,6 +40,7 @@ static int ejs_doauth(MprVarHandle eid,
 	struct auth_context *auth_context;
 	struct MprVar *session_info_obj;
 	NTSTATUS nt_status;
+	bool set;
 
 	struct smbcalls_context *c;
 	struct event_context *ev;
@@ -111,6 +113,32 @@ static int ejs_doauth(MprVarHandle eid,
 		goto done;
 	}
 
+	if (security_token_has_nt_authenticated_users(session_info->security_token)) {
+		mprSetPropertyValue(auth, "user_class", mprString("USER"));
+		set = true;
+	}
+	
+	if (security_token_has_builtin_administrators(session_info->security_token)) {
+		mprSetPropertyValue(auth, "user_class", mprString("ADMINISTRATOR"));
+		set = true;
+	}
+
+	if (security_token_is_system(session_info->security_token)) {
+		mprSetPropertyValue(auth, "user_class", mprString("SYSTEM"));
+		set = true;
+	}
+
+	if (security_token_is_anonymous(session_info->security_token)) {
+		mprSetPropertyValue(auth, "report", mprString("Anonymous login not permitted"));
+		mprSetPropertyValue(auth, "result", mprCreateBoolVar(False));
+		goto done;
+	}
+
+	if (!set) {
+		mprSetPropertyValue(auth, "report", mprString("Session Info generation failed"));
+		mprSetPropertyValue(auth, "result", mprCreateBoolVar(False));
+	}
+	
 	session_info_obj = mprInitObject(eid, "session_info", 0, NULL);
 
 	mprSetPtrChild(session_info_obj, "session_info", session_info);
@@ -121,6 +149,23 @@ static int ejs_doauth(MprVarHandle eid,
 	mprSetPropertyValue(auth, "username", mprString(server_info->account_name));
 	mprSetPropertyValue(auth, "domain", mprString(server_info->domain_name));
 
+	if (security_token_is_system(session_info->security_token)) {
+		mprSetPropertyValue(auth, "report", mprString("SYSTEM"));
+	}
+
+	if (security_token_is_anonymous(session_info->security_token)) {
+		mprSetPropertyValue(auth, "report", mprString("ANONYMOUS"));
+	}
+
+	if (security_token_has_builtin_administrators(session_info->security_token)) {
+		mprSetPropertyValue(auth, "report", mprString("ADMINISTRATOR"));
+	}
+
+	if (security_token_has_nt_authenticated_users(session_info->security_token)) {
+		mprSetPropertyValue(auth, "report", mprString("USER"));
+	}
+
+
 done:
 	return 0;
 }
-- 
cgit 


From a7416c08945c5eae5ef5e896439119fb3379f482 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Tue, 24 Jul 2007 06:03:03 +0000
Subject: r24012: Remove duplicate code block (from bad merge).

Andrew Bartlett
(This used to be commit 68bdbd732fc02ce5a8ef8eb0107459ff3b7eb723)
---
 source4/scripting/ejs/smbcalls_auth.c | 17 -----------------
 1 file changed, 17 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_auth.c b/source4/scripting/ejs/smbcalls_auth.c
index 33d7f2cf0e..2624084f02 100644
--- a/source4/scripting/ejs/smbcalls_auth.c
+++ b/source4/scripting/ejs/smbcalls_auth.c
@@ -149,23 +149,6 @@ static int ejs_doauth(MprVarHandle eid,
 	mprSetPropertyValue(auth, "username", mprString(server_info->account_name));
 	mprSetPropertyValue(auth, "domain", mprString(server_info->domain_name));
 
-	if (security_token_is_system(session_info->security_token)) {
-		mprSetPropertyValue(auth, "report", mprString("SYSTEM"));
-	}
-
-	if (security_token_is_anonymous(session_info->security_token)) {
-		mprSetPropertyValue(auth, "report", mprString("ANONYMOUS"));
-	}
-
-	if (security_token_has_builtin_administrators(session_info->security_token)) {
-		mprSetPropertyValue(auth, "report", mprString("ADMINISTRATOR"));
-	}
-
-	if (security_token_has_nt_authenticated_users(session_info->security_token)) {
-		mprSetPropertyValue(auth, "report", mprString("USER"));
-	}
-
-
 done:
 	return 0;
 }
-- 
cgit 


From 698e7c5f2ae23656c50b95b5ca7151396d215ffb Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Sat, 18 Aug 2007 10:30:40 +0000
Subject: r24535: rename struct dcerpc_interface_call -> struct
 ndr_interface_call and move it to librpc/ndr/libndr.h

metze
(This used to be commit abd5551aabae1820baaa52a963e8c7aa9605914e)
---
 source4/scripting/ejs/smbcalls_rpc.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_rpc.c b/source4/scripting/ejs/smbcalls_rpc.c
index 8fdb7d1414..854a42e5fb 100644
--- a/source4/scripting/ejs/smbcalls_rpc.c
+++ b/source4/scripting/ejs/smbcalls_rpc.c
@@ -182,7 +182,7 @@ static int ejs_irpc_call(int eid, struct MprVar *io,
 	NTSTATUS status;
 	void *ptr;
 	struct ejs_rpc *ejs;
-	const struct dcerpc_interface_call *call;
+	const struct ndr_interface_call *call;
 	struct ejs_irpc_connection *p;
 	struct irpc_request **reqs;
 	int i, count;
@@ -285,7 +285,7 @@ done:
 	void *ptr;
 	struct rpc_request *req;
 	struct ejs_rpc *ejs;
-	const struct dcerpc_interface_call *call;
+	const struct ndr_interface_call *call;
 
 	if (argc != 1 || argv[0]->type != MPR_TYPE_OBJECT) {
 		ejsSetErrorMsg(eid, "rpc_call invalid arguments");
-- 
cgit 


From b8cdadced4d2a26a63b8bbe397c12df949783ed4 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Sun, 19 Aug 2007 20:46:45 +0000
Subject: r24551: rename dcerpc_interface_table -> ndr_interface_table rename
 dcerpc_interface_list  -> ndr_interface_list

and move them to libndr.h

metze
(This used to be commit 4adbebef5df2f833d2d4bfcdda72a34179d52f5c)
---
 source4/scripting/ejs/ejsrpc.h       | 2 +-
 source4/scripting/ejs/smbcalls_rpc.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/ejsrpc.h b/source4/scripting/ejs/ejsrpc.h
index 4c7e5d9ee5..3bfb666dec 100644
--- a/source4/scripting/ejs/ejsrpc.h
+++ b/source4/scripting/ejs/ejsrpc.h
@@ -42,7 +42,7 @@ NTSTATUS smbcalls_register_ejs(const char *name, MprCFunction fn);
 
 
 int ejs_rpc_call(int eid, int argc, struct MprVar **argv,
-		 const struct dcerpc_interface_table *iface, int callnum,
+		 const struct ndr_interface_table *iface, int callnum,
 		 ejs_pull_function_t ejs_pull, ejs_push_function_t ejs_push);
 
 NTSTATUS ejs_pull_struct_start(struct ejs_rpc *ejs, struct MprVar **v, const char *name);
diff --git a/source4/scripting/ejs/smbcalls_rpc.c b/source4/scripting/ejs/smbcalls_rpc.c
index 854a42e5fb..995760bfe1 100644
--- a/source4/scripting/ejs/smbcalls_rpc.c
+++ b/source4/scripting/ejs/smbcalls_rpc.c
@@ -110,7 +110,7 @@ static int ejs_irpc_connect(MprVarHandle eid, int argc, char **argv)
 static int ejs_rpc_connect(MprVarHandle eid, int argc, char **argv)
 {
 	const char *binding, *pipe_name;
-	const struct dcerpc_interface_table *iface;
+	const struct ndr_interface_table *iface;
 	NTSTATUS status;
 	struct dcerpc_pipe *p;
 	struct cli_credentials *creds;
@@ -176,7 +176,7 @@ done:
   make an irpc call - called via the same interface as rpc
 */
 static int ejs_irpc_call(int eid, struct MprVar *io, 
-			 const struct dcerpc_interface_table *iface, int callnum,
+			 const struct ndr_interface_table *iface, int callnum,
 			 ejs_pull_function_t ejs_pull, ejs_push_function_t ejs_push)
 {
 	NTSTATUS status;
@@ -276,7 +276,7 @@ done:
   code
 */
  int ejs_rpc_call(int eid, int argc, struct MprVar **argv,
-		  const struct dcerpc_interface_table *iface, int callnum,
+		  const struct ndr_interface_table *iface, int callnum,
 		  ejs_pull_function_t ejs_pull, ejs_push_function_t ejs_push)
 {
 	struct MprVar *io;
-- 
cgit 


From f14bd1a90ab47a418c0ec2492990a417a0bb3bf6 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Sun, 19 Aug 2007 21:23:03 +0000
Subject: r24557: rename 'dcerpc_table_' -> 'ndr_table_'

metze
(This used to be commit 84651aee81aaabbebf52ffc3fbcbabb2eec6eed5)
---
 source4/scripting/ejs/smbcalls_rpc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_rpc.c b/source4/scripting/ejs/smbcalls_rpc.c
index 995760bfe1..aa4be7aa4a 100644
--- a/source4/scripting/ejs/smbcalls_rpc.c
+++ b/source4/scripting/ejs/smbcalls_rpc.c
@@ -370,7 +370,7 @@ done:
 */
 int ejs_rpc_init(struct MprVar *obj, const char *name)
 {
-	dcerpc_table_init();
+	ndr_table_init();
 
 	mprSetStringCFunction(obj, "connect", ejs_rpc_connect);
 	if (mprGetProperty(obj, "pipe_name", NULL) == NULL) {
-- 
cgit 


From bd93ed4680b3a86348b0d84a93d20f3daafbe8ad Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Tue, 21 Aug 2007 19:35:43 +0000
Subject: r24606: move librpc/rpc/table.c -> librpc/ndr/ndr_table.c and rename
 the containing functions to have a ndr_ prefix

metze
(This used to be commit cb234d43ae693af5d8a921a15c9bcac3c6f0359a)
---
 source4/scripting/ejs/smbcalls_rpc.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_rpc.c b/source4/scripting/ejs/smbcalls_rpc.c
index aa4be7aa4a..4addd473da 100644
--- a/source4/scripting/ejs/smbcalls_rpc.c
+++ b/source4/scripting/ejs/smbcalls_rpc.c
@@ -28,7 +28,7 @@
 #include "scripting/ejs/ejsrpc.h"
 #include "lib/util/dlinklist.h"
 #include "lib/events/events.h"
-#include "librpc/rpc/dcerpc_table.h"
+#include "librpc/ndr/ndr_table.h"
 #include "auth/credentials/credentials.h"
 #include "librpc/rpc/dcerpc.h"
 #include "cluster/cluster.h"
@@ -136,7 +136,7 @@ static int ejs_rpc_connect(MprVarHandle eid, int argc, char **argv)
 		pipe_name = mprToString(mprGetProperty(this, "pipe_name", NULL));
 	}
 
-	iface = idl_iface_by_name(pipe_name);
+	iface = ndr_table_by_name(pipe_name);
 	if (iface == NULL) {
 		status = NT_STATUS_OBJECT_NAME_INVALID;
 		goto done;
-- 
cgit 


From 2da0be9d5e3e7bd91c145031a0bc238a010a9e97 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Fri, 24 Aug 2007 01:57:54 +0000
Subject: r24640: Add a suggested BIND configuration snippit, to help with DNS
 configuration.

When we sort out GSS-TSIG on the server, we can expand this to have
the 'right stuff'.

Andrew Bartlett
(This used to be commit 8f02ade1b2cc164f64f4ea8a371c107ccf6a81b3)
---
 source4/scripting/libjs/provision.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index 02b39068fc..1054a9a508 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -386,6 +386,7 @@ function provision_default_paths(subobj)
 	paths.secrets = lp.get("secrets database");
 	paths.keytab = "secrets.keytab";
 	paths.dns = lp.get("private dir") + "/" + dnsdomain + ".zone";
+	paths.named_conf = lp.get("private dir") + "/named.conf";
 	paths.winsdb = "wins.ldb";
 	paths.ldapdir = lp.get("private dir") + "/ldap";
 	paths.ldap_basedn_ldif = paths.ldapdir + "/" + dnsdomain + ".ldif";
@@ -833,7 +834,11 @@ function provision_dns(subobj, message, paths, session_info, credentials)
 		   message, paths.dns, 
 		   subobj);
 
-	message("Please install the zone located in " + paths.dns + " into your DNS server\n");
+	setup_file("named.conf", 
+		   message, paths.named_conf, 
+		   subobj);
+
+	message("Please install the zone located in " + paths.dns + " into your DNS server.  A sample BIND configuration snippit is at " + paths.named_conf + "\n");
 }
 
 /* Write out a DNS zone file, from the info in the current database */
-- 
cgit 


From b409d4120f9ae451f93a2322267c0f346531d9f3 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sun, 26 Aug 2007 15:16:40 +0000
Subject: r24667: Finally merge the registry improvements that Wilco Baan
 Hofman and I have been working on for at least half a year now. Contains the
 following improvements:

 * proper layering (finally!) for the registry library. Distinction is
   now made between 'real' backends (local, remote, wine, etc) and
   the low-level hive backends (regf, creg, ldb, ...) that are only used
   by the local registry backend
 * tests for all important hive and registry operations
 * re-enable RPC-WINREG tests (still needs more work though, as
							   some return values aren't checked yet)
 * write support for REGF files
 * dir backend now supports setting/reading values, creating keys
 * support for storing security descriptors
 * remove CREG backend as it was incomplete, didn't match the data model
   and wasn't used at all anyway
 * support for parsing ADM files as used by the policy editor (see lib/policy)
 * support for parsing PREG files (format used by .POL files)
 * new streaming interface for registry diffs (improves speed and memory usage
	for regdiff/regpatch significantly)

   ... and fixes a large number of bugs in the registry code
(This used to be commit 7a1eec6358bc863dfc671c542b7185d3e39d7b5a)
---
 source4/scripting/ejs/smbcalls_ldb.c | 2 --
 1 file changed, 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_ldb.c b/source4/scripting/ejs/smbcalls_ldb.c
index 06384c8dbd..7b143ae4d9 100644
--- a/source4/scripting/ejs/smbcalls_ldb.c
+++ b/source4/scripting/ejs/smbcalls_ldb.c
@@ -575,8 +575,6 @@ static int ejs_ldb_attach_dsdb_schema_from_ldif(MprVarHandle eid, int argc, char
 {
 	struct ldb_context *ldb;
 	WERROR status;
-	char *pf_name;
-	char *df_name;
 	const char *pf;
 	const char *df;
 
-- 
cgit 


From 2edf63b6d647eba131e213bd9dbc543100396930 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 27 Aug 2007 13:13:08 +0000
Subject: r24703: Use standard registry diff files when provisioning rather
 than LDIF files for the registry files. (This used to be commit
 67ad556b7388e5d82756e0a3cfc596e44136329c)

---
 source4/scripting/ejs/config.mk      |  6 +++
 source4/scripting/ejs/smbcalls_reg.c | 91 ++++++++++++++++++++++++++++++++++++
 source4/scripting/libjs/provision.js | 11 ++---
 3 files changed, 100 insertions(+), 8 deletions(-)
 create mode 100644 source4/scripting/ejs/smbcalls_reg.c

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/config.mk b/source4/scripting/ejs/config.mk
index f1c17ad21d..5d562ee344 100644
--- a/source4/scripting/ejs/config.mk
+++ b/source4/scripting/ejs/config.mk
@@ -17,6 +17,12 @@ SUBSYSTEM = smbcalls
 INIT_FUNCTION = smb_setup_ejs_ldb
 PRIVATE_DEPENDENCIES = LIBLDB SAMDB LIBNDR
 
+[MODULE::smbcalls_reg]
+OBJ_FILES = smbcalls_reg.o
+SUBSYSTEM = smbcalls
+INIT_FUNCTION = smb_setup_ejs_reg
+PRIVATE_DEPENDENCIES = registry SAMDB LIBNDR
+
 [MODULE::smbcalls_nbt]
 OBJ_FILES = smbcalls_nbt.o
 SUBSYSTEM = smbcalls
diff --git a/source4/scripting/ejs/smbcalls_reg.c b/source4/scripting/ejs/smbcalls_reg.c
new file mode 100644
index 0000000000..4d84587fa4
--- /dev/null
+++ b/source4/scripting/ejs/smbcalls_reg.c
@@ -0,0 +1,91 @@
+/* 
+   Unix SMB/CIFS implementation.
+
+   provide hooks into smbd C calls from ejs scripts
+
+   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 <http://www.gnu.org/licenses/>.
+*/
+
+#include "includes.h"
+#include "scripting/ejs/smbcalls.h"
+#include "lib/appweb/ejs/ejs.h"
+#include "db_wrap.h"
+#include "dsdb/samdb/samdb.h"
+#include "librpc/ndr/libndr.h"
+#include "lib/registry/registry.h"
+
+/*
+  get the connected db
+ */
+static struct registry_context *ejs_get_reg_context(int eid)
+{
+	struct registry_context *rctx = mprGetThisPtr(eid, "registry");
+	if (rctx == NULL) {
+		ejsSetErrorMsg(eid, "unable to find registry");
+	}
+	return rctx;
+}
+
+static int ejs_apply_patchfile(MprVarHandle eid, int argc, struct MprVar **argv)
+{
+	struct registry_context *rctx;
+	WERROR error;
+
+	/* validate arguments */
+	if (argc != 1) {
+		ejsSetErrorMsg(eid, "reg.apply_patchfile invalid number of arguments");
+		return -1;
+	}
+
+	rctx = ejs_get_reg_context(eid);
+	if (rctx == NULL) {
+		return -1;
+	}
+	
+	error = reg_diff_apply(mprToString(argv[0]), rctx);
+
+	mpr_Return(eid, mprWERROR(error));
+
+	return 0;
+}
+
+/*
+  initialise registry ejs subsystem
+*/
+static int ejs_reg_open(MprVarHandle eid, int argc, struct MprVar **argv)
+{
+	struct MprVar *reg = mprInitObject(eid, "registry", argc, argv);
+	struct registry_context *rctx;
+	WERROR error;
+
+	error = reg_open_samba(mprMemCtx(), &rctx, NULL, NULL);
+	SMB_ASSERT(W_ERROR_IS_OK(error));
+
+	mprSetPtrChild(reg, "registry", rctx);
+	mprSetCFunction(reg, "apply_patchfile", ejs_apply_patchfile);
+
+	return 0;
+}
+
+
+/*
+  setup C functions that be called from ejs
+*/
+NTSTATUS smb_setup_ejs_reg(void)
+{
+	ejsDefineCFunction(-1, "reg_open", ejs_reg_open, NULL, MPR_VAR_SCRIPT_HANDLE);
+	return NT_STATUS_OK;
+}
diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index 1054a9a508..6ec29748f6 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -376,12 +376,6 @@ function provision_default_paths(subobj)
 	var paths = new Object();
 	paths.smbconf = lp.get("config file");
 	paths.shareconf = lp.get("private dir") + "/" + "share.ldb";
-	paths.hklm = "hklm.ldb";
-	paths.hkcu = "hkcu.ldb";
-	paths.hkcr = "hkcr.ldb";
-	paths.hku = "hku.ldb";
-	paths.hkpd = "hkpd.ldb";
-	paths.hkpt = "hkpt.ldb";
 	paths.samdb = lp.get("sam database");
 	paths.secrets = lp.get("secrets database");
 	paths.keytab = "secrets.keytab";
@@ -582,8 +576,9 @@ function provision(subobj, message, blank, paths, session_info, credentials, lda
 	setup_ldb("secrets_init.ldif", info, paths.secrets);
 	setup_ldb("secrets.ldif", info, paths.secrets, false);
 
-	message("Setting up hklm.ldb\n");
-	setup_ldb("hklm.ldif", info, paths.hklm);
+	message("Setting up the registry\n");
+	var reg = reg_open();
+	reg.apply_patchfile(lp.get("setup directory") + "/provision.reg")
 
 	message("Setting up sam.ldb partitions\n");
 	/* Also wipes the database */
-- 
cgit 


From 61ffa08f4c95e29d301de9fbabd6e71c2dbc1056 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 27 Aug 2007 18:10:19 +0000
Subject: r24712: No longer expose the 'BOOL' data type in any interfaces.
 (This used to be commit 1ce32673d960c8b05b6c1b1b99e1976a402417ae)

---
 source4/scripting/ejs/ejsrpc.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/ejsrpc.h b/source4/scripting/ejs/ejsrpc.h
index 3bfb666dec..ef920b816a 100644
--- a/source4/scripting/ejs/ejsrpc.h
+++ b/source4/scripting/ejs/ejsrpc.h
@@ -104,7 +104,7 @@ NTSTATUS ejs_pull_dom_sid(struct ejs_rpc *ejs,
 NTSTATUS ejs_push_dom_sid(struct ejs_rpc *ejs, 
 			  struct MprVar *v, const char *name, const struct dom_sid *r);
 NTSTATUS ejs_push_null(struct ejs_rpc *ejs, struct MprVar *v, const char *name);
-BOOL ejs_pull_null(struct ejs_rpc *ejs, struct MprVar *v, const char *name);
+bool ejs_pull_null(struct ejs_rpc *ejs, struct MprVar *v, const char *name);
 NTSTATUS ejs_push_WERROR(struct ejs_rpc *ejs, 
 			 struct MprVar *v, const char *name, const WERROR *r);
 NTSTATUS ejs_push_NTSTATUS(struct ejs_rpc *ejs, 
@@ -114,9 +114,9 @@ NTSTATUS ejs_pull_DATA_BLOB(struct ejs_rpc *ejs,
 NTSTATUS ejs_push_DATA_BLOB(struct ejs_rpc *ejs, 
 			    struct MprVar *v, const char *name, const DATA_BLOB *r);
 NTSTATUS ejs_pull_BOOL(struct ejs_rpc *ejs, 
-		       struct MprVar *v, const char *name, BOOL *r);
+		       struct MprVar *v, const char *name, bool *r);
 NTSTATUS ejs_push_BOOL(struct ejs_rpc *ejs, 
-		       struct MprVar *v, const char *name, const BOOL *r);
+		       struct MprVar *v, const char *name, const bool *r);
 
 NTSTATUS ejs_pull_array_uint8(struct ejs_rpc *ejs, 
 			      struct MprVar *v, const char *name, 
-- 
cgit 


From 73388ce54c5910ee407af6b70e25597d0b696a58 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Tue, 28 Aug 2007 04:28:02 +0000
Subject: r24729: First try and publishing a DNS service account, for folks to
 play with.

The keytab in dns.keytab should (I hope) do the job.

Andrew Bartlett
(This used to be commit af4d331eef91ef7699d179d15e7337fff1eff7bb)
---
 source4/scripting/libjs/provision.js | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index 6ec29748f6..57531a28b9 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -379,6 +379,7 @@ function provision_default_paths(subobj)
 	paths.samdb = lp.get("sam database");
 	paths.secrets = lp.get("secrets database");
 	paths.keytab = "secrets.keytab";
+	paths.dns_keytab = "dns.keytab";
 	paths.dns = lp.get("private dir") + "/" + dnsdomain + ".zone";
 	paths.named_conf = lp.get("private dir") + "/named.conf";
 	paths.winsdb = "wins.ldb";
@@ -469,6 +470,7 @@ function provision_fix_subobj(subobj, paths)
 
 	subobj.SAM_LDB		= "tdb://" + paths.samdb;
 	subobj.SECRETS_KEYTAB	= paths.keytab;
+	subobj.DNS_KEYTAB	= paths.dns_keytab;
 
 	subobj.LDAPDIR = paths.ldapdir;
 	var ldap_path_list = split("/", paths.ldapdir);
@@ -891,6 +893,7 @@ function provision_guess()
 	subobj.POLICYGUID   = randguid();
 	subobj.KRBTGTPASS   = randpass(12);
 	subobj.MACHINEPASS  = randpass(12);
+	subobj.DNSPASS  = randpass(12);
 	subobj.ADMINPASS    = randpass(12);
 	subobj.LDAPMANAGERPASS     = randpass(12);
 	subobj.DEFAULTSITE  = "Default-First-Site-Name";
-- 
cgit 


From f681306335eaf6b33d6fcaa70ac29a8cf1f5889f Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Wed, 29 Aug 2007 01:37:26 +0000
Subject: r24760: Ensure we base64 encode any password being put into LDIF, to
 avoid provision failures when some of the random password values are illigal
 LDIF.

Andrew Bartlett
(This used to be commit 876003f6c6466bfd37ec9b05c9a1f1cc83dd9898)
---
 source4/scripting/libjs/provision.js | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index 57531a28b9..ca0fedf97b 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -449,6 +449,8 @@ function setup_name_mappings(info, ldb)
 
 function provision_fix_subobj(subobj, paths)
 {
+	var ldb = ldb_init();
+	
 	subobj.REALM       = strupper(subobj.REALM);
 	subobj.HOSTNAME    = strlower(subobj.HOSTNAME);
 	subobj.DOMAIN      = strupper(subobj.DOMAIN);
@@ -465,6 +467,11 @@ function provision_fix_subobj(subobj, paths)
 	subobj.CONFIGDN     = "CN=Configuration," + subobj.ROOTDN;
 	subobj.SCHEMADN     = "CN=Schema," + subobj.CONFIGDN;
 
+	subobj.MACHINEPASS_B64 = ldb.encode(subobj.MACHINEPASS);
+	subobj.KRBTGTPASS_B64  = ldb.encode(subobj.KRBTGTPASS);
+	subobj.ADMINPASS_B64   = ldb.encode(subobj.ADMINPASS);
+	subobj.DNSPASS_B64     = ldb.encode(subobj.DNSPASS);
+
 	var rdns = split(",", subobj.DOMAINDN);
 	subobj.RDN_DC = substr(rdns[0], strlen("DC="));
 
-- 
cgit 


From 4e1d0cc8e3b7bfb51845fbe836812f7558c30c10 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Wed, 29 Aug 2007 01:40:58 +0000
Subject: r24761: Permit subtree renames in Samba4.

The module is scary: On a rename, it does a search for all entries
under that entry (including itself), and fires off a seperate rename
call for each result.  This will fail miserably on an LDAP backend,
but I'll need to work on using hdb for OpenLDAP, and hope Fedora DS
can implement subtree renames at some point.

Andrew Bartlett
(This used to be commit 13908a8cb4dd810503213203efb8d51f77f1f379)
---
 source4/scripting/libjs/provision.js | 1 +
 1 file changed, 1 insertion(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index ca0fedf97b..f20eb547ac 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -935,6 +935,7 @@ function provision_guess()
 					"objectclass",
 					"rdn_name",
 					"show_deleted",
+					"subtree_rename",
 					"partition");
 	subobj.MODULES_LIST = join(",", modules_list);
 	subobj.DOMAINDN_LDB = "users.ldb";
-- 
cgit 


From 50017a00757b00a572fc42405f761cf42119b4a4 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Thu, 30 Aug 2007 00:25:47 +0000
Subject: r24793: The subtree_rename module is a work of fiction.  An
 resemblance to a working module, live or dead, is purely co-incidental.

Andrew Bartlett
(This used to be commit 64cc31642fd2ded149631d07bc022213f19595b8)
---
 source4/scripting/libjs/provision.js | 1 -
 1 file changed, 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index f20eb547ac..ca0fedf97b 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -935,7 +935,6 @@ function provision_guess()
 					"objectclass",
 					"rdn_name",
 					"show_deleted",
-					"subtree_rename",
 					"partition");
 	subobj.MODULES_LIST = join(",", modules_list);
 	subobj.DOMAINDN_LDB = "users.ldb";
-- 
cgit 


From ced6fc995f3bc9b00770ff1002a57f20d6b3e109 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Sun, 2 Sep 2007 23:42:40 +0000
Subject: r24911: Make better use of substituted variables in example
 named.conf

Andrew Bartlett
(This used to be commit 9f18a9711771a88be7c38bc26ae6e59fb98f93dd)
---
 source4/scripting/libjs/provision.js | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index ca0fedf97b..fd6de2695f 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -380,6 +380,7 @@ function provision_default_paths(subobj)
 	paths.secrets = lp.get("secrets database");
 	paths.keytab = "secrets.keytab";
 	paths.dns_keytab = "dns.keytab";
+	paths.dns_keytab_abs = lp.get("private dir") + "/" + paths.dns_keytab;
 	paths.dns = lp.get("private dir") + "/" + dnsdomain + ".zone";
 	paths.named_conf = lp.get("private dir") + "/named.conf";
 	paths.winsdb = "wins.ldb";
@@ -478,6 +479,7 @@ function provision_fix_subobj(subobj, paths)
 	subobj.SAM_LDB		= "tdb://" + paths.samdb;
 	subobj.SECRETS_KEYTAB	= paths.keytab;
 	subobj.DNS_KEYTAB	= paths.dns_keytab;
+	subobj.DNS_KEYTAB_ABS	= paths.dns_keytab_abs;
 
 	subobj.LDAPDIR = paths.ldapdir;
 	var ldap_path_list = split("/", paths.ldapdir);
-- 
cgit 


From 6cf69fee189857ae6f85cd3f81a6a58364839942 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Fri, 7 Sep 2007 13:31:15 +0000
Subject: r24994: Fix some C++ warnings. (This used to be commit
 925abf74fa1ed5ae726bae8781ec549302786b39)

---
 source4/scripting/ejs/smbscript.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbscript.c b/source4/scripting/ejs/smbscript.c
index c97bc1ff8d..a21669a07e 100644
--- a/source4/scripting/ejs/smbscript.c
+++ b/source4/scripting/ejs/smbscript.c
@@ -29,7 +29,7 @@
 
 static EjsId eid;
 
-static void smbscript_ejs_exception(const char *reason)
+_NORETURN_ static void smbscript_ejs_exception(const char *reason)
 {
 	Ejs *ep = ejsPtr(eid);
 	ejsSetErrorMsg(eid, "%s", reason);
-- 
cgit 


From cd962355abad90a2161765a7be7d26e63572cab7 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Fri, 7 Sep 2007 15:08:14 +0000
Subject: r25000: Fix some more C++ compatibility warnings. (This used to be
 commit 08bb1ef643ab906f1645cf6f32763dc73b1884e4)

---
 source4/scripting/ejs/smbcalls_cli.c | 12 ++++++------
 source4/scripting/ejs/smbcalls_rpc.c |  5 +++--
 2 files changed, 9 insertions(+), 8 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_cli.c b/source4/scripting/ejs/smbcalls_cli.c
index e94207bf36..fc26fddfd5 100644
--- a/source4/scripting/ejs/smbcalls_cli.c
+++ b/source4/scripting/ejs/smbcalls_cli.c
@@ -483,7 +483,7 @@ static int ejs_tree_disconnect(MprVarHandle eid, int argc, MprVar **argv)
 		return -1;
 	}
 
-	tree = talloc_check_name(argv[0]->ptr, "struct smbcli_tree");
+	tree = talloc_get_type(argv[0]->ptr, struct smbcli_tree);
 
 	result = smb_tree_disconnect(tree);
 
@@ -512,7 +512,7 @@ static int ejs_mkdir(MprVarHandle eid, int argc, MprVar **argv)
 		return -1;
 	}
 
-	tree = argv[0]->ptr;
+	tree = (struct smbcli_tree *)argv[0]->ptr;
 
 	if (!mprVarIsString(argv[1]->type)) {
 		ejsSetErrorMsg(eid, "arg 2 must be a string");
@@ -546,7 +546,7 @@ static int ejs_rmdir(MprVarHandle eid, int argc, MprVar **argv)
 		return -1;
 	}
 
-	tree = argv[0]->ptr;
+	tree = (struct smbcli_tree *)argv[0]->ptr;
 
 	if (!mprVarIsString(argv[1]->type)) {
 		ejsSetErrorMsg(eid, "arg 2 must be a string");
@@ -580,7 +580,7 @@ static int ejs_rename(MprVarHandle eid, int argc, MprVar **argv)
 		return -1;
 	}
 
-	tree = argv[0]->ptr;
+	tree = (struct smbcli_tree *)argv[0]->ptr;
 
 	if (!mprVarIsString(argv[1]->type)) {
 		ejsSetErrorMsg(eid, "arg 2 must be a string");
@@ -619,7 +619,7 @@ static int ejs_unlink(MprVarHandle eid, int argc, MprVar **argv)
 		return -1;
 	}
 
-	tree = argv[0]->ptr;
+	tree = (struct smbcli_tree *)argv[0]->ptr;
 
 	if (!mprVarIsString(argv[1]->type)) {
 		ejsSetErrorMsg(eid, "arg 2 must be a string");
@@ -666,7 +666,7 @@ static int ejs_list(MprVarHandle eid, int argc, MprVar **argv)
 		return -1;
 	}
 
-	tree = argv[0]->ptr;
+	tree = (struct smbcli_tree *)argv[0]->ptr;
 
 	if (!mprVarIsString(argv[1]->type)) {
 		ejsSetErrorMsg(eid, "arg 2 must be a string");
diff --git a/source4/scripting/ejs/smbcalls_rpc.c b/source4/scripting/ejs/smbcalls_rpc.c
index 4addd473da..b95681d4ef 100644
--- a/source4/scripting/ejs/smbcalls_rpc.c
+++ b/source4/scripting/ejs/smbcalls_rpc.c
@@ -144,7 +144,8 @@ static int ejs_rpc_connect(MprVarHandle eid, int argc, char **argv)
 
 	credentials = mprGetProperty(this, "credentials", NULL);
 	if (credentials) {
-		creds = mprGetPtr(credentials, "creds");
+		creds = (struct cli_credentials *)
+				mprGetPtr(credentials, "creds");
 	} else {
 		creds = cmdline_credentials;
 	}
@@ -188,7 +189,7 @@ static int ejs_irpc_call(int eid, struct MprVar *io,
 	int i, count;
 	struct MprVar *results;
 
-	p = mprGetThisPtr(eid, "irpc");
+	p = (struct ejs_irpc_connection *)mprGetThisPtr(eid, "irpc");
 
 	ejs = talloc(mprMemCtx(), struct ejs_rpc);
 	if (ejs == NULL) {
-- 
cgit 


From ffeee68e4b72dd94fee57366bd8d38b8c284c3d4 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sat, 8 Sep 2007 12:42:09 +0000
Subject: r25026: Move param/param.h out of includes.h (This used to be commit
 abe8349f9b4387961ff3665d8c589d61cd2edf31)

---
 source4/scripting/ejs/smbcalls.c        | 1 +
 source4/scripting/ejs/smbcalls.h        | 1 +
 source4/scripting/ejs/smbcalls_cli.c    | 1 +
 source4/scripting/ejs/smbcalls_config.c | 1 +
 source4/scripting/ejs/smbcalls_param.c  | 2 +-
 5 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls.c b/source4/scripting/ejs/smbcalls.c
index bc7994a007..08b9eac5c1 100644
--- a/source4/scripting/ejs/smbcalls.c
+++ b/source4/scripting/ejs/smbcalls.c
@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "param/param.h"
 #include "scripting/ejs/smbcalls.h"
 #include "build.h"
 #include "version.h"
diff --git a/source4/scripting/ejs/smbcalls.h b/source4/scripting/ejs/smbcalls.h
index 77d9dd3381..3aaf324b6e 100644
--- a/source4/scripting/ejs/smbcalls.h
+++ b/source4/scripting/ejs/smbcalls.h
@@ -38,4 +38,5 @@ struct ldb_context;
 struct ldb_message;
 struct cli_credentials;
 
+#include "param/param.h"
 #include "scripting/ejs/proto.h"
diff --git a/source4/scripting/ejs/smbcalls_cli.c b/source4/scripting/ejs/smbcalls_cli.c
index fc26fddfd5..02b948182a 100644
--- a/source4/scripting/ejs/smbcalls_cli.c
+++ b/source4/scripting/ejs/smbcalls_cli.c
@@ -27,6 +27,7 @@
 #include "libcli/smb_composite/smb_composite.h"
 #include "libcli/libcli.h"
 #include "auth/credentials/credentials.h"
+#include "param/param.h"
 
 #if 0
 
diff --git a/source4/scripting/ejs/smbcalls_config.c b/source4/scripting/ejs/smbcalls_config.c
index 6f15ee5a4a..b31b70bda8 100644
--- a/source4/scripting/ejs/smbcalls_config.c
+++ b/source4/scripting/ejs/smbcalls_config.c
@@ -25,6 +25,7 @@
 #include "param/loadparm.h"
 #include "system/network.h"
 #include "lib/socket/netif.h"
+#include "param/param.h"
 
 /*
   return a list of defined services
diff --git a/source4/scripting/ejs/smbcalls_param.c b/source4/scripting/ejs/smbcalls_param.c
index afdee28a65..0e7a83457a 100644
--- a/source4/scripting/ejs/smbcalls_param.c
+++ b/source4/scripting/ejs/smbcalls_param.c
@@ -20,9 +20,9 @@
 */
 
 #include "includes.h"
+#include "param/param.h"
 #include "scripting/ejs/smbcalls.h"
 #include "lib/appweb/ejs/ejs.h"
-#include "param/param.h"
 
 /*
   get parameter
-- 
cgit 


From dccf3f99e45137b6cd18c1de1c79808ad67130d1 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sat, 8 Sep 2007 13:27:14 +0000
Subject: r25027: Fix more warnings. (This used to be commit
 5085c53fcfade614e83d21fc2c1a5bc43bb2a729)

---
 source4/scripting/ejs/ejsnet/net_ctx.c  |  6 +++---
 source4/scripting/ejs/ejsnet/net_user.c | 14 +++++++-------
 source4/scripting/ejs/smbcalls_auth.c   |  2 +-
 source4/scripting/ejs/smbcalls_creds.c  |  2 +-
 source4/scripting/ejs/smbcalls_ldb.c    |  2 +-
 source4/scripting/ejs/smbcalls_param.c  | 12 ++++++------
 source4/scripting/ejs/smbcalls_reg.c    |  2 +-
 source4/scripting/ejs/smbcalls_samba3.c |  2 +-
 source4/scripting/ejs/smbcalls_string.c |  4 ++--
 9 files changed, 23 insertions(+), 23 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/ejsnet/net_ctx.c b/source4/scripting/ejs/ejsnet/net_ctx.c
index 411c98cc72..a2a3821082 100644
--- a/source4/scripting/ejs/ejsnet/net_ctx.c
+++ b/source4/scripting/ejs/ejsnet/net_ctx.c
@@ -78,7 +78,7 @@ static int ejs_net_context(MprVarHandle eid, int argc, struct MprVar **argv)
 		  get credential values from credentials object
 		*/
 		mprCreds = *(argv[0]);
-		creds = mprGetPtr(&mprCreds, "creds");
+		creds = (struct cli_credentials *)mprGetPtr(&mprCreds, "creds");
 		if (creds == NULL) {
 			ejsSetErrorMsg(eid, "invalid credentials parameter");
 			talloc_free(ctx);
@@ -122,7 +122,7 @@ static int ejs_net_join_domain(MprVarHandle eid, int argc, struct MprVar **argv)
 	struct libnet_context *ctx;
 	struct libnet_Join *join;
 	NTSTATUS status;
-	ctx = mprGetThisPtr(eid, "ctx");
+	ctx = (struct libnet_context *)mprGetThisPtr(eid, "ctx");
 	mem_ctx = talloc_new(mprMemCtx());
 
 	join = talloc(mem_ctx, struct libnet_Join);
@@ -181,7 +181,7 @@ static int ejs_net_samsync_ldb(MprVarHandle eid, int argc, struct MprVar **argv)
 	struct libnet_context *ctx;
 	struct libnet_samsync_ldb *samsync;
 	NTSTATUS status;
-	ctx = mprGetThisPtr(eid, "ctx");
+	ctx = (struct libnet_context *)mprGetThisPtr(eid, "ctx");
 	mem_ctx = talloc_new(mprMemCtx());
 
 	samsync = talloc(mem_ctx, struct libnet_samsync_ldb);
diff --git a/source4/scripting/ejs/ejsnet/net_user.c b/source4/scripting/ejs/ejsnet/net_user.c
index 8c9ab9f0eb..34524cc0fa 100644
--- a/source4/scripting/ejs/ejsnet/net_user.c
+++ b/source4/scripting/ejs/ejsnet/net_user.c
@@ -45,7 +45,7 @@ int ejs_net_userman(MprVarHandle eid, int argc, struct MprVar **argv)
 	struct MprVar obj;
 
 	/* libnet context */
-	ctx = mprGetThisPtr(eid, "ctx");
+	ctx = (struct libnet_context *)mprGetThisPtr(eid, "ctx");
 	if (ctx == NULL) {
 		ejsSetErrorMsg(eid, "ctx property returns null pointer");
 		return 0;
@@ -128,14 +128,14 @@ static int ejs_net_createuser(MprVarHandle eid, int argc, char **argv)
 	}
 	
 	/* libnet context */
-	ctx = mprGetThisPtr(eid, "ctx");
+	ctx = (struct libnet_context *)mprGetThisPtr(eid, "ctx");
 	if (ctx == NULL) {
 		ejsSetErrorMsg(eid, "ctx property returns null pointer");
 		goto done;
 	}
 
 	/* domain where the account is to be created */
-	userman_domain = mprGetThisPtr(eid, "domain");
+	userman_domain = (const char *)mprGetThisPtr(eid, "domain");
 	if (userman_domain == NULL) {
 		ejsSetErrorMsg(eid, "domain property returns null pointer");
 		goto done;
@@ -197,7 +197,7 @@ static int ejs_net_deleteuser(MprVarHandle eid, int argc, char **argv)
 	}
 	
 	/* domain where the account is to be deleted */
-	userman_domain = mprGetThisPtr(eid, "domain");
+	userman_domain = (struct libnet_context *)mprGetThisPtr(eid, "domain");
 	if (!userman_domain) {
 		ejsSetErrorMsg(eid, "domain property returns null pointer");
 		goto done;
@@ -253,14 +253,14 @@ static int ejs_net_userinfo(MprVarHandle eid, int argc, char **argv)
 	}
 
 	/* libnet context */
-	ctx = mprGetThisPtr(eid, "ctx");
+	ctx = (struct libnet_context *)mprGetThisPtr(eid, "ctx");
 	if (ctx == NULL) {
 		ejsSetErrorMsg(eid, "ctx property returns null pointer");
 		goto done;
 	}
 	
 	/* domain where the user account is to be queried */
-	userman_domain = mprGetThisPtr(eid, "domain");
+	userman_domain = (struct libnet_context *)mprGetThisPtr(eid, "domain");
 	if (userman_domain == NULL) {
 		ejsSetErrorMsg(eid, "domain property returns null pointer");
 		return -1;
@@ -331,7 +331,7 @@ static int ejs_net_userlist(MprVarHandle eid, int argc, struct MprVar **argv)
 	}
 
 	/* libnet context */
-	ctx = mprGetThisPtr(eid, "ctx");
+	ctx = (struct libnet_context *)mprGetThisPtr(eid, "ctx");
 	if (ctx == NULL) {
 		ejsSetErrorMsg(eid, "ctx property returns null pointer");
 		goto done;
diff --git a/source4/scripting/ejs/smbcalls_auth.c b/source4/scripting/ejs/smbcalls_auth.c
index 2624084f02..dcb0f73909 100644
--- a/source4/scripting/ejs/smbcalls_auth.c
+++ b/source4/scripting/ejs/smbcalls_auth.c
@@ -181,7 +181,7 @@ static int ejs_userAuth(MprVarHandle eid, int argc, struct MprVar **argv)
 		return -1;
 	}
 
-	remote_host = mprGetPtr(argv[1], "socket_address");
+	remote_host = (struct socket_address *)mprGetPtr(argv[1], "socket_address");
 	if (remote_host == NULL) {
 		ejsSetErrorMsg(eid, "userAuth requires a socket address second parameter");
 		return -1;
diff --git a/source4/scripting/ejs/smbcalls_creds.c b/source4/scripting/ejs/smbcalls_creds.c
index 0feead201e..b469f2c9fe 100644
--- a/source4/scripting/ejs/smbcalls_creds.c
+++ b/source4/scripting/ejs/smbcalls_creds.c
@@ -30,7 +30,7 @@
 */
 static struct cli_credentials *ejs_creds_get_credentials(int eid)
 {
-	struct cli_credentials *creds = mprGetThisPtr(eid, "creds");
+	struct cli_credentials *creds = (struct cli_credentials *)mprGetThisPtr(eid, "creds");
 	if (creds == NULL) {
 		ejsSetErrorMsg(eid, "NULL ejs credentials");
 	}
diff --git a/source4/scripting/ejs/smbcalls_ldb.c b/source4/scripting/ejs/smbcalls_ldb.c
index 7b143ae4d9..1e55d1c563 100644
--- a/source4/scripting/ejs/smbcalls_ldb.c
+++ b/source4/scripting/ejs/smbcalls_ldb.c
@@ -34,7 +34,7 @@
  */
 static struct ldb_context *ejs_get_ldb_context(int eid)
 {
-	struct ldb_context *ldb = mprGetThisPtr(eid, "db");
+	struct ldb_context *ldb = (struct ldb_context *)mprGetThisPtr(eid, "db");
 	if (ldb == NULL) {
 		ejsSetErrorMsg(eid, "invalid ldb connection");
 	}
diff --git a/source4/scripting/ejs/smbcalls_param.c b/source4/scripting/ejs/smbcalls_param.c
index 0e7a83457a..9dfad39ee7 100644
--- a/source4/scripting/ejs/smbcalls_param.c
+++ b/source4/scripting/ejs/smbcalls_param.c
@@ -39,7 +39,7 @@ static int ejs_param_get(MprVarHandle eid, int argc, char **argv)
 		return -1;
 	}
 
-	ctx = mprGetThisPtr(eid, "param");
+	ctx = (struct param_context *)mprGetThisPtr(eid, "param");
 	mprAssert(ctx);
 	
 	if (argc == 2) {
@@ -72,7 +72,7 @@ static int ejs_param_get_list(MprVarHandle eid, int argc, char **argv)
 		return -1;
 	}
 
-	ctx = mprGetThisPtr(eid, "param");
+	ctx = (struct param_context *)mprGetThisPtr(eid, "param");
 	mprAssert(ctx);
 	
 	if (argc == 2) {
@@ -107,7 +107,7 @@ static int ejs_param_set(MprVarHandle eid, int argc, struct MprVar **argv)
 		return -1;
 	}
 
-	ctx = mprGetThisPtr(eid, "param");
+	ctx = (struct param_context *)mprGetThisPtr(eid, "param");
 	mprAssert(ctx);
 
 	
@@ -148,7 +148,7 @@ static int ejs_param_data(MprVarHandle eid, int argc, char **argv)
 		return -1;
 	}
 
-	ctx = mprGetThisPtr(eid, "param");
+	ctx = (struct param_context *)mprGetThisPtr(eid, "param");
 	mprAssert(ctx);
 
 	ret = mprObject("array");
@@ -184,7 +184,7 @@ static int ejs_param_load(MprVarHandle eid, int argc, char **argv)
 		return -1;
 	}
 
-	ctx = mprGetThisPtr(eid, "param");
+	ctx = (struct param_context *)mprGetThisPtr(eid, "param");
 	mprAssert(ctx);
 
 	ret = param_read(ctx, argv[0]);
@@ -209,7 +209,7 @@ static int ejs_param_save(MprVarHandle eid, int argc, char **argv)
 		return -1;
 	}
 
-	ctx = mprGetThisPtr(eid, "param");
+	ctx = (struct param_context *)mprGetThisPtr(eid, "param");
 	mprAssert(ctx);
 
 	ret = param_write(ctx, argv[0]);
diff --git a/source4/scripting/ejs/smbcalls_reg.c b/source4/scripting/ejs/smbcalls_reg.c
index 4d84587fa4..d4b13cc2ca 100644
--- a/source4/scripting/ejs/smbcalls_reg.c
+++ b/source4/scripting/ejs/smbcalls_reg.c
@@ -32,7 +32,7 @@
  */
 static struct registry_context *ejs_get_reg_context(int eid)
 {
-	struct registry_context *rctx = mprGetThisPtr(eid, "registry");
+	struct registry_context *rctx = (struct registry_context *)mprGetThisPtr(eid, "registry");
 	if (rctx == NULL) {
 		ejsSetErrorMsg(eid, "unable to find registry");
 	}
diff --git a/source4/scripting/ejs/smbcalls_samba3.c b/source4/scripting/ejs/smbcalls_samba3.c
index 3c550e57cd..7c9ef50cf5 100644
--- a/source4/scripting/ejs/smbcalls_samba3.c
+++ b/source4/scripting/ejs/smbcalls_samba3.c
@@ -433,7 +433,7 @@ static int ejs_find_domainsecrets(MprVarHandle eid, int argc, struct MprVar **ar
 		return -1;
 	}
 
-	samba3 = mprGetThisPtr(eid, "samba3");
+	samba3 = (struct samba3 *)mprGetThisPtr(eid, "samba3");
 	mprAssert(samba3);
 	sec = samba3_find_domainsecrets(samba3, mprToString(argv[0]));
 
diff --git a/source4/scripting/ejs/smbcalls_string.c b/source4/scripting/ejs/smbcalls_string.c
index b83178dbba..215ce77b77 100644
--- a/source4/scripting/ejs/smbcalls_string.c
+++ b/source4/scripting/ejs/smbcalls_string.c
@@ -437,7 +437,7 @@ static int ejs_encodeURIComponent(MprVarHandle eid, int argc, char **argv)
 		if (!isalnum(s[i])) count++;
 	}
 	
-	ret = talloc_size(mprMemCtx(), i + count*2 + 1);
+	ret = talloc_array(mprMemCtx(), char, i + count*2 + 1);
 	if (ret == NULL) {
 		return -1;
 	}
@@ -470,7 +470,7 @@ static int ejs_decodeURIComponent(MprVarHandle eid, int argc, char **argv)
 	
 	s = argv[0];
 
-	ret = talloc_size(mprMemCtx(), strlen(s) + 1);
+	ret = talloc_array(mprMemCtx(), char, strlen(s) + 1);
 	if (ret == NULL) {
 		return -1;
 	}
-- 
cgit 


From 98b57d5eb61094a9c88e2f7d90d3e21b7e74e9d8 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sat, 8 Sep 2007 16:46:30 +0000
Subject: r25035: Fix some more warnings, use service pointer rather than
 service number in more places. (This used to be commit
 df9cebcb97e20564359097148665bd519f31bc6f)

---
 source4/scripting/ejs/ejsrpc.c          |  2 +-
 source4/scripting/ejs/smbcalls_config.c | 15 ++++++++-------
 2 files changed, 9 insertions(+), 8 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/ejsrpc.c b/source4/scripting/ejs/ejsrpc.c
index 966c803a30..53660d433f 100644
--- a/source4/scripting/ejs/ejsrpc.c
+++ b/source4/scripting/ejs/ejsrpc.c
@@ -417,7 +417,7 @@ NTSTATUS ejs_push_array_uint8(struct ejs_rpc *ejs,
 			      const uint8_t *r, uint32_t length)
 {
 	DATA_BLOB blob;
-	blob.data = discard_const(r);
+	blob.data = (uint8_t *)discard_const(r);
 	blob.length = length;
 	mprSetVar(v, name, mprDataBlob(blob));
 	return NT_STATUS_OK;
diff --git a/source4/scripting/ejs/smbcalls_config.c b/source4/scripting/ejs/smbcalls_config.c
index b31b70bda8..6da978663a 100644
--- a/source4/scripting/ejs/smbcalls_config.c
+++ b/source4/scripting/ejs/smbcalls_config.c
@@ -37,7 +37,7 @@ static int ejs_lpServices(MprVarHandle eid, int argc, char **argv)
 	if (argc != 0) return -1;
 	
 	for (i=0;i<lp_numservices();i++) {
-		list = str_list_add(list, lp_servicename(i));
+		list = str_list_add(list, lp_servicename(lp_servicebynum(i)));
 	}
 	talloc_steal(mprMemCtx(), list);
 	mpr_Return(eid, mprList("services", list));
@@ -87,9 +87,10 @@ static int ejs_lpGet(MprVarHandle eid, int argc, char **argv)
 	if (argc < 1) return -1;
 
 	if (argc == 2) {
+		struct service *service;
 		/* its a share parameter */
-		int snum = lp_servicenumber(argv[0]);
-		if (snum == -1) {
+		service = lp_service(argv[0]);
+		if (service == NULL) {
 			mpr_Return(eid, mprCreateUndefinedVar());
 			return 0;
 		}
@@ -104,7 +105,7 @@ static int ejs_lpGet(MprVarHandle eid, int argc, char **argv)
 				mpr_Return(eid, mprCreateUndefinedVar());
 				return 0;
 			}
-			value = lp_get_parametric(snum, type, option);
+			value = lp_get_parametric(service, type, option);
 			if (value == NULL) {
 				mpr_Return(eid, mprCreateUndefinedVar());
 				return 0;
@@ -118,7 +119,7 @@ static int ejs_lpGet(MprVarHandle eid, int argc, char **argv)
 			mpr_Return(eid, mprCreateUndefinedVar());
 			return 0;
 		}
-		parm_ptr = lp_parm_ptr(snum, parm);
+		parm_ptr = lp_parm_ptr(service, parm);
 	} else if (strchr(argv[0], ':')) {
 		/* its a global parametric option */
 		const char *type = talloc_strndup(mprMemCtx(), 
@@ -129,7 +130,7 @@ static int ejs_lpGet(MprVarHandle eid, int argc, char **argv)
 			mpr_Return(eid, mprCreateUndefinedVar());
 			return 0;
 		}
-		value = lp_get_parametric(-1, type, option);
+		value = lp_get_parametric(NULL, type, option);
 		if (value == NULL) {
 			mpr_Return(eid, mprCreateUndefinedVar());
 			return 0;
@@ -143,7 +144,7 @@ static int ejs_lpGet(MprVarHandle eid, int argc, char **argv)
 			mpr_Return(eid, mprCreateUndefinedVar());
 			return 0;
 		}
-		parm_ptr = lp_parm_ptr(-1, parm);
+		parm_ptr = lp_parm_ptr(NULL, parm);
 	}
 
 	if (parm == NULL || parm_ptr == NULL) {
-- 
cgit 


From 15c1801a5c13479f1bf67e0e3c1ad7c0af8e3af7 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Mon, 10 Sep 2007 03:44:47 +0000
Subject: r25051: Move SWAT back to the old-style form-submit modal.

The Web 2.0, async client tools were really interesting, but without
developer backing they remain impossible to support into a release.

The most interesting app was the LDB browser, and I intend to replace
this with phpLdapAdmin, preconfigured for Apache during provision.

This also removes the need to 'compile' SWAT on SVN checkouts.

Andrew Bartlett
(This used to be commit cda965e908055d45b1c05bc29cc791f7238d2fae)
---
 source4/scripting/ejs/smbcalls.c     | 46 ------------------------------------
 source4/scripting/libjs/provision.js |  1 -
 2 files changed, 47 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls.c b/source4/scripting/ejs/smbcalls.c
index 08b9eac5c1..3cb860b9e3 100644
--- a/source4/scripting/ejs/smbcalls.c
+++ b/source4/scripting/ejs/smbcalls.c
@@ -161,51 +161,6 @@ static int ejs_version(MprVarHandle eid, int argc, struct MprVar **argv)
 }
 
 
-/*
- * jsonrpc_include() allows you to include jsonrpc files from a path based at
- * "jsonrpc services directory =" in smb.conf.
- */
-static int jsonrpc_include(int eid, int argc, char **argv)
-{
-        int ret = -1;
-        char *path;
-        char *emsg;
-	const char *jsonrpc_services_dir = lp_jsonrpc_services_dir();
-        struct MprVar result;
-
-
-	if (jsonrpc_services_dir == NULL || jsonrpc_services_dir == NULL) {
-		ejsSetErrorMsg(eid, "'jsonrpc services directory' not set");
-		return -1;
-	}
-
-        if (argc != 1) {
-                mpr_Return(eid, mprCreateIntegerVar(-1));
-		return 0;
-        }
-
-        path = talloc_asprintf(mprMemCtx(), "%s/%s",
-                               jsonrpc_services_dir,
-                               argv[0]);
-        if (path == NULL) {
-                mpr_Return(eid, mprCreateIntegerVar(-1));
-                return 0;
-        }
-
-        if (file_exist(path)) {
-                ret = ejsEvalFile(eid, path, &result, &emsg);
-                if (ret < 0) {
-                        ejsSetErrorMsg(eid, "Could not eval file");
-                        printf("file found; ret=%d (%s)\n", ret, emsg);
-                }
-        }
-        
-        mpr_Return(eid, mprCreateIntegerVar(ret));
-        talloc_free(path);
-	return 0;
-}
-
-
 static void (*ejs_exception_handler) (const char *) = NULL;
 
 _PUBLIC_ void ejs_exception(const char *reason)
@@ -240,6 +195,5 @@ void smb_setup_ejs_functions(void (*exception_handler)(const char *))
 	ejsDefineCFunction(-1, "nativeTypeOf", ejs_typeof_native, NULL, MPR_VAR_SCRIPT_HANDLE);
 	ejsDefineStringCFunction(-1, "libinclude", ejs_libinclude, NULL, MPR_VAR_SCRIPT_HANDLE);
 	ejsDefineCFunction(-1, "version", ejs_version, NULL, MPR_VAR_SCRIPT_HANDLE);
-	ejsDefineStringCFunction(-1, "jsonrpc_include", jsonrpc_include, NULL, MPR_VAR_SCRIPT_HANDLE);
 }
 
diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index fd6de2695f..d6d4909499 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -162,7 +162,6 @@ function ldb_erase(info, ldb)
 	/* delete the specials */
 	ldb.del("@INDEXLIST");
 	ldb.del("@ATTRIBUTES");
-	ldb.del("@SUBCLASSES");
 	ldb.del("@MODULES");
 	ldb.del("@PARTITION");
 	ldb.del("@KLUDGEACL");
-- 
cgit 


From 49f4f8ea2c8c209a6d97911d58a00f1947e867fd Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Wed, 12 Sep 2007 09:26:57 +0000
Subject: r25113: fix compiler warning

metze
(This used to be commit d0ada02532d10e8b31c390ee191b94c2f2299cb0)
---
 source4/scripting/ejs/smbcalls_config.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_config.c b/source4/scripting/ejs/smbcalls_config.c
index 6da978663a..7161ca49ad 100644
--- a/source4/scripting/ejs/smbcalls_config.c
+++ b/source4/scripting/ejs/smbcalls_config.c
@@ -87,7 +87,7 @@ static int ejs_lpGet(MprVarHandle eid, int argc, char **argv)
 	if (argc < 1) return -1;
 
 	if (argc == 2) {
-		struct service *service;
+		struct loadparm_service *service;
 		/* its a share parameter */
 		service = lp_service(argv[0]);
 		if (service == NULL) {
-- 
cgit 


From 9a012df08ee829c1d40fc88ba12a0ea479f60be0 Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Fri, 14 Sep 2007 23:21:00 +0000
Subject: r25175: Change to talloc_asprintf_append_buffer(). Jeremy. (This used
 to be commit 0844dbf597191b3e4d35a696695b229e986daec4)

---
 source4/scripting/ejs/smbcalls_string.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_string.c b/source4/scripting/ejs/smbcalls_string.c
index 215ce77b77..541303ff2d 100644
--- a/source4/scripting/ejs/smbcalls_string.c
+++ b/source4/scripting/ejs/smbcalls_string.c
@@ -238,7 +238,7 @@ static int ejs_join(MprVarHandle eid, int argc, struct MprVar **argv)
 		goto failed;
 	}
 	for (i=1;list[i];i++) {
-		ret = talloc_asprintf_append(ret, "%s%s", separator, list[i]);
+		ret = talloc_asprintf_append_buffer(ret, "%s%s", separator, list[i]);
 		if (ret == NULL) {
 			goto failed;
 		}
@@ -275,7 +275,7 @@ static int ejs_sprintf(MprVarHandle eid, int argc, struct MprVar **argv)
 	ret = talloc_strdup(tmp_ctx, "");
 
 	/* avoid all the format string warnings */
-	_asprintf_append = (_asprintf_append_t)talloc_asprintf_append;
+	_asprintf_append = (_asprintf_append_t)talloc_asprintf_append_buffer;
 
 	/*
 	  hackity hack ...
@@ -284,7 +284,7 @@ static int ejs_sprintf(MprVarHandle eid, int argc, struct MprVar **argv)
 		char *fmt2;
 		int len, len_count=0;
 		char *tstr;
-		ret = talloc_asprintf_append(ret, "%*.*s", 
+		ret = talloc_asprintf_append_buffer(ret, "%*.*s", 
 					     (int)(p-format), (int)(p-format), 
 					     format);
 		if (ret == NULL) goto failed;
@@ -299,7 +299,7 @@ static int ejs_sprintf(MprVarHandle eid, int argc, struct MprVar **argv)
 			tstr--;
 		}
 		if (strcmp(tstr, "%") == 0) {
-			ret = talloc_asprintf_append(ret, "%%");
+			ret = talloc_asprintf_append_buffer(ret, "%%");
 			if (ret == NULL) {
 				goto failed;
 			}
@@ -372,7 +372,7 @@ static int ejs_sprintf(MprVarHandle eid, int argc, struct MprVar **argv)
 		format += len+1;
 	}
 
-	ret = talloc_asprintf_append(ret, "%s", format);
+	ret = talloc_asprintf_append_buffer(ret, "%s", format);
 	mpr_Return(eid, mprString(ret));
 	talloc_free(tmp_ctx);
 	return 0;	   
-- 
cgit 


From df7fbf8cfdcf679d2dd48818176068dd9ad97ab6 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Tue, 18 Sep 2007 13:33:44 +0000
Subject: r25214: use talloc_strndup_append() instead of talloc_append_string()
 and ugly hacks to handle the string termination.

metze
(This used to be commit 32bb276920d3f6987427613c6f1bc71557d8893e)
---
 source4/scripting/ejs/literal.c | 24 ++++--------------------
 1 file changed, 4 insertions(+), 20 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/literal.c b/source4/scripting/ejs/literal.c
index d50e5afdb9..8307c211d3 100644
--- a/source4/scripting/ejs/literal.c
+++ b/source4/scripting/ejs/literal.c
@@ -132,27 +132,11 @@ static void *append_string(void *ctx,
                            char *append,
                            int size)
 {
-    char c;
-    char *end_p = append + size;
-    void *ret;
+	if (!orig) {
+		return talloc_strndup(ctx, append, size);
+	}
 
-    /*
-     * We need to null terminate the string to be copied.  Save character at
-     * the size limit of the source string.
-     */
-    c = *end_p;
-
-    /* Temporarily null-terminate it */
-    *end_p = '\0';
-
-    /* Append the requested data */
-    ret = talloc_append_string(ctx, orig, append);
-    
-    /* Restore the original character in place of our temporary null byte */
-    *end_p = c;
-
-    /* Give 'em what they came for */
-    return ret;
+	return talloc_strndup_append(orig, append, size);
 }
 
 
-- 
cgit 


From 9f43d96e3f64b9354cd2cc1685fab254f811eedf Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Fri, 21 Sep 2007 00:42:51 +0000
Subject: r25266: Fix case. (This used to be commit
 935ac3189d93e53841dc47c0f9c7fcca5661a2bb)

---
 source4/scripting/ejs/ejsrpc.c | 10 +++++-----
 source4/scripting/ejs/ejsrpc.h |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/ejsrpc.c b/source4/scripting/ejs/ejsrpc.c
index 53660d433f..a5654e0f00 100644
--- a/source4/scripting/ejs/ejsrpc.c
+++ b/source4/scripting/ejs/ejsrpc.c
@@ -311,7 +311,7 @@ NTSTATUS ejs_push_null(struct ejs_rpc *ejs, struct MprVar *v, const char *name)
 	return mprSetVar(v, name, mprCreatePtrVar(NULL));
 }
 
-BOOL ejs_pull_null(struct ejs_rpc *ejs, struct MprVar *v, const char *name)
+bool ejs_pull_null(struct ejs_rpc *ejs, struct MprVar *v, const char *name)
 {
 	NTSTATUS status = mprGetVar(&v, name);
 	if (!NT_STATUS_IS_OK(status)) {
@@ -372,16 +372,16 @@ NTSTATUS ejs_push_DATA_BLOB(struct ejs_rpc *ejs,
 	return NT_STATUS_NOT_IMPLEMENTED;
 }
 
-NTSTATUS ejs_pull_BOOL(struct ejs_rpc *ejs, 
-		       struct MprVar *v, const char *name, BOOL *r)
+NTSTATUS ejs_pull_bool(struct ejs_rpc *ejs, 
+		       struct MprVar *v, const char *name, bool *r)
 {
 	NDR_CHECK(mprGetVar(&v, name));
 	*r = mprVarToBool(v);
 	return NT_STATUS_OK;
 }
 
-NTSTATUS ejs_push_BOOL(struct ejs_rpc *ejs, 
-		       struct MprVar *v, const char *name, const BOOL *r)
+NTSTATUS ejs_push_bool(struct ejs_rpc *ejs, 
+		       struct MprVar *v, const char *name, const bool *r)
 {
 	return mprSetVar(v, name, mprCreateBoolVar(*r));
 }
diff --git a/source4/scripting/ejs/ejsrpc.h b/source4/scripting/ejs/ejsrpc.h
index ef920b816a..6723fb4107 100644
--- a/source4/scripting/ejs/ejsrpc.h
+++ b/source4/scripting/ejs/ejsrpc.h
@@ -113,9 +113,9 @@ NTSTATUS ejs_pull_DATA_BLOB(struct ejs_rpc *ejs,
 			    struct MprVar *v, const char *name, DATA_BLOB *r);
 NTSTATUS ejs_push_DATA_BLOB(struct ejs_rpc *ejs, 
 			    struct MprVar *v, const char *name, const DATA_BLOB *r);
-NTSTATUS ejs_pull_BOOL(struct ejs_rpc *ejs, 
+NTSTATUS ejs_pull_bool(struct ejs_rpc *ejs, 
 		       struct MprVar *v, const char *name, bool *r);
-NTSTATUS ejs_push_BOOL(struct ejs_rpc *ejs, 
+NTSTATUS ejs_push_bool(struct ejs_rpc *ejs, 
 		       struct MprVar *v, const char *name, const bool *r);
 
 NTSTATUS ejs_pull_array_uint8(struct ejs_rpc *ejs, 
-- 
cgit 


From ee257e902ade941f734d5b647511d14e051ac0d1 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Sat, 22 Sep 2007 12:57:17 +0000
Subject: r25299: Modify the provision script to take an additional argument: 
 --server-role

This must be set to either 'domain controller', 'domain member' or 'standalone'.

The default for the provision now changes to 'standalone'.

This is not because Samba4 is particularlly useful in that mode, but
because we still want a positive sign from the administrator that we
should advertise as a DC.

We now do more to ensure the 'standalone' and 'member server'
provision output is reasonable, and try not to set odd things into the
database that only belong for the DC.

Andrew Bartlett
(This used to be commit 4cc4ed7719aff712e735628410bd3813c7d6aa40)
---
 source4/scripting/libjs/provision.js | 47 ++++++++++++++++++++++++++++++------
 1 file changed, 39 insertions(+), 8 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index d6d4909499..502583507b 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -489,6 +489,17 @@ function provision_fix_subobj(subobj, paths)
 	subobj.NETLOGONPATH = paths.netlogon;
 	subobj.SYSVOLPATH = paths.sysvol;
 
+	if (subobj.DOMAIN_CONF == undefined) {
+		subobj.DOMAIN_CONF = subobj.DOMAIN;
+	}
+	if (subobj.REALM_CONF == undefined) {
+		subobj.REALM_CONF = subobj.REALM;
+	}
+	if (subobj.SERVERROLE != "domain controller") {
+		subobj.REALM = subobj.HOSTNAME;
+		subobj.DOMAIN = subobj.HOSTNAME;
+	}
+
 	return true;
 }
 
@@ -536,6 +547,8 @@ function provision_become_dc(subobj, message, erase, paths, session_info)
 
 	setup_ldb("secrets.ldif", info, paths.secrets, false);
 
+	setup_ldb("secrets_dc.ldif", info, paths.secrets, false);
+
 	return true;
 }
 
@@ -571,8 +584,16 @@ function provision(subobj, message, blank, paths, session_info, credentials, lda
 	/* only install a new smb.conf if there isn't one there already */
 	var st = sys.stat(paths.smbconf);
 	if (st == undefined) {
+		var smbconfsuffix;
+		if (subobj.ROLE == "domain controller") {
+			smbconfsuffix = "dc";
+		} else if (subobj.ROLE == "member server") {
+			smbconfsuffix = "member";
+		} else {
+			smbconfsuffix = subobj.ROLE;
+		}
 		message("Setting up " + paths.smbconf +"\n");
-		setup_file("provision.smb.conf", info.message, paths.smbconf, subobj);
+		setup_file("provision.smb.conf." + smbconfsuffix, info.message, paths.smbconf, subobj);
 		lp.reload();
 	}
 	/* only install a new shares config db if there is none */
@@ -724,7 +745,7 @@ function provision(subobj, message, blank, paths, session_info, credentials, lda
 	message("Setting up sam.ldb users and groups\n");
 	setup_add_ldif("provision_users.ldif", info, samdb, false);
 
-	if (lp.get("server role") == "domain controller") {
+	if (subobj.SERVERROLE == "domain controller") {
 		message("Setting up self join\n");
 		setup_add_ldif("provision_self_join.ldif", info, samdb, false);
 		setup_add_ldif("provision_group_policy.ldif", info, samdb, false);
@@ -737,6 +758,9 @@ function provision(subobj, message, blank, paths, session_info, credentials, lda
 		sys.mkdir(paths.sysvol + "/"+ subobj.DNSDOMAIN + "/Policies/{" + subobj.POLICYGUID + "}/User", 0755);
 
 		sys.mkdir(paths.netlogon, 0755);
+
+		setup_ldb("secrets_dc.ldif", info, paths.secrets, false);
+
 	}
 
 	if (setup_name_mappings(info, samdb) == false) {
@@ -809,8 +833,8 @@ function provision_schema(subobj, message, tmp_schema_path, paths)
 function provision_dns(subobj, message, paths, session_info, credentials)
 {
 	var lp = loadparm_init();
-	if (lp.get("server role") != "domain controller") {
-		message("No DNS zone required for role %s\n", lp.get("server role"));
+	if (subobj.SERVERROLE != "domain controller") {
+		message("No DNS zone required for role %s\n", subobj.SERVERROLE);
 		return;
 	}
 	message("Setting up DNS zone: " + subobj.DNSDOMAIN + " \n");
@@ -886,6 +910,7 @@ function provision_guess()
 	var rdn_list;
 	random_init(local);
 
+	subobj.SERVERROLE   = strlower(lp.get("server role"));
 	subobj.REALM        = strupper(lp.get("realm"));
 	subobj.DOMAIN       = lp.get("workgroup");
 	subobj.HOSTNAME     = hostname();
@@ -1100,15 +1125,21 @@ function provision_validate(subobj, message)
 	}
 
 
-	if (strupper(lp.get("workgroup")) != strupper(subobj.DOMAIN)) {
+	if (strupper(lp.get("workgroup")) != strupper(subobj.DOMAIN_CONF)) {
 		message("workgroup '%s' in smb.conf must match chosen domain '%s'\n",
-			lp.get("workgroup"), subobj.DOMAIN);
+			lp.get("workgroup"), subobj.DOMAIN_CONF);
 		return false;
 	}
 
-	if (strupper(lp.get("realm")) != strupper(subobj.REALM)) {
+	if (strupper(lp.get("realm")) != strupper(subobj.REALM_CONF)) {
 		message("realm '%s' in smb.conf must match chosen realm '%s'\n",
-			lp.get("realm"), subobj.REALM);
+			lp.get("realm"), subobj.REALM_CONF);
+		return false;
+	}
+
+	if (strupper(lp.get("server role")) != strupper(subobj.SERVERROLE)) {
+		message("server role '%s' in smb.conf must match chosen role '%s'\n",
+			lp.get("server role"), subobj.SERVERROLE);
 		return false;
 	}
 
-- 
cgit 


From bd4dc88e7ba84e53b507f01f7a9f73a0d1b959fd Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Mon, 24 Sep 2007 11:34:26 +0000
Subject: r25304: Thankyou to Amin Azez <azez@ufomechanic.net> for pointing out
 that I used subobj.ROLE and not subobj.SERVERROLE as the rest of the code
 does.

Andrew Bartlett
(This used to be commit dd1cb33591819c3d4263e594c7a80de899def223)
---
 source4/scripting/libjs/provision.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index 502583507b..f204bcc9cc 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -585,12 +585,12 @@ function provision(subobj, message, blank, paths, session_info, credentials, lda
 	var st = sys.stat(paths.smbconf);
 	if (st == undefined) {
 		var smbconfsuffix;
-		if (subobj.ROLE == "domain controller") {
+		if (subobj.SERVERROLE == "domain controller") {
 			smbconfsuffix = "dc";
-		} else if (subobj.ROLE == "member server") {
+		} else if (subobj.SERVERROLE == "member server") {
 			smbconfsuffix = "member";
 		} else {
-			smbconfsuffix = subobj.ROLE;
+			smbconfsuffix = subobj.SERVERROLE;
 		}
 		message("Setting up " + paths.smbconf +"\n");
 		setup_file("provision.smb.conf." + smbconfsuffix, info.message, paths.smbconf, subobj);
-- 
cgit 


From 708729be9f837b95a8e35811282893c428abb450 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Wed, 26 Sep 2007 03:08:40 +0000
Subject: r25348: Start working on another Python wrapper. (This used to be
 commit 441a0404346ce2ff72e8262c5bf6ef94d3b9f331)

---
 source4/scripting/swig/config.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/config.mk b/source4/scripting/swig/config.mk
index 61e8081268..bf9a481e4e 100644
--- a/source4/scripting/swig/config.mk
+++ b/source4/scripting/swig/config.mk
@@ -9,7 +9,7 @@ OBJ_FILES = dcerpc_wrap.o
 
 # Swig extensions
 swig: lib/tdb/swig/_tdb.$(SHLIBEXT) lib/ldb/swig/_ldb.$(SHLIBEXT) \
-	libcli/swig/_libcli_nbt.$(SHLIBEXT)
+	libcli/swig/_libcli_nbt.$(SHLIBEXT) libcli/swig/_libcli_smb.$(SHLIBEXT)
 
 .SUFFIXES: _wrap.c .i
 
-- 
cgit 


From 5e2f9cd8e223368d38d49cf60f199bbd818b8732 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Thu, 27 Sep 2007 19:49:53 +0000
Subject: r25379: Use loadparm context parameter in a lot more places. (This
 used to be commit 091961b13be665061c7e88ab4e2808c015bc403e)

---
 source4/scripting/ejs/smbcalls_config.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_config.c b/source4/scripting/ejs/smbcalls_config.c
index 7161ca49ad..8f1339db34 100644
--- a/source4/scripting/ejs/smbcalls_config.c
+++ b/source4/scripting/ejs/smbcalls_config.c
@@ -36,8 +36,8 @@ static int ejs_lpServices(MprVarHandle eid, int argc, char **argv)
 	const char **list = NULL;
 	if (argc != 0) return -1;
 	
-	for (i=0;i<lp_numservices();i++) {
-		list = str_list_add(list, lp_servicename(lp_servicebynum(i)));
+	for (i=0;i<lp_numservices(global_loadparm);i++) {
+		list = str_list_add(list, lp_servicename(lp_servicebynum(global_loadparm, i)));
 	}
 	talloc_steal(mprMemCtx(), list);
 	mpr_Return(eid, mprList("services", list));
@@ -89,7 +89,7 @@ static int ejs_lpGet(MprVarHandle eid, int argc, char **argv)
 	if (argc == 2) {
 		struct loadparm_service *service;
 		/* its a share parameter */
-		service = lp_service(argv[0]);
+		service = lp_service(global_loadparm, argv[0]);
 		if (service == NULL) {
 			mpr_Return(eid, mprCreateUndefinedVar());
 			return 0;
-- 
cgit 


From db6c6cfdec4d00b034d5dfed7cc5b533f2d53db4 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Thu, 27 Sep 2007 20:45:42 +0000
Subject: r25383: Patch from Amin Azez <azez@ufomechanic.net> to give better
 message when a template file is missing.

Andrew Bartlett
(This used to be commit 5093ea1cef910fe01a249b2d7ef602e2374e2b35)
---
 source4/scripting/libjs/provision.js | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index f204bcc9cc..870e33f84a 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -355,6 +355,11 @@ function setup_file(template, message, fname, subobj)
 	var f = fname;
 	var src = lp.get("setup directory") + "/" + template;
 
+	if (! sys.stat(src)) {
+		message("Template file not found: %s\n",src);
+		assert(0);
+	}
+
 	sys.unlink(f);
 
 	var data = sys.file_load(src);
-- 
cgit 


From 3048e9ad654506219b169a934edded388d10fcad Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Thu, 27 Sep 2007 23:31:28 +0000
Subject: r25392: Add loadparm context as argument in a couple more places.
 (This used to be commit c62f51cc28a37959128e78a1f34cfd4c6d3ba069)

---
 source4/scripting/ejs/smbcalls_config.c | 2 +-
 source4/scripting/ejs/smbscript.c       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_config.c b/source4/scripting/ejs/smbcalls_config.c
index 8f1339db34..f488b0745f 100644
--- a/source4/scripting/ejs/smbcalls_config.c
+++ b/source4/scripting/ejs/smbcalls_config.c
@@ -200,7 +200,7 @@ static int ejs_lpSet(MprVarHandle eid, int argc, char **argv)
 		return -1;
 	}
 
-	mpr_Return(eid, mprCreateBoolVar(lp_set_cmdline(argv[0], argv[1])));
+	mpr_Return(eid, mprCreateBoolVar(lp_set_cmdline(global_loadparm, argv[0], argv[1])));
 	return 0;
 }
 
diff --git a/source4/scripting/ejs/smbscript.c b/source4/scripting/ejs/smbscript.c
index a21669a07e..9f7e048fc0 100644
--- a/source4/scripting/ejs/smbscript.c
+++ b/source4/scripting/ejs/smbscript.c
@@ -52,7 +52,7 @@ int main(int argc, const char **argv)
 	fault_setup(argv[0]);
 
 	if (getenv("SMB_CONF_PATH")) {
-		lp_set_cmdline("config file", getenv("SMB_CONF_PATH"));
+		lp_set_cmdline(global_loadparm, "config file", getenv("SMB_CONF_PATH"));
 	}
 
 	ldb_global_init();
-- 
cgit 


From 37d53832a4623653f706e77985a79d84bd7c6694 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Fri, 28 Sep 2007 01:17:46 +0000
Subject: r25398: Parse loadparm context to all lp_*() functions. (This used to
 be commit 3fcc960839c6e5ca4de2c3c042f12f369ac5f238)

---
 source4/scripting/ejs/ejsnet/net_ctx.c  | 2 +-
 source4/scripting/ejs/smbcalls.c        | 2 +-
 source4/scripting/ejs/smbcalls_cli.c    | 4 ++--
 source4/scripting/ejs/smbcalls_config.c | 2 +-
 source4/scripting/ejs/smbcalls_creds.c  | 2 +-
 source4/scripting/ejs/smbscript.c       | 6 ++++--
 6 files changed, 10 insertions(+), 8 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/ejsnet/net_ctx.c b/source4/scripting/ejs/ejsnet/net_ctx.c
index a2a3821082..5fdfe51887 100644
--- a/source4/scripting/ejs/ejsnet/net_ctx.c
+++ b/source4/scripting/ejs/ejsnet/net_ctx.c
@@ -68,7 +68,7 @@ static int ejs_net_context(MprVarHandle eid, int argc, struct MprVar **argv)
 			talloc_free(ctx);
 			return -1;
 		}
-		cli_credentials_set_conf(creds);
+		cli_credentials_set_conf(creds, global_loadparm);
 		cli_credentials_set_anonymous(creds);
 
 		mprCreds = mprCredentials(creds);
diff --git a/source4/scripting/ejs/smbcalls.c b/source4/scripting/ejs/smbcalls.c
index 3cb860b9e3..91e58873df 100644
--- a/source4/scripting/ejs/smbcalls.c
+++ b/source4/scripting/ejs/smbcalls.c
@@ -111,7 +111,7 @@ static int ejs_typeof_native(MprVarHandle eid, int argc, struct MprVar **argv)
 static int ejs_libinclude(int eid, int argc, char **argv)
 {
 	int i, j;
-	const char **js_include = lp_js_include();
+	const char **js_include = lp_js_include(global_loadparm);
 
 	if (js_include == NULL || js_include[0] == NULL) {
 		ejsSetErrorMsg(eid, "js include path not set");
diff --git a/source4/scripting/ejs/smbcalls_cli.c b/source4/scripting/ejs/smbcalls_cli.c
index 02b948182a..af86be9432 100644
--- a/source4/scripting/ejs/smbcalls_cli.c
+++ b/source4/scripting/ejs/smbcalls_cli.c
@@ -431,7 +431,7 @@ static int ejs_tree_connect(MprVarHandle eid, int argc, char **argv)
 	/* Set up credentials */
 
 	creds = cli_credentials_init(NULL);
-	cli_credentials_set_conf(creds);
+	cli_credentials_set_conf(creds, global_loadparm);
 	cli_credentials_parse_string(creds, argv[1], CRED_SPECIFIED);
 
 	/* Do connect */
@@ -443,7 +443,7 @@ static int ejs_tree_connect(MprVarHandle eid, int argc, char **argv)
 	io.in.service_type           = "?????";
 	io.in.credentials            = creds;
 	io.in.fallback_to_anonymous  = False;
-	io.in.workgroup              = lp_workgroup();
+	io.in.workgroup              = lp_workgroup(global_loadparm);
 
 	result = smb_composite_connect(&io, mem_ctx, NULL);
 	tree = io.out.tree;
diff --git a/source4/scripting/ejs/smbcalls_config.c b/source4/scripting/ejs/smbcalls_config.c
index f488b0745f..45c197834a 100644
--- a/source4/scripting/ejs/smbcalls_config.c
+++ b/source4/scripting/ejs/smbcalls_config.c
@@ -211,7 +211,7 @@ static int ejs_lpSet(MprVarHandle eid, int argc, char **argv)
 */
 static int ejs_lpReload(MprVarHandle eid, int argc, char **argv)
 {
-	BOOL ret = lp_load();
+	BOOL ret = lp_load(lp_configfile(global_loadparm));
 	if (ret) {
 		unload_interfaces();
 	}
diff --git a/source4/scripting/ejs/smbcalls_creds.c b/source4/scripting/ejs/smbcalls_creds.c
index b469f2c9fe..730753d158 100644
--- a/source4/scripting/ejs/smbcalls_creds.c
+++ b/source4/scripting/ejs/smbcalls_creds.c
@@ -248,7 +248,7 @@ static int ejs_credentials_init(MprVarHandle eid, int argc, struct MprVar **argv
 		return -1;
 	}
 
-	cli_credentials_set_conf(creds);
+	cli_credentials_set_conf(creds, global_loadparm);
 
 	return ejs_credentials_obj(obj, creds);
 }
diff --git a/source4/scripting/ejs/smbscript.c b/source4/scripting/ejs/smbscript.c
index 9f7e048fc0..29ce763f96 100644
--- a/source4/scripting/ejs/smbscript.c
+++ b/source4/scripting/ejs/smbscript.c
@@ -26,6 +26,7 @@
 #include "scripting/ejs/smbcalls.h"
 #include "auth/gensec/gensec.h"
 #include "ldb/include/ldb.h"
+#include "dynconfig.h"
 
 static EjsId eid;
 
@@ -52,7 +53,9 @@ int main(int argc, const char **argv)
 	fault_setup(argv[0]);
 
 	if (getenv("SMB_CONF_PATH")) {
-		lp_set_cmdline(global_loadparm, "config file", getenv("SMB_CONF_PATH"));
+		lp_load(getenv("SMB_CONF_PATH"));
+	} else {
+		lp_load(dyn_CONFIGFILE);
 	}
 
 	ldb_global_init();
@@ -60,7 +63,6 @@ int main(int argc, const char **argv)
 	gensec_init();
 	mprSetCtx(mem_ctx);
 
-	lp_load();
 
 	if (argc < 2) {
 		fprintf(stderr, "You must supply a script name\n");
-- 
cgit 


From 60a1046c5c5783799bd64fe18e03534670f83d82 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sat, 29 Sep 2007 18:00:19 +0000
Subject: r25430: Add the loadparm context to all parametric options. (This
 used to be commit fd697d77c9fe67a00939a1f04b35c451316fff58)

---
 source4/scripting/ejs/smbcalls_config.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_config.c b/source4/scripting/ejs/smbcalls_config.c
index 45c197834a..ae7dea6819 100644
--- a/source4/scripting/ejs/smbcalls_config.c
+++ b/source4/scripting/ejs/smbcalls_config.c
@@ -105,7 +105,7 @@ static int ejs_lpGet(MprVarHandle eid, int argc, char **argv)
 				mpr_Return(eid, mprCreateUndefinedVar());
 				return 0;
 			}
-			value = lp_get_parametric(service, type, option);
+			value = lp_get_parametric(global_loadparm, service, type, option);
 			if (value == NULL) {
 				mpr_Return(eid, mprCreateUndefinedVar());
 				return 0;
@@ -130,7 +130,7 @@ static int ejs_lpGet(MprVarHandle eid, int argc, char **argv)
 			mpr_Return(eid, mprCreateUndefinedVar());
 			return 0;
 		}
-		value = lp_get_parametric(NULL, type, option);
+		value = lp_get_parametric(global_loadparm, NULL, type, option);
 		if (value == NULL) {
 			mpr_Return(eid, mprCreateUndefinedVar());
 			return 0;
-- 
cgit 


From 2f3551ca7cee59d4d053cceb87abdf1da1b3a1ad Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 1 Oct 2007 18:52:55 +0000
Subject: r25446: Merge some changes I made on the way home from SFO:

2007-09-29 More higher-level passing around of lp_ctx.
2007-09-29 Fix warning.
2007-09-29 Pass loadparm contexts on a higher level.
2007-09-29 Avoid using global loadparm context.
(This used to be commit 3468952e771ab31f90b6c374ade01c5550810f42)
---
 source4/scripting/ejs/smbcalls.c      |  2 +-
 source4/scripting/ejs/smbcalls_auth.c | 10 ++++++----
 source4/scripting/ejs/smbcalls_ldb.c  |  2 +-
 source4/scripting/ejs/smbcalls_rpc.c  |  4 +++-
 4 files changed, 11 insertions(+), 7 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls.c b/source4/scripting/ejs/smbcalls.c
index 91e58873df..8a3ce245d2 100644
--- a/source4/scripting/ejs/smbcalls.c
+++ b/source4/scripting/ejs/smbcalls.c
@@ -184,7 +184,7 @@ void smb_setup_ejs_functions(void (*exception_handler)(const char *))
 	smb_setup_ejs_param();
         smb_setup_ejs_literal();
 	
-	shared_init = load_samba_modules(NULL, "smbcalls");
+	shared_init = load_samba_modules(NULL, global_loadparm, "smbcalls");
 	
 	run_init_functions(static_init);
 	run_init_functions(shared_init);
diff --git a/source4/scripting/ejs/smbcalls_auth.c b/source4/scripting/ejs/smbcalls_auth.c
index dcb0f73909..e5b1aab3c2 100644
--- a/source4/scripting/ejs/smbcalls_auth.c
+++ b/source4/scripting/ejs/smbcalls_auth.c
@@ -30,9 +30,11 @@
 #include "libcli/security/security.h"
 
 static int ejs_doauth(MprVarHandle eid,
-		      TALLOC_CTX *tmp_ctx, struct MprVar *auth, const char *username, 
-		      const char *password, const char *domain, const char *workstation,
-		      struct socket_address *remote_host, const char **auth_types)
+		      TALLOC_CTX *tmp_ctx, struct MprVar *auth, 
+		      const char *username, const char *password, 
+		      const char *domain, const char *workstation,
+		      struct socket_address *remote_host, 
+		      const char **auth_types)
 {
 	struct auth_usersupplied_info *user_info = NULL;
 	struct auth_serversupplied_info *server_info = NULL;
@@ -54,7 +56,7 @@ static int ejs_doauth(MprVarHandle eid,
 	} else {
 		/* Hope we can find the event context somewhere up there... */
 		ev = event_context_find(tmp_ctx);
-		msg = messaging_client_init(tmp_ctx, ev);
+		msg = messaging_client_init(tmp_ctx, global_loadparm, ev);
 	}
 
 	if (auth_types) {
diff --git a/source4/scripting/ejs/smbcalls_ldb.c b/source4/scripting/ejs/smbcalls_ldb.c
index 1e55d1c563..42105e7965 100644
--- a/source4/scripting/ejs/smbcalls_ldb.c
+++ b/source4/scripting/ejs/smbcalls_ldb.c
@@ -452,7 +452,7 @@ static int ejs_ldbConnect(MprVarHandle eid, int argc, char **argv)
 
 	dbfile = argv[0];
 
-	ldb = ldb_wrap_connect(mprMemCtx(), dbfile, 
+	ldb = ldb_wrap_connect(mprMemCtx(), global_loadparm, dbfile, 
 			       session_info, creds,
 			       0, (const char **)(argv+1));
 	if (ldb == NULL) {
diff --git a/source4/scripting/ejs/smbcalls_rpc.c b/source4/scripting/ejs/smbcalls_rpc.c
index b95681d4ef..5d7c674208 100644
--- a/source4/scripting/ejs/smbcalls_rpc.c
+++ b/source4/scripting/ejs/smbcalls_rpc.c
@@ -78,7 +78,9 @@ static int ejs_irpc_connect(MprVarHandle eid, int argc, char **argv)
 	/* create a messaging context, looping as we have no way to
 	   allocate temporary server ids automatically */
 	for (i=0;i<10000;i++) {
-		p->msg_ctx = messaging_init(p, cluster_id(EJS_ID_BASE + i), ev);
+		p->msg_ctx = messaging_init(p, 
+					    lp_messaging_path(p, global_loadparm),
+					    cluster_id(EJS_ID_BASE + i), ev);
 		if (p->msg_ctx) break;
 	}
 	if (p->msg_ctx == NULL) {
-- 
cgit 


From 30047a95432984c8c450b8a819b9f742bdedf66b Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 2 Oct 2007 13:00:33 +0000
Subject: r25460: use common structure in param/generic.c (This used to be
 commit 01ce5448f44ddda7ec864d812fe23f0fa68d1561)

---
 source4/scripting/ejs/smbcalls_param.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_param.c b/source4/scripting/ejs/smbcalls_param.c
index 9dfad39ee7..830c45d978 100644
--- a/source4/scripting/ejs/smbcalls_param.c
+++ b/source4/scripting/ejs/smbcalls_param.c
@@ -155,10 +155,10 @@ static int ejs_param_data(MprVarHandle eid, int argc, char **argv)
 
 	for (sec = ctx->sections; sec; sec = sec->next) {
 		struct MprVar ps = mprObject("array");
-		struct param *p;
+		struct param_opt *p;
 
 		for (p = sec->parameters; p; p = p->next) {
-			mprSetVar(&ps, p->name, mprString(p->value));
+			mprSetVar(&ps, p->key, mprString(p->value));
 		}
 		
 		mprSetVar(&ret, sec->name, ps);
-- 
cgit 


From 8ffc4c1f97bf40cf19812b086cab2c48ff9aed9d Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 2 Oct 2007 14:29:20 +0000
Subject: r25462: Remove refernece to categories from js as well. (This used to
 be commit 12d7cccd7c8c632e2d49e9c21e0e139366ffe2c3)

---
 source4/scripting/ejs/smbcalls_config.c | 25 -------------------------
 1 file changed, 25 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_config.c b/source4/scripting/ejs/smbcalls_config.c
index ae7dea6819..6b9c245e7e 100644
--- a/source4/scripting/ejs/smbcalls_config.c
+++ b/source4/scripting/ejs/smbcalls_config.c
@@ -45,27 +45,6 @@ static int ejs_lpServices(MprVarHandle eid, int argc, char **argv)
 }
 
 
-/*
-  return a list of parameter categories
-*/
-static int ejs_lpCategories(MprVarHandle eid, int argc, char **argv)
-{
-	struct parm_struct *parm_table = lp_parm_table();
-	int i;
-	const char **list = NULL;
-	if (argc != 0) return -1;
-	
-	for (i=0;parm_table[i].label;i++) {
-		if (parm_table[i].class == P_SEPARATOR) {
-			list = str_list_add(list, parm_table[i].label);
-		}
-	}
-	talloc_steal(mprMemCtx(), list);
-	mpr_Return(eid, mprList("categories", list));
-	return 0;
-}
-
-
 /*
   allow access to loadparm variables from inside ejs scripts in web apps
   
@@ -178,9 +157,6 @@ static int ejs_lpGet(MprVarHandle eid, int argc, char **argv)
 	case P_LIST: 
 		mpr_Return(eid, mprList(parm->label, *(const char ***)parm_ptr));
 		break;
-	case P_SEP:
-		mpr_Return(eid, mprCreateUndefinedVar());
-		return 0;
 	}
 	return 0;
 }
@@ -230,7 +206,6 @@ static int ejs_loadparm_init(MprVarHandle eid, int argc, struct MprVar **argv)
 	mprSetStringCFunction(obj, "set", ejs_lpSet);
 	mprSetStringCFunction(obj, "reload", ejs_lpReload);
 	mprSetStringCFunction(obj, "services", ejs_lpServices);
-	mprSetStringCFunction(obj, "categories", ejs_lpCategories);
 	return 0;
 }
 
-- 
cgit 


From 55a7440a07396e31b6647b79576fb16e54cc183a Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Fri, 5 Oct 2007 21:54:34 +0000
Subject: r25536: Fix path for messaging - this code path doesn't appear to
 have a test, otherwise it would've caused a crash in the testsuite earlier...
 (This used to be commit 89c8fd8c02830051e0199e234cc3e3b15e8c9879)

---
 source4/scripting/ejs/smbcalls_auth.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_auth.c b/source4/scripting/ejs/smbcalls_auth.c
index e5b1aab3c2..44059d7537 100644
--- a/source4/scripting/ejs/smbcalls_auth.c
+++ b/source4/scripting/ejs/smbcalls_auth.c
@@ -56,7 +56,7 @@ static int ejs_doauth(MprVarHandle eid,
 	} else {
 		/* Hope we can find the event context somewhere up there... */
 		ev = event_context_find(tmp_ctx);
-		msg = messaging_client_init(tmp_ctx, global_loadparm, ev);
+		msg = messaging_client_init(tmp_ctx, lp_messaging_path(tmp_ctx, global_loadparm), ev);
 	}
 
 	if (auth_types) {
-- 
cgit 


From 2151cde58014ea2e822c13d2f8a369b45dc19ca8 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sat, 6 Oct 2007 22:28:14 +0000
Subject: r25554: Convert last instances of BOOL, True and False to the
 standard types. (This used to be commit
 566aa14139510788548a874e9213d91317f83ca9)

---
 source4/scripting/ejs/ejsnet/net_ctx.c  |  8 ++++----
 source4/scripting/ejs/ejsrpc.c          |  6 +++---
 source4/scripting/ejs/mprutil.c         |  2 +-
 source4/scripting/ejs/smbcalls_auth.c   | 14 +++++++-------
 source4/scripting/ejs/smbcalls_cli.c    |  8 ++++----
 source4/scripting/ejs/smbcalls_config.c |  4 ++--
 source4/scripting/ejs/smbcalls_creds.c  | 14 +++++++-------
 source4/scripting/ejs/smbcalls_data.c   | 12 ++++++------
 source4/scripting/ejs/smbcalls_ldb.c    |  2 +-
 source4/scripting/ejs/smbcalls_sys.c    |  4 ++--
 10 files changed, 37 insertions(+), 37 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/ejsnet/net_ctx.c b/source4/scripting/ejs/ejsnet/net_ctx.c
index 5fdfe51887..97a05ab88f 100644
--- a/source4/scripting/ejs/ejsnet/net_ctx.c
+++ b/source4/scripting/ejs/ejsnet/net_ctx.c
@@ -166,9 +166,9 @@ static int ejs_net_join_domain(MprVarHandle eid, int argc, struct MprVar **argv)
 		MprVar error_string = mprString(join->out.error_string);
 		
 		mprSetPropertyValue(argv[0], "error_string", error_string);
-		mpr_Return(eid, mprCreateBoolVar(False));
+		mpr_Return(eid, mprCreateBoolVar(false));
 	} else {
-		mpr_Return(eid, mprCreateBoolVar(True));
+		mpr_Return(eid, mprCreateBoolVar(true));
 	}
 	talloc_free(mem_ctx);
 	return 0;
@@ -214,9 +214,9 @@ static int ejs_net_samsync_ldb(MprVarHandle eid, int argc, struct MprVar **argv)
 		MprVar error_string = mprString(samsync->out.error_string);
 		
 		mprSetPropertyValue(argv[0], "error_string", error_string);
-		mpr_Return(eid, mprCreateBoolVar(False));
+		mpr_Return(eid, mprCreateBoolVar(false));
 	} else {
-		mpr_Return(eid, mprCreateBoolVar(True));
+		mpr_Return(eid, mprCreateBoolVar(true));
 	}
 	talloc_free(mem_ctx);
 	return 0;
diff --git a/source4/scripting/ejs/ejsrpc.c b/source4/scripting/ejs/ejsrpc.c
index a5654e0f00..3769607949 100644
--- a/source4/scripting/ejs/ejsrpc.c
+++ b/source4/scripting/ejs/ejsrpc.c
@@ -315,12 +315,12 @@ bool ejs_pull_null(struct ejs_rpc *ejs, struct MprVar *v, const char *name)
 {
 	NTSTATUS status = mprGetVar(&v, name);
 	if (!NT_STATUS_IS_OK(status)) {
-		return False;
+		return false;
 	}
 	if (v->type == MPR_TYPE_PTR && v->ptr == NULL) {
-		return True;
+		return true;
 	}
-	return False;
+	return false;
 }
 
 /*
diff --git a/source4/scripting/ejs/mprutil.c b/source4/scripting/ejs/mprutil.c
index b8271d97c5..9143947fb8 100644
--- a/source4/scripting/ejs/mprutil.c
+++ b/source4/scripting/ejs/mprutil.c
@@ -134,7 +134,7 @@ struct MprVar mprString(const char *s)
 	if (s == NULL) {
 		return mprCreatePtrVar(NULL);
 	}
-	return mprCreateStringVar(s, True);
+	return mprCreateStringVar(s, true);
 }
 
 /*
diff --git a/source4/scripting/ejs/smbcalls_auth.c b/source4/scripting/ejs/smbcalls_auth.c
index 44059d7537..b4848d4323 100644
--- a/source4/scripting/ejs/smbcalls_auth.c
+++ b/source4/scripting/ejs/smbcalls_auth.c
@@ -65,19 +65,19 @@ static int ejs_doauth(MprVarHandle eid,
 		nt_status = auth_context_create(tmp_ctx, ev, msg, &auth_context);
 	}
 	if (!NT_STATUS_IS_OK(nt_status)) {
-		mprSetPropertyValue(auth, "result", mprCreateBoolVar(False));
+		mprSetPropertyValue(auth, "result", mprCreateBoolVar(false));
 		mprSetPropertyValue(auth, "report", mprString("Auth System Failure"));
 		goto done;
 	}
 
 	user_info = talloc(tmp_ctx, struct auth_usersupplied_info);
 	if (!user_info) {
-		mprSetPropertyValue(auth, "result", mprCreateBoolVar(False));
+		mprSetPropertyValue(auth, "result", mprCreateBoolVar(false));
 		mprSetPropertyValue(auth, "report", mprString("talloc failed"));
 		goto done;
 	}
 
-	user_info->mapped_state = True;
+	user_info->mapped_state = true;
 	user_info->client.account_name = username;
 	user_info->mapped.account_name = username;
 	user_info->client.domain_name = domain;
@@ -104,14 +104,14 @@ static int ejs_doauth(MprVarHandle eid,
 	if (!NT_STATUS_IS_OK(nt_status)) {
 		mprSetPropertyValue(auth, "report", 
 				    mprString(talloc_strdup(mprMemCtx(), get_friendly_nt_error_msg(nt_status))));
-		mprSetPropertyValue(auth, "result", mprCreateBoolVar(False));
+		mprSetPropertyValue(auth, "result", mprCreateBoolVar(false));
 		goto done;
 	}
 
 	nt_status = auth_generate_session_info(tmp_ctx, server_info, &session_info);
 	if (!NT_STATUS_IS_OK(nt_status)) {
 		mprSetPropertyValue(auth, "report", mprString("Session Info generation failed"));
-		mprSetPropertyValue(auth, "result", mprCreateBoolVar(False));
+		mprSetPropertyValue(auth, "result", mprCreateBoolVar(false));
 		goto done;
 	}
 
@@ -132,13 +132,13 @@ static int ejs_doauth(MprVarHandle eid,
 
 	if (security_token_is_anonymous(session_info->security_token)) {
 		mprSetPropertyValue(auth, "report", mprString("Anonymous login not permitted"));
-		mprSetPropertyValue(auth, "result", mprCreateBoolVar(False));
+		mprSetPropertyValue(auth, "result", mprCreateBoolVar(false));
 		goto done;
 	}
 
 	if (!set) {
 		mprSetPropertyValue(auth, "report", mprString("Session Info generation failed"));
-		mprSetPropertyValue(auth, "result", mprCreateBoolVar(False));
+		mprSetPropertyValue(auth, "result", mprCreateBoolVar(false));
 	}
 	
 	session_info_obj = mprInitObject(eid, "session_info", 0, NULL);
diff --git a/source4/scripting/ejs/smbcalls_cli.c b/source4/scripting/ejs/smbcalls_cli.c
index af86be9432..e08a098833 100644
--- a/source4/scripting/ejs/smbcalls_cli.c
+++ b/source4/scripting/ejs/smbcalls_cli.c
@@ -61,7 +61,7 @@ static int ejs_cli_connect(MprVarHandle eid, int argc, char **argv)
 		return -1;
 	}
 
-	transport = smbcli_transport_init(sock, sock, False);
+	transport = smbcli_transport_init(sock, sock, false);
 
 	if (!transport) {
 		ejsSetErrorMsg(eid, "transport init failed");
@@ -192,7 +192,7 @@ static int ejs_cli_ssetup(MprVarHandle eid, int argc, MprVar **argv)
 
 	/* Do session setup */
 
-	session = smbcli_session_init(transport, transport, False);
+	session = smbcli_session_init(transport, transport, false);
 
 	if (!session) {
 		ejsSetErrorMsg(eid, "session init failed");
@@ -252,7 +252,7 @@ static int ejs_cli_tree_connect(MprVarHandle eid, int argc, MprVar **argv)
 	}
 
 	session = argv[0]->ptr;
-	tree = smbcli_tree_init(session, session, False);
+	tree = smbcli_tree_init(session, session, false);
 
 	if (!tree) {
 		ejsSetErrorMsg(eid, "tree init failed");
@@ -442,7 +442,7 @@ static int ejs_tree_connect(MprVarHandle eid, int argc, char **argv)
 	io.in.service                = sharename;
 	io.in.service_type           = "?????";
 	io.in.credentials            = creds;
-	io.in.fallback_to_anonymous  = False;
+	io.in.fallback_to_anonymous  = false;
 	io.in.workgroup              = lp_workgroup(global_loadparm);
 
 	result = smb_composite_connect(&io, mem_ctx, NULL);
diff --git a/source4/scripting/ejs/smbcalls_config.c b/source4/scripting/ejs/smbcalls_config.c
index 6b9c245e7e..1c76757659 100644
--- a/source4/scripting/ejs/smbcalls_config.c
+++ b/source4/scripting/ejs/smbcalls_config.c
@@ -138,7 +138,7 @@ static int ejs_lpGet(MprVarHandle eid, int argc, char **argv)
 		mpr_ReturnString(eid, *(char **)parm_ptr);
 		break;
 	case P_BOOL:
-		mpr_Return(eid, mprCreateBoolVar(*(BOOL *)parm_ptr));
+		mpr_Return(eid, mprCreateBoolVar(*(bool *)parm_ptr));
 		break;
 	case P_INTEGER:
 	case P_OCTAL:
@@ -187,7 +187,7 @@ static int ejs_lpSet(MprVarHandle eid, int argc, char **argv)
 */
 static int ejs_lpReload(MprVarHandle eid, int argc, char **argv)
 {
-	BOOL ret = lp_load(lp_configfile(global_loadparm));
+	bool ret = lp_load(lp_configfile(global_loadparm));
 	if (ret) {
 		unload_interfaces();
 	}
diff --git a/source4/scripting/ejs/smbcalls_creds.c b/source4/scripting/ejs/smbcalls_creds.c
index 730753d158..781843371a 100644
--- a/source4/scripting/ejs/smbcalls_creds.c
+++ b/source4/scripting/ejs/smbcalls_creds.c
@@ -61,7 +61,7 @@ static int ejs_creds_set_domain(MprVarHandle eid, int argc, char **argv)
 	}
 
 	cli_credentials_set_domain(creds, argv[0], CRED_SPECIFIED);
-	mpr_Return(eid, mprCreateBoolVar(True));
+	mpr_Return(eid, mprCreateBoolVar(true));
 	return 0;
 }
 
@@ -90,7 +90,7 @@ static int ejs_creds_set_username(MprVarHandle eid, int argc, char **argv)
 	}
 
 	cli_credentials_set_username(creds, argv[0], CRED_SPECIFIED);
-	mpr_Return(eid, mprCreateBoolVar(True));
+	mpr_Return(eid, mprCreateBoolVar(true));
 	return 0;
 }
 
@@ -119,7 +119,7 @@ static int ejs_creds_set_password(MprVarHandle eid, int argc, char **argv)
 	}
 
 	cli_credentials_set_password(creds, argv[0], CRED_SPECIFIED);
-	mpr_Return(eid, mprCreateBoolVar(True));
+	mpr_Return(eid, mprCreateBoolVar(true));
 	return 0;
 }
 
@@ -136,7 +136,7 @@ static int ejs_creds_set_realm(MprVarHandle eid, int argc, char **argv)
 	}
 
 	cli_credentials_set_realm(creds, argv[0], CRED_SPECIFIED);
-	mpr_Return(eid, mprCreateBoolVar(True));
+	mpr_Return(eid, mprCreateBoolVar(true));
 	return 0;
 }
 
@@ -165,7 +165,7 @@ static int ejs_creds_set_workstation(MprVarHandle eid, int argc, char **argv)
 	}
 	
 	cli_credentials_set_workstation(creds, argv[0], CRED_SPECIFIED);
-	mpr_Return(eid, mprCreateBoolVar(True));
+	mpr_Return(eid, mprCreateBoolVar(true));
 	return 0;
 }
 
@@ -193,9 +193,9 @@ static int ejs_creds_set_machine_account(MprVarHandle eid, int argc, struct MprV
 	}
 	
 	if (NT_STATUS_IS_OK(cli_credentials_set_machine_account(creds))) {
-		mpr_Return(eid, mprCreateBoolVar(True));
+		mpr_Return(eid, mprCreateBoolVar(true));
 	} else {
-		mpr_Return(eid, mprCreateBoolVar(False));
+		mpr_Return(eid, mprCreateBoolVar(false));
 	}
 	return 0;
 }
diff --git a/source4/scripting/ejs/smbcalls_data.c b/source4/scripting/ejs/smbcalls_data.c
index 60dadc5165..a98266c3da 100644
--- a/source4/scripting/ejs/smbcalls_data.c
+++ b/source4/scripting/ejs/smbcalls_data.c
@@ -107,7 +107,7 @@ failed:
 static int ejs_blobCompare(MprVarHandle eid, int argc, struct MprVar **argv)
 {
 	DATA_BLOB *blob1, *blob2;
-	BOOL ret = False;
+	bool ret = false;
 
 	if (argc != 2) {
 		ejsSetErrorMsg(eid, "blobCompare invalid arguments");
@@ -118,24 +118,24 @@ static int ejs_blobCompare(MprVarHandle eid, int argc, struct MprVar **argv)
 	blob2 = mprToDataBlob(argv[1]);
 
 	if (blob1 == blob2) {
-		ret = True;
+		ret = true;
 		goto done;
 	}
 	if (blob1 == NULL || blob2 == NULL) {
-		ret = False;
+		ret = false;
 		goto done;
 	}
 
 	if (blob1->length != blob2->length) {
-		ret = False;
+		ret = false;
 		goto done;
 	}
 
 	if (memcmp(blob1->data, blob2->data, blob1->length) != 0) {
-		ret = False;
+		ret = false;
 		goto done;
 	}
-	ret = True;
+	ret = true;
 
 done:
 	mpr_Return(eid, mprCreateBoolVar(ret));
diff --git a/source4/scripting/ejs/smbcalls_ldb.c b/source4/scripting/ejs/smbcalls_ldb.c
index 42105e7965..04162830b4 100644
--- a/source4/scripting/ejs/smbcalls_ldb.c
+++ b/source4/scripting/ejs/smbcalls_ldb.c
@@ -483,7 +483,7 @@ static int ejs_ldbClose(MprVarHandle eid, int argc, struct MprVar **argv)
 	}
 
 	mprSetThisPtr(eid, "db", NULL);
-	mpr_Return(eid, mprCreateBoolVar(True));
+	mpr_Return(eid, mprCreateBoolVar(true));
 	return 0;
 }
 
diff --git a/source4/scripting/ejs/smbcalls_sys.c b/source4/scripting/ejs/smbcalls_sys.c
index 96e665ab3a..10de8e162e 100644
--- a/source4/scripting/ejs/smbcalls_sys.c
+++ b/source4/scripting/ejs/smbcalls_sys.c
@@ -294,7 +294,7 @@ static int ejs_sys_file_load(MprVarHandle eid, int argc, char **argv)
 */
 static int ejs_sys_file_save(MprVarHandle eid, int argc, char **argv)
 {
-	BOOL ret;
+	bool ret;
 	if (argc != 2) {
 		ejsSetErrorMsg(eid, "sys_file_save invalid arguments");
 		return -1;
@@ -311,7 +311,7 @@ static int ejs_sys_file_save(MprVarHandle eid, int argc, char **argv)
 */
 static int ejs_sys_mkdir(MprVarHandle eid, int argc, struct MprVar **argv)
 {
-	BOOL ret;
+	bool ret;
 	char *name;
 	if (argc != 2) {
 		ejsSetErrorMsg(eid, "sys_mkdir invalid arguments, need mkdir(dirname, mode)");
-- 
cgit 


From b09047b78e981af8ade6a72d426bfcb0e742995b Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sat, 13 Oct 2007 20:24:37 +0200
Subject: r25624: Remove ipv4_addr hack. Only causes 4 extra includes of
 system/network.h because we stripped down includes. (This used to be commit
 262c1c23a61f1f4fae13e0a61179fe98b682cecf)

---
 source4/scripting/ejs/smbcalls_samba3.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_samba3.c b/source4/scripting/ejs/smbcalls_samba3.c
index 7c9ef50cf5..36ec2a54e4 100644
--- a/source4/scripting/ejs/smbcalls_samba3.c
+++ b/source4/scripting/ejs/smbcalls_samba3.c
@@ -25,6 +25,7 @@
 #include "lib/samba3/samba3.h"
 #include "libcli/security/security.h"
 #include "librpc/gen_ndr/ndr_misc.h"
+#include "system/network.h"
 
 
 static struct MprVar mprRegistry(struct samba3_regdb *reg)
@@ -407,7 +408,7 @@ static struct MprVar mprWinsEntries(struct samba3 *samba3)
 
 		for (j = 0; j < samba3->winsdb_entries[i].ip_count; j++) {
 			const char *addr;
-			addr = sys_inet_ntoa(samba3->winsdb_entries[i].ips[j]);
+			addr = inet_ntoa(samba3->winsdb_entries[i].ips[j]);
 			mprAddArray(&ips, j, mprString(addr));
 		}
 
-- 
cgit 


From 62078f17bad197780c8cc4e501dd1655bd809edc Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Thu, 18 Oct 2007 03:14:10 +0200
Subject: r25691: make "server role" case insensitive (This used to be commit
 f61a9b706894de4fa8916b55a24f330eed9f5b0c)

---
 source4/scripting/libjs/provision.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index 870e33f84a..b9c7dda8e6 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -500,7 +500,7 @@ function provision_fix_subobj(subobj, paths)
 	if (subobj.REALM_CONF == undefined) {
 		subobj.REALM_CONF = subobj.REALM;
 	}
-	if (subobj.SERVERROLE != "domain controller") {
+	if (strlower(subobj.SERVERROLE) != strlower("domain controller")) {
 		subobj.REALM = subobj.HOSTNAME;
 		subobj.DOMAIN = subobj.HOSTNAME;
 	}
@@ -590,9 +590,9 @@ function provision(subobj, message, blank, paths, session_info, credentials, lda
 	var st = sys.stat(paths.smbconf);
 	if (st == undefined) {
 		var smbconfsuffix;
-		if (subobj.SERVERROLE == "domain controller") {
+		if (strlower(subobj.SERVERROLE) == strlower("domain controller")) {
 			smbconfsuffix = "dc";
-		} else if (subobj.SERVERROLE == "member server") {
+		} else if (strlower(subobj.SERVERROLE) == strlower("member server")) {
 			smbconfsuffix = "member";
 		} else {
 			smbconfsuffix = subobj.SERVERROLE;
@@ -750,7 +750,7 @@ function provision(subobj, message, blank, paths, session_info, credentials, lda
 	message("Setting up sam.ldb users and groups\n");
 	setup_add_ldif("provision_users.ldif", info, samdb, false);
 
-	if (subobj.SERVERROLE == "domain controller") {
+	if (strlower(subobj.SERVERROLE) == strlower("domain controller")) {
 		message("Setting up self join\n");
 		setup_add_ldif("provision_self_join.ldif", info, samdb, false);
 		setup_add_ldif("provision_group_policy.ldif", info, samdb, false);
@@ -838,7 +838,7 @@ function provision_schema(subobj, message, tmp_schema_path, paths)
 function provision_dns(subobj, message, paths, session_info, credentials)
 {
 	var lp = loadparm_init();
-	if (subobj.SERVERROLE != "domain controller") {
+	if (strlower(subobj.SERVERROLE) != strlower("domain controller")) {
 		message("No DNS zone required for role %s\n", subobj.SERVERROLE);
 		return;
 	}
@@ -971,7 +971,7 @@ function provision_guess()
 	subobj.DOMAINDN_LDB = "users.ldb";
 	subobj.CONFIGDN_LDB = "configuration.ldb";
 	subobj.SCHEMADN_LDB = "schema.ldb";
-	subobj.DOMAINDN_MOD = "pdc_fsmo,password_hash";
+	subobj.DOMAINDN_MOD = "subtree_rename,pdc_fsmo,password_hash";
 	subobj.CONFIGDN_MOD = "naming_fsmo";
 	subobj.SCHEMADN_MOD = "schema_fsmo";
 	subobj.DOMAINDN_MOD2 = ",objectguid";
@@ -1142,7 +1142,7 @@ function provision_validate(subobj, message)
 		return false;
 	}
 
-	if (strupper(lp.get("server role")) != strupper(subobj.SERVERROLE)) {
+	if (strlower(lp.get("server role")) != strlower(subobj.SERVERROLE)) {
 		message("server role '%s' in smb.conf must match chosen role '%s'\n",
 			lp.get("server role"), subobj.SERVERROLE);
 		return false;
-- 
cgit 


From 21c65d93eba74d615fa7727e684097f51cf568bc Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Thu, 18 Oct 2007 05:39:55 +0200
Subject: r25693: Implement the rest of subtree renames, now that tridge waved
 his magic

over the ldb_tdb part of the problem.

Andrew Bartlett
(This used to be commit daca0cfd2fc2ec3344415d2d31f399ee3bf16151)
---
 source4/scripting/libjs/provision.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index b9c7dda8e6..d4b2d63565 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -972,8 +972,8 @@ function provision_guess()
 	subobj.CONFIGDN_LDB = "configuration.ldb";
 	subobj.SCHEMADN_LDB = "schema.ldb";
 	subobj.DOMAINDN_MOD = "subtree_rename,pdc_fsmo,password_hash";
-	subobj.CONFIGDN_MOD = "naming_fsmo";
-	subobj.SCHEMADN_MOD = "schema_fsmo";
+	subobj.CONFIGDN_MOD = "subtree_rename,naming_fsmo";
+	subobj.SCHEMADN_MOD = "subtree_rename,schema_fsmo";
 	subobj.DOMAINDN_MOD2 = ",objectguid";
 	subobj.CONFIGDN_MOD2 = ",objectguid";
 	subobj.SCHEMADN_MOD2 = ",objectguid";
-- 
cgit 


From 4bb52bfcb7997f0b8c0491126edfd136260b2f9f Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Thu, 18 Oct 2007 05:47:11 +0200
Subject: r25694: Move subtree_rename above the partitions module. The next
 step is to

built a linked_attributes module under this.

Andrew Bartlett
(This used to be commit 4f47e687e579feeb10bb866d62f0c757e5389709)
---
 source4/scripting/libjs/provision.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index d4b2d63565..e5a91b40b5 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -965,15 +965,16 @@ function provision_guess()
 					"operational",
 					"objectclass",
 					"rdn_name",
+					"subtree_rename",
 					"show_deleted",
 					"partition");
 	subobj.MODULES_LIST = join(",", modules_list);
 	subobj.DOMAINDN_LDB = "users.ldb";
 	subobj.CONFIGDN_LDB = "configuration.ldb";
 	subobj.SCHEMADN_LDB = "schema.ldb";
-	subobj.DOMAINDN_MOD = "subtree_rename,pdc_fsmo,password_hash";
-	subobj.CONFIGDN_MOD = "subtree_rename,naming_fsmo";
-	subobj.SCHEMADN_MOD = "subtree_rename,schema_fsmo";
+	subobj.DOMAINDN_MOD = "pdc_fsmo,password_hash";
+	subobj.CONFIGDN_MOD = "naming_fsmo";
+	subobj.SCHEMADN_MOD = "schema_fsmo";
 	subobj.DOMAINDN_MOD2 = ",objectguid";
 	subobj.CONFIGDN_MOD2 = ",objectguid";
 	subobj.SCHEMADN_MOD2 = ",objectguid";
-- 
cgit 


From 7c721a1f49d576e0a47c35e465206ade1c05d5a9 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Mon, 29 Oct 2007 10:54:06 +0100
Subject: r25747: Implement linked attributes, for add operations.

Much more work is still required here, particularly to handle this
better during the provision, and to handle modifies and deletes, but
this is a start.

Andrew Bartlett
(This used to be commit 2ba99d58e9fe1f8e4b15a58a2fdfce6e876f99b4)
---
 source4/scripting/libjs/provision.js | 1 +
 1 file changed, 1 insertion(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index e5a91b40b5..ef43ed721d 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -966,6 +966,7 @@ function provision_guess()
 					"objectclass",
 					"rdn_name",
 					"subtree_rename",
+					"linked_attributes",
 					"show_deleted",
 					"partition");
 	subobj.MODULES_LIST = join(",", modules_list);
-- 
cgit 


From 16d039504763139f1221c3ff4643d1a5cb2bdc87 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Mon, 29 Oct 2007 21:25:26 +0100
Subject: r25750: Update the objectclass module to improve consistency in
 Samba4.

The aim here is to ensure that if we have

CN=Users,DC=samba,DC=example,DC=com

that we cannot have a DN of the form

cn=admin ,cn=useRS,DC=samba,DC=example,DC=com

This module pulls apart the DN, fixes up the relative DN part, and
searches for the parent to copy the base from.

I've used the objectclass module, as I intend to also validate the
placement of child objects, by reading the allowedChildClasses virtual
attribute.

In the future, I'll also force the attribute names to be consistant
(using the case from the schema).

Andrew Bartlett
(This used to be commit c0a0c69ac5a81cfcb7c7d5ba38db59f8686c30ab)
---
 source4/scripting/libjs/provision.js | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index ef43ed721d..5ca7be99e5 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -631,6 +631,16 @@ function provision(subobj, message, blank, paths, session_info, credentials, lda
 	message("Erasing data from partitions\n");
 	ldb_erase_partitions(info, samdb, ldapbackend);
 	
+	// (hack) Reload, now we have the partitions and rootdse loaded.  
+	var commit_ok = samdb.transaction_commit();
+	if (!commit_ok) {
+		info.message("samdb commit failed: " + samdb.errstring() + "\n");
+		assert(commit_ok);
+	}
+	samdb.close();
+
+	samdb = open_ldb(info, paths.samdb, false);
+
 	message("Adding DomainDN: " + subobj.DOMAINDN + " (permitted to fail)\n");
 	var add_ok = setup_add_ldif("provision_basedn.ldif", info, samdb, true);
 	message("Modifying DomainDN: " + subobj.DOMAINDN + "\n");
@@ -951,20 +961,21 @@ function provision_guess()
 	//
 	// Some Known ordering constraints:
 	// - rootdse must be first, as it makes redirects from "" -> cn=rootdse
-	// - samldb must be before password_hash, because password_hash checks
-	//   that the objectclass is of type person (filled in by samldb)
+	// - objectclass must be before password_hash, because password_hash checks
+	//   that the objectclass is of type person (filled in by the objectclass 
+	//   module when expanding the objectclass list)
 	// - partition must be last
 	// - each partition has its own module list then
 	modules_list        = new Array("rootdse",
-					"kludge_acl",
 					"paged_results",
 					"server_sort",
 					"extended_dn",
 					"asq",
 					"samldb",
-					"operational",
-					"objectclass",
 					"rdn_name",
+					"objectclass",
+					"kludge_acl",
+					"operational",
 					"subtree_rename",
 					"linked_attributes",
 					"show_deleted",
-- 
cgit 


From 0fc96c416ed96cbe060961ea603f93fd4129b3eb Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Tue, 30 Oct 2007 06:24:43 +0100
Subject: r25751: use EJS_CHECK() instead of NDR_CHECK() in ejs code

metze
(This used to be commit 14ca6a8bf90bc73e1fdb0f510be795e28977601e)
---
 source4/scripting/ejs/ejsrpc.h | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/ejsrpc.h b/source4/scripting/ejs/ejsrpc.h
index 6723fb4107..cc22a26700 100644
--- a/source4/scripting/ejs/ejsrpc.h
+++ b/source4/scripting/ejs/ejsrpc.h
@@ -152,6 +152,14 @@ NTSTATUS ejs_push_winreg_String(struct ejs_rpc *ejs,
 	if (!(s)) return ejs_panic(ejs, "out of memory"); \
 } while (0)
 
+#define EJS_CHECK(cmd) do { \
+	NTSTATUS _status; \
+	_status = cmd; \
+	if (!NT_STATUS_IS_OK(_status)) { \
+		return _status; \
+	} \
+} while (0)
+
 /* some types are equivalent for ejs */
 #define ejs_pull_dom_sid2 ejs_pull_dom_sid
 #define ejs_push_dom_sid2 ejs_push_dom_sid
-- 
cgit 


From d7b8a4ab24b2ec4423a019f649d25c8fa6a337f2 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Tue, 30 Oct 2007 08:00:19 +0100
Subject: r25752: use EJS_CHECK() instead of NDR_CHECK()

metze
(This used to be commit d2726e7609be4916b159c1e0ff4daea5568cf393)
---
 source4/scripting/ejs/ejsrpc.c | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/ejsrpc.c b/source4/scripting/ejs/ejsrpc.c
index 3769607949..c7c02dbd64 100644
--- a/source4/scripting/ejs/ejsrpc.c
+++ b/source4/scripting/ejs/ejsrpc.c
@@ -58,7 +58,7 @@ NTSTATUS ejs_pull_struct_start(struct ejs_rpc *ejs, struct MprVar **v, const cha
 */
 NTSTATUS ejs_push_struct_start(struct ejs_rpc *ejs, struct MprVar **v, const char *name)
 {
-	NDR_CHECK(mprSetVar(*v, name, mprObject(name)));
+	EJS_CHECK(mprSetVar(*v, name, mprObject(name)));
 	return mprGetVar(v, name);
 }
 
@@ -68,7 +68,7 @@ NTSTATUS ejs_push_struct_start(struct ejs_rpc *ejs, struct MprVar **v, const cha
 NTSTATUS ejs_pull_uint8(struct ejs_rpc *ejs, 
 			struct MprVar *v, const char *name, uint8_t *r)
 {
-	NDR_CHECK(mprGetVar(&v, name));
+	EJS_CHECK(mprGetVar(&v, name));
 	*r = mprVarToInteger(v);
 	return NT_STATUS_OK;
 	
@@ -86,7 +86,7 @@ NTSTATUS ejs_push_uint8(struct ejs_rpc *ejs,
 NTSTATUS ejs_pull_uint16(struct ejs_rpc *ejs, 
 			 struct MprVar *v, const char *name, uint16_t *r)
 {
-	NDR_CHECK(mprGetVar(&v, name));
+	EJS_CHECK(mprGetVar(&v, name));
 	*r = mprVarToInteger(v);
 	return NT_STATUS_OK;
 	
@@ -104,7 +104,7 @@ NTSTATUS ejs_push_uint16(struct ejs_rpc *ejs,
 NTSTATUS ejs_pull_uint32(struct ejs_rpc *ejs, 
 			 struct MprVar *v, const char *name, uint32_t *r)
 {
-	NDR_CHECK(mprGetVar(&v, name));
+	EJS_CHECK(mprGetVar(&v, name));
 	*r = mprVarToInteger(v);
 	return NT_STATUS_OK;
 }
@@ -121,7 +121,7 @@ NTSTATUS ejs_push_uint32(struct ejs_rpc *ejs,
 NTSTATUS ejs_pull_int32(struct ejs_rpc *ejs, 
 			 struct MprVar *v, const char *name, int32_t *r)
 {
-	NDR_CHECK(mprGetVar(&v, name));
+	EJS_CHECK(mprGetVar(&v, name));
 	*r = mprVarToInteger(v);
 	return NT_STATUS_OK;
 }
@@ -138,7 +138,7 @@ NTSTATUS ejs_push_int32(struct ejs_rpc *ejs,
 NTSTATUS ejs_pull_time_t(struct ejs_rpc *ejs, 
 			 struct MprVar *v, const char *name, time_t *r)
 {
-	NDR_CHECK(mprGetVar(&v, name));
+	EJS_CHECK(mprGetVar(&v, name));
 	*r = mprVarToInteger(v);
 	return NT_STATUS_OK;
 }
@@ -152,7 +152,7 @@ NTSTATUS ejs_push_time_t(struct ejs_rpc *ejs,
 NTSTATUS ejs_pull_hyper(struct ejs_rpc *ejs, 
 			struct MprVar *v, const char *name, uint64_t *r)
 {
-	NDR_CHECK(mprGetVar(&v, name));
+	EJS_CHECK(mprGetVar(&v, name));
 	*r = mprVarToNumber(v);
 	return NT_STATUS_OK;
 }
@@ -219,7 +219,7 @@ NTSTATUS ejs_push_NTSTATUS(struct ejs_rpc *ejs,
 NTSTATUS ejs_pull_enum(struct ejs_rpc *ejs, 
 		       struct MprVar *v, const char *name, unsigned *r)
 {
-	NDR_CHECK(mprGetVar(&v, name));
+	EJS_CHECK(mprGetVar(&v, name));
 	*r = mprVarToInteger(v);
 	return NT_STATUS_OK;
 	
@@ -238,7 +238,7 @@ NTSTATUS ejs_push_enum(struct ejs_rpc *ejs,
 NTSTATUS ejs_pull_string(struct ejs_rpc *ejs, 
 			 struct MprVar *v, const char *name, const char **s)
 {
-	NDR_CHECK(mprGetVar(&v, name));
+	EJS_CHECK(mprGetVar(&v, name));
 	*s = mprToString(v);
 	return NT_STATUS_OK;
 }
@@ -276,7 +276,7 @@ NTSTATUS ejs_pull_dom_sid(struct ejs_rpc *ejs,
 			  struct MprVar *v, const char *name, struct dom_sid *r)
 {
 	struct dom_sid *sid;
-	NDR_CHECK(mprGetVar(&v, name));
+	EJS_CHECK(mprGetVar(&v, name));
 	sid = dom_sid_parse_talloc(ejs, mprToString(v));
 	NT_STATUS_HAVE_NO_MEMORY(sid);
 	*r = *sid;
@@ -294,7 +294,7 @@ NTSTATUS ejs_push_dom_sid(struct ejs_rpc *ejs,
 NTSTATUS ejs_pull_GUID(struct ejs_rpc *ejs, 
 		       struct MprVar *v, const char *name, struct GUID *r)
 {
-	NDR_CHECK(mprGetVar(&v, name));
+	EJS_CHECK(mprGetVar(&v, name));
 	return GUID_from_string(mprToString(v), r);
 }
 
@@ -375,7 +375,7 @@ NTSTATUS ejs_push_DATA_BLOB(struct ejs_rpc *ejs,
 NTSTATUS ejs_pull_bool(struct ejs_rpc *ejs, 
 		       struct MprVar *v, const char *name, bool *r)
 {
-	NDR_CHECK(mprGetVar(&v, name));
+	EJS_CHECK(mprGetVar(&v, name));
 	*r = mprVarToBool(v);
 	return NT_STATUS_OK;
 }
-- 
cgit 


From a8ba7455c9051934e5e215b436a866a28f122930 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Mon, 5 Nov 2007 11:08:35 +0100
Subject: r25831: remove unused include

metze
(This used to be commit 74f5a69022db89314762b4023dd8348cf93004d7)
---
 source4/scripting/ejs/smbcalls_rand.c | 1 -
 1 file changed, 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_rand.c b/source4/scripting/ejs/smbcalls_rand.c
index 7834d9552c..d50cfc9504 100644
--- a/source4/scripting/ejs/smbcalls_rand.c
+++ b/source4/scripting/ejs/smbcalls_rand.c
@@ -22,7 +22,6 @@
 #include "includes.h"
 #include "scripting/ejs/smbcalls.h"
 #include "lib/appweb/ejs/ejs.h"
-#include "system/passwd.h"
 #include "librpc/gen_ndr/ndr_misc.h"
 
 /*
-- 
cgit 


From 6ce86941de76b27772172717ba5de17ab6fb081d Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Mon, 5 Nov 2007 15:47:34 +0100
Subject: r25839: use nss_wrapper code in samba4 if

--enable-nss-wrapper or --enable-developer is given

metze
(This used to be commit f8bc6b9ad0eec60bff7fdc5653397efd9a044a29)
---
 source4/scripting/ejs/config.mk | 1 +
 1 file changed, 1 insertion(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/config.mk b/source4/scripting/ejs/config.mk
index 5d562ee344..1916854f7b 100644
--- a/source4/scripting/ejs/config.mk
+++ b/source4/scripting/ejs/config.mk
@@ -43,6 +43,7 @@ INIT_FUNCTION = smb_setup_ejs_random
 OBJ_FILES = smbcalls_nss.o
 SUBSYSTEM = smbcalls
 INIT_FUNCTION = smb_setup_ejs_nss
+PRIVATE_DEPENDENCIES = NSS_WRAPPER
 
 [MODULE::smbcalls_data]
 OBJ_FILES = smbcalls_data.o
-- 
cgit 


From 716391f10679e82835f42490e1d8a69af2acad82 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Sat, 10 Nov 2007 05:31:26 +0100
Subject: r25921: Now also listen on ldapi by default in the LDAP server

Create a phpLDAPadmin configuration file example to use ldapi to talk
to Samba4

Andrew Bartlett
(This used to be commit 54f4c8ba6127757fd272bd97e301188eb69977ed)
---
 source4/scripting/libjs/provision.js | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index 5ca7be99e5..f12c4406ff 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -162,6 +162,7 @@ function ldb_erase(info, ldb)
 	/* delete the specials */
 	ldb.del("@INDEXLIST");
 	ldb.del("@ATTRIBUTES");
+	ldb.del("@OPTIONS");
 	ldb.del("@MODULES");
 	ldb.del("@PARTITION");
 	ldb.del("@KLUDGEACL");
@@ -393,6 +394,9 @@ function provision_default_paths(subobj)
 	paths.ldap_config_basedn_ldif = paths.ldapdir + "/" + dnsdomain + "-config.ldif";
 	paths.ldap_schema_basedn_ldif = paths.ldapdir + "/" + dnsdomain + "-schema.ldif";
 
+	paths.s4_ldapi_socket = lp.get("private dir") + "/ldapi";
+	paths.phpldapadminconfig = lp.get("private dir") + "/phpldapadmin-config.php";
+
 	paths.sysvol = lp.get("sysvol", "path");
 
 	if (paths.sysvol == undefined) {
@@ -489,6 +493,9 @@ function provision_fix_subobj(subobj, paths)
 	var ldap_path_list = split("/", paths.ldapdir);
 	subobj.LDAPI_URI = "ldapi://" + join("%2F", ldap_path_list) + "%2Fldapi";
 
+	var s4ldap_path_list = split("/", paths.s4_ldapi_socket);
+	subobj.S4_LDAPI_URI = "ldapi://" + join("%2F", s4ldap_path_list);
+
 	subobj.LDAPMANAGERDN = "cn=Manager," + subobj.DOMAINDN;
 
 	subobj.NETLOGONPATH = paths.netlogon;
@@ -794,6 +801,10 @@ function provision(subobj, message, blank, paths, session_info, credentials, lda
 		assert(commit_ok);
 	}
 
+	message("Setting up phpLDAPadmin configuration\n");
+	setup_file("phpldapadmin-config.php", info.message, paths.phpldapadminconfig, subobj);
+	message("Please install the phpLDAPadmin configuration located at " + paths.phpldapadminconfig + " into /etc/phpldapadmin/config.php\n");
+
 	return true;
 }
 
-- 
cgit 


From 6c411949612f60ed970aca5f697cd5c37d2d203c Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Tue, 13 Nov 2007 08:48:29 +0100
Subject: r25936: provision/newuser: don't try to set the 'memberOf' attribute

metze
(This used to be commit c6d959e52cf4b86a52e46402392f32450d3c3635)
---
 source4/scripting/libjs/provision.js | 1 -
 1 file changed, 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index f12c4406ff..3f3b179688 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -1084,7 +1084,6 @@ function newuser(username, unixname, password, message, session_info, credential
 	var ldif = sprintf("
 dn: %s
 sAMAccountName: %s
-memberOf: %s
 unixName: %s
 sambaPassword: %s
 objectClass: user
-- 
cgit 


From 3f2ca10d2d86f0cd64822f9e5f95633f41263237 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Tue, 13 Nov 2007 22:38:55 +0100
Subject: r25940: Rework the samldb and templates handling.

Templates just don't belong in the sam.ldb, as they don't obey any of
the other rules.  This moves them to a seperate templates.ldb.

In samldb, this patch reworks the duplicate SID and Name detection
code, to use ldb_search_exp_fmt() rather than gendb_search.  This
returns far more useful errors, which we now handle and report better.

The call to samdb_search_for_parent_domain() has been moved in samldb,
to allow both the account and SID uniqueness checks to be in the same
domain.  This function also returns better errors.

dcesrv_drsuapi.c is updated for the new prototype of
samdb_search_for_parent_domain()

Andrew Bartlett
(This used to be commit f1ab90c88c782c693b41795d70368650806543b5)
---
 source4/scripting/libjs/provision.js | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index 3f3b179688..73c7608814 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -383,6 +383,7 @@ function provision_default_paths(subobj)
 	paths.shareconf = lp.get("private dir") + "/" + "share.ldb";
 	paths.samdb = lp.get("sam database");
 	paths.secrets = lp.get("secrets database");
+	paths.templates = lp.get("private dir") + "/" + "templates.ldb";
 	paths.keytab = "secrets.keytab";
 	paths.dns_keytab = "dns.keytab";
 	paths.dns_keytab_abs = lp.get("private dir") + "/" + paths.dns_keytab;
@@ -528,6 +529,9 @@ function provision_become_dc(subobj, message, erase, paths, session_info)
 	info.message = message;
 	info.session_info = session_info;
 
+	message("Setting up teplates into " + paths.templates + "\n");
+	setup_ldb("provision_templates.ldif", info, paths.templates);
+
 	/* Also wipes the database */
 	message("Setting up " + paths.samdb + " partitions\n");
 	setup_ldb("provision_partitions.ldif", info, paths.samdb);
@@ -548,9 +552,6 @@ function provision_become_dc(subobj, message, erase, paths, session_info)
 	message("Setting up " + paths.samdb + " indexes\n");
 	setup_add_ldif("provision_index.ldif", info, samdb, false);
 
-	message("Setting up " + paths.samdb + " templates\n");
-	setup_add_ldif("provision_templates.ldif", info, samdb, false);
-
 	ok = samdb.transaction_commit();
 	assert(ok);
 
@@ -623,6 +624,9 @@ function provision(subobj, message, blank, paths, session_info, credentials, lda
 	var reg = reg_open();
 	reg.apply_patchfile(lp.get("setup directory") + "/provision.reg")
 
+	message("Setting up teplates into " + paths.templates + "\n");
+	setup_ldb("provision_templates.ldif", info, paths.templates);
+
 	message("Setting up sam.ldb partitions\n");
 	/* Also wipes the database */
 	setup_ldb("provision_partitions.ldif", info, paths.samdb);
@@ -707,8 +711,6 @@ function provision(subobj, message, blank, paths, session_info, credentials, lda
 
 	message("Setting up display specifiers\n");
 	setup_add_ldif("display_specifiers.ldif", info, samdb, false);
-	message("Setting up sam.ldb templates\n");
-	setup_add_ldif("provision_templates.ldif", info, samdb, false);
 
 	message("Adding users container (permitted to fail)\n");
 	var add_ok = setup_add_ldif("provision_users_add.ldif", info, samdb, true);
-- 
cgit 


From 8959af0a6fa493d4bdfcb609e7d5931a44a4567d Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Wed, 14 Nov 2007 03:55:05 +0100
Subject: r25950: Enable seperate module to prevent subtree deletes.

Andrew Bartlett
(This used to be commit a71414ec3efd3e52a898b58bd2ea7d986518f531)
---
 source4/scripting/libjs/provision.js | 1 +
 1 file changed, 1 insertion(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index 73c7608814..ecd21975ae 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -990,6 +990,7 @@ function provision_guess()
 					"kludge_acl",
 					"operational",
 					"subtree_rename",
+					"subtree_delete",
 					"linked_attributes",
 					"show_deleted",
 					"partition");
-- 
cgit 


From ef22b1a477e11d0036ca9e267c751b67d2bc541c Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Thu, 15 Nov 2007 11:37:41 +0100
Subject: r25966: Don't force an 8 byte width to generated SIDs, as this can
 actually

end up with a SID with a space in it.

Andrew Bartlett
(This used to be commit 7771f59eadf7045d852e60aa365036da230b41b9)
---
 source4/scripting/ejs/smbcalls_rand.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_rand.c b/source4/scripting/ejs/smbcalls_rand.c
index d50cfc9504..a2db1f0d6d 100644
--- a/source4/scripting/ejs/smbcalls_rand.c
+++ b/source4/scripting/ejs/smbcalls_rand.c
@@ -70,7 +70,7 @@ static int ejs_randguid(MprVarHandle eid, int argc, struct MprVar **argv)
 */
 static int ejs_randsid(MprVarHandle eid, int argc, struct MprVar **argv)
 {
-	char *s = talloc_asprintf(mprMemCtx(), "S-1-5-21-%8u-%8u-%8u", 
+	char *s = talloc_asprintf(mprMemCtx(), "S-1-5-21-%u-%u-%u", 
 				  (unsigned)generate_random(), 
 				  (unsigned)generate_random(), 
 				  (unsigned)generate_random());
-- 
cgit 


From ca0b72a1fdb7bd965065e833df34662afef0423e Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Fri, 16 Nov 2007 20:12:00 +0100
Subject: r26003: Split up DB_WRAP, as first step in an attempt to sanitize
 dependencies. (This used to be commit
 56dfcb4f2f8e74c9d8b2fe3a0df043781188a555)

---
 source4/scripting/ejs/smbcalls_ldb.c | 2 +-
 source4/scripting/ejs/smbcalls_reg.c | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_ldb.c b/source4/scripting/ejs/smbcalls_ldb.c
index 04162830b4..b8c35d267e 100644
--- a/source4/scripting/ejs/smbcalls_ldb.c
+++ b/source4/scripting/ejs/smbcalls_ldb.c
@@ -25,7 +25,7 @@
 #include "lib/appweb/ejs/ejs.h"
 #include "lib/ldb/include/ldb.h"
 #include "lib/ldb/include/ldb_errors.h"
-#include "db_wrap.h"
+#include "ldb_wrap.h"
 #include "dsdb/samdb/samdb.h"
 #include "librpc/ndr/libndr.h"
 
diff --git a/source4/scripting/ejs/smbcalls_reg.c b/source4/scripting/ejs/smbcalls_reg.c
index d4b13cc2ca..38634b996c 100644
--- a/source4/scripting/ejs/smbcalls_reg.c
+++ b/source4/scripting/ejs/smbcalls_reg.c
@@ -22,7 +22,6 @@
 #include "includes.h"
 #include "scripting/ejs/smbcalls.h"
 #include "lib/appweb/ejs/ejs.h"
-#include "db_wrap.h"
 #include "dsdb/samdb/samdb.h"
 #include "librpc/ndr/libndr.h"
 #include "lib/registry/registry.h"
-- 
cgit 


From dc2273ba37aefc4e6f7d54da0e3454f2b4690589 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Fri, 16 Nov 2007 23:24:23 +0100
Subject: r26006: Improve some dependencies. (This used to be commit
 28f05bb5ef9e727298f4b61e71c42a8703374b96)

---
 source4/scripting/ejs/config.mk | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/config.mk b/source4/scripting/ejs/config.mk
index 1916854f7b..8b680ba973 100644
--- a/source4/scripting/ejs/config.mk
+++ b/source4/scripting/ejs/config.mk
@@ -8,11 +8,13 @@ OBJ_FILES = \
 
 [MODULE::smbcalls_config]
 OBJ_FILES = smbcalls_config.o
+OUTPUT_TYPE = INTEGRATED
 SUBSYSTEM = smbcalls
 INIT_FUNCTION = smb_setup_ejs_config
 
 [MODULE::smbcalls_ldb]
 OBJ_FILES = smbcalls_ldb.o
+OUTPUT_TYPE = INTEGRATED
 SUBSYSTEM = smbcalls
 INIT_FUNCTION = smb_setup_ejs_ldb
 PRIVATE_DEPENDENCIES = LIBLDB SAMDB LIBNDR
@@ -20,38 +22,45 @@ PRIVATE_DEPENDENCIES = LIBLDB SAMDB LIBNDR
 [MODULE::smbcalls_reg]
 OBJ_FILES = smbcalls_reg.o
 SUBSYSTEM = smbcalls
+OUTPUT_TYPE = INTEGRATED
 INIT_FUNCTION = smb_setup_ejs_reg
 PRIVATE_DEPENDENCIES = registry SAMDB LIBNDR
 
 [MODULE::smbcalls_nbt]
 OBJ_FILES = smbcalls_nbt.o
 SUBSYSTEM = smbcalls
+OUTPUT_TYPE = INTEGRATED
 INIT_FUNCTION = smb_setup_ejs_nbt
 
 [MODULE::smbcalls_samba3]
 OBJ_FILES = smbcalls_samba3.o
 SUBSYSTEM = smbcalls
+OUTPUT_TYPE = INTEGRATED
 INIT_FUNCTION = smb_setup_ejs_samba3
 PRIVATE_DEPENDENCIES = LIBSAMBA3 
 
 [MODULE::smbcalls_rand]
 OBJ_FILES = smbcalls_rand.o
 SUBSYSTEM = smbcalls
+OUTPUT_TYPE = INTEGRATED
 INIT_FUNCTION = smb_setup_ejs_random
 
 [MODULE::smbcalls_nss]
 OBJ_FILES = smbcalls_nss.o
 SUBSYSTEM = smbcalls
+OUTPUT_TYPE = INTEGRATED
 INIT_FUNCTION = smb_setup_ejs_nss
 PRIVATE_DEPENDENCIES = NSS_WRAPPER
 
 [MODULE::smbcalls_data]
 OBJ_FILES = smbcalls_data.o
 SUBSYSTEM = smbcalls
+OUTPUT_TYPE = INTEGRATED
 INIT_FUNCTION = smb_setup_ejs_datablob
 
 [MODULE::smbcalls_auth]
 OBJ_FILES = smbcalls_auth.o
+OUTPUT_TYPE = INTEGRATED
 SUBSYSTEM = smbcalls
 INIT_FUNCTION = smb_setup_ejs_auth
 PRIVATE_DEPENDENCIES = auth
@@ -59,11 +68,13 @@ PRIVATE_DEPENDENCIES = auth
 [MODULE::smbcalls_string]
 OBJ_FILES = smbcalls_string.o
 SUBSYSTEM = smbcalls
+OUTPUT_TYPE = INTEGRATED
 INIT_FUNCTION = smb_setup_ejs_string
 
 [MODULE::smbcalls_sys]
 OBJ_FILES = smbcalls_sys.o
 SUBSYSTEM = smbcalls
+OUTPUT_TYPE = INTEGRATED
 INIT_FUNCTION = smb_setup_ejs_system
 
 include ejsnet/config.mk
-- 
cgit 


From ea851658411e3ff03a906f7ae6afc7e9319d6f90 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Wed, 21 Nov 2007 11:47:55 +0100
Subject: r26068: Import improved Python bindings for LDB, including tests.
 (This used to be commit fc3a8caef749ddac56a4f035dde8b6ceeaa95c48)

---
 source4/scripting/swig/config.mk | 1 +
 1 file changed, 1 insertion(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/config.mk b/source4/scripting/swig/config.mk
index bf9a481e4e..67c1f841f7 100644
--- a/source4/scripting/swig/config.mk
+++ b/source4/scripting/swig/config.mk
@@ -1,6 +1,7 @@
 #######################
 # Start LIBRARY swig_dcerpc
 [LIBRARY::swig_dcerpc]
+ENABLE = NO
 LIBRARY_REALNAME = _dcerpc.$(SHLIBEXT)
 PUBLIC_DEPENDENCIES = LIBCLI_SMB NDR_MISC LIBSAMBA-UTIL LIBSAMBA-CONFIG dcerpc_samr RPC_NDR_LSA DYNCONFIG
 OBJ_FILES = dcerpc_wrap.o
-- 
cgit 


From f47bc82561707130be5d56c22300f11175401d66 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Wed, 21 Nov 2007 12:31:19 +0100
Subject: r26071: Move DCE/RPC SWIG bindings closer to the code they're
 wrapping. (This used to be commit 93eba0a3a984e9cd08ab2cf74b409938c991824a)

---
 source4/scripting/swig/config.mk |  15 ---
 source4/scripting/swig/dcerpc.i  | 238 ---------------------------------------
 2 files changed, 253 deletions(-)
 delete mode 100644 source4/scripting/swig/dcerpc.i

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/config.mk b/source4/scripting/swig/config.mk
index 67c1f841f7..944e33b9b4 100644
--- a/source4/scripting/swig/config.mk
+++ b/source4/scripting/swig/config.mk
@@ -1,13 +1,3 @@
-#######################
-# Start LIBRARY swig_dcerpc
-[LIBRARY::swig_dcerpc]
-ENABLE = NO
-LIBRARY_REALNAME = _dcerpc.$(SHLIBEXT)
-PUBLIC_DEPENDENCIES = LIBCLI_SMB NDR_MISC LIBSAMBA-UTIL LIBSAMBA-CONFIG dcerpc_samr RPC_NDR_LSA DYNCONFIG
-OBJ_FILES = dcerpc_wrap.o
-# End LIBRARY swig_dcerpc
-#######################
-
 # Swig extensions
 swig: lib/tdb/swig/_tdb.$(SHLIBEXT) lib/ldb/swig/_ldb.$(SHLIBEXT) \
 	libcli/swig/_libcli_nbt.$(SHLIBEXT) libcli/swig/_libcli_smb.$(SHLIBEXT)
@@ -17,15 +7,10 @@ swig: lib/tdb/swig/_tdb.$(SHLIBEXT) lib/ldb/swig/_ldb.$(SHLIBEXT) \
 .i_wrap.c:
 	swig -I$(srcdir)/scripting/swig -python $<
 
-SWIG_INCLUDES = librpc/gen_ndr/samr.i librpc/gen_ndr/lsa.i librpc/gen_ndr/spoolss.i
-
-scripting/swig/dcerpc_wrap.c: scripting/swig/dcerpc.i scripting/swig/samba.i scripting/swig/status_codes.i $(SWIG_INCLUDES)
-
 clean::
 	@echo "Removing SWIG output files"
 	@-rm -f scripting/swig/tdb.pyc scripting/swig/tdb.py
 
 # Swig testing
-
 swigtest: swig
 	./selftest/test_swig.sh
diff --git a/source4/scripting/swig/dcerpc.i b/source4/scripting/swig/dcerpc.i
deleted file mode 100644
index cf394ba338..0000000000
--- a/source4/scripting/swig/dcerpc.i
+++ /dev/null
@@ -1,238 +0,0 @@
-/* Tastes like -*- C -*- */
-
-/* 
-   Unix SMB/CIFS implementation.
-
-   Swig interface to librpc functions.
-
-   Copyright (C) Tim Potter 2004
-   
-   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/>.
-*/
-
-%module dcerpc
-
-%{
-
-/* This symbol is used in both includes.h and Python.h which causes an
-   annoying compiler warning. */
-
-#ifdef HAVE_FSTAT
-#undef HAVE_FSTAT
-#endif
-
-#include "includes.h"
-#include "dynconfig.h"
-
-#undef strcpy
-
-PyObject *ntstatus_exception, *werror_exception;
-
-/* Set up return of a dcerpc.NTSTATUS exception */
-
-void set_ntstatus_exception(int status)
-{
-	PyObject *obj = Py_BuildValue("(i,s)", status, 
-				nt_errstr(NT_STATUS(status)));
-
-	PyErr_SetObject(ntstatus_exception, obj);
-}
-
-void set_werror_exception(int status)
-{
-	PyObject *obj = Py_BuildValue("(i,s)", status, 
-				win_errstr(W_ERROR(status)));
-
-	PyErr_SetObject(werror_exception, obj);
-}
-
-%}
-
-%include "samba.i"
-
-%pythoncode %{
-	NTSTATUS = _dcerpc.NTSTATUS
-	WERROR = _dcerpc.WERROR
-%}
-
-%init  %{
-	setup_logging("python", DEBUG_STDOUT);	
-	lp_load();
-	ntstatus_exception = PyErr_NewException("_dcerpc.NTSTATUS", NULL, NULL);
-	werror_exception = PyErr_NewException("_dcerpc.WERROR", NULL, NULL);
-	PyDict_SetItemString(d, "NTSTATUS", ntstatus_exception);
-	PyDict_SetItemString(d, "WERROR", werror_exception);
-
-/* BINARY swig_dcerpc INIT */
-
-		extern NTSTATUS dcerpc_misc_init(void);
-		extern NTSTATUS dcerpc_krb5pac_init(void);
-		extern NTSTATUS dcerpc_samr_init(void);
-		extern NTSTATUS dcerpc_dcerpc_init(void);
-		extern NTSTATUS auth_sam_init(void);
-		extern NTSTATUS dcerpc_lsa_init(void);
-		extern NTSTATUS dcerpc_netlogon_init(void);
-		extern NTSTATUS gensec_init(void);
-		extern NTSTATUS auth_developer_init(void);
-		extern NTSTATUS gensec_spnego_init(void);
-		extern NTSTATUS auth_winbind_init(void);
-		extern NTSTATUS gensec_gssapi_init(void);
-		extern NTSTATUS gensec_ntlmssp_init(void);
-		extern NTSTATUS dcerpc_nbt_init(void);
-		extern NTSTATUS auth_anonymous_init(void);
-		extern NTSTATUS gensec_krb5_init(void);
-		extern NTSTATUS dcerpc_schannel_init(void);
-		extern NTSTATUS dcerpc_epmapper_init(void);
-		if (NT_STATUS_IS_ERR(dcerpc_misc_init())) exit(1);
-		if (NT_STATUS_IS_ERR(dcerpc_krb5pac_init())) exit(1);
-		if (NT_STATUS_IS_ERR(dcerpc_samr_init())) exit(1);
-		if (NT_STATUS_IS_ERR(dcerpc_dcerpc_init())) exit(1);
-		if (NT_STATUS_IS_ERR(auth_sam_init())) exit(1);
-		if (NT_STATUS_IS_ERR(dcerpc_lsa_init())) exit(1);
-		if (NT_STATUS_IS_ERR(dcerpc_netlogon_init())) exit(1);
-		if (NT_STATUS_IS_ERR(gensec_init())) exit(1);
-		if (NT_STATUS_IS_ERR(auth_developer_init())) exit(1);
-		if (NT_STATUS_IS_ERR(gensec_spnego_init())) exit(1);
-		if (NT_STATUS_IS_ERR(auth_winbind_init())) exit(1);
-		if (NT_STATUS_IS_ERR(gensec_gssapi_init())) exit(1);
-		if (NT_STATUS_IS_ERR(gensec_ntlmssp_init())) exit(1);
-		if (NT_STATUS_IS_ERR(dcerpc_nbt_init())) exit(1);
-		if (NT_STATUS_IS_ERR(auth_anonymous_init())) exit(1);
-		if (NT_STATUS_IS_ERR(gensec_krb5_init())) exit(1);
-		if (NT_STATUS_IS_ERR(dcerpc_schannel_init())) exit(1);
-		if (NT_STATUS_IS_ERR(dcerpc_epmapper_init())) exit(1);
-
-%}
-
-%typemap(in, numinputs=0) struct dcerpc_pipe **OUT (struct dcerpc_pipe *temp_dcerpc_pipe) {
-        $1 = &temp_dcerpc_pipe;
-}
-
-%typemap(in, numinputs=0) TALLOC_CTX * {
-	$1 = talloc_init("$symname");
-}
-
-%typemap(freearg) TALLOC_CTX * {
-//	talloc_free($1);
-}
-
-%typemap(argout) struct dcerpc_pipe ** {
-	long status = PyLong_AsLong(resultobj);
-
-	/* Throw exception if result was not OK */
-
-	if (status != 0) {
-		set_ntstatus_exception(status);
-		return NULL;
-	}
-
-	/* Set REF_ALLOC flag so we don't have to do too much extra
-	   mucking around with ref variables in ndr unmarshalling. */
-
-	(*$1)->conn->flags |= DCERPC_NDR_REF_ALLOC;
-
-	/* Return swig handle on dcerpc_pipe */
-
-        resultobj = SWIG_NewPointerObj(*$1, SWIGTYPE_p_dcerpc_pipe, 0);
-}
-
-%types(struct dcerpc_pipe *);
-
-%rename(pipe_connect) dcerpc_pipe_connect;
-
-NTSTATUS dcerpc_pipe_connect(TALLOC_CTX *parent_ctx,
-	                     struct dcerpc_pipe **OUT,
-                             const char *binding,
-                             const char *pipe_uuid,
-                             uint32_t pipe_version,
-			     struct cli_credentials *credentials);
-
-%typemap(in) DATA_BLOB * (DATA_BLOB temp_data_blob) {
-	temp_data_blob.data = PyString_AsString($input);
-	temp_data_blob.length = PyString_Size($input);
-	$1 = &temp_data_blob;
-}
-
-const char *dcerpc_server_name(struct dcerpc_pipe *p);
-
-char *nt_errstr(NTSTATUS nt_code);
-
-/* Some typemaps for easier access to resume handles.  Really this can
-   also be done using the uint32 carray functions, but it's a bit of a
-   hassle.  TODO: Fix memory leak here. */
-
-%typemap(in) uint32_t *resume_handle {
-	$1 = malloc(sizeof(*$1));
-	*$1 = PyLong_AsLong($input);
-}
-
-%typemap(out) uint32_t *resume_handle {
-	$result = PyLong_FromLong(*$1);
-}
-
-%typemap(in) struct policy_handle * {
-
-	if ((SWIG_ConvertPtr($input, (void **) &$1, $1_descriptor,
-			     SWIG_POINTER_EXCEPTION)) == -1) 
-	        return NULL;
-
-	if ($1 == NULL) {
-		PyErr_SetString(PyExc_TypeError, "None is not a valid policy handle");
-		return NULL;
-	}
-}
-
-/* When returning a policy handle to Python we need to make a copy of
-   as the talloc context it is created under is destroyed after the
-   wrapper function returns.  TODO: Fix memory leak created here. */
-
-%typemap(out) struct policy_handle * {
-	if ($1) {
-		struct policy_handle *temp = (struct policy_handle *)malloc(sizeof(struct policy_handle));
-		memcpy(temp, $1, sizeof(struct policy_handle));
-		$result = SWIG_NewPointerObj(temp, SWIGTYPE_p_policy_handle, 0);
-	} else {
-		Py_INCREF(Py_None);
-		$result = Py_None;
-	}
-}
-
-%{
-#include "librpc/gen_ndr/ndr_misc.h"
-#include "librpc/gen_ndr/ndr_security.h"
-#include "librpc/gen_ndr/ndr_samr.h"
-%}
-
-%include "carrays.i"
-
-/* Some functions for accessing arrays of fixed-width integers. */
-
-%array_functions(uint8_t, uint8_array);
-%array_functions(uint16_t, uint16_array);
-%array_functions(uint32_t, uint32_array);
-
-/* Functions for handling arrays of structures.  It would be nice for 
-   pidl to automatically generating these instead of having to find
-   them all by hand. */
-
-%array_functions(struct samr_SamEntry, samr_SamEntry_array);
-%array_functions(union samr_ConnectInfo, samr_ConnectInfo_array);
-%array_functions(struct samr_RidWithAttribute, samr_RidWithAttribute_array);
-
-%array_functions(struct lsa_SidPtr, lsa_SidPtr_array);
-
-%include "librpc/gen_ndr/misc.i"
-%include "librpc/gen_ndr/security.i"
-%include "librpc/gen_ndr/samr.i"
-%include "librpc/gen_ndr/lsa.i"
-- 
cgit 


From d3a13a16fff6e9a9929109a37f04a0a8e91d82b7 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Wed, 21 Nov 2007 12:31:35 +0100
Subject: r26076: Remove some SWIG code that is already commonly available.
 (This used to be commit e6cd16d0fb3c7f0d4756c28b8c9300583910c4c6)

---
 source4/scripting/swig/samba.i | 27 ---------------------------
 1 file changed, 27 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/swig/samba.i b/source4/scripting/swig/samba.i
index 859bdb06e3..fe83ae3da9 100644
--- a/source4/scripting/swig/samba.i
+++ b/source4/scripting/swig/samba.i
@@ -23,28 +23,6 @@
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
 
-%apply int { uint8_t };
-%apply int { int8_t };
-%apply unsigned int { uint16_t };
-%apply int { int16_t };
-%apply unsigned long long { uint64_t };
-%apply long long { int64_t };
-
-%typemap(in) uint32_t {
-	if (PyLong_Check($input))
-		$1 = PyLong_AsUnsignedLong($input);
-	else if (PyInt_Check($input))
-		$1 = PyInt_AsLong($input);
-	else {
-		PyErr_SetString(PyExc_TypeError,"Expected a long or an int");
-		return NULL;
-	}
-}
-
-%typemap(out) uint32_t {
-	$result = PyLong_FromUnsignedLong($1);
-}
-
 %typemap(in) NTSTATUS {
 	if (PyLong_Check($input))
 		$1 = NT_STATUS(PyLong_AsUnsignedLong($input));
@@ -56,13 +34,8 @@
 	}
 }
 
-%typemap(out) NTSTATUS {
-        $result = PyLong_FromUnsignedLong(NT_STATUS_V($1));
-}
-
 %typemap(in) struct cli_credentials * {
 	$1 = cli_credentials_init(arg1);
-	cli_credentials_set_conf($1);
 	if ($input == Py_None) {
 		cli_credentials_set_anonymous($1);
 	} else {
-- 
cgit 


From e5e2b64449a476552bbad49792b13f7501ecdc0c Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Wed, 21 Nov 2007 12:31:43 +0100
Subject: r26079: Some cleanups in the old SWIG wrappers: - remove old torture
 tests for LDB (replaced by a much more extensive test) - moved tool to bin
 directory (This used to be commit d6d3b0ad7a789441c82cf30a640033a052921c37)

---
 source4/scripting/bin/rpcclient               | 301 ++++++++++++++++++++++++++
 source4/scripting/swig/README                 |  23 +-
 source4/scripting/swig/config.mk              |  17 +-
 source4/scripting/swig/rpcclient              | 301 --------------------------
 source4/scripting/swig/torture/torture_ldb.py |  83 -------
 5 files changed, 314 insertions(+), 411 deletions(-)
 create mode 100755 source4/scripting/bin/rpcclient
 delete mode 100755 source4/scripting/swig/rpcclient
 delete mode 100755 source4/scripting/swig/torture/torture_ldb.py

(limited to 'source4/scripting')

diff --git a/source4/scripting/bin/rpcclient b/source4/scripting/bin/rpcclient
new file mode 100755
index 0000000000..34efafdf73
--- /dev/null
+++ b/source4/scripting/bin/rpcclient
@@ -0,0 +1,301 @@
+#!/usr/bin/python
+
+import sys, os, string
+from cmd import Cmd
+from optparse import OptionParser
+from pprint import pprint
+
+import dcerpc, samr
+
+def swig2dict(obj):
+    """Convert a swig object to a dictionary."""
+
+    result = {}
+
+    for attr in filter(lambda x: type(x) == str, dir(obj)):
+
+        if attr[:2] == '__' and attr[-2:] == '__':
+            continue
+
+        if attr == 'this' or attr == 'thisown':
+            continue
+        
+        result[attr] = getattr(obj, attr)
+
+    return result
+
+class rpcclient(Cmd):
+
+    prompt = 'rpcclient$ '
+
+    def __init__(self, server, cred):
+        Cmd.__init__(self)
+        self.server = server
+        self.cred = cred
+
+    def emptyline(self):
+
+        # Default for empty line is to repeat last command - yuck
+
+        pass
+
+    def onecmd(self, line):
+
+        # Override the onecmd() method so we can trap error returns
+
+        try:
+            Cmd.onecmd(self, line)
+        except dcerpc.NTSTATUS, arg:
+            print 'The command returned an error: %s' % arg[1]
+            
+    # Command handlers
+
+    def do_help(self, line):
+        """Displays on-line help for rpcclient commands."""
+        Cmd.do_help(self, line)
+
+    def do_shell(self, line):
+
+        status = os.system(line)
+
+        if os.WIFEXITED(status):
+            if os.WEXITSTATUS(status) != 0:
+                print 'Command exited with code %d' % os.WEXITSTATUS(status)
+        else:
+            print 'Command exited with signal %d' % os.WTERMSIG(status)
+            
+    def do_EOF(self, line):
+        """Exits rpcclient."""
+        print
+        sys.exit(0)
+
+    # SAMR pipe commands
+
+    def do_SamrEnumDomains(self, line):
+        """Enumerate domain names."""
+        
+        usage = 'usage: SamrEnumDomains'
+
+        if line != '':
+            print usage
+            return
+
+        pipe = dcerpc.pipe_connect(
+            'ncacn_np:%s' % self.server,
+            dcerpc.DCERPC_SAMR_UUID, int(dcerpc.DCERPC_SAMR_VERSION),
+            self.cred)
+
+        connect_handle = samr.Connect(pipe)
+
+        for i in connect_handle.EnumDomains():
+            print i
+
+    def do_SamrLookupDomain(self, line):
+        """Return the SID for a domain."""
+
+        usage = 'SamrLookupDomain DOMAIN'
+
+        parser = OptionParser(usage)
+        options, args = parser.parse_args(string.split(line))
+
+        if len(args) != 1:
+            print 'usage:', usage
+            return
+
+        pipe = dcerpc.pipe_connect(
+            'ncacn_np:%s' % self.server,
+            dcerpc.DCERPC_SAMR_UUID, int(dcerpc.DCERPC_SAMR_VERSION),
+            self.cred)
+
+        connect_handle = samr.Connect(pipe)
+
+        print connect_handle.LookupDomain(args[0])
+
+    def do_SamrQueryDomInfo(self, line):
+	"""Return information about a domain designated by its SID."""
+
+	usage = 'SamrQueryDomInfo DOMAIN_SID [info_level]'
+
+	parser = OptionParser(usage)
+	options, args = parser.parse_args(string.split(line))
+
+	if (len(args) == 0) or (len(args) > 2):
+	    print 'usage:', usage
+	    return
+
+        pipe = dcerpc.pipe_connect(
+            'ncacn_np:%s' % self.server,
+            dcerpc.DCERPC_SAMR_UUID, int(dcerpc.DCERPC_SAMR_VERSION),
+            self.cred)
+
+        connect_handle = samr.Connect(pipe)
+	domain_handle = connect_handle.OpenDomain(args[0])
+
+	if (len(args) == 2):
+	    result = domain_handle.QueryDomainInfo(int(args[1]))
+	else:
+	    result = domain_handle.QueryDomainInfo()
+
+        pprint(swig2dict(result))
+
+    def do_SamrQueryDomInfo2(self, line):
+	"""Return information about a domain designated by its SID.
+        (Windows 2000 and >)"""
+
+	usage = 'SamrQueryDomInfo2 DOMAIN_SID [info_level] (Windows 2000 and >)'
+	parser = OptionParser(usage)
+	options, args = parser.parse_args(string.split(line))
+
+	if len(args) == 0 or len(args) > 2:
+	    print 'usage:', usage
+	    return
+
+        pipe = dcerpc.pipe_connect(
+            'ncacn_np:%s' % self.server,
+            dcerpc.DCERPC_SAMR_UUID, int(dcerpc.DCERPC_SAMR_VERSION),
+            self.cred)
+
+        connect_handle = samr.Connect(pipe)
+	domain_handle = connect_handle.OpenDomain(args[0])
+
+	if (len(args) == 2):
+	    result = domain_handle.QueryDomainInfo2(int(args[1]))
+	else:
+	    result = domain_handle.QueryDomainInfo2()
+
+        pprint(swig2dict(result))
+
+    def do_SamrEnumDomainGroups(self, line):
+	"""Return the list of groups of a domain designated by its SID."""
+
+	usage = 'SamrEnumDomainGroups DOMAIN_SID'
+
+        parser = OptionParser(usage)
+        options, args = parser.parse_args(string.split(line))
+
+        if len(args) != 1:
+            print 'usage:', usage
+            return
+
+        pipe = dcerpc.pipe_connect(
+            'ncacn_np:%s' % self.server,
+            dcerpc.DCERPC_SAMR_UUID, int(dcerpc.DCERPC_SAMR_VERSION),
+            self.cred)
+
+        connect_handle = samr.Connect(pipe)	
+	domain_handle = connect_handle.OpenDomain(args[0])
+
+	result = domain_handle.EnumDomainGroups()
+
+        pprint(result)
+
+    def do_SamrEnumDomainAliases(self, line):
+        """Return the list of aliases (local groups) of a domain designated
+        by its SID."""
+
+	usage = 'SamrEnumDomainAliases DOMAIN_SID'
+
+        parser = OptionParser(usage)
+        options, args = parser.parse_args(string.split(line))
+
+        if len(args) != 1:
+            print 'usage:', usage
+            return
+
+        pipe = dcerpc.pipe_connect(
+            'ncacn_np:%s' % self.server,
+            dcerpc.DCERPC_SAMR_UUID, int(dcerpc.DCERPC_SAMR_VERSION),
+            self.cred)
+
+        connect_handle = samr.Connect(pipe)
+        domain_handle = connect_handle.OpenDomain(args[0])
+
+	result = domain_handle.EnumDomainAliases()
+
+        pprint(result)
+
+    def do_SamrEnumDomainUsers(self, line):
+	"""Return the list of users of a domain designated by its SID."""
+
+	usage = 'SamrEnumDomainUsers DOMAIN_SID [user_account_flags]'
+
+        parser = OptionParser(usage)
+        options, args = parser.parse_args(string.split(line))
+
+	if (len(args) == 0) or (len(args) > 2):
+	    print 'usage:', usage
+	    return
+
+        pipe = dcerpc.pipe_connect(
+            'ncacn_np:%s' % self.server,
+            dcerpc.DCERPC_SAMR_UUID, int(dcerpc.DCERPC_SAMR_VERSION),
+            self.cred)
+
+        connect_handle = samr.Connect(pipe)
+        domain_handle = connect_handle.OpenDomain(args[0])
+
+	if (len(args) == 2):
+	    result = domain_handle.EnumDomainUsers(int(args[1]))
+	else:
+	    result = domain_handle.EnumDomainUsers()
+
+        pprint(result)
+
+if __name__ == '__main__':
+
+    # Parse command line
+
+    usage = 'rpcclient SERVER [options]'
+
+    if len(sys.argv) == 1:
+        print usage
+        sys.exit(1)
+
+    server = sys.argv[1]
+    del(sys.argv[1])
+
+    parser = OptionParser(usage)
+
+    parser.add_option('-U', '--username', action='store', type='string',
+                      help='Use given credentials when connecting',
+                      metavar='DOMAIN\\username%password',
+                      dest='username')
+
+    parser.add_option('-c', '--command', action='store', type='string',
+                      help='Execute COMMAND', dest='command')
+
+    options, args = parser.parse_args()
+
+    # Break --username up into domain, username and password
+
+    cred = None
+
+    if not options.username:
+        options.username = '%'
+
+    domain = ''
+    if string.find(options.username, '\\') != -1:
+        domain, options.username = string.split(options.username, '\\')
+
+    password = ''
+    if string.find(options.username, '%') != -1:
+        options.username, password  = string.split(options.username, '%')
+
+    username = options.username
+
+    if username != '':
+	cred = (domain, username, password)
+
+    # Run command loop
+
+    c = rpcclient(server, cred)
+
+    if options.command:
+        c.onecmd(options.command)
+        sys.exit(0)
+
+    while 1:
+        try:
+            c.cmdloop()
+        except KeyboardInterrupt:
+            print 'KeyboardInterrupt'
diff --git a/source4/scripting/swig/README b/source4/scripting/swig/README
index 561c5ab279..38b95b28f4 100644
--- a/source4/scripting/swig/README
+++ b/source4/scripting/swig/README
@@ -6,26 +6,9 @@ Instructions for building:
 1. Run configure with the --with-python option to enable python
    extensions. 
 
-2. Edit the script/build_idl.sh script to pass the --swig option to
-   pidl.  Here's a patch:
+2. Run 'make idl_full swig' to build extensions.
 
-Index: script/build_idl.sh
-===================================================================
---- script/build_idl.sh	(revision 2413)
-+++ script/build_idl.sh	(working copy)
-@@ -4,7 +4,7 @@
- 
- [ -d librpc/gen_ndr ] || mkdir -p librpc/gen_ndr || exit 1
- 
--PIDL="$PERL ./build/pidl/pidl.pl --output librpc/gen_ndr/ndr_ --parse --header --parser --server"
-+PIDL="$PERL ./build/pidl/pidl.pl --output librpc/gen_ndr/ndr_ --parse --header --parser --server --swig"
- TABLES="$PERL ./build/pidl/tables.pl --output librpc/gen_ndr/tables"
- 
- if [ x$FULLBUILD = xFULL ]; then
-
-3. Run 'make idl_full swig' to build extensions.
-
-4. At some stage there will be a proper system for installing the
+3. At some stage there will be a proper system for installing the
    extensions, but right now it's easier to run them in place.  Set
    your PYTHONPATH to include the modules.  From the Samba source
    directory, run:
@@ -34,4 +17,4 @@ Index: script/build_idl.sh
 
 Now you can go nuts and use the extensions.  Check the
 scripting/swig/torture directory for a testsuite.  There will
-hopefully be a bunch of usage examples somewhere.
\ No newline at end of file
+hopefully be a bunch of usage examples somewhere.
diff --git a/source4/scripting/swig/config.mk b/source4/scripting/swig/config.mk
index 944e33b9b4..193e84b255 100644
--- a/source4/scripting/swig/config.mk
+++ b/source4/scripting/swig/config.mk
@@ -1,16 +1,19 @@
 # Swig extensions
-swig: lib/tdb/swig/_tdb.$(SHLIBEXT) lib/ldb/swig/_ldb.$(SHLIBEXT) \
-	libcli/swig/_libcli_nbt.$(SHLIBEXT) libcli/swig/_libcli_smb.$(SHLIBEXT)
+swig: pythonmods
 
+pythonmods: $(PYTHON_DSOS)
+	
 .SUFFIXES: _wrap.c .i
 
 .i_wrap.c:
-	swig -I$(srcdir)/scripting/swig -python $<
+	swig -Wall -I$(srcdir)/scripting/swig -python $<
 
 clean::
 	@echo "Removing SWIG output files"
-	@-rm -f scripting/swig/tdb.pyc scripting/swig/tdb.py
+	@-rm -f bin/python/*
+	# FIXME: Remove _wrap.c files
 
-# Swig testing
-swigtest: swig
-	./selftest/test_swig.sh
+PYDOCTOR_MODULES=bin/python/ldb.py bin/python/auth.py bin/python/credentials.py bin/python/registry.py
+
+pydoctor::
+	LD_LIBRARY_PATH=bin/shared PYTHONPATH=bin/python pydoctor --make-html --docformat=restructedtext --add-package scripting/python/samba/ $(addprefix --add-module , $(PYDOCTOR_MODULES))
diff --git a/source4/scripting/swig/rpcclient b/source4/scripting/swig/rpcclient
deleted file mode 100755
index 34efafdf73..0000000000
--- a/source4/scripting/swig/rpcclient
+++ /dev/null
@@ -1,301 +0,0 @@
-#!/usr/bin/python
-
-import sys, os, string
-from cmd import Cmd
-from optparse import OptionParser
-from pprint import pprint
-
-import dcerpc, samr
-
-def swig2dict(obj):
-    """Convert a swig object to a dictionary."""
-
-    result = {}
-
-    for attr in filter(lambda x: type(x) == str, dir(obj)):
-
-        if attr[:2] == '__' and attr[-2:] == '__':
-            continue
-
-        if attr == 'this' or attr == 'thisown':
-            continue
-        
-        result[attr] = getattr(obj, attr)
-
-    return result
-
-class rpcclient(Cmd):
-
-    prompt = 'rpcclient$ '
-
-    def __init__(self, server, cred):
-        Cmd.__init__(self)
-        self.server = server
-        self.cred = cred
-
-    def emptyline(self):
-
-        # Default for empty line is to repeat last command - yuck
-
-        pass
-
-    def onecmd(self, line):
-
-        # Override the onecmd() method so we can trap error returns
-
-        try:
-            Cmd.onecmd(self, line)
-        except dcerpc.NTSTATUS, arg:
-            print 'The command returned an error: %s' % arg[1]
-            
-    # Command handlers
-
-    def do_help(self, line):
-        """Displays on-line help for rpcclient commands."""
-        Cmd.do_help(self, line)
-
-    def do_shell(self, line):
-
-        status = os.system(line)
-
-        if os.WIFEXITED(status):
-            if os.WEXITSTATUS(status) != 0:
-                print 'Command exited with code %d' % os.WEXITSTATUS(status)
-        else:
-            print 'Command exited with signal %d' % os.WTERMSIG(status)
-            
-    def do_EOF(self, line):
-        """Exits rpcclient."""
-        print
-        sys.exit(0)
-
-    # SAMR pipe commands
-
-    def do_SamrEnumDomains(self, line):
-        """Enumerate domain names."""
-        
-        usage = 'usage: SamrEnumDomains'
-
-        if line != '':
-            print usage
-            return
-
-        pipe = dcerpc.pipe_connect(
-            'ncacn_np:%s' % self.server,
-            dcerpc.DCERPC_SAMR_UUID, int(dcerpc.DCERPC_SAMR_VERSION),
-            self.cred)
-
-        connect_handle = samr.Connect(pipe)
-
-        for i in connect_handle.EnumDomains():
-            print i
-
-    def do_SamrLookupDomain(self, line):
-        """Return the SID for a domain."""
-
-        usage = 'SamrLookupDomain DOMAIN'
-
-        parser = OptionParser(usage)
-        options, args = parser.parse_args(string.split(line))
-
-        if len(args) != 1:
-            print 'usage:', usage
-            return
-
-        pipe = dcerpc.pipe_connect(
-            'ncacn_np:%s' % self.server,
-            dcerpc.DCERPC_SAMR_UUID, int(dcerpc.DCERPC_SAMR_VERSION),
-            self.cred)
-
-        connect_handle = samr.Connect(pipe)
-
-        print connect_handle.LookupDomain(args[0])
-
-    def do_SamrQueryDomInfo(self, line):
-	"""Return information about a domain designated by its SID."""
-
-	usage = 'SamrQueryDomInfo DOMAIN_SID [info_level]'
-
-	parser = OptionParser(usage)
-	options, args = parser.parse_args(string.split(line))
-
-	if (len(args) == 0) or (len(args) > 2):
-	    print 'usage:', usage
-	    return
-
-        pipe = dcerpc.pipe_connect(
-            'ncacn_np:%s' % self.server,
-            dcerpc.DCERPC_SAMR_UUID, int(dcerpc.DCERPC_SAMR_VERSION),
-            self.cred)
-
-        connect_handle = samr.Connect(pipe)
-	domain_handle = connect_handle.OpenDomain(args[0])
-
-	if (len(args) == 2):
-	    result = domain_handle.QueryDomainInfo(int(args[1]))
-	else:
-	    result = domain_handle.QueryDomainInfo()
-
-        pprint(swig2dict(result))
-
-    def do_SamrQueryDomInfo2(self, line):
-	"""Return information about a domain designated by its SID.
-        (Windows 2000 and >)"""
-
-	usage = 'SamrQueryDomInfo2 DOMAIN_SID [info_level] (Windows 2000 and >)'
-	parser = OptionParser(usage)
-	options, args = parser.parse_args(string.split(line))
-
-	if len(args) == 0 or len(args) > 2:
-	    print 'usage:', usage
-	    return
-
-        pipe = dcerpc.pipe_connect(
-            'ncacn_np:%s' % self.server,
-            dcerpc.DCERPC_SAMR_UUID, int(dcerpc.DCERPC_SAMR_VERSION),
-            self.cred)
-
-        connect_handle = samr.Connect(pipe)
-	domain_handle = connect_handle.OpenDomain(args[0])
-
-	if (len(args) == 2):
-	    result = domain_handle.QueryDomainInfo2(int(args[1]))
-	else:
-	    result = domain_handle.QueryDomainInfo2()
-
-        pprint(swig2dict(result))
-
-    def do_SamrEnumDomainGroups(self, line):
-	"""Return the list of groups of a domain designated by its SID."""
-
-	usage = 'SamrEnumDomainGroups DOMAIN_SID'
-
-        parser = OptionParser(usage)
-        options, args = parser.parse_args(string.split(line))
-
-        if len(args) != 1:
-            print 'usage:', usage
-            return
-
-        pipe = dcerpc.pipe_connect(
-            'ncacn_np:%s' % self.server,
-            dcerpc.DCERPC_SAMR_UUID, int(dcerpc.DCERPC_SAMR_VERSION),
-            self.cred)
-
-        connect_handle = samr.Connect(pipe)	
-	domain_handle = connect_handle.OpenDomain(args[0])
-
-	result = domain_handle.EnumDomainGroups()
-
-        pprint(result)
-
-    def do_SamrEnumDomainAliases(self, line):
-        """Return the list of aliases (local groups) of a domain designated
-        by its SID."""
-
-	usage = 'SamrEnumDomainAliases DOMAIN_SID'
-
-        parser = OptionParser(usage)
-        options, args = parser.parse_args(string.split(line))
-
-        if len(args) != 1:
-            print 'usage:', usage
-            return
-
-        pipe = dcerpc.pipe_connect(
-            'ncacn_np:%s' % self.server,
-            dcerpc.DCERPC_SAMR_UUID, int(dcerpc.DCERPC_SAMR_VERSION),
-            self.cred)
-
-        connect_handle = samr.Connect(pipe)
-        domain_handle = connect_handle.OpenDomain(args[0])
-
-	result = domain_handle.EnumDomainAliases()
-
-        pprint(result)
-
-    def do_SamrEnumDomainUsers(self, line):
-	"""Return the list of users of a domain designated by its SID."""
-
-	usage = 'SamrEnumDomainUsers DOMAIN_SID [user_account_flags]'
-
-        parser = OptionParser(usage)
-        options, args = parser.parse_args(string.split(line))
-
-	if (len(args) == 0) or (len(args) > 2):
-	    print 'usage:', usage
-	    return
-
-        pipe = dcerpc.pipe_connect(
-            'ncacn_np:%s' % self.server,
-            dcerpc.DCERPC_SAMR_UUID, int(dcerpc.DCERPC_SAMR_VERSION),
-            self.cred)
-
-        connect_handle = samr.Connect(pipe)
-        domain_handle = connect_handle.OpenDomain(args[0])
-
-	if (len(args) == 2):
-	    result = domain_handle.EnumDomainUsers(int(args[1]))
-	else:
-	    result = domain_handle.EnumDomainUsers()
-
-        pprint(result)
-
-if __name__ == '__main__':
-
-    # Parse command line
-
-    usage = 'rpcclient SERVER [options]'
-
-    if len(sys.argv) == 1:
-        print usage
-        sys.exit(1)
-
-    server = sys.argv[1]
-    del(sys.argv[1])
-
-    parser = OptionParser(usage)
-
-    parser.add_option('-U', '--username', action='store', type='string',
-                      help='Use given credentials when connecting',
-                      metavar='DOMAIN\\username%password',
-                      dest='username')
-
-    parser.add_option('-c', '--command', action='store', type='string',
-                      help='Execute COMMAND', dest='command')
-
-    options, args = parser.parse_args()
-
-    # Break --username up into domain, username and password
-
-    cred = None
-
-    if not options.username:
-        options.username = '%'
-
-    domain = ''
-    if string.find(options.username, '\\') != -1:
-        domain, options.username = string.split(options.username, '\\')
-
-    password = ''
-    if string.find(options.username, '%') != -1:
-        options.username, password  = string.split(options.username, '%')
-
-    username = options.username
-
-    if username != '':
-	cred = (domain, username, password)
-
-    # Run command loop
-
-    c = rpcclient(server, cred)
-
-    if options.command:
-        c.onecmd(options.command)
-        sys.exit(0)
-
-    while 1:
-        try:
-            c.cmdloop()
-        except KeyboardInterrupt:
-            print 'KeyboardInterrupt'
diff --git a/source4/scripting/swig/torture/torture_ldb.py b/source4/scripting/swig/torture/torture_ldb.py
deleted file mode 100755
index fe79f4f843..0000000000
--- a/source4/scripting/swig/torture/torture_ldb.py
+++ /dev/null
@@ -1,83 +0,0 @@
-#!/usr/bin/python
-#
-# A torture test for the Python Ldb bindings.  Also a short guide on
-# how the API works.
-#
-
-from Ldb import *
-
-# Helpers
-
-def t(cond, msg):
-    """Test a condition."""
-    if not cond:
-        raise RuntimeError('FAILED: %s' % msg)
-
-#
-# Torture LdbMessage
-#
-
-m = LdbMessage()
-
-# Empty message
-
-t(m.keys() == [], 'empty msg')
-t(m.dn == None, 'empty dn')
-
-t(m.sanity_check() == LDB_ERR_INVALID_DN_SYNTAX, 'sanity check')
-
-# Test invalid dn
-
-try:
-    m.dn = 'invalid dn'
-except LdbError, arg:
-    if arg[0] != LDB_ERR_INVALID_DN_SYNTAX:
-        raise
-else:
-    t(False, 'LdbError not raised')
-
-# Test valid dn
-
-m.dn = 'name=spotty'
-t(m.dn == 'name=spotty', 'specified dn')
-
-t(m.sanity_check() == LDB_SUCCESS, 'sanity check')
-
-# Test some single-valued attributes
-
-m['animal'] = 'dog'
-m['name'] = 'spotty'
-
-t(m.keys() == ['animal', 'name'], 'keys() test failed')
-t(m.values() == [['dog'], ['spotty']], 'values() test failed')
-t(m.items() == [('animal', ['dog']), ('name', ['spotty'])],
-  'items() test failed')
-
-t(m.sanity_check() == LDB_SUCCESS, 'sanity check')
-
-m['animal'] = 'canine'
-t(m['animal'] == ['canine'], 'replace value failed')
-
-# Test a multi-valued attribute
-
-names = ['spotty', 'foot']
-m['name'] = names
-
-t(m['name'] == names, 'multi-valued attr failed')
-
-t(m.sanity_check() == LDB_SUCCESS, 'sanity check')
-
-# Test non-string attributes
-
-try:
-    m['foo'] = 42
-except TypeError:
-    pass
-else:
-    t(False, 'TypeError not raised')
-
-#
-# Torture Ldb
-#
-
-l = Ldb('foo.ldb')
-- 
cgit 


From 39adc2418a0586261c6c4aea36f72596c6cf8897 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Wed, 21 Nov 2007 13:07:16 +0100
Subject: r26088: Import some native-python python modules and move original
 python swig torture code to common python directory as well. (This used to be
 commit cbf656ff054ab2b0b5ca81e1d4f16ac54c8098f1)

---
 source4/scripting/python/config.mk                 |  35 +
 source4/scripting/python/misc.i                    |  32 +
 source4/scripting/python/parammodule.c             | 182 +++++
 source4/scripting/python/samba/__init__.py         |  57 ++
 source4/scripting/python/samba/getopt.py           |  46 ++
 source4/scripting/python/samba/samr.py             | 753 +++++++++++++++++++++
 source4/scripting/python/samba/torture/pytorture   |  51 ++
 source4/scripting/python/samba/torture/spoolss.py  | 437 ++++++++++++
 .../scripting/python/samba/torture/torture_samr.py | 221 ++++++
 .../scripting/python/samba/torture/torture_tdb.py  |  90 +++
 source4/scripting/python/samba/torture/winreg.py   | 165 +++++
 source4/scripting/python/sidmodule.c               |  57 ++
 source4/scripting/python/uuidmodule.c              |  57 ++
 source4/scripting/swig/README                      |  20 -
 source4/scripting/swig/config.m4                   |  29 -
 source4/scripting/swig/config.mk                   |  19 -
 source4/scripting/swig/samba.i                     |  57 --
 source4/scripting/swig/samr.py                     | 753 ---------------------
 source4/scripting/swig/status_codes.i              | 554 ---------------
 source4/scripting/swig/torture/pytorture           |  51 --
 source4/scripting/swig/torture/spoolss.py          | 437 ------------
 source4/scripting/swig/torture/torture_samr.py     | 221 ------
 source4/scripting/swig/torture/torture_tdb.py      |  90 ---
 source4/scripting/swig/torture/winreg.py           | 165 -----
 24 files changed, 2183 insertions(+), 2396 deletions(-)
 create mode 100644 source4/scripting/python/config.mk
 create mode 100644 source4/scripting/python/misc.i
 create mode 100644 source4/scripting/python/parammodule.c
 create mode 100644 source4/scripting/python/samba/__init__.py
 create mode 100644 source4/scripting/python/samba/getopt.py
 create mode 100644 source4/scripting/python/samba/samr.py
 create mode 100755 source4/scripting/python/samba/torture/pytorture
 create mode 100644 source4/scripting/python/samba/torture/spoolss.py
 create mode 100755 source4/scripting/python/samba/torture/torture_samr.py
 create mode 100755 source4/scripting/python/samba/torture/torture_tdb.py
 create mode 100755 source4/scripting/python/samba/torture/winreg.py
 create mode 100644 source4/scripting/python/sidmodule.c
 create mode 100644 source4/scripting/python/uuidmodule.c
 delete mode 100644 source4/scripting/swig/README
 delete mode 100644 source4/scripting/swig/config.m4
 delete mode 100644 source4/scripting/swig/config.mk
 delete mode 100644 source4/scripting/swig/samba.i
 delete mode 100644 source4/scripting/swig/samr.py
 delete mode 100644 source4/scripting/swig/status_codes.i
 delete mode 100755 source4/scripting/swig/torture/pytorture
 delete mode 100644 source4/scripting/swig/torture/spoolss.py
 delete mode 100755 source4/scripting/swig/torture/torture_samr.py
 delete mode 100755 source4/scripting/swig/torture/torture_tdb.py
 delete mode 100755 source4/scripting/swig/torture/winreg.py

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/config.mk b/source4/scripting/python/config.mk
new file mode 100644
index 0000000000..1c9ffb20ac
--- /dev/null
+++ b/source4/scripting/python/config.mk
@@ -0,0 +1,35 @@
+[PYTHON::python_param]
+PRIVATE_DEPENDENCIES = LIBSAMBA-CONFIG 
+OBJ_FILES = parammodule.o
+
+[PYTHON::python_uuid]
+PRIVATE_DEPENDENCIES = LIBNDR 
+OBJ_FILES = uuidmodule.o
+
+[PYTHON::python_sid]
+PRIVATE_DEPENDENCIES = LIBNDR 
+OBJ_FILES = sidmodule.o
+
+[PYTHON::python_misc]
+PRIVATE_DEPENDENCIES = LIBNDR LIBLDB
+SWIG_FILE = misc.i
+
+# Swig extensions
+swig: pythonmods
+
+.SUFFIXES: _wrap.c .i
+
+.i_wrap.c:
+	swig -Wall -I$(srcdir)/scripting/swig -python $<
+
+clean::
+	@echo "Removing SWIG output files"
+	@-rm -f bin/python/*
+	# FIXME: Remove _wrap.c files
+	#
+pythonmods: $(PYTHON_DSOS)
+
+PYDOCTOR_MODULES=bin/python/ldb.py bin/python/auth.py bin/python/credentials.py bin/python/registry.py
+
+pydoctor:: pythonmods
+	LD_LIBRARY_PATH=bin/shared PYTHONPATH=bin/python pydoctor --make-html --docformat=restructuredtext --add-package scripting/python/samba/ $(addprefix --add-module , $(PYDOCTOR_MODULES))
diff --git a/source4/scripting/python/misc.i b/source4/scripting/python/misc.i
new file mode 100644
index 0000000000..088522320e
--- /dev/null
+++ b/source4/scripting/python/misc.i
@@ -0,0 +1,32 @@
+/* 
+   Unix SMB/CIFS implementation.
+   Copyright (C) Jelmer Vernooij <jelmer@samba.org> 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 <http://www.gnu.org/licenses/>.
+*/
+
+%module(package="samba.misc") misc
+
+%{
+#include "includes.h"
+#include "ldb.h"
+#include "auth/credentials/credentials.h"
+%}
+
+%import "stdint.i"
+%import "../../lib/talloc/talloc.i"
+
+%rename(random_password) generate_random_str;
+char *generate_random_str(TALLOC_CTX *mem_ctx, size_t len);
+
diff --git a/source4/scripting/python/parammodule.c b/source4/scripting/python/parammodule.c
new file mode 100644
index 0000000000..38d312cf1d
--- /dev/null
+++ b/source4/scripting/python/parammodule.c
@@ -0,0 +1,182 @@
+/* 
+   Unix SMB/CIFS implementation.
+
+   Python wrapper for reading smb.conf files
+
+   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 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.
+*/
+
+#include "includes.h"
+#include "scripting/python/talloc.h"
+#include "Python.h"
+#include "param/param.h"
+
+staticforward PyTypeObject param_ParamFileType;
+
+typedef struct {
+	PyObject_HEAD
+	struct param_context *param_ctx;
+} param_ParamFileObject;
+
+static param_ParamFileObject *py_param_init(void)
+{
+	param_ParamFileObject *param; 
+
+	param = PyObject_New(param_ParamFileObject, &param_ParamFileType);
+
+	param->param_ctx = param_init(NULL);
+
+	return param;
+}
+
+static PyObject *py_param_load(PyObject *self, PyObject *args)
+{
+	char *filename = NULL;
+	param_ParamFileObject *param;
+
+	if (!PyArg_ParseTuple(args, "|s:new", &filename))
+	        return NULL;
+
+	param = py_param_init();
+
+	if (filename != NULL) {
+		int ret = param_read(param->param_ctx, filename);
+
+		if (ret == -1) {
+			PyErr_SetString(PyExc_TypeError, "reading file failed");
+			return NULL;
+		}
+	}
+
+	return (PyObject *)param;
+}
+
+static void
+param_dealloc(PyObject* self)
+{
+	PyObject_Del(self);
+}
+
+static PyObject *py_param_get(PyObject *_self, PyObject *args)
+{
+	struct param_opt *param;
+	const char *section_name = NULL, *param_name = NULL;
+	param_ParamFileObject *self = (param_ParamFileObject *)_self;
+
+	if (!PyArg_ParseTuple(args, (char *)"s|s", &param_name, &section_name))
+		return NULL;
+
+	param = param_get(self->param_ctx, section_name, param_name);
+	if (param == NULL)
+		return Py_None;
+
+	return PyString_FromString(param->value);
+}
+
+static PyObject *py_param_set(PyObject *_self, PyObject *args)
+{
+	param_ParamFileObject *self = (param_ParamFileObject *)_self;
+	const char *section_name = NULL, *param_name = NULL, *param_value = NULL;
+
+	if (!PyArg_ParseTuple(args, "ss|s", &param_name, &param_value, &section_name))
+		return NULL;
+
+	if (section_name == NULL)
+		section_name = GLOBAL_NAME;
+
+	if (param_set_string(self->param_ctx, section_name, param_name, param_value) != 0) {
+		PyErr_SetString(PyExc_TypeError, "setting variable failed");
+		return NULL;
+	}
+
+	return Py_None;
+}
+
+static PyObject *py_param_save(PyObject *_self, PyObject *args)
+{
+	param_ParamFileObject *self = (param_ParamFileObject *)_self;
+	const char *filename = NULL;
+
+	if (!PyArg_ParseTuple(args, "s", &filename))
+		return NULL;
+
+	if (param_write(self->param_ctx, filename) != 0) {
+		PyErr_SetString(PyExc_TypeError, "unable to save");
+		return NULL;
+	}
+
+	return Py_None;
+}
+
+static PyObject *py_param_use(PyObject *_self, PyObject *args)
+{
+	param_ParamFileObject *self = (param_ParamFileObject *)_self;
+
+	if (!PyArg_ParseTuple(args, ""))
+		return NULL;
+
+	if (param_use(global_loadparm, self->param_ctx) != 0) {
+		PyErr_SetString(PyExc_TypeError, "unable to use");
+		return NULL;
+	}
+
+	return Py_None;
+}
+
+static PyMethodDef param_methods[] = {
+	{"get", (PyCFunction)py_param_get, METH_VARARGS,
+		"Get a parameter."},
+	{"set", (PyCFunction)py_param_set, METH_VARARGS,
+		"Set a parameter."},
+	{"save", (PyCFunction)py_param_save, METH_VARARGS,
+		"Save file" },
+	{"use", (PyCFunction)py_param_use, METH_VARARGS,
+		"Use param file" },
+	{NULL, NULL, 0, NULL}
+};
+
+static PyObject *
+param_getattr(PyTypeObject *obj, char *name)
+{
+	return Py_FindMethod(param_methods, (PyObject *)obj, name);
+}
+
+static PyTypeObject param_ParamFileType = {
+	PyObject_HEAD_INIT(NULL) 0,
+	.tp_name = "ParamFile",
+	.tp_basicsize = sizeof(param_ParamFileObject),
+	.tp_dealloc = param_dealloc,
+	.tp_getattr = param_getattr,
+};
+
+
+static PyMethodDef methods[] = {
+	{ "ParamFile", (PyCFunction)py_param_load, METH_VARARGS, NULL},
+	{ NULL, NULL }
+};
+
+PyDoc_STRVAR(param_doc, "Simple wrappers around the smb.conf parsers");
+
+PyMODINIT_FUNC initparam(void)
+{
+	PyObject *mod = Py_InitModule3("param", methods, param_doc);
+	if (mod == NULL)
+		return;
+
+	PyModule_AddObject(mod, "configfile", 
+			   PyString_FromString(lp_configfile(global_loadparm)));
+}
diff --git a/source4/scripting/python/samba/__init__.py b/source4/scripting/python/samba/__init__.py
new file mode 100644
index 0000000000..46d8ff7d37
--- /dev/null
+++ b/source4/scripting/python/samba/__init__.py
@@ -0,0 +1,57 @@
+#!/usr/bin/python
+
+# Unix SMB/CIFS implementation.
+# Copyright (C) Andrew Tridgell <tridge@samba.org> 2005
+# Copyright (C) Jelmer Vernooij <jelmer@samba.org> 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 <http://www.gnu.org/licenses/>.
+#
+
+import os
+from misc import ldb_set_credentials
+
+def Ldb(url, session_info=None, credentials=None, modules_dir=None):
+    """Open a Samba Ldb file. 
+
+    This is different from a regular Ldb file in that the Samba-specific
+    modules-dir is used by default and that credentials and session_info 
+    can be passed through (required by some modules).
+    """
+    import ldb
+    ret = ldb.Ldb()
+    if modules_dir is None:
+        modules_dir = os.path.join(os.getcwd(), "bin", "modules", "ldb")
+    ret.set_modules_dir(modules_dir)
+    def samba_debug(level,text):
+        print "%d %s" % (level, text)
+    ldb_set_opaque("credentials", credentials)
+    ret.set_opaque("sessionInfo", session_info)
+    #ret.set_debug(samba_debug)
+    ret.connect(url)
+    return ret
+
+
+def substitute_var(text, values):
+    """substitute strings of the form ${NAME} in str, replacing
+    with substitutions from subobj.
+    
+    :param text: Text in which to subsitute.
+    :param values: Dictionary with keys and values.
+    """
+
+    for (name, value) in values.items():
+        text = text.replace("${%s}" % name, value)
+
+    return text
+
diff --git a/source4/scripting/python/samba/getopt.py b/source4/scripting/python/samba/getopt.py
new file mode 100644
index 0000000000..8143dcafdb
--- /dev/null
+++ b/source4/scripting/python/samba/getopt.py
@@ -0,0 +1,46 @@
+#!/usr/bin/python
+
+# Samba-specific bits for optparse
+# Copyright (C) Jelmer Vernooij <jelmer@samba.org> 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 <http://www.gnu.org/licenses/>.
+#
+
+import optparse
+from credentials import Credentials
+
+class SambaOptions(optparse.OptionGroup):
+    def __init__(self, parser):
+        optparse.OptionGroup.__init__(self, parser, "Samba Common Options")
+        self.add_option("--configfile", type="string", metavar="FILE",
+                        help="Configuration file")
+
+
+class VersionOptions(optparse.OptionGroup):
+    def __init__(self, parser):
+        optparse.OptionGroup.__init__(self, parser, "Version Options")
+
+
+class CredentialsOptions(optparse.OptionGroup):
+    def __init__(self, parser):
+        optparse.OptionGroup.__init__(self, parser, "Credentials Options")
+        self.add_option("--simple-bind-dn", type="string", metavar="DN",
+                        help="DN to use for a simple bind")
+        self.add_option("--password", type="string", metavar="PASSWORD",
+                        help="Password")
+
+    def get_credentials(self):
+        creds = Credentials()
+        # FIXME: Update
+        return creds
diff --git a/source4/scripting/python/samba/samr.py b/source4/scripting/python/samba/samr.py
new file mode 100644
index 0000000000..314f78b8ad
--- /dev/null
+++ b/source4/scripting/python/samba/samr.py
@@ -0,0 +1,753 @@
+import dcerpc
+
+def sid_to_string(sid):
+    """Convert a Python dictionary SID to a string SID."""
+
+    result = 'S-%d' % sid.sid_rev_num
+
+    result = result + '-%u' % \
+             (dcerpc.uint8_array_getitem(sid.id_auth, 5) +
+              (dcerpc.uint8_array_getitem(sid.id_auth, 4) << 8) + 
+              (dcerpc.uint8_array_getitem(sid.id_auth, 3) << 16) +
+              (dcerpc.uint8_array_getitem(sid.id_auth, 2) << 24))
+    
+    for i in range(0, sid.num_auths):
+        result = result + '-%u' % \
+                 dcerpc.uint32_array_getitem(sid.sub_auths, i)
+
+    return result
+
+def string_to_sid(string):
+    """Convert a string SID to a Python dictionary SID.  Throws a
+    ValueError if the SID string was badly formed."""
+
+    if string[0] != 'S':
+        raise ValueError('Bad SID format')
+
+    string = string[1:]
+
+    import re
+
+    match = re.match('-\d+', string)
+
+    if not match:
+        raise ValueError('Bad SID format')
+
+    try:
+        sid_rev_num = int(string[match.start()+1:match.end()])
+    except ValueError:
+        raise ValueError('Bad SID format')
+
+    string = string[match.end():]
+
+    match = re.match('-\d+', string)
+
+    if not match:
+        raise ValueError('Bad SID format')
+
+    try:
+        ia = int(string[match.start()+1:match.end()])
+    except ValueError:
+        raise ValueError('Bad SID format')
+
+    string = string[match.end():]
+
+    id_auth = [0, 0, (ia >> 24) & 0xff, (ia >> 16) & 0xff,
+               (ia >> 8) & 0xff, ia & 0xff]
+
+    num_auths = 0
+    sub_auths = []
+    
+    while len(string):
+
+        match = re.match('-\d+', string)
+
+        if not match:
+            raise ValueError('Bad SID format')
+
+        try:
+            sa = int(string[match.start() + 1 : match.end()])
+        except ValueError:
+            raise ValueError('Bad SID format')
+
+        num_auths = num_auths + 1
+        sub_auths.append(int(sa))
+
+        string = string[match.end():]
+
+    sid = dcerpc.dom_sid()
+    sid.sid_rev_num = sid_rev_num
+    sid.id_auth = dcerpc.new_uint8_array(6)
+    for i in range(6):
+        dcerpc.uint8_array_setitem(sid.id_auth, i, id_auth[i])
+    sid.num_auths = num_auths
+    sid.sub_auths = dcerpc.new_uint32_array(num_auths)
+    for i in range(num_auths):
+        dcerpc.uint32_array_setitem(sid.sub_auths, i, sub_auths[i])
+
+    return sid
+
+def call_fn(fn, pipe, args):
+    """Wrap up a RPC call and throw an exception is an error was returned."""
+    
+    result = fn(pipe, args);
+
+    if result & 0xc0000000L:
+        raise dcerpc.NTSTATUS(result, dcerpc.nt_errstr(result));
+
+    return result;
+   
+class SamrHandle:
+
+    def __init__(self, pipe, handle):
+
+        self.pipe = pipe
+        self.handle = handle
+
+    def __del__(self):
+
+        if self.handle is not None:
+            self.Close()
+
+    def Close(self):
+                    
+        r = dcerpc.samr_Close()
+        r.data_in.handle = self.handle
+
+        call_fn(dcerpc.dcerpc_samr_Close, self.pipe, r)
+
+        self.handle = None
+
+    def QuerySecurity(self, sec_info = 7):
+
+        r = dcerpc.samr_QuerySecurity()
+        r.data_in.handle = self.handle
+        r.data_in.sec_info = sec_info
+
+        call_fn(dcerpc.dcerpc_samr_QuerySecurity, self.pipe, r)
+
+        return r.data_out.sdbuf
+
+    def SetSecurity(self, sdbuf, sec_info = 7):
+
+        r = dcerpc.samr_SetSecurity()
+        r.data_in.handle = self.handle
+        r.data_in.sec_info = sec_info
+        r.data_in.sdbuf = sdbuf
+
+        call_fn(dcerpc.dcerpc_samr_SetSecurity, self.pipe, r)
+        
+class ConnectHandle(SamrHandle):
+
+    def EnumDomains(self):
+
+        r = dcerpc.samr_EnumDomains()
+        r.data_in.connect_handle = self.handle
+        r.data_in.resume_handle = 0
+        r.data_in.buf_size = -1
+
+        domains = []
+
+        while 1:
+
+            call_fn(dcerpc.dcerpc_samr_EnumDomains, self.pipe, r)
+
+            for i in range(r.data_out.sam.count):
+                domains.append(dcerpc.samr_SamEntry_array_getitem(
+                    r.data_out.sam.entries, i).name.string)
+
+            # TODO: Handle more entries here
+
+            break
+
+        return domains
+
+    def LookupDomain(self, domain_name):
+
+        r = dcerpc.samr_LookupDomain()
+        r.data_in.connect_handle = self.handle
+        r.data_in.domain_name = dcerpc.samr_String()
+        r.data_in.domain_name.string = domain_name
+
+        call_fn(dcerpc.dcerpc_samr_LookupDomain, self.pipe, r)
+
+        return sid_to_string(r.data_out.sid);
+
+    def OpenDomain(self, domain_sid, access_mask = 0x02000000):
+
+        r = dcerpc.samr_OpenDomain()
+        r.data_in.connect_handle = self.handle
+        r.data_in.access_mask = access_mask
+        r.data_in.sid = string_to_sid(domain_sid)
+
+        call_fn(dcerpc.dcerpc_samr_OpenDomain, self.pipe, r)
+
+        return DomainHandle(self.pipe, r.data_out.domain_handle)
+
+    def Shutdown(self):
+
+        r = dcerpc.samr_Shutdown()
+        r.data_in.connect_handle = self.handle
+
+        call_fn(dcerpc.dcerpc_samr_Shutdown, self.pipe, r)
+
+    def GetDomPwInfo(self, domain_name):
+
+        r = dcerpc.samr_GetDomPwInfo()
+        r.data_in.domain_name = dcerpc.samr_String()
+        r.data_in.domain_name.string = domain_name
+
+        call_fn(dcerpc.dcerpc_samr_GetDomPwInfo, self.pipe, r)
+
+        return r.data_out.info
+
+
+    def SetBootKeyInformation(self, unknown1, unknown2, unknown3):
+        
+        r = dcerpc.samr_GetBootKeyInformation()
+        r.data_in.connect_handle = self.handle
+        r.data_in.unknown1 = unknown1
+        r.data_in.unknown2 = unknown2
+        r.data_in.unknown3 = unknown3
+
+        call_fn(dcerpc.dcerpc_samr_SetBootKeyInformation, self.pipe, r)
+
+class DomainHandle(SamrHandle):
+
+    def QueryDomainInfo(self, level = 2):
+
+        r = dcerpc.samr_QueryDomainInfo()
+        r.data_in.domain_handle = self.handle
+        r.data_in.level = level
+
+        call_fn(dcerpc.dcerpc_samr_QueryDomainInfo, self.pipe, r)
+
+        return getattr(r.data_out.info, 'info%d' % level)
+
+    def QueryDomainInfo2(self, level = 2):
+
+        r = dcerpc.samr_QueryDomainInfo2()
+        r.data_in.domain_handle = self.handle
+        r.data_in.level = level
+
+        call_fn(dcerpc.dcerpc_samr_QueryDomainInfo2, self.pipe, r)
+
+        return getattr(r.data_out.info, 'info%d' % level)       
+
+    def SetDomainInfo(self, level, info):
+
+        r = dcerpc.samr_SetDomainInfo()
+        r.data_in.domain_handle = self.handle
+        r.data_in.level = level
+        r.data_in.info = dcerpc.samr_DomainInfo()
+        setattr(r.data_in.info, 'info%d' % level, info)
+
+        call_fn(dcerpc.dcerpc_samr_SetDomainInfo, self.pipe, r)
+
+    def EnumDomainGroups(self):
+
+        r = dcerpc.samr_EnumDomainGroups()
+        r.data_in.domain_handle = self.handle
+        r.data_in.resume_handle = 0
+        r.data_in.max_size = 1000
+
+        call_fn(dcerpc.dcerpc_samr_EnumDomainGroups, self.pipe, r)
+
+        groups = []
+
+        if r.data_out.sam.entries:
+            for i in range(r.data_out.sam.count):
+                groups.append(dcerpc.samr_SamEntry_array_getitem(
+                    r.data_out.sam.entries, i).name.string)
+
+        return groups
+
+    def EnumDomainAliases(self):
+
+        r = dcerpc.samr_EnumDomainAliases()
+        r.data_in.domain_handle = self.handle
+        r.data_in.resume_handle = 0
+        # acct_flags in SamrEnumerateAliasesInDomain has probably
+        # no meaning so use 0xffffffff like W2K
+        r.data_in.acct_flags = 0xffffffffL
+
+        call_fn(dcerpc.dcerpc_samr_EnumDomainAliases, self.pipe, r)
+
+        aliases = []
+
+        if r.data_out.sam.entries:
+            for i in range(r.data_out.sam.count):
+                aliases.append(dcerpc.samr_SamEntry_array_getitem(
+                    r.data_out.sam.entries, i).name.string)
+
+        return aliases
+
+    def EnumDomainUsers(self, user_account_flags = 16):
+
+        r = dcerpc.samr_EnumDomainUsers()
+        r.data_in.domain_handle = self.handle
+        r.data_in.resume_handle = 0
+        r.data_in.acct_flags = user_account_flags
+        r.data_in.max_size = 1000
+
+        call_fn(dcerpc.dcerpc_samr_EnumDomainUsers, self.pipe, r)
+
+        users = []
+
+        if r.data_out.sam.entries:
+            for i in range(r.data_out.sam.count):
+                users.append(dcerpc.samr_SamEntry_array_getitem(
+                    r.data_out.sam.entries, i).name.string)
+
+        return users
+
+    def CreateUser(self, account_name, access_mask = 0x02000000):
+
+        r = dcerpc.samr_CreateUser()
+        r.data_in.domain_handle = self.handle
+        r.data_in.account_name = dcerpc.samr_String()
+        r.data_in.account_name.string = account_name
+        r.data_in.access_mask = access_mask
+
+        call_fn(dcerpc.dcerpc_samr_CreateUser, self.pipe, r)
+
+        return (r.data_out.user_handle,
+                dcerpc.uint32_array_getitem(r.data_out.rid, 0))
+
+    def CreateUser2(self, account_name, acct_flags = 0x00000010,
+                    access_mask = 0x02000000):
+
+        r = dcerpc.samr_CreateUser2()
+        r.data_in.domain_handle = self.handle
+        r.data_in.account_name = dcerpc.samr_String()
+        r.data_in.account_name.string = account_name
+        r.data_in.acct_flags = acct_flags
+        r.data_in.access_mask = access_mask
+
+        call_fn(dcerpc.dcerpc_samr_CreateUser2, self.pipe, r)
+
+        return (r.data_out.user_handle,
+                dcerpc.uint32_array_getitem(r.data_out.access_granted, 0),
+                dcerpc.uint32_array_getitem(r.data_out.rid, 0))
+
+    def OpenUser(self, rid, access_mask = 0x02000000):
+
+        r = dcerpc.samr_OpenUser()
+        r.data_in.domain_handle = self.handle
+        r.data_in.access_mask = access_mask
+        r.data_in.rid = rid
+
+        call_fn(dcerpc.dcerpc_samr_OpenUser, self.pipe, r)
+
+        return UserHandle(self.pipe, r.data_out.user_handle)
+
+    def OpenGroup(self, rid, access_mask = 0x02000000):
+
+        r = dcerpc.samr_OpenGroup()
+        r.data_in.domain_handle = self.handle
+        r.data_in.access_mask = access_mask
+        r.data_in.rid = rid
+
+        call_fn(dcerpc.dcerpc_samr_OpenGroup, self.pipe, r)
+
+        return GroupHandle(self.pipe, r.data_out.group_handle)
+
+    def OpenAlias(self, rid, access_mask = 0x02000000):
+
+        r = dcerpc.samr_OpenAlias()
+        r.data_in.domain_handle = self.handle
+        r.data_in.access_mask = access_mask
+        r.data_in.rid = rid
+
+        call_fn(dcerpc.dcerpc_samr_OpenAlias, self.pipe, r)
+
+        return AliasHandle(self.pipe, r.data_out.alias_handle)
+
+    def CreateDomAlias(self, alias_name, access_mask = 0x02000000):
+
+        r = dcerpc.samr_CreateDomAlias()
+        r.data_in.domain_handle = self.handle
+        r.data_in.alias_name = dcerpc.samr_String()
+        r.data_in.alias_name.string = alias_name
+        r.data_in.access_mask = access_mask
+
+        call_fn(dcerpc.dcerpc_samr_CreateDomAlias, self.pipe, r)
+
+        return (AliasHandle(self.pipe, r.data_out.alias_handle),
+                r.data_out.rid)    
+
+    def RidToSid(self, rid):
+
+        r = dcerpc.samr_RidToSid()
+        r.data_in.domain_handle = self.handle
+        r.data_in.rid = rid
+
+        call_fn(dcerpc.dcerpc_samr_RidToSid, self.pipe, r)
+
+        return sid_to_string(r.data_out.sid)
+
+    def RemoveMemberFromForeignDomain(self, sid):
+
+        r = dcerpc.samr_RemoveMemberFromForeignDomain()
+        r.data_in.domain_handle = self.handle
+        r.data_in.sid = sid
+
+        call_fn(dcerpc.dcerpc_samr_RemoveMemberFromForeignDomain, self.pipe, r)
+
+    def LookupNames(self, names):
+
+        r = dcerpc.samr_LookupNames()
+        r.data_in.domain_handle = self.handle
+        r.data_in.num_names = len(names)
+        r.data_in.names = dcerpc.new_samr_String_array(len(names))
+
+        for i in range(len(names)):
+            s = dcerpc.samr_String()
+            s.string = names[i]
+            dcerpc.samr_String_array_setitem(r.data_in.names, i, s)
+
+        call_fn(dcerpc.dcerpc_samr_LookupNames, self.pipe, r)
+
+        return ([dcerpc.uint32_array_getitem(r.data_out.rids.ids, i)
+                 for i in range(r.data_out.rids.count)],
+                [dcerpc.uint32_array_getitem(r.data_out.types.ids, i)
+                 for i in range(r.data_out.types.count)])
+
+    def CreateDomainGroup(self, domain_name, access_mask = 0x02000000):
+
+        r = dcerpc.samr_CreateDomainGroup()
+        r.data_in.domain_handle = self.handle
+        r.data_in.name = dcerpc.samr_String()
+        r.data_in.name.string = domain_name
+        r.data_in.access_mask = access_mask
+
+        call_fn(dcerpc.dcerpc_samr_CreateDomainGroup, self.pipe, r)
+
+    def GetAliasMembership(self, sids):
+
+        r = dcerpc.samr_GetAliasMembership()
+        r.data_in.domain_handle = self.handle
+        r.data_in.sids = dcerpc.lsa_SidArray()
+        r.data_in.sids.num_sids = len(sids)
+        r.data_in.sids.sids = dcerpc.new_lsa_SidPtr_array(len(sids))
+
+        for i in range(len(sids)):
+            s = dcerpc.lsa_SidPtr()
+            s.sid = string_to_sid(sids[i])
+            dcerpc.lsa_SidPtr_array_setitem(r.data_in.sids.sids, i, s)
+
+        call_fn(dcerpc.dcerpc_samr_GetAliasMembership, self.pipe, r)
+
+        return [r.ids[x] for x in range(r.count)]
+
+    def QueryDisplayInfo(self, level):
+
+        # TODO: Handle more data returns
+
+        r = dcerpc.samr_QueryDisplayInfo()
+        r.data_in.domain_handle = self.handle
+        r.data_in.level = level
+        r.data_in.start_idx = 0
+        r.data_in.max_entries = 1000
+        r.data_in.buf_size = -1
+
+        call_fn(dcerpc.dcerpc_samr_QueryDisplayInfo, self.pipe, r)
+
+        # TODO: Return a mapping of the various samr_DispInfo
+        # structures here.
+
+        return getattr(r.data_out.info, 'info%d' % level)
+    
+    def QueryDisplayInfo2(self, level):
+
+        # TODO: Handle more data returns
+
+        r = dcerpc.samr_QueryDisplayInfo2()
+        r.data_in.domain_handle = self.handle
+        r.data_in.level = level
+        r.data_in.start_idx = 0
+        r.data_in.max_entries = 1000
+        r.data_in.buf_size = -1
+
+        call_fn(dcerpc.dcerpc_samr_QueryDisplayInfo2, self.pipe, r)
+
+        # TODO: Return a mapping of the various samr_DispInfo
+        # structures here.
+
+        return getattr(r.data_out.info, 'info%d' % level)
+
+    def QueryDisplayInfo3(self, level):
+
+        # TODO: Handle more data returns
+
+        r = dcerpc.samr_QueryDisplayInfo3()
+        r.data_in.domain_handle = self.handle
+        r.data_in.level = level
+        r.data_in.start_idx = 0
+        r.data_in.max_entries = 1000
+        r.data_in.buf_size = -1
+
+        call_fn(dcerpc.dcerpc_samr_QueryDisplayInfo3, self.pipe, r)
+
+        # TODO: Return a mapping of the various samr_DispInfo
+        # structures here.
+
+        return getattr(r.data_out.info, 'info%d' % level)
+
+    def GetBootKeyInformation(self):
+
+        r = dcerpc.samr_GetBootKeyInformation()
+        r.data_in.domain_handle = self.handle
+
+        call_fn(dcerpc.dcerpc_samr_GetBootKeyInformation, self.pipe, r)
+
+        return r.data_out.unknown
+
+    def SetBootKeyInformation(self):
+
+        r = dcerpc.samr_GetBootKeyInformation()
+        r.data_in.domain_handle = self.handle
+
+        call_fn(dcerpc.dcerpc_samr_GetBootKeyInformation, self.pipe, r)
+
+    def TestPrivateFunctionsDomain(self):
+
+        r = dcerpc.samr_TestPrivateFunctionsDomain()
+        r.data_in.domain_handle = self.handle
+
+        call_fn(dcerpc.dcerpc_samr_TestPrivateFunctionsDomain, self.pipe, r)
+
+class UserHandle(SamrHandle):
+
+    def DeleteUser(self):
+
+        r = dcerpc.samr_DeleteUser()
+        r.data_in.user_handle = self.handle
+        
+        call_fn(dcerpc.dcerpc_samr_DeleteUser, self.pipe, r)
+
+        self.handle = None
+
+    def GetUserPwInfo(self):
+
+        r = dcerpc.samr_GetUserPwInfo()
+        r.data_in.user_handle = self.handle
+
+        call_fn(dcerpc.dcerpc_samr_GetUserPwInfo, self.pipe, r)
+
+        return r.data_out.info
+
+    def QueryUserInfo(self, level):
+
+        r = dcerpc.samr_QueryUserInfo()
+        r.data_in.user_handle = self.handle
+        r.data_in.level = level
+
+        call_fn(dcerpc.dcerpc_samr_QueryUserInfo, self.pipe, r)
+
+        return r.data_out.info
+
+    def QueryUserInfo2(self, level):
+
+        r = dcerpc.samr_QueryUserInfo2()
+        r.data_in.user_handle = self.handle
+        r.data_in.level = level
+
+        call_fn(dcerpc.dcerpc_samr_QueryUserInfo2, self.pipe, r)
+
+        return r.data_out.info
+
+    def GetGroupsForUser(self):
+
+        r = dcerpc.samr_GetGroupsForUser()
+        r.data_in.user_handle = self.handle
+
+        call_fn(dcerpc.dcerpc_samr_GetGroupsForUser, self.pipe, r)
+
+        rid_types = [dcerpc.samr_RidType_array_getitem(r.data_out.rids.rid, x)
+                     for x in range(r.data_out.rids.count)]
+
+        return [(x.rid, x.type) for x in rid_types]
+
+    def TestPrivateFunctionsUser(self):
+
+        r = dcerpc.samr_TestPrivateFunctionsUser()
+        r.data_in.user_handle = self.handle
+
+        call_fn(dcerpc.dcerpc_samr_TestPrivateFunctionsUser, self.pipe, r)
+            
+class GroupHandle(SamrHandle):
+
+    def QueryGroupInfo(self, level):
+
+        r = dcerpc.samr_QueryGroupInfo()
+        r.data_in.group_handle = self.handle
+        r.data_in.level = level
+
+        call_fn(dcerpc.dcerpc_samr_QueryGroupInfo, self.pipe, r)
+
+        return r.data_out.info
+
+    def SetGroupInfo(self, level, info):
+
+        r = dcerpc.samr_SetGroupInfo()
+        r.data_in.group_handle = self.handle
+        r.data_in.level = level
+        r.data_in.info = info
+
+        call_fn(dcerpc.dcerpc_samr_SetGroupInfo, self.pipe, r)
+
+    def QueryGroupMember(self):
+
+        r = dcerpc.samr_QueryGroupMember()
+        r.data_in.group_handle = self.handle
+
+        call_fn(dcerpc.dcerpc_samr_QueryGroupMember, self.pipe, r)
+
+        return [(dcerpc.uint32_array_getitem(r.data_out.rids.rids, x),
+                 dcerpc.uint32_array_getitem(r.data_out.rids.unknown, x))
+                for x in range(r.data_out.rids.count)]
+    
+class AliasHandle(SamrHandle):
+
+    def DeleteDomAlias(self):
+
+        r = dcerpc.samr_DeleteDomAlias()
+        r.data_in.alias_handle = self.handle
+
+        call_fn(dcerpc.dcerpc_samr_DeleteDomAlias, self.pipe, r)
+
+        self.handle = None
+
+    def QueryAliasInfo(self, level = 1):
+
+        r = dcerpc.samr_QueryAliasInfo()
+        r.data_in.alias_handle = self.handle
+        r.data_in.level = level
+
+        call_fn(dcerpc.dcerpc_samr_QueryAliasInfo, self.pipe, r)
+
+        return r.data_out.info
+
+    def SetAliasInfo(self, level, info):
+
+        r = dcerpc.samr_SetAliasInfo()
+        r.data_in.alias_handle = self.handle
+        r.data_in.level = level
+        r.data_in.info = info
+
+        call_fn(dcerpc.dcerpc_samr_SetAliasInfo, self.pipe, r)
+
+    def AddAliasMember(self, sid):
+
+        r = dcerpc.samr_AddAliasMember()
+        r.data_in.alias_handle = self.handle
+        r.data_in.sid = string_to_sid(sid)
+
+        call_fn(dcerpc.dcerpc_samr_AddAliasMember, self.pipe, r)
+
+    def AddMultipleMembersToAlias(self, sids):
+
+        r = dcerpc.samr_AddMultipleMembersToAlias()
+        r.data_in.alias_handle = self.handle
+        r.data_in.sids = dcerpc.lsa_SidArray()
+        r.data_in.sids.num_sids = len(sids)
+        r.data_in.sids.sids = dcerpc.new_lsa_SidPtr_array(len(sids))
+
+        for i in range(len(sids)):
+            s = dcerpc.lsa_SidPtr()
+            s.sid = string_to_sid(sids[i])
+            dcerpc.lsa_SidPtr_array_setitem(r.data_in.sids.sids, i, s)
+
+        call_fn(dcerpc.dcerpc_samr_AddMultipleMembersToAlias, self.pipe, r)
+
+    def GetMembersInAlias(self):
+
+        r = dcerpc.samr_GetMembersInAlias()
+        r.data_in.alias_handle = self.handle
+
+        call_fn(dcerpc.dcerpc_samr_GetMembersInAlias, self.pipe, r)
+
+        return [
+            sid_to_string(
+                dcerpc.lsa_SidPtr_array_getitem(r.data_out.sids.sids, x).sid)
+            for x in range(r.data_out.sids.num_sids)]
+
+def Connect(pipe, access_mask = 0x02000000):
+
+    r = dcerpc.samr_Connect()
+    r.data_in.system_name = dcerpc.new_uint16_array(1)
+    dcerpc.uint16_array_setitem(r.data_in.system_name, 0, ord('\\'))
+    r.data_in.access_mask = access_mask
+
+    call_fn(dcerpc.dcerpc_samr_Connect, pipe, r)
+
+    return ConnectHandle(pipe, r.data_out.connect_handle)
+
+def Connect2(pipe, system_name = '', access_mask = 0x02000000):
+    """Connect to the SAMR pipe."""
+
+    r = dcerpc.samr_Connect2()
+    r.data_in.system_name = system_name
+    r.data_in.access_mask = access_mask
+
+    call_fn(dcerpc.dcerpc_samr_Connect2, pipe, r)
+
+    return ConnectHandle(pipe, r.data_out.connect_handle)
+
+def Connect3(pipe, system_name = '', access_mask = 0x02000000):
+
+    r = dcerpc.samr_Connect3()
+    r.data_in.system_name = system_name
+    r.data_in.unknown = 0
+    r.data_in.access_mask = access_mask
+
+    call_fn(dcerpc.dcerpc_samr_Connect3, pipe, r)
+
+    return ConnectHandle(pipe, r.data_out.connect_handle)
+
+
+def Connect4(pipe, system_name = '', access_mask = 0x02000000):
+
+    r = dcerpc.samr_Connect4()
+    r.data_in.system_name = system_name
+    r.data_in.unknown = 0
+    r.data_in.access_mask = access_mask
+
+    call_fn(dcerpc.dcerpc_samr_Connect4, pipe, r)
+
+    return ConnectHandle(pipe, r.data_out.connect_handle)
+
+def Connect5(pipe, system_name = '', access_mask = 0x02000000):
+
+    r = dcerpc.samr_Connect5()
+    r.data_in.system_name = system_name
+    r.data_in.access_mask = access_mask
+    r.data_in.level = 1
+    r.data_in.info = dcerpc.new_samr_ConnectInfo_array(1)
+    r.data_in.info.unknown1 = 0
+    r.data_in.info.unknown2 = 0
+
+    call_fn(dcerpc.dcerpc_samr_Connect5, pipe, r)
+
+    return ConnectHandle(pipe, r.data_out.connect_handle)
+    
+# AddGroupMember
+# DeleteDomainGroup
+# DeleteGroupMember
+# SetMemberAttributesofGroup
+# AddAliasMember
+# DeleteAliasMember
+# GetMembersinAlias
+# SetUserInfo
+# ChangePasswordUser
+# GetDisplayEnumerationIndex
+# RemoveMemberFromForeignDomain
+# GetDisplayEnumerationIndex2
+# RemoveMultipleMembersFromAlias
+# OemChangePasswordUser2
+# ChangePasswordUser2
+# SetUserInfo2
+# ChangePasswordUser3
+# SetDsrmPassword
+# ValidatePassword
diff --git a/source4/scripting/python/samba/torture/pytorture b/source4/scripting/python/samba/torture/pytorture
new file mode 100755
index 0000000000..e0123447e8
--- /dev/null
+++ b/source4/scripting/python/samba/torture/pytorture
@@ -0,0 +1,51 @@
+#!/usr/bin/python
+
+import sys
+from optparse import OptionParser
+
+# Parse command line
+
+parser = OptionParser()
+
+parser.add_option("-b", "--binding", action="store", type="string",
+                  dest="binding")
+
+parser.add_option("-d", "--domain", action="store", type="string",
+                  dest="domain")
+
+parser.add_option("-u", "--username", action="store", type="string",
+                  dest="username")
+
+parser.add_option("-p", "--password", action="store", type="string",
+                  dest="password")
+
+(options, args) = parser.parse_args()
+
+if not options.binding:
+   parser.error('You must supply a binding string')
+
+if not options.username or not options.password or not options.domain:
+   parser.error('You must supply a domain, username and password')
+
+binding = options.binding
+domain = options.domain
+username = options.username
+password = options.password
+
+if len(args) == 0:
+   parser.error('You must supply the name of a module to test')
+
+# Import and test
+
+for test in args:
+
+   try:
+      module = __import__('torture_%s' % test)
+   except ImportError:
+      print 'No such module "%s"' % test
+      sys.exit(1)
+
+   if not hasattr(module, 'runtests'):
+      print 'Module "%s" does not have a runtests function' % test
+
+   module.runtests(binding, (domain, username, password))
diff --git a/source4/scripting/python/samba/torture/spoolss.py b/source4/scripting/python/samba/torture/spoolss.py
new file mode 100644
index 0000000000..a75385e079
--- /dev/null
+++ b/source4/scripting/python/samba/torture/spoolss.py
@@ -0,0 +1,437 @@
+import sys, string
+import dcerpc
+
+
+def ResizeBufferCall(fn, pipe, r):
+
+    r['buffer'] = None
+    r['buf_size'] = 0
+    
+    result = fn(pipe, r)
+
+    if result['result'] == dcerpc.WERR_INSUFFICIENT_BUFFER or \
+       result['result'] == dcerpc.WERR_MORE_DATA:
+        r['buffer'] = result['buf_size'] * '\x00'
+        r['buf_size'] = result['buf_size']
+
+    result = fn(pipe, r)
+
+    return result
+
+
+def test_OpenPrinterEx(pipe, printer):
+
+    print 'spoolss_OpenPrinterEx(%s)' % printer
+
+    printername = '\\\\%s' % dcerpc.dcerpc_server_name(pipe)
+    
+    if printer is not None:
+        printername = printername + '\\%s' % printer
+
+    r = {}
+    r['printername'] = printername
+    r['datatype'] = None
+    r['devmode_ctr'] = {}
+    r['devmode_ctr']['size'] = 0
+    r['devmode_ctr']['devmode'] = None
+    r['access_mask'] = 0x02000000
+    r['level'] = 1
+    r['userlevel'] = {}
+    r['userlevel']['level1'] = {}
+    r['userlevel']['level1']['size'] = 0
+    r['userlevel']['level1']['client'] = None
+    r['userlevel']['level1']['user'] = None
+    r['userlevel']['level1']['build'] = 1381
+    r['userlevel']['level1']['major'] = 2
+    r['userlevel']['level1']['minor'] = 0
+    r['userlevel']['level1']['processor'] = 0
+
+    result = dcerpc.spoolss_OpenPrinterEx(pipe, r)
+
+    return result['handle']
+
+
+def test_ClosePrinter(pipe, handle):
+
+    r = {}
+    r['handle'] = handle
+
+    dcerpc.spoolss_ClosePrinter(pipe, r)
+
+
+def test_GetPrinter(pipe, handle):
+
+    r = {}
+    r['handle'] = handle
+
+    for level in [0, 1, 2, 3, 4, 5, 6, 7]:
+
+        print 'spoolss_GetPrinter(level = %d)' % level
+
+        r['level'] = level
+        r['buffer'] = None
+        r['buf_size'] = 0
+
+        result = ResizeBufferCall(dcerpc.spoolss_GetPrinter, pipe, r)
+
+
+def test_EnumForms(pipe, handle):
+
+    print 'spoolss_EnumForms()'
+
+    r = {}
+    r['handle'] = handle
+    r['level'] = 1
+    r['buffer'] = None
+    r['buf_size'] = 0
+
+    result = ResizeBufferCall(dcerpc.spoolss_EnumForms, pipe, r)
+
+    forms = dcerpc.unmarshall_spoolss_FormInfo_array(
+        result['buffer'], r['level'], result['count'])
+
+    for form in forms:
+
+        r = {}
+        r['handle'] = handle
+        r['formname'] = form['info1']['formname']
+        r['level'] = 1
+
+        result = ResizeBufferCall(dcerpc.spoolss_GetForm, pipe, r)
+
+
+def test_EnumPorts(pipe, handle):
+
+    print 'spoolss_EnumPorts()'
+
+    for level in [1, 2]:
+
+        r = {}
+        r['handle'] = handle
+        r['servername'] = None
+        r['level'] = level
+
+        result = ResizeBufferCall(dcerpc.spoolss_EnumPorts, pipe, r)
+
+        ports = dcerpc.unmarshall_spoolss_PortInfo_array(
+            result['buffer'], r['level'], result['count'])
+
+        if level == 1:
+            port_names = map(lambda x: x['info1']['port_name'], ports)
+
+
+def test_DeleteForm(pipe, handle, formname):
+
+    r = {}
+    r['handle'] = handle
+    r['formname'] = formname
+
+    dcerpc.spoolss_DeleteForm(pipe, r)
+
+
+def test_GetForm(pipe, handle, formname):
+
+    r = {}
+    r['handle'] = handle
+    r['formname'] = formname
+    r['level'] = 1
+
+    result = ResizeBufferCall(dcerpc.spoolss_GetForm, pipe, r)
+
+    return result['info']['info1']
+    
+
+def test_SetForm(pipe, handle, form):
+
+    print 'spoolss_SetForm()'
+
+    r = {}
+    r['handle'] = handle
+    r['level'] = 1
+    r['formname'] = form['info1']['formname']
+    r['info'] = form
+
+    dcerpc.spoolss_SetForm(pipe, r)
+
+    newform = test_GetForm(pipe, handle, r['formname'])
+
+    if form['info1'] != newform:
+        print 'SetForm: mismatch: %s != %s' % \
+              (r['info']['info1'], f)
+        sys.exit(1)
+
+
+def test_AddForm(pipe, handle):
+
+    print 'spoolss_AddForm()'
+
+    formname = '__testform__'
+
+    r = {}
+    r['handle'] = handle
+    r['level'] = 1
+    r['info'] = {}
+    r['info']['info1'] = {}
+    r['info']['info1']['formname'] = formname
+    r['info']['info1']['flags'] = 0x0002
+    r['info']['info1']['width'] = 100
+    r['info']['info1']['length'] = 100
+    r['info']['info1']['left'] = 0
+    r['info']['info1']['top'] = 1000
+    r['info']['info1']['right'] = 2000
+    r['info']['info1']['bottom'] = 3000
+
+    try:
+        result = dcerpc.spoolss_AddForm(pipe, r)
+    except dcerpc.WERROR, arg:
+        if arg[0] == dcerpc.WERR_ALREADY_EXISTS:
+            test_DeleteForm(pipe, handle, formname)
+        result = dcerpc.spoolss_AddForm(pipe, r)
+
+    f = test_GetForm(pipe, handle, formname)
+
+    if r['info']['info1'] != f:
+        print 'AddForm: mismatch: %s != %s' % \
+              (r['info']['info1'], f)
+        sys.exit(1)
+
+    r['formname'] = formname
+
+    test_SetForm(pipe, handle, r['info'])
+
+    test_DeleteForm(pipe, handle, formname)
+
+
+def test_EnumJobs(pipe, handle):
+
+    print 'spoolss_EnumJobs()'
+
+    r = {}
+    r['handle'] = handle
+    r['firstjob'] = 0
+    r['numjobs'] = 0xffffffff
+    r['level'] = 1
+
+    result = ResizeBufferCall(dcerpc.spoolss_EnumJobs, pipe, r)
+
+    if result['buffer'] is None:
+        return
+    
+    jobs = dcerpc.unmarshall_spoolss_JobInfo_array(
+        result['buffer'], r['level'], result['count'])
+
+    for job in jobs:
+
+        s = {}
+        s['handle'] = handle
+        s['job_id'] = job['info1']['job_id']
+        s['level'] = 1
+
+        result = ResizeBufferCall(dcerpc.spoolss_GetJob, pipe, s)
+
+        if result['info'] != job:
+            print 'EnumJobs: mismatch: %s != %s' % (result['info'], job)
+            sys.exit(1)
+    
+
+    # TODO: AddJob, DeleteJob, ScheduleJob
+
+
+def test_EnumPrinterData(pipe, handle):
+
+    print 'test_EnumPrinterData()'
+
+    enum_index = 0
+
+    while 1:
+
+        r = {}
+        r['handle'] = handle
+        r['enum_index'] = enum_index
+
+        r['value_offered'] = 0
+        r['data_size'] = 0
+        
+        result = dcerpc.spoolss_EnumPrinterData(pipe, r)
+
+        r['value_offered'] = result['value_needed']
+        r['data_size'] = result['data_size']
+
+        result = dcerpc.spoolss_EnumPrinterData(pipe, r)
+
+        if result['result'] == dcerpc.WERR_NO_MORE_ITEMS:
+            break
+
+        s = {}
+        s['handle'] = handle
+        s['value_name'] = result['value_name']
+
+        result2 = ResizeBufferCall(dcerpc.spoolss_GetPrinterData, pipe, s)
+
+        if result['buffer'][:result2['buf_size']] != result2['buffer']:
+            print 'EnumPrinterData/GetPrinterData mismatch'
+            sys.exit(1)
+ 
+        enum_index += 1
+
+
+def test_SetPrinterDataEx(pipe, handle):
+
+    valuename = '__printerdataextest__'
+    data = '12345'
+
+    r = {}
+    r['handle'] = handle
+    r['key_name'] = 'DsSpooler'
+    r['value_name'] = valuename
+    r['type'] = 3
+    r['buffer'] = data
+    r['buf_size'] = len(data)
+    
+    result = dcerpc.spoolss_SetPrinterDataEx(pipe, r)
+
+
+def test_EnumPrinterDataEx(pipe, handle):
+
+    r = {}
+    r['handle'] = handle
+    r['key_name'] = 'DsSpooler'
+    r['buf_size'] = 0
+
+    result = dcerpc.spoolss_EnumPrinterDataEx(pipe, r)
+
+    if result['result'] == dcerpc.WERR_MORE_DATA:
+        r['buf_size'] = result['buf_size']
+
+        result = dcerpc.spoolss_EnumPrinterDataEx(pipe, r)
+
+    # TODO: test spoolss_GetPrinterDataEx()
+
+
+def test_SetPrinterData(pipe, handle):
+
+    print 'testing spoolss_SetPrinterData()'
+
+    valuename = '__printerdatatest__'
+    data = '12345'
+    
+    r = {}
+    r['handle'] = handle
+    r['value_name'] = valuename
+    r['type'] = 3                       # REG_BINARY
+    r['buffer'] = data
+    r['real_len'] = 5
+
+    dcerpc.spoolss_SetPrinterData(pipe, r)
+
+    s = {}
+    s['handle'] = handle
+    s['value_name'] = valuename
+
+    result = ResizeBufferCall(dcerpc.spoolss_GetPrinterData, pipe, r)
+
+    if result['buffer'] != data:
+        print 'SetPrinterData: mismatch'
+        sys.exit(1)
+
+    dcerpc.spoolss_DeletePrinterData(pipe, r)
+
+
+def test_EnumPrinters(pipe):
+
+    print 'testing spoolss_EnumPrinters()'
+
+    printer_names = None
+
+    r = {}
+    r['flags'] = 0x02
+    r['server'] = None
+
+    for level in [0, 1, 2, 4, 5]:
+
+        print 'test_EnumPrinters(level = %d)' % level
+
+        r['level'] = level
+
+        result = ResizeBufferCall(dcerpc.spoolss_EnumPrinters, pipe, r)
+
+        printers = dcerpc.unmarshall_spoolss_PrinterInfo_array(
+            result['buffer'], r['level'], result['count'])
+
+        if level == 2:
+            for p in printers:
+
+                # A nice check is for the specversion in the
+                # devicemode.  This has always been observed to be
+                # 1025.
+
+                if p['info2']['devmode']['specversion'] != 1025:
+                    print 'test_EnumPrinters: specversion != 1025'
+                    sys.exit(1)
+
+    r['level'] = 1
+    result = ResizeBufferCall(dcerpc.spoolss_EnumPrinters, pipe, r)
+    
+    for printer in dcerpc.unmarshall_spoolss_PrinterInfo_array(
+        result['buffer'], r['level'], result['count']):
+
+        if string.find(printer['info1']['name'], '\\\\') == 0:
+            print 'Skipping remote printer %s' % printer['info1']['name']
+            continue
+
+        printername = string.split(printer['info1']['name'], ',')[0]
+
+        handle = test_OpenPrinterEx(pipe, printername)
+
+        test_GetPrinter(pipe, handle)
+        test_EnumPorts(pipe, handle)
+        test_EnumForms(pipe, handle)
+        test_AddForm(pipe, handle)
+        test_EnumJobs(pipe, handle)
+        test_EnumPrinterData(pipe, handle)
+        test_EnumPrinterDataEx(pipe, handle)
+        test_SetPrinterData(pipe, handle)
+#       test_SetPrinterDataEx(pipe, handle)
+        test_ClosePrinter(pipe, handle)
+
+
+def test_EnumPrinterDrivers(pipe):
+
+    print 'test spoolss_EnumPrinterDrivers()'
+
+    for level in [1, 2, 3]:
+
+        r = {}
+        r['server'] = None
+        r['environment'] = None
+        r['level'] = level
+
+        result = ResizeBufferCall(dcerpc.spoolss_EnumPrinterDrivers, pipe, r)
+
+        drivers = dcerpc.unmarshall_spoolss_DriverInfo_array(
+            result['buffer'], r['level'], result['count'])
+
+        if level == 1:
+            driver_names = map(lambda x: x['info1']['driver_name'], drivers)
+            
+
+def test_PrintServer(pipe):
+    
+    handle = test_OpenPrinterEx(pipe, None)
+
+    # EnumForms and AddForm tests return WERR_BADFID here (??)
+
+    test_ClosePrinter(pipe, handle)
+    
+
+def runtests(binding, domain, username, password):
+    
+    print 'Testing SPOOLSS pipe'
+
+    pipe = dcerpc.pipe_connect(binding,
+            dcerpc.DCERPC_SPOOLSS_UUID, dcerpc.DCERPC_SPOOLSS_VERSION,
+            domain, username, password)
+
+    test_EnumPrinters(pipe)
+    test_EnumPrinterDrivers(pipe)
+    test_PrintServer(pipe)
diff --git a/source4/scripting/python/samba/torture/torture_samr.py b/source4/scripting/python/samba/torture/torture_samr.py
new file mode 100755
index 0000000000..15c6dc1a76
--- /dev/null
+++ b/source4/scripting/python/samba/torture/torture_samr.py
@@ -0,0 +1,221 @@
+#!/usr/bin/python
+
+import sys
+import dcerpc, samr
+
+def test_Connect(pipe):
+
+    handle = samr.Connect(pipe)
+    handle = samr.Connect2(pipe)
+    handle = samr.Connect3(pipe)
+    handle = samr.Connect4(pipe)
+
+    # WIN2K3 only?
+    
+    try:
+        handle = samr.Connect5(pipe)
+    except dcerpc.NTSTATUS, arg:
+        if arg[0] != 0xc00000d2L:       # NT_STATUS_NET_WRITE_FAULT
+            raise
+
+    return handle
+    
+def test_UserHandle(user_handle):
+
+    # QuerySecurity()/SetSecurity()
+
+    user_handle.SetSecurity(user_handle.QuerySecurity())
+
+    # GetUserPwInfo()
+
+    user_handle.GetUserPwInfo()
+
+    # GetUserInfo()
+
+    for level in [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 16, 17, 20,
+                  21, 23, 24, 25, 26]:
+
+        try:
+            user_handle.QueryUserInfo(level)
+            user_handle.QueryUserInfo2(level)
+        except dcerpc.NTSTATUS, arg:
+            if arg[0] != 0xc0000003L:   # NT_STATUS_INVALID_INFO_CLASS
+                raise
+
+    # GetGroupsForUser()
+
+    user_handle.GetGroupsForUser()
+
+    # TestPrivateFunctionsUser()
+
+    try:
+        user_handle.TestPrivateFunctionsUser()
+    except dcerpc.NTSTATUS, arg:
+        if arg[0] != 0xC0000002L:
+            raise
+
+def test_GroupHandle(group_handle):
+
+    # QuerySecurity()/SetSecurity()
+
+    group_handle.SetSecurity(group_handle.QuerySecurity())
+
+    # QueryGroupInfo()
+
+    for level in [1, 2, 3, 4, 5]:
+        info = group_handle.QueryGroupInfo(level)
+
+    # TODO: SetGroupinfo()
+
+    # QueryGroupMember()
+
+    group_handle.QueryGroupMember()
+
+def test_AliasHandle(alias_handle):
+
+    # QuerySecurity()/SetSecurity()
+
+    alias_handle.SetSecurity(alias_handle.QuerySecurity())
+
+    print alias_handle.GetMembersInAlias()
+
+def test_DomainHandle(name, sid, domain_handle):
+
+    print 'testing %s (%s)' % (name, sid)
+
+    # QuerySecurity()/SetSecurity()
+
+    domain_handle.SetSecurity(domain_handle.QuerySecurity())
+
+    # LookupNames(), none mapped
+
+    try:
+        domain_handle.LookupNames(['xxNONAMExx'])
+    except dcerpc.NTSTATUS, arg:
+        if arg[0] != 0xc0000073L:
+            raise dcerpc.NTSTATUS(arg)
+
+    # LookupNames(), some mapped
+
+    if name != 'Builtin':
+        domain_handle.LookupNames(['Administrator', 'xxNONAMExx'])
+
+    # QueryDomainInfo()/SetDomainInfo()
+
+    levels = [1, 2, 3, 4, 5, 6, 7, 8, 9, 11, 12, 13]
+    set_ok = [1, 0, 1, 1, 0, 1, 1, 0, 1,  0,  1,  0]
+    
+    for i in range(len(levels)):
+
+        info = domain_handle.QueryDomainInfo(level = levels[i])
+
+        try:
+            domain_handle.SetDomainInfo(levels[i], info)
+        except dcerpc.NTSTATUS, arg:
+            if not (arg[0] == 0xc0000003L and not set_ok[i]):
+                raise
+
+    # QueryDomainInfo2()
+
+    levels = [1, 2, 3, 4, 5, 6, 7, 8, 9, 11, 12, 13]
+
+    for i in range(len(levels)):
+        domain_handle.QueryDomainInfo2(level = levels[i])
+
+    # EnumDomainUsers
+
+    print 'testing users'
+
+    users = domain_handle.EnumDomainUsers()
+    rids = domain_handle.LookupNames(users)
+    
+    for i in range(len(users)):
+        test_UserHandle(domain_handle.OpenUser(rids[0][i]))
+    
+    # QueryDisplayInfo
+
+    for i in [1, 2, 3, 4, 5]:
+        domain_handle.QueryDisplayInfo(level = i)
+        domain_handle.QueryDisplayInfo2(level = i)
+        domain_handle.QueryDisplayInfo3(level = i)
+            
+    # EnumDomainGroups
+
+    print 'testing groups'
+
+    groups = domain_handle.EnumDomainGroups()
+    rids = domain_handle.LookupNames(groups)
+
+    for i in range(len(groups)):
+        test_GroupHandle(domain_handle.OpenGroup(rids[0][i]))
+
+    # EnumDomainAliases
+
+    print 'testing aliases'
+
+    aliases = domain_handle.EnumDomainAliases()
+    rids = domain_handle.LookupNames(aliases)
+
+    for i in range(len(aliases)):
+        test_AliasHandle(domain_handle.OpenAlias(rids[0][i]))
+    
+    # CreateUser
+    # CreateUser2
+    # CreateDomAlias
+    # RidToSid
+    # RemoveMemberFromForeignDomain
+    # CreateDomainGroup
+    # GetAliasMembership
+
+    # GetBootKeyInformation()
+
+    try:
+        domain_handle.GetBootKeyInformation()
+    except dcerpc.NTSTATUS, arg:
+        pass
+
+    # TestPrivateFunctionsDomain()
+
+    try:
+        domain_handle.TestPrivateFunctionsDomain()
+    except dcerpc.NTSTATUS, arg:
+        if arg[0] != 0xC0000002L:
+            raise
+
+def test_ConnectHandle(connect_handle):
+
+    print 'testing connect handle'
+
+    # QuerySecurity/SetSecurity
+
+    connect_handle.SetSecurity(connect_handle.QuerySecurity())
+
+    # Lookup bogus domain
+
+    try:
+        connect_handle.LookupDomain('xxNODOMAINxx')
+    except dcerpc.NTSTATUS, arg:
+        if arg[0] != 0xC00000DFL:          # NT_STATUS_NO_SUCH_DOMAIN
+            raise
+
+    # Test all domains
+
+    for domain_name in connect_handle.EnumDomains():
+
+        connect_handle.GetDomPwInfo(domain_name)
+        sid = connect_handle.LookupDomain(domain_name)
+        domain_handle = connect_handle.OpenDomain(sid)
+
+        test_DomainHandle(domain_name, sid, domain_handle)
+
+    # TODO: Test Shutdown() function
+
+def runtests(binding, creds):
+
+    print 'Testing SAMR pipe'
+
+    pipe = dcerpc.pipe_connect(binding,
+            dcerpc.DCERPC_SAMR_UUID, int(dcerpc.DCERPC_SAMR_VERSION), creds)
+
+    handle = test_Connect(pipe)
+    test_ConnectHandle(handle)
diff --git a/source4/scripting/python/samba/torture/torture_tdb.py b/source4/scripting/python/samba/torture/torture_tdb.py
new file mode 100755
index 0000000000..7f97caf6cb
--- /dev/null
+++ b/source4/scripting/python/samba/torture/torture_tdb.py
@@ -0,0 +1,90 @@
+#!/usr/bin/python
+
+import sys, os
+import Tdb
+
+def fail(msg):
+    print 'FAILED:', msg
+    sys.exit(1)
+
+tdb_file = '/tmp/torture_tdb.tdb'
+
+# Create temporary tdb file
+
+t = Tdb.Tdb(tdb_file, flags = Tdb.CLEAR_IF_FIRST)
+
+# Check non-existent key throws KeyError exception
+
+try:
+    t['__none__']
+except KeyError:
+    pass
+else:
+    fail('non-existent key did not throw KeyError')
+
+# Check storing key
+
+t['bar'] = '1234'
+if t['bar'] != '1234':
+    fail('store key failed')
+
+# Check key exists
+
+if not t.has_key('bar'):
+    fail('has_key() failed for existing key')
+
+if t.has_key('__none__'):
+    fail('has_key() succeeded for non-existent key')
+
+# Delete key
+
+try:
+    del(t['__none__'])
+except KeyError:
+    pass
+else:
+    fail('delete of non-existent key did not throw KeyError')
+
+del t['bar']
+if t.has_key('bar'):
+    fail('delete of existing key did not delete key')
+
+# Clear all keys
+
+t.clear()
+if len(t) != 0:
+    fail('clear failed to remove all keys')
+
+# Other dict functions
+
+t['a'] = '1'
+t['ab'] = '12'
+t['abc'] = '123'
+
+if len(t) != 3:
+    fail('len method produced wrong value')
+
+keys = t.keys()
+values = t.values()
+items = t.items()
+
+if set(keys) != set(['a', 'ab', 'abc']):
+    fail('keys method produced wrong values')
+
+if set(values) != set(['1', '12', '123']):
+    fail('values method produced wrong values')
+
+if set(items) != set([('a', '1'), ('ab', '12'), ('abc', '123')]):
+    fail('values method produced wrong values')
+
+t.close()
+
+# Re-open read-only
+
+t = Tdb.Tdb(tdb_file, open_flags = os.O_RDONLY)
+t.keys()
+t.close()
+
+# Clean up
+
+os.unlink(tdb_file)
diff --git a/source4/scripting/python/samba/torture/winreg.py b/source4/scripting/python/samba/torture/winreg.py
new file mode 100755
index 0000000000..eb60b9847e
--- /dev/null
+++ b/source4/scripting/python/samba/torture/winreg.py
@@ -0,0 +1,165 @@
+#!/usr/bin/python
+
+import sys, dcerpc
+
+def test_OpenHKLM(pipe):
+
+    r = {}
+    r['unknown'] = {}
+    r['unknown']['unknown0'] = 0x9038
+    r['unknown']['unknown1'] = 0x0000
+    r['access_required'] = 0x02000000
+
+    result = dcerpc.winreg_OpenHKLM(pipe, r)
+
+    return result['handle']
+
+def test_QueryInfoKey(pipe, handle):
+
+    r = {}
+    r['handle'] = handle
+    r['class'] = {}
+    r['class']['name'] = None
+
+    return dcerpc.winreg_QueryInfoKey(pipe, r)
+
+def test_CloseKey(pipe, handle):
+
+    r = {}
+    r['handle'] = handle
+
+    dcerpc.winreg_CloseKey(pipe, r)
+
+def test_FlushKey(pipe, handle):
+
+    r = {}
+    r['handle'] = handle
+    
+    dcerpc.winreg_FlushKey(pipe, r)
+
+def test_GetVersion(pipe, handle):
+
+    r = {}
+    r['handle'] = handle
+    
+    dcerpc.winreg_GetVersion(pipe, r)
+
+def test_GetKeySecurity(pipe, handle):
+
+    r = {}
+    r['handle'] = handle
+    r['unknown'] = 4
+    r['size'] = None
+    r['data'] = {}
+    r['data']['max_len'] = 0
+    r['data']['data'] = ''
+
+    result = dcerpc.winreg_GetKeySecurity(pipe, r)
+
+    print result
+
+    if result['result'] == dcerpc.WERR_INSUFFICIENT_BUFFER:
+        r['size'] = {}
+        r['size']['max_len'] = result['data']['max_len']
+        r['size']['offset'] = 0
+        r['size']['len'] = result['data']['max_len']
+
+        result = dcerpc.winreg_GetKeySecurity(pipe, r)
+
+    print result
+
+    sys.exit(1)
+    
+def test_Key(pipe, handle, name, depth = 0):
+
+    # Don't descend too far.  Registries can be very deep.
+
+    if depth > 2:
+        return
+
+    try:
+        keyinfo = test_QueryInfoKey(pipe, handle)
+    except dcerpc.WERROR, arg:
+        if arg[0] == dcerpc.WERR_ACCESS_DENIED:
+            return
+
+    test_GetVersion(pipe, handle)
+
+    test_FlushKey(pipe, handle)
+
+    test_GetKeySecurity(pipe, handle)
+
+    # Enumerate values in this key
+
+    r = {}
+    r['handle'] = handle
+    r['name_in'] = {}
+    r['name_in']['len'] = 0
+    r['name_in']['max_len'] = (keyinfo['max_valnamelen'] + 1) * 2
+    r['name_in']['buffer'] = {}
+    r['name_in']['buffer']['max_len'] = keyinfo['max_valnamelen']  + 1
+    r['name_in']['buffer']['offset'] = 0
+    r['name_in']['buffer']['len'] = 0
+    r['type'] = 0
+    r['value_in'] = {}
+    r['value_in']['max_len'] = keyinfo['max_valbufsize']
+    r['value_in']['offset'] = 0
+    r['value_in']['len'] = 0
+    r['value_len1'] = keyinfo['max_valbufsize']
+    r['value_len2'] = 0
+    
+    for i in range(0, keyinfo['num_values']):
+
+        r['enum_index'] = i
+
+        dcerpc.winreg_EnumValue(pipe, r)
+
+    # Recursively test subkeys of this key
+
+    r = {}
+    r['handle'] = handle
+    r['key_name_len'] = 0
+    r['unknown'] = 0x0414
+    r['in_name'] = {}
+    r['in_name']['unknown'] = 0x20a
+    r['in_name']['key_name'] = {}
+    r['in_name']['key_name']['name'] = None
+    r['class'] = {}
+    r['class']['name'] = None
+    r['last_changed_time'] = {}
+    r['last_changed_time']['low'] = 0
+    r['last_changed_time']['high'] = 0
+
+    for i in range(0, keyinfo['num_subkeys']):
+
+        r['enum_index'] = i
+
+        subkey = dcerpc.winreg_EnumKey(pipe, r)
+
+        s = {}
+        s['handle'] = handle
+        s['keyname'] = {}
+        s['keyname']['name'] = subkey['out_name']['name']
+        s['unknown'] = 0
+        s['access_mask'] = 0x02000000
+
+        result = dcerpc.winreg_OpenKey(pipe, s)
+
+        test_Key(pipe, result['handle'], name + '/' + s['keyname']['name'],
+                 depth + 1)
+
+        test_CloseKey(pipe, result['handle'])
+
+    # Enumerate values
+
+def runtests(binding, domain, username, password):
+    
+    print 'Testing WINREG pipe'
+
+    pipe = dcerpc.pipe_connect(binding,
+            dcerpc.DCERPC_WINREG_UUID, dcerpc.DCERPC_WINREG_VERSION,
+            domain, username, password)
+
+    handle = test_OpenHKLM(pipe)
+
+    test_Key(pipe, handle, 'HKLM')
diff --git a/source4/scripting/python/sidmodule.c b/source4/scripting/python/sidmodule.c
new file mode 100644
index 0000000000..2b3f152e9b
--- /dev/null
+++ b/source4/scripting/python/sidmodule.c
@@ -0,0 +1,57 @@
+/* 
+   Unix SMB/CIFS implementation.
+   Samba utility functions
+   Copyright (C) Jelmer Vernooij <jelmer@samba.org> 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 <http://www.gnu.org/licenses/>.
+*/
+
+#include "includes.h"
+#include "scripting/python/talloc.h"
+#include "Python.h"
+#include "libcli/security/security.h"
+
+static PyObject *sid_random(PyObject *self, PyObject *args)
+{
+	char *str;
+
+	if (!PyArg_ParseTuple(args, ""))
+	        return NULL;
+
+	str = talloc_asprintf(NULL, "S-1-5-21-%u-%u-%u", 
+				  (unsigned)generate_random(), 
+				  (unsigned)generate_random(), 
+				  (unsigned)generate_random());
+
+	if (str == NULL) {
+		PyErr_SetString(PyExc_TypeError, "can't generate random sid");
+		return NULL;
+	}
+
+	return PyString_FromString(str);
+}
+
+static PyMethodDef methods[] = {
+	{ "random", (PyCFunction)sid_random, METH_VARARGS, NULL},
+	{ NULL, NULL }
+};
+
+PyDoc_STRVAR(param_doc, "SID helper routines");
+
+PyMODINIT_FUNC initsid(void)
+{
+	PyObject *mod = Py_InitModule3("sid", methods, param_doc);
+	if (mod == NULL)
+		return;
+}
diff --git a/source4/scripting/python/uuidmodule.c b/source4/scripting/python/uuidmodule.c
new file mode 100644
index 0000000000..9ae432dfa5
--- /dev/null
+++ b/source4/scripting/python/uuidmodule.c
@@ -0,0 +1,57 @@
+/* 
+   Unix SMB/CIFS implementation.
+   Samba utility functions
+   Copyright (C) Jelmer Vernooij <jelmer@samba.org> 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 <http://www.gnu.org/licenses/>.
+*/
+
+#include "includes.h"
+#include "Python.h"
+#include "librpc/ndr/libndr.h"
+
+static PyObject *uuid_random(PyObject *self, PyObject *args)
+{
+	struct GUID guid;
+	char *str;
+
+	if (!PyArg_ParseTuple(args, ""))
+	        return NULL;
+
+	guid = GUID_random();
+
+	str = GUID_string(NULL, &guid);
+	if (str == NULL) {
+		PyErr_SetString(PyExc_TypeError, "can't convert uuid to string");
+		return NULL;
+	}
+
+	talloc_free(str);
+
+	return PyString_FromString(str);
+}
+
+static PyMethodDef methods[] = {
+	{ "random", (PyCFunction)uuid_random, METH_VARARGS, NULL},
+	{ NULL, NULL }
+};
+
+PyDoc_STRVAR(param_doc, "UUID helper routines");
+
+PyMODINIT_FUNC inituuid(void)
+{
+	PyObject *mod = Py_InitModule3("uuid", methods, param_doc);
+	if (mod == NULL)
+		return;
+}
diff --git a/source4/scripting/swig/README b/source4/scripting/swig/README
deleted file mode 100644
index 38b95b28f4..0000000000
--- a/source4/scripting/swig/README
+++ /dev/null
@@ -1,20 +0,0 @@
-README for Samba SWIG Python extensions
----------------------------------------
-
-Instructions for building:
-
-1. Run configure with the --with-python option to enable python
-   extensions. 
-
-2. Run 'make idl_full swig' to build extensions.
-
-3. At some stage there will be a proper system for installing the
-   extensions, but right now it's easier to run them in place.  Set
-   your PYTHONPATH to include the modules.  From the Samba source
-   directory, run:
-
-   export PYTHONPATH=`pwd`/scripting/swig
-
-Now you can go nuts and use the extensions.  Check the
-scripting/swig/torture directory for a testsuite.  There will
-hopefully be a bunch of usage examples somewhere.
diff --git a/source4/scripting/swig/config.m4 b/source4/scripting/swig/config.m4
deleted file mode 100644
index 9988399f70..0000000000
--- a/source4/scripting/swig/config.m4
+++ /dev/null
@@ -1,29 +0,0 @@
-dnl # Scripting subsystem
-
-# Check for python support
-
-PYTHON=
- 
-AC_ARG_WITH(python,
-[  --with-python=PYTHONNAME  build Python libraries],
-[ case "${withval-python}" in
-  yes)
-        PYTHON=python
-        ;;
-  no)
-        PYTHON=
-        ;;
-  *)
-        PYTHON=${withval-python}
-        ;;
-  esac ])
-
-if test x"$PYTHON" != "x"; then
-	incdir=`python -c 'import sys; print "%s/include/python%d.%d" % (sys.prefix, sys.version_info[[0]], sys.version_info[[1]])'`
-	CPPFLAGS="$CPPFLAGS -I $incdir"
-else
-	SMB_ENABLE(swig_dcerpc, NO)
-fi
-
-AC_SUBST(PYTHON)
-
diff --git a/source4/scripting/swig/config.mk b/source4/scripting/swig/config.mk
deleted file mode 100644
index 193e84b255..0000000000
--- a/source4/scripting/swig/config.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# Swig extensions
-swig: pythonmods
-
-pythonmods: $(PYTHON_DSOS)
-	
-.SUFFIXES: _wrap.c .i
-
-.i_wrap.c:
-	swig -Wall -I$(srcdir)/scripting/swig -python $<
-
-clean::
-	@echo "Removing SWIG output files"
-	@-rm -f bin/python/*
-	# FIXME: Remove _wrap.c files
-
-PYDOCTOR_MODULES=bin/python/ldb.py bin/python/auth.py bin/python/credentials.py bin/python/registry.py
-
-pydoctor::
-	LD_LIBRARY_PATH=bin/shared PYTHONPATH=bin/python pydoctor --make-html --docformat=restructedtext --add-package scripting/python/samba/ $(addprefix --add-module , $(PYDOCTOR_MODULES))
diff --git a/source4/scripting/swig/samba.i b/source4/scripting/swig/samba.i
deleted file mode 100644
index fe83ae3da9..0000000000
--- a/source4/scripting/swig/samba.i
+++ /dev/null
@@ -1,57 +0,0 @@
-/* 
-   Unix SMB/CIFS implementation.
-
-   Common swig definitions
-   
-   Copyright (C) 2004 Tim Potter <tpot@samba.org>
-
-     ** NOTE! The following LGPL license applies to the swig
-     ** definitions. 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 3 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, see <http://www.gnu.org/licenses/>.
-*/
-
-%typemap(in) NTSTATUS {
-	if (PyLong_Check($input))
-		$1 = NT_STATUS(PyLong_AsUnsignedLong($input));
-	else if (PyInt_Check($input))
-		$1 = NT_STATUS(PyInt_AsLong($input));
-	else {
-		PyErr_SetString(PyExc_TypeError, "Expected a long or an int");
-		return NULL;
-	}
-}
-
-%typemap(in) struct cli_credentials * {
-	$1 = cli_credentials_init(arg1);
-	if ($input == Py_None) {
-		cli_credentials_set_anonymous($1);
-	} else {
-		if (!PyTuple_Check($input) ||
-		    PyTuple_Size($input) != 3) {
-			PyErr_SetString(PyExc_TypeError, "Expecting three element tuple");
-			return NULL;
-		}
-		if (!PyString_Check(PyTuple_GetItem($input, 0)) ||
-		    !PyString_Check(PyTuple_GetItem($input, 1)) ||
-		    !PyString_Check(PyTuple_GetItem($input, 2))) {
-			PyErr_SetString(PyExc_TypeError, "Expecting string elements");
-			return NULL;
-		}
-		cli_credentials_set_domain($1, PyString_AsString(PyTuple_GetItem($input, 0)), CRED_SPECIFIED);
-		cli_credentials_set_username($1, PyString_AsString(PyTuple_GetItem($input, 1)), CRED_SPECIFIED);
-		cli_credentials_set_password($1, PyString_AsString(PyTuple_GetItem($input, 2)), CRED_SPECIFIED);
-	}
-}
diff --git a/source4/scripting/swig/samr.py b/source4/scripting/swig/samr.py
deleted file mode 100644
index 314f78b8ad..0000000000
--- a/source4/scripting/swig/samr.py
+++ /dev/null
@@ -1,753 +0,0 @@
-import dcerpc
-
-def sid_to_string(sid):
-    """Convert a Python dictionary SID to a string SID."""
-
-    result = 'S-%d' % sid.sid_rev_num
-
-    result = result + '-%u' % \
-             (dcerpc.uint8_array_getitem(sid.id_auth, 5) +
-              (dcerpc.uint8_array_getitem(sid.id_auth, 4) << 8) + 
-              (dcerpc.uint8_array_getitem(sid.id_auth, 3) << 16) +
-              (dcerpc.uint8_array_getitem(sid.id_auth, 2) << 24))
-    
-    for i in range(0, sid.num_auths):
-        result = result + '-%u' % \
-                 dcerpc.uint32_array_getitem(sid.sub_auths, i)
-
-    return result
-
-def string_to_sid(string):
-    """Convert a string SID to a Python dictionary SID.  Throws a
-    ValueError if the SID string was badly formed."""
-
-    if string[0] != 'S':
-        raise ValueError('Bad SID format')
-
-    string = string[1:]
-
-    import re
-
-    match = re.match('-\d+', string)
-
-    if not match:
-        raise ValueError('Bad SID format')
-
-    try:
-        sid_rev_num = int(string[match.start()+1:match.end()])
-    except ValueError:
-        raise ValueError('Bad SID format')
-
-    string = string[match.end():]
-
-    match = re.match('-\d+', string)
-
-    if not match:
-        raise ValueError('Bad SID format')
-
-    try:
-        ia = int(string[match.start()+1:match.end()])
-    except ValueError:
-        raise ValueError('Bad SID format')
-
-    string = string[match.end():]
-
-    id_auth = [0, 0, (ia >> 24) & 0xff, (ia >> 16) & 0xff,
-               (ia >> 8) & 0xff, ia & 0xff]
-
-    num_auths = 0
-    sub_auths = []
-    
-    while len(string):
-
-        match = re.match('-\d+', string)
-
-        if not match:
-            raise ValueError('Bad SID format')
-
-        try:
-            sa = int(string[match.start() + 1 : match.end()])
-        except ValueError:
-            raise ValueError('Bad SID format')
-
-        num_auths = num_auths + 1
-        sub_auths.append(int(sa))
-
-        string = string[match.end():]
-
-    sid = dcerpc.dom_sid()
-    sid.sid_rev_num = sid_rev_num
-    sid.id_auth = dcerpc.new_uint8_array(6)
-    for i in range(6):
-        dcerpc.uint8_array_setitem(sid.id_auth, i, id_auth[i])
-    sid.num_auths = num_auths
-    sid.sub_auths = dcerpc.new_uint32_array(num_auths)
-    for i in range(num_auths):
-        dcerpc.uint32_array_setitem(sid.sub_auths, i, sub_auths[i])
-
-    return sid
-
-def call_fn(fn, pipe, args):
-    """Wrap up a RPC call and throw an exception is an error was returned."""
-    
-    result = fn(pipe, args);
-
-    if result & 0xc0000000L:
-        raise dcerpc.NTSTATUS(result, dcerpc.nt_errstr(result));
-
-    return result;
-   
-class SamrHandle:
-
-    def __init__(self, pipe, handle):
-
-        self.pipe = pipe
-        self.handle = handle
-
-    def __del__(self):
-
-        if self.handle is not None:
-            self.Close()
-
-    def Close(self):
-                    
-        r = dcerpc.samr_Close()
-        r.data_in.handle = self.handle
-
-        call_fn(dcerpc.dcerpc_samr_Close, self.pipe, r)
-
-        self.handle = None
-
-    def QuerySecurity(self, sec_info = 7):
-
-        r = dcerpc.samr_QuerySecurity()
-        r.data_in.handle = self.handle
-        r.data_in.sec_info = sec_info
-
-        call_fn(dcerpc.dcerpc_samr_QuerySecurity, self.pipe, r)
-
-        return r.data_out.sdbuf
-
-    def SetSecurity(self, sdbuf, sec_info = 7):
-
-        r = dcerpc.samr_SetSecurity()
-        r.data_in.handle = self.handle
-        r.data_in.sec_info = sec_info
-        r.data_in.sdbuf = sdbuf
-
-        call_fn(dcerpc.dcerpc_samr_SetSecurity, self.pipe, r)
-        
-class ConnectHandle(SamrHandle):
-
-    def EnumDomains(self):
-
-        r = dcerpc.samr_EnumDomains()
-        r.data_in.connect_handle = self.handle
-        r.data_in.resume_handle = 0
-        r.data_in.buf_size = -1
-
-        domains = []
-
-        while 1:
-
-            call_fn(dcerpc.dcerpc_samr_EnumDomains, self.pipe, r)
-
-            for i in range(r.data_out.sam.count):
-                domains.append(dcerpc.samr_SamEntry_array_getitem(
-                    r.data_out.sam.entries, i).name.string)
-
-            # TODO: Handle more entries here
-
-            break
-
-        return domains
-
-    def LookupDomain(self, domain_name):
-
-        r = dcerpc.samr_LookupDomain()
-        r.data_in.connect_handle = self.handle
-        r.data_in.domain_name = dcerpc.samr_String()
-        r.data_in.domain_name.string = domain_name
-
-        call_fn(dcerpc.dcerpc_samr_LookupDomain, self.pipe, r)
-
-        return sid_to_string(r.data_out.sid);
-
-    def OpenDomain(self, domain_sid, access_mask = 0x02000000):
-
-        r = dcerpc.samr_OpenDomain()
-        r.data_in.connect_handle = self.handle
-        r.data_in.access_mask = access_mask
-        r.data_in.sid = string_to_sid(domain_sid)
-
-        call_fn(dcerpc.dcerpc_samr_OpenDomain, self.pipe, r)
-
-        return DomainHandle(self.pipe, r.data_out.domain_handle)
-
-    def Shutdown(self):
-
-        r = dcerpc.samr_Shutdown()
-        r.data_in.connect_handle = self.handle
-
-        call_fn(dcerpc.dcerpc_samr_Shutdown, self.pipe, r)
-
-    def GetDomPwInfo(self, domain_name):
-
-        r = dcerpc.samr_GetDomPwInfo()
-        r.data_in.domain_name = dcerpc.samr_String()
-        r.data_in.domain_name.string = domain_name
-
-        call_fn(dcerpc.dcerpc_samr_GetDomPwInfo, self.pipe, r)
-
-        return r.data_out.info
-
-
-    def SetBootKeyInformation(self, unknown1, unknown2, unknown3):
-        
-        r = dcerpc.samr_GetBootKeyInformation()
-        r.data_in.connect_handle = self.handle
-        r.data_in.unknown1 = unknown1
-        r.data_in.unknown2 = unknown2
-        r.data_in.unknown3 = unknown3
-
-        call_fn(dcerpc.dcerpc_samr_SetBootKeyInformation, self.pipe, r)
-
-class DomainHandle(SamrHandle):
-
-    def QueryDomainInfo(self, level = 2):
-
-        r = dcerpc.samr_QueryDomainInfo()
-        r.data_in.domain_handle = self.handle
-        r.data_in.level = level
-
-        call_fn(dcerpc.dcerpc_samr_QueryDomainInfo, self.pipe, r)
-
-        return getattr(r.data_out.info, 'info%d' % level)
-
-    def QueryDomainInfo2(self, level = 2):
-
-        r = dcerpc.samr_QueryDomainInfo2()
-        r.data_in.domain_handle = self.handle
-        r.data_in.level = level
-
-        call_fn(dcerpc.dcerpc_samr_QueryDomainInfo2, self.pipe, r)
-
-        return getattr(r.data_out.info, 'info%d' % level)       
-
-    def SetDomainInfo(self, level, info):
-
-        r = dcerpc.samr_SetDomainInfo()
-        r.data_in.domain_handle = self.handle
-        r.data_in.level = level
-        r.data_in.info = dcerpc.samr_DomainInfo()
-        setattr(r.data_in.info, 'info%d' % level, info)
-
-        call_fn(dcerpc.dcerpc_samr_SetDomainInfo, self.pipe, r)
-
-    def EnumDomainGroups(self):
-
-        r = dcerpc.samr_EnumDomainGroups()
-        r.data_in.domain_handle = self.handle
-        r.data_in.resume_handle = 0
-        r.data_in.max_size = 1000
-
-        call_fn(dcerpc.dcerpc_samr_EnumDomainGroups, self.pipe, r)
-
-        groups = []
-
-        if r.data_out.sam.entries:
-            for i in range(r.data_out.sam.count):
-                groups.append(dcerpc.samr_SamEntry_array_getitem(
-                    r.data_out.sam.entries, i).name.string)
-
-        return groups
-
-    def EnumDomainAliases(self):
-
-        r = dcerpc.samr_EnumDomainAliases()
-        r.data_in.domain_handle = self.handle
-        r.data_in.resume_handle = 0
-        # acct_flags in SamrEnumerateAliasesInDomain has probably
-        # no meaning so use 0xffffffff like W2K
-        r.data_in.acct_flags = 0xffffffffL
-
-        call_fn(dcerpc.dcerpc_samr_EnumDomainAliases, self.pipe, r)
-
-        aliases = []
-
-        if r.data_out.sam.entries:
-            for i in range(r.data_out.sam.count):
-                aliases.append(dcerpc.samr_SamEntry_array_getitem(
-                    r.data_out.sam.entries, i).name.string)
-
-        return aliases
-
-    def EnumDomainUsers(self, user_account_flags = 16):
-
-        r = dcerpc.samr_EnumDomainUsers()
-        r.data_in.domain_handle = self.handle
-        r.data_in.resume_handle = 0
-        r.data_in.acct_flags = user_account_flags
-        r.data_in.max_size = 1000
-
-        call_fn(dcerpc.dcerpc_samr_EnumDomainUsers, self.pipe, r)
-
-        users = []
-
-        if r.data_out.sam.entries:
-            for i in range(r.data_out.sam.count):
-                users.append(dcerpc.samr_SamEntry_array_getitem(
-                    r.data_out.sam.entries, i).name.string)
-
-        return users
-
-    def CreateUser(self, account_name, access_mask = 0x02000000):
-
-        r = dcerpc.samr_CreateUser()
-        r.data_in.domain_handle = self.handle
-        r.data_in.account_name = dcerpc.samr_String()
-        r.data_in.account_name.string = account_name
-        r.data_in.access_mask = access_mask
-
-        call_fn(dcerpc.dcerpc_samr_CreateUser, self.pipe, r)
-
-        return (r.data_out.user_handle,
-                dcerpc.uint32_array_getitem(r.data_out.rid, 0))
-
-    def CreateUser2(self, account_name, acct_flags = 0x00000010,
-                    access_mask = 0x02000000):
-
-        r = dcerpc.samr_CreateUser2()
-        r.data_in.domain_handle = self.handle
-        r.data_in.account_name = dcerpc.samr_String()
-        r.data_in.account_name.string = account_name
-        r.data_in.acct_flags = acct_flags
-        r.data_in.access_mask = access_mask
-
-        call_fn(dcerpc.dcerpc_samr_CreateUser2, self.pipe, r)
-
-        return (r.data_out.user_handle,
-                dcerpc.uint32_array_getitem(r.data_out.access_granted, 0),
-                dcerpc.uint32_array_getitem(r.data_out.rid, 0))
-
-    def OpenUser(self, rid, access_mask = 0x02000000):
-
-        r = dcerpc.samr_OpenUser()
-        r.data_in.domain_handle = self.handle
-        r.data_in.access_mask = access_mask
-        r.data_in.rid = rid
-
-        call_fn(dcerpc.dcerpc_samr_OpenUser, self.pipe, r)
-
-        return UserHandle(self.pipe, r.data_out.user_handle)
-
-    def OpenGroup(self, rid, access_mask = 0x02000000):
-
-        r = dcerpc.samr_OpenGroup()
-        r.data_in.domain_handle = self.handle
-        r.data_in.access_mask = access_mask
-        r.data_in.rid = rid
-
-        call_fn(dcerpc.dcerpc_samr_OpenGroup, self.pipe, r)
-
-        return GroupHandle(self.pipe, r.data_out.group_handle)
-
-    def OpenAlias(self, rid, access_mask = 0x02000000):
-
-        r = dcerpc.samr_OpenAlias()
-        r.data_in.domain_handle = self.handle
-        r.data_in.access_mask = access_mask
-        r.data_in.rid = rid
-
-        call_fn(dcerpc.dcerpc_samr_OpenAlias, self.pipe, r)
-
-        return AliasHandle(self.pipe, r.data_out.alias_handle)
-
-    def CreateDomAlias(self, alias_name, access_mask = 0x02000000):
-
-        r = dcerpc.samr_CreateDomAlias()
-        r.data_in.domain_handle = self.handle
-        r.data_in.alias_name = dcerpc.samr_String()
-        r.data_in.alias_name.string = alias_name
-        r.data_in.access_mask = access_mask
-
-        call_fn(dcerpc.dcerpc_samr_CreateDomAlias, self.pipe, r)
-
-        return (AliasHandle(self.pipe, r.data_out.alias_handle),
-                r.data_out.rid)    
-
-    def RidToSid(self, rid):
-
-        r = dcerpc.samr_RidToSid()
-        r.data_in.domain_handle = self.handle
-        r.data_in.rid = rid
-
-        call_fn(dcerpc.dcerpc_samr_RidToSid, self.pipe, r)
-
-        return sid_to_string(r.data_out.sid)
-
-    def RemoveMemberFromForeignDomain(self, sid):
-
-        r = dcerpc.samr_RemoveMemberFromForeignDomain()
-        r.data_in.domain_handle = self.handle
-        r.data_in.sid = sid
-
-        call_fn(dcerpc.dcerpc_samr_RemoveMemberFromForeignDomain, self.pipe, r)
-
-    def LookupNames(self, names):
-
-        r = dcerpc.samr_LookupNames()
-        r.data_in.domain_handle = self.handle
-        r.data_in.num_names = len(names)
-        r.data_in.names = dcerpc.new_samr_String_array(len(names))
-
-        for i in range(len(names)):
-            s = dcerpc.samr_String()
-            s.string = names[i]
-            dcerpc.samr_String_array_setitem(r.data_in.names, i, s)
-
-        call_fn(dcerpc.dcerpc_samr_LookupNames, self.pipe, r)
-
-        return ([dcerpc.uint32_array_getitem(r.data_out.rids.ids, i)
-                 for i in range(r.data_out.rids.count)],
-                [dcerpc.uint32_array_getitem(r.data_out.types.ids, i)
-                 for i in range(r.data_out.types.count)])
-
-    def CreateDomainGroup(self, domain_name, access_mask = 0x02000000):
-
-        r = dcerpc.samr_CreateDomainGroup()
-        r.data_in.domain_handle = self.handle
-        r.data_in.name = dcerpc.samr_String()
-        r.data_in.name.string = domain_name
-        r.data_in.access_mask = access_mask
-
-        call_fn(dcerpc.dcerpc_samr_CreateDomainGroup, self.pipe, r)
-
-    def GetAliasMembership(self, sids):
-
-        r = dcerpc.samr_GetAliasMembership()
-        r.data_in.domain_handle = self.handle
-        r.data_in.sids = dcerpc.lsa_SidArray()
-        r.data_in.sids.num_sids = len(sids)
-        r.data_in.sids.sids = dcerpc.new_lsa_SidPtr_array(len(sids))
-
-        for i in range(len(sids)):
-            s = dcerpc.lsa_SidPtr()
-            s.sid = string_to_sid(sids[i])
-            dcerpc.lsa_SidPtr_array_setitem(r.data_in.sids.sids, i, s)
-
-        call_fn(dcerpc.dcerpc_samr_GetAliasMembership, self.pipe, r)
-
-        return [r.ids[x] for x in range(r.count)]
-
-    def QueryDisplayInfo(self, level):
-
-        # TODO: Handle more data returns
-
-        r = dcerpc.samr_QueryDisplayInfo()
-        r.data_in.domain_handle = self.handle
-        r.data_in.level = level
-        r.data_in.start_idx = 0
-        r.data_in.max_entries = 1000
-        r.data_in.buf_size = -1
-
-        call_fn(dcerpc.dcerpc_samr_QueryDisplayInfo, self.pipe, r)
-
-        # TODO: Return a mapping of the various samr_DispInfo
-        # structures here.
-
-        return getattr(r.data_out.info, 'info%d' % level)
-    
-    def QueryDisplayInfo2(self, level):
-
-        # TODO: Handle more data returns
-
-        r = dcerpc.samr_QueryDisplayInfo2()
-        r.data_in.domain_handle = self.handle
-        r.data_in.level = level
-        r.data_in.start_idx = 0
-        r.data_in.max_entries = 1000
-        r.data_in.buf_size = -1
-
-        call_fn(dcerpc.dcerpc_samr_QueryDisplayInfo2, self.pipe, r)
-
-        # TODO: Return a mapping of the various samr_DispInfo
-        # structures here.
-
-        return getattr(r.data_out.info, 'info%d' % level)
-
-    def QueryDisplayInfo3(self, level):
-
-        # TODO: Handle more data returns
-
-        r = dcerpc.samr_QueryDisplayInfo3()
-        r.data_in.domain_handle = self.handle
-        r.data_in.level = level
-        r.data_in.start_idx = 0
-        r.data_in.max_entries = 1000
-        r.data_in.buf_size = -1
-
-        call_fn(dcerpc.dcerpc_samr_QueryDisplayInfo3, self.pipe, r)
-
-        # TODO: Return a mapping of the various samr_DispInfo
-        # structures here.
-
-        return getattr(r.data_out.info, 'info%d' % level)
-
-    def GetBootKeyInformation(self):
-
-        r = dcerpc.samr_GetBootKeyInformation()
-        r.data_in.domain_handle = self.handle
-
-        call_fn(dcerpc.dcerpc_samr_GetBootKeyInformation, self.pipe, r)
-
-        return r.data_out.unknown
-
-    def SetBootKeyInformation(self):
-
-        r = dcerpc.samr_GetBootKeyInformation()
-        r.data_in.domain_handle = self.handle
-
-        call_fn(dcerpc.dcerpc_samr_GetBootKeyInformation, self.pipe, r)
-
-    def TestPrivateFunctionsDomain(self):
-
-        r = dcerpc.samr_TestPrivateFunctionsDomain()
-        r.data_in.domain_handle = self.handle
-
-        call_fn(dcerpc.dcerpc_samr_TestPrivateFunctionsDomain, self.pipe, r)
-
-class UserHandle(SamrHandle):
-
-    def DeleteUser(self):
-
-        r = dcerpc.samr_DeleteUser()
-        r.data_in.user_handle = self.handle
-        
-        call_fn(dcerpc.dcerpc_samr_DeleteUser, self.pipe, r)
-
-        self.handle = None
-
-    def GetUserPwInfo(self):
-
-        r = dcerpc.samr_GetUserPwInfo()
-        r.data_in.user_handle = self.handle
-
-        call_fn(dcerpc.dcerpc_samr_GetUserPwInfo, self.pipe, r)
-
-        return r.data_out.info
-
-    def QueryUserInfo(self, level):
-
-        r = dcerpc.samr_QueryUserInfo()
-        r.data_in.user_handle = self.handle
-        r.data_in.level = level
-
-        call_fn(dcerpc.dcerpc_samr_QueryUserInfo, self.pipe, r)
-
-        return r.data_out.info
-
-    def QueryUserInfo2(self, level):
-
-        r = dcerpc.samr_QueryUserInfo2()
-        r.data_in.user_handle = self.handle
-        r.data_in.level = level
-
-        call_fn(dcerpc.dcerpc_samr_QueryUserInfo2, self.pipe, r)
-
-        return r.data_out.info
-
-    def GetGroupsForUser(self):
-
-        r = dcerpc.samr_GetGroupsForUser()
-        r.data_in.user_handle = self.handle
-
-        call_fn(dcerpc.dcerpc_samr_GetGroupsForUser, self.pipe, r)
-
-        rid_types = [dcerpc.samr_RidType_array_getitem(r.data_out.rids.rid, x)
-                     for x in range(r.data_out.rids.count)]
-
-        return [(x.rid, x.type) for x in rid_types]
-
-    def TestPrivateFunctionsUser(self):
-
-        r = dcerpc.samr_TestPrivateFunctionsUser()
-        r.data_in.user_handle = self.handle
-
-        call_fn(dcerpc.dcerpc_samr_TestPrivateFunctionsUser, self.pipe, r)
-            
-class GroupHandle(SamrHandle):
-
-    def QueryGroupInfo(self, level):
-
-        r = dcerpc.samr_QueryGroupInfo()
-        r.data_in.group_handle = self.handle
-        r.data_in.level = level
-
-        call_fn(dcerpc.dcerpc_samr_QueryGroupInfo, self.pipe, r)
-
-        return r.data_out.info
-
-    def SetGroupInfo(self, level, info):
-
-        r = dcerpc.samr_SetGroupInfo()
-        r.data_in.group_handle = self.handle
-        r.data_in.level = level
-        r.data_in.info = info
-
-        call_fn(dcerpc.dcerpc_samr_SetGroupInfo, self.pipe, r)
-
-    def QueryGroupMember(self):
-
-        r = dcerpc.samr_QueryGroupMember()
-        r.data_in.group_handle = self.handle
-
-        call_fn(dcerpc.dcerpc_samr_QueryGroupMember, self.pipe, r)
-
-        return [(dcerpc.uint32_array_getitem(r.data_out.rids.rids, x),
-                 dcerpc.uint32_array_getitem(r.data_out.rids.unknown, x))
-                for x in range(r.data_out.rids.count)]
-    
-class AliasHandle(SamrHandle):
-
-    def DeleteDomAlias(self):
-
-        r = dcerpc.samr_DeleteDomAlias()
-        r.data_in.alias_handle = self.handle
-
-        call_fn(dcerpc.dcerpc_samr_DeleteDomAlias, self.pipe, r)
-
-        self.handle = None
-
-    def QueryAliasInfo(self, level = 1):
-
-        r = dcerpc.samr_QueryAliasInfo()
-        r.data_in.alias_handle = self.handle
-        r.data_in.level = level
-
-        call_fn(dcerpc.dcerpc_samr_QueryAliasInfo, self.pipe, r)
-
-        return r.data_out.info
-
-    def SetAliasInfo(self, level, info):
-
-        r = dcerpc.samr_SetAliasInfo()
-        r.data_in.alias_handle = self.handle
-        r.data_in.level = level
-        r.data_in.info = info
-
-        call_fn(dcerpc.dcerpc_samr_SetAliasInfo, self.pipe, r)
-
-    def AddAliasMember(self, sid):
-
-        r = dcerpc.samr_AddAliasMember()
-        r.data_in.alias_handle = self.handle
-        r.data_in.sid = string_to_sid(sid)
-
-        call_fn(dcerpc.dcerpc_samr_AddAliasMember, self.pipe, r)
-
-    def AddMultipleMembersToAlias(self, sids):
-
-        r = dcerpc.samr_AddMultipleMembersToAlias()
-        r.data_in.alias_handle = self.handle
-        r.data_in.sids = dcerpc.lsa_SidArray()
-        r.data_in.sids.num_sids = len(sids)
-        r.data_in.sids.sids = dcerpc.new_lsa_SidPtr_array(len(sids))
-
-        for i in range(len(sids)):
-            s = dcerpc.lsa_SidPtr()
-            s.sid = string_to_sid(sids[i])
-            dcerpc.lsa_SidPtr_array_setitem(r.data_in.sids.sids, i, s)
-
-        call_fn(dcerpc.dcerpc_samr_AddMultipleMembersToAlias, self.pipe, r)
-
-    def GetMembersInAlias(self):
-
-        r = dcerpc.samr_GetMembersInAlias()
-        r.data_in.alias_handle = self.handle
-
-        call_fn(dcerpc.dcerpc_samr_GetMembersInAlias, self.pipe, r)
-
-        return [
-            sid_to_string(
-                dcerpc.lsa_SidPtr_array_getitem(r.data_out.sids.sids, x).sid)
-            for x in range(r.data_out.sids.num_sids)]
-
-def Connect(pipe, access_mask = 0x02000000):
-
-    r = dcerpc.samr_Connect()
-    r.data_in.system_name = dcerpc.new_uint16_array(1)
-    dcerpc.uint16_array_setitem(r.data_in.system_name, 0, ord('\\'))
-    r.data_in.access_mask = access_mask
-
-    call_fn(dcerpc.dcerpc_samr_Connect, pipe, r)
-
-    return ConnectHandle(pipe, r.data_out.connect_handle)
-
-def Connect2(pipe, system_name = '', access_mask = 0x02000000):
-    """Connect to the SAMR pipe."""
-
-    r = dcerpc.samr_Connect2()
-    r.data_in.system_name = system_name
-    r.data_in.access_mask = access_mask
-
-    call_fn(dcerpc.dcerpc_samr_Connect2, pipe, r)
-
-    return ConnectHandle(pipe, r.data_out.connect_handle)
-
-def Connect3(pipe, system_name = '', access_mask = 0x02000000):
-
-    r = dcerpc.samr_Connect3()
-    r.data_in.system_name = system_name
-    r.data_in.unknown = 0
-    r.data_in.access_mask = access_mask
-
-    call_fn(dcerpc.dcerpc_samr_Connect3, pipe, r)
-
-    return ConnectHandle(pipe, r.data_out.connect_handle)
-
-
-def Connect4(pipe, system_name = '', access_mask = 0x02000000):
-
-    r = dcerpc.samr_Connect4()
-    r.data_in.system_name = system_name
-    r.data_in.unknown = 0
-    r.data_in.access_mask = access_mask
-
-    call_fn(dcerpc.dcerpc_samr_Connect4, pipe, r)
-
-    return ConnectHandle(pipe, r.data_out.connect_handle)
-
-def Connect5(pipe, system_name = '', access_mask = 0x02000000):
-
-    r = dcerpc.samr_Connect5()
-    r.data_in.system_name = system_name
-    r.data_in.access_mask = access_mask
-    r.data_in.level = 1
-    r.data_in.info = dcerpc.new_samr_ConnectInfo_array(1)
-    r.data_in.info.unknown1 = 0
-    r.data_in.info.unknown2 = 0
-
-    call_fn(dcerpc.dcerpc_samr_Connect5, pipe, r)
-
-    return ConnectHandle(pipe, r.data_out.connect_handle)
-    
-# AddGroupMember
-# DeleteDomainGroup
-# DeleteGroupMember
-# SetMemberAttributesofGroup
-# AddAliasMember
-# DeleteAliasMember
-# GetMembersinAlias
-# SetUserInfo
-# ChangePasswordUser
-# GetDisplayEnumerationIndex
-# RemoveMemberFromForeignDomain
-# GetDisplayEnumerationIndex2
-# RemoveMultipleMembersFromAlias
-# OemChangePasswordUser2
-# ChangePasswordUser2
-# SetUserInfo2
-# ChangePasswordUser3
-# SetDsrmPassword
-# ValidatePassword
diff --git a/source4/scripting/swig/status_codes.i b/source4/scripting/swig/status_codes.i
deleted file mode 100644
index cf13ac9852..0000000000
--- a/source4/scripting/swig/status_codes.i
+++ /dev/null
@@ -1,554 +0,0 @@
-/* Win32 status codes */
-
-#define STATUS_BUFFER_OVERFLOW            0x80000005
-#define STATUS_NO_MORE_FILES              0x80000006
-#define NT_STATUS_NO_MORE_ENTRIES         0x8000001a
-
-#define STATUS_MORE_ENTRIES               0x0105
-#define STATUS_SOME_UNMAPPED              0x0107
-#define ERROR_INVALID_PARAMETER		  0x0057
-#define ERROR_INSUFFICIENT_BUFFER	  0x007a
-#define STATUS_NOTIFY_ENUM_DIR            0x010c
-#define ERROR_INVALID_DATATYPE		  0x070c
-
-/* NT status codes */
-
-#define NT_STATUS_OK 0x00000000
-#define NT_STATUS_UNSUCCESSFUL 0xC0000001
-#define NT_STATUS_NOT_IMPLEMENTED 0xC0000002
-#define NT_STATUS_INVALID_INFO_CLASS 0xC0000003
-#define NT_STATUS_INFO_LENGTH_MISMATCH 0xC0000004
-#define NT_STATUS_ACCESS_VIOLATION 0xC0000005
-#define NT_STATUS_IN_PAGE_ERROR 0xC0000006
-#define NT_STATUS_PAGEFILE_QUOTA 0xC0000007
-#define NT_STATUS_INVALID_HANDLE 0xC0000008
-#define NT_STATUS_BAD_INITIAL_STACK 0xC0000009
-#define NT_STATUS_BAD_INITIAL_PC 0xC000000a
-#define NT_STATUS_INVALID_CID 0xC000000b
-#define NT_STATUS_TIMER_NOT_CANCELED 0xC000000c
-#define NT_STATUS_INVALID_PARAMETER 0xC000000d
-#define NT_STATUS_NO_SUCH_DEVICE 0xC000000e
-#define NT_STATUS_NO_SUCH_FILE 0xC000000f
-#define NT_STATUS_INVALID_DEVICE_REQUEST 0xC0000010
-#define NT_STATUS_END_OF_FILE 0xC0000011
-#define NT_STATUS_WRONG_VOLUME 0xC0000012
-#define NT_STATUS_NO_MEDIA_IN_DEVICE 0xC0000013
-#define NT_STATUS_UNRECOGNIZED_MEDIA 0xC0000014
-#define NT_STATUS_NONEXISTENT_SECTOR 0xC0000015
-#define NT_STATUS_MORE_PROCESSING_REQUIRED 0xC0000016
-#define NT_STATUS_NO_MEMORY 0xC0000017
-#define NT_STATUS_CONFLICTING_ADDRESSES 0xC0000018
-#define NT_STATUS_NOT_MAPPED_VIEW 0xC0000019
-#define NT_STATUS_UNABLE_TO_FREE_VM 0xC000001a
-#define NT_STATUS_UNABLE_TO_DELETE_SECTION 0xC000001b
-#define NT_STATUS_INVALID_SYSTEM_SERVICE 0xC000001c
-#define NT_STATUS_ILLEGAL_INSTRUCTION 0xC000001d
-#define NT_STATUS_INVALID_LOCK_SEQUENCE 0xC000001e
-#define NT_STATUS_INVALID_VIEW_SIZE 0xC000001f
-#define NT_STATUS_INVALID_FILE_FOR_SECTION 0xC0000020
-#define NT_STATUS_ALREADY_COMMITTED 0xC0000021
-#define NT_STATUS_ACCESS_DENIED 0xC0000022
-#define NT_STATUS_BUFFER_TOO_SMALL 0xC0000023
-#define NT_STATUS_OBJECT_TYPE_MISMATCH 0xC0000024
-#define NT_STATUS_NONCONTINUABLE_EXCEPTION 0xC0000025
-#define NT_STATUS_INVALID_DISPOSITION 0xC0000026
-#define NT_STATUS_UNWIND 0xC0000027
-#define NT_STATUS_BAD_STACK 0xC0000028
-#define NT_STATUS_INVALID_UNWIND_TARGET 0xC0000029
-#define NT_STATUS_NOT_LOCKED 0xC000002a
-#define NT_STATUS_PARITY_ERROR 0xC000002b
-#define NT_STATUS_UNABLE_TO_DECOMMIT_VM 0xC000002c
-#define NT_STATUS_NOT_COMMITTED 0xC000002d
-#define NT_STATUS_INVALID_PORT_ATTRIBUTES 0xC000002e
-#define NT_STATUS_PORT_MESSAGE_TOO_LONG 0xC000002f
-#define NT_STATUS_INVALID_PARAMETER_MIX 0xC0000030
-#define NT_STATUS_INVALID_QUOTA_LOWER 0xC0000031
-#define NT_STATUS_DISK_CORRUPT_ERROR 0xC0000032
-#define NT_STATUS_OBJECT_NAME_INVALID 0xC0000033
-#define NT_STATUS_OBJECT_NAME_NOT_FOUND 0xC0000034
-#define NT_STATUS_OBJECT_NAME_COLLISION 0xC0000035
-#define NT_STATUS_HANDLE_NOT_WAITABLE 0xC0000036
-#define NT_STATUS_PORT_DISCONNECTED 0xC0000037
-#define NT_STATUS_DEVICE_ALREADY_ATTACHED 0xC0000038
-#define NT_STATUS_OBJECT_PATH_INVALID 0xC0000039
-#define NT_STATUS_OBJECT_PATH_NOT_FOUND 0xC000003a
-#define NT_STATUS_OBJECT_PATH_SYNTAX_BAD 0xC000003b
-#define NT_STATUS_DATA_OVERRUN 0xC000003c
-#define NT_STATUS_DATA_LATE_ERROR 0xC000003d
-#define NT_STATUS_DATA_ERROR 0xC000003e
-#define NT_STATUS_CRC_ERROR 0xC000003f
-#define NT_STATUS_SECTION_TOO_BIG 0xC0000040
-#define NT_STATUS_PORT_CONNECTION_REFUSED 0xC0000041
-#define NT_STATUS_INVALID_PORT_HANDLE 0xC0000042
-#define NT_STATUS_SHARING_VIOLATION 0xC0000043
-#define NT_STATUS_QUOTA_EXCEEDED 0xC0000044
-#define NT_STATUS_INVALID_PAGE_PROTECTION 0xC0000045
-#define NT_STATUS_MUTANT_NOT_OWNED 0xC0000046
-#define NT_STATUS_SEMAPHORE_LIMIT_EXCEEDED 0xC0000047
-#define NT_STATUS_PORT_ALREADY_SET 0xC0000048
-#define NT_STATUS_SECTION_NOT_IMAGE 0xC0000049
-#define NT_STATUS_SUSPEND_COUNT_EXCEEDED 0xC000004a
-#define NT_STATUS_THREAD_IS_TERMINATING 0xC000004b
-#define NT_STATUS_BAD_WORKING_SET_LIMIT 0xC000004c
-#define NT_STATUS_INCOMPATIBLE_FILE_MAP 0xC000004d
-#define NT_STATUS_SECTION_PROTECTION 0xC000004e
-#define NT_STATUS_EAS_NOT_SUPPORTED 0xC000004f
-#define NT_STATUS_EA_TOO_LARGE 0xC0000050
-#define NT_STATUS_NONEXISTENT_EA_ENTRY 0xC0000051
-#define NT_STATUS_NO_EAS_ON_FILE 0xC0000052
-#define NT_STATUS_EA_CORRUPT_ERROR 0xC0000053
-#define NT_STATUS_FILE_LOCK_CONFLICT 0xC0000054
-#define NT_STATUS_LOCK_NOT_GRANTED 0xC0000055
-#define NT_STATUS_DELETE_PENDING 0xC0000056
-#define NT_STATUS_CTL_FILE_NOT_SUPPORTED 0xC0000057
-#define NT_STATUS_UNKNOWN_REVISION 0xC0000058
-#define NT_STATUS_REVISION_MISMATCH 0xC0000059
-#define NT_STATUS_INVALID_OWNER 0xC000005a
-#define NT_STATUS_INVALID_PRIMARY_GROUP 0xC000005b
-#define NT_STATUS_NO_IMPERSONATION_TOKEN 0xC000005c
-#define NT_STATUS_CANT_DISABLE_MANDATORY 0xC000005d
-#define NT_STATUS_NO_LOGON_SERVERS 0xC000005e
-#define NT_STATUS_NO_SUCH_LOGON_SESSION 0xC000005f
-#define NT_STATUS_NO_SUCH_PRIVILEGE 0xC0000060
-#define NT_STATUS_PRIVILEGE_NOT_HELD 0xC0000061
-#define NT_STATUS_INVALID_ACCOUNT_NAME 0xC0000062
-#define NT_STATUS_USER_EXISTS 0xC0000063
-#define NT_STATUS_NO_SUCH_USER 0xC0000064
-#define NT_STATUS_GROUP_EXISTS 0xC0000065
-#define NT_STATUS_NO_SUCH_GROUP 0xC0000066
-#define NT_STATUS_MEMBER_IN_GROUP 0xC0000067
-#define NT_STATUS_MEMBER_NOT_IN_GROUP 0xC0000068
-#define NT_STATUS_LAST_ADMIN 0xC0000069
-#define NT_STATUS_WRONG_PASSWORD 0xC000006a
-#define NT_STATUS_ILL_FORMED_PASSWORD 0xC000006b
-#define NT_STATUS_PASSWORD_RESTRICTION 0xC000006c
-#define NT_STATUS_LOGON_FAILURE 0xC000006d
-#define NT_STATUS_ACCOUNT_RESTRICTION 0xC000006e
-#define NT_STATUS_INVALID_LOGON_HOURS 0xC000006f
-#define NT_STATUS_INVALID_WORKSTATION 0xC0000070
-#define NT_STATUS_PASSWORD_EXPIRED 0xC0000071
-#define NT_STATUS_ACCOUNT_DISABLED 0xC0000072
-#define NT_STATUS_NONE_MAPPED 0xC0000073
-#define NT_STATUS_TOO_MANY_LUIDS_REQUESTED 0xC0000074
-#define NT_STATUS_LUIDS_EXHAUSTED 0xC0000075
-#define NT_STATUS_INVALID_SUB_AUTHORITY 0xC0000076
-#define NT_STATUS_INVALID_ACL 0xC0000077
-#define NT_STATUS_INVALID_SID 0xC0000078
-#define NT_STATUS_INVALID_SECURITY_DESCR 0xC0000079
-#define NT_STATUS_PROCEDURE_NOT_FOUND 0xC000007a
-#define NT_STATUS_INVALID_IMAGE_FORMAT 0xC000007b
-#define NT_STATUS_NO_TOKEN 0xC000007c
-#define NT_STATUS_BAD_INHERITANCE_ACL 0xC000007d
-#define NT_STATUS_RANGE_NOT_LOCKED 0xC000007e
-#define NT_STATUS_DISK_FULL 0xC000007f
-#define NT_STATUS_SERVER_DISABLED 0xC0000080
-#define NT_STATUS_SERVER_NOT_DISABLED 0xC0000081
-#define NT_STATUS_TOO_MANY_GUIDS_REQUESTED 0xC0000082
-#define NT_STATUS_GUIDS_EXHAUSTED 0xC0000083
-#define NT_STATUS_INVALID_ID_AUTHORITY 0xC0000084
-#define NT_STATUS_AGENTS_EXHAUSTED 0xC0000085
-#define NT_STATUS_INVALID_VOLUME_LABEL 0xC0000086
-#define NT_STATUS_SECTION_NOT_EXTENDED 0xC0000087
-#define NT_STATUS_NOT_MAPPED_DATA 0xC0000088
-#define NT_STATUS_RESOURCE_DATA_NOT_FOUND 0xC0000089
-#define NT_STATUS_RESOURCE_TYPE_NOT_FOUND 0xC000008a
-#define NT_STATUS_RESOURCE_NAME_NOT_FOUND 0xC000008b
-#define NT_STATUS_ARRAY_BOUNDS_EXCEEDED 0xC000008c
-#define NT_STATUS_FLOAT_DENORMAL_OPERAND 0xC000008d
-#define NT_STATUS_FLOAT_DIVIDE_BY_ZERO 0xC000008e
-#define NT_STATUS_FLOAT_INEXACT_RESULT 0xC000008f
-#define NT_STATUS_FLOAT_INVALID_OPERATION 0xC0000090
-#define NT_STATUS_FLOAT_OVERFLOW 0xC0000091
-#define NT_STATUS_FLOAT_STACK_CHECK 0xC0000092
-#define NT_STATUS_FLOAT_UNDERFLOW 0xC0000093
-#define NT_STATUS_INTEGER_DIVIDE_BY_ZERO 0xC0000094
-#define NT_STATUS_INTEGER_OVERFLOW 0xC0000095
-#define NT_STATUS_PRIVILEGED_INSTRUCTION 0xC0000096
-#define NT_STATUS_TOO_MANY_PAGING_FILES 0xC0000097
-#define NT_STATUS_FILE_INVALID 0xC0000098
-#define NT_STATUS_ALLOTTED_SPACE_EXCEEDED 0xC0000099
-#define NT_STATUS_INSUFFICIENT_RESOURCES 0xC000009a
-#define NT_STATUS_DFS_EXIT_PATH_FOUND 0xC000009b
-#define NT_STATUS_DEVICE_DATA_ERROR 0xC000009c
-#define NT_STATUS_DEVICE_NOT_CONNECTED 0xC000009d
-#define NT_STATUS_DEVICE_POWER_FAILURE 0xC000009e
-#define NT_STATUS_FREE_VM_NOT_AT_BASE 0xC000009f
-#define NT_STATUS_MEMORY_NOT_ALLOCATED 0xC00000a0
-#define NT_STATUS_WORKING_SET_QUOTA 0xC00000a1
-#define NT_STATUS_MEDIA_WRITE_PROTECTED 0xC00000a2
-#define NT_STATUS_DEVICE_NOT_READY 0xC00000a3
-#define NT_STATUS_INVALID_GROUP_ATTRIBUTES 0xC00000a4
-#define NT_STATUS_BAD_IMPERSONATION_LEVEL 0xC00000a5
-#define NT_STATUS_CANT_OPEN_ANONYMOUS 0xC00000a6
-#define NT_STATUS_BAD_VALIDATION_CLASS 0xC00000a7
-#define NT_STATUS_BAD_TOKEN_TYPE 0xC00000a8
-#define NT_STATUS_BAD_MASTER_BOOT_RECORD 0xC00000a9
-#define NT_STATUS_INSTRUCTION_MISALIGNMENT 0xC00000aa
-#define NT_STATUS_INSTANCE_NOT_AVAILABLE 0xC00000ab
-#define NT_STATUS_PIPE_NOT_AVAILABLE 0xC00000ac
-#define NT_STATUS_INVALID_PIPE_STATE 0xC00000ad
-#define NT_STATUS_PIPE_BUSY 0xC00000ae
-#define NT_STATUS_ILLEGAL_FUNCTION 0xC00000af
-#define NT_STATUS_PIPE_DISCONNECTED 0xC00000b0
-#define NT_STATUS_PIPE_CLOSING 0xC00000b1
-#define NT_STATUS_PIPE_CONNECTED 0xC00000b2
-#define NT_STATUS_PIPE_LISTENING 0xC00000b3
-#define NT_STATUS_INVALID_READ_MODE 0xC00000b4
-#define NT_STATUS_IO_TIMEOUT 0xC00000b5
-#define NT_STATUS_FILE_FORCED_CLOSED 0xC00000b6
-#define NT_STATUS_PROFILING_NOT_STARTED 0xC00000b7
-#define NT_STATUS_PROFILING_NOT_STOPPED 0xC00000b8
-#define NT_STATUS_COULD_NOT_INTERPRET 0xC00000b9
-#define NT_STATUS_FILE_IS_A_DIRECTORY 0xC00000ba
-#define NT_STATUS_NOT_SUPPORTED 0xC00000bb
-#define NT_STATUS_REMOTE_NOT_LISTENING 0xC00000bc
-#define NT_STATUS_DUPLICATE_NAME 0xC00000bd
-#define NT_STATUS_BAD_NETWORK_PATH 0xC00000be
-#define NT_STATUS_NETWORK_BUSY 0xC00000bf
-#define NT_STATUS_DEVICE_DOES_NOT_EXIST 0xC00000c0
-#define NT_STATUS_TOO_MANY_COMMANDS 0xC00000c1
-#define NT_STATUS_ADAPTER_HARDWARE_ERROR 0xC00000c2
-#define NT_STATUS_INVALID_NETWORK_RESPONSE 0xC00000c3
-#define NT_STATUS_UNEXPECTED_NETWORK_ERROR 0xC00000c4
-#define NT_STATUS_BAD_REMOTE_ADAPTER 0xC00000c5
-#define NT_STATUS_PRINT_QUEUE_FULL 0xC00000c6
-#define NT_STATUS_NO_SPOOL_SPACE 0xC00000c7
-#define NT_STATUS_PRINT_CANCELLED 0xC00000c8
-#define NT_STATUS_NETWORK_NAME_DELETED 0xC00000c9
-#define NT_STATUS_NETWORK_ACCESS_DENIED 0xC00000ca
-#define NT_STATUS_BAD_DEVICE_TYPE 0xC00000cb
-#define NT_STATUS_BAD_NETWORK_NAME 0xC00000cc
-#define NT_STATUS_TOO_MANY_NAMES 0xC00000cd
-#define NT_STATUS_TOO_MANY_SESSIONS 0xC00000ce
-#define NT_STATUS_SHARING_PAUSED 0xC00000cf
-#define NT_STATUS_REQUEST_NOT_ACCEPTED 0xC00000d0
-#define NT_STATUS_REDIRECTOR_PAUSED 0xC00000d1
-#define NT_STATUS_NET_WRITE_FAULT 0xC00000d2
-#define NT_STATUS_PROFILING_AT_LIMIT 0xC00000d3
-#define NT_STATUS_NOT_SAME_DEVICE 0xC00000d4
-#define NT_STATUS_FILE_RENAMED 0xC00000d5
-#define NT_STATUS_VIRTUAL_CIRCUIT_CLOSED 0xC00000d6
-#define NT_STATUS_NO_SECURITY_ON_OBJECT 0xC00000d7
-#define NT_STATUS_CANT_WAIT 0xC00000d8
-#define NT_STATUS_PIPE_EMPTY 0xC00000d9
-#define NT_STATUS_CANT_ACCESS_DOMAIN_INFO 0xC00000da
-#define NT_STATUS_CANT_TERMINATE_SELF 0xC00000db
-#define NT_STATUS_INVALID_SERVER_STATE 0xC00000dc
-#define NT_STATUS_INVALID_DOMAIN_STATE 0xC00000dd
-#define NT_STATUS_INVALID_DOMAIN_ROLE 0xC00000de
-#define NT_STATUS_NO_SUCH_DOMAIN 0xC00000df
-#define NT_STATUS_DOMAIN_EXISTS 0xC00000e0
-#define NT_STATUS_DOMAIN_LIMIT_EXCEEDED 0xC00000e1
-#define NT_STATUS_OPLOCK_NOT_GRANTED 0xC00000e2
-#define NT_STATUS_INVALID_OPLOCK_PROTOCOL 0xC00000e3
-#define NT_STATUS_INTERNAL_DB_CORRUPTION 0xC00000e4
-#define NT_STATUS_INTERNAL_ERROR 0xC00000e5
-#define NT_STATUS_GENERIC_NOT_MAPPED 0xC00000e6
-#define NT_STATUS_BAD_DESCRIPTOR_FORMAT 0xC00000e7
-#define NT_STATUS_INVALID_USER_BUFFER 0xC00000e8
-#define NT_STATUS_UNEXPECTED_IO_ERROR 0xC00000e9
-#define NT_STATUS_UNEXPECTED_MM_CREATE_ERR 0xC00000ea
-#define NT_STATUS_UNEXPECTED_MM_MAP_ERROR 0xC00000eb
-#define NT_STATUS_UNEXPECTED_MM_EXTEND_ERR 0xC00000ec
-#define NT_STATUS_NOT_LOGON_PROCESS 0xC00000ed
-#define NT_STATUS_LOGON_SESSION_EXISTS 0xC00000ee
-#define NT_STATUS_INVALID_PARAMETER_1 0xC00000ef
-#define NT_STATUS_INVALID_PARAMETER_2 0xC00000f0
-#define NT_STATUS_INVALID_PARAMETER_3 0xC00000f1
-#define NT_STATUS_INVALID_PARAMETER_4 0xC00000f2
-#define NT_STATUS_INVALID_PARAMETER_5 0xC00000f3
-#define NT_STATUS_INVALID_PARAMETER_6 0xC00000f4
-#define NT_STATUS_INVALID_PARAMETER_7 0xC00000f5
-#define NT_STATUS_INVALID_PARAMETER_8 0xC00000f6
-#define NT_STATUS_INVALID_PARAMETER_9 0xC00000f7
-#define NT_STATUS_INVALID_PARAMETER_10 0xC00000f8
-#define NT_STATUS_INVALID_PARAMETER_11 0xC00000f9
-#define NT_STATUS_INVALID_PARAMETER_12 0xC00000fa
-#define NT_STATUS_REDIRECTOR_NOT_STARTED 0xC00000fb
-#define NT_STATUS_REDIRECTOR_STARTED 0xC00000fc
-#define NT_STATUS_STACK_OVERFLOW 0xC00000fd
-#define NT_STATUS_NO_SUCH_PACKAGE 0xC00000fe
-#define NT_STATUS_BAD_FUNCTION_TABLE 0xC00000ff
-#define NT_STATUS_DIRECTORY_NOT_EMPTY 0xC0000101
-#define NT_STATUS_FILE_CORRUPT_ERROR 0xC0000102
-#define NT_STATUS_NOT_A_DIRECTORY 0xC0000103
-#define NT_STATUS_BAD_LOGON_SESSION_STATE 0xC0000104
-#define NT_STATUS_LOGON_SESSION_COLLISION 0xC0000105
-#define NT_STATUS_NAME_TOO_LONG 0xC0000106
-#define NT_STATUS_FILES_OPEN 0xC0000107
-#define NT_STATUS_CONNECTION_IN_USE 0xC0000108
-#define NT_STATUS_MESSAGE_NOT_FOUND 0xC0000109
-#define NT_STATUS_PROCESS_IS_TERMINATING 0xC000010a
-#define NT_STATUS_INVALID_LOGON_TYPE 0xC000010b
-#define NT_STATUS_NO_GUID_TRANSLATION 0xC000010c
-#define NT_STATUS_CANNOT_IMPERSONATE 0xC000010d
-#define NT_STATUS_IMAGE_ALREADY_LOADED 0xC000010e
-#define NT_STATUS_ABIOS_NOT_PRESENT 0xC000010f
-#define NT_STATUS_ABIOS_LID_NOT_EXIST 0xC0000110
-#define NT_STATUS_ABIOS_LID_ALREADY_OWNED 0xC0000111
-#define NT_STATUS_ABIOS_NOT_LID_OWNER 0xC0000112
-#define NT_STATUS_ABIOS_INVALID_COMMAND 0xC0000113
-#define NT_STATUS_ABIOS_INVALID_LID 0xC0000114
-#define NT_STATUS_ABIOS_SELECTOR_NOT_AVAILABLE 0xC0000115
-#define NT_STATUS_ABIOS_INVALID_SELECTOR 0xC0000116
-#define NT_STATUS_NO_LDT 0xC0000117
-#define NT_STATUS_INVALID_LDT_SIZE 0xC0000118
-#define NT_STATUS_INVALID_LDT_OFFSET 0xC0000119
-#define NT_STATUS_INVALID_LDT_DESCRIPTOR 0xC000011a
-#define NT_STATUS_INVALID_IMAGE_NE_FORMAT 0xC000011b
-#define NT_STATUS_RXACT_INVALID_STATE 0xC000011c
-#define NT_STATUS_RXACT_COMMIT_FAILURE 0xC000011d
-#define NT_STATUS_MAPPED_FILE_SIZE_ZERO 0xC000011e
-#define NT_STATUS_TOO_MANY_OPENED_FILES 0xC000011f
-#define NT_STATUS_CANCELLED 0xC0000120
-#define NT_STATUS_CANNOT_DELETE 0xC0000121
-#define NT_STATUS_INVALID_COMPUTER_NAME 0xC0000122
-#define NT_STATUS_FILE_DELETED 0xC0000123
-#define NT_STATUS_SPECIAL_ACCOUNT 0xC0000124
-#define NT_STATUS_SPECIAL_GROUP 0xC0000125
-#define NT_STATUS_SPECIAL_USER 0xC0000126
-#define NT_STATUS_MEMBERS_PRIMARY_GROUP 0xC0000127
-#define NT_STATUS_FILE_CLOSED 0xC0000128
-#define NT_STATUS_TOO_MANY_THREADS 0xC0000129
-#define NT_STATUS_THREAD_NOT_IN_PROCESS 0xC000012a
-#define NT_STATUS_TOKEN_ALREADY_IN_USE 0xC000012b
-#define NT_STATUS_PAGEFILE_QUOTA_EXCEEDED 0xC000012c
-#define NT_STATUS_COMMITMENT_LIMIT 0xC000012d
-#define NT_STATUS_INVALID_IMAGE_LE_FORMAT 0xC000012e
-#define NT_STATUS_INVALID_IMAGE_NOT_MZ 0xC000012f
-#define NT_STATUS_INVALID_IMAGE_PROTECT 0xC0000130
-#define NT_STATUS_INVALID_IMAGE_WIN_16 0xC0000131
-#define NT_STATUS_LOGON_SERVER_CONFLICT 0xC0000132
-#define NT_STATUS_TIME_DIFFERENCE_AT_DC 0xC0000133
-#define NT_STATUS_SYNCHRONIZATION_REQUIRED 0xC0000134
-#define NT_STATUS_DLL_NOT_FOUND 0xC0000135
-#define NT_STATUS_OPEN_FAILED 0xC0000136
-#define NT_STATUS_IO_PRIVILEGE_FAILED 0xC0000137
-#define NT_STATUS_ORDINAL_NOT_FOUND 0xC0000138
-#define NT_STATUS_ENTRYPOINT_NOT_FOUND 0xC0000139
-#define NT_STATUS_CONTROL_C_EXIT 0xC000013a
-#define NT_STATUS_LOCAL_DISCONNECT 0xC000013b
-#define NT_STATUS_REMOTE_DISCONNECT 0xC000013c
-#define NT_STATUS_REMOTE_RESOURCES 0xC000013d
-#define NT_STATUS_LINK_FAILED 0xC000013e
-#define NT_STATUS_LINK_TIMEOUT 0xC000013f
-#define NT_STATUS_INVALID_CONNECTION 0xC0000140
-#define NT_STATUS_INVALID_ADDRESS 0xC0000141
-#define NT_STATUS_DLL_INIT_FAILED 0xC0000142
-#define NT_STATUS_MISSING_SYSTEMFILE 0xC0000143
-#define NT_STATUS_UNHANDLED_EXCEPTION 0xC0000144
-#define NT_STATUS_APP_INIT_FAILURE 0xC0000145
-#define NT_STATUS_PAGEFILE_CREATE_FAILED 0xC0000146
-#define NT_STATUS_NO_PAGEFILE 0xC0000147
-#define NT_STATUS_INVALID_LEVEL 0xC0000148
-#define NT_STATUS_WRONG_PASSWORD_CORE 0xC0000149
-#define NT_STATUS_ILLEGAL_FLOAT_CONTEXT 0xC000014a
-#define NT_STATUS_PIPE_BROKEN 0xC000014b
-#define NT_STATUS_REGISTRY_CORRUPT 0xC000014c
-#define NT_STATUS_REGISTRY_IO_FAILED 0xC000014d
-#define NT_STATUS_NO_EVENT_PAIR 0xC000014e
-#define NT_STATUS_UNRECOGNIZED_VOLUME 0xC000014f
-#define NT_STATUS_SERIAL_NO_DEVICE_INITED 0xC0000150
-#define NT_STATUS_NO_SUCH_ALIAS 0xC0000151
-#define NT_STATUS_MEMBER_NOT_IN_ALIAS 0xC0000152
-#define NT_STATUS_MEMBER_IN_ALIAS 0xC0000153
-#define NT_STATUS_ALIAS_EXISTS 0xC0000154
-#define NT_STATUS_LOGON_NOT_GRANTED 0xC0000155
-#define NT_STATUS_TOO_MANY_SECRETS 0xC0000156
-#define NT_STATUS_SECRET_TOO_LONG 0xC0000157
-#define NT_STATUS_INTERNAL_DB_ERROR 0xC0000158
-#define NT_STATUS_FULLSCREEN_MODE 0xC0000159
-#define NT_STATUS_TOO_MANY_CONTEXT_IDS 0xC000015a
-#define NT_STATUS_LOGON_TYPE_NOT_GRANTED 0xC000015b
-#define NT_STATUS_NOT_REGISTRY_FILE 0xC000015c
-#define NT_STATUS_NT_CROSS_ENCRYPTION_REQUIRED 0xC000015d
-#define NT_STATUS_DOMAIN_CTRLR_CONFIG_ERROR 0xC000015e
-#define NT_STATUS_FT_MISSING_MEMBER 0xC000015f
-#define NT_STATUS_ILL_FORMED_SERVICE_ENTRY 0xC0000160
-#define NT_STATUS_ILLEGAL_CHARACTER 0xC0000161
-#define NT_STATUS_UNMAPPABLE_CHARACTER 0xC0000162
-#define NT_STATUS_UNDEFINED_CHARACTER 0xC0000163
-#define NT_STATUS_FLOPPY_VOLUME 0xC0000164
-#define NT_STATUS_FLOPPY_ID_MARK_NOT_FOUND 0xC0000165
-#define NT_STATUS_FLOPPY_WRONG_CYLINDER 0xC0000166
-#define NT_STATUS_FLOPPY_UNKNOWN_ERROR 0xC0000167
-#define NT_STATUS_FLOPPY_BAD_REGISTERS 0xC0000168
-#define NT_STATUS_DISK_RECALIBRATE_FAILED 0xC0000169
-#define NT_STATUS_DISK_OPERATION_FAILED 0xC000016a
-#define NT_STATUS_DISK_RESET_FAILED 0xC000016b
-#define NT_STATUS_SHARED_IRQ_BUSY 0xC000016c
-#define NT_STATUS_FT_ORPHANING 0xC000016d
-#define NT_STATUS_PARTITION_FAILURE 0xC0000172
-#define NT_STATUS_INVALID_BLOCK_LENGTH 0xC0000173
-#define NT_STATUS_DEVICE_NOT_PARTITIONED 0xC0000174
-#define NT_STATUS_UNABLE_TO_LOCK_MEDIA 0xC0000175
-#define NT_STATUS_UNABLE_TO_UNLOAD_MEDIA 0xC0000176
-#define NT_STATUS_EOM_OVERFLOW 0xC0000177
-#define NT_STATUS_NO_MEDIA 0xC0000178
-#define NT_STATUS_NO_SUCH_MEMBER 0xC000017a
-#define NT_STATUS_INVALID_MEMBER 0xC000017b
-#define NT_STATUS_KEY_DELETED 0xC000017c
-#define NT_STATUS_NO_LOG_SPACE 0xC000017d
-#define NT_STATUS_TOO_MANY_SIDS 0xC000017e
-#define NT_STATUS_LM_CROSS_ENCRYPTION_REQUIRED 0xC000017f
-#define NT_STATUS_KEY_HAS_CHILDREN 0xC0000180
-#define NT_STATUS_CHILD_MUST_BE_VOLATILE 0xC0000181
-#define NT_STATUS_DEVICE_CONFIGURATION_ERROR 0xC0000182
-#define NT_STATUS_DRIVER_INTERNAL_ERROR 0xC0000183
-#define NT_STATUS_INVALID_DEVICE_STATE 0xC0000184
-#define NT_STATUS_IO_DEVICE_ERROR 0xC0000185
-#define NT_STATUS_DEVICE_PROTOCOL_ERROR 0xC0000186
-#define NT_STATUS_BACKUP_CONTROLLER 0xC0000187
-#define NT_STATUS_LOG_FILE_FULL 0xC0000188
-#define NT_STATUS_TOO_LATE 0xC0000189
-#define NT_STATUS_NO_TRUST_LSA_SECRET 0xC000018a
-#define NT_STATUS_NO_TRUST_SAM_ACCOUNT 0xC000018b
-#define NT_STATUS_TRUSTED_DOMAIN_FAILURE 0xC000018c
-#define NT_STATUS_TRUSTED_RELATIONSHIP_FAILURE 0xC000018d
-#define NT_STATUS_EVENTLOG_FILE_CORRUPT 0xC000018e
-#define NT_STATUS_EVENTLOG_CANT_START 0xC000018f
-#define NT_STATUS_TRUST_FAILURE 0xC0000190
-#define NT_STATUS_MUTANT_LIMIT_EXCEEDED 0xC0000191
-#define NT_STATUS_NETLOGON_NOT_STARTED 0xC0000192
-#define NT_STATUS_ACCOUNT_EXPIRED 0xC0000193
-#define NT_STATUS_POSSIBLE_DEADLOCK 0xC0000194
-#define NT_STATUS_NETWORK_CREDENTIAL_CONFLICT 0xC0000195
-#define NT_STATUS_REMOTE_SESSION_LIMIT 0xC0000196
-#define NT_STATUS_EVENTLOG_FILE_CHANGED 0xC0000197
-#define NT_STATUS_NOLOGON_INTERDOMAIN_TRUST_ACCOUNT 0xC0000198
-#define NT_STATUS_NOLOGON_WORKSTATION_TRUST_ACCOUNT 0xC0000199
-#define NT_STATUS_NOLOGON_SERVER_TRUST_ACCOUNT 0xC000019a
-#define NT_STATUS_DOMAIN_TRUST_INCONSISTENT 0xC000019b
-#define NT_STATUS_FS_DRIVER_REQUIRED 0xC000019c
-#define NT_STATUS_NO_USER_SESSION_KEY 0xC0000202
-#define NT_STATUS_USER_SESSION_DELETED 0xC0000203
-#define NT_STATUS_RESOURCE_LANG_NOT_FOUND 0xC0000204
-#define NT_STATUS_INSUFF_SERVER_RESOURCES 0xC0000205
-#define NT_STATUS_INVALID_BUFFER_SIZE 0xC0000206
-#define NT_STATUS_INVALID_ADDRESS_COMPONENT 0xC0000207
-#define NT_STATUS_INVALID_ADDRESS_WILDCARD 0xC0000208
-#define NT_STATUS_TOO_MANY_ADDRESSES 0xC0000209
-#define NT_STATUS_ADDRESS_ALREADY_EXISTS 0xC000020a
-#define NT_STATUS_ADDRESS_CLOSED 0xC000020b
-#define NT_STATUS_CONNECTION_DISCONNECTED 0xC000020c
-#define NT_STATUS_CONNECTION_RESET 0xC000020d
-#define NT_STATUS_TOO_MANY_NODES 0xC000020e
-#define NT_STATUS_TRANSACTION_ABORTED 0xC000020f
-#define NT_STATUS_TRANSACTION_TIMED_OUT 0xC0000210
-#define NT_STATUS_TRANSACTION_NO_RELEASE 0xC0000211
-#define NT_STATUS_TRANSACTION_NO_MATCH 0xC0000212
-#define NT_STATUS_TRANSACTION_RESPONDED 0xC0000213
-#define NT_STATUS_TRANSACTION_INVALID_ID 0xC0000214
-#define NT_STATUS_TRANSACTION_INVALID_TYPE 0xC0000215
-#define NT_STATUS_NOT_SERVER_SESSION 0xC0000216
-#define NT_STATUS_NOT_CLIENT_SESSION 0xC0000217
-#define NT_STATUS_CANNOT_LOAD_REGISTRY_FILE 0xC0000218
-#define NT_STATUS_DEBUG_ATTACH_FAILED 0xC0000219
-#define NT_STATUS_SYSTEM_PROCESS_TERMINATED 0xC000021a
-#define NT_STATUS_DATA_NOT_ACCEPTED 0xC000021b
-#define NT_STATUS_NO_BROWSER_SERVERS_FOUND 0xC000021c
-#define NT_STATUS_VDM_HARD_ERROR 0xC000021d
-#define NT_STATUS_DRIVER_CANCEL_TIMEOUT 0xC000021e
-#define NT_STATUS_REPLY_MESSAGE_MISMATCH 0xC000021f
-#define NT_STATUS_MAPPED_ALIGNMENT 0xC0000220
-#define NT_STATUS_IMAGE_CHECKSUM_MISMATCH 0xC0000221
-#define NT_STATUS_LOST_WRITEBEHIND_DATA 0xC0000222
-#define NT_STATUS_CLIENT_SERVER_PARAMETERS_INVALID 0xC0000223
-#define NT_STATUS_PASSWORD_MUST_CHANGE 0xC0000224
-#define NT_STATUS_NOT_FOUND 0xC0000225
-#define NT_STATUS_NOT_TINY_STREAM 0xC0000226
-#define NT_STATUS_RECOVERY_FAILURE 0xC0000227
-#define NT_STATUS_STACK_OVERFLOW_READ 0xC0000228
-#define NT_STATUS_FAIL_CHECK 0xC0000229
-#define NT_STATUS_DUPLICATE_OBJECTID 0xC000022a
-#define NT_STATUS_OBJECTID_EXISTS 0xC000022b
-#define NT_STATUS_CONVERT_TO_LARGE 0xC000022c
-#define NT_STATUS_RETRY 0xC000022d
-#define NT_STATUS_FOUND_OUT_OF_SCOPE 0xC000022e
-#define NT_STATUS_ALLOCATE_BUCKET 0xC000022f
-#define NT_STATUS_PROPSET_NOT_FOUND 0xC0000230
-#define NT_STATUS_MARSHALL_OVERFLOW 0xC0000231
-#define NT_STATUS_INVALID_VARIANT 0xC0000232
-#define NT_STATUS_DOMAIN_CONTROLLER_NOT_FOUND 0xC0000233
-#define NT_STATUS_ACCOUNT_LOCKED_OUT 0xC0000234
-#define NT_STATUS_HANDLE_NOT_CLOSABLE 0xC0000235
-#define NT_STATUS_CONNECTION_REFUSED 0xC0000236
-#define NT_STATUS_GRACEFUL_DISCONNECT 0xC0000237
-#define NT_STATUS_ADDRESS_ALREADY_ASSOCIATED 0xC0000238
-#define NT_STATUS_ADDRESS_NOT_ASSOCIATED 0xC0000239
-#define NT_STATUS_CONNECTION_INVALID 0xC000023a
-#define NT_STATUS_CONNECTION_ACTIVE 0xC000023b
-#define NT_STATUS_NETWORK_UNREACHABLE 0xC000023c
-#define NT_STATUS_HOST_UNREACHABLE 0xC000023d
-#define NT_STATUS_PROTOCOL_UNREACHABLE 0xC000023e
-#define NT_STATUS_PORT_UNREACHABLE 0xC000023f
-#define NT_STATUS_REQUEST_ABORTED 0xC0000240
-#define NT_STATUS_CONNECTION_ABORTED 0xC0000241
-#define NT_STATUS_BAD_COMPRESSION_BUFFER 0xC0000242
-#define NT_STATUS_USER_MAPPED_FILE 0xC0000243
-#define NT_STATUS_AUDIT_FAILED 0xC0000244
-#define NT_STATUS_TIMER_RESOLUTION_NOT_SET 0xC0000245
-#define NT_STATUS_CONNECTION_COUNT_LIMIT 0xC0000246
-#define NT_STATUS_LOGIN_TIME_RESTRICTION 0xC0000247
-#define NT_STATUS_LOGIN_WKSTA_RESTRICTION 0xC0000248
-#define NT_STATUS_IMAGE_MP_UP_MISMATCH 0xC0000249
-#define NT_STATUS_INSUFFICIENT_LOGON_INFO 0xC0000250
-#define NT_STATUS_BAD_DLL_ENTRYPOINT 0xC0000251
-#define NT_STATUS_BAD_SERVICE_ENTRYPOINT 0xC0000252
-#define NT_STATUS_LPC_REPLY_LOST 0xC0000253
-#define NT_STATUS_IP_ADDRESS_CONFLICT1 0xC0000254
-#define NT_STATUS_IP_ADDRESS_CONFLICT2 0xC0000255
-#define NT_STATUS_REGISTRY_QUOTA_LIMIT 0xC0000256
-#define NT_STATUS_PATH_NOT_COVERED 0xC0000257
-#define NT_STATUS_NO_CALLBACK_ACTIVE 0xC0000258
-#define NT_STATUS_LICENSE_QUOTA_EXCEEDED 0xC0000259
-#define NT_STATUS_PWD_TOO_SHORT 0xC000025a
-#define NT_STATUS_PWD_TOO_RECENT 0xC000025b
-#define NT_STATUS_PWD_HISTORY_CONFLICT 0xC000025c
-#define NT_STATUS_PLUGPLAY_NO_DEVICE 0xC000025e
-#define NT_STATUS_UNSUPPORTED_COMPRESSION 0xC000025f
-#define NT_STATUS_INVALID_HW_PROFILE 0xC0000260
-#define NT_STATUS_INVALID_PLUGPLAY_DEVICE_PATH 0xC0000261
-#define NT_STATUS_DRIVER_ORDINAL_NOT_FOUND 0xC0000262
-#define NT_STATUS_DRIVER_ENTRYPOINT_NOT_FOUND 0xC0000263
-#define NT_STATUS_RESOURCE_NOT_OWNED 0xC0000264
-#define NT_STATUS_TOO_MANY_LINKS 0xC0000265
-#define NT_STATUS_QUOTA_LIST_INCONSISTENT 0xC0000266
-#define NT_STATUS_FILE_IS_OFFLINE 0xC0000267
-#define NT_STATUS_NOT_A_REPARSE_POINT 0xC0000275
-#define NT_STATUS_NO_SUCH_JOB 0xC0000EDE
-
-#define WERR_OK 0
-#define WERR_BADFUNC 1
-#define WERR_BADFILE 2
-#define WERR_ACCESS_DENIED 5
-#define WERR_BADFID 6
-#define WERR_NOMEM 8
-#define WERR_GENERAL_FAILURE 31
-#define WERR_NOT_SUPPORTED 50
-#define WERR_BAD_NETPATH 53
-#define WERR_PRINTQ_FULL 61
-#define WERR_NO_SPOOL_SPACE 62
-#define WERR_NO_SUCH_SHARE 67
-#define WERR_ALREADY_EXISTS 80
-#define WERR_BAD_PASSWORD 86
-#define WERR_INVALID_PARAM 87
-#define WERR_INSUFFICIENT_BUFFER 122
-#define WERR_INVALID_NAME 123
-#define WERR_UNKNOWN_LEVEL 124
-#define WERR_OBJECT_PATH_INVALID 161
-#define WERR_NO_MORE_ITEMS 259
-#define WERR_MORE_DATA 234
-#define WERR_INVALID_OWNER 1307
-#define WERR_CAN_NOT_COMPLETE 1003
-#define WERR_INVALID_SECURITY_DESCRIPTOR 1338
-#define WERR_SERVER_UNAVAILABLE 1722
-#define WERR_UNKNOWN_PRINTER_DRIVER 1797
-#define WERR_INVALID_ENVIRONMENT 1805
-#define WERR_INVALID_FORM_NAME 1902
-#define WERR_INVALID_FORM_SIZE 1903
-#define WERR_BUF_TOO_SMALL 2123
-#define WERR_JOB_NOT_FOUND 2151
-#define WERR_DEST_NOT_FOUND 2152
-#define WERR_NOT_LOCAL_DOMAIN 2320
-#define WERR_STATUS_MORE_ENTRIES 0x0105
diff --git a/source4/scripting/swig/torture/pytorture b/source4/scripting/swig/torture/pytorture
deleted file mode 100755
index e0123447e8..0000000000
--- a/source4/scripting/swig/torture/pytorture
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/usr/bin/python
-
-import sys
-from optparse import OptionParser
-
-# Parse command line
-
-parser = OptionParser()
-
-parser.add_option("-b", "--binding", action="store", type="string",
-                  dest="binding")
-
-parser.add_option("-d", "--domain", action="store", type="string",
-                  dest="domain")
-
-parser.add_option("-u", "--username", action="store", type="string",
-                  dest="username")
-
-parser.add_option("-p", "--password", action="store", type="string",
-                  dest="password")
-
-(options, args) = parser.parse_args()
-
-if not options.binding:
-   parser.error('You must supply a binding string')
-
-if not options.username or not options.password or not options.domain:
-   parser.error('You must supply a domain, username and password')
-
-binding = options.binding
-domain = options.domain
-username = options.username
-password = options.password
-
-if len(args) == 0:
-   parser.error('You must supply the name of a module to test')
-
-# Import and test
-
-for test in args:
-
-   try:
-      module = __import__('torture_%s' % test)
-   except ImportError:
-      print 'No such module "%s"' % test
-      sys.exit(1)
-
-   if not hasattr(module, 'runtests'):
-      print 'Module "%s" does not have a runtests function' % test
-
-   module.runtests(binding, (domain, username, password))
diff --git a/source4/scripting/swig/torture/spoolss.py b/source4/scripting/swig/torture/spoolss.py
deleted file mode 100644
index a75385e079..0000000000
--- a/source4/scripting/swig/torture/spoolss.py
+++ /dev/null
@@ -1,437 +0,0 @@
-import sys, string
-import dcerpc
-
-
-def ResizeBufferCall(fn, pipe, r):
-
-    r['buffer'] = None
-    r['buf_size'] = 0
-    
-    result = fn(pipe, r)
-
-    if result['result'] == dcerpc.WERR_INSUFFICIENT_BUFFER or \
-       result['result'] == dcerpc.WERR_MORE_DATA:
-        r['buffer'] = result['buf_size'] * '\x00'
-        r['buf_size'] = result['buf_size']
-
-    result = fn(pipe, r)
-
-    return result
-
-
-def test_OpenPrinterEx(pipe, printer):
-
-    print 'spoolss_OpenPrinterEx(%s)' % printer
-
-    printername = '\\\\%s' % dcerpc.dcerpc_server_name(pipe)
-    
-    if printer is not None:
-        printername = printername + '\\%s' % printer
-
-    r = {}
-    r['printername'] = printername
-    r['datatype'] = None
-    r['devmode_ctr'] = {}
-    r['devmode_ctr']['size'] = 0
-    r['devmode_ctr']['devmode'] = None
-    r['access_mask'] = 0x02000000
-    r['level'] = 1
-    r['userlevel'] = {}
-    r['userlevel']['level1'] = {}
-    r['userlevel']['level1']['size'] = 0
-    r['userlevel']['level1']['client'] = None
-    r['userlevel']['level1']['user'] = None
-    r['userlevel']['level1']['build'] = 1381
-    r['userlevel']['level1']['major'] = 2
-    r['userlevel']['level1']['minor'] = 0
-    r['userlevel']['level1']['processor'] = 0
-
-    result = dcerpc.spoolss_OpenPrinterEx(pipe, r)
-
-    return result['handle']
-
-
-def test_ClosePrinter(pipe, handle):
-
-    r = {}
-    r['handle'] = handle
-
-    dcerpc.spoolss_ClosePrinter(pipe, r)
-
-
-def test_GetPrinter(pipe, handle):
-
-    r = {}
-    r['handle'] = handle
-
-    for level in [0, 1, 2, 3, 4, 5, 6, 7]:
-
-        print 'spoolss_GetPrinter(level = %d)' % level
-
-        r['level'] = level
-        r['buffer'] = None
-        r['buf_size'] = 0
-
-        result = ResizeBufferCall(dcerpc.spoolss_GetPrinter, pipe, r)
-
-
-def test_EnumForms(pipe, handle):
-
-    print 'spoolss_EnumForms()'
-
-    r = {}
-    r['handle'] = handle
-    r['level'] = 1
-    r['buffer'] = None
-    r['buf_size'] = 0
-
-    result = ResizeBufferCall(dcerpc.spoolss_EnumForms, pipe, r)
-
-    forms = dcerpc.unmarshall_spoolss_FormInfo_array(
-        result['buffer'], r['level'], result['count'])
-
-    for form in forms:
-
-        r = {}
-        r['handle'] = handle
-        r['formname'] = form['info1']['formname']
-        r['level'] = 1
-
-        result = ResizeBufferCall(dcerpc.spoolss_GetForm, pipe, r)
-
-
-def test_EnumPorts(pipe, handle):
-
-    print 'spoolss_EnumPorts()'
-
-    for level in [1, 2]:
-
-        r = {}
-        r['handle'] = handle
-        r['servername'] = None
-        r['level'] = level
-
-        result = ResizeBufferCall(dcerpc.spoolss_EnumPorts, pipe, r)
-
-        ports = dcerpc.unmarshall_spoolss_PortInfo_array(
-            result['buffer'], r['level'], result['count'])
-
-        if level == 1:
-            port_names = map(lambda x: x['info1']['port_name'], ports)
-
-
-def test_DeleteForm(pipe, handle, formname):
-
-    r = {}
-    r['handle'] = handle
-    r['formname'] = formname
-
-    dcerpc.spoolss_DeleteForm(pipe, r)
-
-
-def test_GetForm(pipe, handle, formname):
-
-    r = {}
-    r['handle'] = handle
-    r['formname'] = formname
-    r['level'] = 1
-
-    result = ResizeBufferCall(dcerpc.spoolss_GetForm, pipe, r)
-
-    return result['info']['info1']
-    
-
-def test_SetForm(pipe, handle, form):
-
-    print 'spoolss_SetForm()'
-
-    r = {}
-    r['handle'] = handle
-    r['level'] = 1
-    r['formname'] = form['info1']['formname']
-    r['info'] = form
-
-    dcerpc.spoolss_SetForm(pipe, r)
-
-    newform = test_GetForm(pipe, handle, r['formname'])
-
-    if form['info1'] != newform:
-        print 'SetForm: mismatch: %s != %s' % \
-              (r['info']['info1'], f)
-        sys.exit(1)
-
-
-def test_AddForm(pipe, handle):
-
-    print 'spoolss_AddForm()'
-
-    formname = '__testform__'
-
-    r = {}
-    r['handle'] = handle
-    r['level'] = 1
-    r['info'] = {}
-    r['info']['info1'] = {}
-    r['info']['info1']['formname'] = formname
-    r['info']['info1']['flags'] = 0x0002
-    r['info']['info1']['width'] = 100
-    r['info']['info1']['length'] = 100
-    r['info']['info1']['left'] = 0
-    r['info']['info1']['top'] = 1000
-    r['info']['info1']['right'] = 2000
-    r['info']['info1']['bottom'] = 3000
-
-    try:
-        result = dcerpc.spoolss_AddForm(pipe, r)
-    except dcerpc.WERROR, arg:
-        if arg[0] == dcerpc.WERR_ALREADY_EXISTS:
-            test_DeleteForm(pipe, handle, formname)
-        result = dcerpc.spoolss_AddForm(pipe, r)
-
-    f = test_GetForm(pipe, handle, formname)
-
-    if r['info']['info1'] != f:
-        print 'AddForm: mismatch: %s != %s' % \
-              (r['info']['info1'], f)
-        sys.exit(1)
-
-    r['formname'] = formname
-
-    test_SetForm(pipe, handle, r['info'])
-
-    test_DeleteForm(pipe, handle, formname)
-
-
-def test_EnumJobs(pipe, handle):
-
-    print 'spoolss_EnumJobs()'
-
-    r = {}
-    r['handle'] = handle
-    r['firstjob'] = 0
-    r['numjobs'] = 0xffffffff
-    r['level'] = 1
-
-    result = ResizeBufferCall(dcerpc.spoolss_EnumJobs, pipe, r)
-
-    if result['buffer'] is None:
-        return
-    
-    jobs = dcerpc.unmarshall_spoolss_JobInfo_array(
-        result['buffer'], r['level'], result['count'])
-
-    for job in jobs:
-
-        s = {}
-        s['handle'] = handle
-        s['job_id'] = job['info1']['job_id']
-        s['level'] = 1
-
-        result = ResizeBufferCall(dcerpc.spoolss_GetJob, pipe, s)
-
-        if result['info'] != job:
-            print 'EnumJobs: mismatch: %s != %s' % (result['info'], job)
-            sys.exit(1)
-    
-
-    # TODO: AddJob, DeleteJob, ScheduleJob
-
-
-def test_EnumPrinterData(pipe, handle):
-
-    print 'test_EnumPrinterData()'
-
-    enum_index = 0
-
-    while 1:
-
-        r = {}
-        r['handle'] = handle
-        r['enum_index'] = enum_index
-
-        r['value_offered'] = 0
-        r['data_size'] = 0
-        
-        result = dcerpc.spoolss_EnumPrinterData(pipe, r)
-
-        r['value_offered'] = result['value_needed']
-        r['data_size'] = result['data_size']
-
-        result = dcerpc.spoolss_EnumPrinterData(pipe, r)
-
-        if result['result'] == dcerpc.WERR_NO_MORE_ITEMS:
-            break
-
-        s = {}
-        s['handle'] = handle
-        s['value_name'] = result['value_name']
-
-        result2 = ResizeBufferCall(dcerpc.spoolss_GetPrinterData, pipe, s)
-
-        if result['buffer'][:result2['buf_size']] != result2['buffer']:
-            print 'EnumPrinterData/GetPrinterData mismatch'
-            sys.exit(1)
- 
-        enum_index += 1
-
-
-def test_SetPrinterDataEx(pipe, handle):
-
-    valuename = '__printerdataextest__'
-    data = '12345'
-
-    r = {}
-    r['handle'] = handle
-    r['key_name'] = 'DsSpooler'
-    r['value_name'] = valuename
-    r['type'] = 3
-    r['buffer'] = data
-    r['buf_size'] = len(data)
-    
-    result = dcerpc.spoolss_SetPrinterDataEx(pipe, r)
-
-
-def test_EnumPrinterDataEx(pipe, handle):
-
-    r = {}
-    r['handle'] = handle
-    r['key_name'] = 'DsSpooler'
-    r['buf_size'] = 0
-
-    result = dcerpc.spoolss_EnumPrinterDataEx(pipe, r)
-
-    if result['result'] == dcerpc.WERR_MORE_DATA:
-        r['buf_size'] = result['buf_size']
-
-        result = dcerpc.spoolss_EnumPrinterDataEx(pipe, r)
-
-    # TODO: test spoolss_GetPrinterDataEx()
-
-
-def test_SetPrinterData(pipe, handle):
-
-    print 'testing spoolss_SetPrinterData()'
-
-    valuename = '__printerdatatest__'
-    data = '12345'
-    
-    r = {}
-    r['handle'] = handle
-    r['value_name'] = valuename
-    r['type'] = 3                       # REG_BINARY
-    r['buffer'] = data
-    r['real_len'] = 5
-
-    dcerpc.spoolss_SetPrinterData(pipe, r)
-
-    s = {}
-    s['handle'] = handle
-    s['value_name'] = valuename
-
-    result = ResizeBufferCall(dcerpc.spoolss_GetPrinterData, pipe, r)
-
-    if result['buffer'] != data:
-        print 'SetPrinterData: mismatch'
-        sys.exit(1)
-
-    dcerpc.spoolss_DeletePrinterData(pipe, r)
-
-
-def test_EnumPrinters(pipe):
-
-    print 'testing spoolss_EnumPrinters()'
-
-    printer_names = None
-
-    r = {}
-    r['flags'] = 0x02
-    r['server'] = None
-
-    for level in [0, 1, 2, 4, 5]:
-
-        print 'test_EnumPrinters(level = %d)' % level
-
-        r['level'] = level
-
-        result = ResizeBufferCall(dcerpc.spoolss_EnumPrinters, pipe, r)
-
-        printers = dcerpc.unmarshall_spoolss_PrinterInfo_array(
-            result['buffer'], r['level'], result['count'])
-
-        if level == 2:
-            for p in printers:
-
-                # A nice check is for the specversion in the
-                # devicemode.  This has always been observed to be
-                # 1025.
-
-                if p['info2']['devmode']['specversion'] != 1025:
-                    print 'test_EnumPrinters: specversion != 1025'
-                    sys.exit(1)
-
-    r['level'] = 1
-    result = ResizeBufferCall(dcerpc.spoolss_EnumPrinters, pipe, r)
-    
-    for printer in dcerpc.unmarshall_spoolss_PrinterInfo_array(
-        result['buffer'], r['level'], result['count']):
-
-        if string.find(printer['info1']['name'], '\\\\') == 0:
-            print 'Skipping remote printer %s' % printer['info1']['name']
-            continue
-
-        printername = string.split(printer['info1']['name'], ',')[0]
-
-        handle = test_OpenPrinterEx(pipe, printername)
-
-        test_GetPrinter(pipe, handle)
-        test_EnumPorts(pipe, handle)
-        test_EnumForms(pipe, handle)
-        test_AddForm(pipe, handle)
-        test_EnumJobs(pipe, handle)
-        test_EnumPrinterData(pipe, handle)
-        test_EnumPrinterDataEx(pipe, handle)
-        test_SetPrinterData(pipe, handle)
-#       test_SetPrinterDataEx(pipe, handle)
-        test_ClosePrinter(pipe, handle)
-
-
-def test_EnumPrinterDrivers(pipe):
-
-    print 'test spoolss_EnumPrinterDrivers()'
-
-    for level in [1, 2, 3]:
-
-        r = {}
-        r['server'] = None
-        r['environment'] = None
-        r['level'] = level
-
-        result = ResizeBufferCall(dcerpc.spoolss_EnumPrinterDrivers, pipe, r)
-
-        drivers = dcerpc.unmarshall_spoolss_DriverInfo_array(
-            result['buffer'], r['level'], result['count'])
-
-        if level == 1:
-            driver_names = map(lambda x: x['info1']['driver_name'], drivers)
-            
-
-def test_PrintServer(pipe):
-    
-    handle = test_OpenPrinterEx(pipe, None)
-
-    # EnumForms and AddForm tests return WERR_BADFID here (??)
-
-    test_ClosePrinter(pipe, handle)
-    
-
-def runtests(binding, domain, username, password):
-    
-    print 'Testing SPOOLSS pipe'
-
-    pipe = dcerpc.pipe_connect(binding,
-            dcerpc.DCERPC_SPOOLSS_UUID, dcerpc.DCERPC_SPOOLSS_VERSION,
-            domain, username, password)
-
-    test_EnumPrinters(pipe)
-    test_EnumPrinterDrivers(pipe)
-    test_PrintServer(pipe)
diff --git a/source4/scripting/swig/torture/torture_samr.py b/source4/scripting/swig/torture/torture_samr.py
deleted file mode 100755
index 15c6dc1a76..0000000000
--- a/source4/scripting/swig/torture/torture_samr.py
+++ /dev/null
@@ -1,221 +0,0 @@
-#!/usr/bin/python
-
-import sys
-import dcerpc, samr
-
-def test_Connect(pipe):
-
-    handle = samr.Connect(pipe)
-    handle = samr.Connect2(pipe)
-    handle = samr.Connect3(pipe)
-    handle = samr.Connect4(pipe)
-
-    # WIN2K3 only?
-    
-    try:
-        handle = samr.Connect5(pipe)
-    except dcerpc.NTSTATUS, arg:
-        if arg[0] != 0xc00000d2L:       # NT_STATUS_NET_WRITE_FAULT
-            raise
-
-    return handle
-    
-def test_UserHandle(user_handle):
-
-    # QuerySecurity()/SetSecurity()
-
-    user_handle.SetSecurity(user_handle.QuerySecurity())
-
-    # GetUserPwInfo()
-
-    user_handle.GetUserPwInfo()
-
-    # GetUserInfo()
-
-    for level in [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 16, 17, 20,
-                  21, 23, 24, 25, 26]:
-
-        try:
-            user_handle.QueryUserInfo(level)
-            user_handle.QueryUserInfo2(level)
-        except dcerpc.NTSTATUS, arg:
-            if arg[0] != 0xc0000003L:   # NT_STATUS_INVALID_INFO_CLASS
-                raise
-
-    # GetGroupsForUser()
-
-    user_handle.GetGroupsForUser()
-
-    # TestPrivateFunctionsUser()
-
-    try:
-        user_handle.TestPrivateFunctionsUser()
-    except dcerpc.NTSTATUS, arg:
-        if arg[0] != 0xC0000002L:
-            raise
-
-def test_GroupHandle(group_handle):
-
-    # QuerySecurity()/SetSecurity()
-
-    group_handle.SetSecurity(group_handle.QuerySecurity())
-
-    # QueryGroupInfo()
-
-    for level in [1, 2, 3, 4, 5]:
-        info = group_handle.QueryGroupInfo(level)
-
-    # TODO: SetGroupinfo()
-
-    # QueryGroupMember()
-
-    group_handle.QueryGroupMember()
-
-def test_AliasHandle(alias_handle):
-
-    # QuerySecurity()/SetSecurity()
-
-    alias_handle.SetSecurity(alias_handle.QuerySecurity())
-
-    print alias_handle.GetMembersInAlias()
-
-def test_DomainHandle(name, sid, domain_handle):
-
-    print 'testing %s (%s)' % (name, sid)
-
-    # QuerySecurity()/SetSecurity()
-
-    domain_handle.SetSecurity(domain_handle.QuerySecurity())
-
-    # LookupNames(), none mapped
-
-    try:
-        domain_handle.LookupNames(['xxNONAMExx'])
-    except dcerpc.NTSTATUS, arg:
-        if arg[0] != 0xc0000073L:
-            raise dcerpc.NTSTATUS(arg)
-
-    # LookupNames(), some mapped
-
-    if name != 'Builtin':
-        domain_handle.LookupNames(['Administrator', 'xxNONAMExx'])
-
-    # QueryDomainInfo()/SetDomainInfo()
-
-    levels = [1, 2, 3, 4, 5, 6, 7, 8, 9, 11, 12, 13]
-    set_ok = [1, 0, 1, 1, 0, 1, 1, 0, 1,  0,  1,  0]
-    
-    for i in range(len(levels)):
-
-        info = domain_handle.QueryDomainInfo(level = levels[i])
-
-        try:
-            domain_handle.SetDomainInfo(levels[i], info)
-        except dcerpc.NTSTATUS, arg:
-            if not (arg[0] == 0xc0000003L and not set_ok[i]):
-                raise
-
-    # QueryDomainInfo2()
-
-    levels = [1, 2, 3, 4, 5, 6, 7, 8, 9, 11, 12, 13]
-
-    for i in range(len(levels)):
-        domain_handle.QueryDomainInfo2(level = levels[i])
-
-    # EnumDomainUsers
-
-    print 'testing users'
-
-    users = domain_handle.EnumDomainUsers()
-    rids = domain_handle.LookupNames(users)
-    
-    for i in range(len(users)):
-        test_UserHandle(domain_handle.OpenUser(rids[0][i]))
-    
-    # QueryDisplayInfo
-
-    for i in [1, 2, 3, 4, 5]:
-        domain_handle.QueryDisplayInfo(level = i)
-        domain_handle.QueryDisplayInfo2(level = i)
-        domain_handle.QueryDisplayInfo3(level = i)
-            
-    # EnumDomainGroups
-
-    print 'testing groups'
-
-    groups = domain_handle.EnumDomainGroups()
-    rids = domain_handle.LookupNames(groups)
-
-    for i in range(len(groups)):
-        test_GroupHandle(domain_handle.OpenGroup(rids[0][i]))
-
-    # EnumDomainAliases
-
-    print 'testing aliases'
-
-    aliases = domain_handle.EnumDomainAliases()
-    rids = domain_handle.LookupNames(aliases)
-
-    for i in range(len(aliases)):
-        test_AliasHandle(domain_handle.OpenAlias(rids[0][i]))
-    
-    # CreateUser
-    # CreateUser2
-    # CreateDomAlias
-    # RidToSid
-    # RemoveMemberFromForeignDomain
-    # CreateDomainGroup
-    # GetAliasMembership
-
-    # GetBootKeyInformation()
-
-    try:
-        domain_handle.GetBootKeyInformation()
-    except dcerpc.NTSTATUS, arg:
-        pass
-
-    # TestPrivateFunctionsDomain()
-
-    try:
-        domain_handle.TestPrivateFunctionsDomain()
-    except dcerpc.NTSTATUS, arg:
-        if arg[0] != 0xC0000002L:
-            raise
-
-def test_ConnectHandle(connect_handle):
-
-    print 'testing connect handle'
-
-    # QuerySecurity/SetSecurity
-
-    connect_handle.SetSecurity(connect_handle.QuerySecurity())
-
-    # Lookup bogus domain
-
-    try:
-        connect_handle.LookupDomain('xxNODOMAINxx')
-    except dcerpc.NTSTATUS, arg:
-        if arg[0] != 0xC00000DFL:          # NT_STATUS_NO_SUCH_DOMAIN
-            raise
-
-    # Test all domains
-
-    for domain_name in connect_handle.EnumDomains():
-
-        connect_handle.GetDomPwInfo(domain_name)
-        sid = connect_handle.LookupDomain(domain_name)
-        domain_handle = connect_handle.OpenDomain(sid)
-
-        test_DomainHandle(domain_name, sid, domain_handle)
-
-    # TODO: Test Shutdown() function
-
-def runtests(binding, creds):
-
-    print 'Testing SAMR pipe'
-
-    pipe = dcerpc.pipe_connect(binding,
-            dcerpc.DCERPC_SAMR_UUID, int(dcerpc.DCERPC_SAMR_VERSION), creds)
-
-    handle = test_Connect(pipe)
-    test_ConnectHandle(handle)
diff --git a/source4/scripting/swig/torture/torture_tdb.py b/source4/scripting/swig/torture/torture_tdb.py
deleted file mode 100755
index 7f97caf6cb..0000000000
--- a/source4/scripting/swig/torture/torture_tdb.py
+++ /dev/null
@@ -1,90 +0,0 @@
-#!/usr/bin/python
-
-import sys, os
-import Tdb
-
-def fail(msg):
-    print 'FAILED:', msg
-    sys.exit(1)
-
-tdb_file = '/tmp/torture_tdb.tdb'
-
-# Create temporary tdb file
-
-t = Tdb.Tdb(tdb_file, flags = Tdb.CLEAR_IF_FIRST)
-
-# Check non-existent key throws KeyError exception
-
-try:
-    t['__none__']
-except KeyError:
-    pass
-else:
-    fail('non-existent key did not throw KeyError')
-
-# Check storing key
-
-t['bar'] = '1234'
-if t['bar'] != '1234':
-    fail('store key failed')
-
-# Check key exists
-
-if not t.has_key('bar'):
-    fail('has_key() failed for existing key')
-
-if t.has_key('__none__'):
-    fail('has_key() succeeded for non-existent key')
-
-# Delete key
-
-try:
-    del(t['__none__'])
-except KeyError:
-    pass
-else:
-    fail('delete of non-existent key did not throw KeyError')
-
-del t['bar']
-if t.has_key('bar'):
-    fail('delete of existing key did not delete key')
-
-# Clear all keys
-
-t.clear()
-if len(t) != 0:
-    fail('clear failed to remove all keys')
-
-# Other dict functions
-
-t['a'] = '1'
-t['ab'] = '12'
-t['abc'] = '123'
-
-if len(t) != 3:
-    fail('len method produced wrong value')
-
-keys = t.keys()
-values = t.values()
-items = t.items()
-
-if set(keys) != set(['a', 'ab', 'abc']):
-    fail('keys method produced wrong values')
-
-if set(values) != set(['1', '12', '123']):
-    fail('values method produced wrong values')
-
-if set(items) != set([('a', '1'), ('ab', '12'), ('abc', '123')]):
-    fail('values method produced wrong values')
-
-t.close()
-
-# Re-open read-only
-
-t = Tdb.Tdb(tdb_file, open_flags = os.O_RDONLY)
-t.keys()
-t.close()
-
-# Clean up
-
-os.unlink(tdb_file)
diff --git a/source4/scripting/swig/torture/winreg.py b/source4/scripting/swig/torture/winreg.py
deleted file mode 100755
index eb60b9847e..0000000000
--- a/source4/scripting/swig/torture/winreg.py
+++ /dev/null
@@ -1,165 +0,0 @@
-#!/usr/bin/python
-
-import sys, dcerpc
-
-def test_OpenHKLM(pipe):
-
-    r = {}
-    r['unknown'] = {}
-    r['unknown']['unknown0'] = 0x9038
-    r['unknown']['unknown1'] = 0x0000
-    r['access_required'] = 0x02000000
-
-    result = dcerpc.winreg_OpenHKLM(pipe, r)
-
-    return result['handle']
-
-def test_QueryInfoKey(pipe, handle):
-
-    r = {}
-    r['handle'] = handle
-    r['class'] = {}
-    r['class']['name'] = None
-
-    return dcerpc.winreg_QueryInfoKey(pipe, r)
-
-def test_CloseKey(pipe, handle):
-
-    r = {}
-    r['handle'] = handle
-
-    dcerpc.winreg_CloseKey(pipe, r)
-
-def test_FlushKey(pipe, handle):
-
-    r = {}
-    r['handle'] = handle
-    
-    dcerpc.winreg_FlushKey(pipe, r)
-
-def test_GetVersion(pipe, handle):
-
-    r = {}
-    r['handle'] = handle
-    
-    dcerpc.winreg_GetVersion(pipe, r)
-
-def test_GetKeySecurity(pipe, handle):
-
-    r = {}
-    r['handle'] = handle
-    r['unknown'] = 4
-    r['size'] = None
-    r['data'] = {}
-    r['data']['max_len'] = 0
-    r['data']['data'] = ''
-
-    result = dcerpc.winreg_GetKeySecurity(pipe, r)
-
-    print result
-
-    if result['result'] == dcerpc.WERR_INSUFFICIENT_BUFFER:
-        r['size'] = {}
-        r['size']['max_len'] = result['data']['max_len']
-        r['size']['offset'] = 0
-        r['size']['len'] = result['data']['max_len']
-
-        result = dcerpc.winreg_GetKeySecurity(pipe, r)
-
-    print result
-
-    sys.exit(1)
-    
-def test_Key(pipe, handle, name, depth = 0):
-
-    # Don't descend too far.  Registries can be very deep.
-
-    if depth > 2:
-        return
-
-    try:
-        keyinfo = test_QueryInfoKey(pipe, handle)
-    except dcerpc.WERROR, arg:
-        if arg[0] == dcerpc.WERR_ACCESS_DENIED:
-            return
-
-    test_GetVersion(pipe, handle)
-
-    test_FlushKey(pipe, handle)
-
-    test_GetKeySecurity(pipe, handle)
-
-    # Enumerate values in this key
-
-    r = {}
-    r['handle'] = handle
-    r['name_in'] = {}
-    r['name_in']['len'] = 0
-    r['name_in']['max_len'] = (keyinfo['max_valnamelen'] + 1) * 2
-    r['name_in']['buffer'] = {}
-    r['name_in']['buffer']['max_len'] = keyinfo['max_valnamelen']  + 1
-    r['name_in']['buffer']['offset'] = 0
-    r['name_in']['buffer']['len'] = 0
-    r['type'] = 0
-    r['value_in'] = {}
-    r['value_in']['max_len'] = keyinfo['max_valbufsize']
-    r['value_in']['offset'] = 0
-    r['value_in']['len'] = 0
-    r['value_len1'] = keyinfo['max_valbufsize']
-    r['value_len2'] = 0
-    
-    for i in range(0, keyinfo['num_values']):
-
-        r['enum_index'] = i
-
-        dcerpc.winreg_EnumValue(pipe, r)
-
-    # Recursively test subkeys of this key
-
-    r = {}
-    r['handle'] = handle
-    r['key_name_len'] = 0
-    r['unknown'] = 0x0414
-    r['in_name'] = {}
-    r['in_name']['unknown'] = 0x20a
-    r['in_name']['key_name'] = {}
-    r['in_name']['key_name']['name'] = None
-    r['class'] = {}
-    r['class']['name'] = None
-    r['last_changed_time'] = {}
-    r['last_changed_time']['low'] = 0
-    r['last_changed_time']['high'] = 0
-
-    for i in range(0, keyinfo['num_subkeys']):
-
-        r['enum_index'] = i
-
-        subkey = dcerpc.winreg_EnumKey(pipe, r)
-
-        s = {}
-        s['handle'] = handle
-        s['keyname'] = {}
-        s['keyname']['name'] = subkey['out_name']['name']
-        s['unknown'] = 0
-        s['access_mask'] = 0x02000000
-
-        result = dcerpc.winreg_OpenKey(pipe, s)
-
-        test_Key(pipe, result['handle'], name + '/' + s['keyname']['name'],
-                 depth + 1)
-
-        test_CloseKey(pipe, result['handle'])
-
-    # Enumerate values
-
-def runtests(binding, domain, username, password):
-    
-    print 'Testing WINREG pipe'
-
-    pipe = dcerpc.pipe_connect(binding,
-            dcerpc.DCERPC_WINREG_UUID, dcerpc.DCERPC_WINREG_VERSION,
-            domain, username, password)
-
-    handle = test_OpenHKLM(pipe)
-
-    test_Key(pipe, handle, 'HKLM')
-- 
cgit 


From 29cf3a93cc8a67edcf307ba944bb3d5f90a3d55a Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Wed, 21 Nov 2007 13:22:54 +0100
Subject: r26089: Move python detection to a separate file, and don't make it
 an error if it isn't available. (This used to be commit
 4e7709379de2fb9bf1eafd9ee9cbe10a0e6df51e)

---
 source4/scripting/python/config.m4 | 117 +++++++++++++++++++++++++++++++++++++
 1 file changed, 117 insertions(+)
 create mode 100644 source4/scripting/python/config.m4

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/config.m4 b/source4/scripting/python/config.m4
new file mode 100644
index 0000000000..36bf8a6049
--- /dev/null
+++ b/source4/scripting/python/config.m4
@@ -0,0 +1,117 @@
+AC_ARG_VAR([PYTHON_VERSION],[The installed Python
+	version to use, for example '2.3'. This string 
+	will be appended to the Python interpreter
+	canonical name.])
+
+AC_PATH_PROG([PYTHON],[python[$PYTHON_VERSION]])
+if test -z "$PYTHON"; then
+	AC_MSG_WARN([No python found])
+	SMB_ENABLE(LIBPYTHON,NO)
+else
+	SMB_ENABLE(LIBPYTHON,YES)
+fi
+
+#
+# Check for a version of Python >= 2.1.0
+#
+AC_MSG_CHECKING([for a version of Python >= '2.1.0'])
+ac_supports_python_ver=`$PYTHON -c "import sys, string; \
+	ver = string.split(sys.version)[[0]]; \
+	print ver >= '2.1.0'"`
+if test "$ac_supports_python_ver" != "True"; then
+	AC_MSG_RESULT([no])
+	AC_MSG_ERROR([No recent version of python found])
+else 
+	AC_MSG_RESULT([yes])
+fi
+
+#
+# Check if you have distutils, else fail
+#
+AC_MSG_CHECKING([for the distutils Python package])
+ac_distutils_result=`$PYTHON -c "import distutils" 2>&1`
+if test -z "$ac_distutils_result"; then
+	AC_MSG_RESULT([yes])
+else
+	AC_MSG_RESULT([no])
+	AC_MSG_ERROR([distutils not available])
+fi
+
+#
+# Check for Python include path
+#
+AC_MSG_CHECKING([for Python include path])
+if test -z "$PYTHON_CPPFLAGS"; then
+	python_path=`$PYTHON -c "import distutils.sysconfig; \
+			print distutils.sysconfig.get_python_inc();"`
+	if test -n "${python_path}"; then
+		python_path="-I$python_path"
+	fi
+	PYTHON_CPPFLAGS=$python_path
+fi
+AC_MSG_RESULT([$PYTHON_CPPFLAGS])
+AC_SUBST([PYTHON_CPPFLAGS])
+
+#
+# Check for Python library path
+#
+AC_MSG_CHECKING([for Python library path])
+if test -z "$PYTHON_LDFLAGS"; then
+	# (makes two attempts to ensure we've got a version number
+	# from the interpreter)
+	py_version=`$PYTHON -c "from distutils.sysconfig import *; \
+		from string import join; \
+		print join(get_config_vars('VERSION'))"`
+	if test "$py_version" == "[None]"; then
+		if test -n "$PYTHON_VERSION"; then
+			py_version=$PYTHON_VERSION
+		else
+			py_version=`$PYTHON -c "import sys; \
+				print sys.version[[:3]]"`
+		fi
+	fi
+
+	PYTHON_LDFLAGS=`$PYTHON -c "from distutils.sysconfig import *; \
+		from string import join; \
+		print '-L' + get_python_lib(0,1), \
+			'-lpython';"`$py_version
+fi		
+AC_MSG_RESULT([$PYTHON_LDFLAGS])
+AC_SUBST([PYTHON_LDFLAGS])
+
+#
+# Check for site packages
+#
+AC_MSG_CHECKING([for Python site-packages path])
+if test -z "$PYTHON_SITE_PKG"; then
+	PYTHON_SITE_PKG=`$PYTHON -c "import distutils.sysconfig; \
+			print distutils.sysconfig.get_python_lib(0,0);"`
+fi
+AC_MSG_RESULT([$PYTHON_SITE_PKG])
+AC_SUBST([PYTHON_SITE_PKG])
+
+#
+# libraries which must be linked in when embedding
+#
+AC_MSG_CHECKING(python extra libraries)
+if test -z "$PYTHON_EXTRA_LIBS"; then
+   PYTHON_EXTRA_LIBS=`$PYTHON -c "import distutils.sysconfig; \
+			conf = distutils.sysconfig.get_config_var; \
+			print conf('LOCALMODLIBS'), conf('LIBS')"`
+fi
+AC_MSG_RESULT([$PYTHON_EXTRA_LIBS])
+AC_SUBST(PYTHON_EXTRA_LIBS)
+
+#
+# linking flags needed when embedding
+#
+AC_MSG_CHECKING(python extra linking flags)
+if test -z "$PYTHON_EXTRA_LDFLAGS"; then
+	PYTHON_EXTRA_LDFLAGS=`$PYTHON -c "import distutils.sysconfig; \
+		conf = distutils.sysconfig.get_config_var; \
+		print conf('LINKFORSHARED')"`
+fi
+AC_MSG_RESULT([$PYTHON_EXTRA_LDFLAGS])
+AC_SUBST(PYTHON_EXTRA_LDFLAGS)
+
+SMB_EXT_LIB(LIBPYTHON, [$PYTHON_LDFLAGS], [$PYTHON_CPPFLAGS])
-- 
cgit 


From dd2a4719df68519c11f115aaa8b77e7afca0a2a3 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Wed, 21 Nov 2007 14:49:32 +0100
Subject: r26096: No longer include removed header (This used to be commit
 42738301b1c88ccf46405d6c9171b3ae082423bd)

---
 source4/scripting/python/config.mk     | 2 +-
 source4/scripting/python/parammodule.c | 1 -
 source4/scripting/python/sidmodule.c   | 1 -
 3 files changed, 1 insertion(+), 3 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/config.mk b/source4/scripting/python/config.mk
index 1c9ffb20ac..b70d98d908 100644
--- a/source4/scripting/python/config.mk
+++ b/source4/scripting/python/config.mk
@@ -26,7 +26,7 @@ clean::
 	@echo "Removing SWIG output files"
 	@-rm -f bin/python/*
 	# FIXME: Remove _wrap.c files
-	#
+
 pythonmods: $(PYTHON_DSOS)
 
 PYDOCTOR_MODULES=bin/python/ldb.py bin/python/auth.py bin/python/credentials.py bin/python/registry.py
diff --git a/source4/scripting/python/parammodule.c b/source4/scripting/python/parammodule.c
index 38d312cf1d..bb7adab240 100644
--- a/source4/scripting/python/parammodule.c
+++ b/source4/scripting/python/parammodule.c
@@ -21,7 +21,6 @@
 */
 
 #include "includes.h"
-#include "scripting/python/talloc.h"
 #include "Python.h"
 #include "param/param.h"
 
diff --git a/source4/scripting/python/sidmodule.c b/source4/scripting/python/sidmodule.c
index 2b3f152e9b..4b199b1158 100644
--- a/source4/scripting/python/sidmodule.c
+++ b/source4/scripting/python/sidmodule.c
@@ -18,7 +18,6 @@
 */
 
 #include "includes.h"
-#include "scripting/python/talloc.h"
 #include "Python.h"
 #include "libcli/security/security.h"
 
-- 
cgit 


From 4e25ea3001805c9d3b573627d8d388d5d0a9b53b Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Wed, 21 Nov 2007 15:19:51 +0100
Subject: r26098: Make missing python no longer fatal. (This used to be commit
 9af2aeb22500baf65c11bc46c0051385911a8d67)

---
 source4/scripting/python/config.m4 | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/config.m4 b/source4/scripting/python/config.m4
index 36bf8a6049..0b5e174590 100644
--- a/source4/scripting/python/config.m4
+++ b/source4/scripting/python/config.m4
@@ -5,10 +5,8 @@ AC_ARG_VAR([PYTHON_VERSION],[The installed Python
 
 AC_PATH_PROG([PYTHON],[python[$PYTHON_VERSION]])
 if test -z "$PYTHON"; then
+	working_python=no
 	AC_MSG_WARN([No python found])
-	SMB_ENABLE(LIBPYTHON,NO)
-else
-	SMB_ENABLE(LIBPYTHON,YES)
 fi
 
 #
@@ -19,8 +17,8 @@ ac_supports_python_ver=`$PYTHON -c "import sys, string; \
 	ver = string.split(sys.version)[[0]]; \
 	print ver >= '2.1.0'"`
 if test "$ac_supports_python_ver" != "True"; then
+	working_python=no
 	AC_MSG_RESULT([no])
-	AC_MSG_ERROR([No recent version of python found])
 else 
 	AC_MSG_RESULT([yes])
 fi
@@ -32,9 +30,10 @@ AC_MSG_CHECKING([for the distutils Python package])
 ac_distutils_result=`$PYTHON -c "import distutils" 2>&1`
 if test -z "$ac_distutils_result"; then
 	AC_MSG_RESULT([yes])
+	working_python=yes
 else
 	AC_MSG_RESULT([no])
-	AC_MSG_ERROR([distutils not available])
+	working_python=no
 fi
 
 #
@@ -115,3 +114,11 @@ AC_MSG_RESULT([$PYTHON_EXTRA_LDFLAGS])
 AC_SUBST(PYTHON_EXTRA_LDFLAGS)
 
 SMB_EXT_LIB(LIBPYTHON, [$PYTHON_LDFLAGS], [$PYTHON_CPPFLAGS])
+
+if test x$working_python = xyes
+then
+	SMB_ENABLE(LIBPYTHON,YES)
+else
+	SMB_ENABLE(LIBPYTHON,NO)
+fi
+
-- 
cgit 


From c14de3fd893c4a44cf35c2b354e51bf7f4a81992 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Wed, 21 Nov 2007 16:04:13 +0100
Subject: r26100: Also check for SWIG. (This used to be commit
 1755adffecb8ed68047d6ad69087a680cc63ba8f)

---
 source4/scripting/python/config.m4 | 4 ++--
 source4/scripting/python/config.mk | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/config.m4 b/source4/scripting/python/config.m4
index 0b5e174590..48103a0782 100644
--- a/source4/scripting/python/config.m4
+++ b/source4/scripting/python/config.m4
@@ -3,6 +3,7 @@ AC_ARG_VAR([PYTHON_VERSION],[The installed Python
 	will be appended to the Python interpreter
 	canonical name.])
 
+AC_PATH_PROG(SWIG,swig,no)
 AC_PATH_PROG([PYTHON],[python[$PYTHON_VERSION]])
 if test -z "$PYTHON"; then
 	working_python=no
@@ -115,10 +116,9 @@ AC_SUBST(PYTHON_EXTRA_LDFLAGS)
 
 SMB_EXT_LIB(LIBPYTHON, [$PYTHON_LDFLAGS], [$PYTHON_CPPFLAGS])
 
-if test x$working_python = xyes
+if test x$working_python = xyes && test x$SWIG != xno
 then
 	SMB_ENABLE(LIBPYTHON,YES)
 else
 	SMB_ENABLE(LIBPYTHON,NO)
 fi
-
diff --git a/source4/scripting/python/config.mk b/source4/scripting/python/config.mk
index b70d98d908..c176077267 100644
--- a/source4/scripting/python/config.mk
+++ b/source4/scripting/python/config.mk
@@ -20,7 +20,7 @@ swig: pythonmods
 .SUFFIXES: _wrap.c .i
 
 .i_wrap.c:
-	swig -Wall -I$(srcdir)/scripting/swig -python $<
+	$(SWIG) -Wall -I$(srcdir)/scripting/swig -python $<
 
 clean::
 	@echo "Removing SWIG output files"
-- 
cgit 


From eaecbfa0e2703d429b295e51e230545ed8f3462c Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sun, 25 Nov 2007 15:34:12 +0100
Subject: r26114: Allow keyword-arguments. (This used to be commit
 99c342641b865e37c9ee8dd280348b659076d1e5)

---
 source4/scripting/python/config.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/config.mk b/source4/scripting/python/config.mk
index c176077267..eb35919450 100644
--- a/source4/scripting/python/config.mk
+++ b/source4/scripting/python/config.mk
@@ -20,7 +20,7 @@ swig: pythonmods
 .SUFFIXES: _wrap.c .i
 
 .i_wrap.c:
-	$(SWIG) -Wall -I$(srcdir)/scripting/swig -python $<
+	$(SWIG) -Wall -I$(srcdir)/scripting/swig -python -keyword $<
 
 clean::
 	@echo "Removing SWIG output files"
-- 
cgit 


From c4d7646f294df54d6b5e7a3ac236dfa4e861c501 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Tue, 27 Nov 2007 02:49:37 +0100
Subject: r26139: Based on a report by Theodor Chirana, don't assert() on
 invalid

netbios names at this point, the calling order has changed, and we
have a more informative place to do it.

Andrew Bartlett
(This used to be commit 3136dccd542a72ecda0c73a91674383736571bb5)
---
 source4/scripting/libjs/provision.js | 2 --
 1 file changed, 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index ecd21975ae..f78d994237 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -464,9 +464,7 @@ function provision_fix_subobj(subobj, paths)
 	subobj.REALM       = strupper(subobj.REALM);
 	subobj.HOSTNAME    = strlower(subobj.HOSTNAME);
 	subobj.DOMAIN      = strupper(subobj.DOMAIN);
-	assert(valid_netbios_name(subobj.DOMAIN));
 	subobj.NETBIOSNAME = strupper(subobj.HOSTNAME);
-	assert(valid_netbios_name(subobj.NETBIOSNAME));
 	subobj.DNSDOMAIN    = strlower(subobj.REALM);
 	subobj.DNSNAME      = sprintf("%s.%s", 
 				      strlower(subobj.HOSTNAME), 
-- 
cgit 


From 16325f13395a48daa9c0a8cb58b354e552776fce Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Wed, 28 Nov 2007 22:41:29 +0100
Subject: r26186: Generate SWIG files as part of autogen.sh (This used to be
 commit 4429f8b87e057787df0748f93c842c9a634dada5)

---
 source4/scripting/python/config.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/config.mk b/source4/scripting/python/config.mk
index eb35919450..c396cf62bc 100644
--- a/source4/scripting/python/config.mk
+++ b/source4/scripting/python/config.mk
@@ -22,14 +22,14 @@ swig: pythonmods
 .i_wrap.c:
 	$(SWIG) -Wall -I$(srcdir)/scripting/swig -python -keyword $<
 
-clean::
+realdistclean::
 	@echo "Removing SWIG output files"
 	@-rm -f bin/python/*
 	# FIXME: Remove _wrap.c files
 
 pythonmods: $(PYTHON_DSOS)
 
-PYDOCTOR_MODULES=bin/python/ldb.py bin/python/auth.py bin/python/credentials.py bin/python/registry.py
+PYDOCTOR_MODULES=bin/python/ldb.py bin/python/auth.py bin/python/credentials.py bin/python/registry.py bin/python/tdb.py
 
 pydoctor:: pythonmods
 	LD_LIBRARY_PATH=bin/shared PYTHONPATH=bin/python pydoctor --make-html --docformat=restructuredtext --add-package scripting/python/samba/ $(addprefix --add-module , $(PYDOCTOR_MODULES))
-- 
cgit 


From 660077476f43bb262b57f538147140e07e65f6df Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Wed, 28 Nov 2007 22:41:37 +0100
Subject: r26188: Now that swig output is pregenerated, allow building python
 code without swig installed. (This used to be commit
 f97f82adbd2663cadcfc5522c809ce2e659fb42c)

---
 source4/scripting/python/config.m4 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/config.m4 b/source4/scripting/python/config.m4
index 48103a0782..bdc977b0ba 100644
--- a/source4/scripting/python/config.m4
+++ b/source4/scripting/python/config.m4
@@ -116,7 +116,7 @@ AC_SUBST(PYTHON_EXTRA_LDFLAGS)
 
 SMB_EXT_LIB(LIBPYTHON, [$PYTHON_LDFLAGS], [$PYTHON_CPPFLAGS])
 
-if test x$working_python = xyes && test x$SWIG != xno
+if test x$working_python = xyes
 then
 	SMB_ENABLE(LIBPYTHON,YES)
 else
-- 
cgit 


From 26ae331f75317bfc0a4787d3960a861b25225615 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Thu, 29 Nov 2007 01:36:41 +0100
Subject: r26191: Import custom test runner for subunit, rather than using
 trial, which is part of twisted. (This used to be commit
 b0f808345f948c49ad46f34ba306ca8354393850)

---
 source4/scripting/bin/subunitrun             |  25 ++
 source4/scripting/python/subunit/__init__.py | 386 +++++++++++++++++++++++++++
 2 files changed, 411 insertions(+)
 create mode 100755 source4/scripting/bin/subunitrun
 create mode 100644 source4/scripting/python/subunit/__init__.py

(limited to 'source4/scripting')

diff --git a/source4/scripting/bin/subunitrun b/source4/scripting/bin/subunitrun
new file mode 100755
index 0000000000..add2b91a44
--- /dev/null
+++ b/source4/scripting/bin/subunitrun
@@ -0,0 +1,25 @@
+#!/usr/bin/python
+
+# Simple subunit testrunner for python
+# Copyright (C) Jelmer Vernooij <jelmer@samba.org> 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 <http://www.gnu.org/licenses/>.
+#
+
+from subunit import SubunitTestRunner
+import sys
+from unittest import TestProgram
+
+program = TestProgram(module=None, argv=sys.argv, testRunner=SubunitTestRunner())
+program.runTests()
diff --git a/source4/scripting/python/subunit/__init__.py b/source4/scripting/python/subunit/__init__.py
new file mode 100644
index 0000000000..e44dd766cc
--- /dev/null
+++ b/source4/scripting/python/subunit/__init__.py
@@ -0,0 +1,386 @@
+#
+#  subunit: extensions to python unittest to get test results from subprocesses.
+#  Copyright (C) 2005  Robert Collins <robertc@robertcollins.net>
+#  Copyright (C) 2007  Jelmer Vernooij <jelmer@samba.org>
+#
+#  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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+
+import os
+from StringIO import StringIO
+import subprocess
+import sys
+import unittest
+
+def test_suite():
+    import subunit.tests
+    return subunit.tests.test_suite()
+
+
+def join_dir(base_path, path):
+    """
+    Returns an absolute path to C{path}, calculated relative to the parent
+    of C{base_path}.
+
+    @param base_path: A path to a file or directory.
+    @param path: An absolute path, or a path relative to the containing
+    directory of C{base_path}.
+
+    @return: An absolute path to C{path}.
+    """
+    return os.path.join(os.path.dirname(os.path.abspath(base_path)), path)
+
+
+class TestProtocolServer(object):
+    """A class for receiving results from a TestProtocol client."""
+
+    OUTSIDE_TEST = 0
+    TEST_STARTED = 1
+    READING_FAILURE = 2
+    READING_ERROR = 3
+
+    def __init__(self, client, stream=sys.stdout):
+        """Create a TestProtocol server instance.
+
+        client should be an object that provides
+         - startTest
+         - addSuccess
+         - addFailure
+         - addError
+         - stopTest
+        methods, i.e. a TestResult.
+        """
+        self.state = TestProtocolServer.OUTSIDE_TEST
+        self.client = client
+        self._stream = stream
+
+    def _addError(self, offset, line):
+        if (self.state == TestProtocolServer.TEST_STARTED and
+            self.current_test_description == line[offset:-1]):
+            self.state = TestProtocolServer.OUTSIDE_TEST
+            self.current_test_description = None
+            self.client.addError(self._current_test, RemoteError(""))
+            self.client.stopTest(self._current_test)
+            self._current_test = None
+        elif (self.state == TestProtocolServer.TEST_STARTED and
+            self.current_test_description + " [" == line[offset:-1]):
+            self.state = TestProtocolServer.READING_ERROR
+            self._message = ""
+        else:
+            self.stdOutLineReceived(line)
+
+    def _addFailure(self, offset, line):
+        if (self.state == TestProtocolServer.TEST_STARTED and
+            self.current_test_description == line[offset:-1]):
+            self.state = TestProtocolServer.OUTSIDE_TEST
+            self.current_test_description = None
+            self.client.addFailure(self._current_test, RemoteError())
+            self.client.stopTest(self._current_test)
+        elif (self.state == TestProtocolServer.TEST_STARTED and
+            self.current_test_description + " [" == line[offset:-1]):
+            self.state = TestProtocolServer.READING_FAILURE
+            self._message = ""
+        else:
+            self.stdOutLineReceived(line)
+
+    def _addSuccess(self, offset, line):
+        if (self.state == TestProtocolServer.TEST_STARTED and
+            self.current_test_description == line[offset:-1]):
+            self.client.addSuccess(self._current_test)
+            self.client.stopTest(self._current_test)
+            self.current_test_description = None
+            self._current_test = None
+            self.state = TestProtocolServer.OUTSIDE_TEST
+        else:
+            self.stdOutLineReceived(line)
+
+    def _appendMessage(self, line):
+        if line[0:2] == " ]":
+            # quoted ] start
+            self._message += line[1:]
+        else:
+            self._message += line
+
+    def endQuote(self, line):
+        if self.state == TestProtocolServer.READING_FAILURE:
+            self.state = TestProtocolServer.OUTSIDE_TEST
+            self.current_test_description = None
+            self.client.addFailure(self._current_test,
+                                   RemoteError(self._message))
+            self.client.stopTest(self._current_test)
+        elif self.state == TestProtocolServer.READING_ERROR:
+            self.state = TestProtocolServer.OUTSIDE_TEST
+            self.current_test_description = None
+            self.client.addError(self._current_test,
+                                 RemoteError(self._message))
+            self.client.stopTest(self._current_test)
+        else:
+            self.stdOutLineReceived(line)
+
+    def lineReceived(self, line):
+        """Call the appropriate local method for the received line."""
+        if line == "]\n":
+            self.endQuote(line)
+        elif (self.state == TestProtocolServer.READING_FAILURE or
+              self.state == TestProtocolServer.READING_ERROR):
+            self._appendMessage(line)
+        else:
+            parts = line.split(None, 1)
+            if len(parts) == 2:
+                cmd, rest = parts
+                offset = len(cmd) + 1
+                cmd = cmd.strip(':')
+                if cmd in ('test', 'testing'):
+                    self._startTest(offset, line)
+                elif cmd == 'error':
+                    self._addError(offset, line)
+                elif cmd == 'failure':
+                    self._addFailure(offset, line)
+                elif cmd in ('success', 'successful'):
+                    self._addSuccess(offset, line)
+                else:
+                    self.stdOutLineReceived(line)
+            else:
+                self.stdOutLineReceived(line)
+
+    def lostConnection(self):
+        """The input connection has finished."""
+        if self.state == TestProtocolServer.TEST_STARTED:
+            self.client.addError(self._current_test,
+                                 RemoteError("lost connection during test '%s'"
+                                             % self.current_test_description))
+            self.client.stopTest(self._current_test)
+        elif self.state == TestProtocolServer.READING_ERROR:
+            self.client.addError(self._current_test,
+                                 RemoteError("lost connection during "
+                                             "error report of test "
+                                             "'%s'" %
+                                             self.current_test_description))
+            self.client.stopTest(self._current_test)
+        elif self.state == TestProtocolServer.READING_FAILURE:
+            self.client.addError(self._current_test,
+                                 RemoteError("lost connection during "
+                                             "failure report of test "
+                                             "'%s'" %
+                                             self.current_test_description))
+            self.client.stopTest(self._current_test)
+
+    def readFrom(self, pipe):
+        for line in pipe.readlines():
+            self.lineReceived(line)
+        self.lostConnection()
+
+    def _startTest(self, offset, line):
+        """Internal call to change state machine. Override startTest()."""
+        if self.state == TestProtocolServer.OUTSIDE_TEST:
+            self.state = TestProtocolServer.TEST_STARTED
+            self._current_test = RemotedTestCase(line[offset:-1])
+            self.current_test_description = line[offset:-1]
+            self.client.startTest(self._current_test)
+        else:
+            self.stdOutLineReceived(line)
+
+    def stdOutLineReceived(self, line):
+        self._stream.write(line)
+
+
+class RemoteException(Exception):
+    """An exception that occured remotely to python."""
+
+    def __eq__(self, other):
+        try:
+            return self.args == other.args
+        except AttributeError:
+            return False
+
+
+class TestProtocolClient(unittest.TestResult):
+    """A class that looks like a TestResult and informs a TestProtocolServer."""
+
+    def __init__(self, stream):
+        unittest.TestResult.__init__(self)
+        self._stream = stream
+
+    def addError(self, test, error):
+        """Report an error in test test."""
+        self._stream.write("error: %s [\n" % (test.shortDescription() or str(test)))
+        for line in self._exc_info_to_string(error, test).split():
+            self._stream.write("%s\n" % line)
+        self._stream.write("]\n")
+
+    def addFailure(self, test, error):
+        """Report a failure in test test."""
+        self._stream.write("failure: %s [\n" % (test.shortDescription() or str(test)))
+        for line in self._exc_info_to_string(error, test).split():
+            self._stream.write("%s\n" % line)
+        self._stream.write("]\n")
+
+    def addSuccess(self, test):
+        """Report a success in a test."""
+        self._stream.write("successful: %s\n" % (test.shortDescription() or str(test)))
+
+    def startTest(self, test):
+        """Mark a test as starting its test run."""
+        self._stream.write("test: %s\n" % (test.shortDescription() or str(test)))
+
+
+def RemoteError(description=""):
+    if description == "":
+        description = "\n"
+    return (RemoteException, RemoteException(description), None)
+
+
+class RemotedTestCase(unittest.TestCase):
+    """A class to represent test cases run in child processes."""
+
+    def __eq__ (self, other):
+        try:
+            return self.__description == other.__description
+        except AttributeError:
+            return False
+
+    def __init__(self, description):
+        """Create a psuedo test case with description description."""
+        self.__description = description
+
+    def error(self, label):
+        raise NotImplementedError("%s on RemotedTestCases is not permitted." %
+            label)
+
+    def setUp(self):
+        self.error("setUp")
+
+    def tearDown(self):
+        self.error("tearDown")
+
+    def shortDescription(self):
+        return self.__description
+
+    def id(self):
+        return "%s.%s" % (self._strclass(), self.__description)
+
+    def __str__(self):
+        return "%s (%s)" % (self.__description, self._strclass())
+
+    def __repr__(self):
+        return "<%s description='%s'>" % \
+               (self._strclass(), self.__description)
+
+    def run(self, result=None):
+        if result is None: result = self.defaultTestResult()
+        result.startTest(self)
+        result.addError(self, RemoteError("Cannot run RemotedTestCases.\n"))
+        result.stopTest(self)
+
+    def _strclass(self):
+        cls = self.__class__
+        return "%s.%s" % (cls.__module__, cls.__name__)
+
+
+class ExecTestCase(unittest.TestCase):
+    """A test case which runs external scripts for test fixtures."""
+
+    def __init__(self, methodName='runTest'):
+        """Create an instance of the class that will use the named test
+           method when executed. Raises a ValueError if the instance does
+           not have a method with the specified name.
+        """
+        unittest.TestCase.__init__(self, methodName)
+        testMethod = getattr(self, methodName)
+        self.script = join_dir(sys.modules[self.__class__.__module__].__file__,
+                               testMethod.__doc__)
+
+    def countTestCases(self):
+        return 1
+
+    def run(self, result=None):
+        if result is None: result = self.defaultTestResult()
+        self._run(result)
+
+    def debug(self):
+        """Run the test without collecting errors in a TestResult"""
+        self._run(unittest.TestResult())
+
+    def _run(self, result):
+        protocol = TestProtocolServer(result)
+        output = subprocess.Popen([self.script],
+                                  stdout=subprocess.PIPE).communicate()[0]
+        protocol.readFrom(StringIO(output))
+
+
+class IsolatedTestCase(unittest.TestCase):
+    """A TestCase which runs its tests in a forked process."""
+
+    def run(self, result=None):
+        if result is None: result = self.defaultTestResult()
+        run_isolated(unittest.TestCase, self, result)
+
+
+class IsolatedTestSuite(unittest.TestSuite):
+    """A TestCase which runs its tests in a forked process."""
+
+    def run(self, result=None):
+        if result is None: result = unittest.TestResult()
+        run_isolated(unittest.TestSuite, self, result)
+
+
+def run_isolated(klass, self, result):
+    """Run a test suite or case in a subprocess, using the run method on klass.
+    """
+    c2pread, c2pwrite = os.pipe()
+    # fixme - error -> result
+    # now fork
+    pid = os.fork()
+    if pid == 0:
+        # Child
+        # Close parent's pipe ends
+        os.close(c2pread)
+        # Dup fds for child
+        os.dup2(c2pwrite, 1)
+        # Close pipe fds.
+        os.close(c2pwrite)
+
+        # at this point, sys.stdin is redirected, now we want
+        # to filter it to escape ]'s.
+        ### XXX: test and write that bit.
+
+        result = TestProtocolClient(sys.stdout)
+        klass.run(self, result)
+        sys.stdout.flush()
+        sys.stderr.flush()
+        # exit HARD, exit NOW.
+        os._exit(0)
+    else:
+        # Parent
+        # Close child pipe ends
+        os.close(c2pwrite)
+        # hookup a protocol engine
+        protocol = TestProtocolServer(result)
+        protocol.readFrom(os.fdopen(c2pread, 'rU'))
+        os.waitpid(pid, 0)
+        # TODO return code evaluation.
+    return result
+
+
+class SubunitTestRunner:
+    def __init__(self, stream=sys.stdout):
+        self.stream = stream
+
+    def run(self, test):
+        "Run the given test case or test suite."
+        result = TestProtocolClient(self.stream)
+        test(result)
+        return result
+
-- 
cgit 


From f2f16b45b58c2bbf3053ff55e7a290fc069e0efd Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Thu, 29 Nov 2007 14:49:47 +0100
Subject: r26197: Add bindings for libsecurity. (This used to be commit
 8625cd403ba3a7d2b1b1fccfeb5efd7e21de0135)

---
 source4/scripting/python/config.mk   |  4 ---
 source4/scripting/python/sidmodule.c | 56 ------------------------------------
 2 files changed, 60 deletions(-)
 delete mode 100644 source4/scripting/python/sidmodule.c

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/config.mk b/source4/scripting/python/config.mk
index c396cf62bc..c17511203e 100644
--- a/source4/scripting/python/config.mk
+++ b/source4/scripting/python/config.mk
@@ -6,10 +6,6 @@ OBJ_FILES = parammodule.o
 PRIVATE_DEPENDENCIES = LIBNDR 
 OBJ_FILES = uuidmodule.o
 
-[PYTHON::python_sid]
-PRIVATE_DEPENDENCIES = LIBNDR 
-OBJ_FILES = sidmodule.o
-
 [PYTHON::python_misc]
 PRIVATE_DEPENDENCIES = LIBNDR LIBLDB
 SWIG_FILE = misc.i
diff --git a/source4/scripting/python/sidmodule.c b/source4/scripting/python/sidmodule.c
deleted file mode 100644
index 4b199b1158..0000000000
--- a/source4/scripting/python/sidmodule.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/* 
-   Unix SMB/CIFS implementation.
-   Samba utility functions
-   Copyright (C) Jelmer Vernooij <jelmer@samba.org> 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 <http://www.gnu.org/licenses/>.
-*/
-
-#include "includes.h"
-#include "Python.h"
-#include "libcli/security/security.h"
-
-static PyObject *sid_random(PyObject *self, PyObject *args)
-{
-	char *str;
-
-	if (!PyArg_ParseTuple(args, ""))
-	        return NULL;
-
-	str = talloc_asprintf(NULL, "S-1-5-21-%u-%u-%u", 
-				  (unsigned)generate_random(), 
-				  (unsigned)generate_random(), 
-				  (unsigned)generate_random());
-
-	if (str == NULL) {
-		PyErr_SetString(PyExc_TypeError, "can't generate random sid");
-		return NULL;
-	}
-
-	return PyString_FromString(str);
-}
-
-static PyMethodDef methods[] = {
-	{ "random", (PyCFunction)sid_random, METH_VARARGS, NULL},
-	{ NULL, NULL }
-};
-
-PyDoc_STRVAR(param_doc, "SID helper routines");
-
-PyMODINIT_FUNC initsid(void)
-{
-	PyObject *mod = Py_InitModule3("sid", methods, param_doc);
-	if (mod == NULL)
-		return;
-}
-- 
cgit 


From ef26c9a604657c00ce67768d34e237fd3a903a2c Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Thu, 29 Nov 2007 16:00:59 +0100
Subject: r26201: Build docs for the security module. (This used to be commit
 31073a9e4ecaee08b3e27631db620957df8adde6)

---
 source4/scripting/python/config.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/config.mk b/source4/scripting/python/config.mk
index c17511203e..5d4bc48d8a 100644
--- a/source4/scripting/python/config.mk
+++ b/source4/scripting/python/config.mk
@@ -25,7 +25,7 @@ realdistclean::
 
 pythonmods: $(PYTHON_DSOS)
 
-PYDOCTOR_MODULES=bin/python/ldb.py bin/python/auth.py bin/python/credentials.py bin/python/registry.py bin/python/tdb.py
+PYDOCTOR_MODULES=bin/python/ldb.py bin/python/auth.py bin/python/credentials.py bin/python/registry.py bin/python/tdb.py bin/python/security.py
 
 pydoctor:: pythonmods
 	LD_LIBRARY_PATH=bin/shared PYTHONPATH=bin/python pydoctor --make-html --docformat=restructuredtext --add-package scripting/python/samba/ $(addprefix --add-module , $(PYDOCTOR_MODULES))
-- 
cgit 


From 4151cf9866640a5eb53730ff069625373b6d8c27 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Thu, 29 Nov 2007 17:49:13 +0100
Subject: r26207: Only compile swig files if swig is available. (This used to
 be commit cc5260971c4953ce742363b324ac3804c531e2dd)

---
 source4/scripting/python/config.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/config.mk b/source4/scripting/python/config.mk
index 5d4bc48d8a..c4722e2b9a 100644
--- a/source4/scripting/python/config.mk
+++ b/source4/scripting/python/config.mk
@@ -16,7 +16,7 @@ swig: pythonmods
 .SUFFIXES: _wrap.c .i
 
 .i_wrap.c:
-	$(SWIG) -Wall -I$(srcdir)/scripting/swig -python -keyword $<
+	[ "$(SWIG)" != "no" ] && $(SWIG) -Wall -I$(srcdir)/scripting/swig -python -keyword $<
 
 realdistclean::
 	@echo "Removing SWIG output files"
-- 
cgit 


From 181aab56d528c3a270ff9f349c8e91ecb402142b Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sun, 2 Dec 2007 16:20:18 +0100
Subject: r26221: Add loadparm_context parameter to auth_context_create. (This
 used to be commit a9a9634df8f3137ecb308adb90a755f12af94972)

---
 source4/scripting/ejs/smbcalls_auth.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_auth.c b/source4/scripting/ejs/smbcalls_auth.c
index b4848d4323..6ddb049788 100644
--- a/source4/scripting/ejs/smbcalls_auth.c
+++ b/source4/scripting/ejs/smbcalls_auth.c
@@ -62,7 +62,7 @@ static int ejs_doauth(MprVarHandle eid,
 	if (auth_types) {
 		nt_status = auth_context_create_methods(tmp_ctx, auth_types, ev, msg, &auth_context);
 	} else {
-		nt_status = auth_context_create(tmp_ctx, ev, msg, &auth_context);
+		nt_status = auth_context_create(tmp_ctx, ev, msg, global_loadparm, &auth_context);
 	}
 	if (!NT_STATUS_IS_OK(nt_status)) {
 		mprSetPropertyValue(auth, "result", mprCreateBoolVar(false));
-- 
cgit 


From 2fa338cdc99276a5f85ad54cb88b372ffe8ab063 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sun, 2 Dec 2007 17:09:43 +0100
Subject: r26226: Avoid more uses of global_loadparm. (This used to be commit
 6cbce47a3eaef76a89db7cd0ab0d4f6441fc720d)

---
 source4/scripting/ejs/smbscript.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbscript.c b/source4/scripting/ejs/smbscript.c
index 29ce763f96..db6e0eeb10 100644
--- a/source4/scripting/ejs/smbscript.c
+++ b/source4/scripting/ejs/smbscript.c
@@ -60,7 +60,7 @@ int main(int argc, const char **argv)
 
 	ldb_global_init();
 
-	gensec_init();
+	gensec_init(global_loadparm);
 	mprSetCtx(mem_ctx);
 
 
-- 
cgit 


From 51db4c3f3d81d1ed03beae6426786c843ac59807 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sun, 2 Dec 2007 17:56:09 +0100
Subject: r26228: Store loadparm context in auth context, move more
 loadparm_contexts up the call stack. (This used to be commit
 ba75f1613a9aac69dd5df94dd8a2b37820acd166)

---
 source4/scripting/ejs/smbcalls_auth.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_auth.c b/source4/scripting/ejs/smbcalls_auth.c
index 6ddb049788..39e84d7f2c 100644
--- a/source4/scripting/ejs/smbcalls_auth.c
+++ b/source4/scripting/ejs/smbcalls_auth.c
@@ -60,7 +60,7 @@ static int ejs_doauth(MprVarHandle eid,
 	}
 
 	if (auth_types) {
-		nt_status = auth_context_create_methods(tmp_ctx, auth_types, ev, msg, &auth_context);
+		nt_status = auth_context_create_methods(tmp_ctx, auth_types, ev, msg, global_loadparm, &auth_context);
 	} else {
 		nt_status = auth_context_create(tmp_ctx, ev, msg, global_loadparm, &auth_context);
 	}
-- 
cgit 


From da0640518f67545df6a1da30c916fbc452d38a39 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sun, 2 Dec 2007 20:24:24 +0100
Subject: r26232: Provide replacement for stdint.i for users of older versions
 of swig. (This used to be commit fb2150a07aa6460165efb4587c86ecc820cdeac0)

---
 source4/scripting/python/replace/stdint.i | 109 ++++++++++++++++++++++++++++++
 1 file changed, 109 insertions(+)
 create mode 100644 source4/scripting/python/replace/stdint.i

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/replace/stdint.i b/source4/scripting/python/replace/stdint.i
new file mode 100644
index 0000000000..7b48ca3884
--- /dev/null
+++ b/source4/scripting/python/replace/stdint.i
@@ -0,0 +1,109 @@
+/* -----------------------------------------------------------------------------
+ * See the LICENSE file for information on copyright, usage and redistribution
+ * of SWIG, and the README file for authors - http://www.swig.org/release.html.
+ *
+ * stdint.i
+ *
+ * SWIG library file for ISO C99 types: 7.18 Integer types <stdint.h>
+ * ----------------------------------------------------------------------------- */
+
+%{
+#include <stdint.h>		// Use the C99 official header
+%}
+
+%include <swigarch.i>
+
+/* Exact integral types.  */
+
+/* Signed.  */
+
+typedef signed char		int8_t;
+typedef short int		int16_t;
+typedef int			int32_t;
+#if defined(SWIGWORDSIZE64)
+typedef long int		int64_t;
+#else
+typedef long long int		int64_t;
+#endif
+
+/* Unsigned.  */
+typedef unsigned char		uint8_t;
+typedef unsigned short int	uint16_t;
+typedef unsigned int		uint32_t;
+#if defined(SWIGWORDSIZE64)
+typedef unsigned long int	uint64_t;
+#else
+typedef unsigned long long int	uint64_t;
+#endif
+
+
+/* Small types.  */
+
+/* Signed.  */
+typedef signed char		int_least8_t;
+typedef short int		int_least16_t;
+typedef int			int_least32_t;
+#if defined(SWIGWORDSIZE64)
+typedef long int		int_least64_t;
+#else
+typedef long long int		int_least64_t;
+#endif
+
+/* Unsigned.  */
+typedef unsigned char		uint_least8_t;
+typedef unsigned short int	uint_least16_t;
+typedef unsigned int		uint_least32_t;
+#if defined(SWIGWORDSIZE64)
+typedef unsigned long int	uint_least64_t;
+#else
+typedef unsigned long long int	uint_least64_t;
+#endif
+
+
+/* Fast types.  */
+
+/* Signed.  */
+typedef signed char		int_fast8_t;
+#if defined(SWIGWORDSIZE64)
+typedef long int		int_fast16_t;
+typedef long int		int_fast32_t;
+typedef long int		int_fast64_t;
+#else
+typedef int			int_fast16_t;
+typedef int			int_fast32_t;
+typedef long long int		int_fast64_t;
+#endif
+
+/* Unsigned.  */
+typedef unsigned char		uint_fast8_t;
+#if defined(SWIGWORDSIZE64)
+typedef unsigned long int	uint_fast16_t;
+typedef unsigned long int	uint_fast32_t;
+typedef unsigned long int	uint_fast64_t;
+#else
+typedef unsigned int		uint_fast16_t;
+typedef unsigned int		uint_fast32_t;
+typedef unsigned long long int	uint_fast64_t;
+#endif
+
+
+/* Types for `void *' pointers.  */
+#if defined(SWIGWORDSIZE64)
+typedef long int		intptr_t;
+typedef unsigned long int	uintptr_t;
+#else
+typedef int			intptr_t;
+typedef unsigned int		uintptr_t;
+#endif
+
+
+/* Largest integral types.  */
+#if defined(SWIGWORDSIZE64)
+typedef long int		intmax_t;
+typedef unsigned long int	uintmax_t;
+#else
+typedef long long int		intmax_t;
+typedef unsigned long long int	uintmax_t;
+#endif
+
+
-- 
cgit 


From 6c999cd12344f2bb8b1d2941210b4c205b3e0aad Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sun, 2 Dec 2007 22:32:11 +0100
Subject: r26236: Remove more uses of global_loadparm or specify
 loadparm_context explicitly. (This used to be commit
 5b29ef7c03d9ae76b0ca909e9f03a58e1bad3521)

---
 source4/scripting/ejs/smbcalls_reg.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_reg.c b/source4/scripting/ejs/smbcalls_reg.c
index 38634b996c..fee11b66d9 100644
--- a/source4/scripting/ejs/smbcalls_reg.c
+++ b/source4/scripting/ejs/smbcalls_reg.c
@@ -70,7 +70,7 @@ static int ejs_reg_open(MprVarHandle eid, int argc, struct MprVar **argv)
 	struct registry_context *rctx;
 	WERROR error;
 
-	error = reg_open_samba(mprMemCtx(), &rctx, NULL, NULL);
+	error = reg_open_samba(mprMemCtx(), &rctx, global_loadparm, NULL, NULL);
 	SMB_ASSERT(W_ERROR_IS_OK(error));
 
 	mprSetPtrChild(reg, "registry", rctx);
-- 
cgit 


From 7bf6b95b1ffdfe72144b39132c73fe1c234270b0 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 3 Dec 2007 03:14:27 +0100
Subject: r26242: Don't fail if swig is not available. (This used to be commit
 12debcceac6cca1d8c8e1f78a0c7772b944e9f8d)

---
 source4/scripting/python/config.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/config.mk b/source4/scripting/python/config.mk
index c4722e2b9a..91437e1e0b 100644
--- a/source4/scripting/python/config.mk
+++ b/source4/scripting/python/config.mk
@@ -16,7 +16,7 @@ swig: pythonmods
 .SUFFIXES: _wrap.c .i
 
 .i_wrap.c:
-	[ "$(SWIG)" != "no" ] && $(SWIG) -Wall -I$(srcdir)/scripting/swig -python -keyword $<
+	[ "$(SWIG)" == "no" ] || $(SWIG) -Wall -I$(srcdir)/scripting/swig -python -keyword $<
 
 realdistclean::
 	@echo "Removing SWIG output files"
-- 
cgit 


From 4f5adbdddf6e3e1a4789c2df81973084913742f9 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 3 Dec 2007 04:14:24 +0100
Subject: r26243: stdint.i requires swigarch.i (This used to be commit
 d9391316a982cfff6b283e7d4a86103ec6fe370d)

---
 source4/scripting/python/replace/swigarch.i | 65 +++++++++++++++++++++++++++++
 1 file changed, 65 insertions(+)
 create mode 100644 source4/scripting/python/replace/swigarch.i

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/replace/swigarch.i b/source4/scripting/python/replace/swigarch.i
new file mode 100644
index 0000000000..260b608801
--- /dev/null
+++ b/source4/scripting/python/replace/swigarch.i
@@ -0,0 +1,65 @@
+/* -----------------------------------------------------------------------------
+ * See the LICENSE file for information on copyright, usage and redistribution
+ * of SWIG, and the README file for authors - http://www.swig.org/release.html.
+ *
+ * swigarch.i
+ *
+ * SWIG library file for 32bit/64bit code specialization and checking.
+ *
+ * Use only in extreme cases, when no arch. independent code can be
+ * generated
+ * 
+ * To activate architecture specific code, use
+ *
+ *     swig -DSWIGWORDSIZE32
+ *
+ * or
+ *
+ *     swig -DSWIGWORDSIZE64
+ *
+ * Note that extra checking code will be added to the wrapped code,
+ * which will prevent the compilation in a different architecture.
+ *
+ * If you don't specify the SWIGWORDSIZE (the default case), swig will
+ * generate architecture independent and/or 32bits code, with no extra
+ * checking code added.
+ * ----------------------------------------------------------------------------- */
+
+#if !defined(SWIGWORDSIZE32) &&  !defined(SWIGWORDSIZE64)
+# if (__WORDSIZE == 32)
+#  define SWIGWORDSIZE32
+# endif
+#endif
+  
+#if !defined(SWIGWORDSIZE64) &&  !defined(SWIGWORDSIZE32) 
+# if defined(__x86_64) || defined(__x86_64__) || (__WORDSIZE == 64)
+#  define SWIGWORDSIZE64
+# endif
+#endif
+
+
+#ifdef SWIGWORDSIZE32
+%{
+#define SWIGWORDSIZE32
+#ifndef LONG_MAX
+#include <limits.h>
+#endif
+#if (__WORDSIZE == 64) || (LONG_MAX != INT_MAX)
+# error "SWIG wrapped code invalid in 64 bit architecture, regenarete code using -DSWIGWORDSIZE64"
+#endif
+%}
+#endif
+
+#ifdef SWIGWORDSIZE64
+%{
+#define SWIGWORDSIZE64
+#ifndef LONG_MAX
+#include <limits.h>
+#endif
+#if (__WORDSIZE == 32) || (LONG_MAX == INT_MAX)
+# error "SWIG wrapped code invalid in 32 bit architecture, regenarete code using -DSWIGWORDSIZE32"
+#endif
+%}
+#endif
+  
+
-- 
cgit 


From cd1f19d7d306e59df2d7b5db16d317206408babc Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Mon, 3 Dec 2007 05:49:06 +0100
Subject: r26244: Add a module (sans tests for the moment) that implements
 ranged

results, as used particularly by MMC's Active Directory Users and
Computers to list group members.

This may be used on any attribute, but is useful to obtain attributes
that may be lengthy in 'pages'.  The implementation presumes that
attributes will always be returned by the DB in the same order.

Andrew Bartlett
(This used to be commit c789a91e00b47b2f02513e97101b9606d00c6aaa)
---
 source4/scripting/libjs/provision.js | 1 +
 1 file changed, 1 insertion(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index f78d994237..08407418d3 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -979,6 +979,7 @@ function provision_guess()
 	// - each partition has its own module list then
 	modules_list        = new Array("rootdse",
 					"paged_results",
+					"ranged_results",
 					"server_sort",
 					"extended_dn",
 					"asq",
-- 
cgit 


From a2a4aba5fd7a2ec0a7131f32c8bccd5dbe04e1f1 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Mon, 3 Dec 2007 05:51:04 +0100
Subject: r26245: Make it easier to handle the LDAP backend, with it's
 differing needs,

by seperating the modules list into parts.  That way, we can remove
the modules that the backend will provide.

Andrew Bartlett
(This used to be commit d67e5c7896f6d3064298897ae4d3204498824b06)
---
 source4/scripting/libjs/provision.js | 34 ++++++++++++++++++----------------
 1 file changed, 18 insertions(+), 16 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index 08407418d3..0a064de68d 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -977,23 +977,25 @@ function provision_guess()
 	//   module when expanding the objectclass list)
 	// - partition must be last
 	// - each partition has its own module list then
-	modules_list        = new Array("rootdse",
-					"paged_results",
-					"ranged_results",
-					"server_sort",
-					"extended_dn",
-					"asq",
-					"samldb",
-					"rdn_name",
-					"objectclass",
-					"kludge_acl",
-					"operational",
-					"subtree_rename",
-					"subtree_delete",
-					"linked_attributes",
-					"show_deleted",
-					"partition");
+	var modules_list     = new Array("rootdse",
+					 "paged_results",
+					 "ranged_results",
+					 "server_sort",
+					 "extended_dn",
+					 "asq",
+					 "samldb",
+					 "rdn_name",
+					 "objectclass",
+					 "kludge_acl",
+					 "operational");
+	var tdb_modules_list = new Array("subtree_rename",
+					 "subtree_delete",
+					 "linked_attributes");
+	var modules_list2    = new Array("show_deleted",
+					 "partition");
 	subobj.MODULES_LIST = join(",", modules_list);
+	subobj.TDB_MODULES_LIST = "," + join(",", tdb_modules_list);
+	subobj.MODULES_LIST2 = join(",", modules_list2);
 	subobj.DOMAINDN_LDB = "users.ldb";
 	subobj.CONFIGDN_LDB = "configuration.ldb";
 	subobj.SCHEMADN_LDB = "schema.ldb";
-- 
cgit 


From bb07e5853149b7d3c1fee3c93cbcefb333038dbc Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Mon, 3 Dec 2007 07:03:52 +0100
Subject: r26246: Make it easier to debug assert()s in the provision, if
 messages are

suppressed with --quiet.  Hopefully this will be easier with python.

Andrew Bartlett
(This used to be commit f6e0e15fa5e2b0b7368ff945cc988579aaba0a6c)
---
 source4/scripting/libjs/provision.js | 50 +++++++++++++++++-------------------
 1 file changed, 23 insertions(+), 27 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index 0a064de68d..2dfc941a66 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -653,40 +653,38 @@ function provision(subobj, message, blank, paths, session_info, credentials, lda
 	message("Adding DomainDN: " + subobj.DOMAINDN + " (permitted to fail)\n");
 	var add_ok = setup_add_ldif("provision_basedn.ldif", info, samdb, true);
 	message("Modifying DomainDN: " + subobj.DOMAINDN + "\n");
-	var modify_ok = setup_ldb_modify("provision_basedn_modify.ldif", info, samdb);
-	if (!modify_ok) {
+	var modify_basedn_ok = setup_ldb_modify("provision_basedn_modify.ldif", info, samdb);
+	if (!modify_basedn_ok) {
 		if (!add_ok) {
 			message("%s", "Failed to both add and modify " + subobj.DOMAINDN + " in target " + subobj.DOMAINDN_LDB + ": " + samdb.errstring() + "\n");
 			message("Perhaps you need to run the provision script with the --ldap-base-dn option, and add this record to the backend manually\n"); 
 		};
-		assert(modify_ok);
+		assert(modify_basedn_ok);
 	};
 
 	message("Adding configuration container (permitted to fail)\n");
-	var add_ok = setup_add_ldif("provision_configuration_basedn.ldif", info, samdb, true);
+	var add_config_ok = setup_add_ldif("provision_configuration_basedn.ldif", info, samdb, true);
 	message("Modifying configuration container\n");
-	var modify_ok = setup_ldb_modify("provision_configuration_basedn_modify.ldif", info, samdb);
-	if (!modify_ok) {
-		if (!add_ok) {
+	var modify_config_ok = setup_ldb_modify("provision_configuration_basedn_modify.ldif", info, samdb);
+	if (!modify_config_ok) {
+		if (!add_config_ok) {
 			message("%s", "Failed to both add and modify " + subobj.CONFIGDN + " in target " + subobj.CONFIGDN_LDB + ": " + samdb.errstring() + "\n");
 			message("Perhaps you need to run the provision script with the --ldap-base-dn option, and add this record to the backend manually\n"); 
-			assert(modify_ok);
 		}
-		assert(modify_ok);
+		assert(modify_config_ok);
 	}
 
 	message("Adding schema container (permitted to fail)\n");
-	var add_ok = setup_add_ldif("provision_schema_basedn.ldif", info, samdb, true);
+	var add_schema_ok = setup_add_ldif("provision_schema_basedn.ldif", info, samdb, true);
 	message("Modifying schema container\n");
-	var modify_ok = setup_ldb_modify("provision_schema_basedn_modify.ldif", info, samdb);
-	if (!modify_ok) {
-		if (!add_ok) {
+	var modify_schema_ok = setup_ldb_modify("provision_schema_basedn_modify.ldif", info, samdb);
+	if (!modify_schema_ok) {
+		if (!add_schema_ok) {
 			message("%s", "Failed to both add and modify " + subobj.SCHEMADN + " in target " + subobj.SCHEMADN_LDB + ": " + samdb.errstring() + "\n");
 			message("Perhaps you need to run the provision script with the --ldap-base-dn option, and add this record to the backend manually\n"); 
-			assert(modify_ok);
 		}
 		message("Failed to modify the schema container: " + samdb.errstring() + "\n");
-		assert(modify_ok);
+		assert(modify_schema_ok);
 	}
 
 	message("Setting up sam.ldb Samba4 schema\n");
@@ -711,26 +709,24 @@ function provision(subobj, message, blank, paths, session_info, credentials, lda
 	setup_add_ldif("display_specifiers.ldif", info, samdb, false);
 
 	message("Adding users container (permitted to fail)\n");
-	var add_ok = setup_add_ldif("provision_users_add.ldif", info, samdb, true);
+	var add_users_ok = setup_add_ldif("provision_users_add.ldif", info, samdb, true);
 	message("Modifying users container\n");
-	var modify_ok = setup_ldb_modify("provision_users_modify.ldif", info, samdb);
-	if (!modify_ok) {
-		if (!add_ok) {
+	var modify_users_ok = setup_ldb_modify("provision_users_modify.ldif", info, samdb);
+	if (!modify_users_ok) {
+		if (!add_users_ok) {
 			message("Failed to both add and modify the users container\n");
-			assert(modify_ok);
 		}
-		assert(modify_ok);
+		assert(modify_users_ok);
 	}
 	message("Adding computers container (permitted to fail)\n");
-	var add_ok = setup_add_ldif("provision_computers_add.ldif", info, samdb, true);
+	var add_computers_ok = setup_add_ldif("provision_computers_add.ldif", info, samdb, true);
 	message("Modifying computers container\n");
-	var modify_ok = setup_ldb_modify("provision_computers_modify.ldif", info, samdb);
-	if (!modify_ok) {
-		if (!add_ok) {
+	var modify_computers_ok = setup_ldb_modify("provision_computers_modify.ldif", info, samdb);
+	if (!modify_computers_ok) {
+		if (!add_computers_ok) {
 			message("Failed to both add and modify the computers container\n");
-			assert(modify_ok);
 		}
-		assert(modify_ok);
+		assert(modify_computers_ok);
 	}
 
 	message("Setting up sam.ldb data\n");
-- 
cgit 


From 5193e04368732874f980f681c86e2051505c0171 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 3 Dec 2007 13:33:58 +0100
Subject: r26247: Don't allow use of older SWIG versions. (This used to be
 commit def0ae919b9b65e70124ee5bfcd70d3a22973a9b)

---
 source4/scripting/python/ac_pkg_swig.m4 | 125 ++++++++++++++++++++++++++++++++
 source4/scripting/python/config.m4      |   5 +-
 2 files changed, 129 insertions(+), 1 deletion(-)
 create mode 100644 source4/scripting/python/ac_pkg_swig.m4

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/ac_pkg_swig.m4 b/source4/scripting/python/ac_pkg_swig.m4
new file mode 100644
index 0000000000..013743c1a0
--- /dev/null
+++ b/source4/scripting/python/ac_pkg_swig.m4
@@ -0,0 +1,125 @@
+##### http://autoconf-archive.cryp.to/ac_pkg_swig.html
+#
+# SYNOPSIS
+#
+#   AC_PROG_SWIG([major.minor.micro])
+#
+# DESCRIPTION
+#
+#   This macro searches for a SWIG installation on your system. If
+#   found you should call SWIG via $(SWIG). You can use the optional
+#   first argument to check if the version of the available SWIG is
+#   greater than or equal to the value of the argument. It should have
+#   the format: N[.N[.N]] (N is a number between 0 and 999. Only the
+#   first N is mandatory.)
+#
+#   If the version argument is given (e.g. 1.3.17), AC_PROG_SWIG checks
+#   that the swig package is this version number or higher.
+#
+#   In configure.in, use as:
+#
+#     AC_PROG_SWIG(1.3.17)
+#     SWIG_ENABLE_CXX
+#     SWIG_MULTI_MODULE_SUPPORT
+#     SWIG_PYTHON
+#
+# LAST MODIFICATION
+#
+#   2006-10-22
+#
+# COPYLEFT
+#
+#   Copyright (c) 2006 Sebastian Huber <sebastian-huber@web.de>
+#   Copyright (c) 2006 Alan W. Irwin <irwin@beluga.phys.uvic.ca>
+#   Copyright (c) 2006 Rafael Laboissiere <rafael@laboissiere.net>
+#   Copyright (c) 2006 Andrew Collier <colliera@ukzn.ac.za>
+#
+#   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., 59 Temple Place - Suite 330, Boston, MA
+#   02111-1307, USA.
+#
+#   As a special exception, the respective Autoconf Macro's copyright
+#   owner gives unlimited permission to copy, distribute and modify the
+#   configure scripts that are the output of Autoconf when processing
+#   the Macro. You need not follow the terms of the GNU General Public
+#   License when using or distributing such scripts, even though
+#   portions of the text of the Macro appear in them. The GNU General
+#   Public License (GPL) does govern all other use of the material that
+#   constitutes the Autoconf Macro.
+#
+#   This special exception to the GPL applies to versions of the
+#   Autoconf Macro released by the Autoconf Macro Archive. When you
+#   make and distribute a modified version of the Autoconf Macro, you
+#   may extend this special exception to the GPL to apply to your
+#   modified version as well.
+
+AC_DEFUN([AC_PROG_SWIG],[
+        AC_PATH_PROG([SWIG],[swig])
+        if test -z "$SWIG" ; then
+                AC_MSG_WARN([cannot find 'swig' program. You should look at http://www.swig.org])
+                SWIG='no'
+        elif test -n "$1" ; then
+                AC_MSG_CHECKING([for SWIG version])
+                [swig_version=`$SWIG -version 2>&1 | grep 'SWIG Version' | sed 's/.*\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*/\1/g'`]
+                AC_MSG_RESULT([$swig_version])
+                if test -n "$swig_version" ; then
+                        # Calculate the required version number components
+                        [required=$1]
+                        [required_major=`echo $required | sed 's/[^0-9].*//'`]
+                        if test -z "$required_major" ; then
+                                [required_major=0]
+                        fi
+                        [required=`echo $required | sed 's/[0-9]*[^0-9]//'`]
+                        [required_minor=`echo $required | sed 's/[^0-9].*//'`]
+                        if test -z "$required_minor" ; then
+                                [required_minor=0]
+                        fi
+                        [required=`echo $required | sed 's/[0-9]*[^0-9]//'`]
+                        [required_patch=`echo $required | sed 's/[^0-9].*//'`]
+                        if test -z "$required_patch" ; then
+                                [required_patch=0]
+                        fi
+                        # Calculate the available version number components
+                        [available=$swig_version]
+                        [available_major=`echo $available | sed 's/[^0-9].*//'`]
+                        if test -z "$available_major" ; then
+                                [available_major=0]
+                        fi
+                        [available=`echo $available | sed 's/[0-9]*[^0-9]//'`]
+                        [available_minor=`echo $available | sed 's/[^0-9].*//'`]
+                        if test -z "$available_minor" ; then
+                                [available_minor=0]
+                        fi
+                        [available=`echo $available | sed 's/[0-9]*[^0-9]//'`]
+                        [available_patch=`echo $available | sed 's/[^0-9].*//'`]
+                        if test -z "$available_patch" ; then
+                                [available_patch=0]
+                        fi
+                        if test $available_major -ne $required_major \
+                                -o $available_minor -ne $required_minor \
+                                -o $available_patch -lt $required_patch ; then
+                                AC_MSG_WARN([SWIG version >= $1 is required.  You have $swig_version.  You should look at http://www.swig.org])
+                                SWIG='no'
+                        else
+                                AC_MSG_NOTICE([SWIG executable is '$SWIG'])
+                                SWIG_LIB=`$SWIG -swiglib`
+                                AC_MSG_NOTICE([SWIG library directory is '$SWIG_LIB'])
+                        fi
+                else
+                        AC_MSG_WARN([cannot determine SWIG version])
+                        SWIG='no'
+                fi
+        fi
+        AC_SUBST([SWIG_LIB])
+])
diff --git a/source4/scripting/python/config.m4 b/source4/scripting/python/config.m4
index bdc977b0ba..8a4aba4a66 100644
--- a/source4/scripting/python/config.m4
+++ b/source4/scripting/python/config.m4
@@ -1,9 +1,12 @@
+m4_include(scripting/python/ac_pkg_swig.m4)
+
 AC_ARG_VAR([PYTHON_VERSION],[The installed Python
 	version to use, for example '2.3'. This string 
 	will be appended to the Python interpreter
 	canonical name.])
 
-AC_PATH_PROG(SWIG,swig,no)
+AC_PROG_SWIG(1.3.25)
+
 AC_PATH_PROG([PYTHON],[python[$PYTHON_VERSION]])
 if test -z "$PYTHON"; then
 	working_python=no
-- 
cgit 


From 53ae9bc9f6f66578948c3995073bdc1f1acae0f1 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 3 Dec 2007 13:48:09 +0100
Subject: r26248: Check in SWIG output so SWIG is not required when running out
 of svn. (This used to be commit 08501fbef38f81ce5ff4885a1696f9cb392fd631)

---
 source4/scripting/python/config.m4          |    2 +-
 source4/scripting/python/misc.py            |   53 +
 source4/scripting/python/misc_wrap.c        | 3279 +++++++++++++++++++++++++++
 source4/scripting/python/replace/stdint.i   |  109 -
 source4/scripting/python/replace/swigarch.i |   65 -
 5 files changed, 3333 insertions(+), 175 deletions(-)
 create mode 100644 source4/scripting/python/misc.py
 create mode 100644 source4/scripting/python/misc_wrap.c
 delete mode 100644 source4/scripting/python/replace/stdint.i
 delete mode 100644 source4/scripting/python/replace/swigarch.i

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/config.m4 b/source4/scripting/python/config.m4
index 8a4aba4a66..5e982556fc 100644
--- a/source4/scripting/python/config.m4
+++ b/source4/scripting/python/config.m4
@@ -5,7 +5,7 @@ AC_ARG_VAR([PYTHON_VERSION],[The installed Python
 	will be appended to the Python interpreter
 	canonical name.])
 
-AC_PROG_SWIG(1.3.25)
+AC_PROG_SWIG(1.3.31)
 
 AC_PATH_PROG([PYTHON],[python[$PYTHON_VERSION]])
 if test -z "$PYTHON"; then
diff --git a/source4/scripting/python/misc.py b/source4/scripting/python/misc.py
new file mode 100644
index 0000000000..94625be2c9
--- /dev/null
+++ b/source4/scripting/python/misc.py
@@ -0,0 +1,53 @@
+# This file was automatically generated by SWIG (http://www.swig.org).
+# Version 1.3.33
+#
+# Don't modify this file, modify the SWIG interface instead.
+# This file is compatible with both classic and new-style classes.
+
+import _misc
+import new
+new_instancemethod = new.instancemethod
+try:
+    _swig_property = property
+except NameError:
+    pass # Python < 2.2 doesn't have 'property'.
+def _swig_setattr_nondynamic(self,class_type,name,value,static=1):
+    if (name == "thisown"): return self.this.own(value)
+    if (name == "this"):
+        if type(value).__name__ == 'PySwigObject':
+            self.__dict__[name] = value
+            return
+    method = class_type.__swig_setmethods__.get(name,None)
+    if method: return method(self,value)
+    if (not static) or hasattr(self,name):
+        self.__dict__[name] = value
+    else:
+        raise AttributeError("You cannot add attributes to %s" % self)
+
+def _swig_setattr(self,class_type,name,value):
+    return _swig_setattr_nondynamic(self,class_type,name,value,0)
+
+def _swig_getattr(self,class_type,name):
+    if (name == "thisown"): return self.this.own()
+    method = class_type.__swig_getmethods__.get(name,None)
+    if method: return method(self)
+    raise AttributeError,name
+
+def _swig_repr(self):
+    try: strthis = "proxy of " + self.this.__repr__()
+    except: strthis = ""
+    return "<%s.%s; %s >" % (self.__class__.__module__, self.__class__.__name__, strthis,)
+
+import types
+try:
+    _object = types.ObjectType
+    _newclass = 1
+except AttributeError:
+    class _object : pass
+    _newclass = 0
+del types
+
+
+random_password = _misc.random_password
+
+
diff --git a/source4/scripting/python/misc_wrap.c b/source4/scripting/python/misc_wrap.c
new file mode 100644
index 0000000000..2237f9cb03
--- /dev/null
+++ b/source4/scripting/python/misc_wrap.c
@@ -0,0 +1,3279 @@
+/* ----------------------------------------------------------------------------
+ * This file was automatically generated by SWIG (http://www.swig.org).
+ * Version 1.3.33
+ * 
+ * This file is not intended to be easily readable and contains a number of 
+ * coding conventions designed to improve portability and efficiency. Do not make
+ * changes to this file unless you know what you are doing--modify the SWIG 
+ * interface file instead. 
+ * ----------------------------------------------------------------------------- */
+
+#define SWIGPYTHON
+#define SWIG_PYTHON_DIRECTOR_NO_VTABLE
+/* -----------------------------------------------------------------------------
+ *  This section contains generic SWIG labels for method/variable
+ *  declarations/attributes, and other compiler dependent labels.
+ * ----------------------------------------------------------------------------- */
+
+/* template workaround for compilers that cannot correctly implement the C++ standard */
+#ifndef SWIGTEMPLATEDISAMBIGUATOR
+# if defined(__SUNPRO_CC) && (__SUNPRO_CC <= 0x560)
+#  define SWIGTEMPLATEDISAMBIGUATOR template
+# elif defined(__HP_aCC)
+/* Needed even with `aCC -AA' when `aCC -V' reports HP ANSI C++ B3910B A.03.55 */
+/* If we find a maximum version that requires this, the test would be __HP_aCC <= 35500 for A.03.55 */
+#  define SWIGTEMPLATEDISAMBIGUATOR template
+# else
+#  define SWIGTEMPLATEDISAMBIGUATOR
+# endif
+#endif
+
+/* inline attribute */
+#ifndef SWIGINLINE
+# if defined(__cplusplus) || (defined(__GNUC__) && !defined(__STRICT_ANSI__))
+#   define SWIGINLINE inline
+# else
+#   define SWIGINLINE
+# endif
+#endif
+
+/* attribute recognised by some compilers to avoid 'unused' warnings */
+#ifndef SWIGUNUSED
+# if defined(__GNUC__)
+#   if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
+#     define SWIGUNUSED __attribute__ ((__unused__)) 
+#   else
+#     define SWIGUNUSED
+#   endif
+# elif defined(__ICC)
+#   define SWIGUNUSED __attribute__ ((__unused__)) 
+# else
+#   define SWIGUNUSED 
+# endif
+#endif
+
+#ifndef SWIGUNUSEDPARM
+# ifdef __cplusplus
+#   define SWIGUNUSEDPARM(p)
+# else
+#   define SWIGUNUSEDPARM(p) p SWIGUNUSED 
+# endif
+#endif
+
+/* internal SWIG method */
+#ifndef SWIGINTERN
+# define SWIGINTERN static SWIGUNUSED
+#endif
+
+/* internal inline SWIG method */
+#ifndef SWIGINTERNINLINE
+# define SWIGINTERNINLINE SWIGINTERN SWIGINLINE
+#endif
+
+/* exporting methods */
+#if (__GNUC__ >= 4) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)
+#  ifndef GCC_HASCLASSVISIBILITY
+#    define GCC_HASCLASSVISIBILITY
+#  endif
+#endif
+
+#ifndef SWIGEXPORT
+# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
+#   if defined(STATIC_LINKED)
+#     define SWIGEXPORT
+#   else
+#     define SWIGEXPORT __declspec(dllexport)
+#   endif
+# else
+#   if defined(__GNUC__) && defined(GCC_HASCLASSVISIBILITY)
+#     define SWIGEXPORT __attribute__ ((visibility("default")))
+#   else
+#     define SWIGEXPORT
+#   endif
+# endif
+#endif
+
+/* calling conventions for Windows */
+#ifndef SWIGSTDCALL
+# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
+#   define SWIGSTDCALL __stdcall
+# else
+#   define SWIGSTDCALL
+# endif 
+#endif
+
+/* Deal with Microsoft's attempt at deprecating C standard runtime functions */
+#if !defined(SWIG_NO_CRT_SECURE_NO_DEPRECATE) && defined(_MSC_VER) && !defined(_CRT_SECURE_NO_DEPRECATE)
+# define _CRT_SECURE_NO_DEPRECATE
+#endif
+
+/* Deal with Microsoft's attempt at deprecating methods in the standard C++ library */
+#if !defined(SWIG_NO_SCL_SECURE_NO_DEPRECATE) && defined(_MSC_VER) && !defined(_SCL_SECURE_NO_DEPRECATE)
+# define _SCL_SECURE_NO_DEPRECATE
+#endif
+
+
+
+/* Python.h has to appear first */
+#include <Python.h>
+
+/* -----------------------------------------------------------------------------
+ * swigrun.swg
+ *
+ * This file contains generic CAPI SWIG runtime support for pointer
+ * type checking.
+ * ----------------------------------------------------------------------------- */
+
+/* This should only be incremented when either the layout of swig_type_info changes,
+   or for whatever reason, the runtime changes incompatibly */
+#define SWIG_RUNTIME_VERSION "3"
+
+/* define SWIG_TYPE_TABLE_NAME as "SWIG_TYPE_TABLE" */
+#ifdef SWIG_TYPE_TABLE
+# define SWIG_QUOTE_STRING(x) #x
+# define SWIG_EXPAND_AND_QUOTE_STRING(x) SWIG_QUOTE_STRING(x)
+# define SWIG_TYPE_TABLE_NAME SWIG_EXPAND_AND_QUOTE_STRING(SWIG_TYPE_TABLE)
+#else
+# define SWIG_TYPE_TABLE_NAME
+#endif
+
+/*
+  You can use the SWIGRUNTIME and SWIGRUNTIMEINLINE macros for
+  creating a static or dynamic library from the swig runtime code.
+  In 99.9% of the cases, swig just needs to declare them as 'static'.
+  
+  But only do this if is strictly necessary, ie, if you have problems
+  with your compiler or so.
+*/
+
+#ifndef SWIGRUNTIME
+# define SWIGRUNTIME SWIGINTERN
+#endif
+
+#ifndef SWIGRUNTIMEINLINE
+# define SWIGRUNTIMEINLINE SWIGRUNTIME SWIGINLINE
+#endif
+
+/*  Generic buffer size */
+#ifndef SWIG_BUFFER_SIZE
+# define SWIG_BUFFER_SIZE 1024
+#endif
+
+/* Flags for pointer conversions */
+#define SWIG_POINTER_DISOWN        0x1
+
+/* Flags for new pointer objects */
+#define SWIG_POINTER_OWN           0x1
+
+
+/* 
+   Flags/methods for returning states.
+   
+   The swig conversion methods, as ConvertPtr, return and integer 
+   that tells if the conversion was successful or not. And if not,
+   an error code can be returned (see swigerrors.swg for the codes).
+   
+   Use the following macros/flags to set or process the returning
+   states.
+   
+   In old swig versions, you usually write code as:
+
+     if (SWIG_ConvertPtr(obj,vptr,ty.flags) != -1) {
+       // success code
+     } else {
+       //fail code
+     }
+
+   Now you can be more explicit as:
+
+    int res = SWIG_ConvertPtr(obj,vptr,ty.flags);
+    if (SWIG_IsOK(res)) {
+      // success code
+    } else {
+      // fail code
+    }
+
+   that seems to be the same, but now you can also do
+
+    Type *ptr;
+    int res = SWIG_ConvertPtr(obj,(void **)(&ptr),ty.flags);
+    if (SWIG_IsOK(res)) {
+      // success code
+      if (SWIG_IsNewObj(res) {
+        ...
+	delete *ptr;
+      } else {
+        ...
+      }
+    } else {
+      // fail code
+    }
+    
+   I.e., now SWIG_ConvertPtr can return new objects and you can
+   identify the case and take care of the deallocation. Of course that
+   requires also to SWIG_ConvertPtr to return new result values, as
+
+      int SWIG_ConvertPtr(obj, ptr,...) {         
+        if (<obj is ok>) {			       
+          if (<need new object>) {		       
+            *ptr = <ptr to new allocated object>; 
+            return SWIG_NEWOBJ;		       
+          } else {				       
+            *ptr = <ptr to old object>;	       
+            return SWIG_OLDOBJ;		       
+          } 				       
+        } else {				       
+          return SWIG_BADOBJ;		       
+        }					       
+      }
+
+   Of course, returning the plain '0(success)/-1(fail)' still works, but you can be
+   more explicit by returning SWIG_BADOBJ, SWIG_ERROR or any of the
+   swig errors code.
+
+   Finally, if the SWIG_CASTRANK_MODE is enabled, the result code
+   allows to return the 'cast rank', for example, if you have this
+
+       int food(double)
+       int fooi(int);
+
+   and you call
+ 
+      food(1)   // cast rank '1'  (1 -> 1.0)
+      fooi(1)   // cast rank '0'
+
+   just use the SWIG_AddCast()/SWIG_CheckState()
+
+
+ */
+#define SWIG_OK                    (0) 
+#define SWIG_ERROR                 (-1)
+#define SWIG_IsOK(r)               (r >= 0)
+#define SWIG_ArgError(r)           ((r != SWIG_ERROR) ? r : SWIG_TypeError)  
+
+/* The CastRankLimit says how many bits are used for the cast rank */
+#define SWIG_CASTRANKLIMIT         (1 << 8)
+/* The NewMask denotes the object was created (using new/malloc) */
+#define SWIG_NEWOBJMASK            (SWIG_CASTRANKLIMIT  << 1)
+/* The TmpMask is for in/out typemaps that use temporal objects */
+#define SWIG_TMPOBJMASK            (SWIG_NEWOBJMASK << 1)
+/* Simple returning values */
+#define SWIG_BADOBJ                (SWIG_ERROR)
+#define SWIG_OLDOBJ                (SWIG_OK)
+#define SWIG_NEWOBJ                (SWIG_OK | SWIG_NEWOBJMASK)
+#define SWIG_TMPOBJ                (SWIG_OK | SWIG_TMPOBJMASK)
+/* Check, add and del mask methods */
+#define SWIG_AddNewMask(r)         (SWIG_IsOK(r) ? (r | SWIG_NEWOBJMASK) : r)
+#define SWIG_DelNewMask(r)         (SWIG_IsOK(r) ? (r & ~SWIG_NEWOBJMASK) : r)
+#define SWIG_IsNewObj(r)           (SWIG_IsOK(r) && (r & SWIG_NEWOBJMASK))
+#define SWIG_AddTmpMask(r)         (SWIG_IsOK(r) ? (r | SWIG_TMPOBJMASK) : r)
+#define SWIG_DelTmpMask(r)         (SWIG_IsOK(r) ? (r & ~SWIG_TMPOBJMASK) : r)
+#define SWIG_IsTmpObj(r)           (SWIG_IsOK(r) && (r & SWIG_TMPOBJMASK))
+
+
+/* Cast-Rank Mode */
+#if defined(SWIG_CASTRANK_MODE)
+#  ifndef SWIG_TypeRank
+#    define SWIG_TypeRank             unsigned long
+#  endif
+#  ifndef SWIG_MAXCASTRANK            /* Default cast allowed */
+#    define SWIG_MAXCASTRANK          (2)
+#  endif
+#  define SWIG_CASTRANKMASK          ((SWIG_CASTRANKLIMIT) -1)
+#  define SWIG_CastRank(r)           (r & SWIG_CASTRANKMASK)
+SWIGINTERNINLINE int SWIG_AddCast(int r) { 
+  return SWIG_IsOK(r) ? ((SWIG_CastRank(r) < SWIG_MAXCASTRANK) ? (r + 1) : SWIG_ERROR) : r;
+}
+SWIGINTERNINLINE int SWIG_CheckState(int r) { 
+  return SWIG_IsOK(r) ? SWIG_CastRank(r) + 1 : 0; 
+}
+#else /* no cast-rank mode */
+#  define SWIG_AddCast
+#  define SWIG_CheckState(r) (SWIG_IsOK(r) ? 1 : 0)
+#endif
+
+
+
+
+#include <string.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef void *(*swig_converter_func)(void *);
+typedef struct swig_type_info *(*swig_dycast_func)(void **);
+
+/* Structure to store inforomation on one type */
+typedef struct swig_type_info {
+  const char             *name;			/* mangled name of this type */
+  const char             *str;			/* human readable name of this type */
+  swig_dycast_func        dcast;		/* dynamic cast function down a hierarchy */
+  struct swig_cast_info  *cast;			/* linked list of types that can cast into this type */
+  void                   *clientdata;		/* language specific type data */
+  int                    owndata;		/* flag if the structure owns the clientdata */
+} swig_type_info;
+
+/* Structure to store a type and conversion function used for casting */
+typedef struct swig_cast_info {
+  swig_type_info         *type;			/* pointer to type that is equivalent to this type */
+  swig_converter_func     converter;		/* function to cast the void pointers */
+  struct swig_cast_info  *next;			/* pointer to next cast in linked list */
+  struct swig_cast_info  *prev;			/* pointer to the previous cast */
+} swig_cast_info;
+
+/* Structure used to store module information
+ * Each module generates one structure like this, and the runtime collects
+ * all of these structures and stores them in a circularly linked list.*/
+typedef struct swig_module_info {
+  swig_type_info         **types;		/* Array of pointers to swig_type_info structures that are in this module */
+  size_t                 size;		        /* Number of types in this module */
+  struct swig_module_info *next;		/* Pointer to next element in circularly linked list */
+  swig_type_info         **type_initial;	/* Array of initially generated type structures */
+  swig_cast_info         **cast_initial;	/* Array of initially generated casting structures */
+  void                    *clientdata;		/* Language specific module data */
+} swig_module_info;
+
+/* 
+  Compare two type names skipping the space characters, therefore
+  "char*" == "char *" and "Class<int>" == "Class<int >", etc.
+
+  Return 0 when the two name types are equivalent, as in
+  strncmp, but skipping ' '.
+*/
+SWIGRUNTIME int
+SWIG_TypeNameComp(const char *f1, const char *l1,
+		  const char *f2, const char *l2) {
+  for (;(f1 != l1) && (f2 != l2); ++f1, ++f2) {
+    while ((*f1 == ' ') && (f1 != l1)) ++f1;
+    while ((*f2 == ' ') && (f2 != l2)) ++f2;
+    if (*f1 != *f2) return (*f1 > *f2) ? 1 : -1;
+  }
+  return (int)((l1 - f1) - (l2 - f2));
+}
+
+/*
+  Check type equivalence in a name list like <name1>|<name2>|...
+  Return 0 if not equal, 1 if equal
+*/
+SWIGRUNTIME int
+SWIG_TypeEquiv(const char *nb, const char *tb) {
+  int equiv = 0;
+  const char* te = tb + strlen(tb);
+  const char* ne = nb;
+  while (!equiv && *ne) {
+    for (nb = ne; *ne; ++ne) {
+      if (*ne == '|') break;
+    }
+    equiv = (SWIG_TypeNameComp(nb, ne, tb, te) == 0) ? 1 : 0;
+    if (*ne) ++ne;
+  }
+  return equiv;
+}
+
+/*
+  Check type equivalence in a name list like <name1>|<name2>|...
+  Return 0 if equal, -1 if nb < tb, 1 if nb > tb
+*/
+SWIGRUNTIME int
+SWIG_TypeCompare(const char *nb, const char *tb) {
+  int equiv = 0;
+  const char* te = tb + strlen(tb);
+  const char* ne = nb;
+  while (!equiv && *ne) {
+    for (nb = ne; *ne; ++ne) {
+      if (*ne == '|') break;
+    }
+    equiv = (SWIG_TypeNameComp(nb, ne, tb, te) == 0) ? 1 : 0;
+    if (*ne) ++ne;
+  }
+  return equiv;
+}
+
+
+/* think of this as a c++ template<> or a scheme macro */
+#define SWIG_TypeCheck_Template(comparison, ty)         \
+  if (ty) {                                             \
+    swig_cast_info *iter = ty->cast;                    \
+    while (iter) {                                      \
+      if (comparison) {                                 \
+        if (iter == ty->cast) return iter;              \
+        /* Move iter to the top of the linked list */   \
+        iter->prev->next = iter->next;                  \
+        if (iter->next)                                 \
+          iter->next->prev = iter->prev;                \
+        iter->next = ty->cast;                          \
+        iter->prev = 0;                                 \
+        if (ty->cast) ty->cast->prev = iter;            \
+        ty->cast = iter;                                \
+        return iter;                                    \
+      }                                                 \
+      iter = iter->next;                                \
+    }                                                   \
+  }                                                     \
+  return 0
+
+/*
+  Check the typename
+*/
+SWIGRUNTIME swig_cast_info *
+SWIG_TypeCheck(const char *c, swig_type_info *ty) {
+  SWIG_TypeCheck_Template(strcmp(iter->type->name, c) == 0, ty);
+}
+
+/* Same as previous function, except strcmp is replaced with a pointer comparison */
+SWIGRUNTIME swig_cast_info *
+SWIG_TypeCheckStruct(swig_type_info *from, swig_type_info *into) {
+  SWIG_TypeCheck_Template(iter->type == from, into);
+}
+
+/*
+  Cast a pointer up an inheritance hierarchy
+*/
+SWIGRUNTIMEINLINE void *
+SWIG_TypeCast(swig_cast_info *ty, void *ptr) {
+  return ((!ty) || (!ty->converter)) ? ptr : (*ty->converter)(ptr);
+}
+
+/* 
+   Dynamic pointer casting. Down an inheritance hierarchy
+*/
+SWIGRUNTIME swig_type_info *
+SWIG_TypeDynamicCast(swig_type_info *ty, void **ptr) {
+  swig_type_info *lastty = ty;
+  if (!ty || !ty->dcast) return ty;
+  while (ty && (ty->dcast)) {
+    ty = (*ty->dcast)(ptr);
+    if (ty) lastty = ty;
+  }
+  return lastty;
+}
+
+/*
+  Return the name associated with this type
+*/
+SWIGRUNTIMEINLINE const char *
+SWIG_TypeName(const swig_type_info *ty) {
+  return ty->name;
+}
+
+/*
+  Return the pretty name associated with this type,
+  that is an unmangled type name in a form presentable to the user.
+*/
+SWIGRUNTIME const char *
+SWIG_TypePrettyName(const swig_type_info *type) {
+  /* The "str" field contains the equivalent pretty names of the
+     type, separated by vertical-bar characters.  We choose
+     to print the last name, as it is often (?) the most
+     specific. */
+  if (!type) return NULL;
+  if (type->str != NULL) {
+    const char *last_name = type->str;
+    const char *s;
+    for (s = type->str; *s; s++)
+      if (*s == '|') last_name = s+1;
+    return last_name;
+  }
+  else
+    return type->name;
+}
+
+/* 
+   Set the clientdata field for a type
+*/
+SWIGRUNTIME void
+SWIG_TypeClientData(swig_type_info *ti, void *clientdata) {
+  swig_cast_info *cast = ti->cast;
+  /* if (ti->clientdata == clientdata) return; */
+  ti->clientdata = clientdata;
+  
+  while (cast) {
+    if (!cast->converter) {
+      swig_type_info *tc = cast->type;
+      if (!tc->clientdata) {
+	SWIG_TypeClientData(tc, clientdata);
+      }
+    }    
+    cast = cast->next;
+  }
+}
+SWIGRUNTIME void
+SWIG_TypeNewClientData(swig_type_info *ti, void *clientdata) {
+  SWIG_TypeClientData(ti, clientdata);
+  ti->owndata = 1;
+}
+  
+/*
+  Search for a swig_type_info structure only by mangled name
+  Search is a O(log #types)
+  
+  We start searching at module start, and finish searching when start == end.  
+  Note: if start == end at the beginning of the function, we go all the way around
+  the circular list.
+*/
+SWIGRUNTIME swig_type_info *
+SWIG_MangledTypeQueryModule(swig_module_info *start, 
+                            swig_module_info *end, 
+		            const char *name) {
+  swig_module_info *iter = start;
+  do {
+    if (iter->size) {
+      register size_t l = 0;
+      register size_t r = iter->size - 1;
+      do {
+	/* since l+r >= 0, we can (>> 1) instead (/ 2) */
+	register size_t i = (l + r) >> 1; 
+	const char *iname = iter->types[i]->name;
+	if (iname) {
+	  register int compare = strcmp(name, iname);
+	  if (compare == 0) {	    
+	    return iter->types[i];
+	  } else if (compare < 0) {
+	    if (i) {
+	      r = i - 1;
+	    } else {
+	      break;
+	    }
+	  } else if (compare > 0) {
+	    l = i + 1;
+	  }
+	} else {
+	  break; /* should never happen */
+	}
+      } while (l <= r);
+    }
+    iter = iter->next;
+  } while (iter != end);
+  return 0;
+}
+
+/*
+  Search for a swig_type_info structure for either a mangled name or a human readable name.
+  It first searches the mangled names of the types, which is a O(log #types)
+  If a type is not found it then searches the human readable names, which is O(#types).
+  
+  We start searching at module start, and finish searching when start == end.  
+  Note: if start == end at the beginning of the function, we go all the way around
+  the circular list.
+*/
+SWIGRUNTIME swig_type_info *
+SWIG_TypeQueryModule(swig_module_info *start, 
+                     swig_module_info *end, 
+		     const char *name) {
+  /* STEP 1: Search the name field using binary search */
+  swig_type_info *ret = SWIG_MangledTypeQueryModule(start, end, name);
+  if (ret) {
+    return ret;
+  } else {
+    /* STEP 2: If the type hasn't been found, do a complete search
+       of the str field (the human readable name) */
+    swig_module_info *iter = start;
+    do {
+      register size_t i = 0;
+      for (; i < iter->size; ++i) {
+	if (iter->types[i]->str && (SWIG_TypeEquiv(iter->types[i]->str, name)))
+	  return iter->types[i];
+      }
+      iter = iter->next;
+    } while (iter != end);
+  }
+  
+  /* neither found a match */
+  return 0;
+}
+
+/* 
+   Pack binary data into a string
+*/
+SWIGRUNTIME char *
+SWIG_PackData(char *c, void *ptr, size_t sz) {
+  static const char hex[17] = "0123456789abcdef";
+  register const unsigned char *u = (unsigned char *) ptr;
+  register const unsigned char *eu =  u + sz;
+  for (; u != eu; ++u) {
+    register unsigned char uu = *u;
+    *(c++) = hex[(uu & 0xf0) >> 4];
+    *(c++) = hex[uu & 0xf];
+  }
+  return c;
+}
+
+/* 
+   Unpack binary data from a string
+*/
+SWIGRUNTIME const char *
+SWIG_UnpackData(const char *c, void *ptr, size_t sz) {
+  register unsigned char *u = (unsigned char *) ptr;
+  register const unsigned char *eu = u + sz;
+  for (; u != eu; ++u) {
+    register char d = *(c++);
+    register unsigned char uu;
+    if ((d >= '0') && (d <= '9'))
+      uu = ((d - '0') << 4);
+    else if ((d >= 'a') && (d <= 'f'))
+      uu = ((d - ('a'-10)) << 4);
+    else 
+      return (char *) 0;
+    d = *(c++);
+    if ((d >= '0') && (d <= '9'))
+      uu |= (d - '0');
+    else if ((d >= 'a') && (d <= 'f'))
+      uu |= (d - ('a'-10));
+    else 
+      return (char *) 0;
+    *u = uu;
+  }
+  return c;
+}
+
+/* 
+   Pack 'void *' into a string buffer.
+*/
+SWIGRUNTIME char *
+SWIG_PackVoidPtr(char *buff, void *ptr, const char *name, size_t bsz) {
+  char *r = buff;
+  if ((2*sizeof(void *) + 2) > bsz) return 0;
+  *(r++) = '_';
+  r = SWIG_PackData(r,&ptr,sizeof(void *));
+  if (strlen(name) + 1 > (bsz - (r - buff))) return 0;
+  strcpy(r,name);
+  return buff;
+}
+
+SWIGRUNTIME const char *
+SWIG_UnpackVoidPtr(const char *c, void **ptr, const char *name) {
+  if (*c != '_') {
+    if (strcmp(c,"NULL") == 0) {
+      *ptr = (void *) 0;
+      return name;
+    } else {
+      return 0;
+    }
+  }
+  return SWIG_UnpackData(++c,ptr,sizeof(void *));
+}
+
+SWIGRUNTIME char *
+SWIG_PackDataName(char *buff, void *ptr, size_t sz, const char *name, size_t bsz) {
+  char *r = buff;
+  size_t lname = (name ? strlen(name) : 0);
+  if ((2*sz + 2 + lname) > bsz) return 0;
+  *(r++) = '_';
+  r = SWIG_PackData(r,ptr,sz);
+  if (lname) {
+    strncpy(r,name,lname+1);
+  } else {
+    *r = 0;
+  }
+  return buff;
+}
+
+SWIGRUNTIME const char *
+SWIG_UnpackDataName(const char *c, void *ptr, size_t sz, const char *name) {
+  if (*c != '_') {
+    if (strcmp(c,"NULL") == 0) {
+      memset(ptr,0,sz);
+      return name;
+    } else {
+      return 0;
+    }
+  }
+  return SWIG_UnpackData(++c,ptr,sz);
+}
+
+#ifdef __cplusplus
+}
+#endif
+
+/*  Errors in SWIG */
+#define  SWIG_UnknownError    	   -1 
+#define  SWIG_IOError        	   -2 
+#define  SWIG_RuntimeError   	   -3 
+#define  SWIG_IndexError     	   -4 
+#define  SWIG_TypeError      	   -5 
+#define  SWIG_DivisionByZero 	   -6 
+#define  SWIG_OverflowError  	   -7 
+#define  SWIG_SyntaxError    	   -8 
+#define  SWIG_ValueError     	   -9 
+#define  SWIG_SystemError    	   -10
+#define  SWIG_AttributeError 	   -11
+#define  SWIG_MemoryError    	   -12 
+#define  SWIG_NullReferenceError   -13
+
+
+
+
+/* Add PyOS_snprintf for old Pythons */
+#if PY_VERSION_HEX < 0x02020000
+# if defined(_MSC_VER) || defined(__BORLANDC__) || defined(_WATCOM)
+#  define PyOS_snprintf _snprintf
+# else
+#  define PyOS_snprintf snprintf
+# endif
+#endif
+
+/* A crude PyString_FromFormat implementation for old Pythons */
+#if PY_VERSION_HEX < 0x02020000
+
+#ifndef SWIG_PYBUFFER_SIZE
+# define SWIG_PYBUFFER_SIZE 1024
+#endif
+
+static PyObject *
+PyString_FromFormat(const char *fmt, ...) {
+  va_list ap;
+  char buf[SWIG_PYBUFFER_SIZE * 2];
+  int res;
+  va_start(ap, fmt);
+  res = vsnprintf(buf, sizeof(buf), fmt, ap);
+  va_end(ap);
+  return (res < 0 || res >= (int)sizeof(buf)) ? 0 : PyString_FromString(buf);
+}
+#endif
+
+/* Add PyObject_Del for old Pythons */
+#if PY_VERSION_HEX < 0x01060000
+# define PyObject_Del(op) PyMem_DEL((op))
+#endif
+#ifndef PyObject_DEL
+# define PyObject_DEL PyObject_Del
+#endif
+
+/* A crude PyExc_StopIteration exception for old Pythons */
+#if PY_VERSION_HEX < 0x02020000
+# ifndef PyExc_StopIteration
+#  define PyExc_StopIteration PyExc_RuntimeError
+# endif
+# ifndef PyObject_GenericGetAttr
+#  define PyObject_GenericGetAttr 0
+# endif
+#endif
+/* Py_NotImplemented is defined in 2.1 and up. */
+#if PY_VERSION_HEX < 0x02010000
+# ifndef Py_NotImplemented
+#  define Py_NotImplemented PyExc_RuntimeError
+# endif
+#endif
+
+
+/* A crude PyString_AsStringAndSize implementation for old Pythons */
+#if PY_VERSION_HEX < 0x02010000
+# ifndef PyString_AsStringAndSize
+#  define PyString_AsStringAndSize(obj, s, len) {*s = PyString_AsString(obj); *len = *s ? strlen(*s) : 0;}
+# endif
+#endif
+
+/* PySequence_Size for old Pythons */
+#if PY_VERSION_HEX < 0x02000000
+# ifndef PySequence_Size
+#  define PySequence_Size PySequence_Length
+# endif
+#endif
+
+
+/* PyBool_FromLong for old Pythons */
+#if PY_VERSION_HEX < 0x02030000
+static
+PyObject *PyBool_FromLong(long ok)
+{
+  PyObject *result = ok ? Py_True : Py_False;
+  Py_INCREF(result);
+  return result;
+}
+#endif
+
+/* Py_ssize_t for old Pythons */
+/* This code is as recommended by: */
+/* http://www.python.org/dev/peps/pep-0353/#conversion-guidelines */
+#if PY_VERSION_HEX < 0x02050000 && !defined(PY_SSIZE_T_MIN)
+typedef int Py_ssize_t;
+# define PY_SSIZE_T_MAX INT_MAX
+# define PY_SSIZE_T_MIN INT_MIN
+#endif
+
+/* -----------------------------------------------------------------------------
+ * error manipulation
+ * ----------------------------------------------------------------------------- */
+
+SWIGRUNTIME PyObject*
+SWIG_Python_ErrorType(int code) {
+  PyObject* type = 0;
+  switch(code) {
+  case SWIG_MemoryError:
+    type = PyExc_MemoryError;
+    break;
+  case SWIG_IOError:
+    type = PyExc_IOError;
+    break;
+  case SWIG_RuntimeError:
+    type = PyExc_RuntimeError;
+    break;
+  case SWIG_IndexError:
+    type = PyExc_IndexError;
+    break;
+  case SWIG_TypeError:
+    type = PyExc_TypeError;
+    break;
+  case SWIG_DivisionByZero:
+    type = PyExc_ZeroDivisionError;
+    break;
+  case SWIG_OverflowError:
+    type = PyExc_OverflowError;
+    break;
+  case SWIG_SyntaxError:
+    type = PyExc_SyntaxError;
+    break;
+  case SWIG_ValueError:
+    type = PyExc_ValueError;
+    break;
+  case SWIG_SystemError:
+    type = PyExc_SystemError;
+    break;
+  case SWIG_AttributeError:
+    type = PyExc_AttributeError;
+    break;
+  default:
+    type = PyExc_RuntimeError;
+  }
+  return type;
+}
+
+
+SWIGRUNTIME void
+SWIG_Python_AddErrorMsg(const char* mesg)
+{
+  PyObject *type = 0;
+  PyObject *value = 0;
+  PyObject *traceback = 0;
+
+  if (PyErr_Occurred()) PyErr_Fetch(&type, &value, &traceback);
+  if (value) {
+    PyObject *old_str = PyObject_Str(value);
+    PyErr_Clear();
+    Py_XINCREF(type);
+    PyErr_Format(type, "%s %s", PyString_AsString(old_str), mesg);
+    Py_DECREF(old_str);
+    Py_DECREF(value);
+  } else {
+    PyErr_Format(PyExc_RuntimeError, mesg);
+  }
+}
+
+
+
+#if defined(SWIG_PYTHON_NO_THREADS)
+#  if defined(SWIG_PYTHON_THREADS)
+#    undef SWIG_PYTHON_THREADS
+#  endif
+#endif
+#if defined(SWIG_PYTHON_THREADS) /* Threading support is enabled */
+#  if !defined(SWIG_PYTHON_USE_GIL) && !defined(SWIG_PYTHON_NO_USE_GIL)
+#    if (PY_VERSION_HEX >= 0x02030000) /* For 2.3 or later, use the PyGILState calls */
+#      define SWIG_PYTHON_USE_GIL
+#    endif
+#  endif
+#  if defined(SWIG_PYTHON_USE_GIL) /* Use PyGILState threads calls */
+#    ifndef SWIG_PYTHON_INITIALIZE_THREADS
+#     define SWIG_PYTHON_INITIALIZE_THREADS  PyEval_InitThreads() 
+#    endif
+#    ifdef __cplusplus /* C++ code */
+       class SWIG_Python_Thread_Block {
+         bool status;
+         PyGILState_STATE state;
+       public:
+         void end() { if (status) { PyGILState_Release(state); status = false;} }
+         SWIG_Python_Thread_Block() : status(true), state(PyGILState_Ensure()) {}
+         ~SWIG_Python_Thread_Block() { end(); }
+       };
+       class SWIG_Python_Thread_Allow {
+         bool status;
+         PyThreadState *save;
+       public:
+         void end() { if (status) { PyEval_RestoreThread(save); status = false; }}
+         SWIG_Python_Thread_Allow() : status(true), save(PyEval_SaveThread()) {}
+         ~SWIG_Python_Thread_Allow() { end(); }
+       };
+#      define SWIG_PYTHON_THREAD_BEGIN_BLOCK   SWIG_Python_Thread_Block _swig_thread_block
+#      define SWIG_PYTHON_THREAD_END_BLOCK     _swig_thread_block.end()
+#      define SWIG_PYTHON_THREAD_BEGIN_ALLOW   SWIG_Python_Thread_Allow _swig_thread_allow
+#      define SWIG_PYTHON_THREAD_END_ALLOW     _swig_thread_allow.end()
+#    else /* C code */
+#      define SWIG_PYTHON_THREAD_BEGIN_BLOCK   PyGILState_STATE _swig_thread_block = PyGILState_Ensure()
+#      define SWIG_PYTHON_THREAD_END_BLOCK     PyGILState_Release(_swig_thread_block)
+#      define SWIG_PYTHON_THREAD_BEGIN_ALLOW   PyThreadState *_swig_thread_allow = PyEval_SaveThread()
+#      define SWIG_PYTHON_THREAD_END_ALLOW     PyEval_RestoreThread(_swig_thread_allow)
+#    endif
+#  else /* Old thread way, not implemented, user must provide it */
+#    if !defined(SWIG_PYTHON_INITIALIZE_THREADS)
+#      define SWIG_PYTHON_INITIALIZE_THREADS
+#    endif
+#    if !defined(SWIG_PYTHON_THREAD_BEGIN_BLOCK)
+#      define SWIG_PYTHON_THREAD_BEGIN_BLOCK
+#    endif
+#    if !defined(SWIG_PYTHON_THREAD_END_BLOCK)
+#      define SWIG_PYTHON_THREAD_END_BLOCK
+#    endif
+#    if !defined(SWIG_PYTHON_THREAD_BEGIN_ALLOW)
+#      define SWIG_PYTHON_THREAD_BEGIN_ALLOW
+#    endif
+#    if !defined(SWIG_PYTHON_THREAD_END_ALLOW)
+#      define SWIG_PYTHON_THREAD_END_ALLOW
+#    endif
+#  endif
+#else /* No thread support */
+#  define SWIG_PYTHON_INITIALIZE_THREADS
+#  define SWIG_PYTHON_THREAD_BEGIN_BLOCK
+#  define SWIG_PYTHON_THREAD_END_BLOCK
+#  define SWIG_PYTHON_THREAD_BEGIN_ALLOW
+#  define SWIG_PYTHON_THREAD_END_ALLOW
+#endif
+
+/* -----------------------------------------------------------------------------
+ * Python API portion that goes into the runtime
+ * ----------------------------------------------------------------------------- */
+
+#ifdef __cplusplus
+extern "C" {
+#if 0
+} /* cc-mode */
+#endif
+#endif
+
+/* -----------------------------------------------------------------------------
+ * Constant declarations
+ * ----------------------------------------------------------------------------- */
+
+/* Constant Types */
+#define SWIG_PY_POINTER 4
+#define SWIG_PY_BINARY  5
+
+/* Constant information structure */
+typedef struct swig_const_info {
+  int type;
+  char *name;
+  long lvalue;
+  double dvalue;
+  void   *pvalue;
+  swig_type_info **ptype;
+} swig_const_info;
+
+#ifdef __cplusplus
+#if 0
+{ /* cc-mode */
+#endif
+}
+#endif
+
+
+/* -----------------------------------------------------------------------------
+ * See the LICENSE file for information on copyright, usage and redistribution
+ * of SWIG, and the README file for authors - http://www.swig.org/release.html.
+ *
+ * pyrun.swg
+ *
+ * This file contains the runtime support for Python modules
+ * and includes code for managing global variables and pointer
+ * type checking.
+ *
+ * ----------------------------------------------------------------------------- */
+
+/* Common SWIG API */
+
+/* for raw pointers */
+#define SWIG_Python_ConvertPtr(obj, pptr, type, flags)  SWIG_Python_ConvertPtrAndOwn(obj, pptr, type, flags, 0)
+#define SWIG_ConvertPtr(obj, pptr, type, flags)         SWIG_Python_ConvertPtr(obj, pptr, type, flags)
+#define SWIG_ConvertPtrAndOwn(obj,pptr,type,flags,own)  SWIG_Python_ConvertPtrAndOwn(obj, pptr, type, flags, own)
+#define SWIG_NewPointerObj(ptr, type, flags)            SWIG_Python_NewPointerObj(ptr, type, flags)
+#define SWIG_CheckImplicit(ty)                          SWIG_Python_CheckImplicit(ty) 
+#define SWIG_AcquirePtr(ptr, src)                       SWIG_Python_AcquirePtr(ptr, src)
+#define swig_owntype                                    int
+
+/* for raw packed data */
+#define SWIG_ConvertPacked(obj, ptr, sz, ty)            SWIG_Python_ConvertPacked(obj, ptr, sz, ty)
+#define SWIG_NewPackedObj(ptr, sz, type)                SWIG_Python_NewPackedObj(ptr, sz, type)
+
+/* for class or struct pointers */
+#define SWIG_ConvertInstance(obj, pptr, type, flags)    SWIG_ConvertPtr(obj, pptr, type, flags)
+#define SWIG_NewInstanceObj(ptr, type, flags)           SWIG_NewPointerObj(ptr, type, flags)
+
+/* for C or C++ function pointers */
+#define SWIG_ConvertFunctionPtr(obj, pptr, type)        SWIG_Python_ConvertFunctionPtr(obj, pptr, type)
+#define SWIG_NewFunctionPtrObj(ptr, type)               SWIG_Python_NewPointerObj(ptr, type, 0)
+
+/* for C++ member pointers, ie, member methods */
+#define SWIG_ConvertMember(obj, ptr, sz, ty)            SWIG_Python_ConvertPacked(obj, ptr, sz, ty)
+#define SWIG_NewMemberObj(ptr, sz, type)                SWIG_Python_NewPackedObj(ptr, sz, type)
+
+
+/* Runtime API */
+
+#define SWIG_GetModule(clientdata)                      SWIG_Python_GetModule()
+#define SWIG_SetModule(clientdata, pointer)             SWIG_Python_SetModule(pointer)
+#define SWIG_NewClientData(obj)                         PySwigClientData_New(obj)
+
+#define SWIG_SetErrorObj                                SWIG_Python_SetErrorObj                            
+#define SWIG_SetErrorMsg                        	SWIG_Python_SetErrorMsg				   
+#define SWIG_ErrorType(code)                    	SWIG_Python_ErrorType(code)                        
+#define SWIG_Error(code, msg)            		SWIG_Python_SetErrorMsg(SWIG_ErrorType(code), msg) 
+#define SWIG_fail                        		goto fail					   
+
+
+/* Runtime API implementation */
+
+/* Error manipulation */
+
+SWIGINTERN void 
+SWIG_Python_SetErrorObj(PyObject *errtype, PyObject *obj) {
+  SWIG_PYTHON_THREAD_BEGIN_BLOCK; 
+  PyErr_SetObject(errtype, obj);
+  Py_DECREF(obj);
+  SWIG_PYTHON_THREAD_END_BLOCK;
+}
+
+SWIGINTERN void 
+SWIG_Python_SetErrorMsg(PyObject *errtype, const char *msg) {
+  SWIG_PYTHON_THREAD_BEGIN_BLOCK;
+  PyErr_SetString(errtype, (char *) msg);
+  SWIG_PYTHON_THREAD_END_BLOCK;
+}
+
+#define SWIG_Python_Raise(obj, type, desc)  SWIG_Python_SetErrorObj(SWIG_Python_ExceptionType(desc), obj)
+
+/* Set a constant value */
+
+SWIGINTERN void
+SWIG_Python_SetConstant(PyObject *d, const char *name, PyObject *obj) {   
+  PyDict_SetItemString(d, (char*) name, obj);
+  Py_DECREF(obj);                            
+}
+
+/* Append a value to the result obj */
+
+SWIGINTERN PyObject*
+SWIG_Python_AppendOutput(PyObject* result, PyObject* obj) {
+#if !defined(SWIG_PYTHON_OUTPUT_TUPLE)
+  if (!result) {
+    result = obj;
+  } else if (result == Py_None) {
+    Py_DECREF(result);
+    result = obj;
+  } else {
+    if (!PyList_Check(result)) {
+      PyObject *o2 = result;
+      result = PyList_New(1);
+      PyList_SetItem(result, 0, o2);
+    }
+    PyList_Append(result,obj);
+    Py_DECREF(obj);
+  }
+  return result;
+#else
+  PyObject*   o2;
+  PyObject*   o3;
+  if (!result) {
+    result = obj;
+  } else if (result == Py_None) {
+    Py_DECREF(result);
+    result = obj;
+  } else {
+    if (!PyTuple_Check(result)) {
+      o2 = result;
+      result = PyTuple_New(1);
+      PyTuple_SET_ITEM(result, 0, o2);
+    }
+    o3 = PyTuple_New(1);
+    PyTuple_SET_ITEM(o3, 0, obj);
+    o2 = result;
+    result = PySequence_Concat(o2, o3);
+    Py_DECREF(o2);
+    Py_DECREF(o3);
+  }
+  return result;
+#endif
+}
+
+/* Unpack the argument tuple */
+
+SWIGINTERN int
+SWIG_Python_UnpackTuple(PyObject *args, const char *name, Py_ssize_t min, Py_ssize_t max, PyObject **objs)
+{
+  if (!args) {
+    if (!min && !max) {
+      return 1;
+    } else {
+      PyErr_Format(PyExc_TypeError, "%s expected %s%d arguments, got none", 
+		   name, (min == max ? "" : "at least "), (int)min);
+      return 0;
+    }
+  }  
+  if (!PyTuple_Check(args)) {
+    PyErr_SetString(PyExc_SystemError, "UnpackTuple() argument list is not a tuple");
+    return 0;
+  } else {
+    register Py_ssize_t l = PyTuple_GET_SIZE(args);
+    if (l < min) {
+      PyErr_Format(PyExc_TypeError, "%s expected %s%d arguments, got %d", 
+		   name, (min == max ? "" : "at least "), (int)min, (int)l);
+      return 0;
+    } else if (l > max) {
+      PyErr_Format(PyExc_TypeError, "%s expected %s%d arguments, got %d", 
+		   name, (min == max ? "" : "at most "), (int)max, (int)l);
+      return 0;
+    } else {
+      register int i;
+      for (i = 0; i < l; ++i) {
+	objs[i] = PyTuple_GET_ITEM(args, i);
+      }
+      for (; l < max; ++l) {
+	objs[l] = 0;
+      }
+      return i + 1;
+    }    
+  }
+}
+
+/* A functor is a function object with one single object argument */
+#if PY_VERSION_HEX >= 0x02020000
+#define SWIG_Python_CallFunctor(functor, obj)	        PyObject_CallFunctionObjArgs(functor, obj, NULL);
+#else
+#define SWIG_Python_CallFunctor(functor, obj)	        PyObject_CallFunction(functor, "O", obj);
+#endif
+
+/*
+  Helper for static pointer initialization for both C and C++ code, for example
+  static PyObject *SWIG_STATIC_POINTER(MyVar) = NewSomething(...);
+*/
+#ifdef __cplusplus
+#define SWIG_STATIC_POINTER(var)  var
+#else
+#define SWIG_STATIC_POINTER(var)  var = 0; if (!var) var
+#endif
+
+/* -----------------------------------------------------------------------------
+ * Pointer declarations
+ * ----------------------------------------------------------------------------- */
+
+/* Flags for new pointer objects */
+#define SWIG_POINTER_NOSHADOW       (SWIG_POINTER_OWN      << 1)
+#define SWIG_POINTER_NEW            (SWIG_POINTER_NOSHADOW | SWIG_POINTER_OWN)
+
+#define SWIG_POINTER_IMPLICIT_CONV  (SWIG_POINTER_DISOWN   << 1)
+
+#ifdef __cplusplus
+extern "C" {
+#if 0
+} /* cc-mode */
+#endif
+#endif
+
+/*  How to access Py_None */
+#if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
+#  ifndef SWIG_PYTHON_NO_BUILD_NONE
+#    ifndef SWIG_PYTHON_BUILD_NONE
+#      define SWIG_PYTHON_BUILD_NONE
+#    endif
+#  endif
+#endif
+
+#ifdef SWIG_PYTHON_BUILD_NONE
+#  ifdef Py_None
+#   undef Py_None
+#   define Py_None SWIG_Py_None()
+#  endif
+SWIGRUNTIMEINLINE PyObject * 
+_SWIG_Py_None(void)
+{
+  PyObject *none = Py_BuildValue((char*)"");
+  Py_DECREF(none);
+  return none;
+}
+SWIGRUNTIME PyObject * 
+SWIG_Py_None(void)
+{
+  static PyObject *SWIG_STATIC_POINTER(none) = _SWIG_Py_None();
+  return none;
+}
+#endif
+
+/* The python void return value */
+
+SWIGRUNTIMEINLINE PyObject * 
+SWIG_Py_Void(void)
+{
+  PyObject *none = Py_None;
+  Py_INCREF(none);
+  return none;
+}
+
+/* PySwigClientData */
+
+typedef struct {
+  PyObject *klass;
+  PyObject *newraw;
+  PyObject *newargs;
+  PyObject *destroy;
+  int delargs;
+  int implicitconv;
+} PySwigClientData;
+
+SWIGRUNTIMEINLINE int 
+SWIG_Python_CheckImplicit(swig_type_info *ty)
+{
+  PySwigClientData *data = (PySwigClientData *)ty->clientdata;
+  return data ? data->implicitconv : 0;
+}
+
+SWIGRUNTIMEINLINE PyObject *
+SWIG_Python_ExceptionType(swig_type_info *desc) {
+  PySwigClientData *data = desc ? (PySwigClientData *) desc->clientdata : 0;
+  PyObject *klass = data ? data->klass : 0;
+  return (klass ? klass : PyExc_RuntimeError);
+}
+
+
+SWIGRUNTIME PySwigClientData * 
+PySwigClientData_New(PyObject* obj)
+{
+  if (!obj) {
+    return 0;
+  } else {
+    PySwigClientData *data = (PySwigClientData *)malloc(sizeof(PySwigClientData));
+    /* the klass element */
+    data->klass = obj;
+    Py_INCREF(data->klass);
+    /* the newraw method and newargs arguments used to create a new raw instance */
+    if (PyClass_Check(obj)) {
+      data->newraw = 0;
+      data->newargs = obj;
+      Py_INCREF(obj);
+    } else {
+#if (PY_VERSION_HEX < 0x02020000)
+      data->newraw = 0;
+#else
+      data->newraw = PyObject_GetAttrString(data->klass, (char *)"__new__");
+#endif
+      if (data->newraw) {
+	Py_INCREF(data->newraw);
+	data->newargs = PyTuple_New(1);
+	PyTuple_SetItem(data->newargs, 0, obj);
+      } else {
+	data->newargs = obj;
+      }
+      Py_INCREF(data->newargs);
+    }
+    /* the destroy method, aka as the C++ delete method */
+    data->destroy = PyObject_GetAttrString(data->klass, (char *)"__swig_destroy__");
+    if (PyErr_Occurred()) {
+      PyErr_Clear();
+      data->destroy = 0;
+    }
+    if (data->destroy) {
+      int flags;
+      Py_INCREF(data->destroy);
+      flags = PyCFunction_GET_FLAGS(data->destroy);
+#ifdef METH_O
+      data->delargs = !(flags & (METH_O));
+#else
+      data->delargs = 0;
+#endif
+    } else {
+      data->delargs = 0;
+    }
+    data->implicitconv = 0;
+    return data;
+  }
+}
+
+SWIGRUNTIME void 
+PySwigClientData_Del(PySwigClientData* data)
+{
+  Py_XDECREF(data->newraw);
+  Py_XDECREF(data->newargs);
+  Py_XDECREF(data->destroy);
+}
+
+/* =============== PySwigObject =====================*/
+
+typedef struct {
+  PyObject_HEAD
+  void *ptr;
+  swig_type_info *ty;
+  int own;
+  PyObject *next;
+} PySwigObject;
+
+SWIGRUNTIME PyObject *
+PySwigObject_long(PySwigObject *v)
+{
+  return PyLong_FromVoidPtr(v->ptr);
+}
+
+SWIGRUNTIME PyObject *
+PySwigObject_format(const char* fmt, PySwigObject *v)
+{
+  PyObject *res = NULL;
+  PyObject *args = PyTuple_New(1);
+  if (args) {
+    if (PyTuple_SetItem(args, 0, PySwigObject_long(v)) == 0) {
+      PyObject *ofmt = PyString_FromString(fmt);
+      if (ofmt) {
+	res = PyString_Format(ofmt,args);
+	Py_DECREF(ofmt);
+      }
+      Py_DECREF(args);
+    }
+  }
+  return res;
+}
+
+SWIGRUNTIME PyObject *
+PySwigObject_oct(PySwigObject *v)
+{
+  return PySwigObject_format("%o",v);
+}
+
+SWIGRUNTIME PyObject *
+PySwigObject_hex(PySwigObject *v)
+{
+  return PySwigObject_format("%x",v);
+}
+
+SWIGRUNTIME PyObject *
+#ifdef METH_NOARGS
+PySwigObject_repr(PySwigObject *v)
+#else
+PySwigObject_repr(PySwigObject *v, PyObject *args)
+#endif
+{
+  const char *name = SWIG_TypePrettyName(v->ty);
+  PyObject *hex = PySwigObject_hex(v);    
+  PyObject *repr = PyString_FromFormat("<Swig Object of type '%s' at 0x%s>", name, PyString_AsString(hex));
+  Py_DECREF(hex);
+  if (v->next) {
+#ifdef METH_NOARGS
+    PyObject *nrep = PySwigObject_repr((PySwigObject *)v->next);
+#else
+    PyObject *nrep = PySwigObject_repr((PySwigObject *)v->next, args);
+#endif
+    PyString_ConcatAndDel(&repr,nrep);
+  }
+  return repr;  
+}
+
+SWIGRUNTIME int
+PySwigObject_print(PySwigObject *v, FILE *fp, int SWIGUNUSEDPARM(flags))
+{
+#ifdef METH_NOARGS
+  PyObject *repr = PySwigObject_repr(v);
+#else
+  PyObject *repr = PySwigObject_repr(v, NULL);
+#endif
+  if (repr) {
+    fputs(PyString_AsString(repr), fp);
+    Py_DECREF(repr);
+    return 0; 
+  } else {
+    return 1; 
+  }
+}
+
+SWIGRUNTIME PyObject *
+PySwigObject_str(PySwigObject *v)
+{
+  char result[SWIG_BUFFER_SIZE];
+  return SWIG_PackVoidPtr(result, v->ptr, v->ty->name, sizeof(result)) ?
+    PyString_FromString(result) : 0;
+}
+
+SWIGRUNTIME int
+PySwigObject_compare(PySwigObject *v, PySwigObject *w)
+{
+  void *i = v->ptr;
+  void *j = w->ptr;
+  return (i < j) ? -1 : ((i > j) ? 1 : 0);
+}
+
+SWIGRUNTIME PyTypeObject* _PySwigObject_type(void);
+
+SWIGRUNTIME PyTypeObject*
+PySwigObject_type(void) {
+  static PyTypeObject *SWIG_STATIC_POINTER(type) = _PySwigObject_type();
+  return type;
+}
+
+SWIGRUNTIMEINLINE int
+PySwigObject_Check(PyObject *op) {
+  return ((op)->ob_type == PySwigObject_type())
+    || (strcmp((op)->ob_type->tp_name,"PySwigObject") == 0);
+}
+
+SWIGRUNTIME PyObject *
+PySwigObject_New(void *ptr, swig_type_info *ty, int own);
+
+SWIGRUNTIME void
+PySwigObject_dealloc(PyObject *v)
+{
+  PySwigObject *sobj = (PySwigObject *) v;
+  PyObject *next = sobj->next;
+  if (sobj->own) {
+    swig_type_info *ty = sobj->ty;
+    PySwigClientData *data = ty ? (PySwigClientData *) ty->clientdata : 0;
+    PyObject *destroy = data ? data->destroy : 0;
+    if (destroy) {
+      /* destroy is always a VARARGS method */
+      PyObject *res;
+      if (data->delargs) {
+	/* we need to create a temporal object to carry the destroy operation */
+	PyObject *tmp = PySwigObject_New(sobj->ptr, ty, 0);
+	res = SWIG_Python_CallFunctor(destroy, tmp);
+	Py_DECREF(tmp);
+      } else {
+	PyCFunction meth = PyCFunction_GET_FUNCTION(destroy);
+	PyObject *mself = PyCFunction_GET_SELF(destroy);
+	res = ((*meth)(mself, v));
+      }
+      Py_XDECREF(res);
+    } else {
+      const char *name = SWIG_TypePrettyName(ty);
+#if !defined(SWIG_PYTHON_SILENT_MEMLEAK)
+      printf("swig/python detected a memory leak of type '%s', no destructor found.\n", name);
+#endif
+    }
+  } 
+  Py_XDECREF(next);
+  PyObject_DEL(v);
+}
+
+SWIGRUNTIME PyObject* 
+PySwigObject_append(PyObject* v, PyObject* next)
+{
+  PySwigObject *sobj = (PySwigObject *) v;
+#ifndef METH_O
+  PyObject *tmp = 0;
+  if (!PyArg_ParseTuple(next,(char *)"O:append", &tmp)) return NULL;
+  next = tmp;
+#endif
+  if (!PySwigObject_Check(next)) {
+    return NULL;
+  }
+  sobj->next = next;
+  Py_INCREF(next);
+  return SWIG_Py_Void();
+}
+
+SWIGRUNTIME PyObject* 
+#ifdef METH_NOARGS
+PySwigObject_next(PyObject* v)
+#else
+PySwigObject_next(PyObject* v, PyObject *SWIGUNUSEDPARM(args))
+#endif
+{
+  PySwigObject *sobj = (PySwigObject *) v;
+  if (sobj->next) {    
+    Py_INCREF(sobj->next);
+    return sobj->next;
+  } else {
+    return SWIG_Py_Void();
+  }
+}
+
+SWIGINTERN PyObject*
+#ifdef METH_NOARGS
+PySwigObject_disown(PyObject *v)
+#else
+PySwigObject_disown(PyObject* v, PyObject *SWIGUNUSEDPARM(args))
+#endif
+{
+  PySwigObject *sobj = (PySwigObject *)v;
+  sobj->own = 0;
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject*
+#ifdef METH_NOARGS
+PySwigObject_acquire(PyObject *v)
+#else
+PySwigObject_acquire(PyObject* v, PyObject *SWIGUNUSEDPARM(args))
+#endif
+{
+  PySwigObject *sobj = (PySwigObject *)v;
+  sobj->own = SWIG_POINTER_OWN;
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject*
+PySwigObject_own(PyObject *v, PyObject *args)
+{
+  PyObject *val = 0;
+#if (PY_VERSION_HEX < 0x02020000)
+  if (!PyArg_ParseTuple(args,(char *)"|O:own",&val))
+#else
+  if (!PyArg_UnpackTuple(args, (char *)"own", 0, 1, &val)) 
+#endif
+    {
+      return NULL;
+    } 
+  else
+    {
+      PySwigObject *sobj = (PySwigObject *)v;
+      PyObject *obj = PyBool_FromLong(sobj->own);
+      if (val) {
+#ifdef METH_NOARGS
+	if (PyObject_IsTrue(val)) {
+	  PySwigObject_acquire(v);
+	} else {
+	  PySwigObject_disown(v);
+	}
+#else
+	if (PyObject_IsTrue(val)) {
+	  PySwigObject_acquire(v,args);
+	} else {
+	  PySwigObject_disown(v,args);
+	}
+#endif
+      } 
+      return obj;
+    }
+}
+
+#ifdef METH_O
+static PyMethodDef
+swigobject_methods[] = {
+  {(char *)"disown",  (PyCFunction)PySwigObject_disown,  METH_NOARGS,  (char *)"releases ownership of the pointer"},
+  {(char *)"acquire", (PyCFunction)PySwigObject_acquire, METH_NOARGS,  (char *)"aquires ownership of the pointer"},
+  {(char *)"own",     (PyCFunction)PySwigObject_own,     METH_VARARGS, (char *)"returns/sets ownership of the pointer"},
+  {(char *)"append",  (PyCFunction)PySwigObject_append,  METH_O,       (char *)"appends another 'this' object"},
+  {(char *)"next",    (PyCFunction)PySwigObject_next,    METH_NOARGS,  (char *)"returns the next 'this' object"},
+  {(char *)"__repr__",(PyCFunction)PySwigObject_repr,    METH_NOARGS,  (char *)"returns object representation"},
+  {0, 0, 0, 0}  
+};
+#else
+static PyMethodDef
+swigobject_methods[] = {
+  {(char *)"disown",  (PyCFunction)PySwigObject_disown,  METH_VARARGS,  (char *)"releases ownership of the pointer"},
+  {(char *)"acquire", (PyCFunction)PySwigObject_acquire, METH_VARARGS,  (char *)"aquires ownership of the pointer"},
+  {(char *)"own",     (PyCFunction)PySwigObject_own,     METH_VARARGS,  (char *)"returns/sets ownership of the pointer"},
+  {(char *)"append",  (PyCFunction)PySwigObject_append,  METH_VARARGS,  (char *)"appends another 'this' object"},
+  {(char *)"next",    (PyCFunction)PySwigObject_next,    METH_VARARGS,  (char *)"returns the next 'this' object"},
+  {(char *)"__repr__",(PyCFunction)PySwigObject_repr,   METH_VARARGS,  (char *)"returns object representation"},
+  {0, 0, 0, 0}  
+};
+#endif
+
+#if PY_VERSION_HEX < 0x02020000
+SWIGINTERN PyObject *
+PySwigObject_getattr(PySwigObject *sobj,char *name)
+{
+  return Py_FindMethod(swigobject_methods, (PyObject *)sobj, name);
+}
+#endif
+
+SWIGRUNTIME PyTypeObject*
+_PySwigObject_type(void) {
+  static char swigobject_doc[] = "Swig object carries a C/C++ instance pointer";
+  
+  static PyNumberMethods PySwigObject_as_number = {
+    (binaryfunc)0, /*nb_add*/
+    (binaryfunc)0, /*nb_subtract*/
+    (binaryfunc)0, /*nb_multiply*/
+    (binaryfunc)0, /*nb_divide*/
+    (binaryfunc)0, /*nb_remainder*/
+    (binaryfunc)0, /*nb_divmod*/
+    (ternaryfunc)0,/*nb_power*/
+    (unaryfunc)0,  /*nb_negative*/
+    (unaryfunc)0,  /*nb_positive*/
+    (unaryfunc)0,  /*nb_absolute*/
+    (inquiry)0,    /*nb_nonzero*/
+    0,		   /*nb_invert*/
+    0,		   /*nb_lshift*/
+    0,		   /*nb_rshift*/
+    0,		   /*nb_and*/
+    0,		   /*nb_xor*/
+    0,		   /*nb_or*/
+    (coercion)0,   /*nb_coerce*/
+    (unaryfunc)PySwigObject_long, /*nb_int*/
+    (unaryfunc)PySwigObject_long, /*nb_long*/
+    (unaryfunc)0,                 /*nb_float*/
+    (unaryfunc)PySwigObject_oct,  /*nb_oct*/
+    (unaryfunc)PySwigObject_hex,  /*nb_hex*/
+#if PY_VERSION_HEX >= 0x02050000 /* 2.5.0 */
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 /* nb_inplace_add -> nb_index */
+#elif PY_VERSION_HEX >= 0x02020000 /* 2.2.0 */
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 /* nb_inplace_add -> nb_inplace_true_divide */
+#elif PY_VERSION_HEX >= 0x02000000 /* 2.0.0 */
+    0,0,0,0,0,0,0,0,0,0,0 /* nb_inplace_add -> nb_inplace_or */
+#endif
+  };
+
+  static PyTypeObject pyswigobject_type;  
+  static int type_init = 0;
+  if (!type_init) {
+    const PyTypeObject tmp
+      = {
+	PyObject_HEAD_INIT(NULL)
+	0,				    /* ob_size */
+	(char *)"PySwigObject",		    /* tp_name */
+	sizeof(PySwigObject),		    /* tp_basicsize */
+	0,			            /* tp_itemsize */
+	(destructor)PySwigObject_dealloc,   /* tp_dealloc */
+	(printfunc)PySwigObject_print,	    /* tp_print */
+#if PY_VERSION_HEX < 0x02020000
+	(getattrfunc)PySwigObject_getattr,  /* tp_getattr */ 
+#else
+	(getattrfunc)0,			    /* tp_getattr */ 
+#endif
+	(setattrfunc)0,			    /* tp_setattr */ 
+	(cmpfunc)PySwigObject_compare,	    /* tp_compare */ 
+	(reprfunc)PySwigObject_repr,	    /* tp_repr */    
+	&PySwigObject_as_number,	    /* tp_as_number */
+	0,				    /* tp_as_sequence */
+	0,				    /* tp_as_mapping */
+	(hashfunc)0,			    /* tp_hash */
+	(ternaryfunc)0,			    /* tp_call */
+	(reprfunc)PySwigObject_str,	    /* tp_str */
+	PyObject_GenericGetAttr,            /* tp_getattro */
+	0,				    /* tp_setattro */
+	0,		                    /* tp_as_buffer */
+	Py_TPFLAGS_DEFAULT,	            /* tp_flags */
+	swigobject_doc, 	            /* tp_doc */        
+	0,                                  /* tp_traverse */
+	0,                                  /* tp_clear */
+	0,                                  /* tp_richcompare */
+	0,                                  /* tp_weaklistoffset */
+#if PY_VERSION_HEX >= 0x02020000
+	0,                                  /* tp_iter */
+	0,                                  /* tp_iternext */
+	swigobject_methods,		    /* tp_methods */ 
+	0,			            /* tp_members */
+	0,				    /* tp_getset */	    	
+	0,			            /* tp_base */	        
+	0,				    /* tp_dict */	    	
+	0,				    /* tp_descr_get */  	
+	0,				    /* tp_descr_set */  	
+	0,				    /* tp_dictoffset */ 	
+	0,				    /* tp_init */	    	
+	0,				    /* tp_alloc */	    	
+	0,			            /* tp_new */	    	
+	0,	                            /* tp_free */	   
+        0,                                  /* tp_is_gc */  
+	0,				    /* tp_bases */   
+	0,				    /* tp_mro */
+	0,				    /* tp_cache */   
+ 	0,				    /* tp_subclasses */
+	0,				    /* tp_weaklist */
+#endif
+#if PY_VERSION_HEX >= 0x02030000
+	0,                                  /* tp_del */
+#endif
+#ifdef COUNT_ALLOCS
+	0,0,0,0                             /* tp_alloc -> tp_next */
+#endif
+      };
+    pyswigobject_type = tmp;
+    pyswigobject_type.ob_type = &PyType_Type;
+    type_init = 1;
+  }
+  return &pyswigobject_type;
+}
+
+SWIGRUNTIME PyObject *
+PySwigObject_New(void *ptr, swig_type_info *ty, int own)
+{
+  PySwigObject *sobj = PyObject_NEW(PySwigObject, PySwigObject_type());
+  if (sobj) {
+    sobj->ptr  = ptr;
+    sobj->ty   = ty;
+    sobj->own  = own;
+    sobj->next = 0;
+  }
+  return (PyObject *)sobj;
+}
+
+/* -----------------------------------------------------------------------------
+ * Implements a simple Swig Packed type, and use it instead of string
+ * ----------------------------------------------------------------------------- */
+
+typedef struct {
+  PyObject_HEAD
+  void *pack;
+  swig_type_info *ty;
+  size_t size;
+} PySwigPacked;
+
+SWIGRUNTIME int
+PySwigPacked_print(PySwigPacked *v, FILE *fp, int SWIGUNUSEDPARM(flags))
+{
+  char result[SWIG_BUFFER_SIZE];
+  fputs("<Swig Packed ", fp); 
+  if (SWIG_PackDataName(result, v->pack, v->size, 0, sizeof(result))) {
+    fputs("at ", fp); 
+    fputs(result, fp); 
+  }
+  fputs(v->ty->name,fp); 
+  fputs(">", fp);
+  return 0; 
+}
+  
+SWIGRUNTIME PyObject *
+PySwigPacked_repr(PySwigPacked *v)
+{
+  char result[SWIG_BUFFER_SIZE];
+  if (SWIG_PackDataName(result, v->pack, v->size, 0, sizeof(result))) {
+    return PyString_FromFormat("<Swig Packed at %s%s>", result, v->ty->name);
+  } else {
+    return PyString_FromFormat("<Swig Packed %s>", v->ty->name);
+  }  
+}
+
+SWIGRUNTIME PyObject *
+PySwigPacked_str(PySwigPacked *v)
+{
+  char result[SWIG_BUFFER_SIZE];
+  if (SWIG_PackDataName(result, v->pack, v->size, 0, sizeof(result))){
+    return PyString_FromFormat("%s%s", result, v->ty->name);
+  } else {
+    return PyString_FromString(v->ty->name);
+  }  
+}
+
+SWIGRUNTIME int
+PySwigPacked_compare(PySwigPacked *v, PySwigPacked *w)
+{
+  size_t i = v->size;
+  size_t j = w->size;
+  int s = (i < j) ? -1 : ((i > j) ? 1 : 0);
+  return s ? s : strncmp((char *)v->pack, (char *)w->pack, 2*v->size);
+}
+
+SWIGRUNTIME PyTypeObject* _PySwigPacked_type(void);
+
+SWIGRUNTIME PyTypeObject*
+PySwigPacked_type(void) {
+  static PyTypeObject *SWIG_STATIC_POINTER(type) = _PySwigPacked_type();
+  return type;
+}
+
+SWIGRUNTIMEINLINE int
+PySwigPacked_Check(PyObject *op) {
+  return ((op)->ob_type == _PySwigPacked_type()) 
+    || (strcmp((op)->ob_type->tp_name,"PySwigPacked") == 0);
+}
+
+SWIGRUNTIME void
+PySwigPacked_dealloc(PyObject *v)
+{
+  if (PySwigPacked_Check(v)) {
+    PySwigPacked *sobj = (PySwigPacked *) v;
+    free(sobj->pack);
+  }
+  PyObject_DEL(v);
+}
+
+SWIGRUNTIME PyTypeObject*
+_PySwigPacked_type(void) {
+  static char swigpacked_doc[] = "Swig object carries a C/C++ instance pointer";
+  static PyTypeObject pyswigpacked_type;
+  static int type_init = 0;  
+  if (!type_init) {
+    const PyTypeObject tmp
+      = {
+	PyObject_HEAD_INIT(NULL)
+	0,				    /* ob_size */	
+	(char *)"PySwigPacked",		    /* tp_name */	
+	sizeof(PySwigPacked),		    /* tp_basicsize */	
+	0,				    /* tp_itemsize */	
+	(destructor)PySwigPacked_dealloc,   /* tp_dealloc */	
+	(printfunc)PySwigPacked_print,	    /* tp_print */   	
+	(getattrfunc)0,			    /* tp_getattr */ 	
+	(setattrfunc)0,			    /* tp_setattr */ 	
+	(cmpfunc)PySwigPacked_compare,	    /* tp_compare */ 	
+	(reprfunc)PySwigPacked_repr,	    /* tp_repr */    	
+	0,	                            /* tp_as_number */	
+	0,				    /* tp_as_sequence */
+	0,				    /* tp_as_mapping */	
+	(hashfunc)0,			    /* tp_hash */	
+	(ternaryfunc)0,			    /* tp_call */	
+	(reprfunc)PySwigPacked_str,	    /* tp_str */	
+	PyObject_GenericGetAttr,            /* tp_getattro */
+	0,				    /* tp_setattro */
+	0,		                    /* tp_as_buffer */
+	Py_TPFLAGS_DEFAULT,	            /* tp_flags */
+	swigpacked_doc, 	            /* tp_doc */
+	0,                                  /* tp_traverse */
+	0,                                  /* tp_clear */
+	0,                                  /* tp_richcompare */
+	0,                                  /* tp_weaklistoffset */
+#if PY_VERSION_HEX >= 0x02020000
+	0,                                  /* tp_iter */
+	0,                                  /* tp_iternext */
+	0,		                    /* tp_methods */ 
+	0,			            /* tp_members */
+	0,				    /* tp_getset */	    	
+	0,			            /* tp_base */	        
+	0,				    /* tp_dict */	    	
+	0,				    /* tp_descr_get */  	
+	0,				    /* tp_descr_set */  	
+	0,				    /* tp_dictoffset */ 	
+	0,				    /* tp_init */	    	
+	0,				    /* tp_alloc */	    	
+	0,			            /* tp_new */	    	
+	0, 	                            /* tp_free */	   
+        0,                                  /* tp_is_gc */  
+	0,				    /* tp_bases */   
+	0,				    /* tp_mro */
+	0,				    /* tp_cache */   
+ 	0,				    /* tp_subclasses */
+	0,				    /* tp_weaklist */
+#endif
+#if PY_VERSION_HEX >= 0x02030000
+	0,                                  /* tp_del */
+#endif
+#ifdef COUNT_ALLOCS
+	0,0,0,0                             /* tp_alloc -> tp_next */
+#endif
+      };
+    pyswigpacked_type = tmp;
+    pyswigpacked_type.ob_type = &PyType_Type;
+    type_init = 1;
+  }
+  return &pyswigpacked_type;
+}
+
+SWIGRUNTIME PyObject *
+PySwigPacked_New(void *ptr, size_t size, swig_type_info *ty)
+{
+  PySwigPacked *sobj = PyObject_NEW(PySwigPacked, PySwigPacked_type());
+  if (sobj) {
+    void *pack = malloc(size);
+    if (pack) {
+      memcpy(pack, ptr, size);
+      sobj->pack = pack;
+      sobj->ty   = ty;
+      sobj->size = size;
+    } else {
+      PyObject_DEL((PyObject *) sobj);
+      sobj = 0;
+    }
+  }
+  return (PyObject *) sobj;
+}
+
+SWIGRUNTIME swig_type_info *
+PySwigPacked_UnpackData(PyObject *obj, void *ptr, size_t size)
+{
+  if (PySwigPacked_Check(obj)) {
+    PySwigPacked *sobj = (PySwigPacked *)obj;
+    if (sobj->size != size) return 0;
+    memcpy(ptr, sobj->pack, size);
+    return sobj->ty;
+  } else {
+    return 0;
+  }
+}
+
+/* -----------------------------------------------------------------------------
+ * pointers/data manipulation
+ * ----------------------------------------------------------------------------- */
+
+SWIGRUNTIMEINLINE PyObject *
+_SWIG_This(void)
+{
+  return PyString_FromString("this");
+}
+
+SWIGRUNTIME PyObject *
+SWIG_This(void)
+{
+  static PyObject *SWIG_STATIC_POINTER(swig_this) = _SWIG_This();
+  return swig_this;
+}
+
+/* #define SWIG_PYTHON_SLOW_GETSET_THIS */
+
+SWIGRUNTIME PySwigObject *
+SWIG_Python_GetSwigThis(PyObject *pyobj) 
+{
+  if (PySwigObject_Check(pyobj)) {
+    return (PySwigObject *) pyobj;
+  } else {
+    PyObject *obj = 0;
+#if (!defined(SWIG_PYTHON_SLOW_GETSET_THIS) && (PY_VERSION_HEX >= 0x02030000))
+    if (PyInstance_Check(pyobj)) {
+      obj = _PyInstance_Lookup(pyobj, SWIG_This());      
+    } else {
+      PyObject **dictptr = _PyObject_GetDictPtr(pyobj);
+      if (dictptr != NULL) {
+	PyObject *dict = *dictptr;
+	obj = dict ? PyDict_GetItem(dict, SWIG_This()) : 0;
+      } else {
+#ifdef PyWeakref_CheckProxy
+	if (PyWeakref_CheckProxy(pyobj)) {
+	  PyObject *wobj = PyWeakref_GET_OBJECT(pyobj);
+	  return wobj ? SWIG_Python_GetSwigThis(wobj) : 0;
+	}
+#endif
+	obj = PyObject_GetAttr(pyobj,SWIG_This());
+	if (obj) {
+	  Py_DECREF(obj);
+	} else {
+	  if (PyErr_Occurred()) PyErr_Clear();
+	  return 0;
+	}
+      }
+    }
+#else
+    obj = PyObject_GetAttr(pyobj,SWIG_This());
+    if (obj) {
+      Py_DECREF(obj);
+    } else {
+      if (PyErr_Occurred()) PyErr_Clear();
+      return 0;
+    }
+#endif
+    if (obj && !PySwigObject_Check(obj)) {
+      /* a PyObject is called 'this', try to get the 'real this'
+	 PySwigObject from it */ 
+      return SWIG_Python_GetSwigThis(obj);
+    }
+    return (PySwigObject *)obj;
+  }
+}
+
+/* Acquire a pointer value */
+
+SWIGRUNTIME int
+SWIG_Python_AcquirePtr(PyObject *obj, int own) {
+  if (own) {
+    PySwigObject *sobj = SWIG_Python_GetSwigThis(obj);
+    if (sobj) {
+      int oldown = sobj->own;
+      sobj->own = own;
+      return oldown;
+    }
+  }
+  return 0;
+}
+
+/* Convert a pointer value */
+
+SWIGRUNTIME int
+SWIG_Python_ConvertPtrAndOwn(PyObject *obj, void **ptr, swig_type_info *ty, int flags, int *own) {
+  if (!obj) return SWIG_ERROR;
+  if (obj == Py_None) {
+    if (ptr) *ptr = 0;
+    return SWIG_OK;
+  } else {
+    PySwigObject *sobj = SWIG_Python_GetSwigThis(obj);
+    while (sobj) {
+      void *vptr = sobj->ptr;
+      if (ty) {
+	swig_type_info *to = sobj->ty;
+	if (to == ty) {
+	  /* no type cast needed */
+	  if (ptr) *ptr = vptr;
+	  break;
+	} else {
+	  swig_cast_info *tc = SWIG_TypeCheck(to->name,ty);
+	  if (!tc) {
+	    sobj = (PySwigObject *)sobj->next;
+	  } else {
+	    if (ptr) *ptr = SWIG_TypeCast(tc,vptr);
+	    break;
+	  }
+	}
+      } else {
+	if (ptr) *ptr = vptr;
+	break;
+      }
+    }
+    if (sobj) {
+      if (own) *own = sobj->own;
+      if (flags & SWIG_POINTER_DISOWN) {
+	sobj->own = 0;
+      }
+      return SWIG_OK;
+    } else {
+      int res = SWIG_ERROR;
+      if (flags & SWIG_POINTER_IMPLICIT_CONV) {
+	PySwigClientData *data = ty ? (PySwigClientData *) ty->clientdata : 0;
+	if (data && !data->implicitconv) {
+	  PyObject *klass = data->klass;
+	  if (klass) {
+	    PyObject *impconv;
+	    data->implicitconv = 1; /* avoid recursion and call 'explicit' constructors*/
+	    impconv = SWIG_Python_CallFunctor(klass, obj);
+	    data->implicitconv = 0;
+	    if (PyErr_Occurred()) {
+	      PyErr_Clear();
+	      impconv = 0;
+	    }
+	    if (impconv) {
+	      PySwigObject *iobj = SWIG_Python_GetSwigThis(impconv);
+	      if (iobj) {
+		void *vptr;
+		res = SWIG_Python_ConvertPtrAndOwn((PyObject*)iobj, &vptr, ty, 0, 0);
+		if (SWIG_IsOK(res)) {
+		  if (ptr) {
+		    *ptr = vptr;
+		    /* transfer the ownership to 'ptr' */
+		    iobj->own = 0;
+		    res = SWIG_AddCast(res);
+		    res = SWIG_AddNewMask(res);
+		  } else {
+		    res = SWIG_AddCast(res);		    
+		  }
+		}
+	      }
+	      Py_DECREF(impconv);
+	    }
+	  }
+	}
+      }
+      return res;
+    }
+  }
+}
+
+/* Convert a function ptr value */
+
+SWIGRUNTIME int
+SWIG_Python_ConvertFunctionPtr(PyObject *obj, void **ptr, swig_type_info *ty) {
+  if (!PyCFunction_Check(obj)) {
+    return SWIG_ConvertPtr(obj, ptr, ty, 0);
+  } else {
+    void *vptr = 0;
+    
+    /* here we get the method pointer for callbacks */
+    const char *doc = (((PyCFunctionObject *)obj) -> m_ml -> ml_doc);
+    const char *desc = doc ? strstr(doc, "swig_ptr: ") : 0;
+    if (desc) {
+      desc = ty ? SWIG_UnpackVoidPtr(desc + 10, &vptr, ty->name) : 0;
+      if (!desc) return SWIG_ERROR;
+    }
+    if (ty) {
+      swig_cast_info *tc = SWIG_TypeCheck(desc,ty);
+      if (!tc) return SWIG_ERROR;
+      *ptr = SWIG_TypeCast(tc,vptr);
+    } else {
+      *ptr = vptr;
+    }
+    return SWIG_OK;
+  }
+}
+
+/* Convert a packed value value */
+
+SWIGRUNTIME int
+SWIG_Python_ConvertPacked(PyObject *obj, void *ptr, size_t sz, swig_type_info *ty) {
+  swig_type_info *to = PySwigPacked_UnpackData(obj, ptr, sz);
+  if (!to) return SWIG_ERROR;
+  if (ty) {
+    if (to != ty) {
+      /* check type cast? */
+      swig_cast_info *tc = SWIG_TypeCheck(to->name,ty);
+      if (!tc) return SWIG_ERROR;
+    }
+  }
+  return SWIG_OK;
+}  
+
+/* -----------------------------------------------------------------------------
+ * Create a new pointer object
+ * ----------------------------------------------------------------------------- */
+
+/*
+  Create a new instance object, whitout calling __init__, and set the
+  'this' attribute.
+*/
+
+SWIGRUNTIME PyObject* 
+SWIG_Python_NewShadowInstance(PySwigClientData *data, PyObject *swig_this)
+{
+#if (PY_VERSION_HEX >= 0x02020000)
+  PyObject *inst = 0;
+  PyObject *newraw = data->newraw;
+  if (newraw) {
+    inst = PyObject_Call(newraw, data->newargs, NULL);
+    if (inst) {
+#if !defined(SWIG_PYTHON_SLOW_GETSET_THIS)
+      PyObject **dictptr = _PyObject_GetDictPtr(inst);
+      if (dictptr != NULL) {
+	PyObject *dict = *dictptr;
+	if (dict == NULL) {
+	  dict = PyDict_New();
+	  *dictptr = dict;
+	  PyDict_SetItem(dict, SWIG_This(), swig_this);
+	}
+      }
+#else
+      PyObject *key = SWIG_This();
+      PyObject_SetAttr(inst, key, swig_this);
+#endif
+    }
+  } else {
+    PyObject *dict = PyDict_New();
+    PyDict_SetItem(dict, SWIG_This(), swig_this);
+    inst = PyInstance_NewRaw(data->newargs, dict);
+    Py_DECREF(dict);
+  }
+  return inst;
+#else
+#if (PY_VERSION_HEX >= 0x02010000)
+  PyObject *inst;
+  PyObject *dict = PyDict_New();
+  PyDict_SetItem(dict, SWIG_This(), swig_this);
+  inst = PyInstance_NewRaw(data->newargs, dict);
+  Py_DECREF(dict);
+  return (PyObject *) inst;
+#else
+  PyInstanceObject *inst = PyObject_NEW(PyInstanceObject, &PyInstance_Type);
+  if (inst == NULL) {
+    return NULL;
+  }
+  inst->in_class = (PyClassObject *)data->newargs;
+  Py_INCREF(inst->in_class);
+  inst->in_dict = PyDict_New();
+  if (inst->in_dict == NULL) {
+    Py_DECREF(inst);
+    return NULL;
+  }
+#ifdef Py_TPFLAGS_HAVE_WEAKREFS
+  inst->in_weakreflist = NULL;
+#endif
+#ifdef Py_TPFLAGS_GC
+  PyObject_GC_Init(inst);
+#endif
+  PyDict_SetItem(inst->in_dict, SWIG_This(), swig_this);
+  return (PyObject *) inst;
+#endif
+#endif
+}
+
+SWIGRUNTIME void
+SWIG_Python_SetSwigThis(PyObject *inst, PyObject *swig_this)
+{
+ PyObject *dict;
+#if (PY_VERSION_HEX >= 0x02020000) && !defined(SWIG_PYTHON_SLOW_GETSET_THIS)
+ PyObject **dictptr = _PyObject_GetDictPtr(inst);
+ if (dictptr != NULL) {
+   dict = *dictptr;
+   if (dict == NULL) {
+     dict = PyDict_New();
+     *dictptr = dict;
+   }
+   PyDict_SetItem(dict, SWIG_This(), swig_this);
+   return;
+ }
+#endif
+ dict = PyObject_GetAttrString(inst, (char*)"__dict__");
+ PyDict_SetItem(dict, SWIG_This(), swig_this);
+ Py_DECREF(dict);
+} 
+
+
+SWIGINTERN PyObject *
+SWIG_Python_InitShadowInstance(PyObject *args) {
+  PyObject *obj[2];
+  if (!SWIG_Python_UnpackTuple(args,(char*)"swiginit", 2, 2, obj)) {
+    return NULL;
+  } else {
+    PySwigObject *sthis = SWIG_Python_GetSwigThis(obj[0]);
+    if (sthis) {
+      PySwigObject_append((PyObject*) sthis, obj[1]);
+    } else {
+      SWIG_Python_SetSwigThis(obj[0], obj[1]);
+    }
+    return SWIG_Py_Void();
+  }
+}
+
+/* Create a new pointer object */
+
+SWIGRUNTIME PyObject *
+SWIG_Python_NewPointerObj(void *ptr, swig_type_info *type, int flags) {
+  if (!ptr) {
+    return SWIG_Py_Void();
+  } else {
+    int own = (flags & SWIG_POINTER_OWN) ? SWIG_POINTER_OWN : 0;
+    PyObject *robj = PySwigObject_New(ptr, type, own);
+    PySwigClientData *clientdata = type ? (PySwigClientData *)(type->clientdata) : 0;
+    if (clientdata && !(flags & SWIG_POINTER_NOSHADOW)) {
+      PyObject *inst = SWIG_Python_NewShadowInstance(clientdata, robj);
+      if (inst) {
+	Py_DECREF(robj);
+	robj = inst;
+      }
+    }
+    return robj;
+  }
+}
+
+/* Create a new packed object */
+
+SWIGRUNTIMEINLINE PyObject *
+SWIG_Python_NewPackedObj(void *ptr, size_t sz, swig_type_info *type) {
+  return ptr ? PySwigPacked_New((void *) ptr, sz, type) : SWIG_Py_Void();
+}
+
+/* -----------------------------------------------------------------------------*
+ *  Get type list 
+ * -----------------------------------------------------------------------------*/
+
+#ifdef SWIG_LINK_RUNTIME
+void *SWIG_ReturnGlobalTypeList(void *);
+#endif
+
+SWIGRUNTIME swig_module_info *
+SWIG_Python_GetModule(void) {
+  static void *type_pointer = (void *)0;
+  /* first check if module already created */
+  if (!type_pointer) {
+#ifdef SWIG_LINK_RUNTIME
+    type_pointer = SWIG_ReturnGlobalTypeList((void *)0);
+#else
+    type_pointer = PyCObject_Import((char*)"swig_runtime_data" SWIG_RUNTIME_VERSION,
+				    (char*)"type_pointer" SWIG_TYPE_TABLE_NAME);
+    if (PyErr_Occurred()) {
+      PyErr_Clear();
+      type_pointer = (void *)0;
+    }
+#endif
+  }
+  return (swig_module_info *) type_pointer;
+}
+
+#if PY_MAJOR_VERSION < 2
+/* PyModule_AddObject function was introduced in Python 2.0.  The following function
+   is copied out of Python/modsupport.c in python version 2.3.4 */
+SWIGINTERN int
+PyModule_AddObject(PyObject *m, char *name, PyObject *o)
+{
+  PyObject *dict;
+  if (!PyModule_Check(m)) {
+    PyErr_SetString(PyExc_TypeError,
+		    "PyModule_AddObject() needs module as first arg");
+    return SWIG_ERROR;
+  }
+  if (!o) {
+    PyErr_SetString(PyExc_TypeError,
+		    "PyModule_AddObject() needs non-NULL value");
+    return SWIG_ERROR;
+  }
+  
+  dict = PyModule_GetDict(m);
+  if (dict == NULL) {
+    /* Internal error -- modules must have a dict! */
+    PyErr_Format(PyExc_SystemError, "module '%s' has no __dict__",
+		 PyModule_GetName(m));
+    return SWIG_ERROR;
+  }
+  if (PyDict_SetItemString(dict, name, o))
+    return SWIG_ERROR;
+  Py_DECREF(o);
+  return SWIG_OK;
+}
+#endif
+
+SWIGRUNTIME void
+SWIG_Python_DestroyModule(void *vptr)
+{
+  swig_module_info *swig_module = (swig_module_info *) vptr;
+  swig_type_info **types = swig_module->types;
+  size_t i;
+  for (i =0; i < swig_module->size; ++i) {
+    swig_type_info *ty = types[i];
+    if (ty->owndata) {
+      PySwigClientData *data = (PySwigClientData *) ty->clientdata;
+      if (data) PySwigClientData_Del(data);
+    }
+  }
+  Py_DECREF(SWIG_This());
+}
+
+SWIGRUNTIME void
+SWIG_Python_SetModule(swig_module_info *swig_module) {
+  static PyMethodDef swig_empty_runtime_method_table[] = { {NULL, NULL, 0, NULL} };/* Sentinel */
+
+  PyObject *module = Py_InitModule((char*)"swig_runtime_data" SWIG_RUNTIME_VERSION,
+				   swig_empty_runtime_method_table);
+  PyObject *pointer = PyCObject_FromVoidPtr((void *) swig_module, SWIG_Python_DestroyModule);
+  if (pointer && module) {
+    PyModule_AddObject(module, (char*)"type_pointer" SWIG_TYPE_TABLE_NAME, pointer);
+  } else {
+    Py_XDECREF(pointer);
+  }
+}
+
+/* The python cached type query */
+SWIGRUNTIME PyObject *
+SWIG_Python_TypeCache(void) {
+  static PyObject *SWIG_STATIC_POINTER(cache) = PyDict_New();
+  return cache;
+}
+
+SWIGRUNTIME swig_type_info *
+SWIG_Python_TypeQuery(const char *type)
+{
+  PyObject *cache = SWIG_Python_TypeCache();
+  PyObject *key = PyString_FromString(type); 
+  PyObject *obj = PyDict_GetItem(cache, key);
+  swig_type_info *descriptor;
+  if (obj) {
+    descriptor = (swig_type_info *) PyCObject_AsVoidPtr(obj);
+  } else {
+    swig_module_info *swig_module = SWIG_Python_GetModule();
+    descriptor = SWIG_TypeQueryModule(swig_module, swig_module, type);
+    if (descriptor) {
+      obj = PyCObject_FromVoidPtr(descriptor, NULL);
+      PyDict_SetItem(cache, key, obj);
+      Py_DECREF(obj);
+    }
+  }
+  Py_DECREF(key);
+  return descriptor;
+}
+
+/* 
+   For backward compatibility only
+*/
+#define SWIG_POINTER_EXCEPTION  0
+#define SWIG_arg_fail(arg)      SWIG_Python_ArgFail(arg)
+#define SWIG_MustGetPtr(p, type, argnum, flags)  SWIG_Python_MustGetPtr(p, type, argnum, flags)
+
+SWIGRUNTIME int
+SWIG_Python_AddErrMesg(const char* mesg, int infront)
+{
+  if (PyErr_Occurred()) {
+    PyObject *type = 0;
+    PyObject *value = 0;
+    PyObject *traceback = 0;
+    PyErr_Fetch(&type, &value, &traceback);
+    if (value) {
+      PyObject *old_str = PyObject_Str(value);
+      Py_XINCREF(type);
+      PyErr_Clear();
+      if (infront) {
+	PyErr_Format(type, "%s %s", mesg, PyString_AsString(old_str));
+      } else {
+	PyErr_Format(type, "%s %s", PyString_AsString(old_str), mesg);
+      }
+      Py_DECREF(old_str);
+    }
+    return 1;
+  } else {
+    return 0;
+  }
+}
+  
+SWIGRUNTIME int
+SWIG_Python_ArgFail(int argnum)
+{
+  if (PyErr_Occurred()) {
+    /* add information about failing argument */
+    char mesg[256];
+    PyOS_snprintf(mesg, sizeof(mesg), "argument number %d:", argnum);
+    return SWIG_Python_AddErrMesg(mesg, 1);
+  } else {
+    return 0;
+  }
+}
+
+SWIGRUNTIMEINLINE const char *
+PySwigObject_GetDesc(PyObject *self)
+{
+  PySwigObject *v = (PySwigObject *)self;
+  swig_type_info *ty = v ? v->ty : 0;
+  return ty ? ty->str : (char*)"";
+}
+
+SWIGRUNTIME void
+SWIG_Python_TypeError(const char *type, PyObject *obj)
+{
+  if (type) {
+#if defined(SWIG_COBJECT_TYPES)
+    if (obj && PySwigObject_Check(obj)) {
+      const char *otype = (const char *) PySwigObject_GetDesc(obj);
+      if (otype) {
+	PyErr_Format(PyExc_TypeError, "a '%s' is expected, 'PySwigObject(%s)' is received",
+		     type, otype);
+	return;
+      }
+    } else 
+#endif      
+    {
+      const char *otype = (obj ? obj->ob_type->tp_name : 0); 
+      if (otype) {
+	PyObject *str = PyObject_Str(obj);
+	const char *cstr = str ? PyString_AsString(str) : 0;
+	if (cstr) {
+	  PyErr_Format(PyExc_TypeError, "a '%s' is expected, '%s(%s)' is received",
+		       type, otype, cstr);
+	} else {
+	  PyErr_Format(PyExc_TypeError, "a '%s' is expected, '%s' is received",
+		       type, otype);
+	}
+	Py_XDECREF(str);
+	return;
+      }
+    }   
+    PyErr_Format(PyExc_TypeError, "a '%s' is expected", type);
+  } else {
+    PyErr_Format(PyExc_TypeError, "unexpected type is received");
+  }
+}
+
+
+/* Convert a pointer value, signal an exception on a type mismatch */
+SWIGRUNTIME void *
+SWIG_Python_MustGetPtr(PyObject *obj, swig_type_info *ty, int argnum, int flags) {
+  void *result;
+  if (SWIG_Python_ConvertPtr(obj, &result, ty, flags) == -1) {
+    PyErr_Clear();
+    if (flags & SWIG_POINTER_EXCEPTION) {
+      SWIG_Python_TypeError(SWIG_TypePrettyName(ty), obj);
+      SWIG_Python_ArgFail(argnum);
+    }
+  }
+  return result;
+}
+
+
+#ifdef __cplusplus
+#if 0
+{ /* cc-mode */
+#endif
+}
+#endif
+
+
+
+#define SWIG_exception_fail(code, msg) do { SWIG_Error(code, msg); SWIG_fail; } while(0) 
+
+#define SWIG_contract_assert(expr, msg) if (!(expr)) { SWIG_Error(SWIG_RuntimeError, msg); SWIG_fail; } else 
+
+
+
+/* -------- TYPES TABLE (BEGIN) -------- */
+
+#define SWIGTYPE_p_TALLOC_CTX swig_types[0]
+#define SWIGTYPE_p_char swig_types[1]
+#define SWIGTYPE_p_int swig_types[2]
+#define SWIGTYPE_p_long_long swig_types[3]
+#define SWIGTYPE_p_short swig_types[4]
+#define SWIGTYPE_p_signed_char swig_types[5]
+#define SWIGTYPE_p_unsigned_char swig_types[6]
+#define SWIGTYPE_p_unsigned_int swig_types[7]
+#define SWIGTYPE_p_unsigned_long_long swig_types[8]
+#define SWIGTYPE_p_unsigned_short swig_types[9]
+static swig_type_info *swig_types[11];
+static swig_module_info swig_module = {swig_types, 10, 0, 0, 0, 0};
+#define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name)
+#define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name)
+
+/* -------- TYPES TABLE (END) -------- */
+
+#if (PY_VERSION_HEX <= 0x02000000)
+# if !defined(SWIG_PYTHON_CLASSIC)
+#  error "This python version requires swig to be run with the '-classic' option"
+# endif
+#endif
+
+/*-----------------------------------------------
+              @(target):= _misc.so
+  ------------------------------------------------*/
+#define SWIG_init    init_misc
+
+#define SWIG_name    "_misc"
+
+#define SWIGVERSION 0x010333 
+#define SWIG_VERSION SWIGVERSION
+
+
+#define SWIG_as_voidptr(a) (void *)((const void *)(a)) 
+#define SWIG_as_voidptrptr(a) ((void)SWIG_as_voidptr(*a),(void**)(a)) 
+
+
+#include "includes.h"
+#include "ldb.h"
+#include "auth/credentials/credentials.h"
+
+
+SWIGINTERN int
+SWIG_AsVal_double (PyObject *obj, double *val)
+{
+  int res = SWIG_TypeError;
+  if (PyFloat_Check(obj)) {
+    if (val) *val = PyFloat_AsDouble(obj);
+    return SWIG_OK;
+  } else if (PyInt_Check(obj)) {
+    if (val) *val = PyInt_AsLong(obj);
+    return SWIG_OK;
+  } else if (PyLong_Check(obj)) {
+    double v = PyLong_AsDouble(obj);
+    if (!PyErr_Occurred()) {
+      if (val) *val = v;
+      return SWIG_OK;
+    } else {
+      PyErr_Clear();
+    }
+  }
+#ifdef SWIG_PYTHON_CAST_MODE
+  {
+    int dispatch = 0;
+    double d = PyFloat_AsDouble(obj);
+    if (!PyErr_Occurred()) {
+      if (val) *val = d;
+      return SWIG_AddCast(SWIG_OK);
+    } else {
+      PyErr_Clear();
+    }
+    if (!dispatch) {
+      long v = PyLong_AsLong(obj);
+      if (!PyErr_Occurred()) {
+	if (val) *val = v;
+	return SWIG_AddCast(SWIG_AddCast(SWIG_OK));
+      } else {
+	PyErr_Clear();
+      }
+    }
+  }
+#endif
+  return res;
+}
+
+
+#include <float.h>
+
+
+#include <math.h>
+
+
+SWIGINTERNINLINE int
+SWIG_CanCastAsInteger(double *d, double min, double max) {
+  double x = *d;
+  if ((min <= x && x <= max)) {
+   double fx = floor(x);
+   double cx = ceil(x);
+   double rd =  ((x - fx) < 0.5) ? fx : cx; /* simple rint */
+   if ((errno == EDOM) || (errno == ERANGE)) {
+     errno = 0;
+   } else {
+     double summ, reps, diff;
+     if (rd < x) {
+       diff = x - rd;
+     } else if (rd > x) {
+       diff = rd - x;
+     } else {
+       return 1;
+     }
+     summ = rd + x;
+     reps = diff/summ;
+     if (reps < 8*DBL_EPSILON) {
+       *d = rd;
+       return 1;
+     }
+   }
+  }
+  return 0;
+}
+
+
+SWIGINTERN int
+SWIG_AsVal_unsigned_SS_long (PyObject *obj, unsigned long *val) 
+{
+  if (PyInt_Check(obj)) {
+    long v = PyInt_AsLong(obj);
+    if (v >= 0) {
+      if (val) *val = v;
+      return SWIG_OK;
+    } else {
+      return SWIG_OverflowError;
+    }
+  } else if (PyLong_Check(obj)) {
+    unsigned long v = PyLong_AsUnsignedLong(obj);
+    if (!PyErr_Occurred()) {
+      if (val) *val = v;
+      return SWIG_OK;
+    } else {
+      PyErr_Clear();
+    }
+  }
+#ifdef SWIG_PYTHON_CAST_MODE
+  {
+    int dispatch = 0;
+    unsigned long v = PyLong_AsUnsignedLong(obj);
+    if (!PyErr_Occurred()) {
+      if (val) *val = v;
+      return SWIG_AddCast(SWIG_OK);
+    } else {
+      PyErr_Clear();
+    }
+    if (!dispatch) {
+      double d;
+      int res = SWIG_AddCast(SWIG_AsVal_double (obj,&d));
+      if (SWIG_IsOK(res) && SWIG_CanCastAsInteger(&d, 0, ULONG_MAX)) {
+	if (val) *val = (unsigned long)(d);
+	return res;
+      }
+    }
+  }
+#endif
+  return SWIG_TypeError;
+}
+
+
+SWIGINTERNINLINE int
+SWIG_AsVal_size_t (PyObject * obj, size_t *val)
+{
+  unsigned long v;
+  int res = SWIG_AsVal_unsigned_SS_long (obj, val ? &v : 0);
+  if (SWIG_IsOK(res) && val) *val = (size_t)(v);
+  return res;
+}
+
+
+SWIGINTERN swig_type_info*
+SWIG_pchar_descriptor(void)
+{
+  static int init = 0;
+  static swig_type_info* info = 0;
+  if (!init) {
+    info = SWIG_TypeQuery("_p_char");
+    init = 1;
+  }
+  return info;
+}
+
+
+SWIGINTERNINLINE PyObject *
+SWIG_FromCharPtrAndSize(const char* carray, size_t size)
+{
+  if (carray) {
+    if (size > INT_MAX) {
+      swig_type_info* pchar_descriptor = SWIG_pchar_descriptor();
+      return pchar_descriptor ? 
+	SWIG_NewPointerObj((char *)(carray), pchar_descriptor, 0) : SWIG_Py_Void();
+    } else {
+      return PyString_FromStringAndSize(carray, (int)(size));
+    }
+  } else {
+    return SWIG_Py_Void();
+  }
+}
+
+
+SWIGINTERNINLINE PyObject * 
+SWIG_FromCharPtr(const char *cptr)
+{ 
+  return SWIG_FromCharPtrAndSize(cptr, (cptr ? strlen(cptr) : 0));
+}
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+SWIGINTERN PyObject *_wrap_random_password(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  TALLOC_CTX *arg1 = (TALLOC_CTX *) 0 ;
+  size_t arg2 ;
+  char *result = 0 ;
+  size_t val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  char *  kwnames[] = {
+    (char *) "len", NULL 
+  };
+  
+  {
+    arg1 = NULL;
+  }
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:random_password",kwnames,&obj0)) SWIG_fail;
+  ecode2 = SWIG_AsVal_size_t(obj0, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "random_password" "', argument " "2"" of type '" "size_t""'");
+  } 
+  arg2 = (size_t)(val2);
+  result = (char *)generate_random_str(arg1,arg2);
+  resultobj = SWIG_FromCharPtr((const char *)result);
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+static PyMethodDef SwigMethods[] = {
+	 { (char *)"random_password", (PyCFunction) _wrap_random_password, METH_VARARGS | METH_KEYWORDS, NULL},
+	 { NULL, NULL, 0, NULL }
+};
+
+
+/* -------- TYPE CONVERSION AND EQUIVALENCE RULES (BEGIN) -------- */
+
+static swig_type_info _swigt__p_TALLOC_CTX = {"_p_TALLOC_CTX", "TALLOC_CTX *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_char = {"_p_char", "char *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_int = {"_p_int", "intptr_t *|int *|int_least32_t *|int_fast32_t *|int32_t *|int_fast16_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_long_long = {"_p_long_long", "int_least64_t *|int_fast64_t *|int64_t *|long long *|intmax_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_short = {"_p_short", "short *|int_least16_t *|int16_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_signed_char = {"_p_signed_char", "signed char *|int_least8_t *|int_fast8_t *|int8_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_unsigned_char = {"_p_unsigned_char", "unsigned char *|uint_least8_t *|uint_fast8_t *|uint8_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_unsigned_int = {"_p_unsigned_int", "uintptr_t *|uint_least32_t *|uint_fast32_t *|uint32_t *|unsigned int *|uint_fast16_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_unsigned_long_long = {"_p_unsigned_long_long", "uint_least64_t *|uint_fast64_t *|uint64_t *|unsigned long long *|uintmax_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_unsigned_short = {"_p_unsigned_short", "unsigned short *|uint_least16_t *|uint16_t *", 0, 0, (void*)0, 0};
+
+static swig_type_info *swig_type_initial[] = {
+  &_swigt__p_TALLOC_CTX,
+  &_swigt__p_char,
+  &_swigt__p_int,
+  &_swigt__p_long_long,
+  &_swigt__p_short,
+  &_swigt__p_signed_char,
+  &_swigt__p_unsigned_char,
+  &_swigt__p_unsigned_int,
+  &_swigt__p_unsigned_long_long,
+  &_swigt__p_unsigned_short,
+};
+
+static swig_cast_info _swigc__p_TALLOC_CTX[] = {  {&_swigt__p_TALLOC_CTX, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_char[] = {  {&_swigt__p_char, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_int[] = {  {&_swigt__p_int, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_long_long[] = {  {&_swigt__p_long_long, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_short[] = {  {&_swigt__p_short, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_signed_char[] = {  {&_swigt__p_signed_char, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_unsigned_char[] = {  {&_swigt__p_unsigned_char, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_unsigned_int[] = {  {&_swigt__p_unsigned_int, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_unsigned_long_long[] = {  {&_swigt__p_unsigned_long_long, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_unsigned_short[] = {  {&_swigt__p_unsigned_short, 0, 0, 0},{0, 0, 0, 0}};
+
+static swig_cast_info *swig_cast_initial[] = {
+  _swigc__p_TALLOC_CTX,
+  _swigc__p_char,
+  _swigc__p_int,
+  _swigc__p_long_long,
+  _swigc__p_short,
+  _swigc__p_signed_char,
+  _swigc__p_unsigned_char,
+  _swigc__p_unsigned_int,
+  _swigc__p_unsigned_long_long,
+  _swigc__p_unsigned_short,
+};
+
+
+/* -------- TYPE CONVERSION AND EQUIVALENCE RULES (END) -------- */
+
+static swig_const_info swig_const_table[] = {
+{0, 0, 0, 0.0, 0, 0}};
+
+#ifdef __cplusplus
+}
+#endif
+/* -----------------------------------------------------------------------------
+ * Type initialization:
+ * This problem is tough by the requirement that no dynamic 
+ * memory is used. Also, since swig_type_info structures store pointers to 
+ * swig_cast_info structures and swig_cast_info structures store pointers back
+ * to swig_type_info structures, we need some lookup code at initialization. 
+ * The idea is that swig generates all the structures that are needed. 
+ * The runtime then collects these partially filled structures. 
+ * The SWIG_InitializeModule function takes these initial arrays out of 
+ * swig_module, and does all the lookup, filling in the swig_module.types
+ * array with the correct data and linking the correct swig_cast_info
+ * structures together.
+ *
+ * The generated swig_type_info structures are assigned staticly to an initial 
+ * array. We just loop through that array, and handle each type individually.
+ * First we lookup if this type has been already loaded, and if so, use the
+ * loaded structure instead of the generated one. Then we have to fill in the
+ * cast linked list. The cast data is initially stored in something like a
+ * two-dimensional array. Each row corresponds to a type (there are the same
+ * number of rows as there are in the swig_type_initial array). Each entry in
+ * a column is one of the swig_cast_info structures for that type.
+ * The cast_initial array is actually an array of arrays, because each row has
+ * a variable number of columns. So to actually build the cast linked list,
+ * we find the array of casts associated with the type, and loop through it 
+ * adding the casts to the list. The one last trick we need to do is making
+ * sure the type pointer in the swig_cast_info struct is correct.
+ *
+ * First off, we lookup the cast->type name to see if it is already loaded. 
+ * There are three cases to handle:
+ *  1) If the cast->type has already been loaded AND the type we are adding
+ *     casting info to has not been loaded (it is in this module), THEN we
+ *     replace the cast->type pointer with the type pointer that has already
+ *     been loaded.
+ *  2) If BOTH types (the one we are adding casting info to, and the 
+ *     cast->type) are loaded, THEN the cast info has already been loaded by
+ *     the previous module so we just ignore it.
+ *  3) Finally, if cast->type has not already been loaded, then we add that
+ *     swig_cast_info to the linked list (because the cast->type) pointer will
+ *     be correct.
+ * ----------------------------------------------------------------------------- */
+
+#ifdef __cplusplus
+extern "C" {
+#if 0
+} /* c-mode */
+#endif
+#endif
+
+#if 0
+#define SWIGRUNTIME_DEBUG
+#endif
+
+
+SWIGRUNTIME void
+SWIG_InitializeModule(void *clientdata) {
+  size_t i;
+  swig_module_info *module_head, *iter;
+  int found;
+  
+  clientdata = clientdata;
+  
+  /* check to see if the circular list has been setup, if not, set it up */
+  if (swig_module.next==0) {
+    /* Initialize the swig_module */
+    swig_module.type_initial = swig_type_initial;
+    swig_module.cast_initial = swig_cast_initial;
+    swig_module.next = &swig_module;
+  }
+  
+  /* Try and load any already created modules */
+  module_head = SWIG_GetModule(clientdata);
+  if (!module_head) {
+    /* This is the first module loaded for this interpreter */
+    /* so set the swig module into the interpreter */
+    SWIG_SetModule(clientdata, &swig_module);
+    module_head = &swig_module;
+  } else {
+    /* the interpreter has loaded a SWIG module, but has it loaded this one? */
+    found=0;
+    iter=module_head;
+    do {
+      if (iter==&swig_module) {
+        found=1;
+        break;
+      }
+      iter=iter->next;
+    } while (iter!= module_head);
+    
+    /* if the is found in the list, then all is done and we may leave */
+    if (found) return;
+    /* otherwise we must add out module into the list */
+    swig_module.next = module_head->next;
+    module_head->next = &swig_module;
+  }
+  
+  /* Now work on filling in swig_module.types */
+#ifdef SWIGRUNTIME_DEBUG
+  printf("SWIG_InitializeModule: size %d\n", swig_module.size);
+#endif
+  for (i = 0; i < swig_module.size; ++i) {
+    swig_type_info *type = 0;
+    swig_type_info *ret;
+    swig_cast_info *cast;
+    
+#ifdef SWIGRUNTIME_DEBUG
+    printf("SWIG_InitializeModule: type %d %s\n", i, swig_module.type_initial[i]->name);
+#endif
+    
+    /* if there is another module already loaded */
+    if (swig_module.next != &swig_module) {
+      type = SWIG_MangledTypeQueryModule(swig_module.next, &swig_module, swig_module.type_initial[i]->name);
+    }
+    if (type) {
+      /* Overwrite clientdata field */
+#ifdef SWIGRUNTIME_DEBUG
+      printf("SWIG_InitializeModule: found type %s\n", type->name);
+#endif
+      if (swig_module.type_initial[i]->clientdata) {
+        type->clientdata = swig_module.type_initial[i]->clientdata;
+#ifdef SWIGRUNTIME_DEBUG
+        printf("SWIG_InitializeModule: found and overwrite type %s \n", type->name);
+#endif
+      }
+    } else {
+      type = swig_module.type_initial[i];
+    }
+    
+    /* Insert casting types */
+    cast = swig_module.cast_initial[i];
+    while (cast->type) {
+      /* Don't need to add information already in the list */
+      ret = 0;
+#ifdef SWIGRUNTIME_DEBUG
+      printf("SWIG_InitializeModule: look cast %s\n", cast->type->name);
+#endif
+      if (swig_module.next != &swig_module) {
+        ret = SWIG_MangledTypeQueryModule(swig_module.next, &swig_module, cast->type->name);
+#ifdef SWIGRUNTIME_DEBUG
+        if (ret) printf("SWIG_InitializeModule: found cast %s\n", ret->name);
+#endif
+      }
+      if (ret) {
+        if (type == swig_module.type_initial[i]) {
+#ifdef SWIGRUNTIME_DEBUG
+          printf("SWIG_InitializeModule: skip old type %s\n", ret->name);
+#endif
+          cast->type = ret;
+          ret = 0;
+        } else {
+          /* Check for casting already in the list */
+          swig_cast_info *ocast = SWIG_TypeCheck(ret->name, type);
+#ifdef SWIGRUNTIME_DEBUG
+          if (ocast) printf("SWIG_InitializeModule: skip old cast %s\n", ret->name);
+#endif
+          if (!ocast) ret = 0;
+        }
+      }
+      
+      if (!ret) {
+#ifdef SWIGRUNTIME_DEBUG
+        printf("SWIG_InitializeModule: adding cast %s\n", cast->type->name);
+#endif
+        if (type->cast) {
+          type->cast->prev = cast;
+          cast->next = type->cast;
+        }
+        type->cast = cast;
+      }
+      cast++;
+    }
+    /* Set entry in modules->types array equal to the type */
+    swig_module.types[i] = type;
+  }
+  swig_module.types[i] = 0;
+  
+#ifdef SWIGRUNTIME_DEBUG
+  printf("**** SWIG_InitializeModule: Cast List ******\n");
+  for (i = 0; i < swig_module.size; ++i) {
+    int j = 0;
+    swig_cast_info *cast = swig_module.cast_initial[i];
+    printf("SWIG_InitializeModule: type %d %s\n", i, swig_module.type_initial[i]->name);
+    while (cast->type) {
+      printf("SWIG_InitializeModule: cast type %s\n", cast->type->name);
+      cast++;
+      ++j;
+    }
+    printf("---- Total casts: %d\n",j);
+  }
+  printf("**** SWIG_InitializeModule: Cast List ******\n");
+#endif
+}
+
+/* This function will propagate the clientdata field of type to
+* any new swig_type_info structures that have been added into the list
+* of equivalent types.  It is like calling
+* SWIG_TypeClientData(type, clientdata) a second time.
+*/
+SWIGRUNTIME void
+SWIG_PropagateClientData(void) {
+  size_t i;
+  swig_cast_info *equiv;
+  static int init_run = 0;
+  
+  if (init_run) return;
+  init_run = 1;
+  
+  for (i = 0; i < swig_module.size; i++) {
+    if (swig_module.types[i]->clientdata) {
+      equiv = swig_module.types[i]->cast;
+      while (equiv) {
+        if (!equiv->converter) {
+          if (equiv->type && !equiv->type->clientdata)
+          SWIG_TypeClientData(equiv->type, swig_module.types[i]->clientdata);
+        }
+        equiv = equiv->next;
+      }
+    }
+  }
+}
+
+#ifdef __cplusplus
+#if 0
+{
+  /* c-mode */
+#endif
+}
+#endif
+
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+  
+  /* Python-specific SWIG API */
+#define SWIG_newvarlink()                             SWIG_Python_newvarlink()
+#define SWIG_addvarlink(p, name, get_attr, set_attr)  SWIG_Python_addvarlink(p, name, get_attr, set_attr)
+#define SWIG_InstallConstants(d, constants)           SWIG_Python_InstallConstants(d, constants)
+  
+  /* -----------------------------------------------------------------------------
+   * global variable support code.
+   * ----------------------------------------------------------------------------- */
+  
+  typedef struct swig_globalvar {
+    char       *name;                  /* Name of global variable */
+    PyObject *(*get_attr)(void);       /* Return the current value */
+    int       (*set_attr)(PyObject *); /* Set the value */
+    struct swig_globalvar *next;
+  } swig_globalvar;
+  
+  typedef struct swig_varlinkobject {
+    PyObject_HEAD
+    swig_globalvar *vars;
+  } swig_varlinkobject;
+  
+  SWIGINTERN PyObject *
+  swig_varlink_repr(swig_varlinkobject *SWIGUNUSEDPARM(v)) {
+    return PyString_FromString("<Swig global variables>");
+  }
+  
+  SWIGINTERN PyObject *
+  swig_varlink_str(swig_varlinkobject *v) {
+    PyObject *str = PyString_FromString("(");
+    swig_globalvar  *var;
+    for (var = v->vars; var; var=var->next) {
+      PyString_ConcatAndDel(&str,PyString_FromString(var->name));
+      if (var->next) PyString_ConcatAndDel(&str,PyString_FromString(", "));
+    }
+    PyString_ConcatAndDel(&str,PyString_FromString(")"));
+    return str;
+  }
+  
+  SWIGINTERN int
+  swig_varlink_print(swig_varlinkobject *v, FILE *fp, int SWIGUNUSEDPARM(flags)) {
+    PyObject *str = swig_varlink_str(v);
+    fprintf(fp,"Swig global variables ");
+    fprintf(fp,"%s\n", PyString_AsString(str));
+    Py_DECREF(str);
+    return 0;
+  }
+  
+  SWIGINTERN void
+  swig_varlink_dealloc(swig_varlinkobject *v) {
+    swig_globalvar *var = v->vars;
+    while (var) {
+      swig_globalvar *n = var->next;
+      free(var->name);
+      free(var);
+      var = n;
+    }
+  }
+  
+  SWIGINTERN PyObject *
+  swig_varlink_getattr(swig_varlinkobject *v, char *n) {
+    PyObject *res = NULL;
+    swig_globalvar *var = v->vars;
+    while (var) {
+      if (strcmp(var->name,n) == 0) {
+        res = (*var->get_attr)();
+        break;
+      }
+      var = var->next;
+    }
+    if (res == NULL && !PyErr_Occurred()) {
+      PyErr_SetString(PyExc_NameError,"Unknown C global variable");
+    }
+    return res;
+  }
+  
+  SWIGINTERN int
+  swig_varlink_setattr(swig_varlinkobject *v, char *n, PyObject *p) {
+    int res = 1;
+    swig_globalvar *var = v->vars;
+    while (var) {
+      if (strcmp(var->name,n) == 0) {
+        res = (*var->set_attr)(p);
+        break;
+      }
+      var = var->next;
+    }
+    if (res == 1 && !PyErr_Occurred()) {
+      PyErr_SetString(PyExc_NameError,"Unknown C global variable");
+    }
+    return res;
+  }
+  
+  SWIGINTERN PyTypeObject*
+  swig_varlink_type(void) {
+    static char varlink__doc__[] = "Swig var link object";
+    static PyTypeObject varlink_type;
+    static int type_init = 0;  
+    if (!type_init) {
+      const PyTypeObject tmp
+      = {
+        PyObject_HEAD_INIT(NULL)
+        0,                                  /* Number of items in variable part (ob_size) */
+        (char *)"swigvarlink",              /* Type name (tp_name) */
+        sizeof(swig_varlinkobject),         /* Basic size (tp_basicsize) */
+        0,                                  /* Itemsize (tp_itemsize) */
+        (destructor) swig_varlink_dealloc,   /* Deallocator (tp_dealloc) */ 
+        (printfunc) swig_varlink_print,     /* Print (tp_print) */
+        (getattrfunc) swig_varlink_getattr, /* get attr (tp_getattr) */
+        (setattrfunc) swig_varlink_setattr, /* Set attr (tp_setattr) */
+        0,                                  /* tp_compare */
+        (reprfunc) swig_varlink_repr,       /* tp_repr */
+        0,                                  /* tp_as_number */
+        0,                                  /* tp_as_sequence */
+        0,                                  /* tp_as_mapping */
+        0,                                  /* tp_hash */
+        0,                                  /* tp_call */
+        (reprfunc)swig_varlink_str,        /* tp_str */
+        0,                                  /* tp_getattro */
+        0,                                  /* tp_setattro */
+        0,                                  /* tp_as_buffer */
+        0,                                  /* tp_flags */
+        varlink__doc__,                     /* tp_doc */
+        0,                                  /* tp_traverse */
+        0,                                  /* tp_clear */
+        0,                                  /* tp_richcompare */
+        0,                                  /* tp_weaklistoffset */
+#if PY_VERSION_HEX >= 0x02020000
+        0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* tp_iter -> tp_weaklist */
+#endif
+#if PY_VERSION_HEX >= 0x02030000
+        0,                                  /* tp_del */
+#endif
+#ifdef COUNT_ALLOCS
+        0,0,0,0                             /* tp_alloc -> tp_next */
+#endif
+      };
+      varlink_type = tmp;
+      varlink_type.ob_type = &PyType_Type;
+      type_init = 1;
+    }
+    return &varlink_type;
+  }
+  
+  /* Create a variable linking object for use later */
+  SWIGINTERN PyObject *
+  SWIG_Python_newvarlink(void) {
+    swig_varlinkobject *result = PyObject_NEW(swig_varlinkobject, swig_varlink_type());
+    if (result) {
+      result->vars = 0;
+    }
+    return ((PyObject*) result);
+  }
+  
+  SWIGINTERN void 
+  SWIG_Python_addvarlink(PyObject *p, char *name, PyObject *(*get_attr)(void), int (*set_attr)(PyObject *p)) {
+    swig_varlinkobject *v = (swig_varlinkobject *) p;
+    swig_globalvar *gv = (swig_globalvar *) malloc(sizeof(swig_globalvar));
+    if (gv) {
+      size_t size = strlen(name)+1;
+      gv->name = (char *)malloc(size);
+      if (gv->name) {
+        strncpy(gv->name,name,size);
+        gv->get_attr = get_attr;
+        gv->set_attr = set_attr;
+        gv->next = v->vars;
+      }
+    }
+    v->vars = gv;
+  }
+  
+  SWIGINTERN PyObject *
+  SWIG_globals(void) {
+    static PyObject *_SWIG_globals = 0; 
+    if (!_SWIG_globals) _SWIG_globals = SWIG_newvarlink();  
+    return _SWIG_globals;
+  }
+  
+  /* -----------------------------------------------------------------------------
+   * constants/methods manipulation
+   * ----------------------------------------------------------------------------- */
+  
+  /* Install Constants */
+  SWIGINTERN void
+  SWIG_Python_InstallConstants(PyObject *d, swig_const_info constants[]) {
+    PyObject *obj = 0;
+    size_t i;
+    for (i = 0; constants[i].type; ++i) {
+      switch(constants[i].type) {
+      case SWIG_PY_POINTER:
+        obj = SWIG_NewPointerObj(constants[i].pvalue, *(constants[i]).ptype,0);
+        break;
+      case SWIG_PY_BINARY:
+        obj = SWIG_NewPackedObj(constants[i].pvalue, constants[i].lvalue, *(constants[i].ptype));
+        break;
+      default:
+        obj = 0;
+        break;
+      }
+      if (obj) {
+        PyDict_SetItemString(d, constants[i].name, obj);
+        Py_DECREF(obj);
+      }
+    }
+  }
+  
+  /* -----------------------------------------------------------------------------*/
+  /* Fix SwigMethods to carry the callback ptrs when needed */
+  /* -----------------------------------------------------------------------------*/
+  
+  SWIGINTERN void
+  SWIG_Python_FixMethods(PyMethodDef *methods,
+    swig_const_info *const_table,
+    swig_type_info **types,
+    swig_type_info **types_initial) {
+    size_t i;
+    for (i = 0; methods[i].ml_name; ++i) {
+      const char *c = methods[i].ml_doc;
+      if (c && (c = strstr(c, "swig_ptr: "))) {
+        int j;
+        swig_const_info *ci = 0;
+        const char *name = c + 10;
+        for (j = 0; const_table[j].type; ++j) {
+          if (strncmp(const_table[j].name, name, 
+              strlen(const_table[j].name)) == 0) {
+            ci = &(const_table[j]);
+            break;
+          }
+        }
+        if (ci) {
+          size_t shift = (ci->ptype) - types;
+          swig_type_info *ty = types_initial[shift];
+          size_t ldoc = (c - methods[i].ml_doc);
+          size_t lptr = strlen(ty->name)+2*sizeof(void*)+2;
+          char *ndoc = (char*)malloc(ldoc + lptr + 10);
+          if (ndoc) {
+            char *buff = ndoc;
+            void *ptr = (ci->type == SWIG_PY_POINTER) ? ci->pvalue : 0;
+            if (ptr) {
+              strncpy(buff, methods[i].ml_doc, ldoc);
+              buff += ldoc;
+              strncpy(buff, "swig_ptr: ", 10);
+              buff += 10;
+              SWIG_PackVoidPtr(buff, ptr, ty->name, lptr);
+              methods[i].ml_doc = ndoc;
+            }
+          }
+        }
+      }
+    }
+  } 
+  
+#ifdef __cplusplus
+}
+#endif
+
+/* -----------------------------------------------------------------------------*
+ *  Partial Init method
+ * -----------------------------------------------------------------------------*/
+
+#ifdef __cplusplus
+extern "C"
+#endif
+SWIGEXPORT void SWIG_init(void) {
+  PyObject *m, *d;
+  
+  /* Fix SwigMethods to carry the callback ptrs when needed */
+  SWIG_Python_FixMethods(SwigMethods, swig_const_table, swig_types, swig_type_initial);
+  
+  m = Py_InitModule((char *) SWIG_name, SwigMethods);
+  d = PyModule_GetDict(m);
+  
+  SWIG_InitializeModule(0);
+  SWIG_InstallConstants(d,swig_const_table);
+  
+  
+}
+
diff --git a/source4/scripting/python/replace/stdint.i b/source4/scripting/python/replace/stdint.i
deleted file mode 100644
index 7b48ca3884..0000000000
--- a/source4/scripting/python/replace/stdint.i
+++ /dev/null
@@ -1,109 +0,0 @@
-/* -----------------------------------------------------------------------------
- * See the LICENSE file for information on copyright, usage and redistribution
- * of SWIG, and the README file for authors - http://www.swig.org/release.html.
- *
- * stdint.i
- *
- * SWIG library file for ISO C99 types: 7.18 Integer types <stdint.h>
- * ----------------------------------------------------------------------------- */
-
-%{
-#include <stdint.h>		// Use the C99 official header
-%}
-
-%include <swigarch.i>
-
-/* Exact integral types.  */
-
-/* Signed.  */
-
-typedef signed char		int8_t;
-typedef short int		int16_t;
-typedef int			int32_t;
-#if defined(SWIGWORDSIZE64)
-typedef long int		int64_t;
-#else
-typedef long long int		int64_t;
-#endif
-
-/* Unsigned.  */
-typedef unsigned char		uint8_t;
-typedef unsigned short int	uint16_t;
-typedef unsigned int		uint32_t;
-#if defined(SWIGWORDSIZE64)
-typedef unsigned long int	uint64_t;
-#else
-typedef unsigned long long int	uint64_t;
-#endif
-
-
-/* Small types.  */
-
-/* Signed.  */
-typedef signed char		int_least8_t;
-typedef short int		int_least16_t;
-typedef int			int_least32_t;
-#if defined(SWIGWORDSIZE64)
-typedef long int		int_least64_t;
-#else
-typedef long long int		int_least64_t;
-#endif
-
-/* Unsigned.  */
-typedef unsigned char		uint_least8_t;
-typedef unsigned short int	uint_least16_t;
-typedef unsigned int		uint_least32_t;
-#if defined(SWIGWORDSIZE64)
-typedef unsigned long int	uint_least64_t;
-#else
-typedef unsigned long long int	uint_least64_t;
-#endif
-
-
-/* Fast types.  */
-
-/* Signed.  */
-typedef signed char		int_fast8_t;
-#if defined(SWIGWORDSIZE64)
-typedef long int		int_fast16_t;
-typedef long int		int_fast32_t;
-typedef long int		int_fast64_t;
-#else
-typedef int			int_fast16_t;
-typedef int			int_fast32_t;
-typedef long long int		int_fast64_t;
-#endif
-
-/* Unsigned.  */
-typedef unsigned char		uint_fast8_t;
-#if defined(SWIGWORDSIZE64)
-typedef unsigned long int	uint_fast16_t;
-typedef unsigned long int	uint_fast32_t;
-typedef unsigned long int	uint_fast64_t;
-#else
-typedef unsigned int		uint_fast16_t;
-typedef unsigned int		uint_fast32_t;
-typedef unsigned long long int	uint_fast64_t;
-#endif
-
-
-/* Types for `void *' pointers.  */
-#if defined(SWIGWORDSIZE64)
-typedef long int		intptr_t;
-typedef unsigned long int	uintptr_t;
-#else
-typedef int			intptr_t;
-typedef unsigned int		uintptr_t;
-#endif
-
-
-/* Largest integral types.  */
-#if defined(SWIGWORDSIZE64)
-typedef long int		intmax_t;
-typedef unsigned long int	uintmax_t;
-#else
-typedef long long int		intmax_t;
-typedef unsigned long long int	uintmax_t;
-#endif
-
-
diff --git a/source4/scripting/python/replace/swigarch.i b/source4/scripting/python/replace/swigarch.i
deleted file mode 100644
index 260b608801..0000000000
--- a/source4/scripting/python/replace/swigarch.i
+++ /dev/null
@@ -1,65 +0,0 @@
-/* -----------------------------------------------------------------------------
- * See the LICENSE file for information on copyright, usage and redistribution
- * of SWIG, and the README file for authors - http://www.swig.org/release.html.
- *
- * swigarch.i
- *
- * SWIG library file for 32bit/64bit code specialization and checking.
- *
- * Use only in extreme cases, when no arch. independent code can be
- * generated
- * 
- * To activate architecture specific code, use
- *
- *     swig -DSWIGWORDSIZE32
- *
- * or
- *
- *     swig -DSWIGWORDSIZE64
- *
- * Note that extra checking code will be added to the wrapped code,
- * which will prevent the compilation in a different architecture.
- *
- * If you don't specify the SWIGWORDSIZE (the default case), swig will
- * generate architecture independent and/or 32bits code, with no extra
- * checking code added.
- * ----------------------------------------------------------------------------- */
-
-#if !defined(SWIGWORDSIZE32) &&  !defined(SWIGWORDSIZE64)
-# if (__WORDSIZE == 32)
-#  define SWIGWORDSIZE32
-# endif
-#endif
-  
-#if !defined(SWIGWORDSIZE64) &&  !defined(SWIGWORDSIZE32) 
-# if defined(__x86_64) || defined(__x86_64__) || (__WORDSIZE == 64)
-#  define SWIGWORDSIZE64
-# endif
-#endif
-
-
-#ifdef SWIGWORDSIZE32
-%{
-#define SWIGWORDSIZE32
-#ifndef LONG_MAX
-#include <limits.h>
-#endif
-#if (__WORDSIZE == 64) || (LONG_MAX != INT_MAX)
-# error "SWIG wrapped code invalid in 64 bit architecture, regenarete code using -DSWIGWORDSIZE64"
-#endif
-%}
-#endif
-
-#ifdef SWIGWORDSIZE64
-%{
-#define SWIGWORDSIZE64
-#ifndef LONG_MAX
-#include <limits.h>
-#endif
-#if (__WORDSIZE == 32) || (LONG_MAX == INT_MAX)
-# error "SWIG wrapped code invalid in 32 bit architecture, regenarete code using -DSWIGWORDSIZE32"
-#endif
-%}
-#endif
-  
-
-- 
cgit 


From 43696d2752e2faad34fb3ed2a7dbf01d40ffdc46 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 3 Dec 2007 15:53:28 +0100
Subject: r26252: Specify loadparm_context explicitly when creating sessions.
 (This used to be commit 7280c1e9415daabb2712db1372e23f9846272ede)

---
 source4/scripting/ejs/smbcalls_auth.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_auth.c b/source4/scripting/ejs/smbcalls_auth.c
index 39e84d7f2c..236edbd64d 100644
--- a/source4/scripting/ejs/smbcalls_auth.c
+++ b/source4/scripting/ejs/smbcalls_auth.c
@@ -221,7 +221,7 @@ static int ejs_userAuth(MprVarHandle eid, int argc, struct MprVar **argv)
 static int ejs_system_session(MprVarHandle eid, int argc, struct MprVar **argv)
 {
 	struct MprVar *obj = mprInitObject(eid, "session_info", argc, argv);
-	struct auth_session_info *session_info = system_session(mprMemCtx());
+	struct auth_session_info *session_info = system_session(mprMemCtx(), global_loadparm);
 
 	if (session_info == NULL) {
 		return -1;
-- 
cgit 


From 1fbdd6ef1dfb8704de0524fc6f5c33e1418858cd Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 3 Dec 2007 18:47:35 +0100
Subject: r26264: pass name resolve order explicitly, use torture context for
 settings in dssync tests. (This used to be commit
 c7eae1c7842f9ff8b70cce9e5d6f3ebbbe78e83b)

---
 source4/scripting/ejs/smbcalls_auth.c | 2 +-
 source4/scripting/ejs/smbcalls_nbt.c  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_auth.c b/source4/scripting/ejs/smbcalls_auth.c
index 236edbd64d..7747bb14c6 100644
--- a/source4/scripting/ejs/smbcalls_auth.c
+++ b/source4/scripting/ejs/smbcalls_auth.c
@@ -108,7 +108,7 @@ static int ejs_doauth(MprVarHandle eid,
 		goto done;
 	}
 
-	nt_status = auth_generate_session_info(tmp_ctx, server_info, &session_info);
+	nt_status = auth_generate_session_info(tmp_ctx, global_loadparm, server_info, &session_info);
 	if (!NT_STATUS_IS_OK(nt_status)) {
 		mprSetPropertyValue(auth, "report", mprString("Session Info generation failed"));
 		mprSetPropertyValue(auth, "result", mprCreateBoolVar(false));
diff --git a/source4/scripting/ejs/smbcalls_nbt.c b/source4/scripting/ejs/smbcalls_nbt.c
index 4a7ef682f8..5eaf458f34 100644
--- a/source4/scripting/ejs/smbcalls_nbt.c
+++ b/source4/scripting/ejs/smbcalls_nbt.c
@@ -70,7 +70,7 @@ static int ejs_resolve_name(MprVarHandle eid, int argc, struct MprVar **argv)
 
 	result = 0;
 
-	nt_status = resolve_name(&name, tmp_ctx, &reply_addr, event_context_find(tmp_ctx));
+	nt_status = resolve_name(&name, tmp_ctx, &reply_addr, event_context_find(tmp_ctx), lp_name_resolve_order(global_loadparm));
 
 	if (NT_STATUS_IS_OK(nt_status)) {
 		mprSetPropertyValue(argv[0], "value", mprString(reply_addr));
-- 
cgit 


From 5b357ca8774d97e85153151552bc052cfaf26c1b Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 3 Dec 2007 23:33:09 +0100
Subject: r26270: Require specifying the loadparm_context or NULL to
 cli_credentials_guess(). (This used to be commit
 e52710d6794a25ba697f8c26b43784226964f9cb)

---
 source4/scripting/ejs/smbcalls_rpc.c | 1 -
 1 file changed, 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_rpc.c b/source4/scripting/ejs/smbcalls_rpc.c
index 5d7c674208..049494cba6 100644
--- a/source4/scripting/ejs/smbcalls_rpc.c
+++ b/source4/scripting/ejs/smbcalls_rpc.c
@@ -153,7 +153,6 @@ static int ejs_rpc_connect(MprVarHandle eid, int argc, char **argv)
 	}
 	if (creds == NULL) {
 		creds = cli_credentials_init(mprMemCtx());
-		cli_credentials_guess(creds);
 		cli_credentials_set_anonymous(creds);
 	}
 
-- 
cgit 


From b038240ac72fa34a132eb52bda28bbb80f82c29e Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 4 Dec 2007 00:12:13 +0100
Subject: r26275: return loadparm context in lp_load. (This used to be commit
 d01f0f4c2037b531b3fd088060717f90e60471e9)

---
 source4/scripting/ejs/smbcalls_config.c | 4 +++-
 source4/scripting/ejs/smbscript.c       | 7 ++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_config.c b/source4/scripting/ejs/smbcalls_config.c
index 1c76757659..122d78ac20 100644
--- a/source4/scripting/ejs/smbcalls_config.c
+++ b/source4/scripting/ejs/smbcalls_config.c
@@ -187,7 +187,9 @@ static int ejs_lpSet(MprVarHandle eid, int argc, char **argv)
 */
 static int ejs_lpReload(MprVarHandle eid, int argc, char **argv)
 {
-	bool ret = lp_load(lp_configfile(global_loadparm));
+	bool ret;
+	
+	ret = lp_load(lp_configfile(global_loadparm), NULL);
 	if (ret) {
 		unload_interfaces();
 	}
diff --git a/source4/scripting/ejs/smbscript.c b/source4/scripting/ejs/smbscript.c
index db6e0eeb10..2bb67135ea 100644
--- a/source4/scripting/ejs/smbscript.c
+++ b/source4/scripting/ejs/smbscript.c
@@ -49,18 +49,19 @@ int main(int argc, const char **argv)
 	const char *fname;
 	struct MprVar *return_var;
 	int exit_status, i;
+	struct loadparm_context *lp_ctx;
 
 	fault_setup(argv[0]);
 
 	if (getenv("SMB_CONF_PATH")) {
-		lp_load(getenv("SMB_CONF_PATH"));
+		lp_load(getenv("SMB_CONF_PATH"), &lp_ctx);
 	} else {
-		lp_load(dyn_CONFIGFILE);
+		lp_load(dyn_CONFIGFILE, &lp_ctx);
 	}
 
 	ldb_global_init();
 
-	gensec_init(global_loadparm);
+	gensec_init(lp_ctx);
 	mprSetCtx(mem_ctx);
 
 
-- 
cgit 


From f5860b5a853c40c9e48f5bb0a87c086d268c53bd Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Wed, 5 Dec 2007 00:40:48 +0100
Subject: r26298: Use metze's schema loading code to pre-initialise the schema
 into the

samdb before we start writing entries into it.

In doing so, I realised we still used 'dnsDomain', which is not part
of the standard schema (now removed).

We also set the 'wrong' side of the linked attributes for the
masteredBy on each partition - this is now set in provision_self_join
and backlinks via the linked attributes code.

When we have the schema loaded, we must also have a valid domain SID
loaded, so that the objectclass module works.  This required some ejs
glue.

Andrew Bartlett
(This used to be commit b0de08916e8cb59ce6a2ea94bbc9ac0679830ac1)
---
 source4/scripting/ejs/smbcalls_ldb.c | 51 +++++++++++++++++++++++++++++++--
 source4/scripting/libjs/provision.js | 55 +++++++++++++++++++++++++++++-------
 2 files changed, 93 insertions(+), 13 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_ldb.c b/source4/scripting/ejs/smbcalls_ldb.c
index b8c35d267e..7599cbf443 100644
--- a/source4/scripting/ejs/smbcalls_ldb.c
+++ b/source4/scripting/ejs/smbcalls_ldb.c
@@ -28,6 +28,7 @@
 #include "ldb_wrap.h"
 #include "dsdb/samdb/samdb.h"
 #include "librpc/ndr/libndr.h"
+#include "libcli/security/security.h"
 
 /*
   get the connected db
@@ -598,7 +599,7 @@ static int ejs_ldb_attach_dsdb_schema_from_ldif(MprVarHandle eid, int argc, char
 }
 
 /*
-  commit a ldb attach a dsdb_schema from ldif files
+  set a particular invocationId against the running LDB
   usage:
    ok = ldb.set_ntds_invocationId("7729aa4b-f990-41ad-b81a-8b6a14090f41");
 */
@@ -640,9 +641,9 @@ static int ejs_ldb_set_ntds_invocationId(MprVarHandle eid, int argc, char **argv
 }
 
 /*
-  commit a ldb attach a dsdb_schema from ldif files
+  attach a particular ntds objectGUID against the current ldb
   usage:
-   ok = ldb.get_ntds_objectGUID("7729aa4b-f990-41ad-b81a-8b6a14090f41");
+   ok = ldb.set_ntds_objectGUID("7729aa4b-f990-41ad-b81a-8b6a14090f41");
 */
 static int ejs_ldb_set_ntds_objectGUID(MprVarHandle eid, int argc, char **argv)
 {
@@ -681,6 +682,48 @@ static int ejs_ldb_set_ntds_objectGUID(MprVarHandle eid, int argc, char **argv)
 	return 0;
 }
 
+/*
+  attach a particular domain SID against the current ldb
+  usage:
+   ok = ldb.set_domain_sid("S-S-1-5-21-3065342217-3567412576-2214182334");
+*/
+static int ejs_ldb_set_domain_sid(MprVarHandle eid, int argc, char **argv)
+{
+	struct ldb_context *ldb;
+	struct dom_sid *dom_sid;
+	char *dom_sid_str;
+	bool ok;
+
+	if (argc != 1) {
+		ejsSetErrorMsg(eid, "ldb.set_domain_sid invalid arguments");
+		return -1;
+	}
+
+	ldb = ejs_get_ldb_context(eid);
+	if (ldb == NULL) {
+		return -1;
+	}
+
+	dom_sid_str = argv[0];
+
+	dom_sid = dom_sid_parse_talloc(NULL, dom_sid_str);
+	if (!dom_sid) {
+		ejsSetErrorMsg(eid, "ldb.set_domain_sid - failed to parse domain sid '%s'\n",
+				dom_sid_str);
+		return -1;
+	}
+
+	ok = samdb_set_domain_sid(ldb, dom_sid);
+	talloc_free(dom_sid);
+	if (!ok) {
+		ejsSetErrorMsg(eid, "ldb.set_domain_sid - failed to set cached ntds invocationId\n");
+		return -1;
+	}
+
+	mpr_Return(eid, mprCreateBoolVar(ok));
+	return 0;
+}
+
 /*
   initialise ldb ejs subsystem
 */
@@ -708,6 +751,8 @@ static int ejs_ldb_init(MprVarHandle eid, int argc, struct MprVar **argv)
 			      ejs_ldb_set_ntds_invocationId);
 	mprSetStringCFunction(ldb, "set_ntds_objectGUID",
 			      ejs_ldb_set_ntds_objectGUID);
+	mprSetStringCFunction(ldb, "set_domain_sid",
+			      ejs_ldb_set_domain_sid);
 	mprSetVar(ldb, "SCOPE_BASE", mprCreateNumberVar(LDB_SCOPE_BASE));
 	mprSetVar(ldb, "SCOPE_ONE", mprCreateNumberVar(LDB_SCOPE_ONELEVEL));
 	mprSetVar(ldb, "SCOPE_SUBTREE", mprCreateNumberVar(LDB_SCOPE_SUBTREE));
diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index 2dfc941a66..b42f3b2580 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -563,6 +563,44 @@ function provision_become_dc(subobj, message, erase, paths, session_info)
 	return true;
 }
 
+function load_schema(subobj, message, samdb)
+{
+	var lp = loadparm_init();
+	var src = lp.get("setup directory") + "/" + "schema.ldif";
+
+	if (! sys.stat(src)) {
+		message("Template file not found: %s\n",src);
+		assert(0);
+	}
+
+	var schema_data = sys.file_load(src);
+
+	src = lp.get("setup directory") + "/" + "schema_samba4.ldif";
+
+	if (! sys.stat(src)) {
+		message("Template file not found: %s\n",src);
+		assert(0);
+	}
+
+	schema_data = schema_data + sys.file_load(src);
+
+	schema_data = substitute_var(schema_data, subobj);
+
+	src = lp.get("setup directory") + "/" + "provision_schema_basedn_modify.ldif";
+
+	if (! sys.stat(src)) {
+		message("Template file not found: %s\n",src);
+		assert(0);
+	}
+
+	var head_data = sys.file_load(src);
+	head_data = substitute_var(head_data, subobj);
+
+	var ok = samdb.attach_dsdb_schema_from_ldif(head_data, schema_data);
+	return ok;
+}
+
+
 /*
   provision samba4 - caution, this wipes all existing data!
 */
@@ -648,8 +686,15 @@ function provision(subobj, message, blank, paths, session_info, credentials, lda
 	}
 	samdb.close();
 
+	message("Pre-loading the Samba4 and AD schema\n");
+	
 	samdb = open_ldb(info, paths.samdb, false);
 
+	samdb.set_domain_sid(subobj.DOMAINSID);
+
+	var load_schema_ok = load_schema(subobj, message, samdb);
+	assert(load_schema_ok.is_ok);
+
 	message("Adding DomainDN: " + subobj.DOMAINDN + " (permitted to fail)\n");
 	var add_ok = setup_add_ldif("provision_basedn.ldif", info, samdb, true);
 	message("Modifying DomainDN: " + subobj.DOMAINDN + "\n");
@@ -692,16 +737,6 @@ function provision(subobj, message, blank, paths, session_info, credentials, lda
 	message("Setting up sam.ldb AD schema\n");
 	setup_add_ldif("schema.ldif", info, samdb, false);
 
-	// (hack) Reload, now we have the schema loaded.  
-	var commit_ok = samdb.transaction_commit();
-	if (!commit_ok) {
-		info.message("samdb commit failed: " + samdb.errstring() + "\n");
-		assert(commit_ok);
-	}
-	samdb.close();
-
-	samdb = open_ldb(info, paths.samdb, false);
-
 	message("Setting up sam.ldb configuration data\n");
 	setup_add_ldif("provision_configuration.ldif", info, samdb, false);
 
-- 
cgit 


From d8b91031116b81ae10e2a0fc568ccbf88052e0f3 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Wed, 5 Dec 2007 01:25:39 +0100
Subject: r26302: Print the error string for failed rootdse searches.

Andrew Bartlett
(This used to be commit a7595d009a89fecd7723a1e356d5a58d687bdbb0)
---
 source4/scripting/libjs/provision.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index b42f3b2580..e7e844bb89 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -198,7 +198,10 @@ function ldb_erase_partitions(info, ldb, ldapbackend)
 	var j;
 
 	var res = ldb.search("(objectClass=*)", "", ldb.SCOPE_BASE, rootDSE_attrs);
-	assert(res.error == 0);
+	if (res.error != 0) {
+		info.message("rootdse search failed: " + res.errstr + "\n");
+		assert(res.error == 0);
+	}
 	assert(res.msgs.length == 1);
 	if (typeof(res.msgs[0].namingContexts) == "undefined") {
 		return;
-- 
cgit 


From c3c27fadc0a53f8d3de57bae1158a8b244742d72 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Wed, 5 Dec 2007 03:00:48 +0100
Subject: r26303: Fix up error reporting during the delete of previous entries
 in the

provision, and ignore 'no such entry' as an error (it is normal, and
just means the partition is compleatly empty).

Andrew Bartlett
(This used to be commit 1fb8c31a3da6fc07f55027f05dba5e03dcf8a4f7)
---
 source4/scripting/libjs/provision.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index e7e844bb89..5e9e43a858 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -224,7 +224,10 @@ function ldb_erase_partitions(info, ldb, ldapbackend)
 			var res2 = ldb.search(anything, basedn, ldb.SCOPE_SUBTREE, attrs);
 			var i;
 			if (res2.error != 0) {
-				info.message("ldb search failed: " + res.errstr + "\n");
+				if (res2.error == 32) {
+					break;
+				}
+				info.message("ldb search failed: " + res2.errstr + "\n");
 				continue;
 			}
 			previous_remaining = current_remaining;
@@ -235,7 +238,7 @@ function ldb_erase_partitions(info, ldb, ldapbackend)
 			
 			var res3 = ldb.search(anything, basedn, ldb.SCOPE_SUBTREE, attrs);
 			if (res3.error != 0) {
-				info.message("ldb search failed: " + res.errstr + "\n");
+				info.message("ldb search failed: " + res3.errstr + "\n");
 				continue;
 			}
 			if (res3.msgs.length != 0) {
-- 
cgit 


From 439f85c60976cd1fd725b78b8b0a061cba219424 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Wed, 5 Dec 2007 03:03:33 +0100
Subject: r26304: More work to remove silly error printouts.

Andrew Bartlett
(This used to be commit ba23dac0319f7c5ad89e5d79174520892027afdd)
---
 source4/scripting/libjs/provision.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index 5e9e43a858..a64fdb8977 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -226,9 +226,10 @@ function ldb_erase_partitions(info, ldb, ldapbackend)
 			if (res2.error != 0) {
 				if (res2.error == 32) {
 					break;
+				} else {
+					info.message("ldb search(2) failed: " + res2.errstr + "\n");
+					continue;
 				}
-				info.message("ldb search failed: " + res2.errstr + "\n");
-				continue;
 			}
 			previous_remaining = current_remaining;
 			current_remaining = res2.msgs.length;
@@ -238,7 +239,7 @@ function ldb_erase_partitions(info, ldb, ldapbackend)
 			
 			var res3 = ldb.search(anything, basedn, ldb.SCOPE_SUBTREE, attrs);
 			if (res3.error != 0) {
-				info.message("ldb search failed: " + res3.errstr + "\n");
+				info.message("ldb search(3) failed: " + res3.errstr + "\n");
 				continue;
 			}
 			if (res3.msgs.length != 0) {
-- 
cgit 


From 39ee38d9c1aabf4db065b433d067d0da053d7d61 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Thu, 6 Dec 2007 17:52:23 +0100
Subject: r26316: Use contexts for conversion functions. (This used to be
 commit f6420d933b5b011d428974f3a2a57edf19e6f482)

---
 source4/scripting/ejs/smbcalls_data.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_data.c b/source4/scripting/ejs/smbcalls_data.c
index a98266c3da..d0dd96c087 100644
--- a/source4/scripting/ejs/smbcalls_data.c
+++ b/source4/scripting/ejs/smbcalls_data.c
@@ -177,7 +177,7 @@ static int ejs_regToVar(MprVarHandle eid, int argc, struct MprVar **argv)
 	case REG_EXPAND_SZ: {
 		char *s;
 		ssize_t len;
-		len = convert_string_talloc(mprMemCtx(), CH_UTF16, CH_UNIX, 
+		len = convert_string_talloc(mprMemCtx(), global_smb_iconv_convenience, CH_UTF16, CH_UNIX, 
 					    blob->data, blob->length, (void **)&s);
 		if (len == -1) {
 			ejsSetErrorMsg(eid, "regToVar invalid REG_SZ string");
@@ -225,7 +225,7 @@ static int ejs_regToVar(MprVarHandle eid, int argc, struct MprVar **argv)
 			if (slen == 2 && b.length == 2 && SVAL(b.data, 0) == 0) {
 				break;
 			}
-			len = convert_string_talloc(mprMemCtx(), CH_UTF16, CH_UNIX, 
+			len = convert_string_talloc(mprMemCtx(), global_smb_iconv_convenience, CH_UTF16, CH_UNIX, 
 						    b.data, slen, (void **)&s);
 			if (len == -1) {
 				ejsSetErrorMsg(eid, "regToVar invalid REG_MULTI_SZ string");
-- 
cgit 


From cc35894fb5b86373677a89f33297e763f9813ef1 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Thu, 6 Dec 2007 21:10:24 +0100
Subject: r26317: Fix typos. (This used to be commit
 4c7e3843a0e1a914b259526dcd3e50bd238816af)

---
 source4/scripting/libjs/provision.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index a64fdb8977..7d77bf7885 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -534,7 +534,7 @@ function provision_become_dc(subobj, message, erase, paths, session_info)
 	info.message = message;
 	info.session_info = session_info;
 
-	message("Setting up teplates into " + paths.templates + "\n");
+	message("Setting up templates into " + paths.templates + "\n");
 	setup_ldb("provision_templates.ldif", info, paths.templates);
 
 	/* Also wipes the database */
@@ -667,7 +667,7 @@ function provision(subobj, message, blank, paths, session_info, credentials, lda
 	var reg = reg_open();
 	reg.apply_patchfile(lp.get("setup directory") + "/provision.reg")
 
-	message("Setting up teplates into " + paths.templates + "\n");
+	message("Setting up templates into " + paths.templates + "\n");
 	setup_ldb("provision_templates.ldif", info, paths.templates);
 
 	message("Setting up sam.ldb partitions\n");
-- 
cgit 


From c5bf20c5fe7eaa04cd11a7ce4f365aa6ffd7b124 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Thu, 6 Dec 2007 23:57:22 +0100
Subject: r26325: Remove use of global_loadparm in netif. (This used to be
 commit e452cb28594f23add7c00247ed39e8323aea78a6)

---
 source4/scripting/ejs/smbcalls_sys.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_sys.c b/source4/scripting/ejs/smbcalls_sys.c
index 10de8e162e..86e0873e09 100644
--- a/source4/scripting/ejs/smbcalls_sys.c
+++ b/source4/scripting/ejs/smbcalls_sys.c
@@ -32,10 +32,10 @@
 */
 static int ejs_sys_interfaces(MprVarHandle eid, int argc, struct MprVar **argv)
 {
-	int i, count = iface_count();
+	int i, count = iface_count(global_loadparm);
 	struct MprVar ret = mprArray("interfaces");
 	for (i=0;i<count;i++) {
-		mprAddArray(&ret, i, mprString(iface_n_ip(i)));
+		mprAddArray(&ret, i, mprString(iface_n_ip(global_loadparm, i)));
 	}
 	mpr_Return(eid, ret);
 	return 0;	
-- 
cgit 


From 4c4323009fa83f00ed319de59a3aad48fcd65994 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Fri, 7 Dec 2007 02:37:04 +0100
Subject: r26327: Explicit loadparm_context for RPC client functions. (This
 used to be commit eeb2251d22b3d6e0379444a73af69d1014692b07)

---
 source4/scripting/ejs/ejsnet/net_ctx.c | 2 +-
 source4/scripting/ejs/smbcalls_rpc.c   | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/ejsnet/net_ctx.c b/source4/scripting/ejs/ejsnet/net_ctx.c
index 97a05ab88f..396718367a 100644
--- a/source4/scripting/ejs/ejsnet/net_ctx.c
+++ b/source4/scripting/ejs/ejsnet/net_ctx.c
@@ -52,7 +52,7 @@ static int ejs_net_context(MprVarHandle eid, int argc, struct MprVar **argv)
 	}
 	ev = event_context_find(event_mem_ctx);
 
-	ctx = libnet_context_init(ev);
+	ctx = libnet_context_init(ev, global_loadparm);
 	/* IF we generated a new event context, it will be under here,
 	 * and we need it to last as long as the libnet context, so
 	 * make it a child */
diff --git a/source4/scripting/ejs/smbcalls_rpc.c b/source4/scripting/ejs/smbcalls_rpc.c
index 049494cba6..535c1d2e34 100644
--- a/source4/scripting/ejs/smbcalls_rpc.c
+++ b/source4/scripting/ejs/smbcalls_rpc.c
@@ -158,7 +158,8 @@ static int ejs_rpc_connect(MprVarHandle eid, int argc, char **argv)
 
 	ev = event_context_find(mprMemCtx());
 
-	status = dcerpc_pipe_connect(this, &p, binding, iface, creds, ev);
+	status = dcerpc_pipe_connect(this, &p, binding, iface, creds, ev,
+				     global_loadparm);
 	if (!NT_STATUS_IS_OK(status)) goto done;
 
 	/* callers don't allocate ref vars in the ejs interface */
-- 
cgit 


From 47554fd72e00911f05c1c16f1af4d06481d32882 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Fri, 7 Dec 2007 23:56:53 +0100
Subject: r26338: Fix parameter, typo. (This used to be commit
 2a005096dd41f66fd99577d6ca7eb3e0f1cb30f2)

---
 source4/scripting/ejs/smbcalls_config.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_config.c b/source4/scripting/ejs/smbcalls_config.c
index 122d78ac20..347cb758fe 100644
--- a/source4/scripting/ejs/smbcalls_config.c
+++ b/source4/scripting/ejs/smbcalls_config.c
@@ -98,7 +98,7 @@ static int ejs_lpGet(MprVarHandle eid, int argc, char **argv)
 			mpr_Return(eid, mprCreateUndefinedVar());
 			return 0;
 		}
-		parm_ptr = lp_parm_ptr(service, parm);
+		parm_ptr = lp_parm_ptr(global_loadparm, service, parm);
 	} else if (strchr(argv[0], ':')) {
 		/* its a global parametric option */
 		const char *type = talloc_strndup(mprMemCtx(), 
@@ -123,7 +123,7 @@ static int ejs_lpGet(MprVarHandle eid, int argc, char **argv)
 			mpr_Return(eid, mprCreateUndefinedVar());
 			return 0;
 		}
-		parm_ptr = lp_parm_ptr(NULL, parm);
+		parm_ptr = lp_parm_ptr(global_loadparm, NULL, parm);
 	}
 
 	if (parm == NULL || parm_ptr == NULL) {
-- 
cgit 


From a48fdda5fec99649e29760c7a9c91246438c9579 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sat, 8 Dec 2007 23:31:41 +0100
Subject: r26339: Make loadparm talloc-allocated. (This used to be commit
 1e02cd8db1d65ff72b747833904a10b47749b1fb)

---
 source4/scripting/ejs/smbcalls_config.c | 2 +-
 source4/scripting/ejs/smbscript.c       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_config.c b/source4/scripting/ejs/smbcalls_config.c
index 347cb758fe..157587186c 100644
--- a/source4/scripting/ejs/smbcalls_config.c
+++ b/source4/scripting/ejs/smbcalls_config.c
@@ -189,7 +189,7 @@ static int ejs_lpReload(MprVarHandle eid, int argc, char **argv)
 {
 	bool ret;
 	
-	ret = lp_load(lp_configfile(global_loadparm), NULL);
+	ret = lp_load(talloc_autofree_context(), lp_configfile(global_loadparm), NULL);
 	if (ret) {
 		unload_interfaces();
 	}
diff --git a/source4/scripting/ejs/smbscript.c b/source4/scripting/ejs/smbscript.c
index 2bb67135ea..e00d52589a 100644
--- a/source4/scripting/ejs/smbscript.c
+++ b/source4/scripting/ejs/smbscript.c
@@ -54,9 +54,9 @@ int main(int argc, const char **argv)
 	fault_setup(argv[0]);
 
 	if (getenv("SMB_CONF_PATH")) {
-		lp_load(getenv("SMB_CONF_PATH"), &lp_ctx);
+		lp_load(talloc_autofree_context(), getenv("SMB_CONF_PATH"), &lp_ctx);
 	} else {
-		lp_load(dyn_CONFIGFILE, &lp_ctx);
+		lp_load(talloc_autofree_context(), dyn_CONFIGFILE, &lp_ctx);
 	}
 
 	ldb_global_init();
-- 
cgit 


From dd7e5ed88c48f4ee39e53be07c8839791e914e45 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sat, 8 Dec 2007 23:32:37 +0100
Subject: r26352: Don't make lp_load create a new context. (This used to be
 commit d0d5c1a823a6601292c061dba2b6f4bde2b9e3dd)

---
 source4/scripting/ejs/smbcalls_config.c | 14 ++++++++++++--
 source4/scripting/ejs/smbscript.c       |  6 ++++--
 source4/scripting/libjs/provision.js    |  2 +-
 source4/scripting/libjs/upgrade.js      |  1 -
 4 files changed, 17 insertions(+), 6 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_config.c b/source4/scripting/ejs/smbcalls_config.c
index 157587186c..88c153ead3 100644
--- a/source4/scripting/ejs/smbcalls_config.c
+++ b/source4/scripting/ejs/smbcalls_config.c
@@ -161,6 +161,14 @@ static int ejs_lpGet(MprVarHandle eid, int argc, char **argv)
 	return 0;
 }
 
+/*
+    v = lp.filename();         obtain filename
+*/
+static int ejs_lpFilename(MprVarHandle eid, int argc, char **argv)
+{
+	mpr_ReturnString(eid, lp_configfile(global_loadparm));
+	return 0;
+}
 
 /*
   set a smb.conf parameter. Only sets in memory, not permanent
@@ -188,8 +196,9 @@ static int ejs_lpSet(MprVarHandle eid, int argc, char **argv)
 static int ejs_lpReload(MprVarHandle eid, int argc, char **argv)
 {
 	bool ret;
-	
-	ret = lp_load(talloc_autofree_context(), lp_configfile(global_loadparm), NULL);
+	const char *filename = lp_configfile(global_loadparm);
+
+	ret = lp_load(global_loadparm, filename);
 	if (ret) {
 		unload_interfaces();
 	}
@@ -208,6 +217,7 @@ static int ejs_loadparm_init(MprVarHandle eid, int argc, struct MprVar **argv)
 	mprSetStringCFunction(obj, "set", ejs_lpSet);
 	mprSetStringCFunction(obj, "reload", ejs_lpReload);
 	mprSetStringCFunction(obj, "services", ejs_lpServices);
+	mprSetStringCFunction(obj, "filename", ejs_lpFilename);
 	return 0;
 }
 
diff --git a/source4/scripting/ejs/smbscript.c b/source4/scripting/ejs/smbscript.c
index e00d52589a..a4f2e1cd43 100644
--- a/source4/scripting/ejs/smbscript.c
+++ b/source4/scripting/ejs/smbscript.c
@@ -53,10 +53,12 @@ int main(int argc, const char **argv)
 
 	fault_setup(argv[0]);
 
+	global_loadparm = lp_ctx = loadparm_init(talloc_autofree_context());
+
 	if (getenv("SMB_CONF_PATH")) {
-		lp_load(talloc_autofree_context(), getenv("SMB_CONF_PATH"), &lp_ctx);
+		lp_load(lp_ctx, getenv("SMB_CONF_PATH"));
 	} else {
-		lp_load(talloc_autofree_context(), dyn_CONFIGFILE, &lp_ctx);
+		lp_load(lp_ctx, dyn_CONFIGFILE);
 	}
 
 	ldb_global_init();
diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index 7d77bf7885..f9814884f3 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -386,7 +386,7 @@ function provision_default_paths(subobj)
 	var dnsdomain = strlower(subobj.REALM);
 	var lp = loadparm_init();
 	var paths = new Object();
-	paths.smbconf = lp.get("config file");
+	paths.smbconf = lp.filename()
 	paths.shareconf = lp.get("private dir") + "/" + "share.ldb";
 	paths.samdb = lp.get("sam database");
 	paths.secrets = lp.get("secrets database");
diff --git a/source4/scripting/libjs/upgrade.js b/source4/scripting/libjs/upgrade.js
index 3504d850f2..3a548fe34b 100644
--- a/source4/scripting/libjs/upgrade.js
+++ b/source4/scripting/libjs/upgrade.js
@@ -468,7 +468,6 @@ smbconf_keep = new Array(
 	"wins support",
 	"csc policy",
 	"strict locking",
-	"config file",
 	"preload",
 	"auto services",
 	"lock dir",
-- 
cgit 


From c926cddfad97713ca017c03e61c6e90414c1ad62 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 10 Dec 2007 09:29:00 +0100
Subject: r26366: Import provision scripts in Python. (This used to be commit
 090c799f98adf2c4186daca445c81b4e26e91f2f)

---
 source4/scripting/python/samba/provision.py | 842 ++++++++++++++++++++++++++++
 source4/scripting/python/samba/upgrade.py   | 561 ++++++++++++++++++
 2 files changed, 1403 insertions(+)
 create mode 100644 source4/scripting/python/samba/provision.py
 create mode 100644 source4/scripting/python/samba/upgrade.py

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
new file mode 100644
index 0000000000..3d391863da
--- /dev/null
+++ b/source4/scripting/python/samba/provision.py
@@ -0,0 +1,842 @@
+#
+#    backend code for provisioning a Samba4 server
+#    Copyright Andrew Tridgell 2005
+#    Copyright Jelmer Vernooij 2007
+#    Released under the GNU GPL v2 or later
+#
+
+from base64 import b64encode
+import os
+import pwd
+import grp
+import time
+import uuid, sid, misc
+from socket import gethostname, gethostbyname
+import param
+import registry
+from samba import Ldb, substitute_var
+from ldb import Dn, SCOPE_SUBTREE, SCOPE_ONELEVEL, SCOPE_BASE, LdbError, \
+        LDB_ERR_NO_SUCH_OBJECT, timestring
+
+
+class InvalidNetbiosName(Exception):
+    def __init__(self, name):
+        super(InvalidNetbiosName, self).__init__("The name '%r' is not a valid NetBIOS name" % name)
+
+
+class ProvisionSettings(object):
+    def __init__(self, realm=None, domain=None, hostname=None, hostip=None):
+        self.realm = realm
+        self.domain = domain
+        self.hostname = hostname
+        self.hostip = hostip
+        self.domainsid = None
+        self.invocationid = None
+        self.krbtgtpass = None
+        self.machinepass = None
+        self.adminpass = None
+        self.defaultsite  = "Default-First-Site-Name"
+        self.datestring = None
+        self.root = None
+        self.nobody = None
+        self.nogroup = None
+        self.wheel = None
+        self.backup = None
+        self.users = None
+        self.dnsdomain = None
+        self.dnsname = None
+        self.domaindn = None
+        self.domaindn_ldb = None
+        self.rootdn = None
+        self.configdn = None
+        self.configdn_ldb = None
+        self.schemedn = None
+        self.schemedn_ldb = None
+        self.s4_ldapi_path = None
+        self.policyguid = None
+
+    def subst_vars(self):
+        return {"SCHEMADN": self.schemadn,
+                "SCHEMADN_LDB": self.schemadn_ldb,
+                "SCHEMADN_MOD": "schema_fsmo",
+                "SCHEMADN_MOD2": ",objectguid",
+                "CONFIGDN": self.configdn,
+                "TDB_MODULES_LIST": ","+",".join(self.tdb_modules_list)
+                "MODULES_LIST2": ",".join(self.modules_list2)
+                "CONFIGDN_LDB": self.configdn_ldb,
+                "DOMAINDN": self.domaindn,
+                "DOMAINDN_LDB": self.domaindn_ldb,
+                "DOMAINDN_MOD": "pdc_fsmo,password_hash",
+                "DOMAINDN_MOD2": ",objectguid",
+                "DOMAINSID": self.domainsid,
+                "MODULES_LIST": ",".join(self.modules_list),
+                "CONFIGDN_MOD": "naming_fsmo",
+                "CONFIGDN_MOD2": ",objectguid",
+                "NETBIOSNAME": self.netbiosname,
+                "DNSNAME": self.dnsname,
+                "ROOTDN": self.rootdn,
+                "DNSDOMAIN": self.dnsdomain,
+                "REALM": self.realm,
+                "DEFAULTSITE": self.defaultsite,
+                "MACHINEPASS_B64": b64encode(self.machinepass),
+                "ADMINPASS_B64": b64encode(self.adminpass),
+                "DNSPASS_B64": b64encode(self.dnspass),
+                "KRBTGTPASS_B64": b64encode(self.krbtgtpass),
+                "S4_LDAPI_URI": "ldapi://%s" % self.s4_ldapi_path.replace("/", "%2F"),
+                "LDAPTIME": timestring(int(time.time())),
+                "POLICYGUID": self.policyguid,
+                "RDN_DC": self.rdn_dc,
+                "DOMAINGUID_MOD": self.domainguid_mod,
+                }
+
+    def fix(self, paths):
+        self.realm       = self.realm.upper()
+        self.hostname    = self.hostname.lower()
+        self.domain      = self.domain.upper()
+        if not valid_netbios_name(self.domain):
+            raise InvalidNetbiosName(self.domain)
+        self.netbiosname = self.hostname.upper()
+        if not valid_netbios_name(self.netbiosname):
+            raise InvalidNetbiosName(self.netbiosname)
+        rdns = self.domaindn.split(",")
+        self.rdn_dc = rdns[0][len("DC="):]
+
+        self.sam_ldb        = paths.samdb
+        self.secrets_ldb    = paths.secrets
+        self.secrets_keytab    = paths.keytab
+        
+        self.s4_ldapi_path = paths.s4_ldapi_path
+
+    def validate(self, lp):
+        if not valid_netbios_name(self.domain):
+            raise InvalidNetbiosName(self.domain)
+
+        if not valid_netbios_name(self.netbiosname):
+            raise InvalidNetbiosName(self.netbiosname)
+
+        if lp.get("workgroup").upper() != self.domain.upper():
+            raise Error("workgroup '%s' in smb.conf must match chosen domain '%s'\n",
+                lp.get("workgroup"), self.domain)
+
+        if lp.get("realm").upper() != self.realm.upper():
+            raise Error("realm '%s' in smb.conf must match chosen realm '%s'\n" %
+                (lp.get("realm"), self.realm))
+
+
+class ProvisionPaths:
+    def __init__(self):
+        self.smbconf = None
+        self.shareconf = None
+        self.hklm = None
+        self.hkcu = None
+        self.hkcr = None
+        self.hku = None
+        self.hkpd = None
+        self.hkpt = None
+        self.samdb = None
+        self.secrets = None
+        self.keytab = None
+        self.dns = None
+        self.winsdb = None
+        self.ldap_basedn_ldif = None
+        self.ldap_config_basedn_ldif = None
+        self.ldap_schema_basedn_ldif = None
+        self.s4_ldapi_path = None
+
+
+def install_ok(lp, session_info, credentials):
+    """Check whether the current install seems ok."""
+    if lp.get("realm") == "":
+        return False
+    ldb = Ldb(lp.get("sam database"), session_info=session_info, 
+            credentials=credentials)
+    if len(ldb.search("(cn=Administrator)")) != 1:
+        return False
+    return True
+
+
+def findnss(nssfn, *names):
+    """Find a user or group from a list of possibilities."""
+    for name in names:
+        try:
+            return nssfn(name)
+        except KeyError:
+            pass
+    raise Exception("Unable to find user/group for %s" % arguments[1])
+
+def add_foreign(ldb, subobj, sid, desc):
+    """Add a foreign security principle."""
+    add = """
+dn: CN=%s,CN=ForeignSecurityPrincipals,%s
+objectClass: top
+objectClass: foreignSecurityPrincipal
+description: %s
+""" % (sid, subobj.domaindn, desc)
+    # deliberately ignore errors from this, as the records may
+    # already exist
+    for msg in ldb.parse_ldif(add):
+        ldb.add(msg[1])
+
+def setup_name_mapping(subobj, ldb, sid, unixname):
+    """Setup a mapping between a sam name and a unix name."""
+    res = ldb.search(Dn(ldb, subobj.domaindn), SCOPE_SUBTREE, 
+                     "objectSid=%s" % sid, ["dn"])
+    assert len(res) == 1, "Failed to find record for objectSid %s" % sid
+
+    mod = """
+dn: %s
+changetype: modify
+replace: unixName
+unixName: %s
+""" % (res[0].dn, unixname)
+    ldb.modify(ldb.parse_ldif(mod).next()[1])
+
+def hostip():
+    """return first host IP."""
+    return gethostbyname(hostname())
+
+def hostname():
+    """return first part of hostname."""
+    return gethostname().split(".")[0]
+
+def ldb_delete(ldb):
+    """Delete a LDB file.
+
+    This may be necessary if the ldb is in bad shape, possibly due to being 
+    built from an incompatible previous version of the code, so delete it
+    completely.
+    """
+    print "Deleting %s\n" % ldb.filename
+    os.unlink(ldb.filename)
+    ldb.connect(ldb.filename)
+
+
+def ldb_erase(ldb):
+    """Erase an ldb, removing all records."""
+    # delete the specials
+    for attr in ["@INDEXLIST", "@ATTRIBUTES", "@SUBCLASSES", "@MODULES", 
+                 "@OPTIONS", "@PARTITION", "@KLUDGEACL"]:
+        try:
+            ldb.delete(Dn(ldb, attr))
+        except LdbError, (LDB_ERR_NO_SUCH_OBJECT, _):
+            # Ignore missing dn errors
+            pass
+
+    basedn = Dn(ldb, "")
+    # and the rest
+    for msg in ldb.search(basedn, SCOPE_SUBTREE, 
+            "(&(|(objectclass=*)(dn=*))(!(dn=@BASEINFO)))", 
+            ["dn"]):
+        ldb.delete(msg.dn)
+
+    res = ldb.search(basedn, SCOPE_SUBTREE, "(&(|(objectclass=*)(dn=*))(!(dn=@BASEINFO)))", ["dn"])
+    assert len(res) == 0
+
+
+def ldb_erase_partitions(subobj, message, ldb, ldapbackend):
+    """Erase an ldb, removing all records."""
+    assert ldb is not None
+    res = ldb.search(Dn(ldb, ""), SCOPE_BASE, "(objectClass=*)", 
+                     ["namingContexts"])
+    assert len(res) == 1
+    if not "namingContexts" in res[0]:
+        return
+    for basedn in res[0]["namingContexts"]:
+        anything = "(|(objectclass=*)(dn=*))"
+        previous_remaining = 1
+        current_remaining = 0
+
+        if ldapbackend and (basedn == subobj.domaindn):
+            # Only delete objects that were created by provision
+            anything = "(objectcategory=*)"
+
+        k = 0
+        while ++k < 10 and (previous_remaining != current_remaining):
+            # and the rest
+            res2 = ldb.search(Dn(ldb, basedn), SCOPE_SUBTREE, anything, ["dn"])
+            previous_remaining = current_remaining
+            current_remaining = len(res2)
+            for msg in res2:
+                try:
+                    ldb.delete(msg.dn)
+                except LdbError, (_, text):
+                    message("Unable to delete %s: %s" % (msg.dn, text))
+
+
+def open_ldb(session_info, credentials, dbname):
+    assert session_info is not None
+    try:
+        return Ldb(dbname, session_info=session_info, credentials=credentials)
+    except LdbError, e:
+        print e
+        os.unlink(dbname)
+        return Ldb(dbname, session_info=session_info, credentials=credentials)
+
+
+def setup_add_ldif(setup_dir, ldif, subobj, ldb):
+    """Setup a ldb in the private dir."""
+    assert isinstance(ldif, str)
+    assert isinstance(setup_dir, str)
+    src = os.path.join(setup_dir, ldif)
+
+    data = open(src, 'r').read()
+    data = substitute_var(data, subobj.subst_vars())
+
+    for msg in ldb.parse_ldif(data):
+        ldb.add(msg[1])
+
+
+def setup_modify_ldif(setup_dir, ldif, subobj, ldb):
+    src = os.path.join(setup_dir, ldif)
+
+    data = open(src, 'r').read()
+    data = substitute_var(data, subobj.subst_vars())
+
+    for (changetype, msg) in ldb.parse_ldif(data):
+        ldb.modify(msg)
+
+
+def setup_ldb(setup_dir, ldif, session_info, credentials, subobj, dbname, 
+              erase=True):
+    assert dbname is not None
+    ldb = open_ldb(session_info, credentials, dbname)
+    assert ldb is not None
+    ldb.transaction_start()
+    try:
+        if erase:
+            ldb_erase(ldb);    
+        setup_add_ldif(setup_dir, ldif, subobj, ldb)
+    except:
+        ldb.transaction_cancel()
+        raise
+    ldb.transaction_commit()
+
+
+def setup_ldb_modify(setup_dir, ldif, subobj, ldb):
+    """Modify a ldb in the private dir."""
+    src = os.path.join(setup_dir, ldif)
+
+    data = open(src, 'r').read()
+    data = substitute_var(data, subobj.subst_vars())
+    assert not "${" in data
+
+    for (changetype, msg) in ldb.parse_ldif(data):
+        ldb.modify(msg)
+
+
+def setup_file(setup_dir, template, message, fname, subobj):
+    """Setup a file in the private dir."""
+    f = fname
+    src = os.path.join(setup_dir, template)
+
+    os.unlink(f)
+
+    data = open(src, 'r').read()
+    data = substitute_var(data, subobj.subst_vars())
+    assert not "${" in data
+
+    open(f, 'w').write(data)
+
+
+def provision_default_paths(lp, subobj):
+    """Set the default paths for provisioning.
+
+    :param lp: Loadparm context.
+    :param subobj: Object
+    """
+    paths = ProvisionPaths()
+    private_dir = lp.get("private dir")
+    paths.shareconf = os.path.join(private_dir, "share.ldb")
+    paths.samdb = lp.get("sam database") or os.path.join(private_dir, "samdb.ldb")
+    paths.secrets = lp.get("secrets database") or os.path.join(private_dir, "secrets.ldb")
+    paths.templates = os.path.join(private_dir, "templates.ldb")
+    paths.keytab = os.path.join(private_dir, "secrets.keytab")
+    paths.dns = os.path.join(private_dir, subobj.dnsdomain + ".zone")
+    paths.winsdb = os.path.join(private_dir, "wins.ldb")
+    paths.ldap_basedn_ldif = os.path.join(private_dir, subobj.dnsdomain + ".ldif")
+    paths.ldap_config_basedn_ldif = os.path.join(private_dir, subobj.dnsdomain + "-config.ldif")
+    paths.ldap_schema_basedn_ldif = os.path.join(private_dir, subobj.dnsdomain + "-schema.ldif")
+    paths.s4_ldapi_path = os.path.join(private_dir, "ldapi")
+    paths.phpldapadminconfig = os.path.join(private_dir, "phpldapadmin-config.php")
+    paths.hklm = os.path.join(private_dir, "hklm.ldb")
+    return paths
+
+
+def setup_name_mappings(subobj, ldb):
+    """setup reasonable name mappings for sam names to unix names."""
+    res = ldb.search(Dn(ldb, subobj.domaindn), SCOPE_BASE, "objectSid=*", 
+                     ["objectSid"])
+    assert len(res) == 1
+    assert "objectSid" in res[0]
+    sid = list(res[0]["objectSid"])[0]
+
+    # add some foreign sids if they are not present already
+    add_foreign(ldb, subobj, "S-1-5-7", "Anonymous")
+    add_foreign(ldb, subobj, "S-1-1-0", "World")
+    add_foreign(ldb, subobj, "S-1-5-2", "Network")
+    add_foreign(ldb, subobj, "S-1-5-18", "System")
+    add_foreign(ldb, subobj, "S-1-5-11", "Authenticated Users")
+
+    # some well known sids
+    setup_name_mapping(subobj, ldb, "S-1-5-7", subobj.nobody)
+    setup_name_mapping(subobj, ldb, "S-1-1-0", subobj.nogroup)
+    setup_name_mapping(subobj, ldb, "S-1-5-2", subobj.nogroup)
+    setup_name_mapping(subobj, ldb, "S-1-5-18", subobj.root)
+    setup_name_mapping(subobj, ldb, "S-1-5-11", subobj.users)
+    setup_name_mapping(subobj, ldb, "S-1-5-32-544", subobj.wheel)
+    setup_name_mapping(subobj, ldb, "S-1-5-32-545", subobj.users)
+    setup_name_mapping(subobj, ldb, "S-1-5-32-546", subobj.nogroup)
+    setup_name_mapping(subobj, ldb, "S-1-5-32-551", subobj.backup)
+
+    # and some well known domain rids
+    setup_name_mapping(subobj, ldb, sid + "-500", subobj.root)
+    setup_name_mapping(subobj, ldb, sid + "-518", subobj.wheel)
+    setup_name_mapping(subobj, ldb, sid + "-519", subobj.wheel)
+    setup_name_mapping(subobj, ldb, sid + "-512", subobj.wheel)
+    setup_name_mapping(subobj, ldb, sid + "-513", subobj.users)
+    setup_name_mapping(subobj, ldb, sid + "-520", subobj.wheel)
+
+
+def provision_become_dc(setup_dir, subobj, message, paths, session_info, 
+                        credentials):
+    assert session_info is not None
+    subobj.fix(paths)
+
+    message("Setting up templates into %s" % paths.templates)
+    setup_ldb(setup_dir, "provision_templates.ldif", session_info,
+              credentials, subobj, paths.templates)
+
+    # Also wipes the database
+    message("Setting up %s partitions" % paths.samdb)
+    setup_ldb(setup_dir, "provision_partitions.ldif", session_info, 
+              credentials, subobj, paths.samdb)
+
+    samdb = open_ldb(session_info, credentials, paths.samdb)
+    ldb.transaction_start()
+    try:
+        message("Setting up %s attributes" % paths.samdb)
+        setup_add_ldif(setup_dir, "provision_init.ldif", subobj, samdb)
+
+        message("Setting up %s rootDSE" % paths.samdb)
+        setup_add_ldif(setup_dir, "provision_rootdse_add.ldif", subobj, samdb)
+
+        message("Erasing data from partitions")
+        ldb_erase_partitions(subobj, message, samdb, undefined)
+
+        message("Setting up %s indexes" % paths.samdb)
+        setup_add_ldif(setup_dir, "provision_index.ldif", subobj, samdb)
+    except:
+        samdb.transaction_cancel()
+        raise
+
+    samdb.transaction_commit()
+
+    message("Setting up %s" % paths.secrets)
+    setup_ldb(setup_dir, "secrets_init.ldif", session_info, credentials, 
+              subobj, paths.secrets)
+
+    setup_ldb(setup_dir, "secrets.ldif", session_info, credentials, subobj, 
+              paths.secrets, False)
+
+
+def provision(lp, setup_dir, subobj, message, blank, paths, session_info, 
+              credentials, ldapbackend):
+    """Provision samba4
+    
+    :note: caution, this wipes all existing data!
+    """
+    subobj.fix(paths)
+
+    if subobj.domain_guid is not None:
+        subobj.domainguid_mod = "replace: objectGUID\nobjectGUID: %s\n-" % subobj.domain_guid
+    else:
+        subobj.domainguid_mod = ""
+
+    if subobj.host_guid is not None:
+        subobj.hostguid_add = "objectGUID: %s" % subobj.host_guid
+    else:
+        subobj.hostguid_add = ""
+
+    assert paths.smbconf is not None
+
+    # only install a new smb.conf if there isn't one there already
+    if not os.path.exists(paths.smbconf):
+        message("Setting up smb.conf")
+        setup_file(setup_dir, "provision.smb.conf", message, paths.smbconf, subobj)
+        lp.reload()
+
+    # only install a new shares config db if there is none
+    if not os.path.exists(paths.shareconf):
+        message("Setting up share.ldb")
+        setup_ldb(setup_dir, "share.ldif", session_info, credentials, subobj, paths.shareconf)
+
+    message("Setting up %s" % paths.secrets)
+    setup_ldb(setup_dir, "secrets_init.ldif", session_info, credentials, subobj, paths.secrets)
+    setup_ldb(setup_dir, "secrets.ldif", session_info, credentials, subobj, paths.secrets, False)
+
+    message("Setting up registry")
+    reg = registry.Registry()
+    # FIXME: Still fails for some reason:
+    #reg.mount(paths.hklm, registry.HKEY_LOCAL_MACHINE, [])
+    #reg.apply_patchfile(os.path.join(setup_dir, "provision.reg"))
+
+    message("Setting up templates into %s" % paths.templates)
+    setup_ldb(setup_dir, "provision_templates.ldif", session_info, credentials, subobj, paths.templates)
+
+    message("Setting up sam.ldb partitions")
+    setup_ldb(setup_dir, "provision_partitions.ldif", session_info, 
+              credentials, subobj, paths.samdb)
+
+    samdb = open_ldb(session_info, credentials, paths.samdb)
+    samdb.transaction_start()
+    try:
+        message("Setting up sam.ldb attributes")
+        setup_add_ldif(setup_dir, "provision_init.ldif", subobj, samdb)
+
+        message("Setting up sam.ldb rootDSE")
+        setup_add_ldif(setup_dir, "provision_rootdse_add.ldif", subobj, samdb)
+
+        message("Erasing data from partitions")
+        ldb_erase_partitions(subobj, message, samdb, ldapbackend)
+    except:
+        samdb.transaction_cancel()
+        raise
+
+    samdb.transaction_commit()
+
+    message("Pre-loading the Samba 4 and AD schema")
+
+    samdb = open_ldb(session_info, credentials, paths.samdb)
+
+    samdb.set_domain_sid(subobj.domainsid)
+
+    load_schema(setup_dir, subobj, samdb)
+
+    samdb.transaction_start()
+        
+    try:
+        message("Adding DomainDN: %s (permitted to fail)" % subobj.domaindn)
+        setup_add_ldif(setup_dir, "provision_basedn.ldif", subobj, samdb)
+        message("Modifying DomainDN: " + subobj.domaindn + "")
+        setup_ldb_modify(setup_dir, "provision_basedn_modify.ldif", subobj, samdb)
+
+        message("Adding configuration container (permitted to fail)")
+        setup_add_ldif(setup_dir, "provision_configuration_basedn.ldif", subobj, samdb)
+        message("Modifying configuration container")
+        setup_ldb_modify(setup_dir, "provision_configuration_basedn_modify.ldif", subobj, samdb)
+
+        message("Adding schema container (permitted to fail)")
+        setup_add_ldif(setup_dir, "provision_schema_basedn.ldif", subobj, samdb)
+        message("Modifying schema container")
+        setup_ldb_modify(setup_dir, "provision_schema_basedn_modify.ldif", subobj, samdb)
+        message("Setting up sam.ldb Samba4 schema")
+        setup_add_ldif(setup_dir, "schema_samba4.ldif", subobj, samdb)
+        message("Setting up sam.ldb AD schema")
+        setup_add_ldif(setup_dir, "schema.ldif", subobj, samdb)
+
+        message("Setting up sam.ldb configuration data")
+        setup_add_ldif(setup_dir, "provision_configuration.ldif", subobj, samdb)
+
+        message("Setting up display specifiers")
+        setup_add_ldif(setup_dir, "display_specifiers.ldif", subobj, samdb)
+
+        message("Adding users container (permitted to fail)")
+        setup_add_ldif(setup_dir, "provision_users_add.ldif", subobj, samdb)
+        message("Modifying users container")
+        setup_ldb_modify(setup_dir, "provision_users_modify.ldif", subobj, samdb)
+        message("Adding computers container (permitted to fail)")
+        setup_add_ldif(setup_dir, "provision_computers_add.ldif", subobj, samdb)
+        message("Modifying computers container")
+        setup_ldb_modify(setup_dir, "provision_computers_modify.ldif", subobj, samdb)
+        message("Setting up sam.ldb data")
+        setup_add_ldif(setup_dir, "provision.ldif", subobj, samdb)
+
+        if blank:
+            message("Setting up sam.ldb index")
+            setup_add_ldif(setup_dir, "provision_index.ldif", subobj, samdb)
+
+            message("Setting up sam.ldb rootDSE marking as syncronized")
+            setup_modify_ldif(setup_dir, "provision_rootdse_modify.ldif", subobj, samdb)
+
+            samdb.transaction_commit()
+            return
+
+    #    message("Activate schema module")
+    #    setup_modify_ldif("schema_activation.ldif", info, samdb, False)
+    #
+    #    // (hack) Reload, now we have the schema loaded.  
+    #    commit_ok = samdb.transaction_commit()
+    #    if (!commit_ok) {
+    #        message("samdb commit failed: " + samdb.errstring() + "\n")
+    #        assert(commit_ok)
+    #    }
+    #    samdb.close()
+    #
+    #    samdb = open_ldb(info, paths.samdb, False)
+    #
+        message("Setting up sam.ldb users and groups")
+        setup_add_ldif(setup_dir, "provision_users.ldif", subobj, samdb)
+
+        setup_name_mappings(subobj, samdb)
+
+        message("Setting up sam.ldb index")
+        setup_add_ldif(setup_dir, "provision_index.ldif", subobj, samdb)
+
+        message("Setting up sam.ldb rootDSE marking as syncronized")
+        setup_modify_ldif(setup_dir, "provision_rootdse_modify.ldif", subobj, samdb)
+    except:
+        samdb.transaction_cancel()
+        raise
+
+    samdb.transaction_commit()
+
+    message("Setting up phpLDAPadmin configuration")
+    setup_file(setup_dir, "phpldapadmin-config.php", message, 
+               paths.phpldapadminconfig, subobj)
+    message("Please install the phpLDAPadmin configuration located at %s into /etc/phpldapadmin/config.php" % paths.phpldapadminconfig)
+
+
+def provision_dns(setup_dir, subobj, message, paths, session_info, credentials):
+    """Write out a DNS zone file, from the info in the current database."""
+    message("Setting up DNS zone: %s" % subobj.dnsdomain)
+    # connect to the sam
+    ldb = Ldb(paths.samdb, session_info=session_info, credentials=credentials)
+
+    # These values may have changed, due to an incoming SamSync,
+    # or may not have been specified, so fetch them from the database
+
+    res = ldb.search(Dn(ldb, subobj.domaindn), SCOPE_BASE, "objectGUID=*", 
+                     ["objectGUID"])
+    assert(len(res) == 1)
+    assert(res[0]["objectGUID"] is not None)
+    subobj.domainguid = res[0]["objectGUID"]
+
+    subobj.host_guid = searchone(ldb, subobj.domaindn, 
+                                 "(&(objectClass=computer)(cn=%s))" % subobj.netbiosname, "objectGUID")
+    assert subobj.host_guid is not None
+
+    setup_file(setup_dir, "provision.zone", message, paths.dns, subobj)
+
+    message("Please install the zone located in %s into your DNS server" % paths.dns)
+
+
+def provision_ldapbase(setup_dir, subobj, message, paths):
+    """Write out a DNS zone file, from the info in the current database."""
+    message("Setting up LDAP base entry: %s" % subobj.domaindn)
+    rdns = subobj.domaindn.split(",")
+    subobj.extensibleobject = "objectClass: extensibleObject"
+
+    subobj.rdn_dc = rdns[0][len("DC="):]
+
+    setup_file(setup_dir, "provision_basedn.ldif", 
+           message, paths.ldap_basedn_ldif, 
+           subobj)
+
+    setup_file(setup_dir, "provision_configuration_basedn.ldif", 
+           message, paths.ldap_config_basedn_ldif, 
+           subobj)
+
+    setup_file(setup_dir, "provision_schema_basedn.ldif", 
+           message, paths.ldap_schema_basedn_ldif, 
+           subobj)
+
+    message("Please install the LDIF located in " + paths.ldap_basedn_ldif + ", " + paths.ldap_config_basedn_ldif + " and " + paths.ldap_schema_basedn_ldif + " into your LDAP server, and re-run with --ldap-backend=ldap://my.ldap.server")
+
+
+def provision_guess(lp):
+    """guess reasonably default options for provisioning."""
+    subobj = ProvisionSettings(realm=lp.get("realm").upper(),
+                               domain=lp.get("workgroup"),
+                               hostname=hostname(), 
+                               hostip=hostip())
+
+    assert subobj.realm is not None
+    assert subobj.domain is not None
+    assert subobj.hostname is not None
+    
+    subobj.domainsid    = sid.random()
+    subobj.invocationid = uuid.random()
+    subobj.policyguid   = uuid.random()
+    subobj.krbtgtpass   = misc.random_password(12)
+    subobj.machinepass  = misc.random_password(12)
+    subobj.adminpass    = misc.random_password(12)
+    subobj.dnspass      = misc.random_password(12)
+    subobj.datestring   = time.strftime("%Y%m%d%H")
+    subobj.root         = findnss(pwd.getpwnam, "root")[4]
+    subobj.nobody       = findnss(pwd.getpwnam, "nobody")[4]
+    subobj.nogroup      = findnss(grp.getgrnam, "nogroup", "nobody")[2]
+    subobj.wheel        = findnss(grp.getgrnam, "wheel", "root", "staff", "adm")[2]
+    subobj.backup       = findnss(grp.getgrnam, "backup", "wheel", "root", "staff")[2]
+    subobj.users        = findnss(grp.getgrnam, "users", "guest", "other", "unknown", "usr")[2]
+
+    subobj.dnsdomain    = subobj.realm.lower()
+    subobj.dnsname      = "%s.%s" % (subobj.hostname.lower(), subobj.dnsdomain)
+    subobj.domaindn     = "DC=" + subobj.dnsdomain.replace(".", ",DC=")
+    subobj.domaindn_ldb = "users.ldb"
+    subobj.rootdn       = subobj.domaindn
+    subobj.configdn     = "CN=Configuration," + subobj.rootdn
+    subobj.configdn_ldb = "configuration.ldb"
+    subobj.schemadn     = "CN=Schema," + subobj.configdn
+    subobj.schemadn_ldb = "schema.ldb"
+
+    #Add modules to the list to activate them by default
+    #beware often order is important
+    #
+    # Some Known ordering constraints:
+    # - rootdse must be first, as it makes redirects from "" -> cn=rootdse
+    # - objectclass must be before password_hash, because password_hash checks
+    #   that the objectclass is of type person (filled in by objectclass
+    #   module when expanding the objectclass list)
+    # - partition must be last
+    # - each partition has its own module list then
+    subobj.modules_list = ["rootdse",
+                    "paged_results",
+                    "ranged_results",
+                    "server_sort",
+                    "extended_dn",
+                    "asq",
+                    "samldb",
+                    "rdn_name",
+                    "objectclass",
+                    "kludge_acl",
+                    "operational"]
+    subobj.tdb_modules_list = [
+                    "subtree_rename",
+                    "subtree_delete",
+                    "linked_attributes"]
+    subobj.modules_list2 = ["show_deleted",
+                    "partition"]
+
+    subobj.extensibleobject = "# no objectClass: extensibleObject for local ldb"
+    subobj.aci        = "# no aci for local ldb"
+    return subobj
+
+
+def searchone(ldb, basedn, expression, attribute):
+    """search for one attribute as a string."""
+    res = ldb.search(basedn, SCOPE_SUBTREE, expression, [attribute])
+    if len(res) != 1 or res[0][attribute] is None:
+        return None
+    return res[0][attribute]
+
+
+def load_schema(setup_dir, subobj, samdb):
+    """Load schema."""
+    src = os.path.join(setup_dir, "schema.ldif")
+
+    schema_data = open(src, 'r').read()
+
+    src = os.path.join(setup_dir, "schema_samba4.ldif")
+
+    schema_data += open(src, 'r').read()
+
+    schema_data = substitute_var(schema_data, subobj.subst_vars())
+
+    src = os.path.join(setup_dir, "provision_schema_basedn_modify.ldif")
+
+    head_data = open(src, 'r').read()
+
+    head_data = substitute_var(head_data, subobj.subst_vars())
+
+    samdb.attach_dsdb_schema_from_ldif(head_data, schema_data)
+
+
+def enable_account(ldb, user_dn):
+    """enable the account."""
+    res = ldb.search(user_dn, SCOPE_ONELEVEL, None, ["userAccountControl"])
+    assert len(res) == 1
+    userAccountControl = res[0].userAccountControl
+    userAccountControl = userAccountControl - 2 # remove disabled bit
+    mod = """
+dn: %s
+changetype: modify
+replace: userAccountControl
+userAccountControl: %u
+""" % (user_dn, userAccountControl)
+    ldb.modify(mod)
+
+
+def newuser(sam, username, unixname, password, message, session_info, 
+            credentials):
+    """add a new user record"""
+    # connect to the sam 
+    ldb.transaction_start()
+
+    # find the DNs for the domain and the domain users group
+    res = ldb.search("", SCOPE_BASE, "defaultNamingContext=*", 
+                     ["defaultNamingContext"])
+    assert(len(res) == 1 and res[0].defaultNamingContext is not None)
+    domain_dn = res[0].defaultNamingContext
+    assert(domain_dn is not None)
+    dom_users = searchone(ldb, domain_dn, "name=Domain Users", "dn")
+    assert(dom_users is not None)
+
+    user_dn = "CN=%s,CN=Users,%s" % (username, domain_dn)
+
+    #
+    #  the new user record. note the reliance on the samdb module to fill
+    #  in a sid, guid etc
+    #
+    ldif = """
+dn: %s
+sAMAccountName: %s
+unixName: %s
+sambaPassword: %s
+objectClass: user
+""" % (user_dn, username, unixname, password)
+    #  add the user to the users group as well
+    modgroup = """
+dn: %s
+changetype: modify
+add: member
+member: %s
+""" % (dom_users, user_dn)
+
+
+    #  now the real work
+    message("Adding user %s" % user_dn)
+    ldb.add(ldif)
+
+    message("Modifying group %s" % dom_users)
+    ldb.modify(modgroup)
+
+    #  modify the userAccountControl to remove the disabled bit
+    enable_account(ldb, user_dn)
+    ldb.transaction_commit()
+
+
+def valid_netbios_name(name):
+    """Check whether a name is valid as a NetBIOS name. """
+    # FIXME: There are probably more constraints here. 
+    # crh has a paragraph on this in his book (1.4.1.1)
+    if len(name) > 13:
+        return False
+    return True
+
+
+def join_domain(domain, netbios_name, join_type, creds, message):
+    ctx = NetContext(creds)
+    joindom = object()
+    joindom.domain = domain
+    joindom.join_type = join_type
+    joindom.netbios_name = netbios_name
+    if not ctx.JoinDomain(joindom):
+        raise Exception("Domain Join failed: " + joindom.error_string)
+
+
+def vampire(domain, session_info, credentials, message):
+    """Vampire a remote domain.  
+    
+    Session info and credentials are required for for
+    access to our local database (might be remote ldap)
+    """
+    ctx = NetContext(credentials)
+    vampire_ctx = object()
+    machine_creds = credentials_init()
+    machine_creds.set_domain(form.domain)
+    if not machine_creds.set_machine_account():
+        raise Exception("Failed to access domain join information!")
+    vampire_ctx.machine_creds = machine_creds
+    vampire_ctx.session_info = session_info
+    if not ctx.SamSyncLdb(vampire_ctx):
+        raise Exception("Migration of remote domain to Samba failed: %s " % vampire_ctx.error_string)
diff --git a/source4/scripting/python/samba/upgrade.py b/source4/scripting/python/samba/upgrade.py
new file mode 100644
index 0000000000..49aee3f94d
--- /dev/null
+++ b/source4/scripting/python/samba/upgrade.py
@@ -0,0 +1,561 @@
+#!/usr/bin/python
+#
+#	backend code for upgrading from Samba3
+#	Copyright Jelmer Vernooij 2005-2007
+#	Released under the GNU GPL v3 or later
+#
+
+"""Support code for upgrading from Samba 3 to Samba 4."""
+
+from provision import findnss
+import provision
+import grp
+import pwd
+from uuid import uuid4
+from param import default_configuration
+
+def regkey_to_dn(name):
+	dn = "hive=NONE"
+
+    for el in name.split("/")[1:]:
+        dn = "key=%s," % el + dn
+
+	return dn
+
+# Where prefix is any of:
+# - HKLM
+#   HKU
+#   HKCR
+#   HKPD
+#   HKPT
+#
+
+def upgrade_registry(regdb,prefix,ldb):
+    """Migrate registry contents."""
+    assert regdb is not None:
+	prefix_up = prefix.upper()
+	ldif = []
+
+    for rk in regdb.keys:
+		pts = rk.name.split("/")
+
+		# Only handle selected hive
+        if pts[0].upper() != prefix_up:
+			continue
+
+		keydn = regkey_to_dn(rk.name)
+
+		pts = rk.name.split("/")
+
+		# Convert key name to dn
+		ldif[rk.name] = """
+dn: %s
+name: %s
+
+""" % (keydn, pts[0])
+		
+        for rv in rk.values:
+			ldif[rk.name + " (" + rv.name + ")"] = """
+dn: %s,value=%s
+value: %s
+type: %d
+data:: %s""" % (keydn, rv.name, rv.name, rv.type, ldb.encode(rv.data))
+
+	return ldif
+
+def upgrade_sam_policy(samba3,dn):
+	ldif = """
+dn: %s
+changetype: modify
+replace: minPwdLength
+minPwdLength: %d
+pwdHistoryLength: %d
+minPwdAge: %d
+maxPwdAge: %d
+lockoutDuration: %d
+samba3ResetCountMinutes: %d
+samba3UserMustLogonToChangePassword: %d
+samba3BadLockoutMinutes: %d
+samba3DisconnectTime: %d
+
+""" % (dn, samba3.policy.min_password_length, 
+	samba3.policy.password_history, samba3.policy.minimum_password_age,
+	samba3.policy.maximum_password_age, samba3.policy.lockout_duration,
+	samba3.policy.reset_count_minutes, samba3.policy.user_must_logon_to_change_password,
+	samba3.policy.bad_lockout_minutes, samba3.policy.disconnect_time)
+	
+	return ldif
+
+def upgrade_sam_account(ldb,acc,domaindn,domainsid):
+    """Upgrade a SAM account."""
+    if acc.nt_username is None or acc.nt_username == "":
+		acc.nt_username = acc.username
+
+    if acc.fullname is None:
+		acc.fullname = pwd.getpwnam(acc.fullname)[4]
+
+	acc.fullname = acc.fullname.split(",")[0]
+
+    if acc.fullname is None:
+		acc.fullname = acc.username
+	
+	assert acc.fullname is not None
+	assert acc.nt_username is not None
+
+	ldif = """dn: cn=%s,%s
+objectClass: top
+objectClass: user
+lastLogon: %d
+lastLogoff: %d
+unixName: %s
+sAMAccountName: %s
+cn: %s
+description: %s
+primaryGroupID: %d
+badPwdcount: %d
+logonCount: %d
+samba3Domain: %s
+samba3DirDrive: %s
+samba3MungedDial: %s
+samba3Homedir: %s
+samba3LogonScript: %s
+samba3ProfilePath: %s
+samba3Workstations: %s
+samba3KickOffTime: %d
+samba3BadPwdTime: %d
+samba3PassLastSetTime: %d
+samba3PassCanChangeTime: %d
+samba3PassMustChangeTime: %d
+objectSid: %s-%d
+lmPwdHash:: %s
+ntPwdHash:: %s
+
+""" % (ldb.dn_escape(acc.fullname), domaindn, acc.logon_time, acc.logoff_time, acc.username, acc.nt_username, acc.nt_username, 
+acc.acct_desc, acc.group_rid, acc.bad_password_count, acc.logon_count,
+acc.domain, acc.dir_drive, acc.munged_dial, acc.homedir, acc.logon_script, 
+acc.profile_path, acc.workstations, acc.kickoff_time, acc.bad_password_time, 
+acc.pass_last_set_time, acc.pass_can_change_time, acc.pass_must_change_time, domainsid, acc.user_rid,
+	ldb.encode(acc.lm_pw), ldb.encode(acc.nt_pw))
+
+	return ldif
+
+def upgrade_sam_group(group,domaindn):
+    """Upgrade a SAM group."""
+	if group.sid_name_use == 5: # Well-known group
+		return None
+
+    if group.nt_name in ("Domain Guests", "Domain Users", "Domain Admins"):
+		return None
+	
+    if group.gid == -1:
+		gr = grp.getgrnam(grp.nt_name)
+    else:
+		gr = grp.getgrgid(grp.gid)
+
+    if gr is None:
+		group.unixname = "UNKNOWN"
+    else:
+		group.unixname = gr.gr_name
+
+	assert group.unixname is not None
+	
+	ldif = """dn: cn=%s,%s
+objectClass: top
+objectClass: group
+description: %s
+cn: %s
+objectSid: %s
+unixName: %s
+samba3SidNameUse: %d
+""" % (group.nt_name, domaindn, 
+group.comment, group.nt_name, group.sid, group.unixname, group.sid_name_use)
+
+	return ldif
+
+def upgrade_winbind(samba3,domaindn):
+	ldif = """
+		
+dn: dc=none
+userHwm: %d
+groupHwm: %d
+
+""" % (samba3.idmap.user_hwm, samba3.idmap.group_hwm)
+
+    for m in samba3.idmap.mappings:
+		ldif += """
+dn: SID=%s,%s
+SID: %s
+type: %d
+unixID: %d""" % (m.sid, domaindn, m.sid, m.type, m.unix_id)
+	
+	return ldif
+
+def upgrade_wins(samba3):
+	ldif = ""
+	version_id = 0
+
+    for e in samba3.winsentries:
+		now = sys.nttime()
+		ttl = sys.unix2nttime(e.ttl)
+
+		version_id+=1
+
+        numIPs = len(e.ips)
+
+        if e.type == 0x1C:
+			rType = 0x2
+        elif e.type & 0x80:
+            if numIPs > 1:
+				rType = 0x2
+            else:
+				rType = 0x1
+        else:
+            if numIPs > 1:
+				rType = 0x3
+            else:
+				rType = 0x0
+
+        if ttl > now:
+			rState = 0x0 # active
+        else:
+			rState = 0x1 # released
+
+		nType = ((e.nb_flags & 0x60)>>5)
+
+		ldif += """
+dn: name=%s,type=0x%02X
+type: 0x%02X
+name: %s
+objectClass: winsRecord
+recordType: %u
+recordState: %u
+nodeType: %u
+isStatic: 0
+expireTime: %s
+versionID: %llu
+""" % (e.name, e.type, e.type, e.name, 
+   rType, rState, nType, 
+   ldaptime(ttl), version_id)
+
+        for ip in e.ips:
+			ldif += "address: %s\n" % ip
+
+	ldif += """
+dn: CN=VERSION
+objectClass: winsMaxVersion
+maxVersion: %llu
+""" % version_id
+
+	return ldif
+
+def upgrade_provision(lp, samba3):
+	subobj = Object()
+
+	domainname = samba3.configuration.get("workgroup")
+	
+    if domainname is None:
+		domainname = samba3.secrets.domains[0].name
+		print "No domain specified in smb.conf file, assuming '%s'\n" % domainname
+	
+	domsec = samba3.find_domainsecrets(domainname)
+	hostsec = samba3.find_domainsecrets(hostname())
+	realm = samba3.configuration.get("realm")
+
+    if realm is None:
+		realm = domainname
+		print "No realm specified in smb.conf file, assuming '%s'\n" % realm
+	random_init(local)
+
+	subobj.realm        = realm
+	subobj.domain       = domainname
+	subobj.hostname     = hostname()
+
+	assert subobj.realm is not None
+	assert subobj.domain is not None
+	assert subobj.hostname is not None
+
+	subobj.HOSTIP       = hostip()
+    if domsec is not None:
+		subobj.DOMAINGUID   = domsec.guid
+		subobj.DOMAINSID    = domsec.sid
+    else:
+		print "Can't find domain secrets for '%s'; using random SID and GUID\n" % domainname
+		subobj.DOMAINGUID = uuid4()
+		subobj.DOMAINSID = randsid()
+	
+    if hostsec:
+		subobj.HOSTGUID     = hostsec.guid
+    else:
+		subobj.HOSTGUID = uuid4()
+	subobj.invocationid = uuid4()
+	subobj.krbtgtpass   = randpass(12)
+	subobj.machinepass  = randpass(12)
+	subobj.adminpass    = randpass(12)
+	subobj.datestring   = datestring()
+	subobj.root         = findnss(pwd.getpwnam, "root")[4]
+	subobj.nobody       = findnss(pwd.getpwnam, "nobody")[4]
+	subobj.nogroup      = findnss(grp.getgrnam, "nogroup", "nobody")[2]
+	subobj.wheel        = findnss(grp.getgrnam, "wheel", "root")[2]
+	subobj.users        = findnss(grp.getgrnam, "users", "guest", "other")[2]
+	subobj.dnsdomain    = subobj.realm.lower()
+	subobj.dnsname      = "%s.%s" % (subobj.hostname.lower(), subobj.dnsdomain)
+	subobj.basedn       = "DC=" + ",DC=".join(subobj.realm.split("."))
+	rdn_list = subobj.dnsdomain.split(".")
+	subobj.domaindn     = "DC=" + ",DC=".join(rdn_list)
+	subobj.domaindn_ldb = "users.ldb"
+	subobj.rootdn       = subobj.domaindn
+
+	modules_list        = ["rootdse",
+					"kludge_acl",
+					"paged_results",
+					"server_sort",
+					"extended_dn",
+					"asq",
+					"samldb",
+					"password_hash",
+					"operational",
+					"objectclass",
+					"rdn_name",
+					"show_deleted",
+					"partition"]
+	subobj.modules_list = ",".join(modules_list)
+
+	return subobj
+
+smbconf_keep = [
+	"dos charset", 
+	"unix charset",
+	"display charset",
+	"comment",
+	"path",
+	"directory",
+	"workgroup",
+	"realm",
+	"netbios name",
+	"netbios aliases",
+	"netbios scope",
+	"server string",
+	"interfaces",
+	"bind interfaces only",
+	"security",
+	"auth methods",
+	"encrypt passwords",
+	"null passwords",
+	"obey pam restrictions",
+	"password server",
+	"smb passwd file",
+	"private dir",
+	"passwd chat",
+	"password level",
+	"lanman auth",
+	"ntlm auth",
+	"client NTLMv2 auth",
+	"client lanman auth",
+	"client plaintext auth",
+	"read only",
+	"hosts allow",
+	"hosts deny",
+	"log level",
+	"debuglevel",
+	"log file",
+	"smb ports",
+	"large readwrite",
+	"max protocol",
+	"min protocol",
+	"unicode",
+	"read raw",
+	"write raw",
+	"disable netbios",
+	"nt status support",
+	"announce version",
+	"announce as",
+	"max mux",
+	"max xmit",
+	"name resolve order",
+	"max wins ttl",
+	"min wins ttl",
+	"time server",
+	"unix extensions",
+	"use spnego",
+	"server signing",
+	"client signing",
+	"max connections",
+	"paranoid server security",
+	"socket options",
+	"strict sync",
+	"max print jobs",
+	"printable",
+	"print ok",
+	"printer name",
+	"printer",
+	"map system",
+	"map hidden",
+	"map archive",
+	"preferred master",
+	"prefered master",
+	"local master",
+	"browseable",
+	"browsable",
+	"wins server",
+	"wins support",
+	"csc policy",
+	"strict locking",
+	"preload",
+	"auto services",
+	"lock dir",
+	"lock directory",
+	"pid directory",
+	"socket address",
+	"copy",
+	"include",
+	"available",
+	"volume",
+	"fstype",
+	"panic action",
+	"msdfs root",
+	"host msdfs",
+	"winbind separator"]
+
+#
+#   Remove configuration variables not present in Samba4
+#	oldconf: Old configuration structure
+#	mark: Whether removed configuration variables should be 
+#		kept in the new configuration as "samba3:<name>"
+def upgrade_smbconf(oldconf,mark):
+	data = oldconf.data()
+	newconf = param_init()
+
+	for (s in data) {
+		for (p in data[s]) {
+			keep = False
+			for (k in smbconf_keep) { 
+                if smbconf_keep[k] == p:
+					keep = True
+					break
+			}
+
+            if keep:
+				newconf.set(s, p, oldconf.get(s, p))
+            elif mark:
+				newconf.set(s, "samba3:"+p, oldconf.get(s,p))
+		}
+	}
+
+    if oldconf.get("domain logons") == "True":
+		newconf.set("server role", "domain controller")
+    else:
+        if oldconf.get("security") == "user":
+			newconf.set("server role", "standalone")
+        else:
+			newconf.set("server role", "member server")
+
+	return newconf
+
+def upgrade(subobj, samba3, message, paths, session_info, credentials):
+	ret = 0
+	lp = loadparm_init()
+	samdb = Ldb(paths.samdb, session_info=session_info, credentials=credentials)
+
+	message("Writing configuration")
+	newconf = upgrade_smbconf(samba3.configuration,True)
+	newconf.save(paths.smbconf)
+
+	message("Importing account policies")
+	ldif = upgrade_sam_policy(samba3,subobj.BASEDN)
+	samdb.modify(ldif)
+	regdb = Ldb(paths.hklm)
+
+	regdb.modify("
+dn: value=RefusePasswordChange,key=Parameters,key=Netlogon,key=Services,key=CurrentControlSet,key=System,HIVE=NONE
+replace: type
+type: 4
+replace: data
+data: %d
+" % samba3.policy.refuse_machine_password_change)
+
+	message("Importing users")
+    for account in samba3.samaccounts:
+		msg = "... " + account.username
+		ldif = upgrade_sam_account(samdb, accounts,subobj.BASEDN,subobj.DOMAINSID)
+        try:
+            samdb.add(ldif)
+        except LdbError, e:
+            # FIXME: Ignore 'Record exists' errors
+			msg += "... error: " + str(e)
+			ret += 1; 
+		message(msg)
+
+	message("Importing groups")
+    for mapping in samba3.groupmappings:
+		msg = "... " + mapping.nt_name
+		ldif = upgrade_sam_group(mapping, subobj.BASEDN)
+        if ldif is not None:
+            try:
+			    samdb.add(ldif)
+            except LdbError, e:
+                # FIXME: Ignore 'Record exists' errors
+				msg += "... error: " + str(e)
+				ret += 1
+		message(msg)
+
+	message("Importing registry data")
+    for hive in ["hkcr","hkcu","hklm","hkpd","hku","hkpt"]:
+		message("... " + hive)
+		regdb = Ldb(paths[hive])
+		ldif = upgrade_registry(samba3.registry, hive, regdb)
+		for (var j in ldif) {
+			var msg = "... ... " + j
+            try:
+                regdb.add(ldif[j])
+            except LdbError, e:
+                # FIXME: Ignore 'Record exists' errors
+				msg += "... error: " + str(e)
+				ret += 1
+			message(msg)
+
+	message("Importing WINS data")
+	winsdb = Ldb(paths.winsdb)
+	ldb_erase(winsdb)
+
+	ldif = upgrade_wins(samba3)
+	winsdb.add(ldif)
+
+	# figure out ldapurl, if applicable
+	ldapurl = None
+	pdb = samba3.configuration.get_list("passdb backend")
+    if pdb is not None:
+        for backend in pdb:
+            if len(backend) >= 7 and backend[0:7] == "ldapsam":
+                ldapurl = backend[7:]
+
+	# URL was not specified in passdb backend but ldap /is/ used
+    if ldapurl == "":
+	    ldapurl = "ldap://%s" % samba3.configuration.get("ldap server")
+
+	# Enable samba3sam module if original passdb backend was ldap
+    if ldapurl is not None:
+		message("Enabling Samba3 LDAP mappings for SAM database")
+
+		samdb.modify("""
+dn: @MODULES
+changetype: modify
+replace: @LIST
+@LIST: samldb,operational,objectguid,rdn_name,samba3sam
+""")
+
+		samdb.add("""
+dn: @MAP=samba3sam
+@MAP_URL: %s""", ldapurl))
+
+	return ret
+
+def upgrade_verify(subobj, samba3, paths, message):
+	message("Verifying account policies")
+
+	samldb = Ldb(paths.samdb)
+
+    for account in samba3.samaccounts:
+		msg = samldb.search("(&(sAMAccountName=" + account.nt_username + ")(objectclass=user))")
+		assert(len(msg) >= 1)
+	
+	# FIXME
-- 
cgit 


From b414ac505282f5a2a59c7580a19dfbd86489676e Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 10 Dec 2007 10:29:20 +0100
Subject: r26369: Start on tests for the upgrade python code. (This used to be
 commit c4458d11c710d4f0f892b26c7cb0701a43273587)

---
 source4/scripting/python/samba/tests/upgrade.py | 28 +++++++++++++++++++++++++
 source4/scripting/python/samba/upgrade.py       |  2 ++
 2 files changed, 30 insertions(+)
 create mode 100644 source4/scripting/python/samba/tests/upgrade.py

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/tests/upgrade.py b/source4/scripting/python/samba/tests/upgrade.py
new file mode 100644
index 0000000000..f46d869656
--- /dev/null
+++ b/source4/scripting/python/samba/tests/upgrade.py
@@ -0,0 +1,28 @@
+#!/usr/bin/python
+
+# Unix SMB/CIFS implementation.
+# Copyright (C) Jelmer Vernooij <jelmer@samba.org> 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 <http://www.gnu.org/licenses/>.
+#
+
+from samba.upgrade import regkey_to_dn
+from unittest import TestCase
+
+class RegkeyDnTests(TestCase):
+    def test_empty(self):
+        self.assertEquals("hive=NONE", regkey_to_dn(""))
+
+    def test_nested(self):
+        self.assertEquals("key=foo,key=bar,hive=NONE", regkey_to_dn("foo/bar"))
diff --git a/source4/scripting/python/samba/upgrade.py b/source4/scripting/python/samba/upgrade.py
index 49aee3f94d..1908e3ea55 100644
--- a/source4/scripting/python/samba/upgrade.py
+++ b/source4/scripting/python/samba/upgrade.py
@@ -15,6 +15,7 @@ from uuid import uuid4
 from param import default_configuration
 
 def regkey_to_dn(name):
+    """Convert a registry key to a DN."""
 	dn = "hive=NONE"
 
     for el in name.split("/")[1:]:
@@ -191,6 +192,7 @@ unixID: %d""" % (m.sid, domaindn, m.sid, m.type, m.unix_id)
 	return ldif
 
 def upgrade_wins(samba3):
+    """Upgrade the WINS database."""
 	ldif = ""
 	version_id = 0
 
-- 
cgit 


From eba25f5d1897fbe61e8d7c623fcacb647629bf07 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 10 Dec 2007 10:29:45 +0100
Subject: r26375: Move provision-independent utility function to main samba
 python module. (This used to be commit
 9d0ff47be069422de7ef2794357c6f3e9c540e67)

---
 source4/scripting/python/samba/__init__.py  |  9 +++++++++
 source4/scripting/python/samba/provision.py | 14 ++++----------
 2 files changed, 13 insertions(+), 10 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/__init__.py b/source4/scripting/python/samba/__init__.py
index 46d8ff7d37..00b82e1800 100644
--- a/source4/scripting/python/samba/__init__.py
+++ b/source4/scripting/python/samba/__init__.py
@@ -55,3 +55,12 @@ def substitute_var(text, values):
 
     return text
 
+
+def valid_netbios_name(name):
+    """Check whether a name is valid as a NetBIOS name. """
+    # FIXME: There are probably more constraints here. 
+    # crh has a paragraph on this in his book (1.4.1.1)
+    if len(name) > 13:
+        return False
+    return True
+
diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index 3d391863da..692e49b095 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -14,7 +14,7 @@ import uuid, sid, misc
 from socket import gethostname, gethostbyname
 import param
 import registry
-from samba import Ldb, substitute_var
+from samba import Ldb, substitute_var, valid_netbios_name
 from ldb import Dn, SCOPE_SUBTREE, SCOPE_ONELEVEL, SCOPE_BASE, LdbError, \
         LDB_ERR_NO_SUCH_OBJECT, timestring
 
@@ -191,14 +191,17 @@ unixName: %s
 """ % (res[0].dn, unixname)
     ldb.modify(ldb.parse_ldif(mod).next()[1])
 
+
 def hostip():
     """return first host IP."""
     return gethostbyname(hostname())
 
+
 def hostname():
     """return first part of hostname."""
     return gethostname().split(".")[0]
 
+
 def ldb_delete(ldb):
     """Delete a LDB file.
 
@@ -805,15 +808,6 @@ member: %s
     ldb.transaction_commit()
 
 
-def valid_netbios_name(name):
-    """Check whether a name is valid as a NetBIOS name. """
-    # FIXME: There are probably more constraints here. 
-    # crh has a paragraph on this in his book (1.4.1.1)
-    if len(name) > 13:
-        return False
-    return True
-
-
 def join_domain(domain, netbios_name, join_type, creds, message):
     ctx = NetContext(creds)
     joindom = object()
-- 
cgit 


From 5f4842cf65ce64bfdf577cd549565da20ca818cf Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 10 Dec 2007 18:41:19 +0100
Subject: r26376: Add context for libcli_resolve. (This used to be commit
 459e1466a411d6f83b7372e248566e6e71c745fc)

---
 source4/scripting/ejs/smbcalls_nbt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_nbt.c b/source4/scripting/ejs/smbcalls_nbt.c
index 5eaf458f34..c3679b1ec7 100644
--- a/source4/scripting/ejs/smbcalls_nbt.c
+++ b/source4/scripting/ejs/smbcalls_nbt.c
@@ -70,7 +70,7 @@ static int ejs_resolve_name(MprVarHandle eid, int argc, struct MprVar **argv)
 
 	result = 0;
 
-	nt_status = resolve_name(&name, tmp_ctx, &reply_addr, event_context_find(tmp_ctx), lp_name_resolve_order(global_loadparm));
+	nt_status = resolve_name(lp_resolve_context(global_loadparm), &name, tmp_ctx, &reply_addr, event_context_find(tmp_ctx));
 
 	if (NT_STATUS_IS_OK(nt_status)) {
 		mprSetPropertyValue(argv[0], "value", mprString(reply_addr));
-- 
cgit 


From 68dc2dc526e146dd0ac68d5d68eb55b601282caf Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 11 Dec 2007 14:31:01 +0100
Subject: r26399: Use -O option for SWIG (less evil generated code). (This used
 to be commit 3378b6a559272cb702b52966692bf423f67a2b41)

---
 source4/scripting/python/config.mk   |  2 +-
 source4/scripting/python/misc.py     | 11 ++++++++++-
 source4/scripting/python/misc_wrap.c | 15 ++++++++++++++-
 3 files changed, 25 insertions(+), 3 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/config.mk b/source4/scripting/python/config.mk
index 91437e1e0b..c958761c70 100644
--- a/source4/scripting/python/config.mk
+++ b/source4/scripting/python/config.mk
@@ -16,7 +16,7 @@ swig: pythonmods
 .SUFFIXES: _wrap.c .i
 
 .i_wrap.c:
-	[ "$(SWIG)" == "no" ] || $(SWIG) -Wall -I$(srcdir)/scripting/swig -python -keyword $<
+	[ "$(SWIG)" == "no" ] || $(SWIG) -O -Wall -I$(srcdir)/scripting/swig -python -keyword $<
 
 realdistclean::
 	@echo "Removing SWIG output files"
diff --git a/source4/scripting/python/misc.py b/source4/scripting/python/misc.py
index 94625be2c9..afe7b723e0 100644
--- a/source4/scripting/python/misc.py
+++ b/source4/scripting/python/misc.py
@@ -2,7 +2,6 @@
 # Version 1.3.33
 #
 # Don't modify this file, modify the SWIG interface instead.
-# This file is compatible with both classic and new-style classes.
 
 import _misc
 import new
@@ -48,6 +47,16 @@ except AttributeError:
 del types
 
 
+def _swig_setattr_nondynamic_method(set):
+    def set_attr(self,name,value):
+        if (name == "thisown"): return self.this.own(value)
+        if hasattr(self,name) or (name == "this"):
+            set(self,name,value)
+        else:
+            raise AttributeError("You cannot add attributes to %s" % self)
+    return set_attr
+
+
 random_password = _misc.random_password
 
 
diff --git a/source4/scripting/python/misc_wrap.c b/source4/scripting/python/misc_wrap.c
index 2237f9cb03..fbdd33afda 100644
--- a/source4/scripting/python/misc_wrap.c
+++ b/source4/scripting/python/misc_wrap.c
@@ -9,7 +9,7 @@
  * ----------------------------------------------------------------------------- */
 
 #define SWIGPYTHON
-#define SWIG_PYTHON_DIRECTOR_NO_VTABLE
+#define SWIG_PYTHON_NO_BUILD_NONE
 /* -----------------------------------------------------------------------------
  *  This section contains generic SWIG labels for method/variable
  *  declarations/attributes, and other compiler dependent labels.
@@ -2478,6 +2478,19 @@ static swig_module_info swig_module = {swig_types, 10, 0, 0, 0, 0};
 #  error "This python version requires swig to be run with the '-classic' option"
 # endif
 #endif
+#if (PY_VERSION_HEX <= 0x02020000)
+# error "This python version requires swig to be run with the '-nomodern' option"
+#endif
+#if (PY_VERSION_HEX <= 0x02020000)
+# error "This python version requires swig to be run with the '-nomodernargs' option"
+#endif
+#ifndef METH_O
+# error "This python version requires swig to be run with the '-nofastunpack' option"
+#endif
+#ifdef SWIG_TypeQuery
+# undef SWIG_TypeQuery
+#endif
+#define SWIG_TypeQuery SWIG_Python_TypeQuery
 
 /*-----------------------------------------------
               @(target):= _misc.so
-- 
cgit 


From 6f2252dace1629d7b5c5637b103caa28d2c89b07 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 11 Dec 2007 22:23:14 +0100
Subject: r26401: Don't cache interfaces context in libnetif. (This used to be
 commit 9f975417cc66bfd4589da38bfd23731dbe0e6153)

---
 source4/scripting/ejs/smbcalls_config.c | 3 ---
 source4/scripting/ejs/smbcalls_sys.c    | 9 +++++++--
 2 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_config.c b/source4/scripting/ejs/smbcalls_config.c
index 88c153ead3..07e0f479da 100644
--- a/source4/scripting/ejs/smbcalls_config.c
+++ b/source4/scripting/ejs/smbcalls_config.c
@@ -199,9 +199,6 @@ static int ejs_lpReload(MprVarHandle eid, int argc, char **argv)
 	const char *filename = lp_configfile(global_loadparm);
 
 	ret = lp_load(global_loadparm, filename);
-	if (ret) {
-		unload_interfaces();
-	}
 	mpr_Return(eid, mprCreateBoolVar(ret));
 	return 0;
 }
diff --git a/source4/scripting/ejs/smbcalls_sys.c b/source4/scripting/ejs/smbcalls_sys.c
index 86e0873e09..cc1c3b4e32 100644
--- a/source4/scripting/ejs/smbcalls_sys.c
+++ b/source4/scripting/ejs/smbcalls_sys.c
@@ -32,10 +32,15 @@
 */
 static int ejs_sys_interfaces(MprVarHandle eid, int argc, struct MprVar **argv)
 {
-	int i, count = iface_count(global_loadparm);
+	int i, count;
 	struct MprVar ret = mprArray("interfaces");
+	struct interface *ifaces;
+
+	load_interfaces(lp_interfaces(global_loadparm), &ifaces);
+
+	count = iface_count(ifaces);
 	for (i=0;i<count;i++) {
-		mprAddArray(&ret, i, mprString(iface_n_ip(global_loadparm, i)));
+		mprAddArray(&ret, i, mprString(iface_n_ip(ifaces, i)));
 	}
 	mpr_Return(eid, ret);
 	return 0;	
-- 
cgit 


From 70f1f33af8e6e82506d0ee9ff6cc7e0923a7d0a1 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 11 Dec 2007 22:23:20 +0100
Subject: r26402: Require a talloc context in libnetif. (This used to be commit
 a35e51871bbf1ab33fc316fa59e597b722769c50)

---
 source4/scripting/ejs/smbcalls_sys.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_sys.c b/source4/scripting/ejs/smbcalls_sys.c
index cc1c3b4e32..72ddf90231 100644
--- a/source4/scripting/ejs/smbcalls_sys.c
+++ b/source4/scripting/ejs/smbcalls_sys.c
@@ -36,12 +36,14 @@ static int ejs_sys_interfaces(MprVarHandle eid, int argc, struct MprVar **argv)
 	struct MprVar ret = mprArray("interfaces");
 	struct interface *ifaces;
 
-	load_interfaces(lp_interfaces(global_loadparm), &ifaces);
+	load_interfaces(NULL, lp_interfaces(global_loadparm), &ifaces);
 
 	count = iface_count(ifaces);
 	for (i=0;i<count;i++) {
 		mprAddArray(&ret, i, mprString(iface_n_ip(ifaces, i)));
 	}
+
+	talloc_free(ifaces);
 	mpr_Return(eid, ret);
 	return 0;	
 }
-- 
cgit 


From 4b0199a5493ea2b88558cc40871e63c1dc8dbb56 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Wed, 12 Dec 2007 02:15:29 +0100
Subject: r26409: Pass smb ports along. (This used to be commit
 2833f320de1f1fd39c710ad0a61c3fa1bb1df31f)

---
 source4/scripting/ejs/smbcalls_cli.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_cli.c b/source4/scripting/ejs/smbcalls_cli.c
index e08a098833..a7210eb0fb 100644
--- a/source4/scripting/ejs/smbcalls_cli.c
+++ b/source4/scripting/ejs/smbcalls_cli.c
@@ -437,7 +437,7 @@ static int ejs_tree_connect(MprVarHandle eid, int argc, char **argv)
 	/* Do connect */
 
 	io.in.dest_host              = hostname;
-	io.in.port                   = 0;
+	io.in.dest_ports             = lp_smb_ports(global_loadparm);
 	io.in.called_name            = strupper_talloc(mem_ctx, hostname);
 	io.in.service                = sharename;
 	io.in.service_type           = "?????";
-- 
cgit 


From 6d2edec0a27c674798c118076c2816b3ffdd78e5 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Wed, 12 Dec 2007 03:02:18 +0100
Subject: r26411: Double check Python installation - make sure we can compile
 and link using it. (This used to be commit
 3d8fc5808ced6f54274701d80fe2d42423bf9fee)

---
 source4/scripting/python/config.m4 | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/config.m4 b/source4/scripting/python/config.m4
index 5e982556fc..64a8c70b41 100644
--- a/source4/scripting/python/config.m4
+++ b/source4/scripting/python/config.m4
@@ -119,9 +119,23 @@ AC_SUBST(PYTHON_EXTRA_LDFLAGS)
 
 SMB_EXT_LIB(LIBPYTHON, [$PYTHON_LDFLAGS], [$PYTHON_CPPFLAGS])
 
+
 if test x$working_python = xyes
 then
-	SMB_ENABLE(LIBPYTHON,YES)
+	ac_save_LIBS="$LIBS"
+	ac_save_CFLAGS="$CFLAGS"
+	LIBS="$LIBS $PYTHON_LDFLAGS"
+	CFLAGS="$CFLAGS $PYTHON_CPPFLAGS"
+
+	AC_TRY_LINK([
+#include <Python.h>
+#include <stdlib.h>], 
+[Py_InitModule(NULL, NULL);],
+		[SMB_ENABLE(LIBPYTHON,YES)],
+		[SMB_ENABLE(LIBPYTHON,NO)])
+
+	LIBS="$ac_save_LIBS"
+	CFLAGS="$ac_save_CFLAGS"
 else
 	SMB_ENABLE(LIBPYTHON,NO)
 fi
-- 
cgit 


From 9d4d41f65dc8380d3c3ce19fceefbe3d00bd4e07 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Thu, 13 Dec 2007 03:07:38 +0100
Subject: r26419: Add a module to implement 'ambigious name resolution' by
 munging the

incoming LDAP filter.

Warning: Any anr search will perform a full index search.  Untill ldb
gets substring indexes, this is unavoidable.

Also implement a testsutie to show we match AD behaviour for this
important extension (used in the Active Directory Users and Computers
MMC plugin, as a genereral 'find').

This will also be useful to OpenChange, as their server needs to
implement this.

Andrew Bartlett
(This used to be commit 044b50947254ccd516c21cb156ab60ab9e3a582d)
---
 source4/scripting/libjs/provision.js | 1 +
 1 file changed, 1 insertion(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index f9814884f3..0da02ae276 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -1018,6 +1018,7 @@ function provision_guess()
 	var modules_list     = new Array("rootdse",
 					 "paged_results",
 					 "ranged_results",
+					 "anr",
 					 "server_sort",
 					 "extended_dn",
 					 "asq",
-- 
cgit 


From 8530e8429ac7b12f4bde285af2b7933610461253 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Thu, 13 Dec 2007 08:36:03 +0100
Subject: r26422: build: let configure print out if we have working python
 module support

metze
(This used to be commit dfb9d704d053455d636d4f9d9d49cbfb70ada53e)
---
 source4/scripting/python/config.m4 | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/config.m4 b/source4/scripting/python/config.m4
index 64a8c70b41..8c4225175e 100644
--- a/source4/scripting/python/config.m4
+++ b/source4/scripting/python/config.m4
@@ -120,6 +120,7 @@ AC_SUBST(PYTHON_EXTRA_LDFLAGS)
 SMB_EXT_LIB(LIBPYTHON, [$PYTHON_LDFLAGS], [$PYTHON_CPPFLAGS])
 
 
+AC_MSG_CHECKING(working python module support)
 if test x$working_python = xyes
 then
 	ac_save_LIBS="$LIBS"
@@ -128,14 +129,21 @@ then
 	CFLAGS="$CFLAGS $PYTHON_CPPFLAGS"
 
 	AC_TRY_LINK([
-#include <Python.h>
-#include <stdlib.h>], 
-[Py_InitModule(NULL, NULL);],
-		[SMB_ENABLE(LIBPYTHON,YES)],
-		[SMB_ENABLE(LIBPYTHON,NO)])
+			#include <Python.h>
+			#include <stdlib.h>
+		],[
+			Py_InitModule(NULL, NULL);
+		],[
+			SMB_ENABLE(LIBPYTHON,YES)
+			AC_MSG_RESULT([yes])
+		],[
+			SMB_ENABLE(LIBPYTHON,NO)
+			AC_MSG_RESULT([no])
+		])
 
 	LIBS="$ac_save_LIBS"
 	CFLAGS="$ac_save_CFLAGS"
 else
 	SMB_ENABLE(LIBPYTHON,NO)
+	AC_MSG_RESULT([no])
 fi
-- 
cgit 


From d891c0c74a03d797aed1c5ac0329fd9d1d78da63 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Thu, 13 Dec 2007 22:46:09 +0100
Subject: r26429: Avoid use of global_smb_iconv_convenience. (This used to be
 commit d37136b7abfbba75ef2e5ab855eb3382b9648b8c)

---
 source4/scripting/ejs/smbcalls_data.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_data.c b/source4/scripting/ejs/smbcalls_data.c
index d0dd96c087..3ea41d46fb 100644
--- a/source4/scripting/ejs/smbcalls_data.c
+++ b/source4/scripting/ejs/smbcalls_data.c
@@ -177,7 +177,7 @@ static int ejs_regToVar(MprVarHandle eid, int argc, struct MprVar **argv)
 	case REG_EXPAND_SZ: {
 		char *s;
 		ssize_t len;
-		len = convert_string_talloc(mprMemCtx(), global_smb_iconv_convenience, CH_UTF16, CH_UNIX, 
+		len = convert_string_talloc(mprMemCtx(), lp_iconv_convenience(global_loadparm), CH_UTF16, CH_UNIX, 
 					    blob->data, blob->length, (void **)&s);
 		if (len == -1) {
 			ejsSetErrorMsg(eid, "regToVar invalid REG_SZ string");
@@ -225,7 +225,7 @@ static int ejs_regToVar(MprVarHandle eid, int argc, struct MprVar **argv)
 			if (slen == 2 && b.length == 2 && SVAL(b.data, 0) == 0) {
 				break;
 			}
-			len = convert_string_talloc(mprMemCtx(), global_smb_iconv_convenience, CH_UTF16, CH_UNIX, 
+			len = convert_string_talloc(mprMemCtx(), lp_iconv_convenience(global_loadparm), CH_UTF16, CH_UNIX, 
 						    b.data, slen, (void **)&s);
 			if (len == -1) {
 				ejsSetErrorMsg(eid, "regToVar invalid REG_MULTI_SZ string");
-- 
cgit 


From a2cea02584256e2cf59da5420e8e080e70c66939 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Thu, 13 Dec 2007 22:46:17 +0100
Subject: r26430: require explicit specification of loadparm context. (This
 used to be commit 1b947fe0e6e16318e5a8127bb4932d6b5d20bcf6)

---
 source4/scripting/ejs/smbcalls_creds.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_creds.c b/source4/scripting/ejs/smbcalls_creds.c
index 781843371a..6dfff8f925 100644
--- a/source4/scripting/ejs/smbcalls_creds.c
+++ b/source4/scripting/ejs/smbcalls_creds.c
@@ -192,7 +192,7 @@ static int ejs_creds_set_machine_account(MprVarHandle eid, int argc, struct MprV
 		return -1;
 	}
 	
-	if (NT_STATUS_IS_OK(cli_credentials_set_machine_account(creds))) {
+	if (NT_STATUS_IS_OK(cli_credentials_set_machine_account(creds, global_loadparm))) {
 		mpr_Return(eid, mprCreateBoolVar(true));
 	} else {
 		mpr_Return(eid, mprCreateBoolVar(false));
-- 
cgit 


From 84b476394713d4f2b84782c59dcc084a25af360f Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Thu, 13 Dec 2007 23:23:25 +0100
Subject: r26441: Remove global_loadparm uses. (This used to be commit
 32007c6277efa46341da7741b749a98633d71640)

---
 source4/scripting/ejs/smbcalls_auth.c | 3 ++-
 source4/scripting/ejs/smbcalls_rpc.c  | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_auth.c b/source4/scripting/ejs/smbcalls_auth.c
index 7747bb14c6..89370890c8 100644
--- a/source4/scripting/ejs/smbcalls_auth.c
+++ b/source4/scripting/ejs/smbcalls_auth.c
@@ -56,7 +56,8 @@ static int ejs_doauth(MprVarHandle eid,
 	} else {
 		/* Hope we can find the event context somewhere up there... */
 		ev = event_context_find(tmp_ctx);
-		msg = messaging_client_init(tmp_ctx, lp_messaging_path(tmp_ctx, global_loadparm), ev);
+		msg = messaging_client_init(tmp_ctx, lp_messaging_path(tmp_ctx, global_loadparm), 
+					    lp_iconv_convenience(global_loadparm), ev);
 	}
 
 	if (auth_types) {
diff --git a/source4/scripting/ejs/smbcalls_rpc.c b/source4/scripting/ejs/smbcalls_rpc.c
index 535c1d2e34..2bfc8b5883 100644
--- a/source4/scripting/ejs/smbcalls_rpc.c
+++ b/source4/scripting/ejs/smbcalls_rpc.c
@@ -80,7 +80,9 @@ static int ejs_irpc_connect(MprVarHandle eid, int argc, char **argv)
 	for (i=0;i<10000;i++) {
 		p->msg_ctx = messaging_init(p, 
 					    lp_messaging_path(p, global_loadparm),
-					    cluster_id(EJS_ID_BASE + i), ev);
+					    cluster_id(EJS_ID_BASE + i), 
+				            lp_iconv_convenience(global_loadparm),
+					    ev);
 		if (p->msg_ctx) break;
 	}
 	if (p->msg_ctx == NULL) {
-- 
cgit 


From 55f90f1166d1050d010fffcca696dfb897e42e82 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Fri, 14 Dec 2007 01:26:12 +0100
Subject: r26446: Convert param module to SWIG. (This used to be commit
 94e5f9c92f65070ec8f1c1170c4a0769a4857c6d)

---
 source4/scripting/python/config.mk     |   4 -
 source4/scripting/python/parammodule.c | 181 ---------------------------------
 2 files changed, 185 deletions(-)
 delete mode 100644 source4/scripting/python/parammodule.c

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/config.mk b/source4/scripting/python/config.mk
index c958761c70..9d972f7ee0 100644
--- a/source4/scripting/python/config.mk
+++ b/source4/scripting/python/config.mk
@@ -1,7 +1,3 @@
-[PYTHON::python_param]
-PRIVATE_DEPENDENCIES = LIBSAMBA-CONFIG 
-OBJ_FILES = parammodule.o
-
 [PYTHON::python_uuid]
 PRIVATE_DEPENDENCIES = LIBNDR 
 OBJ_FILES = uuidmodule.o
diff --git a/source4/scripting/python/parammodule.c b/source4/scripting/python/parammodule.c
deleted file mode 100644
index bb7adab240..0000000000
--- a/source4/scripting/python/parammodule.c
+++ /dev/null
@@ -1,181 +0,0 @@
-/* 
-   Unix SMB/CIFS implementation.
-
-   Python wrapper for reading smb.conf files
-
-   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 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.
-*/
-
-#include "includes.h"
-#include "Python.h"
-#include "param/param.h"
-
-staticforward PyTypeObject param_ParamFileType;
-
-typedef struct {
-	PyObject_HEAD
-	struct param_context *param_ctx;
-} param_ParamFileObject;
-
-static param_ParamFileObject *py_param_init(void)
-{
-	param_ParamFileObject *param; 
-
-	param = PyObject_New(param_ParamFileObject, &param_ParamFileType);
-
-	param->param_ctx = param_init(NULL);
-
-	return param;
-}
-
-static PyObject *py_param_load(PyObject *self, PyObject *args)
-{
-	char *filename = NULL;
-	param_ParamFileObject *param;
-
-	if (!PyArg_ParseTuple(args, "|s:new", &filename))
-	        return NULL;
-
-	param = py_param_init();
-
-	if (filename != NULL) {
-		int ret = param_read(param->param_ctx, filename);
-
-		if (ret == -1) {
-			PyErr_SetString(PyExc_TypeError, "reading file failed");
-			return NULL;
-		}
-	}
-
-	return (PyObject *)param;
-}
-
-static void
-param_dealloc(PyObject* self)
-{
-	PyObject_Del(self);
-}
-
-static PyObject *py_param_get(PyObject *_self, PyObject *args)
-{
-	struct param_opt *param;
-	const char *section_name = NULL, *param_name = NULL;
-	param_ParamFileObject *self = (param_ParamFileObject *)_self;
-
-	if (!PyArg_ParseTuple(args, (char *)"s|s", &param_name, &section_name))
-		return NULL;
-
-	param = param_get(self->param_ctx, section_name, param_name);
-	if (param == NULL)
-		return Py_None;
-
-	return PyString_FromString(param->value);
-}
-
-static PyObject *py_param_set(PyObject *_self, PyObject *args)
-{
-	param_ParamFileObject *self = (param_ParamFileObject *)_self;
-	const char *section_name = NULL, *param_name = NULL, *param_value = NULL;
-
-	if (!PyArg_ParseTuple(args, "ss|s", &param_name, &param_value, &section_name))
-		return NULL;
-
-	if (section_name == NULL)
-		section_name = GLOBAL_NAME;
-
-	if (param_set_string(self->param_ctx, section_name, param_name, param_value) != 0) {
-		PyErr_SetString(PyExc_TypeError, "setting variable failed");
-		return NULL;
-	}
-
-	return Py_None;
-}
-
-static PyObject *py_param_save(PyObject *_self, PyObject *args)
-{
-	param_ParamFileObject *self = (param_ParamFileObject *)_self;
-	const char *filename = NULL;
-
-	if (!PyArg_ParseTuple(args, "s", &filename))
-		return NULL;
-
-	if (param_write(self->param_ctx, filename) != 0) {
-		PyErr_SetString(PyExc_TypeError, "unable to save");
-		return NULL;
-	}
-
-	return Py_None;
-}
-
-static PyObject *py_param_use(PyObject *_self, PyObject *args)
-{
-	param_ParamFileObject *self = (param_ParamFileObject *)_self;
-
-	if (!PyArg_ParseTuple(args, ""))
-		return NULL;
-
-	if (param_use(global_loadparm, self->param_ctx) != 0) {
-		PyErr_SetString(PyExc_TypeError, "unable to use");
-		return NULL;
-	}
-
-	return Py_None;
-}
-
-static PyMethodDef param_methods[] = {
-	{"get", (PyCFunction)py_param_get, METH_VARARGS,
-		"Get a parameter."},
-	{"set", (PyCFunction)py_param_set, METH_VARARGS,
-		"Set a parameter."},
-	{"save", (PyCFunction)py_param_save, METH_VARARGS,
-		"Save file" },
-	{"use", (PyCFunction)py_param_use, METH_VARARGS,
-		"Use param file" },
-	{NULL, NULL, 0, NULL}
-};
-
-static PyObject *
-param_getattr(PyTypeObject *obj, char *name)
-{
-	return Py_FindMethod(param_methods, (PyObject *)obj, name);
-}
-
-static PyTypeObject param_ParamFileType = {
-	PyObject_HEAD_INIT(NULL) 0,
-	.tp_name = "ParamFile",
-	.tp_basicsize = sizeof(param_ParamFileObject),
-	.tp_dealloc = param_dealloc,
-	.tp_getattr = param_getattr,
-};
-
-
-static PyMethodDef methods[] = {
-	{ "ParamFile", (PyCFunction)py_param_load, METH_VARARGS, NULL},
-	{ NULL, NULL }
-};
-
-PyDoc_STRVAR(param_doc, "Simple wrappers around the smb.conf parsers");
-
-PyMODINIT_FUNC initparam(void)
-{
-	PyObject *mod = Py_InitModule3("param", methods, param_doc);
-	if (mod == NULL)
-		return;
-
-	PyModule_AddObject(mod, "configfile", 
-			   PyString_FromString(lp_configfile(global_loadparm)));
-}
-- 
cgit 


From 4a33ca21943f72ddde4b22ddd6591c2ccdbb657b Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Fri, 14 Dec 2007 01:53:54 +0100
Subject: r26450: The subprocess is only available in python >= 2.4 so avoid it
 for now. (This used to be commit 5300bc175ea425e2d28332c5e18bd8e3846b458d)

---
 source4/scripting/python/subunit/__init__.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/subunit/__init__.py b/source4/scripting/python/subunit/__init__.py
index e44dd766cc..4f24803e63 100644
--- a/source4/scripting/python/subunit/__init__.py
+++ b/source4/scripting/python/subunit/__init__.py
@@ -20,7 +20,6 @@
 
 import os
 from StringIO import StringIO
-import subprocess
 import sys
 import unittest
 
@@ -315,9 +314,8 @@ class ExecTestCase(unittest.TestCase):
 
     def _run(self, result):
         protocol = TestProtocolServer(result)
-        output = subprocess.Popen([self.script],
-                                  stdout=subprocess.PIPE).communicate()[0]
-        protocol.readFrom(StringIO(output))
+        output = os.popen(self.script, mode='r')
+        protocol.readFrom(output)
 
 
 class IsolatedTestCase(unittest.TestCase):
-- 
cgit 


From eb2c71912baceb1a6884ce143ae91f1e3d2a69fb Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sun, 16 Dec 2007 14:50:18 +0100
Subject: r26471: Sync with js version. (This used to be commit
 c0eea26e8e8eb326112e1833d137751fb7e900d2)

---
 source4/scripting/python/samba/provision.py | 1 +
 1 file changed, 1 insertion(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index 692e49b095..df40c2fb7a 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -695,6 +695,7 @@ def provision_guess(lp):
     subobj.modules_list = ["rootdse",
                     "paged_results",
                     "ranged_results",
+                    "anr",
                     "server_sort",
                     "extended_dn",
                     "asq",
-- 
cgit 


From 1afe0549163bbc639ae1a030239c9ebcd1b922bf Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sun, 16 Dec 2007 15:33:58 +0100
Subject: r26474: Move credentials-specific kerberos file to credentials
 subsystem. Fixes missing symbols in some of the python bindings. (This used
 to be commit e26d0fff6d40899113196ac35a86a9baa10cc9c2)

---
 source4/scripting/python/config.mk         | 4 ++++
 source4/scripting/python/samba/__init__.py | 9 +++++++++
 2 files changed, 13 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/config.mk b/source4/scripting/python/config.mk
index 9d972f7ee0..cf17a28a70 100644
--- a/source4/scripting/python/config.mk
+++ b/source4/scripting/python/config.mk
@@ -25,3 +25,7 @@ PYDOCTOR_MODULES=bin/python/ldb.py bin/python/auth.py bin/python/credentials.py
 
 pydoctor:: pythonmods
 	LD_LIBRARY_PATH=bin/shared PYTHONPATH=bin/python pydoctor --make-html --docformat=restructuredtext --add-package scripting/python/samba/ $(addprefix --add-module , $(PYDOCTOR_MODULES))
+
+clean::
+	@echo "Removing python modules"
+	@rm -f bin/python/*
diff --git a/source4/scripting/python/samba/__init__.py b/source4/scripting/python/samba/__init__.py
index 00b82e1800..2c51440b0c 100644
--- a/source4/scripting/python/samba/__init__.py
+++ b/source4/scripting/python/samba/__init__.py
@@ -21,6 +21,15 @@
 import os
 from misc import ldb_set_credentials
 
+def _in_source_tree():
+    print os.path.exists("%s/../../../samba4-skip" % os.path.dirname(__file__))
+
+# When running, in-tree, make sure bin/python is in the PYTHONPATH
+if _in_source_tree():
+    import sys
+    dir = os.path.dirname(__file__)
+    sys.path.append("%s/../../../bin/python" % os.path.dirname(__file__))
+
 def Ldb(url, session_info=None, credentials=None, modules_dir=None):
     """Open a Samba Ldb file. 
 
-- 
cgit 


From 0a01f50f9802ecfae430d2218af3b96a3682218d Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sun, 16 Dec 2007 15:50:02 +0100
Subject: r26475: Add ldb.set_credentials function. (This used to be commit
 dbebb4ef477d2c8de7b8d1e5cde9b9dada47044f)

---
 source4/scripting/python/misc.i            |  10 ++-
 source4/scripting/python/misc.py           |   4 +
 source4/scripting/python/misc_wrap.c       | 134 ++++++++++++++++++++++++++---
 source4/scripting/python/samba/__init__.py |   7 +-
 4 files changed, 141 insertions(+), 14 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/misc.i b/source4/scripting/python/misc.i
index 088522320e..3d886a25bc 100644
--- a/source4/scripting/python/misc.i
+++ b/source4/scripting/python/misc.i
@@ -21,12 +21,20 @@
 %{
 #include "includes.h"
 #include "ldb.h"
-#include "auth/credentials/credentials.h"
 %}
 
 %import "stdint.i"
+%include "exception.i"
 %import "../../lib/talloc/talloc.i"
+%import "../../lib/ldb/ldb.i"
+%import "../../auth/credentials/credentials.i"
 
 %rename(random_password) generate_random_str;
 char *generate_random_str(TALLOC_CTX *mem_ctx, size_t len);
 
+%inline %{
+void ldb_set_credentials(struct ldb_context *ldb, struct cli_credentials *creds)
+{
+    ldb_set_opaque(ldb, "credentials", creds);
+}
+%}
diff --git a/source4/scripting/python/misc.py b/source4/scripting/python/misc.py
index afe7b723e0..94b341ba72 100644
--- a/source4/scripting/python/misc.py
+++ b/source4/scripting/python/misc.py
@@ -57,6 +57,10 @@ def _swig_setattr_nondynamic_method(set):
     return set_attr
 
 
+import ldb
+import credentials
+import param
 random_password = _misc.random_password
+ldb_set_credentials = _misc.ldb_set_credentials
 
 
diff --git a/source4/scripting/python/misc_wrap.c b/source4/scripting/python/misc_wrap.c
index fbdd33afda..1f34d7f3ac 100644
--- a/source4/scripting/python/misc_wrap.c
+++ b/source4/scripting/python/misc_wrap.c
@@ -2454,20 +2454,35 @@ SWIG_Python_MustGetPtr(PyObject *obj, swig_type_info *ty, int argnum, int flags)
 
 
 
+  #define SWIG_exception(code, msg) do { SWIG_Error(code, msg); SWIG_fail;; } while(0) 
+
+
 /* -------- TYPES TABLE (BEGIN) -------- */
 
 #define SWIGTYPE_p_TALLOC_CTX swig_types[0]
 #define SWIGTYPE_p_char swig_types[1]
-#define SWIGTYPE_p_int swig_types[2]
-#define SWIGTYPE_p_long_long swig_types[3]
-#define SWIGTYPE_p_short swig_types[4]
-#define SWIGTYPE_p_signed_char swig_types[5]
-#define SWIGTYPE_p_unsigned_char swig_types[6]
-#define SWIGTYPE_p_unsigned_int swig_types[7]
-#define SWIGTYPE_p_unsigned_long_long swig_types[8]
-#define SWIGTYPE_p_unsigned_short swig_types[9]
-static swig_type_info *swig_types[11];
-static swig_module_info swig_module = {swig_types, 10, 0, 0, 0, 0};
+#define SWIGTYPE_p_cli_credentials swig_types[2]
+#define SWIGTYPE_p_int swig_types[3]
+#define SWIGTYPE_p_ldb_context swig_types[4]
+#define SWIGTYPE_p_ldb_dn swig_types[5]
+#define SWIGTYPE_p_ldb_ldif swig_types[6]
+#define SWIGTYPE_p_ldb_message swig_types[7]
+#define SWIGTYPE_p_ldb_message_element swig_types[8]
+#define SWIGTYPE_p_ldb_result swig_types[9]
+#define SWIGTYPE_p_loadparm_context swig_types[10]
+#define SWIGTYPE_p_loadparm_service swig_types[11]
+#define SWIGTYPE_p_long_long swig_types[12]
+#define SWIGTYPE_p_param_context swig_types[13]
+#define SWIGTYPE_p_param_section swig_types[14]
+#define SWIGTYPE_p_short swig_types[15]
+#define SWIGTYPE_p_signed_char swig_types[16]
+#define SWIGTYPE_p_unsigned_char swig_types[17]
+#define SWIGTYPE_p_unsigned_int swig_types[18]
+#define SWIGTYPE_p_unsigned_long swig_types[19]
+#define SWIGTYPE_p_unsigned_long_long swig_types[20]
+#define SWIGTYPE_p_unsigned_short swig_types[21]
+static swig_type_info *swig_types[23];
+static swig_module_info swig_module = {swig_types, 22, 0, 0, 0, 0};
 #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name)
 #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name)
 
@@ -2509,7 +2524,6 @@ static swig_module_info swig_module = {swig_types, 10, 0, 0, 0, 0};
 
 #include "includes.h"
 #include "ldb.h"
-#include "auth/credentials/credentials.h"
 
 
 SWIGINTERN int
@@ -2682,6 +2696,12 @@ SWIG_FromCharPtr(const char *cptr)
   return SWIG_FromCharPtrAndSize(cptr, (cptr ? strlen(cptr) : 0));
 }
 
+
+void ldb_set_credentials(struct ldb_context *ldb, struct cli_credentials *creds)
+{
+    ldb_set_opaque(ldb, "credentials", creds);
+}
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -2714,8 +2734,52 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_ldb_set_credentials(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  struct ldb_context *arg1 = (struct ldb_context *) 0 ;
+  struct cli_credentials *arg2 = (struct cli_credentials *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "Ldb",(char *) "creds", NULL 
+  };
+  
+  {
+    arg2 = NULL;
+  }
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:ldb_set_credentials",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ldb_context, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ldb_set_credentials" "', argument " "1"" of type '" "struct ldb_context *""'"); 
+  }
+  arg1 = (struct ldb_context *)(argp1);
+  if (obj1) {
+    res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_cli_credentials, 0 |  0 );
+    if (!SWIG_IsOK(res2)) {
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ldb_set_credentials" "', argument " "2"" of type '" "struct cli_credentials *""'"); 
+    }
+    arg2 = (struct cli_credentials *)(argp2);
+  }
+  {
+    if (arg1 == NULL)
+    SWIG_exception(SWIG_ValueError, 
+      "ldb context must be non-NULL");
+  }
+  ldb_set_credentials(arg1,arg2);
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
 static PyMethodDef SwigMethods[] = {
 	 { (char *)"random_password", (PyCFunction) _wrap_random_password, METH_VARARGS | METH_KEYWORDS, NULL},
+	 { (char *)"ldb_set_credentials", (PyCFunction) _wrap_ldb_set_credentials, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { NULL, NULL, 0, NULL }
 };
 
@@ -2724,48 +2788,96 @@ static PyMethodDef SwigMethods[] = {
 
 static swig_type_info _swigt__p_TALLOC_CTX = {"_p_TALLOC_CTX", "TALLOC_CTX *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_char = {"_p_char", "char *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_cli_credentials = {"_p_cli_credentials", "struct cli_credentials *|cli_credentials *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_int = {"_p_int", "intptr_t *|int *|int_least32_t *|int_fast32_t *|int32_t *|int_fast16_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_ldb_context = {"_p_ldb_context", "struct ldb_context *|ldb *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_ldb_dn = {"_p_ldb_dn", "struct ldb_dn *|ldb_dn *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_ldb_ldif = {"_p_ldb_ldif", "struct ldb_ldif *|ldb_ldif *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_ldb_message = {"_p_ldb_message", "ldb_msg *|struct ldb_message *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_ldb_message_element = {"_p_ldb_message_element", "struct ldb_message_element *|ldb_msg_element *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_ldb_result = {"_p_ldb_result", "struct ldb_result *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_loadparm_context = {"_p_loadparm_context", "struct loadparm_context *|loadparm_context *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_loadparm_service = {"_p_loadparm_service", "struct loadparm_service *|loadparm_service *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_long_long = {"_p_long_long", "int_least64_t *|int_fast64_t *|int64_t *|long long *|intmax_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_param_context = {"_p_param_context", "struct param_context *|param *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_param_section = {"_p_param_section", "struct param_section *|param_section *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_short = {"_p_short", "short *|int_least16_t *|int16_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_signed_char = {"_p_signed_char", "signed char *|int_least8_t *|int_fast8_t *|int8_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_unsigned_char = {"_p_unsigned_char", "unsigned char *|uint_least8_t *|uint_fast8_t *|uint8_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_unsigned_int = {"_p_unsigned_int", "uintptr_t *|uint_least32_t *|uint_fast32_t *|uint32_t *|unsigned int *|uint_fast16_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_unsigned_long = {"_p_unsigned_long", "unsigned long *|time_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_unsigned_long_long = {"_p_unsigned_long_long", "uint_least64_t *|uint_fast64_t *|uint64_t *|unsigned long long *|uintmax_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_unsigned_short = {"_p_unsigned_short", "unsigned short *|uint_least16_t *|uint16_t *", 0, 0, (void*)0, 0};
 
 static swig_type_info *swig_type_initial[] = {
   &_swigt__p_TALLOC_CTX,
   &_swigt__p_char,
+  &_swigt__p_cli_credentials,
   &_swigt__p_int,
+  &_swigt__p_ldb_context,
+  &_swigt__p_ldb_dn,
+  &_swigt__p_ldb_ldif,
+  &_swigt__p_ldb_message,
+  &_swigt__p_ldb_message_element,
+  &_swigt__p_ldb_result,
+  &_swigt__p_loadparm_context,
+  &_swigt__p_loadparm_service,
   &_swigt__p_long_long,
+  &_swigt__p_param_context,
+  &_swigt__p_param_section,
   &_swigt__p_short,
   &_swigt__p_signed_char,
   &_swigt__p_unsigned_char,
   &_swigt__p_unsigned_int,
+  &_swigt__p_unsigned_long,
   &_swigt__p_unsigned_long_long,
   &_swigt__p_unsigned_short,
 };
 
 static swig_cast_info _swigc__p_TALLOC_CTX[] = {  {&_swigt__p_TALLOC_CTX, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_char[] = {  {&_swigt__p_char, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_cli_credentials[] = {  {&_swigt__p_cli_credentials, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_int[] = {  {&_swigt__p_int, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_ldb_context[] = {  {&_swigt__p_ldb_context, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_ldb_dn[] = {  {&_swigt__p_ldb_dn, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_ldb_ldif[] = {  {&_swigt__p_ldb_ldif, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_ldb_message[] = {  {&_swigt__p_ldb_message, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_ldb_message_element[] = {  {&_swigt__p_ldb_message_element, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_ldb_result[] = {  {&_swigt__p_ldb_result, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_loadparm_context[] = {  {&_swigt__p_loadparm_context, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_loadparm_service[] = {  {&_swigt__p_loadparm_service, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_long_long[] = {  {&_swigt__p_long_long, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_param_context[] = {  {&_swigt__p_param_context, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_param_section[] = {  {&_swigt__p_param_section, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_short[] = {  {&_swigt__p_short, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_signed_char[] = {  {&_swigt__p_signed_char, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_unsigned_char[] = {  {&_swigt__p_unsigned_char, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_unsigned_int[] = {  {&_swigt__p_unsigned_int, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_unsigned_long[] = {  {&_swigt__p_unsigned_long, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_unsigned_long_long[] = {  {&_swigt__p_unsigned_long_long, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_unsigned_short[] = {  {&_swigt__p_unsigned_short, 0, 0, 0},{0, 0, 0, 0}};
 
 static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_TALLOC_CTX,
   _swigc__p_char,
+  _swigc__p_cli_credentials,
   _swigc__p_int,
+  _swigc__p_ldb_context,
+  _swigc__p_ldb_dn,
+  _swigc__p_ldb_ldif,
+  _swigc__p_ldb_message,
+  _swigc__p_ldb_message_element,
+  _swigc__p_ldb_result,
+  _swigc__p_loadparm_context,
+  _swigc__p_loadparm_service,
   _swigc__p_long_long,
+  _swigc__p_param_context,
+  _swigc__p_param_section,
   _swigc__p_short,
   _swigc__p_signed_char,
   _swigc__p_unsigned_char,
   _swigc__p_unsigned_int,
+  _swigc__p_unsigned_long,
   _swigc__p_unsigned_long_long,
   _swigc__p_unsigned_short,
 };
diff --git a/source4/scripting/python/samba/__init__.py b/source4/scripting/python/samba/__init__.py
index 2c51440b0c..29d322e2fc 100644
--- a/source4/scripting/python/samba/__init__.py
+++ b/source4/scripting/python/samba/__init__.py
@@ -19,10 +19,9 @@
 #
 
 import os
-from misc import ldb_set_credentials
 
 def _in_source_tree():
-    print os.path.exists("%s/../../../samba4-skip" % os.path.dirname(__file__))
+    return os.path.exists("%s/../../../samba4-skip" % os.path.dirname(__file__))
 
 # When running, in-tree, make sure bin/python is in the PYTHONPATH
 if _in_source_tree():
@@ -30,6 +29,10 @@ if _in_source_tree():
     dir = os.path.dirname(__file__)
     sys.path.append("%s/../../../bin/python" % os.path.dirname(__file__))
 
+import misc
+import ldb
+ldb.ldb.set_credentials = misc.ldb_set_credentials
+
 def Ldb(url, session_info=None, credentials=None, modules_dir=None):
     """Open a Samba Ldb file. 
 
-- 
cgit 


From 440fd879613b94cc75eb0737af91602d96c89bf9 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sun, 16 Dec 2007 17:17:37 +0100
Subject: r26477: Allow setting loadparm context for a ldb context in python,
 plus some other minor improvements. (This used to be commit
 d88527a9d6435203faa8273347d5aa41937e5395)

---
 source4/scripting/python/misc.i            | 14 ++++++++
 source4/scripting/python/misc.py           |  1 +
 source4/scripting/python/misc_wrap.c       | 57 ++++++++++++++++++++++++++++++
 source4/scripting/python/samba/__init__.py | 31 ++++++++++++----
 4 files changed, 96 insertions(+), 7 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/misc.i b/source4/scripting/python/misc.i
index 3d886a25bc..b2a7ad8ee8 100644
--- a/source4/scripting/python/misc.i
+++ b/source4/scripting/python/misc.i
@@ -21,6 +21,7 @@
 %{
 #include "includes.h"
 #include "ldb.h"
+#include "param/param.h"
 %}
 
 %import "stdint.i"
@@ -28,6 +29,7 @@
 %import "../../lib/talloc/talloc.i"
 %import "../../lib/ldb/ldb.i"
 %import "../../auth/credentials/credentials.i"
+%import "../../param/param.i"
 
 %rename(random_password) generate_random_str;
 char *generate_random_str(TALLOC_CTX *mem_ctx, size_t len);
@@ -37,4 +39,16 @@ void ldb_set_credentials(struct ldb_context *ldb, struct cli_credentials *creds)
 {
     ldb_set_opaque(ldb, "credentials", creds);
 }
+
+#if 0 /* Fails to link.. */
+void ldb_set_session_info(struct ldb_context *ldb, struct auth_session_info *session_info)
+{
+    ldb_set_opaque(ldb, "sessionInfo", session_info);
+}
+#endif
+
+void ldb_set_loadparm(struct ldb_context *ldb, struct loadparm_context *lp_ctx)
+{
+    ldb_set_opaque(ldb, "loadparm", lp_ctx);
+}
 %}
diff --git a/source4/scripting/python/misc.py b/source4/scripting/python/misc.py
index 94b341ba72..8a8ff80107 100644
--- a/source4/scripting/python/misc.py
+++ b/source4/scripting/python/misc.py
@@ -62,5 +62,6 @@ import credentials
 import param
 random_password = _misc.random_password
 ldb_set_credentials = _misc.ldb_set_credentials
+ldb_set_loadparm = _misc.ldb_set_loadparm
 
 
diff --git a/source4/scripting/python/misc_wrap.c b/source4/scripting/python/misc_wrap.c
index 1f34d7f3ac..af0f32fcb2 100644
--- a/source4/scripting/python/misc_wrap.c
+++ b/source4/scripting/python/misc_wrap.c
@@ -2524,6 +2524,7 @@ static swig_module_info swig_module = {swig_types, 22, 0, 0, 0, 0};
 
 #include "includes.h"
 #include "ldb.h"
+#include "param/param.h"
 
 
 SWIGINTERN int
@@ -2702,6 +2703,18 @@ void ldb_set_credentials(struct ldb_context *ldb, struct cli_credentials *creds)
     ldb_set_opaque(ldb, "credentials", creds);
 }
 
+#if 0 /* Fails to link.. */
+void ldb_set_session_info(struct ldb_context *ldb, struct auth_session_info *session_info)
+{
+    ldb_set_opaque(ldb, "sessionInfo", session_info);
+}
+#endif
+
+void ldb_set_loadparm(struct ldb_context *ldb, struct loadparm_context *lp_ctx)
+{
+    ldb_set_opaque(ldb, "loadparm", lp_ctx);
+}
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -2777,9 +2790,53 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_ldb_set_loadparm(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  struct ldb_context *arg1 = (struct ldb_context *) 0 ;
+  struct loadparm_context *arg2 = (struct loadparm_context *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "Ldb",(char *) "lp_ctx", NULL 
+  };
+  
+  {
+    arg2 = loadparm_init(NULL);
+  }
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:ldb_set_loadparm",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ldb_context, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ldb_set_loadparm" "', argument " "1"" of type '" "struct ldb_context *""'"); 
+  }
+  arg1 = (struct ldb_context *)(argp1);
+  if (obj1) {
+    res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_loadparm_context, 0 |  0 );
+    if (!SWIG_IsOK(res2)) {
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ldb_set_loadparm" "', argument " "2"" of type '" "struct loadparm_context *""'"); 
+    }
+    arg2 = (struct loadparm_context *)(argp2);
+  }
+  {
+    if (arg1 == NULL)
+    SWIG_exception(SWIG_ValueError, 
+      "ldb context must be non-NULL");
+  }
+  ldb_set_loadparm(arg1,arg2);
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
 static PyMethodDef SwigMethods[] = {
 	 { (char *)"random_password", (PyCFunction) _wrap_random_password, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"ldb_set_credentials", (PyCFunction) _wrap_ldb_set_credentials, METH_VARARGS | METH_KEYWORDS, NULL},
+	 { (char *)"ldb_set_loadparm", (PyCFunction) _wrap_ldb_set_loadparm, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { NULL, NULL, 0, NULL }
 };
 
diff --git a/source4/scripting/python/samba/__init__.py b/source4/scripting/python/samba/__init__.py
index 29d322e2fc..08a262eec8 100644
--- a/source4/scripting/python/samba/__init__.py
+++ b/source4/scripting/python/samba/__init__.py
@@ -21,21 +21,33 @@
 import os
 
 def _in_source_tree():
+    """Check whether the script is being run from the source dir. """
     return os.path.exists("%s/../../../samba4-skip" % os.path.dirname(__file__))
 
+
 # When running, in-tree, make sure bin/python is in the PYTHONPATH
 if _in_source_tree():
     import sys
-    dir = os.path.dirname(__file__)
-    sys.path.append("%s/../../../bin/python" % os.path.dirname(__file__))
+    srcdir = "%s/../../.." % os.path.dirname(__file__)
+    sys.path.append("%s/bin/python" % srcdir)
+    default_ldb_modules_dir = "%s/bin/modules/ldb" % srcdir
+
 
 import misc
 import ldb
 ldb.ldb.set_credentials = misc.ldb_set_credentials
+#FIXME: ldb.ldb.set_session_info = misc.ldb_set_session_info
+ldb.ldb.set_loadparm = misc.ldb_set_loadparm
 
-def Ldb(url, session_info=None, credentials=None, modules_dir=None):
+def Ldb(url, session_info=None, credentials=None, modules_dir=None, lp=None):
     """Open a Samba Ldb file. 
 
+    :param url: LDB Url to open
+    :param session_info: Optional session information
+    :param credentials: Optional credentials, defaults to anonymous.
+    :param modules_dir: Modules directory, automatically set if not specified.
+    :param lp: Loadparm object, optional.
+
     This is different from a regular Ldb file in that the Samba-specific
     modules-dir is used by default and that credentials and session_info 
     can be passed through (required by some modules).
@@ -43,12 +55,17 @@ def Ldb(url, session_info=None, credentials=None, modules_dir=None):
     import ldb
     ret = ldb.Ldb()
     if modules_dir is None:
-        modules_dir = os.path.join(os.getcwd(), "bin", "modules", "ldb")
-    ret.set_modules_dir(modules_dir)
+        modules_dir = default_ldb_modules_dir
+    if modules_dir is not None:
+        ret.set_modules_dir(modules_dir)
     def samba_debug(level,text):
         print "%d %s" % (level, text)
-    ldb_set_opaque("credentials", credentials)
-    ret.set_opaque("sessionInfo", session_info)
+    if credentials is not None:
+        ldb.set_credentials(credentials)
+    if session_info is not None:
+        ldb.set_session_info(session_info)
+    if lp is not None:
+        ldb.set_loadparm(lp)
     #ret.set_debug(samba_debug)
     ret.connect(url)
     return ret
-- 
cgit 


From 07beaf09c95a06636cb029fcc2dbbeb7293879ba Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 17 Dec 2007 03:25:28 +0100
Subject: r26480: Add utility class for testing LDB code. (This used to be
 commit d7f0b12c9e43b93705f6b9fa6b5ab74fe68e80a0)

---
 source4/scripting/python/samba/tests/__init__.py | 37 ++++++++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 source4/scripting/python/samba/tests/__init__.py

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/tests/__init__.py b/source4/scripting/python/samba/tests/__init__.py
new file mode 100644
index 0000000000..d374f8bafa
--- /dev/null
+++ b/source4/scripting/python/samba/tests/__init__.py
@@ -0,0 +1,37 @@
+#!/usr/bin/python
+
+# Unix SMB/CIFS implementation.
+# Copyright (C) Jelmer Vernooij <jelmer@samba.org> 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 <http://www.gnu.org/licenses/>.
+#
+
+import os
+import ldb
+import samba
+import unittest
+
+class LdbTestCase(unittest.TestCase):
+    def setUp(self):
+        self.filename = os.tempnam()
+        self.ldb = samba.Ldb(self.filename)
+
+    def load_modules(self, modules=[]):
+        m = ldb.Message()
+        m.dn = ldb.Dn(self.ldb, "@MODULES")
+        m["@LIST"] = ",".join(modules)
+        self.ldb.add(m)
+        self.ldb = samba.Ldb(self.filename)
+
+
-- 
cgit 


From be999912671de052af909bb88f13c956f12b30e1 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 17 Dec 2007 04:56:54 +0100
Subject: r26484: Don't rely on removed header. (This used to be commit
 6ca2b350858c0747449671234d54584635512705)

---
 source4/scripting/python/samba/provision.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index df40c2fb7a..ce496a8bc1 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -10,7 +10,7 @@ import os
 import pwd
 import grp
 import time
-import uuid, sid, misc
+import uuid, misc
 from socket import gethostname, gethostbyname
 import param
 import registry
@@ -61,8 +61,8 @@ class ProvisionSettings(object):
                 "SCHEMADN_MOD": "schema_fsmo",
                 "SCHEMADN_MOD2": ",objectguid",
                 "CONFIGDN": self.configdn,
-                "TDB_MODULES_LIST": ","+",".join(self.tdb_modules_list)
-                "MODULES_LIST2": ",".join(self.modules_list2)
+                "TDB_MODULES_LIST": ","+",".join(self.tdb_modules_list),
+                "MODULES_LIST2": ",".join(self.modules_list2),
                 "CONFIGDN_LDB": self.configdn_ldb,
                 "DOMAINDN": self.domaindn,
                 "DOMAINDN_LDB": self.domaindn_ldb,
-- 
cgit 


From b0360e3a8617c59661d0b0fd805666e6cefcd811 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 17 Dec 2007 08:20:20 +0100
Subject: r26496: Move some provision functions to a new SamDB class, support
 setting session_info on a ldb context from python. (This used to be commit
 75cfb0d609687538048a7d72a499a5205af46a34)

---
 source4/scripting/python/misc.i             |   2 -
 source4/scripting/python/misc.py            |   1 +
 source4/scripting/python/misc_wrap.c        |  96 ++++++++----
 source4/scripting/python/samba/__init__.py  | 104 +++++++++----
 source4/scripting/python/samba/provision.py | 230 +++++++---------------------
 source4/scripting/python/samba/samdb.py     | 117 ++++++++++++++
 6 files changed, 316 insertions(+), 234 deletions(-)
 create mode 100644 source4/scripting/python/samba/samdb.py

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/misc.i b/source4/scripting/python/misc.i
index b2a7ad8ee8..0a94fcdc29 100644
--- a/source4/scripting/python/misc.i
+++ b/source4/scripting/python/misc.i
@@ -40,12 +40,10 @@ void ldb_set_credentials(struct ldb_context *ldb, struct cli_credentials *creds)
     ldb_set_opaque(ldb, "credentials", creds);
 }
 
-#if 0 /* Fails to link.. */
 void ldb_set_session_info(struct ldb_context *ldb, struct auth_session_info *session_info)
 {
     ldb_set_opaque(ldb, "sessionInfo", session_info);
 }
-#endif
 
 void ldb_set_loadparm(struct ldb_context *ldb, struct loadparm_context *lp_ctx)
 {
diff --git a/source4/scripting/python/misc.py b/source4/scripting/python/misc.py
index 8a8ff80107..7628dbcb15 100644
--- a/source4/scripting/python/misc.py
+++ b/source4/scripting/python/misc.py
@@ -62,6 +62,7 @@ import credentials
 import param
 random_password = _misc.random_password
 ldb_set_credentials = _misc.ldb_set_credentials
+ldb_set_session_info = _misc.ldb_set_session_info
 ldb_set_loadparm = _misc.ldb_set_loadparm
 
 
diff --git a/source4/scripting/python/misc_wrap.c b/source4/scripting/python/misc_wrap.c
index af0f32fcb2..f5e23d0407 100644
--- a/source4/scripting/python/misc_wrap.c
+++ b/source4/scripting/python/misc_wrap.c
@@ -2460,29 +2460,30 @@ SWIG_Python_MustGetPtr(PyObject *obj, swig_type_info *ty, int argnum, int flags)
 /* -------- TYPES TABLE (BEGIN) -------- */
 
 #define SWIGTYPE_p_TALLOC_CTX swig_types[0]
-#define SWIGTYPE_p_char swig_types[1]
-#define SWIGTYPE_p_cli_credentials swig_types[2]
-#define SWIGTYPE_p_int swig_types[3]
-#define SWIGTYPE_p_ldb_context swig_types[4]
-#define SWIGTYPE_p_ldb_dn swig_types[5]
-#define SWIGTYPE_p_ldb_ldif swig_types[6]
-#define SWIGTYPE_p_ldb_message swig_types[7]
-#define SWIGTYPE_p_ldb_message_element swig_types[8]
-#define SWIGTYPE_p_ldb_result swig_types[9]
-#define SWIGTYPE_p_loadparm_context swig_types[10]
-#define SWIGTYPE_p_loadparm_service swig_types[11]
-#define SWIGTYPE_p_long_long swig_types[12]
-#define SWIGTYPE_p_param_context swig_types[13]
-#define SWIGTYPE_p_param_section swig_types[14]
-#define SWIGTYPE_p_short swig_types[15]
-#define SWIGTYPE_p_signed_char swig_types[16]
-#define SWIGTYPE_p_unsigned_char swig_types[17]
-#define SWIGTYPE_p_unsigned_int swig_types[18]
-#define SWIGTYPE_p_unsigned_long swig_types[19]
-#define SWIGTYPE_p_unsigned_long_long swig_types[20]
-#define SWIGTYPE_p_unsigned_short swig_types[21]
-static swig_type_info *swig_types[23];
-static swig_module_info swig_module = {swig_types, 22, 0, 0, 0, 0};
+#define SWIGTYPE_p_auth_session_info swig_types[1]
+#define SWIGTYPE_p_char swig_types[2]
+#define SWIGTYPE_p_cli_credentials swig_types[3]
+#define SWIGTYPE_p_int swig_types[4]
+#define SWIGTYPE_p_ldb_context swig_types[5]
+#define SWIGTYPE_p_ldb_dn swig_types[6]
+#define SWIGTYPE_p_ldb_ldif swig_types[7]
+#define SWIGTYPE_p_ldb_message swig_types[8]
+#define SWIGTYPE_p_ldb_message_element swig_types[9]
+#define SWIGTYPE_p_ldb_result swig_types[10]
+#define SWIGTYPE_p_loadparm_context swig_types[11]
+#define SWIGTYPE_p_loadparm_service swig_types[12]
+#define SWIGTYPE_p_long_long swig_types[13]
+#define SWIGTYPE_p_param_context swig_types[14]
+#define SWIGTYPE_p_param_section swig_types[15]
+#define SWIGTYPE_p_short swig_types[16]
+#define SWIGTYPE_p_signed_char swig_types[17]
+#define SWIGTYPE_p_unsigned_char swig_types[18]
+#define SWIGTYPE_p_unsigned_int swig_types[19]
+#define SWIGTYPE_p_unsigned_long swig_types[20]
+#define SWIGTYPE_p_unsigned_long_long swig_types[21]
+#define SWIGTYPE_p_unsigned_short swig_types[22]
+static swig_type_info *swig_types[24];
+static swig_module_info swig_module = {swig_types, 23, 0, 0, 0, 0};
 #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name)
 #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name)
 
@@ -2703,12 +2704,10 @@ void ldb_set_credentials(struct ldb_context *ldb, struct cli_credentials *creds)
     ldb_set_opaque(ldb, "credentials", creds);
 }
 
-#if 0 /* Fails to link.. */
 void ldb_set_session_info(struct ldb_context *ldb, struct auth_session_info *session_info)
 {
     ldb_set_opaque(ldb, "sessionInfo", session_info);
 }
-#endif
 
 void ldb_set_loadparm(struct ldb_context *ldb, struct loadparm_context *lp_ctx)
 {
@@ -2758,7 +2757,7 @@ SWIGINTERN PyObject *_wrap_ldb_set_credentials(PyObject *SWIGUNUSEDPARM(self), P
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {
-    (char *) "Ldb",(char *) "creds", NULL 
+    (char *) "ldb",(char *) "creds", NULL 
   };
   
   {
@@ -2790,6 +2789,44 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_ldb_set_session_info(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  struct ldb_context *arg1 = (struct ldb_context *) 0 ;
+  struct auth_session_info *arg2 = (struct auth_session_info *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "ldb",(char *) "session_info", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ldb_set_session_info",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ldb_context, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ldb_set_session_info" "', argument " "1"" of type '" "struct ldb_context *""'"); 
+  }
+  arg1 = (struct ldb_context *)(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_auth_session_info, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ldb_set_session_info" "', argument " "2"" of type '" "struct auth_session_info *""'"); 
+  }
+  arg2 = (struct auth_session_info *)(argp2);
+  {
+    if (arg1 == NULL)
+    SWIG_exception(SWIG_ValueError, 
+      "ldb context must be non-NULL");
+  }
+  ldb_set_session_info(arg1,arg2);
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_ldb_set_loadparm(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   struct ldb_context *arg1 = (struct ldb_context *) 0 ;
@@ -2801,7 +2838,7 @@ SWIGINTERN PyObject *_wrap_ldb_set_loadparm(PyObject *SWIGUNUSEDPARM(self), PyOb
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {
-    (char *) "Ldb",(char *) "lp_ctx", NULL 
+    (char *) "ldb",(char *) "lp_ctx", NULL 
   };
   
   {
@@ -2836,6 +2873,7 @@ fail:
 static PyMethodDef SwigMethods[] = {
 	 { (char *)"random_password", (PyCFunction) _wrap_random_password, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"ldb_set_credentials", (PyCFunction) _wrap_ldb_set_credentials, METH_VARARGS | METH_KEYWORDS, NULL},
+	 { (char *)"ldb_set_session_info", (PyCFunction) _wrap_ldb_set_session_info, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"ldb_set_loadparm", (PyCFunction) _wrap_ldb_set_loadparm, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { NULL, NULL, 0, NULL }
 };
@@ -2844,6 +2882,7 @@ static PyMethodDef SwigMethods[] = {
 /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (BEGIN) -------- */
 
 static swig_type_info _swigt__p_TALLOC_CTX = {"_p_TALLOC_CTX", "TALLOC_CTX *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_auth_session_info = {"_p_auth_session_info", "struct auth_session_info *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_char = {"_p_char", "char *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_cli_credentials = {"_p_cli_credentials", "struct cli_credentials *|cli_credentials *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_int = {"_p_int", "intptr_t *|int *|int_least32_t *|int_fast32_t *|int32_t *|int_fast16_t *", 0, 0, (void*)0, 0};
@@ -2868,6 +2907,7 @@ static swig_type_info _swigt__p_unsigned_short = {"_p_unsigned_short", "unsigned
 
 static swig_type_info *swig_type_initial[] = {
   &_swigt__p_TALLOC_CTX,
+  &_swigt__p_auth_session_info,
   &_swigt__p_char,
   &_swigt__p_cli_credentials,
   &_swigt__p_int,
@@ -2892,6 +2932,7 @@ static swig_type_info *swig_type_initial[] = {
 };
 
 static swig_cast_info _swigc__p_TALLOC_CTX[] = {  {&_swigt__p_TALLOC_CTX, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_auth_session_info[] = {  {&_swigt__p_auth_session_info, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_char[] = {  {&_swigt__p_char, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_cli_credentials[] = {  {&_swigt__p_cli_credentials, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_int[] = {  {&_swigt__p_int, 0, 0, 0},{0, 0, 0, 0}};
@@ -2916,6 +2957,7 @@ static swig_cast_info _swigc__p_unsigned_short[] = {  {&_swigt__p_unsigned_short
 
 static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_TALLOC_CTX,
+  _swigc__p_auth_session_info,
   _swigc__p_char,
   _swigc__p_cli_credentials,
   _swigc__p_int,
diff --git a/source4/scripting/python/samba/__init__.py b/source4/scripting/python/samba/__init__.py
index 08a262eec8..56adce4473 100644
--- a/source4/scripting/python/samba/__init__.py
+++ b/source4/scripting/python/samba/__init__.py
@@ -35,40 +35,78 @@ if _in_source_tree():
 
 import misc
 import ldb
-ldb.ldb.set_credentials = misc.ldb_set_credentials
-#FIXME: ldb.ldb.set_session_info = misc.ldb_set_session_info
-ldb.ldb.set_loadparm = misc.ldb_set_loadparm
-
-def Ldb(url, session_info=None, credentials=None, modules_dir=None, lp=None):
-    """Open a Samba Ldb file. 
-
-    :param url: LDB Url to open
-    :param session_info: Optional session information
-    :param credentials: Optional credentials, defaults to anonymous.
-    :param modules_dir: Modules directory, automatically set if not specified.
-    :param lp: Loadparm object, optional.
-
-    This is different from a regular Ldb file in that the Samba-specific
-    modules-dir is used by default and that credentials and session_info 
-    can be passed through (required by some modules).
+ldb.Ldb.set_credentials = misc.ldb_set_credentials
+ldb.Ldb.set_session_info = misc.ldb_set_session_info
+ldb.Ldb.set_loadparm = misc.ldb_set_loadparm
+
+class Ldb(ldb.Ldb):
+    """Simple Samba-specific LDB subclass that takes care 
+    of setting up the modules dir, credentials pointers, etc.
+    
+    Please note that this is intended to be for all Samba LDB files, 
+    not necessarily the Sam database. For Sam-specific helper 
+    functions see samdb.py.
     """
-    import ldb
-    ret = ldb.Ldb()
-    if modules_dir is None:
-        modules_dir = default_ldb_modules_dir
-    if modules_dir is not None:
-        ret.set_modules_dir(modules_dir)
-    def samba_debug(level,text):
-        print "%d %s" % (level, text)
-    if credentials is not None:
-        ldb.set_credentials(credentials)
-    if session_info is not None:
-        ldb.set_session_info(session_info)
-    if lp is not None:
-        ldb.set_loadparm(lp)
-    #ret.set_debug(samba_debug)
-    ret.connect(url)
-    return ret
+    def __init__(url, session_info=None, credentials=None, modules_dir=None, 
+            lp=None):
+        """Open a Samba Ldb file. 
+
+        :param url: LDB Url to open
+        :param session_info: Optional session information
+        :param credentials: Optional credentials, defaults to anonymous.
+        :param modules_dir: Modules directory, automatically set if not specified.
+        :param lp: Loadparm object, optional.
+
+        This is different from a regular Ldb file in that the Samba-specific
+        modules-dir is used by default and that credentials and session_info 
+        can be passed through (required by some modules).
+        """
+        super(self, Ldb).__init__()
+        import ldb
+        ret = ldb.Ldb()
+        if modules_dir is None:
+            modules_dir = default_ldb_modules_dir
+        if modules_dir is not None:
+            ret.set_modules_dir(modules_dir)
+        def samba_debug(level,text):
+            print "%d %s" % (level, text)
+        if credentials is not None:
+            ldb.set_credentials(credentials)
+        if session_info is not None:
+            ldb.set_session_info(session_info)
+        if lp is not None:
+            ldb.set_loadparm(lp)
+        #ret.set_debug(samba_debug)
+        ret.connect(url)
+        return ret
+
+    def searchone(self, basedn, expression, attribute):
+        """Search for one attribute as a string."""
+        res = self.search(basedn, SCOPE_SUBTREE, expression, [attribute])
+        if len(res) != 1 or res[0][attribute] is None:
+            return None
+        return res[0][attribute]
+
+    def erase(self):
+        """Erase an ldb, removing all records."""
+        # delete the specials
+        for attr in ["@INDEXLIST", "@ATTRIBUTES", "@SUBCLASSES", "@MODULES", 
+                     "@OPTIONS", "@PARTITION", "@KLUDGEACL"]:
+            try:
+                self.delete(Dn(self, attr))
+            except LdbError, (LDB_ERR_NO_SUCH_OBJECT, _):
+                # Ignore missing dn errors
+                pass
+
+        basedn = Dn(self, "")
+        # and the rest
+        for msg in self.search(basedn, SCOPE_SUBTREE, 
+                "(&(|(objectclass=*)(dn=*))(!(dn=@BASEINFO)))", 
+                ["dn"]):
+            self.delete(msg.dn)
+
+        res = self.search(basedn, SCOPE_SUBTREE, "(&(|(objectclass=*)(dn=*))(!(dn=@BASEINFO)))", ["dn"])
+        assert len(res) == 0
 
 
 def substitute_var(text, values):
diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index ce496a8bc1..63e50897fe 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -15,6 +15,7 @@ from socket import gethostname, gethostbyname
 import param
 import registry
 from samba import Ldb, substitute_var, valid_netbios_name
+from samba.samdb import SamDB
 from ldb import Dn, SCOPE_SUBTREE, SCOPE_ONELEVEL, SCOPE_BASE, LdbError, \
         LDB_ERR_NO_SUCH_OBJECT, timestring
 
@@ -164,32 +165,6 @@ def findnss(nssfn, *names):
             pass
     raise Exception("Unable to find user/group for %s" % arguments[1])
 
-def add_foreign(ldb, subobj, sid, desc):
-    """Add a foreign security principle."""
-    add = """
-dn: CN=%s,CN=ForeignSecurityPrincipals,%s
-objectClass: top
-objectClass: foreignSecurityPrincipal
-description: %s
-""" % (sid, subobj.domaindn, desc)
-    # deliberately ignore errors from this, as the records may
-    # already exist
-    for msg in ldb.parse_ldif(add):
-        ldb.add(msg[1])
-
-def setup_name_mapping(subobj, ldb, sid, unixname):
-    """Setup a mapping between a sam name and a unix name."""
-    res = ldb.search(Dn(ldb, subobj.domaindn), SCOPE_SUBTREE, 
-                     "objectSid=%s" % sid, ["dn"])
-    assert len(res) == 1, "Failed to find record for objectSid %s" % sid
-
-    mod = """
-dn: %s
-changetype: modify
-replace: unixName
-unixName: %s
-""" % (res[0].dn, unixname)
-    ldb.modify(ldb.parse_ldif(mod).next()[1])
 
 
 def hostip():
@@ -214,57 +189,6 @@ def ldb_delete(ldb):
     ldb.connect(ldb.filename)
 
 
-def ldb_erase(ldb):
-    """Erase an ldb, removing all records."""
-    # delete the specials
-    for attr in ["@INDEXLIST", "@ATTRIBUTES", "@SUBCLASSES", "@MODULES", 
-                 "@OPTIONS", "@PARTITION", "@KLUDGEACL"]:
-        try:
-            ldb.delete(Dn(ldb, attr))
-        except LdbError, (LDB_ERR_NO_SUCH_OBJECT, _):
-            # Ignore missing dn errors
-            pass
-
-    basedn = Dn(ldb, "")
-    # and the rest
-    for msg in ldb.search(basedn, SCOPE_SUBTREE, 
-            "(&(|(objectclass=*)(dn=*))(!(dn=@BASEINFO)))", 
-            ["dn"]):
-        ldb.delete(msg.dn)
-
-    res = ldb.search(basedn, SCOPE_SUBTREE, "(&(|(objectclass=*)(dn=*))(!(dn=@BASEINFO)))", ["dn"])
-    assert len(res) == 0
-
-
-def ldb_erase_partitions(subobj, message, ldb, ldapbackend):
-    """Erase an ldb, removing all records."""
-    assert ldb is not None
-    res = ldb.search(Dn(ldb, ""), SCOPE_BASE, "(objectClass=*)", 
-                     ["namingContexts"])
-    assert len(res) == 1
-    if not "namingContexts" in res[0]:
-        return
-    for basedn in res[0]["namingContexts"]:
-        anything = "(|(objectclass=*)(dn=*))"
-        previous_remaining = 1
-        current_remaining = 0
-
-        if ldapbackend and (basedn == subobj.domaindn):
-            # Only delete objects that were created by provision
-            anything = "(objectcategory=*)"
-
-        k = 0
-        while ++k < 10 and (previous_remaining != current_remaining):
-            # and the rest
-            res2 = ldb.search(Dn(ldb, basedn), SCOPE_SUBTREE, anything, ["dn"])
-            previous_remaining = current_remaining
-            current_remaining = len(res2)
-            for msg in res2:
-                try:
-                    ldb.delete(msg.dn)
-                except LdbError, (_, text):
-                    message("Unable to delete %s: %s" % (msg.dn, text))
-
 
 def open_ldb(session_info, credentials, dbname):
     assert session_info is not None
@@ -374,30 +298,30 @@ def setup_name_mappings(subobj, ldb):
     sid = list(res[0]["objectSid"])[0]
 
     # add some foreign sids if they are not present already
-    add_foreign(ldb, subobj, "S-1-5-7", "Anonymous")
-    add_foreign(ldb, subobj, "S-1-1-0", "World")
-    add_foreign(ldb, subobj, "S-1-5-2", "Network")
-    add_foreign(ldb, subobj, "S-1-5-18", "System")
-    add_foreign(ldb, subobj, "S-1-5-11", "Authenticated Users")
+    ldb.add_foreign(subobj.domaindn, "S-1-5-7", "Anonymous")
+    ldb.add_foreign(subobj.domaindn, "S-1-1-0", "World")
+    ldb.add_foreign(subobj.domaindn, "S-1-5-2", "Network")
+    ldb.add_foreign(subobj.domaindn, "S-1-5-18", "System")
+    ldb.add_foreign(subobj.domaindn, "S-1-5-11", "Authenticated Users")
 
     # some well known sids
-    setup_name_mapping(subobj, ldb, "S-1-5-7", subobj.nobody)
-    setup_name_mapping(subobj, ldb, "S-1-1-0", subobj.nogroup)
-    setup_name_mapping(subobj, ldb, "S-1-5-2", subobj.nogroup)
-    setup_name_mapping(subobj, ldb, "S-1-5-18", subobj.root)
-    setup_name_mapping(subobj, ldb, "S-1-5-11", subobj.users)
-    setup_name_mapping(subobj, ldb, "S-1-5-32-544", subobj.wheel)
-    setup_name_mapping(subobj, ldb, "S-1-5-32-545", subobj.users)
-    setup_name_mapping(subobj, ldb, "S-1-5-32-546", subobj.nogroup)
-    setup_name_mapping(subobj, ldb, "S-1-5-32-551", subobj.backup)
+    ldb.setup_name_mapping(subobj.domaindn, "S-1-5-7", subobj.nobody)
+    ldb.setup_name_mapping(subobj.domaindn, "S-1-1-0", subobj.nogroup)
+    ldb.setup_name_mapping(subobj.domaindn, "S-1-5-2", subobj.nogroup)
+    ldb.setup_name_mapping(subobj.domaindn, "S-1-5-18", subobj.root)
+    ldb.setup_name_mapping(subobj.domaindn, "S-1-5-11", subobj.users)
+    ldb.setup_name_mapping(subobj.domaindn, "S-1-5-32-544", subobj.wheel)
+    ldb.setup_name_mapping(subobj.domaindn, "S-1-5-32-545", subobj.users)
+    ldb.setup_name_mapping(subobj.domaindn, "S-1-5-32-546", subobj.nogroup)
+    ldb.setup_name_mapping(subobj.domaindn, "S-1-5-32-551", subobj.backup)
 
     # and some well known domain rids
-    setup_name_mapping(subobj, ldb, sid + "-500", subobj.root)
-    setup_name_mapping(subobj, ldb, sid + "-518", subobj.wheel)
-    setup_name_mapping(subobj, ldb, sid + "-519", subobj.wheel)
-    setup_name_mapping(subobj, ldb, sid + "-512", subobj.wheel)
-    setup_name_mapping(subobj, ldb, sid + "-513", subobj.users)
-    setup_name_mapping(subobj, ldb, sid + "-520", subobj.wheel)
+    ldb.setup_name_mapping(subobj.domaindn, sid + "-500", subobj.root)
+    ldb.setup_name_mapping(subobj.domaindn, sid + "-518", subobj.wheel)
+    ldb.setup_name_mapping(subobj.domaindn, sid + "-519", subobj.wheel)
+    ldb.setup_name_mapping(subobj.domaindn, sid + "-512", subobj.wheel)
+    ldb.setup_name_mapping(subobj.domaindn, sid + "-513", subobj.users)
+    ldb.setup_name_mapping(subobj.domaindn, sid + "-520", subobj.wheel)
 
 
 def provision_become_dc(setup_dir, subobj, message, paths, session_info, 
@@ -414,7 +338,8 @@ def provision_become_dc(setup_dir, subobj, message, paths, session_info,
     setup_ldb(setup_dir, "provision_partitions.ldif", session_info, 
               credentials, subobj, paths.samdb)
 
-    samdb = open_ldb(session_info, credentials, paths.samdb)
+    samdb = SamDB(paths.samdb, session_info=session_info, 
+                  credentials=credentials)
     ldb.transaction_start()
     try:
         message("Setting up %s attributes" % paths.samdb)
@@ -424,7 +349,7 @@ def provision_become_dc(setup_dir, subobj, message, paths, session_info,
         setup_add_ldif(setup_dir, "provision_rootdse_add.ldif", subobj, samdb)
 
         message("Erasing data from partitions")
-        ldb_erase_partitions(subobj, message, samdb, undefined)
+        ldb_erase_partitions(subobj, message, samdb, None)
 
         message("Setting up %s indexes" % paths.samdb)
         setup_add_ldif(setup_dir, "provision_index.ldif", subobj, samdb)
@@ -603,7 +528,7 @@ def provision_dns(setup_dir, subobj, message, paths, session_info, credentials):
     """Write out a DNS zone file, from the info in the current database."""
     message("Setting up DNS zone: %s" % subobj.dnsdomain)
     # connect to the sam
-    ldb = Ldb(paths.samdb, session_info=session_info, credentials=credentials)
+    ldb = SamDB(paths.samdb, session_info=session_info, credentials=credentials)
 
     # These values may have changed, due to an incoming SamSync,
     # or may not have been specified, so fetch them from the database
@@ -614,7 +539,7 @@ def provision_dns(setup_dir, subobj, message, paths, session_info, credentials):
     assert(res[0]["objectGUID"] is not None)
     subobj.domainguid = res[0]["objectGUID"]
 
-    subobj.host_guid = searchone(ldb, subobj.domaindn, 
+    subobj.host_guid = ldb.searchone(subobj.domaindn, 
                                  "(&(objectClass=computer)(cn=%s))" % subobj.netbiosname, "objectGUID")
     assert subobj.host_guid is not None
 
@@ -716,13 +641,6 @@ def provision_guess(lp):
     return subobj
 
 
-def searchone(ldb, basedn, expression, attribute):
-    """search for one attribute as a string."""
-    res = ldb.search(basedn, SCOPE_SUBTREE, expression, [attribute])
-    if len(res) != 1 or res[0][attribute] is None:
-        return None
-    return res[0][attribute]
-
 
 def load_schema(setup_dir, subobj, samdb):
     """Load schema."""
@@ -745,70 +663,6 @@ def load_schema(setup_dir, subobj, samdb):
     samdb.attach_dsdb_schema_from_ldif(head_data, schema_data)
 
 
-def enable_account(ldb, user_dn):
-    """enable the account."""
-    res = ldb.search(user_dn, SCOPE_ONELEVEL, None, ["userAccountControl"])
-    assert len(res) == 1
-    userAccountControl = res[0].userAccountControl
-    userAccountControl = userAccountControl - 2 # remove disabled bit
-    mod = """
-dn: %s
-changetype: modify
-replace: userAccountControl
-userAccountControl: %u
-""" % (user_dn, userAccountControl)
-    ldb.modify(mod)
-
-
-def newuser(sam, username, unixname, password, message, session_info, 
-            credentials):
-    """add a new user record"""
-    # connect to the sam 
-    ldb.transaction_start()
-
-    # find the DNs for the domain and the domain users group
-    res = ldb.search("", SCOPE_BASE, "defaultNamingContext=*", 
-                     ["defaultNamingContext"])
-    assert(len(res) == 1 and res[0].defaultNamingContext is not None)
-    domain_dn = res[0].defaultNamingContext
-    assert(domain_dn is not None)
-    dom_users = searchone(ldb, domain_dn, "name=Domain Users", "dn")
-    assert(dom_users is not None)
-
-    user_dn = "CN=%s,CN=Users,%s" % (username, domain_dn)
-
-    #
-    #  the new user record. note the reliance on the samdb module to fill
-    #  in a sid, guid etc
-    #
-    ldif = """
-dn: %s
-sAMAccountName: %s
-unixName: %s
-sambaPassword: %s
-objectClass: user
-""" % (user_dn, username, unixname, password)
-    #  add the user to the users group as well
-    modgroup = """
-dn: %s
-changetype: modify
-add: member
-member: %s
-""" % (dom_users, user_dn)
-
-
-    #  now the real work
-    message("Adding user %s" % user_dn)
-    ldb.add(ldif)
-
-    message("Modifying group %s" % dom_users)
-    ldb.modify(modgroup)
-
-    #  modify the userAccountControl to remove the disabled bit
-    enable_account(ldb, user_dn)
-    ldb.transaction_commit()
-
-
 def join_domain(domain, netbios_name, join_type, creds, message):
     ctx = NetContext(creds)
     joindom = object()
@@ -835,3 +689,35 @@ def vampire(domain, session_info, credentials, message):
     vampire_ctx.session_info = session_info
     if not ctx.SamSyncLdb(vampire_ctx):
         raise Exception("Migration of remote domain to Samba failed: %s " % vampire_ctx.error_string)
+
+
+def ldb_erase_partitions(subobj, message, ldb, ldapbackend):
+    """Erase an ldb, removing all records."""
+    assert ldb is not None
+    res = ldb.search(Dn(ldb, ""), SCOPE_BASE, "(objectClass=*)", 
+                     ["namingContexts"])
+    assert len(res) == 1
+    if not "namingContexts" in res[0]:
+        return
+    for basedn in res[0]["namingContexts"]:
+        anything = "(|(objectclass=*)(dn=*))"
+        previous_remaining = 1
+        current_remaining = 0
+
+        if ldapbackend and (basedn == subobj.domaindn):
+            # Only delete objects that were created by provision
+            anything = "(objectcategory=*)"
+
+        k = 0
+        while ++k < 10 and (previous_remaining != current_remaining):
+            # and the rest
+            res2 = ldb.search(Dn(ldb, basedn), SCOPE_SUBTREE, anything, ["dn"])
+            previous_remaining = current_remaining
+            current_remaining = len(res2)
+            for msg in res2:
+                try:
+                    ldb.delete(msg.dn)
+                except LdbError, (_, text):
+                    message("Unable to delete %s: %s" % (msg.dn, text))
+
+
diff --git a/source4/scripting/python/samba/samdb.py b/source4/scripting/python/samba/samdb.py
new file mode 100644
index 0000000000..50164bf590
--- /dev/null
+++ b/source4/scripting/python/samba/samdb.py
@@ -0,0 +1,117 @@
+#!/usr/bin/python
+
+# Unix SMB/CIFS implementation.
+# Copyright (C) Jelmer Vernooij <jelmer@samba.org> 2007
+#
+# Based on the original in EJS:
+# Copyright (C) Andrew Tridgell 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/>.
+#
+
+import samba
+
+class SamDB(samba.Ldb):
+    def add_foreign(self, domaindn, sid, desc):
+        """Add a foreign security principle."""
+        add = """
+dn: CN=%s,CN=ForeignSecurityPrincipals,%s
+objectClass: top
+objectClass: foreignSecurityPrincipal
+description: %s
+        """ % (sid, domaindn, desc)
+        # deliberately ignore errors from this, as the records may
+        # already exist
+        for msg in self.parse_ldif(add):
+            self.add(msg[1])
+
+    def setup_name_mapping(self, domaindn, sid, unixname):
+        """Setup a mapping between a sam name and a unix name."""
+        res = self.search(Dn(ldb, domaindn), SCOPE_SUBTREE, 
+                         "objectSid=%s" % sid, ["dn"])
+        assert len(res) == 1, "Failed to find record for objectSid %s" % sid
+
+        mod = """
+dn: %s
+changetype: modify
+replace: unixName
+unixName: %s
+""" % (res[0].dn, unixname)
+        self.modify(self.parse_ldif(mod).next()[1])
+
+    def enable_account(self, user_dn):
+        """enable the account.
+        
+        :param user_dn: Dn of the account to enable.
+        """
+        res = self.search(user_dn, SCOPE_ONELEVEL, None, ["userAccountControl"])
+        assert len(res) == 1
+        userAccountControl = res[0].userAccountControl
+        userAccountControl = userAccountControl - 2 # remove disabled bit
+        mod = """
+dn: %s
+changetype: modify
+replace: userAccountControl
+userAccountControl: %u
+""" % (user_dn, userAccountControl)
+        self.modify(mod)
+
+    def newuser(self, username, unixname, password, message):
+        """add a new user record"""
+        # connect to the sam 
+        self.transaction_start()
+
+        # find the DNs for the domain and the domain users group
+        res = self.search("", SCOPE_BASE, "defaultNamingContext=*", 
+                         ["defaultNamingContext"])
+        assert(len(res) == 1 and res[0].defaultNamingContext is not None)
+        domain_dn = res[0].defaultNamingContext
+        assert(domain_dn is not None)
+        dom_users = searchone(self, domain_dn, "name=Domain Users", "dn")
+        assert(dom_users is not None)
+
+        user_dn = "CN=%s,CN=Users,%s" % (username, domain_dn)
+
+        #
+        #  the new user record. note the reliance on the samdb module to fill
+        #  in a sid, guid etc
+        #
+        ldif = """
+dn: %s
+sAMAccountName: %s
+unixName: %s
+sambaPassword: %s
+objectClass: user
+    """ % (user_dn, username, unixname, password)
+        #  add the user to the users group as well
+        modgroup = """
+dn: %s
+changetype: modify
+add: member
+member: %s
+""" % (dom_users, user_dn)
+
+
+        #  now the real work
+        message("Adding user %s" % user_dn)
+        self.add(ldif)
+
+        message("Modifying group %s" % dom_users)
+        self.modify(modgroup)
+
+        #  modify the userAccountControl to remove the disabled bit
+        enable_account(self, user_dn)
+        self.transaction_commit()
+
+
-- 
cgit 


From 09915ce8b7edcf23335d570d70f79797afe83a71 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 17 Dec 2007 08:36:39 +0100
Subject: r26499: Allow testing python provision by setting the
 PROVISION_PYTHON environment variable. (This used to be commit
 379d0bbb2f9e0cd9b1855fd77bbb89827e0315ad)

---
 source4/scripting/python/samba/provision.py | 10 ----------
 1 file changed, 10 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index 63e50897fe..60dcf06c83 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -189,7 +189,6 @@ def ldb_delete(ldb):
     ldb.connect(ldb.filename)
 
 
-
 def open_ldb(session_info, credentials, dbname):
     assert session_info is not None
     try:
@@ -641,25 +640,16 @@ def provision_guess(lp):
     return subobj
 
 
-
 def load_schema(setup_dir, subobj, samdb):
     """Load schema."""
     src = os.path.join(setup_dir, "schema.ldif")
-
     schema_data = open(src, 'r').read()
-
     src = os.path.join(setup_dir, "schema_samba4.ldif")
-
     schema_data += open(src, 'r').read()
-
     schema_data = substitute_var(schema_data, subobj.subst_vars())
-
     src = os.path.join(setup_dir, "provision_schema_basedn_modify.ldif")
-
     head_data = open(src, 'r').read()
-
     head_data = substitute_var(head_data, subobj.subst_vars())
-
     samdb.attach_dsdb_schema_from_ldif(head_data, schema_data)
 
 
-- 
cgit 


From 32f439bfa458f7936b507cb5a1e3c74bcb8c68bf Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 17 Dec 2007 11:12:36 +0100
Subject: r26503: Change order of arguments in param interface so it's easier
 to make the

section name optional. Fix several smaller bits and pieces in the Python code.
(This used to be commit 1b89311e5fa4fcde060df50e580dc221205cc8ca)
---
 source4/scripting/ejs/smbcalls_param.c           |  8 ++--
 source4/scripting/python/misc_wrap.c             | 25 ++++++-----
 source4/scripting/python/samba/__init__.py       | 56 ++++++++++++------------
 source4/scripting/python/samba/provision.py      | 30 ++++++-------
 source4/scripting/python/samba/tests/__init__.py |  2 +-
 5 files changed, 64 insertions(+), 57 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_param.c b/source4/scripting/ejs/smbcalls_param.c
index 830c45d978..5fbb0bb017 100644
--- a/source4/scripting/ejs/smbcalls_param.c
+++ b/source4/scripting/ejs/smbcalls_param.c
@@ -45,7 +45,7 @@ static int ejs_param_get(MprVarHandle eid, int argc, char **argv)
 	if (argc == 2) {
 		ret = param_get_string(ctx, argv[0], argv[1]);
 	} else {
-		ret = param_get_string(ctx, NULL, argv[0]);
+		ret = param_get_string(ctx, argv[0], NULL);
 	}
 
 	if (ret) {
@@ -78,7 +78,7 @@ static int ejs_param_get_list(MprVarHandle eid, int argc, char **argv)
 	if (argc == 2) {
 		ret = param_get_string_list(ctx, argv[0], argv[1], NULL);
 	} else {
-		ret = param_get_string_list(ctx, NULL, argv[0], NULL);
+		ret = param_get_string_list(ctx, argv[0], NULL, NULL);
 	}
 
 	if (ret != NULL) {
@@ -123,9 +123,9 @@ static int ejs_param_set(MprVarHandle eid, int argc, struct MprVar **argv)
 	
 	list = mprToList(mprMemCtx(), value);
 	if (list) {
-		ret = param_set_string_list(ctx, section, paramname, list);
+		ret = param_set_string_list(ctx, paramname, list, section);
 	} else {
-		ret = param_set_string(ctx, section, paramname, mprToString(value));
+		ret = param_set_string(ctx, paramname, mprToString(value), section);
 	}
 
 	mpr_Return(eid, mprCreateBoolVar(ret));
diff --git a/source4/scripting/python/misc_wrap.c b/source4/scripting/python/misc_wrap.c
index f5e23d0407..25b6389f6a 100644
--- a/source4/scripting/python/misc_wrap.c
+++ b/source4/scripting/python/misc_wrap.c
@@ -2474,16 +2474,17 @@ SWIG_Python_MustGetPtr(PyObject *obj, swig_type_info *ty, int argnum, int flags)
 #define SWIGTYPE_p_loadparm_service swig_types[12]
 #define SWIGTYPE_p_long_long swig_types[13]
 #define SWIGTYPE_p_param_context swig_types[14]
-#define SWIGTYPE_p_param_section swig_types[15]
-#define SWIGTYPE_p_short swig_types[16]
-#define SWIGTYPE_p_signed_char swig_types[17]
-#define SWIGTYPE_p_unsigned_char swig_types[18]
-#define SWIGTYPE_p_unsigned_int swig_types[19]
-#define SWIGTYPE_p_unsigned_long swig_types[20]
-#define SWIGTYPE_p_unsigned_long_long swig_types[21]
-#define SWIGTYPE_p_unsigned_short swig_types[22]
-static swig_type_info *swig_types[24];
-static swig_module_info swig_module = {swig_types, 23, 0, 0, 0, 0};
+#define SWIGTYPE_p_param_opt swig_types[15]
+#define SWIGTYPE_p_param_section swig_types[16]
+#define SWIGTYPE_p_short swig_types[17]
+#define SWIGTYPE_p_signed_char swig_types[18]
+#define SWIGTYPE_p_unsigned_char swig_types[19]
+#define SWIGTYPE_p_unsigned_int swig_types[20]
+#define SWIGTYPE_p_unsigned_long swig_types[21]
+#define SWIGTYPE_p_unsigned_long_long swig_types[22]
+#define SWIGTYPE_p_unsigned_short swig_types[23]
+static swig_type_info *swig_types[25];
+static swig_module_info swig_module = {swig_types, 24, 0, 0, 0, 0};
 #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name)
 #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name)
 
@@ -2896,6 +2897,7 @@ static swig_type_info _swigt__p_loadparm_context = {"_p_loadparm_context", "stru
 static swig_type_info _swigt__p_loadparm_service = {"_p_loadparm_service", "struct loadparm_service *|loadparm_service *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_long_long = {"_p_long_long", "int_least64_t *|int_fast64_t *|int64_t *|long long *|intmax_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_param_context = {"_p_param_context", "struct param_context *|param *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_param_opt = {"_p_param_opt", "struct param_opt *|param_opt *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_param_section = {"_p_param_section", "struct param_section *|param_section *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_short = {"_p_short", "short *|int_least16_t *|int16_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_signed_char = {"_p_signed_char", "signed char *|int_least8_t *|int_fast8_t *|int8_t *", 0, 0, (void*)0, 0};
@@ -2921,6 +2923,7 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_loadparm_service,
   &_swigt__p_long_long,
   &_swigt__p_param_context,
+  &_swigt__p_param_opt,
   &_swigt__p_param_section,
   &_swigt__p_short,
   &_swigt__p_signed_char,
@@ -2946,6 +2949,7 @@ static swig_cast_info _swigc__p_loadparm_context[] = {  {&_swigt__p_loadparm_con
 static swig_cast_info _swigc__p_loadparm_service[] = {  {&_swigt__p_loadparm_service, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_long_long[] = {  {&_swigt__p_long_long, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_param_context[] = {  {&_swigt__p_param_context, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_param_opt[] = {  {&_swigt__p_param_opt, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_param_section[] = {  {&_swigt__p_param_section, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_short[] = {  {&_swigt__p_short, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_signed_char[] = {  {&_swigt__p_signed_char, 0, 0, 0},{0, 0, 0, 0}};
@@ -2971,6 +2975,7 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_loadparm_service,
   _swigc__p_long_long,
   _swigc__p_param_context,
+  _swigc__p_param_opt,
   _swigc__p_param_section,
   _swigc__p_short,
   _swigc__p_signed_char,
diff --git a/source4/scripting/python/samba/__init__.py b/source4/scripting/python/samba/__init__.py
index 56adce4473..511dcd905a 100644
--- a/source4/scripting/python/samba/__init__.py
+++ b/source4/scripting/python/samba/__init__.py
@@ -33,11 +33,9 @@ if _in_source_tree():
     default_ldb_modules_dir = "%s/bin/modules/ldb" % srcdir
 
 
-import misc
 import ldb
-ldb.Ldb.set_credentials = misc.ldb_set_credentials
-ldb.Ldb.set_session_info = misc.ldb_set_session_info
-ldb.Ldb.set_loadparm = misc.ldb_set_loadparm
+import credentials
+import misc
 
 class Ldb(ldb.Ldb):
     """Simple Samba-specific LDB subclass that takes care 
@@ -47,38 +45,42 @@ class Ldb(ldb.Ldb):
     not necessarily the Sam database. For Sam-specific helper 
     functions see samdb.py.
     """
-    def __init__(url, session_info=None, credentials=None, modules_dir=None, 
-            lp=None):
+    def __init__(self, url=None, session_info=None, credentials=None, 
+                 modules_dir=None, lp=None):
         """Open a Samba Ldb file. 
 
-        :param url: LDB Url to open
+        :param url: Optional LDB URL to open
         :param session_info: Optional session information
         :param credentials: Optional credentials, defaults to anonymous.
-        :param modules_dir: Modules directory, automatically set if not specified.
+        :param modules_dir: Modules directory, if not the default.
         :param lp: Loadparm object, optional.
 
         This is different from a regular Ldb file in that the Samba-specific
         modules-dir is used by default and that credentials and session_info 
         can be passed through (required by some modules).
         """
-        super(self, Ldb).__init__()
-        import ldb
-        ret = ldb.Ldb()
-        if modules_dir is None:
-            modules_dir = default_ldb_modules_dir
+        super(Ldb, self).__init__()
+
         if modules_dir is not None:
-            ret.set_modules_dir(modules_dir)
-        def samba_debug(level,text):
-            print "%d %s" % (level, text)
+            self.set_modules_dir(modules_dir)
+        elif default_ldb_modules_dir is not None:
+            self.set_modules_dir(default_ldb_modules_dir)
+
         if credentials is not None:
-            ldb.set_credentials(credentials)
+            self.set_credentials(self, credentials)
+
         if session_info is not None:
-            ldb.set_session_info(session_info)
+            self.set_session_info(self, session_info)
+
         if lp is not None:
-            ldb.set_loadparm(lp)
-        #ret.set_debug(samba_debug)
-        ret.connect(url)
-        return ret
+            self.set_loadparm(self, lp)
+
+        if url:
+            self.connect(url)
+
+    set_credentials = misc.ldb_set_credentials
+    set_session_info = misc.ldb_set_session_info
+    set_loadparm = misc.ldb_set_loadparm
 
     def searchone(self, basedn, expression, attribute):
         """Search for one attribute as a string."""
@@ -93,19 +95,19 @@ class Ldb(ldb.Ldb):
         for attr in ["@INDEXLIST", "@ATTRIBUTES", "@SUBCLASSES", "@MODULES", 
                      "@OPTIONS", "@PARTITION", "@KLUDGEACL"]:
             try:
-                self.delete(Dn(self, attr))
-            except LdbError, (LDB_ERR_NO_SUCH_OBJECT, _):
+                self.delete(ldb.Dn(self, attr))
+            except ldb.LdbError, (LDB_ERR_NO_SUCH_OBJECT, _):
                 # Ignore missing dn errors
                 pass
 
-        basedn = Dn(self, "")
+        basedn = ldb.Dn(self, "")
         # and the rest
-        for msg in self.search(basedn, SCOPE_SUBTREE, 
+        for msg in self.search(basedn, ldb.SCOPE_SUBTREE, 
                 "(&(|(objectclass=*)(dn=*))(!(dn=@BASEINFO)))", 
                 ["dn"]):
             self.delete(msg.dn)
 
-        res = self.search(basedn, SCOPE_SUBTREE, "(&(|(objectclass=*)(dn=*))(!(dn=@BASEINFO)))", ["dn"])
+        res = self.search(basedn, ldb.SCOPE_SUBTREE, "(&(|(objectclass=*)(dn=*))(!(dn=@BASEINFO)))", ["dn"])
         assert len(res) == 0
 
 
diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index 60dcf06c83..5332a9f9ff 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -16,6 +16,7 @@ import param
 import registry
 from samba import Ldb, substitute_var, valid_netbios_name
 from samba.samdb import SamDB
+import security
 from ldb import Dn, SCOPE_SUBTREE, SCOPE_ONELEVEL, SCOPE_BASE, LdbError, \
         LDB_ERR_NO_SUCH_OBJECT, timestring
 
@@ -69,7 +70,7 @@ class ProvisionSettings(object):
                 "DOMAINDN_LDB": self.domaindn_ldb,
                 "DOMAINDN_MOD": "pdc_fsmo,password_hash",
                 "DOMAINDN_MOD2": ",objectguid",
-                "DOMAINSID": self.domainsid,
+                "DOMAINSID": str(self.domainsid),
                 "MODULES_LIST": ",".join(self.modules_list),
                 "CONFIGDN_MOD": "naming_fsmo",
                 "CONFIGDN_MOD2": ",objectguid",
@@ -115,13 +116,13 @@ class ProvisionSettings(object):
         if not valid_netbios_name(self.netbiosname):
             raise InvalidNetbiosName(self.netbiosname)
 
-        if lp.get("workgroup").upper() != self.domain.upper():
+        if lp.get_string("workgroup").upper() != self.domain.upper():
             raise Error("workgroup '%s' in smb.conf must match chosen domain '%s'\n",
-                lp.get("workgroup"), self.domain)
+                lp.get_string("workgroup"), self.domain)
 
-        if lp.get("realm").upper() != self.realm.upper():
+        if lp.get_string("realm").upper() != self.realm.upper():
             raise Error("realm '%s' in smb.conf must match chosen realm '%s'\n" %
-                (lp.get("realm"), self.realm))
+                (lp.get_string("realm"), self.realm))
 
 
 class ProvisionPaths:
@@ -147,9 +148,9 @@ class ProvisionPaths:
 
 def install_ok(lp, session_info, credentials):
     """Check whether the current install seems ok."""
-    if lp.get("realm") == "":
+    if lp.get_string("realm") == "":
         return False
-    ldb = Ldb(lp.get("sam database"), session_info=session_info, 
+    ldb = Ldb(lp.get_string("sam database"), session_info=session_info, 
             credentials=credentials)
     if len(ldb.search("(cn=Administrator)")) != 1:
         return False
@@ -166,7 +167,6 @@ def findnss(nssfn, *names):
     raise Exception("Unable to find user/group for %s" % arguments[1])
 
 
-
 def hostip():
     """return first host IP."""
     return gethostbyname(hostname())
@@ -230,7 +230,7 @@ def setup_ldb(setup_dir, ldif, session_info, credentials, subobj, dbname,
     ldb.transaction_start()
     try:
         if erase:
-            ldb_erase(ldb);    
+            ldb.erase();    
         setup_add_ldif(setup_dir, ldif, subobj, ldb)
     except:
         ldb.transaction_cancel()
@@ -271,10 +271,10 @@ def provision_default_paths(lp, subobj):
     :param subobj: Object
     """
     paths = ProvisionPaths()
-    private_dir = lp.get("private dir")
+    private_dir = lp.get_string("private dir")
     paths.shareconf = os.path.join(private_dir, "share.ldb")
-    paths.samdb = lp.get("sam database") or os.path.join(private_dir, "samdb.ldb")
-    paths.secrets = lp.get("secrets database") or os.path.join(private_dir, "secrets.ldb")
+    paths.samdb = lp.get_string("sam database") or os.path.join(private_dir, "samdb.ldb")
+    paths.secrets = lp.get_string("secrets database") or os.path.join(private_dir, "secrets.ldb")
     paths.templates = os.path.join(private_dir, "templates.ldb")
     paths.keytab = os.path.join(private_dir, "secrets.keytab")
     paths.dns = os.path.join(private_dir, subobj.dnsdomain + ".zone")
@@ -572,8 +572,8 @@ def provision_ldapbase(setup_dir, subobj, message, paths):
 
 def provision_guess(lp):
     """guess reasonably default options for provisioning."""
-    subobj = ProvisionSettings(realm=lp.get("realm").upper(),
-                               domain=lp.get("workgroup"),
+    subobj = ProvisionSettings(realm=lp.get_string("realm").upper(),
+                               domain=lp.get_string("workgroup"),
                                hostname=hostname(), 
                                hostip=hostip())
 
@@ -581,7 +581,7 @@ def provision_guess(lp):
     assert subobj.domain is not None
     assert subobj.hostname is not None
     
-    subobj.domainsid    = sid.random()
+    subobj.domainsid    = security.random_sid()
     subobj.invocationid = uuid.random()
     subobj.policyguid   = uuid.random()
     subobj.krbtgtpass   = misc.random_password(12)
diff --git a/source4/scripting/python/samba/tests/__init__.py b/source4/scripting/python/samba/tests/__init__.py
index d374f8bafa..d3930e217a 100644
--- a/source4/scripting/python/samba/tests/__init__.py
+++ b/source4/scripting/python/samba/tests/__init__.py
@@ -27,7 +27,7 @@ class LdbTestCase(unittest.TestCase):
         self.filename = os.tempnam()
         self.ldb = samba.Ldb(self.filename)
 
-    def load_modules(self, modules=[]):
+    def set_modules(self, modules=[]):
         m = ldb.Message()
         m.dn = ldb.Dn(self.ldb, "@MODULES")
         m["@LIST"] = ",".join(modules)
-- 
cgit 


From f89c7a6e5eb082794d64b487e69fc442d138ca28 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 17 Dec 2007 12:07:51 +0100
Subject: r26505: Add python bindings for some samdb-related functions, improve
 provisioning in python. (This used to be commit
 d2402251666738c0372bbbaeaa1d26c06e254033)

---
 source4/scripting/python/config.mk          |   2 +-
 source4/scripting/python/misc.i             |   9 ++
 source4/scripting/python/misc.py            |   3 +
 source4/scripting/python/misc_wrap.c        | 225 +++++++++++++++++++++++++---
 source4/scripting/python/samba/provision.py |   6 +-
 source4/scripting/python/samba/samdb.py     |   5 +
 6 files changed, 223 insertions(+), 27 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/config.mk b/source4/scripting/python/config.mk
index cf17a28a70..d0d3829eef 100644
--- a/source4/scripting/python/config.mk
+++ b/source4/scripting/python/config.mk
@@ -3,7 +3,7 @@ PRIVATE_DEPENDENCIES = LIBNDR
 OBJ_FILES = uuidmodule.o
 
 [PYTHON::python_misc]
-PRIVATE_DEPENDENCIES = LIBNDR LIBLDB
+PRIVATE_DEPENDENCIES = LIBNDR LIBLDB SAMDB
 SWIG_FILE = misc.i
 
 # Swig extensions
diff --git a/source4/scripting/python/misc.i b/source4/scripting/python/misc.i
index 0a94fcdc29..518011ea43 100644
--- a/source4/scripting/python/misc.i
+++ b/source4/scripting/python/misc.i
@@ -22,6 +22,7 @@
 #include "includes.h"
 #include "ldb.h"
 #include "param/param.h"
+#include "dsdb/samdb/samdb.h"
 %}
 
 %import "stdint.i"
@@ -30,6 +31,8 @@
 %import "../../lib/ldb/ldb.i"
 %import "../../auth/credentials/credentials.i"
 %import "../../param/param.i"
+%import "../../libcli/security/security.i"
+%import "../../libcli/util/errors.i";
 
 %rename(random_password) generate_random_str;
 char *generate_random_str(TALLOC_CTX *mem_ctx, size_t len);
@@ -49,4 +52,10 @@ void ldb_set_loadparm(struct ldb_context *ldb, struct loadparm_context *lp_ctx)
 {
     ldb_set_opaque(ldb, "loadparm", lp_ctx);
 }
+
 %}
+
+bool samdb_set_domain_sid(struct ldb_context *ldb, 
+                          const struct dom_sid *dom_sid_in);
+
+WERROR dsdb_attach_schema_from_ldif_file(struct ldb_context *ldb, const char *pf, const char *df);
diff --git a/source4/scripting/python/misc.py b/source4/scripting/python/misc.py
index 7628dbcb15..525869ff58 100644
--- a/source4/scripting/python/misc.py
+++ b/source4/scripting/python/misc.py
@@ -60,9 +60,12 @@ def _swig_setattr_nondynamic_method(set):
 import ldb
 import credentials
 import param
+import security
 random_password = _misc.random_password
 ldb_set_credentials = _misc.ldb_set_credentials
 ldb_set_session_info = _misc.ldb_set_session_info
 ldb_set_loadparm = _misc.ldb_set_loadparm
+samdb_set_domain_sid = _misc.samdb_set_domain_sid
+dsdb_attach_schema_from_ldif_file = _misc.dsdb_attach_schema_from_ldif_file
 
 
diff --git a/source4/scripting/python/misc_wrap.c b/source4/scripting/python/misc_wrap.c
index 25b6389f6a..7db909d392 100644
--- a/source4/scripting/python/misc_wrap.c
+++ b/source4/scripting/python/misc_wrap.c
@@ -2463,28 +2463,31 @@ SWIG_Python_MustGetPtr(PyObject *obj, swig_type_info *ty, int argnum, int flags)
 #define SWIGTYPE_p_auth_session_info swig_types[1]
 #define SWIGTYPE_p_char swig_types[2]
 #define SWIGTYPE_p_cli_credentials swig_types[3]
-#define SWIGTYPE_p_int swig_types[4]
-#define SWIGTYPE_p_ldb_context swig_types[5]
-#define SWIGTYPE_p_ldb_dn swig_types[6]
-#define SWIGTYPE_p_ldb_ldif swig_types[7]
-#define SWIGTYPE_p_ldb_message swig_types[8]
-#define SWIGTYPE_p_ldb_message_element swig_types[9]
-#define SWIGTYPE_p_ldb_result swig_types[10]
-#define SWIGTYPE_p_loadparm_context swig_types[11]
-#define SWIGTYPE_p_loadparm_service swig_types[12]
-#define SWIGTYPE_p_long_long swig_types[13]
-#define SWIGTYPE_p_param_context swig_types[14]
-#define SWIGTYPE_p_param_opt swig_types[15]
-#define SWIGTYPE_p_param_section swig_types[16]
-#define SWIGTYPE_p_short swig_types[17]
-#define SWIGTYPE_p_signed_char swig_types[18]
-#define SWIGTYPE_p_unsigned_char swig_types[19]
-#define SWIGTYPE_p_unsigned_int swig_types[20]
-#define SWIGTYPE_p_unsigned_long swig_types[21]
-#define SWIGTYPE_p_unsigned_long_long swig_types[22]
-#define SWIGTYPE_p_unsigned_short swig_types[23]
-static swig_type_info *swig_types[25];
-static swig_module_info swig_module = {swig_types, 24, 0, 0, 0, 0};
+#define SWIGTYPE_p_dom_sid swig_types[4]
+#define SWIGTYPE_p_int swig_types[5]
+#define SWIGTYPE_p_ldb_context swig_types[6]
+#define SWIGTYPE_p_ldb_dn swig_types[7]
+#define SWIGTYPE_p_ldb_ldif swig_types[8]
+#define SWIGTYPE_p_ldb_message swig_types[9]
+#define SWIGTYPE_p_ldb_message_element swig_types[10]
+#define SWIGTYPE_p_ldb_result swig_types[11]
+#define SWIGTYPE_p_loadparm_context swig_types[12]
+#define SWIGTYPE_p_loadparm_service swig_types[13]
+#define SWIGTYPE_p_long_long swig_types[14]
+#define SWIGTYPE_p_param_context swig_types[15]
+#define SWIGTYPE_p_param_opt swig_types[16]
+#define SWIGTYPE_p_param_section swig_types[17]
+#define SWIGTYPE_p_security_descriptor swig_types[18]
+#define SWIGTYPE_p_security_token swig_types[19]
+#define SWIGTYPE_p_short swig_types[20]
+#define SWIGTYPE_p_signed_char swig_types[21]
+#define SWIGTYPE_p_unsigned_char swig_types[22]
+#define SWIGTYPE_p_unsigned_int swig_types[23]
+#define SWIGTYPE_p_unsigned_long swig_types[24]
+#define SWIGTYPE_p_unsigned_long_long swig_types[25]
+#define SWIGTYPE_p_unsigned_short swig_types[26]
+static swig_type_info *swig_types[28];
+static swig_module_info swig_module = {swig_types, 27, 0, 0, 0, 0};
 #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name)
 #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name)
 
@@ -2527,6 +2530,7 @@ static swig_module_info swig_module = {swig_types, 24, 0, 0, 0, 0};
 #include "includes.h"
 #include "ldb.h"
 #include "param/param.h"
+#include "dsdb/samdb/samdb.h"
 
 
 SWIGINTERN int
@@ -2715,6 +2719,69 @@ void ldb_set_loadparm(struct ldb_context *ldb, struct loadparm_context *lp_ctx)
     ldb_set_opaque(ldb, "loadparm", lp_ctx);
 }
 
+
+
+SWIGINTERNINLINE PyObject*
+  SWIG_From_bool  (bool value)
+{
+  return PyBool_FromLong(value ? 1 : 0);
+}
+
+
+SWIGINTERN int
+SWIG_AsCharPtrAndSize(PyObject *obj, char** cptr, size_t* psize, int *alloc)
+{
+  if (PyString_Check(obj)) {
+    char *cstr; Py_ssize_t len;
+    PyString_AsStringAndSize(obj, &cstr, &len);
+    if (cptr)  {
+      if (alloc) {
+	/* 
+	   In python the user should not be able to modify the inner
+	   string representation. To warranty that, if you define
+	   SWIG_PYTHON_SAFE_CSTRINGS, a new/copy of the python string
+	   buffer is always returned.
+
+	   The default behavior is just to return the pointer value,
+	   so, be careful.
+	*/ 
+#if defined(SWIG_PYTHON_SAFE_CSTRINGS)
+	if (*alloc != SWIG_OLDOBJ) 
+#else
+	if (*alloc == SWIG_NEWOBJ) 
+#endif
+	  {
+	    *cptr = (char *)memcpy((char *)malloc((len + 1)*sizeof(char)), cstr, sizeof(char)*(len + 1));
+	    *alloc = SWIG_NEWOBJ;
+	  }
+	else {
+	  *cptr = cstr;
+	  *alloc = SWIG_OLDOBJ;
+	}
+      } else {
+	*cptr = PyString_AsString(obj);
+      }
+    }
+    if (psize) *psize = len + 1;
+    return SWIG_OK;
+  } else {
+    swig_type_info* pchar_descriptor = SWIG_pchar_descriptor();
+    if (pchar_descriptor) {
+      void* vptr = 0;
+      if (SWIG_ConvertPtr(obj, &vptr, pchar_descriptor, 0) == SWIG_OK) {
+	if (cptr) *cptr = (char *) vptr;
+	if (psize) *psize = vptr ? (strlen((char *)vptr) + 1) : 0;
+	if (alloc) *alloc = SWIG_OLDOBJ;
+	return SWIG_OK;
+      }
+    }
+  }
+  return SWIG_TypeError;
+}
+
+
+
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -2871,11 +2938,113 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_samdb_set_domain_sid(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  struct ldb_context *arg1 = (struct ldb_context *) 0 ;
+  struct dom_sid *arg2 = (struct dom_sid *) 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "ldb",(char *) "dom_sid_in", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:samdb_set_domain_sid",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ldb_context, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "samdb_set_domain_sid" "', argument " "1"" of type '" "struct ldb_context *""'"); 
+  }
+  arg1 = (struct ldb_context *)(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_dom_sid, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "samdb_set_domain_sid" "', argument " "2"" of type '" "struct dom_sid const *""'"); 
+  }
+  arg2 = (struct dom_sid *)(argp2);
+  {
+    if (arg1 == NULL)
+    SWIG_exception(SWIG_ValueError, 
+      "ldb context must be non-NULL");
+  }
+  result = (bool)samdb_set_domain_sid(arg1,(struct dom_sid const *)arg2);
+  resultobj = SWIG_From_bool((bool)(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_dsdb_attach_schema_from_ldif_file(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  struct ldb_context *arg1 = (struct ldb_context *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  WERROR result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int res2 ;
+  char *buf2 = 0 ;
+  int alloc2 = 0 ;
+  int res3 ;
+  char *buf3 = 0 ;
+  int alloc3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  char *  kwnames[] = {
+    (char *) "ldb",(char *) "pf",(char *) "df", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:dsdb_attach_schema_from_ldif_file",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ldb_context, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "dsdb_attach_schema_from_ldif_file" "', argument " "1"" of type '" "struct ldb_context *""'"); 
+  }
+  arg1 = (struct ldb_context *)(argp1);
+  res2 = SWIG_AsCharPtrAndSize(obj1, &buf2, NULL, &alloc2);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "dsdb_attach_schema_from_ldif_file" "', argument " "2"" of type '" "char const *""'");
+  }
+  arg2 = (char *)(buf2);
+  res3 = SWIG_AsCharPtrAndSize(obj2, &buf3, NULL, &alloc3);
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "dsdb_attach_schema_from_ldif_file" "', argument " "3"" of type '" "char const *""'");
+  }
+  arg3 = (char *)(buf3);
+  {
+    if (arg1 == NULL)
+    SWIG_exception(SWIG_ValueError, 
+      "ldb context must be non-NULL");
+  }
+  result = dsdb_attach_schema_from_ldif_file(arg1,(char const *)arg2,(char const *)arg3);
+  {
+    if (!W_ERROR_IS_OK(result)) {
+      PyObject *obj = Py_BuildValue("(i,s)", (&result)->v, win_errstr(result));
+      PyErr_SetObject(PyExc_RuntimeError, obj);
+    } else if (resultobj == NULL) {
+      resultobj = Py_None;
+    }
+  }
+  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
+  if (alloc3 == SWIG_NEWOBJ) free((char*)buf3);
+  return resultobj;
+fail:
+  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
+  if (alloc3 == SWIG_NEWOBJ) free((char*)buf3);
+  return NULL;
+}
+
+
 static PyMethodDef SwigMethods[] = {
 	 { (char *)"random_password", (PyCFunction) _wrap_random_password, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"ldb_set_credentials", (PyCFunction) _wrap_ldb_set_credentials, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"ldb_set_session_info", (PyCFunction) _wrap_ldb_set_session_info, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"ldb_set_loadparm", (PyCFunction) _wrap_ldb_set_loadparm, METH_VARARGS | METH_KEYWORDS, NULL},
+	 { (char *)"samdb_set_domain_sid", (PyCFunction) _wrap_samdb_set_domain_sid, METH_VARARGS | METH_KEYWORDS, NULL},
+	 { (char *)"dsdb_attach_schema_from_ldif_file", (PyCFunction) _wrap_dsdb_attach_schema_from_ldif_file, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { NULL, NULL, 0, NULL }
 };
 
@@ -2886,6 +3055,7 @@ static swig_type_info _swigt__p_TALLOC_CTX = {"_p_TALLOC_CTX", "TALLOC_CTX *", 0
 static swig_type_info _swigt__p_auth_session_info = {"_p_auth_session_info", "struct auth_session_info *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_char = {"_p_char", "char *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_cli_credentials = {"_p_cli_credentials", "struct cli_credentials *|cli_credentials *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_dom_sid = {"_p_dom_sid", "struct dom_sid *|dom_sid *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_int = {"_p_int", "intptr_t *|int *|int_least32_t *|int_fast32_t *|int32_t *|int_fast16_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_ldb_context = {"_p_ldb_context", "struct ldb_context *|ldb *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_ldb_dn = {"_p_ldb_dn", "struct ldb_dn *|ldb_dn *", 0, 0, (void*)0, 0};
@@ -2899,6 +3069,8 @@ static swig_type_info _swigt__p_long_long = {"_p_long_long", "int_least64_t *|in
 static swig_type_info _swigt__p_param_context = {"_p_param_context", "struct param_context *|param *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_param_opt = {"_p_param_opt", "struct param_opt *|param_opt *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_param_section = {"_p_param_section", "struct param_section *|param_section *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_security_descriptor = {"_p_security_descriptor", "struct security_descriptor *|security_descriptor *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_security_token = {"_p_security_token", "struct security_token *|security_token *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_short = {"_p_short", "short *|int_least16_t *|int16_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_signed_char = {"_p_signed_char", "signed char *|int_least8_t *|int_fast8_t *|int8_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_unsigned_char = {"_p_unsigned_char", "unsigned char *|uint_least8_t *|uint_fast8_t *|uint8_t *", 0, 0, (void*)0, 0};
@@ -2912,6 +3084,7 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_auth_session_info,
   &_swigt__p_char,
   &_swigt__p_cli_credentials,
+  &_swigt__p_dom_sid,
   &_swigt__p_int,
   &_swigt__p_ldb_context,
   &_swigt__p_ldb_dn,
@@ -2925,6 +3098,8 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_param_context,
   &_swigt__p_param_opt,
   &_swigt__p_param_section,
+  &_swigt__p_security_descriptor,
+  &_swigt__p_security_token,
   &_swigt__p_short,
   &_swigt__p_signed_char,
   &_swigt__p_unsigned_char,
@@ -2938,6 +3113,7 @@ static swig_cast_info _swigc__p_TALLOC_CTX[] = {  {&_swigt__p_TALLOC_CTX, 0, 0,
 static swig_cast_info _swigc__p_auth_session_info[] = {  {&_swigt__p_auth_session_info, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_char[] = {  {&_swigt__p_char, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_cli_credentials[] = {  {&_swigt__p_cli_credentials, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_dom_sid[] = {  {&_swigt__p_dom_sid, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_int[] = {  {&_swigt__p_int, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_ldb_context[] = {  {&_swigt__p_ldb_context, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_ldb_dn[] = {  {&_swigt__p_ldb_dn, 0, 0, 0},{0, 0, 0, 0}};
@@ -2951,6 +3127,8 @@ static swig_cast_info _swigc__p_long_long[] = {  {&_swigt__p_long_long, 0, 0, 0}
 static swig_cast_info _swigc__p_param_context[] = {  {&_swigt__p_param_context, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_param_opt[] = {  {&_swigt__p_param_opt, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_param_section[] = {  {&_swigt__p_param_section, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_security_descriptor[] = {  {&_swigt__p_security_descriptor, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_security_token[] = {  {&_swigt__p_security_token, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_short[] = {  {&_swigt__p_short, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_signed_char[] = {  {&_swigt__p_signed_char, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_unsigned_char[] = {  {&_swigt__p_unsigned_char, 0, 0, 0},{0, 0, 0, 0}};
@@ -2964,6 +3142,7 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_auth_session_info,
   _swigc__p_char,
   _swigc__p_cli_credentials,
+  _swigc__p_dom_sid,
   _swigc__p_int,
   _swigc__p_ldb_context,
   _swigc__p_ldb_dn,
@@ -2977,6 +3156,8 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_param_context,
   _swigc__p_param_opt,
   _swigc__p_param_section,
+  _swigc__p_security_descriptor,
+  _swigc__p_security_token,
   _swigc__p_short,
   _swigc__p_signed_char,
   _swigc__p_unsigned_char,
diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index 5332a9f9ff..34191b7269 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -433,10 +433,8 @@ def provision(lp, setup_dir, subobj, message, blank, paths, session_info,
 
     message("Pre-loading the Samba 4 and AD schema")
 
-    samdb = open_ldb(session_info, credentials, paths.samdb)
-
+    samdb = SamDB(paths.samdb, session_info, credentials)
     samdb.set_domain_sid(subobj.domainsid)
-
     load_schema(setup_dir, subobj, samdb)
 
     samdb.transaction_start()
@@ -650,7 +648,7 @@ def load_schema(setup_dir, subobj, samdb):
     src = os.path.join(setup_dir, "provision_schema_basedn_modify.ldif")
     head_data = open(src, 'r').read()
     head_data = substitute_var(head_data, subobj.subst_vars())
-    samdb.attach_dsdb_schema_from_ldif(head_data, schema_data)
+    samdb.attach_schema_from_ldif(head_data, schema_data)
 
 
 def join_domain(domain, netbios_name, join_type, creds, message):
diff --git a/source4/scripting/python/samba/samdb.py b/source4/scripting/python/samba/samdb.py
index 50164bf590..73426121a6 100644
--- a/source4/scripting/python/samba/samdb.py
+++ b/source4/scripting/python/samba/samdb.py
@@ -21,6 +21,7 @@
 #
 
 import samba
+import misc
 
 class SamDB(samba.Ldb):
     def add_foreign(self, domaindn, sid, desc):
@@ -114,4 +115,8 @@ member: %s
         enable_account(self, user_dn)
         self.transaction_commit()
 
+    def set_domain_sid(self, sid):
+        misc.samdb_set_domain_sid(self, sid)
 
+    def attach_schema_from_ldif(self, pf, df):
+        misc.dsdb_attach_schema_from_ldif_file(self, pf, df)
-- 
cgit 


From 323c174be37214d561a5d525a7c3eef47ac700e8 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 17 Dec 2007 12:19:45 +0100
Subject: r26506: Start running (really trivial) tests for upgrade script.
 (This used to be commit 73bd4a9566d15f85a971e3a87cefbec2e2eece1c)

---
 source4/scripting/python/samba/tests/upgrade.py |   2 +-
 source4/scripting/python/samba/upgrade.py       | 602 ++++++++++++------------
 2 files changed, 302 insertions(+), 302 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/tests/upgrade.py b/source4/scripting/python/samba/tests/upgrade.py
index f46d869656..a25743425b 100644
--- a/source4/scripting/python/samba/tests/upgrade.py
+++ b/source4/scripting/python/samba/tests/upgrade.py
@@ -25,4 +25,4 @@ class RegkeyDnTests(TestCase):
         self.assertEquals("hive=NONE", regkey_to_dn(""))
 
     def test_nested(self):
-        self.assertEquals("key=foo,key=bar,hive=NONE", regkey_to_dn("foo/bar"))
+        self.assertEquals("key=bar,key=foo,hive=NONE", regkey_to_dn("foo/bar"))
diff --git a/source4/scripting/python/samba/upgrade.py b/source4/scripting/python/samba/upgrade.py
index 1908e3ea55..783cc008d5 100644
--- a/source4/scripting/python/samba/upgrade.py
+++ b/source4/scripting/python/samba/upgrade.py
@@ -11,17 +11,19 @@ from provision import findnss
 import provision
 import grp
 import pwd
-from uuid import uuid4
-from param import default_configuration
+import uuid
 
 def regkey_to_dn(name):
     """Convert a registry key to a DN."""
-	dn = "hive=NONE"
+    dn = "hive=NONE"
 
-    for el in name.split("/")[1:]:
+    if name == "":
+        return dn
+
+    for el in name.split("/"):
         dn = "key=%s," % el + dn
 
-	return dn
+    return dn
 
 # Where prefix is any of:
 # - HKLM
@@ -33,39 +35,39 @@ def regkey_to_dn(name):
 
 def upgrade_registry(regdb,prefix,ldb):
     """Migrate registry contents."""
-    assert regdb is not None:
-	prefix_up = prefix.upper()
-	ldif = []
+    assert regdb is not None
+    prefix_up = prefix.upper()
+    ldif = []
 
     for rk in regdb.keys:
-		pts = rk.name.split("/")
+        pts = rk.name.split("/")
 
-		# Only handle selected hive
+        # Only handle selected hive
         if pts[0].upper() != prefix_up:
-			continue
+            continue
 
-		keydn = regkey_to_dn(rk.name)
+        keydn = regkey_to_dn(rk.name)
 
-		pts = rk.name.split("/")
+        pts = rk.name.split("/")
 
-		# Convert key name to dn
-		ldif[rk.name] = """
+        # Convert key name to dn
+        ldif[rk.name] = """
 dn: %s
 name: %s
 
 """ % (keydn, pts[0])
-		
+        
         for rv in rk.values:
-			ldif[rk.name + " (" + rv.name + ")"] = """
+            ldif[rk.name + " (" + rv.name + ")"] = """
 dn: %s,value=%s
 value: %s
 type: %d
 data:: %s""" % (keydn, rv.name, rv.name, rv.type, ldb.encode(rv.data))
 
-	return ldif
+    return ldif
 
 def upgrade_sam_policy(samba3,dn):
-	ldif = """
+    ldif = """
 dn: %s
 changetype: modify
 replace: minPwdLength
@@ -80,30 +82,30 @@ samba3BadLockoutMinutes: %d
 samba3DisconnectTime: %d
 
 """ % (dn, samba3.policy.min_password_length, 
-	samba3.policy.password_history, samba3.policy.minimum_password_age,
-	samba3.policy.maximum_password_age, samba3.policy.lockout_duration,
-	samba3.policy.reset_count_minutes, samba3.policy.user_must_logon_to_change_password,
-	samba3.policy.bad_lockout_minutes, samba3.policy.disconnect_time)
-	
-	return ldif
+    samba3.policy.password_history, samba3.policy.minimum_password_age,
+    samba3.policy.maximum_password_age, samba3.policy.lockout_duration,
+    samba3.policy.reset_count_minutes, samba3.policy.user_must_logon_to_change_password,
+    samba3.policy.bad_lockout_minutes, samba3.policy.disconnect_time)
+    
+    return ldif
 
 def upgrade_sam_account(ldb,acc,domaindn,domainsid):
     """Upgrade a SAM account."""
     if acc.nt_username is None or acc.nt_username == "":
-		acc.nt_username = acc.username
+        acc.nt_username = acc.username
 
     if acc.fullname is None:
-		acc.fullname = pwd.getpwnam(acc.fullname)[4]
+        acc.fullname = pwd.getpwnam(acc.fullname)[4]
 
-	acc.fullname = acc.fullname.split(",")[0]
+    acc.fullname = acc.fullname.split(",")[0]
 
     if acc.fullname is None:
-		acc.fullname = acc.username
-	
-	assert acc.fullname is not None
-	assert acc.nt_username is not None
+        acc.fullname = acc.username
+    
+    assert acc.fullname is not None
+    assert acc.nt_username is not None
 
-	ldif = """dn: cn=%s,%s
+    ldif = """dn: cn=%s,%s
 objectClass: top
 objectClass: user
 lastLogon: %d
@@ -136,31 +138,31 @@ acc.acct_desc, acc.group_rid, acc.bad_password_count, acc.logon_count,
 acc.domain, acc.dir_drive, acc.munged_dial, acc.homedir, acc.logon_script, 
 acc.profile_path, acc.workstations, acc.kickoff_time, acc.bad_password_time, 
 acc.pass_last_set_time, acc.pass_can_change_time, acc.pass_must_change_time, domainsid, acc.user_rid,
-	ldb.encode(acc.lm_pw), ldb.encode(acc.nt_pw))
+    ldb.encode(acc.lm_pw), ldb.encode(acc.nt_pw))
 
-	return ldif
+    return ldif
 
 def upgrade_sam_group(group,domaindn):
     """Upgrade a SAM group."""
-	if group.sid_name_use == 5: # Well-known group
-		return None
+    if group.sid_name_use == 5: # Well-known group
+        return None
 
     if group.nt_name in ("Domain Guests", "Domain Users", "Domain Admins"):
-		return None
-	
+        return None
+    
     if group.gid == -1:
-		gr = grp.getgrnam(grp.nt_name)
+        gr = grp.getgrnam(grp.nt_name)
     else:
-		gr = grp.getgrgid(grp.gid)
+        gr = grp.getgrgid(grp.gid)
 
     if gr is None:
-		group.unixname = "UNKNOWN"
+        group.unixname = "UNKNOWN"
     else:
-		group.unixname = gr.gr_name
+        group.unixname = gr.gr_name
 
-	assert group.unixname is not None
-	
-	ldif = """dn: cn=%s,%s
+    assert group.unixname is not None
+    
+    ldif = """dn: cn=%s,%s
 objectClass: top
 objectClass: group
 description: %s
@@ -171,11 +173,11 @@ samba3SidNameUse: %d
 """ % (group.nt_name, domaindn, 
 group.comment, group.nt_name, group.sid, group.unixname, group.sid_name_use)
 
-	return ldif
+    return ldif
 
 def upgrade_winbind(samba3,domaindn):
-	ldif = """
-		
+    ldif = """
+        
 dn: dc=none
 userHwm: %d
 groupHwm: %d
@@ -183,48 +185,48 @@ groupHwm: %d
 """ % (samba3.idmap.user_hwm, samba3.idmap.group_hwm)
 
     for m in samba3.idmap.mappings:
-		ldif += """
+        ldif += """
 dn: SID=%s,%s
 SID: %s
 type: %d
 unixID: %d""" % (m.sid, domaindn, m.sid, m.type, m.unix_id)
-	
-	return ldif
+    
+    return ldif
 
 def upgrade_wins(samba3):
     """Upgrade the WINS database."""
-	ldif = ""
-	version_id = 0
+    ldif = ""
+    version_id = 0
 
     for e in samba3.winsentries:
-		now = sys.nttime()
-		ttl = sys.unix2nttime(e.ttl)
+        now = sys.nttime()
+        ttl = sys.unix2nttime(e.ttl)
 
-		version_id+=1
+        version_id+=1
 
         numIPs = len(e.ips)
 
         if e.type == 0x1C:
-			rType = 0x2
+            rType = 0x2
         elif e.type & 0x80:
             if numIPs > 1:
-				rType = 0x2
+                rType = 0x2
             else:
-				rType = 0x1
+                rType = 0x1
         else:
             if numIPs > 1:
-				rType = 0x3
+                rType = 0x3
             else:
-				rType = 0x0
+                rType = 0x0
 
         if ttl > now:
-			rState = 0x0 # active
+            rState = 0x0 # active
         else:
-			rState = 0x1 # released
+            rState = 0x1 # released
 
-		nType = ((e.nb_flags & 0x60)>>5)
+        nType = ((e.nb_flags & 0x60)>>5)
 
-		ldif += """
+        ldif += """
 dn: name=%s,type=0x%02X
 type: 0x%02X
 name: %s
@@ -240,324 +242,322 @@ versionID: %llu
    ldaptime(ttl), version_id)
 
         for ip in e.ips:
-			ldif += "address: %s\n" % ip
+            ldif += "address: %s\n" % ip
 
-	ldif += """
+    ldif += """
 dn: CN=VERSION
 objectClass: winsMaxVersion
 maxVersion: %llu
 """ % version_id
 
-	return ldif
+    return ldif
 
 def upgrade_provision(lp, samba3):
-	subobj = Object()
+    subobj = Object()
 
-	domainname = samba3.configuration.get("workgroup")
-	
+    domainname = samba3.configuration.get("workgroup")
+    
     if domainname is None:
-		domainname = samba3.secrets.domains[0].name
-		print "No domain specified in smb.conf file, assuming '%s'\n" % domainname
-	
-	domsec = samba3.find_domainsecrets(domainname)
-	hostsec = samba3.find_domainsecrets(hostname())
-	realm = samba3.configuration.get("realm")
+        domainname = samba3.secrets.domains[0].name
+        print "No domain specified in smb.conf file, assuming '%s'\n" % domainname
+    
+    domsec = samba3.find_domainsecrets(domainname)
+    hostsec = samba3.find_domainsecrets(hostname())
+    realm = samba3.configuration.get("realm")
 
     if realm is None:
-		realm = domainname
-		print "No realm specified in smb.conf file, assuming '%s'\n" % realm
-	random_init(local)
+        realm = domainname
+        print "No realm specified in smb.conf file, assuming '%s'\n" % realm
+    random_init(local)
 
-	subobj.realm        = realm
-	subobj.domain       = domainname
-	subobj.hostname     = hostname()
+    subobj.realm        = realm
+    subobj.domain       = domainname
+    subobj.hostname     = hostname()
 
-	assert subobj.realm is not None
-	assert subobj.domain is not None
-	assert subobj.hostname is not None
+    assert subobj.realm is not None
+    assert subobj.domain is not None
+    assert subobj.hostname is not None
 
-	subobj.HOSTIP       = hostip()
+    subobj.HOSTIP       = hostip()
     if domsec is not None:
-		subobj.DOMAINGUID   = domsec.guid
-		subobj.DOMAINSID    = domsec.sid
+        subobj.DOMAINGUID   = domsec.guid
+        subobj.DOMAINSID    = domsec.sid
     else:
-		print "Can't find domain secrets for '%s'; using random SID and GUID\n" % domainname
-		subobj.DOMAINGUID = uuid4()
-		subobj.DOMAINSID = randsid()
-	
+        print "Can't find domain secrets for '%s'; using random SID and GUID\n" % domainname
+        subobj.DOMAINGUID = uuid.random()
+        subobj.DOMAINSID = randsid()
+    
     if hostsec:
-		subobj.HOSTGUID     = hostsec.guid
+        subobj.HOSTGUID     = hostsec.guid
     else:
-		subobj.HOSTGUID = uuid4()
-	subobj.invocationid = uuid4()
-	subobj.krbtgtpass   = randpass(12)
-	subobj.machinepass  = randpass(12)
-	subobj.adminpass    = randpass(12)
-	subobj.datestring   = datestring()
-	subobj.root         = findnss(pwd.getpwnam, "root")[4]
-	subobj.nobody       = findnss(pwd.getpwnam, "nobody")[4]
-	subobj.nogroup      = findnss(grp.getgrnam, "nogroup", "nobody")[2]
-	subobj.wheel        = findnss(grp.getgrnam, "wheel", "root")[2]
-	subobj.users        = findnss(grp.getgrnam, "users", "guest", "other")[2]
-	subobj.dnsdomain    = subobj.realm.lower()
-	subobj.dnsname      = "%s.%s" % (subobj.hostname.lower(), subobj.dnsdomain)
-	subobj.basedn       = "DC=" + ",DC=".join(subobj.realm.split("."))
-	rdn_list = subobj.dnsdomain.split(".")
-	subobj.domaindn     = "DC=" + ",DC=".join(rdn_list)
-	subobj.domaindn_ldb = "users.ldb"
-	subobj.rootdn       = subobj.domaindn
-
-	modules_list        = ["rootdse",
-					"kludge_acl",
-					"paged_results",
-					"server_sort",
-					"extended_dn",
-					"asq",
-					"samldb",
-					"password_hash",
-					"operational",
-					"objectclass",
-					"rdn_name",
-					"show_deleted",
-					"partition"]
-	subobj.modules_list = ",".join(modules_list)
-
-	return subobj
+        subobj.HOSTGUID = uuid.random()
+    subobj.invocationid = uuid.random()
+    subobj.krbtgtpass   = randpass(12)
+    subobj.machinepass  = randpass(12)
+    subobj.adminpass    = randpass(12)
+    subobj.datestring   = datestring()
+    subobj.root         = findnss(pwd.getpwnam, "root")[4]
+    subobj.nobody       = findnss(pwd.getpwnam, "nobody")[4]
+    subobj.nogroup      = findnss(grp.getgrnam, "nogroup", "nobody")[2]
+    subobj.wheel        = findnss(grp.getgrnam, "wheel", "root")[2]
+    subobj.users        = findnss(grp.getgrnam, "users", "guest", "other")[2]
+    subobj.dnsdomain    = subobj.realm.lower()
+    subobj.dnsname      = "%s.%s" % (subobj.hostname.lower(), subobj.dnsdomain)
+    subobj.basedn       = "DC=" + ",DC=".join(subobj.realm.split("."))
+    rdn_list = subobj.dnsdomain.split(".")
+    subobj.domaindn     = "DC=" + ",DC=".join(rdn_list)
+    subobj.domaindn_ldb = "users.ldb"
+    subobj.rootdn       = subobj.domaindn
+
+    modules_list        = ["rootdse",
+                    "kludge_acl",
+                    "paged_results",
+                    "server_sort",
+                    "extended_dn",
+                    "asq",
+                    "samldb",
+                    "password_hash",
+                    "operational",
+                    "objectclass",
+                    "rdn_name",
+                    "show_deleted",
+                    "partition"]
+    subobj.modules_list = ",".join(modules_list)
+
+    return subobj
 
 smbconf_keep = [
-	"dos charset", 
-	"unix charset",
-	"display charset",
-	"comment",
-	"path",
-	"directory",
-	"workgroup",
-	"realm",
-	"netbios name",
-	"netbios aliases",
-	"netbios scope",
-	"server string",
-	"interfaces",
-	"bind interfaces only",
-	"security",
-	"auth methods",
-	"encrypt passwords",
-	"null passwords",
-	"obey pam restrictions",
-	"password server",
-	"smb passwd file",
-	"private dir",
-	"passwd chat",
-	"password level",
-	"lanman auth",
-	"ntlm auth",
-	"client NTLMv2 auth",
-	"client lanman auth",
-	"client plaintext auth",
-	"read only",
-	"hosts allow",
-	"hosts deny",
-	"log level",
-	"debuglevel",
-	"log file",
-	"smb ports",
-	"large readwrite",
-	"max protocol",
-	"min protocol",
-	"unicode",
-	"read raw",
-	"write raw",
-	"disable netbios",
-	"nt status support",
-	"announce version",
-	"announce as",
-	"max mux",
-	"max xmit",
-	"name resolve order",
-	"max wins ttl",
-	"min wins ttl",
-	"time server",
-	"unix extensions",
-	"use spnego",
-	"server signing",
-	"client signing",
-	"max connections",
-	"paranoid server security",
-	"socket options",
-	"strict sync",
-	"max print jobs",
-	"printable",
-	"print ok",
-	"printer name",
-	"printer",
-	"map system",
-	"map hidden",
-	"map archive",
-	"preferred master",
-	"prefered master",
-	"local master",
-	"browseable",
-	"browsable",
-	"wins server",
-	"wins support",
-	"csc policy",
-	"strict locking",
-	"preload",
-	"auto services",
-	"lock dir",
-	"lock directory",
-	"pid directory",
-	"socket address",
-	"copy",
-	"include",
-	"available",
-	"volume",
-	"fstype",
-	"panic action",
-	"msdfs root",
-	"host msdfs",
-	"winbind separator"]
+    "dos charset", 
+    "unix charset",
+    "display charset",
+    "comment",
+    "path",
+    "directory",
+    "workgroup",
+    "realm",
+    "netbios name",
+    "netbios aliases",
+    "netbios scope",
+    "server string",
+    "interfaces",
+    "bind interfaces only",
+    "security",
+    "auth methods",
+    "encrypt passwords",
+    "null passwords",
+    "obey pam restrictions",
+    "password server",
+    "smb passwd file",
+    "private dir",
+    "passwd chat",
+    "password level",
+    "lanman auth",
+    "ntlm auth",
+    "client NTLMv2 auth",
+    "client lanman auth",
+    "client plaintext auth",
+    "read only",
+    "hosts allow",
+    "hosts deny",
+    "log level",
+    "debuglevel",
+    "log file",
+    "smb ports",
+    "large readwrite",
+    "max protocol",
+    "min protocol",
+    "unicode",
+    "read raw",
+    "write raw",
+    "disable netbios",
+    "nt status support",
+    "announce version",
+    "announce as",
+    "max mux",
+    "max xmit",
+    "name resolve order",
+    "max wins ttl",
+    "min wins ttl",
+    "time server",
+    "unix extensions",
+    "use spnego",
+    "server signing",
+    "client signing",
+    "max connections",
+    "paranoid server security",
+    "socket options",
+    "strict sync",
+    "max print jobs",
+    "printable",
+    "print ok",
+    "printer name",
+    "printer",
+    "map system",
+    "map hidden",
+    "map archive",
+    "preferred master",
+    "prefered master",
+    "local master",
+    "browseable",
+    "browsable",
+    "wins server",
+    "wins support",
+    "csc policy",
+    "strict locking",
+    "preload",
+    "auto services",
+    "lock dir",
+    "lock directory",
+    "pid directory",
+    "socket address",
+    "copy",
+    "include",
+    "available",
+    "volume",
+    "fstype",
+    "panic action",
+    "msdfs root",
+    "host msdfs",
+    "winbind separator"]
 
-#
-#   Remove configuration variables not present in Samba4
-#	oldconf: Old configuration structure
-#	mark: Whether removed configuration variables should be 
-#		kept in the new configuration as "samba3:<name>"
 def upgrade_smbconf(oldconf,mark):
-	data = oldconf.data()
-	newconf = param_init()
-
-	for (s in data) {
-		for (p in data[s]) {
-			keep = False
-			for (k in smbconf_keep) { 
+    """Remove configuration variables not present in Samba4
+
+    :param oldconf: Old configuration structure
+    :param mark: Whether removed configuration variables should be 
+        kept in the new configuration as "samba3:<name>"
+    """
+    data = oldconf.data()
+    newconf = param_init()
+
+    for s in data:
+        for p in data[s]:
+            keep = False
+            for k in smbconf_keep:
                 if smbconf_keep[k] == p:
-					keep = True
-					break
-			}
+                    keep = True
+                    break
 
             if keep:
-				newconf.set(s, p, oldconf.get(s, p))
+                newconf.set(s, p, oldconf.get(s, p))
             elif mark:
-				newconf.set(s, "samba3:"+p, oldconf.get(s,p))
-		}
-	}
+                newconf.set(s, "samba3:"+p, oldconf.get(s,p))
 
     if oldconf.get("domain logons") == "True":
-		newconf.set("server role", "domain controller")
+        newconf.set("server role", "domain controller")
     else:
         if oldconf.get("security") == "user":
-			newconf.set("server role", "standalone")
+            newconf.set("server role", "standalone")
         else:
-			newconf.set("server role", "member server")
+            newconf.set("server role", "member server")
 
-	return newconf
+    return newconf
 
 def upgrade(subobj, samba3, message, paths, session_info, credentials):
-	ret = 0
-	lp = loadparm_init()
-	samdb = Ldb(paths.samdb, session_info=session_info, credentials=credentials)
+    ret = 0
+    lp = loadparm_init()
+    samdb = Ldb(paths.samdb, session_info=session_info, credentials=credentials)
 
-	message("Writing configuration")
-	newconf = upgrade_smbconf(samba3.configuration,True)
-	newconf.save(paths.smbconf)
+    message("Writing configuration")
+    newconf = upgrade_smbconf(samba3.configuration,True)
+    newconf.save(paths.smbconf)
 
-	message("Importing account policies")
-	ldif = upgrade_sam_policy(samba3,subobj.BASEDN)
-	samdb.modify(ldif)
-	regdb = Ldb(paths.hklm)
+    message("Importing account policies")
+    ldif = upgrade_sam_policy(samba3,subobj.BASEDN)
+    samdb.modify(ldif)
+    regdb = Ldb(paths.hklm)
 
-	regdb.modify("
+    regdb.modify("""
 dn: value=RefusePasswordChange,key=Parameters,key=Netlogon,key=Services,key=CurrentControlSet,key=System,HIVE=NONE
 replace: type
 type: 4
 replace: data
 data: %d
-" % samba3.policy.refuse_machine_password_change)
+""" % samba3.policy.refuse_machine_password_change)
 
-	message("Importing users")
+    message("Importing users")
     for account in samba3.samaccounts:
-		msg = "... " + account.username
-		ldif = upgrade_sam_account(samdb, accounts,subobj.BASEDN,subobj.DOMAINSID)
+        msg = "... " + account.username
+        ldif = upgrade_sam_account(samdb, accounts,subobj.BASEDN,subobj.DOMAINSID)
         try:
             samdb.add(ldif)
         except LdbError, e:
             # FIXME: Ignore 'Record exists' errors
-			msg += "... error: " + str(e)
-			ret += 1; 
-		message(msg)
+            msg += "... error: " + str(e)
+            ret += 1; 
+        message(msg)
 
-	message("Importing groups")
+    message("Importing groups")
     for mapping in samba3.groupmappings:
-		msg = "... " + mapping.nt_name
-		ldif = upgrade_sam_group(mapping, subobj.BASEDN)
+        msg = "... " + mapping.nt_name
+        ldif = upgrade_sam_group(mapping, subobj.BASEDN)
         if ldif is not None:
             try:
-			    samdb.add(ldif)
+                samdb.add(ldif)
             except LdbError, e:
                 # FIXME: Ignore 'Record exists' errors
-				msg += "... error: " + str(e)
-				ret += 1
-		message(msg)
+                msg += "... error: " + str(e)
+                ret += 1
+        message(msg)
 
-	message("Importing registry data")
+    message("Importing registry data")
     for hive in ["hkcr","hkcu","hklm","hkpd","hku","hkpt"]:
-		message("... " + hive)
-		regdb = Ldb(paths[hive])
-		ldif = upgrade_registry(samba3.registry, hive, regdb)
-		for (var j in ldif) {
-			var msg = "... ... " + j
+        message("... " + hive)
+        regdb = Ldb(paths[hive])
+        ldif = upgrade_registry(samba3.registry, hive, regdb)
+        for j in ldif:
+            msg = "... ... " + j
             try:
                 regdb.add(ldif[j])
             except LdbError, e:
                 # FIXME: Ignore 'Record exists' errors
-				msg += "... error: " + str(e)
-				ret += 1
-			message(msg)
+                msg += "... error: " + str(e)
+                ret += 1
+            message(msg)
 
-	message("Importing WINS data")
-	winsdb = Ldb(paths.winsdb)
-	ldb_erase(winsdb)
+    message("Importing WINS data")
+    winsdb = Ldb(paths.winsdb)
+    ldb_erase(winsdb)
 
-	ldif = upgrade_wins(samba3)
-	winsdb.add(ldif)
+    ldif = upgrade_wins(samba3)
+    winsdb.add(ldif)
 
-	# figure out ldapurl, if applicable
-	ldapurl = None
-	pdb = samba3.configuration.get_list("passdb backend")
+    # figure out ldapurl, if applicable
+    ldapurl = None
+    pdb = samba3.configuration.get_list("passdb backend")
     if pdb is not None:
         for backend in pdb:
             if len(backend) >= 7 and backend[0:7] == "ldapsam":
                 ldapurl = backend[7:]
 
-	# URL was not specified in passdb backend but ldap /is/ used
+    # URL was not specified in passdb backend but ldap /is/ used
     if ldapurl == "":
-	    ldapurl = "ldap://%s" % samba3.configuration.get("ldap server")
+        ldapurl = "ldap://%s" % samba3.configuration.get("ldap server")
 
-	# Enable samba3sam module if original passdb backend was ldap
+    # Enable samba3sam module if original passdb backend was ldap
     if ldapurl is not None:
-		message("Enabling Samba3 LDAP mappings for SAM database")
+        message("Enabling Samba3 LDAP mappings for SAM database")
 
-		samdb.modify("""
+        samdb.modify("""
 dn: @MODULES
 changetype: modify
 replace: @LIST
 @LIST: samldb,operational,objectguid,rdn_name,samba3sam
 """)
 
-		samdb.add("""
+        samdb.add("""
 dn: @MAP=samba3sam
-@MAP_URL: %s""", ldapurl))
+@MAP_URL: %s""" % ldapurl)
 
-	return ret
+    return ret
 
 def upgrade_verify(subobj, samba3, paths, message):
-	message("Verifying account policies")
+    message("Verifying account policies")
 
-	samldb = Ldb(paths.samdb)
+    samldb = Ldb(paths.samdb)
 
     for account in samba3.samaccounts:
-		msg = samldb.search("(&(sAMAccountName=" + account.nt_username + ")(objectclass=user))")
-		assert(len(msg) >= 1)
-	
-	# FIXME
+        msg = samldb.search("(&(sAMAccountName=" + account.nt_username + ")(objectclass=user))")
+        assert(len(msg) >= 1)
+    
+    # FIXME
-- 
cgit 


From ca74c6e6c426e6b69ba31676e2b06dda29b5409e Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 17 Dec 2007 20:03:06 +0100
Subject: r26513: Update substitution dictionary for ldifs. (This used to be
 commit 60fb2de2119cb2f42f858868e39c3b0d303ac20f)

---
 source4/scripting/python/misc.i             |  3 +++
 source4/scripting/python/misc.py            |  1 +
 source4/scripting/python/misc_wrap.c        | 14 ++++++++++++++
 source4/scripting/python/samba/__init__.py  |  3 +++
 source4/scripting/python/samba/provision.py |  6 ++++++
 5 files changed, 27 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/misc.i b/source4/scripting/python/misc.i
index 518011ea43..eda0db2c3d 100644
--- a/source4/scripting/python/misc.i
+++ b/source4/scripting/python/misc.i
@@ -59,3 +59,6 @@ bool samdb_set_domain_sid(struct ldb_context *ldb,
                           const struct dom_sid *dom_sid_in);
 
 WERROR dsdb_attach_schema_from_ldif_file(struct ldb_context *ldb, const char *pf, const char *df);
+
+%rename(version) samba_version_string;
+const char *samba_version_string(void);
diff --git a/source4/scripting/python/misc.py b/source4/scripting/python/misc.py
index 525869ff58..228ab24dbf 100644
--- a/source4/scripting/python/misc.py
+++ b/source4/scripting/python/misc.py
@@ -67,5 +67,6 @@ ldb_set_session_info = _misc.ldb_set_session_info
 ldb_set_loadparm = _misc.ldb_set_loadparm
 samdb_set_domain_sid = _misc.samdb_set_domain_sid
 dsdb_attach_schema_from_ldif_file = _misc.dsdb_attach_schema_from_ldif_file
+version = _misc.version
 
 
diff --git a/source4/scripting/python/misc_wrap.c b/source4/scripting/python/misc_wrap.c
index 7db909d392..effabdecef 100644
--- a/source4/scripting/python/misc_wrap.c
+++ b/source4/scripting/python/misc_wrap.c
@@ -3038,6 +3038,19 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_version(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  char *result = 0 ;
+  
+  if (!SWIG_Python_UnpackTuple(args,"version",0,0,0)) SWIG_fail;
+  result = (char *)samba_version_string();
+  resultobj = SWIG_FromCharPtr((const char *)result);
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
 static PyMethodDef SwigMethods[] = {
 	 { (char *)"random_password", (PyCFunction) _wrap_random_password, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"ldb_set_credentials", (PyCFunction) _wrap_ldb_set_credentials, METH_VARARGS | METH_KEYWORDS, NULL},
@@ -3045,6 +3058,7 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"ldb_set_loadparm", (PyCFunction) _wrap_ldb_set_loadparm, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"samdb_set_domain_sid", (PyCFunction) _wrap_samdb_set_domain_sid, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"dsdb_attach_schema_from_ldif_file", (PyCFunction) _wrap_dsdb_attach_schema_from_ldif_file, METH_VARARGS | METH_KEYWORDS, NULL},
+	 { (char *)"version", (PyCFunction)_wrap_version, METH_NOARGS, NULL},
 	 { NULL, NULL, 0, NULL }
 };
 
diff --git a/source4/scripting/python/samba/__init__.py b/source4/scripting/python/samba/__init__.py
index 511dcd905a..f89ac39ac7 100644
--- a/source4/scripting/python/samba/__init__.py
+++ b/source4/scripting/python/samba/__init__.py
@@ -122,6 +122,8 @@ def substitute_var(text, values):
     for (name, value) in values.items():
         text = text.replace("${%s}" % name, value)
 
+    assert "${" not in text, text
+
     return text
 
 
@@ -133,3 +135,4 @@ def valid_netbios_name(name):
         return False
     return True
 
+version = misc.version
diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index 34191b7269..7d7b85c13e 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -14,6 +14,7 @@ import uuid, misc
 from socket import gethostname, gethostbyname
 import param
 import registry
+import samba
 from samba import Ldb, substitute_var, valid_netbios_name
 from samba.samdb import SamDB
 import security
@@ -56,6 +57,7 @@ class ProvisionSettings(object):
         self.schemedn_ldb = None
         self.s4_ldapi_path = None
         self.policyguid = None
+        self.extensibleobject = None
 
     def subst_vars(self):
         return {"SCHEMADN": self.schemadn,
@@ -77,6 +79,7 @@ class ProvisionSettings(object):
                 "NETBIOSNAME": self.netbiosname,
                 "DNSNAME": self.dnsname,
                 "ROOTDN": self.rootdn,
+                "DOMAIN": self.domain,
                 "DNSDOMAIN": self.dnsdomain,
                 "REALM": self.realm,
                 "DEFAULTSITE": self.defaultsite,
@@ -89,6 +92,9 @@ class ProvisionSettings(object):
                 "POLICYGUID": self.policyguid,
                 "RDN_DC": self.rdn_dc,
                 "DOMAINGUID_MOD": self.domainguid_mod,
+                "VERSION": samba.version(),
+                "ACI": "# no aci for local ldb",
+                "EXTENSIBLEOBJECT": self.extensibleobject,
                 }
 
     def fix(self, paths):
-- 
cgit 


From c619f86efc4f502f7127a1fd2ac165dd970658f9 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 17 Dec 2007 23:16:05 +0100
Subject: r26516: Fix line splitting in subunitrun. (This used to be commit
 623b7b31144f9da5e256e5541d04db8698dd39d3)

---
 source4/scripting/python/subunit/__init__.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/subunit/__init__.py b/source4/scripting/python/subunit/__init__.py
index 4f24803e63..4d3434a3ea 100644
--- a/source4/scripting/python/subunit/__init__.py
+++ b/source4/scripting/python/subunit/__init__.py
@@ -215,14 +215,14 @@ class TestProtocolClient(unittest.TestResult):
     def addError(self, test, error):
         """Report an error in test test."""
         self._stream.write("error: %s [\n" % (test.shortDescription() or str(test)))
-        for line in self._exc_info_to_string(error, test).split():
+        for line in self._exc_info_to_string(error, test).splitlines():
             self._stream.write("%s\n" % line)
         self._stream.write("]\n")
 
     def addFailure(self, test, error):
         """Report a failure in test test."""
         self._stream.write("failure: %s [\n" % (test.shortDescription() or str(test)))
-        for line in self._exc_info_to_string(error, test).split():
+        for line in self._exc_info_to_string(error, test).splitlines():
             self._stream.write("%s\n" % line)
         self._stream.write("]\n")
 
-- 
cgit 


From 57b8a8fd42f5d89f439fd9d0781bd8f561a84131 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 17 Dec 2007 23:16:12 +0100
Subject: r26517: Add functions for setting and getting parameters on a
 LoadParm.

Pass loadparm context along to Ldb contexts.
Other minor Python improvements.
(This used to be commit 7a15b486bae8fb774058b2d94cc12b7b01ee6ac0)
---
 source4/scripting/python/misc.i             |  2 +-
 source4/scripting/python/samba/provision.py | 66 +++++++++++++++--------------
 2 files changed, 36 insertions(+), 32 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/misc.i b/source4/scripting/python/misc.i
index eda0db2c3d..a0519644b8 100644
--- a/source4/scripting/python/misc.i
+++ b/source4/scripting/python/misc.i
@@ -32,7 +32,7 @@
 %import "../../auth/credentials/credentials.i"
 %import "../../param/param.i"
 %import "../../libcli/security/security.i"
-%import "../../libcli/util/errors.i";
+%import "../../libcli/util/errors.i"
 
 %rename(random_password) generate_random_str;
 char *generate_random_str(TALLOC_CTX *mem_ctx, size_t len);
diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index 7d7b85c13e..d88b8501ba 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -122,13 +122,13 @@ class ProvisionSettings(object):
         if not valid_netbios_name(self.netbiosname):
             raise InvalidNetbiosName(self.netbiosname)
 
-        if lp.get_string("workgroup").upper() != self.domain.upper():
+        if lp.get("workgroup").upper() != self.domain.upper():
             raise Error("workgroup '%s' in smb.conf must match chosen domain '%s'\n",
-                lp.get_string("workgroup"), self.domain)
+                lp.get("workgroup"), self.domain)
 
-        if lp.get_string("realm").upper() != self.realm.upper():
+        if lp.get("realm").upper() != self.realm.upper():
             raise Error("realm '%s' in smb.conf must match chosen realm '%s'\n" %
-                (lp.get_string("realm"), self.realm))
+                (lp.get("realm"), self.realm))
 
 
 class ProvisionPaths:
@@ -154,10 +154,10 @@ class ProvisionPaths:
 
 def install_ok(lp, session_info, credentials):
     """Check whether the current install seems ok."""
-    if lp.get_string("realm") == "":
+    if lp.get("realm") == "":
         return False
-    ldb = Ldb(lp.get_string("sam database"), session_info=session_info, 
-            credentials=credentials)
+    ldb = Ldb(lp.get("sam database"), session_info=session_info, 
+            credentials=credentials, lp=lp)
     if len(ldb.search("(cn=Administrator)")) != 1:
         return False
     return True
@@ -195,14 +195,16 @@ def ldb_delete(ldb):
     ldb.connect(ldb.filename)
 
 
-def open_ldb(session_info, credentials, dbname):
+def open_ldb(session_info, credentials, lp, dbname):
     assert session_info is not None
     try:
-        return Ldb(dbname, session_info=session_info, credentials=credentials)
+        return Ldb(dbname, session_info=session_info, credentials=credentials, 
+                   lp=lp)
     except LdbError, e:
         print e
         os.unlink(dbname)
-        return Ldb(dbname, session_info=session_info, credentials=credentials)
+        return Ldb(dbname, session_info=session_info, credentials=credentials,
+                   lp=lp)
 
 
 def setup_add_ldif(setup_dir, ldif, subobj, ldb):
@@ -228,10 +230,10 @@ def setup_modify_ldif(setup_dir, ldif, subobj, ldb):
         ldb.modify(msg)
 
 
-def setup_ldb(setup_dir, ldif, session_info, credentials, subobj, dbname, 
+def setup_ldb(setup_dir, ldif, session_info, credentials, subobj, lp, dbname, 
               erase=True):
     assert dbname is not None
-    ldb = open_ldb(session_info, credentials, dbname)
+    ldb = open_ldb(session_info, credentials, lp, dbname)
     assert ldb is not None
     ldb.transaction_start()
     try:
@@ -277,10 +279,10 @@ def provision_default_paths(lp, subobj):
     :param subobj: Object
     """
     paths = ProvisionPaths()
-    private_dir = lp.get_string("private dir")
+    private_dir = lp.get("private dir")
     paths.shareconf = os.path.join(private_dir, "share.ldb")
-    paths.samdb = lp.get_string("sam database") or os.path.join(private_dir, "samdb.ldb")
-    paths.secrets = lp.get_string("secrets database") or os.path.join(private_dir, "secrets.ldb")
+    paths.samdb = lp.get("sam database") or os.path.join(private_dir, "samdb.ldb")
+    paths.secrets = lp.get("secrets database") or os.path.join(private_dir, "secrets.ldb")
     paths.templates = os.path.join(private_dir, "templates.ldb")
     paths.keytab = os.path.join(private_dir, "secrets.keytab")
     paths.dns = os.path.join(private_dir, subobj.dnsdomain + ".zone")
@@ -329,22 +331,22 @@ def setup_name_mappings(subobj, ldb):
     ldb.setup_name_mapping(subobj.domaindn, sid + "-520", subobj.wheel)
 
 
-def provision_become_dc(setup_dir, subobj, message, paths, session_info, 
+def provision_become_dc(setup_dir, subobj, message, paths, lp, session_info, 
                         credentials):
     assert session_info is not None
     subobj.fix(paths)
 
     message("Setting up templates into %s" % paths.templates)
     setup_ldb(setup_dir, "provision_templates.ldif", session_info,
-              credentials, subobj, paths.templates)
+              credentials, subobj, lp, paths.templates)
 
     # Also wipes the database
     message("Setting up %s partitions" % paths.samdb)
     setup_ldb(setup_dir, "provision_partitions.ldif", session_info, 
-              credentials, subobj, paths.samdb)
+              credentials, subobj, lp, paths.samdb)
 
     samdb = SamDB(paths.samdb, session_info=session_info, 
-                  credentials=credentials)
+                  credentials=credentials, lp=lp)
     ldb.transaction_start()
     try:
         message("Setting up %s attributes" % paths.samdb)
@@ -366,9 +368,9 @@ def provision_become_dc(setup_dir, subobj, message, paths, session_info,
 
     message("Setting up %s" % paths.secrets)
     setup_ldb(setup_dir, "secrets_init.ldif", session_info, credentials, 
-              subobj, paths.secrets)
+              subobj, lp, paths.secrets)
 
-    setup_ldb(setup_dir, "secrets.ldif", session_info, credentials, subobj, 
+    setup_ldb(setup_dir, "secrets.ldif", session_info, credentials, subobj, lp,
               paths.secrets, False)
 
 
@@ -401,11 +403,11 @@ def provision(lp, setup_dir, subobj, message, blank, paths, session_info,
     # only install a new shares config db if there is none
     if not os.path.exists(paths.shareconf):
         message("Setting up share.ldb")
-        setup_ldb(setup_dir, "share.ldif", session_info, credentials, subobj, paths.shareconf)
+        setup_ldb(setup_dir, "share.ldif", session_info, credentials, subobj, lp, paths.shareconf)
 
     message("Setting up %s" % paths.secrets)
-    setup_ldb(setup_dir, "secrets_init.ldif", session_info, credentials, subobj, paths.secrets)
-    setup_ldb(setup_dir, "secrets.ldif", session_info, credentials, subobj, paths.secrets, False)
+    setup_ldb(setup_dir, "secrets_init.ldif", session_info, credentials, subobj, lp, paths.secrets)
+    setup_ldb(setup_dir, "secrets.ldif", session_info, credentials, subobj, lp, paths.secrets, False)
 
     message("Setting up registry")
     reg = registry.Registry()
@@ -414,13 +416,13 @@ def provision(lp, setup_dir, subobj, message, blank, paths, session_info,
     #reg.apply_patchfile(os.path.join(setup_dir, "provision.reg"))
 
     message("Setting up templates into %s" % paths.templates)
-    setup_ldb(setup_dir, "provision_templates.ldif", session_info, credentials, subobj, paths.templates)
+    setup_ldb(setup_dir, "provision_templates.ldif", session_info, credentials, subobj, lp, paths.templates)
 
     message("Setting up sam.ldb partitions")
     setup_ldb(setup_dir, "provision_partitions.ldif", session_info, 
-              credentials, subobj, paths.samdb)
+              credentials, subobj, lp, paths.samdb)
 
-    samdb = open_ldb(session_info, credentials, paths.samdb)
+    samdb = open_ldb(session_info, credentials, lp, paths.samdb)
     samdb.transaction_start()
     try:
         message("Setting up sam.ldb attributes")
@@ -439,7 +441,8 @@ def provision(lp, setup_dir, subobj, message, blank, paths, session_info,
 
     message("Pre-loading the Samba 4 and AD schema")
 
-    samdb = SamDB(paths.samdb, session_info, credentials)
+    samdb = SamDB(paths.samdb, session_info=session_info, 
+                  credentials=credentials, lp=lp)
     samdb.set_domain_sid(subobj.domainsid)
     load_schema(setup_dir, subobj, samdb)
 
@@ -531,7 +534,8 @@ def provision_dns(setup_dir, subobj, message, paths, session_info, credentials):
     """Write out a DNS zone file, from the info in the current database."""
     message("Setting up DNS zone: %s" % subobj.dnsdomain)
     # connect to the sam
-    ldb = SamDB(paths.samdb, session_info=session_info, credentials=credentials)
+    ldb = SamDB(paths.samdb, session_info=session_info, credentials=credentials,
+                lp=lp)
 
     # These values may have changed, due to an incoming SamSync,
     # or may not have been specified, so fetch them from the database
@@ -576,8 +580,8 @@ def provision_ldapbase(setup_dir, subobj, message, paths):
 
 def provision_guess(lp):
     """guess reasonably default options for provisioning."""
-    subobj = ProvisionSettings(realm=lp.get_string("realm").upper(),
-                               domain=lp.get_string("workgroup"),
+    subobj = ProvisionSettings(realm=lp.get("realm").upper(),
+                               domain=lp.get("workgroup"),
                                hostname=hostname(), 
                                hostip=hostip())
 
-- 
cgit 


From 12a513b47b1a1f2adeb2cb2a10ac36d02dd44065 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 17 Dec 2007 23:16:16 +0100
Subject: r26518: Fix provision of registry using Python. (This used to be
 commit 12eb38e553993b2726a803af4ae9c05229d6ebe4)

---
 source4/scripting/python/samba/provision.py | 40 +++++++++++++++++++----------
 1 file changed, 26 insertions(+), 14 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index d88b8501ba..d9863420b6 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -287,11 +287,15 @@ def provision_default_paths(lp, subobj):
     paths.keytab = os.path.join(private_dir, "secrets.keytab")
     paths.dns = os.path.join(private_dir, subobj.dnsdomain + ".zone")
     paths.winsdb = os.path.join(private_dir, "wins.ldb")
-    paths.ldap_basedn_ldif = os.path.join(private_dir, subobj.dnsdomain + ".ldif")
-    paths.ldap_config_basedn_ldif = os.path.join(private_dir, subobj.dnsdomain + "-config.ldif")
-    paths.ldap_schema_basedn_ldif = os.path.join(private_dir, subobj.dnsdomain + "-schema.ldif")
+    paths.ldap_basedn_ldif = os.path.join(private_dir, 
+                                          subobj.dnsdomain + ".ldif")
+    paths.ldap_config_basedn_ldif = os.path.join(private_dir, 
+                                             subobj.dnsdomain + "-config.ldif")
+    paths.ldap_schema_basedn_ldif = os.path.join(private_dir, 
+                                              subobj.dnsdomain + "-schema.ldif")
     paths.s4_ldapi_path = os.path.join(private_dir, "ldapi")
-    paths.phpldapadminconfig = os.path.join(private_dir, "phpldapadmin-config.php")
+    paths.phpldapadminconfig = os.path.join(private_dir, 
+                                            "phpldapadmin-config.php")
     paths.hklm = os.path.join(private_dir, "hklm.ldb")
     return paths
 
@@ -370,8 +374,8 @@ def provision_become_dc(setup_dir, subobj, message, paths, lp, session_info,
     setup_ldb(setup_dir, "secrets_init.ldif", session_info, credentials, 
               subobj, lp, paths.secrets)
 
-    setup_ldb(setup_dir, "secrets.ldif", session_info, credentials, subobj, lp,
-              paths.secrets, False)
+    setup_ldb(setup_dir, "secrets.ldif", session_info, credentials, subobj, 
+              lp, paths.secrets, False)
 
 
 def provision(lp, setup_dir, subobj, message, blank, paths, session_info, 
@@ -397,26 +401,34 @@ def provision(lp, setup_dir, subobj, message, blank, paths, session_info,
     # only install a new smb.conf if there isn't one there already
     if not os.path.exists(paths.smbconf):
         message("Setting up smb.conf")
-        setup_file(setup_dir, "provision.smb.conf", message, paths.smbconf, subobj)
+        setup_file(setup_dir, "provision.smb.conf", message, paths.smbconf, 
+                   subobj)
         lp.reload()
 
     # only install a new shares config db if there is none
     if not os.path.exists(paths.shareconf):
         message("Setting up share.ldb")
-        setup_ldb(setup_dir, "share.ldif", session_info, credentials, subobj, lp, paths.shareconf)
+        setup_ldb(setup_dir, "share.ldif", session_info, credentials, subobj, 
+                  lp, paths.shareconf)
 
     message("Setting up %s" % paths.secrets)
-    setup_ldb(setup_dir, "secrets_init.ldif", session_info, credentials, subobj, lp, paths.secrets)
-    setup_ldb(setup_dir, "secrets.ldif", session_info, credentials, subobj, lp, paths.secrets, False)
+    setup_ldb(setup_dir, "secrets_init.ldif", session_info, credentials, 
+              subobj, lp, paths.secrets)
+    setup_ldb(setup_dir, "secrets.ldif", session_info, credentials, subobj, 
+              lp, paths.secrets, False)
 
     message("Setting up registry")
     reg = registry.Registry()
-    # FIXME: Still fails for some reason:
-    #reg.mount(paths.hklm, registry.HKEY_LOCAL_MACHINE, [])
-    #reg.apply_patchfile(os.path.join(setup_dir, "provision.reg"))
+    hive = registry.Hive(paths.hklm, session_info=session_info, 
+                         credentials=credentials, lp_ctx=lp)
+    reg.mount_hive(hive, registry.HKEY_LOCAL_MACHINE, [])
+    provision_reg = os.path.join(setup_dir, "provision.reg")
+    assert os.path.exists(provision_reg)
+    reg.apply_patchfile(provision_reg)
 
     message("Setting up templates into %s" % paths.templates)
-    setup_ldb(setup_dir, "provision_templates.ldif", session_info, credentials, subobj, lp, paths.templates)
+    setup_ldb(setup_dir, "provision_templates.ldif", session_info, 
+              credentials, subobj, lp, paths.templates)
 
     message("Setting up sam.ldb partitions")
     setup_ldb(setup_dir, "provision_partitions.ldif", session_info, 
-- 
cgit 


From 63f53094efa29b76eb4136cddf19d9c5d325fc5f Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 18 Dec 2007 02:21:14 +0100
Subject: r26520: More Python updates. (This used to be commit
 a8b1fe15ac853082961132ede061fe1556ae29f7)

---
 source4/scripting/python/misc.i             |  3 ++
 source4/scripting/python/misc.py            |  2 +
 source4/scripting/python/misc_wrap.c        | 73 +++++++++++++++++++++++++++++
 source4/scripting/python/samba/__init__.py  |  4 ++
 source4/scripting/python/samba/provision.py | 13 ++---
 source4/scripting/python/samba/samdb.py     |  8 +++-
 6 files changed, 96 insertions(+), 7 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/misc.i b/source4/scripting/python/misc.i
index a0519644b8..3af10dfce9 100644
--- a/source4/scripting/python/misc.i
+++ b/source4/scripting/python/misc.i
@@ -23,6 +23,7 @@
 #include "ldb.h"
 #include "param/param.h"
 #include "dsdb/samdb/samdb.h"
+#include "lib/ldb-samba/ldif_handlers.h"
 %}
 
 %import "stdint.i"
@@ -62,3 +63,5 @@ WERROR dsdb_attach_schema_from_ldif_file(struct ldb_context *ldb, const char *pf
 
 %rename(version) samba_version_string;
 const char *samba_version_string(void);
+int dsdb_set_global_schema(struct ldb_context *ldb);
+int ldb_register_samba_handlers(struct ldb_context *ldb);
diff --git a/source4/scripting/python/misc.py b/source4/scripting/python/misc.py
index 228ab24dbf..ae900a1f62 100644
--- a/source4/scripting/python/misc.py
+++ b/source4/scripting/python/misc.py
@@ -68,5 +68,7 @@ ldb_set_loadparm = _misc.ldb_set_loadparm
 samdb_set_domain_sid = _misc.samdb_set_domain_sid
 dsdb_attach_schema_from_ldif_file = _misc.dsdb_attach_schema_from_ldif_file
 version = _misc.version
+dsdb_set_global_schema = _misc.dsdb_set_global_schema
+ldb_register_samba_handlers = _misc.ldb_register_samba_handlers
 
 
diff --git a/source4/scripting/python/misc_wrap.c b/source4/scripting/python/misc_wrap.c
index effabdecef..dc1203e2f0 100644
--- a/source4/scripting/python/misc_wrap.c
+++ b/source4/scripting/python/misc_wrap.c
@@ -2531,6 +2531,7 @@ static swig_module_info swig_module = {swig_types, 27, 0, 0, 0, 0};
 #include "ldb.h"
 #include "param/param.h"
 #include "dsdb/samdb/samdb.h"
+#include "lib/ldb-samba/ldif_handlers.h"
 
 
 SWIGINTERN int
@@ -2782,6 +2783,16 @@ SWIG_AsCharPtrAndSize(PyObject *obj, char** cptr, size_t* psize, int *alloc)
 
 
 
+
+  #define SWIG_From_long   PyInt_FromLong 
+
+
+SWIGINTERNINLINE PyObject *
+SWIG_From_int  (int value)
+{    
+  return SWIG_From_long  (value);
+}
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -3051,6 +3062,66 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_dsdb_set_global_schema(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  struct ldb_context *arg1 = (struct ldb_context *) 0 ;
+  int result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  char *  kwnames[] = {
+    (char *) "ldb", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:dsdb_set_global_schema",kwnames,&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ldb_context, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "dsdb_set_global_schema" "', argument " "1"" of type '" "struct ldb_context *""'"); 
+  }
+  arg1 = (struct ldb_context *)(argp1);
+  {
+    if (arg1 == NULL)
+    SWIG_exception(SWIG_ValueError, 
+      "ldb context must be non-NULL");
+  }
+  result = (int)dsdb_set_global_schema(arg1);
+  resultobj = SWIG_From_int((int)(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ldb_register_samba_handlers(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  struct ldb_context *arg1 = (struct ldb_context *) 0 ;
+  int result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  char *  kwnames[] = {
+    (char *) "ldb", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ldb_register_samba_handlers",kwnames,&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ldb_context, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ldb_register_samba_handlers" "', argument " "1"" of type '" "struct ldb_context *""'"); 
+  }
+  arg1 = (struct ldb_context *)(argp1);
+  {
+    if (arg1 == NULL)
+    SWIG_exception(SWIG_ValueError, 
+      "ldb context must be non-NULL");
+  }
+  result = (int)ldb_register_samba_handlers(arg1);
+  resultobj = SWIG_From_int((int)(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
 static PyMethodDef SwigMethods[] = {
 	 { (char *)"random_password", (PyCFunction) _wrap_random_password, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"ldb_set_credentials", (PyCFunction) _wrap_ldb_set_credentials, METH_VARARGS | METH_KEYWORDS, NULL},
@@ -3059,6 +3130,8 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"samdb_set_domain_sid", (PyCFunction) _wrap_samdb_set_domain_sid, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"dsdb_attach_schema_from_ldif_file", (PyCFunction) _wrap_dsdb_attach_schema_from_ldif_file, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"version", (PyCFunction)_wrap_version, METH_NOARGS, NULL},
+	 { (char *)"dsdb_set_global_schema", (PyCFunction) _wrap_dsdb_set_global_schema, METH_VARARGS | METH_KEYWORDS, NULL},
+	 { (char *)"ldb_register_samba_handlers", (PyCFunction) _wrap_ldb_register_samba_handlers, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { NULL, NULL, 0, NULL }
 };
 
diff --git a/source4/scripting/python/samba/__init__.py b/source4/scripting/python/samba/__init__.py
index f89ac39ac7..8e0eff3011 100644
--- a/source4/scripting/python/samba/__init__.py
+++ b/source4/scripting/python/samba/__init__.py
@@ -78,6 +78,10 @@ class Ldb(ldb.Ldb):
         if url:
             self.connect(url)
 
+        def msg(l,text):
+            print text
+        #self.set_debug(msg)
+
     set_credentials = misc.ldb_set_credentials
     set_session_info = misc.ldb_set_session_info
     set_loadparm = misc.ldb_set_loadparm
diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index d9863420b6..0a3c183fcc 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -306,7 +306,7 @@ def setup_name_mappings(subobj, ldb):
                      ["objectSid"])
     assert len(res) == 1
     assert "objectSid" in res[0]
-    sid = list(res[0]["objectSid"])[0]
+    sid = str(list(res[0]["objectSid"])[0])
 
     # add some foreign sids if they are not present already
     ldb.add_foreign(subobj.domaindn, "S-1-5-7", "Anonymous")
@@ -419,12 +419,12 @@ def provision(lp, setup_dir, subobj, message, blank, paths, session_info,
 
     message("Setting up registry")
     reg = registry.Registry()
-    hive = registry.Hive(paths.hklm, session_info=session_info, 
-                         credentials=credentials, lp_ctx=lp)
-    reg.mount_hive(hive, registry.HKEY_LOCAL_MACHINE, [])
+    #hive = registry.Hive(paths.hklm, session_info=session_info, 
+    #                     credentials=credentials, lp_ctx=lp)
+    #reg.mount_hive(hive, "HKEY_LOCAL_MACHINE")
     provision_reg = os.path.join(setup_dir, "provision.reg")
     assert os.path.exists(provision_reg)
-    reg.apply_patchfile(provision_reg)
+    #reg.apply_patchfile(provision_reg)
 
     message("Setting up templates into %s" % paths.templates)
     setup_ldb(setup_dir, "provision_templates.ldif", session_info, 
@@ -434,7 +434,8 @@ def provision(lp, setup_dir, subobj, message, blank, paths, session_info,
     setup_ldb(setup_dir, "provision_partitions.ldif", session_info, 
               credentials, subobj, lp, paths.samdb)
 
-    samdb = open_ldb(session_info, credentials, lp, paths.samdb)
+    samdb = SamDB(paths.samdb, session_info=session_info, 
+                  credentials=credentials, lp=lp)
     samdb.transaction_start()
     try:
         message("Setting up sam.ldb attributes")
diff --git a/source4/scripting/python/samba/samdb.py b/source4/scripting/python/samba/samdb.py
index 73426121a6..ce06efa3de 100644
--- a/source4/scripting/python/samba/samdb.py
+++ b/source4/scripting/python/samba/samdb.py
@@ -22,8 +22,14 @@
 
 import samba
 import misc
+import ldb
 
 class SamDB(samba.Ldb):
+    def __init__(self, *args, **kwargs):
+        super(SamDB, self).__init__(*args, **kwargs)
+        misc.dsdb_set_global_schema(self)
+        misc.ldb_register_samba_handlers(self)
+
     def add_foreign(self, domaindn, sid, desc):
         """Add a foreign security principle."""
         add = """
@@ -39,7 +45,7 @@ description: %s
 
     def setup_name_mapping(self, domaindn, sid, unixname):
         """Setup a mapping between a sam name and a unix name."""
-        res = self.search(Dn(ldb, domaindn), SCOPE_SUBTREE, 
+        res = self.search(ldb.Dn(self, domaindn), ldb.SCOPE_SUBTREE, 
                          "objectSid=%s" % sid, ["dn"])
         assert len(res) == 1, "Failed to find record for objectSid %s" % sid
 
-- 
cgit 


From 2fef113e82c1f324dc5b5474100eb537f0c98f80 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 18 Dec 2007 02:21:24 +0100
Subject: r26521: Fix newlines. (This used to be commit
 174aa1583791a4c305bc49cf78f8f10d42701bc9)

---
 source4/scripting/python/samba/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/__init__.py b/source4/scripting/python/samba/__init__.py
index 8e0eff3011..a46b148bbb 100644
--- a/source4/scripting/python/samba/__init__.py
+++ b/source4/scripting/python/samba/__init__.py
@@ -80,7 +80,7 @@ class Ldb(ldb.Ldb):
 
         def msg(l,text):
             print text
-        #self.set_debug(msg)
+        self.set_debug(msg)
 
     set_credentials = misc.ldb_set_credentials
     set_session_info = misc.ldb_set_session_info
-- 
cgit 


From 54a48d40a10c813954e4b777377607bb8366a57e Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 18 Dec 2007 02:21:28 +0100
Subject: r26522: Fix warnings on SamDB connect from Python, simplify the setup
 code for the various LDBs. (This used to be commit
 20c686f501b652ec0578a075a124b72ecb5f41b6)

---
 source4/scripting/python/samba/__init__.py  |  7 ++--
 source4/scripting/python/samba/provision.py | 61 ++++++++++++++++-------------
 source4/scripting/python/samba/samdb.py     |  8 +++-
 3 files changed, 43 insertions(+), 33 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/__init__.py b/source4/scripting/python/samba/__init__.py
index a46b148bbb..fd294952b8 100644
--- a/source4/scripting/python/samba/__init__.py
+++ b/source4/scripting/python/samba/__init__.py
@@ -75,13 +75,14 @@ class Ldb(ldb.Ldb):
         if lp is not None:
             self.set_loadparm(self, lp)
 
-        if url:
-            self.connect(url)
-
         def msg(l,text):
             print text
         self.set_debug(msg)
 
+        if url is not None:
+            self.connect(url)
+
+
     set_credentials = misc.ldb_set_credentials
     set_session_info = misc.ldb_set_session_info
     set_loadparm = misc.ldb_set_loadparm
diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index 0a3c183fcc..2c6e50219a 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -230,15 +230,10 @@ def setup_modify_ldif(setup_dir, ldif, subobj, ldb):
         ldb.modify(msg)
 
 
-def setup_ldb(setup_dir, ldif, session_info, credentials, subobj, lp, dbname, 
-              erase=True):
-    assert dbname is not None
-    ldb = open_ldb(session_info, credentials, lp, dbname)
+def setup_ldb(ldb, setup_dir, ldif, subobj):
     assert ldb is not None
     ldb.transaction_start()
     try:
-        if erase:
-            ldb.erase();    
         setup_add_ldif(setup_dir, ldif, subobj, ldb)
     except:
         ldb.transaction_cancel()
@@ -281,8 +276,8 @@ def provision_default_paths(lp, subobj):
     paths = ProvisionPaths()
     private_dir = lp.get("private dir")
     paths.shareconf = os.path.join(private_dir, "share.ldb")
-    paths.samdb = lp.get("sam database") or os.path.join(private_dir, "samdb.ldb")
-    paths.secrets = lp.get("secrets database") or os.path.join(private_dir, "secrets.ldb")
+    paths.samdb = os.path.join(private_dir, lp.get("sam database") or "samdb.ldb")
+    paths.secrets = os.path.join(private_dir, lp.get("secrets database") or "secrets.ldb")
     paths.templates = os.path.join(private_dir, "templates.ldb")
     paths.keytab = os.path.join(private_dir, "secrets.keytab")
     paths.dns = os.path.join(private_dir, subobj.dnsdomain + ".zone")
@@ -341,13 +336,17 @@ def provision_become_dc(setup_dir, subobj, message, paths, lp, session_info,
     subobj.fix(paths)
 
     message("Setting up templates into %s" % paths.templates)
-    setup_ldb(setup_dir, "provision_templates.ldif", session_info,
-              credentials, subobj, lp, paths.templates)
+    templates_ldb = Ldb(paths.templates, session_info=session_info,
+                        credentials=credentials, lp=lp)
+    templates_ldb.erase()
+    setup_ldb(templates_ldb, setup_dir, "provision_templates.ldif", subobj)
 
     # Also wipes the database
     message("Setting up %s partitions" % paths.samdb)
-    setup_ldb(setup_dir, "provision_partitions.ldif", session_info, 
-              credentials, subobj, lp, paths.samdb)
+    samdb = SamDB(paths.samdb, credentials=credentials, 
+                  session_info=session_info, lp=lp)
+    samdb.erase()
+    setup_ldb(samdb, setup_dir, "provision_partitions.ldif", subobj)
 
     samdb = SamDB(paths.samdb, session_info=session_info, 
                   credentials=credentials, lp=lp)
@@ -371,11 +370,12 @@ def provision_become_dc(setup_dir, subobj, message, paths, lp, session_info,
     samdb.transaction_commit()
 
     message("Setting up %s" % paths.secrets)
-    setup_ldb(setup_dir, "secrets_init.ldif", session_info, credentials, 
-              subobj, lp, paths.secrets)
-
-    setup_ldb(setup_dir, "secrets.ldif", session_info, credentials, subobj, 
-              lp, paths.secrets, False)
+    secrets_ldb = Ldb(paths.secrets, session_info=session_info,
+                      credentials=credentials, lp=lp)
+    secrets_ldb.clear()
+    setup_ldb(secrets_ldb, setup_dir, "secrets_init.ldif", subobj)
+    setup_ldb(secrets_ldb, setup_dir, "secrets.ldif", subobj)
+    setup_ldb(secrets_ldb, setup_dir, "secrets_dc.ldif", subobj)
 
 
 def provision(lp, setup_dir, subobj, message, blank, paths, session_info, 
@@ -408,14 +408,16 @@ def provision(lp, setup_dir, subobj, message, blank, paths, session_info,
     # only install a new shares config db if there is none
     if not os.path.exists(paths.shareconf):
         message("Setting up share.ldb")
-        setup_ldb(setup_dir, "share.ldif", session_info, credentials, subobj, 
-                  lp, paths.shareconf)
+        share_ldb = Ldb(paths.shareconf, session_info=session_info, 
+                        credentials=credentials, lp=lp)
+        setup_ldb(share_ldb, setup_dir, "share.ldif", subobj)
 
     message("Setting up %s" % paths.secrets)
-    setup_ldb(setup_dir, "secrets_init.ldif", session_info, credentials, 
-              subobj, lp, paths.secrets)
-    setup_ldb(setup_dir, "secrets.ldif", session_info, credentials, subobj, 
-              lp, paths.secrets, False)
+    secrets_ldb = Ldb(paths.secrets, session_info=session_info, 
+                      credentials=credentials, lp=lp)
+    secrets_ldb.erase()
+    setup_ldb(secrets_ldb, setup_dir, "secrets_init.ldif", subobj)
+    setup_ldb(secrets_ldb, setup_dir, "secrets.ldif", subobj)
 
     message("Setting up registry")
     reg = registry.Registry()
@@ -427,12 +429,16 @@ def provision(lp, setup_dir, subobj, message, blank, paths, session_info,
     #reg.apply_patchfile(provision_reg)
 
     message("Setting up templates into %s" % paths.templates)
-    setup_ldb(setup_dir, "provision_templates.ldif", session_info, 
-              credentials, subobj, lp, paths.templates)
+    templates_ldb = Ldb(paths.templates, session_info=session_info,
+                        credentials=credentials, lp=lp)
+    templates_ldb.erase()
+    setup_ldb(templates_ldb, setup_dir, "provision_templates.ldif", subobj)
 
     message("Setting up sam.ldb partitions")
-    setup_ldb(setup_dir, "provision_partitions.ldif", session_info, 
-              credentials, subobj, lp, paths.samdb)
+    samdb = SamDB(paths.samdb, session_info=session_info, 
+                  credentials=credentials, lp=lp)
+    samdb.erase()
+    setup_ldb(samdb, setup_dir, "provision_partitions.ldif", subobj)
 
     samdb = SamDB(paths.samdb, session_info=session_info, 
                   credentials=credentials, lp=lp)
@@ -453,7 +459,6 @@ def provision(lp, setup_dir, subobj, message, blank, paths, session_info,
     samdb.transaction_commit()
 
     message("Pre-loading the Samba 4 and AD schema")
-
     samdb = SamDB(paths.samdb, session_info=session_info, 
                   credentials=credentials, lp=lp)
     samdb.set_domain_sid(subobj.domainsid)
diff --git a/source4/scripting/python/samba/samdb.py b/source4/scripting/python/samba/samdb.py
index ce06efa3de..e3f001deb1 100644
--- a/source4/scripting/python/samba/samdb.py
+++ b/source4/scripting/python/samba/samdb.py
@@ -25,10 +25,14 @@ import misc
 import ldb
 
 class SamDB(samba.Ldb):
-    def __init__(self, *args, **kwargs):
-        super(SamDB, self).__init__(*args, **kwargs)
+    def __init__(self, url=None, session_info=None, credentials=None, 
+                 modules_dir=None, lp=None):
+        super(SamDB, self).__init__(session_info=session_info, credentials=credentials,
+                                    modules_dir=modules_dir, lp=lp)
         misc.dsdb_set_global_schema(self)
         misc.ldb_register_samba_handlers(self)
+        if url:
+            self.connect(url)
 
     def add_foreign(self, domaindn, sid, desc):
         """Add a foreign security principle."""
-- 
cgit 


From 1c29a63d443fde3fc0253f634822c12749f1afad Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 18 Dec 2007 17:21:13 +0100
Subject: r26523: Refactor provisioning code. (This used to be commit
 ac1083178f9e521dcd5d3d8b5199abcb00159adf)

---
 source4/scripting/python/samba/__init__.py  |   8 +-
 source4/scripting/python/samba/provision.py | 396 +++++++++++++++++-----------
 source4/scripting/python/samba/samdb.py     |   2 +-
 3 files changed, 250 insertions(+), 156 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/__init__.py b/source4/scripting/python/samba/__init__.py
index fd294952b8..3981464681 100644
--- a/source4/scripting/python/samba/__init__.py
+++ b/source4/scripting/python/samba/__init__.py
@@ -77,7 +77,7 @@ class Ldb(ldb.Ldb):
 
         def msg(l,text):
             print text
-        self.set_debug(msg)
+        #self.set_debug(msg)
 
         if url is not None:
             self.connect(url)
@@ -87,9 +87,9 @@ class Ldb(ldb.Ldb):
     set_session_info = misc.ldb_set_session_info
     set_loadparm = misc.ldb_set_loadparm
 
-    def searchone(self, basedn, expression, attribute):
+    def searchone(self, basedn, attribute, expression=None, scope=ldb.SCOPE_BASE):
         """Search for one attribute as a string."""
-        res = self.search(basedn, SCOPE_SUBTREE, expression, [attribute])
+        res = self.search(basedn, scope, expression, [attribute])
         if len(res) != 1 or res[0][attribute] is None:
             return None
         return res[0][attribute]
@@ -125,6 +125,8 @@ def substitute_var(text, values):
     """
 
     for (name, value) in values.items():
+        assert isinstance(name, str), "%r is not a string" % name
+        assert isinstance(value, str), "Value %r for %s is not a string" % (value, name)
         text = text.replace("${%s}" % name, value)
 
     assert "${" not in text, text
diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index 2c6e50219a..a8aeb8c831 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -39,7 +39,6 @@ class ProvisionSettings(object):
         self.machinepass = None
         self.adminpass = None
         self.defaultsite  = "Default-First-Site-Name"
-        self.datestring = None
         self.root = None
         self.nobody = None
         self.nogroup = None
@@ -49,52 +48,19 @@ class ProvisionSettings(object):
         self.dnsdomain = None
         self.dnsname = None
         self.domaindn = None
-        self.domaindn_ldb = None
         self.rootdn = None
         self.configdn = None
-        self.configdn_ldb = None
         self.schemedn = None
         self.schemedn_ldb = None
         self.s4_ldapi_path = None
         self.policyguid = None
-        self.extensibleobject = None
+        self.serverrole = None
 
     def subst_vars(self):
-        return {"SCHEMADN": self.schemadn,
-                "SCHEMADN_LDB": self.schemadn_ldb,
-                "SCHEMADN_MOD": "schema_fsmo",
-                "SCHEMADN_MOD2": ",objectguid",
-                "CONFIGDN": self.configdn,
-                "TDB_MODULES_LIST": ","+",".join(self.tdb_modules_list),
-                "MODULES_LIST2": ",".join(self.modules_list2),
-                "CONFIGDN_LDB": self.configdn_ldb,
-                "DOMAINDN": self.domaindn,
-                "DOMAINDN_LDB": self.domaindn_ldb,
-                "DOMAINDN_MOD": "pdc_fsmo,password_hash",
-                "DOMAINDN_MOD2": ",objectguid",
-                "DOMAINSID": str(self.domainsid),
-                "MODULES_LIST": ",".join(self.modules_list),
-                "CONFIGDN_MOD": "naming_fsmo",
-                "CONFIGDN_MOD2": ",objectguid",
-                "NETBIOSNAME": self.netbiosname,
-                "DNSNAME": self.dnsname,
-                "ROOTDN": self.rootdn,
-                "DOMAIN": self.domain,
-                "DNSDOMAIN": self.dnsdomain,
-                "REALM": self.realm,
-                "DEFAULTSITE": self.defaultsite,
-                "MACHINEPASS_B64": b64encode(self.machinepass),
-                "ADMINPASS_B64": b64encode(self.adminpass),
-                "DNSPASS_B64": b64encode(self.dnspass),
-                "KRBTGTPASS_B64": b64encode(self.krbtgtpass),
-                "S4_LDAPI_URI": "ldapi://%s" % self.s4_ldapi_path.replace("/", "%2F"),
-                "LDAPTIME": timestring(int(time.time())),
-                "POLICYGUID": self.policyguid,
-                "RDN_DC": self.rdn_dc,
-                "DOMAINGUID_MOD": self.domainguid_mod,
-                "VERSION": samba.version(),
-                "ACI": "# no aci for local ldb",
-                "EXTENSIBLEOBJECT": self.extensibleobject,
+        return {
+                "SERVERROLE": self.serverrole,
+                "DOMAIN_CONF": self.domain,
+                "REALM_CONF": self.realm,
                 }
 
     def fix(self, paths):
@@ -114,6 +80,7 @@ class ProvisionSettings(object):
         self.secrets_keytab    = paths.keytab
         
         self.s4_ldapi_path = paths.s4_ldapi_path
+        self.serverrole = "domain controller"
 
     def validate(self, lp):
         if not valid_netbios_name(self.domain):
@@ -207,61 +174,64 @@ def open_ldb(session_info, credentials, lp, dbname):
                    lp=lp)
 
 
-def setup_add_ldif(setup_dir, ldif, subobj, ldb):
+def setup_add_ldif(ldb, setup_dir, ldif, subst_vars=None):
     """Setup a ldb in the private dir."""
     assert isinstance(ldif, str)
     assert isinstance(setup_dir, str)
     src = os.path.join(setup_dir, ldif)
 
     data = open(src, 'r').read()
-    data = substitute_var(data, subobj.subst_vars())
+    if subst_vars is not None:
+        data = substitute_var(data, subst_vars)
 
     for msg in ldb.parse_ldif(data):
         ldb.add(msg[1])
 
 
-def setup_modify_ldif(setup_dir, ldif, subobj, ldb):
+def setup_modify_ldif(ldb, setup_dir, ldif, substvars=None):
     src = os.path.join(setup_dir, ldif)
 
     data = open(src, 'r').read()
-    data = substitute_var(data, subobj.subst_vars())
+    if substvars is not None:
+        data = substitute_var(data, substvars)
 
     for (changetype, msg) in ldb.parse_ldif(data):
         ldb.modify(msg)
 
 
-def setup_ldb(ldb, setup_dir, ldif, subobj):
+def setup_ldb(ldb, setup_dir, ldif, subst_vars=None):
     assert ldb is not None
     ldb.transaction_start()
     try:
-        setup_add_ldif(setup_dir, ldif, subobj, ldb)
+        setup_add_ldif(ldb, setup_dir, ldif, subst_vars)
     except:
         ldb.transaction_cancel()
         raise
     ldb.transaction_commit()
 
 
-def setup_ldb_modify(setup_dir, ldif, subobj, ldb):
+def setup_ldb_modify(setup_dir, ldif, substvars, ldb):
     """Modify a ldb in the private dir."""
     src = os.path.join(setup_dir, ldif)
 
     data = open(src, 'r').read()
-    data = substitute_var(data, subobj.subst_vars())
+    data = substitute_var(data, substvars)
     assert not "${" in data
 
     for (changetype, msg) in ldb.parse_ldif(data):
         ldb.modify(msg)
 
 
-def setup_file(setup_dir, template, message, fname, subobj):
+def setup_file(setup_dir, template, fname, substvars):
     """Setup a file in the private dir."""
     f = fname
     src = os.path.join(setup_dir, template)
 
-    os.unlink(f)
+    if os.path.exists(f):
+        os.unlink(f)
 
     data = open(src, 'r').read()
-    data = substitute_var(data, subobj.subst_vars())
+    data = substitute_var(data, substvars)
     assert not "${" in data
 
     open(f, 'w').write(data)
@@ -297,11 +267,7 @@ def provision_default_paths(lp, subobj):
 
 def setup_name_mappings(subobj, ldb):
     """setup reasonable name mappings for sam names to unix names."""
-    res = ldb.search(Dn(ldb, subobj.domaindn), SCOPE_BASE, "objectSid=*", 
-                     ["objectSid"])
-    assert len(res) == 1
-    assert "objectSid" in res[0]
-    sid = str(list(res[0]["objectSid"])[0])
+    sid = str(subobj.domainsid)
 
     # add some foreign sids if they are not present already
     ldb.add_foreign(subobj.domaindn, "S-1-5-7", "Anonymous")
@@ -336,33 +302,35 @@ def provision_become_dc(setup_dir, subobj, message, paths, lp, session_info,
     subobj.fix(paths)
 
     message("Setting up templates into %s" % paths.templates)
-    templates_ldb = Ldb(paths.templates, session_info=session_info,
-                        credentials=credentials, lp=lp)
-    templates_ldb.erase()
-    setup_ldb(templates_ldb, setup_dir, "provision_templates.ldif", subobj)
+    setup_templatesdb(paths.templates, setup_dir, session_info, 
+                      credentials, lp)
 
     # Also wipes the database
-    message("Setting up %s partitions" % paths.samdb)
+    message("Setting up samdb")
+    os.path.unlink(paths.samdb)
     samdb = SamDB(paths.samdb, credentials=credentials, 
                   session_info=session_info, lp=lp)
     samdb.erase()
-    setup_ldb(samdb, setup_dir, "provision_partitions.ldif", subobj)
 
-    samdb = SamDB(paths.samdb, session_info=session_info, 
-                  credentials=credentials, lp=lp)
+    message("Setting up %s partitions" % paths.samdb)
+    setup_samdb_partitions(samdb, setup_dir, subobj)
+
+    samdb = SamDB(paths.samdb, credentials=credentials, 
+                  session_info=session_info, lp=lp)
+
     ldb.transaction_start()
     try:
         message("Setting up %s attributes" % paths.samdb)
-        setup_add_ldif(setup_dir, "provision_init.ldif", subobj, samdb)
+        setup_add_ldif(samdb, setup_dir, "provision_init.ldif")
 
         message("Setting up %s rootDSE" % paths.samdb)
-        setup_add_ldif(setup_dir, "provision_rootdse_add.ldif", subobj, samdb)
+        setup_samdb_rootdse(samdb, setup_dir, subobj)
 
         message("Erasing data from partitions")
         ldb_erase_partitions(subobj, message, samdb, None)
 
         message("Setting up %s indexes" % paths.samdb)
-        setup_add_ldif(setup_dir, "provision_index.ldif", subobj, samdb)
+        setup_add_ldif(samdb, setup_dir, "provision_index.ldif")
     except:
         samdb.transaction_cancel()
         raise
@@ -370,12 +338,70 @@ def provision_become_dc(setup_dir, subobj, message, paths, lp, session_info,
     samdb.transaction_commit()
 
     message("Setting up %s" % paths.secrets)
-    secrets_ldb = Ldb(paths.secrets, session_info=session_info,
-                      credentials=credentials, lp=lp)
-    secrets_ldb.clear()
-    setup_ldb(secrets_ldb, setup_dir, "secrets_init.ldif", subobj)
-    setup_ldb(secrets_ldb, setup_dir, "secrets.ldif", subobj)
-    setup_ldb(secrets_ldb, setup_dir, "secrets_dc.ldif", subobj)
+    secrets_ldb = setup_secretsdb(paths.secrets, setup_dir, session_info, credentials, lp)
+    setup_ldb(secrets_ldb, setup_dir, "secrets_dc.ldif", 
+              { "MACHINEPASS_B64": b64encode(self.machinepass) })
+
+
+def setup_secretsdb(path, setup_dir, session_info, credentials, lp):
+    secrets_ldb = Ldb(path, session_info=session_info, credentials=credentials, lp=lp)
+    secrets_ldb.erase()
+    setup_ldb(secrets_ldb, setup_dir, "secrets_init.ldif")
+    setup_ldb(secrets_ldb, setup_dir, "secrets.ldif")
+    return secrets_ldb
+
+
+def setup_templatesdb(path, setup_dir, session_info, credentials, lp):
+    templates_ldb = Ldb(path, session_info=session_info,
+                        credentials=credentials, lp=lp)
+    templates_ldb.erase()
+    setup_ldb(templates_ldb, setup_dir, "provision_templates.ldif", None)
+
+
+def setup_registry(path, setup_dir, session_info, credentials, lp):
+    reg = registry.Registry()
+    hive = registry.Hive(path, session_info=session_info, 
+                         credentials=credentials, lp_ctx=lp)
+    reg.mount_hive(hive, "HKEY_LOCAL_MACHINE")
+    provision_reg = os.path.join(setup_dir, "provision.reg")
+    assert os.path.exists(provision_reg)
+    reg.apply_patchfile(provision_reg)
+
+
+def setup_samdb_rootdse(samdb, setup_dir, subobj):
+    setup_add_ldif(samdb, setup_dir, "provision_rootdse_add.ldif", {
+        "SCHEMADN": subobj.schemadn, 
+        "NETBIOSNAME": subobj.netbiosname,
+        "DNSDOMAIN": subobj.dnsdomain,
+        "DEFAULTSITE": subobj.defaultsite,
+        "REALM": subobj.realm,
+        "DNSNAME": subobj.dnsname,
+        "DOMAINDN": subobj.domaindn,
+        "ROOTDN": subobj.rootdn,
+        "CONFIGDN": subobj.configdn,
+        "VERSION": samba.version(),
+        })
+
+
+def setup_samdb_partitions(samdb, setup_dir, subobj):
+    setup_ldb(samdb, setup_dir, "provision_partitions.ldif", {
+        "SCHEMADN": subobj.schemadn, 
+        "SCHEMADN_LDB": "schema.ldb",
+        "SCHEMADN_MOD2": ",objectguid",
+        "CONFIGDN": subobj.configdn,
+        "CONFIGDN_LDB": "configuration.ldb",
+        "DOMAINDN": subobj.domaindn,
+        "DOMAINDN_LDB": "users.ldb",
+        "SCHEMADN_MOD": "schema_fsmo",
+        "CONFIGDN_MOD": "naming_fsmo",
+        "CONFIGDN_MOD2": ",objectguid",
+        "DOMAINDN_MOD": "pdc_fsmo,password_hash",
+        "DOMAINDN_MOD2": ",objectguid",
+        "MODULES_LIST": ",".join(subobj.modules_list),
+        "TDB_MODULES_LIST": ","+",".join(subobj.tdb_modules_list),
+        "MODULES_LIST2": ",".join(subobj.modules_list2),
+        })
+
 
 
 def provision(lp, setup_dir, subobj, message, blank, paths, session_info, 
@@ -386,11 +412,6 @@ def provision(lp, setup_dir, subobj, message, blank, paths, session_info,
     """
     subobj.fix(paths)
 
-    if subobj.domain_guid is not None:
-        subobj.domainguid_mod = "replace: objectGUID\nobjectGUID: %s\n-" % subobj.domain_guid
-    else:
-        subobj.domainguid_mod = ""
-
     if subobj.host_guid is not None:
         subobj.hostguid_add = "objectGUID: %s" % subobj.host_guid
     else:
@@ -401,8 +422,14 @@ def provision(lp, setup_dir, subobj, message, blank, paths, session_info,
     # only install a new smb.conf if there isn't one there already
     if not os.path.exists(paths.smbconf):
         message("Setting up smb.conf")
-        setup_file(setup_dir, "provision.smb.conf", message, paths.smbconf, 
-                   subobj)
+        if lp.get("server role") == "domain controller":
+            smbconfsuffix = "dc"
+        elif lp.get("server role") == "member":
+            smbconfsuffix = "member"
+        else:
+            assert "Invalid server role setting: %s" % lp.get("server role")
+        setup_file(setup_dir, "provision.smb.conf.%s" % smbconfsuffix, paths.smbconf, 
+                None)
         lp.reload()
 
     # only install a new shares config db if there is none
@@ -410,45 +437,37 @@ def provision(lp, setup_dir, subobj, message, blank, paths, session_info,
         message("Setting up share.ldb")
         share_ldb = Ldb(paths.shareconf, session_info=session_info, 
                         credentials=credentials, lp=lp)
-        setup_ldb(share_ldb, setup_dir, "share.ldif", subobj)
+        setup_ldb(share_ldb, setup_dir, "share.ldif", None)
 
     message("Setting up %s" % paths.secrets)
-    secrets_ldb = Ldb(paths.secrets, session_info=session_info, 
-                      credentials=credentials, lp=lp)
-    secrets_ldb.erase()
-    setup_ldb(secrets_ldb, setup_dir, "secrets_init.ldif", subobj)
-    setup_ldb(secrets_ldb, setup_dir, "secrets.ldif", subobj)
+    setup_secretsdb(paths.secrets, setup_dir, session_info=session_info, 
+                    credentials=credentials, lp=lp)
 
     message("Setting up registry")
-    reg = registry.Registry()
-    #hive = registry.Hive(paths.hklm, session_info=session_info, 
-    #                     credentials=credentials, lp_ctx=lp)
-    #reg.mount_hive(hive, "HKEY_LOCAL_MACHINE")
-    provision_reg = os.path.join(setup_dir, "provision.reg")
-    assert os.path.exists(provision_reg)
-    #reg.apply_patchfile(provision_reg)
+    #setup_registry(paths.hklm, setup_dir, session_info, 
+    #               credentials=credentials, lp=lp)
 
     message("Setting up templates into %s" % paths.templates)
-    templates_ldb = Ldb(paths.templates, session_info=session_info,
-                        credentials=credentials, lp=lp)
-    templates_ldb.erase()
-    setup_ldb(templates_ldb, setup_dir, "provision_templates.ldif", subobj)
+    setup_templatesdb(paths.templates, setup_dir, session_info=session_info, 
+                      credentials=credentials, lp=lp)
 
-    message("Setting up sam.ldb partitions")
     samdb = SamDB(paths.samdb, session_info=session_info, 
                   credentials=credentials, lp=lp)
     samdb.erase()
-    setup_ldb(samdb, setup_dir, "provision_partitions.ldif", subobj)
+
+    message("Setting up sam.ldb partitions")
+    setup_samdb_partitions(samdb, setup_dir, subobj)
 
     samdb = SamDB(paths.samdb, session_info=session_info, 
                   credentials=credentials, lp=lp)
+
     samdb.transaction_start()
     try:
         message("Setting up sam.ldb attributes")
-        setup_add_ldif(setup_dir, "provision_init.ldif", subobj, samdb)
+        setup_add_ldif(samdb, setup_dir, "provision_init.ldif")
 
         message("Setting up sam.ldb rootDSE")
-        setup_add_ldif(setup_dir, "provision_rootdse_add.ldif", subobj, samdb)
+        setup_samdb_rootdse(samdb, setup_dir, subobj)
 
         message("Erasing data from partitions")
         ldb_erase_partitions(subobj, message, samdb, ldapbackend)
@@ -462,53 +481,113 @@ def provision(lp, setup_dir, subobj, message, blank, paths, session_info,
     samdb = SamDB(paths.samdb, session_info=session_info, 
                   credentials=credentials, lp=lp)
     samdb.set_domain_sid(subobj.domainsid)
-    load_schema(setup_dir, subobj, samdb)
+    load_schema(setup_dir, samdb, subobj)
 
     samdb.transaction_start()
         
     try:
         message("Adding DomainDN: %s (permitted to fail)" % subobj.domaindn)
-        setup_add_ldif(setup_dir, "provision_basedn.ldif", subobj, samdb)
+        setup_add_ldif(samdb, setup_dir, "provision_basedn.ldif", {
+            "DOMAINDN": subobj.domaindn,
+            "ACI": "# no aci for local ldb",
+            "EXTENSIBLEOBJECT": "# no objectClass: extensibleObject for local ldb",
+            "RDN_DC": subobj.rdn_dc,
+            })
+
         message("Modifying DomainDN: " + subobj.domaindn + "")
-        setup_ldb_modify(setup_dir, "provision_basedn_modify.ldif", subobj, samdb)
+        if subobj.domain_guid is not None:
+            domainguid_mod = "replace: objectGUID\nobjectGUID: %s\n-" % subobj.domain_guid
+        else:
+            domainguid_mod = ""
+
+        setup_ldb_modify(setup_dir, "provision_basedn_modify.ldif", {
+            "RDN_DC": subobj.rdn_dc,
+            "LDAPTIME": timestring(int(time.time())),
+            "DOMAINSID": str(subobj.domainsid),
+            "SCHEMADN": subobj.schemadn, 
+            "NETBIOSNAME": subobj.netbiosname,
+            "DEFAULTSITE": subobj.defaultsite,
+            "CONFIGDN": subobj.configdn,
+            "POLICYGUID": subobj.policyguid,
+            "DOMAINDN": subobj.domaindn,
+            "DOMAINGUID_MOD": domainguid_mod,
+            }, samdb)
 
         message("Adding configuration container (permitted to fail)")
-        setup_add_ldif(setup_dir, "provision_configuration_basedn.ldif", subobj, samdb)
+        setup_add_ldif(samdb, setup_dir, "provision_configuration_basedn.ldif", {
+            "CONFIGDN": subobj.configdn, 
+            "ACI": "# no aci for local ldb",
+            "EXTENSIBLEOBJECT": "# no objectClass: extensibleObject for local ldb",
+            })
         message("Modifying configuration container")
-        setup_ldb_modify(setup_dir, "provision_configuration_basedn_modify.ldif", subobj, samdb)
+        setup_ldb_modify(setup_dir, "provision_configuration_basedn_modify.ldif", {
+            "CONFIGDN": subobj.configdn, 
+            "SCHEMADN": subobj.schemadn,
+            }, samdb)
 
         message("Adding schema container (permitted to fail)")
-        setup_add_ldif(setup_dir, "provision_schema_basedn.ldif", subobj, samdb)
+        setup_add_ldif(samdb, setup_dir, "provision_schema_basedn.ldif", {
+            "SCHEMADN": subobj.schemadn,
+            "ACI": "# no aci for local ldb",
+            "EXTENSIBLEOBJECT": "# no objectClass: extensibleObject for local ldb"
+            })
         message("Modifying schema container")
-        setup_ldb_modify(setup_dir, "provision_schema_basedn_modify.ldif", subobj, samdb)
+        setup_ldb_modify(setup_dir, "provision_schema_basedn_modify.ldif", {
+            "SCHEMADN": subobj.schemadn,
+            "NETBIOSNAME": subobj.netbiosname,
+            "DEFAULTSITE": subobj.defaultsite,
+            "CONFIGDN": subobj.configdn,
+            }, samdb)
+
         message("Setting up sam.ldb Samba4 schema")
-        setup_add_ldif(setup_dir, "schema_samba4.ldif", subobj, samdb)
+        setup_add_ldif(samdb, setup_dir, "schema_samba4.ldif", {
+            "SCHEMADN": subobj.schemadn,
+            })
         message("Setting up sam.ldb AD schema")
-        setup_add_ldif(setup_dir, "schema.ldif", subobj, samdb)
+        setup_add_ldif(samdb, setup_dir, "schema.ldif", {
+            "SCHEMADN": subobj.schemadn,
+            })
 
         message("Setting up sam.ldb configuration data")
-        setup_add_ldif(setup_dir, "provision_configuration.ldif", subobj, samdb)
+        setup_add_ldif(samdb, setup_dir, "provision_configuration.ldif", {
+            "CONFIGDN": subobj.configdn,
+            "NETBIOSNAME": subobj.netbiosname,
+            "DEFAULTSITE": subobj.defaultsite,
+            "DNSDOMAIN": subobj.dnsdomain,
+            "DOMAIN": subobj.domain,
+            "SCHEMADN": subobj.schemadn,
+            "DOMAINDN": subobj.domaindn,
+            })
 
         message("Setting up display specifiers")
-        setup_add_ldif(setup_dir, "display_specifiers.ldif", subobj, samdb)
+        setup_add_ldif(samdb, setup_dir, "display_specifiers.ldif", {"CONFIGDN": subobj.configdn})
 
         message("Adding users container (permitted to fail)")
-        setup_add_ldif(setup_dir, "provision_users_add.ldif", subobj, samdb)
+        setup_add_ldif(samdb, setup_dir, "provision_users_add.ldif", {
+            "DOMAINDN": subobj.domaindn})
         message("Modifying users container")
-        setup_ldb_modify(setup_dir, "provision_users_modify.ldif", subobj, samdb)
+        setup_ldb_modify(setup_dir, "provision_users_modify.ldif", {
+            "DOMAINDN": subobj.domaindn}, samdb)
         message("Adding computers container (permitted to fail)")
-        setup_add_ldif(setup_dir, "provision_computers_add.ldif", subobj, samdb)
+        setup_add_ldif(samdb, setup_dir, "provision_computers_add.ldif", {
+            "DOMAINDN": subobj.domaindn})
         message("Modifying computers container")
-        setup_ldb_modify(setup_dir, "provision_computers_modify.ldif", subobj, samdb)
+        setup_ldb_modify(setup_dir, "provision_computers_modify.ldif", {
+            "DOMAINDN": subobj.domaindn}, samdb)
         message("Setting up sam.ldb data")
-        setup_add_ldif(setup_dir, "provision.ldif", subobj, samdb)
+        setup_add_ldif(samdb, setup_dir, "provision.ldif", {
+            "DOMAINDN": subobj.domaindn,
+            "NETBIOSNAME": subobj.netbiosname,
+            "DEFAULTSITE": subobj.defaultsite,
+            "CONFIGDN": subobj.configdn,
+            })
 
         if blank:
             message("Setting up sam.ldb index")
-            setup_add_ldif(setup_dir, "provision_index.ldif", subobj, samdb)
+            setup_add_ldif(samdb, setup_dir, "provision_index.ldif")
 
             message("Setting up sam.ldb rootDSE marking as syncronized")
-            setup_modify_ldif(setup_dir, "provision_rootdse_modify.ldif", subobj, samdb)
+            setup_modify_ldif(samdb, setup_dir, "provision_rootdse_modify.ldif")
 
             samdb.transaction_commit()
             return
@@ -527,15 +606,21 @@ def provision(lp, setup_dir, subobj, message, blank, paths, session_info,
     #    samdb = open_ldb(info, paths.samdb, False)
     #
         message("Setting up sam.ldb users and groups")
-        setup_add_ldif(setup_dir, "provision_users.ldif", subobj, samdb)
+        setup_add_ldif(samdb, setup_dir, "provision_users.ldif", {
+            "DOMAINDN": subobj.domaindn,
+            "DOMAINSID": str(subobj.domainsid),
+            "CONFIGDN": subobj.configdn,
+            "ADMINPASS_B64": b64encode(subobj.adminpass),
+            "KRBTGTPASS_B64": b64encode(subobj.krbtgtpass),
+            })
 
         setup_name_mappings(subobj, samdb)
 
         message("Setting up sam.ldb index")
-        setup_add_ldif(setup_dir, "provision_index.ldif", subobj, samdb)
+        setup_add_ldif(samdb, setup_dir, "provision_index.ldif")
 
         message("Setting up sam.ldb rootDSE marking as syncronized")
-        setup_modify_ldif(setup_dir, "provision_rootdse_modify.ldif", subobj, samdb)
+        setup_modify_ldif(samdb, setup_dir, "provision_rootdse_modify.ldif")
     except:
         samdb.transaction_cancel()
         raise
@@ -543,12 +628,17 @@ def provision(lp, setup_dir, subobj, message, blank, paths, session_info,
     samdb.transaction_commit()
 
     message("Setting up phpLDAPadmin configuration")
-    setup_file(setup_dir, "phpldapadmin-config.php", message, 
-               paths.phpldapadminconfig, subobj)
+    create_phplpapdadmin_config(paths.phpldapadminconfig, setup_dir, subobj.s4_ldapi_path)
+
     message("Please install the phpLDAPadmin configuration located at %s into /etc/phpldapadmin/config.php" % paths.phpldapadminconfig)
 
 
-def provision_dns(setup_dir, subobj, message, paths, session_info, credentials):
+def create_phplpapdadmin_config(path, setup_dir, s4_ldapi_path):
+    setup_file(setup_dir, "phpldapadmin-config.php", 
+               path, {"S4_LDAPI_URI": "ldapi://%s" % s4_ldapi_path.replace("/", "%2F")})
+
+
+def provision_dns(setup_dir, subobj, message, paths, session_info, credentials, lp):
     """Write out a DNS zone file, from the info in the current database."""
     message("Setting up DNS zone: %s" % subobj.dnsdomain)
     # connect to the sam
@@ -557,18 +647,22 @@ def provision_dns(setup_dir, subobj, message, paths, session_info, credentials):
 
     # These values may have changed, due to an incoming SamSync,
     # or may not have been specified, so fetch them from the database
-
-    res = ldb.search(Dn(ldb, subobj.domaindn), SCOPE_BASE, "objectGUID=*", 
-                     ["objectGUID"])
-    assert(len(res) == 1)
-    assert(res[0]["objectGUID"] is not None)
-    subobj.domainguid = res[0]["objectGUID"]
-
-    subobj.host_guid = ldb.searchone(subobj.domaindn, 
-                                 "(&(objectClass=computer)(cn=%s))" % subobj.netbiosname, "objectGUID")
-    assert subobj.host_guid is not None
-
-    setup_file(setup_dir, "provision.zone", message, paths.dns, subobj)
+    domainguid = str(ldb.searchone(Dn(ldb, subobj.domaindn), "objectGUID"))
+
+    hostguid = str(ldb.searchone(Dn(ldb, subobj.domaindn), "objectGUID" ,
+                                 expression="(&(objectClass=computer)(cn=%s))" % subobj.netbiosname))
+
+    setup_file(setup_dir, "provision.zone", paths.dns, {
+            "DNSPASS_B64": b64encode(subobj.dnspass),
+            "HOSTNAME": hostname(),
+            "DNSDOMAIN": subobj.dnsdomain,
+            "REALM": subobj.realm,
+            "HOSTIP": hostip(),
+            "DOMAINGUID": domainguid,
+            "DATESTRING": time.strftime("%Y%m%d%H"),
+            "DEFAULTSITE": subobj.defaultsite,
+            "HOSTGUID": hostguid,
+        })
 
     message("Please install the zone located in %s into your DNS server" % paths.dns)
 
@@ -577,21 +671,21 @@ def provision_ldapbase(setup_dir, subobj, message, paths):
     """Write out a DNS zone file, from the info in the current database."""
     message("Setting up LDAP base entry: %s" % subobj.domaindn)
     rdns = subobj.domaindn.split(",")
-    subobj.extensibleobject = "objectClass: extensibleObject"
 
     subobj.rdn_dc = rdns[0][len("DC="):]
 
     setup_file(setup_dir, "provision_basedn.ldif", 
-           message, paths.ldap_basedn_ldif, 
-           subobj)
+           paths.ldap_basedn_ldif, 
+           None)
 
     setup_file(setup_dir, "provision_configuration_basedn.ldif", 
-           message, paths.ldap_config_basedn_ldif, 
-           subobj)
+           paths.ldap_config_basedn_ldif, None)
 
     setup_file(setup_dir, "provision_schema_basedn.ldif", 
-           message, paths.ldap_schema_basedn_ldif, 
-           subobj)
+           paths.ldap_schema_basedn_ldif, {
+            "SCHEMADN": subobj.schemadn,
+            "ACI": "# no aci for local ldb",
+            "EXTENSIBLEOBJECT": "objectClass: extensibleObject"})
 
     message("Please install the LDIF located in " + paths.ldap_basedn_ldif + ", " + paths.ldap_config_basedn_ldif + " and " + paths.ldap_schema_basedn_ldif + " into your LDAP server, and re-run with --ldap-backend=ldap://my.ldap.server")
 
@@ -614,7 +708,6 @@ def provision_guess(lp):
     subobj.machinepass  = misc.random_password(12)
     subobj.adminpass    = misc.random_password(12)
     subobj.dnspass      = misc.random_password(12)
-    subobj.datestring   = time.strftime("%Y%m%d%H")
     subobj.root         = findnss(pwd.getpwnam, "root")[4]
     subobj.nobody       = findnss(pwd.getpwnam, "nobody")[4]
     subobj.nogroup      = findnss(grp.getgrnam, "nogroup", "nobody")[2]
@@ -625,12 +718,9 @@ def provision_guess(lp):
     subobj.dnsdomain    = subobj.realm.lower()
     subobj.dnsname      = "%s.%s" % (subobj.hostname.lower(), subobj.dnsdomain)
     subobj.domaindn     = "DC=" + subobj.dnsdomain.replace(".", ",DC=")
-    subobj.domaindn_ldb = "users.ldb"
     subobj.rootdn       = subobj.domaindn
     subobj.configdn     = "CN=Configuration," + subobj.rootdn
-    subobj.configdn_ldb = "configuration.ldb"
     subobj.schemadn     = "CN=Schema," + subobj.configdn
-    subobj.schemadn_ldb = "schema.ldb"
 
     #Add modules to the list to activate them by default
     #beware often order is important
@@ -661,21 +751,23 @@ def provision_guess(lp):
     subobj.modules_list2 = ["show_deleted",
                     "partition"]
 
-    subobj.extensibleobject = "# no objectClass: extensibleObject for local ldb"
-    subobj.aci        = "# no aci for local ldb"
     return subobj
 
 
-def load_schema(setup_dir, subobj, samdb):
+def load_schema(setup_dir, samdb, subobj):
     """Load schema."""
     src = os.path.join(setup_dir, "schema.ldif")
     schema_data = open(src, 'r').read()
     src = os.path.join(setup_dir, "schema_samba4.ldif")
     schema_data += open(src, 'r').read()
-    schema_data = substitute_var(schema_data, subobj.subst_vars())
+    schema_data = substitute_var(schema_data, {"SCHEMADN": subobj.schemadn})
     src = os.path.join(setup_dir, "provision_schema_basedn_modify.ldif")
     head_data = open(src, 'r').read()
-    head_data = substitute_var(head_data, subobj.subst_vars())
+    head_data = substitute_var(head_data, {
+                    "SCHEMADN": subobj.schemadn,
+                    "NETBIOSNAME": subobj.netbiosname,
+                    "CONFIGDN": subobj.configdn,
+                    "DEFAULTSITE": subobj.defaultsite})
     samdb.attach_schema_from_ldif(head_data, schema_data)
 
 
diff --git a/source4/scripting/python/samba/samdb.py b/source4/scripting/python/samba/samdb.py
index e3f001deb1..7061e22ce4 100644
--- a/source4/scripting/python/samba/samdb.py
+++ b/source4/scripting/python/samba/samdb.py
@@ -89,7 +89,7 @@ userAccountControl: %u
         assert(len(res) == 1 and res[0].defaultNamingContext is not None)
         domain_dn = res[0].defaultNamingContext
         assert(domain_dn is not None)
-        dom_users = searchone(self, domain_dn, "name=Domain Users", "dn")
+        dom_users = self.searchone(domain_dn, "dn", "name=Domain Users")
         assert(dom_users is not None)
 
         user_dn = "CN=%s,CN=Users,%s" % (username, domain_dn)
-- 
cgit 


From 4bfbd78086a342e4075596a6a9e5de0cec0b47ac Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 18 Dec 2007 17:21:20 +0100
Subject: r26524: Import self join. (This used to be commit
 daae983c260da6af6a4f1cba1290bc7240d7a970)

---
 source4/scripting/python/samba/provision.py | 117 ++++++++++++++++++----------
 1 file changed, 75 insertions(+), 42 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index a8aeb8c831..c17b74345a 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -54,14 +54,6 @@ class ProvisionSettings(object):
         self.schemedn_ldb = None
         self.s4_ldapi_path = None
         self.policyguid = None
-        self.serverrole = None
-
-    def subst_vars(self):
-        return {
-                "SERVERROLE": self.serverrole,
-                "DOMAIN_CONF": self.domain,
-                "REALM_CONF": self.realm,
-                }
 
     def fix(self, paths):
         self.realm       = self.realm.upper()
@@ -75,13 +67,6 @@ class ProvisionSettings(object):
         rdns = self.domaindn.split(",")
         self.rdn_dc = rdns[0][len("DC="):]
 
-        self.sam_ldb        = paths.samdb
-        self.secrets_ldb    = paths.secrets
-        self.secrets_keytab    = paths.keytab
-        
-        self.s4_ldapi_path = paths.s4_ldapi_path
-        self.serverrole = "domain controller"
-
     def validate(self, lp):
         if not valid_netbios_name(self.domain):
             raise InvalidNetbiosName(self.domain)
@@ -111,12 +96,12 @@ class ProvisionPaths:
         self.samdb = None
         self.secrets = None
         self.keytab = None
+        self.dns_keytab = None
         self.dns = None
         self.winsdb = None
         self.ldap_basedn_ldif = None
         self.ldap_config_basedn_ldif = None
         self.ldap_schema_basedn_ldif = None
-        self.s4_ldapi_path = None
 
 
 def install_ok(lp, session_info, credentials):
@@ -184,6 +169,8 @@ def setup_add_ldif(ldb, setup_dir, ldif, subst_vars=None):
     if subst_vars is not None:
         data = substitute_var(data, subst_vars)
 
+    assert "${" not in data
+
     for msg in ldb.parse_ldif(data):
         ldb.add(msg[1])
 
@@ -195,6 +182,8 @@ def setup_modify_ldif(ldb, setup_dir, ldif, substvars=None):
     if substvars is not None:
         data = substitute_var(data, substvars)
 
+    assert "${" not in data
+
     for (changetype, msg) in ldb.parse_ldif(data):
         ldb.modify(msg)
 
@@ -231,7 +220,8 @@ def setup_file(setup_dir, template, fname, substvars):
         os.unlink(f)
 
     data = open(src, 'r').read()
-    data = substitute_var(data, substvars)
+    if substvars:
+        data = substitute_var(data, substvars)
     assert not "${" in data
 
     open(f, 'w').write(data)
@@ -250,6 +240,7 @@ def provision_default_paths(lp, subobj):
     paths.secrets = os.path.join(private_dir, lp.get("secrets database") or "secrets.ldb")
     paths.templates = os.path.join(private_dir, "templates.ldb")
     paths.keytab = os.path.join(private_dir, "secrets.keytab")
+    paths.dns_keytab = os.path.join(private_dir, "dns.keytab")
     paths.dns = os.path.join(private_dir, subobj.dnsdomain + ".zone")
     paths.winsdb = os.path.join(private_dir, "wins.ldb")
     paths.ldap_basedn_ldif = os.path.join(private_dir, 
@@ -262,6 +253,14 @@ def provision_default_paths(lp, subobj):
     paths.phpldapadminconfig = os.path.join(private_dir, 
                                             "phpldapadmin-config.php")
     paths.hklm = os.path.join(private_dir, "hklm.ldb")
+    paths.sysvol = lp.get("sysvol", "path")
+    if paths.sysvol is None:
+        paths.sysvol = os.path.join(lp.get("lock dir"), "sysvol")
+
+    paths.netlogon = lp.get("netlogon", "path")
+    if paths.netlogon is None:
+        paths.netlogon = os.path.join(os.path.join(paths.sysvol, "scripts"))
+
     return paths
 
 
@@ -412,11 +411,6 @@ def provision(lp, setup_dir, subobj, message, blank, paths, session_info,
     """
     subobj.fix(paths)
 
-    if subobj.host_guid is not None:
-        subobj.hostguid_add = "objectGUID: %s" % subobj.host_guid
-    else:
-        subobj.hostguid_add = ""
-
     assert paths.smbconf is not None
 
     # only install a new smb.conf if there isn't one there already
@@ -440,10 +434,11 @@ def provision(lp, setup_dir, subobj, message, blank, paths, session_info,
         setup_ldb(share_ldb, setup_dir, "share.ldif", None)
 
     message("Setting up %s" % paths.secrets)
-    setup_secretsdb(paths.secrets, setup_dir, session_info=session_info, 
+    secrets_ldb = setup_secretsdb(paths.secrets, setup_dir, session_info=session_info, 
                     credentials=credentials, lp=lp)
 
     message("Setting up registry")
+    # FIXME: Still fails for some reason
     #setup_registry(paths.hklm, setup_dir, session_info, 
     #               credentials=credentials, lp=lp)
 
@@ -582,15 +577,7 @@ def provision(lp, setup_dir, subobj, message, blank, paths, session_info,
             "CONFIGDN": subobj.configdn,
             })
 
-        if blank:
-            message("Setting up sam.ldb index")
-            setup_add_ldif(samdb, setup_dir, "provision_index.ldif")
-
-            message("Setting up sam.ldb rootDSE marking as syncronized")
-            setup_modify_ldif(samdb, setup_dir, "provision_rootdse_modify.ldif")
-
-            samdb.transaction_commit()
-            return
+        if not blank:
 
     #    message("Activate schema module")
     #    setup_modify_ldif("schema_activation.ldif", info, samdb, False)
@@ -605,16 +592,62 @@ def provision(lp, setup_dir, subobj, message, blank, paths, session_info,
     #
     #    samdb = open_ldb(info, paths.samdb, False)
     #
-        message("Setting up sam.ldb users and groups")
-        setup_add_ldif(samdb, setup_dir, "provision_users.ldif", {
-            "DOMAINDN": subobj.domaindn,
-            "DOMAINSID": str(subobj.domainsid),
-            "CONFIGDN": subobj.configdn,
-            "ADMINPASS_B64": b64encode(subobj.adminpass),
-            "KRBTGTPASS_B64": b64encode(subobj.krbtgtpass),
-            })
+            message("Setting up sam.ldb users and groups")
+            setup_add_ldif(samdb, setup_dir, "provision_users.ldif", {
+                "DOMAINDN": subobj.domaindn,
+                "DOMAINSID": str(subobj.domainsid),
+                "CONFIGDN": subobj.configdn,
+                "ADMINPASS_B64": b64encode(subobj.adminpass),
+                "KRBTGTPASS_B64": b64encode(subobj.krbtgtpass),
+                })
+
+            if lp.get("server role") == "domain controller":
+                message("Setting up self join")
+                if subobj.host_guid is not None:
+                    hostguid_add = "objectGUID: %s" % subobj.host_guid
+                else:
+                    hostguid_add = ""
+
+                setup_add_ldif(samdb, setup_dir, "provision_self_join.ldif", { 
+                          "CONFIGDN": subobj.configdn, 
+                          "SCHEMADN": subobj.schemadn,
+                          "DOMAINDN": subobj.domaindn,
+                          "INVOCATIONID": subobj.invocationid,
+                          "NETBIOSNAME": subobj.netbiosname,
+                          "DEFAULTSITE": subobj.defaultsite,
+                          "DNSNAME": subobj.dnsname,
+                          "MACHINEPASS_B64": b64encode(subobj.machinepass),
+                          "DNSPASS_B64": b64encode(subobj.dnspass),
+                          "REALM": subobj.realm,
+                          "DOMAIN": subobj.domain,
+                          "HOSTGUID_ADD": hostguid_add,
+                          "DNSDOMAIN": subobj.dnsdomain})
+                setup_add_ldif(samdb, setup_dir, "provision_group_policy.ldif", { 
+                          "POLICYGUID": subobj.policyguid,
+                          "DNSDOMAIN": subobj.dnsdomain,
+                          "DOMAINSID": str(subobj.domainsid),
+                          "DOMAINDN": subobj.domaindn})
+
+                os.makedirs(os.path.join(paths.sysvol, subobj.dnsdomain, "Policies", "{" + subobj.policyguid + "}"), 0755)
+                os.makedirs(os.path.join(paths.sysvol, subobj.dnsdomain, "Policies", "{" + subobj.policyguid + "}", "Machine"), 0755)
+                os.makedirs(os.path.join(paths.sysvol, subobj.dnsdomain, "Policies", "{" + subobj.policyguid + "}", "User"), 0755)
+                if not os.path.isdir(paths.netlogon):
+                    os.makedirs(paths.netlogon, 0755)
+                setup_ldb(secrets_ldb, setup_dir, "secrets_dc.ldif", { 
+                    "MACHINEPASS_B64": b64encode(subobj.machinepass),
+                    "DOMAIN": subobj.domain,
+                    "REALM": subobj.realm,
+                    "LDAPTIME": timestring(int(time.time())),
+                    "DNSDOMAIN": subobj.dnsdomain,
+                    "DOMAINSID": str(subobj.domainsid),
+                    "SECRETS_KEYTAB": paths.keytab,
+                    "NETBIOSNAME": subobj.netbiosname,
+                    "SAM_LDB": paths.samdb,
+                    "DNS_KEYTAB": paths.dns_keytab,
+                    "DNSPASS_B64": b64encode(subobj.dnspass),
+                    })
 
-        setup_name_mappings(subobj, samdb)
+            setup_name_mappings(subobj, samdb)
 
         message("Setting up sam.ldb index")
         setup_add_ldif(samdb, setup_dir, "provision_index.ldif")
@@ -628,7 +661,7 @@ def provision(lp, setup_dir, subobj, message, blank, paths, session_info,
     samdb.transaction_commit()
 
     message("Setting up phpLDAPadmin configuration")
-    create_phplpapdadmin_config(paths.phpldapadminconfig, setup_dir, subobj.s4_ldapi_path)
+    create_phplpapdadmin_config(paths.phpldapadminconfig, setup_dir, paths.s4_ldapi_path)
 
     message("Please install the phpLDAPadmin configuration located at %s into /etc/phpldapadmin/config.php" % paths.phpldapadminconfig)
 
-- 
cgit 


From 44946cefb3c016a45f1d167db765b705e96ed70c Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 18 Dec 2007 17:21:24 +0100
Subject: r26525: Consistency in the API. (This used to be commit
 37577fee582e7c9896b5cf8b62016d480b8f147e)

---
 source4/scripting/python/samba/provision.py | 103 ++++++++++++++--------------
 1 file changed, 53 insertions(+), 50 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index c17b74345a..ebc8288351 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -199,12 +199,13 @@ def setup_ldb(ldb, setup_dir, ldif, subst_vars=None):
     ldb.transaction_commit()
 
 
-def setup_ldb_modify(setup_dir, ldif, substvars, ldb):
+def setup_ldb_modify(ldb, setup_dir, ldif, substvars=None):
     """Modify a ldb in the private dir."""
     src = os.path.join(setup_dir, ldif)
 
     data = open(src, 'r').read()
-    data = substitute_var(data, substvars)
+    if substvars is not None:
+        data = substitute_var(data, substvars)
     assert not "${" in data
 
     for (changetype, msg) in ldb.parse_ldif(data):
@@ -312,7 +313,8 @@ def provision_become_dc(setup_dir, subobj, message, paths, lp, session_info,
     samdb.erase()
 
     message("Setting up %s partitions" % paths.samdb)
-    setup_samdb_partitions(samdb, setup_dir, subobj)
+    setup_samdb_partitions(samdb, setup_dir, subobj.schemadn, 
+                           subobj.configdn, subobj.domaindn)
 
     samdb = SamDB(paths.samdb, credentials=credentials, 
                   session_info=session_info, lp=lp)
@@ -382,23 +384,52 @@ def setup_samdb_rootdse(samdb, setup_dir, subobj):
         })
 
 
-def setup_samdb_partitions(samdb, setup_dir, subobj):
+def setup_samdb_partitions(samdb, setup_dir, schemadn, configdn, domaindn):
+    #Add modules to the list to activate them by default
+    #beware often order is important
+    #
+    # Some Known ordering constraints:
+    # - rootdse must be first, as it makes redirects from "" -> cn=rootdse
+    # - objectclass must be before password_hash, because password_hash checks
+    #   that the objectclass is of type person (filled in by objectclass
+    #   module when expanding the objectclass list)
+    # - partition must be last
+    # - each partition has its own module list then
+    modules_list = ["rootdse",
+                    "paged_results",
+                    "ranged_results",
+                    "anr",
+                    "server_sort",
+                    "extended_dn",
+                    "asq",
+                    "samldb",
+                    "rdn_name",
+                    "objectclass",
+                    "kludge_acl",
+                    "operational"]
+    tdb_modules_list = [
+                    "subtree_rename",
+                    "subtree_delete",
+                    "linked_attributes"]
+    modules_list2 = ["show_deleted",
+                    "partition"]
+ 
     setup_ldb(samdb, setup_dir, "provision_partitions.ldif", {
-        "SCHEMADN": subobj.schemadn, 
+        "SCHEMADN": schemadn, 
         "SCHEMADN_LDB": "schema.ldb",
         "SCHEMADN_MOD2": ",objectguid",
-        "CONFIGDN": subobj.configdn,
+        "CONFIGDN": configdn,
         "CONFIGDN_LDB": "configuration.ldb",
-        "DOMAINDN": subobj.domaindn,
+        "DOMAINDN": domaindn,
         "DOMAINDN_LDB": "users.ldb",
         "SCHEMADN_MOD": "schema_fsmo",
         "CONFIGDN_MOD": "naming_fsmo",
         "CONFIGDN_MOD2": ",objectguid",
         "DOMAINDN_MOD": "pdc_fsmo,password_hash",
         "DOMAINDN_MOD2": ",objectguid",
-        "MODULES_LIST": ",".join(subobj.modules_list),
-        "TDB_MODULES_LIST": ","+",".join(subobj.tdb_modules_list),
-        "MODULES_LIST2": ",".join(subobj.modules_list2),
+        "MODULES_LIST": ",".join(modules_list),
+        "TDB_MODULES_LIST": ","+",".join(tdb_modules_list),
+        "MODULES_LIST2": ",".join(modules_list2),
         })
 
 
@@ -451,7 +482,8 @@ def provision(lp, setup_dir, subobj, message, blank, paths, session_info,
     samdb.erase()
 
     message("Setting up sam.ldb partitions")
-    setup_samdb_partitions(samdb, setup_dir, subobj)
+    setup_samdb_partitions(samdb, setup_dir, subobj.schemadn,
+                           subobj.configdn, subobj.domaindn)
 
     samdb = SamDB(paths.samdb, session_info=session_info, 
                   credentials=credentials, lp=lp)
@@ -495,7 +527,7 @@ def provision(lp, setup_dir, subobj, message, blank, paths, session_info,
         else:
             domainguid_mod = ""
 
-        setup_ldb_modify(setup_dir, "provision_basedn_modify.ldif", {
+        setup_ldb_modify(samdb, setup_dir, "provision_basedn_modify.ldif", {
             "RDN_DC": subobj.rdn_dc,
             "LDAPTIME": timestring(int(time.time())),
             "DOMAINSID": str(subobj.domainsid),
@@ -506,7 +538,7 @@ def provision(lp, setup_dir, subobj, message, blank, paths, session_info,
             "POLICYGUID": subobj.policyguid,
             "DOMAINDN": subobj.domaindn,
             "DOMAINGUID_MOD": domainguid_mod,
-            }, samdb)
+            })
 
         message("Adding configuration container (permitted to fail)")
         setup_add_ldif(samdb, setup_dir, "provision_configuration_basedn.ldif", {
@@ -515,10 +547,10 @@ def provision(lp, setup_dir, subobj, message, blank, paths, session_info,
             "EXTENSIBLEOBJECT": "# no objectClass: extensibleObject for local ldb",
             })
         message("Modifying configuration container")
-        setup_ldb_modify(setup_dir, "provision_configuration_basedn_modify.ldif", {
+        setup_ldb_modify(samdb, setup_dir, "provision_configuration_basedn_modify.ldif", {
             "CONFIGDN": subobj.configdn, 
             "SCHEMADN": subobj.schemadn,
-            }, samdb)
+            })
 
         message("Adding schema container (permitted to fail)")
         setup_add_ldif(samdb, setup_dir, "provision_schema_basedn.ldif", {
@@ -527,12 +559,12 @@ def provision(lp, setup_dir, subobj, message, blank, paths, session_info,
             "EXTENSIBLEOBJECT": "# no objectClass: extensibleObject for local ldb"
             })
         message("Modifying schema container")
-        setup_ldb_modify(setup_dir, "provision_schema_basedn_modify.ldif", {
+        setup_ldb_modify(samdb, setup_dir, "provision_schema_basedn_modify.ldif", {
             "SCHEMADN": subobj.schemadn,
             "NETBIOSNAME": subobj.netbiosname,
             "DEFAULTSITE": subobj.defaultsite,
             "CONFIGDN": subobj.configdn,
-            }, samdb)
+            })
 
         message("Setting up sam.ldb Samba4 schema")
         setup_add_ldif(samdb, setup_dir, "schema_samba4.ldif", {
@@ -561,14 +593,14 @@ def provision(lp, setup_dir, subobj, message, blank, paths, session_info,
         setup_add_ldif(samdb, setup_dir, "provision_users_add.ldif", {
             "DOMAINDN": subobj.domaindn})
         message("Modifying users container")
-        setup_ldb_modify(setup_dir, "provision_users_modify.ldif", {
-            "DOMAINDN": subobj.domaindn}, samdb)
+        setup_ldb_modify(samdb, setup_dir, "provision_users_modify.ldif", {
+            "DOMAINDN": subobj.domaindn})
         message("Adding computers container (permitted to fail)")
         setup_add_ldif(samdb, setup_dir, "provision_computers_add.ldif", {
             "DOMAINDN": subobj.domaindn})
         message("Modifying computers container")
-        setup_ldb_modify(setup_dir, "provision_computers_modify.ldif", {
-            "DOMAINDN": subobj.domaindn}, samdb)
+        setup_ldb_modify(samdb, setup_dir, "provision_computers_modify.ldif", {
+            "DOMAINDN": subobj.domaindn})
         message("Setting up sam.ldb data")
         setup_add_ldif(samdb, setup_dir, "provision.ldif", {
             "DOMAINDN": subobj.domaindn,
@@ -755,35 +787,6 @@ def provision_guess(lp):
     subobj.configdn     = "CN=Configuration," + subobj.rootdn
     subobj.schemadn     = "CN=Schema," + subobj.configdn
 
-    #Add modules to the list to activate them by default
-    #beware often order is important
-    #
-    # Some Known ordering constraints:
-    # - rootdse must be first, as it makes redirects from "" -> cn=rootdse
-    # - objectclass must be before password_hash, because password_hash checks
-    #   that the objectclass is of type person (filled in by objectclass
-    #   module when expanding the objectclass list)
-    # - partition must be last
-    # - each partition has its own module list then
-    subobj.modules_list = ["rootdse",
-                    "paged_results",
-                    "ranged_results",
-                    "anr",
-                    "server_sort",
-                    "extended_dn",
-                    "asq",
-                    "samldb",
-                    "rdn_name",
-                    "objectclass",
-                    "kludge_acl",
-                    "operational"]
-    subobj.tdb_modules_list = [
-                    "subtree_rename",
-                    "subtree_delete",
-                    "linked_attributes"]
-    subobj.modules_list2 = ["show_deleted",
-                    "partition"]
-
     return subobj
 
 
-- 
cgit 


From 4e6ab64762477c0117aa823fd8e6b1275d63e0d7 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 18 Dec 2007 18:54:19 +0100
Subject: r26527: Start on tests for provision. (This used to be commit
 84ac6c6bbfc4baaf28906ee5826a9cf888043656)

---
 source4/scripting/python/samba/__init__.py        |  2 -
 source4/scripting/python/samba/provision.py       | 60 ++++++++---------------
 source4/scripting/python/samba/tests/__init__.py  | 17 +++++++
 source4/scripting/python/samba/tests/provision.py | 59 ++++++++++++++++++++++
 4 files changed, 96 insertions(+), 42 deletions(-)
 create mode 100644 source4/scripting/python/samba/tests/provision.py

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/__init__.py b/source4/scripting/python/samba/__init__.py
index 3981464681..9ac283e660 100644
--- a/source4/scripting/python/samba/__init__.py
+++ b/source4/scripting/python/samba/__init__.py
@@ -129,8 +129,6 @@ def substitute_var(text, values):
         assert isinstance(value, str), "Value %r for %s is not a string" % (value, name)
         text = text.replace("${%s}" % name, value)
 
-    assert "${" not in text, text
-
     return text
 
 
diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index ebc8288351..04f50e8359 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -135,18 +135,6 @@ def hostname():
     return gethostname().split(".")[0]
 
 
-def ldb_delete(ldb):
-    """Delete a LDB file.
-
-    This may be necessary if the ldb is in bad shape, possibly due to being 
-    built from an incompatible previous version of the code, so delete it
-    completely.
-    """
-    print "Deleting %s\n" % ldb.filename
-    os.unlink(ldb.filename)
-    ldb.connect(ldb.filename)
-
-
 def open_ldb(session_info, credentials, lp, dbname):
     assert session_info is not None
     try:
@@ -176,6 +164,13 @@ def setup_add_ldif(ldb, setup_dir, ldif, subst_vars=None):
 
 
 def setup_modify_ldif(ldb, setup_dir, ldif, substvars=None):
+    """Modify a ldb in the private dir.
+    
+    :param ldb: LDB object.
+    :param setup_dir: Setup directory.
+    :param ldif: LDIF file path.
+    :param substvars: Optional dictionary with substitution variables.
+    """
     src = os.path.join(setup_dir, ldif)
 
     data = open(src, 'r').read()
@@ -199,19 +194,6 @@ def setup_ldb(ldb, setup_dir, ldif, subst_vars=None):
     ldb.transaction_commit()
 
 
-def setup_ldb_modify(ldb, setup_dir, ldif, substvars=None):
-    """Modify a ldb in the private dir."""
-    src = os.path.join(setup_dir, ldif)
-
-    data = open(src, 'r').read()
-    if substvars is not None:
-        data = substitute_var(data, substvars)
-    assert not "${" in data
-
-    for (changetype, msg) in ldb.parse_ldif(data):
-        ldb.modify(msg)
-
-
 def setup_file(setup_dir, template, fname, substvars):
     """Setup a file in the private dir."""
     f = fname
@@ -328,7 +310,7 @@ def provision_become_dc(setup_dir, subobj, message, paths, lp, session_info,
         setup_samdb_rootdse(samdb, setup_dir, subobj)
 
         message("Erasing data from partitions")
-        ldb_erase_partitions(subobj, message, samdb, None)
+        ldb_erase_partitions(subobj.domaindn, message, samdb, None)
 
         message("Setting up %s indexes" % paths.samdb)
         setup_add_ldif(samdb, setup_dir, "provision_index.ldif")
@@ -453,8 +435,7 @@ def provision(lp, setup_dir, subobj, message, blank, paths, session_info,
             smbconfsuffix = "member"
         else:
             assert "Invalid server role setting: %s" % lp.get("server role")
-        setup_file(setup_dir, "provision.smb.conf.%s" % smbconfsuffix, paths.smbconf, 
-                None)
+        setup_file(setup_dir, "provision.smb.conf.%s" % smbconfsuffix, paths.smbconf)
         lp.reload()
 
     # only install a new shares config db if there is none
@@ -462,7 +443,7 @@ def provision(lp, setup_dir, subobj, message, blank, paths, session_info,
         message("Setting up share.ldb")
         share_ldb = Ldb(paths.shareconf, session_info=session_info, 
                         credentials=credentials, lp=lp)
-        setup_ldb(share_ldb, setup_dir, "share.ldif", None)
+        setup_ldb(share_ldb, setup_dir, "share.ldif")
 
     message("Setting up %s" % paths.secrets)
     secrets_ldb = setup_secretsdb(paths.secrets, setup_dir, session_info=session_info, 
@@ -497,7 +478,7 @@ def provision(lp, setup_dir, subobj, message, blank, paths, session_info,
         setup_samdb_rootdse(samdb, setup_dir, subobj)
 
         message("Erasing data from partitions")
-        ldb_erase_partitions(subobj, message, samdb, ldapbackend)
+        ldb_erase_partitions(subobj.domaindn, message, samdb, ldapbackend)
     except:
         samdb.transaction_cancel()
         raise
@@ -527,7 +508,7 @@ def provision(lp, setup_dir, subobj, message, blank, paths, session_info,
         else:
             domainguid_mod = ""
 
-        setup_ldb_modify(samdb, setup_dir, "provision_basedn_modify.ldif", {
+        setup_modify_ldif(samdb, setup_dir, "provision_basedn_modify.ldif", {
             "RDN_DC": subobj.rdn_dc,
             "LDAPTIME": timestring(int(time.time())),
             "DOMAINSID": str(subobj.domainsid),
@@ -547,7 +528,7 @@ def provision(lp, setup_dir, subobj, message, blank, paths, session_info,
             "EXTENSIBLEOBJECT": "# no objectClass: extensibleObject for local ldb",
             })
         message("Modifying configuration container")
-        setup_ldb_modify(samdb, setup_dir, "provision_configuration_basedn_modify.ldif", {
+        setup_modify_ldif(samdb, setup_dir, "provision_configuration_basedn_modify.ldif", {
             "CONFIGDN": subobj.configdn, 
             "SCHEMADN": subobj.schemadn,
             })
@@ -559,7 +540,7 @@ def provision(lp, setup_dir, subobj, message, blank, paths, session_info,
             "EXTENSIBLEOBJECT": "# no objectClass: extensibleObject for local ldb"
             })
         message("Modifying schema container")
-        setup_ldb_modify(samdb, setup_dir, "provision_schema_basedn_modify.ldif", {
+        setup_modify_ldif(samdb, setup_dir, "provision_schema_basedn_modify.ldif", {
             "SCHEMADN": subobj.schemadn,
             "NETBIOSNAME": subobj.netbiosname,
             "DEFAULTSITE": subobj.defaultsite,
@@ -593,13 +574,13 @@ def provision(lp, setup_dir, subobj, message, blank, paths, session_info,
         setup_add_ldif(samdb, setup_dir, "provision_users_add.ldif", {
             "DOMAINDN": subobj.domaindn})
         message("Modifying users container")
-        setup_ldb_modify(samdb, setup_dir, "provision_users_modify.ldif", {
+        setup_modify_ldif(samdb, setup_dir, "provision_users_modify.ldif", {
             "DOMAINDN": subobj.domaindn})
         message("Adding computers container (permitted to fail)")
         setup_add_ldif(samdb, setup_dir, "provision_computers_add.ldif", {
             "DOMAINDN": subobj.domaindn})
         message("Modifying computers container")
-        setup_ldb_modify(samdb, setup_dir, "provision_computers_modify.ldif", {
+        setup_modify_ldif(samdb, setup_dir, "provision_computers_modify.ldif", {
             "DOMAINDN": subobj.domaindn})
         message("Setting up sam.ldb data")
         setup_add_ldif(samdb, setup_dir, "provision.ldif", {
@@ -807,7 +788,7 @@ def load_schema(setup_dir, samdb, subobj):
     samdb.attach_schema_from_ldif(head_data, schema_data)
 
 
-def join_domain(domain, netbios_name, join_type, creds, message):
+def join_domain(domain, netbios_name, join_type, creds):
     ctx = NetContext(creds)
     joindom = object()
     joindom.domain = domain
@@ -824,8 +805,7 @@ def vampire(domain, session_info, credentials, message):
     access to our local database (might be remote ldap)
     """
     ctx = NetContext(credentials)
-    vampire_ctx = object()
-    machine_creds = credentials_init()
+    machine_creds = Credentials()
     machine_creds.set_domain(form.domain)
     if not machine_creds.set_machine_account():
         raise Exception("Failed to access domain join information!")
@@ -835,7 +815,7 @@ def vampire(domain, session_info, credentials, message):
         raise Exception("Migration of remote domain to Samba failed: %s " % vampire_ctx.error_string)
 
 
-def ldb_erase_partitions(subobj, message, ldb, ldapbackend):
+def ldb_erase_partitions(domaindn, message, ldb, ldapbackend):
     """Erase an ldb, removing all records."""
     assert ldb is not None
     res = ldb.search(Dn(ldb, ""), SCOPE_BASE, "(objectClass=*)", 
@@ -848,7 +828,7 @@ def ldb_erase_partitions(subobj, message, ldb, ldapbackend):
         previous_remaining = 1
         current_remaining = 0
 
-        if ldapbackend and (basedn == subobj.domaindn):
+        if ldapbackend and (basedn == domaindn):
             # Only delete objects that were created by provision
             anything = "(objectcategory=*)"
 
diff --git a/source4/scripting/python/samba/tests/__init__.py b/source4/scripting/python/samba/tests/__init__.py
index d3930e217a..0808469907 100644
--- a/source4/scripting/python/samba/tests/__init__.py
+++ b/source4/scripting/python/samba/tests/__init__.py
@@ -35,3 +35,20 @@ class LdbTestCase(unittest.TestCase):
         self.ldb = samba.Ldb(self.filename)
 
 
+class SubstituteVarTestCase(unittest.TestCase):
+    def test_empty(self):
+        self.assertEquals("", samba.substitute_var("", {}))
+
+    def test_nothing(self):
+        self.assertEquals("foo bar", samba.substitute_var("foo bar", {"bar": "bla"}))
+
+    def test_replace(self):
+        self.assertEquals("foo bla", samba.substitute_var("foo ${bar}", {"bar": "bla"}))
+
+    def test_broken(self):
+        self.assertEquals("foo ${bdkjfhsdkfh sdkfh ", 
+                samba.substitute_var("foo ${bdkjfhsdkfh sdkfh ", {"bar": "bla"}))
+
+    def test_unknown_var(self):
+        self.assertEquals("foo ${bla} gsff", 
+                samba.substitute_var("foo ${bla} gsff", {"bar": "bla"}))
diff --git a/source4/scripting/python/samba/tests/provision.py b/source4/scripting/python/samba/tests/provision.py
new file mode 100644
index 0000000000..5edfe79084
--- /dev/null
+++ b/source4/scripting/python/samba/tests/provision.py
@@ -0,0 +1,59 @@
+#!/usr/bin/python
+
+# Unix SMB/CIFS implementation.
+# Copyright (C) Jelmer Vernooij <jelmer@samba.org> 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 <http://www.gnu.org/licenses/>.
+#
+
+import unittest
+import samba.provision
+
+class ProvisionTestCase(unittest.TestCase):
+    def test_setup_secretsdb(self):
+        raise NotImplementedError(self.test_setup_secretsdb)
+
+    def test_setup_templatesdb(self):
+        raise NotImplementedError(self.test_setup_templatesdb)
+
+    def test_setup_registry(self):
+        raise NotImplementedError(self.test_setup_registry)
+
+    def test_setup_samdb_rootdse(self):
+        raise NotImplementedError(self.test_setup_samdb_rootdse)
+
+    def test_setup_samdb_partitions(self):
+        raise NotImplementedError(self.test_setup_samdb_partitions)
+
+    def test_create_phpldapadmin_config(self):
+        raise NotImplementedError(self.test_create_phpldapadmin_config)
+
+    def test_provision_dns(self):
+        raise NotImplementedError(self.test_provision_dns)
+
+    def test_provision_ldapbase(self):
+        raise NotImplementedError(self.test_provision_ldapbase)
+
+    def test_provision_guess(self):
+        raise NotImplementedError(self.test_provision_guess)
+
+    def test_join_domain(self):
+        raise NotImplementedError(self.test_join_domain)
+
+    def test_vampire(self):
+        raise NotImplementedError(self.test_vampire)
+
+    def test_erase_partitions(self):
+        raise NotImplementedError(self.test_erase_partitions)
+
-- 
cgit 


From 5ed08ebac3545e60ac8c553ffe8b019d7ba3f853 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Wed, 19 Dec 2007 11:34:36 +0100
Subject: r26534: configure: using == in shell scripts isn't portable
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Thanks to Björn Jacke <bj@sernet.de> for reporting this.

metze
(This used to be commit 1d5d97083029956fd1ce5eb2c0333052a46a334a)
---
 source4/scripting/python/config.m4 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/config.m4 b/source4/scripting/python/config.m4
index 8c4225175e..96e4da9add 100644
--- a/source4/scripting/python/config.m4
+++ b/source4/scripting/python/config.m4
@@ -65,7 +65,7 @@ if test -z "$PYTHON_LDFLAGS"; then
 	py_version=`$PYTHON -c "from distutils.sysconfig import *; \
 		from string import join; \
 		print join(get_config_vars('VERSION'))"`
-	if test "$py_version" == "[None]"; then
+	if test "$py_version" = "[None]"; then
 		if test -n "$PYTHON_VERSION"; then
 			py_version=$PYTHON_VERSION
 		else
-- 
cgit 


From 595ec370da471116b35464dc65d2962f28380d74 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Wed, 19 Dec 2007 23:27:24 +0100
Subject: r26535: Get rid of all-knowing ProvisionSettings object. (This used
 to be commit 40bf88c8a70e8379a6081cb6050034bcd7ae56eb)

---
 source4/scripting/python/samba/provision.py | 522 ++++++++++++++--------------
 1 file changed, 258 insertions(+), 264 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index 04f50e8359..c9cb457b4a 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -1,8 +1,10 @@
 #
 #    backend code for provisioning a Samba4 server
-#    Copyright Andrew Tridgell 2005
-#    Copyright Jelmer Vernooij 2007
 #    Released under the GNU GPL v2 or later
+#    Copyright Jelmer Vernooij 2007
+#
+# Based on the original in EJS:
+#    Copyright Andrew Tridgell 2005
 #
 
 from base64 import b64encode
@@ -22,67 +24,13 @@ from ldb import Dn, SCOPE_SUBTREE, SCOPE_ONELEVEL, SCOPE_BASE, LdbError, \
         LDB_ERR_NO_SUCH_OBJECT, timestring
 
 
+DEFAULTSITE = "Default-First-Site-Name"
+
 class InvalidNetbiosName(Exception):
     def __init__(self, name):
         super(InvalidNetbiosName, self).__init__("The name '%r' is not a valid NetBIOS name" % name)
 
 
-class ProvisionSettings(object):
-    def __init__(self, realm=None, domain=None, hostname=None, hostip=None):
-        self.realm = realm
-        self.domain = domain
-        self.hostname = hostname
-        self.hostip = hostip
-        self.domainsid = None
-        self.invocationid = None
-        self.krbtgtpass = None
-        self.machinepass = None
-        self.adminpass = None
-        self.defaultsite  = "Default-First-Site-Name"
-        self.root = None
-        self.nobody = None
-        self.nogroup = None
-        self.wheel = None
-        self.backup = None
-        self.users = None
-        self.dnsdomain = None
-        self.dnsname = None
-        self.domaindn = None
-        self.rootdn = None
-        self.configdn = None
-        self.schemedn = None
-        self.schemedn_ldb = None
-        self.s4_ldapi_path = None
-        self.policyguid = None
-
-    def fix(self, paths):
-        self.realm       = self.realm.upper()
-        self.hostname    = self.hostname.lower()
-        self.domain      = self.domain.upper()
-        if not valid_netbios_name(self.domain):
-            raise InvalidNetbiosName(self.domain)
-        self.netbiosname = self.hostname.upper()
-        if not valid_netbios_name(self.netbiosname):
-            raise InvalidNetbiosName(self.netbiosname)
-        rdns = self.domaindn.split(",")
-        self.rdn_dc = rdns[0][len("DC="):]
-
-    def validate(self, lp):
-        if not valid_netbios_name(self.domain):
-            raise InvalidNetbiosName(self.domain)
-
-        if not valid_netbios_name(self.netbiosname):
-            raise InvalidNetbiosName(self.netbiosname)
-
-        if lp.get("workgroup").upper() != self.domain.upper():
-            raise Error("workgroup '%s' in smb.conf must match chosen domain '%s'\n",
-                lp.get("workgroup"), self.domain)
-
-        if lp.get("realm").upper() != self.realm.upper():
-            raise Error("realm '%s' in smb.conf must match chosen realm '%s'\n" %
-                (lp.get("realm"), self.realm))
-
-
 class ProvisionPaths:
     def __init__(self):
         self.smbconf = None
@@ -125,11 +73,6 @@ def findnss(nssfn, *names):
     raise Exception("Unable to find user/group for %s" % arguments[1])
 
 
-def hostip():
-    """return first host IP."""
-    return gethostbyname(hostname())
-
-
 def hostname():
     """return first part of hostname."""
     return gethostname().split(".")[0]
@@ -210,11 +153,11 @@ def setup_file(setup_dir, template, fname, substvars):
     open(f, 'w').write(data)
 
 
-def provision_default_paths(lp, subobj):
+def provision_default_paths(lp, dnsdomain):
     """Set the default paths for provisioning.
 
     :param lp: Loadparm context.
-    :param subobj: Object
+    :param dnsdomain: DNS Domain name
     """
     paths = ProvisionPaths()
     private_dir = lp.get("private dir")
@@ -224,14 +167,14 @@ def provision_default_paths(lp, subobj):
     paths.templates = os.path.join(private_dir, "templates.ldb")
     paths.keytab = os.path.join(private_dir, "secrets.keytab")
     paths.dns_keytab = os.path.join(private_dir, "dns.keytab")
-    paths.dns = os.path.join(private_dir, subobj.dnsdomain + ".zone")
+    paths.dns = os.path.join(private_dir, dnsdomain + ".zone")
     paths.winsdb = os.path.join(private_dir, "wins.ldb")
     paths.ldap_basedn_ldif = os.path.join(private_dir, 
-                                          subobj.dnsdomain + ".ldif")
+                                          dnsdomain + ".ldif")
     paths.ldap_config_basedn_ldif = os.path.join(private_dir, 
-                                             subobj.dnsdomain + "-config.ldif")
+                                             dnsdomain + "-config.ldif")
     paths.ldap_schema_basedn_ldif = os.path.join(private_dir, 
-                                              subobj.dnsdomain + "-schema.ldif")
+                                              dnsdomain + "-schema.ldif")
     paths.s4_ldapi_path = os.path.join(private_dir, "ldapi")
     paths.phpldapadminconfig = os.path.join(private_dir, 
                                             "phpldapadmin-config.php")
@@ -247,41 +190,39 @@ def provision_default_paths(lp, subobj):
     return paths
 
 
-def setup_name_mappings(subobj, ldb):
+def setup_name_mappings(ldb, sid, domaindn, root, nobody, nogroup, users, 
+                        wheel, backup):
     """setup reasonable name mappings for sam names to unix names."""
-    sid = str(subobj.domainsid)
-
     # add some foreign sids if they are not present already
-    ldb.add_foreign(subobj.domaindn, "S-1-5-7", "Anonymous")
-    ldb.add_foreign(subobj.domaindn, "S-1-1-0", "World")
-    ldb.add_foreign(subobj.domaindn, "S-1-5-2", "Network")
-    ldb.add_foreign(subobj.domaindn, "S-1-5-18", "System")
-    ldb.add_foreign(subobj.domaindn, "S-1-5-11", "Authenticated Users")
+    ldb.add_foreign(domaindn, "S-1-5-7", "Anonymous")
+    ldb.add_foreign(domaindn, "S-1-1-0", "World")
+    ldb.add_foreign(domaindn, "S-1-5-2", "Network")
+    ldb.add_foreign(domaindn, "S-1-5-18", "System")
+    ldb.add_foreign(domaindn, "S-1-5-11", "Authenticated Users")
 
     # some well known sids
-    ldb.setup_name_mapping(subobj.domaindn, "S-1-5-7", subobj.nobody)
-    ldb.setup_name_mapping(subobj.domaindn, "S-1-1-0", subobj.nogroup)
-    ldb.setup_name_mapping(subobj.domaindn, "S-1-5-2", subobj.nogroup)
-    ldb.setup_name_mapping(subobj.domaindn, "S-1-5-18", subobj.root)
-    ldb.setup_name_mapping(subobj.domaindn, "S-1-5-11", subobj.users)
-    ldb.setup_name_mapping(subobj.domaindn, "S-1-5-32-544", subobj.wheel)
-    ldb.setup_name_mapping(subobj.domaindn, "S-1-5-32-545", subobj.users)
-    ldb.setup_name_mapping(subobj.domaindn, "S-1-5-32-546", subobj.nogroup)
-    ldb.setup_name_mapping(subobj.domaindn, "S-1-5-32-551", subobj.backup)
+    ldb.setup_name_mapping(domaindn, "S-1-5-7", nobody)
+    ldb.setup_name_mapping(domaindn, "S-1-1-0", nogroup)
+    ldb.setup_name_mapping(domaindn, "S-1-5-2", nogroup)
+    ldb.setup_name_mapping(domaindn, "S-1-5-18", root)
+    ldb.setup_name_mapping(domaindn, "S-1-5-11", users)
+    ldb.setup_name_mapping(domaindn, "S-1-5-32-544", wheel)
+    ldb.setup_name_mapping(domaindn, "S-1-5-32-545", users)
+    ldb.setup_name_mapping(domaindn, "S-1-5-32-546", nogroup)
+    ldb.setup_name_mapping(domaindn, "S-1-5-32-551", backup)
 
     # and some well known domain rids
-    ldb.setup_name_mapping(subobj.domaindn, sid + "-500", subobj.root)
-    ldb.setup_name_mapping(subobj.domaindn, sid + "-518", subobj.wheel)
-    ldb.setup_name_mapping(subobj.domaindn, sid + "-519", subobj.wheel)
-    ldb.setup_name_mapping(subobj.domaindn, sid + "-512", subobj.wheel)
-    ldb.setup_name_mapping(subobj.domaindn, sid + "-513", subobj.users)
-    ldb.setup_name_mapping(subobj.domaindn, sid + "-520", subobj.wheel)
+    ldb.setup_name_mapping(domaindn, sid + "-500", root)
+    ldb.setup_name_mapping(domaindn, sid + "-518", wheel)
+    ldb.setup_name_mapping(domaindn, sid + "-519", wheel)
+    ldb.setup_name_mapping(domaindn, sid + "-512", wheel)
+    ldb.setup_name_mapping(domaindn, sid + "-513", users)
+    ldb.setup_name_mapping(domaindn, sid + "-520", wheel)
 
 
-def provision_become_dc(setup_dir, subobj, message, paths, lp, session_info, 
+def provision_become_dc(setup_dir, message, paths, lp, session_info, 
                         credentials):
     assert session_info is not None
-    subobj.fix(paths)
 
     message("Setting up templates into %s" % paths.templates)
     setup_templatesdb(paths.templates, setup_dir, session_info, 
@@ -295,8 +236,8 @@ def provision_become_dc(setup_dir, subobj, message, paths, lp, session_info,
     samdb.erase()
 
     message("Setting up %s partitions" % paths.samdb)
-    setup_samdb_partitions(samdb, setup_dir, subobj.schemadn, 
-                           subobj.configdn, subobj.domaindn)
+    setup_samdb_partitions(samdb, setup_dir, schemadn, 
+                           configdn, domaindn)
 
     samdb = SamDB(paths.samdb, credentials=credentials, 
                   session_info=session_info, lp=lp)
@@ -307,10 +248,12 @@ def provision_become_dc(setup_dir, subobj, message, paths, lp, session_info,
         setup_add_ldif(samdb, setup_dir, "provision_init.ldif")
 
         message("Setting up %s rootDSE" % paths.samdb)
-        setup_samdb_rootdse(samdb, setup_dir, subobj)
+        setup_samdb_rootdse(samdb, setup_dir, schemadn, domaindn, 
+                            hostname, dnsdomain, realm, rootdn, configdn, 
+                            netbiosname)
 
         message("Erasing data from partitions")
-        ldb_erase_partitions(subobj.domaindn, message, samdb, None)
+        ldb_erase_partitions(domaindn, message, samdb, None)
 
         message("Setting up %s indexes" % paths.samdb)
         setup_add_ldif(samdb, setup_dir, "provision_index.ldif")
@@ -323,7 +266,7 @@ def provision_become_dc(setup_dir, subobj, message, paths, lp, session_info,
     message("Setting up %s" % paths.secrets)
     secrets_ldb = setup_secretsdb(paths.secrets, setup_dir, session_info, credentials, lp)
     setup_ldb(secrets_ldb, setup_dir, "secrets_dc.ldif", 
-              { "MACHINEPASS_B64": b64encode(self.machinepass) })
+              { "MACHINEPASS_B64": b64encode(machinepass) })
 
 
 def setup_secretsdb(path, setup_dir, session_info, credentials, lp):
@@ -351,17 +294,18 @@ def setup_registry(path, setup_dir, session_info, credentials, lp):
     reg.apply_patchfile(provision_reg)
 
 
-def setup_samdb_rootdse(samdb, setup_dir, subobj):
+def setup_samdb_rootdse(samdb, setup_dir, schemadn, domaindn, hostname, 
+                        dnsdomain, realm, rootdn, configdn, netbiosname):
     setup_add_ldif(samdb, setup_dir, "provision_rootdse_add.ldif", {
-        "SCHEMADN": subobj.schemadn, 
-        "NETBIOSNAME": subobj.netbiosname,
-        "DNSDOMAIN": subobj.dnsdomain,
-        "DEFAULTSITE": subobj.defaultsite,
-        "REALM": subobj.realm,
-        "DNSNAME": subobj.dnsname,
-        "DOMAINDN": subobj.domaindn,
-        "ROOTDN": subobj.rootdn,
-        "CONFIGDN": subobj.configdn,
+        "SCHEMADN": schemadn, 
+        "NETBIOSNAME": netbiosname,
+        "DNSDOMAIN": dnsdomain,
+        "DEFAULTSITE": DEFAULTSITE,
+        "REALM": realm,
+        "DNSNAME": "%s.%s" % (hostname, dnsdomain),
+        "DOMAINDN": domaindn,
+        "ROOTDN": rootdn,
+        "CONFIGDN": configdn,
         "VERSION": samba.version(),
         })
 
@@ -416,25 +360,103 @@ def setup_samdb_partitions(samdb, setup_dir, schemadn, configdn, domaindn):
 
 
 
-def provision(lp, setup_dir, subobj, message, blank, paths, session_info, 
-              credentials, ldapbackend):
+def provision(lp, setup_dir, message, blank, paths, session_info, 
+              credentials, ldapbackend, realm=None, domain=None, hostname=None, 
+              hostip=None, domainsid=None, hostguid=None, adminpass=None, 
+              krbtgtpass=None, domainguid=None, policyguid=None, 
+              invocationid=None, machinepass=None, dnspass=None, root=None,
+              nobody=None, nogroup=None, users=None, wheel=None, backup=None, 
+              aci=None, serverrole=None):
     """Provision samba4
     
     :note: caution, this wipes all existing data!
     """
-    subobj.fix(paths)
+
+    if domainsid is None:
+        domainsid = security.random_sid()
+    if policyguid is None:
+        policyguid = uuid.random()
+    if invocationid is None:
+        invocationid = uuid.random()
+    if adminpass is None:
+        adminpass = misc.random_password(12)
+    if krbtgtpass is None:
+        krbtgtpass = misc.random_password(12)
+    if machinepass is None:
+        machinepass  = misc.random_password(12)
+    if dnspass is None:
+        dnspass = misc.random_password(12)
+    if root is None:
+        root = findnss(pwd.getpwnam, "root")[4]
+    if nobody is None:
+        nobody = findnss(pwd.getpwnam, "nobody")[4]
+    if nogroup is None:
+        nogroup = findnss(grp.getgrnam, "nogroup", "nobody")[2]
+    if users is None:
+        users = findnss(grp.getgrnam, "users", "guest", "other", "unknown", "usr")[2]
+    if wheel is None:
+        wheel = findnss(grp.getgrnam, "wheel", "root", "staff", "adm")[2]
+    if backup is None:
+        backup = findnss(grp.getgrnam, "backup", "wheel", "root", "staff")[2]
+    if aci is None:
+        aci = "# no aci for local ldb"
+    if serverrole is None:
+        serverrole = lp.get("server role")
+
+    if realm is None:
+        realm = lp.get("realm")
+    else:
+        if lp.get("realm").upper() != realm.upper():
+            raise Error("realm '%s' in smb.conf must match chosen realm '%s'\n" %
+                (lp.get("realm"), realm))
+
+    assert realm is not None
+    realm = realm.upper()
+
+    if domain is None:
+        domain = lp.get("workgroup")
+    else:
+        if lp.get("workgroup").upper() != domain.upper():
+            raise Error("workgroup '%s' in smb.conf must match chosen domain '%s'\n",
+                lp.get("workgroup"), domain)
+
+    assert domain is not None
+    domain = domain.upper()
+    if not valid_netbios_name(domain):
+        raise InvalidNetbiosName(domain)
+
+    if hostname is None:
+        hostname = gethostname().split(".")[0].lower()
+
+    if hostip is None:
+        hostip = gethostbyname(hostname)
+
+    netbiosname = hostname.upper()
+    if not valid_netbios_name(netbiosname):
+        raise InvalidNetbiosName(netbiosname)
+
+    dnsdomain    = realm.lower()
+    domaindn     = "DC=" + dnsdomain.replace(".", ",DC=")
+    rootdn       = domaindn
+    configdn     = "CN=Configuration," + rootdn
+    schemadn     = "CN=Schema," + configdn
+
+    rdn_dc = domaindn.split(",")[0][len("DC="):]
+
+    message("Provisioning for %s in realm %s" % (domain, realm))
+    message("Using administrator password: %s" % adminpass)
 
     assert paths.smbconf is not None
 
     # only install a new smb.conf if there isn't one there already
     if not os.path.exists(paths.smbconf):
         message("Setting up smb.conf")
-        if lp.get("server role") == "domain controller":
+        if serverrole == "domain controller":
             smbconfsuffix = "dc"
-        elif lp.get("server role") == "member":
+        elif serverrole == "member":
             smbconfsuffix = "member"
         else:
-            assert "Invalid server role setting: %s" % lp.get("server role")
+            assert "Invalid server role setting: %s" % serverrole
         setup_file(setup_dir, "provision.smb.conf.%s" % smbconfsuffix, paths.smbconf)
         lp.reload()
 
@@ -463,8 +485,7 @@ def provision(lp, setup_dir, subobj, message, blank, paths, session_info,
     samdb.erase()
 
     message("Setting up sam.ldb partitions")
-    setup_samdb_partitions(samdb, setup_dir, subobj.schemadn,
-                           subobj.configdn, subobj.domaindn)
+    setup_samdb_partitions(samdb, setup_dir, schemadn, configdn, domaindn)
 
     samdb = SamDB(paths.samdb, session_info=session_info, 
                   credentials=credentials, lp=lp)
@@ -475,10 +496,12 @@ def provision(lp, setup_dir, subobj, message, blank, paths, session_info,
         setup_add_ldif(samdb, setup_dir, "provision_init.ldif")
 
         message("Setting up sam.ldb rootDSE")
-        setup_samdb_rootdse(samdb, setup_dir, subobj)
+        setup_samdb_rootdse(samdb, setup_dir, schemadn, domaindn, 
+                            hostname, dnsdomain, realm, rootdn, configdn, 
+                            netbiosname)
 
         message("Erasing data from partitions")
-        ldb_erase_partitions(subobj.domaindn, message, samdb, ldapbackend)
+        ldb_erase_partitions(domaindn, message, samdb, ldapbackend)
     except:
         samdb.transaction_cancel()
         raise
@@ -488,106 +511,104 @@ def provision(lp, setup_dir, subobj, message, blank, paths, session_info,
     message("Pre-loading the Samba 4 and AD schema")
     samdb = SamDB(paths.samdb, session_info=session_info, 
                   credentials=credentials, lp=lp)
-    samdb.set_domain_sid(subobj.domainsid)
-    load_schema(setup_dir, samdb, subobj)
+    samdb.set_domain_sid(domainsid)
+    load_schema(setup_dir, samdb, schemadn, netbiosname, configdn)
 
     samdb.transaction_start()
         
     try:
-        message("Adding DomainDN: %s (permitted to fail)" % subobj.domaindn)
+        message("Adding DomainDN: %s (permitted to fail)" % domaindn)
         setup_add_ldif(samdb, setup_dir, "provision_basedn.ldif", {
-            "DOMAINDN": subobj.domaindn,
-            "ACI": "# no aci for local ldb",
+            "DOMAINDN": domaindn,
+            "ACI": aci,
             "EXTENSIBLEOBJECT": "# no objectClass: extensibleObject for local ldb",
-            "RDN_DC": subobj.rdn_dc,
+            "RDN_DC": rdn_dc,
             })
 
-        message("Modifying DomainDN: " + subobj.domaindn + "")
-        if subobj.domain_guid is not None:
-            domainguid_mod = "replace: objectGUID\nobjectGUID: %s\n-" % subobj.domain_guid
+        message("Modifying DomainDN: " + domaindn + "")
+        if domainguid is not None:
+            domainguid_mod = "replace: objectGUID\nobjectGUID: %s\n-" % domainguid
         else:
             domainguid_mod = ""
 
         setup_modify_ldif(samdb, setup_dir, "provision_basedn_modify.ldif", {
-            "RDN_DC": subobj.rdn_dc,
+            "RDN_DC": rdn_dc,
             "LDAPTIME": timestring(int(time.time())),
-            "DOMAINSID": str(subobj.domainsid),
-            "SCHEMADN": subobj.schemadn, 
-            "NETBIOSNAME": subobj.netbiosname,
-            "DEFAULTSITE": subobj.defaultsite,
-            "CONFIGDN": subobj.configdn,
-            "POLICYGUID": subobj.policyguid,
-            "DOMAINDN": subobj.domaindn,
+            "DOMAINSID": str(domainsid),
+            "SCHEMADN": schemadn, 
+            "NETBIOSNAME": netbiosname,
+            "DEFAULTSITE": DEFAULTSITE,
+            "CONFIGDN": configdn,
+            "POLICYGUID": policyguid,
+            "DOMAINDN": domaindn,
             "DOMAINGUID_MOD": domainguid_mod,
             })
 
         message("Adding configuration container (permitted to fail)")
         setup_add_ldif(samdb, setup_dir, "provision_configuration_basedn.ldif", {
-            "CONFIGDN": subobj.configdn, 
-            "ACI": "# no aci for local ldb",
+            "CONFIGDN": configdn, 
+            "ACI": aci,
             "EXTENSIBLEOBJECT": "# no objectClass: extensibleObject for local ldb",
             })
         message("Modifying configuration container")
         setup_modify_ldif(samdb, setup_dir, "provision_configuration_basedn_modify.ldif", {
-            "CONFIGDN": subobj.configdn, 
-            "SCHEMADN": subobj.schemadn,
+            "CONFIGDN": configdn, 
+            "SCHEMADN": schemadn,
             })
 
         message("Adding schema container (permitted to fail)")
         setup_add_ldif(samdb, setup_dir, "provision_schema_basedn.ldif", {
-            "SCHEMADN": subobj.schemadn,
-            "ACI": "# no aci for local ldb",
+            "SCHEMADN": schemadn,
+            "ACI": aci,
             "EXTENSIBLEOBJECT": "# no objectClass: extensibleObject for local ldb"
             })
         message("Modifying schema container")
         setup_modify_ldif(samdb, setup_dir, "provision_schema_basedn_modify.ldif", {
-            "SCHEMADN": subobj.schemadn,
-            "NETBIOSNAME": subobj.netbiosname,
-            "DEFAULTSITE": subobj.defaultsite,
-            "CONFIGDN": subobj.configdn,
+            "SCHEMADN": schemadn,
+            "NETBIOSNAME": netbiosname,
+            "DEFAULTSITE": DEFAULTSITE,
+            "CONFIGDN": configdn,
             })
 
         message("Setting up sam.ldb Samba4 schema")
-        setup_add_ldif(samdb, setup_dir, "schema_samba4.ldif", {
-            "SCHEMADN": subobj.schemadn,
-            })
+        setup_add_ldif(samdb, setup_dir, "schema_samba4.ldif", 
+                       {"SCHEMADN": schemadn })
         message("Setting up sam.ldb AD schema")
-        setup_add_ldif(samdb, setup_dir, "schema.ldif", {
-            "SCHEMADN": subobj.schemadn,
-            })
+        setup_add_ldif(samdb, setup_dir, "schema.ldif", 
+                       {"SCHEMADN": schemadn})
 
         message("Setting up sam.ldb configuration data")
         setup_add_ldif(samdb, setup_dir, "provision_configuration.ldif", {
-            "CONFIGDN": subobj.configdn,
-            "NETBIOSNAME": subobj.netbiosname,
-            "DEFAULTSITE": subobj.defaultsite,
-            "DNSDOMAIN": subobj.dnsdomain,
-            "DOMAIN": subobj.domain,
-            "SCHEMADN": subobj.schemadn,
-            "DOMAINDN": subobj.domaindn,
+            "CONFIGDN": configdn,
+            "NETBIOSNAME": netbiosname,
+            "DEFAULTSITE": DEFAULTSITE,
+            "DNSDOMAIN": dnsdomain,
+            "DOMAIN": domain,
+            "SCHEMADN": schemadn,
+            "DOMAINDN": domaindn,
             })
 
         message("Setting up display specifiers")
-        setup_add_ldif(samdb, setup_dir, "display_specifiers.ldif", {"CONFIGDN": subobj.configdn})
+        setup_add_ldif(samdb, setup_dir, "display_specifiers.ldif", {"CONFIGDN": configdn})
 
         message("Adding users container (permitted to fail)")
         setup_add_ldif(samdb, setup_dir, "provision_users_add.ldif", {
-            "DOMAINDN": subobj.domaindn})
+            "DOMAINDN": domaindn})
         message("Modifying users container")
         setup_modify_ldif(samdb, setup_dir, "provision_users_modify.ldif", {
-            "DOMAINDN": subobj.domaindn})
+            "DOMAINDN": domaindn})
         message("Adding computers container (permitted to fail)")
         setup_add_ldif(samdb, setup_dir, "provision_computers_add.ldif", {
-            "DOMAINDN": subobj.domaindn})
+            "DOMAINDN": domaindn})
         message("Modifying computers container")
         setup_modify_ldif(samdb, setup_dir, "provision_computers_modify.ldif", {
-            "DOMAINDN": subobj.domaindn})
+            "DOMAINDN": domaindn})
         message("Setting up sam.ldb data")
         setup_add_ldif(samdb, setup_dir, "provision.ldif", {
-            "DOMAINDN": subobj.domaindn,
-            "NETBIOSNAME": subobj.netbiosname,
-            "DEFAULTSITE": subobj.defaultsite,
-            "CONFIGDN": subobj.configdn,
+            "DOMAINDN": domaindn,
+            "NETBIOSNAME": netbiosname,
+            "DEFAULTSITE": DEFAULTSITE,
+            "CONFIGDN": configdn,
             })
 
         if not blank:
@@ -607,60 +628,63 @@ def provision(lp, setup_dir, subobj, message, blank, paths, session_info,
     #
             message("Setting up sam.ldb users and groups")
             setup_add_ldif(samdb, setup_dir, "provision_users.ldif", {
-                "DOMAINDN": subobj.domaindn,
-                "DOMAINSID": str(subobj.domainsid),
-                "CONFIGDN": subobj.configdn,
-                "ADMINPASS_B64": b64encode(subobj.adminpass),
-                "KRBTGTPASS_B64": b64encode(subobj.krbtgtpass),
+                "DOMAINDN": domaindn,
+                "DOMAINSID": str(domainsid),
+                "CONFIGDN": configdn,
+                "ADMINPASS_B64": b64encode(adminpass),
+                "KRBTGTPASS_B64": b64encode(krbtgtpass),
                 })
 
             if lp.get("server role") == "domain controller":
                 message("Setting up self join")
-                if subobj.host_guid is not None:
-                    hostguid_add = "objectGUID: %s" % subobj.host_guid
+                if hostguid is not None:
+                    hostguid_add = "objectGUID: %s" % hostguid
                 else:
                     hostguid_add = ""
 
                 setup_add_ldif(samdb, setup_dir, "provision_self_join.ldif", { 
-                          "CONFIGDN": subobj.configdn, 
-                          "SCHEMADN": subobj.schemadn,
-                          "DOMAINDN": subobj.domaindn,
-                          "INVOCATIONID": subobj.invocationid,
-                          "NETBIOSNAME": subobj.netbiosname,
-                          "DEFAULTSITE": subobj.defaultsite,
-                          "DNSNAME": subobj.dnsname,
-                          "MACHINEPASS_B64": b64encode(subobj.machinepass),
-                          "DNSPASS_B64": b64encode(subobj.dnspass),
-                          "REALM": subobj.realm,
-                          "DOMAIN": subobj.domain,
+                          "CONFIGDN": configdn, 
+                          "SCHEMADN": schemadn,
+                          "DOMAINDN": domaindn,
+                          "INVOCATIONID": invocationid,
+                          "NETBIOSNAME": netbiosname,
+                          "DEFAULTSITE": DEFAULTSITE,
+                          "DNSNAME": "%s.%s" % (hostname, dnsdomain),
+                          "MACHINEPASS_B64": b64encode(machinepass),
+                          "DNSPASS_B64": b64encode(dnspass),
+                          "REALM": realm,
+                          "DOMAIN": domain,
                           "HOSTGUID_ADD": hostguid_add,
-                          "DNSDOMAIN": subobj.dnsdomain})
+                          "DNSDOMAIN": dnsdomain})
                 setup_add_ldif(samdb, setup_dir, "provision_group_policy.ldif", { 
-                          "POLICYGUID": subobj.policyguid,
-                          "DNSDOMAIN": subobj.dnsdomain,
-                          "DOMAINSID": str(subobj.domainsid),
-                          "DOMAINDN": subobj.domaindn})
-
-                os.makedirs(os.path.join(paths.sysvol, subobj.dnsdomain, "Policies", "{" + subobj.policyguid + "}"), 0755)
-                os.makedirs(os.path.join(paths.sysvol, subobj.dnsdomain, "Policies", "{" + subobj.policyguid + "}", "Machine"), 0755)
-                os.makedirs(os.path.join(paths.sysvol, subobj.dnsdomain, "Policies", "{" + subobj.policyguid + "}", "User"), 0755)
+                          "POLICYGUID": policyguid,
+                          "DNSDOMAIN": dnsdomain,
+                          "DOMAINSID": str(domainsid),
+                          "DOMAINDN": domaindn})
+
+                os.makedirs(os.path.join(paths.sysvol, dnsdomain, "Policies", "{" + policyguid + "}"), 0755)
+                os.makedirs(os.path.join(paths.sysvol, dnsdomain, "Policies", "{" + policyguid + "}", "Machine"), 0755)
+                os.makedirs(os.path.join(paths.sysvol, dnsdomain, "Policies", "{" + policyguid + "}", "User"), 0755)
                 if not os.path.isdir(paths.netlogon):
                     os.makedirs(paths.netlogon, 0755)
                 setup_ldb(secrets_ldb, setup_dir, "secrets_dc.ldif", { 
-                    "MACHINEPASS_B64": b64encode(subobj.machinepass),
-                    "DOMAIN": subobj.domain,
-                    "REALM": subobj.realm,
+                    "MACHINEPASS_B64": b64encode(machinepass),
+                    "DOMAIN": domain,
+                    "REALM": realm,
                     "LDAPTIME": timestring(int(time.time())),
-                    "DNSDOMAIN": subobj.dnsdomain,
-                    "DOMAINSID": str(subobj.domainsid),
+                    "DNSDOMAIN": dnsdomain,
+                    "DOMAINSID": str(domainsid),
                     "SECRETS_KEYTAB": paths.keytab,
-                    "NETBIOSNAME": subobj.netbiosname,
+                    "NETBIOSNAME": netbiosname,
                     "SAM_LDB": paths.samdb,
                     "DNS_KEYTAB": paths.dns_keytab,
-                    "DNSPASS_B64": b64encode(subobj.dnspass),
+                    "DNSPASS_B64": b64encode(dnspass),
                     })
 
-            setup_name_mappings(subobj, samdb)
+            setup_name_mappings(samdb, str(domainsid), 
+                                domaindn, root=root, nobody=nobody, 
+                                nogroup=nogroup, wheel=wheel, users=users,
+                                backup=backup)
 
         message("Setting up sam.ldb index")
         setup_add_ldif(samdb, setup_dir, "provision_index.ldif")
@@ -678,113 +702,83 @@ def provision(lp, setup_dir, subobj, message, blank, paths, session_info,
 
     message("Please install the phpLDAPadmin configuration located at %s into /etc/phpldapadmin/config.php" % paths.phpldapadminconfig)
 
+    message("Setting up DNS zone: %s" % dnsdomain)
+    provision_dns(setup_dir, paths, session_info, credentials, lp,
+                  hostname=hostname, hostip=hostip, dnsdomain=dnsdomain,
+                  domaindn=domaindn, dnspass=dnspass, realm=realm)
+    message("Please install the zone located in %s into your DNS server" % paths.dns)
 
 def create_phplpapdadmin_config(path, setup_dir, s4_ldapi_path):
     setup_file(setup_dir, "phpldapadmin-config.php", 
                path, {"S4_LDAPI_URI": "ldapi://%s" % s4_ldapi_path.replace("/", "%2F")})
 
 
-def provision_dns(setup_dir, subobj, message, paths, session_info, credentials, lp):
+def provision_dns(setup_dir, paths, session_info, 
+                  credentials, lp, dnsdomain, domaindn, 
+                  hostip, hostname, dnspass, realm):
     """Write out a DNS zone file, from the info in the current database."""
-    message("Setting up DNS zone: %s" % subobj.dnsdomain)
+
     # connect to the sam
     ldb = SamDB(paths.samdb, session_info=session_info, credentials=credentials,
                 lp=lp)
 
     # These values may have changed, due to an incoming SamSync,
     # or may not have been specified, so fetch them from the database
-    domainguid = str(ldb.searchone(Dn(ldb, subobj.domaindn), "objectGUID"))
+    domainguid = str(ldb.searchone(Dn(ldb, domaindn), "objectGUID"))
 
-    hostguid = str(ldb.searchone(Dn(ldb, subobj.domaindn), "objectGUID" ,
-                                 expression="(&(objectClass=computer)(cn=%s))" % subobj.netbiosname))
+    hostguid = str(ldb.searchone(Dn(ldb, domaindn), "objectGUID" ,
+                                 expression="(&(objectClass=computer)(cn=%s))" % hostname))
 
     setup_file(setup_dir, "provision.zone", paths.dns, {
-            "DNSPASS_B64": b64encode(subobj.dnspass),
-            "HOSTNAME": hostname(),
-            "DNSDOMAIN": subobj.dnsdomain,
-            "REALM": subobj.realm,
-            "HOSTIP": hostip(),
+            "DNSPASS_B64": b64encode(dnspass),
+            "HOSTNAME": hostname,
+            "DNSDOMAIN": dnsdomain,
+            "REALM": realm,
+            "HOSTIP": hostip,
             "DOMAINGUID": domainguid,
             "DATESTRING": time.strftime("%Y%m%d%H"),
-            "DEFAULTSITE": subobj.defaultsite,
+            "DEFAULTSITE": DEFAULTSITE,
             "HOSTGUID": hostguid,
         })
 
-    message("Please install the zone located in %s into your DNS server" % paths.dns)
 
 
-def provision_ldapbase(setup_dir, subobj, message, paths):
+def provision_ldapbase(setup_dir, message, paths):
     """Write out a DNS zone file, from the info in the current database."""
-    message("Setting up LDAP base entry: %s" % subobj.domaindn)
-    rdns = subobj.domaindn.split(",")
+    message("Setting up LDAP base entry: %s" % domaindn)
+    rdns = domaindn.split(",")
 
-    subobj.rdn_dc = rdns[0][len("DC="):]
+    rdn_dc = rdns[0][len("DC="):]
 
     setup_file(setup_dir, "provision_basedn.ldif", 
-           paths.ldap_basedn_ldif, 
-           None)
+           paths.ldap_basedn_ldif)
 
     setup_file(setup_dir, "provision_configuration_basedn.ldif", 
-           paths.ldap_config_basedn_ldif, None)
+           paths.ldap_config_basedn_ldif)
 
     setup_file(setup_dir, "provision_schema_basedn.ldif", 
            paths.ldap_schema_basedn_ldif, {
-            "SCHEMADN": subobj.schemadn,
+            "SCHEMADN": schemadn,
             "ACI": "# no aci for local ldb",
             "EXTENSIBLEOBJECT": "objectClass: extensibleObject"})
 
     message("Please install the LDIF located in " + paths.ldap_basedn_ldif + ", " + paths.ldap_config_basedn_ldif + " and " + paths.ldap_schema_basedn_ldif + " into your LDAP server, and re-run with --ldap-backend=ldap://my.ldap.server")
 
 
-def provision_guess(lp):
-    """guess reasonably default options for provisioning."""
-    subobj = ProvisionSettings(realm=lp.get("realm").upper(),
-                               domain=lp.get("workgroup"),
-                               hostname=hostname(), 
-                               hostip=hostip())
-
-    assert subobj.realm is not None
-    assert subobj.domain is not None
-    assert subobj.hostname is not None
-    
-    subobj.domainsid    = security.random_sid()
-    subobj.invocationid = uuid.random()
-    subobj.policyguid   = uuid.random()
-    subobj.krbtgtpass   = misc.random_password(12)
-    subobj.machinepass  = misc.random_password(12)
-    subobj.adminpass    = misc.random_password(12)
-    subobj.dnspass      = misc.random_password(12)
-    subobj.root         = findnss(pwd.getpwnam, "root")[4]
-    subobj.nobody       = findnss(pwd.getpwnam, "nobody")[4]
-    subobj.nogroup      = findnss(grp.getgrnam, "nogroup", "nobody")[2]
-    subobj.wheel        = findnss(grp.getgrnam, "wheel", "root", "staff", "adm")[2]
-    subobj.backup       = findnss(grp.getgrnam, "backup", "wheel", "root", "staff")[2]
-    subobj.users        = findnss(grp.getgrnam, "users", "guest", "other", "unknown", "usr")[2]
-
-    subobj.dnsdomain    = subobj.realm.lower()
-    subobj.dnsname      = "%s.%s" % (subobj.hostname.lower(), subobj.dnsdomain)
-    subobj.domaindn     = "DC=" + subobj.dnsdomain.replace(".", ",DC=")
-    subobj.rootdn       = subobj.domaindn
-    subobj.configdn     = "CN=Configuration," + subobj.rootdn
-    subobj.schemadn     = "CN=Schema," + subobj.configdn
-
-    return subobj
-
-
-def load_schema(setup_dir, samdb, subobj):
+def load_schema(setup_dir, samdb, schemadn, netbiosname, configdn):
     """Load schema."""
     src = os.path.join(setup_dir, "schema.ldif")
     schema_data = open(src, 'r').read()
     src = os.path.join(setup_dir, "schema_samba4.ldif")
     schema_data += open(src, 'r').read()
-    schema_data = substitute_var(schema_data, {"SCHEMADN": subobj.schemadn})
+    schema_data = substitute_var(schema_data, {"SCHEMADN": schemadn})
     src = os.path.join(setup_dir, "provision_schema_basedn_modify.ldif")
     head_data = open(src, 'r').read()
     head_data = substitute_var(head_data, {
-                    "SCHEMADN": subobj.schemadn,
-                    "NETBIOSNAME": subobj.netbiosname,
-                    "CONFIGDN": subobj.configdn,
-                    "DEFAULTSITE": subobj.defaultsite})
+                    "SCHEMADN": schemadn,
+                    "NETBIOSNAME": netbiosname,
+                    "CONFIGDN": configdn,
+                    "DEFAULTSITE": DEFAULTSITE})
     samdb.attach_schema_from_ldif(head_data, schema_data)
 
 
-- 
cgit 


From 86f91db7d5c84526b3fbd4369d7a56dc0f057b4c Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Wed, 19 Dec 2007 23:27:31 +0100
Subject: r26536: More tests for provisioning code. (This used to be commit
 43c8bfeedf06ce806c524a28fa72c643f6db60f4)

---
 source4/scripting/python/samba/__init__.py        |  4 +++-
 source4/scripting/python/samba/provision.py       |  6 ------
 source4/scripting/python/samba/tests/__init__.py  | 18 ++++++++++++++++++
 source4/scripting/python/samba/tests/provision.py | 17 +++++++++++++----
 source4/scripting/python/samba/upgrade.py         | 18 +++++-------------
 5 files changed, 39 insertions(+), 24 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/__init__.py b/source4/scripting/python/samba/__init__.py
index 9ac283e660..d185464a58 100644
--- a/source4/scripting/python/samba/__init__.py
+++ b/source4/scripting/python/samba/__init__.py
@@ -92,7 +92,9 @@ class Ldb(ldb.Ldb):
         res = self.search(basedn, scope, expression, [attribute])
         if len(res) != 1 or res[0][attribute] is None:
             return None
-        return res[0][attribute]
+        values = set(res[0][attribute])
+        assert len(values) == 1
+        return values.pop()
 
     def erase(self):
         """Erase an ldb, removing all records."""
diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index c9cb457b4a..f3fc138e6b 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -73,11 +73,6 @@ def findnss(nssfn, *names):
     raise Exception("Unable to find user/group for %s" % arguments[1])
 
 
-def hostname():
-    """return first part of hostname."""
-    return gethostname().split(".")[0]
-
-
 def open_ldb(session_info, credentials, lp, dbname):
     assert session_info is not None
     try:
@@ -742,7 +737,6 @@ def provision_dns(setup_dir, paths, session_info,
         })
 
 
-
 def provision_ldapbase(setup_dir, message, paths):
     """Write out a DNS zone file, from the info in the current database."""
     message("Setting up LDAP base entry: %s" % domaindn)
diff --git a/source4/scripting/python/samba/tests/__init__.py b/source4/scripting/python/samba/tests/__init__.py
index 0808469907..45588ecb5a 100644
--- a/source4/scripting/python/samba/tests/__init__.py
+++ b/source4/scripting/python/samba/tests/__init__.py
@@ -20,6 +20,7 @@
 import os
 import ldb
 import samba
+import tempfile
 import unittest
 
 class LdbTestCase(unittest.TestCase):
@@ -35,6 +36,15 @@ class LdbTestCase(unittest.TestCase):
         self.ldb = samba.Ldb(self.filename)
 
 
+class TestCaseInTempDir(unittest.TestCase):
+    def setUp(self):
+        super(TestCaseInTempDir, self).setUp()
+        self.tempdir = tempfile.mkdtemp()
+
+    def tearDown(self):
+        super(TestCaseInTempDir, self).tearDown()
+
+
 class SubstituteVarTestCase(unittest.TestCase):
     def test_empty(self):
         self.assertEquals("", samba.substitute_var("", {}))
@@ -52,3 +62,11 @@ class SubstituteVarTestCase(unittest.TestCase):
     def test_unknown_var(self):
         self.assertEquals("foo ${bla} gsff", 
                 samba.substitute_var("foo ${bla} gsff", {"bar": "bla"}))
+
+
+class LdbExtensionTests(TestCaseInTempDir):
+    def test_searchone(self):
+        l = samba.Ldb(self.tempdir + "/searchone.ldb")
+        l.add({"dn": ldb.Dn(l, "foo=dc"), "bar": "bla"})
+        self.assertEquals("bla", l.searchone(ldb.Dn(l, "foo=dc"), "bar"))
+
diff --git a/source4/scripting/python/samba/tests/provision.py b/source4/scripting/python/samba/tests/provision.py
index 5edfe79084..c8bd99283b 100644
--- a/source4/scripting/python/samba/tests/provision.py
+++ b/source4/scripting/python/samba/tests/provision.py
@@ -17,13 +17,22 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-import unittest
-import samba.provision
+import os
+from samba.provision import setup_secretsdb
+import samba.tests
+from ldb import Dn
 
-class ProvisionTestCase(unittest.TestCase):
+setup_dir = "setup"
+
+class ProvisionTestCase(samba.tests.TestCaseInTempDir):
     def test_setup_secretsdb(self):
-        raise NotImplementedError(self.test_setup_secretsdb)
+        ldb = setup_secretsdb(os.path.join(self.tempdir, "secrets.ldb"), 
+                              setup_dir, None, None, None)
+        self.assertEquals("LSA Secrets",
+                 ldb.searchone(Dn(ldb, "CN=LSA Secrets"), "CN"))
+
 
+class Disabled:
     def test_setup_templatesdb(self):
         raise NotImplementedError(self.test_setup_templatesdb)
 
diff --git a/source4/scripting/python/samba/upgrade.py b/source4/scripting/python/samba/upgrade.py
index 783cc008d5..4521d4604d 100644
--- a/source4/scripting/python/samba/upgrade.py
+++ b/source4/scripting/python/samba/upgrade.py
@@ -14,7 +14,10 @@ import pwd
 import uuid
 
 def regkey_to_dn(name):
-    """Convert a registry key to a DN."""
+    """Convert a registry key to a DN.
+    
+    :name: The registry key name.
+    :return: A matching DN."""
     dn = "hive=NONE"
 
     if name == "":
@@ -253,8 +256,6 @@ maxVersion: %llu
     return ldif
 
 def upgrade_provision(lp, samba3):
-    subobj = Object()
-
     domainname = samba3.configuration.get("workgroup")
     
     if domainname is None:
@@ -272,13 +273,7 @@ def upgrade_provision(lp, samba3):
 
     subobj.realm        = realm
     subobj.domain       = domainname
-    subobj.hostname     = hostname()
 
-    assert subobj.realm is not None
-    assert subobj.domain is not None
-    assert subobj.hostname is not None
-
-    subobj.HOSTIP       = hostip()
     if domsec is not None:
         subobj.DOMAINGUID   = domsec.guid
         subobj.DOMAINSID    = domsec.sid
@@ -288,10 +283,7 @@ def upgrade_provision(lp, samba3):
         subobj.DOMAINSID = randsid()
     
     if hostsec:
-        subobj.HOSTGUID     = hostsec.guid
-    else:
-        subobj.HOSTGUID = uuid.random()
-    subobj.invocationid = uuid.random()
+        hostguid = hostsec.guid
     subobj.krbtgtpass   = randpass(12)
     subobj.machinepass  = randpass(12)
     subobj.adminpass    = randpass(12)
-- 
cgit 


From c2fffa8335ac68ff70de52f9fc80fb49e5d6d686 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Wed, 19 Dec 2007 23:27:38 +0100
Subject: r26538: Pass path generation function around rather than base
 directory. (This used to be commit 5f921af41e4dcd6844f6a662d56bd27c4e76ff88)

---
 source4/scripting/python/samba/__init__.py        |  41 +++-
 source4/scripting/python/samba/provision.py       | 256 ++++++++++------------
 source4/scripting/python/samba/samdb.py           |   4 +-
 source4/scripting/python/samba/tests/__init__.py  |   2 +-
 source4/scripting/python/samba/tests/provision.py |   5 +-
 source4/scripting/python/samba/upgrade.py         |   4 +-
 6 files changed, 164 insertions(+), 148 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/__init__.py b/source4/scripting/python/samba/__init__.py
index d185464a58..2c46f72883 100644
--- a/source4/scripting/python/samba/__init__.py
+++ b/source4/scripting/python/samba/__init__.py
@@ -87,7 +87,8 @@ class Ldb(ldb.Ldb):
     set_session_info = misc.ldb_set_session_info
     set_loadparm = misc.ldb_set_loadparm
 
-    def searchone(self, basedn, attribute, expression=None, scope=ldb.SCOPE_BASE):
+    def searchone(self, basedn, attribute, expression=None, 
+                  scope=ldb.SCOPE_BASE):
         """Search for one attribute as a string."""
         res = self.search(basedn, scope, expression, [attribute])
         if len(res) != 1 or res[0][attribute] is None:
@@ -112,11 +113,47 @@ class Ldb(ldb.Ldb):
         for msg in self.search(basedn, ldb.SCOPE_SUBTREE, 
                 "(&(|(objectclass=*)(dn=*))(!(dn=@BASEINFO)))", 
                 ["dn"]):
-            self.delete(msg.dn)
+            try:
+                self.delete(msg.dn)
+            except ldb.LdbError, (LDB_ERR_NO_SUCH_OBJECT, _):
+                # Ignor eno such object errors
+                pass
 
         res = self.search(basedn, ldb.SCOPE_SUBTREE, "(&(|(objectclass=*)(dn=*))(!(dn=@BASEINFO)))", ["dn"])
         assert len(res) == 0
 
+    def erase_partitions(self):
+        """Erase an ldb, removing all records."""
+        res = self.search(ldb.Dn(self, ""), ldb.SCOPE_BASE, "(objectClass=*)", 
+                         ["namingContexts"])
+        assert len(res) == 1
+        if not "namingContexts" in res[0]:
+            return
+        for basedn in res[0]["namingContexts"]:
+            previous_remaining = 1
+            current_remaining = 0
+
+            k = 0
+            while ++k < 10 and (previous_remaining != current_remaining):
+                # and the rest
+                res2 = self.search(ldb.Dn(self, basedn), ldb.SCOPE_SUBTREE, "(|(objectclass=*)(dn=*))", ["dn"])
+                previous_remaining = current_remaining
+                current_remaining = len(res2)
+                for msg in res2:
+                    self.delete(msg.dn)
+
+    def load_ldif_file_add(self, ldif_path):
+        """Load a LDIF file.
+
+        :param ldif_path: Path to LDIF file.
+        """
+        self.load_ldif_add(open(ldif_path, 'r').read())
+
+    def load_ldif_add(self, ldif):
+        for changetype, msg in self.parse_ldif(ldif):
+            assert changetype == ldb.CHANGETYPE_NONE
+            self.add(msg)
+
 
 def substitute_var(text, values):
     """substitute strings of the form ${NAME} in str, replacing
diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index f3fc138e6b..90f7cd0697 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -21,7 +21,7 @@ from samba import Ldb, substitute_var, valid_netbios_name
 from samba.samdb import SamDB
 import security
 from ldb import Dn, SCOPE_SUBTREE, SCOPE_ONELEVEL, SCOPE_BASE, LdbError, \
-        LDB_ERR_NO_SUCH_OBJECT, timestring
+        LDB_ERR_NO_SUCH_OBJECT, timestring, CHANGETYPE_MODIFY, CHANGETYPE_NONE
 
 
 DEFAULTSITE = "Default-First-Site-Name"
@@ -58,7 +58,7 @@ def install_ok(lp, session_info, credentials):
         return False
     ldb = Ldb(lp.get("sam database"), session_info=session_info, 
             credentials=credentials, lp=lp)
-    if len(ldb.search("(cn=Administrator)")) != 1:
+    if len(ldb.search(ldb.Dn("(cn=Administrator)"))) != 1:
         return False
     return True
 
@@ -85,62 +85,56 @@ def open_ldb(session_info, credentials, lp, dbname):
                    lp=lp)
 
 
-def setup_add_ldif(ldb, setup_dir, ldif, subst_vars=None):
+def setup_add_ldif(ldb, ldif_path, subst_vars=None):
     """Setup a ldb in the private dir."""
-    assert isinstance(ldif, str)
-    assert isinstance(setup_dir, str)
-    src = os.path.join(setup_dir, ldif)
+    assert isinstance(ldif_path, str)
 
-    data = open(src, 'r').read()
+    data = open(ldif_path, 'r').read()
     if subst_vars is not None:
         data = substitute_var(data, subst_vars)
 
     assert "${" not in data
 
-    for msg in ldb.parse_ldif(data):
-        ldb.add(msg[1])
+    ldb.load_ldif_add(data)
 
 
-def setup_modify_ldif(ldb, setup_dir, ldif, substvars=None):
+def setup_modify_ldif(ldb, ldif_path, substvars=None):
     """Modify a ldb in the private dir.
     
     :param ldb: LDB object.
-    :param setup_dir: Setup directory.
-    :param ldif: LDIF file path.
+    :param ldif_path: LDIF file path.
     :param substvars: Optional dictionary with substitution variables.
     """
-    src = os.path.join(setup_dir, ldif)
-
-    data = open(src, 'r').read()
+    data = open(ldif_path, 'r').read()
     if substvars is not None:
         data = substitute_var(data, substvars)
 
     assert "${" not in data
 
     for (changetype, msg) in ldb.parse_ldif(data):
+        assert changetype == CHANGETYPE_MODIFY
         ldb.modify(msg)
 
 
-def setup_ldb(ldb, setup_dir, ldif, subst_vars=None):
+def setup_ldb(ldb, ldif_path, subst_vars):
     assert ldb is not None
     ldb.transaction_start()
     try:
-        setup_add_ldif(ldb, setup_dir, ldif, subst_vars)
+        setup_add_ldif(ldb, ldif_path, subst_vars)
     except:
         ldb.transaction_cancel()
         raise
     ldb.transaction_commit()
 
 
-def setup_file(setup_dir, template, fname, substvars):
+def setup_file(template, fname, substvars):
     """Setup a file in the private dir."""
     f = fname
-    src = os.path.join(setup_dir, template)
 
     if os.path.exists(f):
         os.unlink(f)
 
-    data = open(src, 'r').read()
+    data = open(template, 'r').read()
     if substvars:
         data = substitute_var(data, substvars)
     assert not "${" in data
@@ -218,40 +212,44 @@ def setup_name_mappings(ldb, sid, domaindn, root, nobody, nogroup, users,
 def provision_become_dc(setup_dir, message, paths, lp, session_info, 
                         credentials):
     assert session_info is not None
+    erase = False
+
+    def setup_path(file):
+        return os.path.join(setup_dir, file)
+    os.path.unlink(paths.samdb)
 
-    message("Setting up templates into %s" % paths.templates)
-    setup_templatesdb(paths.templates, setup_dir, session_info, 
+    message("Setting up templates db")
+    setup_templatesdb(paths.templates, setup_path, session_info, 
                       credentials, lp)
 
     # Also wipes the database
-    message("Setting up samdb")
-    os.path.unlink(paths.samdb)
+    message("Setting up sam.ldb")
     samdb = SamDB(paths.samdb, credentials=credentials, 
                   session_info=session_info, lp=lp)
-    samdb.erase()
 
-    message("Setting up %s partitions" % paths.samdb)
-    setup_samdb_partitions(samdb, setup_dir, schemadn, 
-                           configdn, domaindn)
+    message("Setting up sam.ldb partitions")
+    setup_samdb_partitions(samdb, setup_path, schemadn, 
+                       configdn, domaindn)
 
     samdb = SamDB(paths.samdb, credentials=credentials, 
                   session_info=session_info, lp=lp)
 
     ldb.transaction_start()
     try:
-        message("Setting up %s attributes" % paths.samdb)
-        setup_add_ldif(samdb, setup_dir, "provision_init.ldif")
+        message("Setting up sam.ldb attributes")
+        samdb.load_ldif_file_add(setup_path("provision_init.ldif"))
 
-        message("Setting up %s rootDSE" % paths.samdb)
-        setup_samdb_rootdse(samdb, setup_dir, schemadn, domaindn, 
+        message("Setting up sam.ldb rootDSE")
+        setup_samdb_rootdse(samdb, setup_path, schemadn, domaindn, 
                             hostname, dnsdomain, realm, rootdn, configdn, 
                             netbiosname)
 
-        message("Erasing data from partitions")
-        ldb_erase_partitions(domaindn, message, samdb, None)
+        if erase:
+            message("Erasing data from partitions")
+            samdb.erase_partitions()
 
-        message("Setting up %s indexes" % paths.samdb)
-        setup_add_ldif(samdb, setup_dir, "provision_index.ldif")
+        message("Setting up sam.ldb indexes")
+        samdb.load_ldif_file_add(setup_path("provision_index.ldif"))
     except:
         samdb.transaction_cancel()
         raise
@@ -259,39 +257,39 @@ def provision_become_dc(setup_dir, message, paths, lp, session_info,
     samdb.transaction_commit()
 
     message("Setting up %s" % paths.secrets)
-    secrets_ldb = setup_secretsdb(paths.secrets, setup_dir, session_info, credentials, lp)
-    setup_ldb(secrets_ldb, setup_dir, "secrets_dc.ldif", 
+    secrets_ldb = setup_secretsdb(paths.secrets, setup_path, session_info, credentials, lp)
+    setup_ldb(secrets_ldb, setup_path("secrets_dc.ldif"), 
               { "MACHINEPASS_B64": b64encode(machinepass) })
 
 
-def setup_secretsdb(path, setup_dir, session_info, credentials, lp):
+def setup_secretsdb(path, setup_path, session_info, credentials, lp):
     secrets_ldb = Ldb(path, session_info=session_info, credentials=credentials, lp=lp)
     secrets_ldb.erase()
-    setup_ldb(secrets_ldb, setup_dir, "secrets_init.ldif")
-    setup_ldb(secrets_ldb, setup_dir, "secrets.ldif")
+    secrets_ldb.load_ldif_file_add(setup_path("secrets_init.ldif"))
+    secrets_ldb.load_ldif_file_add(setup_path("secrets.ldif"))
     return secrets_ldb
 
 
-def setup_templatesdb(path, setup_dir, session_info, credentials, lp):
-    templates_ldb = Ldb(path, session_info=session_info,
+def setup_templatesdb(path, setup_path, session_info, credentials, lp):
+    templates_ldb = SamDB(path, session_info=session_info,
                         credentials=credentials, lp=lp)
     templates_ldb.erase()
-    setup_ldb(templates_ldb, setup_dir, "provision_templates.ldif", None)
+    templates_ldb.load_ldif_file_add(setup_path("provision_templates.ldif"))
 
 
-def setup_registry(path, setup_dir, session_info, credentials, lp):
+def setup_registry(path, setup_path, session_info, credentials, lp):
     reg = registry.Registry()
     hive = registry.Hive(path, session_info=session_info, 
                          credentials=credentials, lp_ctx=lp)
     reg.mount_hive(hive, "HKEY_LOCAL_MACHINE")
-    provision_reg = os.path.join(setup_dir, "provision.reg")
+    provision_reg = setup_path("provision.reg")
     assert os.path.exists(provision_reg)
     reg.apply_patchfile(provision_reg)
 
 
-def setup_samdb_rootdse(samdb, setup_dir, schemadn, domaindn, hostname, 
+def setup_samdb_rootdse(samdb, setup_path, schemadn, domaindn, hostname, 
                         dnsdomain, realm, rootdn, configdn, netbiosname):
-    setup_add_ldif(samdb, setup_dir, "provision_rootdse_add.ldif", {
+    setup_add_ldif(samdb, setup_path("provision_rootdse_add.ldif"), {
         "SCHEMADN": schemadn, 
         "NETBIOSNAME": netbiosname,
         "DNSDOMAIN": dnsdomain,
@@ -305,7 +303,7 @@ def setup_samdb_rootdse(samdb, setup_dir, schemadn, domaindn, hostname,
         })
 
 
-def setup_samdb_partitions(samdb, setup_dir, schemadn, configdn, domaindn):
+def setup_samdb_partitions(samdb, setup_path, schemadn, configdn, domaindn):
     #Add modules to the list to activate them by default
     #beware often order is important
     #
@@ -335,7 +333,7 @@ def setup_samdb_partitions(samdb, setup_dir, schemadn, configdn, domaindn):
     modules_list2 = ["show_deleted",
                     "partition"]
  
-    setup_ldb(samdb, setup_dir, "provision_partitions.ldif", {
+    setup_add_ldif(samdb, setup_path("provision_partitions.ldif"), {
         "SCHEMADN": schemadn, 
         "SCHEMADN_LDB": "schema.ldb",
         "SCHEMADN_MOD2": ",objectguid",
@@ -367,6 +365,11 @@ def provision(lp, setup_dir, message, blank, paths, session_info,
     :note: caution, this wipes all existing data!
     """
 
+    def setup_path(file):
+        return os.path.join(setup_dir, file)
+
+    erase = False
+
     if domainsid is None:
         domainsid = security.random_sid()
     if policyguid is None:
@@ -438,6 +441,7 @@ def provision(lp, setup_dir, message, blank, paths, session_info,
 
     rdn_dc = domaindn.split(",")[0][len("DC="):]
 
+    message("set DOMAIN SID: %s" % str(domainsid))
     message("Provisioning for %s in realm %s" % (domain, realm))
     message("Using administrator password: %s" % adminpass)
 
@@ -452,7 +456,14 @@ def provision(lp, setup_dir, message, blank, paths, session_info,
             smbconfsuffix = "member"
         else:
             assert "Invalid server role setting: %s" % serverrole
-        setup_file(setup_dir, "provision.smb.conf.%s" % smbconfsuffix, paths.smbconf)
+        setup_file(setup_path("provision.smb.conf.%s" % smbconfsuffix), paths.smbconf, {
+            "HOSTNAME": hostname,
+            "DOMAIN_CONF": domain,
+            "REALM_CONF": realm,
+            "SERVERROLE": serverrole,
+            "NETLOGONPATH": paths.netlogon,
+            "SYSVOLPATH": paths.sysvol,
+            })
         lp.reload()
 
     # only install a new shares config db if there is none
@@ -460,27 +471,26 @@ def provision(lp, setup_dir, message, blank, paths, session_info,
         message("Setting up share.ldb")
         share_ldb = Ldb(paths.shareconf, session_info=session_info, 
                         credentials=credentials, lp=lp)
-        setup_ldb(share_ldb, setup_dir, "share.ldif")
+        share_ldb.load_ldif_file_add(setup_path("share.ldif"))
 
-    message("Setting up %s" % paths.secrets)
-    secrets_ldb = setup_secretsdb(paths.secrets, setup_dir, session_info=session_info, 
+    message("Setting up secrets.ldb")
+    secrets_ldb = setup_secretsdb(paths.secrets, setup_path, session_info=session_info, 
                     credentials=credentials, lp=lp)
 
-    message("Setting up registry")
+    message("Setting up the registry")
     # FIXME: Still fails for some reason
-    #setup_registry(paths.hklm, setup_dir, session_info, 
+    #setup_registry(paths.hklm, setup_path, session_info, 
     #               credentials=credentials, lp=lp)
 
-    message("Setting up templates into %s" % paths.templates)
-    setup_templatesdb(paths.templates, setup_dir, session_info=session_info, 
+    message("Setting up templates db")
+    setup_templatesdb(paths.templates, setup_path, session_info=session_info, 
                       credentials=credentials, lp=lp)
 
     samdb = SamDB(paths.samdb, session_info=session_info, 
                   credentials=credentials, lp=lp)
-    samdb.erase()
 
     message("Setting up sam.ldb partitions")
-    setup_samdb_partitions(samdb, setup_dir, schemadn, configdn, domaindn)
+    setup_samdb_partitions(samdb, setup_path, schemadn, configdn, domaindn)
 
     samdb = SamDB(paths.samdb, session_info=session_info, 
                   credentials=credentials, lp=lp)
@@ -488,15 +498,16 @@ def provision(lp, setup_dir, message, blank, paths, session_info,
     samdb.transaction_start()
     try:
         message("Setting up sam.ldb attributes")
-        setup_add_ldif(samdb, setup_dir, "provision_init.ldif")
+        samdb.load_ldif_file_add(setup_path("provision_init.ldif"))
 
         message("Setting up sam.ldb rootDSE")
-        setup_samdb_rootdse(samdb, setup_dir, schemadn, domaindn, 
+        setup_samdb_rootdse(samdb, setup_path, schemadn, domaindn, 
                             hostname, dnsdomain, realm, rootdn, configdn, 
                             netbiosname)
 
-        message("Erasing data from partitions")
-        ldb_erase_partitions(domaindn, message, samdb, ldapbackend)
+        if erase:
+            message("Erasing data from partitions")
+            samdb.erase_partitions()
     except:
         samdb.transaction_cancel()
         raise
@@ -507,13 +518,13 @@ def provision(lp, setup_dir, message, blank, paths, session_info,
     samdb = SamDB(paths.samdb, session_info=session_info, 
                   credentials=credentials, lp=lp)
     samdb.set_domain_sid(domainsid)
-    load_schema(setup_dir, samdb, schemadn, netbiosname, configdn)
+    load_schema(setup_path, samdb, schemadn, netbiosname, configdn)
 
     samdb.transaction_start()
         
     try:
         message("Adding DomainDN: %s (permitted to fail)" % domaindn)
-        setup_add_ldif(samdb, setup_dir, "provision_basedn.ldif", {
+        setup_add_ldif(samdb, setup_path("provision_basedn.ldif"), {
             "DOMAINDN": domaindn,
             "ACI": aci,
             "EXTENSIBLEOBJECT": "# no objectClass: extensibleObject for local ldb",
@@ -526,7 +537,7 @@ def provision(lp, setup_dir, message, blank, paths, session_info,
         else:
             domainguid_mod = ""
 
-        setup_modify_ldif(samdb, setup_dir, "provision_basedn_modify.ldif", {
+        setup_modify_ldif(samdb, setup_path("provision_basedn_modify.ldif"), {
             "RDN_DC": rdn_dc,
             "LDAPTIME": timestring(int(time.time())),
             "DOMAINSID": str(domainsid),
@@ -540,25 +551,25 @@ def provision(lp, setup_dir, message, blank, paths, session_info,
             })
 
         message("Adding configuration container (permitted to fail)")
-        setup_add_ldif(samdb, setup_dir, "provision_configuration_basedn.ldif", {
+        setup_add_ldif(samdb, setup_path("provision_configuration_basedn.ldif"), {
             "CONFIGDN": configdn, 
             "ACI": aci,
             "EXTENSIBLEOBJECT": "# no objectClass: extensibleObject for local ldb",
             })
         message("Modifying configuration container")
-        setup_modify_ldif(samdb, setup_dir, "provision_configuration_basedn_modify.ldif", {
+        setup_modify_ldif(samdb, setup_path("provision_configuration_basedn_modify.ldif"), {
             "CONFIGDN": configdn, 
             "SCHEMADN": schemadn,
             })
 
         message("Adding schema container (permitted to fail)")
-        setup_add_ldif(samdb, setup_dir, "provision_schema_basedn.ldif", {
+        setup_add_ldif(samdb, setup_path("provision_schema_basedn.ldif"), {
             "SCHEMADN": schemadn,
             "ACI": aci,
             "EXTENSIBLEOBJECT": "# no objectClass: extensibleObject for local ldb"
             })
         message("Modifying schema container")
-        setup_modify_ldif(samdb, setup_dir, "provision_schema_basedn_modify.ldif", {
+        setup_modify_ldif(samdb, setup_path("provision_schema_basedn_modify.ldif"), {
             "SCHEMADN": schemadn,
             "NETBIOSNAME": netbiosname,
             "DEFAULTSITE": DEFAULTSITE,
@@ -566,14 +577,14 @@ def provision(lp, setup_dir, message, blank, paths, session_info,
             })
 
         message("Setting up sam.ldb Samba4 schema")
-        setup_add_ldif(samdb, setup_dir, "schema_samba4.ldif", 
+        setup_add_ldif(samdb, setup_path("schema_samba4.ldif"), 
                        {"SCHEMADN": schemadn })
         message("Setting up sam.ldb AD schema")
-        setup_add_ldif(samdb, setup_dir, "schema.ldif", 
+        setup_add_ldif(samdb, setup_path("schema.ldif"), 
                        {"SCHEMADN": schemadn})
 
         message("Setting up sam.ldb configuration data")
-        setup_add_ldif(samdb, setup_dir, "provision_configuration.ldif", {
+        setup_add_ldif(samdb, setup_path("provision_configuration.ldif"), {
             "CONFIGDN": configdn,
             "NETBIOSNAME": netbiosname,
             "DEFAULTSITE": DEFAULTSITE,
@@ -584,22 +595,23 @@ def provision(lp, setup_dir, message, blank, paths, session_info,
             })
 
         message("Setting up display specifiers")
-        setup_add_ldif(samdb, setup_dir, "display_specifiers.ldif", {"CONFIGDN": configdn})
+        setup_add_ldif(samdb, setup_path("display_specifiers.ldif"), 
+                       {"CONFIGDN": configdn})
 
         message("Adding users container (permitted to fail)")
-        setup_add_ldif(samdb, setup_dir, "provision_users_add.ldif", {
+        setup_add_ldif(samdb, setup_path("provision_users_add.ldif"), {
             "DOMAINDN": domaindn})
         message("Modifying users container")
-        setup_modify_ldif(samdb, setup_dir, "provision_users_modify.ldif", {
+        setup_modify_ldif(samdb, setup_path("provision_users_modify.ldif"), {
             "DOMAINDN": domaindn})
         message("Adding computers container (permitted to fail)")
-        setup_add_ldif(samdb, setup_dir, "provision_computers_add.ldif", {
+        setup_add_ldif(samdb, setup_path("provision_computers_add.ldif"), {
             "DOMAINDN": domaindn})
         message("Modifying computers container")
-        setup_modify_ldif(samdb, setup_dir, "provision_computers_modify.ldif", {
+        setup_modify_ldif(samdb, setup_path("provision_computers_modify.ldif"), {
             "DOMAINDN": domaindn})
         message("Setting up sam.ldb data")
-        setup_add_ldif(samdb, setup_dir, "provision.ldif", {
+        setup_add_ldif(samdb, setup_path("provision.ldif"), {
             "DOMAINDN": domaindn,
             "NETBIOSNAME": netbiosname,
             "DEFAULTSITE": DEFAULTSITE,
@@ -622,7 +634,7 @@ def provision(lp, setup_dir, message, blank, paths, session_info,
     #    samdb = open_ldb(info, paths.samdb, False)
     #
             message("Setting up sam.ldb users and groups")
-            setup_add_ldif(samdb, setup_dir, "provision_users.ldif", {
+            setup_add_ldif(samdb, setup_path("provision_users.ldif"), {
                 "DOMAINDN": domaindn,
                 "DOMAINSID": str(domainsid),
                 "CONFIGDN": configdn,
@@ -637,7 +649,7 @@ def provision(lp, setup_dir, message, blank, paths, session_info,
                 else:
                     hostguid_add = ""
 
-                setup_add_ldif(samdb, setup_dir, "provision_self_join.ldif", { 
+                setup_add_ldif(samdb, setup_path("provision_self_join.ldif"), { 
                           "CONFIGDN": configdn, 
                           "SCHEMADN": schemadn,
                           "DOMAINDN": domaindn,
@@ -651,7 +663,7 @@ def provision(lp, setup_dir, message, blank, paths, session_info,
                           "DOMAIN": domain,
                           "HOSTGUID_ADD": hostguid_add,
                           "DNSDOMAIN": dnsdomain})
-                setup_add_ldif(samdb, setup_dir, "provision_group_policy.ldif", { 
+                setup_add_ldif(samdb, setup_path("provision_group_policy.ldif"), { 
                           "POLICYGUID": policyguid,
                           "DNSDOMAIN": dnsdomain,
                           "DOMAINSID": str(domainsid),
@@ -662,7 +674,7 @@ def provision(lp, setup_dir, message, blank, paths, session_info,
                 os.makedirs(os.path.join(paths.sysvol, dnsdomain, "Policies", "{" + policyguid + "}", "User"), 0755)
                 if not os.path.isdir(paths.netlogon):
                     os.makedirs(paths.netlogon, 0755)
-                setup_ldb(secrets_ldb, setup_dir, "secrets_dc.ldif", { 
+                setup_ldb(secrets_ldb, setup_path("secrets_dc.ldif"), { 
                     "MACHINEPASS_B64": b64encode(machinepass),
                     "DOMAIN": domain,
                     "REALM": realm,
@@ -682,10 +694,10 @@ def provision(lp, setup_dir, message, blank, paths, session_info,
                                 backup=backup)
 
         message("Setting up sam.ldb index")
-        setup_add_ldif(samdb, setup_dir, "provision_index.ldif")
+        samdb.load_ldif_file_add(setup_path("provision_index.ldif"))
 
         message("Setting up sam.ldb rootDSE marking as syncronized")
-        setup_modify_ldif(samdb, setup_dir, "provision_rootdse_modify.ldif")
+        setup_modify_ldif(samdb, setup_path("provision_rootdse_modify.ldif"))
     except:
         samdb.transaction_cancel()
         raise
@@ -693,38 +705,33 @@ def provision(lp, setup_dir, message, blank, paths, session_info,
     samdb.transaction_commit()
 
     message("Setting up phpLDAPadmin configuration")
-    create_phplpapdadmin_config(paths.phpldapadminconfig, setup_dir, paths.s4_ldapi_path)
+    create_phplpapdadmin_config(paths.phpldapadminconfig, setup_path, paths.s4_ldapi_path)
 
     message("Please install the phpLDAPadmin configuration located at %s into /etc/phpldapadmin/config.php" % paths.phpldapadminconfig)
 
     message("Setting up DNS zone: %s" % dnsdomain)
-    provision_dns(setup_dir, paths, session_info, credentials, lp,
+    create_zone_file(paths.dns, setup_path, samdb, 
                   hostname=hostname, hostip=hostip, dnsdomain=dnsdomain,
                   domaindn=domaindn, dnspass=dnspass, realm=realm)
     message("Please install the zone located in %s into your DNS server" % paths.dns)
 
-def create_phplpapdadmin_config(path, setup_dir, s4_ldapi_path):
-    setup_file(setup_dir, "phpldapadmin-config.php", 
+def create_phplpapdadmin_config(path, setup_path, s4_ldapi_path):
+    setup_file(setup_path("phpldapadmin-config.php"), 
                path, {"S4_LDAPI_URI": "ldapi://%s" % s4_ldapi_path.replace("/", "%2F")})
 
 
-def provision_dns(setup_dir, paths, session_info, 
-                  credentials, lp, dnsdomain, domaindn, 
+def create_zone_file(path, setup_path, samdb, dnsdomain, domaindn, 
                   hostip, hostname, dnspass, realm):
     """Write out a DNS zone file, from the info in the current database."""
 
     # connect to the sam
-    ldb = SamDB(paths.samdb, session_info=session_info, credentials=credentials,
-                lp=lp)
-
     # These values may have changed, due to an incoming SamSync,
     # or may not have been specified, so fetch them from the database
-    domainguid = str(ldb.searchone(Dn(ldb, domaindn), "objectGUID"))
+    domainguid = samdb.searchone(Dn(samdb, domaindn), "objectGUID")
+    hostguid = samdb.searchone(Dn(samdb, domaindn), "objectGUID" ,
+                     expression="(&(objectClass=computer)(cn=%s))" % hostname)
 
-    hostguid = str(ldb.searchone(Dn(ldb, domaindn), "objectGUID" ,
-                                 expression="(&(objectClass=computer)(cn=%s))" % hostname))
-
-    setup_file(setup_dir, "provision.zone", paths.dns, {
+    setup_file(setup_path("provision.zone"), path, {
             "DNSPASS_B64": b64encode(dnspass),
             "HOSTNAME": hostname,
             "DNSDOMAIN": dnsdomain,
@@ -744,13 +751,16 @@ def provision_ldapbase(setup_dir, message, paths):
 
     rdn_dc = rdns[0][len("DC="):]
 
-    setup_file(setup_dir, "provision_basedn.ldif", 
+    def setup_path(file):
+        return os.path.join(setup_dir, file)
+
+    setup_file(setup_path("provision_basedn.ldif"), 
            paths.ldap_basedn_ldif)
 
-    setup_file(setup_dir, "provision_configuration_basedn.ldif", 
+    setup_file(setup_path("provision_configuration_basedn.ldif"), 
            paths.ldap_config_basedn_ldif)
 
-    setup_file(setup_dir, "provision_schema_basedn.ldif", 
+    setup_file(setup_path("provision_schema_basedn.ldif"), 
            paths.ldap_schema_basedn_ldif, {
             "SCHEMADN": schemadn,
             "ACI": "# no aci for local ldb",
@@ -759,15 +769,12 @@ def provision_ldapbase(setup_dir, message, paths):
     message("Please install the LDIF located in " + paths.ldap_basedn_ldif + ", " + paths.ldap_config_basedn_ldif + " and " + paths.ldap_schema_basedn_ldif + " into your LDAP server, and re-run with --ldap-backend=ldap://my.ldap.server")
 
 
-def load_schema(setup_dir, samdb, schemadn, netbiosname, configdn):
+def load_schema(setup_path, samdb, schemadn, netbiosname, configdn):
     """Load schema."""
-    src = os.path.join(setup_dir, "schema.ldif")
-    schema_data = open(src, 'r').read()
-    src = os.path.join(setup_dir, "schema_samba4.ldif")
-    schema_data += open(src, 'r').read()
+    schema_data = open(setup_path("schema.ldif"), 'r').read()
+    schema_data += open(setup_path("schema_samba4.ldif"), 'r').read()
     schema_data = substitute_var(schema_data, {"SCHEMADN": schemadn})
-    src = os.path.join(setup_dir, "provision_schema_basedn_modify.ldif")
-    head_data = open(src, 'r').read()
+    head_data = open(setup_path("provision_schema_basedn_modify.ldif"), 'r').read()
     head_data = substitute_var(head_data, {
                     "SCHEMADN": schemadn,
                     "NETBIOSNAME": netbiosname,
@@ -803,33 +810,4 @@ def vampire(domain, session_info, credentials, message):
         raise Exception("Migration of remote domain to Samba failed: %s " % vampire_ctx.error_string)
 
 
-def ldb_erase_partitions(domaindn, message, ldb, ldapbackend):
-    """Erase an ldb, removing all records."""
-    assert ldb is not None
-    res = ldb.search(Dn(ldb, ""), SCOPE_BASE, "(objectClass=*)", 
-                     ["namingContexts"])
-    assert len(res) == 1
-    if not "namingContexts" in res[0]:
-        return
-    for basedn in res[0]["namingContexts"]:
-        anything = "(|(objectclass=*)(dn=*))"
-        previous_remaining = 1
-        current_remaining = 0
-
-        if ldapbackend and (basedn == domaindn):
-            # Only delete objects that were created by provision
-            anything = "(objectcategory=*)"
-
-        k = 0
-        while ++k < 10 and (previous_remaining != current_remaining):
-            # and the rest
-            res2 = ldb.search(Dn(ldb, basedn), SCOPE_SUBTREE, anything, ["dn"])
-            previous_remaining = current_remaining
-            current_remaining = len(res2)
-            for msg in res2:
-                try:
-                    ldb.delete(msg.dn)
-                except LdbError, (_, text):
-                    message("Unable to delete %s: %s" % (msg.dn, text))
-
 
diff --git a/source4/scripting/python/samba/samdb.py b/source4/scripting/python/samba/samdb.py
index 7061e22ce4..84b604dbc4 100644
--- a/source4/scripting/python/samba/samdb.py
+++ b/source4/scripting/python/samba/samdb.py
@@ -29,8 +29,8 @@ class SamDB(samba.Ldb):
                  modules_dir=None, lp=None):
         super(SamDB, self).__init__(session_info=session_info, credentials=credentials,
                                     modules_dir=modules_dir, lp=lp)
-        misc.dsdb_set_global_schema(self)
-        misc.ldb_register_samba_handlers(self)
+        assert misc.dsdb_set_global_schema(self) == 0
+        assert misc.ldb_register_samba_handlers(self) == 0
         if url:
             self.connect(url)
 
diff --git a/source4/scripting/python/samba/tests/__init__.py b/source4/scripting/python/samba/tests/__init__.py
index 45588ecb5a..e213c1cc1f 100644
--- a/source4/scripting/python/samba/tests/__init__.py
+++ b/source4/scripting/python/samba/tests/__init__.py
@@ -67,6 +67,6 @@ class SubstituteVarTestCase(unittest.TestCase):
 class LdbExtensionTests(TestCaseInTempDir):
     def test_searchone(self):
         l = samba.Ldb(self.tempdir + "/searchone.ldb")
-        l.add({"dn": ldb.Dn(l, "foo=dc"), "bar": "bla"})
+        l.add({"dn": "foo=dc", "bar": "bla"})
         self.assertEquals("bla", l.searchone(ldb.Dn(l, "foo=dc"), "bar"))
 
diff --git a/source4/scripting/python/samba/tests/provision.py b/source4/scripting/python/samba/tests/provision.py
index c8bd99283b..bf7182dbd3 100644
--- a/source4/scripting/python/samba/tests/provision.py
+++ b/source4/scripting/python/samba/tests/provision.py
@@ -23,11 +23,14 @@ import samba.tests
 from ldb import Dn
 
 setup_dir = "setup"
+def setup_path(file):
+    return os.path.join(setup_dir, file)
+
 
 class ProvisionTestCase(samba.tests.TestCaseInTempDir):
     def test_setup_secretsdb(self):
         ldb = setup_secretsdb(os.path.join(self.tempdir, "secrets.ldb"), 
-                              setup_dir, None, None, None)
+                              setup_path, None, None, None)
         self.assertEquals("LSA Secrets",
                  ldb.searchone(Dn(ldb, "CN=LSA Secrets"), "CN"))
 
diff --git a/source4/scripting/python/samba/upgrade.py b/source4/scripting/python/samba/upgrade.py
index 4521d4604d..1c27f8ec25 100644
--- a/source4/scripting/python/samba/upgrade.py
+++ b/source4/scripting/python/samba/upgrade.py
@@ -537,9 +537,7 @@ replace: @LIST
 @LIST: samldb,operational,objectguid,rdn_name,samba3sam
 """)
 
-        samdb.add("""
-dn: @MAP=samba3sam
-@MAP_URL: %s""" % ldapurl)
+        samdb.add({"dn": "@MAP=samba3sam", "@MAP_URL": ldapurl})
 
     return ret
 
-- 
cgit 


From 3e75f222bcdf114238cc4f2bcc61332dc059135f Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Wed, 19 Dec 2007 23:27:42 +0100
Subject: r26539: Remove unnecessary statics. (This used to be commit
 e53e79eebef3ece6978f0a2b4a1ee0a0814bb5d2)

---
 source4/scripting/ejs/ejsnet/net_user.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/ejsnet/net_user.c b/source4/scripting/ejs/ejsnet/net_user.c
index 34524cc0fa..4b0923216b 100644
--- a/source4/scripting/ejs/ejsnet/net_user.c
+++ b/source4/scripting/ejs/ejsnet/net_user.c
@@ -197,7 +197,7 @@ static int ejs_net_deleteuser(MprVarHandle eid, int argc, char **argv)
 	}
 	
 	/* domain where the account is to be deleted */
-	userman_domain = (struct libnet_context *)mprGetThisPtr(eid, "domain");
+	userman_domain = (const char*)mprGetThisPtr(eid, "domain");
 	if (!userman_domain) {
 		ejsSetErrorMsg(eid, "domain property returns null pointer");
 		goto done;
@@ -260,7 +260,7 @@ static int ejs_net_userinfo(MprVarHandle eid, int argc, char **argv)
 	}
 	
 	/* domain where the user account is to be queried */
-	userman_domain = (struct libnet_context *)mprGetThisPtr(eid, "domain");
+	userman_domain = (const char *)mprGetThisPtr(eid, "domain");
 	if (userman_domain == NULL) {
 		ejsSetErrorMsg(eid, "domain property returns null pointer");
 		return -1;
-- 
cgit 


From 0500b87092540d300b4e021a0fb95ce16a44fbd2 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Thu, 20 Dec 2007 00:02:15 +0100
Subject: r26540: Revert my previous commit after concerns raised by Andrew.
 (This used to be commit 6ac86f8be7d9a8c5ab396a93e6d1e6819e11f173)

---
 source4/scripting/ejs/ejsnet/net_user.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/ejsnet/net_user.c b/source4/scripting/ejs/ejsnet/net_user.c
index 4b0923216b..34524cc0fa 100644
--- a/source4/scripting/ejs/ejsnet/net_user.c
+++ b/source4/scripting/ejs/ejsnet/net_user.c
@@ -197,7 +197,7 @@ static int ejs_net_deleteuser(MprVarHandle eid, int argc, char **argv)
 	}
 	
 	/* domain where the account is to be deleted */
-	userman_domain = (const char*)mprGetThisPtr(eid, "domain");
+	userman_domain = (struct libnet_context *)mprGetThisPtr(eid, "domain");
 	if (!userman_domain) {
 		ejsSetErrorMsg(eid, "domain property returns null pointer");
 		goto done;
@@ -260,7 +260,7 @@ static int ejs_net_userinfo(MprVarHandle eid, int argc, char **argv)
 	}
 	
 	/* domain where the user account is to be queried */
-	userman_domain = (const char *)mprGetThisPtr(eid, "domain");
+	userman_domain = (struct libnet_context *)mprGetThisPtr(eid, "domain");
 	if (userman_domain == NULL) {
 		ejsSetErrorMsg(eid, "domain property returns null pointer");
 		return -1;
-- 
cgit 


From 109a903750e6bec865e402f02c5c457250594e55 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Thu, 20 Dec 2007 15:53:56 +0100
Subject: r26545: Sync output with ejs. (This used to be commit
 48ceaa964327ed7094275780cc3c0767636bcb18)

---
 source4/scripting/python/samba/__init__.py  |  2 +
 source4/scripting/python/samba/provision.py | 65 +++++++++++++----------------
 source4/scripting/python/samba/samdb.py     |  1 -
 3 files changed, 32 insertions(+), 36 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/__init__.py b/source4/scripting/python/samba/__init__.py
index 2c46f72883..c735361353 100644
--- a/source4/scripting/python/samba/__init__.py
+++ b/source4/scripting/python/samba/__init__.py
@@ -72,6 +72,8 @@ class Ldb(ldb.Ldb):
         if session_info is not None:
             self.set_session_info(self, session_info)
 
+        assert misc.ldb_register_samba_handlers(self) == 0
+
         if lp is not None:
             self.set_loadparm(self, lp)
 
diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index 90f7cd0697..a4a9e7ac46 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -219,20 +219,19 @@ def provision_become_dc(setup_dir, message, paths, lp, session_info,
     os.path.unlink(paths.samdb)
 
     message("Setting up templates db")
-    setup_templatesdb(paths.templates, setup_path, session_info, 
-                      credentials, lp)
+    setup_templatesdb(paths.templates, setup_path, session_info=session_info, 
+                      credentials=credentials, lp=lp)
 
     # Also wipes the database
     message("Setting up sam.ldb")
-    samdb = SamDB(paths.samdb, credentials=credentials, 
-                  session_info=session_info, lp=lp)
+    samdb = SamDB(paths.samdb, session_info=session_info, 
+                  credentials=credentials, lp=lp)
 
     message("Setting up sam.ldb partitions")
-    setup_samdb_partitions(samdb, setup_path, schemadn, 
-                       configdn, domaindn)
+    setup_samdb_partitions(samdb, setup_path, schemadn, configdn, domaindn)
 
-    samdb = SamDB(paths.samdb, credentials=credentials, 
-                  session_info=session_info, lp=lp)
+    samdb = SamDB(paths.samdb, session_info=session_info, 
+                  credentials=credentials, lp=lp)
 
     ldb.transaction_start()
     try:
@@ -257,12 +256,15 @@ def provision_become_dc(setup_dir, message, paths, lp, session_info,
     samdb.transaction_commit()
 
     message("Setting up %s" % paths.secrets)
-    secrets_ldb = setup_secretsdb(paths.secrets, setup_path, session_info, credentials, lp)
+    secrets_ldb = setup_secretsdb(paths.secrets, setup_path, session_info, 
+                                  credentials, lp)
     setup_ldb(secrets_ldb, setup_path("secrets_dc.ldif"), 
               { "MACHINEPASS_B64": b64encode(machinepass) })
 
 
 def setup_secretsdb(path, setup_path, session_info, credentials, lp):
+    if os.path.exists(path):
+        os.unlink(path)
     secrets_ldb = Ldb(path, session_info=session_info, credentials=credentials, lp=lp)
     secrets_ldb.erase()
     secrets_ldb.load_ldif_file_add(setup_path("secrets_init.ldif"))
@@ -474,8 +476,9 @@ def provision(lp, setup_dir, message, blank, paths, session_info,
         share_ldb.load_ldif_file_add(setup_path("share.ldif"))
 
     message("Setting up secrets.ldb")
-    secrets_ldb = setup_secretsdb(paths.secrets, setup_path, session_info=session_info, 
-                    credentials=credentials, lp=lp)
+    secrets_ldb = setup_secretsdb(paths.secrets, setup_path, 
+                                  session_info=session_info, 
+                                  credentials=credentials, lp=lp)
 
     message("Setting up the registry")
     # FIXME: Still fails for some reason
@@ -486,6 +489,8 @@ def provision(lp, setup_dir, message, blank, paths, session_info,
     setup_templatesdb(paths.templates, setup_path, session_info=session_info, 
                       credentials=credentials, lp=lp)
 
+    # Also wipes the database
+    message("Setting up sam.ldb")
     samdb = SamDB(paths.samdb, session_info=session_info, 
                   credentials=credentials, lp=lp)
 
@@ -619,20 +624,6 @@ def provision(lp, setup_dir, message, blank, paths, session_info,
             })
 
         if not blank:
-
-    #    message("Activate schema module")
-    #    setup_modify_ldif("schema_activation.ldif", info, samdb, False)
-    #
-    #    // (hack) Reload, now we have the schema loaded.  
-    #    commit_ok = samdb.transaction_commit()
-    #    if (!commit_ok) {
-    #        message("samdb commit failed: " + samdb.errstring() + "\n")
-    #        assert(commit_ok)
-    #    }
-    #    samdb.close()
-    #
-    #    samdb = open_ldb(info, paths.samdb, False)
-    #
             message("Setting up sam.ldb users and groups")
             setup_add_ldif(samdb, setup_path("provision_users.ldif"), {
                 "DOMAINDN": domaindn,
@@ -696,7 +687,7 @@ def provision(lp, setup_dir, message, blank, paths, session_info,
         message("Setting up sam.ldb index")
         samdb.load_ldif_file_add(setup_path("provision_index.ldif"))
 
-        message("Setting up sam.ldb rootDSE marking as syncronized")
+        message("Setting up sam.ldb rootDSE marking as synchronized")
         setup_modify_ldif(samdb, setup_path("provision_rootdse_modify.ldif"))
     except:
         samdb.transaction_cancel()
@@ -709,10 +700,21 @@ def provision(lp, setup_dir, message, blank, paths, session_info,
 
     message("Please install the phpLDAPadmin configuration located at %s into /etc/phpldapadmin/config.php" % paths.phpldapadminconfig)
 
+    samdb = SamDB(paths.samdb, session_info=session_info, 
+                  credentials=credentials, lp=lp)
+
+    domainguid = samdb.searchone(Dn(samdb, domaindn), "objectGUID")
+    assert isinstance(domainguid, str)
+    hostguid = samdb.searchone(Dn(samdb, domaindn), "objectGUID",
+            expression="(&(objectClass=computer)(cn=%s))" % hostname,
+            scope=SCOPE_SUBTREE)
+    assert isinstance(hostguid, str)
+
     message("Setting up DNS zone: %s" % dnsdomain)
     create_zone_file(paths.dns, setup_path, samdb, 
                   hostname=hostname, hostip=hostip, dnsdomain=dnsdomain,
-                  domaindn=domaindn, dnspass=dnspass, realm=realm)
+                  domaindn=domaindn, dnspass=dnspass, realm=realm, 
+                  domainguid=domainguid, hostguid=hostguid)
     message("Please install the zone located in %s into your DNS server" % paths.dns)
 
 def create_phplpapdadmin_config(path, setup_path, s4_ldapi_path):
@@ -721,16 +723,9 @@ def create_phplpapdadmin_config(path, setup_path, s4_ldapi_path):
 
 
 def create_zone_file(path, setup_path, samdb, dnsdomain, domaindn, 
-                  hostip, hostname, dnspass, realm):
+                  hostip, hostname, dnspass, realm, domainguid, hostguid):
     """Write out a DNS zone file, from the info in the current database."""
 
-    # connect to the sam
-    # These values may have changed, due to an incoming SamSync,
-    # or may not have been specified, so fetch them from the database
-    domainguid = samdb.searchone(Dn(samdb, domaindn), "objectGUID")
-    hostguid = samdb.searchone(Dn(samdb, domaindn), "objectGUID" ,
-                     expression="(&(objectClass=computer)(cn=%s))" % hostname)
-
     setup_file(setup_path("provision.zone"), path, {
             "DNSPASS_B64": b64encode(dnspass),
             "HOSTNAME": hostname,
diff --git a/source4/scripting/python/samba/samdb.py b/source4/scripting/python/samba/samdb.py
index 84b604dbc4..46707f060f 100644
--- a/source4/scripting/python/samba/samdb.py
+++ b/source4/scripting/python/samba/samdb.py
@@ -30,7 +30,6 @@ class SamDB(samba.Ldb):
         super(SamDB, self).__init__(session_info=session_info, credentials=credentials,
                                     modules_dir=modules_dir, lp=lp)
         assert misc.dsdb_set_global_schema(self) == 0
-        assert misc.ldb_register_samba_handlers(self) == 0
         if url:
             self.connect(url)
 
-- 
cgit 


From 758be0eedc8c0a780405a767970417f2c88dde27 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Fri, 21 Dec 2007 00:36:17 -0600
Subject: r26555: Use python-config utility to find python compile/link flags.
 (This used to be commit 6cc5e838e6c411ce74e7abde685720aa1f3cbdfb)

---
 source4/scripting/python/config.m4 | 110 +++----------------------------------
 1 file changed, 8 insertions(+), 102 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/config.m4 b/source4/scripting/python/config.m4
index 96e4da9add..8951b4da08 100644
--- a/source4/scripting/python/config.m4
+++ b/source4/scripting/python/config.m4
@@ -13,112 +13,18 @@ if test -z "$PYTHON"; then
 	AC_MSG_WARN([No python found])
 fi
 
-#
-# Check for a version of Python >= 2.1.0
-#
-AC_MSG_CHECKING([for a version of Python >= '2.1.0'])
-ac_supports_python_ver=`$PYTHON -c "import sys, string; \
-	ver = string.split(sys.version)[[0]]; \
-	print ver >= '2.1.0'"`
-if test "$ac_supports_python_ver" != "True"; then
+AC_PATH_PROG([PYTHON_CONFIG],[python[$PYTHON_VERSION]-config])
+if test -z "$PYTHON_CONFIG"; then
 	working_python=no
-	AC_MSG_RESULT([no])
-else 
-	AC_MSG_RESULT([yes])
-fi
-
-#
-# Check if you have distutils, else fail
-#
-AC_MSG_CHECKING([for the distutils Python package])
-ac_distutils_result=`$PYTHON -c "import distutils" 2>&1`
-if test -z "$ac_distutils_result"; then
-	AC_MSG_RESULT([yes])
-	working_python=yes
+	AC_MSG_WARN([No python-config found])
 else
-	AC_MSG_RESULT([no])
-	working_python=no
-fi
-
-#
-# Check for Python include path
-#
-AC_MSG_CHECKING([for Python include path])
-if test -z "$PYTHON_CPPFLAGS"; then
-	python_path=`$PYTHON -c "import distutils.sysconfig; \
-			print distutils.sysconfig.get_python_inc();"`
-	if test -n "${python_path}"; then
-		python_path="-I$python_path"
-	fi
-	PYTHON_CPPFLAGS=$python_path
-fi
-AC_MSG_RESULT([$PYTHON_CPPFLAGS])
-AC_SUBST([PYTHON_CPPFLAGS])
-
-#
-# Check for Python library path
-#
-AC_MSG_CHECKING([for Python library path])
-if test -z "$PYTHON_LDFLAGS"; then
-	# (makes two attempts to ensure we've got a version number
-	# from the interpreter)
-	py_version=`$PYTHON -c "from distutils.sysconfig import *; \
-		from string import join; \
-		print join(get_config_vars('VERSION'))"`
-	if test "$py_version" = "[None]"; then
-		if test -n "$PYTHON_VERSION"; then
-			py_version=$PYTHON_VERSION
-		else
-			py_version=`$PYTHON -c "import sys; \
-				print sys.version[[:3]]"`
-		fi
-	fi
-
-	PYTHON_LDFLAGS=`$PYTHON -c "from distutils.sysconfig import *; \
-		from string import join; \
-		print '-L' + get_python_lib(0,1), \
-			'-lpython';"`$py_version
-fi		
-AC_MSG_RESULT([$PYTHON_LDFLAGS])
-AC_SUBST([PYTHON_LDFLAGS])
-
-#
-# Check for site packages
-#
-AC_MSG_CHECKING([for Python site-packages path])
-if test -z "$PYTHON_SITE_PKG"; then
-	PYTHON_SITE_PKG=`$PYTHON -c "import distutils.sysconfig; \
-			print distutils.sysconfig.get_python_lib(0,0);"`
-fi
-AC_MSG_RESULT([$PYTHON_SITE_PKG])
-AC_SUBST([PYTHON_SITE_PKG])
-
-#
-# libraries which must be linked in when embedding
-#
-AC_MSG_CHECKING(python extra libraries)
-if test -z "$PYTHON_EXTRA_LIBS"; then
-   PYTHON_EXTRA_LIBS=`$PYTHON -c "import distutils.sysconfig; \
-			conf = distutils.sysconfig.get_config_var; \
-			print conf('LOCALMODLIBS'), conf('LIBS')"`
-fi
-AC_MSG_RESULT([$PYTHON_EXTRA_LIBS])
-AC_SUBST(PYTHON_EXTRA_LIBS)
-
-#
-# linking flags needed when embedding
-#
-AC_MSG_CHECKING(python extra linking flags)
-if test -z "$PYTHON_EXTRA_LDFLAGS"; then
-	PYTHON_EXTRA_LDFLAGS=`$PYTHON -c "import distutils.sysconfig; \
-		conf = distutils.sysconfig.get_config_var; \
-		print conf('LINKFORSHARED')"`
+	working_python=yes
 fi
-AC_MSG_RESULT([$PYTHON_EXTRA_LDFLAGS])
-AC_SUBST(PYTHON_EXTRA_LDFLAGS)
 
-SMB_EXT_LIB(LIBPYTHON, [$PYTHON_LDFLAGS], [$PYTHON_CPPFLAGS])
+PYTHON_LDFLAGS=`$PYTHON_CONFIG --ldflags`
+PYTHON_CFLAGS=`$PYTHON_CONFIG --cflags`
 
+SMB_EXT_LIB(LIBPYTHON, [$PYTHON_LDFLAGS], [$PYTHON_CFLAGS])
 
 AC_MSG_CHECKING(working python module support)
 if test x$working_python = xyes
@@ -126,7 +32,7 @@ then
 	ac_save_LIBS="$LIBS"
 	ac_save_CFLAGS="$CFLAGS"
 	LIBS="$LIBS $PYTHON_LDFLAGS"
-	CFLAGS="$CFLAGS $PYTHON_CPPFLAGS"
+	CFLAGS="$CFLAGS $PYTHON_CFLAGS"
 
 	AC_TRY_LINK([
 			#include <Python.h>
-- 
cgit 


From 30ce895e0c75c50bbe510b6a3685c7e1f217b919 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sat, 22 Dec 2007 00:47:36 -0600
Subject: r26559: Make the provision function a bit smaller. (This used to be
 commit a1175231a58c60f32574816643dafc78ff867161)

---
 source4/scripting/python/samba/provision.py | 346 +++++++++++++++-------------
 1 file changed, 182 insertions(+), 164 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index a4a9e7ac46..f516e73893 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -354,150 +354,21 @@ def setup_samdb_partitions(samdb, setup_path, schemadn, configdn, domaindn):
         })
 
 
-
-def provision(lp, setup_dir, message, blank, paths, session_info, 
-              credentials, ldapbackend, realm=None, domain=None, hostname=None, 
-              hostip=None, domainsid=None, hostguid=None, adminpass=None, 
-              krbtgtpass=None, domainguid=None, policyguid=None, 
-              invocationid=None, machinepass=None, dnspass=None, root=None,
-              nobody=None, nogroup=None, users=None, wheel=None, backup=None, 
-              aci=None, serverrole=None):
-    """Provision samba4
-    
-    :note: caution, this wipes all existing data!
-    """
-
-    def setup_path(file):
-        return os.path.join(setup_dir, file)
-
-    erase = False
-
-    if domainsid is None:
-        domainsid = security.random_sid()
-    if policyguid is None:
-        policyguid = uuid.random()
-    if invocationid is None:
-        invocationid = uuid.random()
-    if adminpass is None:
-        adminpass = misc.random_password(12)
-    if krbtgtpass is None:
-        krbtgtpass = misc.random_password(12)
-    if machinepass is None:
-        machinepass  = misc.random_password(12)
-    if dnspass is None:
-        dnspass = misc.random_password(12)
-    if root is None:
-        root = findnss(pwd.getpwnam, "root")[4]
-    if nobody is None:
-        nobody = findnss(pwd.getpwnam, "nobody")[4]
-    if nogroup is None:
-        nogroup = findnss(grp.getgrnam, "nogroup", "nobody")[2]
-    if users is None:
-        users = findnss(grp.getgrnam, "users", "guest", "other", "unknown", "usr")[2]
-    if wheel is None:
-        wheel = findnss(grp.getgrnam, "wheel", "root", "staff", "adm")[2]
-    if backup is None:
-        backup = findnss(grp.getgrnam, "backup", "wheel", "root", "staff")[2]
-    if aci is None:
-        aci = "# no aci for local ldb"
-    if serverrole is None:
-        serverrole = lp.get("server role")
-
-    if realm is None:
-        realm = lp.get("realm")
-    else:
-        if lp.get("realm").upper() != realm.upper():
-            raise Error("realm '%s' in smb.conf must match chosen realm '%s'\n" %
-                (lp.get("realm"), realm))
-
-    assert realm is not None
-    realm = realm.upper()
-
-    if domain is None:
-        domain = lp.get("workgroup")
-    else:
-        if lp.get("workgroup").upper() != domain.upper():
-            raise Error("workgroup '%s' in smb.conf must match chosen domain '%s'\n",
-                lp.get("workgroup"), domain)
-
-    assert domain is not None
-    domain = domain.upper()
-    if not valid_netbios_name(domain):
-        raise InvalidNetbiosName(domain)
-
-    if hostname is None:
-        hostname = gethostname().split(".")[0].lower()
-
-    if hostip is None:
-        hostip = gethostbyname(hostname)
-
-    netbiosname = hostname.upper()
-    if not valid_netbios_name(netbiosname):
-        raise InvalidNetbiosName(netbiosname)
-
-    dnsdomain    = realm.lower()
-    domaindn     = "DC=" + dnsdomain.replace(".", ",DC=")
-    rootdn       = domaindn
-    configdn     = "CN=Configuration," + rootdn
-    schemadn     = "CN=Schema," + configdn
-
-    rdn_dc = domaindn.split(",")[0][len("DC="):]
-
-    message("set DOMAIN SID: %s" % str(domainsid))
-    message("Provisioning for %s in realm %s" % (domain, realm))
-    message("Using administrator password: %s" % adminpass)
-
-    assert paths.smbconf is not None
-
-    # only install a new smb.conf if there isn't one there already
-    if not os.path.exists(paths.smbconf):
-        message("Setting up smb.conf")
-        if serverrole == "domain controller":
-            smbconfsuffix = "dc"
-        elif serverrole == "member":
-            smbconfsuffix = "member"
-        else:
-            assert "Invalid server role setting: %s" % serverrole
-        setup_file(setup_path("provision.smb.conf.%s" % smbconfsuffix), paths.smbconf, {
-            "HOSTNAME": hostname,
-            "DOMAIN_CONF": domain,
-            "REALM_CONF": realm,
-            "SERVERROLE": serverrole,
-            "NETLOGONPATH": paths.netlogon,
-            "SYSVOLPATH": paths.sysvol,
-            })
-        lp.reload()
-
-    # only install a new shares config db if there is none
-    if not os.path.exists(paths.shareconf):
-        message("Setting up share.ldb")
-        share_ldb = Ldb(paths.shareconf, session_info=session_info, 
-                        credentials=credentials, lp=lp)
-        share_ldb.load_ldif_file_add(setup_path("share.ldif"))
-
-    message("Setting up secrets.ldb")
-    secrets_ldb = setup_secretsdb(paths.secrets, setup_path, 
-                                  session_info=session_info, 
-                                  credentials=credentials, lp=lp)
-
-    message("Setting up the registry")
-    # FIXME: Still fails for some reason
-    #setup_registry(paths.hklm, setup_path, session_info, 
-    #               credentials=credentials, lp=lp)
-
-    message("Setting up templates db")
-    setup_templatesdb(paths.templates, setup_path, session_info=session_info, 
-                      credentials=credentials, lp=lp)
-
+def setup_samdb(path, setup_path, session_info, credentials, lp, 
+                schemadn, configdn, domaindn, dnsdomain, realm, 
+                netbiosname, message, hostname, rootdn, erase, 
+                domainsid, aci, rdn_dc, domainguid, policyguid, 
+                domainname, blank, adminpass, krbtgtpass, 
+                machinepass, hostguid, invocationid, dnspass):
     # Also wipes the database
     message("Setting up sam.ldb")
-    samdb = SamDB(paths.samdb, session_info=session_info, 
+    samdb = SamDB(path, session_info=session_info, 
                   credentials=credentials, lp=lp)
 
     message("Setting up sam.ldb partitions")
     setup_samdb_partitions(samdb, setup_path, schemadn, configdn, domaindn)
 
-    samdb = SamDB(paths.samdb, session_info=session_info, 
+    samdb = SamDB(path, session_info=session_info, 
                   credentials=credentials, lp=lp)
 
     samdb.transaction_start()
@@ -520,7 +391,7 @@ def provision(lp, setup_dir, message, blank, paths, session_info,
     samdb.transaction_commit()
 
     message("Pre-loading the Samba 4 and AD schema")
-    samdb = SamDB(paths.samdb, session_info=session_info, 
+    samdb = SamDB(path, session_info=session_info, 
                   credentials=credentials, lp=lp)
     samdb.set_domain_sid(domainsid)
     load_schema(setup_path, samdb, schemadn, netbiosname, configdn)
@@ -594,7 +465,7 @@ def provision(lp, setup_dir, message, blank, paths, session_info,
             "NETBIOSNAME": netbiosname,
             "DEFAULTSITE": DEFAULTSITE,
             "DNSDOMAIN": dnsdomain,
-            "DOMAIN": domain,
+            "DOMAIN": domainname,
             "SCHEMADN": schemadn,
             "DOMAINDN": domaindn,
             })
@@ -651,7 +522,7 @@ def provision(lp, setup_dir, message, blank, paths, session_info,
                           "MACHINEPASS_B64": b64encode(machinepass),
                           "DNSPASS_B64": b64encode(dnspass),
                           "REALM": realm,
-                          "DOMAIN": domain,
+                          "DOMAIN": domainname,
                           "HOSTGUID_ADD": hostguid_add,
                           "DNSDOMAIN": dnsdomain})
                 setup_add_ldif(samdb, setup_path("provision_group_policy.ldif"), { 
@@ -660,30 +531,6 @@ def provision(lp, setup_dir, message, blank, paths, session_info,
                           "DOMAINSID": str(domainsid),
                           "DOMAINDN": domaindn})
 
-                os.makedirs(os.path.join(paths.sysvol, dnsdomain, "Policies", "{" + policyguid + "}"), 0755)
-                os.makedirs(os.path.join(paths.sysvol, dnsdomain, "Policies", "{" + policyguid + "}", "Machine"), 0755)
-                os.makedirs(os.path.join(paths.sysvol, dnsdomain, "Policies", "{" + policyguid + "}", "User"), 0755)
-                if not os.path.isdir(paths.netlogon):
-                    os.makedirs(paths.netlogon, 0755)
-                setup_ldb(secrets_ldb, setup_path("secrets_dc.ldif"), { 
-                    "MACHINEPASS_B64": b64encode(machinepass),
-                    "DOMAIN": domain,
-                    "REALM": realm,
-                    "LDAPTIME": timestring(int(time.time())),
-                    "DNSDOMAIN": dnsdomain,
-                    "DOMAINSID": str(domainsid),
-                    "SECRETS_KEYTAB": paths.keytab,
-                    "NETBIOSNAME": netbiosname,
-                    "SAM_LDB": paths.samdb,
-                    "DNS_KEYTAB": paths.dns_keytab,
-                    "DNSPASS_B64": b64encode(dnspass),
-                    })
-
-            setup_name_mappings(samdb, str(domainsid), 
-                                domaindn, root=root, nobody=nobody, 
-                                nogroup=nogroup, wheel=wheel, users=users,
-                                backup=backup)
-
         message("Setting up sam.ldb index")
         samdb.load_ldif_file_add(setup_path("provision_index.ldif"))
 
@@ -694,6 +541,177 @@ def provision(lp, setup_dir, message, blank, paths, session_info,
         raise
 
     samdb.transaction_commit()
+    return samdb
+
+
+def provision(lp, setup_dir, message, blank, paths, session_info, 
+              credentials, ldapbackend, realm=None, domain=None, hostname=None, 
+              hostip=None, domainsid=None, hostguid=None, adminpass=None, 
+              krbtgtpass=None, domainguid=None, policyguid=None, 
+              invocationid=None, machinepass=None, dnspass=None, root=None,
+              nobody=None, nogroup=None, users=None, wheel=None, backup=None, 
+              aci=None, serverrole=None):
+    """Provision samba4
+    
+    :note: caution, this wipes all existing data!
+    """
+
+    def setup_path(file):
+        return os.path.join(setup_dir, file)
+
+    erase = False
+
+    if domainsid is None:
+        domainsid = security.random_sid()
+    if policyguid is None:
+        policyguid = uuid.random()
+    if invocationid is None:
+        invocationid = uuid.random()
+    if adminpass is None:
+        adminpass = misc.random_password(12)
+    if krbtgtpass is None:
+        krbtgtpass = misc.random_password(12)
+    if machinepass is None:
+        machinepass  = misc.random_password(12)
+    if dnspass is None:
+        dnspass = misc.random_password(12)
+    if root is None:
+        root = findnss(pwd.getpwnam, "root")[4]
+    if nobody is None:
+        nobody = findnss(pwd.getpwnam, "nobody")[4]
+    if nogroup is None:
+        nogroup = findnss(grp.getgrnam, "nogroup", "nobody")[2]
+    if users is None:
+        users = findnss(grp.getgrnam, "users", "guest", "other", "unknown", "usr")[2]
+    if wheel is None:
+        wheel = findnss(grp.getgrnam, "wheel", "root", "staff", "adm")[2]
+    if backup is None:
+        backup = findnss(grp.getgrnam, "backup", "wheel", "root", "staff")[2]
+    if aci is None:
+        aci = "# no aci for local ldb"
+    if serverrole is None:
+        serverrole = lp.get("server role")
+
+    if realm is None:
+        realm = lp.get("realm")
+    else:
+        if lp.get("realm").upper() != realm.upper():
+            raise Error("realm '%s' in smb.conf must match chosen realm '%s'\n" %
+                (lp.get("realm"), realm))
+
+    assert realm is not None
+    realm = realm.upper()
+
+    if domain is None:
+        domain = lp.get("workgroup")
+    else:
+        if lp.get("workgroup").upper() != domain.upper():
+            raise Error("workgroup '%s' in smb.conf must match chosen domain '%s'\n",
+                lp.get("workgroup"), domain)
+
+    assert domain is not None
+    domain = domain.upper()
+    if not valid_netbios_name(domain):
+        raise InvalidNetbiosName(domain)
+
+    if hostname is None:
+        hostname = gethostname().split(".")[0].lower()
+
+    if hostip is None:
+        hostip = gethostbyname(hostname)
+
+    netbiosname = hostname.upper()
+    if not valid_netbios_name(netbiosname):
+        raise InvalidNetbiosName(netbiosname)
+
+    dnsdomain    = realm.lower()
+    domaindn     = "DC=" + dnsdomain.replace(".", ",DC=")
+    rootdn       = domaindn
+    configdn     = "CN=Configuration," + rootdn
+    schemadn     = "CN=Schema," + configdn
+
+    rdn_dc = domaindn.split(",")[0][len("DC="):]
+
+    message("set DOMAIN SID: %s" % str(domainsid))
+    message("Provisioning for %s in realm %s" % (domain, realm))
+    message("Using administrator password: %s" % adminpass)
+
+    assert paths.smbconf is not None
+
+    # only install a new smb.conf if there isn't one there already
+    if not os.path.exists(paths.smbconf):
+        message("Setting up smb.conf")
+        if serverrole == "domain controller":
+            smbconfsuffix = "dc"
+        elif serverrole == "member":
+            smbconfsuffix = "member"
+        else:
+            assert "Invalid server role setting: %s" % serverrole
+        setup_file(setup_path("provision.smb.conf.%s" % smbconfsuffix), paths.smbconf, {
+            "HOSTNAME": hostname,
+            "DOMAIN_CONF": domain,
+            "REALM_CONF": realm,
+            "SERVERROLE": serverrole,
+            "NETLOGONPATH": paths.netlogon,
+            "SYSVOLPATH": paths.sysvol,
+            })
+        lp.reload()
+
+    # only install a new shares config db if there is none
+    if not os.path.exists(paths.shareconf):
+        message("Setting up share.ldb")
+        share_ldb = Ldb(paths.shareconf, session_info=session_info, 
+                        credentials=credentials, lp=lp)
+        share_ldb.load_ldif_file_add(setup_path("share.ldif"))
+
+    message("Setting up secrets.ldb")
+    secrets_ldb = setup_secretsdb(paths.secrets, setup_path, 
+                                  session_info=session_info, 
+                                  credentials=credentials, lp=lp)
+
+    message("Setting up the registry")
+    # FIXME: Still fails for some reason
+    #setup_registry(paths.hklm, setup_path, session_info, 
+    #               credentials=credentials, lp=lp)
+
+    message("Setting up templates db")
+    setup_templatesdb(paths.templates, setup_path, session_info=session_info, 
+                      credentials=credentials, lp=lp)
+
+    samdb = setup_samdb(paths.samdb, setup_path, session_info=session_info, credentials=credentials,
+                        lp=lp, schemadn=schemadn, configdn=configdn, domaindn=domaindn,
+                        dnsdomain=dnsdomain, netbiosname=netbiosname, realm=realm, message=message,
+                        hostname=hostname, rootdn=rootdn, erase=erase, domainsid=domainsid, aci=aci,
+                        rdn_dc=rdn_dc, domainguid=domainguid, policyguid=policyguid, 
+                        domainname=domain, blank=blank, adminpass=adminpass, krbtgtpass=krbtgtpass,
+                        hostguid=hostguid, invocationid=invocationid, machinepass=machinepass,
+                        dnspass=dnspass)
+
+    if lp.get("server role") == "domain controller":
+        os.makedirs(os.path.join(paths.sysvol, dnsdomain, "Policies", "{" + policyguid + "}"), 0755)
+        os.makedirs(os.path.join(paths.sysvol, dnsdomain, "Policies", "{" + policyguid + "}", "Machine"), 0755)
+        os.makedirs(os.path.join(paths.sysvol, dnsdomain, "Policies", "{" + policyguid + "}", "User"), 0755)
+        if not os.path.isdir(paths.netlogon):
+            os.makedirs(paths.netlogon, 0755)
+        setup_ldb(secrets_ldb, setup_path("secrets_dc.ldif"), { 
+            "MACHINEPASS_B64": b64encode(machinepass),
+            "DOMAIN": domain,
+            "REALM": realm,
+            "LDAPTIME": timestring(int(time.time())),
+            "DNSDOMAIN": dnsdomain,
+            "DOMAINSID": str(domainsid),
+            "SECRETS_KEYTAB": paths.keytab,
+            "NETBIOSNAME": netbiosname,
+            "SAM_LDB": paths.samdb,
+            "DNS_KEYTAB": paths.dns_keytab,
+            "DNSPASS_B64": b64encode(dnspass),
+            })
+
+    if not blank:
+        setup_name_mappings(samdb, str(domainsid), 
+                        domaindn, root=root, nobody=nobody, 
+                        nogroup=nogroup, wheel=wheel, users=users,
+                        backup=backup)
 
     message("Setting up phpLDAPadmin configuration")
     create_phplpapdadmin_config(paths.phpldapadminconfig, setup_path, paths.s4_ldapi_path)
-- 
cgit 


From b7ffc3b404fbe3cf759e743c23e7bdbf75e71286 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sat, 22 Dec 2007 02:26:38 -0600
Subject: r26562: Fix provisioning using Python. (This used to be commit
 b07ca944ba62a3f3de58c06b66533c0953a32de9)

---
 source4/scripting/python/samba/provision.py | 73 +++++++++++++++++------------
 1 file changed, 43 insertions(+), 30 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index f516e73893..65094ecfac 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -354,6 +354,36 @@ def setup_samdb_partitions(samdb, setup_path, schemadn, configdn, domaindn):
         })
 
 
+def setup_self_join(samdb, configdn, schemadn, domaindn, 
+                    netbiosname, hostname, dnsdomain, machinepass, dnspass, 
+                    realm, domainname, domainsid, invocationid, setup_path,
+                    policyguid, hostguid=None):
+    if hostguid is not None:
+        hostguid_add = "objectGUID: %s" % hostguid
+    else:
+        hostguid_add = ""
+
+    setup_add_ldif(samdb, setup_path("provision_self_join.ldif"), { 
+              "CONFIGDN": configdn, 
+              "SCHEMADN": schemadn,
+              "DOMAINDN": domaindn,
+              "INVOCATIONID": invocationid,
+              "NETBIOSNAME": netbiosname,
+              "DEFAULTSITE": DEFAULTSITE,
+              "DNSNAME": "%s.%s" % (hostname, dnsdomain),
+              "MACHINEPASS_B64": b64encode(machinepass),
+              "DNSPASS_B64": b64encode(dnspass),
+              "REALM": realm,
+              "DOMAIN": domainname,
+              "HOSTGUID_ADD": hostguid_add,
+              "DNSDOMAIN": dnsdomain})
+    setup_add_ldif(samdb, setup_path("provision_group_policy.ldif"), { 
+              "POLICYGUID": policyguid,
+              "DNSDOMAIN": dnsdomain,
+              "DOMAINSID": str(domainsid),
+              "DOMAINDN": domaindn})
+
+
 def setup_samdb(path, setup_path, session_info, credentials, lp, 
                 schemadn, configdn, domaindn, dnsdomain, realm, 
                 netbiosname, message, hostname, rootdn, erase, 
@@ -506,30 +536,11 @@ def setup_samdb(path, setup_path, session_info, credentials, lp,
 
             if lp.get("server role") == "domain controller":
                 message("Setting up self join")
-                if hostguid is not None:
-                    hostguid_add = "objectGUID: %s" % hostguid
-                else:
-                    hostguid_add = ""
-
-                setup_add_ldif(samdb, setup_path("provision_self_join.ldif"), { 
-                          "CONFIGDN": configdn, 
-                          "SCHEMADN": schemadn,
-                          "DOMAINDN": domaindn,
-                          "INVOCATIONID": invocationid,
-                          "NETBIOSNAME": netbiosname,
-                          "DEFAULTSITE": DEFAULTSITE,
-                          "DNSNAME": "%s.%s" % (hostname, dnsdomain),
-                          "MACHINEPASS_B64": b64encode(machinepass),
-                          "DNSPASS_B64": b64encode(dnspass),
-                          "REALM": realm,
-                          "DOMAIN": domainname,
-                          "HOSTGUID_ADD": hostguid_add,
-                          "DNSDOMAIN": dnsdomain})
-                setup_add_ldif(samdb, setup_path("provision_group_policy.ldif"), { 
-                          "POLICYGUID": policyguid,
-                          "DNSDOMAIN": dnsdomain,
-                          "DOMAINSID": str(domainsid),
-                          "DOMAINDN": domaindn})
+                setup_self_join(samdb, configdn=configdn, schemadn=schemadn, domaindn=domaindn, 
+                                invocationid=invocationid, dnspass=dnspass, netbiosname=netbiosname,
+                                dnsdomain=dnsdomain, realm=realm, machinepass=machinepass, 
+                                domainname=domainname, domainsid=domainsid, policyguid=policyguid,
+                                hostname=hostname, hostguid=hostguid, setup_path=setup_path)
 
         message("Setting up sam.ldb index")
         samdb.load_ldif_file_add(setup_path("provision_index.ldif"))
@@ -693,6 +704,7 @@ def provision(lp, setup_dir, message, blank, paths, session_info,
         os.makedirs(os.path.join(paths.sysvol, dnsdomain, "Policies", "{" + policyguid + "}", "User"), 0755)
         if not os.path.isdir(paths.netlogon):
             os.makedirs(paths.netlogon, 0755)
+        secrets_ldb = Ldb(paths.secrets, session_info=session_info, credentials=credentials, lp=lp)
         setup_ldb(secrets_ldb, setup_path("secrets_dc.ldif"), { 
             "MACHINEPASS_B64": b64encode(machinepass),
             "DOMAIN": domain,
@@ -728,12 +740,13 @@ def provision(lp, setup_dir, message, blank, paths, session_info,
             scope=SCOPE_SUBTREE)
     assert isinstance(hostguid, str)
 
-    message("Setting up DNS zone: %s" % dnsdomain)
-    create_zone_file(paths.dns, setup_path, samdb, 
-                  hostname=hostname, hostip=hostip, dnsdomain=dnsdomain,
-                  domaindn=domaindn, dnspass=dnspass, realm=realm, 
-                  domainguid=domainguid, hostguid=hostguid)
-    message("Please install the zone located in %s into your DNS server" % paths.dns)
+    if lp.get("server role") == "domain controller":
+        message("Setting up DNS zone: %s" % dnsdomain)
+        create_zone_file(paths.dns, setup_path, samdb, 
+                      hostname=hostname, hostip=hostip, dnsdomain=dnsdomain,
+                      domaindn=domaindn, dnspass=dnspass, realm=realm, 
+                      domainguid=domainguid, hostguid=hostguid)
+        message("Please install the zone located in %s into your DNS server" % paths.dns)
 
 def create_phplpapdadmin_config(path, setup_path, s4_ldapi_path):
     setup_file(setup_path("phpldapadmin-config.php"), 
-- 
cgit 


From 09f820f0bd1a9fc7ffd171418ceb0e19df8e2e43 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sat, 22 Dec 2007 05:02:57 -0600
Subject: r26564: More python bindings for registry code. (This used to be
 commit f40fad9827d0e9567224bc1e64ea91e610a07a3f)

---
 source4/scripting/python/samba/provision.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index 65094ecfac..1d606d80e5 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -681,9 +681,8 @@ def provision(lp, setup_dir, message, blank, paths, session_info,
                                   credentials=credentials, lp=lp)
 
     message("Setting up the registry")
-    # FIXME: Still fails for some reason
-    #setup_registry(paths.hklm, setup_path, session_info, 
-    #               credentials=credentials, lp=lp)
+    setup_registry(paths.hklm, setup_path, session_info, 
+                   credentials=credentials, lp=lp)
 
     message("Setting up templates db")
     setup_templatesdb(paths.templates, setup_path, session_info=session_info, 
-- 
cgit 


From 249cc734cebfef31320ec10b05dbfaaaa39682ca Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sat, 22 Dec 2007 05:03:02 -0600
Subject: r26565: Fix python registry bindings. 'PROVISION_PYTHON=yes make
 test' works now. (This used to be commit
 485d1fa3d17fe6cc7a0ecd80e8bac42d173bbb19)

---
 source4/scripting/python/samba/provision.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index 1d606d80e5..b5fe3eba9e 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -281,12 +281,12 @@ def setup_templatesdb(path, setup_path, session_info, credentials, lp):
 
 def setup_registry(path, setup_path, session_info, credentials, lp):
     reg = registry.Registry()
-    hive = registry.Hive(path, session_info=session_info, 
+    hive = registry.open_ldb(path, session_info=session_info, 
                          credentials=credentials, lp_ctx=lp)
     reg.mount_hive(hive, "HKEY_LOCAL_MACHINE")
     provision_reg = setup_path("provision.reg")
     assert os.path.exists(provision_reg)
-    reg.apply_patchfile(provision_reg)
+    reg.diff_apply(provision_reg)
 
 
 def setup_samdb_rootdse(samdb, setup_path, schemadn, domaindn, hostname, 
-- 
cgit 


From f053e385ff796914392d0eafa1e8756ff5ffdb18 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sat, 22 Dec 2007 05:11:21 -0600
Subject: r26566: Fix member provision when using python. (This used to be
 commit e5573283df9e98bccc8eae227cf0f11367ecf084)

---
 source4/scripting/python/samba/provision.py | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index b5fe3eba9e..dcf567954a 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -729,17 +729,17 @@ def provision(lp, setup_dir, message, blank, paths, session_info,
 
     message("Please install the phpLDAPadmin configuration located at %s into /etc/phpldapadmin/config.php" % paths.phpldapadminconfig)
 
-    samdb = SamDB(paths.samdb, session_info=session_info, 
-                  credentials=credentials, lp=lp)
+    if lp.get("server role") == "domain controller":
+        samdb = SamDB(paths.samdb, session_info=session_info, 
+                      credentials=credentials, lp=lp)
 
-    domainguid = samdb.searchone(Dn(samdb, domaindn), "objectGUID")
-    assert isinstance(domainguid, str)
-    hostguid = samdb.searchone(Dn(samdb, domaindn), "objectGUID",
-            expression="(&(objectClass=computer)(cn=%s))" % hostname,
-            scope=SCOPE_SUBTREE)
-    assert isinstance(hostguid, str)
+        domainguid = samdb.searchone(Dn(samdb, domaindn), "objectGUID")
+        assert isinstance(domainguid, str)
+        hostguid = samdb.searchone(Dn(samdb, domaindn), "objectGUID",
+                expression="(&(objectClass=computer)(cn=%s))" % hostname,
+                scope=SCOPE_SUBTREE)
+        assert isinstance(hostguid, str)
 
-    if lp.get("server role") == "domain controller":
         message("Setting up DNS zone: %s" % dnsdomain)
         create_zone_file(paths.dns, setup_path, samdb, 
                       hostname=hostname, hostip=hostip, dnsdomain=dnsdomain,
-- 
cgit 


From aa0a06f13c44e0eca0b3f2f0c34f0f7995b87159 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sun, 23 Dec 2007 19:19:41 -0600
Subject: r26570: - Trim size of the swig-generated Python bindings by removing
 a bunch of {}'s.

- Start working on Python equivalents for various EJS tests.
- Fix regression in argument order for reg_diff_apply() in EJS bindings.
(This used to be commit c550c03372cb260b78f6a6c132e70571bc4cb852)
---
 source4/scripting/bin/samba3dump                 | 387 +++++++++--------------
 source4/scripting/bin/winreg.py                  |  93 ++++++
 source4/scripting/ejs/smbcalls_reg.c             |   2 +-
 source4/scripting/python/misc_wrap.c             |  73 ++---
 source4/scripting/python/samba/__init__.py       |  20 +-
 source4/scripting/python/samba/provision.py      |   4 +-
 source4/scripting/python/samba/samba3.py         | 224 +++++++++++++
 source4/scripting/python/samba/tests/__init__.py |   1 +
 source4/scripting/python/samba/tests/samba3.py   |  57 ++++
 source4/scripting/python/samba/upgrade.py        |  16 +-
 10 files changed, 584 insertions(+), 293 deletions(-)
 create mode 100644 source4/scripting/bin/winreg.py
 create mode 100644 source4/scripting/python/samba/samba3.py
 create mode 100644 source4/scripting/python/samba/tests/samba3.py

(limited to 'source4/scripting')

diff --git a/source4/scripting/bin/samba3dump b/source4/scripting/bin/samba3dump
index 6b3d999803..44ffc6a861 100755
--- a/source4/scripting/bin/samba3dump
+++ b/source4/scripting/bin/samba3dump
@@ -1,234 +1,157 @@
-#!/bin/sh
-exec smbscript "$0" ${1+"$@"}
-/*
-	Dump Samba3 data
-	Copyright Jelmer Vernooij 2005
-	Released under the GNU GPL v2 or later
-*/
-
-options = GetOptions(ARGV,
-		"POPT_AUTOHELP",
-		"POPT_COMMON_SAMBA",
-		"POPT_COMMON_VERSION",
-		'format=s',
-		'quiet', 'blank');
-
-if (options == undefined) {
-   println("Failed to parse options");
-   return -1;
-}
-
-if (options.format == undefined) {
-	options.format = "summary";
-}
-
-if (options.format != "summary" && options.format != "full") {
-	printf("Unknown format %s\n", options.format);
-	return -1;
-}
-
-libinclude("base.js");
-
-if (options.ARGV.length != 2) {
-	println("Usage: samba3dump <libdir> <smb.conf>");
-	return -1;
-}
-
-function print_header(txt)
-{
-	printf("\n%s\n", txt);
-	println("==========================================");
-}
-
-function print_samba3_policy(pol)
-{
-	print_header("Account Policies");
-	printf("Min password length: %d\n", pol.min_password_length);
-	printf("Password history length: %d\n", pol.password_history);
-	printf("User must logon to change password: %d\n", pol.user_must_logon_to_change_password);
-	printf("Maximum password age: %d\n", pol.maximum_password_age);
-	printf("Minimum password age: %d\n", pol.minimum_password_age);
-	printf("Lockout duration: %d\n", pol.lockout_duration);
-	printf("Reset Count Minutes: %d\n", pol.reset_count_minutes);
-	printf("Bad Lockout Minutes: %d\n", pol.bad_lockout_minutes);
-	printf("Disconnect Time: %d\n", pol.disconnect_time);
-	printf("Refuse Machine Password Change: %d\n", pol.refuse_machine_password_change);
-}
-
-function print_samba3_sam(samba3)
-{
-	var i;
-	print_header("SAM Database");
+#!/usr/bin/python
+#
+#	Dump Samba3 data
+#	Copyright Jelmer Vernooij 2005-2007
+#	Released under the GNU GPL v3 or later
+#
+
+import optparse
+import os, sys
+sys.path.append(os.path.join(os.path.dirname(__file__), "../python"))
+import samba
+import samba.samba3
+
+parser = optparse.OptionParser("provision <libdir> <smb.conf>")
+parser.add_option("--format", type="choice", metavar="FORMAT",
+		          choices=["full", "summary"])
+
+opts, args = parser.parse_args()
+
+if opts.format is None:
+	opts.format = "summary"
+
+def print_header(txt):
+	print "\n%s" % txt
+	print "=========================================="
+
+def print_samba3_policy(pol):
+	print_header("Account Policies")
+	print "Min password length: %d" % pol.min_password_length
+	print "Password history length: %d" % pol.password_history
+	print "User must logon to change password: %d" % pol.user_must_logon_to_change_password
+	print "Maximum password age: %d" % pol.maximum_password_age
+	print "Minimum password age: %d" % pol.minimum_password_age
+	print "Lockout duration: %d" % pol.lockout_duration
+	print "Reset Count Minutes: %d" % pol.reset_count_minutes
+	print "Bad Lockout Minutes: %d" % pol.bad_lockout_minutes
+	print "Disconnect Time: %d" % pol.disconnect_time
+	print "Refuse Machine Password Change: %d" % pol.refuse_machine_password_change
+
+def print_samba3_sam(samba3):
+	print_header("SAM Database")
 	
-	for (i in samba3.samaccounts) {
-		var a = samba3.samaccounts[i];
-		printf("%d: %s\n", a.user_rid, a.username);
-	}
-}
-
-function print_samba3_shares(samba3)
-{
-	var i, j;
-	print_header("Configured shares");
-	for (i in samba3.shares) {
-		var s = samba3.shares[i];
-		printf("--- %s ---\n", s.name);
-
-		for (j in s.parameters) {
-			var p = s.parameters[j];
-			printf("\t%s = %s\n", p.name, p.value);
-		}
-
-		println("");
-	}
-}
-
-function print_samba3_secrets(secrets)
-{
-	var i;
-	print_header("Secrets");
-
-	println("IPC Credentials:");
-	if (secrets.ipc_cred.username_obtained) 
-		printf("	User: %s\n", secrets.ipc_cred.get_username);
-	if (secrets.ipc_cred.password_obtained)
-		printf("	Password: %s\n", secrets.ipc_cred.get_password);
-
-	if (secrets.ipc_cred.domain_obtained)
-		printf("	Domain: %s\n\n", secrets.ipc_cred.get_domain);
-
-	println("LDAP passwords:");
-	for (i in secrets.ldappws) {
-		var pw = secrets.ldappws[i];
-		printf("\t%s -> %s\n", pw.dn, pw.password);
-	}
-	println("");
-
-	println("Domains:");
-	for (i in secrets.domains) {
-		var d = secrets.domains[i];
-		printf("\t--- %s ---\n", d.name);
-		printf("\tSID: %s\n", d.sid);
-		printf("\tGUID: %s\n", d.guid);
-		printf("\tPlaintext pwd: %s\n", d.plaintext_pw);
-		printf("\tLast Changed: %lu\n", d.last_change_time);
-		printf("\tSecure Channel Type: %d\n\n", d.sec_channel_type);
-	}
-
-	println("Trusted domains:");
-	for (i in secrets.trusted_domains) {
-		var td = secrets.trusted_domains[i];
-		for (j = 0; j < td.uni_name_len; j++) {
-			printf("\t--- %s ---\n", td.uni_name[j]);
-		}
-		printf("\tPassword: %s\n", td.pass);
-		printf("\tModified: %lu\n", td.mod_time);
-		printf("\tSID: %s\n", td.domain_sid);
-	}
-}
-
-function print_samba3_regdb(regdb)
-{
-	var i, j;
-	print_header("Registry");
-
-	for (i in regdb.keys) {
-		var k = regdb.keys[i];
-		printf("%s\n", k.name);
-		for (j in k.values) {
-			var v = k.values[j];
-			printf("\t%s: type %d, length %d\n", v.name, v.type, v.data.length);
-		}
-	}
-}
-
-function print_samba3_winsdb(samba3)
-{
-	var i;
-	print_header("WINS Database");
-
-	for (i in samba3.winsentries) {
-		var e = samba3.winsentries[i];
-		printf("%s, nb_flags: %x, type: %d, ttl: %lu, %d ips, fst: %s\n", e.name, e.nb_flags, e.type, e.ttl, e.ips.length, e.ips[0]);
-	}
-}
-
-function print_samba3_groupmappings(groupdb)
-{
-	print_header("Group Mappings");
+	for a in samba3.samaccounts:
+		print "%d: %s" % a.user_rid, a.username
+
+def print_samba3_shares(samba3):
+	print_header("Configured shares")
+	for s in samba3.shares:
+		print "--- %s ---" % s.name
+
+		for p in s.parameters:
+			print "\t%s = %s" % (p.name, p.value)
+
+		print ""
+
+def print_samba3_secrets(secrets):
+	print_header("Secrets")
+
+	print "IPC Credentials:"
+	if secrets.ipc_cred.username_obtained:
+		print "	User: %s\n" % secrets.ipc_cred.get_username
+	if secrets.ipc_cred.password_obtained:
+		print "	Password: %s\n" % secrets.ipc_cred.get_password
+
+	if secrets.ipc_cred.domain_obtained:
+		print "	Domain: %s\n" % secrets.ipc_cred.get_domain
+
+	print "LDAP passwords:"
+	for pw in secrets.ldappws:
+		print "\t%s -> %s" % (pw.dn, pw.password)
+	print ""
+
+	print "Domains:"
+	for d in secrets.domains:
+		print "\t--- %s ---" % d.name
+		print "\tSID: %s" % d.sid
+		print "\tGUID: %s" % d.guid
+		print "\tPlaintext pwd: %s" % d.plaintext_pw
+		print "\tLast Changed: %lu" % d.last_change_time
+		print "\tSecure Channel Type: %d\n" % d.sec_channel_type
+
+	print "Trusted domains:"
+	for td in secrets.trusted_domains:
+		for n in td.uni_name:
+			print "\t--- %s ---" % n
+		print "\tPassword: %s" % td.password
+		print "\tModified: %lu" % td.mod_time
+		print "\tSID: %s" % td.domain_sid
+
+def print_samba3_regdb(regdb):
+	print_header("Registry")
+
+	for k in regdb.keys:
+		print "%s\n" % k.name
+		for v in regdb.values(k):
+			print "\t%s: type %d, length %d" % (v.name, v.type, v.data.length)
+
+def print_samba3_winsdb(samba3):
+	print_header("WINS Database")
+
+	for e in samba3.winsentries:
+		print "%s, nb_flags: %x, type: %d, ttl: %lu, %d ips, fst: %s" % (e.name, e.nb_flags, e.type, e.ttl, e.ips.length, e.ips[0])
+
+def print_samba3_groupmappings(groupdb):
+	print_header("Group Mappings")
 	
-	for (var i in groupdb.groupmappings) {
-		var g = groupdb.groupmappings[i];
-		printf("\t--- Group: %s ---\n", g.nt_name);
-		printf("\tComment: %s\n", g.comment);
-		printf("\tGID: %d\n", g.gid);
-		printf("\tSID Name Use: %d\n", g.sid_name_use);
-		printf("\tSID: %s\n\n", g.sid);
-	}
-}
-
-function print_samba3_aliases(groupdb)
-{
-	var i, j;
-	for (i in groupdb.aliases) {
-		var a = groupdb.aliases[i];
-		printf("\t--- Alias: %s ---\n", a.sid);
-		for (j in a.members) {
-			printf("\t%s\n", a.members[j]);
-		}
-	}
-}
-
-function print_samba3_idmapdb(idmapdb)
-{
-	var i;
-	print_header("Winbindd SID<->GID/UID mappings");
-
-	printf("User High Water Mark: %d\n", idmapdb.user_hwm);
-	printf("Group High Water Mark: %d\n\n", idmapdb.group_hwm);
-
-	for (i in idmapdb.mappings) {
-		var e = idmapdb.mappings[i];
-		printf("%s -> ", e.sid);
-
-		if (e.type == e.IDMAP_GROUP) { 
-			printf("GID %d\n", e.unix_id);
-		} else {
-			printf("UID %d\n", e.unix_id);
-		}
-	}
-}
-
-function print_samba3(samba3)
-{
-	print_samba3_sam(samba3);
-	print_samba3_policy(samba3.policy);
-	print_samba3_shares(samba3);
-	print_samba3_winsdb(samba3);
-	print_samba3_regdb(samba3.registry);
-	print_samba3_secrets(samba3.secrets);
-	print_samba3_groupmappings(samba3);
-	print_samba3_aliases(samba3);
-	print_samba3_idmapdb(samba3.idmapdb);
-}
-
-function print_samba3_summary(samba3)
-{
-	printf("WINS db entries: %d\n", samba3.winsentries.length);
-	printf("SAM Accounts: %d\n", samba3.samaccounts.length);
-	printf("Registry key count: %d\n", samba3.registry.keys.length);
-	printf("Shares (including [global]): %d\n", samba3.shares.length);
-	printf("Groupmap count: %d\n", samba3.groupmappings.length);
-	printf("Alias count: %d\n", samba3.aliases.length);
-	printf("Idmap count: %d\n", samba3.idmapdb.mappings.length);
-}
-
-samba3 = samba3_read(options.ARGV[0], options.ARGV[1]);
-
-if (options.format == "summary") {
-	print_samba3_summary(samba3);
-} else if (options.format == "full") {
-	print_samba3(samba3);
-}
-
-return 0;
+	for g in groupdb.groupmappings:
+		print "\t--- Group: %s ---" % g.nt_name
+		print "\tComment: %s" % g.comment
+		print "\tGID: %d" % g.gid
+		print "\tSID Name Use: %d" % g.sid_name_use
+		print "\tSID: %s\n" % g.sid
+
+def print_samba3_aliases(groupdb):
+	for a in groupdb.aliases:
+		print "\t--- Alias: %s ---" % a.sid
+		for m in a.members:
+			print "\t%s" % m
+
+def print_samba3_idmapdb(idmapdb):
+	print_header("Winbindd SID<->GID/UID mappings")
+
+	print "User High Water Mark: %d" % idmapdb.user_hwm
+	print "Group High Water Mark: %d\n" % idmapdb.group_hwm
+
+	for e in idmapdb.mappings:
+		if e.type == e.IDMAP_GROUP:
+			print "%s -> GID %d" % (e.sid, e.unix_id)
+		else:
+			print "%s -> UID %d" % (e.sid, e.unix_id)
+
+def print_samba3(samba3):
+	print_samba3_sam(samba3)
+	print_samba3_policy(samba3.get_policy_db())
+	print_samba3_shares(samba3)
+	print_samba3_winsdb(samba3.get_wins_db())
+	print_samba3_regdb(samba3.get_registry())
+	print_samba3_secrets(samba3.get_secrets_db())
+	print_samba3_groupmappings(samba3.get_groupmapping_db())
+	print_samba3_aliases(samba3)
+	print_samba3_idmapdb(samba3.get_idmap_db())
+
+def print_samba3_summary(samba3):
+	print "WINS db entries: %d" % len(samba3.winsentries)
+	print "SAM Accounts: %d" % len(samba3.samaccounts)
+	print "Registry key count: %d" % len(samba3.registry.keys)
+	print "Shares (including [global]): %d" % len(samba3.shares)
+	print "Groupmap count: %d" % len(samba3.groupmappings)
+	print "Alias count: %d" % len(samba3.aliases)
+	print "Idmap count: %d" % len(samba3.idmapdb.mappings)
+
+samba3 = samba.samba3.Samba3(args[0], args[1])
+
+if opts.format == "summary":
+	print_samba3_summary(samba3)
+elif opts.format == "full":
+	print_samba3(samba3)
diff --git a/source4/scripting/bin/winreg.py b/source4/scripting/bin/winreg.py
new file mode 100644
index 0000000000..6cdc3a5898
--- /dev/null
+++ b/source4/scripting/bin/winreg.py
@@ -0,0 +1,93 @@
+#!/usr/bin/python
+#
+#  tool to manipulate a remote registry
+#  Copyright Andrew Tridgell 2005
+#  Copyright Jelmer Vernooij 2007
+#  Released under the GNU GPL v3 or later
+#
+
+import sys
+
+options = GetOptions(ARGV,
+			 "POPT_AUTOHELP",
+			 "POPT_COMMON_SAMBA",
+			 "POPT_COMMON_CREDENTIALS",
+			 "createkey=s")
+if (options == undefined) {
+	print "Failed to parse options"
+	sys.exit(-1)
+
+if len(sys.argv < 2:
+	print "Usage: %s <BINDING> [path]" % sys.argv[0]
+	sys.exit(-1)
+
+binding = options.ARGV[0]
+reg = winregObj()
+
+print "Connecting to " + binding
+status = reg.connect(binding)
+if (status.is_ok != true) {
+	print("Failed to connect to " + binding + " - " + status.errstr + "\n")
+	return -1
+}
+
+def list_values(path):
+	list = reg.enum_values(path)
+	if (list == undefined) {
+		return
+	}
+	for (i=0;i<list.length;i++) {
+		v = list[i]
+		printf("\ttype=%-30s size=%4d  '%s'\n", reg.typestring(v.type), v.size, v.name)
+		if (v.type == reg.REG_SZ || v.type == reg.REG_EXPAND_SZ) {
+			printf("\t\t'%s'\n", v.value)
+		}
+		if (v.type == reg.REG_MULTI_SZ) {
+			for (j in v.value) {
+				printf("\t\t'%s'\n", v.value[j])
+			}
+		}
+		if (v.type == reg.REG_DWORD || v.type == reg.REG_DWORD_BIG_ENDIAN) {
+			printf("\t\t0x%08x (%d)\n", v.value, v.value)
+		}
+		if (v.type == reg.REG_QWORD) {
+			printf("\t\t0x%llx (%lld)\n", v.value, v.value)
+		}
+	}
+
+def list_path(path):
+	count = 0
+	list = reg.enum_path(path)
+	if (list == undefined) {
+		println("Unable to list " + path)
+		return 0
+	}
+	list_values(path)
+	count = count + list.length
+	for (i=0;i<list.length;i++) {
+		if (path) {
+			npath = path + "\\" + list[i]
+		} else {
+			npath = list[i]
+		}
+		println(npath)
+		count = count + list_path(npath)
+	}
+	return count
+
+if len(sys.argv) > 2:
+	root = sys.argv[2]
+else:
+	root = ''
+
+if options.createkey:
+    try:
+	    reg.create_key("HKLM\\SOFTWARE", options.createkey)
+    except:
+		print "Failed to create key"
+else:
+	printf("Listing registry tree '%s'\n", root)
+	count = list_path(root)
+    if count == 0:
+		println("No entries found")
+		sys.exit(1)
diff --git a/source4/scripting/ejs/smbcalls_reg.c b/source4/scripting/ejs/smbcalls_reg.c
index fee11b66d9..30e5357cfb 100644
--- a/source4/scripting/ejs/smbcalls_reg.c
+++ b/source4/scripting/ejs/smbcalls_reg.c
@@ -54,7 +54,7 @@ static int ejs_apply_patchfile(MprVarHandle eid, int argc, struct MprVar **argv)
 		return -1;
 	}
 	
-	error = reg_diff_apply(mprToString(argv[0]), rctx);
+	error = reg_diff_apply(rctx, mprToString(argv[0]));
 
 	mpr_Return(eid, mprWERROR(error));
 
diff --git a/source4/scripting/python/misc_wrap.c b/source4/scripting/python/misc_wrap.c
index dc1203e2f0..0f36647487 100644
--- a/source4/scripting/python/misc_wrap.c
+++ b/source4/scripting/python/misc_wrap.c
@@ -2808,9 +2808,7 @@ SWIGINTERN PyObject *_wrap_random_password(PyObject *SWIGUNUSEDPARM(self), PyObj
     (char *) "len", NULL 
   };
   
-  {
-    arg1 = NULL;
-  }
+  arg1 = NULL;
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:random_password",kwnames,&obj0)) SWIG_fail;
   ecode2 = SWIG_AsVal_size_t(obj0, &val2);
   if (!SWIG_IsOK(ecode2)) {
@@ -2855,11 +2853,9 @@ SWIGINTERN PyObject *_wrap_ldb_set_credentials(PyObject *SWIGUNUSEDPARM(self), P
     }
     arg2 = (struct cli_credentials *)(argp2);
   }
-  {
-    if (arg1 == NULL)
-    SWIG_exception(SWIG_ValueError, 
-      "ldb context must be non-NULL");
-  }
+  if (arg1 == NULL)
+  SWIG_exception(SWIG_ValueError, 
+    "ldb context must be non-NULL");
   ldb_set_credentials(arg1,arg2);
   resultobj = SWIG_Py_Void();
   return resultobj;
@@ -2893,11 +2889,9 @@ SWIGINTERN PyObject *_wrap_ldb_set_session_info(PyObject *SWIGUNUSEDPARM(self),
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ldb_set_session_info" "', argument " "2"" of type '" "struct auth_session_info *""'"); 
   }
   arg2 = (struct auth_session_info *)(argp2);
-  {
-    if (arg1 == NULL)
-    SWIG_exception(SWIG_ValueError, 
-      "ldb context must be non-NULL");
-  }
+  if (arg1 == NULL)
+  SWIG_exception(SWIG_ValueError, 
+    "ldb context must be non-NULL");
   ldb_set_session_info(arg1,arg2);
   resultobj = SWIG_Py_Void();
   return resultobj;
@@ -2936,11 +2930,9 @@ SWIGINTERN PyObject *_wrap_ldb_set_loadparm(PyObject *SWIGUNUSEDPARM(self), PyOb
     }
     arg2 = (struct loadparm_context *)(argp2);
   }
-  {
-    if (arg1 == NULL)
-    SWIG_exception(SWIG_ValueError, 
-      "ldb context must be non-NULL");
-  }
+  if (arg1 == NULL)
+  SWIG_exception(SWIG_ValueError, 
+    "ldb context must be non-NULL");
   ldb_set_loadparm(arg1,arg2);
   resultobj = SWIG_Py_Void();
   return resultobj;
@@ -2975,11 +2967,9 @@ SWIGINTERN PyObject *_wrap_samdb_set_domain_sid(PyObject *SWIGUNUSEDPARM(self),
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "samdb_set_domain_sid" "', argument " "2"" of type '" "struct dom_sid const *""'"); 
   }
   arg2 = (struct dom_sid *)(argp2);
-  {
-    if (arg1 == NULL)
-    SWIG_exception(SWIG_ValueError, 
-      "ldb context must be non-NULL");
-  }
+  if (arg1 == NULL)
+  SWIG_exception(SWIG_ValueError, 
+    "ldb context must be non-NULL");
   result = (bool)samdb_set_domain_sid(arg1,(struct dom_sid const *)arg2);
   resultobj = SWIG_From_bool((bool)(result));
   return resultobj;
@@ -3025,19 +3015,16 @@ SWIGINTERN PyObject *_wrap_dsdb_attach_schema_from_ldif_file(PyObject *SWIGUNUSE
     SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "dsdb_attach_schema_from_ldif_file" "', argument " "3"" of type '" "char const *""'");
   }
   arg3 = (char *)(buf3);
-  {
-    if (arg1 == NULL)
-    SWIG_exception(SWIG_ValueError, 
-      "ldb context must be non-NULL");
-  }
+  if (arg1 == NULL)
+  SWIG_exception(SWIG_ValueError, 
+    "ldb context must be non-NULL");
   result = dsdb_attach_schema_from_ldif_file(arg1,(char const *)arg2,(char const *)arg3);
-  {
-    if (!W_ERROR_IS_OK(result)) {
-      PyObject *obj = Py_BuildValue("(i,s)", (&result)->v, win_errstr(result));
-      PyErr_SetObject(PyExc_RuntimeError, obj);
-    } else if (resultobj == NULL) {
-      resultobj = Py_None;
-    }
+  if (!W_ERROR_IS_OK(result)) {
+    PyObject *obj = Py_BuildValue("(i,s)", (&result)->v, win_errstr(result));
+    PyErr_SetObject(PyExc_RuntimeError, obj);
+    SWIG_fail;
+  } else if (resultobj == NULL) {
+    resultobj = Py_None;
   }
   if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
   if (alloc3 == SWIG_NEWOBJ) free((char*)buf3);
@@ -3079,11 +3066,9 @@ SWIGINTERN PyObject *_wrap_dsdb_set_global_schema(PyObject *SWIGUNUSEDPARM(self)
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "dsdb_set_global_schema" "', argument " "1"" of type '" "struct ldb_context *""'"); 
   }
   arg1 = (struct ldb_context *)(argp1);
-  {
-    if (arg1 == NULL)
-    SWIG_exception(SWIG_ValueError, 
-      "ldb context must be non-NULL");
-  }
+  if (arg1 == NULL)
+  SWIG_exception(SWIG_ValueError, 
+    "ldb context must be non-NULL");
   result = (int)dsdb_set_global_schema(arg1);
   resultobj = SWIG_From_int((int)(result));
   return resultobj;
@@ -3109,11 +3094,9 @@ SWIGINTERN PyObject *_wrap_ldb_register_samba_handlers(PyObject *SWIGUNUSEDPARM(
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ldb_register_samba_handlers" "', argument " "1"" of type '" "struct ldb_context *""'"); 
   }
   arg1 = (struct ldb_context *)(argp1);
-  {
-    if (arg1 == NULL)
-    SWIG_exception(SWIG_ValueError, 
-      "ldb context must be non-NULL");
-  }
+  if (arg1 == NULL)
+  SWIG_exception(SWIG_ValueError, 
+    "ldb context must be non-NULL");
   result = (int)ldb_register_samba_handlers(arg1);
   resultobj = SWIG_From_int((int)(result));
   return resultobj;
diff --git a/source4/scripting/python/samba/__init__.py b/source4/scripting/python/samba/__init__.py
index c735361353..5b34534133 100644
--- a/source4/scripting/python/samba/__init__.py
+++ b/source4/scripting/python/samba/__init__.py
@@ -91,7 +91,14 @@ class Ldb(ldb.Ldb):
 
     def searchone(self, basedn, attribute, expression=None, 
                   scope=ldb.SCOPE_BASE):
-        """Search for one attribute as a string."""
+        """Search for one attribute as a string.
+        
+        :param basedn: BaseDN for the search.
+        :param attribute: Name of the attribute
+        :param expression: Optional search expression.
+        :param scope: Search scope (defaults to base).
+        :return: Value of attribute as a string or None if it wasn't found.
+        """
         res = self.search(basedn, scope, expression, [attribute])
         if len(res) != 1 or res[0][attribute] is None:
             return None
@@ -100,7 +107,7 @@ class Ldb(ldb.Ldb):
         return values.pop()
 
     def erase(self):
-        """Erase an ldb, removing all records."""
+        """Erase this ldb, removing all records."""
         # delete the specials
         for attr in ["@INDEXLIST", "@ATTRIBUTES", "@SUBCLASSES", "@MODULES", 
                      "@OPTIONS", "@PARTITION", "@KLUDGEACL"]:
@@ -149,13 +156,18 @@ class Ldb(ldb.Ldb):
 
         :param ldif_path: Path to LDIF file.
         """
-        self.load_ldif_add(open(ldif_path, 'r').read())
+        self.add_ldif(open(ldif_path, 'r').read())
 
-    def load_ldif_add(self, ldif):
+    def add_ldif(self, ldif):
         for changetype, msg in self.parse_ldif(ldif):
             assert changetype == ldb.CHANGETYPE_NONE
             self.add(msg)
 
+    def modify_ldif(self, ldif):
+        for (changetype, msg) in ldb.parse_ldif(data):
+            assert changetype == CHANGETYPE_MODIFY
+            ldb.modify(msg)
+
 
 def substitute_var(text, values):
     """substitute strings of the form ${NAME} in str, replacing
diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index dcf567954a..a4e6c6a214 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -111,9 +111,7 @@ def setup_modify_ldif(ldb, ldif_path, substvars=None):
 
     assert "${" not in data
 
-    for (changetype, msg) in ldb.parse_ldif(data):
-        assert changetype == CHANGETYPE_MODIFY
-        ldb.modify(msg)
+    ldb.modify_ldif(data)
 
 
 def setup_ldb(ldb, ldif_path, subst_vars):
diff --git a/source4/scripting/python/samba/samba3.py b/source4/scripting/python/samba/samba3.py
new file mode 100644
index 0000000000..d8289ae756
--- /dev/null
+++ b/source4/scripting/python/samba/samba3.py
@@ -0,0 +1,224 @@
+#!/usr/bin/python
+
+# Unix SMB/CIFS implementation.
+# Copyright (C) Jelmer Vernooij <jelmer@samba.org> 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 <http://www.gnu.org/licenses/>.
+#
+
+"""Support for reading Samba 3 data files."""
+
+REGISTRY_VALUE_PREFIX = "SAMBA_REGVAL"
+REGISTRY_DB_VERSION = 1
+
+import tdb
+
+class Registry:
+    """Simple read-only support for reading the Samba3 registry."""
+    def __init__(self, file):
+        self.tdb = tdb.Tdb(file)
+
+    def __len__(self):
+        """Return the number of keys."""
+        return len(self.keys())
+
+    def keys(self):
+        """Return list with all the keys."""
+        return [k.rstrip("\x00") for k in self.tdb.keys() if not k.startswith(REGISTRY_VALUE_PREFIX)]
+
+    def subkeys(self, key):
+        data = self.tdb.get(key)
+        if data is None:
+            return []
+        # FIXME: Parse data
+        return []
+
+    def values(self, key):
+        """Return a dictionary with the values set for a specific key."""
+        data = self.tdb.get("%s/%s" % (REGISTRY_VALUE_PREFIX, key))
+        if data is None:
+            return {}
+        # FIXME: Parse data
+        return {}
+
+
+class PolicyDatabase:
+    def __init__(self, file):
+        self.tdb = tdb.Tdb(file)
+        self.min_password_length = tdb.fetch_uint32("min password length")
+        self.user_must_logon_to_change_password = tdb.fetch_uint32("password history")
+        self.user_must_logon_to_change_password = tdb.fetch_uint32("user must logon to change pasword")
+        self.maximum_password_age = tdb.fetch_uint32("maximum password age")
+        self.minimum_password_age = tdb.fetch_uint32("minimum password age")
+        self.lockout_duration = tdb.fetch_uint32("lockout duration")
+        self.reset_count_minutes = tdb.fetch_uint32("reset count minutes")
+        self.bad_lockout_minutes = tdb.fetch_uint32("bad lockout minutes")
+        self.disconnect_time = tdb.fetch_uint32("disconnect time")
+        self.refuse_machine_password_change = tdb.fetch_uint32("refuse machine password change")
+
+        # FIXME: Read privileges as well
+
+
+GROUPDB_DATABASE_VERSION_V1 = 1 # native byte format.
+GROUPDB_DATABASE_VERSION_V2 = 2 # le format.
+
+GROUP_PREFIX = "UNIXGROUP/"
+
+# Alias memberships are stored reverse, as memberships. The performance
+# critical operation is to determine the aliases a SID is member of, not
+# listing alias members. So we store a list of alias SIDs a SID is member of
+# hanging of the member as key.
+MEMBEROF_PREFIX = "MEMBEROF/"
+
+class GroupMappingDatabase:
+    def __init__(self, file): 
+        self.tdb = tdb.Tdb(file)
+
+
+# High water mark keys
+HWM_GROUP = "GROUP HWM"
+HWM_USER = "USER HWM"
+
+# idmap version determines auto-conversion
+IDMAP_VERSION = 2
+
+class IdmapDatabase:
+    def __init__(self, file):
+        self.tdb = tdb.Tdb(file)
+        assert self.tdb.fetch_int32("IDMAP_VERSION") == IDMAP_VERSION
+
+
+class SecretsDatabase:
+    def __init__(self, file):
+        self.tdb = tdb.Tdb(file)
+        self.domains = {}
+        for k, v in self.tdb.items():
+            if k == "SECRETS/AUTH_PASSWORD":
+                self.auth_password = v
+            elif k == "SECRETS/AUTH_DOMAIN":
+                self.auth_domain = v
+            elif k == "SECRETS/AUTH_USER":
+                self.auth_user = v
+            elif k.startswith("SECRETS/SID/"):
+                pass # FIXME
+            elif k.startswith("SECRETS/DOMGUID/"):
+                pass # FIXME
+            elif k.startswith("SECRETS/LDAP_BIND_PW/"):
+                pass # FIXME
+            elif k.startswith("SECRETS/AFS_KEYFILE/"):
+                pass # FIXME
+            elif k.startswith("SECRETS/MACHINE_SEC_CHANNEL_TYPE/"):
+                pass # FIXME
+            elif k.startswith("SECRETS/MACHINE_LAST_CHANGE_TIME/"):
+                pass # FIXME
+            elif k.startswith("SECRETS/MACHINE_PASSWORD/"):
+                pass # FIXME
+            elif k.startswith("SECRETS/$MACHINE.ACC/"):
+                pass # FIXME
+            elif k.startswith("SECRETS/$DOMTRUST.ACC/"):
+                pass # FIXME
+            elif k == "INFO/random_seed":
+                self.random_seed = v
+            else:
+                raise "Unknown key %s in secrets database" % k
+
+SHARE_DATABASE_VERSION_V1 = 1
+SHARE_DATABASE_VERSION_V2 = 2
+
+class ShareInfoDatabase:
+    def __init__(self, file):
+        self.tdb = tdb.Tdb(file)
+        assert self.tdb.fetch_int32("INFO/version") in (SHARE_DATABASE_VERSION_V1, SHARE_DATABASE_VERSION_V2)
+
+    def get_secdesc(self, name):
+        secdesc = self.tdb.get("SECDESC/%s" % name)
+        # FIXME: Run ndr_pull_security_descriptor
+
+
+ACB_DISABLED = 0x00000001
+ACB_HOMDIRREQ = 0x00000002
+ACB_PWNOTREQ = 0x00000004
+ACB_TEMPDUP = 0x00000008
+ACB_NORMAL = 0x00000010
+ACB_MNS = 0x00000020
+ACB_DOMTRUST = 0x00000040
+ACB_WSTRUST = 0x00000080
+ACB_SVRTRUST = 0x00000100
+ACB_PWNOEXP = 0x00000200
+ACB_AUTOLOCK = 0x00000400
+ACB_ENC_TXT_PWD_ALLOWED = 0x00000800
+ACB_SMARTCARD_REQUIRED = 0x00001000
+ACB_TRUSTED_FOR_DELEGATION = 0x00002000
+ACB_NOT_DELEGATED = 0x00004000
+ACB_USE_DES_KEY_ONLY = 0x00008000
+ACB_DONT_REQUIRE_PREAUTH = 0x00010000
+ACB_PW_EXPIRED = 0x00020000
+ACB_NO_AUTH_DATA_REQD = 0x00080000
+
+acb_info_mapping = {
+        'N': ACB_PWNOTREQ,  # 'N'o password. 
+        'D': ACB_DISABLED,  # 'D'isabled.
+		'H': ACB_HOMDIRREQ, # 'H'omedir required.
+		'T': ACB_TEMPDUP,   # 'T'emp account.
+		'U': ACB_NORMAL,    # 'U'ser account (normal).
+		'M': ACB_MNS,       # 'M'NS logon user account. What is this ?
+		'W': ACB_WSTRUST,   # 'W'orkstation account.
+		'S': ACB_SVRTRUST,  # 'S'erver account. 
+		'L': ACB_AUTOLOCK,  # 'L'ocked account.
+		'X': ACB_PWNOEXP,   # No 'X'piry on password
+		'I': ACB_DOMTRUST,  # 'I'nterdomain trust account.
+        ' ': 0
+        }
+
+
+class Smbpasswd:
+    def __init__(self, file):
+        pass
+
+
+class TdbSam:
+    def __init__(self, file):
+        self.tdb = tdb.Tdb(file)
+
+
+class WinsDatabase:
+    def __init__(self, file):
+        pass
+
+
+class Samba3:
+    def __init__(self, smbconfpath, libdir):
+        self.smbconfpath = smbconfpath
+        self.libdir = libdir
+
+    def get_policy_db(self):
+        return PolicyDatabase(os.path.join(libdir, "account_policy.tdb"))
+    
+    def get_registry(self):
+        return Registry(os.path.join(libdir, "registry.tdb"))
+
+    def get_secrets_db(self):
+        return SecretsDatabase(os.path.join(libdir, "secrets.tdb"))
+
+    def get_shares_db(self):
+        return ShareInfoDatabase(os.path.join(libdir, "share_info.tdb"))
+
+    def get_idmap_db(self):
+        return IdmapDatabase(os.path.join(libdir, "winbindd_idmap.tdb"))
+
+    def get_wins_db(self):
+        return WinsDatabase(os.path.join(libdir, "wins.dat"))
+
+    def get_groupmapping_db(self):
+        return GroupMappingDatabase(os.path.join(libdir, "group_mapping.tdb"))
diff --git a/source4/scripting/python/samba/tests/__init__.py b/source4/scripting/python/samba/tests/__init__.py
index e213c1cc1f..b01807c02f 100644
--- a/source4/scripting/python/samba/tests/__init__.py
+++ b/source4/scripting/python/samba/tests/__init__.py
@@ -43,6 +43,7 @@ class TestCaseInTempDir(unittest.TestCase):
 
     def tearDown(self):
         super(TestCaseInTempDir, self).tearDown()
+        # FIXME: Remove all files in self.tempdir
 
 
 class SubstituteVarTestCase(unittest.TestCase):
diff --git a/source4/scripting/python/samba/tests/samba3.py b/source4/scripting/python/samba/tests/samba3.py
new file mode 100644
index 0000000000..c6b6281c60
--- /dev/null
+++ b/source4/scripting/python/samba/tests/samba3.py
@@ -0,0 +1,57 @@
+#!/usr/bin/python
+
+# Unix SMB/CIFS implementation.
+# Copyright (C) Jelmer Vernooij <jelmer@samba.org> 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 <http://www.gnu.org/licenses/>.
+#
+
+import unittest
+from samba.samba3 import GroupMappingDatabase, Registry, PolicyDatabase
+import os
+
+DATADIR=os.path.join(os.path.dirname(__file__), "../../../../../testdata/samba3")
+
+class RegistryTestCase(unittest.TestCase):
+    def setUp(self):
+        self.registry = Registry(os.path.join(DATADIR, "registry.tdb"))
+
+    def test_length(self):
+        self.assertEquals(28, len(self.registry))
+
+    def test_keys(self):
+        self.assertEquals([], self.registry.keys())
+
+
+class PolicyTestCase(unittest.TestCase):
+    def setUp(self):
+        self.policy = PolicyDatabase(os.path.join(DATADIR, "account_policy.tdb"))
+
+    def test_policy(self):
+        self.assertEquals(self.policy.min_password_length, 5)
+        self.assertEquals(self.policy.minimum_password_age, 0)
+        self.assertEquals(self.policy.maximum_password_age, 999999999)
+        self.assertEquals(self.policy.refuse_machine_password_change, 0)
+        self.assertEquals(self.policy.reset_count_minutes, 0)
+        self.assertEquals(self.policy.disconnect_time, -1)
+        self.assertEquals(self.policy.user_must_logon_to_change_password, 0)
+        self.assertEquals(self.policy.password_history, 0)
+        self.assertEquals(self.policy.lockout_duration, 0)
+        self.assertEquals(self.policy.bad_lockout_minutes, 0)
+
+
+class GroupsTestCase(unittest.TestCase):
+    def setUp(self):
+        self.groupdb = GroupMappingDatabase(os.path.join(DATADIR, "group_mapping.tdb"))
+
diff --git a/source4/scripting/python/samba/upgrade.py b/source4/scripting/python/samba/upgrade.py
index 1c27f8ec25..3168fedf2d 100644
--- a/source4/scripting/python/samba/upgrade.py
+++ b/source4/scripting/python/samba/upgrade.py
@@ -7,7 +7,7 @@
 
 """Support code for upgrading from Samba 3 to Samba 4."""
 
-from provision import findnss
+from provision import findnss, provision
 import provision
 import grp
 import pwd
@@ -69,7 +69,7 @@ data:: %s""" % (keydn, rv.name, rv.name, rv.type, ldb.encode(rv.data))
 
     return ldif
 
-def upgrade_sam_policy(samba3,dn):
+def upgrade_sam_policy(policy,dn):
     ldif = """
 dn: %s
 changetype: modify
@@ -84,11 +84,11 @@ samba3UserMustLogonToChangePassword: %d
 samba3BadLockoutMinutes: %d
 samba3DisconnectTime: %d
 
-""" % (dn, samba3.policy.min_password_length, 
-    samba3.policy.password_history, samba3.policy.minimum_password_age,
-    samba3.policy.maximum_password_age, samba3.policy.lockout_duration,
-    samba3.policy.reset_count_minutes, samba3.policy.user_must_logon_to_change_password,
-    samba3.policy.bad_lockout_minutes, samba3.policy.disconnect_time)
+""" % (dn, policy.min_password_length, 
+    policy.password_history, policy.minimum_password_age,
+    policy.maximum_password_age, policy.lockout_duration,
+    policy.reset_count_minutes, policy.user_must_logon_to_change_password,
+    policy.bad_lockout_minutes, policy.disconnect_time)
     
     return ldif
 
@@ -465,7 +465,7 @@ replace: type
 type: 4
 replace: data
 data: %d
-""" % samba3.policy.refuse_machine_password_change)
+""" % policy.refuse_machine_password_change)
 
     message("Importing users")
     for account in samba3.samaccounts:
-- 
cgit 


From 3ee442c54f658e0dc9541a492e46fd8f6bf3a7f4 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sun, 23 Dec 2007 20:22:46 -0600
Subject: r26571: Hide warnings about unused macros and casting qualifiers in
 autogenerated files. (This used to be commit
 cb76c60007ae1254181c09ba1ab09c419f500bc5)

---
 source4/scripting/python/misc_wrap.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/misc_wrap.c b/source4/scripting/python/misc_wrap.c
index 0f36647487..03128c2e9e 100644
--- a/source4/scripting/python/misc_wrap.c
+++ b/source4/scripting/python/misc_wrap.c
@@ -2837,9 +2837,7 @@ SWIGINTERN PyObject *_wrap_ldb_set_credentials(PyObject *SWIGUNUSEDPARM(self), P
     (char *) "ldb",(char *) "creds", NULL 
   };
   
-  {
-    arg2 = NULL;
-  }
+  arg2 = NULL;
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:ldb_set_credentials",kwnames,&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ldb_context, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
@@ -2914,9 +2912,7 @@ SWIGINTERN PyObject *_wrap_ldb_set_loadparm(PyObject *SWIGUNUSEDPARM(self), PyOb
     (char *) "ldb",(char *) "lp_ctx", NULL 
   };
   
-  {
-    arg2 = loadparm_init(NULL);
-  }
+  arg2 = loadparm_init(NULL);
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:ldb_set_loadparm",kwnames,&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ldb_context, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-- 
cgit 


From d0ba9f001474bfee9b1e8fb516effab736cd4050 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sun, 23 Dec 2007 20:56:41 -0600
Subject: r26572: Fix warnings in the Python code. (This used to be commit
 15038d9586d0b58f301ca8c39c21ef10c4283f28)

---
 source4/scripting/python/misc.i      | 1 +
 source4/scripting/python/misc_wrap.c | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/misc.i b/source4/scripting/python/misc.i
index 3af10dfce9..2f41840670 100644
--- a/source4/scripting/python/misc.i
+++ b/source4/scripting/python/misc.i
@@ -22,6 +22,7 @@
 #include "includes.h"
 #include "ldb.h"
 #include "param/param.h"
+#include "auth/credentials/credentials.h"
 #include "dsdb/samdb/samdb.h"
 #include "lib/ldb-samba/ldif_handlers.h"
 %}
diff --git a/source4/scripting/python/misc_wrap.c b/source4/scripting/python/misc_wrap.c
index 03128c2e9e..a7493550cc 100644
--- a/source4/scripting/python/misc_wrap.c
+++ b/source4/scripting/python/misc_wrap.c
@@ -2530,6 +2530,7 @@ static swig_module_info swig_module = {swig_types, 27, 0, 0, 0, 0};
 #include "includes.h"
 #include "ldb.h"
 #include "param/param.h"
+#include "auth/credentials/credentials.h"
 #include "dsdb/samdb/samdb.h"
 #include "lib/ldb-samba/ldif_handlers.h"
 
@@ -3016,7 +3017,7 @@ SWIGINTERN PyObject *_wrap_dsdb_attach_schema_from_ldif_file(PyObject *SWIGUNUSE
     "ldb context must be non-NULL");
   result = dsdb_attach_schema_from_ldif_file(arg1,(char const *)arg2,(char const *)arg3);
   if (!W_ERROR_IS_OK(result)) {
-    PyObject *obj = Py_BuildValue("(i,s)", (&result)->v, win_errstr(result));
+    PyObject *obj = Py_BuildValue((char *)"(i,s)", (&result)->v, win_errstr(result));
     PyErr_SetObject(PyExc_RuntimeError, obj);
     SWIG_fail;
   } else if (resultobj == NULL) {
-- 
cgit 


From 1ab5bcfb93c9fc7b18d55e6c5995efddf97fea09 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sun, 23 Dec 2007 22:06:29 -0600
Subject: r26575: Build a private copy of the Python executable for Samba 4, so
 we know we're always using the same library we build the modules for. (This
 used to be commit 03270c5ffdb1476bef5eba846c2ea008111375fc)

---
 source4/scripting/python/config.m4   |  3 +++
 source4/scripting/python/config.mk   |  5 +++++
 source4/scripting/python/smbpython.c | 25 +++++++++++++++++++++++++
 3 files changed, 33 insertions(+)
 create mode 100644 source4/scripting/python/smbpython.c

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/config.m4 b/source4/scripting/python/config.m4
index 8951b4da08..49ad7273a4 100644
--- a/source4/scripting/python/config.m4
+++ b/source4/scripting/python/config.m4
@@ -41,9 +41,11 @@ then
 			Py_InitModule(NULL, NULL);
 		],[
 			SMB_ENABLE(LIBPYTHON,YES)
+			SMB_ENABLE(smbpython,YES)
 			AC_MSG_RESULT([yes])
 		],[
 			SMB_ENABLE(LIBPYTHON,NO)
+			SMB_ENABLE(smbpython,NO)
 			AC_MSG_RESULT([no])
 		])
 
@@ -51,5 +53,6 @@ then
 	CFLAGS="$ac_save_CFLAGS"
 else
 	SMB_ENABLE(LIBPYTHON,NO)
+	SMB_ENABLE(smbpython,NO)
 	AC_MSG_RESULT([no])
 fi
diff --git a/source4/scripting/python/config.mk b/source4/scripting/python/config.mk
index d0d3829eef..ac923cb8d1 100644
--- a/source4/scripting/python/config.mk
+++ b/source4/scripting/python/config.mk
@@ -1,3 +1,8 @@
+[BINARY::smbpython]
+PRIVATE_DEPENDENCIES = LIBPYTHON
+OBJ_FILES = \
+			smbpython.o
+
 [PYTHON::python_uuid]
 PRIVATE_DEPENDENCIES = LIBNDR 
 OBJ_FILES = uuidmodule.o
diff --git a/source4/scripting/python/smbpython.c b/source4/scripting/python/smbpython.c
new file mode 100644
index 0000000000..43785765c1
--- /dev/null
+++ b/source4/scripting/python/smbpython.c
@@ -0,0 +1,25 @@
+/* 
+   Unix SMB/CIFS implementation.
+   Samba utility functions
+   Copyright (C) Jelmer Vernooij <jelmer@samba.org> 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 <http://www.gnu.org/licenses/>.
+*/
+
+#include "includes.h"
+#include <Python.h>
+
+int main(int argc, char **argv) {
+	return Py_Main(argc,argv);
+}
-- 
cgit 


From be33f4c611d37ebba59ff618033dc73601339ad1 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sun, 23 Dec 2007 23:54:30 -0600
Subject: r26576: Allow the static module loading code to be used for the
 Python modules.

Simplify the way module initialization functions are handled.
(This used to be commit ba8be2dfc0de4434c798663336b81f7f95cde520)
---
 source4/scripting/ejs/smbcalls.c      |  2 +-
 source4/scripting/python/config.m4    |  9 ++++---
 source4/scripting/python/config.mk    |  7 ++++--
 source4/scripting/python/modules.c    | 45 +++++++++++++++++++++++++++++++++++
 source4/scripting/python/smbpython.c  |  6 ++++-
 source4/scripting/python/uuidmodule.c |  4 ++--
 6 files changed, 64 insertions(+), 9 deletions(-)
 create mode 100644 source4/scripting/python/modules.c

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls.c b/source4/scripting/ejs/smbcalls.c
index 8a3ce245d2..da13f1f6ef 100644
--- a/source4/scripting/ejs/smbcalls.c
+++ b/source4/scripting/ejs/smbcalls.c
@@ -173,7 +173,7 @@ _PUBLIC_ void ejs_exception(const char *reason)
 */
 void smb_setup_ejs_functions(void (*exception_handler)(const char *))
 {
-	init_module_fn static_init[] = STATIC_smbcalls_MODULES;
+	init_module_fn static_init[] = { STATIC_smbcalls_MODULES, NULL };
 	init_module_fn *shared_init;
 
 	ejs_exception_handler = exception_handler;
diff --git a/source4/scripting/python/config.m4 b/source4/scripting/python/config.m4
index 49ad7273a4..b6ca7966df 100644
--- a/source4/scripting/python/config.m4
+++ b/source4/scripting/python/config.m4
@@ -24,7 +24,7 @@ fi
 PYTHON_LDFLAGS=`$PYTHON_CONFIG --ldflags`
 PYTHON_CFLAGS=`$PYTHON_CONFIG --cflags`
 
-SMB_EXT_LIB(LIBPYTHON, [$PYTHON_LDFLAGS], [$PYTHON_CFLAGS])
+SMB_EXT_LIB(EXT_LIB_PYTHON, [$PYTHON_LDFLAGS], [$PYTHON_CFLAGS])
 
 AC_MSG_CHECKING(working python module support)
 if test x$working_python = xyes
@@ -40,10 +40,12 @@ then
 		],[
 			Py_InitModule(NULL, NULL);
 		],[
-			SMB_ENABLE(LIBPYTHON,YES)
+			SMB_ENABLE(EXT_LIB_PYTHON,YES)
 			SMB_ENABLE(smbpython,YES)
+			SMB_ENABLE(LIBPYTHON,YES)
 			AC_MSG_RESULT([yes])
 		],[
+			SMB_ENABLE(EXT_LIB_PYTHON,NO)
 			SMB_ENABLE(LIBPYTHON,NO)
 			SMB_ENABLE(smbpython,NO)
 			AC_MSG_RESULT([no])
@@ -52,7 +54,8 @@ then
 	LIBS="$ac_save_LIBS"
 	CFLAGS="$ac_save_CFLAGS"
 else
-	SMB_ENABLE(LIBPYTHON,NO)
+	SMB_ENABLE(EXT_LIB_PYTHON,NO)
+	SMB_ENABLE(LIBPYTHONyy,NO)
 	SMB_ENABLE(smbpython,NO)
 	AC_MSG_RESULT([no])
 fi
diff --git a/source4/scripting/python/config.mk b/source4/scripting/python/config.mk
index ac923cb8d1..601e432906 100644
--- a/source4/scripting/python/config.mk
+++ b/source4/scripting/python/config.mk
@@ -1,7 +1,10 @@
 [BINARY::smbpython]
 PRIVATE_DEPENDENCIES = LIBPYTHON
-OBJ_FILES = \
-			smbpython.o
+OBJ_FILES = smbpython.o
+
+[SUBSYSTEM::LIBPYTHON]
+PUBLIC_DEPENDENCIES = EXT_LIB_PYTHON
+OBJ_FILES = modules.o
 
 [PYTHON::python_uuid]
 PRIVATE_DEPENDENCIES = LIBNDR 
diff --git a/source4/scripting/python/modules.c b/source4/scripting/python/modules.c
new file mode 100644
index 0000000000..6a766f3412
--- /dev/null
+++ b/source4/scripting/python/modules.c
@@ -0,0 +1,45 @@
+/* 
+   Unix SMB/CIFS implementation.
+   Samba utility functions
+   Copyright (C) Jelmer Vernooij <jelmer@samba.org> 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 <http://www.gnu.org/licenses/>.
+*/
+
+#include "includes.h"
+#include <Python.h>
+#include "build.h"
+
+extern void init_ldb(void);
+extern void init_security(void);
+extern void init_registry(void);
+extern void init_param(void);
+extern void init_misc(void);
+extern void init_ldb(void);
+extern void init_auth(void);
+extern void init_credentials(void);
+extern void init_tdb(void);
+extern void init_dcerpc(void);
+extern void init_events(void);
+extern void inituuid(void);
+
+static struct _inittab py_modules[] = { STATIC_LIBPYTHON_MODULES };
+
+void py_load_samba_modules(void)
+{
+	int i;
+	for (i = 0; i < ARRAY_SIZE(py_modules); i++) {
+		PyImport_ExtendInittab(&py_modules[i]);
+	}
+}
diff --git a/source4/scripting/python/smbpython.c b/source4/scripting/python/smbpython.c
index 43785765c1..19c458e7ac 100644
--- a/source4/scripting/python/smbpython.c
+++ b/source4/scripting/python/smbpython.c
@@ -20,6 +20,10 @@
 #include "includes.h"
 #include <Python.h>
 
-int main(int argc, char **argv) {
+void py_load_samba_modules(void);
+
+int main(int argc, char **argv) 
+{
+	py_load_samba_modules();
 	return Py_Main(argc,argv);
 }
diff --git a/source4/scripting/python/uuidmodule.c b/source4/scripting/python/uuidmodule.c
index 9ae432dfa5..02c929d4a5 100644
--- a/source4/scripting/python/uuidmodule.c
+++ b/source4/scripting/python/uuidmodule.c
@@ -26,7 +26,7 @@ static PyObject *uuid_random(PyObject *self, PyObject *args)
 	struct GUID guid;
 	char *str;
 
-	if (!PyArg_ParseTuple(args, ""))
+	if (!PyArg_ParseTuple(args, (char *)""))
 	        return NULL;
 
 	guid = GUID_random();
@@ -51,7 +51,7 @@ PyDoc_STRVAR(param_doc, "UUID helper routines");
 
 PyMODINIT_FUNC inituuid(void)
 {
-	PyObject *mod = Py_InitModule3("uuid", methods, param_doc);
+	PyObject *mod = Py_InitModule3((char *)"uuid", methods, param_doc);
 	if (mod == NULL)
 		return;
 }
-- 
cgit 


From c13ae707313c5bf9819a75c1699d099565d2494d Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 24 Dec 2007 01:28:22 -0600
Subject: r26580: Include sentinel in build.h, in case the list is empty. (This
 used to be commit f1997dabed584bdc864c4b7235c29603c312ef46)

---
 source4/scripting/ejs/smbcalls.c   | 2 +-
 source4/scripting/python/config.mk | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls.c b/source4/scripting/ejs/smbcalls.c
index da13f1f6ef..1f29fce002 100644
--- a/source4/scripting/ejs/smbcalls.c
+++ b/source4/scripting/ejs/smbcalls.c
@@ -173,7 +173,7 @@ _PUBLIC_ void ejs_exception(const char *reason)
 */
 void smb_setup_ejs_functions(void (*exception_handler)(const char *))
 {
-	init_module_fn static_init[] = { STATIC_smbcalls_MODULES, NULL };
+	init_module_fn static_init[] = { STATIC_smbcalls_MODULES };
 	init_module_fn *shared_init;
 
 	ejs_exception_handler = exception_handler;
diff --git a/source4/scripting/python/config.mk b/source4/scripting/python/config.mk
index 601e432906..226f9637db 100644
--- a/source4/scripting/python/config.mk
+++ b/source4/scripting/python/config.mk
@@ -4,6 +4,7 @@ OBJ_FILES = smbpython.o
 
 [SUBSYSTEM::LIBPYTHON]
 PUBLIC_DEPENDENCIES = EXT_LIB_PYTHON
+INIT_FUNCTION_SENTINEL = { NULL, NULL }
 OBJ_FILES = modules.o
 
 [PYTHON::python_uuid]
-- 
cgit 


From 59efa6e5d074f9f0fbc0b5fd2b5bcdc9d78b95e3 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 24 Dec 2007 11:02:52 -0600
Subject: r26585: Fix samba3.python tests. (This used to be commit
 231ec0777b7d1fb1297e3a974871b8735a386cfa)

---
 source4/scripting/python/samba/samba3.py       | 42 ++++++++++++++------------
 source4/scripting/python/samba/tests/samba3.py | 10 ++++--
 2 files changed, 30 insertions(+), 22 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/samba3.py b/source4/scripting/python/samba/samba3.py
index d8289ae756..8225eacd58 100644
--- a/source4/scripting/python/samba/samba3.py
+++ b/source4/scripting/python/samba/samba3.py
@@ -22,12 +22,16 @@
 REGISTRY_VALUE_PREFIX = "SAMBA_REGVAL"
 REGISTRY_DB_VERSION = 1
 
+import os
 import tdb
 
 class Registry:
     """Simple read-only support for reading the Samba3 registry."""
     def __init__(self, file):
-        self.tdb = tdb.Tdb(file)
+        self.tdb = tdb.Tdb(file, flags=os.O_RDONLY)
+
+    def close(self):
+        self.tdb.close()
 
     def __len__(self):
         """Return the number of keys."""
@@ -38,7 +42,7 @@ class Registry:
         return [k.rstrip("\x00") for k in self.tdb.keys() if not k.startswith(REGISTRY_VALUE_PREFIX)]
 
     def subkeys(self, key):
-        data = self.tdb.get(key)
+        data = self.tdb.get("%s\x00" % key)
         if data is None:
             return []
         # FIXME: Parse data
@@ -46,7 +50,7 @@ class Registry:
 
     def values(self, key):
         """Return a dictionary with the values set for a specific key."""
-        data = self.tdb.get("%s/%s" % (REGISTRY_VALUE_PREFIX, key))
+        data = self.tdb.get("%s/%s\x00" % (REGISTRY_VALUE_PREFIX, key))
         if data is None:
             return {}
         # FIXME: Parse data
@@ -55,17 +59,17 @@ class Registry:
 
 class PolicyDatabase:
     def __init__(self, file):
-        self.tdb = tdb.Tdb(file)
-        self.min_password_length = tdb.fetch_uint32("min password length")
-        self.user_must_logon_to_change_password = tdb.fetch_uint32("password history")
-        self.user_must_logon_to_change_password = tdb.fetch_uint32("user must logon to change pasword")
-        self.maximum_password_age = tdb.fetch_uint32("maximum password age")
-        self.minimum_password_age = tdb.fetch_uint32("minimum password age")
-        self.lockout_duration = tdb.fetch_uint32("lockout duration")
-        self.reset_count_minutes = tdb.fetch_uint32("reset count minutes")
-        self.bad_lockout_minutes = tdb.fetch_uint32("bad lockout minutes")
-        self.disconnect_time = tdb.fetch_uint32("disconnect time")
-        self.refuse_machine_password_change = tdb.fetch_uint32("refuse machine password change")
+        self.tdb = tdb.Tdb(file, flags=os.O_RDONLY)
+        self.min_password_length = self.tdb.fetch_uint32("min password length\x00")
+        self.password_history = self.tdb.fetch_uint32("password history\x00")
+        self.user_must_logon_to_change_password = self.tdb.fetch_uint32("user must logon to change pasword\x00")
+        self.maximum_password_age = self.tdb.fetch_uint32("maximum password age\x00")
+        self.minimum_password_age = self.tdb.fetch_uint32("minimum password age\x00")
+        self.lockout_duration = self.tdb.fetch_uint32("lockout duration\x00")
+        self.reset_count_minutes = self.tdb.fetch_uint32("reset count minutes\x00")
+        self.bad_lockout_minutes = self.tdb.fetch_uint32("bad lockout minutes\x00")
+        self.disconnect_time = self.tdb.fetch_int32("disconnect time\x00")
+        self.refuse_machine_password_change = self.tdb.fetch_uint32("refuse machine password change\x00")
 
         # FIXME: Read privileges as well
 
@@ -83,7 +87,7 @@ MEMBEROF_PREFIX = "MEMBEROF/"
 
 class GroupMappingDatabase:
     def __init__(self, file): 
-        self.tdb = tdb.Tdb(file)
+        self.tdb = tdb.Tdb(file, flags=os.O_RDONLY)
 
 
 # High water mark keys
@@ -95,13 +99,13 @@ IDMAP_VERSION = 2
 
 class IdmapDatabase:
     def __init__(self, file):
-        self.tdb = tdb.Tdb(file)
+        self.tdb = tdb.Tdb(file, flags=os.O_RDONLY)
         assert self.tdb.fetch_int32("IDMAP_VERSION") == IDMAP_VERSION
 
 
 class SecretsDatabase:
     def __init__(self, file):
-        self.tdb = tdb.Tdb(file)
+        self.tdb = tdb.Tdb(file, flags=os.O_RDONLY)
         self.domains = {}
         for k, v in self.tdb.items():
             if k == "SECRETS/AUTH_PASSWORD":
@@ -138,7 +142,7 @@ SHARE_DATABASE_VERSION_V2 = 2
 
 class ShareInfoDatabase:
     def __init__(self, file):
-        self.tdb = tdb.Tdb(file)
+        self.tdb = tdb.Tdb(file, flags=os.O_RDONLY)
         assert self.tdb.fetch_int32("INFO/version") in (SHARE_DATABASE_VERSION_V1, SHARE_DATABASE_VERSION_V2)
 
     def get_secdesc(self, name):
@@ -189,7 +193,7 @@ class Smbpasswd:
 
 class TdbSam:
     def __init__(self, file):
-        self.tdb = tdb.Tdb(file)
+        self.tdb = tdb.Tdb(file, flags=os.O_RDONLY)
 
 
 class WinsDatabase:
diff --git a/source4/scripting/python/samba/tests/samba3.py b/source4/scripting/python/samba/tests/samba3.py
index c6b6281c60..0d56ca9117 100644
--- a/source4/scripting/python/samba/tests/samba3.py
+++ b/source4/scripting/python/samba/tests/samba3.py
@@ -22,16 +22,20 @@ from samba.samba3 import GroupMappingDatabase, Registry, PolicyDatabase
 import os
 
 DATADIR=os.path.join(os.path.dirname(__file__), "../../../../../testdata/samba3")
+print "Samba 3 data dir: %s" % DATADIR
 
 class RegistryTestCase(unittest.TestCase):
     def setUp(self):
         self.registry = Registry(os.path.join(DATADIR, "registry.tdb"))
 
+    def tearDown(self):
+        self.registry.close()
+
     def test_length(self):
         self.assertEquals(28, len(self.registry))
 
     def test_keys(self):
-        self.assertEquals([], self.registry.keys())
+        self.assertTrue("HKLM" in self.registry.keys())
 
 
 class PolicyTestCase(unittest.TestCase):
@@ -45,10 +49,10 @@ class PolicyTestCase(unittest.TestCase):
         self.assertEquals(self.policy.refuse_machine_password_change, 0)
         self.assertEquals(self.policy.reset_count_minutes, 0)
         self.assertEquals(self.policy.disconnect_time, -1)
-        self.assertEquals(self.policy.user_must_logon_to_change_password, 0)
+        self.assertEquals(self.policy.user_must_logon_to_change_password, None)
         self.assertEquals(self.policy.password_history, 0)
         self.assertEquals(self.policy.lockout_duration, 0)
-        self.assertEquals(self.policy.bad_lockout_minutes, 0)
+        self.assertEquals(self.policy.bad_lockout_minutes, None)
 
 
 class GroupsTestCase(unittest.TestCase):
-- 
cgit 


From 95b1f554b2c57a9f975a0cc27ca51bec6c7594d6 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 24 Dec 2007 13:04:33 -0600
Subject: r26587: Fix reading Samba 3 WINS database and initial work on group
 db, aliases and secrets. (This used to be commit
 c7c4cf258ac7975b409d26c9386838d4780c756f)

---
 source4/scripting/python/samba/samba3.py       | 160 ++++++++++++++++++++-----
 source4/scripting/python/samba/tests/samba3.py |  55 ++++++++-
 source4/scripting/python/samba/upgrade.py      |  21 ++--
 3 files changed, 196 insertions(+), 40 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/samba3.py b/source4/scripting/python/samba/samba3.py
index 8225eacd58..509ee29c1d 100644
--- a/source4/scripting/python/samba/samba3.py
+++ b/source4/scripting/python/samba/samba3.py
@@ -73,6 +73,9 @@ class PolicyDatabase:
 
         # FIXME: Read privileges as well
 
+    def close(self):
+        self.tdb.close()
+
 
 GROUPDB_DATABASE_VERSION_V1 = 1 # native byte format.
 GROUPDB_DATABASE_VERSION_V2 = 2 # le format.
@@ -88,6 +91,20 @@ MEMBEROF_PREFIX = "MEMBEROF/"
 class GroupMappingDatabase:
     def __init__(self, file): 
         self.tdb = tdb.Tdb(file, flags=os.O_RDONLY)
+        assert self.tdb.fetch_int32("INFO/version\x00") in (GROUPDB_DATABASE_VERSION_V1, GROUPDB_DATABASE_VERSION_V2)
+
+    def groupsids(self):
+        for k in self.tdb.keys():
+            if k.startswith(GROUP_PREFIX):
+                yield k[len(GROUP_PREFIX):].rstrip("\0")
+
+    def aliases(self):
+        for k in self.tdb.keys():
+            if k.startswith(MEMBEROF_PREFIX):
+                yield k[len(MEMBEROF_PREFIX):].rstrip("\0")
+
+    def close(self):
+        self.tdb.close()
 
 
 # High water mark keys
@@ -102,40 +119,56 @@ class IdmapDatabase:
         self.tdb = tdb.Tdb(file, flags=os.O_RDONLY)
         assert self.tdb.fetch_int32("IDMAP_VERSION") == IDMAP_VERSION
 
+    def close(self):
+        self.tdb.close()
+
 
 class SecretsDatabase:
     def __init__(self, file):
         self.tdb = tdb.Tdb(file, flags=os.O_RDONLY)
-        self.domains = {}
-        for k, v in self.tdb.items():
-            if k == "SECRETS/AUTH_PASSWORD":
-                self.auth_password = v
-            elif k == "SECRETS/AUTH_DOMAIN":
-                self.auth_domain = v
-            elif k == "SECRETS/AUTH_USER":
-                self.auth_user = v
-            elif k.startswith("SECRETS/SID/"):
-                pass # FIXME
-            elif k.startswith("SECRETS/DOMGUID/"):
-                pass # FIXME
-            elif k.startswith("SECRETS/LDAP_BIND_PW/"):
-                pass # FIXME
-            elif k.startswith("SECRETS/AFS_KEYFILE/"):
-                pass # FIXME
-            elif k.startswith("SECRETS/MACHINE_SEC_CHANNEL_TYPE/"):
-                pass # FIXME
-            elif k.startswith("SECRETS/MACHINE_LAST_CHANGE_TIME/"):
-                pass # FIXME
-            elif k.startswith("SECRETS/MACHINE_PASSWORD/"):
-                pass # FIXME
-            elif k.startswith("SECRETS/$MACHINE.ACC/"):
-                pass # FIXME
-            elif k.startswith("SECRETS/$DOMTRUST.ACC/"):
-                pass # FIXME
-            elif k == "INFO/random_seed":
-                self.random_seed = v
-            else:
-                raise "Unknown key %s in secrets database" % k
+
+    def get_auth_password(self):
+        return self.tdb.get("SECRETS/AUTH_PASSWORD")
+
+    def get_auth_domain(self):
+        return self.tdb.get("SECRETS/AUTH_DOMAIN")
+
+    def get_auth_user(self):
+        return self.tdb.get("SECRETS/AUTH_USER")
+
+    def get_dom_guid(self, host):
+        return self.tdb.get("SECRETS/DOMGUID/%s" % host)
+
+    def get_ldap_bind_pw(self, host):
+        return self.tdb.get("SECRETS/LDAP_BIND_PW/%s" % host)
+    
+    def get_afs_keyfile(self, host):
+        return self.tdb.get("SECRETS/AFS_KEYFILE/%s" % host)
+
+    def get_machine_sec_channel_type(self, host):
+        return self.tdb.get("SECRETS/MACHINE_SEC_CHANNEL_TYPE/%s" % host)
+
+    def get_machine_last_change_time(self, host):
+        return self.tdb.get("SECRETS/MACHINE_LAST_CHANGE_TIME/%s" % host)
+            
+    def get_machine_password(self, host):
+        return self.tdb.get("SECRETS/MACHINE_PASSWORD/%s" % host)
+
+    def get_machine_acc(self, host):
+        return self.tdb.get("SECRETS/$MACHINE.ACC/%s" % host)
+
+    def get_domtrust_acc(self, host):
+        return self.tdb.get("SECRETS/$DOMTRUST.ACC/%s" % host)
+
+    def get_random_seed(self):
+        return self.tdb.get("INFO/random_seed")
+
+    def get_sid(self, host):
+        return self.tdb.get("SECRETS/SID/%s" % host.upper())
+
+    def close(self):
+        self.tdb.close()
+
 
 SHARE_DATABASE_VERSION_V1 = 1
 SHARE_DATABASE_VERSION_V2 = 2
@@ -149,6 +182,8 @@ class ShareInfoDatabase:
         secdesc = self.tdb.get("SECDESC/%s" % name)
         # FIXME: Run ndr_pull_security_descriptor
 
+    def close(self):
+        self.tdb.close()
 
 ACB_DISABLED = 0x00000001
 ACB_HOMDIRREQ = 0x00000002
@@ -190,16 +225,79 @@ class Smbpasswd:
     def __init__(self, file):
         pass
 
+TDBSAM_FORMAT_STRING_V0 = "ddddddBBBBBBBBBBBBddBBwdwdBwwd"
+TDBSAM_FORMAT_STRING_V1 = "dddddddBBBBBBBBBBBBddBBwdwdBwwd"
+TDBSAM_FORMAT_STRING_V2 = "dddddddBBBBBBBBBBBBddBBBwwdBwwd"
+TDBSAM_USER_PREFIX = "USER_"
+
 
 class TdbSam:
     def __init__(self, file):
         self.tdb = tdb.Tdb(file, flags=os.O_RDONLY)
+        self.version = self.tdb.fetch_uint32("INFO/version") or 0
+        assert self.version in (0, 1, 2)
+
+    def usernames(self):
+        for k in self.tdb.keys():
+            if k.startswith(TDBSAM_USER_PREFIX):
+                yield k[len(TDBSAM_USER_PREFIX):].rstrip("\0")
+
+    def close(self):
+        self.tdb.close()
+
+
+def shellsplit(text):
+    """Very simple shell-like line splitting.
+    
+    :param text: Text to split.
+    :return: List with parts of the line as strings.
+    """
+    ret = list()
+    inquotes = False
+    current = ""
+    for c in text:
+        if c == "\"":
+            inquotes = not inquotes
+        elif c in ("\t", "\n", " ") and not inquotes:
+            ret.append(current)
+            current = ""
+        else:
+            current += c
+    if current != "":
+        ret.append(current)
+    return ret
 
 
 class WinsDatabase:
     def __init__(self, file):
-        pass
+        self.entries = {}
+        f = open(file, 'r')
+        assert f.readline().rstrip("\n") == "VERSION 1 0"
+        for l in f.readlines():
+            if l[0] == "#": # skip comments
+                continue
+            entries = shellsplit(l.rstrip("\n"))
+            print entries
+            name = entries[0]
+            ttl = int(entries[1])
+            i = 2
+            ips = []
+            while "." in entries[i]:
+                ips.append(entries[i])
+                i+=1
+            nb_flags = entries[i]
+            assert not name in self.entries, "Name %s exists twice" % name
+            self.entries[name] = (ttl, ips, nb_flags)
+        f.close()
+
+    def __getitem__(self, name):
+        return self.entries[name]
 
+    def __len__(self):
+        return len(self.entries)
+
+    def close(self): # for consistency
+        pass
 
 class Samba3:
     def __init__(self, smbconfpath, libdir):
diff --git a/source4/scripting/python/samba/tests/samba3.py b/source4/scripting/python/samba/tests/samba3.py
index 0d56ca9117..92d11d11d4 100644
--- a/source4/scripting/python/samba/tests/samba3.py
+++ b/source4/scripting/python/samba/tests/samba3.py
@@ -18,7 +18,8 @@
 #
 
 import unittest
-from samba.samba3 import GroupMappingDatabase, Registry, PolicyDatabase
+from samba.samba3 import (GroupMappingDatabase, Registry, PolicyDatabase, SecretsDatabase, TdbSam,
+                          WinsDatabase)
 import os
 
 DATADIR=os.path.join(os.path.dirname(__file__), "../../../../../testdata/samba3")
@@ -59,3 +60,55 @@ class GroupsTestCase(unittest.TestCase):
     def setUp(self):
         self.groupdb = GroupMappingDatabase(os.path.join(DATADIR, "group_mapping.tdb"))
 
+    def tearDown(self):
+        self.groupdb.close()
+
+    def test_group_length(self):
+        self.assertEquals(13, len(list(self.groupdb.groupsids())))
+
+    def test_groupsids(self):
+        sids = list(self.groupdb.groupsids())
+        self.assertTrue("S-1-5-32-544" in sids)
+
+    def test_alias_length(self):
+        self.assertEquals(0, len(list(self.groupdb.aliases())))
+
+
+class SecretsDbTestCase(unittest.TestCase):
+    def setUp(self):
+        self.secretsdb = SecretsDatabase(os.path.join(DATADIR, "secrets.tdb"))
+
+    def tearDown(self):
+        self.secretsdb.close()
+
+    def test_get_sid(self):
+        self.assertTrue(self.secretsdb.get_sid("BEDWYR") is not None)
+
+
+class TdbSamTestCase(unittest.TestCase):
+    def setUp(self):
+        self.samdb = TdbSam(os.path.join(DATADIR, "passdb.tdb"))
+
+    def tearDown(self):
+        self.samdb.close()
+
+    def test_usernames(self):
+        self.assertEquals(3, len(list(self.samdb.usernames())))
+
+
+class WinsDatabaseTestCase(unittest.TestCase):
+    def setUp(self):
+        self.winsdb = WinsDatabase(os.path.join(DATADIR, "wins.dat"))
+
+    def test_length(self):
+        self.assertEquals(22, len(self.winsdb))
+
+    def test_first_entry(self):
+        self.assertEqual((1124185120, ["192.168.1.5"], "64R"), self.winsdb["ADMINISTRATOR#03"])
+
+    def tearDown(self):
+        self.winsdb.close()
+
+# FIXME: smbpasswd
+# FIXME: idmapdb
+# FIXME: Shares
diff --git a/source4/scripting/python/samba/upgrade.py b/source4/scripting/python/samba/upgrade.py
index 3168fedf2d..4f2ab46ef0 100644
--- a/source4/scripting/python/samba/upgrade.py
+++ b/source4/scripting/python/samba/upgrade.py
@@ -530,14 +530,7 @@ data: %d
     if ldapurl is not None:
         message("Enabling Samba3 LDAP mappings for SAM database")
 
-        samdb.modify("""
-dn: @MODULES
-changetype: modify
-replace: @LIST
-@LIST: samldb,operational,objectguid,rdn_name,samba3sam
-""")
-
-        samdb.add({"dn": "@MAP=samba3sam", "@MAP_URL": ldapurl})
+        enable_samba3sam(samdb)
 
     return ret
 
@@ -551,3 +544,15 @@ def upgrade_verify(subobj, samba3, paths, message):
         assert(len(msg) >= 1)
     
     # FIXME
+
+
+
+def enable_samba3sam(samdb):
+    samdb.modify("""
+dn: @MODULES
+changetype: modify
+replace: @LIST
+@LIST: samldb,operational,objectguid,rdn_name,samba3sam
+""")
+
+    samdb.add({"dn": "@MAP=samba3sam", "@MAP_URL": ldapurl})
-- 
cgit 


From 8ada900ee67fc8e1a1ff94c9e5f7a50752d11017 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 24 Dec 2007 14:16:40 -0600
Subject: r26590: Parsing routines for the smbpasswd file and idmap database.
 (This used to be commit 0c14e16a2bc965d3319ca990089566bff98a47fe)

---
 source4/scripting/python/samba/samba3.py       | 96 ++++++++++++++++++++++++--
 source4/scripting/python/samba/tests/samba3.py | 53 ++++++++++++--
 2 files changed, 140 insertions(+), 9 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/samba3.py b/source4/scripting/python/samba/samba3.py
index 509ee29c1d..b75b24ba34 100644
--- a/source4/scripting/python/samba/samba3.py
+++ b/source4/scripting/python/samba/samba3.py
@@ -108,16 +108,47 @@ class GroupMappingDatabase:
 
 
 # High water mark keys
-HWM_GROUP = "GROUP HWM"
-HWM_USER = "USER HWM"
+IDMAP_HWM_GROUP = "GROUP HWM\0"
+IDMAP_HWM_USER = "USER HWM\0"
+
+IDMAP_GROUP_PREFIX = "GID "
+IDMAP_USER_PREFIX = "UID "
 
 # idmap version determines auto-conversion
-IDMAP_VERSION = 2
+IDMAP_VERSION_V2 = 2
 
 class IdmapDatabase:
     def __init__(self, file):
         self.tdb = tdb.Tdb(file, flags=os.O_RDONLY)
-        assert self.tdb.fetch_int32("IDMAP_VERSION") == IDMAP_VERSION
+        assert self.tdb.fetch_int32("IDMAP_VERSION\0") == IDMAP_VERSION_V2
+
+    def uids(self):
+        for k in self.tdb.keys():
+            if k.startswith(IDMAP_USER_PREFIX):
+                yield int(k[len(IDMAP_USER_PREFIX):].rstrip("\0"))
+
+    def gids(self):
+        for k in self.tdb.keys():
+            if k.startswith(IDMAP_GROUP_PREFIX):
+                yield int(k[len(IDMAP_GROUP_PREFIX):].rstrip("\0"))
+
+    def get_user_sid(self, uid):
+        data = self.tdb.get("%s%d\0" % (IDMAP_USER_PREFIX, uid))
+        if data is None:
+            return data
+        return data.rstrip("\0")
+
+    def get_group_sid(self, gid):
+        data = self.tdb.get("%s%d\0" % (IDMAP_GROUP_PREFIX, gid))
+        if data is None:
+            return data
+        return data.rstrip("\0")
+
+    def get_user_hwm(self):
+        return self.tdb.fetch_uint32(IDMAP_HWM_USER)
+
+    def get_group_hwm(self):
+        return self.tdb.fetch_uint32(IDMAP_HWM_GROUP)
 
     def close(self):
         self.tdb.close()
@@ -181,6 +212,7 @@ class ShareInfoDatabase:
     def get_secdesc(self, name):
         secdesc = self.tdb.get("SECDESC/%s" % name)
         # FIXME: Run ndr_pull_security_descriptor
+        return secdesc
 
     def close(self):
         self.tdb.close()
@@ -220,11 +252,65 @@ acb_info_mapping = {
         ' ': 0
         }
 
+def decode_acb(text):
+    assert not "[" in text and not "]" in text
+    ret = 0
+    for x in text:
+        ret |= acb_info_mapping[x]
+    return ret
 
-class Smbpasswd:
+
+class SmbpasswdFile:
     def __init__(self, file):
+        self.users = {}
+        f = open(file, 'r')
+        for l in f.readlines():
+            if len(l) == 0 or l[0] == "#":
+                continue # Skip comments and blank lines
+            parts = l.split(":")
+            username = parts[0]
+            uid = int(parts[1])
+            acct_ctrl = 0
+            last_change_time = None
+            if parts[2] == "NO PASSWORD":
+                acct_ctrl |= ACB_PWNOTREQ
+                lm_password = None
+            elif parts[2][0] in ("*", "X"):
+                # No password set
+                lm_password = None
+            else:
+                lm_password = parts[2]
+
+            if parts[3][0] in ("*", "X"):
+                # No password set
+                nt_password = None
+            else:
+                nt_password = parts[3]
+
+            if parts[4][0] == '[':
+                assert "]" in parts[4]
+                acct_ctrl |= decode_acb(parts[4][1:-1])
+                if parts[5].startswith("LCT-"):
+                    last_change_time = int(parts[5][len("LCT-"):], 16)
+            else: # old style file
+                if username[-1] == "$":
+                    acct_ctrl &= ~ACB_NORMAL
+                    acct_ctrl |= ACB_WSTRUST
+
+            self.users[username] = (uid, lm_password, nt_password, acct_ctrl, last_change_time)
+
+        f.close()
+
+    def __len__(self):
+        return len(self.users)
+
+    def __getitem__(self, name):
+        return self.users[name]
+
+    def close(self): # For consistency
         pass
 
+
 TDBSAM_FORMAT_STRING_V0 = "ddddddBBBBBBBBBBBBddBBwdwdBwwd"
 TDBSAM_FORMAT_STRING_V1 = "dddddddBBBBBBBBBBBBddBBwdwdBwwd"
 TDBSAM_FORMAT_STRING_V2 = "dddddddBBBBBBBBBBBBddBBBwwdBwwd"
diff --git a/source4/scripting/python/samba/tests/samba3.py b/source4/scripting/python/samba/tests/samba3.py
index 92d11d11d4..580bcfa3c2 100644
--- a/source4/scripting/python/samba/tests/samba3.py
+++ b/source4/scripting/python/samba/tests/samba3.py
@@ -19,7 +19,7 @@
 
 import unittest
 from samba.samba3 import (GroupMappingDatabase, Registry, PolicyDatabase, SecretsDatabase, TdbSam,
-                          WinsDatabase)
+                          WinsDatabase, SmbpasswdFile, ACB_NORMAL, IdmapDatabase)
 import os
 
 DATADIR=os.path.join(os.path.dirname(__file__), "../../../../../testdata/samba3")
@@ -109,6 +109,51 @@ class WinsDatabaseTestCase(unittest.TestCase):
     def tearDown(self):
         self.winsdb.close()
 
-# FIXME: smbpasswd
-# FIXME: idmapdb
-# FIXME: Shares
+class SmbpasswdTestCase(unittest.TestCase):
+    def setUp(self):
+        self.samdb = SmbpasswdFile(os.path.join(DATADIR, "smbpasswd"))
+
+    def test_length(self):
+        self.assertEquals(3, len(self.samdb))
+
+    def test_get_user(self):
+        self.assertEquals((0, "552902031BEDE9EFAAD3B435B51404EE", "878D8014606CDA29677A44EFA1353FC7", ACB_NORMAL, int(1125418267)), self.samdb["rootpw"])
+
+    def tearDown(self):
+        self.samdb.close()
+
+
+class IdmapDbTestCase(unittest.TestCase):
+    def setUp(self):
+        self.idmapdb = IdmapDatabase(os.path.join(DATADIR, "winbindd_idmap.tdb"))
+
+    def test_user_hwm(self):
+        self.assertEquals(10000, self.idmapdb.get_user_hwm())
+
+    def test_group_hwm(self):
+        self.assertEquals(10002, self.idmapdb.get_group_hwm())
+
+    def test_uids(self):
+        self.assertEquals(1, len(list(self.idmapdb.uids())))
+
+    def test_gids(self):
+        self.assertEquals(3, len(list(self.idmapdb.gids())))
+
+    def test_get_user_sid(self):
+        self.assertEquals("S-1-5-21-58189338-3053988021-627566699-501", self.idmapdb.get_user_sid(65534))
+
+    def test_get_group_sid(self):
+        self.assertEquals("S-1-5-21-2447931902-1787058256-3961074038-3007", self.idmapdb.get_group_sid(10001))
+
+    def tearDown(self):
+        self.idmapdb.close()
+
+
+class ShareInfoTestCase(unittest.TestCase):
+    def setUp(self):
+        self.shareinfodb = ShareInfoDatabase(os.path.join(DATADIR, "share_info.tdb"))
+
+    # FIXME: needs proper data so it can be tested
+
+    def tearDown(self):
+        self.shareinfodb.close()
-- 
cgit 


From 3c22677a8ce1635d7e055f954153dec4c1796b17 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 24 Dec 2007 14:16:59 -0600
Subject: r26591: Get the first bits of samba3dump to work again. (This used to
 be commit 3511027515f8ea860fbe46639d9169999646a297)

---
 source4/scripting/bin/samba3dump          | 123 +++++++++++++++++-------------
 source4/scripting/python/samba/samba3.py  |  42 +++++++---
 source4/scripting/python/samba/upgrade.py |   4 +-
 3 files changed, 101 insertions(+), 68 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/bin/samba3dump b/source4/scripting/bin/samba3dump
index 44ffc6a861..0aa54d91cc 100755
--- a/source4/scripting/bin/samba3dump
+++ b/source4/scripting/bin/samba3dump
@@ -11,7 +11,7 @@ sys.path.append(os.path.join(os.path.dirname(__file__), "../python"))
 import samba
 import samba.samba3
 
-parser = optparse.OptionParser("provision <libdir> <smb.conf>")
+parser = optparse.OptionParser("provision <libdir> [<smb.conf>]")
 parser.add_option("--format", type="choice", metavar="FORMAT",
 		          choices=["full", "summary"])
 
@@ -28,14 +28,22 @@ def print_samba3_policy(pol):
 	print_header("Account Policies")
 	print "Min password length: %d" % pol.min_password_length
 	print "Password history length: %d" % pol.password_history
-	print "User must logon to change password: %d" % pol.user_must_logon_to_change_password
-	print "Maximum password age: %d" % pol.maximum_password_age
-	print "Minimum password age: %d" % pol.minimum_password_age
-	print "Lockout duration: %d" % pol.lockout_duration
-	print "Reset Count Minutes: %d" % pol.reset_count_minutes
-	print "Bad Lockout Minutes: %d" % pol.bad_lockout_minutes
-	print "Disconnect Time: %d" % pol.disconnect_time
-	print "Refuse Machine Password Change: %d" % pol.refuse_machine_password_change
+	if pol.user_must_logon_to_change_password:
+		print "User must logon to change password: %d" % pol.user_must_logon_to_change_password
+	if pol.maximum_password_age:
+		print "Maximum password age: %d" % pol.maximum_password_age
+	if pol.minimum_password_age:
+		print "Minimum password age: %d" % pol.minimum_password_age
+	if pol.lockout_duration:
+		print "Lockout duration: %d" % pol.lockout_duration
+	if pol.reset_count_minutes:
+		print "Reset Count Minutes: %d" % pol.reset_count_minutes
+	if pol.bad_lockout_minutes:
+		print "Bad Lockout Minutes: %d" % pol.bad_lockout_minutes
+	if pol.disconnect_time:
+		print "Disconnect Time: %d" % pol.disconnect_time
+	if pol.refuse_machine_password_change:
+		print "Refuse Machine Password Change: %d" % pol.refuse_machine_password_change
 
 def print_samba3_sam(samba3):
 	print_header("SAM Database")
@@ -56,55 +64,55 @@ def print_samba3_shares(samba3):
 def print_samba3_secrets(secrets):
 	print_header("Secrets")
 
-	print "IPC Credentials:"
-	if secrets.ipc_cred.username_obtained:
-		print "	User: %s\n" % secrets.ipc_cred.get_username
-	if secrets.ipc_cred.password_obtained:
-		print "	Password: %s\n" % secrets.ipc_cred.get_password
-
-	if secrets.ipc_cred.domain_obtained:
-		print "	Domain: %s\n" % secrets.ipc_cred.get_domain
-
-	print "LDAP passwords:"
-	for pw in secrets.ldappws:
-		print "\t%s -> %s" % (pw.dn, pw.password)
-	print ""
+	if secrets.get_auth_user():
+		print "IPC Credentials:"
+		if secrets.get_auth_user():
+			print "	User: %s\n" % secrets.get_auth_user()
+		if secrets.get_auth_password():
+			print "	Password: %s\n" % secrets.get_auth_password()
+		if secrets.get_auth_domain():
+			print "	Domain: %s\n" % secrets.get_auth_domain()
+
+	if len(list(secrets.ldap_dns())) > 0:
+		print "LDAP passwords:"
+		for dn in secrets.ldap_dns():
+			print "\t%s -> %s" % (dn, secrets.get_ldap_bind_pw(dn))
+		print ""
 
 	print "Domains:"
-	for d in secrets.domains:
-		print "\t--- %s ---" % d.name
-		print "\tSID: %s" % d.sid
-		print "\tGUID: %s" % d.guid
-		print "\tPlaintext pwd: %s" % d.plaintext_pw
-		print "\tLast Changed: %lu" % d.last_change_time
-		print "\tSecure Channel Type: %d\n" % d.sec_channel_type
+	for domain in secrets.domains():
+		print "\t--- %s ---" % domain
+		print "\tSID: %s" % secrets.get_sid(domain)
+		print "\tGUID: %s" % secrets.get_dom_guid(domain)
+		print "\tPlaintext pwd: %s" % secrets.get_machine_password(domain)
+		if secrets.get_machine_last_change_time(domain):
+			print "\tLast Changed: %lu" % secrets.get_machine_last_change_time(domain)
+		if secrets.get_machine_sec_channel_type(domain):
+			print "\tSecure Channel Type: %d\n" % secrets.get_machine_sec_channel_type(domain)
 
 	print "Trusted domains:"
-	for td in secrets.trusted_domains:
-		for n in td.uni_name:
-			print "\t--- %s ---" % n
-		print "\tPassword: %s" % td.password
-		print "\tModified: %lu" % td.mod_time
-		print "\tSID: %s" % td.domain_sid
+	for td in secrets.trusted_domains():
+		print td
 
 def print_samba3_regdb(regdb):
 	print_header("Registry")
 
-	for k in regdb.keys:
-		print "%s\n" % k.name
+	for k in regdb.keys():
+		print "%s" % k
 		for v in regdb.values(k):
 			print "\t%s: type %d, length %d" % (v.name, v.type, v.data.length)
 
-def print_samba3_winsdb(samba3):
+def print_samba3_winsdb(winsdb):
 	print_header("WINS Database")
 
-	for e in samba3.winsentries:
-		print "%s, nb_flags: %x, type: %d, ttl: %lu, %d ips, fst: %s" % (e.name, e.nb_flags, e.type, e.ttl, e.ips.length, e.ips[0])
+	for name in winsdb:
+		(ttl, ips, nb_flags) = winsdb[name]
+		print "%s, nb_flags: %s, ttl: %lu, %d ips, fst: %s" % (name, nb_flags, ttl, len(ips), ips[0])
 
 def print_samba3_groupmappings(groupdb):
 	print_header("Group Mappings")
 	
-	for g in groupdb.groupmappings:
+	for sid in groupdb.groupsids():
 		print "\t--- Group: %s ---" % g.nt_name
 		print "\tComment: %s" % g.comment
 		print "\tGID: %d" % g.gid
@@ -130,26 +138,33 @@ def print_samba3_idmapdb(idmapdb):
 			print "%s -> UID %d" % (e.sid, e.unix_id)
 
 def print_samba3(samba3):
-	print_samba3_sam(samba3)
 	print_samba3_policy(samba3.get_policy_db())
-	print_samba3_shares(samba3)
 	print_samba3_winsdb(samba3.get_wins_db())
 	print_samba3_regdb(samba3.get_registry())
 	print_samba3_secrets(samba3.get_secrets_db())
-	print_samba3_groupmappings(samba3.get_groupmapping_db())
-	print_samba3_aliases(samba3)
+	groupdb = samba3.get_groupmapping_db()
+	print_samba3_groupmappings(groupdb)
+	print_samba3_aliases(groupdb)
 	print_samba3_idmapdb(samba3.get_idmap_db())
+	print_samba3_shares(samba3)
+	print_samba3_sam(samba3)
 
 def print_samba3_summary(samba3):
-	print "WINS db entries: %d" % len(samba3.winsentries)
-	print "SAM Accounts: %d" % len(samba3.samaccounts)
-	print "Registry key count: %d" % len(samba3.registry.keys)
-	print "Shares (including [global]): %d" % len(samba3.shares)
-	print "Groupmap count: %d" % len(samba3.groupmappings)
-	print "Alias count: %d" % len(samba3.aliases)
-	print "Idmap count: %d" % len(samba3.idmapdb.mappings)
-
-samba3 = samba.samba3.Samba3(args[0], args[1])
+	print "WINS db entries: %d" % len(samba3.get_wins_db())
+	print "Registry key count: %d" % len(samba3.get_registry())
+	groupdb = samba3.get_groupmapping_db()
+	print "Groupmap count: %d" % len(list(groupdb.groupsids()))
+	print "Alias count: %d" % len(list(groupdb.aliases()))
+	idmapdb = samba3.get_idmap_db()
+	print "Idmap count: %d" % (len(list(idmapdb.uids())) + len(list(idmapdb.gids())))
+
+libdir = args[0]
+if len(args) > 1:
+	smbconf = args[2]
+else:
+	smbconf = os.path.join(libdir, "smb.conf")
+
+samba3 = samba.samba3.Samba3(libdir, smbconf)
 
 if opts.format == "summary":
 	print_samba3_summary(samba3)
diff --git a/source4/scripting/python/samba/samba3.py b/source4/scripting/python/samba/samba3.py
index b75b24ba34..40443bd8ba 100644
--- a/source4/scripting/python/samba/samba3.py
+++ b/source4/scripting/python/samba/samba3.py
@@ -170,6 +170,16 @@ class SecretsDatabase:
     def get_dom_guid(self, host):
         return self.tdb.get("SECRETS/DOMGUID/%s" % host)
 
+    def ldap_dns(self):
+        for k in self.tdb.keys():
+            if k.startswith("SECRETS/LDAP_BIND_PW/"):
+                yield k[len("SECRETS/LDAP_BIND_PW/"):].rstrip("\0")
+
+    def domains(self):
+        for k in self.tdb.keys():
+            if k.startswith("SECRETS/SID/"):
+                yield k[len("SECRETS/SID/"):].rstrip("\0")
+
     def get_ldap_bind_pw(self, host):
         return self.tdb.get("SECRETS/LDAP_BIND_PW/%s" % host)
     
@@ -177,10 +187,10 @@ class SecretsDatabase:
         return self.tdb.get("SECRETS/AFS_KEYFILE/%s" % host)
 
     def get_machine_sec_channel_type(self, host):
-        return self.tdb.get("SECRETS/MACHINE_SEC_CHANNEL_TYPE/%s" % host)
+        return self.tdb.fetch_uint32("SECRETS/MACHINE_SEC_CHANNEL_TYPE/%s" % host)
 
     def get_machine_last_change_time(self, host):
-        return self.tdb.get("SECRETS/MACHINE_LAST_CHANGE_TIME/%s" % host)
+        return self.tdb.fetch_uint32("SECRETS/MACHINE_LAST_CHANGE_TIME/%s" % host)
             
     def get_machine_password(self, host):
         return self.tdb.get("SECRETS/MACHINE_PASSWORD/%s" % host)
@@ -191,6 +201,11 @@ class SecretsDatabase:
     def get_domtrust_acc(self, host):
         return self.tdb.get("SECRETS/$DOMTRUST.ACC/%s" % host)
 
+    def trusted_domains(self):
+        for k in self.tdb.keys():
+            if k.startswith("SECRETS/$DOMTRUST.ACC/"):
+                yield k[len("SECRETS/$DOMTRUST.ACC/"):].rstrip("\0")
+
     def get_random_seed(self):
         return self.tdb.get("INFO/random_seed")
 
@@ -307,6 +322,9 @@ class SmbpasswdFile:
     def __getitem__(self, name):
         return self.users[name]
 
+    def __iter__(self):
+        return iter(self.entries)
+
     def close(self): # For consistency
         pass
 
@@ -363,7 +381,6 @@ class WinsDatabase:
             if l[0] == "#": # skip comments
                 continue
             entries = shellsplit(l.rstrip("\n"))
-            print entries
             name = entries[0]
             ttl = int(entries[1])
             i = 2
@@ -382,31 +399,34 @@ class WinsDatabase:
     def __len__(self):
         return len(self.entries)
 
+    def __iter__(self):
+        return iter(self.entries)
+
     def close(self): # for consistency
         pass
 
 class Samba3:
-    def __init__(self, smbconfpath, libdir):
+    def __init__(self, libdir, smbconfpath):
         self.smbconfpath = smbconfpath
         self.libdir = libdir
 
     def get_policy_db(self):
-        return PolicyDatabase(os.path.join(libdir, "account_policy.tdb"))
+        return PolicyDatabase(os.path.join(self.libdir, "account_policy.tdb"))
     
     def get_registry(self):
-        return Registry(os.path.join(libdir, "registry.tdb"))
+        return Registry(os.path.join(self.libdir, "registry.tdb"))
 
     def get_secrets_db(self):
-        return SecretsDatabase(os.path.join(libdir, "secrets.tdb"))
+        return SecretsDatabase(os.path.join(self.libdir, "secrets.tdb"))
 
     def get_shares_db(self):
-        return ShareInfoDatabase(os.path.join(libdir, "share_info.tdb"))
+        return ShareInfoDatabase(os.path.join(self.libdir, "share_info.tdb"))
 
     def get_idmap_db(self):
-        return IdmapDatabase(os.path.join(libdir, "winbindd_idmap.tdb"))
+        return IdmapDatabase(os.path.join(self.libdir, "winbindd_idmap.tdb"))
 
     def get_wins_db(self):
-        return WinsDatabase(os.path.join(libdir, "wins.dat"))
+        return WinsDatabase(os.path.join(self.libdir, "wins.dat"))
 
     def get_groupmapping_db(self):
-        return GroupMappingDatabase(os.path.join(libdir, "group_mapping.tdb"))
+        return GroupMappingDatabase(os.path.join(self.libdir, "group_mapping.tdb"))
diff --git a/source4/scripting/python/samba/upgrade.py b/source4/scripting/python/samba/upgrade.py
index 4f2ab46ef0..375c39eb5a 100644
--- a/source4/scripting/python/samba/upgrade.py
+++ b/source4/scripting/python/samba/upgrade.py
@@ -447,7 +447,6 @@ def upgrade_smbconf(oldconf,mark):
 
 def upgrade(subobj, samba3, message, paths, session_info, credentials):
     ret = 0
-    lp = loadparm_init()
     samdb = Ldb(paths.samdb, session_info=session_info, credentials=credentials)
 
     message("Writing configuration")
@@ -455,8 +454,7 @@ def upgrade(subobj, samba3, message, paths, session_info, credentials):
     newconf.save(paths.smbconf)
 
     message("Importing account policies")
-    ldif = upgrade_sam_policy(samba3,subobj.BASEDN)
-    samdb.modify(ldif)
+    samdb.modify_ldif(upgrade_sam_policy(samba3,subobj.BASEDN))
     regdb = Ldb(paths.hklm)
 
     regdb.modify("""
-- 
cgit 


From cc30cb5e24160d107b67936d71f54645d9b3d23f Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 25 Dec 2007 16:36:23 -0600
Subject: r26592: Finish fixing the samba3dump script. (This used to be commit
 85679f3fc98238f90280f9f10d42550d71eeb918)

---
 source4/scripting/bin/samba3dump         | 240 +++++++++++++++----------------
 source4/scripting/python/samba/samba3.py |  63 ++++++--
 2 files changed, 170 insertions(+), 133 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/bin/samba3dump b/source4/scripting/bin/samba3dump
index 0aa54d91cc..157a708ff6 100755
--- a/source4/scripting/bin/samba3dump
+++ b/source4/scripting/bin/samba3dump
@@ -1,8 +1,8 @@
 #!/usr/bin/python
 #
-#	Dump Samba3 data
-#	Copyright Jelmer Vernooij 2005-2007
-#	Released under the GNU GPL v3 or later
+#    Dump Samba3 data
+#    Copyright Jelmer Vernooij 2005-2007
+#    Released under the GNU GPL v3 or later
 #
 
 import optparse
@@ -13,160 +13,154 @@ import samba.samba3
 
 parser = optparse.OptionParser("provision <libdir> [<smb.conf>]")
 parser.add_option("--format", type="choice", metavar="FORMAT",
-		          choices=["full", "summary"])
+                  choices=["full", "summary"])
 
 opts, args = parser.parse_args()
 
 if opts.format is None:
-	opts.format = "summary"
+    opts.format = "summary"
 
 def print_header(txt):
-	print "\n%s" % txt
-	print "=========================================="
+    print "\n%s" % txt
+    print "=" * len(txt)
 
 def print_samba3_policy(pol):
-	print_header("Account Policies")
-	print "Min password length: %d" % pol.min_password_length
-	print "Password history length: %d" % pol.password_history
-	if pol.user_must_logon_to_change_password:
-		print "User must logon to change password: %d" % pol.user_must_logon_to_change_password
-	if pol.maximum_password_age:
-		print "Maximum password age: %d" % pol.maximum_password_age
-	if pol.minimum_password_age:
-		print "Minimum password age: %d" % pol.minimum_password_age
-	if pol.lockout_duration:
-		print "Lockout duration: %d" % pol.lockout_duration
-	if pol.reset_count_minutes:
-		print "Reset Count Minutes: %d" % pol.reset_count_minutes
-	if pol.bad_lockout_minutes:
-		print "Bad Lockout Minutes: %d" % pol.bad_lockout_minutes
-	if pol.disconnect_time:
-		print "Disconnect Time: %d" % pol.disconnect_time
-	if pol.refuse_machine_password_change:
-		print "Refuse Machine Password Change: %d" % pol.refuse_machine_password_change
-
-def print_samba3_sam(samba3):
-	print_header("SAM Database")
-	
-	for a in samba3.samaccounts:
-		print "%d: %s" % a.user_rid, a.username
-
-def print_samba3_shares(samba3):
-	print_header("Configured shares")
-	for s in samba3.shares:
-		print "--- %s ---" % s.name
-
-		for p in s.parameters:
-			print "\t%s = %s" % (p.name, p.value)
-
-		print ""
+    print_header("Account Policies")
+    print "Min password length: %d" % pol.min_password_length
+    print "Password history length: %d" % pol.password_history
+    if pol.user_must_logon_to_change_password:
+        print "User must logon to change password: %d" % pol.user_must_logon_to_change_password
+    if pol.maximum_password_age:
+        print "Maximum password age: %d" % pol.maximum_password_age
+    if pol.minimum_password_age:
+        print "Minimum password age: %d" % pol.minimum_password_age
+    if pol.lockout_duration:
+        print "Lockout duration: %d" % pol.lockout_duration
+    if pol.reset_count_minutes:
+        print "Reset Count Minutes: %d" % pol.reset_count_minutes
+    if pol.bad_lockout_minutes:
+        print "Bad Lockout Minutes: %d" % pol.bad_lockout_minutes
+    if pol.disconnect_time:
+        print "Disconnect Time: %d" % pol.disconnect_time
+    if pol.refuse_machine_password_change:
+        print "Refuse Machine Password Change: %d" % pol.refuse_machine_password_change
+
+def print_samba3_sam(samdb):
+    print_header("SAM Database")
+    
+    for user in samdb:
+        print "%s" % user
+
+def print_samba3_shares(shares):
+    print_header("Configured shares")
+    for s in shares:
+        print "--- %s ---" % s.name
+
+        for p in s:
+            print "\t%s = %s" % (p.key, p.value)
+
+        print ""
 
 def print_samba3_secrets(secrets):
-	print_header("Secrets")
-
-	if secrets.get_auth_user():
-		print "IPC Credentials:"
-		if secrets.get_auth_user():
-			print "	User: %s\n" % secrets.get_auth_user()
-		if secrets.get_auth_password():
-			print "	Password: %s\n" % secrets.get_auth_password()
-		if secrets.get_auth_domain():
-			print "	Domain: %s\n" % secrets.get_auth_domain()
-
-	if len(list(secrets.ldap_dns())) > 0:
-		print "LDAP passwords:"
-		for dn in secrets.ldap_dns():
-			print "\t%s -> %s" % (dn, secrets.get_ldap_bind_pw(dn))
-		print ""
-
-	print "Domains:"
-	for domain in secrets.domains():
-		print "\t--- %s ---" % domain
-		print "\tSID: %s" % secrets.get_sid(domain)
-		print "\tGUID: %s" % secrets.get_dom_guid(domain)
-		print "\tPlaintext pwd: %s" % secrets.get_machine_password(domain)
-		if secrets.get_machine_last_change_time(domain):
-			print "\tLast Changed: %lu" % secrets.get_machine_last_change_time(domain)
-		if secrets.get_machine_sec_channel_type(domain):
-			print "\tSecure Channel Type: %d\n" % secrets.get_machine_sec_channel_type(domain)
-
-	print "Trusted domains:"
-	for td in secrets.trusted_domains():
-		print td
+    print_header("Secrets")
+
+    if secrets.get_auth_user():
+        print "IPC Credentials:"
+        if secrets.get_auth_user():
+            print "    User: %s\n" % secrets.get_auth_user()
+        if secrets.get_auth_password():
+            print "    Password: %s\n" % secrets.get_auth_password()
+        if secrets.get_auth_domain():
+            print "    Domain: %s\n" % secrets.get_auth_domain()
+
+    if len(list(secrets.ldap_dns())) > 0:
+        print "LDAP passwords:"
+        for dn in secrets.ldap_dns():
+            print "\t%s -> %s" % (dn, secrets.get_ldap_bind_pw(dn))
+        print ""
+
+    print "Domains:"
+    for domain in secrets.domains():
+        print "\t--- %s ---" % domain
+        print "\tSID: %s" % secrets.get_sid(domain)
+        print "\tGUID: %s" % secrets.get_dom_guid(domain)
+        print "\tPlaintext pwd: %s" % secrets.get_machine_password(domain)
+        if secrets.get_machine_last_change_time(domain):
+            print "\tLast Changed: %lu" % secrets.get_machine_last_change_time(domain)
+        if secrets.get_machine_sec_channel_type(domain):
+            print "\tSecure Channel Type: %d\n" % secrets.get_machine_sec_channel_type(domain)
+
+    print "Trusted domains:"
+    for td in secrets.trusted_domains():
+        print td
 
 def print_samba3_regdb(regdb):
-	print_header("Registry")
+    print_header("Registry")
 
-	for k in regdb.keys():
-		print "%s" % k
-		for v in regdb.values(k):
-			print "\t%s: type %d, length %d" % (v.name, v.type, v.data.length)
+    for k in regdb.keys():
+        print "%s" % k
+        for v in regdb.values(k):
+            print "\t%s: type %d, length %d" % (v.name, v.type, v.data.length)
 
 def print_samba3_winsdb(winsdb):
-	print_header("WINS Database")
+    print_header("WINS Database")
 
-	for name in winsdb:
-		(ttl, ips, nb_flags) = winsdb[name]
-		print "%s, nb_flags: %s, ttl: %lu, %d ips, fst: %s" % (name, nb_flags, ttl, len(ips), ips[0])
+    for name in winsdb:
+        (ttl, ips, nb_flags) = winsdb[name]
+        print "%s, nb_flags: %s, ttl: %lu, %d ips, fst: %s" % (name, nb_flags, ttl, len(ips), ips[0])
 
 def print_samba3_groupmappings(groupdb):
-	print_header("Group Mappings")
-	
-	for sid in groupdb.groupsids():
-		print "\t--- Group: %s ---" % g.nt_name
-		print "\tComment: %s" % g.comment
-		print "\tGID: %d" % g.gid
-		print "\tSID Name Use: %d" % g.sid_name_use
-		print "\tSID: %s\n" % g.sid
+    print_header("Group Mappings")
+    
+    for sid in groupdb.groupsids():
+        print "\t--- Group: %s ---" % sid
 
 def print_samba3_aliases(groupdb):
-	for a in groupdb.aliases:
-		print "\t--- Alias: %s ---" % a.sid
-		for m in a.members:
-			print "\t%s" % m
+    for sid in groupdb.aliases():
+        print "\t--- Alias: %s ---" % sid
 
 def print_samba3_idmapdb(idmapdb):
-	print_header("Winbindd SID<->GID/UID mappings")
+    print_header("Winbindd SID<->GID/UID mappings")
 
-	print "User High Water Mark: %d" % idmapdb.user_hwm
-	print "Group High Water Mark: %d\n" % idmapdb.group_hwm
+    print "User High Water Mark: %d" % idmapdb.get_user_hwm()
+    print "Group High Water Mark: %d\n" % idmapdb.get_group_hwm()
 
-	for e in idmapdb.mappings:
-		if e.type == e.IDMAP_GROUP:
-			print "%s -> GID %d" % (e.sid, e.unix_id)
-		else:
-			print "%s -> UID %d" % (e.sid, e.unix_id)
+    for uid in idmapdb.uids():
+        print "%s -> UID %d" % (idmapdb.get_user_sid(uid), uid)
+
+    for gid in idmapdb.gids():
+        print "%s -> GID %d" % (idmapdb.get_group_sid(gid), gid)
 
 def print_samba3(samba3):
-	print_samba3_policy(samba3.get_policy_db())
-	print_samba3_winsdb(samba3.get_wins_db())
-	print_samba3_regdb(samba3.get_registry())
-	print_samba3_secrets(samba3.get_secrets_db())
-	groupdb = samba3.get_groupmapping_db()
-	print_samba3_groupmappings(groupdb)
-	print_samba3_aliases(groupdb)
-	print_samba3_idmapdb(samba3.get_idmap_db())
-	print_samba3_shares(samba3)
-	print_samba3_sam(samba3)
+    print_samba3_policy(samba3.get_policy_db())
+    print_samba3_winsdb(samba3.get_wins_db())
+    print_samba3_regdb(samba3.get_registry())
+    print_samba3_secrets(samba3.get_secrets_db())
+    print_samba3_idmapdb(samba3.get_idmap_db())
+    print_samba3_sam(samba3.get_sam_db())
+    groupdb = samba3.get_groupmapping_db()
+    print_samba3_groupmappings(groupdb)
+    print_samba3_aliases(groupdb)
+    print_samba3_shares(samba3.get_shares())
 
 def print_samba3_summary(samba3):
-	print "WINS db entries: %d" % len(samba3.get_wins_db())
-	print "Registry key count: %d" % len(samba3.get_registry())
-	groupdb = samba3.get_groupmapping_db()
-	print "Groupmap count: %d" % len(list(groupdb.groupsids()))
-	print "Alias count: %d" % len(list(groupdb.aliases()))
-	idmapdb = samba3.get_idmap_db()
-	print "Idmap count: %d" % (len(list(idmapdb.uids())) + len(list(idmapdb.gids())))
+    print "WINS db entries: %d" % len(samba3.get_wins_db())
+    print "Registry key count: %d" % len(samba3.get_registry())
+    groupdb = samba3.get_groupmapping_db()
+    print "Groupmap count: %d" % len(list(groupdb.groupsids()))
+    print "Alias count: %d" % len(list(groupdb.aliases()))
+    idmapdb = samba3.get_idmap_db()
+    print "Idmap count: %d" % (len(list(idmapdb.uids())) + len(list(idmapdb.gids())))
 
 libdir = args[0]
 if len(args) > 1:
-	smbconf = args[2]
+    smbconf = args[2]
 else:
-	smbconf = os.path.join(libdir, "smb.conf")
+    smbconf = os.path.join(libdir, "smb.conf")
 
 samba3 = samba.samba3.Samba3(libdir, smbconf)
 
 if opts.format == "summary":
-	print_samba3_summary(samba3)
+    print_samba3_summary(samba3)
 elif opts.format == "full":
-	print_samba3(samba3)
+    print_samba3(samba3)
diff --git a/source4/scripting/python/samba/samba3.py b/source4/scripting/python/samba/samba3.py
index 40443bd8ba..d125e3164b 100644
--- a/source4/scripting/python/samba/samba3.py
+++ b/source4/scripting/python/samba/samba3.py
@@ -222,7 +222,7 @@ SHARE_DATABASE_VERSION_V2 = 2
 class ShareInfoDatabase:
     def __init__(self, file):
         self.tdb = tdb.Tdb(file, flags=os.O_RDONLY)
-        assert self.tdb.fetch_int32("INFO/version") in (SHARE_DATABASE_VERSION_V1, SHARE_DATABASE_VERSION_V2)
+        assert self.tdb.fetch_int32("INFO/version\0") in (SHARE_DATABASE_VERSION_V1, SHARE_DATABASE_VERSION_V2)
 
     def get_secdesc(self, name):
         secdesc = self.tdb.get("SECDESC/%s" % name)
@@ -232,6 +232,19 @@ class ShareInfoDatabase:
     def close(self):
         self.tdb.close()
 
+
+class Shares:
+    def __init__(self, lp, shareinfo):
+        self.lp = lp
+        self.shareinfo = shareinfo
+
+    def __len__(self):
+        return len(self.lp) - 1
+
+    def __iter__(self):
+        return self.lp.__iter__()
+
+
 ACB_DISABLED = 0x00000001
 ACB_HOMDIRREQ = 0x00000002
 ACB_PWNOTREQ = 0x00000004
@@ -323,7 +336,7 @@ class SmbpasswdFile:
         return self.users[name]
 
     def __iter__(self):
-        return iter(self.entries)
+        return iter(self.users)
 
     def close(self): # For consistency
         pass
@@ -346,6 +359,8 @@ class TdbSam:
             if k.startswith(TDBSAM_USER_PREFIX):
                 yield k[len(TDBSAM_USER_PREFIX):].rstrip("\0")
 
+    __iter__ = usernames
+
     def close(self):
         self.tdb.close()
 
@@ -409,24 +424,52 @@ class Samba3:
     def __init__(self, libdir, smbconfpath):
         self.smbconfpath = smbconfpath
         self.libdir = libdir
+        import param
+        self.lp = param.ParamFile()
+        self.lp.read(self.smbconfpath)
+
+    def libdir_path(self, path):
+        if path[0] == "/" or path[0] == ".":
+            return path
+        return os.path.join(self.libdir, path)
+
+    def get_conf(self):
+        return self.lp
+
+    def get_sam_db(self):
+        lp = self.get_conf()
+        backends = str(lp.get("passdb backend")).split(" ")
+        if backends[0].startswith("smbpasswd"):
+            if ":" in backends[0]:
+                return SmbpasswdFile(self.libdir_path(backends[0][len("smbpasswd:"):]))
+            return SmbpasswdFile(self.libdir_path("smbpasswd"))
+        elif backends[0].startswith("tdbsam"):
+            if ":" in backends[0]:
+                return TdbSam(self.libdir_path(backends[0][len("tdbsam:"):]))
+            return TdbSam(self.libdir_path("passdb.tdb"))
+        else:
+            raise NotImplementedError("unsupported passdb backend %s" % backends[0])
 
     def get_policy_db(self):
-        return PolicyDatabase(os.path.join(self.libdir, "account_policy.tdb"))
+        return PolicyDatabase(self.libdir_path("account_policy.tdb"))
     
     def get_registry(self):
-        return Registry(os.path.join(self.libdir, "registry.tdb"))
+        return Registry(self.libdir_path("registry.tdb"))
 
     def get_secrets_db(self):
-        return SecretsDatabase(os.path.join(self.libdir, "secrets.tdb"))
+        return SecretsDatabase(self.libdir_path("secrets.tdb"))
 
-    def get_shares_db(self):
-        return ShareInfoDatabase(os.path.join(self.libdir, "share_info.tdb"))
+    def get_shareinfo_db(self):
+        return ShareInfoDatabase(self.libdir_path("share_info.tdb"))
 
     def get_idmap_db(self):
-        return IdmapDatabase(os.path.join(self.libdir, "winbindd_idmap.tdb"))
+        return IdmapDatabase(self.libdir_path("winbindd_idmap.tdb"))
 
     def get_wins_db(self):
-        return WinsDatabase(os.path.join(self.libdir, "wins.dat"))
+        return WinsDatabase(self.libdir_path("wins.dat"))
+
+    def get_shares(self):
+        return Shares(self.get_conf(), self.get_shareinfo_db())
 
     def get_groupmapping_db(self):
-        return GroupMappingDatabase(os.path.join(self.libdir, "group_mapping.tdb"))
+        return GroupMappingDatabase(self.libdir_path("group_mapping.tdb"))
-- 
cgit 


From 7c146c42d2cf51e891b9f29d3b61a40f173a3b23 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 25 Dec 2007 16:36:31 -0600
Subject: r26593: - More work on the python versions of samba3dump and the
 samba3sam tests.

- Initial work converting the upgrade code to Python.
- Removed the old EJS upgrade code because it has been broken for a long time.
(This used to be commit 150cf39fbd4fe088546870fb0d8f20c0d9eb4aca)
---
 source4/scripting/bin/samba3dump                 |   3 -
 source4/scripting/libjs/upgrade.js               | 687 -----------------------
 source4/scripting/python/samba/samba3.py         |   2 +-
 source4/scripting/python/samba/tests/__init__.py |   2 +-
 source4/scripting/python/samba/upgrade.py        |  94 +---
 5 files changed, 33 insertions(+), 755 deletions(-)
 delete mode 100644 source4/scripting/libjs/upgrade.js

(limited to 'source4/scripting')

diff --git a/source4/scripting/bin/samba3dump b/source4/scripting/bin/samba3dump
index 157a708ff6..f8d10cbc71 100755
--- a/source4/scripting/bin/samba3dump
+++ b/source4/scripting/bin/samba3dump
@@ -47,7 +47,6 @@ def print_samba3_policy(pol):
 
 def print_samba3_sam(samdb):
     print_header("SAM Database")
-    
     for user in samdb:
         print "%s" % user
 
@@ -55,10 +54,8 @@ def print_samba3_shares(shares):
     print_header("Configured shares")
     for s in shares:
         print "--- %s ---" % s.name
-
         for p in s:
             print "\t%s = %s" % (p.key, p.value)
-
         print ""
 
 def print_samba3_secrets(secrets):
diff --git a/source4/scripting/libjs/upgrade.js b/source4/scripting/libjs/upgrade.js
deleted file mode 100644
index 3a548fe34b..0000000000
--- a/source4/scripting/libjs/upgrade.js
+++ /dev/null
@@ -1,687 +0,0 @@
-/*
-	backend code for upgrading from Samba3
-	Copyright Jelmer Vernooij 2005
-	Released under the GNU GPL v2 or later
-*/
-
-libinclude("base.js");
-
-function regkey_to_dn(name)
-{
-	var dn = "hive=NONE";
-	var i = 0;
-
-	var as = split("/", name);
-
-	for (i in as) {
-		if (i > 0) {
-			dn = sprintf("key=%s,", as[i]) + dn;
-		}
-	}
-
-	return dn;
-}
-
-/* Where prefix is any of:
- * - HKLM
- *   HKU
- *   HKCR
- *   HKPD
- *   HKPT
- */
-
-function upgrade_registry(regdb,prefix,ldb)
-{
-	assert(regdb != undefined);
-	var prefix_up = strupper(prefix);
-	var ldif = new Array();
-
-	for (var i in regdb.keys) {
-		var rk = regdb.keys[i];
-		var pts = split("/", rk.name);
-
-		/* Only handle selected hive */
-		if (strupper(pts[0]) != prefix_up) {
-			continue;
-		}
-
-		var keydn = regkey_to_dn(rk.name);
-
-		var pts = split("/", rk.name);
-
-		/* Convert key name to dn */
-		ldif[rk.name] = sprintf("
-dn: %s
-name: %s
-
-", keydn, pts[0]);
-		
-		for (var j in rk.values) {
-			var rv = rk.values[j];
-
-			ldif[rk.name + " (" + rv.name + ")"] = sprintf("
-dn: %s,value=%s
-value: %s
-type: %d
-data:: %s", keydn, rv.name, rv.name, rv.type, ldb.encode(rv.data));
-		}
-	}
-
-	return ldif;
-}
-
-function upgrade_sam_policy(samba3,dn)
-{
-	var ldif = sprintf("
-dn: %s
-changetype: modify
-replace: minPwdLength
-minPwdLength: %d
-pwdHistoryLength: %d
-minPwdAge: %d
-maxPwdAge: %d
-lockoutDuration: %d
-samba3ResetCountMinutes: %d
-samba3UserMustLogonToChangePassword: %d
-samba3BadLockoutMinutes: %d
-samba3DisconnectTime: %d
-
-", dn, samba3.policy.min_password_length, 
-	samba3.policy.password_history, samba3.policy.minimum_password_age,
-	samba3.policy.maximum_password_age, samba3.policy.lockout_duration,
-	samba3.policy.reset_count_minutes, samba3.policy.user_must_logon_to_change_password,
-	samba3.policy.bad_lockout_minutes, samba3.policy.disconnect_time
-);
-	
-	return ldif;
-}
-
-function upgrade_sam_account(ldb,acc,domaindn,domainsid)
-{
-	if (acc.nt_username == undefined) {
-		acc.nt_username = acc.username;
-	}	
-
-	if (acc.nt_username == "") {
-		acc.nt_username = acc.username;
-	}	
-
-	if (acc.fullname == undefined) {
-		var pw = nss.getpwnam(acc.fullname);
-		acc.fullname = pw.pw_gecos;
-	}
-
-	var pts = split(',', acc.fullname);
-	acc.fullname = pts[0];
-
-	if (acc.fullname == undefined) {
-		acc.fullname = acc.username;
-	}
-	
-	assert(acc.fullname != undefined);
-	assert(acc.nt_username != undefined);
-
-	var ldif = sprintf(
-"dn: cn=%s,%s
-objectClass: top
-objectClass: user
-lastLogon: %d
-lastLogoff: %d
-unixName: %s
-sAMAccountName: %s
-cn: %s
-description: %s
-primaryGroupID: %d
-badPwdcount: %d
-logonCount: %d
-samba3Domain: %s
-samba3DirDrive: %s
-samba3MungedDial: %s
-samba3Homedir: %s
-samba3LogonScript: %s
-samba3ProfilePath: %s
-samba3Workstations: %s
-samba3KickOffTime: %d
-samba3BadPwdTime: %d
-samba3PassLastSetTime: %d
-samba3PassCanChangeTime: %d
-samba3PassMustChangeTime: %d
-objectSid: %s-%d
-lmPwdHash:: %s
-ntPwdHash:: %s
-
-", ldb.dn_escape(acc.fullname), domaindn, acc.logon_time, acc.logoff_time, acc.username, acc.nt_username, acc.nt_username, 
-
-acc.acct_desc, acc.group_rid, acc.bad_password_count, acc.logon_count,
-acc.domain, acc.dir_drive, acc.munged_dial, acc.homedir, acc.logon_script, 
-acc.profile_path, acc.workstations, acc.kickoff_time, acc.bad_password_time, 
-acc.pass_last_set_time, acc.pass_can_change_time, acc.pass_must_change_time, domainsid, acc.user_rid,
-	ldb.encode(acc.lm_pw), ldb.encode(acc.nt_pw)); 
-
-	return ldif;
-}
-
-function upgrade_sam_group(grp,domaindn)
-{
-	var nss = nss_init();
-
-	var gr;
-	if (grp.sid_name_use == 5) { // Well-known group
-		return undefined;
-	}
-
-	if (grp.nt_name == "Domain Guests" ||
-	    grp.nt_name == "Domain Users" ||
-	    grp.nt_name == "Domain Admins") {
-		return undefined;
-	}
-	
-	if (grp.gid == -1) {
-		gr = nss.getgrnam(grp.nt_name);
-	} else {
-		gr = nss.getgrgid(grp.gid);
-	}
-
-	if (gr == undefined) {
-		grp.unixname = "UNKNOWN";
-	} else {
-		grp.unixname = gr.gr_name;
-	}
-
-	assert(grp.unixname != undefined);
-	
-	var ldif = sprintf(
-"dn: cn=%s,%s
-objectClass: top
-objectClass: group
-description: %s
-cn: %s
-objectSid: %s
-unixName: %s
-samba3SidNameUse: %d
-", grp.nt_name, domaindn, 
-grp.comment, grp.nt_name, grp.sid, grp.unixname, grp.sid_name_use);
-
-	return ldif;
-}
-
-function upgrade_winbind(samba3,domaindn)
-{
-	var ldif = sprintf("
-		
-dn: dc=none
-userHwm: %d
-groupHwm: %d
-
-", samba3.idmap.user_hwm, samba3.idmap.group_hwm);
-
-	for (var i in samba3.idmap.mappings) {
-		var m = samba3.idmap.mappings[i];
-		ldif = ldif + sprintf("
-dn: SID=%s,%s
-SID: %s
-type: %d
-unixID: %d", m.sid, domaindn, m.sid, m.type, m.unix_id);
-	}
-	
-	return ldif;
-}
-*/
-
-function upgrade_wins(samba3)
-{
-	var ldif = "";
-	var version_id = 0;
-
-	for (i in samba3.winsentries) {
-		var rType;
-		var rState;
-		var nType;
-		var numIPs = 0;
-		var e = samba3.winsentries[i];
-		var now = sys.nttime();
-		var ttl = sys.unix2nttime(e.ttl);
-
-		version_id++;
-
-		for (var i in e.ips) {
-			numIPs++;
-		}
-
-		if (e.type == 0x1C) {
-			rType = 0x2;
-		} else if (sys.bitAND(e.type, 0x80)) {
-			if (numIPs > 1) {
-				rType = 0x2;
-			} else {
-				rType = 0x1;
-			}
-		} else {
-			if (numIPs > 1) {
-				rType = 0x3;
-			} else {
-				rType = 0x0;
-			}
-		}
-
-		if (ttl > now) {
-			rState = 0x0;/* active */
-		} else {
-			rState = 0x1;/* released */		
-		}
-
-		nType = (sys.bitAND(e.nb_flags,0x60)>>5);
-
-		ldif = ldif + sprintf("
-dn: name=%s,type=0x%02X
-type: 0x%02X
-name: %s
-objectClass: winsRecord
-recordType: %u
-recordState: %u
-nodeType: %u
-isStatic: 0
-expireTime: %s
-versionID: %llu
-", e.name, e.type, e.type, e.name, 
-   rType, rState, nType, 
-   sys.ldaptime(ttl), version_id);
-
-		for (var i in e.ips) {
-			ldif = ldif + sprintf("address: %s\n", e.ips[i]);
-		}
-	}
-
-	ldif = ldif + sprintf("
-dn: CN=VERSION
-objectClass: winsMaxVersion
-maxVersion: %llu
-", version_id);
-
-	return ldif;
-}
-
-function upgrade_provision(samba3)
-{
-	var subobj = new Object();
-	var nss = nss_init();
-	var lp = loadparm_init();
-	var rdn_list;
-
-	var domainname = samba3.configuration.get("workgroup");
-	
-	if (domainname == undefined) {
-		domainname = samba3.secrets.domains[0].name;
-		println("No domain specified in smb.conf file, assuming '" + domainname + "'");
-	}
-	
-	var domsec = samba3.find_domainsecrets(domainname);
-	var hostsec = samba3.find_domainsecrets(hostname());
-	var realm = samba3.configuration.get("realm");
-
-	if (realm == undefined) {
-		realm = domainname;
-		println("No realm specified in smb.conf file, assuming '" + realm + "'");
-	}
-	random_init(local);
-
-	subobj.REALM        = realm;
-	subobj.DOMAIN       = domainname;
-	subobj.HOSTNAME     = hostname();
-
-	assert(subobj.REALM);
-	assert(subobj.DOMAIN);
-	assert(subobj.HOSTNAME);
-
-	subobj.HOSTIP       = hostip();
-	if (domsec != undefined) {
-		subobj.DOMAINGUID   = domsec.guid;
-		subobj.DOMAINSID    = domsec.sid;
-	} else {
-		println("Can't find domain secrets for '" + domainname + "'; using random SID and GUID");
-		subobj.DOMAINGUID = randguid();
-		subobj.DOMAINSID = randsid();
-	}
-	
-	if (hostsec) {
-		subobj.HOSTGUID     = hostsec.guid;
-	} else {
-		subobj.HOSTGUID = randguid();
-	}
-	subobj.INVOCATIONID = randguid();
-	subobj.KRBTGTPASS   = randpass(12);
-	subobj.MACHINEPASS  = randpass(12);
-	subobj.ADMINPASS    = randpass(12);
-	subobj.DEFAULTSITE  = "Default-First-Site-Name";
-	subobj.NEWGUID      = randguid;
-	subobj.NTTIME       = nttime;
-	subobj.LDAPTIME     = ldaptime;
-	subobj.DATESTRING   = datestring;
-	subobj.ROOT         = findnss(nss.getpwnam, "root");
-	subobj.NOBODY       = findnss(nss.getpwnam, "nobody");
-	subobj.NOGROUP      = findnss(nss.getgrnam, "nogroup", "nobody");
-	subobj.WHEEL        = findnss(nss.getgrnam, "wheel", "root");
-	subobj.USERS        = findnss(nss.getgrnam, "users", "guest", "other");
-	subobj.DNSDOMAIN    = strlower(subobj.REALM);
-	subobj.DNSNAME      = sprintf("%s.%s", 
-				      strlower(subobj.HOSTNAME), 
-				      subobj.DNSDOMAIN);
-	subobj.BASEDN       = "DC=" + join(",DC=", split(".", subobj.REALM));
-	rdn_list = split(".", subobj.DNSDOMAIN);
-	subobj.DOMAINDN     = "DC=" + join(",DC=", rdn_list);
-	subobj.DOMAINDN_LDB = "users.ldb";
-	subobj.ROOTDN       = subobj.DOMAINDN;
-
-	modules_list        = new Array("rootdse",
-					"kludge_acl",
-					"paged_results",
-					"server_sort",
-					"extended_dn",
-					"asq",
-					"samldb",
-					"password_hash",
-					"operational",
-					"objectclass",
-					"rdn_name",
-					"show_deleted",
-					"partition");
-	subobj.MODULES_LIST = join(",", modules_list);
-
-	return subobj;
-}
-
-smbconf_keep = new Array(
-	"dos charset", 
-	"unix charset",
-	"display charset",
-	"comment",
-	"path",
-	"directory",
-	"workgroup",
-	"realm",
-	"netbios name",
-	"netbios aliases",
-	"netbios scope",
-	"server string",
-	"interfaces",
-	"bind interfaces only",
-	"security",
-	"auth methods",
-	"encrypt passwords",
-	"null passwords",
-	"obey pam restrictions",
-	"password server",
-	"smb passwd file",
-	"private dir",
-	"passwd chat",
-	"password level",
-	"lanman auth",
-	"ntlm auth",
-	"client NTLMv2 auth",
-	"client lanman auth",
-	"client plaintext auth",
-	"read only",
-	"hosts allow",
-	"hosts deny",
-	"log level",
-	"debuglevel",
-	"log file",
-	"smb ports",
-	"large readwrite",
-	"max protocol",
-	"min protocol",
-	"unicode",
-	"read raw",
-	"write raw",
-	"disable netbios",
-	"nt status support",
-	"announce version",
-	"announce as",
-	"max mux",
-	"max xmit",
-	"name resolve order",
-	"max wins ttl",
-	"min wins ttl",
-	"time server",
-	"unix extensions",
-	"use spnego",
-	"server signing",
-	"client signing",
-	"max connections",
-	"paranoid server security",
-	"socket options",
-	"strict sync",
-	"max print jobs",
-	"printable",
-	"print ok",
-	"printer name",
-	"printer",
-	"map system",
-	"map hidden",
-	"map archive",
-	"preferred master",
-	"prefered master",
-	"local master",
-	"browseable",
-	"browsable",
-	"wins server",
-	"wins support",
-	"csc policy",
-	"strict locking",
-	"preload",
-	"auto services",
-	"lock dir",
-	"lock directory",
-	"pid directory",
-	"socket address",
-	"copy",
-	"include",
-	"available",
-	"volume",
-	"fstype",
-	"panic action",
-	"msdfs root",
-	"host msdfs",
-	"winbind separator");
-
-/*
-   Remove configuration variables not present in Samba4
-	oldconf: Old configuration structure
-	mark: Whether removed configuration variables should be 
-		kept in the new configuration as "samba3:<name>"
- */
-function upgrade_smbconf(oldconf,mark)
-{
-	var data = oldconf.data();
-	var newconf = param_init();
-
-	for (var s in data) {
-		for (var p in data[s]) {
-			var keep = false;
-			for (var k in smbconf_keep) { 
-				if (smbconf_keep[k] == p) {
-					keep = true;
-					break;
-				}
-			}
-
-			if (keep) {
-				newconf.set(s, p, oldconf.get(s, p));
-			} else if (mark) {
-				newconf.set(s, "samba3:"+p, oldconf.get(s,p));
-			}
-		}
-	}
-
-	if (oldconf.get("domain logons") == "True") {
-		newconf.set("server role", "domain controller");
-	} else {
-		if (oldconf.get("security") == "user") {
-			newconf.set("server role", "standalone");
-		} else {
-			newconf.set("server role", "member server");
-		}
-	}
-
-	return newconf;
-}
-
-function upgrade(subobj, samba3, message, paths, session_info, credentials)
-{
-	var ret = 0;
-	var lp = loadparm_init();
-	var samdb = ldb_init();
-	samdb.session_info = session_info;
-	samdb.credentials = credentials;
-	var ok = samdb.connect(paths.samdb);
-	if (!ok) {
-		info.message("samdb connect failed: " + samdb.errstring() + "\n");
-		assert(ok);
-	}
-
-	message("Writing configuration\n");
-	var newconf = upgrade_smbconf(samba3.configuration,true);
-	newconf.save(paths.smbconf);
-
-	message("Importing account policies\n");
-	var ldif = upgrade_sam_policy(samba3,subobj.BASEDN);
-	ok = samdb.modify(ldif);
-	if (!ok) {
-		message("samdb load failed: " + samdb.errstring() + "\n");
-		assert(ok);
-	}
-	var regdb = ldb_init();
-	ok = regdb.connect(paths.hklm);
-	if (!ok) {
-		message("registry connect: " + regdb.errstring() + "\n");
-		assert(ok);
-	}
-
-	ok = regdb.modify(sprintf("
-dn: value=RefusePasswordChange,key=Parameters,key=Netlogon,key=Services,key=CurrentControlSet,key=System,HIVE=NONE
-replace: type
-type: 4
-replace: data
-data: %d
-", samba3.policy.refuse_machine_password_change));
-	if (!ok) {
-		message("registry load failed: " + regdb.errstring() + "\n");
-		assert(ok);
-	}
-
-	message("Importing users\n");
-	for (var i in samba3.samaccounts) {
-		var msg = "... " + samba3.samaccounts[i].username;
-		var ldif = upgrade_sam_account(samdb,samba3.samaccounts[i],subobj.BASEDN,subobj.DOMAINSID);
-		ok = samdb.add(ldif);
-		if (!ok && samdb.errstring() != "Record exists") { 
-			msg = msg + "... error: " + samdb.errstring();
-			ret = ret + 1; 
-		}
-		message(msg + "\n");
-	}
-
-	message("Importing groups\n");
-	for (var i in samba3.groupmappings) {
-		var msg = "... " + samba3.groupmappings[i].nt_name;
-		var ldif = upgrade_sam_group(samba3.groupmappings[i],subobj.BASEDN);
-		if (ldif != undefined) {
-			ok = samdb.add(ldif);
-			if (!ok && samdb.errstring() != "Record exists") { 
-				msg = msg + "... error: " + samdb.errstring();
-				ret = ret + 1; 
-			}
-		}
-		message(msg + "\n");
-	}
-
-	message("Importing registry data\n");
-	var hives = new Array("hkcr","hkcu","hklm","hkpd","hku","hkpt"); 
-	for (var i in hives) {
-		var hn = hives[i];
-		message("... " + hn + "\n");
-		regdb = ldb_init();
-		ok = regdb.connect(paths[hn]);
-		assert(ok);
-		var ldif = upgrade_registry(samba3.registry, hn, regdb);
-		for (var j in ldif) {
-			var msg = "... ... " + j;
-			ok = regdb.add(ldif[j]);
-			if (!ok && regdb.errstring() != "Record exists") { 
-				msg = msg + "... error: " + regdb.errstring();
-				ret = ret + 1; 
-			}
-			message(msg + "\n");
-		}
-	}
-
-
-	message("Importing WINS data\n");
-	var winsdb = ldb_init();
-	ok = winsdb.connect(paths.winsdb);
-	assert(ok);
-	ldb_erase(winsdb);
-
-	var ldif = upgrade_wins(samba3);
-	ok = winsdb.add(ldif);
-	assert(ok);
-
-	// figure out ldapurl, if applicable
-	var ldapurl = undefined;
-	var pdb = samba3.configuration.get_list("passdb backend");
-	if (pdb != undefined) {
-		for (var b in pdb) {
-			if (strlen(pdb[b]) >= 7) {
-				if (substr(pdb[b], 0, 7) == "ldapsam") {
-					ldapurl = substr(pdb[b], 8);
-				}
-			}
-		}
-	}
-
-	// URL was not specified in passdb backend but ldap /is/ used
-	if (ldapurl == "") {
-		ldapurl = "ldap://" + samba3.configuration.get("ldap server");
-	}
-
-	// Enable samba3sam module if original passdb backend was ldap
-	if (ldapurl != undefined) {
-		message("Enabling Samba3 LDAP mappings for SAM database\n");
-
-		ok = samdb.modify("
-dn: @MODULES
-changetype: modify
-replace: @LIST
-@LIST: samldb,operational,objectguid,rdn_name,samba3sam
-");
-		if (!ok) {
-			message("Error enabling samba3sam module: " + samdb.errstring() + "\n");
-			ret = ret + 1;
-		}
-
-		ok = samdb.add(sprintf("
-dn: @MAP=samba3sam
-@MAP_URL: %s", ldapurl));
-		assert(ok);
-
-	}
-
-	return ret;
-}
-
-function upgrade_verify(subobj, samba3,paths,message)
-{
-	message("Verifying account policies\n");
-	var samldb = ldb_init();
-	var ne = 0;
-
-	var ok = samldb.connect(paths.samdb);
-	assert(ok);
-
-	for (var i in samba3.samaccounts) {
-		var msg = samldb.search("(&(sAMAccountName=" + samba3.samaccounts[i].nt_username + ")(objectclass=user))");
-		assert(msg.length >= 1);
-	}
-	
-	// FIXME
-}
diff --git a/source4/scripting/python/samba/samba3.py b/source4/scripting/python/samba/samba3.py
index d125e3164b..b4261f7c74 100644
--- a/source4/scripting/python/samba/samba3.py
+++ b/source4/scripting/python/samba/samba3.py
@@ -167,7 +167,7 @@ class SecretsDatabase:
     def get_auth_user(self):
         return self.tdb.get("SECRETS/AUTH_USER")
 
-    def get_dom_guid(self, host):
+    def get_domain_guid(self, host):
         return self.tdb.get("SECRETS/DOMGUID/%s" % host)
 
     def ldap_dns(self):
diff --git a/source4/scripting/python/samba/tests/__init__.py b/source4/scripting/python/samba/tests/__init__.py
index b01807c02f..5885a3b507 100644
--- a/source4/scripting/python/samba/tests/__init__.py
+++ b/source4/scripting/python/samba/tests/__init__.py
@@ -43,7 +43,7 @@ class TestCaseInTempDir(unittest.TestCase):
 
     def tearDown(self):
         super(TestCaseInTempDir, self).tearDown()
-        # FIXME: Remove all files in self.tempdir
+        os.rmdir(self.tempdir)
 
 
 class SubstituteVarTestCase(unittest.TestCase):
diff --git a/source4/scripting/python/samba/upgrade.py b/source4/scripting/python/samba/upgrade.py
index 375c39eb5a..c13351bc63 100644
--- a/source4/scripting/python/samba/upgrade.py
+++ b/source4/scripting/python/samba/upgrade.py
@@ -255,68 +255,44 @@ maxVersion: %llu
 
     return ldif
 
-def upgrade_provision(lp, samba3):
-    domainname = samba3.configuration.get("workgroup")
+def upgrade_provision(samba3, setup_dir, message, credentials, session_info, paths):
+    oldconf = samba3.get_conf()
+
+    if oldconf.get("domain logons") == "True":
+        serverrole = "domain controller"
+    else:
+        if oldconf.get("security") == "user":
+            serverrole = "standalone"
+        else:
+            serverrole = "member server"
+
+    domainname = oldconf.get("workgroup")
+    realm = oldconf.get("realm")
+    netbiosname = oldconf.get("netbios name")
+
+    secrets_db = samba3.get_secrets_db()
     
     if domainname is None:
-        domainname = samba3.secrets.domains[0].name
-        print "No domain specified in smb.conf file, assuming '%s'\n" % domainname
+        domainname = secrets_db.domains()[0]
+        message("No domain specified in smb.conf file, assuming '%s'" % domainname)
     
-    domsec = samba3.find_domainsecrets(domainname)
-    hostsec = samba3.find_domainsecrets(hostname())
-    realm = samba3.configuration.get("realm")
-
     if realm is None:
-        realm = domainname
-        print "No realm specified in smb.conf file, assuming '%s'\n" % realm
-    random_init(local)
+        realm = domainname.lower()
+        message("No realm specified in smb.conf file, assuming '%s'\n" % realm)
 
-    subobj.realm        = realm
-    subobj.domain       = domainname
-
-    if domsec is not None:
-        subobj.DOMAINGUID   = domsec.guid
-        subobj.DOMAINSID    = domsec.sid
+    domainguid = secrets_db.get_domain_guid(domainname)
+    domainsid = secrets_db.get_sid(domainsid)
+    if domainsid is None:
+        message("Can't find domain secrets for '%s'; using random SID\n" % domainname)
+    
+    if netbiosname is not None:
+        machinepass = secrets_db.get_machine_password(netbiosname)
     else:
-        print "Can't find domain secrets for '%s'; using random SID and GUID\n" % domainname
-        subobj.DOMAINGUID = uuid.random()
-        subobj.DOMAINSID = randsid()
+        netbiosname = None
     
-    if hostsec:
-        hostguid = hostsec.guid
-    subobj.krbtgtpass   = randpass(12)
-    subobj.machinepass  = randpass(12)
-    subobj.adminpass    = randpass(12)
-    subobj.datestring   = datestring()
-    subobj.root         = findnss(pwd.getpwnam, "root")[4]
-    subobj.nobody       = findnss(pwd.getpwnam, "nobody")[4]
-    subobj.nogroup      = findnss(grp.getgrnam, "nogroup", "nobody")[2]
-    subobj.wheel        = findnss(grp.getgrnam, "wheel", "root")[2]
-    subobj.users        = findnss(grp.getgrnam, "users", "guest", "other")[2]
-    subobj.dnsdomain    = subobj.realm.lower()
-    subobj.dnsname      = "%s.%s" % (subobj.hostname.lower(), subobj.dnsdomain)
-    subobj.basedn       = "DC=" + ",DC=".join(subobj.realm.split("."))
-    rdn_list = subobj.dnsdomain.split(".")
-    subobj.domaindn     = "DC=" + ",DC=".join(rdn_list)
-    subobj.domaindn_ldb = "users.ldb"
-    subobj.rootdn       = subobj.domaindn
-
-    modules_list        = ["rootdse",
-                    "kludge_acl",
-                    "paged_results",
-                    "server_sort",
-                    "extended_dn",
-                    "asq",
-                    "samldb",
-                    "password_hash",
-                    "operational",
-                    "objectclass",
-                    "rdn_name",
-                    "show_deleted",
-                    "partition"]
-    subobj.modules_list = ",".join(modules_list)
-
-    return subobj
+    provision(lp, setup_dir, message, blank=True, paths=path, session_info=session_info, 
+              credentials=credentials, realm=realm, domain=domainname, 
+              domainsid=domainsid, domainguid=domainguid, machinepass=machinepass, serverrole=serverrole)
 
 smbconf_keep = [
     "dos charset", 
@@ -435,14 +411,6 @@ def upgrade_smbconf(oldconf,mark):
             elif mark:
                 newconf.set(s, "samba3:"+p, oldconf.get(s,p))
 
-    if oldconf.get("domain logons") == "True":
-        newconf.set("server role", "domain controller")
-    else:
-        if oldconf.get("security") == "user":
-            newconf.set("server role", "standalone")
-        else:
-            newconf.set("server role", "member server")
-
     return newconf
 
 def upgrade(subobj, samba3, message, paths, session_info, credentials):
-- 
cgit 


From e8bca8dd71c9bb64b84f6a74632a46a661be0d97 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 25 Dec 2007 16:36:36 -0600
Subject: r26594: Add right paths to the Python sys.path setting so we don't
 have to set magic environment variables when running from the build
 directory. (This used to be commit 2d2674ad79330f59210408fd03e859afc01f40f2)

---
 source4/scripting/python/modules.c   | 8 ++++++++
 source4/scripting/python/smbpython.c | 7 +++++++
 2 files changed, 15 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/modules.c b/source4/scripting/python/modules.c
index 6a766f3412..2a88870660 100644
--- a/source4/scripting/python/modules.c
+++ b/source4/scripting/python/modules.c
@@ -43,3 +43,11 @@ void py_load_samba_modules(void)
 		PyImport_ExtendInittab(&py_modules[i]);
 	}
 }
+
+void py_update_path(const char *bindir)
+{
+	char *newpath;
+	asprintf(&newpath, "%s:%s/python:%s/../scripting/python", Py_GetPath(), bindir, bindir);
+	PySys_SetPath(newpath);
+	free(newpath);
+}
diff --git a/source4/scripting/python/smbpython.c b/source4/scripting/python/smbpython.c
index 19c458e7ac..27286236ef 100644
--- a/source4/scripting/python/smbpython.c
+++ b/source4/scripting/python/smbpython.c
@@ -21,9 +21,16 @@
 #include <Python.h>
 
 void py_load_samba_modules(void);
+void py_update_path(const char *bindir);
 
 int main(int argc, char **argv) 
 {
 	py_load_samba_modules();
+	Py_Initialize();
+	if (strchr(argv[0], '/') != NULL) {
+		char *bindir = strndup(argv[0], strrchr(argv[0], '/')-argv[0]);
+		py_update_path(bindir);
+		free(bindir);
+	}
 	return Py_Main(argc,argv);
 }
-- 
cgit 


From cea31e32163fe639be72b3f4dfca1362c93b5576 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 25 Dec 2007 16:36:39 -0600
Subject: r26595: Fix includes for hosts without gssapi as system header. (This
 used to be commit 64203a6b7b98be59af192290b0106979c2b2f71a)

---
 source4/scripting/python/config.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/config.mk b/source4/scripting/python/config.mk
index 226f9637db..4a531f5062 100644
--- a/source4/scripting/python/config.mk
+++ b/source4/scripting/python/config.mk
@@ -12,7 +12,7 @@ PRIVATE_DEPENDENCIES = LIBNDR
 OBJ_FILES = uuidmodule.o
 
 [PYTHON::python_misc]
-PRIVATE_DEPENDENCIES = LIBNDR LIBLDB SAMDB
+PRIVATE_DEPENDENCIES = LIBNDR LIBLDB SAMDB CREDENTIALS
 SWIG_FILE = misc.i
 
 # Swig extensions
-- 
cgit 


From 533cc583ed20efdfd6bee60f86d16fef3942898b Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 25 Dec 2007 16:36:44 -0600
Subject: r26596: Fixed upgrade.py.

Added blackbox tests for provision and upgrade Python scripts.
Clean up temporary files created by the Python tests.
(This used to be commit 2227fb6df62240cae64d27a1920d878316f819fc)
---
 source4/scripting/python/samba/__init__.py        |  6 +++---
 source4/scripting/python/samba/provision.py       |  6 +++---
 source4/scripting/python/samba/tests/__init__.py  | 11 +++++++---
 source4/scripting/python/samba/tests/provision.py | 10 ++++++---
 source4/scripting/python/samba/upgrade.py         | 26 ++++++++---------------
 5 files changed, 30 insertions(+), 29 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/__init__.py b/source4/scripting/python/samba/__init__.py
index 5b34534133..359457d815 100644
--- a/source4/scripting/python/samba/__init__.py
+++ b/source4/scripting/python/samba/__init__.py
@@ -164,9 +164,9 @@ class Ldb(ldb.Ldb):
             self.add(msg)
 
     def modify_ldif(self, ldif):
-        for (changetype, msg) in ldb.parse_ldif(data):
-            assert changetype == CHANGETYPE_MODIFY
-            ldb.modify(msg)
+        for (changetype, msg) in self.parse_ldif(ldif):
+            assert changetype == ldb.CHANGETYPE_MODIFY
+            self.modify(msg)
 
 
 def substitute_var(text, values):
diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index a4e6c6a214..c4a3bb7fd6 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -95,7 +95,7 @@ def setup_add_ldif(ldb, ldif_path, subst_vars=None):
 
     assert "${" not in data
 
-    ldb.load_ldif_add(data)
+    ldb.add_ldif(data)
 
 
 def setup_modify_ldif(ldb, ldif_path, substvars=None):
@@ -140,7 +140,7 @@ def setup_file(template, fname, substvars):
     open(f, 'w').write(data)
 
 
-def provision_default_paths(lp, dnsdomain):
+def provision_paths_from_lp(lp, dnsdomain):
     """Set the default paths for provisioning.
 
     :param lp: Loadparm context.
@@ -605,7 +605,7 @@ def provision(lp, setup_dir, message, blank, paths, session_info,
         realm = lp.get("realm")
     else:
         if lp.get("realm").upper() != realm.upper():
-            raise Error("realm '%s' in smb.conf must match chosen realm '%s'\n" %
+            raise Exception("realm '%s' in smb.conf must match chosen realm '%s'\n" %
                 (lp.get("realm"), realm))
 
     assert realm is not None
diff --git a/source4/scripting/python/samba/tests/__init__.py b/source4/scripting/python/samba/tests/__init__.py
index 5885a3b507..5e1ff87c2b 100644
--- a/source4/scripting/python/samba/tests/__init__.py
+++ b/source4/scripting/python/samba/tests/__init__.py
@@ -67,7 +67,12 @@ class SubstituteVarTestCase(unittest.TestCase):
 
 class LdbExtensionTests(TestCaseInTempDir):
     def test_searchone(self):
-        l = samba.Ldb(self.tempdir + "/searchone.ldb")
-        l.add({"dn": "foo=dc", "bar": "bla"})
-        self.assertEquals("bla", l.searchone(ldb.Dn(l, "foo=dc"), "bar"))
+        path = self.tempdir + "/searchone.ldb"
+        l = samba.Ldb(path)
+        try:
+            l.add({"dn": "foo=dc", "bar": "bla"})
+            self.assertEquals("bla", l.searchone(ldb.Dn(l, "foo=dc"), "bar"))
+        finally:
+            del l
+            os.unlink(path)
 
diff --git a/source4/scripting/python/samba/tests/provision.py b/source4/scripting/python/samba/tests/provision.py
index bf7182dbd3..f5a0339c1f 100644
--- a/source4/scripting/python/samba/tests/provision.py
+++ b/source4/scripting/python/samba/tests/provision.py
@@ -29,10 +29,14 @@ def setup_path(file):
 
 class ProvisionTestCase(samba.tests.TestCaseInTempDir):
     def test_setup_secretsdb(self):
-        ldb = setup_secretsdb(os.path.join(self.tempdir, "secrets.ldb"), 
-                              setup_path, None, None, None)
-        self.assertEquals("LSA Secrets",
+        path = os.path.join(self.tempdir, "secrets.ldb")
+        ldb = setup_secretsdb(path, setup_path, None, None, None)
+        try:
+            self.assertEquals("LSA Secrets",
                  ldb.searchone(Dn(ldb, "CN=LSA Secrets"), "CN"))
+        finally:
+            del ldb
+            os.unlink(path)
 
 
 class Disabled:
diff --git a/source4/scripting/python/samba/upgrade.py b/source4/scripting/python/samba/upgrade.py
index c13351bc63..05a63d9326 100644
--- a/source4/scripting/python/samba/upgrade.py
+++ b/source4/scripting/python/samba/upgrade.py
@@ -8,7 +8,6 @@
 """Support code for upgrading from Samba 3 to Samba 4."""
 
 from provision import findnss, provision
-import provision
 import grp
 import pwd
 import uuid
@@ -255,7 +254,7 @@ maxVersion: %llu
 
     return ldif
 
-def upgrade_provision(samba3, setup_dir, message, credentials, session_info, paths):
+def upgrade_provision(samba3, setup_dir, message, credentials, session_info, lp, paths):
     oldconf = samba3.get_conf()
 
     if oldconf.get("domain logons") == "True":
@@ -266,7 +265,11 @@ def upgrade_provision(samba3, setup_dir, message, credentials, session_info, pat
         else:
             serverrole = "member server"
 
+    lp.set("server role", serverrole)
     domainname = oldconf.get("workgroup")
+    if domainname:
+        domainname = str(domainname)
+    lp.set("workgroup", domainname)
     realm = oldconf.get("realm")
     netbiosname = oldconf.get("netbios name")
 
@@ -279,18 +282,19 @@ def upgrade_provision(samba3, setup_dir, message, credentials, session_info, pat
     if realm is None:
         realm = domainname.lower()
         message("No realm specified in smb.conf file, assuming '%s'\n" % realm)
+    lp.set("realm", realm)
 
     domainguid = secrets_db.get_domain_guid(domainname)
-    domainsid = secrets_db.get_sid(domainsid)
+    domainsid = secrets_db.get_sid(domainname)
     if domainsid is None:
         message("Can't find domain secrets for '%s'; using random SID\n" % domainname)
     
     if netbiosname is not None:
         machinepass = secrets_db.get_machine_password(netbiosname)
     else:
-        netbiosname = None
+        machinepass = None
     
-    provision(lp, setup_dir, message, blank=True, paths=path, session_info=session_info, 
+    provision(lp=lp, setup_dir=setup_dir, message=message, blank=True, ldapbackend=None, paths=paths, session_info=session_info, 
               credentials=credentials, realm=realm, domain=domainname, 
               domainsid=domainsid, domainguid=domainguid, machinepass=machinepass, serverrole=serverrole)
 
@@ -500,18 +504,6 @@ data: %d
 
     return ret
 
-def upgrade_verify(subobj, samba3, paths, message):
-    message("Verifying account policies")
-
-    samldb = Ldb(paths.samdb)
-
-    for account in samba3.samaccounts:
-        msg = samldb.search("(&(sAMAccountName=" + account.nt_username + ")(objectclass=user))")
-        assert(len(msg) >= 1)
-    
-    # FIXME
-
-
 
 def enable_samba3sam(samdb):
     samdb.modify("""
-- 
cgit 


From 327847b98765e29a10f70e2b7512bd9acd6a0570 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 25 Dec 2007 16:36:50 -0600
Subject: r26597: Attempt to provide alternative for hosts that don't have
 python-config. (This used to be commit
 fa5d1923efe5c1dc7ef12757b41f8d8eafcb1288)

---
 source4/scripting/python/config.m4 | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/config.m4 b/source4/scripting/python/config.m4
index b6ca7966df..a629aa8f92 100644
--- a/source4/scripting/python/config.m4
+++ b/source4/scripting/python/config.m4
@@ -19,10 +19,16 @@ if test -z "$PYTHON_CONFIG"; then
 	AC_MSG_WARN([No python-config found])
 else
 	working_python=yes
+	PYTHON_LDFLAGS=`$PYTHON_CONFIG --ldflags`
+	PYTHON_CFLAGS=`$PYTHON_CONFIG --cflags`
 fi
 
-PYTHON_LDFLAGS=`$PYTHON_CONFIG --ldflags`
-PYTHON_CFLAGS=`$PYTHON_CONFIG --cflags`
+if test $working_python = no && test x$PYTHON != x
+then
+	PYTHON_CFLAGS=`$PYTHON -c "from distutils import sysconfig; print '-I%s -I%s %s' % (sysconfig.get_python_inc(), sysconfig.get_python_inc(plat_specific=True), sysconfig.get_config_var('CFLAGS'))"`
+	PYTHON_LDFLAGS=`$PYTHON -c "from distutils import sysconfig; print '%s %s -lpython%s -L%s' % (sysconfig.get_config_var('LIBS'), sysconfig.get_config_var('SYSLIBS'), sysconfig.get_config_var('VERSION'), sysconfig.get_config_var('LIBPL'))"`
+	working_python=yes
+fi
 
 SMB_EXT_LIB(EXT_LIB_PYTHON, [$PYTHON_LDFLAGS], [$PYTHON_CFLAGS])
 
-- 
cgit 


From 43a03b0fb48ceb528539a16b0023fb5b30b7a79e Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 25 Dec 2007 16:36:53 -0600
Subject: r26598: Simplify the way Python tests are run. (This used to be
 commit d649f73431fc993e31522e7fc8e1e35e0a4421d8)

---
 source4/scripting/bin/subunitrun | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/bin/subunitrun b/source4/scripting/bin/subunitrun
index add2b91a44..7142abed85 100755
--- a/source4/scripting/bin/subunitrun
+++ b/source4/scripting/bin/subunitrun
@@ -21,5 +21,6 @@ from subunit import SubunitTestRunner
 import sys
 from unittest import TestProgram
 
-program = TestProgram(module=None, argv=sys.argv, testRunner=SubunitTestRunner())
+program = TestProgram(module=None, argv=sys.argv, 
+		              testRunner=SubunitTestRunner())
 program.runTests()
-- 
cgit 


From 7ff974a226b3dda63a91ef0702b12406e130f809 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 25 Dec 2007 16:36:58 -0600
Subject: r26599: Attempt to also support provisioning using Python in the
 BECOME-DC test.

Not tested yet as the test it is part of has been disabled because it's broken.
(This used to be commit 6b1e25b702847cd6662b4aece35692b099707b74)
---
 source4/scripting/python/modules.h   | 26 ++++++++++++++++++++++++++
 source4/scripting/python/smbpython.c |  4 +---
 2 files changed, 27 insertions(+), 3 deletions(-)
 create mode 100644 source4/scripting/python/modules.h

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/modules.h b/source4/scripting/python/modules.h
new file mode 100644
index 0000000000..238c73455f
--- /dev/null
+++ b/source4/scripting/python/modules.h
@@ -0,0 +1,26 @@
+/* 
+   Unix SMB/CIFS implementation.
+   Samba utility functions
+   Copyright (C) Jelmer Vernooij <jelmer@samba.org> 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 <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef __SAMBA_PYTHON_MODULES_H__
+#define __SAMBA_PYTHON_MODULES_H__
+
+void py_load_samba_modules(void);
+void py_update_path(const char *bindir);
+
+#endif /* __SAMBA_PYTHON_MODULES_H__ */ 
diff --git a/source4/scripting/python/smbpython.c b/source4/scripting/python/smbpython.c
index 27286236ef..c5de53fd60 100644
--- a/source4/scripting/python/smbpython.c
+++ b/source4/scripting/python/smbpython.c
@@ -19,9 +19,7 @@
 
 #include "includes.h"
 #include <Python.h>
-
-void py_load_samba_modules(void);
-void py_update_path(const char *bindir);
+#include "scripting/python/modules.h"
 
 int main(int argc, char **argv) 
 {
-- 
cgit 


From 251a4e07803d0fa95b1324d60133475ef8c41e79 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 25 Dec 2007 16:37:02 -0600
Subject: r26600: Provide dir variable with current basedir in Makefile. (This
 used to be commit b06d3e1a52d6b71a1e3e7a9e0ecf69f3b899ae18)

---
 source4/scripting/python/config.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/config.mk b/source4/scripting/python/config.mk
index 4a531f5062..ecf8f9a102 100644
--- a/source4/scripting/python/config.mk
+++ b/source4/scripting/python/config.mk
@@ -33,7 +33,7 @@ pythonmods: $(PYTHON_DSOS)
 PYDOCTOR_MODULES=bin/python/ldb.py bin/python/auth.py bin/python/credentials.py bin/python/registry.py bin/python/tdb.py bin/python/security.py
 
 pydoctor:: pythonmods
-	LD_LIBRARY_PATH=bin/shared PYTHONPATH=bin/python pydoctor --make-html --docformat=restructuredtext --add-package scripting/python/samba/ $(addprefix --add-module , $(PYDOCTOR_MODULES))
+	LD_LIBRARY_PATH=bin/shared PYTHONPATH=bin/python pydoctor --make-html --docformat=restructuredtext --add-package $(dir)/samba/ $(addprefix --add-module , $(PYDOCTOR_MODULES))
 
 clean::
 	@echo "Removing python modules"
-- 
cgit 


From aa79008d4b8741cab917a75d4a7e1f8d6a25e897 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 25 Dec 2007 17:34:07 -0600
Subject: r26602: Revert my previous commit as it only works with GNU make.
 (This used to be commit ecd2d96c3173e4d2f77a1ca50f26a16ac7a313b1)

---
 source4/scripting/python/config.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/config.mk b/source4/scripting/python/config.mk
index ecf8f9a102..4a531f5062 100644
--- a/source4/scripting/python/config.mk
+++ b/source4/scripting/python/config.mk
@@ -33,7 +33,7 @@ pythonmods: $(PYTHON_DSOS)
 PYDOCTOR_MODULES=bin/python/ldb.py bin/python/auth.py bin/python/credentials.py bin/python/registry.py bin/python/tdb.py bin/python/security.py
 
 pydoctor:: pythonmods
-	LD_LIBRARY_PATH=bin/shared PYTHONPATH=bin/python pydoctor --make-html --docformat=restructuredtext --add-package $(dir)/samba/ $(addprefix --add-module , $(PYDOCTOR_MODULES))
+	LD_LIBRARY_PATH=bin/shared PYTHONPATH=bin/python pydoctor --make-html --docformat=restructuredtext --add-package scripting/python/samba/ $(addprefix --add-module , $(PYDOCTOR_MODULES))
 
 clean::
 	@echo "Removing python modules"
-- 
cgit 


From c4d3666ac2821518be57ca89d963f77bbddaedf4 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Wed, 26 Dec 2007 20:55:05 -0600
Subject: r26607: Fix reading of values and subkeys in Samba 3 registry files.
 (This used to be commit e3d7454ef70d6fe9a1ce34eaf57268bd5b713ccf)

---
 source4/scripting/bin/samba3dump               |  11 +-
 source4/scripting/python/samba/samba3.py       |  28 +++-
 source4/scripting/python/samba/tests/samba3.py |   8 ++
 source4/scripting/python/samba/upgrade.py      | 188 +++++++++----------------
 4 files changed, 108 insertions(+), 127 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/bin/samba3dump b/source4/scripting/bin/samba3dump
index f8d10cbc71..8f56d423d8 100755
--- a/source4/scripting/bin/samba3dump
+++ b/source4/scripting/bin/samba3dump
@@ -80,7 +80,7 @@ def print_samba3_secrets(secrets):
     for domain in secrets.domains():
         print "\t--- %s ---" % domain
         print "\tSID: %s" % secrets.get_sid(domain)
-        print "\tGUID: %s" % secrets.get_dom_guid(domain)
+        print "\tGUID: %s" % secrets.get_domain_guid(domain)
         print "\tPlaintext pwd: %s" % secrets.get_machine_password(domain)
         if secrets.get_machine_last_change_time(domain):
             print "\tLast Changed: %lu" % secrets.get_machine_last_change_time(domain)
@@ -93,11 +93,12 @@ def print_samba3_secrets(secrets):
 
 def print_samba3_regdb(regdb):
     print_header("Registry")
+    from registry import str_regtype
 
     for k in regdb.keys():
-        print "%s" % k
-        for v in regdb.values(k):
-            print "\t%s: type %d, length %d" % (v.name, v.type, v.data.length)
+        print "[%s]" % k
+        for (value_name, (type, value))  in regdb.values(k).items():
+            print "\"%s\"=%s:%s" % (value_name, str_regtype(type), value)
 
 def print_samba3_winsdb(winsdb):
     print_header("WINS Database")
@@ -151,7 +152,7 @@ def print_samba3_summary(samba3):
 
 libdir = args[0]
 if len(args) > 1:
-    smbconf = args[2]
+    smbconf = args[1]
 else:
     smbconf = os.path.join(libdir, "smb.conf")
 
diff --git a/source4/scripting/python/samba/samba3.py b/source4/scripting/python/samba/samba3.py
index b4261f7c74..df94f3503c 100644
--- a/source4/scripting/python/samba/samba3.py
+++ b/source4/scripting/python/samba/samba3.py
@@ -45,16 +45,36 @@ class Registry:
         data = self.tdb.get("%s\x00" % key)
         if data is None:
             return []
-        # FIXME: Parse data
-        return []
+        import struct
+        (num, ) = struct.unpack("<L", data[0:4])
+        keys = data[4:].split("\0")
+        assert keys[-1] == ""
+        keys.pop()
+        assert len(keys) == num
+        return keys
 
     def values(self, key):
         """Return a dictionary with the values set for a specific key."""
         data = self.tdb.get("%s/%s\x00" % (REGISTRY_VALUE_PREFIX, key))
         if data is None:
             return {}
-        # FIXME: Parse data
-        return {}
+        ret = {}
+        import struct
+        (num, ) = struct.unpack("<L", data[0:4])
+        data = data[4:]
+        for i in range(num):
+            # Value name
+            (name, data) = data.split("\0", 1)
+
+            (type, ) = struct.unpack("<L", data[0:4])
+            data = data[4:]
+            (value_len, ) = struct.unpack("<L", data[0:4])
+            data = data[4:]
+
+            ret[name] = (type, data[:value_len])
+            data = data[value_len:]
+
+        return ret
 
 
 class PolicyDatabase:
diff --git a/source4/scripting/python/samba/tests/samba3.py b/source4/scripting/python/samba/tests/samba3.py
index 580bcfa3c2..e25562929a 100644
--- a/source4/scripting/python/samba/tests/samba3.py
+++ b/source4/scripting/python/samba/tests/samba3.py
@@ -38,6 +38,14 @@ class RegistryTestCase(unittest.TestCase):
     def test_keys(self):
         self.assertTrue("HKLM" in self.registry.keys())
 
+    def test_subkeys(self):
+        self.assertEquals(["SOFTWARE", "SYSTEM"], self.registry.subkeys("HKLM"))
+
+    def test_values(self):
+        self.assertEquals({'DisplayName': (1L, 'E\x00v\x00e\x00n\x00t\x00 \x00L\x00o\x00g\x00\x00\x00'), 
+                           'ErrorControl': (4L, '\x01\x00\x00\x00')}, 
+                           self.registry.values("HKLM/SYSTEM/CURRENTCONTROLSET/SERVICES/EVENTLOG"))
+
 
 class PolicyTestCase(unittest.TestCase):
     def setUp(self):
diff --git a/source4/scripting/python/samba/upgrade.py b/source4/scripting/python/samba/upgrade.py
index 05a63d9326..a6bd07df58 100644
--- a/source4/scripting/python/samba/upgrade.py
+++ b/source4/scripting/python/samba/upgrade.py
@@ -11,21 +11,7 @@ from provision import findnss, provision
 import grp
 import pwd
 import uuid
-
-def regkey_to_dn(name):
-    """Convert a registry key to a DN.
-    
-    :name: The registry key name.
-    :return: A matching DN."""
-    dn = "hive=NONE"
-
-    if name == "":
-        return dn
-
-    for el in name.split("/"):
-        dn = "key=%s," % el + dn
-
-    return dn
+import registry
 
 # Where prefix is any of:
 # - HKLM
@@ -35,39 +21,6 @@ def regkey_to_dn(name):
 #   HKPT
 #
 
-def upgrade_registry(regdb,prefix,ldb):
-    """Migrate registry contents."""
-    assert regdb is not None
-    prefix_up = prefix.upper()
-    ldif = []
-
-    for rk in regdb.keys:
-        pts = rk.name.split("/")
-
-        # Only handle selected hive
-        if pts[0].upper() != prefix_up:
-            continue
-
-        keydn = regkey_to_dn(rk.name)
-
-        pts = rk.name.split("/")
-
-        # Convert key name to dn
-        ldif[rk.name] = """
-dn: %s
-name: %s
-
-""" % (keydn, pts[0])
-        
-        for rv in rk.values:
-            ldif[rk.name + " (" + rv.name + ")"] = """
-dn: %s,value=%s
-value: %s
-type: %d
-data:: %s""" % (keydn, rv.name, rv.name, rv.type, ldb.encode(rv.data))
-
-    return ldif
-
 def upgrade_sam_policy(policy,dn):
     ldif = """
 dn: %s
@@ -177,82 +130,72 @@ group.comment, group.nt_name, group.sid, group.unixname, group.sid_name_use)
 
     return ldif
 
-def upgrade_winbind(samba3,domaindn):
-    ldif = """
-        
-dn: dc=none
-userHwm: %d
-groupHwm: %d
-
-""" % (samba3.idmap.user_hwm, samba3.idmap.group_hwm)
-
-    for m in samba3.idmap.mappings:
-        ldif += """
-dn: SID=%s,%s
-SID: %s
-type: %d
-unixID: %d""" % (m.sid, domaindn, m.sid, m.type, m.unix_id)
-    
-    return ldif
+def import_idmap(samba4_idmap,samba3_idmap,domaindn):
+    samba4_idmap.add({
+        "dn": domaindn,
+        "userHwm": str(samba3_idmap.get_user_hwm()),
+        "groupHwm": str(samba3_idmap.get_group_hwm())})
 
-def upgrade_wins(samba3):
-    """Upgrade the WINS database."""
-    ldif = ""
-    version_id = 0
+    for uid in samba3_idmap.uids():
+        samba4_idmap.add({"dn": "SID=%s,%s" % (samba3_idmap.get_user_sid(uid), domaindn),
+                          "SID": samba3_idmap.get_user_sid(uid),
+                          "type": "user",
+                          "unixID": str(uid)})
 
-    for e in samba3.winsentries:
-        now = sys.nttime()
-        ttl = sys.unix2nttime(e.ttl)
+    for gid in samba3_idmap.uids():
+        samba4_idmap.add({"dn": "SID=%s,%s" % (samba3_idmap.get_group_sid(gid), domaindn),
+                          "SID": samba3_idmap.get_group_sid(gid),
+                          "type": "group",
+                          "unixID": str(gid)})
 
+
+def import_wins(samba4_winsdb, samba3_winsdb):
+    """Import settings from a Samba3 WINS database."""
+    version_id = 0
+    import time
+
+    for (name, (ttl, ips, nb_flags)) in samba3_winsdb.items():
         version_id+=1
 
         numIPs = len(e.ips)
 
-        if e.type == 0x1C:
+        type = int(name.split("#", 1)[1], 16)
+
+        if type == 0x1C:
             rType = 0x2
-        elif e.type & 0x80:
-            if numIPs > 1:
+        elif type & 0x80:
+            if len(ips) > 1:
                 rType = 0x2
             else:
                 rType = 0x1
         else:
-            if numIPs > 1:
+            if len(ips) > 1:
                 rType = 0x3
             else:
                 rType = 0x0
 
-        if ttl > now:
+        if ttl > time.time():
             rState = 0x0 # active
         else:
             rState = 0x1 # released
 
-        nType = ((e.nb_flags & 0x60)>>5)
-
-        ldif += """
-dn: name=%s,type=0x%02X
-type: 0x%02X
-name: %s
-objectClass: winsRecord
-recordType: %u
-recordState: %u
-nodeType: %u
-isStatic: 0
-expireTime: %s
-versionID: %llu
-""" % (e.name, e.type, e.type, e.name, 
-   rType, rState, nType, 
-   ldaptime(ttl), version_id)
-
-        for ip in e.ips:
-            ldif += "address: %s\n" % ip
-
-    ldif += """
-dn: CN=VERSION
-objectClass: winsMaxVersion
-maxVersion: %llu
-""" % version_id
+        nType = ((nb_flags & 0x60)>>5)
 
-    return ldif
+        samba4_winsdb.add({"dn": "name=%s,type=0x%s" % name.split("#"),
+                           "type": name.split("#")[1],
+                           "name": name.split("#")[0],
+                           "objectClass": "winsRecord",
+                           "recordType": str(rType),
+                           "recordState": str(rState),
+                           "nodeType": str(nType),
+                           "expireTime": ldb.ldaptime(ttl),
+                           "isStatic": "0",
+                           "versionID": str(version_id),
+                           "address": ips})
+
+    samba4_winsdb.add({"dn": "CN=VERSION",
+                       "objectClass": "winsMaxVersion",
+                       "maxVersion": str(version_id)})
 
 def upgrade_provision(samba3, setup_dir, message, credentials, session_info, lp, paths):
     oldconf = samba3.get_conf()
@@ -417,6 +360,30 @@ def upgrade_smbconf(oldconf,mark):
 
     return newconf
 
+SAMBA3_PREDEF_NAMES = {
+        'HKLM': registry.HKEY_LOCAL_MACHINE,
+}
+
+def import_registry(samba4_registry, samba3_regdb):
+    """Import a Samba 3 registry database into the Samba 4 registry.
+
+    :param samba4_registry: Samba 4 registry handle.
+    :param samba3_regdb: Samba 3 registry database handle.
+    """
+    def ensure_key_exists(keypath):
+        (predef_name, keypath) = keypath.split("/", 1)
+        predef_id = SAMBA3_PREDEF_NAMES[predef_name]
+        keypath = keypath.replace("/", "\\")
+        return samba4_registry.create_key(predef_id, keypath)
+
+    for key in samba3_regdb.keys():
+        key_handle = ensure_key_exists(key)
+        for subkey in samba3_regdb.subkeys(key):
+            ensure_key_exists(subkey)
+        for (value_name, (value_type, value_data)) in samba3_regdb.values(key).items():
+            key_handle.set_value(value_name, value_type, value_data)
+
+
 def upgrade(subobj, samba3, message, paths, session_info, credentials):
     ret = 0
     samdb = Ldb(paths.samdb, session_info=session_info, credentials=credentials)
@@ -462,21 +429,6 @@ data: %d
                 ret += 1
         message(msg)
 
-    message("Importing registry data")
-    for hive in ["hkcr","hkcu","hklm","hkpd","hku","hkpt"]:
-        message("... " + hive)
-        regdb = Ldb(paths[hive])
-        ldif = upgrade_registry(samba3.registry, hive, regdb)
-        for j in ldif:
-            msg = "... ... " + j
-            try:
-                regdb.add(ldif[j])
-            except LdbError, e:
-                # FIXME: Ignore 'Record exists' errors
-                msg += "... error: " + str(e)
-                ret += 1
-            message(msg)
-
     message("Importing WINS data")
     winsdb = Ldb(paths.winsdb)
     ldb_erase(winsdb)
-- 
cgit 


From 222262b54e74a01a66b3cbbea5502d4ce488905d Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Thu, 27 Dec 2007 03:09:49 -0600
Subject: r26608: More improvements to the upgrade code. (This used to be
 commit 7ea06d91f602f770f55a1171174f11b922fed8e7)

---
 source4/scripting/python/samba/provision.py     |   2 +
 source4/scripting/python/samba/samba3.py        | 165 +++++++++++++--
 source4/scripting/python/samba/tests/samba3.py  |  20 +-
 source4/scripting/python/samba/tests/upgrade.py |   8 +-
 source4/scripting/python/samba/upgrade.py       | 260 +++++++++++++-----------
 5 files changed, 307 insertions(+), 148 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index c4a3bb7fd6..53eb1d618f 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -745,6 +745,8 @@ def provision(lp, setup_dir, message, blank, paths, session_info,
                       domainguid=domainguid, hostguid=hostguid)
         message("Please install the zone located in %s into your DNS server" % paths.dns)
 
+    return domaindn
+
 def create_phplpapdadmin_config(path, setup_path, s4_ldapi_path):
     setup_file(setup_path("phpldapadmin-config.php"), 
                path, {"S4_LDAPI_URI": "ldapi://%s" % s4_ldapi_path.replace("/", "%2F")})
diff --git a/source4/scripting/python/samba/samba3.py b/source4/scripting/python/samba/samba3.py
index df94f3503c..c9153d85cf 100644
--- a/source4/scripting/python/samba/samba3.py
+++ b/source4/scripting/python/samba/samba3.py
@@ -118,6 +118,15 @@ class GroupMappingDatabase:
             if k.startswith(GROUP_PREFIX):
                 yield k[len(GROUP_PREFIX):].rstrip("\0")
 
+    def get_group(self, sid):
+        data = self.tdb.get("%s%s\0" % (GROUP_PREFIX, sid))
+        if data is None:
+            return data
+        import struct
+        (gid, sid_name_use) = struct.unpack("<lL", data[0:8])
+        (nt_name, comment, _) = data[8:].split("\0")
+        return (gid, sid_name_use, nt_name, comment)
+
     def aliases(self):
         for k in self.tdb.keys():
             if k.startswith(MEMBEROF_PREFIX):
@@ -288,15 +297,15 @@ ACB_NO_AUTH_DATA_REQD = 0x00080000
 acb_info_mapping = {
         'N': ACB_PWNOTREQ,  # 'N'o password. 
         'D': ACB_DISABLED,  # 'D'isabled.
-		'H': ACB_HOMDIRREQ, # 'H'omedir required.
-		'T': ACB_TEMPDUP,   # 'T'emp account.
-		'U': ACB_NORMAL,    # 'U'ser account (normal).
-		'M': ACB_MNS,       # 'M'NS logon user account. What is this ?
-		'W': ACB_WSTRUST,   # 'W'orkstation account.
-		'S': ACB_SVRTRUST,  # 'S'erver account. 
-		'L': ACB_AUTOLOCK,  # 'L'ocked account.
-		'X': ACB_PWNOEXP,   # No 'X'piry on password
-		'I': ACB_DOMTRUST,  # 'I'nterdomain trust account.
+        'H': ACB_HOMDIRREQ, # 'H'omedir required.
+        'T': ACB_TEMPDUP,   # 'T'emp account.
+        'U': ACB_NORMAL,    # 'U'ser account (normal).
+        'M': ACB_MNS,       # 'M'NS logon user account. What is this ?
+        'W': ACB_WSTRUST,   # 'W'orkstation account.
+        'S': ACB_SVRTRUST,  # 'S'erver account. 
+        'L': ACB_AUTOLOCK,  # 'L'ocked account.
+        'X': ACB_PWNOEXP,   # No 'X'piry on password
+        'I': ACB_DOMTRUST,  # 'I'nterdomain trust account.
         ' ': 0
         }
 
@@ -308,6 +317,72 @@ def decode_acb(text):
     return ret
 
 
+class SAMUser:
+    def __init__(self, name, uid=None, lm_password=None, nt_password=None, acct_ctrl=None, 
+                 last_change_time=None, nt_username=None, fullname=None, logon_time=None, logoff_time=None,
+                 acct_desc=None, group_rid=None, bad_password_count=None, logon_count=None,
+                 domain=None, dir_drive=None, munged_dial=None, homedir=None, logon_script=None,
+                 profile_path=None, workstations=None, kickoff_time=None, bad_password_time=None,
+                 pass_last_set_time=None, pass_can_change_time=None, pass_must_change_time=None,
+                 user_rid=None):
+        self.username = name
+        self.uid = uid
+        self.lm_password = lm_password
+        self.nt_password = nt_password
+        self.acct_ctrl = acct_ctrl
+        self.pass_last_set_time = last_change_time
+        self.nt_username = nt_username
+        self.fullname = fullname
+        self.logon_time = logon_time
+        self.logoff_time = logoff_time
+        self.acct_desc = acct_desc
+        self.group_rid = group_rid
+        self.bad_password_count = bad_password_count
+        self.logon_count = logon_count
+        self.domain = domain
+        self.dir_drive = dir_drive
+        self.munged_dial = munged_dial
+        self.homedir = homedir
+        self.logon_script = logon_script
+        self.profile_path = profile_path
+        self.workstations = workstations
+        self.kickoff_time = kickoff_time
+        self.bad_password_time = bad_password_time
+        self.pass_can_change_time = pass_can_change_time
+        self.pass_must_change_time = pass_must_change_time
+        self.user_rid = user_rid
+
+    def __eq__(self, other): 
+        if not isinstance(other, SAMUser):
+            return False
+        return (self.username == other.username and 
+                self.uid == other.uid and 
+                self.lm_password == other.lm_password and 
+                self.nt_password == other.nt_password and 
+                self.acct_ctrl == other.acct_ctrl and 
+                self.pass_last_set_time == other.pass_last_set_time and 
+                self.nt_username == other.nt_username and 
+                self.fullname == other.fullname and 
+                self.logon_time == other.logon_time and 
+                self.logoff_time == other.logoff_time and 
+                self.acct_desc == other.acct_desc and 
+                self.group_rid == other.group_rid and 
+                self.bad_password_count == other.bad_password_count and 
+                self.logon_count == other.logon_count and 
+                self.domain == other.domain and 
+                self.dir_drive == other.dir_drive and 
+                self.munged_dial == other.munged_dial and 
+                self.homedir == other.homedir and 
+                self.logon_script == other.logon_script and 
+                self.profile_path == other.profile_path and 
+                self.workstations == other.workstations and 
+                self.kickoff_time == other.kickoff_time and 
+                self.bad_password_time == other.bad_password_time and 
+                self.pass_can_change_time == other.pass_can_change_time and 
+                self.pass_must_change_time == other.pass_must_change_time and 
+                self.user_rid == other.user_rid)
+
+
 class SmbpasswdFile:
     def __init__(self, file):
         self.users = {}
@@ -345,7 +420,7 @@ class SmbpasswdFile:
                     acct_ctrl &= ~ACB_NORMAL
                     acct_ctrl |= ACB_WSTRUST
 
-            self.users[username] = (uid, lm_password, nt_password, acct_ctrl, last_change_time)
+            self.users[username] = SAMUser(username, uid, lm_password, nt_password, acct_ctrl, last_change_time)
 
         f.close()
 
@@ -368,6 +443,11 @@ TDBSAM_FORMAT_STRING_V2 = "dddddddBBBBBBBBBBBBddBBBwwdBwwd"
 TDBSAM_USER_PREFIX = "USER_"
 
 
+class LdapSam:
+    def __init__(self, url):
+        self.ldap_url = ldap_url
+
+
 class TdbSam:
     def __init__(self, file):
         self.tdb = tdb.Tdb(file, flags=os.O_RDONLY)
@@ -380,6 +460,45 @@ class TdbSam:
                 yield k[len(TDBSAM_USER_PREFIX):].rstrip("\0")
 
     __iter__ = usernames
+    
+    def __getitem__(self, name):
+        data = self.tdb["%s%s\0" % (TDBSAM_USER_PREFIX, name)]
+        import struct
+        (logon_time, logoff_time, kickoff_time, pass_last_set_time, pass_can_change_time, \
+                pass_must_change_time) = struct.unpack("<llllll", data[:6*4])
+        user = SAMUser(name)
+        user.logon_time = logon_time
+        user.logoff_time = logoff_time
+        user.kickoff_time = kickoff_time
+        user.pass_last_set_time = pass_last_set_time
+        user.pass_can_change_time = pass_can_change_time
+
+#	&username_len, &sampass->username,			/* B */
+#		&domain_len, &sampass->domain,				/* B */
+#		&nt_username_len, &sampass->nt_username,		/* B */
+#		&fullname_len, &sampass->fullname,			/* B */
+#		&homedir_len, &sampass->homedir,			/* B */
+#		&dir_drive_len, &sampass->dir_drive,			/* B */
+#		&logon_script_len, &sampass->logon_script,		/* B */
+#		&profile_path_len, &sampass->profile_path,		/* B */
+#		&acct_desc_len, &sampass->acct_desc,			/* B */
+#		&workstations_len, &sampass->workstations,		/* B */
+#		&unknown_str_len, &sampass->unknown_str,		/* B */
+#		&munged_dial_len, &sampass->munged_dial,		/* B */
+#		&sampass->user_rid,					/* d */
+#		&sampass->group_rid,					/* d */
+#		&lm_pw_len, sampass->lm_pw.hash,			/* B */
+#		&nt_pw_len, sampass->nt_pw.hash,			/* B */
+#		&sampass->acct_ctrl,					/* w */
+#		&remove_me, /* remove on the next TDB_FORMAT upgarde */	/* d */
+#		&sampass->logon_divs,					/* w */
+#		&sampass->hours_len,					/* d */
+#		&hourslen, &sampass->hours,				/* B */
+#		&sampass->bad_password_count,				/* w */
+#		&sampass->logon_count,					/* w */
+#		&sampass->unknown_6);					/* d */
+#		
+        return user
 
     def close(self):
         self.tdb.close()
@@ -423,7 +542,7 @@ class WinsDatabase:
             while "." in entries[i]:
                 ips.append(entries[i])
                 i+=1
-            nb_flags = entries[i]
+            nb_flags = int(entries[i][:-1], 16)
             assert not name in self.entries, "Name %s exists twice" % name
             self.entries[name] = (ttl, ips, nb_flags)
         f.close()
@@ -437,6 +556,9 @@ class WinsDatabase:
     def __iter__(self):
         return iter(self.entries)
 
+    def items(self):
+        return self.entries.items()
+
     def close(self): # for consistency
         pass
 
@@ -459,14 +581,19 @@ class Samba3:
     def get_sam_db(self):
         lp = self.get_conf()
         backends = str(lp.get("passdb backend")).split(" ")
-        if backends[0].startswith("smbpasswd"):
-            if ":" in backends[0]:
-                return SmbpasswdFile(self.libdir_path(backends[0][len("smbpasswd:"):]))
-            return SmbpasswdFile(self.libdir_path("smbpasswd"))
-        elif backends[0].startswith("tdbsam"):
-            if ":" in backends[0]:
-                return TdbSam(self.libdir_path(backends[0][len("tdbsam:"):]))
-            return TdbSam(self.libdir_path("passdb.tdb"))
+        if ":" in backends[0]:
+            (name, location) = backends[0].split(":", 2)
+        else:
+            name = backends[0]
+            location = None
+        if name == "smbpasswd":
+            return SmbpasswdFile(self.libdir_path(location or "smbpasswd"))
+        elif name == "tdbsam":
+            return TdbSam(self.libdir_path(location or "passdb.tdb"))
+        elif name == "ldapsam":
+            if location is not None:
+                return LdapSam("ldap:%s" % location)
+            return LdapSam(lp.get("ldap server"))
         else:
             raise NotImplementedError("unsupported passdb backend %s" % backends[0])
 
diff --git a/source4/scripting/python/samba/tests/samba3.py b/source4/scripting/python/samba/tests/samba3.py
index e25562929a..22b21ba1b4 100644
--- a/source4/scripting/python/samba/tests/samba3.py
+++ b/source4/scripting/python/samba/tests/samba3.py
@@ -19,7 +19,7 @@
 
 import unittest
 from samba.samba3 import (GroupMappingDatabase, Registry, PolicyDatabase, SecretsDatabase, TdbSam,
-                          WinsDatabase, SmbpasswdFile, ACB_NORMAL, IdmapDatabase)
+                          WinsDatabase, SmbpasswdFile, ACB_NORMAL, IdmapDatabase, SAMUser)
 import os
 
 DATADIR=os.path.join(os.path.dirname(__file__), "../../../../../testdata/samba3")
@@ -74,6 +74,9 @@ class GroupsTestCase(unittest.TestCase):
     def test_group_length(self):
         self.assertEquals(13, len(list(self.groupdb.groupsids())))
 
+    def test_get_group(self):
+        self.assertEquals((-1, 5L, 'Administrators', ''), self.groupdb.get_group("S-1-5-32-544"))
+
     def test_groupsids(self):
         sids = list(self.groupdb.groupsids())
         self.assertTrue("S-1-5-32-544" in sids)
@@ -103,6 +106,11 @@ class TdbSamTestCase(unittest.TestCase):
     def test_usernames(self):
         self.assertEquals(3, len(list(self.samdb.usernames())))
 
+    def test_getuser(self):
+        return
+        user = SAMUser("root")
+        self.assertEquals(user, self.samdb["root"])
+
 
 class WinsDatabaseTestCase(unittest.TestCase):
     def setUp(self):
@@ -112,7 +120,7 @@ class WinsDatabaseTestCase(unittest.TestCase):
         self.assertEquals(22, len(self.winsdb))
 
     def test_first_entry(self):
-        self.assertEqual((1124185120, ["192.168.1.5"], "64R"), self.winsdb["ADMINISTRATOR#03"])
+        self.assertEqual((1124185120, ["192.168.1.5"], 0x64), self.winsdb["ADMINISTRATOR#03"])
 
     def tearDown(self):
         self.winsdb.close()
@@ -125,7 +133,13 @@ class SmbpasswdTestCase(unittest.TestCase):
         self.assertEquals(3, len(self.samdb))
 
     def test_get_user(self):
-        self.assertEquals((0, "552902031BEDE9EFAAD3B435B51404EE", "878D8014606CDA29677A44EFA1353FC7", ACB_NORMAL, int(1125418267)), self.samdb["rootpw"])
+        user = SAMUser("rootpw")
+        user.lm_password = "552902031BEDE9EFAAD3B435B51404EE"
+        user.nt_password = "878D8014606CDA29677A44EFA1353FC7"
+        user.acct_ctrl = ACB_NORMAL
+        user.pass_last_set_time = int(1125418267)
+        user.uid = 0
+        self.assertEquals(user, self.samdb["rootpw"])
 
     def tearDown(self):
         self.samdb.close()
diff --git a/source4/scripting/python/samba/tests/upgrade.py b/source4/scripting/python/samba/tests/upgrade.py
index a25743425b..ddafa00691 100644
--- a/source4/scripting/python/samba/tests/upgrade.py
+++ b/source4/scripting/python/samba/tests/upgrade.py
@@ -17,12 +17,6 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-from samba.upgrade import regkey_to_dn
+import samba.upgrade
 from unittest import TestCase
 
-class RegkeyDnTests(TestCase):
-    def test_empty(self):
-        self.assertEquals("hive=NONE", regkey_to_dn(""))
-
-    def test_nested(self):
-        self.assertEquals("key=bar,key=foo,hive=NONE", regkey_to_dn("foo/bar"))
diff --git a/source4/scripting/python/samba/upgrade.py b/source4/scripting/python/samba/upgrade.py
index a6bd07df58..3ecfe872f9 100644
--- a/source4/scripting/python/samba/upgrade.py
+++ b/source4/scripting/python/samba/upgrade.py
@@ -9,20 +9,15 @@
 
 from provision import findnss, provision
 import grp
+import ldb
 import pwd
 import uuid
 import registry
+from samba import Ldb
+from samba.samdb import SamDB
 
-# Where prefix is any of:
-# - HKLM
-#   HKU
-#   HKCR
-#   HKPD
-#   HKPT
-#
-
-def upgrade_sam_policy(policy,dn):
-    ldif = """
+def import_sam_policy(samldb, samba3_policy, domaindn):
+    samldb.modify_ldif("""
 dn: %s
 changetype: modify
 replace: minPwdLength
@@ -40,19 +35,24 @@ samba3DisconnectTime: %d
     policy.password_history, policy.minimum_password_age,
     policy.maximum_password_age, policy.lockout_duration,
     policy.reset_count_minutes, policy.user_must_logon_to_change_password,
-    policy.bad_lockout_minutes, policy.disconnect_time)
-    
-    return ldif
+    policy.bad_lockout_minutes, policy.disconnect_time))
+
 
-def upgrade_sam_account(ldb,acc,domaindn,domainsid):
-    """Upgrade a SAM account."""
+def import_sam_account(samldb,acc,domaindn,domainsid):
+    """Import a Samba 3 SAM account.
+    
+    :param samldb: Samba 4 SAM Database handle
+    :param acc: Samba 3 account
+    :param domaindn: Domain DN
+    :param domainsid: Domain SID."""
     if acc.nt_username is None or acc.nt_username == "":
         acc.nt_username = acc.username
 
     if acc.fullname is None:
-        acc.fullname = pwd.getpwnam(acc.fullname)[4]
-
-    acc.fullname = acc.fullname.split(",")[0]
+        try:
+            acc.fullname = pwd.getpwnam(acc.username)[4].split(",")[0]
+        except KeyError:
+            pass
 
     if acc.fullname is None:
         acc.fullname = acc.username
@@ -60,105 +60,113 @@ def upgrade_sam_account(ldb,acc,domaindn,domainsid):
     assert acc.fullname is not None
     assert acc.nt_username is not None
 
-    ldif = """dn: cn=%s,%s
-objectClass: top
-objectClass: user
-lastLogon: %d
-lastLogoff: %d
-unixName: %s
-sAMAccountName: %s
-cn: %s
-description: %s
-primaryGroupID: %d
-badPwdcount: %d
-logonCount: %d
-samba3Domain: %s
-samba3DirDrive: %s
-samba3MungedDial: %s
-samba3Homedir: %s
-samba3LogonScript: %s
-samba3ProfilePath: %s
-samba3Workstations: %s
-samba3KickOffTime: %d
-samba3BadPwdTime: %d
-samba3PassLastSetTime: %d
-samba3PassCanChangeTime: %d
-samba3PassMustChangeTime: %d
-objectSid: %s-%d
-lmPwdHash:: %s
-ntPwdHash:: %s
-
-""" % (ldb.dn_escape(acc.fullname), domaindn, acc.logon_time, acc.logoff_time, acc.username, acc.nt_username, acc.nt_username, 
-acc.acct_desc, acc.group_rid, acc.bad_password_count, acc.logon_count,
-acc.domain, acc.dir_drive, acc.munged_dial, acc.homedir, acc.logon_script, 
-acc.profile_path, acc.workstations, acc.kickoff_time, acc.bad_password_time, 
-acc.pass_last_set_time, acc.pass_can_change_time, acc.pass_must_change_time, domainsid, acc.user_rid,
-    ldb.encode(acc.lm_pw), ldb.encode(acc.nt_pw))
-
-    return ldif
-
-def upgrade_sam_group(group,domaindn):
-    """Upgrade a SAM group."""
-    if group.sid_name_use == 5: # Well-known group
+    samldb.add({
+        "dn": "cn=%s,%s" % (acc.fullname, domaindn),
+        "objectClass": ["top", "user"],
+        "lastLogon": str(acc.logon_time),
+        "lastLogoff": str(acc.logoff_time),
+        "unixName": acc.username,
+        "sAMAccountName": acc.nt_username,
+        "cn": acc.nt_username,
+        "description": acc.acct_desc,
+        "primaryGroupID": str(acc.group_rid),
+        "badPwdcount": str(acc.bad_password_count),
+        "logonCount": str(acc.logon_count),
+        "samba3Domain": acc.domain,
+        "samba3DirDrive": acc.dir_drive,
+        "samba3MungedDial": acc.munged_dial,
+        "samba3Homedir": acc.homedir, 
+        "samba3LogonScript": acc.logon_script, 
+        "samba3ProfilePath": acc.profile_path,
+        "samba3Workstations": acc.workstations,
+        "samba3KickOffTime": str(acc.kickoff_time),
+        "samba3BadPwdTime": str(acc.bad_password_time),
+        "samba3PassLastSetTime": str(acc.pass_last_set_time),
+        "samba3PassCanChangeTime": str(acc.pass_can_change_time),
+        "samba3PassMustChangeTime": str(acc.pass_must_change_time),
+        "objectSid": "%s-%d" % (domainsid, acc.user_rid),
+        "lmPwdHash:": acc.lm_password,
+        "ntPwdHash:": acc.nt_password,
+        })
+
+
+def import_sam_group(samldb, sid, gid, sid_name_use, nt_name, comment, domaindn):
+    """Upgrade a SAM group.
+    
+    :param samldb: SAM database.
+    :param gid: Group GID
+    :param sid_name_use: SID name use
+    :param nt_name: NT Group Name
+    :param comment: NT Group Comment
+    :param domaindn: Domain DN
+    """
+
+    if sid_name_use == 5: # Well-known group
         return None
 
-    if group.nt_name in ("Domain Guests", "Domain Users", "Domain Admins"):
+    if nt_name in ("Domain Guests", "Domain Users", "Domain Admins"):
         return None
     
-    if group.gid == -1:
-        gr = grp.getgrnam(grp.nt_name)
+    if gid == -1:
+        gr = grp.getgrnam(nt_name)
     else:
-        gr = grp.getgrgid(grp.gid)
+        gr = grp.getgrgid(gid)
 
     if gr is None:
-        group.unixname = "UNKNOWN"
+        unixname = "UNKNOWN"
     else:
-        group.unixname = gr.gr_name
+        unixname = gr.gr_name
 
-    assert group.unixname is not None
+    assert unixname is not None
     
-    ldif = """dn: cn=%s,%s
-objectClass: top
-objectClass: group
-description: %s
-cn: %s
-objectSid: %s
-unixName: %s
-samba3SidNameUse: %d
-""" % (group.nt_name, domaindn, 
-group.comment, group.nt_name, group.sid, group.unixname, group.sid_name_use)
-
-    return ldif
-
-def import_idmap(samba4_idmap,samba3_idmap,domaindn):
-    samba4_idmap.add({
+    samldb.add({
+        "dn": "cn=%s,%s" % (nt_name, domaindn),
+        "objectClass": ["top", "group"],
+        "description": comment,
+        "cn": nt_name, 
+        "objectSid": sid,
+        "unixName": unixname,
+        "samba3SidNameUse": str(sid_name_use)
+        })
+
+
+def import_idmap(samdb,samba3_idmap,domaindn):
+    """Import idmap data.
+
+    :param samdb: SamDB handle.
+    :param samba3_idmap: Samba 3 IDMAP database to import from
+    :param domaindn: Domain DN.
+    """
+    samdb.add({
         "dn": domaindn,
         "userHwm": str(samba3_idmap.get_user_hwm()),
         "groupHwm": str(samba3_idmap.get_group_hwm())})
 
     for uid in samba3_idmap.uids():
-        samba4_idmap.add({"dn": "SID=%s,%s" % (samba3_idmap.get_user_sid(uid), domaindn),
+        samdb.add({"dn": "SID=%s,%s" % (samba3_idmap.get_user_sid(uid), domaindn),
                           "SID": samba3_idmap.get_user_sid(uid),
                           "type": "user",
                           "unixID": str(uid)})
 
     for gid in samba3_idmap.uids():
-        samba4_idmap.add({"dn": "SID=%s,%s" % (samba3_idmap.get_group_sid(gid), domaindn),
+        samdb.add({"dn": "SID=%s,%s" % (samba3_idmap.get_group_sid(gid), domaindn),
                           "SID": samba3_idmap.get_group_sid(gid),
                           "type": "group",
                           "unixID": str(gid)})
 
 
 def import_wins(samba4_winsdb, samba3_winsdb):
-    """Import settings from a Samba3 WINS database."""
+    """Import settings from a Samba3 WINS database.
+    
+    :param samba4_winsdb: WINS database to import to
+    :param samba3_winsdb: WINS database to import from
+    """
     version_id = 0
     import time
 
     for (name, (ttl, ips, nb_flags)) in samba3_winsdb.items():
         version_id+=1
 
-        numIPs = len(e.ips)
-
         type = int(name.split("#", 1)[1], 16)
 
         if type == 0x1C:
@@ -181,14 +189,14 @@ def import_wins(samba4_winsdb, samba3_winsdb):
 
         nType = ((nb_flags & 0x60)>>5)
 
-        samba4_winsdb.add({"dn": "name=%s,type=0x%s" % name.split("#"),
+        samba4_winsdb.add({"dn": "name=%s,type=0x%s" % tuple(name.split("#")),
                            "type": name.split("#")[1],
                            "name": name.split("#")[0],
                            "objectClass": "winsRecord",
                            "recordType": str(rType),
                            "recordState": str(rState),
                            "nodeType": str(nType),
-                           "expireTime": ldb.ldaptime(ttl),
+                           "expireTime": ldb.timestring(ttl),
                            "isStatic": "0",
                            "versionID": str(version_id),
                            "address": ips})
@@ -237,9 +245,52 @@ def upgrade_provision(samba3, setup_dir, message, credentials, session_info, lp,
     else:
         machinepass = None
     
-    provision(lp=lp, setup_dir=setup_dir, message=message, blank=True, ldapbackend=None, paths=paths, session_info=session_info, 
-              credentials=credentials, realm=realm, domain=domainname, 
-              domainsid=domainsid, domainguid=domainguid, machinepass=machinepass, serverrole=serverrole)
+    domaindn = provision(lp=lp, setup_dir=setup_dir, message=message, blank=True, ldapbackend=None, 
+                         paths=paths, session_info=session_info, credentials=credentials, realm=realm, 
+                         domain=domainname, domainsid=domainsid, domainguid=domainguid, 
+                         machinepass=machinepass, serverrole=serverrole)
+
+    samdb = SamDB(paths.samdb, credentials=credentials, lp=lp, session_info=session_info)
+
+    import_wins(Ldb(paths.winsdb), samba3.get_wins_db())
+
+    # FIXME: import_registry(registry.Registry(), samba3.get_registry())
+
+    # FIXME: import_idmap(samdb,samba3.get_idmap_db(),domaindn)
+    
+    groupdb = samba3.get_groupmapping_db()
+    for sid in groupdb.groupsids():
+        (gid, sid_name_use, nt_name, comment) = groupdb.get_group(sid)
+        # FIXME: import_sam_group(samdb, sid, gid, sid_name_use, nt_name, comment, domaindn)
+
+    # FIXME: Aliases
+
+    passdb = samba3.get_sam_db()
+    for name in passdb:
+        user = passdb[name]
+        #FIXME: import_sam_account(samdb, user, domaindn, domainsid)
+
+    if hasattr(passdb, 'ldap_url'):
+        message("Enabling Samba3 LDAP mappings for SAM database")
+
+        enable_samba3sam(samdb, passdb.ldap_url)
+
+
+def enable_samba3sam(samdb, ldapurl):
+    """Enable Samba 3 LDAP URL database.
+
+    :param samdb: SAM Database.
+    :param ldapurl: Samba 3 LDAP URL
+    """
+    samdb.modify_ldif("""
+dn: @MODULES
+changetype: modify
+replace: @LIST
+@LIST: samldb,operational,objectguid,rdn_name,samba3sam
+""")
+
+    samdb.add({"dn": "@MAP=samba3sam", "@MAP_URL": ldapurl})
+
 
 smbconf_keep = [
     "dos charset", 
@@ -436,33 +487,4 @@ data: %d
     ldif = upgrade_wins(samba3)
     winsdb.add(ldif)
 
-    # figure out ldapurl, if applicable
-    ldapurl = None
-    pdb = samba3.configuration.get_list("passdb backend")
-    if pdb is not None:
-        for backend in pdb:
-            if len(backend) >= 7 and backend[0:7] == "ldapsam":
-                ldapurl = backend[7:]
-
-    # URL was not specified in passdb backend but ldap /is/ used
-    if ldapurl == "":
-        ldapurl = "ldap://%s" % samba3.configuration.get("ldap server")
 
-    # Enable samba3sam module if original passdb backend was ldap
-    if ldapurl is not None:
-        message("Enabling Samba3 LDAP mappings for SAM database")
-
-        enable_samba3sam(samdb)
-
-    return ret
-
-
-def enable_samba3sam(samdb):
-    samdb.modify("""
-dn: @MODULES
-changetype: modify
-replace: @LIST
-@LIST: samldb,operational,objectguid,rdn_name,samba3sam
-""")
-
-    samdb.add({"dn": "@MAP=samba3sam", "@MAP_URL": ldapurl})
-- 
cgit 


From 094f364fe172a117fd1cf8ae1855fd72fca8e5b4 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Thu, 27 Dec 2007 23:31:42 -0600
Subject: r26614: Fix options parsing for credentials in Python. (This used to
 be commit 9ef3b7de6baadeb2240ef9d24c55be9dc4cccf1e)

---
 source4/scripting/python/samba/getopt.py | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/getopt.py b/source4/scripting/python/samba/getopt.py
index 8143dcafdb..3335c55bc6 100644
--- a/source4/scripting/python/samba/getopt.py
+++ b/source4/scripting/python/samba/getopt.py
@@ -35,12 +35,24 @@ class VersionOptions(optparse.OptionGroup):
 class CredentialsOptions(optparse.OptionGroup):
     def __init__(self, parser):
         optparse.OptionGroup.__init__(self, parser, "Credentials Options")
-        self.add_option("--simple-bind-dn", type="string", metavar="DN",
+        self.add_option("--simple-bind-dn", metavar="DN", action="callback",
+                        callback=self.set_simple_bind_dn, type=str,
                         help="DN to use for a simple bind")
-        self.add_option("--password", type="string", metavar="PASSWORD",
-                        help="Password")
+        self.add_option("--password", metavar="PASSWORD", action="callback",
+                        help="Password", type=str, callback=self.set_password)
+        self.add_option("-U", "--username", metavar="USERNAME", 
+                        action="callback", type=str,
+                        help="username", callback=self.parse_username)
+        self.creds = Credentials()
+
+    def parse_username(self, option, opt_str, arg, parser):
+        self.creds.parse_string(arg)
+
+    def set_password(self, option, opt_str, arg, parser):
+        self.creds.set_password(arg)
+
+    def set_simple_bind_dn(self, option, opt_str, arg, parser):
+        self.creds.set_simple_bind_dn(arg)
 
     def get_credentials(self):
-        creds = Credentials()
-        # FIXME: Update
-        return creds
+        return self.creds
-- 
cgit 


From 8ad2a035e35284f50ed2650bb202f050416de248 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Thu, 27 Dec 2007 23:31:59 -0600
Subject: r26616: Support parsing of user data in SAmba 3 tdbsam. (This used to
 be commit 2f33e0451d6699fed8bc9abfa2f331317502b358)

---
 source4/scripting/python/samba/getopt.py       |   2 +-
 source4/scripting/python/samba/samba3.py       | 139 ++++++++++++++-----------
 source4/scripting/python/samba/tests/samba3.py |  32 +++++-
 source4/scripting/python/samba/upgrade.py      |  53 ----------
 4 files changed, 111 insertions(+), 115 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/getopt.py b/source4/scripting/python/samba/getopt.py
index 3335c55bc6..014dd336d8 100644
--- a/source4/scripting/python/samba/getopt.py
+++ b/source4/scripting/python/samba/getopt.py
@@ -23,7 +23,7 @@ from credentials import Credentials
 class SambaOptions(optparse.OptionGroup):
     def __init__(self, parser):
         optparse.OptionGroup.__init__(self, parser, "Samba Common Options")
-        self.add_option("--configfile", type="string", metavar="FILE",
+        self.add_option("-s", "--configfile", type="string", metavar="FILE",
                         help="Configuration file")
 
 
diff --git a/source4/scripting/python/samba/samba3.py b/source4/scripting/python/samba/samba3.py
index c9153d85cf..27656900ad 100644
--- a/source4/scripting/python/samba/samba3.py
+++ b/source4/scripting/python/samba/samba3.py
@@ -324,7 +324,8 @@ class SAMUser:
                  domain=None, dir_drive=None, munged_dial=None, homedir=None, logon_script=None,
                  profile_path=None, workstations=None, kickoff_time=None, bad_password_time=None,
                  pass_last_set_time=None, pass_can_change_time=None, pass_must_change_time=None,
-                 user_rid=None):
+                 user_rid=None, unknown_6=None, nt_password_history=None,
+                 unknown_str=None, hours=None, logon_divs=None):
         self.username = name
         self.uid = uid
         self.lm_password = lm_password
@@ -351,37 +352,16 @@ class SAMUser:
         self.pass_can_change_time = pass_can_change_time
         self.pass_must_change_time = pass_must_change_time
         self.user_rid = user_rid
+        self.unknown_6 = unknown_6
+        self.nt_password_history = nt_password_history
+        self.unknown_str = unknown_str
+        self.hours = hours
+        self.logon_divs = logon_divs
 
     def __eq__(self, other): 
         if not isinstance(other, SAMUser):
             return False
-        return (self.username == other.username and 
-                self.uid == other.uid and 
-                self.lm_password == other.lm_password and 
-                self.nt_password == other.nt_password and 
-                self.acct_ctrl == other.acct_ctrl and 
-                self.pass_last_set_time == other.pass_last_set_time and 
-                self.nt_username == other.nt_username and 
-                self.fullname == other.fullname and 
-                self.logon_time == other.logon_time and 
-                self.logoff_time == other.logoff_time and 
-                self.acct_desc == other.acct_desc and 
-                self.group_rid == other.group_rid and 
-                self.bad_password_count == other.bad_password_count and 
-                self.logon_count == other.logon_count and 
-                self.domain == other.domain and 
-                self.dir_drive == other.dir_drive and 
-                self.munged_dial == other.munged_dial and 
-                self.homedir == other.homedir and 
-                self.logon_script == other.logon_script and 
-                self.profile_path == other.profile_path and 
-                self.workstations == other.workstations and 
-                self.kickoff_time == other.kickoff_time and 
-                self.bad_password_time == other.bad_password_time and 
-                self.pass_can_change_time == other.pass_can_change_time and 
-                self.pass_must_change_time == other.pass_must_change_time and 
-                self.user_rid == other.user_rid)
-
+        return self.__dict__ == other.__dict__
 
 class SmbpasswdFile:
     def __init__(self, file):
@@ -451,7 +431,7 @@ class LdapSam:
 class TdbSam:
     def __init__(self, file):
         self.tdb = tdb.Tdb(file, flags=os.O_RDONLY)
-        self.version = self.tdb.fetch_uint32("INFO/version") or 0
+        self.version = self.tdb.fetch_uint32("INFO/version\0") or 0
         assert self.version in (0, 1, 2)
 
     def usernames(self):
@@ -463,41 +443,82 @@ class TdbSam:
     
     def __getitem__(self, name):
         data = self.tdb["%s%s\0" % (TDBSAM_USER_PREFIX, name)]
-        import struct
-        (logon_time, logoff_time, kickoff_time, pass_last_set_time, pass_can_change_time, \
-                pass_must_change_time) = struct.unpack("<llllll", data[:6*4])
         user = SAMUser(name)
-        user.logon_time = logon_time
+        import struct
+    
+        def unpack_string(data):
+            (length, ) = struct.unpack("<L", data[:4])
+            data = data[4:]
+            if length == 0:
+                return (None, data)
+            return (data[:length].rstrip("\0"), data[length:])
+
+        def unpack_int32(data):
+            (value, ) = struct.unpack("<l", data[:4])
+            return (value, data[4:])
+
+        def unpack_uint32(data):
+            (value, ) = struct.unpack("<L", data[:4])
+            return (value, data[4:])
+
+        def unpack_uint16(data):
+            (value, ) = struct.unpack("<H", data[:2])
+            return (value, data[2:])
+
+        (logon_time, data) = unpack_int32(data)
+        (logoff_time, data) = unpack_int32(data)
+        (kickoff_time, data) = unpack_int32(data)
+
+        if self.version > 0:
+            (bad_password_time, data) = unpack_int32(data)
+            if bad_password_time != 0:
+                user.bad_password_time = bad_password_time
+        (pass_last_set_time, data) = unpack_int32(data)
+        (pass_can_change_time, data) = unpack_int32(data)
+        (pass_must_change_time, data) = unpack_int32(data)
+
+        if logon_time != 0:
+            user.logon_time = logon_time
         user.logoff_time = logoff_time
         user.kickoff_time = kickoff_time
-        user.pass_last_set_time = pass_last_set_time
+        if pass_last_set_time != 0:
+            user.pass_last_set_time = pass_last_set_time
         user.pass_can_change_time = pass_can_change_time
 
-#	&username_len, &sampass->username,			/* B */
-#		&domain_len, &sampass->domain,				/* B */
-#		&nt_username_len, &sampass->nt_username,		/* B */
-#		&fullname_len, &sampass->fullname,			/* B */
-#		&homedir_len, &sampass->homedir,			/* B */
-#		&dir_drive_len, &sampass->dir_drive,			/* B */
-#		&logon_script_len, &sampass->logon_script,		/* B */
-#		&profile_path_len, &sampass->profile_path,		/* B */
-#		&acct_desc_len, &sampass->acct_desc,			/* B */
-#		&workstations_len, &sampass->workstations,		/* B */
-#		&unknown_str_len, &sampass->unknown_str,		/* B */
-#		&munged_dial_len, &sampass->munged_dial,		/* B */
-#		&sampass->user_rid,					/* d */
-#		&sampass->group_rid,					/* d */
-#		&lm_pw_len, sampass->lm_pw.hash,			/* B */
-#		&nt_pw_len, sampass->nt_pw.hash,			/* B */
-#		&sampass->acct_ctrl,					/* w */
-#		&remove_me, /* remove on the next TDB_FORMAT upgarde */	/* d */
-#		&sampass->logon_divs,					/* w */
-#		&sampass->hours_len,					/* d */
-#		&hourslen, &sampass->hours,				/* B */
-#		&sampass->bad_password_count,				/* w */
-#		&sampass->logon_count,					/* w */
-#		&sampass->unknown_6);					/* d */
-#		
+        (user.username, data) = unpack_string(data)
+        (user.domain, data) = unpack_string(data)
+        (user.nt_username, data) = unpack_string(data)
+        (user.fullname, data) = unpack_string(data)
+        (user.homedir, data) = unpack_string(data)
+        (user.dir_drive, data) = unpack_string(data)
+        (user.logon_script, data) = unpack_string(data)
+        (user.profile_path, data) = unpack_string(data)
+        (user.acct_desc, data) = unpack_string(data)
+        (user.workstations, data) = unpack_string(data)
+        (user.unknown_str, data) = unpack_string(data)
+        (user.munged_dial, data) = unpack_string(data)
+
+        (user.user_rid, data) = unpack_int32(data)
+        (user.group_rid, data) = unpack_int32(data)
+
+        (user.lm_password, data) = unpack_string(data)
+        (user.nt_password, data) = unpack_string(data)
+
+        if self.version > 1:
+            (user.nt_password_history, data) = unpack_string(data)
+
+        (user.acct_ctrl, data) = unpack_uint16(data)
+        (_, data) = unpack_uint32(data) # remove_me field
+        (user.logon_divs, data) = unpack_uint16(data)
+        (hours, data) = unpack_string(data)
+        user.hours = []
+        for entry in hours:
+            for i in range(8):
+                user.hours.append(ord(entry) & (2 ** i) == (2 ** i))
+        (user.bad_password_count, data) = unpack_uint16(data)
+        (user.logon_count, data) = unpack_uint16(data)
+        (user.unknown_6, data) = unpack_uint32(data)
+        assert len(data) == 0
         return user
 
     def close(self):
diff --git a/source4/scripting/python/samba/tests/samba3.py b/source4/scripting/python/samba/tests/samba3.py
index 22b21ba1b4..175aa90497 100644
--- a/source4/scripting/python/samba/tests/samba3.py
+++ b/source4/scripting/python/samba/tests/samba3.py
@@ -107,9 +107,37 @@ class TdbSamTestCase(unittest.TestCase):
         self.assertEquals(3, len(list(self.samdb.usernames())))
 
     def test_getuser(self):
-        return
         user = SAMUser("root")
-        self.assertEquals(user, self.samdb["root"])
+        user.logoff_time = 2147483647
+        user.kickoff_time = 2147483647
+        user.pass_can_change_time = 1125418267
+        user.username = "root"
+        user.uid = None
+        user.lm_password = 'U)\x02\x03\x1b\xed\xe9\xef\xaa\xd3\xb45\xb5\x14\x04\xee'
+        user.nt_password = '\x87\x8d\x80\x14`l\xda)gzD\xef\xa15?\xc7'
+        user.acct_ctrl = 16
+        user.pass_last_set_time = 1125418267
+        user.fullname = "root"
+        user.nt_username = ""
+        user.logoff_time = 2147483647
+        user.acct_desc = ""
+        user.group_rid = 1001
+        user.logon_count = 0
+        user.bad_password_count = 0
+        user.domain = "BEDWYR"
+        user.munged_dial = ""
+        user.workstations = ""
+        user.user_rid = 1000
+        user.kickoff_time = 2147483647
+        user.logoff_time = 2147483647
+        user.unknown_6 = 1260L
+        user.logon_divs = 0
+        user.hours = [True for i in range(168)]
+        other = self.samdb["root"]
+        for name in other.__dict__:
+            if other.__dict__[name] != user.__dict__[name]:
+                print "%s: %r != %r" % (name, other.__dict__[name], user.__dict__[name])
+        self.assertEquals(user, other)
 
 
 class WinsDatabaseTestCase(unittest.TestCase):
diff --git a/source4/scripting/python/samba/upgrade.py b/source4/scripting/python/samba/upgrade.py
index 3ecfe872f9..abf1127c36 100644
--- a/source4/scripting/python/samba/upgrade.py
+++ b/source4/scripting/python/samba/upgrade.py
@@ -435,56 +435,3 @@ def import_registry(samba4_registry, samba3_regdb):
             key_handle.set_value(value_name, value_type, value_data)
 
 
-def upgrade(subobj, samba3, message, paths, session_info, credentials):
-    ret = 0
-    samdb = Ldb(paths.samdb, session_info=session_info, credentials=credentials)
-
-    message("Writing configuration")
-    newconf = upgrade_smbconf(samba3.configuration,True)
-    newconf.save(paths.smbconf)
-
-    message("Importing account policies")
-    samdb.modify_ldif(upgrade_sam_policy(samba3,subobj.BASEDN))
-    regdb = Ldb(paths.hklm)
-
-    regdb.modify("""
-dn: value=RefusePasswordChange,key=Parameters,key=Netlogon,key=Services,key=CurrentControlSet,key=System,HIVE=NONE
-replace: type
-type: 4
-replace: data
-data: %d
-""" % policy.refuse_machine_password_change)
-
-    message("Importing users")
-    for account in samba3.samaccounts:
-        msg = "... " + account.username
-        ldif = upgrade_sam_account(samdb, accounts,subobj.BASEDN,subobj.DOMAINSID)
-        try:
-            samdb.add(ldif)
-        except LdbError, e:
-            # FIXME: Ignore 'Record exists' errors
-            msg += "... error: " + str(e)
-            ret += 1; 
-        message(msg)
-
-    message("Importing groups")
-    for mapping in samba3.groupmappings:
-        msg = "... " + mapping.nt_name
-        ldif = upgrade_sam_group(mapping, subobj.BASEDN)
-        if ldif is not None:
-            try:
-                samdb.add(ldif)
-            except LdbError, e:
-                # FIXME: Ignore 'Record exists' errors
-                msg += "... error: " + str(e)
-                ret += 1
-        message(msg)
-
-    message("Importing WINS data")
-    winsdb = Ldb(paths.winsdb)
-    ldb_erase(winsdb)
-
-    ldif = upgrade_wins(samba3)
-    winsdb.add(ldif)
-
-
-- 
cgit 


From 77c825f08b516e3e5acf40d0b744a01ce68635fe Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Fri, 28 Dec 2007 15:36:55 -0600
Subject: r26618: Implement -W option support. (This used to be commit
 e48026b17d682c01eb3343ef35f6e847b18fa297)

---
 source4/scripting/python/samba/getopt.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/getopt.py b/source4/scripting/python/samba/getopt.py
index 014dd336d8..87cf171ca2 100644
--- a/source4/scripting/python/samba/getopt.py
+++ b/source4/scripting/python/samba/getopt.py
@@ -42,12 +42,18 @@ class CredentialsOptions(optparse.OptionGroup):
                         help="Password", type=str, callback=self.set_password)
         self.add_option("-U", "--username", metavar="USERNAME", 
                         action="callback", type=str,
-                        help="username", callback=self.parse_username)
+                        help="Username", callback=self.parse_username)
+        self.add_option("-W", "--workgroup", metavar="WORKGROUP", 
+                        action="callback", type=str,
+                        help="Workgroup", callback=self.parse_workgroup)
         self.creds = Credentials()
 
     def parse_username(self, option, opt_str, arg, parser):
         self.creds.parse_string(arg)
 
+    def parse_workgroup(self, option, opt_str, arg, parser):
+        self.creds.set_domain(arg)
+
     def set_password(self, option, opt_str, arg, parser):
         self.creds.set_password(arg)
 
-- 
cgit 


From a61e25f17492bf78eb5d5ec962f0d174f94d8f84 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Fri, 28 Dec 2007 16:25:17 -0600
Subject: r26622: python: Update license version, clarify copyright. (This used
 to be commit 3ee62094074d74b6c69948730f2892f0a430f40b)

---
 source4/scripting/python/samba/provision.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index 53eb1d618f..fa45f7a79d 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -1,6 +1,6 @@
 #
 #    backend code for provisioning a Samba4 server
-#    Released under the GNU GPL v2 or later
+#    Released under the GNU GPL v3 or later
 #    Copyright Jelmer Vernooij 2007
 #
 # Based on the original in EJS:
-- 
cgit 


From 68b698270481f2b033046dcd6e0a293c1cdaf838 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Fri, 28 Dec 2007 16:25:27 -0600
Subject: r26624: libnet/python: Use standard function for constructing
 context, allow overriding credentials. (This used to be commit
 a5fb3caedefaf5387e3a384d060272f11a3b4b99)

---
 source4/scripting/python/modules.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/modules.c b/source4/scripting/python/modules.c
index 2a88870660..6094cb49f4 100644
--- a/source4/scripting/python/modules.c
+++ b/source4/scripting/python/modules.c
@@ -33,6 +33,7 @@ extern void init_tdb(void);
 extern void init_dcerpc(void);
 extern void init_events(void);
 extern void inituuid(void);
+extern void init_net(void);
 
 static struct _inittab py_modules[] = { STATIC_LIBPYTHON_MODULES };
 
-- 
cgit 


From 6817c5d885a75a1af0e646827c3fa8220df8c7a5 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sat, 29 Dec 2007 18:14:15 -0600
Subject: r26628: python: Add more documentation, simplify code in Samba3
 module. (This used to be commit 3c329ee73d9979236313c37e51750ec06b8dd69e)

---
 source4/scripting/python/config.mk               |   2 +-
 source4/scripting/python/samba/__init__.py       |   8 ++
 source4/scripting/python/samba/getopt.py         |   2 +-
 source4/scripting/python/samba/provision.py      |  96 ++++++++++++++--------
 source4/scripting/python/samba/samba3.py         | 100 +++++++++++++++--------
 source4/scripting/python/samba/samdb.py          |  50 ++++++++----
 source4/scripting/python/samba/tests/__init__.py |   4 +
 7 files changed, 175 insertions(+), 87 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/config.mk b/source4/scripting/python/config.mk
index 4a531f5062..cfd179aff5 100644
--- a/source4/scripting/python/config.mk
+++ b/source4/scripting/python/config.mk
@@ -30,7 +30,7 @@ realdistclean::
 
 pythonmods: $(PYTHON_DSOS)
 
-PYDOCTOR_MODULES=bin/python/ldb.py bin/python/auth.py bin/python/credentials.py bin/python/registry.py bin/python/tdb.py bin/python/security.py
+PYDOCTOR_MODULES=bin/python/ldb.py bin/python/auth.py bin/python/credentials.py bin/python/registry.py bin/python/tdb.py bin/python/security.py bin/python/events.py bin/python/net.py
 
 pydoctor:: pythonmods
 	LD_LIBRARY_PATH=bin/shared PYTHONPATH=bin/python pydoctor --make-html --docformat=restructuredtext --add-package scripting/python/samba/ $(addprefix --add-module , $(PYDOCTOR_MODULES))
diff --git a/source4/scripting/python/samba/__init__.py b/source4/scripting/python/samba/__init__.py
index 359457d815..01fdea6665 100644
--- a/source4/scripting/python/samba/__init__.py
+++ b/source4/scripting/python/samba/__init__.py
@@ -159,11 +159,19 @@ class Ldb(ldb.Ldb):
         self.add_ldif(open(ldif_path, 'r').read())
 
     def add_ldif(self, ldif):
+        """Add data based on a LDIF string.
+
+        :param ldif: LDIF text.
+        """
         for changetype, msg in self.parse_ldif(ldif):
             assert changetype == ldb.CHANGETYPE_NONE
             self.add(msg)
 
     def modify_ldif(self, ldif):
+        """Modify database based on a LDIF string.
+
+        :param ldif: LDIF text.
+        """
         for (changetype, msg) in self.parse_ldif(ldif):
             assert changetype == ldb.CHANGETYPE_MODIFY
             self.modify(msg)
diff --git a/source4/scripting/python/samba/getopt.py b/source4/scripting/python/samba/getopt.py
index 87cf171ca2..c0e7053062 100644
--- a/source4/scripting/python/samba/getopt.py
+++ b/source4/scripting/python/samba/getopt.py
@@ -58,7 +58,7 @@ class CredentialsOptions(optparse.OptionGroup):
         self.creds.set_password(arg)
 
     def set_simple_bind_dn(self, option, opt_str, arg, parser):
-        self.creds.set_simple_bind_dn(arg)
+        self.creds.set_bind_dn(arg)
 
     def get_credentials(self):
         return self.creds
diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index fa45f7a79d..bdfe035c41 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -74,6 +74,14 @@ def findnss(nssfn, *names):
 
 
 def open_ldb(session_info, credentials, lp, dbname):
+    """Open a LDB, thrashing it if it is corrupt.
+
+    :param session_info: auth session information
+    :param credentials: credentials
+    :param lp: Loadparm context
+    :param dbname: Path of the database to open.
+    :return: a Ldb object
+    """
     assert session_info is not None
     try:
         return Ldb(dbname, session_info=session_info, credentials=credentials, 
@@ -86,7 +94,12 @@ def open_ldb(session_info, credentials, lp, dbname):
 
 
 def setup_add_ldif(ldb, ldif_path, subst_vars=None):
-    """Setup a ldb in the private dir."""
+    """Setup a ldb in the private dir.
+    
+    :param ldb: LDB file to import data into
+    :param ldif_path: Path of the LDIF file to load
+    :param subst_vars: Optional variables to subsitute in LDIF.
+    """
     assert isinstance(ldif_path, str)
 
     data = open(ldif_path, 'r').read()
@@ -126,7 +139,12 @@ def setup_ldb(ldb, ldif_path, subst_vars):
 
 
 def setup_file(template, fname, substvars):
-    """Setup a file in the private dir."""
+    """Setup a file in the private dir.
+
+    :param template: Path of the template file.
+    :param fname: Path of the file to create.
+    :param substvars: Substitution variables.
+    """
     f = fname
 
     if os.path.exists(f):
@@ -179,7 +197,17 @@ def provision_paths_from_lp(lp, dnsdomain):
 
 def setup_name_mappings(ldb, sid, domaindn, root, nobody, nogroup, users, 
                         wheel, backup):
-    """setup reasonable name mappings for sam names to unix names."""
+    """setup reasonable name mappings for sam names to unix names.
+    
+    :param ldb: SamDB object.
+    :param sid: The domain sid.
+    :param domaindn: The domain DN.
+    :param root: Name of the UNIX root user.
+    :param nobody: Name of the UNIX nobody user.
+    :param nogroup: Name of the unix nobody group.
+    :param users: Name of the unix users group.
+    :param wheel: Name of the wheel group (users that can become root).
+    :param backup: Name of the backup group."""
     # add some foreign sids if they are not present already
     ldb.add_foreign(domaindn, "S-1-5-7", "Anonymous")
     ldb.add_foreign(domaindn, "S-1-1-0", "World")
@@ -591,7 +619,8 @@ def provision(lp, setup_dir, message, blank, paths, session_info,
     if nogroup is None:
         nogroup = findnss(grp.getgrnam, "nogroup", "nobody")[2]
     if users is None:
-        users = findnss(grp.getgrnam, "users", "guest", "other", "unknown", "usr")[2]
+        users = findnss(grp.getgrnam, "users", "guest", "other", "unknown", 
+                        "usr")[2]
     if wheel is None:
         wheel = findnss(grp.getgrnam, "wheel", "root", "staff", "adm")[2]
     if backup is None:
@@ -748,13 +777,32 @@ def provision(lp, setup_dir, message, blank, paths, session_info,
     return domaindn
 
 def create_phplpapdadmin_config(path, setup_path, s4_ldapi_path):
+    """Create a PHP LDAP admin configuration file.
+
+    :param path: Path to write the configuration to.
+    :param setup_path: Function to generate setup paths.
+    :param s4_ldapi_path: Path to Samba 4 LDAPI socket.
+    """
     setup_file(setup_path("phpldapadmin-config.php"), 
                path, {"S4_LDAPI_URI": "ldapi://%s" % s4_ldapi_path.replace("/", "%2F")})
 
 
 def create_zone_file(path, setup_path, samdb, dnsdomain, domaindn, 
                   hostip, hostname, dnspass, realm, domainguid, hostguid):
-    """Write out a DNS zone file, from the info in the current database."""
+    """Write out a DNS zone file, from the info in the current database.
+    
+    :param path: Path of the new file.
+    :param setup_path": Setup path function.
+    :param samdb: SamDB object
+    :param dnsdomain: DNS Domain name
+    :param domaindn: DN of the Domain
+    :param hostip: Local IP
+    :param hostname: Local hostname
+    :param dnspass: Password for DNS
+    :param realm: Realm name
+    :param domainguid: GUID of the domain.
+    :param hostguid: GUID of the host.
+    """
 
     setup_file(setup_path("provision.zone"), path, {
             "DNSPASS_B64": b64encode(dnspass),
@@ -795,7 +843,14 @@ def provision_ldapbase(setup_dir, message, paths):
 
 
 def load_schema(setup_path, samdb, schemadn, netbiosname, configdn):
-    """Load schema."""
+    """Load schema.
+    
+    :param samdb: Load a schema into a SamDB.
+    :param setup_path: Setup path function.
+    :param schemadn: DN of the schema
+    :param netbiosname: NetBIOS name of the host.
+    :param configdn: DN of the configuration
+    """
     schema_data = open(setup_path("schema.ldif"), 'r').read()
     schema_data += open(setup_path("schema_samba4.ldif"), 'r').read()
     schema_data = substitute_var(schema_data, {"SCHEMADN": schemadn})
@@ -807,32 +862,3 @@ def load_schema(setup_path, samdb, schemadn, netbiosname, configdn):
                     "DEFAULTSITE": DEFAULTSITE})
     samdb.attach_schema_from_ldif(head_data, schema_data)
 
-
-def join_domain(domain, netbios_name, join_type, creds):
-    ctx = NetContext(creds)
-    joindom = object()
-    joindom.domain = domain
-    joindom.join_type = join_type
-    joindom.netbios_name = netbios_name
-    if not ctx.JoinDomain(joindom):
-        raise Exception("Domain Join failed: " + joindom.error_string)
-
-
-def vampire(domain, session_info, credentials, message):
-    """Vampire a remote domain.  
-    
-    Session info and credentials are required for for
-    access to our local database (might be remote ldap)
-    """
-    ctx = NetContext(credentials)
-    machine_creds = Credentials()
-    machine_creds.set_domain(form.domain)
-    if not machine_creds.set_machine_account():
-        raise Exception("Failed to access domain join information!")
-    vampire_ctx.machine_creds = machine_creds
-    vampire_ctx.session_info = session_info
-    if not ctx.SamSyncLdb(vampire_ctx):
-        raise Exception("Migration of remote domain to Samba failed: %s " % vampire_ctx.error_string)
-
-
-
diff --git a/source4/scripting/python/samba/samba3.py b/source4/scripting/python/samba/samba3.py
index 27656900ad..113348e6f1 100644
--- a/source4/scripting/python/samba/samba3.py
+++ b/source4/scripting/python/samba/samba3.py
@@ -25,14 +25,33 @@ REGISTRY_DB_VERSION = 1
 import os
 import tdb
 
-class Registry:
-    """Simple read-only support for reading the Samba3 registry."""
+
+class TdbDatabase:
+    """Simple Samba 3 TDB database reader."""
     def __init__(self, file):
+        """Open a file.
+
+        :param file: Path of the file to open.
+        """
         self.tdb = tdb.Tdb(file, flags=os.O_RDONLY)
+        self._check_version()
+
+    def _check_version(self):
+        pass
 
     def close(self):
+        """Close resources associated with this object."""
         self.tdb.close()
 
+
+class Registry(TdbDatabase):
+    """Simple read-only support for reading the Samba3 registry.
+    
+    :note: This object uses the same syntax for registry key paths as 
+        Samba 3. This particular format uses forward slashes for key path 
+        separators and abbreviations for the predefined key names. 
+        e.g.: HKLM/Software/Bar.
+    """
     def __len__(self):
         """Return the number of keys."""
         return len(self.keys())
@@ -42,6 +61,11 @@ class Registry:
         return [k.rstrip("\x00") for k in self.tdb.keys() if not k.startswith(REGISTRY_VALUE_PREFIX)]
 
     def subkeys(self, key):
+        """Retrieve the subkeys for the specified key.
+
+        :param key: Key path.
+        :return: list with key names
+        """
         data = self.tdb.get("%s\x00" % key)
         if data is None:
             return []
@@ -54,7 +78,11 @@ class Registry:
         return keys
 
     def values(self, key):
-        """Return a dictionary with the values set for a specific key."""
+        """Return a dictionary with the values set for a specific key.
+        
+        :param key: Key to retrieve values for.
+        :return: Dictionary with value names as key, tuple with type and 
+            data as value."""
         data = self.tdb.get("%s/%s\x00" % (REGISTRY_VALUE_PREFIX, key))
         if data is None:
             return {}
@@ -77,9 +105,14 @@ class Registry:
         return ret
 
 
-class PolicyDatabase:
+class PolicyDatabase(TdbDatabase):
+    """Samba 3 Account Policy database reader."""
     def __init__(self, file):
-        self.tdb = tdb.Tdb(file, flags=os.O_RDONLY)
+        """Open a policy database
+        
+        :param file: Path to the file to open.
+        """
+        super(PolicyDatabase, self).__init__(file)
         self.min_password_length = self.tdb.fetch_uint32("min password length\x00")
         self.password_history = self.tdb.fetch_uint32("password history\x00")
         self.user_must_logon_to_change_password = self.tdb.fetch_uint32("user must logon to change pasword\x00")
@@ -93,9 +126,6 @@ class PolicyDatabase:
 
         # FIXME: Read privileges as well
 
-    def close(self):
-        self.tdb.close()
-
 
 GROUPDB_DATABASE_VERSION_V1 = 1 # native byte format.
 GROUPDB_DATABASE_VERSION_V2 = 2 # le format.
@@ -108,17 +138,27 @@ GROUP_PREFIX = "UNIXGROUP/"
 # hanging of the member as key.
 MEMBEROF_PREFIX = "MEMBEROF/"
 
-class GroupMappingDatabase:
-    def __init__(self, file): 
-        self.tdb = tdb.Tdb(file, flags=os.O_RDONLY)
+class GroupMappingDatabase(TdbDatabase):
+    """Samba 3 group mapping database reader."""
+    def _check_version(self):
         assert self.tdb.fetch_int32("INFO/version\x00") in (GROUPDB_DATABASE_VERSION_V1, GROUPDB_DATABASE_VERSION_V2)
 
     def groupsids(self):
+        """Retrieve the SIDs for the groups in this database.
+
+        :return: List with sids as strings.
+        """
         for k in self.tdb.keys():
             if k.startswith(GROUP_PREFIX):
                 yield k[len(GROUP_PREFIX):].rstrip("\0")
 
     def get_group(self, sid):
+        """Retrieve the group mapping information for a particular group.
+
+        :param sid: SID of the group
+        :return: None if the group can not be found, otherwise 
+            a tuple with gid, sid_name_use, the NT name and comment.
+        """
         data = self.tdb.get("%s%s\0" % (GROUP_PREFIX, sid))
         if data is None:
             return data
@@ -128,13 +168,11 @@ class GroupMappingDatabase:
         return (gid, sid_name_use, nt_name, comment)
 
     def aliases(self):
+        """Retrieve the aliases in this database."""
         for k in self.tdb.keys():
             if k.startswith(MEMBEROF_PREFIX):
                 yield k[len(MEMBEROF_PREFIX):].rstrip("\0")
 
-    def close(self):
-        self.tdb.close()
-
 
 # High water mark keys
 IDMAP_HWM_GROUP = "GROUP HWM\0"
@@ -146,22 +184,29 @@ IDMAP_USER_PREFIX = "UID "
 # idmap version determines auto-conversion
 IDMAP_VERSION_V2 = 2
 
-class IdmapDatabase:
-    def __init__(self, file):
-        self.tdb = tdb.Tdb(file, flags=os.O_RDONLY)
+class IdmapDatabase(TdbDatabase):
+    """Samba 3 ID map database reader."""
+    def _check_version(self):
         assert self.tdb.fetch_int32("IDMAP_VERSION\0") == IDMAP_VERSION_V2
 
     def uids(self):
+        """Retrieve a list of all uids in this database."""
         for k in self.tdb.keys():
             if k.startswith(IDMAP_USER_PREFIX):
                 yield int(k[len(IDMAP_USER_PREFIX):].rstrip("\0"))
 
     def gids(self):
+        """Retrieve a list of all gids in this database."""
         for k in self.tdb.keys():
             if k.startswith(IDMAP_GROUP_PREFIX):
                 yield int(k[len(IDMAP_GROUP_PREFIX):].rstrip("\0"))
 
     def get_user_sid(self, uid):
+        """Retrieve the SID associated with a particular uid.
+
+        :param uid: UID to retrieve SID for.
+        :return: A SID or None if no mapping was found.
+        """
         data = self.tdb.get("%s%d\0" % (IDMAP_USER_PREFIX, uid))
         if data is None:
             return data
@@ -174,19 +219,15 @@ class IdmapDatabase:
         return data.rstrip("\0")
 
     def get_user_hwm(self):
+        """Obtain the user high-water mark."""
         return self.tdb.fetch_uint32(IDMAP_HWM_USER)
 
     def get_group_hwm(self):
+        """Obtain the group high-water mark."""
         return self.tdb.fetch_uint32(IDMAP_HWM_GROUP)
 
-    def close(self):
-        self.tdb.close()
-
-
-class SecretsDatabase:
-    def __init__(self, file):
-        self.tdb = tdb.Tdb(file, flags=os.O_RDONLY)
 
+class SecretsDatabase(TdbDatabase):
     def get_auth_password(self):
         return self.tdb.get("SECRETS/AUTH_PASSWORD")
 
@@ -241,16 +282,12 @@ class SecretsDatabase:
     def get_sid(self, host):
         return self.tdb.get("SECRETS/SID/%s" % host.upper())
 
-    def close(self):
-        self.tdb.close()
-
 
 SHARE_DATABASE_VERSION_V1 = 1
 SHARE_DATABASE_VERSION_V2 = 2
 
-class ShareInfoDatabase:
-    def __init__(self, file):
-        self.tdb = tdb.Tdb(file, flags=os.O_RDONLY)
+class ShareInfoDatabase(TdbDatabase):
+    def _check_version(self):
         assert self.tdb.fetch_int32("INFO/version\0") in (SHARE_DATABASE_VERSION_V1, SHARE_DATABASE_VERSION_V2)
 
     def get_secdesc(self, name):
@@ -258,9 +295,6 @@ class ShareInfoDatabase:
         # FIXME: Run ndr_pull_security_descriptor
         return secdesc
 
-    def close(self):
-        self.tdb.close()
-
 
 class Shares:
     def __init__(self, lp, shareinfo):
diff --git a/source4/scripting/python/samba/samdb.py b/source4/scripting/python/samba/samdb.py
index 46707f060f..2af56d8d8e 100644
--- a/source4/scripting/python/samba/samdb.py
+++ b/source4/scripting/python/samba/samdb.py
@@ -20,13 +20,20 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
+"""Convenience functions for using the SAM."""
+
 import samba
 import misc
 import ldb
 
 class SamDB(samba.Ldb):
+    """The SAM database."""
     def __init__(self, url=None, session_info=None, credentials=None, 
                  modules_dir=None, lp=None):
+        """Open the Sam Database.
+
+        :param url: URL of the database.
+        """
         super(SamDB, self).__init__(session_info=session_info, credentials=credentials,
                                     modules_dir=modules_dir, lp=lp)
         assert misc.dsdb_set_global_schema(self) == 0
@@ -47,7 +54,12 @@ description: %s
             self.add(msg[1])
 
     def setup_name_mapping(self, domaindn, sid, unixname):
-        """Setup a mapping between a sam name and a unix name."""
+        """Setup a mapping between a sam name and a unix name.
+        
+        :param domaindn: DN of the domain.
+        :param sid: SID of the NT-side of the mapping.
+        :param unixname: Unix name to map to.
+        """
         res = self.search(ldb.Dn(self, domaindn), ldb.SCOPE_SUBTREE, 
                          "objectSid=%s" % sid, ["dn"])
         assert len(res) == 1, "Failed to find record for objectSid %s" % sid
@@ -61,7 +73,7 @@ unixName: %s
         self.modify(self.parse_ldif(mod).next()[1])
 
     def enable_account(self, user_dn):
-        """enable the account.
+        """Enable an account.
         
         :param user_dn: Dn of the account to enable.
         """
@@ -75,10 +87,15 @@ changetype: modify
 replace: userAccountControl
 userAccountControl: %u
 """ % (user_dn, userAccountControl)
-        self.modify(mod)
+        self.modify_ldif(mod)
 
-    def newuser(self, username, unixname, password, message):
-        """add a new user record"""
+    def newuser(self, username, unixname, password):
+        """add a new user record.
+        
+        :param username: Name of the new user.
+        :param unixname: Name of the unix user to map to.
+        :param password: Password for the new user
+        """
         # connect to the sam 
         self.transaction_start()
 
@@ -97,13 +114,13 @@ userAccountControl: %u
         #  the new user record. note the reliance on the samdb module to fill
         #  in a sid, guid etc
         #
-        ldif = """
-dn: %s
-sAMAccountName: %s
-unixName: %s
-sambaPassword: %s
-objectClass: user
-    """ % (user_dn, username, unixname, password)
+        #  now the real work
+        self.add({"dn": user_dn, 
+            "sAMAccountName": username,
+            "unixName": unixname,
+            "sambaPassword": password,
+            "objectClass": "user"})
+
         #  add the user to the users group as well
         modgroup = """
 dn: %s
@@ -113,11 +130,6 @@ member: %s
 """ % (dom_users, user_dn)
 
 
-        #  now the real work
-        message("Adding user %s" % user_dn)
-        self.add(ldif)
-
-        message("Modifying group %s" % dom_users)
         self.modify(modgroup)
 
         #  modify the userAccountControl to remove the disabled bit
@@ -125,6 +137,10 @@ member: %s
         self.transaction_commit()
 
     def set_domain_sid(self, sid):
+        """Change the domain SID used by this SamDB.
+
+        :param sid: The new domain sid to use.
+        """
         misc.samdb_set_domain_sid(self, sid)
 
     def attach_schema_from_ldif(self, pf, df):
diff --git a/source4/scripting/python/samba/tests/__init__.py b/source4/scripting/python/samba/tests/__init__.py
index 5e1ff87c2b..ad8a2524b5 100644
--- a/source4/scripting/python/samba/tests/__init__.py
+++ b/source4/scripting/python/samba/tests/__init__.py
@@ -17,6 +17,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
+"""Samba Python tests."""
+
 import os
 import ldb
 import samba
@@ -24,11 +26,13 @@ import tempfile
 import unittest
 
 class LdbTestCase(unittest.TestCase):
+    """Trivial test case for running tests against a LDB."""
     def setUp(self):
         self.filename = os.tempnam()
         self.ldb = samba.Ldb(self.filename)
 
     def set_modules(self, modules=[]):
+        """Change the modules for this Ldb."""
         m = ldb.Message()
         m.dn = ldb.Dn(self.ldb, "@MODULES")
         m["@LIST"] = ",".join(modules)
-- 
cgit 


From 2bd4bf6a1beb2b00ab86cca59ac875bf75c921ef Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sat, 29 Dec 2007 18:14:18 -0600
Subject: r26629: python: Improve documentation in various places. (This used
 to be commit ee71a27bca66426d34cb1d686a83ac6a342329d3)

---
 source4/scripting/python/samba/getopt.py    | 16 +++++------
 source4/scripting/python/samba/provision.py |  8 +++++-
 source4/scripting/python/samba/samba3.py    | 43 +++++++++++++++++++++++------
 3 files changed, 50 insertions(+), 17 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/getopt.py b/source4/scripting/python/samba/getopt.py
index c0e7053062..a087974a69 100644
--- a/source4/scripting/python/samba/getopt.py
+++ b/source4/scripting/python/samba/getopt.py
@@ -36,28 +36,28 @@ class CredentialsOptions(optparse.OptionGroup):
     def __init__(self, parser):
         optparse.OptionGroup.__init__(self, parser, "Credentials Options")
         self.add_option("--simple-bind-dn", metavar="DN", action="callback",
-                        callback=self.set_simple_bind_dn, type=str,
+                        callback=self._set_simple_bind_dn, type=str,
                         help="DN to use for a simple bind")
         self.add_option("--password", metavar="PASSWORD", action="callback",
-                        help="Password", type=str, callback=self.set_password)
+                        help="Password", type=str, callback=self._set_password)
         self.add_option("-U", "--username", metavar="USERNAME", 
                         action="callback", type=str,
-                        help="Username", callback=self.parse_username)
+                        help="Username", callback=self._parse_username)
         self.add_option("-W", "--workgroup", metavar="WORKGROUP", 
                         action="callback", type=str,
-                        help="Workgroup", callback=self.parse_workgroup)
+                        help="Workgroup", callback=self._parse_workgroup)
         self.creds = Credentials()
 
-    def parse_username(self, option, opt_str, arg, parser):
+    def _parse_username(self, option, opt_str, arg, parser):
         self.creds.parse_string(arg)
 
-    def parse_workgroup(self, option, opt_str, arg, parser):
+    def _parse_workgroup(self, option, opt_str, arg, parser):
         self.creds.set_domain(arg)
 
-    def set_password(self, option, opt_str, arg, parser):
+    def _set_password(self, option, opt_str, arg, parser):
         self.creds.set_password(arg)
 
-    def set_simple_bind_dn(self, option, opt_str, arg, parser):
+    def _set_simple_bind_dn(self, option, opt_str, arg, parser):
         self.creds.set_bind_dn(arg)
 
     def get_credentials(self):
diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index bdfe035c41..db3749f721 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -23,6 +23,7 @@ import security
 from ldb import Dn, SCOPE_SUBTREE, SCOPE_ONELEVEL, SCOPE_BASE, LdbError, \
         LDB_ERR_NO_SUCH_OBJECT, timestring, CHANGETYPE_MODIFY, CHANGETYPE_NONE
 
+"""Functions for setting up a Samba configuration."""
 
 DEFAULTSITE = "Default-First-Site-Name"
 
@@ -53,7 +54,12 @@ class ProvisionPaths:
 
 
 def install_ok(lp, session_info, credentials):
-    """Check whether the current install seems ok."""
+    """Check whether the current install seems ok.
+    
+    :param lp: Loadparm context
+    :param session_info: Session information
+    :param credentials: Credentials
+    """
     if lp.get("realm") == "":
         return False
     ldb = Ldb(lp.get("sam database"), session_info=session_info, 
diff --git a/source4/scripting/python/samba/samba3.py b/source4/scripting/python/samba/samba3.py
index 113348e6f1..cffedb54af 100644
--- a/source4/scripting/python/samba/samba3.py
+++ b/source4/scripting/python/samba/samba3.py
@@ -26,7 +26,7 @@ import os
 import tdb
 
 
-class TdbDatabase:
+class TdbDatabase(object):
     """Simple Samba 3 TDB database reader."""
     def __init__(self, file):
         """Open a file.
@@ -228,6 +228,7 @@ class IdmapDatabase(TdbDatabase):
 
 
 class SecretsDatabase(TdbDatabase):
+    """Samba 3 Secrets database reader."""
     def get_auth_password(self):
         return self.tdb.get("SECRETS/AUTH_PASSWORD")
 
@@ -246,6 +247,10 @@ class SecretsDatabase(TdbDatabase):
                 yield k[len("SECRETS/LDAP_BIND_PW/"):].rstrip("\0")
 
     def domains(self):
+        """Iterate over domains in this database.
+
+        :return: Iterator over the names of domains in this database.
+        """
         for k in self.tdb.keys():
             if k.startswith("SECRETS/SID/"):
                 yield k[len("SECRETS/SID/"):].rstrip("\0")
@@ -287,10 +292,15 @@ SHARE_DATABASE_VERSION_V1 = 1
 SHARE_DATABASE_VERSION_V2 = 2
 
 class ShareInfoDatabase(TdbDatabase):
+    """Samba 3 Share Info database reader."""
     def _check_version(self):
         assert self.tdb.fetch_int32("INFO/version\0") in (SHARE_DATABASE_VERSION_V1, SHARE_DATABASE_VERSION_V2)
 
     def get_secdesc(self, name):
+        """Obtain the security descriptor on a particular share.
+        
+        :param name: Name of the share
+        """
         secdesc = self.tdb.get("SECDESC/%s" % name)
         # FIXME: Run ndr_pull_security_descriptor
         return secdesc
@@ -302,9 +312,11 @@ class Shares:
         self.shareinfo = shareinfo
 
     def __len__(self):
+        """Number of shares."""
         return len(self.lp) - 1
 
     def __iter__(self):
+        """Iterate over the share names."""
         return self.lp.__iter__()
 
 
@@ -329,7 +341,7 @@ ACB_PW_EXPIRED = 0x00020000
 ACB_NO_AUTH_DATA_REQD = 0x00080000
 
 acb_info_mapping = {
-        'N': ACB_PWNOTREQ,  # 'N'o password. 
+        'N': ACB_PWNOTREQ,  # 'N'o password.
         'D': ACB_DISABLED,  # 'D'isabled.
         'H': ACB_HOMDIRREQ, # 'H'omedir required.
         'T': ACB_TEMPDUP,   # 'T'emp account.
@@ -344,6 +356,11 @@ acb_info_mapping = {
         }
 
 def decode_acb(text):
+    """Decode a ACB field.
+
+    :param text: ACB text
+    :return: integer with flags set.
+    """
     assert not "[" in text and not "]" in text
     ret = 0
     for x in text:
@@ -352,6 +369,10 @@ def decode_acb(text):
 
 
 class SAMUser:
+    """Samba 3 SAM User.
+    
+    :note: Unknown or unset fields are set to None.
+    """
     def __init__(self, name, uid=None, lm_password=None, nt_password=None, acct_ctrl=None, 
                  last_change_time=None, nt_username=None, fullname=None, logon_time=None, logoff_time=None,
                  acct_desc=None, group_rid=None, bad_password_count=None, logon_count=None,
@@ -398,6 +419,7 @@ class SAMUser:
         return self.__dict__ == other.__dict__
 
 class SmbpasswdFile:
+    """Samba 3 smbpasswd file reader."""
     def __init__(self, file):
         self.users = {}
         f = open(file, 'r')
@@ -458,13 +480,14 @@ TDBSAM_USER_PREFIX = "USER_"
 
 
 class LdapSam:
+    """Samba 3 LDAP passdb backend reader."""
     def __init__(self, url):
         self.ldap_url = ldap_url
 
 
-class TdbSam:
-    def __init__(self, file):
-        self.tdb = tdb.Tdb(file, flags=os.O_RDONLY)
+class TdbSam(TdbDatabase):
+    """Samba 3 TDB passdb backend reader."""
+    def _check_version(self):
         self.version = self.tdb.fetch_uint32("INFO/version\0") or 0
         assert self.version in (0, 1, 2)
 
@@ -555,9 +578,6 @@ class TdbSam:
         assert len(data) == 0
         return user
 
-    def close(self):
-        self.tdb.close()
-
 
 def shellsplit(text):
     """Very simple shell-like line splitting.
@@ -582,6 +602,7 @@ def shellsplit(text):
 
 
 class WinsDatabase:
+    """Samba 3 WINS database reader."""
     def __init__(self, file):
         self.entries = {}
         f = open(file, 'r')
@@ -618,7 +639,13 @@ class WinsDatabase:
         pass
 
 class Samba3:
+    """Samba 3 configuration and state data reader."""
     def __init__(self, libdir, smbconfpath):
+        """Open the configuration and data for a Samba 3 installation.
+
+        :param libdir: Library directory
+        :param smbconfpath: Path to the smb.conf file.
+        """
         self.smbconfpath = smbconfpath
         self.libdir = libdir
         import param
-- 
cgit 


From 5e03b921825ffe177bf9d00ed1e12de02728da75 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Wed, 2 Jan 2008 01:52:31 -0600
Subject: r26642: samba3sam.py: Remove more EJS-specific code. (This used to be
 commit 7d14b657b3d59924b15f4f84bbd5745cd7f759ef)

---
 source4/scripting/python/samba/__init__.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/__init__.py b/source4/scripting/python/samba/__init__.py
index 01fdea6665..e0b9e1d410 100644
--- a/source4/scripting/python/samba/__init__.py
+++ b/source4/scripting/python/samba/__init__.py
@@ -172,8 +172,7 @@ class Ldb(ldb.Ldb):
 
         :param ldif: LDIF text.
         """
-        for (changetype, msg) in self.parse_ldif(ldif):
-            assert changetype == ldb.CHANGETYPE_MODIFY
+        for changetype, msg in self.parse_ldif(ldif):
             self.modify(msg)
 
 
-- 
cgit 


From 771b347f9b185895390445be96081c781e28a26d Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Wed, 2 Jan 2008 18:39:01 -0600
Subject: r26644: Janitorial: Pass resolve_context explicitly to various SMB
 functions, should help fix the build for OpenChange. (This used to be commit
 385ffe4f4cc9a21a760c0f00410f56e2592fd507)

---
 source4/scripting/ejs/smbcalls_cli.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_cli.c b/source4/scripting/ejs/smbcalls_cli.c
index a7210eb0fb..bb1e445d04 100644
--- a/source4/scripting/ejs/smbcalls_cli.c
+++ b/source4/scripting/ejs/smbcalls_cli.c
@@ -26,6 +26,7 @@
 #include "libcli/composite/composite.h"
 #include "libcli/smb_composite/smb_composite.h"
 #include "libcli/libcli.h"
+#include "libcli/resolve/resolve.h"
 #include "auth/credentials/credentials.h"
 #include "param/param.h"
 
@@ -445,7 +446,9 @@ static int ejs_tree_connect(MprVarHandle eid, int argc, char **argv)
 	io.in.fallback_to_anonymous  = false;
 	io.in.workgroup              = lp_workgroup(global_loadparm);
 
-	result = smb_composite_connect(&io, mem_ctx, NULL);
+	result = smb_composite_connect(&io, mem_ctx, 
+				       lp_resolve_context(global_loadparm), 
+				       NULL);
 	tree = io.out.tree;
 
 	talloc_free(mem_ctx);
-- 
cgit 


From 969b8579c755441092e27b499ecedbd7d725816d Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Wed, 2 Jan 2008 18:39:15 -0600
Subject: r26646: libcli/smb_composite: Allow specifying SMB parameters in
 smb_composite_connect structure. AFAIK no global variables will now be used
 when doing RPC client connections. (This used to be commit
 0ef75e4e3cb0e1bd10e367a00f5e9b725587c40a)

---
 source4/scripting/ejs/smbcalls_cli.c | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_cli.c b/source4/scripting/ejs/smbcalls_cli.c
index bb1e445d04..b66318dc3d 100644
--- a/source4/scripting/ejs/smbcalls_cli.c
+++ b/source4/scripting/ejs/smbcalls_cli.c
@@ -445,6 +445,12 @@ static int ejs_tree_connect(MprVarHandle eid, int argc, char **argv)
 	io.in.credentials            = creds;
 	io.in.fallback_to_anonymous  = false;
 	io.in.workgroup              = lp_workgroup(global_loadparm);
+	io.in.max_xmit = lp_max_xmit(global_loadparm);
+	io.in.max_mux = lp_maxmux(global_loadparm);
+	io.in.ntstatus_support = lp_nt_status_support(global_loadparm);
+	io.in.max_protocol = lp_cli_maxprotocol(global_loadparm);
+	io.in.unicode = lp_unicode(global_loadparm);
+	io.in.use_spnego = lp_use_spnego(global_loadparm) && lp_nt_status_support(global_loadparm);
 
 	result = smb_composite_connect(&io, mem_ctx, 
 				       lp_resolve_context(global_loadparm), 
-- 
cgit 


From 425732f688865ebe2bfe568c8278edec50cbdedf Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Thu, 3 Jan 2008 17:21:58 -0600
Subject: r26651: libsmb: Allow specifying signing policy from higher up.

The number of arguments is getting a bit excessive now, so it
probably makes sense to pass in the smbcli_options struct rather than
all members individually and add a convenience function for obtaining a
smbcli_options struct from a loadparm context.
(This used to be commit 9f64213463b5bf3bcbf36913139e9a5042e967a2)
---
 source4/scripting/ejs/smbcalls_cli.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_cli.c b/source4/scripting/ejs/smbcalls_cli.c
index b66318dc3d..5e61a4df21 100644
--- a/source4/scripting/ejs/smbcalls_cli.c
+++ b/source4/scripting/ejs/smbcalls_cli.c
@@ -451,6 +451,7 @@ static int ejs_tree_connect(MprVarHandle eid, int argc, char **argv)
 	io.in.max_protocol = lp_cli_maxprotocol(global_loadparm);
 	io.in.unicode = lp_unicode(global_loadparm);
 	io.in.use_spnego = lp_use_spnego(global_loadparm) && lp_nt_status_support(global_loadparm);
+	io.in.signing = lp_client_signing(global_loadparm);
 
 	result = smb_composite_connect(&io, mem_ctx, 
 				       lp_resolve_context(global_loadparm), 
-- 
cgit 


From dcc282590b34537fc1ead61c3300172528273b44 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Thu, 3 Jan 2008 17:22:12 -0600
Subject: r26654: libcli/smb_composite: Rather than specifying each of the
 gazillion options for SMB individually, just specify the smbcli_options
 struct. (This used to be commit 8a97886e24a4b969aa91409c06f423b71a45f6eb)

---
 source4/scripting/ejs/smbcalls_cli.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_cli.c b/source4/scripting/ejs/smbcalls_cli.c
index 5e61a4df21..8295a0879f 100644
--- a/source4/scripting/ejs/smbcalls_cli.c
+++ b/source4/scripting/ejs/smbcalls_cli.c
@@ -445,13 +445,7 @@ static int ejs_tree_connect(MprVarHandle eid, int argc, char **argv)
 	io.in.credentials            = creds;
 	io.in.fallback_to_anonymous  = false;
 	io.in.workgroup              = lp_workgroup(global_loadparm);
-	io.in.max_xmit = lp_max_xmit(global_loadparm);
-	io.in.max_mux = lp_maxmux(global_loadparm);
-	io.in.ntstatus_support = lp_nt_status_support(global_loadparm);
-	io.in.max_protocol = lp_cli_maxprotocol(global_loadparm);
-	io.in.unicode = lp_unicode(global_loadparm);
-	io.in.use_spnego = lp_use_spnego(global_loadparm) && lp_nt_status_support(global_loadparm);
-	io.in.signing = lp_client_signing(global_loadparm);
+	lp_smbcli_options(global_loadparm, &io.in.options);
 
 	result = smb_composite_connect(&io, mem_ctx, 
 				       lp_resolve_context(global_loadparm), 
-- 
cgit 


From 6ed5fc0919d2f43ad28f9fff08e2a3c8f09bbecd Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Thu, 3 Jan 2008 21:21:12 -0600
Subject: r26656: python: Add file documentating the status of the Python
 migration. (This used to be commit 5c86cc6648169bf52161a1ffdbf17a38b62c611f)

---
 source4/scripting/python/STATUS | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 source4/scripting/python/STATUS

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/STATUS b/source4/scripting/python/STATUS
new file mode 100644
index 0000000000..b39563da29
--- /dev/null
+++ b/source4/scripting/python/STATUS
@@ -0,0 +1,20 @@
+dsdb/samdb/ldb_modules/tests/samba3sam.py
+lib/ldb/tests/python/ldap.py
+SWAT
+hierarchy
+DCE/RPC bindings
+ - pidl:
+     Parse::Pidl::Samba::Python
+	 - wrap struct/bitmap/enum/union types
+	  - __ndr_pack__/__ndr_unpack__ members
+	 Parse::Pidl::Samba::NDR::Python
+	 - pidl generated client fns
+	  - one class per interface
+	  - AddOne()
+
+ - scripting/bin/smbstatus.py
+ - scripting/bin/winreg.py
+
+not important before making Python the default:
+- scripting/python/samba/upgrade.py
+- install python modules into system
-- 
cgit 


From 1548d8d2be2a1012549f626d504070272bb51c9e Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Thu, 3 Jan 2008 21:45:18 -0600
Subject: r26658: pidl: Register Python modules. (This used to be commit
 f47044aacc8eb6df856524744ab87bee997bae6d)

---
 source4/scripting/python/modules.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/modules.c b/source4/scripting/python/modules.c
index 6094cb49f4..55df51d881 100644
--- a/source4/scripting/python/modules.c
+++ b/source4/scripting/python/modules.c
@@ -34,6 +34,7 @@ extern void init_dcerpc(void);
 extern void init_events(void);
 extern void inituuid(void);
 extern void init_net(void);
+extern void initecho(void);
 
 static struct _inittab py_modules[] = { STATIC_LIBPYTHON_MODULES };
 
-- 
cgit 


From e652fc802a13ead5e3b0ef7c2b4a6976ab0e1ec6 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sat, 5 Jan 2008 14:00:07 -0600
Subject: r26666: python: Prefer newer Python versions as they use const
 properly. (This used to be commit aa2adf33275dc637022d9feee1531aa79aa08e25)

---
 source4/scripting/python/config.m4 | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/config.m4 b/source4/scripting/python/config.m4
index a629aa8f92..326cef8440 100644
--- a/source4/scripting/python/config.m4
+++ b/source4/scripting/python/config.m4
@@ -13,7 +13,12 @@ if test -z "$PYTHON"; then
 	AC_MSG_WARN([No python found])
 fi
 
-AC_PATH_PROG([PYTHON_CONFIG],[python[$PYTHON_VERSION]-config])
+if test -z "$PYTHON_VERSION"; then 
+	AC_PATH_PROGS([PYTHON_CONFIG], [python2.6-config python2.5-config python2.4-config python-config])
+else 
+	AC_PATH_PROG([PYTHON_CONFIG], [python[$PYTHON_VERSION]-config])
+fi
+
 if test -z "$PYTHON_CONFIG"; then
 	working_python=no
 	AC_MSG_WARN([No python-config found])
-- 
cgit 


From ff1017b1426a7620618ca3b5e2b4cd5cdac3dcd2 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 7 Jan 2008 14:11:19 -0600
Subject: r26687: python: Update status after feedback from abartlett. (This
 used to be commit f08192750eecdd8b0ffbed84a53abcae51afd2df)

---
 source4/scripting/python/STATUS | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/STATUS b/source4/scripting/python/STATUS
index b39563da29..c82275fff8 100644
--- a/source4/scripting/python/STATUS
+++ b/source4/scripting/python/STATUS
@@ -1,6 +1,9 @@
 dsdb/samdb/ldb_modules/tests/samba3sam.py
 lib/ldb/tests/python/ldap.py
+provisioning in LDAP mode
 SWAT
+command-line vampire
+provisioning: combine some of the python dictionaries
 hierarchy
 DCE/RPC bindings
  - pidl:
-- 
cgit 


From 48c75bade7fe68f3fcaf075a97bcdb80b448bbb7 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Thu, 10 Jan 2008 17:47:58 +0100
Subject: configure: Complain when Python is not found. (This used to be commit
 6aaccdb0b38366963d5bdff444d24d6dcacc817b)

---
 source4/scripting/python/config.m4 | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/config.m4 b/source4/scripting/python/config.m4
index 326cef8440..348f9197f7 100644
--- a/source4/scripting/python/config.m4
+++ b/source4/scripting/python/config.m4
@@ -65,8 +65,5 @@ then
 	LIBS="$ac_save_LIBS"
 	CFLAGS="$ac_save_CFLAGS"
 else
-	SMB_ENABLE(EXT_LIB_PYTHON,NO)
-	SMB_ENABLE(LIBPYTHONyy,NO)
-	SMB_ENABLE(smbpython,NO)
-	AC_MSG_RESULT([no])
+	AC_MSG_ERROR([Python not found. Please install Python 2.x and its development headers/libraries.])
 fi
-- 
cgit 


From 5b8ffcca53d40c8067531f75c658f856886ee095 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Thu, 10 Jan 2008 17:53:56 +0100
Subject: python: Update STATUS. (This used to be commit
 bcd82a9ae3cb01b3d8ed0c36999f7a1c0bbab19a)

---
 source4/scripting/python/STATUS | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/STATUS b/source4/scripting/python/STATUS
index c82275fff8..f2f1641658 100644
--- a/source4/scripting/python/STATUS
+++ b/source4/scripting/python/STATUS
@@ -1,7 +1,6 @@
-dsdb/samdb/ldb_modules/tests/samba3sam.py
-lib/ldb/tests/python/ldap.py
-provisioning in LDAP mode
-SWAT
+dsdb/samdb/ldb_modules/tests/samba3sam.py: Fix remaining failing tests
+lib/ldb/tests/python/ldap.py: Fix remaining failing tests
+provisioning in LDAP mode(TEST_LDAP=yes PROVISION_PYTHON=yes make test)
 command-line vampire
 provisioning: combine some of the python dictionaries
 hierarchy
@@ -21,3 +20,4 @@ DCE/RPC bindings
 not important before making Python the default:
 - scripting/python/samba/upgrade.py
 - install python modules into system
+- SWAT
-- 
cgit 


From 63bbb9239848beb376d8ffacd787e3fde7cd77e7 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Fri, 11 Jan 2008 04:07:14 +0100
Subject: Python: Update STATUS. (This used to be commit
 cbf3b74e5f5076d864b08c772f21b20751ea5163)

---
 source4/scripting/python/STATUS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/STATUS b/source4/scripting/python/STATUS
index f2f1641658..5972027f59 100644
--- a/source4/scripting/python/STATUS
+++ b/source4/scripting/python/STATUS
@@ -1,5 +1,5 @@
 dsdb/samdb/ldb_modules/tests/samba3sam.py: Fix remaining failing tests
-lib/ldb/tests/python/ldap.py: Fix remaining failing tests
+lib/ldb/tests/python/ldap.py: Fix remaining 3 FIXME's
 provisioning in LDAP mode(TEST_LDAP=yes PROVISION_PYTHON=yes make test)
 command-line vampire
 provisioning: combine some of the python dictionaries
-- 
cgit 


From 48c2d871ea4864fcce47fc5e1fab926ce81de854 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Fri, 11 Jan 2008 15:21:23 +1100
Subject: Use 'dn' less, as this is not a valid attribute in AD, and I want to
 remove it from ldb.  It is not longer mapped against OpenLDAP.

Andrew Bartlett
(This used to be commit f917ccec85f854423f423bbffc41459d92960a1b)
---
 source4/scripting/libjs/provision.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index 0da02ae276..266bac1a75 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -170,7 +170,7 @@ function ldb_erase(info, ldb)
 	/* and the rest */
 	attrs = new Array("dn");
      	var basedn = "";
-     	var res = ldb.search("(&(|(objectclass=*)(dn=*))(!(dn=@BASEINFO)))", basedn, ldb.SCOPE_SUBTREE, attrs);
+     	var res = ldb.search("(&(|(objectclass=*)(distinguishedName=*))(!(distinguishedName=@BASEINFO)))", basedn, ldb.SCOPE_SUBTREE, attrs);
 	var i;
 	if (res.error != 0) {
 		ldb_delete(info, ldb);
@@ -180,7 +180,7 @@ function ldb_erase(info, ldb)
 		ldb.del(res.msgs[i].dn);
 	}
 
-     	var res = ldb.search("(&(|(objectclass=*)(dn=*))(!(dn=@BASEINFO)))", basedn, ldb.SCOPE_SUBTREE, attrs);
+     	var res = ldb.search("(&(|(objectclass=*)(distinguishedName=*))(!(distinguishedName=@BASEINFO)))", basedn, ldb.SCOPE_SUBTREE, attrs);
 	if (res.error != 0 || res.msgs.length != 0) {
 		ldb_delete(info, ldb);
 		return;
@@ -207,8 +207,8 @@ function ldb_erase_partitions(info, ldb, ldapbackend)
 		return;
 	}	
 	for (j=0; j<res.msgs[0].namingContexts.length; j++) {
-		var anything = "(|(objectclass=*)(dn=*))";
-		var attrs = new Array("dn");
+		var anything = "(|(objectclass=*)(distinguishedName=*))";
+		var attrs = new Array("distinguishedName");
 		var basedn = res.msgs[0].namingContexts[j];
 		var k;
 		var previous_remaining = 1;
-- 
cgit 


From 7b7749042134e31490e21b3e001451eb0f8c410e Mon Sep 17 00:00:00 2001
From: Kai Blin <kai@samba.org>
Date: Wed, 26 Dec 2007 09:54:21 +0100
Subject: ejs: Remove cast to incompatible pointer. (This used to be commit
 89d5b91d3c4dae754178c82cb7a24e7c5af09fcd)

---
 source4/scripting/ejs/ejsnet/net_user.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/ejsnet/net_user.c b/source4/scripting/ejs/ejsnet/net_user.c
index 34524cc0fa..57e538d3b4 100644
--- a/source4/scripting/ejs/ejsnet/net_user.c
+++ b/source4/scripting/ejs/ejsnet/net_user.c
@@ -195,9 +195,9 @@ static int ejs_net_deleteuser(MprVarHandle eid, int argc, char **argv)
 		ejsSetErrorMsg(eid, "ctx property returns null pointer");
 		goto done;
 	}
-	
+
 	/* domain where the account is to be deleted */
-	userman_domain = (struct libnet_context *)mprGetThisPtr(eid, "domain");
+	userman_domain = mprGetThisPtr(eid, "domain");
 	if (!userman_domain) {
 		ejsSetErrorMsg(eid, "domain property returns null pointer");
 		goto done;
@@ -258,9 +258,9 @@ static int ejs_net_userinfo(MprVarHandle eid, int argc, char **argv)
 		ejsSetErrorMsg(eid, "ctx property returns null pointer");
 		goto done;
 	}
-	
+
 	/* domain where the user account is to be queried */
-	userman_domain = (struct libnet_context *)mprGetThisPtr(eid, "domain");
+	userman_domain = mprGetThisPtr(eid, "domain");
 	if (userman_domain == NULL) {
 		ejsSetErrorMsg(eid, "domain property returns null pointer");
 		return -1;
-- 
cgit 


From 7c3e8c838f0ada9ebae9dbb2bc5d84320c8431f2 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Fri, 11 Jan 2008 16:13:46 +0100
Subject: Python: Simplify code in a couple of places. Copy Andrew's changes
 from g53b5166. (This used to be commit
 f056f624958af79204c972eba3f85e36e93daed7)

---
 source4/scripting/python/samba/__init__.py  | 12 ++++++------
 source4/scripting/python/samba/provision.py |  8 ++++----
 source4/scripting/python/samba/samdb.py     |  4 ++--
 3 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/__init__.py b/source4/scripting/python/samba/__init__.py
index e0b9e1d410..e858180169 100644
--- a/source4/scripting/python/samba/__init__.py
+++ b/source4/scripting/python/samba/__init__.py
@@ -112,15 +112,15 @@ class Ldb(ldb.Ldb):
         for attr in ["@INDEXLIST", "@ATTRIBUTES", "@SUBCLASSES", "@MODULES", 
                      "@OPTIONS", "@PARTITION", "@KLUDGEACL"]:
             try:
-                self.delete(ldb.Dn(self, attr))
+                self.delete(attr)
             except ldb.LdbError, (LDB_ERR_NO_SUCH_OBJECT, _):
                 # Ignore missing dn errors
                 pass
 
-        basedn = ldb.Dn(self, "")
+        basedn = ""
         # and the rest
         for msg in self.search(basedn, ldb.SCOPE_SUBTREE, 
-                "(&(|(objectclass=*)(dn=*))(!(dn=@BASEINFO)))", 
+                "(&(|(objectclass=*)(distinguishedName=*))(!(distinguishedName=@BASEINFO)))", 
                 ["dn"]):
             try:
                 self.delete(msg.dn)
@@ -128,12 +128,12 @@ class Ldb(ldb.Ldb):
                 # Ignor eno such object errors
                 pass
 
-        res = self.search(basedn, ldb.SCOPE_SUBTREE, "(&(|(objectclass=*)(dn=*))(!(dn=@BASEINFO)))", ["dn"])
+        res = self.search(basedn, ldb.SCOPE_SUBTREE, "(&(|(objectclass=*)(distinguishedName=*))(!(distinguisedName=@BASEINFO)))", ["dn"])
         assert len(res) == 0
 
     def erase_partitions(self):
         """Erase an ldb, removing all records."""
-        res = self.search(ldb.Dn(self, ""), ldb.SCOPE_BASE, "(objectClass=*)", 
+        res = self.search("", ldb.SCOPE_BASE, "(objectClass=*)", 
                          ["namingContexts"])
         assert len(res) == 1
         if not "namingContexts" in res[0]:
@@ -145,7 +145,7 @@ class Ldb(ldb.Ldb):
             k = 0
             while ++k < 10 and (previous_remaining != current_remaining):
                 # and the rest
-                res2 = self.search(ldb.Dn(self, basedn), ldb.SCOPE_SUBTREE, "(|(objectclass=*)(dn=*))", ["dn"])
+                res2 = self.search(basedn, ldb.SCOPE_SUBTREE, "(|(objectclass=*)(distinguishedName=*))", ["distinguishedName"])
                 previous_remaining = current_remaining
                 current_remaining = len(res2)
                 for msg in res2:
diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index db3749f721..1607cb343b 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -20,7 +20,7 @@ import samba
 from samba import Ldb, substitute_var, valid_netbios_name
 from samba.samdb import SamDB
 import security
-from ldb import Dn, SCOPE_SUBTREE, SCOPE_ONELEVEL, SCOPE_BASE, LdbError, \
+from ldb import SCOPE_SUBTREE, SCOPE_ONELEVEL, SCOPE_BASE, LdbError, \
         LDB_ERR_NO_SUCH_OBJECT, timestring, CHANGETYPE_MODIFY, CHANGETYPE_NONE
 
 """Functions for setting up a Samba configuration."""
@@ -64,7 +64,7 @@ def install_ok(lp, session_info, credentials):
         return False
     ldb = Ldb(lp.get("sam database"), session_info=session_info, 
             credentials=credentials, lp=lp)
-    if len(ldb.search(ldb.Dn("(cn=Administrator)"))) != 1:
+    if len(ldb.search("(cn=Administrator)")) != 1:
         return False
     return True
 
@@ -766,9 +766,9 @@ def provision(lp, setup_dir, message, blank, paths, session_info,
         samdb = SamDB(paths.samdb, session_info=session_info, 
                       credentials=credentials, lp=lp)
 
-        domainguid = samdb.searchone(Dn(samdb, domaindn), "objectGUID")
+        domainguid = samdb.searchone(domaindn, "objectGUID")
         assert isinstance(domainguid, str)
-        hostguid = samdb.searchone(Dn(samdb, domaindn), "objectGUID",
+        hostguid = samdb.searchone(domaindn, "objectGUID",
                 expression="(&(objectClass=computer)(cn=%s))" % hostname,
                 scope=SCOPE_SUBTREE)
         assert isinstance(hostguid, str)
diff --git a/source4/scripting/python/samba/samdb.py b/source4/scripting/python/samba/samdb.py
index 2af56d8d8e..353eaee198 100644
--- a/source4/scripting/python/samba/samdb.py
+++ b/source4/scripting/python/samba/samdb.py
@@ -60,7 +60,7 @@ description: %s
         :param sid: SID of the NT-side of the mapping.
         :param unixname: Unix name to map to.
         """
-        res = self.search(ldb.Dn(self, domaindn), ldb.SCOPE_SUBTREE, 
+        res = self.search(domaindn, ldb.SCOPE_SUBTREE, 
                          "objectSid=%s" % sid, ["dn"])
         assert len(res) == 1, "Failed to find record for objectSid %s" % sid
 
@@ -103,7 +103,7 @@ userAccountControl: %u
         res = self.search("", SCOPE_BASE, "defaultNamingContext=*", 
                          ["defaultNamingContext"])
         assert(len(res) == 1 and res[0].defaultNamingContext is not None)
-        domain_dn = res[0].defaultNamingContext
+        domain_dn = res[0]["defaultNamingContext"][0]
         assert(domain_dn is not None)
         dom_users = self.searchone(domain_dn, "dn", "name=Domain Users")
         assert(dom_users is not None)
-- 
cgit 


From 378dff1365801b2dd23677a38f2fb20828cbbf39 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Fri, 11 Jan 2008 16:28:17 +0100
Subject: python: Fix typo. (This used to be commit
 d6b06fc03e37781f5f59b15cff8fe3ee8df63444)

---
 source4/scripting/python/samba/__init__.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/__init__.py b/source4/scripting/python/samba/__init__.py
index e858180169..483929661d 100644
--- a/source4/scripting/python/samba/__init__.py
+++ b/source4/scripting/python/samba/__init__.py
@@ -121,14 +121,14 @@ class Ldb(ldb.Ldb):
         # and the rest
         for msg in self.search(basedn, ldb.SCOPE_SUBTREE, 
                 "(&(|(objectclass=*)(distinguishedName=*))(!(distinguishedName=@BASEINFO)))", 
-                ["dn"]):
+                ["distinguishedName"]):
             try:
                 self.delete(msg.dn)
             except ldb.LdbError, (LDB_ERR_NO_SUCH_OBJECT, _):
                 # Ignor eno such object errors
                 pass
 
-        res = self.search(basedn, ldb.SCOPE_SUBTREE, "(&(|(objectclass=*)(distinguishedName=*))(!(distinguisedName=@BASEINFO)))", ["dn"])
+        res = self.search(basedn, ldb.SCOPE_SUBTREE, "(&(|(objectclass=*)(distinguishedName=*))(!(distinguishedName=@BASEINFO)))", ["distinguishedName"])
         assert len(res) == 0
 
     def erase_partitions(self):
-- 
cgit 


From 53c33aa2b42732304f247798a4dbe3bcae14e407 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sun, 13 Jan 2008 03:32:44 +0100
Subject: python: Avoid PyDoc_STRVAR() macro which doesn't exist in Python2.2.
 (This used to be commit dec3f421be5d7fd4ead3b71f8b69921c41bad39a)

---
 source4/scripting/python/uuidmodule.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/uuidmodule.c b/source4/scripting/python/uuidmodule.c
index 02c929d4a5..9b952d31b9 100644
--- a/source4/scripting/python/uuidmodule.c
+++ b/source4/scripting/python/uuidmodule.c
@@ -18,7 +18,7 @@
 */
 
 #include "includes.h"
-#include "Python.h"
+#include <Python.h>
 #include "librpc/ndr/libndr.h"
 
 static PyObject *uuid_random(PyObject *self, PyObject *args)
@@ -47,11 +47,9 @@ static PyMethodDef methods[] = {
 	{ NULL, NULL }
 };
 
-PyDoc_STRVAR(param_doc, "UUID helper routines");
-
 PyMODINIT_FUNC inituuid(void)
 {
-	PyObject *mod = Py_InitModule3((char *)"uuid", methods, param_doc);
+	PyObject *mod = Py_InitModule3((char *)"uuid", methods, "UUID helper routines");
 	if (mod == NULL)
 		return;
 }
-- 
cgit 


From c264fb4bde955ede94b82b5e98308553ecab93f2 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sun, 13 Jan 2008 04:17:04 +0100
Subject: python: Try more possible flags.

The flags returned by python-config may be for gcc and may not work for other compilers.
(This used to be commit 1fbc3a9f47a33f785d935e39345021d9ca455bb9)
---
 source4/scripting/python/config.m4 | 65 ++++++++++++++++++++------------------
 1 file changed, 34 insertions(+), 31 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/config.m4 b/source4/scripting/python/config.m4
index 326cef8440..6cf667a338 100644
--- a/source4/scripting/python/config.m4
+++ b/source4/scripting/python/config.m4
@@ -13,6 +13,30 @@ if test -z "$PYTHON"; then
 	AC_MSG_WARN([No python found])
 fi
 
+AC_DEFUN([TRY_LINK_PYTHON],
+[
+	if test $working_python = no; then
+		ac_save_LIBS="$LIBS"
+		ac_save_CFLAGS="$CFLAGS"
+		LIBS="$LIBS $1"
+		CFLAGS="$CFLAGS $2"
+
+		AC_TRY_LINK([
+				#include <Python.h>
+				#include <stdlib.h>
+			],[
+				Py_InitModule(NULL, NULL);
+			],[
+				PYTHON_LDFLAGS="$1"
+				PYTHON_CFLAGS="$2"
+				working_python=yes
+			])
+		LIBS="$ac_save_LIBS"
+		CFLAGS="$ac_save_CFLAGS"
+	fi
+])
+
+
 if test -z "$PYTHON_VERSION"; then 
 	AC_PATH_PROGS([PYTHON_CONFIG], [python2.6-config python2.5-config python2.4-config python-config])
 else 
@@ -23,50 +47,29 @@ if test -z "$PYTHON_CONFIG"; then
 	working_python=no
 	AC_MSG_WARN([No python-config found])
 else
-	working_python=yes
-	PYTHON_LDFLAGS=`$PYTHON_CONFIG --ldflags`
-	PYTHON_CFLAGS=`$PYTHON_CONFIG --cflags`
+	TRY_LINK_PYTHON([`$PYTHON_CONFIG --ldflags`], [`$PYTHON_CONFIG --includes`])
+	TRY_LINK_PYTHON([`$PYTHON_CONFIG --ldflags`], [`$PYTHON_CONFIG --cflags`])
 fi
 
-if test $working_python = no && test x$PYTHON != x
+if test x$PYTHON != x
 then
 	PYTHON_CFLAGS=`$PYTHON -c "from distutils import sysconfig; print '-I%s -I%s %s' % (sysconfig.get_python_inc(), sysconfig.get_python_inc(plat_specific=True), sysconfig.get_config_var('CFLAGS'))"`
 	PYTHON_LDFLAGS=`$PYTHON -c "from distutils import sysconfig; print '%s %s -lpython%s -L%s' % (sysconfig.get_config_var('LIBS'), sysconfig.get_config_var('SYSLIBS'), sysconfig.get_config_var('VERSION'), sysconfig.get_config_var('LIBPL'))"`
-	working_python=yes
+	TRY_LINK_PYTHON($PYTHON_LDFLAGS, $PYTHON_CFLAGS)
 fi
 
 SMB_EXT_LIB(EXT_LIB_PYTHON, [$PYTHON_LDFLAGS], [$PYTHON_CFLAGS])
 
 AC_MSG_CHECKING(working python module support)
-if test x$working_python = xyes
-then
-	ac_save_LIBS="$LIBS"
-	ac_save_CFLAGS="$CFLAGS"
-	LIBS="$LIBS $PYTHON_LDFLAGS"
-	CFLAGS="$CFLAGS $PYTHON_CFLAGS"
-
-	AC_TRY_LINK([
-			#include <Python.h>
-			#include <stdlib.h>
-		],[
-			Py_InitModule(NULL, NULL);
-		],[
-			SMB_ENABLE(EXT_LIB_PYTHON,YES)
-			SMB_ENABLE(smbpython,YES)
-			SMB_ENABLE(LIBPYTHON,YES)
-			AC_MSG_RESULT([yes])
-		],[
-			SMB_ENABLE(EXT_LIB_PYTHON,NO)
-			SMB_ENABLE(LIBPYTHON,NO)
-			SMB_ENABLE(smbpython,NO)
-			AC_MSG_RESULT([no])
-		])
-
-	LIBS="$ac_save_LIBS"
-	CFLAGS="$ac_save_CFLAGS"
+if test $working_python = yes; then
+	SMB_ENABLE(EXT_LIB_PYTHON,YES)
+	SMB_ENABLE(smbpython,YES)
+	SMB_ENABLE(LIBPYTHON,YES)
+	AC_MSG_RESULT([yes])
 else
 	SMB_ENABLE(EXT_LIB_PYTHON,NO)
 	SMB_ENABLE(LIBPYTHONyy,NO)
 	SMB_ENABLE(smbpython,NO)
 	AC_MSG_RESULT([no])
 fi
+
-- 
cgit 


From 2c90e6fc7a2c0858babaa45f3bf969238739aabf Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sun, 13 Jan 2008 04:23:09 +0100
Subject: python: Fix initialization of variable. (This used to be commit
 620ec696657558dbad2a6c7d4231deabcaeaaef1)

---
 source4/scripting/python/config.m4 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/config.m4 b/source4/scripting/python/config.m4
index 6cf667a338..b0884478c1 100644
--- a/source4/scripting/python/config.m4
+++ b/source4/scripting/python/config.m4
@@ -36,6 +36,8 @@ AC_DEFUN([TRY_LINK_PYTHON],
 	fi
 ])
 
+dnl assume no working python
+working_python=no
 
 if test -z "$PYTHON_VERSION"; then 
 	AC_PATH_PROGS([PYTHON_CONFIG], [python2.6-config python2.5-config python2.4-config python-config])
@@ -44,7 +46,6 @@ else
 fi
 
 if test -z "$PYTHON_CONFIG"; then
-	working_python=no
 	AC_MSG_WARN([No python-config found])
 else
 	TRY_LINK_PYTHON([`$PYTHON_CONFIG --ldflags`], [`$PYTHON_CONFIG --includes`])
-- 
cgit 


From 6ef36c1f82fa9d48a3418f25202cab55b2f54d2f Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sun, 13 Jan 2008 06:07:20 +0100
Subject: python: Avoid PyMODINIT_FUNC because it doesn't exist in older
 pythons. (This used to be commit e179db6d0fcf093082f2ad441980a2bb77ac6b17)

---
 source4/scripting/python/uuidmodule.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/uuidmodule.c b/source4/scripting/python/uuidmodule.c
index 9b952d31b9..e05b286dd0 100644
--- a/source4/scripting/python/uuidmodule.c
+++ b/source4/scripting/python/uuidmodule.c
@@ -47,7 +47,7 @@ static PyMethodDef methods[] = {
 	{ NULL, NULL }
 };
 
-PyMODINIT_FUNC inituuid(void)
+void inituuid(void)
 {
 	PyObject *mod = Py_InitModule3((char *)"uuid", methods, "UUID helper routines");
 	if (mod == NULL)
-- 
cgit 


From ecf52b2bc7c55fdc574f8dc58e90a9f52bdf1925 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sun, 13 Jan 2008 14:59:16 +0100
Subject: python: Avoid overwriting flags for already found version of Python.
 (This used to be commit 9041e385fe666c16d9a5b9a030b54a856f17e5e5)

---
 source4/scripting/python/config.m4 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/config.m4 b/source4/scripting/python/config.m4
index b0884478c1..4f46f92682 100644
--- a/source4/scripting/python/config.m4
+++ b/source4/scripting/python/config.m4
@@ -54,9 +54,9 @@ fi
 
 if test x$PYTHON != x
 then
-	PYTHON_CFLAGS=`$PYTHON -c "from distutils import sysconfig; print '-I%s -I%s %s' % (sysconfig.get_python_inc(), sysconfig.get_python_inc(plat_specific=True), sysconfig.get_config_var('CFLAGS'))"`
-	PYTHON_LDFLAGS=`$PYTHON -c "from distutils import sysconfig; print '%s %s -lpython%s -L%s' % (sysconfig.get_config_var('LIBS'), sysconfig.get_config_var('SYSLIBS'), sysconfig.get_config_var('VERSION'), sysconfig.get_config_var('LIBPL'))"`
-	TRY_LINK_PYTHON($PYTHON_LDFLAGS, $PYTHON_CFLAGS)
+	DISTUTILS_CFLAGS=`$PYTHON -c "from distutils import sysconfig; print '-I%s -I%s %s' % (sysconfig.get_python_inc(), sysconfig.get_python_inc(plat_specific=True), sysconfig.get_config_var('CFLAGS'))"`
+	DISTUTILS_LDFLAGS=`$PYTHON -c "from distutils import sysconfig; print '%s %s -lpython%s -L%s' % (sysconfig.get_config_var('LIBS'), sysconfig.get_config_var('SYSLIBS'), sysconfig.get_config_var('VERSION'), sysconfig.get_config_var('LIBPL'))"`
+	TRY_LINK_PYTHON($DISTUTILS_LDFLAGS, $DISTUTILS_CFLAGS)
 fi
 
 SMB_EXT_LIB(EXT_LIB_PYTHON, [$PYTHON_LDFLAGS], [$PYTHON_CFLAGS])
-- 
cgit 


From 252675a5788059dbcc49b175b56fa6c6a35ef74a Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sun, 13 Jan 2008 16:44:42 +0100
Subject: python: Add some utility functions for working with Python objects
 based on talloc pointers. (This used to be commit
 9366ddba92e192cd88e12eafba4a90af8c266f1c)

---
 source4/scripting/python/pytalloc.c | 34 +++++++++++++++++++++++++++++
 source4/scripting/python/pytalloc.h | 43 +++++++++++++++++++++++++++++++++++++
 2 files changed, 77 insertions(+)
 create mode 100644 source4/scripting/python/pytalloc.c
 create mode 100644 source4/scripting/python/pytalloc.h

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/pytalloc.c b/source4/scripting/python/pytalloc.c
new file mode 100644
index 0000000000..55ed56a627
--- /dev/null
+++ b/source4/scripting/python/pytalloc.c
@@ -0,0 +1,34 @@
+/* 
+   Unix SMB/CIFS implementation.
+   Python/Talloc glue
+   Copyright (C) Jelmer Vernooij <jelmer@samba.org> 2008
+   
+   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/>.
+*/
+
+#include "includes.h"
+
+void py_talloc_dealloc(PyObject* self)
+{
+	py_talloc_Object *obj = (py_talloc_Object *)self;
+	talloc_free(obj->object);
+	PyObject_Del(self);
+}
+
+PyObject *py_talloc_import(PyTypeObject *py_type, void *ptr)
+{
+	PyObject *ret = PyObject_New(py_talloc_Object, &py_type);
+	ret->talloc_ptr = talloc_reference(NULL, ptr); 
+	return ret;
+}
diff --git a/source4/scripting/python/pytalloc.h b/source4/scripting/python/pytalloc.h
new file mode 100644
index 0000000000..93f6b48d82
--- /dev/null
+++ b/source4/scripting/python/pytalloc.h
@@ -0,0 +1,43 @@
+/* 
+   Unix SMB/CIFS implementation.
+   Samba utility functions
+   Copyright (C) Jelmer Vernooij <jelmer@samba.org> 2008
+   
+   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/>.
+*/
+
+#ifndef _PY_TALLOC_H_
+#define _PY_TALLOC_H_
+
+#include <Python.h>
+
+typedef struct {
+	PyObject_HEAD
+	void *talloc_ptr;
+} py_talloc_Object;
+
+/* Deallocate a py_talloc_Object */
+void py_talloc_dealloc(PyObject* self);
+
+/* Retrieve the pointer for a py_talloc_object. Like talloc_get_type() 
+ * but for py_talloc_Objects. */
+
+/* FIXME: Call PyErr_SetString(PyExc_TypeError, "expected " __STR(type) ") 
+ * when talloc_get_type() returns NULL. */
+#define py_talloc_get_type(py_obj, type) \
+	talloc_get_type(((py_talloc_Object *)py_obj)->talloc_ptr, type)
+
+PyObject *py_talloc_import(PyTypeObject *py_type, void *ptr);
+
+#endif /* _PY_TALLOC_H_ */
-- 
cgit 


From f7a0ef04f00cd44845bcee0a171e4cc05a545350 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sun, 13 Jan 2008 18:38:12 +0100
Subject: pidl/python: Support repr() for python types. (This used to be commit
 cf3664594d3540db20d32bc844f18e20abfa0d96)

---
 source4/scripting/python/pytalloc.c | 10 +++++++++-
 source4/scripting/python/pytalloc.h |  3 +++
 2 files changed, 12 insertions(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/pytalloc.c b/source4/scripting/python/pytalloc.c
index 55ed56a627..4032ff75a4 100644
--- a/source4/scripting/python/pytalloc.c
+++ b/source4/scripting/python/pytalloc.c
@@ -22,7 +22,7 @@
 void py_talloc_dealloc(PyObject* self)
 {
 	py_talloc_Object *obj = (py_talloc_Object *)self;
-	talloc_free(obj->object);
+	talloc_free(obj->talloc_ptr);
 	PyObject_Del(self);
 }
 
@@ -32,3 +32,11 @@ PyObject *py_talloc_import(PyTypeObject *py_type, void *ptr)
 	ret->talloc_ptr = talloc_reference(NULL, ptr); 
 	return ret;
 }
+
+PyObject *py_talloc_default_repr(PyObject *py_obj)
+{
+	py_talloc_Object *obj = (py_talloc_Object *)py_obj;
+
+	return PyString_FromFormat("<talloc: %s>", 
+							   talloc_get_name(obj->talloc_ptr));
+}
diff --git a/source4/scripting/python/pytalloc.h b/source4/scripting/python/pytalloc.h
index 93f6b48d82..735829bfcb 100644
--- a/source4/scripting/python/pytalloc.h
+++ b/source4/scripting/python/pytalloc.h
@@ -40,4 +40,7 @@ void py_talloc_dealloc(PyObject* self);
 
 PyObject *py_talloc_import(PyTypeObject *py_type, void *ptr);
 
+/* Sane default implementation of reprfunc. */
+PyObject *py_talloc_default_repr(PyObject *py_obj);
+
 #endif /* _PY_TALLOC_H_ */
-- 
cgit 


From bfab9862fcdd657a1bddafde49cdd182f89fcf8b Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sun, 13 Jan 2008 20:41:34 +0100
Subject: python: Allow wrapping pointers within talloc'ed memory that are not
 talloc contexts. (This used to be commit
 9c038a74113fb55ed5eb12a7d0ae4a46bad9050c)

---
 source4/scripting/python/pytalloc.c | 10 ++++++----
 source4/scripting/python/pytalloc.h | 11 ++++++++---
 2 files changed, 14 insertions(+), 7 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/pytalloc.c b/source4/scripting/python/pytalloc.c
index 4032ff75a4..d0b8cb83f2 100644
--- a/source4/scripting/python/pytalloc.c
+++ b/source4/scripting/python/pytalloc.c
@@ -22,14 +22,16 @@
 void py_talloc_dealloc(PyObject* self)
 {
 	py_talloc_Object *obj = (py_talloc_Object *)self;
-	talloc_free(obj->talloc_ptr);
+	talloc_free(obj->talloc_ctx);
 	PyObject_Del(self);
 }
 
-PyObject *py_talloc_import(PyTypeObject *py_type, void *ptr)
+PyObject *py_talloc_import(PyTypeObject *py_type, TALLOC_CTX *mem_ctx, 
+						   void *ptr)
 {
 	PyObject *ret = PyObject_New(py_talloc_Object, &py_type);
-	ret->talloc_ptr = talloc_reference(NULL, ptr); 
+	ret->talloc_ctx = talloc_reference(mem_ctx, ptr); 
+	ret->ptr = ptr;
 	return ret;
 }
 
@@ -38,5 +40,5 @@ PyObject *py_talloc_default_repr(PyObject *py_obj)
 	py_talloc_Object *obj = (py_talloc_Object *)py_obj;
 
 	return PyString_FromFormat("<talloc: %s>", 
-							   talloc_get_name(obj->talloc_ptr));
+							   talloc_get_name(obj->talloc_ctx));
 }
diff --git a/source4/scripting/python/pytalloc.h b/source4/scripting/python/pytalloc.h
index 735829bfcb..aad5840a67 100644
--- a/source4/scripting/python/pytalloc.h
+++ b/source4/scripting/python/pytalloc.h
@@ -24,7 +24,8 @@
 
 typedef struct {
 	PyObject_HEAD
-	void *talloc_ptr;
+	TALLOC_CTX *talloc_ctx;
+	void *ptr;
 } py_talloc_Object;
 
 /* Deallocate a py_talloc_Object */
@@ -36,9 +37,13 @@ void py_talloc_dealloc(PyObject* self);
 /* FIXME: Call PyErr_SetString(PyExc_TypeError, "expected " __STR(type) ") 
  * when talloc_get_type() returns NULL. */
 #define py_talloc_get_type(py_obj, type) \
-	talloc_get_type(((py_talloc_Object *)py_obj)->talloc_ptr, type)
+	talloc_get_type(py_talloc_get_ptr(py_obj), type)
 
-PyObject *py_talloc_import(PyTypeObject *py_type, void *ptr);
+#define py_talloc_get_ptr(py_obj) ((py_talloc_Object *)py_obj)->ptr
+#define py_talloc_get_mem_ctx(py_obj)  ((py_talloc_Object *)py_obj)->talloc_ctx
+
+PyObject *py_talloc_import_ex(PyTypeObject *py_type, TALLOC_CTX *mem_ctx, void *ptr);
+#define py_talloc_import(py_type, talloc_ptr) py_talloc_import_ex(py_type, talloc_ptr, talloc_ptr)
 
 /* Sane default implementation of reprfunc. */
 PyObject *py_talloc_default_repr(PyObject *py_obj);
-- 
cgit 


From d5903fd75e9640831f0e78fc04d3ffa5ea3b1b4a Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 14 Jan 2008 02:48:50 +0100
Subject: pidl/python: Fix compilation of py_echo. (This used to be commit
 5ee99ff31c80ece6861b2a0323d71170ef9346b9)

---
 source4/scripting/python/config.mk  | 2 +-
 source4/scripting/python/pytalloc.c | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/config.mk b/source4/scripting/python/config.mk
index cfd179aff5..f00b477919 100644
--- a/source4/scripting/python/config.mk
+++ b/source4/scripting/python/config.mk
@@ -5,7 +5,7 @@ OBJ_FILES = smbpython.o
 [SUBSYSTEM::LIBPYTHON]
 PUBLIC_DEPENDENCIES = EXT_LIB_PYTHON
 INIT_FUNCTION_SENTINEL = { NULL, NULL }
-OBJ_FILES = modules.o
+OBJ_FILES = modules.o pytalloc.o
 
 [PYTHON::python_uuid]
 PRIVATE_DEPENDENCIES = LIBNDR 
diff --git a/source4/scripting/python/pytalloc.c b/source4/scripting/python/pytalloc.c
index d0b8cb83f2..dc61a0a13d 100644
--- a/source4/scripting/python/pytalloc.c
+++ b/source4/scripting/python/pytalloc.c
@@ -18,6 +18,7 @@
 */
 
 #include "includes.h"
+#include "scripting/python/pytalloc.h"
 
 void py_talloc_dealloc(PyObject* self)
 {
@@ -26,13 +27,13 @@ void py_talloc_dealloc(PyObject* self)
 	PyObject_Del(self);
 }
 
-PyObject *py_talloc_import(PyTypeObject *py_type, TALLOC_CTX *mem_ctx, 
+PyObject *py_talloc_import_ex(PyTypeObject *py_type, TALLOC_CTX *mem_ctx, 
 						   void *ptr)
 {
-	PyObject *ret = PyObject_New(py_talloc_Object, &py_type);
+	py_talloc_Object *ret = PyObject_New(py_talloc_Object, py_type);
 	ret->talloc_ctx = talloc_reference(mem_ctx, ptr); 
 	ret->ptr = ptr;
-	return ret;
+	return (PyObject *)ret;
 }
 
 PyObject *py_talloc_default_repr(PyObject *py_obj)
-- 
cgit 


From db4ee4cce5f1fd84f3f0a331e769a70394126ca5 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 14 Jan 2008 03:59:36 +0100
Subject: python: Fix rpcecho tests. (This used to be commit
 ebb78ea4232c1614755844849580e3697b0a53fa)

---
 source4/scripting/python/STATUS                    |  5 ---
 .../python/samba/tests/dcerpc/__init__.py          |  0
 .../scripting/python/samba/tests/dcerpc/rpcecho.py | 39 ++++++++++++++++++++++
 3 files changed, 39 insertions(+), 5 deletions(-)
 create mode 100644 source4/scripting/python/samba/tests/dcerpc/__init__.py
 create mode 100644 source4/scripting/python/samba/tests/dcerpc/rpcecho.py

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/STATUS b/source4/scripting/python/STATUS
index 5972027f59..9a1c5b1b64 100644
--- a/source4/scripting/python/STATUS
+++ b/source4/scripting/python/STATUS
@@ -9,11 +9,6 @@ DCE/RPC bindings
      Parse::Pidl::Samba::Python
 	 - wrap struct/bitmap/enum/union types
 	  - __ndr_pack__/__ndr_unpack__ members
-	 Parse::Pidl::Samba::NDR::Python
-	 - pidl generated client fns
-	  - one class per interface
-	  - AddOne()
-
  - scripting/bin/smbstatus.py
  - scripting/bin/winreg.py
 
diff --git a/source4/scripting/python/samba/tests/dcerpc/__init__.py b/source4/scripting/python/samba/tests/dcerpc/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/source4/scripting/python/samba/tests/dcerpc/rpcecho.py b/source4/scripting/python/samba/tests/dcerpc/rpcecho.py
new file mode 100644
index 0000000000..cedd0cc2fe
--- /dev/null
+++ b/source4/scripting/python/samba/tests/dcerpc/rpcecho.py
@@ -0,0 +1,39 @@
+#!/usr/bin/python
+
+# Unix SMB/CIFS implementation.
+# Copyright (C) Jelmer Vernooij <jelmer@samba.org> 2008
+#   
+# 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/>.
+#
+
+import echo
+import unittest
+
+class RpcEchoTests(unittest.TestCase):
+    def setUp(self):
+        self.conn = echo.rpcecho("ncalrpc:")
+
+    def test_addone(self):
+        self.assertEquals(2, conn.AddOne(1))
+
+    def test_echodata(self):
+        self.assertEquals("bla", conn.EchoData(3, "bla"))
+
+    def test_call(self):
+        self.assertEquals("foobar", conn.TestCall("foobar"))
+
+    def test_surrounding(self):
+        somearray = [1,2,3,4]
+        (y,) = conn.TestSurrounding(echo.Surrounding(4, somearray))
+        self.assertEquals(8 * [0], y.surrounding)
-- 
cgit 


From 3b16c532f21202696d54ef87f8fa74d066812898 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 14 Jan 2008 05:16:51 +0100
Subject: pidl/python: Pass credentials and loadparm context when connecting
 using DCE/RPC. (This used to be commit
 4c87af95310e4aaee3f2e2da02d0ea70ed1ec25b)

---
 source4/scripting/python/samba/tests/dcerpc/rpcecho.py | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/tests/dcerpc/rpcecho.py b/source4/scripting/python/samba/tests/dcerpc/rpcecho.py
index cedd0cc2fe..52a4f49bb4 100644
--- a/source4/scripting/python/samba/tests/dcerpc/rpcecho.py
+++ b/source4/scripting/python/samba/tests/dcerpc/rpcecho.py
@@ -18,22 +18,25 @@
 #
 
 import echo
+from param import LoadParm
 import unittest
 
 class RpcEchoTests(unittest.TestCase):
     def setUp(self):
-        self.conn = echo.rpcecho("ncalrpc:")
+        lp_ctx = LoadParm()
+        lp_ctx.load("st/client/client.conf")
+        self.conn = echo.rpcecho("ncalrpc:", lp_ctx)
 
     def test_addone(self):
-        self.assertEquals(2, conn.AddOne(1))
+        self.assertEquals(2, self.conn.AddOne(1))
 
     def test_echodata(self):
-        self.assertEquals("bla", conn.EchoData(3, "bla"))
+        self.assertEquals("bla", self.conn.EchoData(3, "bla"))
 
     def test_call(self):
-        self.assertEquals("foobar", conn.TestCall("foobar"))
+        self.assertEquals("foobar", self.conn.TestCall("foobar"))
 
     def test_surrounding(self):
         somearray = [1,2,3,4]
-        (y,) = conn.TestSurrounding(echo.Surrounding(4, somearray))
+        (y,) = self.conn.TestSurrounding(echo.Surrounding(4, somearray))
         self.assertEquals(8 * [0], y.surrounding)
-- 
cgit 


From aca6bd5a2a2c5fe266509499be624bbab7b5c3c0 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 14 Jan 2008 06:03:33 +0100
Subject: python: Fix deallocation bug in pytalloc. (This used to be commit
 b849b4a6c4c9b03a9704449a69f00a59fc0df9c5)

---
 source4/scripting/python/pytalloc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/pytalloc.c b/source4/scripting/python/pytalloc.c
index dc61a0a13d..d8d3efe69c 100644
--- a/source4/scripting/python/pytalloc.c
+++ b/source4/scripting/python/pytalloc.c
@@ -31,7 +31,7 @@ PyObject *py_talloc_import_ex(PyTypeObject *py_type, TALLOC_CTX *mem_ctx,
 						   void *ptr)
 {
 	py_talloc_Object *ret = PyObject_New(py_talloc_Object, py_type);
-	ret->talloc_ctx = talloc_reference(mem_ctx, ptr); 
+	ret->talloc_ctx = talloc_reference(NULL, mem_ctx); 
 	ret->ptr = ptr;
 	return (PyObject *)ret;
 }
-- 
cgit 


From 271f5f18f2c871cfba256f7088839e4eb195e289 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 14 Jan 2008 06:05:28 +0100
Subject: python: Fix last bugs in rpcecho test. It passes now! (This used to
 be commit 25a0cd091bb24e579ceb34472d9c213aae157ba9)

---
 source4/scripting/python/samba/tests/dcerpc/rpcecho.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/tests/dcerpc/rpcecho.py b/source4/scripting/python/samba/tests/dcerpc/rpcecho.py
index 52a4f49bb4..52c2bb8c72 100644
--- a/source4/scripting/python/samba/tests/dcerpc/rpcecho.py
+++ b/source4/scripting/python/samba/tests/dcerpc/rpcecho.py
@@ -31,12 +31,14 @@ class RpcEchoTests(unittest.TestCase):
         self.assertEquals(2, self.conn.AddOne(1))
 
     def test_echodata(self):
-        self.assertEquals("bla", self.conn.EchoData(3, "bla"))
+        self.assertEquals([1,2,3], self.conn.EchoData(3, [1, 2, 3]))
 
     def test_call(self):
-        self.assertEquals("foobar", self.conn.TestCall("foobar"))
+        self.assertEquals(u"foobar", self.conn.TestCall(u"foobar"))
 
     def test_surrounding(self):
-        somearray = [1,2,3,4]
-        (y,) = self.conn.TestSurrounding(echo.Surrounding(4, somearray))
+        surrounding_struct = echo.Surrounding()
+        surrounding_struct.x = 4
+        surrounding_struct.surrounding = [1,2,3,4]
+        y = self.conn.TestSurrounding(surrounding_struct)
         self.assertEquals(8 * [0], y.surrounding)
-- 
cgit 


From e42322848b81a36528a0af88138acb3ec997bf01 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 14 Jan 2008 13:26:21 +0100
Subject: python: Start building winreg module. (This used to be commit
 f1a9fad83cee7754304b3422aa273d5f64868e40)

---
 source4/scripting/python/modules.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/modules.c b/source4/scripting/python/modules.c
index 55df51d881..5e53aadb94 100644
--- a/source4/scripting/python/modules.c
+++ b/source4/scripting/python/modules.c
@@ -35,6 +35,7 @@ extern void init_events(void);
 extern void inituuid(void);
 extern void init_net(void);
 extern void initecho(void);
+extern void initwinreg(void);
 
 static struct _inittab py_modules[] = { STATIC_LIBPYTHON_MODULES };
 
-- 
cgit 


From 7dd468ff2e5a4c4ce503e1b8e024bf91dcf7a412 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 14 Jan 2008 14:48:59 +0100
Subject: python: Fix python code for winreg, add test. (This used to be commit
 bd3e6c41c42738fcfcc5cef4e65f0e219d358260)

---
 source4/scripting/python/STATUS                    |  1 -
 .../python/samba/tests/dcerpc/registry.py          | 53 ++++++++++++++++++++++
 2 files changed, 53 insertions(+), 1 deletion(-)
 create mode 100644 source4/scripting/python/samba/tests/dcerpc/registry.py

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/STATUS b/source4/scripting/python/STATUS
index 9a1c5b1b64..0e88b4041c 100644
--- a/source4/scripting/python/STATUS
+++ b/source4/scripting/python/STATUS
@@ -10,7 +10,6 @@ DCE/RPC bindings
 	 - wrap struct/bitmap/enum/union types
 	  - __ndr_pack__/__ndr_unpack__ members
  - scripting/bin/smbstatus.py
- - scripting/bin/winreg.py
 
 not important before making Python the default:
 - scripting/python/samba/upgrade.py
diff --git a/source4/scripting/python/samba/tests/dcerpc/registry.py b/source4/scripting/python/samba/tests/dcerpc/registry.py
new file mode 100644
index 0000000000..7979592a40
--- /dev/null
+++ b/source4/scripting/python/samba/tests/dcerpc/registry.py
@@ -0,0 +1,53 @@
+#!/usr/bin/python
+
+# Unix SMB/CIFS implementation.
+# Copyright (C) Jelmer Vernooij <jelmer@samba.org> 2008
+#   
+# 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/>.
+#
+
+
+#!/usr/bin/python
+
+# Unix SMB/CIFS implementation.
+# Copyright (C) Jelmer Vernooij <jelmer@samba.org> 2008
+#   
+# 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/>.
+#
+
+import winreg
+from param import LoadParm
+import unittest
+
+class WinregTests(unittest.TestCase):
+    def setUp(self):
+        lp_ctx = LoadParm()
+        lp_ctx.load("st/client/client.conf")
+        self.conn = winreg.winreg("ncalrpc:", lp_ctx)
+
+    def test_hklm(self):
+        (handle, _) = self.conn.OpenHKLM(None, 
+                 winreg.KEY_QUERY_VALUE | winreg.KEY_ENUMERATE_SUB_KEYS)
+        self.conn.CloseKey(handle)
-- 
cgit 


From 035599fa651409502a6894179d5cd8a026110ba1 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 14 Jan 2008 15:25:09 +0100
Subject: python: Be more pythonic - turn WERROR and NTSTATUS return codes into
 exceptions. (This used to be commit 16fc69b843e92ae62b15caf927335cc117156499)

---
 .../python/samba/tests/dcerpc/registry.py          | 39 ++++++++++------------
 1 file changed, 18 insertions(+), 21 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/tests/dcerpc/registry.py b/source4/scripting/python/samba/tests/dcerpc/registry.py
index 7979592a40..f3f0b0fb1a 100644
--- a/source4/scripting/python/samba/tests/dcerpc/registry.py
+++ b/source4/scripting/python/samba/tests/dcerpc/registry.py
@@ -17,26 +17,6 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-
-#!/usr/bin/python
-
-# Unix SMB/CIFS implementation.
-# Copyright (C) Jelmer Vernooij <jelmer@samba.org> 2008
-#   
-# 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/>.
-#
-
 import winreg
 from param import LoadParm
 import unittest
@@ -47,7 +27,24 @@ class WinregTests(unittest.TestCase):
         lp_ctx.load("st/client/client.conf")
         self.conn = winreg.winreg("ncalrpc:", lp_ctx)
 
+    def get_hklm(self):
+        return self.conn.OpenHKLM(None, 
+             winreg.KEY_QUERY_VALUE | winreg.KEY_ENUMERATE_SUB_KEYS)
+
     def test_hklm(self):
-        (handle, _) = self.conn.OpenHKLM(None, 
+        handle = self.conn.OpenHKLM(None, 
+                 winreg.KEY_QUERY_VALUE | winreg.KEY_ENUMERATE_SUB_KEYS)
+        self.conn.CloseKey(handle)
+
+    def test_getversion(self):
+        handle = self.get_hklm()
+        version = self.conn.GetVersion(handle)
+        self.assertEquals(int, version.__class__)
+        self.conn.CloseKey(handle)
+
+    def test_getkeyinfo(self):
+        handle = self.conn.OpenHKLM(None, 
                  winreg.KEY_QUERY_VALUE | winreg.KEY_ENUMERATE_SUB_KEYS)
+        x = self.conn.QueryInfoKey(handle, winreg.String())
+        self.assertEquals(9, len(x)) # should return a 9-tuple
         self.conn.CloseKey(handle)
-- 
cgit 


From fa5397fbeda759ac66fc5d0a6bdfb60a070a7962 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 14 Jan 2008 16:11:58 +0100
Subject: python: Build epmapper module. (This used to be commit
 6cb78c7634de0f9ab327583844d7860d384356eb)

---
 source4/scripting/python/modules.c | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/modules.c b/source4/scripting/python/modules.c
index 5e53aadb94..d8a5fdeeae 100644
--- a/source4/scripting/python/modules.c
+++ b/source4/scripting/python/modules.c
@@ -36,6 +36,9 @@ extern void inituuid(void);
 extern void init_net(void);
 extern void initecho(void);
 extern void initwinreg(void);
+extern void initepmapper(void);
+extern void initinitshutdown(void);
+static void initdcerpc_misc(void) {} 
 
 static struct _inittab py_modules[] = { STATIC_LIBPYTHON_MODULES };
 
-- 
cgit 


From a896c8940ca372808c0725bc4f2725f6cb8467b8 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 14 Jan 2008 16:48:27 +0100
Subject: python: Enable python bindings for samr and lsa interfaces. (This
 used to be commit 3dfcefd8ac640ef1539185f19f7414fbcea9e741)

---
 source4/scripting/python/modules.c |  3 +++
 source4/scripting/python/pyrpc.h   | 27 +++++++++++++++++++++++++++
 2 files changed, 30 insertions(+)
 create mode 100644 source4/scripting/python/pyrpc.h

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/modules.c b/source4/scripting/python/modules.c
index d8a5fdeeae..8c5115efca 100644
--- a/source4/scripting/python/modules.c
+++ b/source4/scripting/python/modules.c
@@ -39,6 +39,9 @@ extern void initwinreg(void);
 extern void initepmapper(void);
 extern void initinitshutdown(void);
 static void initdcerpc_misc(void) {} 
+extern void initmgmt(void);
+extern void initatsvc(void);
+extern void initsamr(void);
 
 static struct _inittab py_modules[] = { STATIC_LIBPYTHON_MODULES };
 
diff --git a/source4/scripting/python/pyrpc.h b/source4/scripting/python/pyrpc.h
new file mode 100644
index 0000000000..d7b64dbe93
--- /dev/null
+++ b/source4/scripting/python/pyrpc.h
@@ -0,0 +1,27 @@
+/* 
+   Unix SMB/CIFS implementation.
+   Samba utility functions
+   Copyright (C) Jelmer Vernooij <jelmer@samba.org> 2008
+   
+   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/>.
+*/
+
+#define PY_CHECK_TYPE(type, var, fail) \
+	if (!type ## _Check(var)) {\
+		PyErr_Format(PyExc_TypeError, "Expected type %s", type ## _Type.tp_name); \
+		fail; \
+	}
+
+#define dom_sid2_Type dom_sid_Type
+#define dom_sid28_Type dom_sid_Type
-- 
cgit 


From 860106b3f426a06eed6a681fa839dd89f339ba9a Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 14 Jan 2008 16:49:19 +0100
Subject: python: Move some convenience macros to a separate header rather than
 putting them in every generated py_* file. (This used to be commit
 712274b9bdf524da125cbbe6e4bb475b21b1da66)

---
 source4/scripting/python/pyrpc.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/pyrpc.h b/source4/scripting/python/pyrpc.h
index d7b64dbe93..5390c6923d 100644
--- a/source4/scripting/python/pyrpc.h
+++ b/source4/scripting/python/pyrpc.h
@@ -25,3 +25,5 @@
 
 #define dom_sid2_Type dom_sid_Type
 #define dom_sid28_Type dom_sid_Type
+#define dom_sid2_Check dom_sid_Check
+#define dom_sid28_Check dom_sid28_Check
-- 
cgit 


From d28eb21a984a733e8f1de51170e41ae7c879f7e9 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 14 Jan 2008 18:59:11 +0100
Subject: python: Compile security module, handle uint. (This used to be commit
 dee64344fb13aaed38a550ebb4048d0fa526d5b6)

---
 source4/scripting/python/modules.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/modules.c b/source4/scripting/python/modules.c
index 8c5115efca..1728f166bd 100644
--- a/source4/scripting/python/modules.c
+++ b/source4/scripting/python/modules.c
@@ -42,6 +42,8 @@ static void initdcerpc_misc(void) {}
 extern void initmgmt(void);
 extern void initatsvc(void);
 extern void initsamr(void);
+extern void initsecurity(void);
+extern void initlsa(void);
 
 static struct _inittab py_modules[] = { STATIC_LIBPYTHON_MODULES };
 
-- 
cgit 


From 001b2435f0a47f75f82a32f2ccead2759596a09d Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 14 Jan 2008 19:05:08 +0100
Subject: python: Add simple test for samr python code. (This used to be commit
 0a039fabcba9510ab600b2e4becbf75a58d2134d)

---
 source4/scripting/python/samba/tests/dcerpc/sam.py | 28 ++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 source4/scripting/python/samba/tests/dcerpc/sam.py

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/tests/dcerpc/sam.py b/source4/scripting/python/samba/tests/dcerpc/sam.py
new file mode 100644
index 0000000000..50caaf2348
--- /dev/null
+++ b/source4/scripting/python/samba/tests/dcerpc/sam.py
@@ -0,0 +1,28 @@
+#!/usr/bin/python
+
+# Unix SMB/CIFS implementation.
+# Copyright (C) Jelmer Vernooij <jelmer@samba.org> 2008
+#   
+# 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/>.
+#
+
+import samr
+import unittest
+
+class SamrTests(unittest.TestCase):
+    def setUp(self):
+        self.conn = samr.samr("ncalrpc:", "st/client/client.conf")
+
+    def test_connect5(self):
+        (level, info, handle) = self.conn.Connect5(None, 0, 1, samr.ConnectInfo1())
-- 
cgit 


From 2aa8cbca8baf1159544c2f3c0ce316da03035d71 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 14 Jan 2008 19:49:52 +0100
Subject: python: Work around the fact that there are two "security" modules
 now.

This well demonstrates the fact we need hierarchy.
(This used to be commit df7e3498824e27f8a6d61b8b6f52577eab248d2c)
---
 source4/scripting/python/modules.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/modules.c b/source4/scripting/python/modules.c
index 1728f166bd..c953e9866c 100644
--- a/source4/scripting/python/modules.c
+++ b/source4/scripting/python/modules.c
@@ -42,7 +42,7 @@ static void initdcerpc_misc(void) {}
 extern void initmgmt(void);
 extern void initatsvc(void);
 extern void initsamr(void);
-extern void initsecurity(void);
+static void initdcerpc_security(void) {}
 extern void initlsa(void);
 
 static struct _inittab py_modules[] = { STATIC_LIBPYTHON_MODULES };
-- 
cgit 


From 2ebe80c27c8cd39a0f40ef6de3a9f805cb7d6bed Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 14 Jan 2008 19:51:08 +0100
Subject: python: Convert winreg.py completely to rpc, use new RPC Python
 bindings. (This used to be commit 9c21773737ea941b623105352b4625dcb8437706)

---
 source4/scripting/bin/winreg.py | 133 ++++++++++++++++++----------------------
 1 file changed, 61 insertions(+), 72 deletions(-)
 mode change 100644 => 100755 source4/scripting/bin/winreg.py

(limited to 'source4/scripting')

diff --git a/source4/scripting/bin/winreg.py b/source4/scripting/bin/winreg.py
old mode 100644
new mode 100755
index 6cdc3a5898..f68f2d12f2
--- a/source4/scripting/bin/winreg.py
+++ b/source4/scripting/bin/winreg.py
@@ -7,87 +7,76 @@
 #
 
 import sys
+import winreg
+import optparse
+import samba.getopt as options
 
-options = GetOptions(ARGV,
-			 "POPT_AUTOHELP",
-			 "POPT_COMMON_SAMBA",
-			 "POPT_COMMON_CREDENTIALS",
-			 "createkey=s")
-if (options == undefined) {
-	print "Failed to parse options"
-	sys.exit(-1)
+parser = optparse.OptionParser("%s <BINDING> [path]" % sys.argv[0])
+parser.add_option_group(options.SambaOptions(parser))
+parser.add_option("--createkey", type="string", metavar="KEYNAME", 
+        help="create a key")
 
-if len(sys.argv < 2:
-	print "Usage: %s <BINDING> [path]" % sys.argv[0]
-	sys.exit(-1)
+opts, args = parser.parse_args()
 
-binding = options.ARGV[0]
-reg = winregObj()
+if len(args) < 1:
+    parser.print_usage()
+    sys.exit(-1)
+
+binding = args[0]
 
 print "Connecting to " + binding
-status = reg.connect(binding)
-if (status.is_ok != true) {
-	print("Failed to connect to " + binding + " - " + status.errstr + "\n")
-	return -1
-}
+conn = winreg.winreg(binding, opts.configfile)
 
-def list_values(path):
-	list = reg.enum_values(path)
-	if (list == undefined) {
-		return
-	}
-	for (i=0;i<list.length;i++) {
-		v = list[i]
-		printf("\ttype=%-30s size=%4d  '%s'\n", reg.typestring(v.type), v.size, v.name)
-		if (v.type == reg.REG_SZ || v.type == reg.REG_EXPAND_SZ) {
-			printf("\t\t'%s'\n", v.value)
-		}
-		if (v.type == reg.REG_MULTI_SZ) {
-			for (j in v.value) {
-				printf("\t\t'%s'\n", v.value[j])
-			}
-		}
-		if (v.type == reg.REG_DWORD || v.type == reg.REG_DWORD_BIG_ENDIAN) {
-			printf("\t\t0x%08x (%d)\n", v.value, v.value)
-		}
-		if (v.type == reg.REG_QWORD) {
-			printf("\t\t0x%llx (%lld)\n", v.value, v.value)
-		}
-	}
+def list_values(key):
+    (num_values, max_valnamelen, max_valbufsize) = conn.QueryInfoKey(key, winreg.String())[4:8]
+    for i in range(num_values):
+        name = winreg.StringBuf()
+        name.size = max_valnamelen
+        (name, type, data, _, data_len) = conn.EnumValue(key, i, name, 0, "", max_valbufsize, 0)
+        print "\ttype=%-30s size=%4d  '%s'" % type, len, name
+        if type in (winreg.REG_SZ, winreg.REG_EXPAND_SZ):
+            print "\t\t'%s'" % data
+#        if (v.type == reg.REG_MULTI_SZ) {
+#            for (j in v.value) {
+#                printf("\t\t'%s'\n", v.value[j])
+#            }
+#        }
+#        if (v.type == reg.REG_DWORD || v.type == reg.REG_DWORD_BIG_ENDIAN) {
+#            printf("\t\t0x%08x (%d)\n", v.value, v.value)
+#        }
+#        if (v.type == reg.REG_QWORD) {
+#            printf("\t\t0x%llx (%lld)\n", v.value, v.value)
+#        }
 
-def list_path(path):
-	count = 0
-	list = reg.enum_path(path)
-	if (list == undefined) {
-		println("Unable to list " + path)
-		return 0
-	}
-	list_values(path)
-	count = count + list.length
-	for (i=0;i<list.length;i++) {
-		if (path) {
-			npath = path + "\\" + list[i]
-		} else {
-			npath = list[i]
-		}
-		println(npath)
-		count = count + list_path(npath)
-	}
-	return count
+def list_path(key, path):
+    count = 0
+    (num_subkeys, max_subkeylen, max_subkeysize) = conn.QueryInfoKey(key, winreg.String())[1:4]
+    for i in range(num_subkeys):
+        name = winreg.StringBuf()
+        name.size = max_subkeysize
+        keyclass = winreg.StringBuf()
+        keyclass.size = max_subkeysize
+        (name, _, _) = conn.EnumKey(key, i, name, keyclass=keyclass, last_changed_time=None)[0]
+        subkey = conn.OpenKey(key, name, 0, winreg.KEY_QUERY_VALUE | winreg.KEY_ENUMERATE_SUB_KEYS)
+        count += list_path(subkey, "%s\\%s" % (path, name))
+        list_values(subkey)
+    return count
 
-if len(sys.argv) > 2:
-	root = sys.argv[2]
+if len(args) > 1:
+    root = args[1]
 else:
-	root = ''
+    root = "HKLM"
 
-if options.createkey:
-    try:
-	    reg.create_key("HKLM\\SOFTWARE", options.createkey)
-    except:
-		print "Failed to create key"
+if opts.createkey:
+    reg.create_key("HKLM\\SOFTWARE", opt.createkey)
 else:
-	printf("Listing registry tree '%s'\n", root)
-	count = list_path(root)
+    print "Listing registry tree '%s'" % root
+    try:
+        root_key = getattr(conn, "Open%s" % root)(None, winreg.KEY_QUERY_VALUE | winreg.KEY_ENUMERATE_SUB_KEYS)
+    except AttributeError:
+        print "Unknown root key name %s" % root
+        sys.exit(1)
+    count = list_path(root_key, root)
     if count == 0:
-		println("No entries found")
-		sys.exit(1)
+        print "No entries found"
+        sys.exit(1)
-- 
cgit 


From 506f6432882804ed62fd3b8c1ddc2a4ac80fa08d Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 14 Jan 2008 20:08:04 +0100
Subject: python: Compile in svcctl Python bindings. (This used to be commit
 567099b66d0369715f8e0a083a5ce160faaf4da2)

---
 source4/scripting/python/modules.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/modules.c b/source4/scripting/python/modules.c
index c953e9866c..dc6e79fe1a 100644
--- a/source4/scripting/python/modules.c
+++ b/source4/scripting/python/modules.c
@@ -44,6 +44,7 @@ extern void initatsvc(void);
 extern void initsamr(void);
 static void initdcerpc_security(void) {}
 extern void initlsa(void);
+extern void initsvcctl(void);
 
 static struct _inittab py_modules[] = { STATIC_LIBPYTHON_MODULES };
 
-- 
cgit 


From d869de531c9f6b81c7eca43c3bfaab294c14cab1 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 14 Jan 2008 20:14:53 +0100
Subject: python: Enable building of the wkssvc python bindings. (This used to
 be commit 7a00d48a478be84e9f38c5e6cb57739063d0d613)

---
 source4/scripting/bin/epdump.py    | 24 ++++++++++++++++++++++++
 source4/scripting/python/modules.c |  1 +
 2 files changed, 25 insertions(+)
 create mode 100644 source4/scripting/bin/epdump.py

(limited to 'source4/scripting')

diff --git a/source4/scripting/bin/epdump.py b/source4/scripting/bin/epdump.py
new file mode 100644
index 0000000000..15dee33774
--- /dev/null
+++ b/source4/scripting/bin/epdump.py
@@ -0,0 +1,24 @@
+#!/usr/bin/python
+
+# Unix SMB/CIFS implementation.
+# Copyright (C) Jelmer Vernooij <jelmer@samba.org> 2008
+#   
+# 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/>.
+#
+
+import sys
+
+if len(sys.argv) < 2:
+    print "Usage: %s <binding-string>" % sys.argv[0]
+    sys.exit(1)
diff --git a/source4/scripting/python/modules.c b/source4/scripting/python/modules.c
index dc6e79fe1a..b2dd50b507 100644
--- a/source4/scripting/python/modules.c
+++ b/source4/scripting/python/modules.c
@@ -45,6 +45,7 @@ extern void initsamr(void);
 static void initdcerpc_security(void) {}
 extern void initlsa(void);
 extern void initsvcctl(void);
+extern void initwkssvc(void);
 
 static struct _inittab py_modules[] = { STATIC_LIBPYTHON_MODULES };
 
-- 
cgit 


From 0c7f4c23b7c98b41dce1919aca78bc7b760659fe Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 15 Jan 2008 01:08:30 +0100
Subject: python: Update status. (This used to be commit
 b4b12f00a7eb952024795ddc5ab3481fd4ba03fc)

---
 source4/scripting/python/STATUS | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/STATUS b/source4/scripting/python/STATUS
index 0e88b4041c..6e6475bfde 100644
--- a/source4/scripting/python/STATUS
+++ b/source4/scripting/python/STATUS
@@ -3,15 +3,13 @@ lib/ldb/tests/python/ldap.py: Fix remaining 3 FIXME's
 provisioning in LDAP mode(TEST_LDAP=yes PROVISION_PYTHON=yes make test)
 command-line vampire
 provisioning: combine some of the python dictionaries
-hierarchy
-DCE/RPC bindings
- - pidl:
-     Parse::Pidl::Samba::Python
-	 - wrap struct/bitmap/enum/union types
-	  - __ndr_pack__/__ndr_unpack__ members
- - scripting/bin/smbstatus.py
+finish scripting/bin/smbstatus.py
 
 not important before making Python the default:
+- hierarchy (rename samr -> dcerpc.samr, misc -> samba.misc, etc)
 - scripting/python/samba/upgrade.py
 - install python modules into system
 - SWAT
+- __ndr_pack__/__ndr_unpack__ members for the NDR struct bindings
+- generate docstrings in DCE/RPC bindings
+- eliminate some variables from the python interface because they can be induced
-- 
cgit 


From ad5bb10f707dddc0cea159af09393520128157d7 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 14 Jan 2008 23:04:57 +0100
Subject: python: Build shared python modules for generic use. (This used to be
 commit 502424955237ace5a276d4c91c62e95233ecd978)

---
 source4/scripting/python/config.mk | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/config.mk b/source4/scripting/python/config.mk
index f00b477919..450da0e90a 100644
--- a/source4/scripting/python/config.mk
+++ b/source4/scripting/python/config.mk
@@ -16,7 +16,7 @@ PRIVATE_DEPENDENCIES = LIBNDR LIBLDB SAMDB CREDENTIALS
 SWIG_FILE = misc.i
 
 # Swig extensions
-swig: pythonmods
+swig:: pythonmods
 
 .SUFFIXES: _wrap.c .i
 
@@ -28,13 +28,19 @@ realdistclean::
 	@-rm -f bin/python/*
 	# FIXME: Remove _wrap.c files
 
-pythonmods: $(PYTHON_DSOS)
+pythonmods:: $(PYTHON_DSOS) $(PYTHON_PYS)
 
 PYDOCTOR_MODULES=bin/python/ldb.py bin/python/auth.py bin/python/credentials.py bin/python/registry.py bin/python/tdb.py bin/python/security.py bin/python/events.py bin/python/net.py
 
 pydoctor:: pythonmods
 	LD_LIBRARY_PATH=bin/shared PYTHONPATH=bin/python pydoctor --make-html --docformat=restructuredtext --add-package scripting/python/samba/ $(addprefix --add-module , $(PYDOCTOR_MODULES))
 
+installpython:: pythonmods
+	@$(SHELL) $(srcdir)/script/installpython.sh \
+		$(INSTALLPERMS) \
+		$(DESTDIR)$(PYTHONDIR) \
+		scripting/python bin/python
+
 clean::
 	@echo "Removing python modules"
 	@rm -f bin/python/*
-- 
cgit 


From f1e177a7b8e660b245d5fb9b11a66b43c9b69784 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Thu, 17 Jan 2008 12:00:27 +1100
Subject: provision: simplfy by removing old code to manually create baseDNs.

Previously, we would create the first record in the DB as an LDIF
file, with the expectation that the administrator would use slapadd to
create the database.

We now do everything over LDAP, which is far simpler, and allows the
LDB module chain to do its work, without special cases.

Also fix naming of the output schema when suggesting the comamnd line
to run ad2oLschema in provision-backend.

Andrew Bartlett
(This used to be commit e77375758d66e94e5e0b6e61a97c9281c3d9c71f)
---
 source4/scripting/libjs/provision.js | 38 ++++++------------------------------
 1 file changed, 6 insertions(+), 32 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index 266bac1a75..381288417a 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -398,9 +398,6 @@ function provision_default_paths(subobj)
 	paths.named_conf = lp.get("private dir") + "/named.conf";
 	paths.winsdb = "wins.ldb";
 	paths.ldapdir = lp.get("private dir") + "/ldap";
-	paths.ldap_basedn_ldif = paths.ldapdir + "/" + dnsdomain + ".ldif";
-	paths.ldap_config_basedn_ldif = paths.ldapdir + "/" + dnsdomain + "-config.ldif";
-	paths.ldap_schema_basedn_ldif = paths.ldapdir + "/" + dnsdomain + "-schema.ldif";
 
 	paths.s4_ldapi_socket = lp.get("private dir") + "/ldapi";
 	paths.phpldapadminconfig = lp.get("private dir") + "/phpldapadmin-config.php";
@@ -866,6 +863,12 @@ function provision_schema(subobj, message, tmp_schema_path, paths)
 	/* This will erase anything in the tmp db */
 	var samdb = open_ldb(info, tmp_schema_path, true);
 
+	message("Setting up sam.ldb attributes\n");
+	setup_add_ldif("provision_init.ldif", info, samdb, false);
+
+	message("Setting up sam.ldb rootDSE\n");
+	setup_add_ldif("provision_rootdse_add.ldif", info, samdb, false);
+
 	message("Adding schema container (permitted to fail)\n");
 	var add_ok = setup_add_ldif("provision_schema_basedn.ldif", info, samdb, true);
 	message("Modifying schema container\n");
@@ -934,34 +937,6 @@ function provision_dns(subobj, message, paths, session_info, credentials)
 	message("Please install the zone located in " + paths.dns + " into your DNS server.  A sample BIND configuration snippit is at " + paths.named_conf + "\n");
 }
 
-/* Write out a DNS zone file, from the info in the current database */
-function provision_ldapbase(subobj, message, paths)
-{
-	var ok = provision_fix_subobj(subobj, paths);
-	assert(ok);
-
-	message("Setting up LDAP base entry: " + subobj.DOMAINDN + " \n");
-	var rdns = split(",", subobj.DOMAINDN);
-	subobj.EXTENSIBLEOBJECT = "objectClass: extensibleObject";
-
-	subobj.RDN_DC = substr(rdns[0], strlen("DC="));
-
-	sys.mkdir(paths.ldapdir, 0700);
-
-	setup_file("provision_basedn.ldif", 
-		   message, paths.ldap_basedn_ldif, 
-		   subobj);
-
-	setup_file("provision_configuration_basedn.ldif", 
-		   message, paths.ldap_config_basedn_ldif, 
-		   subobj);
-
-	setup_file("provision_schema_basedn.ldif", 
-		   message, paths.ldap_schema_basedn_ldif, 
-		   subobj);
-
-}
-
 
 /*
   guess reasonably default options for provisioning
@@ -1045,7 +1020,6 @@ function provision_guess()
 	subobj.CONFIGDN_MOD2 = ",objectguid";
 	subobj.SCHEMADN_MOD2 = ",objectguid";
 
-	subobj.EXTENSIBLEOBJECT = "# no objectClass: extensibleObject for local ldb";
 	subobj.ACI		= "# no aci for local ldb";
 
 	return subobj;
-- 
cgit 


From 8d36d43e5258aa80855a9baa707a9fcad77a0d03 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Fri, 18 Jan 2008 10:13:43 +1100
Subject: Add in a new module to handle instanceType

This code raided from the repl_meta_data module, which probably needs
to be downsized to just handling the replication data.

Andrew Bartlett
(This used to be commit 2a418f33705a792d9d16cf1d4aa3dcda467e6e04)
---
 source4/scripting/libjs/provision.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index 381288417a..0cca49dec9 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -1013,9 +1013,9 @@ function provision_guess()
 	subobj.DOMAINDN_LDB = "users.ldb";
 	subobj.CONFIGDN_LDB = "configuration.ldb";
 	subobj.SCHEMADN_LDB = "schema.ldb";
-	subobj.DOMAINDN_MOD = "pdc_fsmo,password_hash";
-	subobj.CONFIGDN_MOD = "naming_fsmo";
-	subobj.SCHEMADN_MOD = "schema_fsmo";
+	subobj.DOMAINDN_MOD = "pdc_fsmo,password_hash,instancetype";
+	subobj.CONFIGDN_MOD = "naming_fsmo,instancetype";
+	subobj.SCHEMADN_MOD = "schema_fsmo,instancetype";
 	subobj.DOMAINDN_MOD2 = ",objectguid";
 	subobj.CONFIGDN_MOD2 = ",objectguid";
 	subobj.SCHEMADN_MOD2 = ",objectguid";
-- 
cgit 


From 064eb82870596e72373c290dfaf0e6b8289303de Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Fri, 18 Jan 2008 13:25:01 +1100
Subject: Remove --ldap-base from the python provision script

(This is a merge from the ejs script)

Andrew Bartlett
(This used to be commit d822dfa017b84895222ace8c44935fb872930548)
---
 source4/scripting/python/samba/provision.py | 32 -----------------------------
 1 file changed, 32 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index 1607cb343b..d59cea121e 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -180,12 +180,6 @@ def provision_paths_from_lp(lp, dnsdomain):
     paths.dns_keytab = os.path.join(private_dir, "dns.keytab")
     paths.dns = os.path.join(private_dir, dnsdomain + ".zone")
     paths.winsdb = os.path.join(private_dir, "wins.ldb")
-    paths.ldap_basedn_ldif = os.path.join(private_dir, 
-                                          dnsdomain + ".ldif")
-    paths.ldap_config_basedn_ldif = os.path.join(private_dir, 
-                                             dnsdomain + "-config.ldif")
-    paths.ldap_schema_basedn_ldif = os.path.join(private_dir, 
-                                              dnsdomain + "-schema.ldif")
     paths.s4_ldapi_path = os.path.join(private_dir, "ldapi")
     paths.phpldapadminconfig = os.path.join(private_dir, 
                                             "phpldapadmin-config.php")
@@ -465,7 +459,6 @@ def setup_samdb(path, setup_path, session_info, credentials, lp,
         setup_add_ldif(samdb, setup_path("provision_basedn.ldif"), {
             "DOMAINDN": domaindn,
             "ACI": aci,
-            "EXTENSIBLEOBJECT": "# no objectClass: extensibleObject for local ldb",
             "RDN_DC": rdn_dc,
             })
 
@@ -823,31 +816,6 @@ def create_zone_file(path, setup_path, samdb, dnsdomain, domaindn,
         })
 
 
-def provision_ldapbase(setup_dir, message, paths):
-    """Write out a DNS zone file, from the info in the current database."""
-    message("Setting up LDAP base entry: %s" % domaindn)
-    rdns = domaindn.split(",")
-
-    rdn_dc = rdns[0][len("DC="):]
-
-    def setup_path(file):
-        return os.path.join(setup_dir, file)
-
-    setup_file(setup_path("provision_basedn.ldif"), 
-           paths.ldap_basedn_ldif)
-
-    setup_file(setup_path("provision_configuration_basedn.ldif"), 
-           paths.ldap_config_basedn_ldif)
-
-    setup_file(setup_path("provision_schema_basedn.ldif"), 
-           paths.ldap_schema_basedn_ldif, {
-            "SCHEMADN": schemadn,
-            "ACI": "# no aci for local ldb",
-            "EXTENSIBLEOBJECT": "objectClass: extensibleObject"})
-
-    message("Please install the LDIF located in " + paths.ldap_basedn_ldif + ", " + paths.ldap_config_basedn_ldif + " and " + paths.ldap_schema_basedn_ldif + " into your LDAP server, and re-run with --ldap-backend=ldap://my.ldap.server")
-
-
 def load_schema(setup_path, samdb, schemadn, netbiosname, configdn):
     """Load schema.
     
-- 
cgit 


From 03023c4f7d8c7bc6716982db86e8167f1ac6331b Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sun, 20 Jan 2008 16:28:43 +0100
Subject: build: Demote a bunch of libraries to subsystems. This makes
 packaging easier and should also make it easier to migrate to a new build
 system. (This used to be commit 77b400764e3dadfa05407343af649ad9298cc085)

---
 source4/scripting/ejs/config.mk | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/config.mk b/source4/scripting/ejs/config.mk
index 8b680ba973..656ecdae16 100644
--- a/source4/scripting/ejs/config.mk
+++ b/source4/scripting/ejs/config.mk
@@ -1,10 +1,6 @@
-#######################
-# Start LIBRARY EJSRPC
 [SUBSYSTEM::EJSRPC]
 OBJ_FILES = \
 		ejsrpc.o
-# End SUBSYSTEM EJSRPC
-#######################
 
 [MODULE::smbcalls_config]
 OBJ_FILES = smbcalls_config.o
@@ -79,11 +75,7 @@ INIT_FUNCTION = smb_setup_ejs_system
 
 include ejsnet/config.mk
 
-#######################
-# Start LIBRARY smbcalls
-[LIBRARY::smbcalls]
-SO_VERSION = 0
-VERSION = 0.0.1
+[SUBSYSTEM::smbcalls]
 PRIVATE_PROTO_HEADER = proto.h
 OBJ_FILES = \
 		smbcalls.o \
@@ -101,8 +93,6 @@ PRIVATE_DEPENDENCIES = \
 		CREDENTIALS POPT_CREDENTIALS POPT_SAMBA \
 		dcerpc \
 		NDR_TABLE
-# End SUBSYSTEM smbcalls
-#######################
 
 #######################
 # Start BINARY SMBSCRIPT
-- 
cgit 


From 42a793107e79624644ddfcac960b23eae3362002 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sun, 20 Jan 2008 18:04:19 +0100
Subject: python: Fix init functions. (This used to be commit
 4b057b9bffcef9ecc61fe016746f5ce6f17f6d06)

---
 source4/scripting/python/modules.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/modules.c b/source4/scripting/python/modules.c
index b2dd50b507..fff981e941 100644
--- a/source4/scripting/python/modules.c
+++ b/source4/scripting/python/modules.c
@@ -46,6 +46,8 @@ static void initdcerpc_security(void) {}
 extern void initlsa(void);
 extern void initsvcctl(void);
 extern void initwkssvc(void);
+extern void init_libcli_nbt(void);
+extern void init_libcli_smb(void);
 
 static struct _inittab py_modules[] = { STATIC_LIBPYTHON_MODULES };
 
-- 
cgit 


From decdf5954d5e1ae84318d6767317965f544a897f Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Wed, 23 Jan 2008 23:33:36 +0100
Subject: python: Add convenience function for getting command line loadparm
 context and default to using system smb.conf. (This used to be commit
 b3afde0f00ab5093b577b139a062c233d4db2524)

---
 source4/scripting/bin/winreg.py          |  5 +++--
 source4/scripting/python/samba/getopt.py | 20 ++++++++++++++++++--
 2 files changed, 21 insertions(+), 4 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/bin/winreg.py b/source4/scripting/bin/winreg.py
index f68f2d12f2..1e39ee8f78 100755
--- a/source4/scripting/bin/winreg.py
+++ b/source4/scripting/bin/winreg.py
@@ -12,7 +12,8 @@ import optparse
 import samba.getopt as options
 
 parser = optparse.OptionParser("%s <BINDING> [path]" % sys.argv[0])
-parser.add_option_group(options.SambaOptions(parser))
+sambaopts = options.SambaOptions(parser)
+parser.add_option_group(sambaopts)
 parser.add_option("--createkey", type="string", metavar="KEYNAME", 
         help="create a key")
 
@@ -25,7 +26,7 @@ if len(args) < 1:
 binding = args[0]
 
 print "Connecting to " + binding
-conn = winreg.winreg(binding, opts.configfile)
+conn = winreg.winreg(binding, sambaopts.get_loadparm())
 
 def list_values(key):
     (num_values, max_valnamelen, max_valbufsize) = conn.QueryInfoKey(key, winreg.String())[4:8]
diff --git a/source4/scripting/python/samba/getopt.py b/source4/scripting/python/samba/getopt.py
index a087974a69..dfcf2c457e 100644
--- a/source4/scripting/python/samba/getopt.py
+++ b/source4/scripting/python/samba/getopt.py
@@ -23,9 +23,25 @@ from credentials import Credentials
 class SambaOptions(optparse.OptionGroup):
     def __init__(self, parser):
         optparse.OptionGroup.__init__(self, parser, "Samba Common Options")
-        self.add_option("-s", "--configfile", type="string", metavar="FILE",
-                        help="Configuration file")
+        self.add_option("-s", "--configfile", action="callback",
+                        type=str, metavar="FILE", help="Configuration file", 
+                        callback=self._load_configfile)
+        self._configfile = None
 
+    def get_loadparm_path(self):
+        return self._configfile
+
+    def _load_configfile(self, option, opt_str, arg, parser):
+        self._configfile = arg
+
+    def get_loadparm(self):
+        import param
+        lp = param.LoadParm()
+        if self._configfile is None:
+            lp.load_default()
+        else:
+            lp.load(self._configfile)
+        return lp
 
 class VersionOptions(optparse.OptionGroup):
     def __init__(self, parser):
-- 
cgit 


From 42771814530639940b3349a6b5091f9a7d19f8f7 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Thu, 24 Jan 2008 01:05:57 +0100
Subject: python: Support --no-pass. (This used to be commit
 a90f3e8c420bec7fd7a39e0d5e2df6b32aedcdd5)

---
 source4/scripting/python/samba/getopt.py | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/getopt.py b/source4/scripting/python/samba/getopt.py
index dfcf2c457e..088a5acf6f 100644
--- a/source4/scripting/python/samba/getopt.py
+++ b/source4/scripting/python/samba/getopt.py
@@ -50,6 +50,7 @@ class VersionOptions(optparse.OptionGroup):
 
 class CredentialsOptions(optparse.OptionGroup):
     def __init__(self, parser):
+        self.no_pass = False
         optparse.OptionGroup.__init__(self, parser, "Credentials Options")
         self.add_option("--simple-bind-dn", metavar="DN", action="callback",
                         callback=self._set_simple_bind_dn, type=str,
@@ -62,6 +63,8 @@ class CredentialsOptions(optparse.OptionGroup):
         self.add_option("-W", "--workgroup", metavar="WORKGROUP", 
                         action="callback", type=str,
                         help="Workgroup", callback=self._parse_workgroup)
+        self.add_option("-N", "--no-pass", action="store_true",
+                        help="Don't ask for a password")
         self.creds = Credentials()
 
     def _parse_username(self, option, opt_str, arg, parser):
@@ -77,4 +80,7 @@ class CredentialsOptions(optparse.OptionGroup):
         self.creds.set_bind_dn(arg)
 
     def get_credentials(self):
+        self.creds.guess()
+        if not self.no_pass:
+            self.creds.set_cmdline_callbacks()
         return self.creds
-- 
cgit 


From a2dcf7bd22b5f206ef3c3816d0c93b140260da67 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Thu, 24 Jan 2008 01:06:19 +0100
Subject: Python: add some docstrings. (This used to be commit
 1de69a772e1cc007220add1f51bffe83784c3344)

---
 source4/scripting/python/samba/provision.py | 51 ++++++++++++++++++++++++++---
 1 file changed, 46 insertions(+), 5 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index d59cea121e..11dd819ad3 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -289,6 +289,14 @@ def provision_become_dc(setup_dir, message, paths, lp, session_info,
 
 
 def setup_secretsdb(path, setup_path, session_info, credentials, lp):
+    """Setup the secrets database.
+
+    :param path: Path to the secrets database.
+    :param setup_path: Get the path to a setup file.
+    :param session_info: Session info.
+    :param credentials: Credentials
+    :param lp: Loadparm context
+    """
     if os.path.exists(path):
         os.unlink(path)
     secrets_ldb = Ldb(path, session_info=session_info, credentials=credentials, lp=lp)
@@ -299,6 +307,14 @@ def setup_secretsdb(path, setup_path, session_info, credentials, lp):
 
 
 def setup_templatesdb(path, setup_path, session_info, credentials, lp):
+    """Setup the templates database.
+
+    :param path: Path to the database.
+    :param setup_path: Function for obtaining the path to setup files.
+    :param session_info: Session info
+    :param credentials: Credentials
+    :param lp: Loadparm context
+    """
     templates_ldb = SamDB(path, session_info=session_info,
                         credentials=credentials, lp=lp)
     templates_ldb.erase()
@@ -306,6 +322,14 @@ def setup_templatesdb(path, setup_path, session_info, credentials, lp):
 
 
 def setup_registry(path, setup_path, session_info, credentials, lp):
+    """Setup the registry.
+    
+    :param path: Path to the registry database
+    :param setup_path: Function that returns the path to a setup.
+    :param session_info: Session information
+    :param credentials: Credentials
+    :param lp: Loadparm context
+    """
     reg = registry.Registry()
     hive = registry.open_ldb(path, session_info=session_info, 
                          credentials=credentials, lp_ctx=lp)
@@ -317,6 +341,12 @@ def setup_registry(path, setup_path, session_info, credentials, lp):
 
 def setup_samdb_rootdse(samdb, setup_path, schemadn, domaindn, hostname, 
                         dnsdomain, realm, rootdn, configdn, netbiosname):
+    """Setup the SamDB rootdse.
+
+    :param samdb: Sam Database handle
+    :param setup_path: Obtain setup path
+    ...
+    """
     setup_add_ldif(samdb, setup_path("provision_rootdse_add.ldif"), {
         "SCHEMADN": schemadn, 
         "NETBIOSNAME": netbiosname,
@@ -332,6 +362,14 @@ def setup_samdb_rootdse(samdb, setup_path, schemadn, domaindn, hostname,
 
 
 def setup_samdb_partitions(samdb, setup_path, schemadn, configdn, domaindn):
+    """Setup SAM database partitions.
+
+    :param samdb: Sam Database handle
+    :param setup_path: Setup path function
+    :param schemadn: Schema DN.
+    :param configdn: Configuration DN.
+    :param domaindn: Domain DN.
+    """
     #Add modules to the list to activate them by default
     #beware often order is important
     #
@@ -561,11 +599,14 @@ def setup_samdb(path, setup_path, session_info, credentials, lp,
 
             if lp.get("server role") == "domain controller":
                 message("Setting up self join")
-                setup_self_join(samdb, configdn=configdn, schemadn=schemadn, domaindn=domaindn, 
-                                invocationid=invocationid, dnspass=dnspass, netbiosname=netbiosname,
-                                dnsdomain=dnsdomain, realm=realm, machinepass=machinepass, 
-                                domainname=domainname, domainsid=domainsid, policyguid=policyguid,
-                                hostname=hostname, hostguid=hostguid, setup_path=setup_path)
+                setup_self_join(samdb, configdn=configdn, schemadn=schemadn, 
+                                domaindn=domaindn, invocationid=invocationid, 
+                                dnspass=dnspass, netbiosname=netbiosname, 
+                                dnsdomain=dnsdomain, realm=realm, 
+                                machinepass=machinepass, domainname=domainname, 
+                                domainsid=domainsid, policyguid=policyguid,
+                                hostname=hostname, hostguid=hostguid, 
+                                setup_path=setup_path)
 
         message("Setting up sam.ldb index")
         samdb.load_ldif_file_add(setup_path("provision_index.ldif"))
-- 
cgit 


From 08f94e2754a95b50fc421c18a07401d4fd141941 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Thu, 24 Jan 2008 11:26:21 +1100
Subject: Remove useless subs from the ejs provision

The less things we manually place into the templates, the easier the
conversion to python will be.

Andrew Bartlett
(This used to be commit f65e5c164476b80468aa19452b108db17c642f8b)
---
 source4/scripting/libjs/provision.js | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index 0cca49dec9..175a1782ba 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -969,9 +969,6 @@ function provision_guess()
 	subobj.ADMINPASS    = randpass(12);
 	subobj.LDAPMANAGERPASS     = randpass(12);
 	subobj.DEFAULTSITE  = "Default-First-Site-Name";
-	subobj.NEWGUID      = randguid;
-	subobj.NTTIME       = nttime;
-	subobj.LDAPTIME     = ldaptime;
 	subobj.DATESTRING   = datestring;
 	subobj.ROOT         = findnss(nss.getpwnam, "root");
 	subobj.NOBODY       = findnss(nss.getpwnam, "nobody");
-- 
cgit 


From 1557e7b930b95fa5309390c46f72e14628447703 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Thu, 24 Jan 2008 11:33:37 +1100
Subject: Kill another sub that the modules will handle for us. (This used to
 be commit e9bb130d63e86fafc4cbf379e2e237354b88bcf8)

---
 source4/scripting/libjs/provision.js | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index 175a1782ba..5c4ff6877f 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -484,9 +484,6 @@ function provision_fix_subobj(subobj, paths)
 	subobj.ADMINPASS_B64   = ldb.encode(subobj.ADMINPASS);
 	subobj.DNSPASS_B64     = ldb.encode(subobj.DNSPASS);
 
-	var rdns = split(",", subobj.DOMAINDN);
-	subobj.RDN_DC = substr(rdns[0], strlen("DC="));
-
 	subobj.SAM_LDB		= "tdb://" + paths.samdb;
 	subobj.SECRETS_KEYTAB	= paths.keytab;
 	subobj.DNS_KEYTAB	= paths.dns_keytab;
-- 
cgit 


From a2d7a3b627842b70cfe2aa8318ce5b7353989261 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Thu, 24 Jan 2008 14:28:25 +1100
Subject: Use the repl_meta_data module by default.

This means that, except when we back onto LDAP, when it will be
replaced with the mapping backend, we will keep this codepath tested.

Andrew Bartlett
(This used to be commit e8fb5da5a18c1c3bd788b1ab3f814ffb847b00fd)
---
 source4/scripting/libjs/provision.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index 5c4ff6877f..b782d948be 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -693,6 +693,8 @@ function provision(subobj, message, blank, paths, session_info, credentials, lda
 
 	samdb.set_domain_sid(subobj.DOMAINSID);
 
+	samdb.set_ntds_invocationId(subobj.INVOCATIONID);
+
 	var load_schema_ok = load_schema(subobj, message, samdb);
 	assert(load_schema_ok.is_ok);
 
@@ -1010,9 +1012,9 @@ function provision_guess()
 	subobj.DOMAINDN_MOD = "pdc_fsmo,password_hash,instancetype";
 	subobj.CONFIGDN_MOD = "naming_fsmo,instancetype";
 	subobj.SCHEMADN_MOD = "schema_fsmo,instancetype";
-	subobj.DOMAINDN_MOD2 = ",objectguid";
-	subobj.CONFIGDN_MOD2 = ",objectguid";
-	subobj.SCHEMADN_MOD2 = ",objectguid";
+	subobj.DOMAINDN_MOD2 = ",repl_meta_data";
+	subobj.CONFIGDN_MOD2 = ",repl_meta_data";
+	subobj.SCHEMADN_MOD2 = ",repl_meta_data";
 
 	subobj.ACI		= "# no aci for local ldb";
 
-- 
cgit 


From 48e79659d1a81bb5a5dd3932f9e8f7c0b1a99947 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Thu, 24 Jan 2008 16:17:45 +1100
Subject: Make the repl_meta_data module the default for domain controllers.

Andrew Bartlett
(This used to be commit ae2ea1bd0cd2b326b09b372428969f2cf52ce519)
---
 source4/scripting/libjs/provision.js | 29 ++++++++++++++++++++++++-----
 1 file changed, 24 insertions(+), 5 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index b782d948be..4cb717bde8 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -610,10 +610,21 @@ function provision(subobj, message, blank, paths, session_info, credentials, lda
 	var lp = loadparm_init();
 	var sys = sys_init();
 	var info = new Object();
+	random_init(local);
 
 	var ok = provision_fix_subobj(subobj, paths);
 	assert(ok);
 
+	if (strlower(subobj.SERVERROLE) == strlower("domain controller")) {
+		if (subobj.BACKEND_MOD == undefined) {
+			subobj.BACKEND_MOD = "repl_meta_data";
+		}
+	} else {
+		if (subobj.BACKEND_MOD == undefined) {
+			subobj.BACKEND_MOD = "objectguid";
+		}
+	}
+
 	if (subobj.DOMAINGUID != undefined) {
 		subobj.DOMAINGUID_MOD = sprintf("replace: objectGUID\nobjectGUID: %s\n-", subobj.DOMAINGUID);
 	} else {
@@ -693,7 +704,19 @@ function provision(subobj, message, blank, paths, session_info, credentials, lda
 
 	samdb.set_domain_sid(subobj.DOMAINSID);
 
-	samdb.set_ntds_invocationId(subobj.INVOCATIONID);
+	if (strlower(subobj.SERVERROLE) == strlower("domain controller")) {
+		if (subobj.INVOCATIONID == undefined) {
+			subobj.INVOCATIONID = randguid();
+		}
+		samdb.set_ntds_invocationId(subobj.INVOCATIONID);
+		if (subobj.BACKEND_MOD == undefined) {
+			subobj.BACKEND_MOD = "repl_meta_data";
+		}
+	} else {
+		if (subobj.BACKEND_MOD == undefined) {
+			subobj.BACKEND_MOD = "objectguid";
+		}
+	}
 
 	var load_schema_ok = load_schema(subobj, message, samdb);
 	assert(load_schema_ok.is_ok);
@@ -960,7 +983,6 @@ function provision_guess()
 	subobj.VERSION      = version();
 	subobj.HOSTIP       = hostip();
 	subobj.DOMAINSID    = randsid();
-	subobj.INVOCATIONID = randguid();
 	subobj.POLICYGUID   = randguid();
 	subobj.KRBTGTPASS   = randpass(12);
 	subobj.MACHINEPASS  = randpass(12);
@@ -1012,9 +1034,6 @@ function provision_guess()
 	subobj.DOMAINDN_MOD = "pdc_fsmo,password_hash,instancetype";
 	subobj.CONFIGDN_MOD = "naming_fsmo,instancetype";
 	subobj.SCHEMADN_MOD = "schema_fsmo,instancetype";
-	subobj.DOMAINDN_MOD2 = ",repl_meta_data";
-	subobj.CONFIGDN_MOD2 = ",repl_meta_data";
-	subobj.SCHEMADN_MOD2 = ",repl_meta_data";
 
 	subobj.ACI		= "# no aci for local ldb";
 
-- 
cgit 


From 6e5c528f87dee7ec0b1fe1ab9c6f48cea32164bc Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Thu, 24 Jan 2008 16:25:35 +1100
Subject: Ensure we set subobj.BACKEND_MOD for the 'partitions only' case.

Andrew Bartlett
(This used to be commit be5eb2da241452ccc0526f4f115aa44c0793c351)
---
 source4/scripting/libjs/provision.js | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index 4cb717bde8..e71498010c 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -524,6 +524,10 @@ function provision_become_dc(subobj, message, erase, paths, session_info)
 	var ok = provision_fix_subobj(subobj, paths);
 	assert(ok);
 
+	if (subobj.BACKEND_MOD == undefined) {
+		subobj.BACKEND_MOD = "repl_meta_data";
+	}
+
 	info.subobj = subobj;
 	info.message = message;
 	info.session_info = session_info;
-- 
cgit 


From 859b847a68cf10526b9f356ebcb328e7334a8cb1 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Thu, 24 Jan 2008 22:08:39 +0100
Subject: python: Add bindings for SamDB.set_invocation_id(). (This used to be
 commit c09efa7b778f9cb29032a6abfd914fcaae8df163)

---
 source4/scripting/python/misc.i         |   2 +
 source4/scripting/python/misc.py        |   1 +
 source4/scripting/python/misc_wrap.c    | 101 +++++++++++++++++++++++---------
 source4/scripting/python/samba/samdb.py |   7 +++
 4 files changed, 82 insertions(+), 29 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/misc.i b/source4/scripting/python/misc.i
index 2f41840670..d5c9cde93e 100644
--- a/source4/scripting/python/misc.i
+++ b/source4/scripting/python/misc.i
@@ -66,3 +66,5 @@ WERROR dsdb_attach_schema_from_ldif_file(struct ldb_context *ldb, const char *pf
 const char *samba_version_string(void);
 int dsdb_set_global_schema(struct ldb_context *ldb);
 int ldb_register_samba_handlers(struct ldb_context *ldb);
+
+bool samdb_set_ntds_invocation_id(struct ldb_context *ldb, const struct GUID *invocation_id_in);
\ No newline at end of file
diff --git a/source4/scripting/python/misc.py b/source4/scripting/python/misc.py
index ae900a1f62..998de46504 100644
--- a/source4/scripting/python/misc.py
+++ b/source4/scripting/python/misc.py
@@ -70,5 +70,6 @@ dsdb_attach_schema_from_ldif_file = _misc.dsdb_attach_schema_from_ldif_file
 version = _misc.version
 dsdb_set_global_schema = _misc.dsdb_set_global_schema
 ldb_register_samba_handlers = _misc.ldb_register_samba_handlers
+samdb_set_ntds_invocation_id = _misc.samdb_set_ntds_invocation_id
 
 
diff --git a/source4/scripting/python/misc_wrap.c b/source4/scripting/python/misc_wrap.c
index a7493550cc..564bcc0e46 100644
--- a/source4/scripting/python/misc_wrap.c
+++ b/source4/scripting/python/misc_wrap.c
@@ -2459,35 +2459,36 @@ SWIG_Python_MustGetPtr(PyObject *obj, swig_type_info *ty, int argnum, int flags)
 
 /* -------- TYPES TABLE (BEGIN) -------- */
 
-#define SWIGTYPE_p_TALLOC_CTX swig_types[0]
-#define SWIGTYPE_p_auth_session_info swig_types[1]
-#define SWIGTYPE_p_char swig_types[2]
-#define SWIGTYPE_p_cli_credentials swig_types[3]
-#define SWIGTYPE_p_dom_sid swig_types[4]
-#define SWIGTYPE_p_int swig_types[5]
-#define SWIGTYPE_p_ldb_context swig_types[6]
-#define SWIGTYPE_p_ldb_dn swig_types[7]
-#define SWIGTYPE_p_ldb_ldif swig_types[8]
-#define SWIGTYPE_p_ldb_message swig_types[9]
-#define SWIGTYPE_p_ldb_message_element swig_types[10]
-#define SWIGTYPE_p_ldb_result swig_types[11]
-#define SWIGTYPE_p_loadparm_context swig_types[12]
-#define SWIGTYPE_p_loadparm_service swig_types[13]
-#define SWIGTYPE_p_long_long swig_types[14]
-#define SWIGTYPE_p_param_context swig_types[15]
-#define SWIGTYPE_p_param_opt swig_types[16]
-#define SWIGTYPE_p_param_section swig_types[17]
-#define SWIGTYPE_p_security_descriptor swig_types[18]
-#define SWIGTYPE_p_security_token swig_types[19]
-#define SWIGTYPE_p_short swig_types[20]
-#define SWIGTYPE_p_signed_char swig_types[21]
-#define SWIGTYPE_p_unsigned_char swig_types[22]
-#define SWIGTYPE_p_unsigned_int swig_types[23]
-#define SWIGTYPE_p_unsigned_long swig_types[24]
-#define SWIGTYPE_p_unsigned_long_long swig_types[25]
-#define SWIGTYPE_p_unsigned_short swig_types[26]
-static swig_type_info *swig_types[28];
-static swig_module_info swig_module = {swig_types, 27, 0, 0, 0, 0};
+#define SWIGTYPE_p_GUID swig_types[0]
+#define SWIGTYPE_p_TALLOC_CTX swig_types[1]
+#define SWIGTYPE_p_auth_session_info swig_types[2]
+#define SWIGTYPE_p_char swig_types[3]
+#define SWIGTYPE_p_cli_credentials swig_types[4]
+#define SWIGTYPE_p_dom_sid swig_types[5]
+#define SWIGTYPE_p_int swig_types[6]
+#define SWIGTYPE_p_ldb_context swig_types[7]
+#define SWIGTYPE_p_ldb_dn swig_types[8]
+#define SWIGTYPE_p_ldb_ldif swig_types[9]
+#define SWIGTYPE_p_ldb_message swig_types[10]
+#define SWIGTYPE_p_ldb_message_element swig_types[11]
+#define SWIGTYPE_p_ldb_result swig_types[12]
+#define SWIGTYPE_p_loadparm_context swig_types[13]
+#define SWIGTYPE_p_loadparm_service swig_types[14]
+#define SWIGTYPE_p_long_long swig_types[15]
+#define SWIGTYPE_p_param_context swig_types[16]
+#define SWIGTYPE_p_param_opt swig_types[17]
+#define SWIGTYPE_p_param_section swig_types[18]
+#define SWIGTYPE_p_security_descriptor swig_types[19]
+#define SWIGTYPE_p_security_token swig_types[20]
+#define SWIGTYPE_p_short swig_types[21]
+#define SWIGTYPE_p_signed_char swig_types[22]
+#define SWIGTYPE_p_unsigned_char swig_types[23]
+#define SWIGTYPE_p_unsigned_int swig_types[24]
+#define SWIGTYPE_p_unsigned_long swig_types[25]
+#define SWIGTYPE_p_unsigned_long_long swig_types[26]
+#define SWIGTYPE_p_unsigned_short swig_types[27]
+static swig_type_info *swig_types[29];
+static swig_module_info swig_module = {swig_types, 28, 0, 0, 0, 0};
 #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name)
 #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name)
 
@@ -3102,6 +3103,43 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_samdb_set_ntds_invocation_id(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  struct ldb_context *arg1 = (struct ldb_context *) 0 ;
+  struct GUID *arg2 = (struct GUID *) 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "ldb",(char *) "invocation_id_in", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:samdb_set_ntds_invocation_id",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ldb_context, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "samdb_set_ntds_invocation_id" "', argument " "1"" of type '" "struct ldb_context *""'"); 
+  }
+  arg1 = (struct ldb_context *)(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_GUID, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "samdb_set_ntds_invocation_id" "', argument " "2"" of type '" "struct GUID const *""'"); 
+  }
+  arg2 = (struct GUID *)(argp2);
+  if (arg1 == NULL)
+  SWIG_exception(SWIG_ValueError, 
+    "ldb context must be non-NULL");
+  result = (bool)samdb_set_ntds_invocation_id(arg1,(struct GUID const *)arg2);
+  resultobj = SWIG_From_bool((bool)(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
 static PyMethodDef SwigMethods[] = {
 	 { (char *)"random_password", (PyCFunction) _wrap_random_password, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"ldb_set_credentials", (PyCFunction) _wrap_ldb_set_credentials, METH_VARARGS | METH_KEYWORDS, NULL},
@@ -3112,12 +3150,14 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"version", (PyCFunction)_wrap_version, METH_NOARGS, NULL},
 	 { (char *)"dsdb_set_global_schema", (PyCFunction) _wrap_dsdb_set_global_schema, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"ldb_register_samba_handlers", (PyCFunction) _wrap_ldb_register_samba_handlers, METH_VARARGS | METH_KEYWORDS, NULL},
+	 { (char *)"samdb_set_ntds_invocation_id", (PyCFunction) _wrap_samdb_set_ntds_invocation_id, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { NULL, NULL, 0, NULL }
 };
 
 
 /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (BEGIN) -------- */
 
+static swig_type_info _swigt__p_GUID = {"_p_GUID", "struct GUID *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_TALLOC_CTX = {"_p_TALLOC_CTX", "TALLOC_CTX *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_auth_session_info = {"_p_auth_session_info", "struct auth_session_info *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_char = {"_p_char", "char *", 0, 0, (void*)0, 0};
@@ -3147,6 +3187,7 @@ static swig_type_info _swigt__p_unsigned_long_long = {"_p_unsigned_long_long", "
 static swig_type_info _swigt__p_unsigned_short = {"_p_unsigned_short", "unsigned short *|uint_least16_t *|uint16_t *", 0, 0, (void*)0, 0};
 
 static swig_type_info *swig_type_initial[] = {
+  &_swigt__p_GUID,
   &_swigt__p_TALLOC_CTX,
   &_swigt__p_auth_session_info,
   &_swigt__p_char,
@@ -3176,6 +3217,7 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_unsigned_short,
 };
 
+static swig_cast_info _swigc__p_GUID[] = {  {&_swigt__p_GUID, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_TALLOC_CTX[] = {  {&_swigt__p_TALLOC_CTX, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_auth_session_info[] = {  {&_swigt__p_auth_session_info, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_char[] = {  {&_swigt__p_char, 0, 0, 0},{0, 0, 0, 0}};
@@ -3205,6 +3247,7 @@ static swig_cast_info _swigc__p_unsigned_long_long[] = {  {&_swigt__p_unsigned_l
 static swig_cast_info _swigc__p_unsigned_short[] = {  {&_swigt__p_unsigned_short, 0, 0, 0},{0, 0, 0, 0}};
 
 static swig_cast_info *swig_cast_initial[] = {
+  _swigc__p_GUID,
   _swigc__p_TALLOC_CTX,
   _swigc__p_auth_session_info,
   _swigc__p_char,
diff --git a/source4/scripting/python/samba/samdb.py b/source4/scripting/python/samba/samdb.py
index 353eaee198..e92a4bbb90 100644
--- a/source4/scripting/python/samba/samdb.py
+++ b/source4/scripting/python/samba/samdb.py
@@ -145,3 +145,10 @@ member: %s
 
     def attach_schema_from_ldif(self, pf, df):
         misc.dsdb_attach_schema_from_ldif_file(self, pf, df)
+
+    def set_invocation_id(self, invocation_id):
+    	"""Set the invocation id for this SamDB handle.
+    	
+    	:param invocation_id: GUID of the invocation id.
+    	"""
+    	misc.samdb_set_ntds_invocation_id(self, invocation_id)
\ No newline at end of file
-- 
cgit 


From d958f4b3912dc298037c112ad724b85a7a46ecdb Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Thu, 24 Jan 2008 22:18:27 +0100
Subject: python: Add function to look for unsubsituted variables. (This used
 to be commit e726ce5bc515ae8d10b472396e228cfd35737476)

---
 source4/scripting/python/samba/__init__.py       | 15 +++++++++++++++
 source4/scripting/python/samba/tests/__init__.py |  4 ++++
 2 files changed, 19 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/__init__.py b/source4/scripting/python/samba/__init__.py
index 483929661d..b5d7f2ebc7 100644
--- a/source4/scripting/python/samba/__init__.py
+++ b/source4/scripting/python/samba/__init__.py
@@ -192,6 +192,21 @@ def substitute_var(text, values):
     return text
 
 
+def check_all_substituted(text):
+    """Make sure that all substitution variables in a string have been replaced.
+    If not, raise an exception.
+    
+    :param text: The text to search for substitution variables
+    """
+    if not "${" in text:
+    	return
+    
+    var_start = text.find("${")
+    var_end = text.find("}", var_start)
+    
+    raise Exception("Not all variables substituted: %s" % text[var_start:var_end])
+
+
 def valid_netbios_name(name):
     """Check whether a name is valid as a NetBIOS name. """
     # FIXME: There are probably more constraints here. 
diff --git a/source4/scripting/python/samba/tests/__init__.py b/source4/scripting/python/samba/tests/__init__.py
index ad8a2524b5..6fbf420339 100644
--- a/source4/scripting/python/samba/tests/__init__.py
+++ b/source4/scripting/python/samba/tests/__init__.py
@@ -67,6 +67,10 @@ class SubstituteVarTestCase(unittest.TestCase):
     def test_unknown_var(self):
         self.assertEquals("foo ${bla} gsff", 
                 samba.substitute_var("foo ${bla} gsff", {"bar": "bla"}))
+                
+    def test_check_all_substituted(self):
+    	check_all_substituted("nothing to see here")
+    	self.assertRaises(Exception, check_all_substituted, "Not subsituted: ${FOOBAR}")
 
 
 class LdbExtensionTests(TestCaseInTempDir):
-- 
cgit 


From 8afcbdcfe71fad0f6a22314de16ac047148d42b8 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Fri, 25 Jan 2008 00:51:09 +0100
Subject: python: Make SamDB.set_ntds_invocation_id take a string. (This used
 to be commit 59bb26772f089cf4d8727c12230cfef8126762b1)

---
 source4/scripting/python/misc.i      |  11 +++-
 source4/scripting/python/misc.py     |   2 +-
 source4/scripting/python/misc_wrap.c | 100 +++++++++++++++++++----------------
 3 files changed, 65 insertions(+), 48 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/misc.i b/source4/scripting/python/misc.i
index d5c9cde93e..a11b2fb825 100644
--- a/source4/scripting/python/misc.i
+++ b/source4/scripting/python/misc.i
@@ -67,4 +67,13 @@ const char *samba_version_string(void);
 int dsdb_set_global_schema(struct ldb_context *ldb);
 int ldb_register_samba_handlers(struct ldb_context *ldb);
 
-bool samdb_set_ntds_invocation_id(struct ldb_context *ldb, const struct GUID *invocation_id_in);
\ No newline at end of file
+%inline %{
+bool dsdb_set_ntds_invocation_id(struct ldb_context *ldb, const char *guid)
+{
+    struct GUID invocation_id_in;
+    if (NT_STATUS_IS_ERR(GUID_from_string(guid, &invocation_id_in))) {
+        return false;
+    }
+    return samdb_set_ntds_invocation_id(ldb, &invocation_id_in);
+}
+%}
diff --git a/source4/scripting/python/misc.py b/source4/scripting/python/misc.py
index 998de46504..2fc7fe37e7 100644
--- a/source4/scripting/python/misc.py
+++ b/source4/scripting/python/misc.py
@@ -70,6 +70,6 @@ dsdb_attach_schema_from_ldif_file = _misc.dsdb_attach_schema_from_ldif_file
 version = _misc.version
 dsdb_set_global_schema = _misc.dsdb_set_global_schema
 ldb_register_samba_handlers = _misc.ldb_register_samba_handlers
-samdb_set_ntds_invocation_id = _misc.samdb_set_ntds_invocation_id
+dsdb_set_ntds_invocation_id = _misc.dsdb_set_ntds_invocation_id
 
 
diff --git a/source4/scripting/python/misc_wrap.c b/source4/scripting/python/misc_wrap.c
index 564bcc0e46..f467f851bd 100644
--- a/source4/scripting/python/misc_wrap.c
+++ b/source4/scripting/python/misc_wrap.c
@@ -2459,36 +2459,35 @@ SWIG_Python_MustGetPtr(PyObject *obj, swig_type_info *ty, int argnum, int flags)
 
 /* -------- TYPES TABLE (BEGIN) -------- */
 
-#define SWIGTYPE_p_GUID swig_types[0]
-#define SWIGTYPE_p_TALLOC_CTX swig_types[1]
-#define SWIGTYPE_p_auth_session_info swig_types[2]
-#define SWIGTYPE_p_char swig_types[3]
-#define SWIGTYPE_p_cli_credentials swig_types[4]
-#define SWIGTYPE_p_dom_sid swig_types[5]
-#define SWIGTYPE_p_int swig_types[6]
-#define SWIGTYPE_p_ldb_context swig_types[7]
-#define SWIGTYPE_p_ldb_dn swig_types[8]
-#define SWIGTYPE_p_ldb_ldif swig_types[9]
-#define SWIGTYPE_p_ldb_message swig_types[10]
-#define SWIGTYPE_p_ldb_message_element swig_types[11]
-#define SWIGTYPE_p_ldb_result swig_types[12]
-#define SWIGTYPE_p_loadparm_context swig_types[13]
-#define SWIGTYPE_p_loadparm_service swig_types[14]
-#define SWIGTYPE_p_long_long swig_types[15]
-#define SWIGTYPE_p_param_context swig_types[16]
-#define SWIGTYPE_p_param_opt swig_types[17]
-#define SWIGTYPE_p_param_section swig_types[18]
-#define SWIGTYPE_p_security_descriptor swig_types[19]
-#define SWIGTYPE_p_security_token swig_types[20]
-#define SWIGTYPE_p_short swig_types[21]
-#define SWIGTYPE_p_signed_char swig_types[22]
-#define SWIGTYPE_p_unsigned_char swig_types[23]
-#define SWIGTYPE_p_unsigned_int swig_types[24]
-#define SWIGTYPE_p_unsigned_long swig_types[25]
-#define SWIGTYPE_p_unsigned_long_long swig_types[26]
-#define SWIGTYPE_p_unsigned_short swig_types[27]
-static swig_type_info *swig_types[29];
-static swig_module_info swig_module = {swig_types, 28, 0, 0, 0, 0};
+#define SWIGTYPE_p_TALLOC_CTX swig_types[0]
+#define SWIGTYPE_p_auth_session_info swig_types[1]
+#define SWIGTYPE_p_char swig_types[2]
+#define SWIGTYPE_p_cli_credentials swig_types[3]
+#define SWIGTYPE_p_dom_sid swig_types[4]
+#define SWIGTYPE_p_int swig_types[5]
+#define SWIGTYPE_p_ldb_context swig_types[6]
+#define SWIGTYPE_p_ldb_dn swig_types[7]
+#define SWIGTYPE_p_ldb_ldif swig_types[8]
+#define SWIGTYPE_p_ldb_message swig_types[9]
+#define SWIGTYPE_p_ldb_message_element swig_types[10]
+#define SWIGTYPE_p_ldb_result swig_types[11]
+#define SWIGTYPE_p_loadparm_context swig_types[12]
+#define SWIGTYPE_p_loadparm_service swig_types[13]
+#define SWIGTYPE_p_long_long swig_types[14]
+#define SWIGTYPE_p_param_context swig_types[15]
+#define SWIGTYPE_p_param_opt swig_types[16]
+#define SWIGTYPE_p_param_section swig_types[17]
+#define SWIGTYPE_p_security_descriptor swig_types[18]
+#define SWIGTYPE_p_security_token swig_types[19]
+#define SWIGTYPE_p_short swig_types[20]
+#define SWIGTYPE_p_signed_char swig_types[21]
+#define SWIGTYPE_p_unsigned_char swig_types[22]
+#define SWIGTYPE_p_unsigned_int swig_types[23]
+#define SWIGTYPE_p_unsigned_long swig_types[24]
+#define SWIGTYPE_p_unsigned_long_long swig_types[25]
+#define SWIGTYPE_p_unsigned_short swig_types[26]
+static swig_type_info *swig_types[28];
+static swig_module_info swig_module = {swig_types, 27, 0, 0, 0, 0};
 #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name)
 #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name)
 
@@ -2795,6 +2794,16 @@ SWIG_From_int  (int value)
   return SWIG_From_long  (value);
 }
 
+
+bool dsdb_set_ntds_invocation_id(struct ldb_context *ldb, const char *guid)
+{
+    struct GUID invocation_id_in;
+    if (NT_STATUS_IS_ERR(GUID_from_string(guid, &invocation_id_in))) {
+        return false;
+    }
+    return samdb_set_ntds_invocation_id(ldb, &invocation_id_in);
+}
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -3103,39 +3112,42 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_samdb_set_ntds_invocation_id(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_dsdb_set_ntds_invocation_id(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   struct ldb_context *arg1 = (struct ldb_context *) 0 ;
-  struct GUID *arg2 = (struct GUID *) 0 ;
+  char *arg2 = (char *) 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
+  int res2 ;
+  char *buf2 = 0 ;
+  int alloc2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {
-    (char *) "ldb",(char *) "invocation_id_in", NULL 
+    (char *) "ldb",(char *) "guid", NULL 
   };
   
-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:samdb_set_ntds_invocation_id",kwnames,&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:dsdb_set_ntds_invocation_id",kwnames,&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ldb_context, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "samdb_set_ntds_invocation_id" "', argument " "1"" of type '" "struct ldb_context *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "dsdb_set_ntds_invocation_id" "', argument " "1"" of type '" "struct ldb_context *""'"); 
   }
   arg1 = (struct ldb_context *)(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_GUID, 0 |  0 );
+  res2 = SWIG_AsCharPtrAndSize(obj1, &buf2, NULL, &alloc2);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "samdb_set_ntds_invocation_id" "', argument " "2"" of type '" "struct GUID const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "dsdb_set_ntds_invocation_id" "', argument " "2"" of type '" "char const *""'");
   }
-  arg2 = (struct GUID *)(argp2);
+  arg2 = (char *)(buf2);
   if (arg1 == NULL)
   SWIG_exception(SWIG_ValueError, 
     "ldb context must be non-NULL");
-  result = (bool)samdb_set_ntds_invocation_id(arg1,(struct GUID const *)arg2);
+  result = (bool)dsdb_set_ntds_invocation_id(arg1,(char const *)arg2);
   resultobj = SWIG_From_bool((bool)(result));
+  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
   return resultobj;
 fail:
+  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
   return NULL;
 }
 
@@ -3150,14 +3162,13 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"version", (PyCFunction)_wrap_version, METH_NOARGS, NULL},
 	 { (char *)"dsdb_set_global_schema", (PyCFunction) _wrap_dsdb_set_global_schema, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"ldb_register_samba_handlers", (PyCFunction) _wrap_ldb_register_samba_handlers, METH_VARARGS | METH_KEYWORDS, NULL},
-	 { (char *)"samdb_set_ntds_invocation_id", (PyCFunction) _wrap_samdb_set_ntds_invocation_id, METH_VARARGS | METH_KEYWORDS, NULL},
+	 { (char *)"dsdb_set_ntds_invocation_id", (PyCFunction) _wrap_dsdb_set_ntds_invocation_id, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { NULL, NULL, 0, NULL }
 };
 
 
 /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (BEGIN) -------- */
 
-static swig_type_info _swigt__p_GUID = {"_p_GUID", "struct GUID *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_TALLOC_CTX = {"_p_TALLOC_CTX", "TALLOC_CTX *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_auth_session_info = {"_p_auth_session_info", "struct auth_session_info *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_char = {"_p_char", "char *", 0, 0, (void*)0, 0};
@@ -3187,7 +3198,6 @@ static swig_type_info _swigt__p_unsigned_long_long = {"_p_unsigned_long_long", "
 static swig_type_info _swigt__p_unsigned_short = {"_p_unsigned_short", "unsigned short *|uint_least16_t *|uint16_t *", 0, 0, (void*)0, 0};
 
 static swig_type_info *swig_type_initial[] = {
-  &_swigt__p_GUID,
   &_swigt__p_TALLOC_CTX,
   &_swigt__p_auth_session_info,
   &_swigt__p_char,
@@ -3217,7 +3227,6 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_unsigned_short,
 };
 
-static swig_cast_info _swigc__p_GUID[] = {  {&_swigt__p_GUID, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_TALLOC_CTX[] = {  {&_swigt__p_TALLOC_CTX, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_auth_session_info[] = {  {&_swigt__p_auth_session_info, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_char[] = {  {&_swigt__p_char, 0, 0, 0},{0, 0, 0, 0}};
@@ -3247,7 +3256,6 @@ static swig_cast_info _swigc__p_unsigned_long_long[] = {  {&_swigt__p_unsigned_l
 static swig_cast_info _swigc__p_unsigned_short[] = {  {&_swigt__p_unsigned_short, 0, 0, 0},{0, 0, 0, 0}};
 
 static swig_cast_info *swig_cast_initial[] = {
-  _swigc__p_GUID,
   _swigc__p_TALLOC_CTX,
   _swigc__p_auth_session_info,
   _swigc__p_char,
-- 
cgit 


From 37f35d2a03409e0d52232d4c4f956ec8637d4884 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Fri, 25 Jan 2008 01:02:13 +0100
Subject: python/provision: Reconcile code partitions-only provisioning and
 generic provisioning, some other minor refactoring of the provisioning.

Pair-programmed by Andrew and me using obby :-)
(This used to be commit 688adcbb635af87fcfedb869b7f1857a947fd2f9)
---
 source4/scripting/python/samba/__init__.py       |   6 +-
 source4/scripting/python/samba/provision.py      | 469 +++++++++++++----------
 source4/scripting/python/samba/samdb.py          |   6 +-
 source4/scripting/python/samba/tests/__init__.py |   2 +-
 source4/scripting/python/samba/upgrade.py        |   5 +-
 5 files changed, 276 insertions(+), 212 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/__init__.py b/source4/scripting/python/samba/__init__.py
index b5d7f2ebc7..5c14edd357 100644
--- a/source4/scripting/python/samba/__init__.py
+++ b/source4/scripting/python/samba/__init__.py
@@ -1,8 +1,10 @@
 #!/usr/bin/python
 
 # Unix SMB/CIFS implementation.
+# Copyright (C) Jelmer Vernooij <jelmer@samba.org> 2007-2008
+# 
+# Based on the original in EJS:
 # Copyright (C) Andrew Tridgell <tridge@samba.org> 2005
-# Copyright (C) Jelmer Vernooij <jelmer@samba.org> 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
@@ -204,7 +206,7 @@ def check_all_substituted(text):
     var_start = text.find("${")
     var_end = text.find("}", var_start)
     
-    raise Exception("Not all variables substituted: %s" % text[var_start:var_end])
+    raise Exception("Not all variables substituted: %s" % text[var_start:var_end+1])
 
 
 def valid_netbios_name(name):
diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index 11dd819ad3..918d983782 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -1,10 +1,25 @@
 #
-#    backend code for provisioning a Samba4 server
-#    Released under the GNU GPL v3 or later
-#    Copyright Jelmer Vernooij 2007
+# Unix SMB/CIFS implementation.
+# backend code for provisioning a Samba4 server
+
+# Copyright (C) Jelmer Vernooij <jelmer@samba.org> 2007-2008
+# Copyright (C) Andrew Bartlett <abartlet@samba.org> 2008
 #
 # Based on the original in EJS:
-#    Copyright Andrew Tridgell 2005
+# Copyright (C) Andrew Tridgell <tridge@samba.org> 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/>.
 #
 
 from base64 import b64encode
@@ -17,9 +32,10 @@ from socket import gethostname, gethostbyname
 import param
 import registry
 import samba
-from samba import Ldb, substitute_var, valid_netbios_name
+from samba import Ldb, substitute_var, valid_netbios_name, check_all_substituted
 from samba.samdb import SamDB
 import security
+import urllib
 from ldb import SCOPE_SUBTREE, SCOPE_ONELEVEL, SCOPE_BASE, LdbError, \
         LDB_ERR_NO_SUCH_OBJECT, timestring, CHANGETYPE_MODIFY, CHANGETYPE_NONE
 
@@ -53,7 +69,7 @@ class ProvisionPaths:
         self.ldap_schema_basedn_ldif = None
 
 
-def install_ok(lp, session_info, credentials):
+def check_install(lp, session_info, credentials):
     """Check whether the current install seems ok.
     
     :param lp: Loadparm context
@@ -61,12 +77,11 @@ def install_ok(lp, session_info, credentials):
     :param credentials: Credentials
     """
     if lp.get("realm") == "":
-        return False
+        raise Error("Realm empty")
     ldb = Ldb(lp.get("sam database"), session_info=session_info, 
             credentials=credentials, lp=lp)
     if len(ldb.search("(cn=Administrator)")) != 1:
-        return False
-    return True
+        raise "No administrator account found"
 
 
 def findnss(nssfn, *names):
@@ -112,7 +127,7 @@ def setup_add_ldif(ldb, ldif_path, subst_vars=None):
     if subst_vars is not None:
         data = substitute_var(data, subst_vars)
 
-    assert "${" not in data
+    check_all_substituted(data)
 
     ldb.add_ldif(data)
 
@@ -128,7 +143,7 @@ def setup_modify_ldif(ldb, ldif_path, substvars=None):
     if substvars is not None:
         data = substitute_var(data, substvars)
 
-    assert "${" not in data
+    check_all_substituted(data)
 
     ldb.modify_ldif(data)
 
@@ -159,19 +174,20 @@ def setup_file(template, fname, substvars):
     data = open(template, 'r').read()
     if substvars:
         data = substitute_var(data, substvars)
-    assert not "${" in data
+    check_all_substituted(data)
 
     open(f, 'w').write(data)
 
 
-def provision_paths_from_lp(lp, dnsdomain):
+def provision_paths_from_lp(lp, dnsdomain, private_dir=None):
     """Set the default paths for provisioning.
 
     :param lp: Loadparm context.
     :param dnsdomain: DNS Domain name
     """
     paths = ProvisionPaths()
-    private_dir = lp.get("private dir")
+    if private_dir is None:
+        private_dir = lp.get("private dir")
     paths.shareconf = os.path.join(private_dir, "share.ldb")
     paths.samdb = os.path.join(private_dir, lp.get("sam database") or "samdb.ldb")
     paths.secrets = os.path.join(private_dir, lp.get("secrets database") or "secrets.ldb")
@@ -235,57 +251,144 @@ def setup_name_mappings(ldb, sid, domaindn, root, nobody, nogroup, users,
     ldb.setup_name_mapping(domaindn, sid + "-520", wheel)
 
 
-def provision_become_dc(setup_dir, message, paths, lp, session_info, 
-                        credentials):
+def setup_samdb_partitions(samdb_path, setup_path, message, lp, session_info, 
+                           credentials, configdn, schemadn, domaindn, 
+                           hostname, netbiosname, dnsdomain, realm, 
+                           rootdn, serverrole, ldap_backend=None, 
+                           ldap_backend_type=None, erase=False):
+    """Setup the partitions for the SAM database. 
+    
+    Alternatively, provision() may call this, and then populate the database.
+    
+    :param erase: Remove the existing data present in the database.
+    :param
+     
+    :note: This will wipe the Sam Database!
+    
+    :note: This function always removes the local SAM LDB file. The erase 
+    parameter controls whether to erase the existing data, which 
+    may not be stored locally but in LDAP.
+    """
     assert session_info is not None
-    erase = False
 
-    def setup_path(file):
-        return os.path.join(setup_dir, file)
-    os.path.unlink(paths.samdb)
-
-    message("Setting up templates db")
-    setup_templatesdb(paths.templates, setup_path, session_info=session_info, 
-                      credentials=credentials, lp=lp)
+    if os.path.exists(samdb_path):
+        os.unlink(samdb_path)
 
     # Also wipes the database
-    message("Setting up sam.ldb")
-    samdb = SamDB(paths.samdb, session_info=session_info, 
+    samdb = SamDB(samdb_path, session_info=session_info, 
                   credentials=credentials, lp=lp)
 
-    message("Setting up sam.ldb partitions")
-    setup_samdb_partitions(samdb, setup_path, schemadn, configdn, domaindn)
+    #Add modules to the list to activate them by default
+    #beware often order is important
+    #
+    # Some Known ordering constraints:
+    # - rootdse must be first, as it makes redirects from "" -> cn=rootdse
+    # - objectclass must be before password_hash, because password_hash checks
+    #   that the objectclass is of type person (filled in by objectclass
+    #   module when expanding the objectclass list)
+    # - partition must be last
+    # - each partition has its own module list then
+    modules_list = ["rootdse",
+                    "paged_results",
+                    "ranged_results",
+                    "anr",
+                    "server_sort",
+                    "extended_dn",
+                    "asq",
+                    "samldb",
+                    "rdn_name",
+                    "objectclass",
+                    "kludge_acl",
+                    "operational"]
+    tdb_modules_list = [
+                    "subtree_rename",
+                    "subtree_delete",
+                    "linked_attributes"]
+    modules_list2 = ["show_deleted",
+                    "partition"]
+ 
+    domaindn_ldb = "users.ldb"
+    if ldap_backend is not None:
+    	domaindn_ldb = ldap_backend
+    configdn_ldb = "configuration.ldb"
+    if ldap_backend is not None:
+    	configdn_ldb = ldap_backend
+    schema_ldb = "schema.ldb"
+    if ldap_backend is not None:
+    	schema_ldb = ldap_backend
+    	
+    if ldap_backend_type == "fedora-ds":
+        backend_modules = ["nsuniqueid","paged_searches"]
+    elif ldap_backend_type == "openldap":
+        backend_modules = ["normalise","entryuuid","paged_searches"]
+    elif serverrole == "domain controller":
+        backend_modules = ["repl_meta_data"]
+    else:
+        backend_modules = ["objectguid"]
+        
+    setup_add_ldif(samdb, setup_path("provision_partitions.ldif"), {
+        "SCHEMADN": schemadn, 
+        "SCHEMADN_LDB": "schema.ldb",
+        "SCHEMADN_MOD2": ",objectguid",
+        "CONFIGDN": configdn,
+        "CONFIGDN_LDB": "configuration.ldb",
+        "DOMAINDN": domaindn,
+        "DOMAINDN_LDB": "users.ldb",
+        "SCHEMADN_MOD": "schema_fsmo,instancetype",
+        "CONFIGDN_MOD": "naming_fsmo,instancetype",
+        "DOMAINDN_MOD": "pdc_fsmo,password_hash,instancetype",
+        "MODULES_LIST": ",".join(modules_list),
+        "TDB_MODULES_LIST": ","+",".join(tdb_modules_list),
+        "MODULES_LIST2": ",".join(modules_list2),
+        "BACKEND_MOD": ",".join(backend_modules),
+        })
 
-    samdb = SamDB(paths.samdb, session_info=session_info, 
+    samdb = SamDB(samdb_path, session_info=session_info, 
                   credentials=credentials, lp=lp)
 
-    ldb.transaction_start()
+    samdb.transaction_start()
     try:
         message("Setting up sam.ldb attributes")
         samdb.load_ldif_file_add(setup_path("provision_init.ldif"))
 
         message("Setting up sam.ldb rootDSE")
-        setup_samdb_rootdse(samdb, setup_path, schemadn, domaindn, 
-                            hostname, dnsdomain, realm, rootdn, configdn, 
-                            netbiosname)
+        setup_samdb_rootdse(samdb, setup_path, schemadn, domaindn, hostname, 
+                            dnsdomain, realm, rootdn, configdn, netbiosname)
 
         if erase:
             message("Erasing data from partitions")
             samdb.erase_partitions()
 
-        message("Setting up sam.ldb indexes")
-        samdb.load_ldif_file_add(setup_path("provision_index.ldif"))
     except:
         samdb.transaction_cancel()
         raise
 
     samdb.transaction_commit()
+    
+    return samdb
+
 
-    message("Setting up %s" % paths.secrets)
-    secrets_ldb = setup_secretsdb(paths.secrets, setup_path, session_info, 
-                                  credentials, lp)
-    setup_ldb(secrets_ldb, setup_path("secrets_dc.ldif"), 
-              { "MACHINEPASS_B64": b64encode(machinepass) })
+def secretsdb_become_dc(secretsdb, setup_path, domain, realm, dnsdomain, 
+                        netbiosname, domainsid, keytab_path, samdb_url, 
+                        dns_keytab_path, dnspass, machinepass):
+    """Add DC-specific bits to a secrets database.
+    
+    :param secretsdb: Ldb Handle to the secrets database
+    :param setup_path: Setup path function
+    :param machinepass: Machine password
+    """
+    setup_ldb(secretsdb, setup_path("secrets_dc.ldif"), { 
+            "MACHINEPASS_B64": b64encode(machinepass),
+            "DOMAIN": domain,
+            "REALM": realm,
+            "DNSDOMAIN": dnsdomain,
+            "DOMAINSID": str(domainsid),
+            "SECRETS_KEYTAB": keytab_path,
+            "NETBIOSNAME": netbiosname,
+            "SAM_LDB": samdb_url,
+            "DNS_KEYTAB": dns_keytab_path,
+            "DNSPASS_B64": b64encode(dnspass),
+            })
 
 
 def setup_secretsdb(path, setup_path, session_info, credentials, lp):
@@ -296,10 +399,12 @@ def setup_secretsdb(path, setup_path, session_info, credentials, lp):
     :param session_info: Session info.
     :param credentials: Credentials
     :param lp: Loadparm context
+    :return: LDB handle for the created secrets database
     """
     if os.path.exists(path):
         os.unlink(path)
-    secrets_ldb = Ldb(path, session_info=session_info, credentials=credentials, lp=lp)
+    secrets_ldb = Ldb(path, session_info=session_info, credentials=credentials,
+                      lp=lp)
     secrets_ldb.erase()
     secrets_ldb.load_ldif_file_add(setup_path("secrets_init.ldif"))
     secrets_ldb.load_ldif_file_add(setup_path("secrets.ldif"))
@@ -316,7 +421,7 @@ def setup_templatesdb(path, setup_path, session_info, credentials, lp):
     :param lp: Loadparm context
     """
     templates_ldb = SamDB(path, session_info=session_info,
-                        credentials=credentials, lp=lp)
+                          credentials=credentials, lp=lp)
     templates_ldb.erase()
     templates_ldb.load_ldif_file_add(setup_path("provision_templates.ldif"))
 
@@ -359,69 +464,13 @@ def setup_samdb_rootdse(samdb, setup_path, schemadn, domaindn, hostname,
         "CONFIGDN": configdn,
         "VERSION": samba.version(),
         })
-
-
-def setup_samdb_partitions(samdb, setup_path, schemadn, configdn, domaindn):
-    """Setup SAM database partitions.
-
-    :param samdb: Sam Database handle
-    :param setup_path: Setup path function
-    :param schemadn: Schema DN.
-    :param configdn: Configuration DN.
-    :param domaindn: Domain DN.
-    """
-    #Add modules to the list to activate them by default
-    #beware often order is important
-    #
-    # Some Known ordering constraints:
-    # - rootdse must be first, as it makes redirects from "" -> cn=rootdse
-    # - objectclass must be before password_hash, because password_hash checks
-    #   that the objectclass is of type person (filled in by objectclass
-    #   module when expanding the objectclass list)
-    # - partition must be last
-    # - each partition has its own module list then
-    modules_list = ["rootdse",
-                    "paged_results",
-                    "ranged_results",
-                    "anr",
-                    "server_sort",
-                    "extended_dn",
-                    "asq",
-                    "samldb",
-                    "rdn_name",
-                    "objectclass",
-                    "kludge_acl",
-                    "operational"]
-    tdb_modules_list = [
-                    "subtree_rename",
-                    "subtree_delete",
-                    "linked_attributes"]
-    modules_list2 = ["show_deleted",
-                    "partition"]
- 
-    setup_add_ldif(samdb, setup_path("provision_partitions.ldif"), {
-        "SCHEMADN": schemadn, 
-        "SCHEMADN_LDB": "schema.ldb",
-        "SCHEMADN_MOD2": ",objectguid",
-        "CONFIGDN": configdn,
-        "CONFIGDN_LDB": "configuration.ldb",
-        "DOMAINDN": domaindn,
-        "DOMAINDN_LDB": "users.ldb",
-        "SCHEMADN_MOD": "schema_fsmo",
-        "CONFIGDN_MOD": "naming_fsmo",
-        "CONFIGDN_MOD2": ",objectguid",
-        "DOMAINDN_MOD": "pdc_fsmo,password_hash",
-        "DOMAINDN_MOD2": ",objectguid",
-        "MODULES_LIST": ",".join(modules_list),
-        "TDB_MODULES_LIST": ","+",".join(tdb_modules_list),
-        "MODULES_LIST2": ",".join(modules_list2),
-        })
-
+        
 
 def setup_self_join(samdb, configdn, schemadn, domaindn, 
                     netbiosname, hostname, dnsdomain, machinepass, dnspass, 
                     realm, domainname, domainsid, invocationid, setup_path,
                     policyguid, hostguid=None):
+    """Join a host to its own domain."""
     if hostguid is not None:
         hostguid_add = "objectGUID: %s" % hostguid
     else:
@@ -451,43 +500,39 @@ def setup_self_join(samdb, configdn, schemadn, domaindn,
 def setup_samdb(path, setup_path, session_info, credentials, lp, 
                 schemadn, configdn, domaindn, dnsdomain, realm, 
                 netbiosname, message, hostname, rootdn, erase, 
-                domainsid, aci, rdn_dc, domainguid, policyguid, 
-                domainname, blank, adminpass, krbtgtpass, 
-                machinepass, hostguid, invocationid, dnspass):
-    # Also wipes the database
-    message("Setting up sam.ldb")
-    samdb = SamDB(path, session_info=session_info, 
-                  credentials=credentials, lp=lp)
+                domainsid, aci, domainguid, policyguid, 
+                domainname, fill, adminpass, krbtgtpass, 
+                machinepass, hostguid, invocationid, dnspass,
+                serverrole, ldap_backend=None, ldap_backend_type=None):
+    """Setup a complete SAM Database.
+    
+    """
 
-    message("Setting up sam.ldb partitions")
-    setup_samdb_partitions(samdb, setup_path, schemadn, configdn, domaindn)
+    # Also wipes the database
+    setup_samdb_partitions(path, setup_path, schemadn=schemadn, configdn=configdn, 
+                           domaindn=domaindn, message=message, lp=lp,
+                           credentials=credentials, session_info=session_info,
+                           hostname=hostname, netbiosname=netbiosname, 
+                           dnsdomain=dnsdomain, realm=realm, rootdn=rootdn,
+                           ldap_backend=ldap_backend, serverrole=serverrole,
+                           ldap_backend_type=ldap_backend_type, erase=erase)
 
     samdb = SamDB(path, session_info=session_info, 
                   credentials=credentials, lp=lp)
 
-    samdb.transaction_start()
-    try:
-        message("Setting up sam.ldb attributes")
-        samdb.load_ldif_file_add(setup_path("provision_init.ldif"))
-
-        message("Setting up sam.ldb rootDSE")
-        setup_samdb_rootdse(samdb, setup_path, schemadn, domaindn, 
-                            hostname, dnsdomain, realm, rootdn, configdn, 
-                            netbiosname)
-
-        if erase:
-            message("Erasing data from partitions")
-            samdb.erase_partitions()
-    except:
-        samdb.transaction_cancel()
-        raise
-
-    samdb.transaction_commit()
+    if fill == FILL_DRS:
+       # We want to finish here, but setup the index before we do so
+        message("Setting up sam.ldb index")
+        samdb.load_ldif_file_add(setup_path("provision_index.ldif"))
+        return samdb
 
     message("Pre-loading the Samba 4 and AD schema")
     samdb = SamDB(path, session_info=session_info, 
                   credentials=credentials, lp=lp)
     samdb.set_domain_sid(domainsid)
+    if lp.get("server role") == "domain controller":
+        samdb.set_invocation_id(invocationid)
+
     load_schema(setup_path, samdb, schemadn, netbiosname, configdn)
 
     samdb.transaction_start()
@@ -497,7 +542,6 @@ def setup_samdb(path, setup_path, session_info, credentials, lp,
         setup_add_ldif(samdb, setup_path("provision_basedn.ldif"), {
             "DOMAINDN": domaindn,
             "ACI": aci,
-            "RDN_DC": rdn_dc,
             })
 
         message("Modifying DomainDN: " + domaindn + "")
@@ -507,7 +551,6 @@ def setup_samdb(path, setup_path, session_info, credentials, lp,
             domainguid_mod = ""
 
         setup_modify_ldif(samdb, setup_path("provision_basedn_modify.ldif"), {
-            "RDN_DC": rdn_dc,
             "LDAPTIME": timestring(int(time.time())),
             "DOMAINSID": str(domainsid),
             "SCHEMADN": schemadn, 
@@ -538,7 +581,8 @@ def setup_samdb(path, setup_path, session_info, credentials, lp,
             "EXTENSIBLEOBJECT": "# no objectClass: extensibleObject for local ldb"
             })
         message("Modifying schema container")
-        setup_modify_ldif(samdb, setup_path("provision_schema_basedn_modify.ldif"), {
+        setup_modify_ldif(samdb, 
+            setup_path("provision_schema_basedn_modify.ldif"), {
             "SCHEMADN": schemadn,
             "NETBIOSNAME": netbiosname,
             "DEFAULTSITE": DEFAULTSITE,
@@ -587,7 +631,7 @@ def setup_samdb(path, setup_path, session_info, credentials, lp,
             "CONFIGDN": configdn,
             })
 
-        if not blank:
+        if fill == FILL_FULL:
             message("Setting up sam.ldb users and groups")
             setup_add_ldif(samdb, setup_path("provision_users.ldif"), {
                 "DOMAINDN": domaindn,
@@ -608,11 +652,9 @@ def setup_samdb(path, setup_path, session_info, credentials, lp,
                                 hostname=hostname, hostguid=hostguid, 
                                 setup_path=setup_path)
 
+    #We want to setup the index last, as adds are faster unindexed
         message("Setting up sam.ldb index")
         samdb.load_ldif_file_add(setup_path("provision_index.ldif"))
-
-        message("Setting up sam.ldb rootDSE marking as synchronized")
-        setup_modify_ldif(samdb, setup_path("provision_rootdse_modify.ldif"))
     except:
         samdb.transaction_cancel()
         raise
@@ -620,14 +662,18 @@ def setup_samdb(path, setup_path, session_info, credentials, lp,
     samdb.transaction_commit()
     return samdb
 
-
-def provision(lp, setup_dir, message, blank, paths, session_info, 
-              credentials, ldapbackend, realm=None, domain=None, hostname=None, 
-              hostip=None, domainsid=None, hostguid=None, adminpass=None, 
-              krbtgtpass=None, domainguid=None, policyguid=None, 
-              invocationid=None, machinepass=None, dnspass=None, root=None,
-              nobody=None, nogroup=None, users=None, wheel=None, backup=None, 
-              aci=None, serverrole=None):
+FILL_FULL = "FULL"
+FILL_NT4SYNC = "NT4SYNC"
+FILL_DRS = "DRS"
+
+def provision(lp, setup_dir, message, paths, session_info, 
+              credentials, ldapbackend, samdb_fill=FILL_FULL, realm=None, rootdn=None,
+              domain=None, hostname=None, hostip=None, domainsid=None, 
+              hostguid=None, adminpass=None, krbtgtpass=None, domainguid=None, 
+              policyguid=None, invocationid=None, machinepass=None, 
+              dnspass=None, root=None, nobody=None, nogroup=None, users=None, 
+              wheel=None, backup=None, aci=None, serverrole=None, erase=False,
+              ldap_backend=None, ldap_backend_type=None):
     """Provision samba4
     
     :note: caution, this wipes all existing data!
@@ -636,14 +682,10 @@ def provision(lp, setup_dir, message, blank, paths, session_info,
     def setup_path(file):
         return os.path.join(setup_dir, file)
 
-    erase = False
-
     if domainsid is None:
         domainsid = security.random_sid()
     if policyguid is None:
         policyguid = uuid.random()
-    if invocationid is None:
-        invocationid = uuid.random()
     if adminpass is None:
         adminpass = misc.random_password(12)
     if krbtgtpass is None:
@@ -669,29 +711,25 @@ def provision(lp, setup_dir, message, blank, paths, session_info,
         aci = "# no aci for local ldb"
     if serverrole is None:
         serverrole = lp.get("server role")
+    if invocationid is None and serverrole == "domain controller":
+        invocationid = uuid.random()
 
     if realm is None:
         realm = lp.get("realm")
-    else:
-        if lp.get("realm").upper() != realm.upper():
-            raise Exception("realm '%s' in smb.conf must match chosen realm '%s'\n" %
+
+    if lp.get("realm").upper() != realm.upper():
+        raise Exception("realm '%s' in smb.conf must match chosen realm '%s'" %
                 (lp.get("realm"), realm))
 
+    ldapi_url = "ldapi://%s" % urllib.quote(paths.s4_ldapi_path)
+    
+    if ldap_backend == "ldapi":
+    	# provision-backend will set this path suggested slapd command line / fedorads.inf
+    	ldap_backend = "ldapi://" % urllib.quote(os.path.join(lp.get("private dir"), "ldap", "ldapi"))
+
     assert realm is not None
     realm = realm.upper()
 
-    if domain is None:
-        domain = lp.get("workgroup")
-    else:
-        if lp.get("workgroup").upper() != domain.upper():
-            raise Error("workgroup '%s' in smb.conf must match chosen domain '%s'\n",
-                lp.get("workgroup"), domain)
-
-    assert domain is not None
-    domain = domain.upper()
-    if not valid_netbios_name(domain):
-        raise InvalidNetbiosName(domain)
-
     if hostname is None:
         hostname = gethostname().split(".")[0].lower()
 
@@ -703,13 +741,30 @@ def provision(lp, setup_dir, message, blank, paths, session_info,
         raise InvalidNetbiosName(netbiosname)
 
     dnsdomain    = realm.lower()
-    domaindn     = "DC=" + dnsdomain.replace(".", ",DC=")
-    rootdn       = domaindn
+    if serverrole == "domain controller":
+	domaindn     = "DC=" + dnsdomain.replace(".", ",DC=")
+        if domain is None:
+            domain = lp.get("workgroup")
+    
+        if lp.get("workgroup").upper() != domain.upper():
+            raise Error("workgroup '%s' in smb.conf must match chosen domain '%s'",
+                lp.get("workgroup"), domain)
+
+        assert domain is not None
+        domain = domain.upper()
+        if not valid_netbios_name(domain):
+            raise InvalidNetbiosName(domain)
+
+    else:
+    	domaindn = "CN=" + netbiosname
+    	domain = netbiosname
+    	
+    if rootdn is None:
+       rootdn       = domaindn
+       
     configdn     = "CN=Configuration," + rootdn
     schemadn     = "CN=Schema," + configdn
 
-    rdn_dc = domaindn.split(",")[0][len("DC="):]
-
     message("set DOMAIN SID: %s" % str(domainsid))
     message("Provisioning for %s in realm %s" % (domain, realm))
     message("Using administrator password: %s" % adminpass)
@@ -725,7 +780,8 @@ def provision(lp, setup_dir, message, blank, paths, session_info,
             smbconfsuffix = "member"
         else:
             assert "Invalid server role setting: %s" % serverrole
-        setup_file(setup_path("provision.smb.conf.%s" % smbconfsuffix), paths.smbconf, {
+        setup_file(setup_path("provision.smb.conf.%s" % smbconfsuffix), 
+                   paths.smbconf, {
             "HOSTNAME": hostname,
             "DOMAIN_CONF": domain,
             "REALM_CONF": realm,
@@ -742,6 +798,7 @@ def provision(lp, setup_dir, message, blank, paths, session_info,
                         credentials=credentials, lp=lp)
         share_ldb.load_ldif_file_add(setup_path("share.ldif"))
 
+     
     message("Setting up secrets.ldb")
     secrets_ldb = setup_secretsdb(paths.secrets, setup_path, 
                                   session_info=session_info, 
@@ -755,44 +812,47 @@ def provision(lp, setup_dir, message, blank, paths, session_info,
     setup_templatesdb(paths.templates, setup_path, session_info=session_info, 
                       credentials=credentials, lp=lp)
 
-    samdb = setup_samdb(paths.samdb, setup_path, session_info=session_info, credentials=credentials,
-                        lp=lp, schemadn=schemadn, configdn=configdn, domaindn=domaindn,
-                        dnsdomain=dnsdomain, netbiosname=netbiosname, realm=realm, message=message,
-                        hostname=hostname, rootdn=rootdn, erase=erase, domainsid=domainsid, aci=aci,
-                        rdn_dc=rdn_dc, domainguid=domainguid, policyguid=policyguid, 
-                        domainname=domain, blank=blank, adminpass=adminpass, krbtgtpass=krbtgtpass,
-                        hostguid=hostguid, invocationid=invocationid, machinepass=machinepass,
-                        dnspass=dnspass)
+    samdb = setup_samdb(paths.samdb, setup_path, session_info=session_info, 
+                        credentials=credentials, lp=lp, schemadn=schemadn, 
+                        configdn=configdn, domaindn=domaindn,
+                        dnsdomain=dnsdomain, netbiosname=netbiosname, 
+                        realm=realm, message=message, hostname=hostname, 
+                        rootdn=rootdn, erase=erase, domainsid=domainsid, 
+                        aci=aci, domainguid=domainguid, policyguid=policyguid, 
+                        domainname=domain, fill=samdb_fill, 
+                        adminpass=adminpass, krbtgtpass=krbtgtpass,
+                        hostguid=hostguid, invocationid=invocationid, 
+                        machinepass=machinepass, dnspass=dnspass,
+                        serverrole=serverrole, ldap_backend=ldap_backend, 
+                        ldap_backend_type=ldap_backend_type)
 
     if lp.get("server role") == "domain controller":
-        os.makedirs(os.path.join(paths.sysvol, dnsdomain, "Policies", "{" + policyguid + "}"), 0755)
-        os.makedirs(os.path.join(paths.sysvol, dnsdomain, "Policies", "{" + policyguid + "}", "Machine"), 0755)
-        os.makedirs(os.path.join(paths.sysvol, dnsdomain, "Policies", "{" + policyguid + "}", "User"), 0755)
-        if not os.path.isdir(paths.netlogon):
+       policy_path = os.path.join(paths.sysvol, dnsdomain, "Policies", 
+                                  "{" + policyguid + "}")
+       os.makedirs(policy_path, 0755)
+       os.makedirs(os.path.join(policy_path, "Machine"), 0755)
+       os.makedirs(os.path.join(policy_path, "User"), 0755)
+       if not os.path.isdir(paths.netlogon):
             os.makedirs(paths.netlogon, 0755)
-        secrets_ldb = Ldb(paths.secrets, session_info=session_info, credentials=credentials, lp=lp)
-        setup_ldb(secrets_ldb, setup_path("secrets_dc.ldif"), { 
-            "MACHINEPASS_B64": b64encode(machinepass),
-            "DOMAIN": domain,
-            "REALM": realm,
-            "LDAPTIME": timestring(int(time.time())),
-            "DNSDOMAIN": dnsdomain,
-            "DOMAINSID": str(domainsid),
-            "SECRETS_KEYTAB": paths.keytab,
-            "NETBIOSNAME": netbiosname,
-            "SAM_LDB": paths.samdb,
-            "DNS_KEYTAB": paths.dns_keytab,
-            "DNSPASS_B64": b64encode(dnspass),
-            })
-
-    if not blank:
-        setup_name_mappings(samdb, str(domainsid), 
-                        domaindn, root=root, nobody=nobody, 
-                        nogroup=nogroup, wheel=wheel, users=users,
-                        backup=backup)
+       secrets_ldb = Ldb(paths.secrets, session_info=session_info, 
+                         credentials=credentials, lp=lp)
+       secretsdb_become_dc(secrets_ldb, setup_path, domain=domain, realm=realm,
+                           netbiosname=netbiosname, domainsid=domainsid, 
+                           keytab_path=paths.keytab, samdb_url=paths.samdb, 
+                           dns_keytab_path=paths.dns_keytab, dnspass=dnspass, 
+                           machinepass=machinepass, dnsdomain=dnsdomain)
+
+    if samdb_fill == FILL_FULL:
+        setup_name_mappings(samdb, str(domainsid), domaindn, root=root, 
+                            nobody=nobody, nogroup=nogroup, wheel=wheel, 
+                            users=users, backup=backup)
+   
+        message("Setting up sam.ldb rootDSE marking as synchronized")
+        setup_modify_ldif(samdb, setup_path("provision_rootdse_modify.ldif"))
 
     message("Setting up phpLDAPadmin configuration")
-    create_phplpapdadmin_config(paths.phpldapadminconfig, setup_path, paths.s4_ldapi_path)
+    create_phpldapadmin_config(paths.phpldapadminconfig, setup_path, 
+                               ldapi_url)
 
     message("Please install the phpLDAPadmin configuration located at %s into /etc/phpldapadmin/config.php" % paths.phpldapadminconfig)
 
@@ -816,15 +876,15 @@ def provision(lp, setup_dir, message, blank, paths, session_info,
 
     return domaindn
 
-def create_phplpapdadmin_config(path, setup_path, s4_ldapi_path):
+
+def create_phpldapadmin_config(path, setup_path, ldap_backend):
     """Create a PHP LDAP admin configuration file.
 
     :param path: Path to write the configuration to.
     :param setup_path: Function to generate setup paths.
-    :param s4_ldapi_path: Path to Samba 4 LDAPI socket.
     """
-    setup_file(setup_path("phpldapadmin-config.php"), 
-               path, {"S4_LDAPI_URI": "ldapi://%s" % s4_ldapi_path.replace("/", "%2F")})
+    setup_file(setup_path("phpldapadmin-config.php"), path, 
+            {"S4_LDAPI_URI": ldap_backend})
 
 
 def create_zone_file(path, setup_path, samdb, dnsdomain, domaindn, 
@@ -874,6 +934,7 @@ def load_schema(setup_path, samdb, schemadn, netbiosname, configdn):
                     "SCHEMADN": schemadn,
                     "NETBIOSNAME": netbiosname,
                     "CONFIGDN": configdn,
-                    "DEFAULTSITE": DEFAULTSITE})
+                    "DEFAULTSITE": DEFAULTSITE
+    })
     samdb.attach_schema_from_ldif(head_data, schema_data)
 
diff --git a/source4/scripting/python/samba/samdb.py b/source4/scripting/python/samba/samdb.py
index e92a4bbb90..b757330ecb 100644
--- a/source4/scripting/python/samba/samdb.py
+++ b/source4/scripting/python/samba/samdb.py
@@ -1,10 +1,10 @@
 #!/usr/bin/python
 
 # Unix SMB/CIFS implementation.
-# Copyright (C) Jelmer Vernooij <jelmer@samba.org> 2007
+# Copyright (C) Jelmer Vernooij <jelmer@samba.org> 2007-2008
 #
 # Based on the original in EJS:
-# Copyright (C) Andrew Tridgell 2005
+# Copyright (C) Andrew Tridgell <tridge@samba.org> 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
@@ -151,4 +151,4 @@ member: %s
     	
     	:param invocation_id: GUID of the invocation id.
     	"""
-    	misc.samdb_set_ntds_invocation_id(self, invocation_id)
\ No newline at end of file
+    	misc.dsdb_set_ntds_invocation_id(self, invocation_id)
diff --git a/source4/scripting/python/samba/tests/__init__.py b/source4/scripting/python/samba/tests/__init__.py
index 6fbf420339..9839811470 100644
--- a/source4/scripting/python/samba/tests/__init__.py
+++ b/source4/scripting/python/samba/tests/__init__.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 
 # Unix SMB/CIFS implementation.
-# Copyright (C) Jelmer Vernooij <jelmer@samba.org> 2007
+# Copyright (C) Jelmer Vernooij <jelmer@samba.org> 2007-2008
 #   
 # 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
diff --git a/source4/scripting/python/samba/upgrade.py b/source4/scripting/python/samba/upgrade.py
index abf1127c36..a118af2526 100644
--- a/source4/scripting/python/samba/upgrade.py
+++ b/source4/scripting/python/samba/upgrade.py
@@ -7,7 +7,7 @@
 
 """Support code for upgrading from Samba 3 to Samba 4."""
 
-from provision import findnss, provision
+from provision import findnss, provision, FILL_DRS
 import grp
 import ldb
 import pwd
@@ -245,7 +245,8 @@ def upgrade_provision(samba3, setup_dir, message, credentials, session_info, lp,
     else:
         machinepass = None
     
-    domaindn = provision(lp=lp, setup_dir=setup_dir, message=message, blank=True, ldapbackend=None, 
+    domaindn = provision(lp=lp, setup_dir=setup_dir, message=message, 
+                         samdb_fill=FILL_DRS, ldapbackend=None, 
                          paths=paths, session_info=session_info, credentials=credentials, realm=realm, 
                          domain=domainname, domainsid=domainsid, domainguid=domainguid, 
                          machinepass=machinepass, serverrole=serverrole)
-- 
cgit 


From 76eb7ddd75719eb516a0dc10a88e23fd6463a718 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Fri, 25 Jan 2008 01:30:43 +0100
Subject: python: fix tests for check_all_substituted. (This used to be commit
 859cffed9d3a62f9f7610d74472aa3c0d1979a35)

---
 source4/scripting/python/samba/tests/__init__.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/tests/__init__.py b/source4/scripting/python/samba/tests/__init__.py
index 9839811470..e557dd95be 100644
--- a/source4/scripting/python/samba/tests/__init__.py
+++ b/source4/scripting/python/samba/tests/__init__.py
@@ -69,8 +69,8 @@ class SubstituteVarTestCase(unittest.TestCase):
                 samba.substitute_var("foo ${bla} gsff", {"bar": "bla"}))
                 
     def test_check_all_substituted(self):
-    	check_all_substituted("nothing to see here")
-    	self.assertRaises(Exception, check_all_substituted, "Not subsituted: ${FOOBAR}")
+    	samba.check_all_substituted("nothing to see here")
+    	self.assertRaises(Exception, samba.check_all_substituted, "Not subsituted: ${FOOBAR}")
 
 
 class LdbExtensionTests(TestCaseInTempDir):
-- 
cgit 


From c91791bbc489d90eca5f6b8d6dc369d7e2129c29 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Fri, 25 Jan 2008 01:37:47 +0100
Subject: python: Add test for secretsdb_become_dc (This used to be commit
 9173c678efb6f74dbec64298bcb00952feff2ed7)

---
 source4/scripting/python/samba/tests/provision.py | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/tests/provision.py b/source4/scripting/python/samba/tests/provision.py
index f5a0339c1f..83952df9fe 100644
--- a/source4/scripting/python/samba/tests/provision.py
+++ b/source4/scripting/python/samba/tests/provision.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 
 # Unix SMB/CIFS implementation.
-# Copyright (C) Jelmer Vernooij <jelmer@samba.org> 2007
+# Copyright (C) Jelmer Vernooij <jelmer@samba.org> 2007-2008
 #   
 # 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
@@ -18,7 +18,7 @@
 #
 
 import os
-from samba.provision import setup_secretsdb
+from samba.provision import setup_secretsdb, secretsdb_become_dc
 import samba.tests
 from ldb import Dn
 
@@ -37,7 +37,22 @@ class ProvisionTestCase(samba.tests.TestCaseInTempDir):
         finally:
             del ldb
             os.unlink(path)
-
+            
+    def test_become_dc(self):
+        path = os.path.join(self.tempdir, "secrets.ldb")
+        secrets_ldb = setup_secretsdb(path, setup_path, None, None, None)
+        try:
+            secretsdb_become_dc(secrets_ldb, setup_path, domain="EXAMPLE", 
+                   realm="example", netbiosname="myhost", 
+                   domainsid="S-5-22", keytab_path="keytab.path", 
+                   samdb_url="ldap://url/", 
+                   dns_keytab_path="dns.keytab", dnspass="bla", 
+                           machinepass="machinepass", dnsdomain="example.com")
+            self.assertEquals(1, 
+                    len(secrets_ldb.search("samAccountName=krbtgt,flatname=EXAMPLE,CN=Principals")))
+        finally:
+            del secrets_ldb
+            os.unlink(path)
 
 class Disabled:
     def test_setup_templatesdb(self):
-- 
cgit 


From dcb04065cda7fc7f23c494ec138af6b882651f20 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Fri, 25 Jan 2008 03:54:33 +0100
Subject: python: Fix representation of UUIDs as strings in zone files rather
 than binary blobs, fix escaping of LDAP URL's in PHP LDAP admin
 configuration.

Pair-programmed with Andrew, but git doesn't appear to support multiple --author arguments. :-(
(This used to be commit dff54ff043563f93b86361039c46e662045f62cc)
---
 source4/scripting/python/samba/__init__.py        |  4 ++--
 source4/scripting/python/samba/provision.py       | 11 ++++++-----
 source4/scripting/python/samba/samdb.py           |  2 +-
 source4/scripting/python/samba/tests/__init__.py  |  2 +-
 source4/scripting/python/samba/tests/provision.py | 10 +++++++++-
 5 files changed, 19 insertions(+), 10 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/__init__.py b/source4/scripting/python/samba/__init__.py
index 5c14edd357..b041165800 100644
--- a/source4/scripting/python/samba/__init__.py
+++ b/source4/scripting/python/samba/__init__.py
@@ -91,7 +91,7 @@ class Ldb(ldb.Ldb):
     set_session_info = misc.ldb_set_session_info
     set_loadparm = misc.ldb_set_loadparm
 
-    def searchone(self, basedn, attribute, expression=None, 
+    def searchone(self, attribute, basedn=None, expression=None, 
                   scope=ldb.SCOPE_BASE):
         """Search for one attribute as a string.
         
@@ -106,7 +106,7 @@ class Ldb(ldb.Ldb):
             return None
         values = set(res[0][attribute])
         assert len(values) == 1
-        return values.pop()
+        return self.schema_format_value(attribute, values.pop())
 
     def erase(self):
         """Erase this ldb, removing all records."""
diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index 918d983782..0e498f65e5 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -725,7 +725,7 @@ def provision(lp, setup_dir, message, paths, session_info,
     
     if ldap_backend == "ldapi":
     	# provision-backend will set this path suggested slapd command line / fedorads.inf
-    	ldap_backend = "ldapi://" % urllib.quote(os.path.join(lp.get("private dir"), "ldap", "ldapi"))
+    	ldap_backend = "ldapi://" % urllib.quote(os.path.join(lp.get("private dir"), "ldap", "ldapi"), "")
 
     assert realm is not None
     realm = realm.upper()
@@ -860,9 +860,9 @@ def provision(lp, setup_dir, message, paths, session_info,
         samdb = SamDB(paths.samdb, session_info=session_info, 
                       credentials=credentials, lp=lp)
 
-        domainguid = samdb.searchone(domaindn, "objectGUID")
+        domainguid = samdb.searchone(basedn=domaindn, attribute="objectGUID")
         assert isinstance(domainguid, str)
-        hostguid = samdb.searchone(domaindn, "objectGUID",
+        hostguid = samdb.searchone(basedn=domaindn, attribute="objectGUID",
                 expression="(&(objectClass=computer)(cn=%s))" % hostname,
                 scope=SCOPE_SUBTREE)
         assert isinstance(hostguid, str)
@@ -877,14 +877,14 @@ def provision(lp, setup_dir, message, paths, session_info,
     return domaindn
 
 
-def create_phpldapadmin_config(path, setup_path, ldap_backend):
+def create_phpldapadmin_config(path, setup_path, ldapi_uri):
     """Create a PHP LDAP admin configuration file.
 
     :param path: Path to write the configuration to.
     :param setup_path: Function to generate setup paths.
     """
     setup_file(setup_path("phpldapadmin-config.php"), path, 
-            {"S4_LDAPI_URI": ldap_backend})
+            {"S4_LDAPI_URI": ldapi_uri})
 
 
 def create_zone_file(path, setup_path, samdb, dnsdomain, domaindn, 
@@ -903,6 +903,7 @@ def create_zone_file(path, setup_path, samdb, dnsdomain, domaindn,
     :param domainguid: GUID of the domain.
     :param hostguid: GUID of the host.
     """
+    assert isinstance(domainguid, str)
 
     setup_file(setup_path("provision.zone"), path, {
             "DNSPASS_B64": b64encode(dnspass),
diff --git a/source4/scripting/python/samba/samdb.py b/source4/scripting/python/samba/samdb.py
index b757330ecb..c11fabf553 100644
--- a/source4/scripting/python/samba/samdb.py
+++ b/source4/scripting/python/samba/samdb.py
@@ -105,7 +105,7 @@ userAccountControl: %u
         assert(len(res) == 1 and res[0].defaultNamingContext is not None)
         domain_dn = res[0]["defaultNamingContext"][0]
         assert(domain_dn is not None)
-        dom_users = self.searchone(domain_dn, "dn", "name=Domain Users")
+        dom_users = self.searchone(basedn=domain_dn, attribute="dn", expression="name=Domain Users")
         assert(dom_users is not None)
 
         user_dn = "CN=%s,CN=Users,%s" % (username, domain_dn)
diff --git a/source4/scripting/python/samba/tests/__init__.py b/source4/scripting/python/samba/tests/__init__.py
index e557dd95be..9402002674 100644
--- a/source4/scripting/python/samba/tests/__init__.py
+++ b/source4/scripting/python/samba/tests/__init__.py
@@ -79,7 +79,7 @@ class LdbExtensionTests(TestCaseInTempDir):
         l = samba.Ldb(path)
         try:
             l.add({"dn": "foo=dc", "bar": "bla"})
-            self.assertEquals("bla", l.searchone(ldb.Dn(l, "foo=dc"), "bar"))
+            self.assertEquals("bla", l.searchone(basedn=ldb.Dn(l, "foo=dc"), attribute="bar"))
         finally:
             del l
             os.unlink(path)
diff --git a/source4/scripting/python/samba/tests/provision.py b/source4/scripting/python/samba/tests/provision.py
index 83952df9fe..1456b6751c 100644
--- a/source4/scripting/python/samba/tests/provision.py
+++ b/source4/scripting/python/samba/tests/provision.py
@@ -33,7 +33,7 @@ class ProvisionTestCase(samba.tests.TestCaseInTempDir):
         ldb = setup_secretsdb(path, setup_path, None, None, None)
         try:
             self.assertEquals("LSA Secrets",
-                 ldb.searchone(Dn(ldb, "CN=LSA Secrets"), "CN"))
+                 ldb.searchone(basedn="CN=LSA Secrets", attribute="CN"))
         finally:
             del ldb
             os.unlink(path)
@@ -50,6 +50,14 @@ class ProvisionTestCase(samba.tests.TestCaseInTempDir):
                            machinepass="machinepass", dnsdomain="example.com")
             self.assertEquals(1, 
                     len(secrets_ldb.search("samAccountName=krbtgt,flatname=EXAMPLE,CN=Principals")))
+	    self.assertEquals("keytab.path",
+                    secrets_ldb.searchone(basedn="flatname=EXAMPLE,CN=primary domains", 
+                                          expression="(privateKeytab=*)", 
+                                          attribute="privateKeytab"))
+            self.assertEquals("S-5-22",
+                    secrets_ldb.searchone(basedn="flatname=EXAMPLE,CN=primary domains",
+                                          expression="objectSid=*", attribute="objectSid"))
+
         finally:
             del secrets_ldb
             os.unlink(path)
-- 
cgit 


From 1b18de131c556280004dea6393e22547c9681fd9 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Fri, 25 Jan 2008 17:11:20 +1100
Subject: Tidy up the last regresesions on the python smbscript, from my work
 with Jelmer today.

The only remaining issue is that for the build farm, we will need to
manually specify the users and groups from the NSS_WRAPPPER, as python
isn't compiled with this.

Andrew Bartlett
(This used to be commit 5370484d25b8c7a5bde730d9be36ecbbb0aaf315)
---
 source4/scripting/python/samba/provision.py | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index 0e498f65e5..26c4afe3c8 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -188,12 +188,17 @@ def provision_paths_from_lp(lp, dnsdomain, private_dir=None):
     paths = ProvisionPaths()
     if private_dir is None:
         private_dir = lp.get("private dir")
+        paths.keytab = "secrets.keytab"
+        paths.dns_keytab = "dns.keytab"
+    else:
+        paths.keytab = os.path.join(private_dir, "secrets.keytab")
+        paths.dns_keytab = os.path.join(private_dir, "dns.keytab")
+
     paths.shareconf = os.path.join(private_dir, "share.ldb")
     paths.samdb = os.path.join(private_dir, lp.get("sam database") or "samdb.ldb")
     paths.secrets = os.path.join(private_dir, lp.get("secrets database") or "secrets.ldb")
     paths.templates = os.path.join(private_dir, "templates.ldb")
-    paths.keytab = os.path.join(private_dir, "secrets.keytab")
-    paths.dns_keytab = os.path.join(private_dir, "dns.keytab")
+
     paths.dns = os.path.join(private_dir, dnsdomain + ".zone")
     paths.winsdb = os.path.join(private_dir, "wins.ldb")
     paths.s4_ldapi_path = os.path.join(private_dir, "ldapi")
@@ -407,6 +412,8 @@ def setup_secretsdb(path, setup_path, session_info, credentials, lp):
                       lp=lp)
     secrets_ldb.erase()
     secrets_ldb.load_ldif_file_add(setup_path("secrets_init.ldif"))
+    secrets_ldb = Ldb(path, session_info=session_info, credentials=credentials,
+                      lp=lp)
     secrets_ldb.load_ldif_file_add(setup_path("secrets.ldif"))
     return secrets_ldb
 
@@ -695,18 +702,18 @@ def provision(lp, setup_dir, message, paths, session_info,
     if dnspass is None:
         dnspass = misc.random_password(12)
     if root is None:
-        root = findnss(pwd.getpwnam, "root")[4]
+        root = findnss(pwd.getpwnam, "root")[0]
     if nobody is None:
-        nobody = findnss(pwd.getpwnam, "nobody")[4]
+        nobody = findnss(pwd.getpwnam, "nobody")[0]
     if nogroup is None:
-        nogroup = findnss(grp.getgrnam, "nogroup", "nobody")[2]
+        nogroup = findnss(grp.getgrnam, "nogroup", "nobody")[0]
     if users is None:
         users = findnss(grp.getgrnam, "users", "guest", "other", "unknown", 
-                        "usr")[2]
+                        "usr")[0]
     if wheel is None:
-        wheel = findnss(grp.getgrnam, "wheel", "root", "staff", "adm")[2]
+        wheel = findnss(grp.getgrnam, "wheel", "root", "staff", "adm")[0]
     if backup is None:
-        backup = findnss(grp.getgrnam, "backup", "wheel", "root", "staff")[2]
+        backup = findnss(grp.getgrnam, "backup", "wheel", "root", "staff")[0]
     if aci is None:
         aci = "# no aci for local ldb"
     if serverrole is None:
@@ -721,11 +728,11 @@ def provision(lp, setup_dir, message, paths, session_info,
         raise Exception("realm '%s' in smb.conf must match chosen realm '%s'" %
                 (lp.get("realm"), realm))
 
-    ldapi_url = "ldapi://%s" % urllib.quote(paths.s4_ldapi_path)
+    ldapi_url = "ldapi://%s" % urllib.quote(paths.s4_ldapi_path, safe="")
     
     if ldap_backend == "ldapi":
     	# provision-backend will set this path suggested slapd command line / fedorads.inf
-    	ldap_backend = "ldapi://" % urllib.quote(os.path.join(lp.get("private dir"), "ldap", "ldapi"), "")
+    	ldap_backend = "ldapi://" % urllib.quote(os.path.join(lp.get("private dir"), "ldap", "ldapi"), safe="")
 
     assert realm is not None
     realm = realm.upper()
-- 
cgit 


From 6c2d4f2806bae8072d61ba8795832d9a9e75573e Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Fri, 25 Jan 2008 11:47:44 +0100
Subject: python/provision: Reload secrets when necessary, fix unix names in
 mappings.

Pair programmed with Andrew.
(This used to be commit 04fe8c8aefae8da8966954d0654c37adf2d0361d)
---
 source4/scripting/python/samba/provision.py | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index 0e498f65e5..4d99cd9cd9 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -193,7 +193,7 @@ def provision_paths_from_lp(lp, dnsdomain, private_dir=None):
     paths.secrets = os.path.join(private_dir, lp.get("secrets database") or "secrets.ldb")
     paths.templates = os.path.join(private_dir, "templates.ldb")
     paths.keytab = os.path.join(private_dir, "secrets.keytab")
-    paths.dns_keytab = os.path.join(private_dir, "dns.keytab")
+    paths.dns_keytab = "dns.keytab"
     paths.dns = os.path.join(private_dir, dnsdomain + ".zone")
     paths.winsdb = os.path.join(private_dir, "wins.ldb")
     paths.s4_ldapi_path = os.path.join(private_dir, "ldapi")
@@ -407,6 +407,8 @@ def setup_secretsdb(path, setup_path, session_info, credentials, lp):
                       lp=lp)
     secrets_ldb.erase()
     secrets_ldb.load_ldif_file_add(setup_path("secrets_init.ldif"))
+    secrets_ldb = Ldb(path, session_info=session_info, credentials=credentials,
+                      lp=lp)
     secrets_ldb.load_ldif_file_add(setup_path("secrets.ldif"))
     return secrets_ldb
 
@@ -695,18 +697,18 @@ def provision(lp, setup_dir, message, paths, session_info,
     if dnspass is None:
         dnspass = misc.random_password(12)
     if root is None:
-        root = findnss(pwd.getpwnam, "root")[4]
+        root = findnss(pwd.getpwnam, "root")[0]
     if nobody is None:
-        nobody = findnss(pwd.getpwnam, "nobody")[4]
+        nobody = findnss(pwd.getpwnam, "nobody")[0]
     if nogroup is None:
-        nogroup = findnss(grp.getgrnam, "nogroup", "nobody")[2]
+        nogroup = findnss(grp.getgrnam, "nogroup", "nobody")[0]
     if users is None:
         users = findnss(grp.getgrnam, "users", "guest", "other", "unknown", 
-                        "usr")[2]
+                        "usr")[0]
     if wheel is None:
-        wheel = findnss(grp.getgrnam, "wheel", "root", "staff", "adm")[2]
+        wheel = findnss(grp.getgrnam, "wheel", "root", "staff", "adm")[0]
     if backup is None:
-        backup = findnss(grp.getgrnam, "backup", "wheel", "root", "staff")[2]
+        backup = findnss(grp.getgrnam, "backup", "wheel", "root", "staff")[0]
     if aci is None:
         aci = "# no aci for local ldb"
     if serverrole is None:
-- 
cgit 


From 21f5f4d4409e5a7076194639570f11ec32cf3257 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Fri, 25 Jan 2008 12:16:13 +0100
Subject: python: Give precedence to Samba's syspath over the already set
 system one. (This used to be commit f3ebaf0a0c0b881da28063c69bb6306f6aa1c774)

---
 source4/scripting/python/modules.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/modules.c b/source4/scripting/python/modules.c
index fff981e941..2ecad20b8e 100644
--- a/source4/scripting/python/modules.c
+++ b/source4/scripting/python/modules.c
@@ -62,7 +62,7 @@ void py_load_samba_modules(void)
 void py_update_path(const char *bindir)
 {
 	char *newpath;
-	asprintf(&newpath, "%s:%s/python:%s/../scripting/python", Py_GetPath(), bindir, bindir);
+	asprintf(&newpath, "%s/python:%s/../scripting/python:%s", bindir, bindir, Py_GetPath());
 	PySys_SetPath(newpath);
 	free(newpath);
 }
-- 
cgit 


From e41a6329029130f7209671c29fd219525d9012f8 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Fri, 25 Jan 2008 15:40:55 +0100
Subject: configure: define HAVE_WORKING_PYTHON

metze
(This used to be commit 351c2e99ab8b6a91f7355077b2d2944fd820839c)
---
 source4/scripting/python/config.m4 | 1 +
 1 file changed, 1 insertion(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/config.m4 b/source4/scripting/python/config.m4
index 4f46f92682..3acd7321c7 100644
--- a/source4/scripting/python/config.m4
+++ b/source4/scripting/python/config.m4
@@ -66,6 +66,7 @@ if test $working_python = yes; then
 	SMB_ENABLE(EXT_LIB_PYTHON,YES)
 	SMB_ENABLE(smbpython,YES)
 	SMB_ENABLE(LIBPYTHON,YES)
+	AC_DEFINE(HAVE_WORKING_PYTHON, 1, [Whether we have working python support])
 	AC_MSG_RESULT([yes])
 else
 	SMB_ENABLE(EXT_LIB_PYTHON,NO)
-- 
cgit 


From 172e00d8a174646e4e1279e66805c24eeac00c40 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sat, 26 Jan 2008 02:55:03 +0100
Subject: python: Load smb.conf file for the provision tests. (This used to be
 commit 41571bbb933c763a9608f4ba56f1a5a97af133ab)

---
 source4/scripting/python/samba/tests/provision.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/tests/provision.py b/source4/scripting/python/samba/tests/provision.py
index 1456b6751c..4e9fa9c3ef 100644
--- a/source4/scripting/python/samba/tests/provision.py
+++ b/source4/scripting/python/samba/tests/provision.py
@@ -21,6 +21,10 @@ import os
 from samba.provision import setup_secretsdb, secretsdb_become_dc
 import samba.tests
 from ldb import Dn
+import param
+
+lp = param.LoadParm()
+lp.load("st/dc/etc/smb.conf")
 
 setup_dir = "setup"
 def setup_path(file):
@@ -30,7 +34,7 @@ def setup_path(file):
 class ProvisionTestCase(samba.tests.TestCaseInTempDir):
     def test_setup_secretsdb(self):
         path = os.path.join(self.tempdir, "secrets.ldb")
-        ldb = setup_secretsdb(path, setup_path, None, None, None)
+        ldb = setup_secretsdb(path, setup_path, None, None, lp=lp)
         try:
             self.assertEquals("LSA Secrets",
                  ldb.searchone(basedn="CN=LSA Secrets", attribute="CN"))
@@ -40,7 +44,7 @@ class ProvisionTestCase(samba.tests.TestCaseInTempDir):
             
     def test_become_dc(self):
         path = os.path.join(self.tempdir, "secrets.ldb")
-        secrets_ldb = setup_secretsdb(path, setup_path, None, None, None)
+        secrets_ldb = setup_secretsdb(path, setup_path, None, None, lp=lp)
         try:
             secretsdb_become_dc(secrets_ldb, setup_path, domain="EXAMPLE", 
                    realm="example", netbiosname="myhost", 
-- 
cgit 


From cab677a33f0376cd1bf96ec561dc0463bbf80edd Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sat, 26 Jan 2008 04:22:42 +0100
Subject: python: Use relative paths for registry. (This used to be commit
 079200b824de6dd8c7de3e5b76ed1805fde02965)

---
 source4/scripting/python/samba/provision.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index f244679eb5..d2a4f28b64 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -203,7 +203,13 @@ def provision_paths_from_lp(lp, dnsdomain, private_dir=None):
     paths.s4_ldapi_path = os.path.join(private_dir, "ldapi")
     paths.phpldapadminconfig = os.path.join(private_dir, 
                                             "phpldapadmin-config.php")
-    paths.hklm = os.path.join(private_dir, "hklm.ldb")
+    paths.hklm = "hklm.ldb"
+    paths.hkcr = "hkcr.ldb"
+    paths.hkcu = "hkcu.ldb"
+    paths.hku = "hku.ldb"
+    paths.hkpd = "hkpd.ldb"
+    paths.hkpt = "hkpt.ldb"
+
     paths.sysvol = lp.get("sysvol", "path")
     if paths.sysvol is None:
         paths.sysvol = os.path.join(lp.get("lock dir"), "sysvol")
@@ -442,6 +448,7 @@ def setup_registry(path, setup_path, session_info, credentials, lp):
     :param lp: Loadparm context
     """
     reg = registry.Registry()
+    print path
     hive = registry.open_ldb(path, session_info=session_info, 
                          credentials=credentials, lp_ctx=lp)
     reg.mount_hive(hive, "HKEY_LOCAL_MACHINE")
-- 
cgit 


From bcad73a7f7f63b33c02df5a62c7986f2c7dc11ff Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 29 Jan 2008 13:10:43 +0100
Subject: Partially revert d64a2288a2cb3a8f74a18b740b265a460773635d and
 351c2e99ab8b6a91f7355077b2d2944fd820839c to see if that fixes the build.
 (This used to be commit 2a79cebfd99f4048214be65a6c918cc988dc83ed)

---
 source4/scripting/python/config.m4 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/config.m4 b/source4/scripting/python/config.m4
index 3acd7321c7..e4a34ece1e 100644
--- a/source4/scripting/python/config.m4
+++ b/source4/scripting/python/config.m4
@@ -66,7 +66,7 @@ if test $working_python = yes; then
 	SMB_ENABLE(EXT_LIB_PYTHON,YES)
 	SMB_ENABLE(smbpython,YES)
 	SMB_ENABLE(LIBPYTHON,YES)
-	AC_DEFINE(HAVE_WORKING_PYTHON, 1, [Whether we have working python support])
+	dnl AC_DEFINE(HAVE_WORKING_PYTHON, 1, [Whether we have working python support])
 	AC_MSG_RESULT([yes])
 else
 	SMB_ENABLE(EXT_LIB_PYTHON,NO)
-- 
cgit 


From 61379d97cd3f4f21cc55d3cf3539e0adfa274b7f Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 29 Jan 2008 14:27:27 +0100
Subject: python: Provide PyAPI_DATA macro for older versions of Python (<
 2.3). (This used to be commit 421bdd203eab09e560f4919715fa4cc4497e406f)

---
 source4/scripting/python/pyrpc.h | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/pyrpc.h b/source4/scripting/python/pyrpc.h
index 5390c6923d..3a5d235cfc 100644
--- a/source4/scripting/python/pyrpc.h
+++ b/source4/scripting/python/pyrpc.h
@@ -27,3 +27,8 @@
 #define dom_sid28_Type dom_sid_Type
 #define dom_sid2_Check dom_sid_Check
 #define dom_sid28_Check dom_sid28_Check
+
+/* This macro is only provided by Python >= 2.3 */
+#ifndef PyAPI_DATA
+#   define PyAPI_DATA(RTYPE) extern RTYPE
+#endif
-- 
cgit 


From 77f71c1b65358723771354fd9ff1dc418b227ccc Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Mon, 4 Feb 2008 17:51:38 +1100
Subject: Rework cluster_id() to take an additional argument, as we need
 <node>.<pid>.<fd> to be unique in a prefork process environment.

Andrew Bartlett and David Disseldorp
(This used to be commit 931994a7f185bbc98924823e9e8cef1011dd0957)
---
 source4/scripting/ejs/smbcalls_rpc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_rpc.c b/source4/scripting/ejs/smbcalls_rpc.c
index 2bfc8b5883..44cfa16d7e 100644
--- a/source4/scripting/ejs/smbcalls_rpc.c
+++ b/source4/scripting/ejs/smbcalls_rpc.c
@@ -80,7 +80,7 @@ static int ejs_irpc_connect(MprVarHandle eid, int argc, char **argv)
 	for (i=0;i<10000;i++) {
 		p->msg_ctx = messaging_init(p, 
 					    lp_messaging_path(p, global_loadparm),
-					    cluster_id(EJS_ID_BASE + i), 
+					    cluster_id(EJS_ID_BASE, i), 
 				            lp_iconv_convenience(global_loadparm),
 					    ev);
 		if (p->msg_ctx) break;
-- 
cgit 


From fffe4f3bdd27b11dce75c9b2c931f5291f04ab6b Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Fri, 8 Feb 2008 03:03:44 +0100
Subject: Fix formatting. (This used to be commit
 73d1b0fcb64fdc7be1e1e1002f3f182fcbe476ae)

---
 source4/scripting/python/samba/provision.py | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index d2a4f28b64..bcadcca583 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -319,14 +319,14 @@ def setup_samdb_partitions(samdb_path, setup_path, message, lp, session_info,
  
     domaindn_ldb = "users.ldb"
     if ldap_backend is not None:
-    	domaindn_ldb = ldap_backend
+        domaindn_ldb = ldap_backend
     configdn_ldb = "configuration.ldb"
     if ldap_backend is not None:
-    	configdn_ldb = ldap_backend
+        configdn_ldb = ldap_backend
     schema_ldb = "schema.ldb"
     if ldap_backend is not None:
-    	schema_ldb = ldap_backend
-    	
+        schema_ldb = ldap_backend
+    
     if ldap_backend_type == "fedora-ds":
         backend_modules = ["nsuniqueid","paged_searches"]
     elif ldap_backend_type == "openldap":
@@ -737,8 +737,8 @@ def provision(lp, setup_dir, message, paths, session_info,
     ldapi_url = "ldapi://%s" % urllib.quote(paths.s4_ldapi_path, safe="")
     
     if ldap_backend == "ldapi":
-    	# provision-backend will set this path suggested slapd command line / fedorads.inf
-    	ldap_backend = "ldapi://" % urllib.quote(os.path.join(lp.get("private dir"), "ldap", "ldapi"), safe="")
+        # provision-backend will set this path suggested slapd command line / fedorads.inf
+        ldap_backend = "ldapi://" % urllib.quote(os.path.join(lp.get("private dir"), "ldap", "ldapi"), safe="")
 
     assert realm is not None
     realm = realm.upper()
@@ -755,7 +755,7 @@ def provision(lp, setup_dir, message, paths, session_info,
 
     dnsdomain    = realm.lower()
     if serverrole == "domain controller":
-	domaindn     = "DC=" + dnsdomain.replace(".", ",DC=")
+        domaindn     = "DC=" + dnsdomain.replace(".", ",DC=")
         if domain is None:
             domain = lp.get("workgroup")
     
@@ -769,9 +769,9 @@ def provision(lp, setup_dir, message, paths, session_info,
             raise InvalidNetbiosName(domain)
 
     else:
-    	domaindn = "CN=" + netbiosname
-    	domain = netbiosname
-    	
+        domaindn = "CN=" + netbiosname
+        domain = netbiosname
+    
     if rootdn is None:
        rootdn       = domaindn
        
-- 
cgit 


From 26897518ea88e6c70eda4031e62c02fcbcdb0fc0 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Fri, 8 Feb 2008 17:11:26 +1100
Subject: Fix LDAP backend with python

We were still setting the hard-coded users.ldb etc, rather than
switching to the ldapi:// URI

Andrew Bartlett
(This used to be commit 603e981250b26b533ec35dd607cb635226cf99df)
---
 source4/scripting/python/samba/provision.py | 44 +++++++++++++++++------------
 1 file changed, 26 insertions(+), 18 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index d2a4f28b64..9a44983d8e 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -323,9 +323,9 @@ def setup_samdb_partitions(samdb_path, setup_path, message, lp, session_info,
     configdn_ldb = "configuration.ldb"
     if ldap_backend is not None:
     	configdn_ldb = ldap_backend
-    schema_ldb = "schema.ldb"
+    schemadn_ldb = "schema.ldb"
     if ldap_backend is not None:
-    	schema_ldb = ldap_backend
+    	schemadn_ldb = ldap_backend
     	
     if ldap_backend_type == "fedora-ds":
         backend_modules = ["nsuniqueid","paged_searches"]
@@ -336,23 +336,31 @@ def setup_samdb_partitions(samdb_path, setup_path, message, lp, session_info,
     else:
         backend_modules = ["objectguid"]
         
-    setup_add_ldif(samdb, setup_path("provision_partitions.ldif"), {
-        "SCHEMADN": schemadn, 
-        "SCHEMADN_LDB": "schema.ldb",
-        "SCHEMADN_MOD2": ",objectguid",
-        "CONFIGDN": configdn,
-        "CONFIGDN_LDB": "configuration.ldb",
-        "DOMAINDN": domaindn,
-        "DOMAINDN_LDB": "users.ldb",
-        "SCHEMADN_MOD": "schema_fsmo,instancetype",
-        "CONFIGDN_MOD": "naming_fsmo,instancetype",
-        "DOMAINDN_MOD": "pdc_fsmo,password_hash,instancetype",
-        "MODULES_LIST": ",".join(modules_list),
-        "TDB_MODULES_LIST": ","+",".join(tdb_modules_list),
-        "MODULES_LIST2": ",".join(modules_list2),
-        "BACKEND_MOD": ",".join(backend_modules),
+    samdb.transaction_start()
+    try:
+        setup_add_ldif(samdb, setup_path("provision_partitions.ldif"), {
+                "SCHEMADN": schemadn, 
+                "SCHEMADN_LDB": schemadn_ldb,
+                "SCHEMADN_MOD2": ",objectguid",
+                "CONFIGDN": configdn,
+                "CONFIGDN_LDB": configdn_ldb,
+                "DOMAINDN": domaindn,
+                "DOMAINDN_LDB": domaindn_ldb,
+                "SCHEMADN_MOD": "schema_fsmo,instancetype",
+                "CONFIGDN_MOD": "naming_fsmo,instancetype",
+                "DOMAINDN_MOD": "pdc_fsmo,password_hash,instancetype",
+                "MODULES_LIST": ",".join(modules_list),
+                "TDB_MODULES_LIST": ","+",".join(tdb_modules_list),
+                "MODULES_LIST2": ",".join(modules_list2),
+                "BACKEND_MOD": ",".join(backend_modules),
         })
 
+    except:
+        samdb.transaction_cancel()
+        raise
+
+    samdb.transaction_commit()
+    
     samdb = SamDB(samdb_path, session_info=session_info, 
                   credentials=credentials, lp=lp)
 
@@ -680,7 +688,7 @@ FILL_NT4SYNC = "NT4SYNC"
 FILL_DRS = "DRS"
 
 def provision(lp, setup_dir, message, paths, session_info, 
-              credentials, ldapbackend, samdb_fill=FILL_FULL, realm=None, rootdn=None,
+              credentials, samdb_fill=FILL_FULL, realm=None, rootdn=None,
               domain=None, hostname=None, hostip=None, domainsid=None, 
               hostguid=None, adminpass=None, krbtgtpass=None, domainguid=None, 
               policyguid=None, invocationid=None, machinepass=None, 
-- 
cgit 


From c1c09e584e134a9b9ccf0fcb6517a87619c3a5ed Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Fri, 8 Feb 2008 17:12:25 +1100
Subject: LDAP now works with the python provision!

Andrew Bartlett
(This used to be commit 8f0a89ca19d6a3986dacd981fab1ebbc8b1a4ad0)
---
 source4/scripting/python/STATUS | 1 -
 1 file changed, 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/STATUS b/source4/scripting/python/STATUS
index 6e6475bfde..ee67b8bc7a 100644
--- a/source4/scripting/python/STATUS
+++ b/source4/scripting/python/STATUS
@@ -1,6 +1,5 @@
 dsdb/samdb/ldb_modules/tests/samba3sam.py: Fix remaining failing tests
 lib/ldb/tests/python/ldap.py: Fix remaining 3 FIXME's
-provisioning in LDAP mode(TEST_LDAP=yes PROVISION_PYTHON=yes make test)
 command-line vampire
 provisioning: combine some of the python dictionaries
 finish scripting/bin/smbstatus.py
-- 
cgit 


From c1d8ac0ab1226c27a46fcbb0101c2921d63de599 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sat, 9 Feb 2008 01:42:38 +0100
Subject: Remove unused class members. (This used to be commit
 373ef4287f998b79bf9ba6364d6a67e5c522833d)

---
 source4/scripting/python/samba/provision.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index 0c16ab3bfe..e15f205813 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -64,9 +64,6 @@ class ProvisionPaths:
         self.dns_keytab = None
         self.dns = None
         self.winsdb = None
-        self.ldap_basedn_ldif = None
-        self.ldap_config_basedn_ldif = None
-        self.ldap_schema_basedn_ldif = None
 
 
 def check_install(lp, session_info, credentials):
@@ -201,6 +198,7 @@ def provision_paths_from_lp(lp, dnsdomain, private_dir=None):
     paths.dns = os.path.join(private_dir, dnsdomain + ".zone")
     paths.winsdb = os.path.join(private_dir, "wins.ldb")
     paths.s4_ldapi_path = os.path.join(private_dir, "ldapi")
+    paths.smbconf = os.path.join(private_dir, "smb.conf")
     paths.phpldapadminconfig = os.path.join(private_dir, 
                                             "phpldapadmin-config.php")
     paths.hklm = "hklm.ldb"
@@ -812,7 +810,7 @@ def provision(lp, setup_dir, message, paths, session_info,
             "NETLOGONPATH": paths.netlogon,
             "SYSVOLPATH": paths.sysvol,
             })
-        lp.reload()
+        lp.load(paths.smbconf)
 
     # only install a new shares config db if there is none
     if not os.path.exists(paths.shareconf):
-- 
cgit 


From 2aac2a5df8a03a42ed92e84f093b8aa5ba16dd1d Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sat, 9 Feb 2008 02:10:49 +0100
Subject: Add tests for findnss(), add some docstrings. (This used to be commit
 4eec2bbc9a139e927ce21c615ebfbb3026b26384)

---
 source4/scripting/python/samba/provision.py       | 39 +++++++++++++++--------
 source4/scripting/python/samba/tests/provision.py | 23 ++++++++++++-
 2 files changed, 48 insertions(+), 14 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index e15f205813..b094581fb4 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -81,14 +81,19 @@ def check_install(lp, session_info, credentials):
         raise "No administrator account found"
 
 
-def findnss(nssfn, *names):
-    """Find a user or group from a list of possibilities."""
+def findnss(nssfn, names):
+    """Find a user or group from a list of possibilities.
+    
+    :param nssfn: NSS Function to try (should raise KeyError if not found)
+    :param names: Names to check.
+    :return: Value return by first names list.
+    """
     for name in names:
         try:
             return nssfn(name)
         except KeyError:
             pass
-    raise Exception("Unable to find user/group for %s" % arguments[1])
+    raise KeyError("Unable to find user/group %r" % names)
 
 
 def open_ldb(session_info, credentials, lp, dbname):
@@ -146,6 +151,14 @@ def setup_modify_ldif(ldb, ldif_path, substvars=None):
 
 
 def setup_ldb(ldb, ldif_path, subst_vars):
+    """Import a LDIF a file into a LDB handle, optionally substituting variables.
+
+    :note: Either all LDIF data will be added or none (using transactions).
+
+    :param ldb: LDB file to import into.
+    :param ldif_path: Path to the LDIF file.
+    :param subst_vars: Dictionary with substitution variables.
+    """
     assert ldb is not None
     ldb.transaction_start()
     try:
@@ -716,18 +729,18 @@ def provision(lp, setup_dir, message, paths, session_info,
     if dnspass is None:
         dnspass = misc.random_password(12)
     if root is None:
-        root = findnss(pwd.getpwnam, "root")[0]
+        root = findnss(pwd.getpwnam, ["root"])[0]
     if nobody is None:
-        nobody = findnss(pwd.getpwnam, "nobody")[0]
+        nobody = findnss(pwd.getpwnam, ["nobody"])[0]
     if nogroup is None:
-        nogroup = findnss(grp.getgrnam, "nogroup", "nobody")[0]
+        nogroup = findnss(grp.getgrnam, ["nogroup", "nobody"])[0]
     if users is None:
-        users = findnss(grp.getgrnam, "users", "guest", "other", "unknown", 
-                        "usr")[0]
+        users = findnss(grp.getgrnam, ["users", "guest", "other", "unknown", 
+                        "usr"])[0]
     if wheel is None:
-        wheel = findnss(grp.getgrnam, "wheel", "root", "staff", "adm")[0]
+        wheel = findnss(grp.getgrnam, ["wheel", "root", "staff", "adm"])[0]
     if backup is None:
-        backup = findnss(grp.getgrnam, "backup", "wheel", "root", "staff")[0]
+        backup = findnss(grp.getgrnam, ["backup", "wheel", "root", "staff"])[0]
     if aci is None:
         aci = "# no aci for local ldb"
     if serverrole is None:
@@ -781,10 +794,10 @@ def provision(lp, setup_dir, message, paths, session_info,
         domain = netbiosname
     
     if rootdn is None:
-       rootdn       = domaindn
+       rootdn = domaindn
        
-    configdn     = "CN=Configuration," + rootdn
-    schemadn     = "CN=Schema," + configdn
+    configdn = "CN=Configuration," + rootdn
+    schemadn = "CN=Schema," + configdn
 
     message("set DOMAIN SID: %s" % str(domainsid))
     message("Provisioning for %s in realm %s" % (domain, realm))
diff --git a/source4/scripting/python/samba/tests/provision.py b/source4/scripting/python/samba/tests/provision.py
index 4e9fa9c3ef..eb49f7af83 100644
--- a/source4/scripting/python/samba/tests/provision.py
+++ b/source4/scripting/python/samba/tests/provision.py
@@ -18,10 +18,11 @@
 #
 
 import os
-from samba.provision import setup_secretsdb, secretsdb_become_dc
+from samba.provision import setup_secretsdb, secretsdb_become_dc, findnss
 import samba.tests
 from ldb import Dn
 import param
+import unittest
 
 lp = param.LoadParm()
 lp.load("st/dc/etc/smb.conf")
@@ -66,6 +67,25 @@ class ProvisionTestCase(samba.tests.TestCaseInTempDir):
             del secrets_ldb
             os.unlink(path)
 
+
+class FindNssTests(unittest.TestCase):
+    """Test findnss() function."""
+    def test_nothing(self):
+        def x(y):
+            raise KeyError
+        self.assertRaises(KeyError, findnss, x, [])
+
+    def test_first(self):
+        self.assertEquals("bla", findnss(lambda x: "bla", ["bla"]))
+
+    def test_skip_first(self):
+        def x(y):
+            if y != "bla":
+                raise KeyError
+            return "ha"
+        self.assertEquals("ha", findnss(x, ["bloe", "bla"]))
+
+
 class Disabled:
     def test_setup_templatesdb(self):
         raise NotImplementedError(self.test_setup_templatesdb)
@@ -100,3 +120,4 @@ class Disabled:
     def test_erase_partitions(self):
         raise NotImplementedError(self.test_erase_partitions)
 
+
-- 
cgit 


From bd0bfe683386f983318b507c5a614f818cdfb38d Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sat, 9 Feb 2008 03:09:56 +0100
Subject: Fix provision python test. (This used to be commit
 b173fa6bd2b24b5a3e7b4fbcb926f6c9771c10ba)

---
 source4/scripting/python/samba/provision.py | 24 +++++++++---------------
 1 file changed, 9 insertions(+), 15 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index b094581fb4..7dd564fae1 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -189,20 +189,16 @@ def setup_file(template, fname, substvars):
     open(f, 'w').write(data)
 
 
-def provision_paths_from_lp(lp, dnsdomain, private_dir=None):
+def provision_paths_from_lp(lp, dnsdomain):
     """Set the default paths for provisioning.
 
     :param lp: Loadparm context.
     :param dnsdomain: DNS Domain name
     """
     paths = ProvisionPaths()
-    if private_dir is None:
-        private_dir = lp.get("private dir")
-        paths.keytab = "secrets.keytab"
-        paths.dns_keytab = "dns.keytab"
-    else:
-        paths.keytab = os.path.join(private_dir, "secrets.keytab")
-        paths.dns_keytab = os.path.join(private_dir, "dns.keytab")
+    private_dir = lp.get("private dir")
+    paths.keytab = "secrets.keytab"
+    paths.dns_keytab = "dns.keytab"
 
     paths.shareconf = os.path.join(private_dir, "share.ldb")
     paths.samdb = os.path.join(private_dir, lp.get("sam database") or "samdb.ldb")
@@ -469,7 +465,6 @@ def setup_registry(path, setup_path, session_info, credentials, lp):
     :param lp: Loadparm context
     """
     reg = registry.Registry()
-    print path
     hive = registry.open_ldb(path, session_info=session_info, 
                          credentials=credentials, lp_ctx=lp)
     reg.mount_hive(hive, "HKEY_LOCAL_MACHINE")
@@ -540,6 +535,7 @@ def setup_samdb(path, setup_path, session_info, credentials, lp,
                 serverrole, ldap_backend=None, ldap_backend_type=None):
     """Setup a complete SAM Database.
     
+    :note: This will wipe the main SAM database file!
     """
 
     # Also wipes the database
@@ -745,6 +741,7 @@ def provision(lp, setup_dir, message, paths, session_info,
         aci = "# no aci for local ldb"
     if serverrole is None:
         serverrole = lp.get("server role")
+    assert serverrole in ("domain controller", "member server")
     if invocationid is None and serverrole == "domain controller":
         invocationid = uuid.random()
 
@@ -774,9 +771,9 @@ def provision(lp, setup_dir, message, paths, session_info,
     if not valid_netbios_name(netbiosname):
         raise InvalidNetbiosName(netbiosname)
 
-    dnsdomain    = realm.lower()
+    dnsdomain = realm.lower()
     if serverrole == "domain controller":
-        domaindn     = "DC=" + dnsdomain.replace(".", ",DC=")
+        domaindn = "DC=" + dnsdomain.replace(".", ",DC=")
         if domain is None:
             domain = lp.get("workgroup")
     
@@ -788,7 +785,6 @@ def provision(lp, setup_dir, message, paths, session_info,
         domain = domain.upper()
         if not valid_netbios_name(domain):
             raise InvalidNetbiosName(domain)
-
     else:
         domaindn = "CN=" + netbiosname
         domain = netbiosname
@@ -812,8 +808,6 @@ def provision(lp, setup_dir, message, paths, session_info,
             smbconfsuffix = "dc"
         elif serverrole == "member":
             smbconfsuffix = "member"
-        else:
-            assert "Invalid server role setting: %s" % serverrole
         setup_file(setup_path("provision.smb.conf.%s" % smbconfsuffix), 
                    paths.smbconf, {
             "HOSTNAME": hostname,
@@ -953,7 +947,7 @@ def create_zone_file(path, setup_path, samdb, dnsdomain, domaindn,
 
 
 def load_schema(setup_path, samdb, schemadn, netbiosname, configdn):
-    """Load schema.
+    """Load schema for the SamDB.
     
     :param samdb: Load a schema into a SamDB.
     :param setup_path: Setup path function.
-- 
cgit 


From 4932e4bb7ad11c6ef8ad3187063dba4e7481afa7 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sat, 9 Feb 2008 03:59:45 +0100
Subject: Fix upgrade after provision parameter rename. (This used to be commit
 361b9f43fb2abb64f2cbae7740b89a616a3c2646)

---
 source4/scripting/python/samba/upgrade.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/upgrade.py b/source4/scripting/python/samba/upgrade.py
index a118af2526..b332bb89ae 100644
--- a/source4/scripting/python/samba/upgrade.py
+++ b/source4/scripting/python/samba/upgrade.py
@@ -246,8 +246,8 @@ def upgrade_provision(samba3, setup_dir, message, credentials, session_info, lp,
         machinepass = None
     
     domaindn = provision(lp=lp, setup_dir=setup_dir, message=message, 
-                         samdb_fill=FILL_DRS, ldapbackend=None, 
-                         paths=paths, session_info=session_info, credentials=credentials, realm=realm, 
+                         samdb_fill=FILL_DRS, paths=paths, session_info=session_info, 
+                         credentials=credentials, realm=realm, 
                          domain=domainname, domainsid=domainsid, domainguid=domainguid, 
                          machinepass=machinepass, serverrole=serverrole)
 
-- 
cgit 


From c61dc3849434347ca8a77f917ca6241bf4ee3174 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sat, 9 Feb 2008 15:42:19 +0100
Subject: Re-enable python support in BECOME-DC test. (This used to be commit
 ed44fd59bfa289bcef82e0650ccda381efb52268)

---
 source4/scripting/python/config.m4 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/config.m4 b/source4/scripting/python/config.m4
index e4a34ece1e..3acd7321c7 100644
--- a/source4/scripting/python/config.m4
+++ b/source4/scripting/python/config.m4
@@ -66,7 +66,7 @@ if test $working_python = yes; then
 	SMB_ENABLE(EXT_LIB_PYTHON,YES)
 	SMB_ENABLE(smbpython,YES)
 	SMB_ENABLE(LIBPYTHON,YES)
-	dnl AC_DEFINE(HAVE_WORKING_PYTHON, 1, [Whether we have working python support])
+	AC_DEFINE(HAVE_WORKING_PYTHON, 1, [Whether we have working python support])
 	AC_MSG_RESULT([yes])
 else
 	SMB_ENABLE(EXT_LIB_PYTHON,NO)
-- 
cgit 


From 2fa4c158580a1e3efea7f8d121305d16eda815cb Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sat, 9 Feb 2008 17:37:42 +0100
Subject: Fix syntax of docstrings, set project name when generating Python API
 documentation. (This used to be commit
 68f13d87eb034fdbc712169f2d1b1a0475751ec5)

---
 source4/scripting/python/config.mk          | 2 +-
 source4/scripting/python/samba/provision.py | 6 ++----
 source4/scripting/python/samba/upgrade.py   | 2 +-
 3 files changed, 4 insertions(+), 6 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/config.mk b/source4/scripting/python/config.mk
index 450da0e90a..b15e1fcda7 100644
--- a/source4/scripting/python/config.mk
+++ b/source4/scripting/python/config.mk
@@ -33,7 +33,7 @@ pythonmods:: $(PYTHON_DSOS) $(PYTHON_PYS)
 PYDOCTOR_MODULES=bin/python/ldb.py bin/python/auth.py bin/python/credentials.py bin/python/registry.py bin/python/tdb.py bin/python/security.py bin/python/events.py bin/python/net.py
 
 pydoctor:: pythonmods
-	LD_LIBRARY_PATH=bin/shared PYTHONPATH=bin/python pydoctor --make-html --docformat=restructuredtext --add-package scripting/python/samba/ $(addprefix --add-module , $(PYDOCTOR_MODULES))
+	LD_LIBRARY_PATH=bin/shared PYTHONPATH=bin/python pydoctor --project-name=Samba --make-html --docformat=restructuredtext --add-package scripting/python/samba/ $(addprefix --add-module , $(PYDOCTOR_MODULES))
 
 installpython:: pythonmods
 	@$(SHELL) $(srcdir)/script/installpython.sh \
diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index 7dd564fae1..4f52d36167 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -278,13 +278,12 @@ def setup_samdb_partitions(samdb_path, setup_path, message, lp, session_info,
     Alternatively, provision() may call this, and then populate the database.
     
     :param erase: Remove the existing data present in the database.
-    :param
      
     :note: This will wipe the Sam Database!
     
     :note: This function always removes the local SAM LDB file. The erase 
-    parameter controls whether to erase the existing data, which 
-    may not be stored locally but in LDAP.
+        parameter controls whether to erase the existing data, which 
+        may not be stored locally but in LDAP.
     """
     assert session_info is not None
 
@@ -479,7 +478,6 @@ def setup_samdb_rootdse(samdb, setup_path, schemadn, domaindn, hostname,
 
     :param samdb: Sam Database handle
     :param setup_path: Obtain setup path
-    ...
     """
     setup_add_ldif(samdb, setup_path("provision_rootdse_add.ldif"), {
         "SCHEMADN": schemadn, 
diff --git a/source4/scripting/python/samba/upgrade.py b/source4/scripting/python/samba/upgrade.py
index b332bb89ae..8bf75d776e 100644
--- a/source4/scripting/python/samba/upgrade.py
+++ b/source4/scripting/python/samba/upgrade.py
@@ -10,6 +10,7 @@
 from provision import findnss, provision, FILL_DRS
 import grp
 import ldb
+import time
 import pwd
 import uuid
 import registry
@@ -162,7 +163,6 @@ def import_wins(samba4_winsdb, samba3_winsdb):
     :param samba3_winsdb: WINS database to import from
     """
     version_id = 0
-    import time
 
     for (name, (ttl, ips, nb_flags)) in samba3_winsdb.items():
         version_id+=1
-- 
cgit 


From cf287aa831a538c9f6c95882cee382fa836756d1 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sat, 9 Feb 2008 17:42:31 +0100
Subject: Add docstring. (This used to be commit
 073ed0dd1cc8fae9eb4a2f7ff6763124917c56e8)

---
 source4/scripting/python/samba/tests/provision.py | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/tests/provision.py b/source4/scripting/python/samba/tests/provision.py
index eb49f7af83..54a7782b3d 100644
--- a/source4/scripting/python/samba/tests/provision.py
+++ b/source4/scripting/python/samba/tests/provision.py
@@ -33,6 +33,8 @@ def setup_path(file):
 
 
 class ProvisionTestCase(samba.tests.TestCaseInTempDir):
+    """Some simple tests for individual functions in the provisioning code.
+    """
     def test_setup_secretsdb(self):
         path = os.path.join(self.tempdir, "secrets.ldb")
         ldb = setup_secretsdb(path, setup_path, None, None, lp=lp)
-- 
cgit 


From 1342b265caa91bcd12ce608e3821c4e355ce1577 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sat, 9 Feb 2008 20:09:58 +0100
Subject: Fix typo. (This used to be commit
 80dbf04266d15833f7eb18704cfece1f95965e83)

---
 source4/scripting/python/config.m4 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/config.m4 b/source4/scripting/python/config.m4
index 3acd7321c7..77cabdfcb3 100644
--- a/source4/scripting/python/config.m4
+++ b/source4/scripting/python/config.m4
@@ -70,7 +70,7 @@ if test $working_python = yes; then
 	AC_MSG_RESULT([yes])
 else
 	SMB_ENABLE(EXT_LIB_PYTHON,NO)
-	SMB_ENABLE(LIBPYTHONyy,NO)
+	SMB_ENABLE(LIBPYTHON,NO)
 	SMB_ENABLE(smbpython,NO)
 	AC_MSG_RESULT([no])
 fi
-- 
cgit 


From 63aa4b902144873243e37eb7d7ce91d30b886abc Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sat, 9 Feb 2008 20:47:12 +0100
Subject: Remove unused define. (This used to be commit
 64d6d729135e1b3b19c9bdbbe973fcdaca15e8b3)

---
 source4/scripting/python/config.m4 | 1 -
 1 file changed, 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/config.m4 b/source4/scripting/python/config.m4
index 1f03ec8e34..908efd1588 100644
--- a/source4/scripting/python/config.m4
+++ b/source4/scripting/python/config.m4
@@ -66,7 +66,6 @@ if test $working_python = yes; then
 	SMB_ENABLE(EXT_LIB_PYTHON,YES)
 	SMB_ENABLE(smbpython,YES)
 	SMB_ENABLE(LIBPYTHON,YES)
-	AC_DEFINE(HAVE_WORKING_PYTHON, 1, [Whether we have working python support])
 	AC_MSG_RESULT([yes])
 else
 	AC_MSG_ERROR([Python not found. Please install Python 2.x and its development headers/libraries.])
-- 
cgit 


From 2cf29aebff0dc821487e60ce86c18c6bbf1be866 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sat, 9 Feb 2008 22:29:42 +0100
Subject: Add tests for upgrade of WINS database. (This used to be commit
 7777611c0f32a693f0fa057c130e4ea491658f6b)

---
 source4/scripting/python/samba/tests/upgrade.py | 19 +++++++++++++++++--
 source4/scripting/python/samba/upgrade.py       |  4 +++-
 2 files changed, 20 insertions(+), 3 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/tests/upgrade.py b/source4/scripting/python/samba/tests/upgrade.py
index ddafa00691..4dc86ace8a 100644
--- a/source4/scripting/python/samba/tests/upgrade.py
+++ b/source4/scripting/python/samba/tests/upgrade.py
@@ -17,6 +17,21 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-import samba.upgrade
-from unittest import TestCase
+from samba import Ldb
+from samba.upgrade import import_wins
+from samba.tests import LdbTestCase
 
+class WinsUpgradeTests(LdbTestCase):
+    def test_upgrade(self):
+        winsdb = {
+            "FOO#20": (200, ["127.0.0.1", "127.0.0.2"], 0x60)
+        }
+        import_wins(self.ldb, winsdb)
+
+        self.assertEquals(['name=FOO,type=0x20'], 
+                          [str(m.dn) for m in self.ldb.search(expression="(objectClass=winsRecord)")])
+
+    def test_version(self):
+        import_wins(self.ldb, {})
+        self.assertEquals("VERSION", 
+                self.ldb.search(expression="(objectClass=winsMaxVersion)")[0]["cn"])
diff --git a/source4/scripting/python/samba/upgrade.py b/source4/scripting/python/samba/upgrade.py
index 8bf75d776e..01b62ff984 100644
--- a/source4/scripting/python/samba/upgrade.py
+++ b/source4/scripting/python/samba/upgrade.py
@@ -18,6 +18,7 @@ from samba import Ldb
 from samba.samdb import SamDB
 
 def import_sam_policy(samldb, samba3_policy, domaindn):
+    """Import a Samba 3 policy database."""
     samldb.modify_ldif("""
 dn: %s
 changetype: modify
@@ -201,7 +202,8 @@ def import_wins(samba4_winsdb, samba3_winsdb):
                            "versionID": str(version_id),
                            "address": ips})
 
-    samba4_winsdb.add({"dn": "CN=VERSION",
+    samba4_winsdb.add({"dn": "cn=VERSION",
+                       "cn": "VERSION",
                        "objectClass": "winsMaxVersion",
                        "maxVersion": str(version_id)})
 
-- 
cgit 


From f75d6241291eaa079d01e658efd7d00a60584830 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sun, 10 Feb 2008 00:21:41 +0100
Subject: Start working on python conversion of minschema. (This used to be
 commit 239a1616644321e2d1e64985ea3f3c4971997228)

---
 source4/scripting/bin/minschema.py | 660 +++++++++++++++++++++++++++++++++++++
 1 file changed, 660 insertions(+)
 create mode 100755 source4/scripting/bin/minschema.py

(limited to 'source4/scripting')

diff --git a/source4/scripting/bin/minschema.py b/source4/scripting/bin/minschema.py
new file mode 100755
index 0000000000..0a16cc9886
--- /dev/null
+++ b/source4/scripting/bin/minschema.py
@@ -0,0 +1,660 @@
+#!/usr/bin/python
+# 
+#  work out the minimal schema for a set of objectclasses 
+#
+
+import getopt
+import optparse
+import samba
+
+parser = optparse.OptionParser("minschema <URL> <classfile>")
+sambaopts = options.SambaOptions(parser)
+parser.add_option_group(sambaopts)
+credopts = options.CredentialsOptions(parser)
+parser.add_option_group(credopts)
+parser.add_option_group(options.VersionOptions(parser))
+parser.add_option("--verbose", help="Be verbose", action="store_true")
+parser.add_option("--dump-classes", action="store_true")
+parser.add_option("--dump-attributes", action="store_true")
+parser.add_option("--dump-subschema", action="store_true")
+parser.add_option("--dump-subschema-auto", action="store_true")
+
+opts, args = parser.parse_args()
+opts.dump_all = True
+
+if opts.dump_classes:
+    opts.dump_all = False
+if opts.dump_attributes:
+    opts.dump_all = False
+if opts.dump_subschema:
+    opts.dump_all = False
+if dump_subschema_auto:
+	opts.dump_all = False
+	opts.dump_subschema = True
+if opts.dump_all:
+	opts.dump_classes = True
+	opts.dump_attributes = True
+	opts.dump_subschema = True
+	opts.dump_subschema_auto = True
+
+if len(args) != 2:
+    parser.print_usage()
+    sys.exit(1)
+
+(url, classfile) = args
+
+creds = credopts.get_credentials()
+ldb = Ldb(url, credentials=creds)
+
+objectclasses = []
+attributes = []
+rootDse = {}
+
+objectclasses_expanded = []
+
+# the attributes we need for objectclasses
+class_attrs = ["objectClass", 
+               "subClassOf", 
+               "governsID", 
+               "possSuperiors", 
+               "possibleInferiors",
+               "mayContain",
+               "mustContain",
+               "auxiliaryClass",
+               "rDNAttID",
+               "showInAdvancedViewOnly",
+               "adminDisplayName",
+               "adminDescription",
+               "objectClassCategory",
+               "lDAPDisplayName",
+               "schemaIDGUID",
+               "systemOnly",
+               "systemPossSuperiors",
+               "systemMayContain",
+               "systemMustContain",
+               "systemAuxiliaryClass",
+               "defaultSecurityDescriptor",
+               "systemFlags",
+               "defaultHidingValue",
+               "objectCategory",
+               "defaultObjectCategory", 
+               
+               # this attributes are not used by w2k3
+               "schemaFlagsEx",
+               "msDs-IntId",
+               "msDs-Schema-Extensions",
+               "classDisplayName",
+               "isDefunct"]
+
+attrib_attrs = ["objectClass",
+                "attributeID", 
+                "attributeSyntax",
+                "isSingleValued",
+                "rangeLower",
+                "rangeUpper",
+                "mAPIID",
+                "linkID",
+                "showInAdvancedViewOnly",
+                "adminDisplayName",
+                "oMObjectClass",
+                "adminDescription",
+                "oMSyntax", 
+                "searchFlags",
+                "extendedCharsAllowed",
+                "lDAPDisplayName",
+                "schemaIDGUID",
+                "attributeSecurityGUID",
+                "systemOnly",
+                "systemFlags",
+                "isMemberOfPartialAttributeSet",
+                "objectCategory", 
+                
+                # this attributes are not used by w2k3
+                "schemaFlagsEx",
+                "msDs-IntId",
+                "msDs-Schema-Extensions",
+                "classDisplayName",
+                "isEphemeral",
+                "isDefunct"]
+
+#
+#  notes:
+#
+#  objectClassCategory 
+#      1: structural
+#      2: abstract
+#      3: auxiliary
+
+#
+#  print only if verbose is set
+#
+def dprintf(text):
+    if verbose is not None:
+		print text
+
+def get_object_cn(ldb, name):
+	attrs = ["cn"]
+
+	res = ldb.search("(ldapDisplayName=%s)" % name, rootDse.schemaNamingContext, ldb.SCOPE_SUBTREE, attrs)
+	assert len(res) == 1
+
+    cn = res[0]["cn"]
+
+#
+#  create an objectclass object
+#
+def obj_objectClass(ldb, name):
+	var o = new Object()
+	o.name = name
+	o.cn = get_object_cn(ldb, name)
+	return o
+
+#
+#  create an attribute object
+#
+def obj_attribute(ldb, name):
+	var o = new Object()
+	o.name = name
+	o.cn = get_object_cn(ldb, name)
+	return o
+
+
+syntaxmap = dict()
+
+syntaxmap['2.5.5.1']  = '1.3.6.1.4.1.1466.115.121.1.12'
+syntaxmap['2.5.5.2']  = '1.3.6.1.4.1.1466.115.121.1.38'
+syntaxmap['2.5.5.3']  = '1.2.840.113556.1.4.1362'
+syntaxmap['2.5.5.4']  = '1.2.840.113556.1.4.905'
+syntaxmap['2.5.5.5']  = '1.3.6.1.4.1.1466.115.121.1.26'
+syntaxmap['2.5.5.6']  = '1.3.6.1.4.1.1466.115.121.1.36'
+syntaxmap['2.5.5.7']  = '1.2.840.113556.1.4.903'
+syntaxmap['2.5.5.8']  = '1.3.6.1.4.1.1466.115.121.1.7'
+syntaxmap['2.5.5.9']  = '1.3.6.1.4.1.1466.115.121.1.27'
+syntaxmap['2.5.5.10'] = '1.3.6.1.4.1.1466.115.121.1.40'
+syntaxmap['2.5.5.11'] = '1.3.6.1.4.1.1466.115.121.1.24'
+syntaxmap['2.5.5.12'] = '1.3.6.1.4.1.1466.115.121.1.15'
+syntaxmap['2.5.5.13'] = '1.3.6.1.4.1.1466.115.121.1.43'
+syntaxmap['2.5.5.14'] = '1.2.840.113556.1.4.904'
+syntaxmap['2.5.5.15'] = '1.2.840.113556.1.4.907'
+syntaxmap['2.5.5.16'] = '1.2.840.113556.1.4.906'
+syntaxmap['2.5.5.17'] = '1.3.6.1.4.1.1466.115.121.1.40'
+
+#
+#  map some attribute syntaxes from some apparently MS specific
+#  syntaxes to the standard syntaxes
+#
+def map_attribute_syntax(s):
+    if syntaxmap.has_key(s):
+		return syntaxmap[s]
+	return s
+
+#
+#  fix a string DN to use ${SCHEMADN}
+#
+def fix_dn(dn):
+	s = strstr(dn, rootDse.schemaNamingContext)
+	if (s == NULL) {
+		return dn
+	}
+	return substr(dn, 0, strlen(dn) - strlen(s)) + "${SCHEMADN}"
+
+#
+#  dump an object as ldif
+#
+def write_ldif_one(o, attrs):
+	print "dn: CN=%s,${SCHEMADN}\n" % o["cn"]
+    for a in attrs:
+        if not o.has_key(a):
+			continue
+		# special case for oMObjectClass, which is a binary object
+        if a == "oMObjectClass":
+			print "%s:: %s\n" % (a, o[a])
+			continue
+		v = o[a]
+        if isinstance(v, str):
+			v = [v]
+        for j in v:
+			print "%s: %s\n" % (a, fix_dn(j))
+	print "\n"
+
+#
+# dump an array of objects as ldif
+#
+def write_ldif(o, attrs):
+    for i in o:
+		write_ldif_one(i, attrs)
+
+
+#
+#  create a testDN based an an example DN
+#  the idea is to ensure we obey any structural rules
+#
+def create_testdn(exampleDN):
+	a = split(",", exampleDN)
+	a[0] = "CN=TestDN"
+	return ",".join(a)
+
+#
+#  find the properties of an objectclass
+#
+def find_objectclass_properties(ldb, o):
+	res = ldb.search(
+		expression="(ldapDisplayName=%s)" % o.name,
+		rootDse.schemaNamingContext, ldb.SCOPE_SUBTREE, class_attrs)
+	assert(len(res) == 1)
+    msg = res[0]
+    for a in msg:
+		o[a] = msg[a]
+
+#
+#  find the properties of an attribute
+#
+def find_attribute_properties(ldb, o):
+	res = ldb.search(
+		expression="(ldapDisplayName=%s)" % o.name,
+		rootDse.schemaNamingContext, ldb.SCOPE_SUBTREE, attrib_attrs)
+	assert(len(res) == 1)
+    msg = res[0]
+    for a in msg:
+		# special case for oMObjectClass, which is a binary object
+        if a == "oMObjectClass":
+			o[a] = ldb.encode(msg[a])
+			continue
+		o[a] = msg[a]
+
+#
+#  find the auto-created properties of an objectclass. Only works for classes
+#  that can be created using just a DN and the objectclass
+#
+def find_objectclass_auto(ldb, o):
+    if not o.has_key("exampleDN"):
+		return
+	testdn = create_testdn(o.exampleDN)
+
+	print "testdn is '%s'\n" % testdn
+
+	ldif = "dn: " + testdn
+	ldif += "\nobjectClass: " + o.name
+    try:
+        ldb.add(ldif)
+    except LdbError, e:
+        print "error adding %s: %s\n" % (o.name, e)
+		print "%s\n" % ldif
+        return
+
+	res = ldb.search("", testdn, ldb.SCOPE_BASE)
+	ldb.delete(testdn)
+
+    for a in res.msgs[0]:
+		attributes[a].autocreate = True
+
+
+#
+#  look at auxiliary information from a class to intuit the existance of more
+#  classes needed for a minimal schema
+#
+def expand_objectclass(ldb, o):
+	attrs = ["auxiliaryClass", "systemAuxiliaryClass",
+			      "possSuperiors", "systemPossSuperiors",
+			      "subClassOf"]
+	res = ldb.search(
+		"(&(objectClass=classSchema)(ldapDisplayName=%s))" % o.name,
+		rootDse.schemaNamingContext, ldb.SCOPE_SUBTREE, attrs)
+	print "Expanding class %s\n" % o.name
+	assert(len(res) == 1)
+	msg = res[0]
+    for a in attrs:
+        if not msg.has_key(aname):
+			continue
+		list = msg[aname]
+        if isinstance(list, str):
+			list = [msg[aname]]
+        for name in list:
+            if not objectclasses.has_key(name):
+				print "Found new objectclass '%s'\n" % name
+				objectclasses[name] = obj_objectClass(ldb, name)
+
+
+#
+#  add the must and may attributes from an objectclass to the full list
+#  of attributes
+#
+def add_objectclass_attributes(ldb, class):
+	attrs = ["mustContain", "systemMustContain", 
+			      "mayContain", "systemMayContain"]
+    for aname in attrs:
+        if not class.has_key(aname):
+			continue
+		alist = class[aname]
+        if isinstance(alist, str):
+			alist = [alist]
+        for a in alist:
+            if not attributes.has_key(a):
+				attributes[a] = obj_attribute(ldb, a)
+
+
+#
+#  process an individual record, working out what attributes it has
+#
+def walk_dn(ldb, dn):
+	# get a list of all possible attributes for this object 
+	attrs = ["allowedAttributes"]
+    try:
+        res = ldb.search("objectClass=*", dn, ldb.SCOPE_BASE, attrs)
+    except LdbError, e:
+		print "Unable to fetch allowedAttributes for '%s' - %r\n" % (dn, e)
+		return
+	allattrs = res[0]["allowedAttributes"]
+    try:
+        res = ldb.search("objectClass=*", dn, ldb.SCOPE_BASE, allattrs)
+    except LdbError, e:
+        print "Unable to fetch all attributes for '%s' - %s\n" % (dn, e)
+		return
+	msg = res[0]
+    for a in msg:
+        if not attributes.has_key(a):
+			attributes[a] = obj_attribute(ldb, a)
+
+#
+#  walk a naming context, looking for all records
+#
+def walk_naming_context(ldb, namingContext):
+    try:
+        res = ldb.search("objectClass=*", namingContext, ldb.SCOPE_DEFAULT, 
+                         ["objectClass"])
+    except LdbError, e:
+		print "Unable to fetch objectClasses for '%s' - %s\n" % (namingContext, e)
+		return
+    for msg in res:
+		msg = res.msgs[r]["objectClass"]
+        for objectClass in msg:
+            if not objectclasses.has_key(objectClass):
+				objectclasses[objectClass] = obj_objectClass(ldb, objectClass)
+				objectclasses[objectClass].exampleDN = res.msgs[r]["dn"]
+		walk_dn(ldb, res.msgs[r].dn)
+
+#
+#  trim the may attributes for an objectClass
+#
+def trim_objectclass_attributes(ldb, class):
+	# trim possibleInferiors,
+	# include only the classes we extracted
+    if class.has_key("possibleInferiors"):
+        possinf = class["possibleInferiors"]
+		newpossinf = []
+        if isinstance(possinf, str):
+			possinf = [possinf]
+        for x in possinf:
+            if objectclasses.has_key(x):
+				newpossinf[n] = x
+				n++
+		class["possibleInferiors"] = newpossinf
+
+	# trim systemMayContain,
+	# remove duplicates
+    if class.has_key("systemMayContain"):
+        sysmay = class["systemMayContain"]
+		newsysmay = []
+        if isinstance(sysmay, str):
+			sysmay = [sysmay]
+        for x in sysmay:
+			dup = False
+			if newsysmay[0] == undefined) {
+				newsysmay[0] = x
+            else:
+				for (n = 0; n < newsysmay.length; n++) {
+					if (newsysmay[n] == x) {
+						dup = True
+                if not dup:
+					newsysmay[n] = x
+		class["systemMayContain"] = newsysmay
+
+	# trim mayContain,
+	# remove duplicates
+    if not class.has_key("mayContain"):
+        may = class["mayContain"]
+		newmay = []
+        if isinstance(may, str):
+			may = [may]
+        for x in may:
+			dup = False
+			if (newmay[0] == undefined) {
+				newmay[0] = x
+			} else {
+				for (n = 0; n < newmay.length; n++) {
+					if (newmay[n] == x) {
+						dup = True
+                if not dup:
+					newmay[n] = x
+		class["mayContain"] = newmay
+
+#
+#  load the basic attributes of an objectClass
+#
+def build_objectclass(ldb, name):
+	attrs = ["name"]
+    try:
+        res = ldb.search(
+            expression="(&(objectClass=classSchema)(ldapDisplayName=%s))" % name,
+            rootDse.schemaNamingContext, ldb.SCOPE_SUBTREE, attrs)
+    except LdbError, e:
+		print "unknown class '%s'\n" % name
+		return None
+    if len(res) == 0:
+		print "unknown class '%s'\n" % name
+		return None
+	return obj_objectClass(ldb, name)
+
+#
+#  append 2 lists
+#
+def list_append(a1, a2):
+	if (a1 == undefined) {
+		return a2
+	if (a2 == undefined)
+		return a1
+    for (i=0;i<a2.length;i++):
+		a1[a1.length] = a2[i]
+	return a1
+
+#
+#  form a coalesced attribute list
+#
+def attribute_list(class, attr1, attr2):
+	a1 = class[attr1]
+	a2 = class[attr2]
+    if isinstance(a1, str):
+		a1 = [a1]
+    if isinstance(a2, str):
+		a2 = [a2]
+	return list_append(a1, a2)
+
+#
+#  write out a list in aggregate form
+#
+def aggregate_list(name, list):
+    if list is None:
+		return
+	print "%s ( %s )" % (name, "$ ".join(list))
+
+#
+#  write the aggregate record for an objectclass
+#
+def write_aggregate_objectclass(class):
+	print "objectClasses: ( %s NAME '%s' " % (class.governsID, class.name)
+    if not class.has_key('subClassOf'):
+		print "SUP %s " % class['subClassOf']
+    if class.objectClassCategory == 1:
+		print "STRUCTURAL "
+    elif class.objectClassCategory == 2:
+		print "ABSTRACT "
+    elif class.objectClassCategory == 3:
+		print "AUXILIARY "
+
+	list = attribute_list(class, "systemMustContain", "mustContain")
+	aggregate_list("MUST", list)
+
+	list = attribute_list(class, "systemMayContain", "mayContain")
+	aggregate_list("MAY", list)
+
+	print ")\n"
+
+
+#
+#  write the aggregate record for an ditcontentrule
+#
+def write_aggregate_ditcontentrule(class):
+	list = attribute_list(class, "auxiliaryClass", "systemAuxiliaryClass")
+    if list is None:
+		return
+
+	print "dITContentRules: ( %s NAME '%s' " % (class.governsID, class.name)
+
+	aggregate_list("AUX", list)
+
+	may_list = None
+	must_list = None
+
+    for c in list:
+		list2 = attribute_list(objectclasses[c], 
+				       "mayContain", "systemMayContain")
+		may_list = list_append(may_list, list2)
+		list2 = attribute_list(objectclasses[c], 
+				       "mustContain", "systemMustContain")
+		must_list = list_append(must_list, list2)
+
+	aggregate_list("MUST", must_list)
+	aggregate_list("MAY", may_list)
+
+	print ")\n"
+
+#
+#  write the aggregate record for an attribute
+#
+def write_aggregate_attribute(attrib):
+	print "attributeTypes: ( %s NAME '%s' SYNTAX '%s' " % (
+	       attrib.attributeID, attrib.name, 
+	       map_attribute_syntax(attrib.attributeSyntax))
+    if attrib['isSingleValued'] == "TRUE":
+		print "SINGLE-VALUE "
+    if attrib['systemOnly'] == "TRUE":
+		print "NO-USER-MODIFICATION "
+
+	print ")\n"
+
+
+#
+#  write the aggregate record
+#
+def write_aggregate():
+	print "dn: CN=Aggregate,${SCHEMADN}\n"
+	print """objectClass: top
+objectClass: subSchema
+objectCategory: CN=SubSchema,${SCHEMADN}
+"""
+    if not opts.dump_subschema_auto:
+		return
+
+    for objectclass in objectclasses:
+		write_aggregate_objectclass(objectclass)
+    for attr in attributes:
+		write_aggregate_attribute(attr)
+    for objectclass in objectclasses:
+		write_aggregate_ditcontentrule(objectclass)
+
+#
+#  load a list from a file
+#
+def load_list(file):
+	var sys = sys_init()
+	var s = sys.file_load(file)
+	var a = split("\n", s)
+	return a
+
+# get the rootDSE
+res = ldb.search("", "", ldb.SCOPE_BASE)
+rootDse = res[0]
+
+# load the list of classes we are interested in
+classes = load_list(classfile)
+for (i=0;i<classes.length;i++) {
+	var classname = classes[i]
+	var class = build_objectclass(ldb, classname)
+	if (class != undefined) {
+		objectclasses[classname] = class
+
+
+#
+#  expand the objectclass list as needed
+#
+num_classes = 0
+expanded = 0
+# calculate the actual number of classes
+num_classes = len(objectclasses)
+
+# so EJS do not have while nor the break statement
+# cannot find any other way than doing more loops
+# than necessary to recursively expand all classes
+#
+for inf in range(500):
+    if expanded < num_classes:
+		for (i in objectclasses) {
+			var n = objectclasses[i]
+			if (objectclasses_expanded[i] != "DONE") {
+				expand_objectclass(ldb, objectclasses[i])
+				objectclasses_expanded[i] = "DONE"
+				expanded++
+		# recalculate the actual number of classes
+		num_classes = len(objectclasses)
+
+#
+#  find objectclass properties
+#
+for objectclass in objectclasses:
+	find_objectclass_properties(ldb, objectclass)
+
+
+#
+#  form the full list of attributes
+#
+for objectclass in objectclasses:
+	add_objectclass_attributes(ldb, objectclass)
+
+# and attribute properties
+for attr in attributes:
+	find_attribute_properties(ldb, attr)
+
+#
+# trim the 'may' attribute lists to those really needed
+#
+for objectclass in objectclasses) {
+	trim_objectclass_attributes(ldb, objectclass)
+
+#
+#  dump an ldif form of the attributes and objectclasses
+#
+if opts.dump_attributes:
+	write_ldif(attributes, attrib_attrs)
+if opts.dump_classes:
+	write_ldif(objectclasses, class_attrs)
+if opts.dump_subschema:
+	write_aggregate()
+
+if not opts.verbose:
+	sys.exit(0)
+
+#
+#  dump list of objectclasses
+#
+print "objectClasses:\n"
+for objectclass in objectclasses:
+	print "\t%s\n" % objectclass
+
+print "attributes:\n"
+for attr in attributes:
+	print "\t%s\n" % ttr
+
+print "autocreated attributes:\n"
+for (i in attributes) {
+	if (attributes[i].autocreate == true) {
+		print "\t%s\n" % i
-- 
cgit 


From cac225ba7daf8d88d858292902480415f0fa00e2 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sun, 10 Feb 2008 00:56:55 +0100
Subject: More syntax fixes, use more standard python functions. (This used to
 be commit ea07509b4a9335a3b3fe6f6da1124fd1aab33c96)

---
 source4/scripting/bin/minschema.py | 575 ++++++++++++++++---------------------
 1 file changed, 247 insertions(+), 328 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/bin/minschema.py b/source4/scripting/bin/minschema.py
index 0a16cc9886..fb9d7b05aa 100755
--- a/source4/scripting/bin/minschema.py
+++ b/source4/scripting/bin/minschema.py
@@ -3,9 +3,10 @@
 #  work out the minimal schema for a set of objectclasses 
 #
 
-import getopt
 import optparse
 import samba
+from samba import getopt as options
+import sys
 
 parser = optparse.OptionParser("minschema <URL> <classfile>")
 sambaopts = options.SambaOptions(parser)
@@ -28,14 +29,14 @@ if opts.dump_attributes:
     opts.dump_all = False
 if opts.dump_subschema:
     opts.dump_all = False
-if dump_subschema_auto:
-	opts.dump_all = False
-	opts.dump_subschema = True
+if opts.dump_subschema_auto:
+    opts.dump_all = False
+    opts.dump_subschema = True
 if opts.dump_all:
-	opts.dump_classes = True
-	opts.dump_attributes = True
-	opts.dump_subschema = True
-	opts.dump_subschema_auto = True
+    opts.dump_classes = True
+    opts.dump_attributes = True
+    opts.dump_subschema = True
+    opts.dump_subschema_auto = True
 
 if len(args) != 2:
     parser.print_usage()
@@ -48,9 +49,8 @@ ldb = Ldb(url, credentials=creds)
 
 objectclasses = []
 attributes = []
-rootDse = {}
 
-objectclasses_expanded = []
+objectclasses_expanded = set()
 
 # the attributes we need for objectclasses
 class_attrs = ["objectClass", 
@@ -130,33 +130,28 @@ attrib_attrs = ["objectClass",
 #
 def dprintf(text):
     if verbose is not None:
-		print text
+        print text
 
 def get_object_cn(ldb, name):
-	attrs = ["cn"]
+    attrs = ["cn"]
 
-	res = ldb.search("(ldapDisplayName=%s)" % name, rootDse.schemaNamingContext, ldb.SCOPE_SUBTREE, attrs)
-	assert len(res) == 1
+    res = ldb.search("(ldapDisplayName=%s)" % name, rootDse["schemaNamingContext"], ldb.SCOPE_SUBTREE, attrs)
+    assert len(res) == 1
 
-    cn = res[0]["cn"]
+    return res[0]["cn"]
 
-#
-#  create an objectclass object
-#
-def obj_objectClass(ldb, name):
-	var o = new Object()
-	o.name = name
-	o.cn = get_object_cn(ldb, name)
-	return o
+class Objectclass:
+    def __init__(self, ldb, name):
+        """create an objectclass object"""
+        self.name = name
+        self.cn = get_object_cn(ldb, name)
 
-#
-#  create an attribute object
-#
-def obj_attribute(ldb, name):
-	var o = new Object()
-	o.name = name
-	o.cn = get_object_cn(ldb, name)
-	return o
+
+class Attribute:
+    def __init__(self, ldb, name):
+        """create an attribute object"""
+        self.name = name
+        self.cn = get_object_cn(ldb, name)
 
 
 syntaxmap = dict()
@@ -179,397 +174,330 @@ syntaxmap['2.5.5.15'] = '1.2.840.113556.1.4.907'
 syntaxmap['2.5.5.16'] = '1.2.840.113556.1.4.906'
 syntaxmap['2.5.5.17'] = '1.3.6.1.4.1.1466.115.121.1.40'
 
-#
-#  map some attribute syntaxes from some apparently MS specific
-#  syntaxes to the standard syntaxes
-#
+
 def map_attribute_syntax(s):
+    """map some attribute syntaxes from some apparently MS specific
+    syntaxes to the standard syntaxes"""
     if syntaxmap.has_key(s):
-		return syntaxmap[s]
-	return s
+        return syntaxmap[s]
+    return s
+
 
-#
-#  fix a string DN to use ${SCHEMADN}
-#
 def fix_dn(dn):
-	s = strstr(dn, rootDse.schemaNamingContext)
-	if (s == NULL) {
-		return dn
-	}
-	return substr(dn, 0, strlen(dn) - strlen(s)) + "${SCHEMADN}"
+    """fix a string DN to use ${SCHEMADN}"""
+    return dn.replace(rootDse["schemaNamingContext"], "${SCHEMADN}")
+
 
-#
-#  dump an object as ldif
-#
 def write_ldif_one(o, attrs):
-	print "dn: CN=%s,${SCHEMADN}\n" % o["cn"]
+    """dump an object as ldif"""
+    print "dn: CN=%s,${SCHEMADN}\n" % o["cn"]
     for a in attrs:
         if not o.has_key(a):
-			continue
-		# special case for oMObjectClass, which is a binary object
+            continue
+        # special case for oMObjectClass, which is a binary object
         if a == "oMObjectClass":
-			print "%s:: %s\n" % (a, o[a])
-			continue
-		v = o[a]
+            print "%s:: %s\n" % (a, o[a])
+            continue
+        v = o[a]
         if isinstance(v, str):
-			v = [v]
+            v = [v]
         for j in v:
-			print "%s: %s\n" % (a, fix_dn(j))
-	print "\n"
+            print "%s: %s\n" % (a, fix_dn(j))
+    print "\n"
 
-#
-# dump an array of objects as ldif
-#
 def write_ldif(o, attrs):
+    """dump an array of objects as ldif"""
     for i in o:
-		write_ldif_one(i, attrs)
+        write_ldif_one(i, attrs)
 
 
-#
-#  create a testDN based an an example DN
-#  the idea is to ensure we obey any structural rules
-#
 def create_testdn(exampleDN):
-	a = split(",", exampleDN)
-	a[0] = "CN=TestDN"
-	return ",".join(a)
+    """create a testDN based an an example DN
+    the idea is to ensure we obey any structural rules"""
+    a = exampleDN.split(",")
+    a[0] = "CN=TestDN"
+    return ",".join(a)
+
 
-#
-#  find the properties of an objectclass
-#
 def find_objectclass_properties(ldb, o):
-	res = ldb.search(
-		expression="(ldapDisplayName=%s)" % o.name,
-		rootDse.schemaNamingContext, ldb.SCOPE_SUBTREE, class_attrs)
-	assert(len(res) == 1)
+    """the properties of an objectclass"""
+    res = ldb.search(
+        expression="(ldapDisplayName=%s)" % o.name,
+        basedn=rootDse["schemaNamingContext"], scope=ldb.SCOPE_SUBTREE, attrs=class_attrs)
+    assert(len(res) == 1)
     msg = res[0]
     for a in msg:
-		o[a] = msg[a]
+        o[a] = msg[a]
 
-#
-#  find the properties of an attribute
-#
 def find_attribute_properties(ldb, o):
-	res = ldb.search(
-		expression="(ldapDisplayName=%s)" % o.name,
-		rootDse.schemaNamingContext, ldb.SCOPE_SUBTREE, attrib_attrs)
-	assert(len(res) == 1)
+    """find the properties of an attribute"""
+    res = ldb.search(
+        expression="(ldapDisplayName=%s)" % o.name,
+        basedn=rootDse["schemaNamingContext"], scope=ldb.SCOPE_SUBTREE, 
+        attrs=attrib_attrs)
+    assert(len(res) == 1)
     msg = res[0]
     for a in msg:
-		# special case for oMObjectClass, which is a binary object
+        # special case for oMObjectClass, which is a binary object
         if a == "oMObjectClass":
-			o[a] = ldb.encode(msg[a])
-			continue
-		o[a] = msg[a]
+            o[a] = ldb.encode(msg[a])
+            continue
+        o[a] = msg[a]
+
 
-#
-#  find the auto-created properties of an objectclass. Only works for classes
-#  that can be created using just a DN and the objectclass
-#
 def find_objectclass_auto(ldb, o):
+    """find the auto-created properties of an objectclass. Only works for 
+    classes that can be created using just a DN and the objectclass"""
     if not o.has_key("exampleDN"):
-		return
-	testdn = create_testdn(o.exampleDN)
+        return
+    testdn = create_testdn(o.exampleDN)
 
-	print "testdn is '%s'\n" % testdn
+    print "testdn is '%s'\n" % testdn
 
-	ldif = "dn: " + testdn
-	ldif += "\nobjectClass: " + o.name
+    ldif = "dn: " + testdn
+    ldif += "\nobjectClass: " + o.name
     try:
         ldb.add(ldif)
     except LdbError, e:
         print "error adding %s: %s\n" % (o.name, e)
-		print "%s\n" % ldif
+        print "%s\n" % ldif
         return
 
-	res = ldb.search("", testdn, ldb.SCOPE_BASE)
-	ldb.delete(testdn)
+    res = ldb.search("", testdn, ldb.SCOPE_BASE)
+    ldb.delete(testdn)
 
     for a in res.msgs[0]:
-		attributes[a].autocreate = True
+        attributes[a].autocreate = True
 
 
-#
-#  look at auxiliary information from a class to intuit the existance of more
-#  classes needed for a minimal schema
-#
 def expand_objectclass(ldb, o):
-	attrs = ["auxiliaryClass", "systemAuxiliaryClass",
-			      "possSuperiors", "systemPossSuperiors",
-			      "subClassOf"]
-	res = ldb.search(
-		"(&(objectClass=classSchema)(ldapDisplayName=%s))" % o.name,
-		rootDse.schemaNamingContext, ldb.SCOPE_SUBTREE, attrs)
-	print "Expanding class %s\n" % o.name
-	assert(len(res) == 1)
-	msg = res[0]
+    """look at auxiliary information from a class to intuit the existance of 
+    more classes needed for a minimal schema"""
+    attrs = ["auxiliaryClass", "systemAuxiliaryClass",
+                  "possSuperiors", "systemPossSuperiors",
+                  "subClassOf"]
+    res = ldb.search(
+        expression="(&(objectClass=classSchema)(ldapDisplayName=%s))" % o.name,
+        basedn=rootDse["schemaNamingContext"], scope=ldb.SCOPE_SUBTREE, 
+        attrs=attrs)
+    print "Expanding class %s\n" % o.name
+    assert(len(res) == 1)
+    msg = res[0]
     for a in attrs:
         if not msg.has_key(aname):
-			continue
-		list = msg[aname]
+            continue
+        list = msg[aname]
         if isinstance(list, str):
-			list = [msg[aname]]
+            list = [msg[aname]]
         for name in list:
             if not objectclasses.has_key(name):
-				print "Found new objectclass '%s'\n" % name
-				objectclasses[name] = obj_objectClass(ldb, name)
+                print "Found new objectclass '%s'\n" % name
+                objectclasses[name] = Objectclass(ldb, name)
 
 
-#
-#  add the must and may attributes from an objectclass to the full list
-#  of attributes
-#
-def add_objectclass_attributes(ldb, class):
-	attrs = ["mustContain", "systemMustContain", 
-			      "mayContain", "systemMayContain"]
+def add_objectclass_attributes(ldb, objectclass):
+    """add the must and may attributes from an objectclass to the full list
+    of attributes"""
+    attrs = ["mustContain", "systemMustContain", 
+                  "mayContain", "systemMayContain"]
     for aname in attrs:
-        if not class.has_key(aname):
-			continue
-		alist = class[aname]
+        if not objectclass.has_key(aname):
+            continue
+        alist = objectclass[aname]
         if isinstance(alist, str):
-			alist = [alist]
+            alist = [alist]
         for a in alist:
             if not attributes.has_key(a):
-				attributes[a] = obj_attribute(ldb, a)
+                attributes[a] = Attribute(ldb, a)
 
 
-#
-#  process an individual record, working out what attributes it has
-#
 def walk_dn(ldb, dn):
-	# get a list of all possible attributes for this object 
-	attrs = ["allowedAttributes"]
+    """process an individual record, working out what attributes it has"""
+    # get a list of all possible attributes for this object 
+    attrs = ["allowedAttributes"]
     try:
         res = ldb.search("objectClass=*", dn, ldb.SCOPE_BASE, attrs)
     except LdbError, e:
-		print "Unable to fetch allowedAttributes for '%s' - %r\n" % (dn, e)
-		return
-	allattrs = res[0]["allowedAttributes"]
+        print "Unable to fetch allowedAttributes for '%s' - %r\n" % (dn, e)
+        return
+    allattrs = res[0]["allowedAttributes"]
     try:
         res = ldb.search("objectClass=*", dn, ldb.SCOPE_BASE, allattrs)
     except LdbError, e:
         print "Unable to fetch all attributes for '%s' - %s\n" % (dn, e)
-		return
-	msg = res[0]
+        return
+    msg = res[0]
     for a in msg:
         if not attributes.has_key(a):
-			attributes[a] = obj_attribute(ldb, a)
+            attributes[a] = Attribute(ldb, a)
 
-#
-#  walk a naming context, looking for all records
-#
 def walk_naming_context(ldb, namingContext):
+    """walk a naming context, looking for all records"""
     try:
         res = ldb.search("objectClass=*", namingContext, ldb.SCOPE_DEFAULT, 
                          ["objectClass"])
     except LdbError, e:
-		print "Unable to fetch objectClasses for '%s' - %s\n" % (namingContext, e)
-		return
+        print "Unable to fetch objectClasses for '%s' - %s\n" % (namingContext, e)
+        return
     for msg in res:
-		msg = res.msgs[r]["objectClass"]
+        msg = res.msgs[r]["objectClass"]
         for objectClass in msg:
             if not objectclasses.has_key(objectClass):
-				objectclasses[objectClass] = obj_objectClass(ldb, objectClass)
-				objectclasses[objectClass].exampleDN = res.msgs[r]["dn"]
-		walk_dn(ldb, res.msgs[r].dn)
-
-#
-#  trim the may attributes for an objectClass
-#
-def trim_objectclass_attributes(ldb, class):
-	# trim possibleInferiors,
-	# include only the classes we extracted
-    if class.has_key("possibleInferiors"):
-        possinf = class["possibleInferiors"]
-		newpossinf = []
+                objectclasses[objectClass] = Objectclass(ldb, objectClass)
+                objectclasses[objectClass].exampleDN = res.msgs[r]["dn"]
+        walk_dn(ldb, res.msgs[r].dn)
+
+def trim_objectclass_attributes(ldb, objectclass):
+    """trim the may attributes for an objectClass"""
+    # trim possibleInferiors,
+    # include only the classes we extracted
+    if objectclass.has_key("possibleInferiors"):
+        possinf = objectclass["possibleInferiors"]
+        newpossinf = []
         if isinstance(possinf, str):
-			possinf = [possinf]
+            possinf = [possinf]
         for x in possinf:
             if objectclasses.has_key(x):
-				newpossinf[n] = x
-				n++
-		class["possibleInferiors"] = newpossinf
-
-	# trim systemMayContain,
-	# remove duplicates
-    if class.has_key("systemMayContain"):
-        sysmay = class["systemMayContain"]
-		newsysmay = []
+                newpossinf[n] = x
+                n+=1
+        objectclass["possibleInferiors"] = newpossinf
+
+    # trim systemMayContain,
+    # remove duplicates
+    if objectclass.has_key("systemMayContain"):
+        sysmay = objectclass["systemMayContain"]
+        newsysmay = []
         if isinstance(sysmay, str):
-			sysmay = [sysmay]
+            sysmay = [sysmay]
         for x in sysmay:
-			dup = False
-			if newsysmay[0] == undefined) {
-				newsysmay[0] = x
-            else:
-				for (n = 0; n < newsysmay.length; n++) {
-					if (newsysmay[n] == x) {
-						dup = True
-                if not dup:
-					newsysmay[n] = x
-		class["systemMayContain"] = newsysmay
-
-	# trim mayContain,
-	# remove duplicates
-    if not class.has_key("mayContain"):
-        may = class["mayContain"]
-		newmay = []
+            if not x in newsysmay:
+                newsysmay.append(x)
+        objectclass["systemMayContain"] = newsysmay
+
+    # trim mayContain,
+    # remove duplicates
+    if not objectclass.has_key("mayContain"):
+        may = objectclass["mayContain"]
+        newmay = []
         if isinstance(may, str):
-			may = [may]
+            may = [may]
         for x in may:
-			dup = False
-			if (newmay[0] == undefined) {
-				newmay[0] = x
-			} else {
-				for (n = 0; n < newmay.length; n++) {
-					if (newmay[n] == x) {
-						dup = True
-                if not dup:
-					newmay[n] = x
-		class["mayContain"] = newmay
+            if not x in newmay:
+                newmay.append(x)
+        objectclass["mayContain"] = newmay
 
-#
-#  load the basic attributes of an objectClass
-#
 def build_objectclass(ldb, name):
-	attrs = ["name"]
+    """load the basic attributes of an objectClass"""
+    attrs = ["name"]
     try:
         res = ldb.search(
             expression="(&(objectClass=classSchema)(ldapDisplayName=%s))" % name,
-            rootDse.schemaNamingContext, ldb.SCOPE_SUBTREE, attrs)
+            basedn=rootDse["schemaNamingContext"], scope=ldb.SCOPE_SUBTREE, 
+            attrs=attrs)
     except LdbError, e:
-		print "unknown class '%s'\n" % name
-		return None
+        print "unknown class '%s'\n" % name
+        return None
     if len(res) == 0:
-		print "unknown class '%s'\n" % name
-		return None
-	return obj_objectClass(ldb, name)
-
-#
-#  append 2 lists
-#
-def list_append(a1, a2):
-	if (a1 == undefined) {
-		return a2
-	if (a2 == undefined)
-		return a1
-    for (i=0;i<a2.length;i++):
-		a1[a1.length] = a2[i]
-	return a1
-
-#
-#  form a coalesced attribute list
-#
-def attribute_list(class, attr1, attr2):
-	a1 = class[attr1]
-	a2 = class[attr2]
+        print "unknown class '%s'\n" % name
+        return None
+    return Objectclass(ldb, name)
+
+def attribute_list(objectclass, attr1, attr2):
+    """form a coalesced attribute list"""
+    a1 = objectclass[attr1]
+    a2 = objectclass[attr2]
     if isinstance(a1, str):
-		a1 = [a1]
+        a1 = [a1]
     if isinstance(a2, str):
-		a2 = [a2]
-	return list_append(a1, a2)
+        a2 = [a2]
+    return a1 + a2
 
-#
-#  write out a list in aggregate form
-#
 def aggregate_list(name, list):
+    """write out a list in aggregate form"""
     if list is None:
-		return
-	print "%s ( %s )" % (name, "$ ".join(list))
+        return
+    print "%s ( %s )" % (name, "$ ".join(list))
 
-#
-#  write the aggregate record for an objectclass
-#
-def write_aggregate_objectclass(class):
-	print "objectClasses: ( %s NAME '%s' " % (class.governsID, class.name)
-    if not class.has_key('subClassOf'):
-		print "SUP %s " % class['subClassOf']
-    if class.objectClassCategory == 1:
-		print "STRUCTURAL "
-    elif class.objectClassCategory == 2:
-		print "ABSTRACT "
-    elif class.objectClassCategory == 3:
-		print "AUXILIARY "
+def write_aggregate_objectclass(objectclass):
+    """write the aggregate record for an objectclass"""
+    print "objectClasses: ( %s NAME '%s' " % (objectclass.governsID, objectclass.name)
+    if not objectclass.has_key('subClassOf'):
+        print "SUP %s " % objectclass['subClassOf']
+    if objectclass.objectClassCategory == 1:
+        print "STRUCTURAL "
+    elif objectclass.objectClassCategory == 2:
+        print "ABSTRACT "
+    elif objectclass.objectClassCategory == 3:
+        print "AUXILIARY "
 
-	list = attribute_list(class, "systemMustContain", "mustContain")
-	aggregate_list("MUST", list)
+    list = attribute_list(objectclass, "systemMustContain", "mustContain")
+    aggregate_list("MUST", list)
 
-	list = attribute_list(class, "systemMayContain", "mayContain")
-	aggregate_list("MAY", list)
+    list = attribute_list(objectclass, "systemMayContain", "mayContain")
+    aggregate_list("MAY", list)
 
-	print ")\n"
+    print ")\n"
 
 
-#
-#  write the aggregate record for an ditcontentrule
-#
-def write_aggregate_ditcontentrule(class):
-	list = attribute_list(class, "auxiliaryClass", "systemAuxiliaryClass")
+def write_aggregate_ditcontentrule(objectclass):
+    """write the aggregate record for an ditcontentrule"""
+    list = attribute_list(objectclass, "auxiliaryClass", "systemAuxiliaryClass")
     if list is None:
-		return
+        return
 
-	print "dITContentRules: ( %s NAME '%s' " % (class.governsID, class.name)
+    print "dITContentRules: ( %s NAME '%s' " % (objectclass.governsID, objectclass.name)
 
-	aggregate_list("AUX", list)
+    aggregate_list("AUX", list)
 
-	may_list = None
-	must_list = None
+    may_list = None
+    must_list = None
 
     for c in list:
-		list2 = attribute_list(objectclasses[c], 
-				       "mayContain", "systemMayContain")
-		may_list = list_append(may_list, list2)
-		list2 = attribute_list(objectclasses[c], 
-				       "mustContain", "systemMustContain")
-		must_list = list_append(must_list, list2)
+        list2 = attribute_list(objectclasses[c], 
+                       "mayContain", "systemMayContain")
+        may_list = may_list + list2
+        list2 = attribute_list(objectclasses[c], 
+                       "mustContain", "systemMustContain")
+        must_list = must_list + list2
 
-	aggregate_list("MUST", must_list)
-	aggregate_list("MAY", may_list)
+    aggregate_list("MUST", must_list)
+    aggregate_list("MAY", may_list)
 
-	print ")\n"
+    print ")\n"
 
-#
-#  write the aggregate record for an attribute
-#
 def write_aggregate_attribute(attrib):
-	print "attributeTypes: ( %s NAME '%s' SYNTAX '%s' " % (
-	       attrib.attributeID, attrib.name, 
-	       map_attribute_syntax(attrib.attributeSyntax))
+    """write the aggregate record for an attribute"""
+    print "attributeTypes: ( %s NAME '%s' SYNTAX '%s' " % (
+           attrib.attributeID, attrib.name, 
+           map_attribute_syntax(attrib.attributeSyntax))
     if attrib['isSingleValued'] == "TRUE":
-		print "SINGLE-VALUE "
+        print "SINGLE-VALUE "
     if attrib['systemOnly'] == "TRUE":
-		print "NO-USER-MODIFICATION "
+        print "NO-USER-MODIFICATION "
 
-	print ")\n"
+    print ")\n"
 
 
-#
-#  write the aggregate record
-#
 def write_aggregate():
-	print "dn: CN=Aggregate,${SCHEMADN}\n"
-	print """objectClass: top
+    """write the aggregate record"""
+    print "dn: CN=Aggregate,${SCHEMADN}\n"
+    print """objectClass: top
 objectClass: subSchema
 objectCategory: CN=SubSchema,${SCHEMADN}
 """
     if not opts.dump_subschema_auto:
-		return
+        return
 
     for objectclass in objectclasses:
-		write_aggregate_objectclass(objectclass)
+        write_aggregate_objectclass(objectclass)
     for attr in attributes:
-		write_aggregate_attribute(attr)
+        write_aggregate_attribute(attr)
     for objectclass in objectclasses:
-		write_aggregate_ditcontentrule(objectclass)
+        write_aggregate_ditcontentrule(objectclass)
 
-#
-#  load a list from a file
-#
 def load_list(file):
-	var sys = sys_init()
-	var s = sys.file_load(file)
-	var a = split("\n", s)
-	return a
+    """load a list from a file"""
+    return open(file, 'r').splitlines()
 
 # get the rootDSE
 res = ldb.search("", "", ldb.SCOPE_BASE)
@@ -577,84 +505,75 @@ rootDse = res[0]
 
 # load the list of classes we are interested in
 classes = load_list(classfile)
-for (i=0;i<classes.length;i++) {
-	var classname = classes[i]
-	var class = build_objectclass(ldb, classname)
-	if (class != undefined) {
-		objectclasses[classname] = class
+for classname in classes:
+    objectclass = build_objectclass(ldb, classname)
+    if objectclass is not None:
+        objectclasses[classname] = objectclass
 
 
 #
 #  expand the objectclass list as needed
 #
-num_classes = 0
 expanded = 0
-# calculate the actual number of classes
-num_classes = len(objectclasses)
 
 # so EJS do not have while nor the break statement
 # cannot find any other way than doing more loops
 # than necessary to recursively expand all classes
 #
 for inf in range(500):
-    if expanded < num_classes:
-		for (i in objectclasses) {
-			var n = objectclasses[i]
-			if (objectclasses_expanded[i] != "DONE") {
-				expand_objectclass(ldb, objectclasses[i])
-				objectclasses_expanded[i] = "DONE"
-				expanded++
-		# recalculate the actual number of classes
-		num_classes = len(objectclasses)
+    for n in objectclasses:
+        if not n in objectclasses_expanded:
+            expand_objectclass(ldb, objectclasses[i])
+            objectclasses_expanded.add(n)
 
 #
 #  find objectclass properties
 #
 for objectclass in objectclasses:
-	find_objectclass_properties(ldb, objectclass)
+    find_objectclass_properties(ldb, objectclass)
 
 
 #
 #  form the full list of attributes
 #
 for objectclass in objectclasses:
-	add_objectclass_attributes(ldb, objectclass)
+    add_objectclass_attributes(ldb, objectclass)
 
 # and attribute properties
 for attr in attributes:
-	find_attribute_properties(ldb, attr)
+    find_attribute_properties(ldb, attr)
 
 #
 # trim the 'may' attribute lists to those really needed
 #
-for objectclass in objectclasses) {
-	trim_objectclass_attributes(ldb, objectclass)
+for objectclass in objectclasses:
+    trim_objectclass_attributes(ldb, objectclass)
 
 #
 #  dump an ldif form of the attributes and objectclasses
 #
 if opts.dump_attributes:
-	write_ldif(attributes, attrib_attrs)
+    write_ldif(attributes, attrib_attrs)
 if opts.dump_classes:
-	write_ldif(objectclasses, class_attrs)
+    write_ldif(objectclasses, class_attrs)
 if opts.dump_subschema:
-	write_aggregate()
+    write_aggregate()
 
 if not opts.verbose:
-	sys.exit(0)
+    sys.exit(0)
 
 #
 #  dump list of objectclasses
 #
 print "objectClasses:\n"
 for objectclass in objectclasses:
-	print "\t%s\n" % objectclass
+    print "\t%s\n" % objectclass
 
 print "attributes:\n"
 for attr in attributes:
-	print "\t%s\n" % ttr
+    print "\t%s\n" % attr
 
 print "autocreated attributes:\n"
-for (i in attributes) {
-	if (attributes[i].autocreate == true) {
-		print "\t%s\n" % i
+for attr in attributes:
+    if attr.autocreate:
+        print "\t%s\n" % i
-- 
cgit 


From 176f32cc9755bfec73371a25955fe00ce8817041 Mon Sep 17 00:00:00 2001
From: Kai Blin <kai@samba.org>
Date: Mon, 11 Feb 2008 10:37:26 +0100
Subject: provision: Fix new user creation.

Spotted by nobody88 in IRC.
(This used to be commit 38d4e2407afb942de21379dc886f9e4c5532a2b9)
---
 source4/scripting/libjs/provision.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index e71498010c..dc9eae8e72 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -1124,7 +1124,7 @@ unixName: %s
 sambaPassword: %s
 objectClass: user
 ",
-			   user_dn, username, dom_users,
+			   user_dn, username,
 			   unixname, password);
 	/*
 	  add the user to the users group as well
@@ -1134,7 +1134,7 @@ dn: %s
 changetype: modify
 add: member
 member: %s
-", 
+",
 			       dom_users, user_dn);
 
 
-- 
cgit 


From af007e5837ac472f0527505c8013b837932136bc Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 11 Feb 2008 13:20:24 +0100
Subject: Use SMB_CONF_PATH environment variable inside tests rather than
 hardcoded paths. (This used to be commit
 eb04de69c0e319e18b148191946808f81e1cc8c4)

---
 source4/scripting/python/samba/tests/__init__.py        | 6 ++++++
 source4/scripting/python/samba/tests/dcerpc/registry.py | 4 ++--
 source4/scripting/python/samba/tests/dcerpc/rpcecho.py  | 5 ++---
 source4/scripting/python/samba/tests/dcerpc/sam.py      | 3 ++-
 source4/scripting/python/samba/tests/provision.py       | 3 +--
 5 files changed, 13 insertions(+), 8 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/tests/__init__.py b/source4/scripting/python/samba/tests/__init__.py
index 9402002674..c8673d3fae 100644
--- a/source4/scripting/python/samba/tests/__init__.py
+++ b/source4/scripting/python/samba/tests/__init__.py
@@ -84,3 +84,9 @@ class LdbExtensionTests(TestCaseInTempDir):
             del l
             os.unlink(path)
 
+
+def get_loadparm():
+    import param
+    lp = param.LoadParm()
+    lp.load(os.getenv("SMB_CONF_PATH"))
+    return lp
diff --git a/source4/scripting/python/samba/tests/dcerpc/registry.py b/source4/scripting/python/samba/tests/dcerpc/registry.py
index f3f0b0fb1a..147acc5098 100644
--- a/source4/scripting/python/samba/tests/dcerpc/registry.py
+++ b/source4/scripting/python/samba/tests/dcerpc/registry.py
@@ -20,11 +20,11 @@
 import winreg
 from param import LoadParm
 import unittest
+from samba.tests import get_loadparm
 
 class WinregTests(unittest.TestCase):
     def setUp(self):
-        lp_ctx = LoadParm()
-        lp_ctx.load("st/client/client.conf")
+        lp_ctx = get_loadparm()
         self.conn = winreg.winreg("ncalrpc:", lp_ctx)
 
     def get_hklm(self):
diff --git a/source4/scripting/python/samba/tests/dcerpc/rpcecho.py b/source4/scripting/python/samba/tests/dcerpc/rpcecho.py
index 52c2bb8c72..8c1a8bec71 100644
--- a/source4/scripting/python/samba/tests/dcerpc/rpcecho.py
+++ b/source4/scripting/python/samba/tests/dcerpc/rpcecho.py
@@ -18,13 +18,12 @@
 #
 
 import echo
-from param import LoadParm
 import unittest
+from samba.tests import get_loadparm
 
 class RpcEchoTests(unittest.TestCase):
     def setUp(self):
-        lp_ctx = LoadParm()
-        lp_ctx.load("st/client/client.conf")
+        lp_ctx = get_loadparm()
         self.conn = echo.rpcecho("ncalrpc:", lp_ctx)
 
     def test_addone(self):
diff --git a/source4/scripting/python/samba/tests/dcerpc/sam.py b/source4/scripting/python/samba/tests/dcerpc/sam.py
index 50caaf2348..96348f2f69 100644
--- a/source4/scripting/python/samba/tests/dcerpc/sam.py
+++ b/source4/scripting/python/samba/tests/dcerpc/sam.py
@@ -19,10 +19,11 @@
 
 import samr
 import unittest
+from samba.tests import get_loadparm
 
 class SamrTests(unittest.TestCase):
     def setUp(self):
-        self.conn = samr.samr("ncalrpc:", "st/client/client.conf")
+        self.conn = samr.samr("ncalrpc:", get_loadparm())
 
     def test_connect5(self):
         (level, info, handle) = self.conn.Connect5(None, 0, 1, samr.ConnectInfo1())
diff --git a/source4/scripting/python/samba/tests/provision.py b/source4/scripting/python/samba/tests/provision.py
index 54a7782b3d..514582cbe4 100644
--- a/source4/scripting/python/samba/tests/provision.py
+++ b/source4/scripting/python/samba/tests/provision.py
@@ -24,8 +24,7 @@ from ldb import Dn
 import param
 import unittest
 
-lp = param.LoadParm()
-lp.load("st/dc/etc/smb.conf")
+lp = samba.tests.get_loadparm()
 
 setup_dir = "setup"
 def setup_path(file):
-- 
cgit 


From 08c8d3b992d419db7b39a91fb42208beb5d273ba Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 11 Feb 2008 13:51:09 +0100
Subject: Remove Samba 3 backwards compatibility code in C.

This code is no longer used, and equivalent code already exists in Python
(scripting/python/samba/samba3.py)
(This used to be commit c16212e8bf5343496ea4b3afc30a8b4d3a0afe2d)
---
 source4/scripting/ejs/config.mk         |   7 -
 source4/scripting/ejs/smbcalls_samba3.c | 501 --------------------------------
 2 files changed, 508 deletions(-)
 delete mode 100644 source4/scripting/ejs/smbcalls_samba3.c

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/config.mk b/source4/scripting/ejs/config.mk
index 656ecdae16..5de17263b7 100644
--- a/source4/scripting/ejs/config.mk
+++ b/source4/scripting/ejs/config.mk
@@ -28,13 +28,6 @@ SUBSYSTEM = smbcalls
 OUTPUT_TYPE = INTEGRATED
 INIT_FUNCTION = smb_setup_ejs_nbt
 
-[MODULE::smbcalls_samba3]
-OBJ_FILES = smbcalls_samba3.o
-SUBSYSTEM = smbcalls
-OUTPUT_TYPE = INTEGRATED
-INIT_FUNCTION = smb_setup_ejs_samba3
-PRIVATE_DEPENDENCIES = LIBSAMBA3 
-
 [MODULE::smbcalls_rand]
 OBJ_FILES = smbcalls_rand.o
 SUBSYSTEM = smbcalls
diff --git a/source4/scripting/ejs/smbcalls_samba3.c b/source4/scripting/ejs/smbcalls_samba3.c
deleted file mode 100644
index 36ec2a54e4..0000000000
--- a/source4/scripting/ejs/smbcalls_samba3.c
+++ /dev/null
@@ -1,501 +0,0 @@
-/* 
-   Unix SMB/CIFS implementation.
-
-   provide hooks into smbd C calls from ejs scripts
-
-   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/>.
-*/
-
-#include "includes.h"
-#include "scripting/ejs/smbcalls.h"
-#include "lib/appweb/ejs/ejs.h"
-#include "lib/samba3/samba3.h"
-#include "libcli/security/security.h"
-#include "librpc/gen_ndr/ndr_misc.h"
-#include "system/network.h"
-
-
-static struct MprVar mprRegistry(struct samba3_regdb *reg)
-{
-	struct MprVar mpv = mprObject("registry"), ks, vs, k, v;
-	int i, j;
-
-	ks = mprArray("array");
-
-	for (i = 0; i < reg->key_count; i++) {
-		k = mprObject("regkey");
-
-		mprSetVar(&k, "name", mprString(reg->keys[i].name));
-
-		vs = mprArray("array");
-		
-		for (j = 0; j < reg->keys[i].value_count; j++) {
-			v = mprObject("regval");
-
-			mprSetVar(&v, "name", mprString(reg->keys[i].values[j].name));
-			mprSetVar(&v, "type", mprCreateIntegerVar(reg->keys[i].values[j].type));
-			mprSetVar(&v, "data", mprDataBlob(reg->keys[i].values[j].data));
-
-			mprAddArray(&vs, j, v);
-		}
-
-		mprSetVar(&k, "values", vs);
-
-		mprAddArray(&ks, i, k);
-	}
-
-	if (i == 0) {
-		mprSetVar(&ks, "length", mprCreateIntegerVar(i));
-	}
-
-	mprSetVar(&mpv, "keys", ks);
-
-	return mpv;
-}
-
-static struct MprVar mprPolicy(struct samba3_policy *pol)
-{
-	struct MprVar mpv = mprObject("policy");
-
-	mprSetVar(&mpv, "min_password_length", mprCreateIntegerVar(pol->min_password_length));
-	mprSetVar(&mpv, "password_history", mprCreateIntegerVar(pol->password_history));
-	mprSetVar(&mpv, "user_must_logon_to_change_password", mprCreateIntegerVar(pol->user_must_logon_to_change_password));
-	mprSetVar(&mpv, "maximum_password_age", mprCreateIntegerVar(pol->maximum_password_age));
-	mprSetVar(&mpv, "minimum_password_age", mprCreateIntegerVar(pol->minimum_password_age));
-	mprSetVar(&mpv, "lockout_duration", mprCreateIntegerVar(pol->lockout_duration));
-	mprSetVar(&mpv, "reset_count_minutes", mprCreateIntegerVar(pol->reset_count_minutes));
-	mprSetVar(&mpv, "bad_lockout_minutes", mprCreateIntegerVar(pol->bad_lockout_minutes));
-	mprSetVar(&mpv, "disconnect_time", mprCreateIntegerVar(pol->disconnect_time));
-	mprSetVar(&mpv, "refuse_machine_password_change", mprCreateIntegerVar(pol->refuse_machine_password_change));
-
-	return mpv;
-}
-
-static struct MprVar mprIdmapDb(struct samba3_idmapdb *db)
-{
-	struct MprVar mpv = mprObject("idmapdb"), mps, mp;
-	int i;
-
-	mprSetVar(&mpv, "user_hwm", mprCreateIntegerVar(db->user_hwm));
-	mprSetVar(&mpv, "group_hwm", mprCreateIntegerVar(db->group_hwm));
-
-	mps = mprArray("array");
-
-	for (i = 0; i < db->mapping_count; i++) {
-		char *tmp;
-		mp = mprObject("idmap");
-
-		mprSetVar(&mp, "IDMAP_GROUP", mprCreateIntegerVar(IDMAP_GROUP));
-		mprSetVar(&mp, "IDMAP_USER", mprCreateIntegerVar(IDMAP_USER));
-		mprSetVar(&mp, "type", mprCreateIntegerVar(db->mappings[i].type));
-		mprSetVar(&mp, "unix_id", mprCreateIntegerVar(db->mappings[i].unix_id));
-
-		tmp = dom_sid_string(NULL, db->mappings[i].sid);
-		mprSetVar(&mp, "sid", mprString(tmp));
-		talloc_free(tmp);
-
-		mprAddArray(&mps, i, mp);
-	}
-
-	if (i == 0) {
-		mprSetVar(&mpv, "length", mprCreateIntegerVar(i));
-	}
-
-
-	mprSetVar(&mpv, "mappings", mps);
-
-	return mpv;
-}
-
-static struct MprVar mprGroupMappings(struct samba3_groupdb *db)
-{
-	struct MprVar mpv = mprArray("array"), g;
-	int i;
-
-	for (i = 0; i < db->groupmap_count; i++) {
-		char *tmp;
-		g = mprObject("group");
-
-		mprSetVar(&g, "gid", mprCreateIntegerVar(db->groupmappings[i].gid));
-
-		tmp = dom_sid_string(NULL, db->groupmappings[i].sid);
-		mprSetVar(&g, "sid", mprString(tmp));
-		talloc_free(tmp);
-
-		mprSetVar(&g, "sid_name_use", mprCreateIntegerVar(db->groupmappings[i].sid_name_use));
-		mprSetVar(&g, "nt_name", mprString(db->groupmappings[i].nt_name));
-		mprSetVar(&g, "comment", mprString(db->groupmappings[i].comment));
-
-		mprAddArray(&mpv, i, g);
-	}
-
-	if (i == 0) {
-		mprSetVar(&mpv, "length", mprCreateIntegerVar(i));
-	}
-
-
-	return mpv;
-}
-
-static struct MprVar mprAliases(struct samba3_groupdb *db)
-{
-	struct MprVar mpv = mprObject("array"), a, am;
-	int i, j;
-
-	for (i = 0; i < db->alias_count; i++) {
-		char *tmp;
-		a = mprObject("alias");
-
-		tmp = dom_sid_string(NULL, db->aliases[i].sid);
-		mprSetVar(&a, "sid", mprString(tmp));
-		talloc_free(tmp);
-
-		am = mprArray("array");
-
-		for (j = 0; j < db->aliases[i].member_count; j++) {
-			tmp = dom_sid_string(NULL, db->aliases[i].members[j]);
-			mprAddArray(&am, j, mprString(tmp));
-			talloc_free(tmp);
-		}
-
-		mprSetVar(&a, "members", am);
-	}
-
-	if (i == 0) {
-		mprSetVar(&mpv, "length", mprCreateIntegerVar(i));
-	}
-
-	return mpv;
-}
-
-static struct MprVar mprDomainSecrets(struct samba3_domainsecrets *ds)
-{
-	struct MprVar v, e = mprObject("domainsecrets");
-	char *tmp;
-	DATA_BLOB blob;
-
-	mprSetVar(&e, "name", mprString(ds->name));
-
-	tmp = dom_sid_string(NULL, &ds->sid);
-	mprSetVar(&e, "sid", mprString(tmp));
-	talloc_free(tmp);
-
-	tmp = GUID_string(NULL, &ds->guid);
-	mprSetVar(&e, "guid", mprString(tmp));
-	talloc_free(tmp);
-
-	mprSetVar(&e, "plaintext_pw", mprString(ds->plaintext_pw));
-
-	mprSetVar(&e, "last_change_time", mprCreateIntegerVar(ds->last_change_time));
-	mprSetVar(&e, "sec_channel_type", mprCreateIntegerVar(ds->sec_channel_type));
-
-	v = mprObject("hash_pw");
-
-	blob.data = ds->hash_pw.hash;
-	blob.length = 16;
-	mprSetVar(&v, "hash", mprDataBlob(blob));
-
-	mprSetVar(&v, "mod_time", mprCreateIntegerVar(ds->hash_pw.mod_time));
-
-	mprSetVar(&e, "hash_pw", v);
-
-	return e;
-}
-
-static struct MprVar mprSecrets(struct samba3_secrets *sec)
-{
-	struct MprVar mpv = mprObject("samba3_secrets"), es, e;
-	int i;
-
-	es = mprArray("array");
-
-	for (i = 0; i < sec->ldappw_count; i++) {
-		e = mprObject("ldappw");
-
-		mprSetVar(&e, "dn", mprString(sec->ldappws[i].dn));
-		mprSetVar(&e, "password", mprString(sec->ldappws[i].password));
-
-		mprAddArray(&es, i, e);
-	}
-
-	mprSetVar(&mpv, "ldappws", es);
-
-	es = mprArray("array");
-
-	for (i = 0; i < sec->domain_count; i++) {
-		mprAddArray(&es, i, mprDomainSecrets(&sec->domains[i]));
-	}
-
-	if (i == 0) {
-		mprSetVar(&es, "length", mprCreateIntegerVar(i));
-	}
-
-	mprSetVar(&mpv, "domains", es);
-
-	es = mprArray("trusted_domains");
-
-	for (i = 0; i < sec->trusted_domain_count; i++) {
-		struct MprVar ns;
-		char *tmp;
-		int j;
-		e = mprObject("trusted_domain");
-
-		ns = mprArray("array");
-
-		for (j = 0; j < sec->trusted_domains[i].uni_name_len; j++) {
-			mprAddArray(&ns, j, mprString(sec->trusted_domains[i].uni_name[j]));
-		}
-
-		mprSetVar(&e, "uni_name", ns);
-
-		mprSetVar(&e, "pass", mprString(sec->trusted_domains[i].pass));
-		mprSetVar(&e, "mod_time", mprCreateIntegerVar(sec->trusted_domains[i].mod_time));
-
-		tmp = dom_sid_string(NULL, &sec->trusted_domains[i].domain_sid);
-		mprSetVar(&e, "domains_sid", mprString(tmp));
-		talloc_free(tmp);
-
-		mprAddArray(&es, i, e);
-	}
-
-	if (i == 0) {
-		mprSetVar(&es, "length", mprCreateIntegerVar(i));
-	}
-
-	mprSetVar(&mpv, "trusted_domains", es);
-	
-	es = mprArray("array");
-
-	for (i = 0; i < sec->afs_keyfile_count; i++) {
-		struct MprVar ks;
-		int j;
-		e = mprObject("afs_keyfile");
-
-		mprSetVar(&e, "cell", mprString(sec->afs_keyfiles[i].cell));
-
-		ks = mprArray("array");
-		
-		for (j = 0; j < 8; j++) {
-			struct MprVar k = mprObject("entry");
-			DATA_BLOB blob;
-			
-			mprSetVar(&k, "kvno", mprCreateIntegerVar(sec->afs_keyfiles[i].entry[j].kvno));
-			blob.data = (uint8_t*)sec->afs_keyfiles[i].entry[j].key;
-			blob.length = 8;
-			mprSetVar(&k, "key", mprDataBlob(blob));
-
-			mprAddArray(&ks, j, k);
-		}
-
-		mprSetVar(&e, "entry", ks);
-
-		mprSetVar(&e, "nkeys", mprCreateIntegerVar(sec->afs_keyfiles[i].nkeys));
-
-		mprAddArray(&es, i, e);
-	}
-
-	if (i == 0) {
-		mprSetVar(&es, "length", mprCreateIntegerVar(i));
-	}
-
-	mprSetVar(&mpv, "afs_keyfiles", es);
-
-	mprSetVar(&mpv, "ipc_cred", mprCredentials(sec->ipc_cred));
-
-	return mpv;
-}
-
-static struct MprVar mprShares(struct samba3 *samba3)
-{
-	struct MprVar mpv = mprArray("array"), s;
-	int i;
-
-	for (i = 0; i < samba3->share_count; i++) {
-		s = mprObject("share");
-
-		mprSetVar(&s, "name", mprString(samba3->shares[i].name));
-
-		/* FIXME: secdesc */
-
-		mprAddArray(&mpv, i, s);
-	}
-
-	if (i == 0) {
-		mprSetVar(&mpv, "length", mprCreateIntegerVar(i));
-	}
-
-	return mpv;
-}
-
-static struct MprVar mprSamAccounts(struct samba3 *samba3)
-{
-	struct MprVar mpv = mprArray("array"), m;
-	int i;
-
-	for (i = 0; i < samba3->samaccount_count; i++) {
-		struct samba3_samaccount *a = &samba3->samaccounts[i];
-		DATA_BLOB blob;
-
-		m = mprObject("samba3_samaccount");
-
-		mprSetVar(&m, "logon_time", mprCreateIntegerVar(a->logon_time));
-		mprSetVar(&m, "logoff_time", mprCreateIntegerVar(a->logoff_time));
-		mprSetVar(&m, "kickoff_time", mprCreateIntegerVar(a->kickoff_time));
-		mprSetVar(&m, "bad_password_time", mprCreateIntegerVar(a->bad_password_time));
-		mprSetVar(&m, "pass_last_set_time", mprCreateIntegerVar(a->pass_last_set_time));
-		mprSetVar(&m, "pass_can_change_time", mprCreateIntegerVar(a->pass_can_change_time));
-		mprSetVar(&m, "pass_must_change_time", mprCreateIntegerVar(a->pass_must_change_time));
-		mprSetVar(&m, "user_rid", mprCreateIntegerVar(a->user_rid));
-		mprSetVar(&m, "group_rid", mprCreateIntegerVar(a->group_rid));
-		mprSetVar(&m, "acct_ctrl", mprCreateIntegerVar(a->acct_ctrl));
-		mprSetVar(&m, "logon_divs", mprCreateIntegerVar(a->logon_divs));
-		mprSetVar(&m, "bad_password_count", mprCreateIntegerVar(a->bad_password_count));
-		mprSetVar(&m, "logon_count", mprCreateIntegerVar(a->logon_count));
-		mprSetVar(&m, "username", mprString(a->username));
-		mprSetVar(&m, "domain", mprString(a->domain));
-		mprSetVar(&m, "nt_username", mprString(a->nt_username));
-		mprSetVar(&m, "dir_drive", mprString(a->dir_drive));
-		mprSetVar(&m, "munged_dial", mprString(a->munged_dial));
-		mprSetVar(&m, "fullname", mprString(a->fullname));
-		mprSetVar(&m, "homedir", mprString(a->homedir));
-		mprSetVar(&m, "logon_script", mprString(a->logon_script));
-		mprSetVar(&m, "profile_path", mprString(a->profile_path));
-		mprSetVar(&m, "acct_desc", mprString(a->acct_desc));
-		mprSetVar(&m, "workstations", mprString(a->workstations));
-		blob.length = 16;
-		blob.data = a->lm_pw.hash;
-		mprSetVar(&m, "lm_pw", mprDataBlob(blob));
-		blob.data = a->nt_pw.hash;
-		mprSetVar(&m, "nt_pw", mprDataBlob(blob));
-
-		mprAddArray(&mpv, i, m);
-	}
-
-	if (i == 0) {
-		mprSetVar(&mpv, "length", mprCreateIntegerVar(i));
-	}
-
-	return mpv;
-}
-
-static struct MprVar mprWinsEntries(struct samba3 *samba3)
-{
-	struct MprVar mpv = mprArray("array");
-	int i, j;
-
-	for (i = 0; i < samba3->winsdb_count; i++) {
-		struct MprVar w = mprObject("wins_entry"), ips;
-
-		mprSetVar(&w, "name", mprString(samba3->winsdb_entries[i].name));
-		mprSetVar(&w, "nb_flags", mprCreateIntegerVar(samba3->winsdb_entries[i].nb_flags));
-		mprSetVar(&w, "type", mprCreateIntegerVar(samba3->winsdb_entries[i].type));
-		mprSetVar(&w, "ttl", mprCreateIntegerVar(samba3->winsdb_entries[i].ttl));
-
-		ips = mprObject("array");
-
-		for (j = 0; j < samba3->winsdb_entries[i].ip_count; j++) {
-			const char *addr;
-			addr = inet_ntoa(samba3->winsdb_entries[i].ips[j]);
-			mprAddArray(&ips, j, mprString(addr));
-		}
-
-		mprSetVar(&w, "ips", ips);
-		
-		mprAddArray(&mpv, i, w);
-	}
-
-	if (i == 0) {
-		mprSetVar(&mpv, "length", mprCreateIntegerVar(i));
-	}
-
-	return mpv;
-}
-
-static int ejs_find_domainsecrets(MprVarHandle eid, int argc, struct MprVar **argv)
-{
-	struct samba3 *samba3 = NULL;
-	struct samba3_domainsecrets *sec;
-
-	if (argc < 1) {
-		ejsSetErrorMsg(eid, "find_domainsecrets invalid arguments");
-		return -1;
-	}
-
-	samba3 = (struct samba3 *)mprGetThisPtr(eid, "samba3");
-	mprAssert(samba3);
-	sec = samba3_find_domainsecrets(samba3, mprToString(argv[0]));
-
-	if (sec == NULL) {
-		mpr_Return(eid, mprCreateUndefinedVar());
-	} else {
-		mpr_Return(eid, mprDomainSecrets(sec));
-	}
-
-	return 0;
-}
-
-/*
-  initialise samba3 ejs subsystem
-
-  samba3 = samba3_read(libdir,smbconf)
-*/
-static int ejs_samba3_read(MprVarHandle eid, int argc, struct MprVar **argv)
-{
-	struct MprVar mpv = mprObject("samba3");
-	struct samba3 *samba3;
-	NTSTATUS status;
-
-	if (argc < 2) {
-		ejsSetErrorMsg(eid, "samba3_read invalid arguments");
-		return -1;
-	}
-
-	status = samba3_read(mprToString(argv[0]), mprToString(argv[1]), mprMemCtx(), &samba3);
-
-	if (NT_STATUS_IS_ERR(status)) {
-		ejsSetErrorMsg(eid, "samba3_read: error");
-		return -1;
-	}
-
-	mprAssert(samba3);
-	
-	mprSetPtrChild(&mpv, "samba3", samba3);
-	mprSetVar(&mpv, "winsentries", mprWinsEntries(samba3));
-	mprSetVar(&mpv, "samaccounts", mprSamAccounts(samba3));
-	mprSetVar(&mpv, "shares", mprShares(samba3));
-	mprSetVar(&mpv, "secrets", mprSecrets(&samba3->secrets));
-	mprSetVar(&mpv, "groupmappings", mprGroupMappings(&samba3->group));
-	mprSetVar(&mpv, "aliases", mprAliases(&samba3->group));
-	mprSetVar(&mpv, "idmapdb", mprIdmapDb(&samba3->idmap));
-	mprSetVar(&mpv, "policy", mprPolicy(&samba3->policy));
-	mprSetVar(&mpv, "registry", mprRegistry(&samba3->registry));
-	mprSetVar(&mpv, "configuration", mprParam(samba3->configuration));
-	mprSetCFunction(&mpv, "find_domainsecrets", ejs_find_domainsecrets);
-
-	mpr_Return(eid, mpv);
-	
-	return 0;
-}
-
-
-/*
-  setup C functions that be called from ejs
-*/
-NTSTATUS smb_setup_ejs_samba3(void)
-{
-	ejsDefineCFunction(-1, "samba3_read", ejs_samba3_read, NULL, MPR_VAR_SCRIPT_HANDLE);
-	return NT_STATUS_OK;
-}
-- 
cgit 


From fdd75e135a8cb43f946af99120566f744df2a8e0 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 12 Feb 2008 21:59:23 +0100
Subject: Correctly increment counters in Subunit test runner. (This used to be
 commit c474a2bb83a3e28a0b83f3b8ca1b646742dfca3d)

---
 source4/scripting/bin/subunitrun             | 4 +---
 source4/scripting/python/subunit/__init__.py | 5 ++++-
 2 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/bin/subunitrun b/source4/scripting/bin/subunitrun
index 7142abed85..8dfe2def9c 100755
--- a/source4/scripting/bin/subunitrun
+++ b/source4/scripting/bin/subunitrun
@@ -21,6 +21,4 @@ from subunit import SubunitTestRunner
 import sys
 from unittest import TestProgram
 
-program = TestProgram(module=None, argv=sys.argv, 
-		              testRunner=SubunitTestRunner())
-program.runTests()
+TestProgram(module=None, argv=sys.argv, testRunner=SubunitTestRunner())
diff --git a/source4/scripting/python/subunit/__init__.py b/source4/scripting/python/subunit/__init__.py
index 4d3434a3ea..7fcb815937 100644
--- a/source4/scripting/python/subunit/__init__.py
+++ b/source4/scripting/python/subunit/__init__.py
@@ -218,6 +218,7 @@ class TestProtocolClient(unittest.TestResult):
         for line in self._exc_info_to_string(error, test).splitlines():
             self._stream.write("%s\n" % line)
         self._stream.write("]\n")
+        super(TestProtocolClient, self).addError(test, error)
 
     def addFailure(self, test, error):
         """Report a failure in test test."""
@@ -225,14 +226,17 @@ class TestProtocolClient(unittest.TestResult):
         for line in self._exc_info_to_string(error, test).splitlines():
             self._stream.write("%s\n" % line)
         self._stream.write("]\n")
+        super(TestProtocolClient, self).addFailure(test, error)
 
     def addSuccess(self, test):
         """Report a success in a test."""
         self._stream.write("successful: %s\n" % (test.shortDescription() or str(test)))
+        super(TestProtocolClient, self).addSuccess(test)
 
     def startTest(self, test):
         """Mark a test as starting its test run."""
         self._stream.write("test: %s\n" % (test.shortDescription() or str(test)))
+        super(TestProtocolClient, self).startTest(test)
 
 
 def RemoteError(description=""):
@@ -379,6 +383,5 @@ class SubunitTestRunner:
     def run(self, test):
         "Run the given test case or test suite."
         result = TestProtocolClient(self.stream)
-        test(result)
         return result
 
-- 
cgit 


From 04aef38453ff977bf260546545e968fce3ddd599 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 12 Feb 2008 22:10:25 +0100
Subject: Fix subunit runner exit codes. (This used to be commit
 7911308dbc1233838e44c533302f77b03ea41148)

---
 source4/scripting/bin/subunitrun             | 3 ++-
 source4/scripting/python/subunit/__init__.py | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/bin/subunitrun b/source4/scripting/bin/subunitrun
index 8dfe2def9c..11ac426589 100755
--- a/source4/scripting/bin/subunitrun
+++ b/source4/scripting/bin/subunitrun
@@ -21,4 +21,5 @@ from subunit import SubunitTestRunner
 import sys
 from unittest import TestProgram
 
-TestProgram(module=None, argv=sys.argv, testRunner=SubunitTestRunner())
+runner = SubunitTestRunner()
+TestProgram(module=None, argv=sys.argv, testRunner=runner)
diff --git a/source4/scripting/python/subunit/__init__.py b/source4/scripting/python/subunit/__init__.py
index 7fcb815937..3abfbf522e 100644
--- a/source4/scripting/python/subunit/__init__.py
+++ b/source4/scripting/python/subunit/__init__.py
@@ -209,7 +209,7 @@ class TestProtocolClient(unittest.TestResult):
     """A class that looks like a TestResult and informs a TestProtocolServer."""
 
     def __init__(self, stream):
-        unittest.TestResult.__init__(self)
+        super(TestProtocolClient, self).__init__()
         self._stream = stream
 
     def addError(self, test, error):
@@ -383,5 +383,6 @@ class SubunitTestRunner:
     def run(self, test):
         "Run the given test case or test suite."
         result = TestProtocolClient(self.stream)
+        test(result)
         return result
 
-- 
cgit 


From b4ce9dc3609aafd6df17bd3b57c0da63fdaba4b1 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Wed, 13 Feb 2008 01:21:06 +0100
Subject: Fix invalid symbol. (This used to be commit
 bd0ef811c4e6419ba05076fbc151827cea5d1ca1)

---
 source4/scripting/python/samba/samdb.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/samdb.py b/source4/scripting/python/samba/samdb.py
index c11fabf553..3c6bb23c02 100644
--- a/source4/scripting/python/samba/samdb.py
+++ b/source4/scripting/python/samba/samdb.py
@@ -100,12 +100,14 @@ userAccountControl: %u
         self.transaction_start()
 
         # find the DNs for the domain and the domain users group
-        res = self.search("", SCOPE_BASE, "defaultNamingContext=*", 
-                         ["defaultNamingContext"])
+        res = self.search("", scope=ldb.SCOPE_BASE, 
+                          expression="(defaultNamingContext=*)", 
+                          attrs=["defaultNamingContext"])
         assert(len(res) == 1 and res[0].defaultNamingContext is not None)
         domain_dn = res[0]["defaultNamingContext"][0]
         assert(domain_dn is not None)
-        dom_users = self.searchone(basedn=domain_dn, attribute="dn", expression="name=Domain Users")
+        dom_users = self.searchone(basedn=domain_dn, attribute="dn", 
+                                   expression="name=Domain Users")
         assert(dom_users is not None)
 
         user_dn = "CN=%s,CN=Users,%s" % (username, domain_dn)
-- 
cgit 


From 08e3f99f14f178e87f3543261be59a7f97f60b4f Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Wed, 13 Feb 2008 02:18:45 +0100
Subject: Initial work on a test for samba.tests.samdb (This used to be commit
 8b33860954ca03be1ea45fd8d40963dbbd5b162f)

---
 source4/scripting/python/samba/provision.py   |  3 +-
 source4/scripting/python/samba/tests/samdb.py | 55 +++++++++++++++++++++++++++
 2 files changed, 57 insertions(+), 1 deletion(-)
 create mode 100644 source4/scripting/python/samba/tests/samdb.py

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index 4f52d36167..97021fceb2 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -332,7 +332,6 @@ def setup_samdb_partitions(samdb_path, setup_path, message, lp, session_info,
     schemadn_ldb = "schema.ldb"
     if ldap_backend is not None:
         schema_ldb = ldap_backend
-    
     	schemadn_ldb = ldap_backend
     	
     if ldap_backend_type == "fedora-ds":
@@ -536,6 +535,8 @@ def setup_samdb(path, setup_path, session_info, credentials, lp,
     :note: This will wipe the main SAM database file!
     """
 
+    assert serverrole in ("domain controller", "member server")
+
     # Also wipes the database
     setup_samdb_partitions(path, setup_path, schemadn=schemadn, configdn=configdn, 
                            domaindn=domaindn, message=message, lp=lp,
diff --git a/source4/scripting/python/samba/tests/samdb.py b/source4/scripting/python/samba/tests/samdb.py
new file mode 100644
index 0000000000..40e56bebb5
--- /dev/null
+++ b/source4/scripting/python/samba/tests/samdb.py
@@ -0,0 +1,55 @@
+#!/usr/bin/python
+
+# Unix SMB/CIFS implementation. Tests for SamDB
+# Copyright (C) Jelmer Vernooij <jelmer@samba.org> 2008
+#   
+# 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/>.
+#
+from auth import system_session
+from credentials import Credentials
+import os
+from samba.provision import setup_samdb
+from samba.samdb import SamDB
+from samba.tests import get_loadparm, TestCaseInTempDir
+import security
+from unittest import TestCase
+import uuid
+
+class SamDBTestCase(TestCaseInTempDir):
+    def setUp(self):
+        super(SamDBTestCase, self).setUp()
+        invocationid = uuid.random()
+        domaindn = "DC=COM,DC=EXAMPLE"
+        self.domaindn = domaindn
+        configdn = "CN=Configuration," + domaindn
+        schemadn = "CN=Schema," + configdn
+        domainguid = uuid.random()
+        policyguid = uuid.random()
+        setup_path = lambda x: os.path.join("setup", x)
+        creds = Credentials()
+        domainsid = security.random_sid()
+        hostguid = uuid.random()
+        path = os.path.join(self.tempdir, "samdb.ldb")
+        self.samdb = setup_samdb(path, setup_path, system_session(), creds, 
+                                 get_loadparm(), schemadn, configdn, 
+                                 self.domaindn, "example.com", "EXAMPLE.COM", 
+                                 "FOO", lambda x: None, "foo", domaindn, 
+                                 False, domainsid, "# no aci", domainguid, 
+                                 policyguid, "EXAMPLE", True, "secret", 
+                                 "secret", "secret", hostguid, invocationid, 
+                                 "secret", "domain controller")
+
+    def test_add_foreign(self):
+        self.samdb.add_foreign(self.domaindn, "S-1-5-7", "Somedescription")
+
-- 
cgit 


From 85fe22a85fe7e8db7d2f6e2fdd6f02836f116b8e Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Fri, 15 Feb 2008 15:14:55 +0100
Subject: Use struct for provision parameters since there are so many of them.
 (This used to be commit 4b9d5bc57ca4ee14c142ea720dce5e4ee97f8c16)

---
 source4/scripting/python/samba/provision.py | 40 ++++++++++++++++-------------
 1 file changed, 22 insertions(+), 18 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index 97021fceb2..d30eaf3d7f 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -271,7 +271,7 @@ def setup_name_mappings(ldb, sid, domaindn, root, nobody, nogroup, users,
 def setup_samdb_partitions(samdb_path, setup_path, message, lp, session_info, 
                            credentials, configdn, schemadn, domaindn, 
                            hostname, netbiosname, dnsdomain, realm, 
-                           rootdn, serverrole, ldap_backend=None, 
+                           rootdn, serverrole, sitename, ldap_backend=None, 
                            ldap_backend_type=None, erase=False):
     """Setup the partitions for the SAM database. 
     
@@ -378,7 +378,8 @@ def setup_samdb_partitions(samdb_path, setup_path, message, lp, session_info,
 
         message("Setting up sam.ldb rootDSE")
         setup_samdb_rootdse(samdb, setup_path, schemadn, domaindn, hostname, 
-                            dnsdomain, realm, rootdn, configdn, netbiosname)
+                            dnsdomain, realm, rootdn, configdn, netbiosname,
+                            sitename)
 
         if erase:
             message("Erasing data from partitions")
@@ -472,7 +473,8 @@ def setup_registry(path, setup_path, session_info, credentials, lp):
 
 
 def setup_samdb_rootdse(samdb, setup_path, schemadn, domaindn, hostname, 
-                        dnsdomain, realm, rootdn, configdn, netbiosname):
+                        dnsdomain, realm, rootdn, configdn, netbiosname,
+                        sitename):
     """Setup the SamDB rootdse.
 
     :param samdb: Sam Database handle
@@ -482,7 +484,7 @@ def setup_samdb_rootdse(samdb, setup_path, schemadn, domaindn, hostname,
         "SCHEMADN": schemadn, 
         "NETBIOSNAME": netbiosname,
         "DNSDOMAIN": dnsdomain,
-        "DEFAULTSITE": DEFAULTSITE,
+        "DEFAULTSITE": sitename,
         "REALM": realm,
         "DNSNAME": "%s.%s" % (hostname, dnsdomain),
         "DOMAINDN": domaindn,
@@ -495,7 +497,7 @@ def setup_samdb_rootdse(samdb, setup_path, schemadn, domaindn, hostname,
 def setup_self_join(samdb, configdn, schemadn, domaindn, 
                     netbiosname, hostname, dnsdomain, machinepass, dnspass, 
                     realm, domainname, domainsid, invocationid, setup_path,
-                    policyguid, hostguid=None):
+                    policyguid, sitename, hostguid=None):
     """Join a host to its own domain."""
     if hostguid is not None:
         hostguid_add = "objectGUID: %s" % hostguid
@@ -508,7 +510,7 @@ def setup_self_join(samdb, configdn, schemadn, domaindn,
               "DOMAINDN": domaindn,
               "INVOCATIONID": invocationid,
               "NETBIOSNAME": netbiosname,
-              "DEFAULTSITE": DEFAULTSITE,
+              "DEFAULTSITE": sitename,
               "DNSNAME": "%s.%s" % (hostname, dnsdomain),
               "MACHINEPASS_B64": b64encode(machinepass),
               "DNSPASS_B64": b64encode(dnspass),
@@ -529,7 +531,8 @@ def setup_samdb(path, setup_path, session_info, credentials, lp,
                 domainsid, aci, domainguid, policyguid, 
                 domainname, fill, adminpass, krbtgtpass, 
                 machinepass, hostguid, invocationid, dnspass,
-                serverrole, ldap_backend=None, ldap_backend_type=None):
+                serverrole, sitename, ldap_backend=None, 
+                ldap_backend_type=None):
     """Setup a complete SAM Database.
     
     :note: This will wipe the main SAM database file!
@@ -544,7 +547,8 @@ def setup_samdb(path, setup_path, session_info, credentials, lp,
                            hostname=hostname, netbiosname=netbiosname, 
                            dnsdomain=dnsdomain, realm=realm, rootdn=rootdn,
                            ldap_backend=ldap_backend, serverrole=serverrole,
-                           ldap_backend_type=ldap_backend_type, erase=erase)
+                           ldap_backend_type=ldap_backend_type, erase=erase,
+                           sitename=sitename)
 
     samdb = SamDB(path, session_info=session_info, 
                   credentials=credentials, lp=lp)
@@ -562,7 +566,7 @@ def setup_samdb(path, setup_path, session_info, credentials, lp,
     if lp.get("server role") == "domain controller":
         samdb.set_invocation_id(invocationid)
 
-    load_schema(setup_path, samdb, schemadn, netbiosname, configdn)
+    load_schema(setup_path, samdb, schemadn, netbiosname, configdn, sitename)
 
     samdb.transaction_start()
         
@@ -584,7 +588,7 @@ def setup_samdb(path, setup_path, session_info, credentials, lp,
             "DOMAINSID": str(domainsid),
             "SCHEMADN": schemadn, 
             "NETBIOSNAME": netbiosname,
-            "DEFAULTSITE": DEFAULTSITE,
+            "DEFAULTSITE": sitename,
             "CONFIGDN": configdn,
             "POLICYGUID": policyguid,
             "DOMAINDN": domaindn,
@@ -614,7 +618,7 @@ def setup_samdb(path, setup_path, session_info, credentials, lp,
             setup_path("provision_schema_basedn_modify.ldif"), {
             "SCHEMADN": schemadn,
             "NETBIOSNAME": netbiosname,
-            "DEFAULTSITE": DEFAULTSITE,
+            "DEFAULTSITE": sitename,
             "CONFIGDN": configdn,
             })
 
@@ -629,7 +633,7 @@ def setup_samdb(path, setup_path, session_info, credentials, lp,
         setup_add_ldif(samdb, setup_path("provision_configuration.ldif"), {
             "CONFIGDN": configdn,
             "NETBIOSNAME": netbiosname,
-            "DEFAULTSITE": DEFAULTSITE,
+            "DEFAULTSITE": sitename,
             "DNSDOMAIN": dnsdomain,
             "DOMAIN": domainname,
             "SCHEMADN": schemadn,
@@ -656,7 +660,7 @@ def setup_samdb(path, setup_path, session_info, credentials, lp,
         setup_add_ldif(samdb, setup_path("provision.ldif"), {
             "DOMAINDN": domaindn,
             "NETBIOSNAME": netbiosname,
-            "DEFAULTSITE": DEFAULTSITE,
+            "DEFAULTSITE": sitename,
             "CONFIGDN": configdn,
             })
 
@@ -679,7 +683,7 @@ def setup_samdb(path, setup_path, session_info, credentials, lp,
                                 machinepass=machinepass, domainname=domainname, 
                                 domainsid=domainsid, policyguid=policyguid,
                                 hostname=hostname, hostguid=hostguid, 
-                                setup_path=setup_path)
+                                setup_path=setup_path, sitename=sitename)
 
     #We want to setup the index last, as adds are faster unindexed
         message("Setting up sam.ldb index")
@@ -702,7 +706,7 @@ def provision(lp, setup_dir, message, paths, session_info,
               policyguid=None, invocationid=None, machinepass=None, 
               dnspass=None, root=None, nobody=None, nogroup=None, users=None, 
               wheel=None, backup=None, aci=None, serverrole=None, erase=False,
-              ldap_backend=None, ldap_backend_type=None):
+              ldap_backend=None, ldap_backend_type=None, sitename=DEFAULTSITE):
     """Provision samba4
     
     :note: caution, this wipes all existing data!
@@ -851,7 +855,7 @@ def provision(lp, setup_dir, message, paths, session_info,
                         hostguid=hostguid, invocationid=invocationid, 
                         machinepass=machinepass, dnspass=dnspass,
                         serverrole=serverrole, ldap_backend=ldap_backend, 
-                        ldap_backend_type=ldap_backend_type)
+                        ldap_backend_type=ldap_backend_type, sitename=sitename)
 
     if lp.get("server role") == "domain controller":
        policy_path = os.path.join(paths.sysvol, dnsdomain, "Policies", 
@@ -945,7 +949,7 @@ def create_zone_file(path, setup_path, samdb, dnsdomain, domaindn,
         })
 
 
-def load_schema(setup_path, samdb, schemadn, netbiosname, configdn):
+def load_schema(setup_path, samdb, schemadn, netbiosname, configdn, sitename):
     """Load schema for the SamDB.
     
     :param samdb: Load a schema into a SamDB.
@@ -962,7 +966,7 @@ def load_schema(setup_path, samdb, schemadn, netbiosname, configdn):
                     "SCHEMADN": schemadn,
                     "NETBIOSNAME": netbiosname,
                     "CONFIGDN": configdn,
-                    "DEFAULTSITE": DEFAULTSITE
+                    "DEFAULTSITE":sitename 
     })
     samdb.attach_schema_from_ldif(head_data, schema_data)
 
-- 
cgit 


From 7c96ca88c4e6fc5bd9b0c585b0700cc04e0f517c Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sat, 16 Feb 2008 15:23:26 +0100
Subject: Formatting fixes. (This used to be commit
 bc0fab89e325ebb6ab870b1c3f4b263c50631b70)

---
 source4/scripting/python/samba/provision.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index d30eaf3d7f..3e88b68509 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -335,9 +335,9 @@ def setup_samdb_partitions(samdb_path, setup_path, message, lp, session_info,
     	schemadn_ldb = ldap_backend
     	
     if ldap_backend_type == "fedora-ds":
-        backend_modules = ["nsuniqueid","paged_searches"]
+        backend_modules = ["nsuniqueid", "paged_searches"]
     elif ldap_backend_type == "openldap":
-        backend_modules = ["normalise","entryuuid","paged_searches"]
+        backend_modules = ["normalise", "entryuuid", "paged_searches"]
     elif serverrole == "domain controller":
         backend_modules = ["repl_meta_data"]
     else:
@@ -695,6 +695,7 @@ def setup_samdb(path, setup_path, session_info, credentials, lp,
     samdb.transaction_commit()
     return samdb
 
+
 FILL_FULL = "FULL"
 FILL_NT4SYNC = "NT4SYNC"
 FILL_DRS = "DRS"
-- 
cgit 


From 7df18932f65282461ee00c1ae17712c490be84d4 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sat, 16 Feb 2008 16:15:21 +0100
Subject: use gmake to handle .py file copies. (This used to be commit
 33111f98df7e8f9bb7d62599c6b13a1a4479a2e1)

---
 source4/scripting/python/config.mk | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/config.mk b/source4/scripting/python/config.mk
index b15e1fcda7..16cd301aad 100644
--- a/source4/scripting/python/config.mk
+++ b/source4/scripting/python/config.mk
@@ -35,6 +35,10 @@ PYDOCTOR_MODULES=bin/python/ldb.py bin/python/auth.py bin/python/credentials.py
 pydoctor:: pythonmods
 	LD_LIBRARY_PATH=bin/shared PYTHONPATH=bin/python pydoctor --project-name=Samba --make-html --docformat=restructuredtext --add-package scripting/python/samba/ $(addprefix --add-module , $(PYDOCTOR_MODULES))
 
+bin/python/%.py: 
+	mkdir -p $(@D)
+	cp $< $@
+
 installpython:: pythonmods
 	@$(SHELL) $(srcdir)/script/installpython.sh \
 		$(INSTALLPERMS) \
-- 
cgit 


From b66ee2ed22754dd44b20c06e573072e328d9a3dd Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sat, 16 Feb 2008 18:38:02 +0100
Subject: Move responsibilities of build.h to makefile. (This used to be commit
 a43f6d37bce85748e9cf2675e5beced5db26f1c3)

---
 source4/scripting/ejs/smbcalls.c | 1 -
 1 file changed, 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls.c b/source4/scripting/ejs/smbcalls.c
index 1f29fce002..da35a6ba8c 100644
--- a/source4/scripting/ejs/smbcalls.c
+++ b/source4/scripting/ejs/smbcalls.c
@@ -23,7 +23,6 @@
 #include "includes.h"
 #include "param/param.h"
 #include "scripting/ejs/smbcalls.h"
-#include "build.h"
 #include "version.h"
 
 /*
-- 
cgit 


From 602f4635da0935abffdda2a29ec302a775fdbe62 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 18 Feb 2008 19:06:17 +0100
Subject: Get rid of 'INTEGRATED' build of modules - now replaced by
 'MERGED_OBJ' (This used to be commit
 269cbf84d8b7dbf3bc88adc04ae283dc908af5ac)

---
 source4/scripting/ejs/config.mk | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/config.mk b/source4/scripting/ejs/config.mk
index 5de17263b7..f99f37ecad 100644
--- a/source4/scripting/ejs/config.mk
+++ b/source4/scripting/ejs/config.mk
@@ -4,13 +4,13 @@ OBJ_FILES = \
 
 [MODULE::smbcalls_config]
 OBJ_FILES = smbcalls_config.o
-OUTPUT_TYPE = INTEGRATED
+OUTPUT_TYPE = MERGED_OBJ
 SUBSYSTEM = smbcalls
 INIT_FUNCTION = smb_setup_ejs_config
 
 [MODULE::smbcalls_ldb]
 OBJ_FILES = smbcalls_ldb.o
-OUTPUT_TYPE = INTEGRATED
+OUTPUT_TYPE = MERGED_OBJ
 SUBSYSTEM = smbcalls
 INIT_FUNCTION = smb_setup_ejs_ldb
 PRIVATE_DEPENDENCIES = LIBLDB SAMDB LIBNDR
@@ -18,38 +18,38 @@ PRIVATE_DEPENDENCIES = LIBLDB SAMDB LIBNDR
 [MODULE::smbcalls_reg]
 OBJ_FILES = smbcalls_reg.o
 SUBSYSTEM = smbcalls
-OUTPUT_TYPE = INTEGRATED
+OUTPUT_TYPE = MERGED_OBJ
 INIT_FUNCTION = smb_setup_ejs_reg
 PRIVATE_DEPENDENCIES = registry SAMDB LIBNDR
 
 [MODULE::smbcalls_nbt]
 OBJ_FILES = smbcalls_nbt.o
 SUBSYSTEM = smbcalls
-OUTPUT_TYPE = INTEGRATED
+OUTPUT_TYPE = MERGED_OBJ
 INIT_FUNCTION = smb_setup_ejs_nbt
 
 [MODULE::smbcalls_rand]
 OBJ_FILES = smbcalls_rand.o
 SUBSYSTEM = smbcalls
-OUTPUT_TYPE = INTEGRATED
+OUTPUT_TYPE = MERGED_OBJ
 INIT_FUNCTION = smb_setup_ejs_random
 
 [MODULE::smbcalls_nss]
 OBJ_FILES = smbcalls_nss.o
 SUBSYSTEM = smbcalls
-OUTPUT_TYPE = INTEGRATED
+OUTPUT_TYPE = MERGED_OBJ
 INIT_FUNCTION = smb_setup_ejs_nss
 PRIVATE_DEPENDENCIES = NSS_WRAPPER
 
 [MODULE::smbcalls_data]
 OBJ_FILES = smbcalls_data.o
 SUBSYSTEM = smbcalls
-OUTPUT_TYPE = INTEGRATED
+OUTPUT_TYPE = MERGED_OBJ
 INIT_FUNCTION = smb_setup_ejs_datablob
 
 [MODULE::smbcalls_auth]
 OBJ_FILES = smbcalls_auth.o
-OUTPUT_TYPE = INTEGRATED
+OUTPUT_TYPE = MERGED_OBJ
 SUBSYSTEM = smbcalls
 INIT_FUNCTION = smb_setup_ejs_auth
 PRIVATE_DEPENDENCIES = auth
@@ -57,13 +57,13 @@ PRIVATE_DEPENDENCIES = auth
 [MODULE::smbcalls_string]
 OBJ_FILES = smbcalls_string.o
 SUBSYSTEM = smbcalls
-OUTPUT_TYPE = INTEGRATED
+OUTPUT_TYPE = MERGED_OBJ
 INIT_FUNCTION = smb_setup_ejs_string
 
 [MODULE::smbcalls_sys]
 OBJ_FILES = smbcalls_sys.o
 SUBSYSTEM = smbcalls
-OUTPUT_TYPE = INTEGRATED
+OUTPUT_TYPE = MERGED_OBJ
 INIT_FUNCTION = smb_setup_ejs_system
 
 include ejsnet/config.mk
-- 
cgit 


From ff0315ba859421dff6aba055887e086fa68c2951 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 18 Feb 2008 20:04:18 +0100
Subject: Rename include to mkinclude to emphasize it is different from make's
 include. (This used to be commit 0e1d0a874ae3d22b8f97a79b81fe0af3ef53a771)

---
 source4/scripting/ejs/config.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/config.mk b/source4/scripting/ejs/config.mk
index f99f37ecad..c1f07367fb 100644
--- a/source4/scripting/ejs/config.mk
+++ b/source4/scripting/ejs/config.mk
@@ -66,7 +66,7 @@ SUBSYSTEM = smbcalls
 OUTPUT_TYPE = MERGED_OBJ
 INIT_FUNCTION = smb_setup_ejs_system
 
-include ejsnet/config.mk
+mkinclude ejsnet/config.mk
 
 [SUBSYSTEM::smbcalls]
 PRIVATE_PROTO_HEADER = proto.h
-- 
cgit 


From 0020793515ade04f3ef5754717490e2eb2ca6bb9 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Wed, 20 Feb 2008 03:40:44 +0100
Subject: Fix static module list generation for ldb. (This used to be commit
 92c1c0e9137f0845cac6cc96bf78711b6aaffe21)

---
 source4/scripting/ejs/smbscript.c | 2 --
 1 file changed, 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbscript.c b/source4/scripting/ejs/smbscript.c
index a4f2e1cd43..9ed4aa490f 100644
--- a/source4/scripting/ejs/smbscript.c
+++ b/source4/scripting/ejs/smbscript.c
@@ -61,8 +61,6 @@ int main(int argc, const char **argv)
 		lp_load(lp_ctx, dyn_CONFIGFILE);
 	}
 
-	ldb_global_init();
-
 	gensec_init(lp_ctx);
 	mprSetCtx(mem_ctx);
 
-- 
cgit 


From 845664e94b7bc98f6e93be6d7ff2a141d9d9e192 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Wed, 20 Feb 2008 11:32:56 +0100
Subject: Avoid python2.2-specific types. (This used to be commit
 d45c6b5574ea732d25e9180c83f1fa807ebe57ba)

---
 source4/scripting/python/config.m4 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/config.m4 b/source4/scripting/python/config.m4
index 908efd1588..2142cd9abd 100644
--- a/source4/scripting/python/config.m4
+++ b/source4/scripting/python/config.m4
@@ -54,7 +54,7 @@ fi
 
 if test x$PYTHON != x
 then
-	DISTUTILS_CFLAGS=`$PYTHON -c "from distutils import sysconfig; print '-I%s -I%s %s' % (sysconfig.get_python_inc(), sysconfig.get_python_inc(plat_specific=True), sysconfig.get_config_var('CFLAGS'))"`
+	DISTUTILS_CFLAGS=`$PYTHON -c "from distutils import sysconfig; print '-I%s -I%s %s' % (sysconfig.get_python_inc(), sysconfig.get_python_inc(plat_specific=1), sysconfig.get_config_var('CFLAGS'))"`
 	DISTUTILS_LDFLAGS=`$PYTHON -c "from distutils import sysconfig; print '%s %s -lpython%s -L%s' % (sysconfig.get_config_var('LIBS'), sysconfig.get_config_var('SYSLIBS'), sysconfig.get_config_var('VERSION'), sysconfig.get_config_var('LIBPL'))"`
 	TRY_LINK_PYTHON($DISTUTILS_LDFLAGS, $DISTUTILS_CFLAGS)
 fi
-- 
cgit 


From 895874d9663ccb95883579d145018ec8a8add9c8 Mon Sep 17 00:00:00 2001
From: Kai Blin <kai@samba.org>
Date: Mon, 18 Feb 2008 14:33:58 +0100
Subject: idmap: Handle uid->SID mapping (This used to be commit
 6ac6de8476ba036eb041e054bc37e4503dc2fde8)

---
 source4/scripting/libjs/provision.js        |  4 ++++
 source4/scripting/python/samba/provision.py | 24 ++++++++++++++++++++++++
 2 files changed, 28 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index dc9eae8e72..3ba93debf9 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -389,6 +389,7 @@ function provision_default_paths(subobj)
 	paths.smbconf = lp.filename()
 	paths.shareconf = lp.get("private dir") + "/" + "share.ldb";
 	paths.samdb = lp.get("sam database");
+	paths.idmapdb = lp.get("idmap database");
 	paths.secrets = lp.get("secrets database");
 	paths.templates = lp.get("private dir") + "/" + "templates.ldb";
 	paths.keytab = "secrets.keytab";
@@ -679,6 +680,9 @@ function provision(subobj, message, blank, paths, session_info, credentials, lda
 	message("Setting up templates into " + paths.templates + "\n");
 	setup_ldb("provision_templates.ldif", info, paths.templates);
 
+	message("Setting up " + paths.idmapdb +"\n");
+	setup_ldb("idmap_init.ldif", info, paths.idmapdb);
+
 	message("Setting up sam.ldb partitions\n");
 	/* Also wipes the database */
 	setup_ldb("provision_partitions.ldif", info, paths.samdb);
diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index 3e88b68509..e3c47ff4a2 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -59,6 +59,7 @@ class ProvisionPaths:
         self.hkpd = None
         self.hkpt = None
         self.samdb = None
+        self.idmapdb = None
         self.secrets = None
         self.keytab = None
         self.dns_keytab = None
@@ -202,6 +203,7 @@ def provision_paths_from_lp(lp, dnsdomain):
 
     paths.shareconf = os.path.join(private_dir, "share.ldb")
     paths.samdb = os.path.join(private_dir, lp.get("sam database") or "samdb.ldb")
+    paths.idmapdb = os.path.join(private_dir, lp.get("idmap database") or "idmap.ldb")
     paths.secrets = os.path.join(private_dir, lp.get("secrets database") or "secrets.ldb")
     paths.templates = os.path.join(private_dir, "templates.ldb")
     paths.dns = os.path.join(private_dir, dnsdomain + ".zone")
@@ -471,6 +473,24 @@ def setup_registry(path, setup_path, session_info, credentials, lp):
     assert os.path.exists(provision_reg)
     reg.diff_apply(provision_reg)
 
+def setup_idmapdb(path, setup_path, session_info, credentials, lp):
+    """Setup the idmap database.
+
+    :param path: path to the idmap database
+    :param setup_path: Function that returns a path to a setup file
+    :param session_info: Session information
+    :param credentials: Credentials
+    :param lp: Loadparm context
+    """
+    if os.path.exists(path):
+        os.unlink(path)
+
+    idmap_ldb = Ldb(path, session_info=session_info, credentials=credentials,
+                    lp=lp)
+
+    idmap_ldb.erase()
+    idmap_ldb.load_ldif_file_add(setup_path("idmap_init.ldif"))
+    return idmap_ldb
 
 def setup_samdb_rootdse(samdb, setup_path, schemadn, domaindn, hostname, 
                         dnsdomain, realm, rootdn, configdn, netbiosname,
@@ -844,6 +864,10 @@ def provision(lp, setup_dir, message, paths, session_info,
     setup_templatesdb(paths.templates, setup_path, session_info=session_info, 
                       credentials=credentials, lp=lp)
 
+    message("Setting up idmap db")
+    setup_idmapdb(paths.idmapdb, setup_path, session_info=session_info,
+                  credentials=credentials, lp=lp)
+
     samdb = setup_samdb(paths.samdb, setup_path, session_info=session_info, 
                         credentials=credentials, lp=lp, schemadn=schemadn, 
                         configdn=configdn, domaindn=domaindn,
-- 
cgit 


From e11c61bc5cd487dce06fc38bb0ee8c4e24b04e8c Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Thu, 21 Feb 2008 18:21:44 +0100
Subject: Introduce mprLpCtx() similar to mprMemCtx() for loadparm_context used
 by all EJS code. (This used to be commit
 184988866fe8e740f58e3683eefcaa70f8b51d11)

---
 source4/scripting/ejs/ejsnet/net_ctx.c  |  4 ++--
 source4/scripting/ejs/smbcalls.c        |  4 ++--
 source4/scripting/ejs/smbcalls_auth.c   | 12 ++++++------
 source4/scripting/ejs/smbcalls_cli.c    |  8 ++++----
 source4/scripting/ejs/smbcalls_config.c | 22 +++++++++++-----------
 source4/scripting/ejs/smbcalls_creds.c  |  4 ++--
 source4/scripting/ejs/smbcalls_data.c   |  4 ++--
 source4/scripting/ejs/smbcalls_ldb.c    |  2 +-
 source4/scripting/ejs/smbcalls_nbt.c    |  2 +-
 source4/scripting/ejs/smbcalls_reg.c    |  2 +-
 source4/scripting/ejs/smbcalls_rpc.c    |  6 +++---
 source4/scripting/ejs/smbcalls_sys.c    |  2 +-
 12 files changed, 36 insertions(+), 36 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/ejsnet/net_ctx.c b/source4/scripting/ejs/ejsnet/net_ctx.c
index 396718367a..99be1c4ef8 100644
--- a/source4/scripting/ejs/ejsnet/net_ctx.c
+++ b/source4/scripting/ejs/ejsnet/net_ctx.c
@@ -52,7 +52,7 @@ static int ejs_net_context(MprVarHandle eid, int argc, struct MprVar **argv)
 	}
 	ev = event_context_find(event_mem_ctx);
 
-	ctx = libnet_context_init(ev, global_loadparm);
+	ctx = libnet_context_init(ev, mprLpCtx());
 	/* IF we generated a new event context, it will be under here,
 	 * and we need it to last as long as the libnet context, so
 	 * make it a child */
@@ -68,7 +68,7 @@ static int ejs_net_context(MprVarHandle eid, int argc, struct MprVar **argv)
 			talloc_free(ctx);
 			return -1;
 		}
-		cli_credentials_set_conf(creds, global_loadparm);
+		cli_credentials_set_conf(creds, mprLpCtx());
 		cli_credentials_set_anonymous(creds);
 
 		mprCreds = mprCredentials(creds);
diff --git a/source4/scripting/ejs/smbcalls.c b/source4/scripting/ejs/smbcalls.c
index 1f29fce002..63a80e17db 100644
--- a/source4/scripting/ejs/smbcalls.c
+++ b/source4/scripting/ejs/smbcalls.c
@@ -111,7 +111,7 @@ static int ejs_typeof_native(MprVarHandle eid, int argc, struct MprVar **argv)
 static int ejs_libinclude(int eid, int argc, char **argv)
 {
 	int i, j;
-	const char **js_include = lp_js_include(global_loadparm);
+	const char **js_include = lp_js_include(mprLpCtx());
 
 	if (js_include == NULL || js_include[0] == NULL) {
 		ejsSetErrorMsg(eid, "js include path not set");
@@ -184,7 +184,7 @@ void smb_setup_ejs_functions(void (*exception_handler)(const char *))
 	smb_setup_ejs_param();
         smb_setup_ejs_literal();
 	
-	shared_init = load_samba_modules(NULL, global_loadparm, "smbcalls");
+	shared_init = load_samba_modules(NULL, mprLpCtx(), "smbcalls");
 	
 	run_init_functions(static_init);
 	run_init_functions(shared_init);
diff --git a/source4/scripting/ejs/smbcalls_auth.c b/source4/scripting/ejs/smbcalls_auth.c
index 89370890c8..908a009159 100644
--- a/source4/scripting/ejs/smbcalls_auth.c
+++ b/source4/scripting/ejs/smbcalls_auth.c
@@ -56,14 +56,14 @@ static int ejs_doauth(MprVarHandle eid,
 	} else {
 		/* Hope we can find the event context somewhere up there... */
 		ev = event_context_find(tmp_ctx);
-		msg = messaging_client_init(tmp_ctx, lp_messaging_path(tmp_ctx, global_loadparm), 
-					    lp_iconv_convenience(global_loadparm), ev);
+		msg = messaging_client_init(tmp_ctx, lp_messaging_path(tmp_ctx, mprLpCtx()), 
+					    lp_iconv_convenience(mprLpCtx()), ev);
 	}
 
 	if (auth_types) {
-		nt_status = auth_context_create_methods(tmp_ctx, auth_types, ev, msg, global_loadparm, &auth_context);
+		nt_status = auth_context_create_methods(tmp_ctx, auth_types, ev, msg, mprLpCtx(), &auth_context);
 	} else {
-		nt_status = auth_context_create(tmp_ctx, ev, msg, global_loadparm, &auth_context);
+		nt_status = auth_context_create(tmp_ctx, ev, msg, mprLpCtx(), &auth_context);
 	}
 	if (!NT_STATUS_IS_OK(nt_status)) {
 		mprSetPropertyValue(auth, "result", mprCreateBoolVar(false));
@@ -109,7 +109,7 @@ static int ejs_doauth(MprVarHandle eid,
 		goto done;
 	}
 
-	nt_status = auth_generate_session_info(tmp_ctx, global_loadparm, server_info, &session_info);
+	nt_status = auth_generate_session_info(tmp_ctx, mprLpCtx(), server_info, &session_info);
 	if (!NT_STATUS_IS_OK(nt_status)) {
 		mprSetPropertyValue(auth, "report", mprString("Session Info generation failed"));
 		mprSetPropertyValue(auth, "result", mprCreateBoolVar(false));
@@ -222,7 +222,7 @@ static int ejs_userAuth(MprVarHandle eid, int argc, struct MprVar **argv)
 static int ejs_system_session(MprVarHandle eid, int argc, struct MprVar **argv)
 {
 	struct MprVar *obj = mprInitObject(eid, "session_info", argc, argv);
-	struct auth_session_info *session_info = system_session(mprMemCtx(), global_loadparm);
+	struct auth_session_info *session_info = system_session(mprMemCtx(), mprLpCtx());
 
 	if (session_info == NULL) {
 		return -1;
diff --git a/source4/scripting/ejs/smbcalls_cli.c b/source4/scripting/ejs/smbcalls_cli.c
index 8295a0879f..4f2d52b25c 100644
--- a/source4/scripting/ejs/smbcalls_cli.c
+++ b/source4/scripting/ejs/smbcalls_cli.c
@@ -432,23 +432,23 @@ static int ejs_tree_connect(MprVarHandle eid, int argc, char **argv)
 	/* Set up credentials */
 
 	creds = cli_credentials_init(NULL);
-	cli_credentials_set_conf(creds, global_loadparm);
+	cli_credentials_set_conf(creds, mprLpCtx());
 	cli_credentials_parse_string(creds, argv[1], CRED_SPECIFIED);
 
 	/* Do connect */
 
 	io.in.dest_host              = hostname;
-	io.in.dest_ports             = lp_smb_ports(global_loadparm);
+	io.in.dest_ports             = lp_smb_ports(mprLpCtx());
 	io.in.called_name            = strupper_talloc(mem_ctx, hostname);
 	io.in.service                = sharename;
 	io.in.service_type           = "?????";
 	io.in.credentials            = creds;
 	io.in.fallback_to_anonymous  = false;
-	io.in.workgroup              = lp_workgroup(global_loadparm);
+	io.in.workgroup              = lp_workgroup(mprLpCtx());
 	lp_smbcli_options(global_loadparm, &io.in.options);
 
 	result = smb_composite_connect(&io, mem_ctx, 
-				       lp_resolve_context(global_loadparm), 
+				       lp_resolve_context(mprLpCtx()), 
 				       NULL);
 	tree = io.out.tree;
 
diff --git a/source4/scripting/ejs/smbcalls_config.c b/source4/scripting/ejs/smbcalls_config.c
index 07e0f479da..eb673b3a23 100644
--- a/source4/scripting/ejs/smbcalls_config.c
+++ b/source4/scripting/ejs/smbcalls_config.c
@@ -36,8 +36,8 @@ static int ejs_lpServices(MprVarHandle eid, int argc, char **argv)
 	const char **list = NULL;
 	if (argc != 0) return -1;
 	
-	for (i=0;i<lp_numservices(global_loadparm);i++) {
-		list = str_list_add(list, lp_servicename(lp_servicebynum(global_loadparm, i)));
+	for (i=0;i<lp_numservices(mprLpCtx());i++) {
+		list = str_list_add(list, lp_servicename(lp_servicebynum(mprLpCtx(), i)));
 	}
 	talloc_steal(mprMemCtx(), list);
 	mpr_Return(eid, mprList("services", list));
@@ -68,7 +68,7 @@ static int ejs_lpGet(MprVarHandle eid, int argc, char **argv)
 	if (argc == 2) {
 		struct loadparm_service *service;
 		/* its a share parameter */
-		service = lp_service(global_loadparm, argv[0]);
+		service = lp_service(mprLpCtx(), argv[0]);
 		if (service == NULL) {
 			mpr_Return(eid, mprCreateUndefinedVar());
 			return 0;
@@ -84,7 +84,7 @@ static int ejs_lpGet(MprVarHandle eid, int argc, char **argv)
 				mpr_Return(eid, mprCreateUndefinedVar());
 				return 0;
 			}
-			value = lp_get_parametric(global_loadparm, service, type, option);
+			value = lp_get_parametric(mprLpCtx(), service, type, option);
 			if (value == NULL) {
 				mpr_Return(eid, mprCreateUndefinedVar());
 				return 0;
@@ -98,7 +98,7 @@ static int ejs_lpGet(MprVarHandle eid, int argc, char **argv)
 			mpr_Return(eid, mprCreateUndefinedVar());
 			return 0;
 		}
-		parm_ptr = lp_parm_ptr(global_loadparm, service, parm);
+		parm_ptr = lp_parm_ptr(mprLpCtx(), service, parm);
 	} else if (strchr(argv[0], ':')) {
 		/* its a global parametric option */
 		const char *type = talloc_strndup(mprMemCtx(), 
@@ -109,7 +109,7 @@ static int ejs_lpGet(MprVarHandle eid, int argc, char **argv)
 			mpr_Return(eid, mprCreateUndefinedVar());
 			return 0;
 		}
-		value = lp_get_parametric(global_loadparm, NULL, type, option);
+		value = lp_get_parametric(mprLpCtx(), NULL, type, option);
 		if (value == NULL) {
 			mpr_Return(eid, mprCreateUndefinedVar());
 			return 0;
@@ -123,7 +123,7 @@ static int ejs_lpGet(MprVarHandle eid, int argc, char **argv)
 			mpr_Return(eid, mprCreateUndefinedVar());
 			return 0;
 		}
-		parm_ptr = lp_parm_ptr(global_loadparm, NULL, parm);
+		parm_ptr = lp_parm_ptr(mprLpCtx(), NULL, parm);
 	}
 
 	if (parm == NULL || parm_ptr == NULL) {
@@ -166,7 +166,7 @@ static int ejs_lpGet(MprVarHandle eid, int argc, char **argv)
 */
 static int ejs_lpFilename(MprVarHandle eid, int argc, char **argv)
 {
-	mpr_ReturnString(eid, lp_configfile(global_loadparm));
+	mpr_ReturnString(eid, lp_configfile(mprLpCtx()));
 	return 0;
 }
 
@@ -184,7 +184,7 @@ static int ejs_lpSet(MprVarHandle eid, int argc, char **argv)
 		return -1;
 	}
 
-	mpr_Return(eid, mprCreateBoolVar(lp_set_cmdline(global_loadparm, argv[0], argv[1])));
+	mpr_Return(eid, mprCreateBoolVar(lp_set_cmdline(mprLpCtx(), argv[0], argv[1])));
 	return 0;
 }
 
@@ -196,9 +196,9 @@ static int ejs_lpSet(MprVarHandle eid, int argc, char **argv)
 static int ejs_lpReload(MprVarHandle eid, int argc, char **argv)
 {
 	bool ret;
-	const char *filename = lp_configfile(global_loadparm);
+	const char *filename = lp_configfile(mprLpCtx());
 
-	ret = lp_load(global_loadparm, filename);
+	ret = lp_load(mprLpCtx(), filename);
 	mpr_Return(eid, mprCreateBoolVar(ret));
 	return 0;
 }
diff --git a/source4/scripting/ejs/smbcalls_creds.c b/source4/scripting/ejs/smbcalls_creds.c
index 6dfff8f925..fd73f0751f 100644
--- a/source4/scripting/ejs/smbcalls_creds.c
+++ b/source4/scripting/ejs/smbcalls_creds.c
@@ -192,7 +192,7 @@ static int ejs_creds_set_machine_account(MprVarHandle eid, int argc, struct MprV
 		return -1;
 	}
 	
-	if (NT_STATUS_IS_OK(cli_credentials_set_machine_account(creds, global_loadparm))) {
+	if (NT_STATUS_IS_OK(cli_credentials_set_machine_account(creds, mprLpCtx()))) {
 		mpr_Return(eid, mprCreateBoolVar(true));
 	} else {
 		mpr_Return(eid, mprCreateBoolVar(false));
@@ -248,7 +248,7 @@ static int ejs_credentials_init(MprVarHandle eid, int argc, struct MprVar **argv
 		return -1;
 	}
 
-	cli_credentials_set_conf(creds, global_loadparm);
+	cli_credentials_set_conf(creds, mprLpCtx());
 
 	return ejs_credentials_obj(obj, creds);
 }
diff --git a/source4/scripting/ejs/smbcalls_data.c b/source4/scripting/ejs/smbcalls_data.c
index 3ea41d46fb..19e1e173d6 100644
--- a/source4/scripting/ejs/smbcalls_data.c
+++ b/source4/scripting/ejs/smbcalls_data.c
@@ -177,7 +177,7 @@ static int ejs_regToVar(MprVarHandle eid, int argc, struct MprVar **argv)
 	case REG_EXPAND_SZ: {
 		char *s;
 		ssize_t len;
-		len = convert_string_talloc(mprMemCtx(), lp_iconv_convenience(global_loadparm), CH_UTF16, CH_UNIX, 
+		len = convert_string_talloc(mprMemCtx(), lp_iconv_convenience(mprLpCtx()), CH_UTF16, CH_UNIX, 
 					    blob->data, blob->length, (void **)&s);
 		if (len == -1) {
 			ejsSetErrorMsg(eid, "regToVar invalid REG_SZ string");
@@ -225,7 +225,7 @@ static int ejs_regToVar(MprVarHandle eid, int argc, struct MprVar **argv)
 			if (slen == 2 && b.length == 2 && SVAL(b.data, 0) == 0) {
 				break;
 			}
-			len = convert_string_talloc(mprMemCtx(), lp_iconv_convenience(global_loadparm), CH_UTF16, CH_UNIX, 
+			len = convert_string_talloc(mprMemCtx(), lp_iconv_convenience(mprLpCtx()), CH_UTF16, CH_UNIX, 
 						    b.data, slen, (void **)&s);
 			if (len == -1) {
 				ejsSetErrorMsg(eid, "regToVar invalid REG_MULTI_SZ string");
diff --git a/source4/scripting/ejs/smbcalls_ldb.c b/source4/scripting/ejs/smbcalls_ldb.c
index 7599cbf443..f47920b9bb 100644
--- a/source4/scripting/ejs/smbcalls_ldb.c
+++ b/source4/scripting/ejs/smbcalls_ldb.c
@@ -453,7 +453,7 @@ static int ejs_ldbConnect(MprVarHandle eid, int argc, char **argv)
 
 	dbfile = argv[0];
 
-	ldb = ldb_wrap_connect(mprMemCtx(), global_loadparm, dbfile, 
+	ldb = ldb_wrap_connect(mprMemCtx(), mprLpCtx(), dbfile, 
 			       session_info, creds,
 			       0, (const char **)(argv+1));
 	if (ldb == NULL) {
diff --git a/source4/scripting/ejs/smbcalls_nbt.c b/source4/scripting/ejs/smbcalls_nbt.c
index c3679b1ec7..67a85414ca 100644
--- a/source4/scripting/ejs/smbcalls_nbt.c
+++ b/source4/scripting/ejs/smbcalls_nbt.c
@@ -70,7 +70,7 @@ static int ejs_resolve_name(MprVarHandle eid, int argc, struct MprVar **argv)
 
 	result = 0;
 
-	nt_status = resolve_name(lp_resolve_context(global_loadparm), &name, tmp_ctx, &reply_addr, event_context_find(tmp_ctx));
+	nt_status = resolve_name(lp_resolve_context(mprLpCtx()), &name, tmp_ctx, &reply_addr, event_context_find(tmp_ctx));
 
 	if (NT_STATUS_IS_OK(nt_status)) {
 		mprSetPropertyValue(argv[0], "value", mprString(reply_addr));
diff --git a/source4/scripting/ejs/smbcalls_reg.c b/source4/scripting/ejs/smbcalls_reg.c
index 30e5357cfb..e20d91ad2e 100644
--- a/source4/scripting/ejs/smbcalls_reg.c
+++ b/source4/scripting/ejs/smbcalls_reg.c
@@ -70,7 +70,7 @@ static int ejs_reg_open(MprVarHandle eid, int argc, struct MprVar **argv)
 	struct registry_context *rctx;
 	WERROR error;
 
-	error = reg_open_samba(mprMemCtx(), &rctx, global_loadparm, NULL, NULL);
+	error = reg_open_samba(mprMemCtx(), &rctx, mprLpCtx(), NULL, NULL);
 	SMB_ASSERT(W_ERROR_IS_OK(error));
 
 	mprSetPtrChild(reg, "registry", rctx);
diff --git a/source4/scripting/ejs/smbcalls_rpc.c b/source4/scripting/ejs/smbcalls_rpc.c
index 44cfa16d7e..d1e49b4348 100644
--- a/source4/scripting/ejs/smbcalls_rpc.c
+++ b/source4/scripting/ejs/smbcalls_rpc.c
@@ -79,9 +79,9 @@ static int ejs_irpc_connect(MprVarHandle eid, int argc, char **argv)
 	   allocate temporary server ids automatically */
 	for (i=0;i<10000;i++) {
 		p->msg_ctx = messaging_init(p, 
-					    lp_messaging_path(p, global_loadparm),
+					    lp_messaging_path(p, mprLpCtx()),
 					    cluster_id(EJS_ID_BASE, i), 
-				            lp_iconv_convenience(global_loadparm),
+				            lp_iconv_convenience(mprLpCtx()),
 					    ev);
 		if (p->msg_ctx) break;
 	}
@@ -161,7 +161,7 @@ static int ejs_rpc_connect(MprVarHandle eid, int argc, char **argv)
 	ev = event_context_find(mprMemCtx());
 
 	status = dcerpc_pipe_connect(this, &p, binding, iface, creds, ev,
-				     global_loadparm);
+				     mprLpCtx());
 	if (!NT_STATUS_IS_OK(status)) goto done;
 
 	/* callers don't allocate ref vars in the ejs interface */
diff --git a/source4/scripting/ejs/smbcalls_sys.c b/source4/scripting/ejs/smbcalls_sys.c
index 72ddf90231..00599a55bc 100644
--- a/source4/scripting/ejs/smbcalls_sys.c
+++ b/source4/scripting/ejs/smbcalls_sys.c
@@ -36,7 +36,7 @@ static int ejs_sys_interfaces(MprVarHandle eid, int argc, struct MprVar **argv)
 	struct MprVar ret = mprArray("interfaces");
 	struct interface *ifaces;
 
-	load_interfaces(NULL, lp_interfaces(global_loadparm), &ifaces);
+	load_interfaces(NULL, lp_interfaces(mprLpCtx()), &ifaces);
 
 	count = iface_count(ifaces);
 	for (i=0;i<count;i++) {
-- 
cgit 


From 3101cb888d5cbad785050b8491b138d683d444fb Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 25 Feb 2008 12:51:55 +0100
Subject: Remove uses of global_loadparm. (This used to be commit
 a16c9a2129ce92e7e1a613b2badd168e42ead436)

---
 source4/scripting/ejs/smbcalls_cli.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_cli.c b/source4/scripting/ejs/smbcalls_cli.c
index 4f2d52b25c..dbb36312da 100644
--- a/source4/scripting/ejs/smbcalls_cli.c
+++ b/source4/scripting/ejs/smbcalls_cli.c
@@ -445,7 +445,7 @@ static int ejs_tree_connect(MprVarHandle eid, int argc, char **argv)
 	io.in.credentials            = creds;
 	io.in.fallback_to_anonymous  = false;
 	io.in.workgroup              = lp_workgroup(mprLpCtx());
-	lp_smbcli_options(global_loadparm, &io.in.options);
+	lp_smbcli_options(mprLpCtx(), &io.in.options);
 
 	result = smb_composite_connect(&io, mem_ctx, 
 				       lp_resolve_context(mprLpCtx()), 
-- 
cgit 


From 22ef67dd136f0a67885a17be68909643dc97304d Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 26 Feb 2008 01:20:55 +0100
Subject: Fix the build (again). (This used to be commit
 ef00f6b5817107738dc44367838095896af4e77d)

---
 source4/scripting/ejs/smbcalls.c | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls.c b/source4/scripting/ejs/smbcalls.c
index da35a6ba8c..ac1c20008b 100644
--- a/source4/scripting/ejs/smbcalls.c
+++ b/source4/scripting/ejs/smbcalls.c
@@ -172,6 +172,32 @@ _PUBLIC_ void ejs_exception(const char *reason)
 */
 void smb_setup_ejs_functions(void (*exception_handler)(const char *))
 {
+	extern NTSTATUS ejs_init_security(void);
+	extern NTSTATUS ejs_init_initshutdown(void);
+	extern NTSTATUS smb_setup_ejs_reg(void);
+	extern NTSTATUS smb_setup_ejs_string(void);
+	extern NTSTATUS ejs_init_lsarpc(void);
+	extern NTSTATUS ejs_init_rpcecho(void);
+	extern NTSTATUS ejs_init_winreg(void);
+	extern NTSTATUS smb_setup_ejs_random(void);
+	extern NTSTATUS smb_setup_ejs_config(void);
+	extern NTSTATUS ejs_init_misc(void);
+	extern NTSTATUS ejs_init_netdfs(void);
+	extern NTSTATUS smb_setup_ejs_datablob(void);
+	extern NTSTATUS smb_setup_ejs_auth(void);
+	extern NTSTATUS smb_setup_ejs_nss(void);
+	extern NTSTATUS ejs_init_samr(void);
+	extern NTSTATUS ejs_init_wkssvc(void);
+	extern NTSTATUS smb_setup_ejs_system(void);
+	extern NTSTATUS smb_setup_ejs_ldb(void);
+	extern NTSTATUS ejs_init_svcctl(void);
+	extern NTSTATUS smb_setup_ejs_nbt(void);
+	extern NTSTATUS smb_setup_ejs_net(void);
+	extern NTSTATUS ejs_init_srvsvc(void);
+	extern NTSTATUS ejs_init_netlogon(void);
+	extern NTSTATUS ejs_init_drsuapi(void);
+	extern NTSTATUS ejs_init_irpc(void);
+	extern NTSTATUS ejs_init_eventlog(void);
 	init_module_fn static_init[] = { STATIC_smbcalls_MODULES };
 	init_module_fn *shared_init;
 
-- 
cgit 


From ef15b28d244dcaaa38a07055c3a88f6199173611 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 26 Feb 2008 16:02:51 +0100
Subject: use make macro for python. (This used to be commit
 b0408abb08648c0155d8f5da5fb299b1acbc09b6)

---
 source4/scripting/python/config.mk | 27 ---------------------------
 1 file changed, 27 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/config.mk b/source4/scripting/python/config.mk
index 16cd301aad..cafbea6b6e 100644
--- a/source4/scripting/python/config.mk
+++ b/source4/scripting/python/config.mk
@@ -15,36 +15,9 @@ OBJ_FILES = uuidmodule.o
 PRIVATE_DEPENDENCIES = LIBNDR LIBLDB SAMDB CREDENTIALS
 SWIG_FILE = misc.i
 
-# Swig extensions
-swig:: pythonmods
-
-.SUFFIXES: _wrap.c .i
-
-.i_wrap.c:
-	[ "$(SWIG)" == "no" ] || $(SWIG) -O -Wall -I$(srcdir)/scripting/swig -python -keyword $<
-
-realdistclean::
-	@echo "Removing SWIG output files"
-	@-rm -f bin/python/*
-	# FIXME: Remove _wrap.c files
-
-pythonmods:: $(PYTHON_DSOS) $(PYTHON_PYS)
-
 PYDOCTOR_MODULES=bin/python/ldb.py bin/python/auth.py bin/python/credentials.py bin/python/registry.py bin/python/tdb.py bin/python/security.py bin/python/events.py bin/python/net.py
 
 pydoctor:: pythonmods
 	LD_LIBRARY_PATH=bin/shared PYTHONPATH=bin/python pydoctor --project-name=Samba --make-html --docformat=restructuredtext --add-package scripting/python/samba/ $(addprefix --add-module , $(PYDOCTOR_MODULES))
 
-bin/python/%.py: 
-	mkdir -p $(@D)
-	cp $< $@
-
-installpython:: pythonmods
-	@$(SHELL) $(srcdir)/script/installpython.sh \
-		$(INSTALLPERMS) \
-		$(DESTDIR)$(PYTHONDIR) \
-		scripting/python bin/python
 
-clean::
-	@echo "Removing python modules"
-	@rm -f bin/python/*
-- 
cgit 


From 2ca7dfe20c4a86d0abacf5cafc81a2dd97acc7dd Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 26 Feb 2008 16:51:50 +0100
Subject: Fix pydoctor. (This used to be commit
 023025e4de119aa234f885aa6e5594660bd8f358)

---
 source4/scripting/python/config.mk | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/config.mk b/source4/scripting/python/config.mk
index cafbea6b6e..56634736bd 100644
--- a/source4/scripting/python/config.mk
+++ b/source4/scripting/python/config.mk
@@ -15,9 +15,6 @@ OBJ_FILES = uuidmodule.o
 PRIVATE_DEPENDENCIES = LIBNDR LIBLDB SAMDB CREDENTIALS
 SWIG_FILE = misc.i
 
-PYDOCTOR_MODULES=bin/python/ldb.py bin/python/auth.py bin/python/credentials.py bin/python/registry.py bin/python/tdb.py bin/python/security.py bin/python/events.py bin/python/net.py
-
-pydoctor:: pythonmods
-	LD_LIBRARY_PATH=bin/shared PYTHONPATH=bin/python pydoctor --project-name=Samba --make-html --docformat=restructuredtext --add-package scripting/python/samba/ $(addprefix --add-module , $(PYDOCTOR_MODULES))
-
+_PY_FILES = $(shell find scripting/python -name "*.py")
 
+$(foreach pyfile, $(_PY_FILES),$(eval $(call python_py_module_template,$(patsubst scripting/python/%,%,$(pyfile)),$(pyfile))))
-- 
cgit 


From 9b7baec42bc00985697be895e5d21aae50322f4d Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Thu, 28 Feb 2008 08:39:45 +1100
Subject: Reorder modules to have rdn_name before objectclass.

This ensures the relative DN is placed in the correct case into the
DB.

Andrew Bartlett
(This used to be commit 16378219fbf9e8a26621f848e85426180822ea29)
---
 source4/scripting/python/samba/provision.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index e3c47ff4a2..55935b0037 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -313,9 +313,9 @@ def setup_samdb_partitions(samdb_path, setup_path, message, lp, session_info,
                     "server_sort",
                     "extended_dn",
                     "asq",
-                    "samldb",
                     "rdn_name",
                     "objectclass",
+                    "samldb",
                     "kludge_acl",
                     "operational"]
     tdb_modules_list = [
-- 
cgit 


From 2ba62662f8e2578153be3125eb557b9349ccfd3b Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Thu, 28 Feb 2008 20:04:58 +0100
Subject: Remove sDefault as static variable. (This used to be commit
 16f36ce499e93860dd535034a584ec2b93e7a172)

---
 source4/scripting/python/config.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/config.mk b/source4/scripting/python/config.mk
index b15e1fcda7..0d47c8c542 100644
--- a/source4/scripting/python/config.mk
+++ b/source4/scripting/python/config.mk
@@ -25,7 +25,7 @@ swig:: pythonmods
 
 realdistclean::
 	@echo "Removing SWIG output files"
-	@-rm -f bin/python/*
+	@-rm -rf bin/python/*
 	# FIXME: Remove _wrap.c files
 
 pythonmods:: $(PYTHON_DSOS) $(PYTHON_PYS)
-- 
cgit 


From 09447777d0c1a00daced1c63c3614136acfbe53f Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sat, 16 Feb 2008 16:15:21 +0100
Subject: use gmake to handle .py file copies. (This used to be commit
 d54421a9eeadbd76791917c5e3c460c897259ede)

---
 source4/scripting/python/config.mk | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/config.mk b/source4/scripting/python/config.mk
index 0d47c8c542..b68abdba5e 100644
--- a/source4/scripting/python/config.mk
+++ b/source4/scripting/python/config.mk
@@ -35,6 +35,10 @@ PYDOCTOR_MODULES=bin/python/ldb.py bin/python/auth.py bin/python/credentials.py
 pydoctor:: pythonmods
 	LD_LIBRARY_PATH=bin/shared PYTHONPATH=bin/python pydoctor --project-name=Samba --make-html --docformat=restructuredtext --add-package scripting/python/samba/ $(addprefix --add-module , $(PYDOCTOR_MODULES))
 
+bin/python/%.py: 
+	mkdir -p $(@D)
+	cp $< $@
+
 installpython:: pythonmods
 	@$(SHELL) $(srcdir)/script/installpython.sh \
 		$(INSTALLPERMS) \
-- 
cgit 


From 21208d3303ec13056f706ee74132822a7dd2f36a Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Fri, 29 Feb 2008 14:32:37 +0100
Subject: Fix typos, avoid DEPEND_LIST from growing with empty elements. (This
 used to be commit b30fd477ff0d97bb4de3c5301a6cdc47867451ee)

---
 source4/scripting/python/config.mk | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/config.mk b/source4/scripting/python/config.mk
index b68abdba5e..a16d737344 100644
--- a/source4/scripting/python/config.mk
+++ b/source4/scripting/python/config.mk
@@ -25,7 +25,6 @@ swig:: pythonmods
 
 realdistclean::
 	@echo "Removing SWIG output files"
-	@-rm -rf bin/python/*
 	# FIXME: Remove _wrap.c files
 
 pythonmods:: $(PYTHON_DSOS) $(PYTHON_PYS)
@@ -47,4 +46,4 @@ installpython:: pythonmods
 
 clean::
 	@echo "Removing python modules"
-	@rm -f bin/python/*
+	@rm -rf bin/python/*
-- 
cgit 


From c20cf59768d585baf4524c54dadba1ec60673894 Mon Sep 17 00:00:00 2001
From: Douglas VanLeuven <roamdad@sonic.net>
Date: Mon, 3 Mar 2008 11:08:59 +1100
Subject: Fix member server provision

Can't add "member server" because the script aborts with null
reference when no match on serverrole.  This is fixed by checking for
the keyword "member server".
(This used to be commit 62536750ae06248a49c6b56c86d01b0062bb54f0)
---
 source4/scripting/python/samba/provision.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index 55935b0037..e9aded205a 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -830,7 +830,7 @@ def provision(lp, setup_dir, message, paths, session_info,
         message("Setting up smb.conf")
         if serverrole == "domain controller":
             smbconfsuffix = "dc"
-        elif serverrole == "member":
+        elif serverrole == "member server":
             smbconfsuffix = "member"
         setup_file(setup_path("provision.smb.conf.%s" % smbconfsuffix), 
                    paths.smbconf, {
-- 
cgit 


From 4d4a898742a0439d3f60c84194b02901412f4679 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Mon, 3 Mar 2008 13:03:19 +1100
Subject: Fix failure to re-provision.

Somewhere in the conversion from ejs we lost calling the 'delete
partitions' code.  However, we have to be careful not to wipe
partitions when we are the second client connecting to an LDAP server.

Andrew Bartlett
(This used to be commit 272eb765b81e3eab216a07249334f9b7d20e530b)
---
 source4/scripting/python/samba/__init__.py  | 11 +++++++++--
 source4/scripting/python/samba/provision.py | 19 ++++++++++++-------
 2 files changed, 21 insertions(+), 9 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/__init__.py b/source4/scripting/python/samba/__init__.py
index b041165800..8d5f4250c9 100644
--- a/source4/scripting/python/samba/__init__.py
+++ b/source4/scripting/python/samba/__init__.py
@@ -127,7 +127,7 @@ class Ldb(ldb.Ldb):
             try:
                 self.delete(msg.dn)
             except ldb.LdbError, (LDB_ERR_NO_SUCH_OBJECT, _):
-                # Ignor eno such object errors
+                # Ignore no such object errors
                 pass
 
         res = self.search(basedn, ldb.SCOPE_SUBTREE, "(&(|(objectclass=*)(distinguishedName=*))(!(distinguishedName=@BASEINFO)))", ["distinguishedName"])
@@ -151,7 +151,14 @@ class Ldb(ldb.Ldb):
                 previous_remaining = current_remaining
                 current_remaining = len(res2)
                 for msg in res2:
-                    self.delete(msg.dn)
+                    try:
+                        self.delete(msg.dn)
+                    # Ignore no such object errors
+                    except ldb.LdbError, (LDB_ERR_NO_SUCH_OBJECT, _):
+                        pass
+                    # Ignore not allowed on non leaf errors
+                    except ldb.LdbError, (LDB_ERR_NOT_ALLOWED_ON_NON_LEAF, _):
+                        pass
 
     def load_ldif_file_add(self, ldif_path):
         """Load a LDIF file.
diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index e9aded205a..ea2feb981b 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -279,8 +279,6 @@ def setup_samdb_partitions(samdb_path, setup_path, message, lp, session_info,
     
     Alternatively, provision() may call this, and then populate the database.
     
-    :param erase: Remove the existing data present in the database.
-     
     :note: This will wipe the Sam Database!
     
     :note: This function always removes the local SAM LDB file. The erase 
@@ -289,10 +287,15 @@ def setup_samdb_partitions(samdb_path, setup_path, message, lp, session_info,
     """
     assert session_info is not None
 
-    if os.path.exists(samdb_path):
+    samdb = SamDB(samdb_path, session_info=session_info, 
+                  credentials=credentials, lp=lp)
+
+    # Wipes the database
+    try:
+        samdb.erase()
+    except:
         os.unlink(samdb_path)
 
-    # Also wipes the database
     samdb = SamDB(samdb_path, session_info=session_info, 
                   credentials=credentials, lp=lp)
 
@@ -547,7 +550,7 @@ def setup_self_join(samdb, configdn, schemadn, domaindn,
 
 def setup_samdb(path, setup_path, session_info, credentials, lp, 
                 schemadn, configdn, domaindn, dnsdomain, realm, 
-                netbiosname, message, hostname, rootdn, erase, 
+                netbiosname, message, hostname, rootdn, 
                 domainsid, aci, domainguid, policyguid, 
                 domainname, fill, adminpass, krbtgtpass, 
                 machinepass, hostguid, invocationid, dnspass,
@@ -560,6 +563,8 @@ def setup_samdb(path, setup_path, session_info, credentials, lp,
 
     assert serverrole in ("domain controller", "member server")
 
+    erase = (fill != FILL_DRS)    
+
     # Also wipes the database
     setup_samdb_partitions(path, setup_path, schemadn=schemadn, configdn=configdn, 
                            domaindn=domaindn, message=message, lp=lp,
@@ -726,7 +731,7 @@ def provision(lp, setup_dir, message, paths, session_info,
               hostguid=None, adminpass=None, krbtgtpass=None, domainguid=None, 
               policyguid=None, invocationid=None, machinepass=None, 
               dnspass=None, root=None, nobody=None, nogroup=None, users=None, 
-              wheel=None, backup=None, aci=None, serverrole=None, erase=False,
+              wheel=None, backup=None, aci=None, serverrole=None,
               ldap_backend=None, ldap_backend_type=None, sitename=DEFAULTSITE):
     """Provision samba4
     
@@ -873,7 +878,7 @@ def provision(lp, setup_dir, message, paths, session_info,
                         configdn=configdn, domaindn=domaindn,
                         dnsdomain=dnsdomain, netbiosname=netbiosname, 
                         realm=realm, message=message, hostname=hostname, 
-                        rootdn=rootdn, erase=erase, domainsid=domainsid, 
+                        rootdn=rootdn, domainsid=domainsid, 
                         aci=aci, domainguid=domainguid, policyguid=policyguid, 
                         domainname=domain, fill=samdb_fill, 
                         adminpass=adminpass, krbtgtpass=krbtgtpass,
-- 
cgit 


From b29d47edcf2767d7f9e9f63332079c6e8e89946c Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 3 Mar 2008 18:25:28 +0100
Subject: Move object file lists to the Makefile. (This used to be commit
 a7e6d2a1832db388fdafa1279f84c9a8bbfc87d6)

---
 source4/scripting/ejs/config.mk        | 57 ++++++++++++++++++++--------------
 source4/scripting/ejs/ejsnet/config.mk | 14 +++++----
 source4/scripting/python/config.mk     |  9 ++++--
 3 files changed, 48 insertions(+), 32 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/config.mk b/source4/scripting/ejs/config.mk
index c1f07367fb..6acf902c08 100644
--- a/source4/scripting/ejs/config.mk
+++ b/source4/scripting/ejs/config.mk
@@ -1,84 +1,85 @@
 [SUBSYSTEM::EJSRPC]
-OBJ_FILES = \
-		ejsrpc.o
+
+EJSRPC_OBJ_FILES = scripting/ejs/ejsrpc.o
 
 [MODULE::smbcalls_config]
-OBJ_FILES = smbcalls_config.o
 OUTPUT_TYPE = MERGED_OBJ
 SUBSYSTEM = smbcalls
 INIT_FUNCTION = smb_setup_ejs_config
 
+smbcalls_config_OBJ_FILES = scripting/ejs/smbcalls_config.o
+
 [MODULE::smbcalls_ldb]
-OBJ_FILES = smbcalls_ldb.o
 OUTPUT_TYPE = MERGED_OBJ
 SUBSYSTEM = smbcalls
 INIT_FUNCTION = smb_setup_ejs_ldb
 PRIVATE_DEPENDENCIES = LIBLDB SAMDB LIBNDR
 
+smbcalls_ldb_OBJ_FILES = scripting/ejs/smbcalls_ldb.o
+
 [MODULE::smbcalls_reg]
-OBJ_FILES = smbcalls_reg.o
 SUBSYSTEM = smbcalls
 OUTPUT_TYPE = MERGED_OBJ
 INIT_FUNCTION = smb_setup_ejs_reg
 PRIVATE_DEPENDENCIES = registry SAMDB LIBNDR
 
+smbcalls_reg_OBJ_FILES = scripting/ejs/smbcalls_reg.o
+
 [MODULE::smbcalls_nbt]
-OBJ_FILES = smbcalls_nbt.o
 SUBSYSTEM = smbcalls
 OUTPUT_TYPE = MERGED_OBJ
 INIT_FUNCTION = smb_setup_ejs_nbt
 
+smbcalls_nbt_OBJ_FILES = scripting/ejs/smbcalls_nbt.o
+
 [MODULE::smbcalls_rand]
-OBJ_FILES = smbcalls_rand.o
 SUBSYSTEM = smbcalls
 OUTPUT_TYPE = MERGED_OBJ
 INIT_FUNCTION = smb_setup_ejs_random
 
+smbcalls_rand_OBJ_FILES = scripting/ejs/smbcalls_rand.o
+
 [MODULE::smbcalls_nss]
-OBJ_FILES = smbcalls_nss.o
 SUBSYSTEM = smbcalls
 OUTPUT_TYPE = MERGED_OBJ
 INIT_FUNCTION = smb_setup_ejs_nss
 PRIVATE_DEPENDENCIES = NSS_WRAPPER
 
+smbcalls_nss_OBJ_FILES = scripting/ejs/smbcalls_nss.o
+
 [MODULE::smbcalls_data]
-OBJ_FILES = smbcalls_data.o
 SUBSYSTEM = smbcalls
 OUTPUT_TYPE = MERGED_OBJ
 INIT_FUNCTION = smb_setup_ejs_datablob
 
+smbcalls_data_OBJ_FILES = scripting/ejs/smbcalls_data.o
+
 [MODULE::smbcalls_auth]
-OBJ_FILES = smbcalls_auth.o
 OUTPUT_TYPE = MERGED_OBJ
 SUBSYSTEM = smbcalls
 INIT_FUNCTION = smb_setup_ejs_auth
 PRIVATE_DEPENDENCIES = auth
 
+smbcalls_auth_OBJ_FILES = scripting/ejs/smbcalls_auth.o
+
 [MODULE::smbcalls_string]
-OBJ_FILES = smbcalls_string.o
 SUBSYSTEM = smbcalls
 OUTPUT_TYPE = MERGED_OBJ
 INIT_FUNCTION = smb_setup_ejs_string
 
+smbcalls_string_OBJ_FILES = scripting/ejs/smbcalls_string.o
+
 [MODULE::smbcalls_sys]
-OBJ_FILES = smbcalls_sys.o
 SUBSYSTEM = smbcalls
 OUTPUT_TYPE = MERGED_OBJ
 INIT_FUNCTION = smb_setup_ejs_system
 
+smbcalls_sys_OBJ_FILES = scripting/ejs/smbcalls_sys.o
+
 mkinclude ejsnet/config.mk
 
 [SUBSYSTEM::smbcalls]
 PRIVATE_PROTO_HEADER = proto.h
-OBJ_FILES = \
-		smbcalls.o \
-		smbcalls_cli.o \
-		smbcalls_rpc.o \
-		smbcalls_options.o \
-		smbcalls_creds.o \
-		smbcalls_param.o \
-		mprutil.o \
-		literal.o
 PRIVATE_DEPENDENCIES = \
 		EJS LIBSAMBA-UTIL \
 		EJSRPC MESSAGING \
@@ -87,12 +88,22 @@ PRIVATE_DEPENDENCIES = \
 		dcerpc \
 		NDR_TABLE
 
+smbcalls_OBJ_FILES = $(addprefix scripting/ejs/, \
+		smbcalls.o \
+		smbcalls_cli.o \
+		smbcalls_rpc.o \
+		smbcalls_options.o \
+		smbcalls_creds.o \
+		smbcalls_param.o \
+		mprutil.o \
+		literal.o)
+
 #######################
 # Start BINARY SMBSCRIPT
 [BINARY::smbscript]
 INSTALLDIR = BINDIR
-OBJ_FILES = \
-		smbscript.o
 PRIVATE_DEPENDENCIES = EJS LIBSAMBA-UTIL smbcalls LIBSAMBA-CONFIG
 # End BINARY SMBSCRIPT
 #######################
+
+smbscript_OBJ_FILES = scripting/ejs/smbscript.o
diff --git a/source4/scripting/ejs/ejsnet/config.mk b/source4/scripting/ejs/ejsnet/config.mk
index 249a33121d..85a5b2bf09 100644
--- a/source4/scripting/ejs/ejsnet/config.mk
+++ b/source4/scripting/ejs/ejsnet/config.mk
@@ -1,11 +1,13 @@
 [MODULE::smbcalls_net]
-OBJ_FILES = \
-		net_ctx.o \
-		net_user.o \
-		mpr_user.o \
-		net_host.o \
-		mpr_host.o
 SUBSYSTEM = smbcalls
 INIT_FUNCTION = smb_setup_ejs_net
 PRIVATE_PROTO_HEADER = proto.h
 PRIVATE_DEPENDENCIES = LIBSAMBA-NET LIBCLI_SMB CREDENTIALS
+
+smbcalls_net_OBJ_FILES = $(addprefix scripting/ejs/ejsnet/,  \
+		net_ctx.o \
+		net_user.o \
+		mpr_user.o \
+		net_host.o \
+		mpr_host.o)
+
diff --git a/source4/scripting/python/config.mk b/source4/scripting/python/config.mk
index 56634736bd..8a3a637bf5 100644
--- a/source4/scripting/python/config.mk
+++ b/source4/scripting/python/config.mk
@@ -1,15 +1,18 @@
 [BINARY::smbpython]
 PRIVATE_DEPENDENCIES = LIBPYTHON
-OBJ_FILES = smbpython.o
+
+smbpython_OBJ_FILES = scripting/python/smbpython.o
 
 [SUBSYSTEM::LIBPYTHON]
 PUBLIC_DEPENDENCIES = EXT_LIB_PYTHON
 INIT_FUNCTION_SENTINEL = { NULL, NULL }
-OBJ_FILES = modules.o pytalloc.o
+
+LIBPYTHON_OBJ_FILES = $(addprefix scripting/python/, modules.o pytalloc.o)
 
 [PYTHON::python_uuid]
 PRIVATE_DEPENDENCIES = LIBNDR 
-OBJ_FILES = uuidmodule.o
+
+python_uuid_OBJ_FILES = scripting/python/uuidmodule.o
 
 [PYTHON::python_misc]
 PRIVATE_DEPENDENCIES = LIBNDR LIBLDB SAMDB CREDENTIALS
-- 
cgit 


From 2d1c06c5781600a0efcf9becd3e2773dbbbf2cc7 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 4 Mar 2008 00:43:24 +0100
Subject: Fix includes. (This used to be commit
 99e61dade2bd9ae2a5dfe17f766528012c09e46c)

---
 source4/scripting/python/config.mk | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/config.mk b/source4/scripting/python/config.mk
index 8a3a637bf5..a0f5caad3b 100644
--- a/source4/scripting/python/config.mk
+++ b/source4/scripting/python/config.mk
@@ -18,6 +18,8 @@ python_uuid_OBJ_FILES = scripting/python/uuidmodule.o
 PRIVATE_DEPENDENCIES = LIBNDR LIBLDB SAMDB CREDENTIALS
 SWIG_FILE = misc.i
 
+python_misc_OBJ_FILES = scripting/python/misc_wrap.o
+
 _PY_FILES = $(shell find scripting/python -name "*.py")
 
 $(foreach pyfile, $(_PY_FILES),$(eval $(call python_py_module_template,$(patsubst scripting/python/%,%,$(pyfile)),$(pyfile))))
-- 
cgit 


From 7e0ef3fd0ef4dba827f331cbe43fa0524be91130 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Thu, 6 Mar 2008 21:55:26 +1100
Subject: Make Samba4 pass the NET-API-BECOMEDC test against Win2k3 (again).

To make Samba4, using the python provision system, pass this test
required some major rework.  Untested code is broken code, and some of
the refactoring for a seperate provision test (which also now passes)
broke things.

Similarly, the iconv work has compiled, but these codepaths have never
been run (NULL pointer de-reference).

In working to use a local, rather than global, loadparm context, and
to support using a target directory, a few things needed to be
reworked, particularly around path handling.

Andrew Bartlett
(This used to be commit 1169e8d7bee20477b0efbfea3534ac63c83fb3d6)
---
 source4/scripting/python/samba/provision.py | 214 ++++++++++++++++++----------
 1 file changed, 138 insertions(+), 76 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index ea2feb981b..ab8c51595f 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -32,6 +32,7 @@ from socket import gethostname, gethostbyname
 import param
 import registry
 import samba
+from auth import system_session
 from samba import Ldb, substitute_var, valid_netbios_name, check_all_substituted
 from samba.samdb import SamDB
 import security
@@ -65,6 +66,7 @@ class ProvisionPaths:
         self.dns_keytab = None
         self.dns = None
         self.winsdb = None
+        self.private_dir = None
 
 
 def check_install(lp, session_info, credentials):
@@ -197,20 +199,20 @@ def provision_paths_from_lp(lp, dnsdomain):
     :param dnsdomain: DNS Domain name
     """
     paths = ProvisionPaths()
-    private_dir = lp.get("private dir")
+    paths.private_dir = lp.get("private dir")
     paths.keytab = "secrets.keytab"
     paths.dns_keytab = "dns.keytab"
 
-    paths.shareconf = os.path.join(private_dir, "share.ldb")
-    paths.samdb = os.path.join(private_dir, lp.get("sam database") or "samdb.ldb")
-    paths.idmapdb = os.path.join(private_dir, lp.get("idmap database") or "idmap.ldb")
-    paths.secrets = os.path.join(private_dir, lp.get("secrets database") or "secrets.ldb")
-    paths.templates = os.path.join(private_dir, "templates.ldb")
-    paths.dns = os.path.join(private_dir, dnsdomain + ".zone")
-    paths.winsdb = os.path.join(private_dir, "wins.ldb")
-    paths.s4_ldapi_path = os.path.join(private_dir, "ldapi")
-    paths.smbconf = os.path.join(private_dir, "smb.conf")
-    paths.phpldapadminconfig = os.path.join(private_dir, 
+    paths.shareconf = os.path.join(paths.private_dir, "share.ldb")
+    paths.samdb = os.path.join(paths.private_dir, lp.get("sam database") or "samdb.ldb")
+    paths.idmapdb = os.path.join(paths.private_dir, lp.get("idmap database") or "idmap.ldb")
+    paths.secrets = os.path.join(paths.private_dir, lp.get("secrets database") or "secrets.ldb")
+    paths.templates = os.path.join(paths.private_dir, "templates.ldb")
+    paths.dns = os.path.join(paths.private_dir, dnsdomain + ".zone")
+    paths.winsdb = os.path.join(paths.private_dir, "wins.ldb")
+    paths.s4_ldapi_path = os.path.join(paths.private_dir, "ldapi")
+    paths.smbconf = os.path.join(paths.private_dir, "smb.conf")
+    paths.phpldapadminconfig = os.path.join(paths.private_dir, 
                                             "phpldapadmin-config.php")
     paths.hklm = "hklm.ldb"
     paths.hkcr = "hkcr.ldb"
@@ -588,7 +590,7 @@ def setup_samdb(path, setup_path, session_info, credentials, lp,
     samdb = SamDB(path, session_info=session_info, 
                   credentials=credentials, lp=lp)
     samdb.set_domain_sid(domainsid)
-    if lp.get("server role") == "domain controller":
+    if serverrole == "domain controller":
         samdb.set_invocation_id(invocationid)
 
     load_schema(setup_path, samdb, schemadn, netbiosname, configdn, sitename)
@@ -699,7 +701,7 @@ def setup_samdb(path, setup_path, session_info, credentials, lp,
                 "KRBTGTPASS_B64": b64encode(krbtgtpass),
                 })
 
-            if lp.get("server role") == "domain controller":
+            if serverrole == "domain controller":
                 message("Setting up self join")
                 setup_self_join(samdb, configdn=configdn, schemadn=schemadn, 
                                 domaindn=domaindn, invocationid=invocationid, 
@@ -725,13 +727,14 @@ FILL_FULL = "FULL"
 FILL_NT4SYNC = "NT4SYNC"
 FILL_DRS = "DRS"
 
-def provision(lp, setup_dir, message, paths, session_info, 
-              credentials, samdb_fill=FILL_FULL, realm=None, rootdn=None,
+def provision(setup_dir, message, session_info, 
+              credentials, smbconf=None, targetdir=None, samdb_fill=FILL_FULL, realm=None, 
+              rootdn=None, domaindn=None, schemadn=None, configdn=None,
               domain=None, hostname=None, hostip=None, domainsid=None, 
               hostguid=None, adminpass=None, krbtgtpass=None, domainguid=None, 
               policyguid=None, invocationid=None, machinepass=None, 
               dnspass=None, root=None, nobody=None, nogroup=None, users=None, 
-              wheel=None, backup=None, aci=None, serverrole=None,
+              wheel=None, backup=None, aci=None, serverrole=None, 
               ldap_backend=None, ldap_backend_type=None, sitename=DEFAULTSITE):
     """Provision samba4
     
@@ -768,6 +771,65 @@ def provision(lp, setup_dir, message, paths, session_info,
         backup = findnss(grp.getgrnam, ["backup", "wheel", "root", "staff"])[0]
     if aci is None:
         aci = "# no aci for local ldb"
+    if hostname is None:
+        hostname = gethostname().split(".")[0].lower()
+
+    if hostip is None:
+        hostip = gethostbyname(hostname)
+
+    netbiosname = hostname.upper()
+    if not valid_netbios_name(netbiosname):
+        raise InvalidNetbiosName(netbiosname)
+
+    if targetdir is not None:
+        if not os.path.exists(targetdir):
+            os.mkdir(targetdir)
+        if not os.path.exists(os.path.join(targetdir, "etc")):
+           os.mkdir(os.path.join(targetdir, "etc"))
+
+        if smbconf is None:
+            smbconf = os.path.join(targetdir, os.path.join("etc", "smb.conf"))
+
+    # only install a new smb.conf if there isn't one there already
+    if not os.path.exists(smbconf):
+        message("Setting up smb.conf")
+        assert serverrole is not None
+        if serverrole == "domain controller":
+            smbconfsuffix = "dc"
+        elif serverrole == "member server":
+            smbconfsuffix = "member"
+
+        assert domain is not None
+        assert realm is not None
+
+        default_lp = param.LoadParm()
+        #Load non-existant file
+        default_lp.load(smbconf)
+        
+        if targetdir is not None:
+            privatedir_line = "private dir = " + os.path.abspath(os.path.join(targetdir, "private"))
+            lockdir_line = "lock dir = " + os.path.abspath(targetdir)
+
+            default_lp.set("lock dir", os.path.abspath(targetdir))
+            
+        sysvol = os.path.join(default_lp.get("lock dir"), "sysvol")
+        netlogon = os.path.join(os.path.join(sysvol, "scripts"))
+
+        setup_file(setup_path("provision.smb.conf.%s" % smbconfsuffix), 
+                   smbconf, {
+                "HOSTNAME": hostname,
+                "DOMAIN_CONF": domain,
+                "REALM_CONF": realm,
+                "SERVERROLE": serverrole,
+                "NETLOGONPATH": netlogon,
+                "SYSVOLPATH": sysvol,
+                "PRIVATEDIR_LINE": privatedir_line,
+                "LOCKDIR_LINE": lockdir_line
+                })
+
+    lp = param.LoadParm()
+    lp.load(smbconf)
+
     if serverrole is None:
         serverrole = lp.get("server role")
     assert serverrole in ("domain controller", "member server")
@@ -777,32 +839,26 @@ def provision(lp, setup_dir, message, paths, session_info,
     if realm is None:
         realm = lp.get("realm")
 
-    if lp.get("realm").upper() != realm.upper():
-        raise Exception("realm '%s' in smb.conf must match chosen realm '%s'" %
-                (lp.get("realm"), realm))
-
-    ldapi_url = "ldapi://%s" % urllib.quote(paths.s4_ldapi_path, safe="")
-    
-    if ldap_backend == "ldapi":
-        # provision-backend will set this path suggested slapd command line / fedorads.inf
-        ldap_backend = "ldapi://" % urllib.quote(os.path.join(lp.get("private dir"), "ldap", "ldapi"), safe="")
-
     assert realm is not None
     realm = realm.upper()
 
-    if hostname is None:
-        hostname = gethostname().split(".")[0].lower()
+    dnsdomain = realm.lower()
 
-    if hostip is None:
-        hostip = gethostbyname(hostname)
+    paths = provision_paths_from_lp(lp, dnsdomain)
 
-    netbiosname = hostname.upper()
-    if not valid_netbios_name(netbiosname):
-        raise InvalidNetbiosName(netbiosname)
+    if targetdir is not None:
+        if not os.path.exists(paths.private_dir):
+            os.mkdir(paths.private_dir)
+
+    ldapi_url = "ldapi://%s" % urllib.quote(paths.s4_ldapi_path, safe="")
+    
+    if ldap_backend == "ldapi":
+        # provision-backend will set this path suggested slapd command line / fedorads.inf
+        ldap_backend = "ldapi://" % urllib.quote(os.path.join(paths.private_dir, "ldap", "ldapi"), safe="")
 
-    dnsdomain = realm.lower()
     if serverrole == "domain controller":
-        domaindn = "DC=" + dnsdomain.replace(".", ",DC=")
+        if domaindn is None:
+            domaindn = "DC=" + dnsdomain.replace(".", ",DC=")
         if domain is None:
             domain = lp.get("workgroup")
     
@@ -815,38 +871,25 @@ def provision(lp, setup_dir, message, paths, session_info,
         if not valid_netbios_name(domain):
             raise InvalidNetbiosName(domain)
     else:
-        domaindn = "CN=" + netbiosname
+        if domaindn is None:
+            domaindn = "CN=" + netbiosname
         domain = netbiosname
     
     if rootdn is None:
        rootdn = domaindn
        
-    configdn = "CN=Configuration," + rootdn
-    schemadn = "CN=Schema," + configdn
+    if configdn is None:
+        configdn = "CN=Configuration," + rootdn
+    if schemadn is None:
+        schemadn = "CN=Schema," + configdn
 
     message("set DOMAIN SID: %s" % str(domainsid))
     message("Provisioning for %s in realm %s" % (domain, realm))
     message("Using administrator password: %s" % adminpass)
 
-    assert paths.smbconf is not None
-
-    # only install a new smb.conf if there isn't one there already
-    if not os.path.exists(paths.smbconf):
-        message("Setting up smb.conf")
-        if serverrole == "domain controller":
-            smbconfsuffix = "dc"
-        elif serverrole == "member server":
-            smbconfsuffix = "member"
-        setup_file(setup_path("provision.smb.conf.%s" % smbconfsuffix), 
-                   paths.smbconf, {
-            "HOSTNAME": hostname,
-            "DOMAIN_CONF": domain,
-            "REALM_CONF": realm,
-            "SERVERROLE": serverrole,
-            "NETLOGONPATH": paths.netlogon,
-            "SYSVOLPATH": paths.sysvol,
-            })
-        lp.load(paths.smbconf)
+    if lp.get("realm").upper() != realm.upper():
+        raise Exception("realm '%s' in smb.conf must match chosen realm '%s'" %
+                        (lp.get("realm"), realm))
 
     # only install a new shares config db if there is none
     if not os.path.exists(paths.shareconf):
@@ -911,32 +954,52 @@ def provision(lp, setup_dir, message, paths, session_info,
         message("Setting up sam.ldb rootDSE marking as synchronized")
         setup_modify_ldif(samdb, setup_path("provision_rootdse_modify.ldif"))
 
+        # Only make a zone file on the first DC, it should be replicated with DNS replication
+        if serverrole == "domain controller":
+            samdb = SamDB(paths.samdb, session_info=session_info, 
+                      credentials=credentials, lp=lp)
+
+            domainguid = samdb.searchone(basedn=domaindn, attribute="objectGUID")
+            assert isinstance(domainguid, str)
+            hostguid = samdb.searchone(basedn=domaindn, attribute="objectGUID",
+                                       expression="(&(objectClass=computer)(cn=%s))" % hostname,
+                                       scope=SCOPE_SUBTREE)
+            assert isinstance(hostguid, str)
+            
+            message("Setting up DNS zone: %s" % dnsdomain)
+            create_zone_file(paths.dns, setup_path, samdb, 
+                             hostname=hostname, hostip=hostip, dnsdomain=dnsdomain,
+                             domaindn=domaindn, dnspass=dnspass, realm=realm, 
+                             domainguid=domainguid, hostguid=hostguid)
+            message("Please install the zone located in %s into your DNS server" % paths.dns)
+            
     message("Setting up phpLDAPadmin configuration")
     create_phpldapadmin_config(paths.phpldapadminconfig, setup_path, 
                                ldapi_url)
 
     message("Please install the phpLDAPadmin configuration located at %s into /etc/phpldapadmin/config.php" % paths.phpldapadminconfig)
 
-    if lp.get("server role") == "domain controller":
-        samdb = SamDB(paths.samdb, session_info=session_info, 
-                      credentials=credentials, lp=lp)
-
-        domainguid = samdb.searchone(basedn=domaindn, attribute="objectGUID")
-        assert isinstance(domainguid, str)
-        hostguid = samdb.searchone(basedn=domaindn, attribute="objectGUID",
-                expression="(&(objectClass=computer)(cn=%s))" % hostname,
-                scope=SCOPE_SUBTREE)
-        assert isinstance(hostguid, str)
-
-        message("Setting up DNS zone: %s" % dnsdomain)
-        create_zone_file(paths.dns, setup_path, samdb, 
-                      hostname=hostname, hostip=hostip, dnsdomain=dnsdomain,
-                      domaindn=domaindn, dnspass=dnspass, realm=realm, 
-                      domainguid=domainguid, hostguid=hostguid)
-        message("Please install the zone located in %s into your DNS server" % paths.dns)
-
     return domaindn
 
+def provision_become_dc(setup_dir=None,
+                        smbconf=None, targetdir=None, realm=None, 
+                        rootdn=None, domaindn=None, schemadn=None, configdn=None,
+                        domain=None, hostname=None, domainsid=None, 
+                        hostguid=None, adminpass=None, krbtgtpass=None, domainguid=None, 
+                        policyguid=None, invocationid=None, machinepass=None, 
+                        dnspass=None, root=None, nobody=None, nogroup=None, users=None, 
+                        wheel=None, backup=None, aci=None, serverrole=None, 
+                        ldap_backend=None, ldap_backend_type=None, sitename=DEFAULTSITE):
+
+    def message(text):
+	"""print a message if quiet is not set."""
+        print text
+
+    provision(setup_dir, message, system_session(), None,
+              smbconf=smbconf, targetdir=targetdir, samdb_fill=FILL_DRS, realm=realm, 
+              rootdn=rootdn, domaindn=domaindn, schemadn=schemadn, configdn=configdn, 
+              domain=domain, hostname=hostname, hostip="127.0.0.1", domainsid=domainsid, machinepass=machinepass, serverrole="domain controller", sitename=sitename);
+    
 
 def create_phpldapadmin_config(path, setup_path, ldapi_uri):
     """Create a PHP LDAP admin configuration file.
@@ -978,7 +1041,6 @@ def create_zone_file(path, setup_path, samdb, dnsdomain, domaindn,
             "HOSTGUID": hostguid,
         })
 
-
 def load_schema(setup_path, samdb, schemadn, netbiosname, configdn, sitename):
     """Load schema for the SamDB.
     
-- 
cgit 


From 8b24d248b7c928fd3b20f95ede34302ca274c4ae Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Fri, 7 Mar 2008 07:33:14 +1100
Subject: Start to rework provision for LDAP backends

This is the start of the rework of the provision script to handle an
LDAP backend correctly.  For example, we must not set the 'tdb
modules' against an LDAP backend such as OpenLDAP that handles subtree
renames.

Andrew Bartlett
(This used to be commit e462a107d3bafcc546ca4d53dcc8eb32e4280745)
---
 source4/scripting/python/samba/__init__.py  |  7 ++++++-
 source4/scripting/python/samba/provision.py | 11 ++++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/__init__.py b/source4/scripting/python/samba/__init__.py
index 8d5f4250c9..e91b320c07 100644
--- a/source4/scripting/python/samba/__init__.py
+++ b/source4/scripting/python/samba/__init__.py
@@ -147,7 +147,12 @@ class Ldb(ldb.Ldb):
             k = 0
             while ++k < 10 and (previous_remaining != current_remaining):
                 # and the rest
-                res2 = self.search(basedn, ldb.SCOPE_SUBTREE, "(|(objectclass=*)(distinguishedName=*))", ["distinguishedName"])
+                try:
+                    res2 = self.search(basedn, ldb.SCOPE_SUBTREE, "(|(objectclass=*)(distinguishedName=*))", ["distinguishedName"])
+                except ldb.LdbError, (LDB_ERR_NO_SUCH_OBJECT, _):
+                    # Ignore missing dn errors
+                    return
+
                 previous_remaining = current_remaining
                 current_remaining = len(res2)
                 for msg in res2:
diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index ea2feb981b..b140071f41 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -341,12 +341,21 @@ def setup_samdb_partitions(samdb_path, setup_path, message, lp, session_info,
     	
     if ldap_backend_type == "fedora-ds":
         backend_modules = ["nsuniqueid", "paged_searches"]
+        # We can handle linked attributes here, as we don't have directory-side subtree operations
+        tdb_modules_list = ["linked_attributes"]
     elif ldap_backend_type == "openldap":
         backend_modules = ["normalise", "entryuuid", "paged_searches"]
+        # OpenLDAP handles subtree renames, so we don't want to do any of these things
+        tdb_modules_list = None
     elif serverrole == "domain controller":
         backend_modules = ["repl_meta_data"]
     else:
         backend_modules = ["objectguid"]
+
+    if tdb_modules_list is None:
+        tdb_modules_list_as_string = ""
+    else:
+        tdb_modules_list_as_string = ","+",".join(tdb_modules_list)
         
     samdb.transaction_start()
     try:
@@ -362,7 +371,7 @@ def setup_samdb_partitions(samdb_path, setup_path, message, lp, session_info,
                 "CONFIGDN_MOD": "naming_fsmo,instancetype",
                 "DOMAINDN_MOD": "pdc_fsmo,password_hash,instancetype",
                 "MODULES_LIST": ",".join(modules_list),
-                "TDB_MODULES_LIST": ","+",".join(tdb_modules_list),
+                "TDB_MODULES_LIST": tdb_modules_list_as_string,
                 "MODULES_LIST2": ",".join(modules_list2),
                 "BACKEND_MOD": ",".join(backend_modules),
         })
-- 
cgit 


From 14c5f968e1f99ceabc5a42d9a38a00ea137b00ea Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Fri, 7 Mar 2008 10:57:52 +1100
Subject: Rework provision scripts for more testing

This fixes up some issues with testdir (was not honoured) and
increases test coverage.

We now check all the major provision modes.  In doing so, to make it
possible to call from the multiple layers of 'sh', I have allowed 'dc'
to alias 'domain controller' and 'member' to alias 'member server'.
Fighting shell quoting in the test system was just too hard...

Also fix upgrade.py

Andrew Bartlett
(This used to be commit 0923de12282b0e063dd73bc3e056dd5c3663c190)
---
 source4/scripting/python/samba/provision.py | 29 ++++++++++++++++-------------
 source4/scripting/python/samba/upgrade.py   |  5 +----
 2 files changed, 17 insertions(+), 17 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index 37c4c5b082..25c1a995ef 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -572,9 +572,7 @@ def setup_samdb(path, setup_path, session_info, credentials, lp,
     :note: This will wipe the main SAM database file!
     """
 
-    assert serverrole in ("domain controller", "member server")
-
-    erase = (fill != FILL_DRS)    
+    erase = (fill != FILL_DRS)
 
     # Also wipes the database
     setup_samdb_partitions(path, setup_path, schemadn=schemadn, configdn=configdn, 
@@ -796,17 +794,22 @@ def provision(setup_dir, message, session_info,
         if not os.path.exists(os.path.join(targetdir, "etc")):
            os.mkdir(os.path.join(targetdir, "etc"))
 
-        if smbconf is None:
-            smbconf = os.path.join(targetdir, os.path.join("etc", "smb.conf"))
+        smbconf = os.path.join(targetdir, os.path.join("etc", "smb.conf"))
 
     # only install a new smb.conf if there isn't one there already
+
     if not os.path.exists(smbconf):
         message("Setting up smb.conf")
-        assert serverrole is not None
+        if serverrole is None:
+            serverrole = "standalone"
+
+        assert serverrole in ("domain controller", "member server", "standalone")
         if serverrole == "domain controller":
             smbconfsuffix = "dc"
         elif serverrole == "member server":
             smbconfsuffix = "member"
+        elif serverrole == "standalone":
+            smbconfsuffix = "standalone"
 
         assert domain is not None
         assert realm is not None
@@ -827,8 +830,8 @@ def provision(setup_dir, message, session_info,
         setup_file(setup_path("provision.smb.conf.%s" % smbconfsuffix), 
                    smbconf, {
                 "HOSTNAME": hostname,
-                "DOMAIN_CONF": domain,
-                "REALM_CONF": realm,
+                "DOMAIN": domain,
+                "REALM": realm,
                 "SERVERROLE": serverrole,
                 "NETLOGONPATH": netlogon,
                 "SYSVOLPATH": sysvol,
@@ -841,7 +844,7 @@ def provision(setup_dir, message, session_info,
 
     if serverrole is None:
         serverrole = lp.get("server role")
-    assert serverrole in ("domain controller", "member server")
+    assert serverrole in ("domain controller", "member server", "standalone")
     if invocationid is None and serverrole == "domain controller":
         invocationid = uuid.random()
 
@@ -851,6 +854,10 @@ def provision(setup_dir, message, session_info,
     assert realm is not None
     realm = realm.upper()
 
+    if lp.get("realm").upper() != realm.upper():
+        raise Exception("realm '%s' in %s must match chosen realm '%s'" %
+                        (lp.get("realm"), smbconf, realm))
+    
     dnsdomain = realm.lower()
 
     paths = provision_paths_from_lp(lp, dnsdomain)
@@ -896,10 +903,6 @@ def provision(setup_dir, message, session_info,
     message("Provisioning for %s in realm %s" % (domain, realm))
     message("Using administrator password: %s" % adminpass)
 
-    if lp.get("realm").upper() != realm.upper():
-        raise Exception("realm '%s' in smb.conf must match chosen realm '%s'" %
-                        (lp.get("realm"), realm))
-
     # only install a new shares config db if there is none
     if not os.path.exists(paths.shareconf):
         message("Setting up share.ldb")
diff --git a/source4/scripting/python/samba/upgrade.py b/source4/scripting/python/samba/upgrade.py
index 01b62ff984..c5086846d8 100644
--- a/source4/scripting/python/samba/upgrade.py
+++ b/source4/scripting/python/samba/upgrade.py
@@ -218,11 +218,9 @@ def upgrade_provision(samba3, setup_dir, message, credentials, session_info, lp,
         else:
             serverrole = "member server"
 
-    lp.set("server role", serverrole)
     domainname = oldconf.get("workgroup")
     if domainname:
         domainname = str(domainname)
-    lp.set("workgroup", domainname)
     realm = oldconf.get("realm")
     netbiosname = oldconf.get("netbios name")
 
@@ -235,7 +233,6 @@ def upgrade_provision(samba3, setup_dir, message, credentials, session_info, lp,
     if realm is None:
         realm = domainname.lower()
         message("No realm specified in smb.conf file, assuming '%s'\n" % realm)
-    lp.set("realm", realm)
 
     domainguid = secrets_db.get_domain_guid(domainname)
     domainsid = secrets_db.get_sid(domainname)
@@ -247,7 +244,7 @@ def upgrade_provision(samba3, setup_dir, message, credentials, session_info, lp,
     else:
         machinepass = None
     
-    domaindn = provision(lp=lp, setup_dir=setup_dir, message=message, 
+    domaindn = provision(setup_dir=setup_dir, message=message, 
                          samdb_fill=FILL_DRS, paths=paths, session_info=session_info, 
                          credentials=credentials, realm=realm, 
                          domain=domainname, domainsid=domainsid, domainguid=domainguid, 
-- 
cgit 


From a7e1fa0bef17ecc46f642b23ef635acfb09fea04 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Fri, 7 Mar 2008 19:20:39 +1100
Subject: Try to fix up part of the upgrade test.

There are still problems with the upgrade test, but these are not
related to the provision system.

Andrew Bartlett
(This used to be commit d331bc400fb138bc43be88d0ca8ab3bcd590d2cd)
---
 source4/scripting/python/samba/provision.py | 13 ++++++++++++-
 source4/scripting/python/samba/upgrade.py   | 20 +++++++++-----------
 2 files changed, 21 insertions(+), 12 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index 25c1a995ef..ebca1f8e40 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -68,6 +68,12 @@ class ProvisionPaths:
         self.winsdb = None
         self.private_dir = None
 
+class ProvisionResult:
+    def __init__(self):
+        self.paths = None
+        self.domaindn = None
+        self.lp = None
+        self.samdb = None
 
 def check_install(lp, session_info, credentials):
     """Check whether the current install seems ok.
@@ -991,7 +997,12 @@ def provision(setup_dir, message, session_info,
 
     message("Please install the phpLDAPadmin configuration located at %s into /etc/phpldapadmin/config.php" % paths.phpldapadminconfig)
 
-    return domaindn
+    result = ProvisionResult()
+    result.domaindn = domaindn
+    result.paths = paths
+    result.lp = lp
+    result.samdb = samdb
+    return result
 
 def provision_become_dc(setup_dir=None,
                         smbconf=None, targetdir=None, realm=None, 
diff --git a/source4/scripting/python/samba/upgrade.py b/source4/scripting/python/samba/upgrade.py
index c5086846d8..f40f2cffe7 100644
--- a/source4/scripting/python/samba/upgrade.py
+++ b/source4/scripting/python/samba/upgrade.py
@@ -207,7 +207,7 @@ def import_wins(samba4_winsdb, samba3_winsdb):
                        "objectClass": "winsMaxVersion",
                        "maxVersion": str(version_id)})
 
-def upgrade_provision(samba3, setup_dir, message, credentials, session_info, lp, paths):
+def upgrade_provision(samba3, setup_dir, message, credentials, session_info, smbconf, targetdir):
     oldconf = samba3.get_conf()
 
     if oldconf.get("domain logons") == "True":
@@ -244,15 +244,13 @@ def upgrade_provision(samba3, setup_dir, message, credentials, session_info, lp,
     else:
         machinepass = None
     
-    domaindn = provision(setup_dir=setup_dir, message=message, 
-                         samdb_fill=FILL_DRS, paths=paths, session_info=session_info, 
-                         credentials=credentials, realm=realm, 
-                         domain=domainname, domainsid=domainsid, domainguid=domainguid, 
-                         machinepass=machinepass, serverrole=serverrole)
+    result = provision(setup_dir=setup_dir, message=message, 
+                       samdb_fill=FILL_DRS, smbconf=smbconf, session_info=session_info, 
+                       credentials=credentials, realm=realm, 
+                       domain=domainname, domainsid=domainsid, domainguid=domainguid, 
+                       machinepass=machinepass, serverrole=serverrole, targetdir=targetdir)
 
-    samdb = SamDB(paths.samdb, credentials=credentials, lp=lp, session_info=session_info)
-
-    import_wins(Ldb(paths.winsdb), samba3.get_wins_db())
+    import_wins(Ldb(result.paths.winsdb), samba3.get_wins_db())
 
     # FIXME: import_registry(registry.Registry(), samba3.get_registry())
 
@@ -268,12 +266,12 @@ def upgrade_provision(samba3, setup_dir, message, credentials, session_info, lp,
     passdb = samba3.get_sam_db()
     for name in passdb:
         user = passdb[name]
-        #FIXME: import_sam_account(samdb, user, domaindn, domainsid)
+        #FIXME: import_sam_account(result.samdb, user, domaindn, domainsid)
 
     if hasattr(passdb, 'ldap_url'):
         message("Enabling Samba3 LDAP mappings for SAM database")
 
-        enable_samba3sam(samdb, passdb.ldap_url)
+        enable_samba3sam(result.samdb, passdb.ldap_url)
 
 
 def enable_samba3sam(samdb, ldapurl):
-- 
cgit 


From 6a1f56d82a367a2f037e18ed346cf7cce7f377e0 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Fri, 7 Mar 2008 20:33:12 +0100
Subject: Fix the build. (This used to be commit
 3b7940d531a30098ca9a09e9c83dc4d223d1fe8f)

---
 source4/scripting/ejs/config.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/config.mk b/source4/scripting/ejs/config.mk
index 6acf902c08..0d10fc6e3a 100644
--- a/source4/scripting/ejs/config.mk
+++ b/source4/scripting/ejs/config.mk
@@ -58,7 +58,7 @@ smbcalls_data_OBJ_FILES = scripting/ejs/smbcalls_data.o
 OUTPUT_TYPE = MERGED_OBJ
 SUBSYSTEM = smbcalls
 INIT_FUNCTION = smb_setup_ejs_auth
-PRIVATE_DEPENDENCIES = auth
+PRIVATE_DEPENDENCIES = service_auth
 
 smbcalls_auth_OBJ_FILES = scripting/ejs/smbcalls_auth.o
 
-- 
cgit 


From 2bf39edc9d0abf3306bd25b9c40d88aceb029be7 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sat, 8 Mar 2008 15:28:12 +0100
Subject: Push SOVERSION and VERSION out of perl code. (This used to be commit
 0ba8ac6a14c62ff9edfe9f0bf43b8a7406b85291)

---
 source4/scripting/python/modules.c | 1 -
 1 file changed, 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/modules.c b/source4/scripting/python/modules.c
index 2ecad20b8e..2c10a35c60 100644
--- a/source4/scripting/python/modules.c
+++ b/source4/scripting/python/modules.c
@@ -19,7 +19,6 @@
 
 #include "includes.h"
 #include <Python.h>
-#include "build.h"
 
 extern void init_ldb(void);
 extern void init_security(void);
-- 
cgit 


From 9703948850fb6febb237d701ce6b6300e9df8e1f Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Tue, 11 Mar 2008 14:41:10 +1100
Subject: Fix provision script to work without smb.conf location specified.

Andrew Bartlett
(This used to be commit b4da374a998caac18c288a0a6e3fcd2c50cbffa7)
---
 source4/scripting/python/samba/provision.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index ebca1f8e40..24870c2fbd 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -51,7 +51,6 @@ class InvalidNetbiosName(Exception):
 
 class ProvisionPaths:
     def __init__(self):
-        self.smbconf = None
         self.shareconf = None
         self.hklm = None
         self.hkcu = None
@@ -217,7 +216,6 @@ def provision_paths_from_lp(lp, dnsdomain):
     paths.dns = os.path.join(paths.private_dir, dnsdomain + ".zone")
     paths.winsdb = os.path.join(paths.private_dir, "wins.ldb")
     paths.s4_ldapi_path = os.path.join(paths.private_dir, "ldapi")
-    paths.smbconf = os.path.join(paths.private_dir, "smb.conf")
     paths.phpldapadminconfig = os.path.join(paths.private_dir, 
                                             "phpldapadmin-config.php")
     paths.hklm = "hklm.ldb"
@@ -759,6 +757,9 @@ def provision(setup_dir, message, session_info,
 
     if domainsid is None:
         domainsid = security.random_sid()
+    else:
+        domainsid = security.Sid(domainsid)
+
     if policyguid is None:
         policyguid = uuid.random()
     if adminpass is None:
-- 
cgit 


From 69d66e6fb09b2449dec9bf0af49408b9a6c3cc65 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Thu, 13 Mar 2008 08:08:05 +1100
Subject: Upgrade provision-backend to python.

This required a large rework of the provision code, so as to move much
of the 'guess' logic into subprocedures, rather than just inline in
the provision code.

Andrew Bartlett
(This used to be commit a0754c2a857217ca831c2295b17255d8f38dfbc2)
---
 source4/scripting/python/samba/provision.py | 621 ++++++++++++++++++----------
 1 file changed, 411 insertions(+), 210 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index 24870c2fbd..2ede4b8d3d 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -66,7 +66,27 @@ class ProvisionPaths:
         self.dns = None
         self.winsdb = None
         self.private_dir = None
-
+        self.ldapdir = None
+        self.slapdconf = None
+        self.modulesconf = None
+        self.memberofconf = None
+        self.fedoradsinf = None
+        self.fedoradspartitions = None
+ 
+class ProvisionNames:
+    def __init__(self):
+        self.rootdn = None
+        self.domaindn = None
+        self.configdn = None
+        self.schemadn = None
+        self.ldapmanagerdn = None
+        self.dnsdomain = None
+        self.realm = None
+        self.netbiosname = None
+        self.domain = None
+        self.hostname = None
+        self.sitename = None
+    
 class ProvisionResult:
     def __init__(self):
         self.paths = None
@@ -218,6 +238,18 @@ def provision_paths_from_lp(lp, dnsdomain):
     paths.s4_ldapi_path = os.path.join(paths.private_dir, "ldapi")
     paths.phpldapadminconfig = os.path.join(paths.private_dir, 
                                             "phpldapadmin-config.php")
+    paths.ldapdir = os.path.join(paths.private_dir, 
+                                 "ldap")
+    paths.slapdconf = os.path.join(paths.ldapdir, 
+                                   "slapd.conf")
+    paths.modulesconf = os.path.join(paths.ldapdir, 
+                                     "modules.conf")
+    paths.memberofconf = os.path.join(paths.ldapdir, 
+                                      "memberof.conf")
+    paths.fedoradsinf = os.path.join(paths.ldapdir, 
+                                   "fedorads.inf")
+    paths.fedoradspartitions = os.path.join(paths.ldapdir, 
+                                            "fedorads-partitions.ldif")
     paths.hklm = "hklm.ldb"
     paths.hkcr = "hkcr.ldb"
     paths.hkcu = "hkcu.ldb"
@@ -225,16 +257,142 @@ def provision_paths_from_lp(lp, dnsdomain):
     paths.hkpd = "hkpd.ldb"
     paths.hkpt = "hkpt.ldb"
 
-    paths.sysvol = lp.get("sysvol", "path")
-    if paths.sysvol is None:
-        paths.sysvol = os.path.join(lp.get("lock dir"), "sysvol")
+    paths.sysvol = lp.get("path", "sysvol")
 
-    paths.netlogon = lp.get("netlogon", "path")
-    if paths.netlogon is None:
-        paths.netlogon = os.path.join(os.path.join(paths.sysvol, "scripts"))
+    paths.netlogon = lp.get("path", "netlogon")
 
     return paths
 
+def guess_names(lp=None, hostname=None, domain=None, dnsdomain=None, serverrole=None,
+              rootdn=None, domaindn=None, configdn=None, schemadn=None, sitename=None):
+
+    if hostname is None:
+        hostname = gethostname().split(".")[0].lower()
+
+    netbiosname = hostname.upper()
+    if not valid_netbios_name(netbiosname):
+        raise InvalidNetbiosName(netbiosname)
+
+    hostname = hostname.lower()
+
+    if dnsdomain is None:
+        dnsdomain = lp.get("realm")
+
+    if serverrole is None:
+        serverrole = lp.get("server role")
+
+    assert dnsdomain is not None
+    realm = dnsdomain.upper()
+
+    if lp.get("realm").upper() != realm:
+        raise Exception("realm '%s' in %s must match chosen realm '%s'" %
+                        (lp.get("realm"), smbconf, realm))
+    
+    dnsdomain = dnsdomain.lower()
+
+    if (serverrole == "domain controller"):
+        if domain is None:
+            domain = lp.get("workgroup")
+        if domaindn is None:
+            domaindn = "DC=" + dnsdomain.replace(".", ",DC=")
+        if lp.get("workgroup").upper() != domain.upper():
+            raise Error("workgroup '%s' in smb.conf must match chosen domain '%s'",
+                        lp.get("workgroup"), domain)
+    else:
+        domain = netbiosname
+        if domaindn is None:
+            domaindn = "CN=" + netbiosname
+        
+    assert domain is not None
+    domain = domain.upper()
+    if not valid_netbios_name(domain):
+        raise InvalidNetbiosName(domain)
+        
+    if rootdn is None:
+       rootdn = domaindn
+       
+    if configdn is None:
+        configdn = "CN=Configuration," + rootdn
+    if schemadn is None:
+        schemadn = "CN=Schema," + configdn
+
+    if sitename is None:
+        sitename=DEFAULTSITE
+
+    names = ProvisionNames()
+    names.rootdn = rootdn
+    names.domaindn = domaindn
+    names.configdn = configdn
+    names.schemadn = schemadn
+    names.ldapmanagerdn = "CN=Manager," + rootdn
+    names.dnsdomain = dnsdomain
+    names.domain = domain
+    names.realm = realm
+    names.netbiosname = netbiosname
+    names.hostname = hostname
+    names.sitename = sitename
+    
+    return names
+    
+
+def load_or_make_smbconf(smbconf, setup_path, hostname, domain, realm, serverrole, targetdir):
+    if targetdir is not None:
+        if not os.path.exists(targetdir):
+            os.mkdir(targetdir)
+        if not os.path.exists(os.path.join(targetdir, "etc")):
+           os.mkdir(os.path.join(targetdir, "etc"))
+
+        smbconf = os.path.join(targetdir, "etc", "smb.conf")
+
+    # only install a new smb.conf if there isn't one there already
+
+    if not os.path.exists(smbconf):
+        if hostname is None:
+            hostname = gethostname().split(".")[0].lower()
+
+        if serverrole is None:
+            serverrole = "standalone"
+
+        assert serverrole in ("domain controller", "member server", "standalone")
+        if serverrole == "domain controller":
+            smbconfsuffix = "dc"
+        elif serverrole == "member server":
+            smbconfsuffix = "member"
+        elif serverrole == "standalone":
+            smbconfsuffix = "standalone"
+
+        assert domain is not None
+        assert realm is not None
+
+        default_lp = param.LoadParm()
+        #Load non-existant file
+        default_lp.load(smbconf)
+        
+        if targetdir is not None:
+            privatedir_line = "private dir = " + os.path.abspath(os.path.join(targetdir, "private"))
+            lockdir_line = "lock dir = " + os.path.abspath(targetdir)
+
+            default_lp.set("lock dir", os.path.abspath(targetdir))
+            
+        sysvol = os.path.join(default_lp.get("lock dir"), "sysvol")
+        netlogon = os.path.join(sysvol, realm.lower(), "scripts")
+
+        setup_file(setup_path("provision.smb.conf.%s" % smbconfsuffix), 
+                   smbconf, {
+                "HOSTNAME": hostname,
+                "DOMAIN": domain,
+                "REALM": realm,
+                "SERVERROLE": serverrole,
+                "NETLOGONPATH": netlogon,
+                "SYSVOLPATH": sysvol,
+                "PRIVATEDIR_LINE": privatedir_line,
+                "LOCKDIR_LINE": lockdir_line
+                })
+
+    lp = param.LoadParm()
+    lp.load(smbconf)
+
+    return lp
 
 def setup_name_mappings(ldb, sid, domaindn, root, nobody, nogroup, users, 
                         wheel, backup):
@@ -277,9 +435,8 @@ def setup_name_mappings(ldb, sid, domaindn, root, nobody, nogroup, users,
 
 
 def setup_samdb_partitions(samdb_path, setup_path, message, lp, session_info, 
-                           credentials, configdn, schemadn, domaindn, 
-                           hostname, netbiosname, dnsdomain, realm, 
-                           rootdn, serverrole, sitename, ldap_backend=None, 
+                           credentials, names,
+                           serverrole, ldap_backend=None, 
                            ldap_backend_type=None, erase=False):
     """Setup the partitions for the SAM database. 
     
@@ -366,12 +523,12 @@ def setup_samdb_partitions(samdb_path, setup_path, message, lp, session_info,
     samdb.transaction_start()
     try:
         setup_add_ldif(samdb, setup_path("provision_partitions.ldif"), {
-                "SCHEMADN": schemadn, 
+                "SCHEMADN": names.schemadn, 
                 "SCHEMADN_LDB": schemadn_ldb,
                 "SCHEMADN_MOD2": ",objectguid",
-                "CONFIGDN": configdn,
+                "CONFIGDN": names.configdn,
                 "CONFIGDN_LDB": configdn_ldb,
-                "DOMAINDN": domaindn,
+                "DOMAINDN": names.domaindn,
                 "DOMAINDN_LDB": domaindn_ldb,
                 "SCHEMADN_MOD": "schema_fsmo,instancetype",
                 "CONFIGDN_MOD": "naming_fsmo,instancetype",
@@ -397,9 +554,9 @@ def setup_samdb_partitions(samdb_path, setup_path, message, lp, session_info,
         samdb.load_ldif_file_add(setup_path("provision_init.ldif"))
 
         message("Setting up sam.ldb rootDSE")
-        setup_samdb_rootdse(samdb, setup_path, schemadn, domaindn, hostname, 
-                            dnsdomain, realm, rootdn, configdn, netbiosname,
-                            sitename)
+        setup_samdb_rootdse(samdb, setup_path, names.schemadn, names.domaindn, names.hostname, 
+                            names.dnsdomain, names.realm, names.rootdn, names.configdn, names.netbiosname,
+                            names.sitename)
 
         if erase:
             message("Erasing data from partitions")
@@ -532,10 +689,10 @@ def setup_samdb_rootdse(samdb, setup_path, schemadn, domaindn, hostname,
         })
         
 
-def setup_self_join(samdb, configdn, schemadn, domaindn, 
-                    netbiosname, hostname, dnsdomain, machinepass, dnspass, 
-                    realm, domainname, domainsid, invocationid, setup_path,
-                    policyguid, sitename, hostguid=None):
+def setup_self_join(samdb, names,
+                    machinepass, dnspass, 
+                    domainsid, invocationid, setup_path,
+                    policyguid, hostguid=None):
     """Join a host to its own domain."""
     if hostguid is not None:
         hostguid_add = "objectGUID: %s" % hostguid
@@ -543,33 +700,32 @@ def setup_self_join(samdb, configdn, schemadn, domaindn,
         hostguid_add = ""
 
     setup_add_ldif(samdb, setup_path("provision_self_join.ldif"), { 
-              "CONFIGDN": configdn, 
-              "SCHEMADN": schemadn,
-              "DOMAINDN": domaindn,
+              "CONFIGDN": names.configdn, 
+              "SCHEMADN": names.schemadn,
+              "DOMAINDN": names.domaindn,
               "INVOCATIONID": invocationid,
-              "NETBIOSNAME": netbiosname,
-              "DEFAULTSITE": sitename,
-              "DNSNAME": "%s.%s" % (hostname, dnsdomain),
+              "NETBIOSNAME": names.netbiosname,
+              "DEFAULTSITE": names.sitename,
+              "DNSNAME": "%s.%s" % (names.hostname, names.dnsdomain),
               "MACHINEPASS_B64": b64encode(machinepass),
               "DNSPASS_B64": b64encode(dnspass),
-              "REALM": realm,
-              "DOMAIN": domainname,
+              "REALM": names.realm,
+              "DOMAIN": names.domain,
               "HOSTGUID_ADD": hostguid_add,
-              "DNSDOMAIN": dnsdomain})
+              "DNSDOMAIN": names.dnsdomain})
     setup_add_ldif(samdb, setup_path("provision_group_policy.ldif"), { 
               "POLICYGUID": policyguid,
-              "DNSDOMAIN": dnsdomain,
+              "DNSDOMAIN": names.dnsdomain,
               "DOMAINSID": str(domainsid),
-              "DOMAINDN": domaindn})
+              "DOMAINDN": names.domaindn})
 
 
 def setup_samdb(path, setup_path, session_info, credentials, lp, 
-                schemadn, configdn, domaindn, dnsdomain, realm, 
-                netbiosname, message, hostname, rootdn, 
+                names, message, 
                 domainsid, aci, domainguid, policyguid, 
-                domainname, fill, adminpass, krbtgtpass, 
+                fill, adminpass, krbtgtpass, 
                 machinepass, hostguid, invocationid, dnspass,
-                serverrole, sitename, ldap_backend=None, 
+                serverrole, ldap_backend=None, 
                 ldap_backend_type=None):
     """Setup a complete SAM Database.
     
@@ -579,14 +735,11 @@ def setup_samdb(path, setup_path, session_info, credentials, lp,
     erase = (fill != FILL_DRS)
 
     # Also wipes the database
-    setup_samdb_partitions(path, setup_path, schemadn=schemadn, configdn=configdn, 
-                           domaindn=domaindn, message=message, lp=lp,
+    setup_samdb_partitions(path, setup_path, message=message, lp=lp,
                            credentials=credentials, session_info=session_info,
-                           hostname=hostname, netbiosname=netbiosname, 
-                           dnsdomain=dnsdomain, realm=realm, rootdn=rootdn,
+                           names=names, 
                            ldap_backend=ldap_backend, serverrole=serverrole,
-                           ldap_backend_type=ldap_backend_type, erase=erase,
-                           sitename=sitename)
+                           ldap_backend_type=ldap_backend_type, erase=erase)
 
     samdb = SamDB(path, session_info=session_info, 
                   credentials=credentials, lp=lp)
@@ -604,18 +757,18 @@ def setup_samdb(path, setup_path, session_info, credentials, lp,
     if serverrole == "domain controller":
         samdb.set_invocation_id(invocationid)
 
-    load_schema(setup_path, samdb, schemadn, netbiosname, configdn, sitename)
+    load_schema(setup_path, samdb, names.schemadn, names.netbiosname, names.configdn, names.sitename)
 
     samdb.transaction_start()
         
     try:
-        message("Adding DomainDN: %s (permitted to fail)" % domaindn)
+        message("Adding DomainDN: %s (permitted to fail)" % names.domaindn)
         setup_add_ldif(samdb, setup_path("provision_basedn.ldif"), {
-            "DOMAINDN": domaindn,
+            "DOMAINDN": names.domaindn,
             "ACI": aci,
             })
 
-        message("Modifying DomainDN: " + domaindn + "")
+        message("Modifying DomainDN: " + names.domaindn + "")
         if domainguid is not None:
             domainguid_mod = "replace: objectGUID\nobjectGUID: %s\n-" % domainguid
         else:
@@ -624,104 +777,102 @@ def setup_samdb(path, setup_path, session_info, credentials, lp,
         setup_modify_ldif(samdb, setup_path("provision_basedn_modify.ldif"), {
             "LDAPTIME": timestring(int(time.time())),
             "DOMAINSID": str(domainsid),
-            "SCHEMADN": schemadn, 
-            "NETBIOSNAME": netbiosname,
-            "DEFAULTSITE": sitename,
-            "CONFIGDN": configdn,
+            "SCHEMADN": names.schemadn, 
+            "NETBIOSNAME": names.netbiosname,
+            "DEFAULTSITE": names.sitename,
+            "CONFIGDN": names.configdn,
             "POLICYGUID": policyguid,
-            "DOMAINDN": domaindn,
+            "DOMAINDN": names.domaindn,
             "DOMAINGUID_MOD": domainguid_mod,
             })
 
         message("Adding configuration container (permitted to fail)")
         setup_add_ldif(samdb, setup_path("provision_configuration_basedn.ldif"), {
-            "CONFIGDN": configdn, 
+            "CONFIGDN": names.configdn, 
             "ACI": aci,
             "EXTENSIBLEOBJECT": "# no objectClass: extensibleObject for local ldb",
             })
         message("Modifying configuration container")
         setup_modify_ldif(samdb, setup_path("provision_configuration_basedn_modify.ldif"), {
-            "CONFIGDN": configdn, 
-            "SCHEMADN": schemadn,
+            "CONFIGDN": names.configdn, 
+            "SCHEMADN": names.schemadn,
             })
 
         message("Adding schema container (permitted to fail)")
         setup_add_ldif(samdb, setup_path("provision_schema_basedn.ldif"), {
-            "SCHEMADN": schemadn,
+            "SCHEMADN": names.schemadn,
             "ACI": aci,
             "EXTENSIBLEOBJECT": "# no objectClass: extensibleObject for local ldb"
             })
         message("Modifying schema container")
         setup_modify_ldif(samdb, 
             setup_path("provision_schema_basedn_modify.ldif"), {
-            "SCHEMADN": schemadn,
-            "NETBIOSNAME": netbiosname,
-            "DEFAULTSITE": sitename,
-            "CONFIGDN": configdn,
+            "SCHEMADN": names.schemadn,
+            "NETBIOSNAME": names.netbiosname,
+            "DEFAULTSITE": names.sitename,
+            "CONFIGDN": names.configdn,
             })
 
         message("Setting up sam.ldb Samba4 schema")
         setup_add_ldif(samdb, setup_path("schema_samba4.ldif"), 
-                       {"SCHEMADN": schemadn })
+                       {"SCHEMADN": names.schemadn })
         message("Setting up sam.ldb AD schema")
         setup_add_ldif(samdb, setup_path("schema.ldif"), 
-                       {"SCHEMADN": schemadn})
+                       {"SCHEMADN": names.schemadn})
 
         message("Setting up sam.ldb configuration data")
         setup_add_ldif(samdb, setup_path("provision_configuration.ldif"), {
-            "CONFIGDN": configdn,
-            "NETBIOSNAME": netbiosname,
-            "DEFAULTSITE": sitename,
-            "DNSDOMAIN": dnsdomain,
-            "DOMAIN": domainname,
-            "SCHEMADN": schemadn,
-            "DOMAINDN": domaindn,
+            "CONFIGDN": names.configdn,
+            "NETBIOSNAME": names.netbiosname,
+            "DEFAULTSITE": names.sitename,
+            "DNSDOMAIN": names.dnsdomain,
+            "DOMAIN": names.domain,
+            "SCHEMADN": names.schemadn,
+            "DOMAINDN": names.domaindn,
             })
 
         message("Setting up display specifiers")
         setup_add_ldif(samdb, setup_path("display_specifiers.ldif"), 
-                       {"CONFIGDN": configdn})
+                       {"CONFIGDN": names.configdn})
 
         message("Adding users container (permitted to fail)")
         setup_add_ldif(samdb, setup_path("provision_users_add.ldif"), {
-            "DOMAINDN": domaindn})
+                "DOMAINDN": names.domaindn})
         message("Modifying users container")
         setup_modify_ldif(samdb, setup_path("provision_users_modify.ldif"), {
-            "DOMAINDN": domaindn})
+                "DOMAINDN": names.domaindn})
         message("Adding computers container (permitted to fail)")
         setup_add_ldif(samdb, setup_path("provision_computers_add.ldif"), {
-            "DOMAINDN": domaindn})
+                "DOMAINDN": names.domaindn})
         message("Modifying computers container")
         setup_modify_ldif(samdb, setup_path("provision_computers_modify.ldif"), {
-            "DOMAINDN": domaindn})
+                "DOMAINDN": names.domaindn})
         message("Setting up sam.ldb data")
         setup_add_ldif(samdb, setup_path("provision.ldif"), {
-            "DOMAINDN": domaindn,
-            "NETBIOSNAME": netbiosname,
-            "DEFAULTSITE": sitename,
-            "CONFIGDN": configdn,
+            "DOMAINDN": names.domaindn,
+            "NETBIOSNAME": names.netbiosname,
+            "DEFAULTSITE": names.sitename,
+            "CONFIGDN": names.configdn,
             })
 
         if fill == FILL_FULL:
             message("Setting up sam.ldb users and groups")
             setup_add_ldif(samdb, setup_path("provision_users.ldif"), {
-                "DOMAINDN": domaindn,
+                "DOMAINDN": names.domaindn,
                 "DOMAINSID": str(domainsid),
-                "CONFIGDN": configdn,
+                "CONFIGDN": names.configdn,
                 "ADMINPASS_B64": b64encode(adminpass),
                 "KRBTGTPASS_B64": b64encode(krbtgtpass),
                 })
 
             if serverrole == "domain controller":
                 message("Setting up self join")
-                setup_self_join(samdb, configdn=configdn, schemadn=schemadn, 
-                                domaindn=domaindn, invocationid=invocationid, 
-                                dnspass=dnspass, netbiosname=netbiosname, 
-                                dnsdomain=dnsdomain, realm=realm, 
-                                machinepass=machinepass, domainname=domainname, 
+                setup_self_join(samdb, names=names, invocationid=invocationid, 
+                                dnspass=dnspass,  
+                                machinepass=machinepass, 
                                 domainsid=domainsid, policyguid=policyguid,
-                                hostname=hostname, hostguid=hostguid, 
-                                setup_path=setup_path, sitename=sitename)
+                                hostguid=hostguid, 
+                                setup_path=setup_path)
 
     #We want to setup the index last, as adds are faster unindexed
         message("Setting up sam.ldb index")
@@ -746,7 +897,7 @@ def provision(setup_dir, message, session_info,
               policyguid=None, invocationid=None, machinepass=None, 
               dnspass=None, root=None, nobody=None, nogroup=None, users=None, 
               wheel=None, backup=None, aci=None, serverrole=None, 
-              ldap_backend=None, ldap_backend_type=None, sitename=DEFAULTSITE):
+              ldap_backend=None, ldap_backend_type=None, sitename=None):
     """Provision samba4
     
     :note: caution, this wipes all existing data!
@@ -785,129 +936,37 @@ def provision(setup_dir, message, session_info,
         backup = findnss(grp.getgrnam, ["backup", "wheel", "root", "staff"])[0]
     if aci is None:
         aci = "# no aci for local ldb"
-    if hostname is None:
-        hostname = gethostname().split(".")[0].lower()
 
-    if hostip is None:
-        hostip = gethostbyname(hostname)
+    lp = load_or_make_smbconf(smbconf, setup_path, hostname, domain, realm, serverrole, targetdir)
 
-    netbiosname = hostname.upper()
-    if not valid_netbios_name(netbiosname):
-        raise InvalidNetbiosName(netbiosname)
+    names = guess_names(lp=lp, hostname=hostname, domain=domain, 
+                        dnsdomain=realm, serverrole=serverrole, sitename=sitename,
+                        rootdn=rootdn, domaindn=domaindn, configdn=configdn, schemadn=schemadn)
 
-    if targetdir is not None:
-        if not os.path.exists(targetdir):
-            os.mkdir(targetdir)
-        if not os.path.exists(os.path.join(targetdir, "etc")):
-           os.mkdir(os.path.join(targetdir, "etc"))
-
-        smbconf = os.path.join(targetdir, os.path.join("etc", "smb.conf"))
-
-    # only install a new smb.conf if there isn't one there already
-
-    if not os.path.exists(smbconf):
-        message("Setting up smb.conf")
-        if serverrole is None:
-            serverrole = "standalone"
-
-        assert serverrole in ("domain controller", "member server", "standalone")
-        if serverrole == "domain controller":
-            smbconfsuffix = "dc"
-        elif serverrole == "member server":
-            smbconfsuffix = "member"
-        elif serverrole == "standalone":
-            smbconfsuffix = "standalone"
-
-        assert domain is not None
-        assert realm is not None
-
-        default_lp = param.LoadParm()
-        #Load non-existant file
-        default_lp.load(smbconf)
-        
-        if targetdir is not None:
-            privatedir_line = "private dir = " + os.path.abspath(os.path.join(targetdir, "private"))
-            lockdir_line = "lock dir = " + os.path.abspath(targetdir)
-
-            default_lp.set("lock dir", os.path.abspath(targetdir))
-            
-        sysvol = os.path.join(default_lp.get("lock dir"), "sysvol")
-        netlogon = os.path.join(os.path.join(sysvol, "scripts"))
-
-        setup_file(setup_path("provision.smb.conf.%s" % smbconfsuffix), 
-                   smbconf, {
-                "HOSTNAME": hostname,
-                "DOMAIN": domain,
-                "REALM": realm,
-                "SERVERROLE": serverrole,
-                "NETLOGONPATH": netlogon,
-                "SYSVOLPATH": sysvol,
-                "PRIVATEDIR_LINE": privatedir_line,
-                "LOCKDIR_LINE": lockdir_line
-                })
+    paths = provision_paths_from_lp(lp, names.dnsdomain)
 
-    lp = param.LoadParm()
-    lp.load(smbconf)
+    if hostip is None:
+        hostip = gethostbyname(names.hostname)
 
     if serverrole is None:
         serverrole = lp.get("server role")
+
     assert serverrole in ("domain controller", "member server", "standalone")
     if invocationid is None and serverrole == "domain controller":
         invocationid = uuid.random()
 
-    if realm is None:
-        realm = lp.get("realm")
-
-    assert realm is not None
-    realm = realm.upper()
-
-    if lp.get("realm").upper() != realm.upper():
-        raise Exception("realm '%s' in %s must match chosen realm '%s'" %
-                        (lp.get("realm"), smbconf, realm))
-    
-    dnsdomain = realm.lower()
-
-    paths = provision_paths_from_lp(lp, dnsdomain)
-
-    if targetdir is not None:
-        if not os.path.exists(paths.private_dir):
-            os.mkdir(paths.private_dir)
+    if not os.path.exists(paths.private_dir):
+        os.mkdir(paths.private_dir)
 
     ldapi_url = "ldapi://%s" % urllib.quote(paths.s4_ldapi_path, safe="")
     
-    if ldap_backend == "ldapi":
-        # provision-backend will set this path suggested slapd command line / fedorads.inf
-        ldap_backend = "ldapi://" % urllib.quote(os.path.join(paths.private_dir, "ldap", "ldapi"), safe="")
-
-    if serverrole == "domain controller":
-        if domaindn is None:
-            domaindn = "DC=" + dnsdomain.replace(".", ",DC=")
-        if domain is None:
-            domain = lp.get("workgroup")
-    
-        if lp.get("workgroup").upper() != domain.upper():
-            raise Error("workgroup '%s' in smb.conf must match chosen domain '%s'",
-                lp.get("workgroup"), domain)
-
-        assert domain is not None
-        domain = domain.upper()
-        if not valid_netbios_name(domain):
-            raise InvalidNetbiosName(domain)
-    else:
-        if domaindn is None:
-            domaindn = "CN=" + netbiosname
-        domain = netbiosname
-    
-    if rootdn is None:
-       rootdn = domaindn
-       
-    if configdn is None:
-        configdn = "CN=Configuration," + rootdn
-    if schemadn is None:
-        schemadn = "CN=Schema," + configdn
-
+    if ldap_backend is not None:
+        if ldap_backend == "ldapi":
+            # provision-backend will set this path suggested slapd command line / fedorads.inf
+            ldap_backend = "ldapi://" % urllib.quote(os.path.join(paths.private_dir, "ldap", "ldapi"), safe="")
+             
     message("set DOMAIN SID: %s" % str(domainsid))
-    message("Provisioning for %s in realm %s" % (domain, realm))
+    message("Provisioning for %s in realm %s" % (names.domain, realm))
     message("Using administrator password: %s" % adminpass)
 
     # only install a new shares config db if there is none
@@ -936,21 +995,19 @@ def provision(setup_dir, message, session_info,
                   credentials=credentials, lp=lp)
 
     samdb = setup_samdb(paths.samdb, setup_path, session_info=session_info, 
-                        credentials=credentials, lp=lp, schemadn=schemadn, 
-                        configdn=configdn, domaindn=domaindn,
-                        dnsdomain=dnsdomain, netbiosname=netbiosname, 
-                        realm=realm, message=message, hostname=hostname, 
-                        rootdn=rootdn, domainsid=domainsid, 
+                        credentials=credentials, lp=lp, names=names,
+                        message=message, 
+                        domainsid=domainsid, 
                         aci=aci, domainguid=domainguid, policyguid=policyguid, 
-                        domainname=domain, fill=samdb_fill, 
+                        fill=samdb_fill, 
                         adminpass=adminpass, krbtgtpass=krbtgtpass,
                         hostguid=hostguid, invocationid=invocationid, 
                         machinepass=machinepass, dnspass=dnspass,
                         serverrole=serverrole, ldap_backend=ldap_backend, 
-                        ldap_backend_type=ldap_backend_type, sitename=sitename)
+                        ldap_backend_type=ldap_backend_type)
 
     if lp.get("server role") == "domain controller":
-       policy_path = os.path.join(paths.sysvol, dnsdomain, "Policies", 
+       policy_path = os.path.join(paths.sysvol, names.dnsdomain, "Policies", 
                                   "{" + policyguid + "}")
        os.makedirs(policy_path, 0755)
        os.makedirs(os.path.join(policy_path, "Machine"), 0755)
@@ -959,14 +1016,14 @@ def provision(setup_dir, message, session_info,
             os.makedirs(paths.netlogon, 0755)
        secrets_ldb = Ldb(paths.secrets, session_info=session_info, 
                          credentials=credentials, lp=lp)
-       secretsdb_become_dc(secrets_ldb, setup_path, domain=domain, realm=realm,
-                           netbiosname=netbiosname, domainsid=domainsid, 
+       secretsdb_become_dc(secrets_ldb, setup_path, domain=domain, realm=names.realm,
+                           netbiosname=names.netbiosname, domainsid=domainsid, 
                            keytab_path=paths.keytab, samdb_url=paths.samdb, 
                            dns_keytab_path=paths.dns_keytab, dnspass=dnspass, 
-                           machinepass=machinepass, dnsdomain=dnsdomain)
+                           machinepass=machinepass, dnsdomain=names.dnsdomain)
 
     if samdb_fill == FILL_FULL:
-        setup_name_mappings(samdb, str(domainsid), domaindn, root=root, 
+        setup_name_mappings(samdb, str(domainsid), names.domaindn, root=root, 
                             nobody=nobody, nogroup=nogroup, wheel=wheel, 
                             users=users, backup=backup)
    
@@ -981,14 +1038,14 @@ def provision(setup_dir, message, session_info,
             domainguid = samdb.searchone(basedn=domaindn, attribute="objectGUID")
             assert isinstance(domainguid, str)
             hostguid = samdb.searchone(basedn=domaindn, attribute="objectGUID",
-                                       expression="(&(objectClass=computer)(cn=%s))" % hostname,
+                                       expression="(&(objectClass=computer)(cn=%s))" % names.hostname,
                                        scope=SCOPE_SUBTREE)
             assert isinstance(hostguid, str)
             
-            message("Setting up DNS zone: %s" % dnsdomain)
+            message("Setting up DNS zone: %s" % names.dnsdomain)
             create_zone_file(paths.dns, setup_path, samdb, 
-                             hostname=hostname, hostip=hostip, dnsdomain=dnsdomain,
-                             domaindn=domaindn, dnspass=dnspass, realm=realm, 
+                             hostname=names.hostname, hostip=hostip, dnsdomain=names.dnsdomain,
+                             domaindn=names.domaindn, dnspass=dnspass, realm=names.realm, 
                              domainguid=domainguid, hostguid=hostguid)
             message("Please install the zone located in %s into your DNS server" % paths.dns)
             
@@ -1025,6 +1082,150 @@ def provision_become_dc(setup_dir=None,
               domain=domain, hostname=hostname, hostip="127.0.0.1", domainsid=domainsid, machinepass=machinepass, serverrole="domain controller", sitename=sitename);
     
 
+def setup_db_config(setup_path, file, dbdir):
+    if not os.path.isdir(os.path.join(dbdir, "bdb-logs")):
+        os.makedirs(os.path.join(dbdir, "bdb-logs"), 0700);
+    if not os.path.isdir(os.path.join(dbdir, "tmp")):
+        os.makedirs(os.path.join(dbdir, "tmp"), 0700);
+    
+    setup_file(setup_path("DB_CONFIG"), os.path.join(dbdir, "DB_CONFIG"),
+               {"LDAPDBDIR": dbdir})
+    
+
+
+def provision_backend(setup_dir=None, message=None,
+                      smbconf=None, targetdir=None, realm=None, 
+                      rootdn=None, domaindn=None, schemadn=None, configdn=None,
+                      domain=None, hostname=None, adminpass=None, root=None, serverrole=None, 
+                      ldap_backend_type=None):
+
+    def setup_path(file):
+        return os.path.join(setup_dir, file)
+
+    if hostname is None:
+        hostname = gethostname().split(".")[0].lower()
+
+    if root is None:
+        root = findnss(pwd.getpwnam, ["root"])[0]
+
+    lp = load_or_make_smbconf(smbconf, setup_path, hostname, domain, realm, serverrole, targetdir)
+
+    names = guess_names(lp=lp, hostname=hostname, domain=domain, 
+                        dnsdomain=realm, serverrole=serverrole, 
+                        rootdn=rootdn, domaindn=domaindn, configdn=configdn, schemadn=schemadn)
+
+    paths = provision_paths_from_lp(lp, names.dnsdomain)
+
+    if not os.path.isdir(paths.ldapdir):
+        os.makedirs(paths.ldapdir)
+    schemadb_path = os.path.join(paths.ldapdir, "schema-tmp.ldb")
+    try:
+        os.unlink(schemadb_path)
+    except:
+        pass
+
+    schemadb = Ldb(schemadb_path, lp=lp)
+ 
+    setup_add_ldif(schemadb, setup_path("provision_schema_basedn.ldif"), 
+                   {"SCHEMADN": names.schemadn,
+                    "ACI": "#",
+                    "EXTENSIBLEOBJECT": "# no objectClass: extensibleObject for local ldb"
+                    })
+    setup_modify_ldif(schemadb, 
+                      setup_path("provision_schema_basedn_modify.ldif"), \
+                          {"SCHEMADN": names.schemadn,
+                           "NETBIOSNAME": names.netbiosname,
+                           "DEFAULTSITE": DEFAULTSITE,
+                           "CONFIGDN": names.configdn,
+                           })
+    
+    setup_add_ldif(schemadb, setup_path("schema_samba4.ldif"), 
+                   {"SCHEMADN": names.schemadn })
+    setup_add_ldif(schemadb, setup_path("schema.ldif"), 
+                   {"SCHEMADN": names.schemadn})
+
+    if ldap_backend_type == "fedora-ds":
+        setup_file(setup_path("fedora-ds.inf"), paths.fedoradsinf, 
+                   {"ROOT": root,
+                    "HOSTNAME": hostname,
+                    "DNSDOMAIN": names.dnsdomain,
+                    "LDAPDIR": paths.ldapdir,
+                    "DOMAINDN": names.domaindn,
+                    "LDAPMANAGERDN": names.ldapmanagerdn,
+                    "LDAPMANAGERPASS": adminpass, 
+                    "SERVERPORT": ""})
+        
+        setup_file(setup_path("fedora-partitions.ldif"), paths.fedoradspartitions, 
+                   {"CONFIGDN": names.configdn,
+                    "SCHEMADN": names.schemadn,
+                    })
+        
+        setup_file(setup_path("fedora-partitions.ldif"), paths.fedoradspartitions, 
+                   {"CONFIGDN": names.configdn,
+                    "SCHEMADN": names.schemadn,
+                    })
+        mapping = "schema-map-fedora-ds-1.0"
+        backend_schema = "99_ad.ldif"
+    elif ldap_backend_type == "openldap":
+        setup_file(setup_path("slapd.conf"), paths.slapdconf,
+                   {"DNSDOMAIN": names.dnsdomain,
+                    "LDAPDIR": paths.ldapdir,
+                    "DOMAINDN": names.domaindn,
+                    "CONFIGDN": names.configdn,
+                    "SCHEMADN": names.schemadn,
+                    "LDAPMANAGERDN": names.ldapmanagerdn,
+                    "LDAPMANAGERPASS": adminpass})
+        setup_file(setup_path("modules.conf"), paths.modulesconf,
+                   {"REALM": names.realm})
+        
+        setup_db_config(setup_path, file, os.path.join(paths.ldapdir, "db", "user"))
+        setup_db_config(setup_path, file, os.path.join(paths.ldapdir, "db", "config"))
+        setup_db_config(setup_path, file, os.path.join(paths.ldapdir, "db", "schema"))
+        mapping = "schema-map-openldap-2.3"
+        backend_schema = "backend-schema.schema"
+        
+        attrs = ["linkID", "lDAPDisplayName"]
+	res = schemadb.search(expression="(&(&(linkID=*)(!(linkID:1.2.840.113556.1.4.803:=1)))(objectclass=attributeSchema))", base=names.schemadn, scope=SCOPE_SUBTREE, attrs=attrs);
+
+ 	memberof_config = "# This is a generated file, do not edit!\n";
+	refint_attributes = "";
+	for i in range (0, len(res)):
+            linkid = res[i]["linkID"][0]
+            linkid = str(int(linkid) + 1)
+            target = schemadb.searchone(basedn=names.schemadn, 
+                                        expression="(&(objectclass=attributeSchema)(linkID=" + (linkid) + "))", 
+                                        attribute="lDAPDisplayName");
+            if target is not None:
+                refint_attributes = refint_attributes + " " + target + " " + res[i]["lDAPDisplayName"];
+                memberof_config = memberof_config + """overlay memberof
+memberof-dangling error
+memberof-refint TRUE
+memberof-group-oc top
+memberof-member-ad """ + res[i]["lDAPDisplayName"] + """
+memberof-memberof-ad """ + target + """
+memberof-dangling-error 32
+
+""";
+
+	memberof_config = memberof_config + """
+overlay refint
+refint_attributes""" + refint_attributes + "\n";
+	
+        if os.path.exists(paths.memberofconf):
+            os.unlink(paths.memberof.conf)
+
+            open(paths.memberofconf, 'w').write(memberof_config)
+
+        ldapi_uri = "ldapi://" + urllib.quote(os.path.join(paths.private_dir, "ldap", "ldapi"), safe="")
+        message("Start slapd with: slapd -f " + paths.ldapdir + "/slapd.conf -h " + ldapi_uri)
+                
+
+    schema_command = "bin/ad2oLschema --option=convert:target=" + ldap_backend_type + " -I " + setup_path(mapping) + " -H tdb://" + schemadb_path + " -O " + os.path.join(paths.ldapdir, backend_schema);
+
+    os.system(schema_command)
+
+
+
 def create_phpldapadmin_config(path, setup_path, ldapi_uri):
     """Create a PHP LDAP admin configuration file.
 
-- 
cgit 


From 6f2935d082687eee23dbc9f1108162cf1670831a Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Thu, 13 Mar 2008 09:53:32 +1100
Subject: Don't talloc_free() the UUID before we return.

This error caused us to put a 0x80 byte at the end of GUID, which was
only detected by OpenLDAP's schema checking.

Andrew Bartlett
(This used to be commit fd99b7719bcb503e2695b2cbad0230fa23a094ca)
---
 source4/scripting/python/uuidmodule.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/uuidmodule.c b/source4/scripting/python/uuidmodule.c
index e05b286dd0..cd9a1cb4d5 100644
--- a/source4/scripting/python/uuidmodule.c
+++ b/source4/scripting/python/uuidmodule.c
@@ -24,6 +24,7 @@
 static PyObject *uuid_random(PyObject *self, PyObject *args)
 {
 	struct GUID guid;
+	PyObject *pyobj;
 	char *str;
 
 	if (!PyArg_ParseTuple(args, (char *)""))
@@ -37,9 +38,11 @@ static PyObject *uuid_random(PyObject *self, PyObject *args)
 		return NULL;
 	}
 
+	pyobj = PyString_FromString(str);
+
 	talloc_free(str);
 
-	return PyString_FromString(str);
+	return pyobj;
 }
 
 static PyMethodDef methods[] = {
-- 
cgit 


From 07a7c8fa0d76cb7cb10cc88fb5bbe5439b746d01 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Thu, 13 Mar 2008 09:55:06 +1100
Subject: Update the provision scripts and selftest for LDAP

This should allow us to provision onto an OpenLDAP backend again.

Also ensure we always have a sysvol and netlogon share in the selftest
environment.

Andrew Bartlett
(This used to be commit b2d9b03ba3434e76d4d476233a198728523d17f9)
---
 source4/scripting/python/samba/provision.py | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index 2ede4b8d3d..f9604a84b2 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -1192,16 +1192,18 @@ def provision_backend(setup_dir=None, message=None,
 	for i in range (0, len(res)):
             linkid = res[i]["linkID"][0]
             linkid = str(int(linkid) + 1)
+            expression = "(&(objectclass=attributeSchema)(linkID=" + (linkid) + "))"
             target = schemadb.searchone(basedn=names.schemadn, 
-                                        expression="(&(objectclass=attributeSchema)(linkID=" + (linkid) + "))", 
-                                        attribute="lDAPDisplayName");
+                                        expression=expression, 
+                                        attribute="lDAPDisplayName", 
+                                        scope=SCOPE_SUBTREE);
             if target is not None:
-                refint_attributes = refint_attributes + " " + target + " " + res[i]["lDAPDisplayName"];
+                refint_attributes = refint_attributes + " " + target + " " + res[i]["lDAPDisplayName"][0];
                 memberof_config = memberof_config + """overlay memberof
 memberof-dangling error
 memberof-refint TRUE
 memberof-group-oc top
-memberof-member-ad """ + res[i]["lDAPDisplayName"] + """
+memberof-member-ad """ + res[i]["lDAPDisplayName"][0] + """
 memberof-memberof-ad """ + target + """
 memberof-dangling-error 32
 
@@ -1214,7 +1216,7 @@ refint_attributes""" + refint_attributes + "\n";
         if os.path.exists(paths.memberofconf):
             os.unlink(paths.memberof.conf)
 
-            open(paths.memberofconf, 'w').write(memberof_config)
+        open(paths.memberofconf, 'w').write(memberof_config)
 
         ldapi_uri = "ldapi://" + urllib.quote(os.path.join(paths.private_dir, "ldap", "ldapi"), safe="")
         message("Start slapd with: slapd -f " + paths.ldapdir + "/slapd.conf -h " + ldapi_uri)
-- 
cgit 


From 0c882402360a10b19a038bce9f87e241051c9ba8 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Thu, 13 Mar 2008 11:36:58 +1100
Subject: Rework to have member server 'domains' be CN=NETBIOSNAME

This reworks quite a few parts of our provision system to use
CN=NETBIOSNAME as the domain for member servers.

This makes it clear that these domains are not in the DNS structure,
while complying with our own schema (found by OpenLDAP's schema
validation).

Andrew Bartlett
(This used to be commit bda6a38b055fed2394e65cdc0b308a1442116402)
---
 source4/scripting/python/samba/provision.py | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index f9604a84b2..25316e888a 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -763,9 +763,15 @@ def setup_samdb(path, setup_path, session_info, credentials, lp,
         
     try:
         message("Adding DomainDN: %s (permitted to fail)" % names.domaindn)
+        if serverrole == "domain controller":
+            domain_oc = "domainDNS"
+        else:
+            domain_oc = "samba4LocalDomain"
+
         setup_add_ldif(samdb, setup_path("provision_basedn.ldif"), {
             "DOMAINDN": names.domaindn,
             "ACI": aci,
+            "DOMAIN_OC": domain_oc
             })
 
         message("Modifying DomainDN: " + names.domaindn + "")
-- 
cgit 


From 1710eca2594c3b43f7b0651a2f07429dbeb2a35d Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Thu, 13 Mar 2008 14:27:10 +0100
Subject: configure: when detecting python we should disable pyconfig.h

This fixes the detection on HP-UX where the pyconfig.h contains
bogus defines.

metze
(This used to be commit 9391f6f80461be2b214a881782aecf7df8a4aba3)
---
 source4/scripting/python/config.m4 | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/config.m4 b/source4/scripting/python/config.m4
index 2142cd9abd..aac98ebc60 100644
--- a/source4/scripting/python/config.m4
+++ b/source4/scripting/python/config.m4
@@ -22,6 +22,8 @@ AC_DEFUN([TRY_LINK_PYTHON],
 		CFLAGS="$CFLAGS $2"
 
 		AC_TRY_LINK([
+				/* we have our own configure tests */
+				#define Py_PYCONFIG_H 1
 				#include <Python.h>
 				#include <stdlib.h>
 			],[
-- 
cgit 


From 9c7c6c7049ab67bd5d0cee992180602bc71fa9d1 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Thu, 13 Mar 2008 15:55:56 +0100
Subject: build: we don't rely on bash yet:-) '==' should be just '='

metze
(This used to be commit 17997dd9bcd385fcf27646d832ad824cc2a0800a)
---
 source4/scripting/python/config.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/config.mk b/source4/scripting/python/config.mk
index a16d737344..09c77813ca 100644
--- a/source4/scripting/python/config.mk
+++ b/source4/scripting/python/config.mk
@@ -21,7 +21,7 @@ swig:: pythonmods
 .SUFFIXES: _wrap.c .i
 
 .i_wrap.c:
-	[ "$(SWIG)" == "no" ] || $(SWIG) -O -Wall -I$(srcdir)/scripting/swig -python -keyword $<
+	[ "$(SWIG)" = "no" ] || $(SWIG) -O -Wall -I$(srcdir)/scripting/swig -python -keyword $<
 
 realdistclean::
 	@echo "Removing SWIG output files"
-- 
cgit 


From 2fd59920381ea81734565637adcec96e5668ef86 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Fri, 14 Mar 2008 14:33:18 +0100
Subject: swig: regenerate _wrap.c files

metze
(This used to be commit 08b41e10699c7bb8058ab0ab61f17a1bbfcc1ce4)
---
 source4/scripting/python/misc_wrap.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/misc_wrap.c b/source4/scripting/python/misc_wrap.c
index f467f851bd..cf85e91e1e 100644
--- a/source4/scripting/python/misc_wrap.c
+++ b/source4/scripting/python/misc_wrap.c
@@ -3027,7 +3027,7 @@ SWIGINTERN PyObject *_wrap_dsdb_attach_schema_from_ldif_file(PyObject *SWIGUNUSE
     "ldb context must be non-NULL");
   result = dsdb_attach_schema_from_ldif_file(arg1,(char const *)arg2,(char const *)arg3);
   if (!W_ERROR_IS_OK(result)) {
-    PyObject *obj = Py_BuildValue((char *)"(i,s)", (&result)->v, win_errstr(result));
+    PyObject *obj = Py_BuildValue((char *)"(i,s)", W_ERROR_V(result), win_errstr(result));
     PyErr_SetObject(PyExc_RuntimeError, obj);
     SWIG_fail;
   } else if (resultobj == NULL) {
-- 
cgit 


From d7299d82c31f08750d5d378b0e1f0226dbff5d05 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Sat, 15 Mar 2008 19:03:04 +1100
Subject: Rework memberof handling in slapd.conf (used for OpenLDAP backend)

Instead of using an include file, put the generated configurationd
directly into slapd.conf.

Andrew Bartlett
(This used to be commit 95ac786136aebfe5ededeb3fb81cbd4e296e3988)
---
 source4/scripting/python/samba/provision.py | 41 +++++++++++++----------------
 1 file changed, 19 insertions(+), 22 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index 25316e888a..47d00f8871 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -1173,27 +1173,10 @@ def provision_backend(setup_dir=None, message=None,
         mapping = "schema-map-fedora-ds-1.0"
         backend_schema = "99_ad.ldif"
     elif ldap_backend_type == "openldap":
-        setup_file(setup_path("slapd.conf"), paths.slapdconf,
-                   {"DNSDOMAIN": names.dnsdomain,
-                    "LDAPDIR": paths.ldapdir,
-                    "DOMAINDN": names.domaindn,
-                    "CONFIGDN": names.configdn,
-                    "SCHEMADN": names.schemadn,
-                    "LDAPMANAGERDN": names.ldapmanagerdn,
-                    "LDAPMANAGERPASS": adminpass})
-        setup_file(setup_path("modules.conf"), paths.modulesconf,
-                   {"REALM": names.realm})
-        
-        setup_db_config(setup_path, file, os.path.join(paths.ldapdir, "db", "user"))
-        setup_db_config(setup_path, file, os.path.join(paths.ldapdir, "db", "config"))
-        setup_db_config(setup_path, file, os.path.join(paths.ldapdir, "db", "schema"))
-        mapping = "schema-map-openldap-2.3"
-        backend_schema = "backend-schema.schema"
-        
         attrs = ["linkID", "lDAPDisplayName"]
 	res = schemadb.search(expression="(&(&(linkID=*)(!(linkID:1.2.840.113556.1.4.803:=1)))(objectclass=attributeSchema))", base=names.schemadn, scope=SCOPE_SUBTREE, attrs=attrs);
 
- 	memberof_config = "# This is a generated file, do not edit!\n";
+ 	memberof_config = "# Generated from schema in " + schemadb_path + "\n";
 	refint_attributes = "";
 	for i in range (0, len(res)):
             linkid = res[i]["linkID"][0]
@@ -1219,10 +1202,24 @@ memberof-dangling-error 32
 overlay refint
 refint_attributes""" + refint_attributes + "\n";
 	
-        if os.path.exists(paths.memberofconf):
-            os.unlink(paths.memberof.conf)
-
-        open(paths.memberofconf, 'w').write(memberof_config)
+        setup_file(setup_path("slapd.conf"), paths.slapdconf,
+                   {"DNSDOMAIN": names.dnsdomain,
+                    "LDAPDIR": paths.ldapdir,
+                    "DOMAINDN": names.domaindn,
+                    "CONFIGDN": names.configdn,
+                    "SCHEMADN": names.schemadn,
+                    "LDAPMANAGERDN": names.ldapmanagerdn,
+                    "LDAPMANAGERPASS": adminpass,
+                    "MEMBEROF_CONFIG": memberof_config})
+        setup_file(setup_path("modules.conf"), paths.modulesconf,
+                   {"REALM": names.realm})
+        
+        setup_db_config(setup_path, file, os.path.join(paths.ldapdir, "db", "user"))
+        setup_db_config(setup_path, file, os.path.join(paths.ldapdir, "db", "config"))
+        setup_db_config(setup_path, file, os.path.join(paths.ldapdir, "db", "schema"))
+        mapping = "schema-map-openldap-2.3"
+        backend_schema = "backend-schema.schema"
+        
 
         ldapi_uri = "ldapi://" + urllib.quote(os.path.join(paths.private_dir, "ldap", "ldapi"), safe="")
         message("Start slapd with: slapd -f " + paths.ldapdir + "/slapd.conf -h " + ldapi_uri)
-- 
cgit 


From 786deaf9288c77b40892d6639113e580a7be6904 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Fri, 28 Mar 2008 12:08:54 +1100
Subject: Make the setup/newuser and setup/setpassword scripts actually work...

These need a testsuite, but this will come soon.

Andrew Bartlett
(This used to be commit fbcaa622bd1929399e32326349e96b6676a49b96)
---
 source4/scripting/python/samba/samdb.py | 58 ++++++++++++++++++++++++---------
 1 file changed, 42 insertions(+), 16 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/samdb.py b/source4/scripting/python/samba/samdb.py
index 3c6bb23c02..de0fd4ba04 100644
--- a/source4/scripting/python/samba/samdb.py
+++ b/source4/scripting/python/samba/samdb.py
@@ -77,10 +77,15 @@ unixName: %s
         
         :param user_dn: Dn of the account to enable.
         """
-        res = self.search(user_dn, SCOPE_ONELEVEL, None, ["userAccountControl"])
+        res = self.search(user_dn, ldb.SCOPE_BASE, None, ["userAccountControl"])
         assert len(res) == 1
-        userAccountControl = res[0].userAccountControl
-        userAccountControl = userAccountControl - 2 # remove disabled bit
+        userAccountControl = res[0]["userAccountControl"][0]
+        userAccountControl = int(userAccountControl)
+        if (userAccountControl & 0x2):
+            userAccountControl = userAccountControl & ~0x2 # remove disabled bit
+        if (userAccountControl & 0x20):
+            userAccountControl = userAccountControl & ~0x20 # remove 'no password required' bit
+
         mod = """
 dn: %s
 changetype: modify
@@ -103,13 +108,9 @@ userAccountControl: %u
         res = self.search("", scope=ldb.SCOPE_BASE, 
                           expression="(defaultNamingContext=*)", 
                           attrs=["defaultNamingContext"])
-        assert(len(res) == 1 and res[0].defaultNamingContext is not None)
+        assert(len(res) == 1 and res[0]["defaultNamingContext"] is not None)
         domain_dn = res[0]["defaultNamingContext"][0]
         assert(domain_dn is not None)
-        dom_users = self.searchone(basedn=domain_dn, attribute="dn", 
-                                   expression="name=Domain Users")
-        assert(dom_users is not None)
-
         user_dn = "CN=%s,CN=Users,%s" % (username, domain_dn)
 
         #
@@ -123,19 +124,44 @@ userAccountControl: %u
             "sambaPassword": password,
             "objectClass": "user"})
 
-        #  add the user to the users group as well
-        modgroup = """
+        #  modify the userAccountControl to remove the disabled bit
+        self.enable_account(user_dn)
+        self.transaction_commit()
+
+    def setpassword(self, filter, password):
+        """Set a password on a user record
+        
+        :param filter: LDAP filter to find the user (eg samccountname=name)
+        :param password: Password for the user
+        """
+        # connect to the sam 
+        self.transaction_start()
+
+        # find the DNs for the domain
+        res = self.search("", scope=ldb.SCOPE_BASE, 
+                          expression="(defaultNamingContext=*)", 
+                          attrs=["defaultNamingContext"])
+        assert(len(res) == 1 and res[0]["defaultNamingContext"] is not None)
+        domain_dn = res[0]["defaultNamingContext"][0]
+        assert(domain_dn is not None)
+
+        res = self.search(domain_dn, scope=ldb.SCOPE_SUBTREE, 
+                          expression=filter,
+                          attrs=[])
+        assert(len(res) == 1)
+        user_dn = res[0].dn
+
+        setpw = """
 dn: %s
 changetype: modify
-add: member
-member: %s
-""" % (dom_users, user_dn)
-
+replace: sambaPassword
+sambaPassword: %s
+""" % (user_dn, password)
 
-        self.modify(modgroup)
+        self.modify_ldif(setpw)
 
         #  modify the userAccountControl to remove the disabled bit
-        enable_account(self, user_dn)
+        self.enable_account(user_dn)
         self.transaction_commit()
 
     def set_domain_sid(self, sid):
-- 
cgit 


From 677dc6aa897aed0919050545155fbd868c210b89 Mon Sep 17 00:00:00 2001
From: Kai Blin <kai@samba.org>
Date: Thu, 27 Mar 2008 17:49:56 +0100
Subject: provision: Initialize uninitialized variables if "targetdir" is not
 defined and there is no smb.conf file (This used to be commit
 19c29f473883be0a17fa740de9feb226f347df4a)

---
 source4/scripting/python/samba/provision.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index 47d00f8871..e97ce694b4 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -373,7 +373,10 @@ def load_or_make_smbconf(smbconf, setup_path, hostname, domain, realm, serverrol
             lockdir_line = "lock dir = " + os.path.abspath(targetdir)
 
             default_lp.set("lock dir", os.path.abspath(targetdir))
-            
+        else:
+	    privatedir_line = "private_dir = " + default_lp.get("private dir")
+	    lockdir_line = "lock dir = " + default_lp.get("lock dir")
+
         sysvol = os.path.join(default_lp.get("lock dir"), "sysvol")
         netlogon = os.path.join(sysvol, realm.lower(), "scripts")
 
-- 
cgit 


From e15b35e3897e63b9e815a04101436439d4aebdef Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Thu, 27 Mar 2008 22:26:37 +0100
Subject: Remove define that appears to cause configure test breakage on
 Julien's machine. (This used to be commit
 f47df5761571dd5c36789fb2e225a1125ca0e8f7)

---
 source4/scripting/python/config.m4 | 2 --
 1 file changed, 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/config.m4 b/source4/scripting/python/config.m4
index aac98ebc60..3790071ba8 100644
--- a/source4/scripting/python/config.m4
+++ b/source4/scripting/python/config.m4
@@ -23,9 +23,7 @@ AC_DEFUN([TRY_LINK_PYTHON],
 
 		AC_TRY_LINK([
 				/* we have our own configure tests */
-				#define Py_PYCONFIG_H 1
 				#include <Python.h>
-				#include <stdlib.h>
 			],[
 				Py_InitModule(NULL, NULL);
 			],[
-- 
cgit 


From b2c6ba69a453aaa7cbabb7be7b8c2a05b48a76c4 Mon Sep 17 00:00:00 2001
From: Andrew Kroeger <andrew@sprocks.gotdns.com>
Date: Thu, 27 Mar 2008 16:30:18 -0500
Subject: provision: Increase max NetBIOS name length from 13 to 15.

Issue originally reported by user Julsa-FR on IRC.
(This used to be commit ee9ad77009ef5e36655a49c41730a4a963ba9d43)
---
 source4/scripting/libjs/provision.js       | 2 +-
 source4/scripting/python/samba/__init__.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index 3ba93debf9..86baa0c003 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -1174,7 +1174,7 @@ member: %s
 // crh has a paragraph on this in his book (1.4.1.1)
 function valid_netbios_name(name)
 {
-	if (strlen(name) > 13) return false;
+	if (strlen(name) > 15) return false;
 	return true;
 }
 
diff --git a/source4/scripting/python/samba/__init__.py b/source4/scripting/python/samba/__init__.py
index e91b320c07..b9d81c6c3c 100644
--- a/source4/scripting/python/samba/__init__.py
+++ b/source4/scripting/python/samba/__init__.py
@@ -225,7 +225,7 @@ def valid_netbios_name(name):
     """Check whether a name is valid as a NetBIOS name. """
     # FIXME: There are probably more constraints here. 
     # crh has a paragraph on this in his book (1.4.1.1)
-    if len(name) > 13:
+    if len(name) > 15:
         return False
     return True
 
-- 
cgit 


From 4ddce8c28ca5abe2ac52cfb3a2956803f585b51a Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Fri, 28 Mar 2008 10:38:12 +1100
Subject: Don't specify what should be a default option in the generated
 smb.conf

Instead, sub in "", so that the default continued to come from the code.

Andrew Bartlett
(This used to be commit b1829da8f75175fcc569a3a9195f2358731055a9)
---
 source4/scripting/python/samba/provision.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index e97ce694b4..d5e66d842c 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -374,8 +374,8 @@ def load_or_make_smbconf(smbconf, setup_path, hostname, domain, realm, serverrol
 
             default_lp.set("lock dir", os.path.abspath(targetdir))
         else:
-	    privatedir_line = "private_dir = " + default_lp.get("private dir")
-	    lockdir_line = "lock dir = " + default_lp.get("lock dir")
+	    privatedir_line = ""
+	    lockdir_line = ""
 
         sysvol = os.path.join(default_lp.get("lock dir"), "sysvol")
         netlogon = os.path.join(sysvol, realm.lower(), "scripts")
-- 
cgit 


From 8f8c56bfbcbfe8f80afb09eb1d481a108b252bee Mon Sep 17 00:00:00 2001
From: Andrew Kroeger <andrew@sprocks.gotdns.com>
Date: Fri, 28 Mar 2008 01:08:49 -0500
Subject: Convert some more files to GPLv3. (This used to be commit
 ebe5e8399422eb7e2ff4deb546338823e2718907)

---
 source4/scripting/bin/smbstatus              | 2 +-
 source4/scripting/bin/winreg                 | 2 +-
 source4/scripting/libjs/auth.js              | 2 +-
 source4/scripting/libjs/base.js              | 2 +-
 source4/scripting/libjs/encoder.js           | 2 +-
 source4/scripting/libjs/management.js        | 2 +-
 source4/scripting/libjs/provision.js         | 2 +-
 source4/scripting/libjs/samr.js              | 2 +-
 source4/scripting/libjs/server_call.js       | 2 +-
 source4/scripting/libjs/winreg.js            | 2 +-
 source4/scripting/python/subunit/__init__.py | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/bin/smbstatus b/source4/scripting/bin/smbstatus
index ea41289dce..4dfc3365a1 100755
--- a/source4/scripting/bin/smbstatus
+++ b/source4/scripting/bin/smbstatus
@@ -3,7 +3,7 @@ exec smbscript "$0" ${1+"$@"}
 /*
   provide information on connected users and open files
   Copyright Andrew Tridgell 2005
-  Released under the GNU GPL v2 or later
+  Released under the GNU GPL version 3 or later
 */	
 
 libinclude("base.js");
diff --git a/source4/scripting/bin/winreg b/source4/scripting/bin/winreg
index 2114394f45..883c6d7ee3 100755
--- a/source4/scripting/bin/winreg
+++ b/source4/scripting/bin/winreg
@@ -3,7 +3,7 @@ exec smbscript "$0" ${1+"$@"}
 /*
   tool to manipulate a remote registry
   Copyright Andrew Tridgell 2005
-  Released under the GNU GPL v2 or later
+  Released under the GNU GPL version 3 or later
 */	
 
 var options = GetOptions(ARGV,
diff --git a/source4/scripting/libjs/auth.js b/source4/scripting/libjs/auth.js
index 73d8645218..3fe81d0ea7 100644
--- a/source4/scripting/libjs/auth.js
+++ b/source4/scripting/libjs/auth.js
@@ -1,7 +1,7 @@
 /*
 	auth js library functions
 	Copyright Andrew Tridgell 2005
-	released under the GNU GPL v2 or later
+	released under the GNU GPL version 3 or later
 */
 
 
diff --git a/source4/scripting/libjs/base.js b/source4/scripting/libjs/base.js
index df0bfe0ce9..d861073a07 100644
--- a/source4/scripting/libjs/base.js
+++ b/source4/scripting/libjs/base.js
@@ -1,7 +1,7 @@
 /*
 	base js library functions
 	Copyright Andrew Tridgell 2005
-	released under the GNU GPL v2 or later
+	released under the GNU GPL version 3 or later
 */
 
 if (global["HAVE_BASE_JS"] != undefined) {
diff --git a/source4/scripting/libjs/encoder.js b/source4/scripting/libjs/encoder.js
index d96b859547..6cb780c00d 100644
--- a/source4/scripting/libjs/encoder.js
+++ b/source4/scripting/libjs/encoder.js
@@ -2,7 +2,7 @@
 	server side js functions for encoding/decoding objects into linear strings
 
 	Copyright Andrew Tridgell 2005
-	released under the GNU GPL Version 2 or later
+	released under the GNU GPL Version 3 or later
 */
 /*
 	usage:
diff --git a/source4/scripting/libjs/management.js b/source4/scripting/libjs/management.js
index e54b5e283b..4a43275156 100644
--- a/source4/scripting/libjs/management.js
+++ b/source4/scripting/libjs/management.js
@@ -1,7 +1,7 @@
 /*
 	backend code for Samba4 management
 	Copyright Andrew Tridgell 2005
-	Released under the GNU GPL v2 or later
+	Released under the GNU GPL version 3 or later
 */
 
 
diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index 86baa0c003..51e2785762 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -1,7 +1,7 @@
 /*
 	backend code for provisioning a Samba4 server
 	Copyright Andrew Tridgell 2005
-	Released under the GNU GPL v2 or later
+	Released under the GNU GPL version 3 or later
 */
 
 sys = sys_init();
diff --git a/source4/scripting/libjs/samr.js b/source4/scripting/libjs/samr.js
index a7d7d964fb..6e8c70af3c 100644
--- a/source4/scripting/libjs/samr.js
+++ b/source4/scripting/libjs/samr.js
@@ -1,7 +1,7 @@
 /*
 	samr rpc utility functions 
 	Copyright Andrew Tridgell 2005
-	released under the GNU GPL v2 or later
+	released under the GNU GPL version 3 or later
 */	
 
 if (global["HAVE_SAMR_JS"] != undefined) {
diff --git a/source4/scripting/libjs/server_call.js b/source4/scripting/libjs/server_call.js
index a8c08780f9..46414a90dd 100644
--- a/source4/scripting/libjs/server_call.js
+++ b/source4/scripting/libjs/server_call.js
@@ -2,7 +2,7 @@
 	server side js functions for handling async calls from js clients
 
 	Copyright Andrew Tridgell 2005
-	released under the GNU GPL Version 2 or later
+	released under the GNU GPL Version 3 or later
 */
 
 libinclude("encoder.js");
diff --git a/source4/scripting/libjs/winreg.js b/source4/scripting/libjs/winreg.js
index 29338abc5a..9db415694d 100644
--- a/source4/scripting/libjs/winreg.js
+++ b/source4/scripting/libjs/winreg.js
@@ -1,7 +1,7 @@
 /*
 	winreg rpc utility functions 
 	Copyright Andrew Tridgell 2005
-	released under the GNU GPL v2 or later
+	released under the GNU GPL version 3 or later
 */	
 
 libinclude("base.js");
diff --git a/source4/scripting/python/subunit/__init__.py b/source4/scripting/python/subunit/__init__.py
index 3abfbf522e..ac3d0c3a40 100644
--- a/source4/scripting/python/subunit/__init__.py
+++ b/source4/scripting/python/subunit/__init__.py
@@ -5,7 +5,7 @@
 #
 #  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
+#  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,
-- 
cgit 


From 142fbfb3c1f9f8cda7f0edaa801f8345f23d805f Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Fri, 28 Mar 2008 21:57:15 +1100
Subject: Fix and test python scripts and kerberos

This fixes up the python credentials interface in a number of areas,
with the aim of supporting '-k yes' as a command line option.  (This
enables the use of kerberos).

As such, I've had to change the get_credentials call to take a
loadparm context, so that the credentials can be initialised
correctly.

The test_kinit script has been modified to prove that this continues
to work, as well as to provide greater code coverage of the kerberos
paths.

Andrew Bartlett
(This used to be commit 727ef40c2b56910028ef3c1092b8eab1bfa6ce63)
---
 source4/scripting/python/samba/getopt.py      | 15 ++++++++++++---
 source4/scripting/python/samba/tests/samdb.py |  1 +
 2 files changed, 13 insertions(+), 3 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/getopt.py b/source4/scripting/python/samba/getopt.py
index 088a5acf6f..82cb004b62 100644
--- a/source4/scripting/python/samba/getopt.py
+++ b/source4/scripting/python/samba/getopt.py
@@ -18,7 +18,7 @@
 #
 
 import optparse
-from credentials import Credentials
+from credentials import Credentials, AUTO_USE_KERBEROS, DONT_USE_KERBEROS, MUST_USE_KERBEROS
 
 class SambaOptions(optparse.OptionGroup):
     def __init__(self, parser):
@@ -65,6 +65,9 @@ class CredentialsOptions(optparse.OptionGroup):
                         help="Workgroup", callback=self._parse_workgroup)
         self.add_option("-N", "--no-pass", action="store_true",
                         help="Don't ask for a password")
+        self.add_option("-k", "--kerberos", metavar="KERBEROS", 
+                        action="callback", type=str,
+                        help="Use Kerberos", callback=self._set_kerberos)
         self.creds = Credentials()
 
     def _parse_username(self, option, opt_str, arg, parser):
@@ -76,11 +79,17 @@ class CredentialsOptions(optparse.OptionGroup):
     def _set_password(self, option, opt_str, arg, parser):
         self.creds.set_password(arg)
 
+    def _set_kerberos(self, option, opt_str, arg, parser):
+        if bool(arg) or arg.lower() == "yes":
+            self.creds.set_kerberos_state(MUST_USE_KERBEROS)
+        else:
+            self.creds.set_kerberos_state(DONT_USE_KERBEROS)
+
     def _set_simple_bind_dn(self, option, opt_str, arg, parser):
         self.creds.set_bind_dn(arg)
 
-    def get_credentials(self):
-        self.creds.guess()
+    def get_credentials(self, lp):
+        self.creds.guess(lp)
         if not self.no_pass:
             self.creds.set_cmdline_callbacks()
         return self.creds
diff --git a/source4/scripting/python/samba/tests/samdb.py b/source4/scripting/python/samba/tests/samdb.py
index 40e56bebb5..3745dba6fc 100644
--- a/source4/scripting/python/samba/tests/samdb.py
+++ b/source4/scripting/python/samba/tests/samdb.py
@@ -38,6 +38,7 @@ class SamDBTestCase(TestCaseInTempDir):
         policyguid = uuid.random()
         setup_path = lambda x: os.path.join("setup", x)
         creds = Credentials()
+        creds.set_anonymous()
         domainsid = security.random_sid()
         hostguid = uuid.random()
         path = os.path.join(self.tempdir, "samdb.ldb")
-- 
cgit 


From 238a1a52f1fd3cce0a0fd980c1717c8540a1c7a1 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Sat, 29 Mar 2008 17:17:56 +1100
Subject: Rework 'compleated' message in provision to be more useful.

In particular, this should draw attention to accidential 'standalone'
server provisions and therefore cause less frustration.

Andrew Bartlett
(This used to be commit e906ae041a2b589ffceff97b74f7c4b01386382a)
---
 source4/scripting/python/samba/provision.py | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index d5e66d842c..b03457e57b 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -974,10 +974,6 @@ def provision(setup_dir, message, session_info,
             # provision-backend will set this path suggested slapd command line / fedorads.inf
             ldap_backend = "ldapi://" % urllib.quote(os.path.join(paths.private_dir, "ldap", "ldapi"), safe="")
              
-    message("set DOMAIN SID: %s" % str(domainsid))
-    message("Provisioning for %s in realm %s" % (names.domain, realm))
-    message("Using administrator password: %s" % adminpass)
-
     # only install a new shares config db if there is none
     if not os.path.exists(paths.shareconf):
         message("Setting up share.ldb")
@@ -1036,7 +1032,7 @@ def provision(setup_dir, message, session_info,
                             nobody=nobody, nogroup=nogroup, wheel=wheel, 
                             users=users, backup=backup)
    
-        message("Setting up sam.ldb rootDSE marking as synchronized")
+        message("Compleating sam.ldb setup by marking as synchronized")
         setup_modify_ldif(samdb, setup_path("provision_rootdse_modify.ldif"))
 
         # Only make a zone file on the first DC, it should be replicated with DNS replication
@@ -1051,19 +1047,25 @@ def provision(setup_dir, message, session_info,
                                        scope=SCOPE_SUBTREE)
             assert isinstance(hostguid, str)
             
-            message("Setting up DNS zone: %s" % names.dnsdomain)
             create_zone_file(paths.dns, setup_path, samdb, 
                              hostname=names.hostname, hostip=hostip, dnsdomain=names.dnsdomain,
                              domaindn=names.domaindn, dnspass=dnspass, realm=names.realm, 
                              domainguid=domainguid, hostguid=hostguid)
             message("Please install the zone located in %s into your DNS server" % paths.dns)
             
-    message("Setting up phpLDAPadmin configuration")
     create_phpldapadmin_config(paths.phpldapadminconfig, setup_path, 
                                ldapi_url)
 
     message("Please install the phpLDAPadmin configuration located at %s into /etc/phpldapadmin/config.php" % paths.phpldapadminconfig)
 
+    message("Once the above files are installed, your server will be ready to use")
+    message("Server Type:    %s" % serverrole)
+    message("Hostname:       %s" % names.hostname)
+    message("NetBIOS Domain: %s" % names.domain)
+    message("DNS Domain:     %s" % names.dnsdomain)
+    message("DOMAIN SID:     %s" % str(domainsid))
+    message("Admin password: %s" % adminpass)
+
     result = ProvisionResult()
     result.domaindn = domaindn
     result.paths = paths
-- 
cgit 


From f41b9a9dde0dcad17e3a137537548f9bd9ab3901 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 1 Apr 2008 15:08:30 +0200
Subject: Rename libsamba-config to libsamba-hostconfig. (This used to be
 commit c46b7e90e347da76156ddcae4866adb88e9fec21)

---
 source4/scripting/ejs/config.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/config.mk b/source4/scripting/ejs/config.mk
index c1f07367fb..33a4ac915f 100644
--- a/source4/scripting/ejs/config.mk
+++ b/source4/scripting/ejs/config.mk
@@ -93,6 +93,6 @@ PRIVATE_DEPENDENCIES = \
 INSTALLDIR = BINDIR
 OBJ_FILES = \
 		smbscript.o
-PRIVATE_DEPENDENCIES = EJS LIBSAMBA-UTIL smbcalls LIBSAMBA-CONFIG
+PRIVATE_DEPENDENCIES = EJS LIBSAMBA-UTIL smbcalls LIBSAMBA-HOSTCONFIG
 # End BINARY SMBSCRIPT
 #######################
-- 
cgit 


From 2ab6dd9ea58c7f09791f45077df084447fc7de69 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Wed, 2 Apr 2008 11:38:58 +1100
Subject: Remove references to setting the host GUID, as the repl_meta_data
 module prohibits it anyway.

Andrew Bartlett
(This used to be commit c5b287c056855892f30fbbf32efe7d65da31ce91)
---
 source4/scripting/python/samba/provision.py | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index b03457e57b..50d9f8d2ff 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -695,13 +695,8 @@ def setup_samdb_rootdse(samdb, setup_path, schemadn, domaindn, hostname,
 def setup_self_join(samdb, names,
                     machinepass, dnspass, 
                     domainsid, invocationid, setup_path,
-                    policyguid, hostguid=None):
+                    policyguid):
     """Join a host to its own domain."""
-    if hostguid is not None:
-        hostguid_add = "objectGUID: %s" % hostguid
-    else:
-        hostguid_add = ""
-
     setup_add_ldif(samdb, setup_path("provision_self_join.ldif"), { 
               "CONFIGDN": names.configdn, 
               "SCHEMADN": names.schemadn,
@@ -714,7 +709,6 @@ def setup_self_join(samdb, names,
               "DNSPASS_B64": b64encode(dnspass),
               "REALM": names.realm,
               "DOMAIN": names.domain,
-              "HOSTGUID_ADD": hostguid_add,
               "DNSDOMAIN": names.dnsdomain})
     setup_add_ldif(samdb, setup_path("provision_group_policy.ldif"), { 
               "POLICYGUID": policyguid,
@@ -727,7 +721,7 @@ def setup_samdb(path, setup_path, session_info, credentials, lp,
                 names, message, 
                 domainsid, aci, domainguid, policyguid, 
                 fill, adminpass, krbtgtpass, 
-                machinepass, hostguid, invocationid, dnspass,
+                machinepass, invocationid, dnspass,
                 serverrole, ldap_backend=None, 
                 ldap_backend_type=None):
     """Setup a complete SAM Database.
@@ -880,7 +874,6 @@ def setup_samdb(path, setup_path, session_info, credentials, lp,
                                 dnspass=dnspass,  
                                 machinepass=machinepass, 
                                 domainsid=domainsid, policyguid=policyguid,
-                                hostguid=hostguid, 
                                 setup_path=setup_path)
 
     #We want to setup the index last, as adds are faster unindexed
@@ -902,7 +895,7 @@ def provision(setup_dir, message, session_info,
               credentials, smbconf=None, targetdir=None, samdb_fill=FILL_FULL, realm=None, 
               rootdn=None, domaindn=None, schemadn=None, configdn=None,
               domain=None, hostname=None, hostip=None, domainsid=None, 
-              hostguid=None, adminpass=None, krbtgtpass=None, domainguid=None, 
+              adminpass=None, krbtgtpass=None, domainguid=None, 
               policyguid=None, invocationid=None, machinepass=None, 
               dnspass=None, root=None, nobody=None, nogroup=None, users=None, 
               wheel=None, backup=None, aci=None, serverrole=None, 
@@ -1006,7 +999,7 @@ def provision(setup_dir, message, session_info,
                         aci=aci, domainguid=domainguid, policyguid=policyguid, 
                         fill=samdb_fill, 
                         adminpass=adminpass, krbtgtpass=krbtgtpass,
-                        hostguid=hostguid, invocationid=invocationid, 
+                        invocationid=invocationid, 
                         machinepass=machinepass, dnspass=dnspass,
                         serverrole=serverrole, ldap_backend=ldap_backend, 
                         ldap_backend_type=ldap_backend_type)
@@ -1077,7 +1070,7 @@ def provision_become_dc(setup_dir=None,
                         smbconf=None, targetdir=None, realm=None, 
                         rootdn=None, domaindn=None, schemadn=None, configdn=None,
                         domain=None, hostname=None, domainsid=None, 
-                        hostguid=None, adminpass=None, krbtgtpass=None, domainguid=None, 
+                        adminpass=None, krbtgtpass=None, domainguid=None, 
                         policyguid=None, invocationid=None, machinepass=None, 
                         dnspass=None, root=None, nobody=None, nogroup=None, users=None, 
                         wheel=None, backup=None, aci=None, serverrole=None, 
-- 
cgit 


From 3c0c6acc594fba1f1d28e49cb105c99fa1649a18 Mon Sep 17 00:00:00 2001
From: Andrew Kroeger <andrew@sprocks.gotdns.com>
Date: Tue, 1 Apr 2008 19:51:24 -0500
Subject: provision: Add support for IPv6 (bz #4593). (This used to be commit
 8585a3c77d5dfe97bca3f08716fc06ac2819f578)

---
 source4/scripting/python/samba/provision.py | 34 +++++++++++++++++++++--------
 1 file changed, 25 insertions(+), 9 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index b03457e57b..870f64ecc9 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -28,7 +28,7 @@ import pwd
 import grp
 import time
 import uuid, misc
-from socket import gethostname, gethostbyname
+import socket
 import param
 import registry
 import samba
@@ -267,7 +267,7 @@ def guess_names(lp=None, hostname=None, domain=None, dnsdomain=None, serverrole=
               rootdn=None, domaindn=None, configdn=None, schemadn=None, sitename=None):
 
     if hostname is None:
-        hostname = gethostname().split(".")[0].lower()
+        hostname = socket.gethostname().split(".")[0].lower()
 
     netbiosname = hostname.upper()
     if not valid_netbios_name(netbiosname):
@@ -348,7 +348,7 @@ def load_or_make_smbconf(smbconf, setup_path, hostname, domain, realm, serverrol
 
     if not os.path.exists(smbconf):
         if hostname is None:
-            hostname = gethostname().split(".")[0].lower()
+            hostname = socket.gethostname().split(".")[0].lower()
 
         if serverrole is None:
             serverrole = "standalone"
@@ -901,7 +901,7 @@ FILL_DRS = "DRS"
 def provision(setup_dir, message, session_info, 
               credentials, smbconf=None, targetdir=None, samdb_fill=FILL_FULL, realm=None, 
               rootdn=None, domaindn=None, schemadn=None, configdn=None,
-              domain=None, hostname=None, hostip=None, domainsid=None, 
+              domain=None, hostname=None, hostip=None, hostip6=None, domainsid=None, 
               hostguid=None, adminpass=None, krbtgtpass=None, domainguid=None, 
               policyguid=None, invocationid=None, machinepass=None, 
               dnspass=None, root=None, nobody=None, nogroup=None, users=None, 
@@ -955,7 +955,12 @@ def provision(setup_dir, message, session_info,
     paths = provision_paths_from_lp(lp, names.dnsdomain)
 
     if hostip is None:
-        hostip = gethostbyname(names.hostname)
+        hostip = socket.getaddrinfo(names.hostname, None, socket.AF_INET, socket.AI_CANONNAME, socket.IPPROTO_IP)[0][-1][0]
+
+    if hostip6 is None:
+        try:
+            hostip6 = socket.getaddrinfo(names.hostname, None, socket.AF_INET6, socket.AI_CANONNAME, socket.IPPROTO_IP)[0][-1][0]
+        except socket.gaierror: pass
 
     if serverrole is None:
         serverrole = lp.get("server role")
@@ -1048,7 +1053,8 @@ def provision(setup_dir, message, session_info,
             assert isinstance(hostguid, str)
             
             create_zone_file(paths.dns, setup_path, samdb, 
-                             hostname=names.hostname, hostip=hostip, dnsdomain=names.dnsdomain,
+                             hostname=names.hostname, hostip=hostip,
+                             hostip6=hostip6, dnsdomain=names.dnsdomain,
                              domaindn=names.domaindn, dnspass=dnspass, realm=names.realm, 
                              domainguid=domainguid, hostguid=hostguid)
             message("Please install the zone located in %s into your DNS server" % paths.dns)
@@ -1114,7 +1120,7 @@ def provision_backend(setup_dir=None, message=None,
         return os.path.join(setup_dir, file)
 
     if hostname is None:
-        hostname = gethostname().split(".")[0].lower()
+        hostname = socket.gethostname().split(".")[0].lower()
 
     if root is None:
         root = findnss(pwd.getpwnam, ["root"])[0]
@@ -1247,7 +1253,7 @@ def create_phpldapadmin_config(path, setup_path, ldapi_uri):
 
 
 def create_zone_file(path, setup_path, samdb, dnsdomain, domaindn, 
-                  hostip, hostname, dnspass, realm, domainguid, hostguid):
+                  hostip, hostip6, hostname, dnspass, realm, domainguid, hostguid):
     """Write out a DNS zone file, from the info in the current database.
     
     :param path: Path of the new file.
@@ -1255,7 +1261,8 @@ def create_zone_file(path, setup_path, samdb, dnsdomain, domaindn,
     :param samdb: SamDB object
     :param dnsdomain: DNS Domain name
     :param domaindn: DN of the Domain
-    :param hostip: Local IP
+    :param hostip: Local IPv4 IP
+    :param hostip6: Local IPv6 IP
     :param hostname: Local hostname
     :param dnspass: Password for DNS
     :param realm: Realm name
@@ -1264,6 +1271,13 @@ def create_zone_file(path, setup_path, samdb, dnsdomain, domaindn,
     """
     assert isinstance(domainguid, str)
 
+    hostip6_base_line = ""
+    hostip6_host_line = ""
+
+    if hostip6 is not None:
+        hostip6_base_line = "			IN AAAA	" + hostip6
+        hostip6_host_line = hostname + "		IN AAAA	" + hostip6
+
     setup_file(setup_path("provision.zone"), path, {
             "DNSPASS_B64": b64encode(dnspass),
             "HOSTNAME": hostname,
@@ -1274,6 +1288,8 @@ def create_zone_file(path, setup_path, samdb, dnsdomain, domaindn,
             "DATESTRING": time.strftime("%Y%m%d%H"),
             "DEFAULTSITE": DEFAULTSITE,
             "HOSTGUID": hostguid,
+            "HOSTIP6_BASE_LINE": hostip6_base_line,
+            "HOSTIP6_HOST_LINE": hostip6_host_line,
         })
 
 def load_schema(setup_path, samdb, schemadn, netbiosname, configdn, sitename):
-- 
cgit 


From afe3e8172ddaa5e4aa811faceecda4f943d6e2ef Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Wed, 2 Apr 2008 04:53:27 +0200
Subject: Install public header files again and include required prototypes.
 (This used to be commit 47ffbbf67435904754469544390b67d34c958343)

---
 source4/scripting/ejs/smbcalls_rand.c | 1 +
 source4/scripting/python/misc.i       | 1 +
 source4/scripting/python/misc_wrap.c  | 1 +
 3 files changed, 3 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_rand.c b/source4/scripting/ejs/smbcalls_rand.c
index a2db1f0d6d..58e0fa1fd1 100644
--- a/source4/scripting/ejs/smbcalls_rand.c
+++ b/source4/scripting/ejs/smbcalls_rand.c
@@ -23,6 +23,7 @@
 #include "scripting/ejs/smbcalls.h"
 #include "lib/appweb/ejs/ejs.h"
 #include "librpc/gen_ndr/ndr_misc.h"
+#include "librpc/ndr/libndr.h"
 
 /*
   usage:
diff --git a/source4/scripting/python/misc.i b/source4/scripting/python/misc.i
index a11b2fb825..e04e6a6906 100644
--- a/source4/scripting/python/misc.i
+++ b/source4/scripting/python/misc.i
@@ -25,6 +25,7 @@
 #include "auth/credentials/credentials.h"
 #include "dsdb/samdb/samdb.h"
 #include "lib/ldb-samba/ldif_handlers.h"
+#include "librpc/ndr/libndr.h"
 %}
 
 %import "stdint.i"
diff --git a/source4/scripting/python/misc_wrap.c b/source4/scripting/python/misc_wrap.c
index cf85e91e1e..579d1f379f 100644
--- a/source4/scripting/python/misc_wrap.c
+++ b/source4/scripting/python/misc_wrap.c
@@ -2533,6 +2533,7 @@ static swig_module_info swig_module = {swig_types, 27, 0, 0, 0, 0};
 #include "auth/credentials/credentials.h"
 #include "dsdb/samdb/samdb.h"
 #include "lib/ldb-samba/ldif_handlers.h"
+#include "librpc/ndr/libndr.h"
 
 
 SWIGINTERN int
-- 
cgit 


From 8ac91d913231ecd7ead595b93032c7486f67c949 Mon Sep 17 00:00:00 2001
From: Kai Blin <kai@samba.org>
Date: Tue, 1 Apr 2008 00:17:00 +0200
Subject: provision: Set up id mappings in the idmap db, only map
 Administrator. (This used to be commit
 206b7d387c6d17e5cc40fd45b489abac9235a7a4)

---
 source4/scripting/python/samba/idmap.py     | 73 +++++++++++++++++++++
 source4/scripting/python/samba/provision.py | 98 ++++++++++++++---------------
 source4/scripting/python/samba/samdb.py     | 19 ------
 3 files changed, 120 insertions(+), 70 deletions(-)
 create mode 100644 source4/scripting/python/samba/idmap.py

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/idmap.py b/source4/scripting/python/samba/idmap.py
new file mode 100644
index 0000000000..355565968a
--- /dev/null
+++ b/source4/scripting/python/samba/idmap.py
@@ -0,0 +1,73 @@
+#!/usr/bin/python
+
+# Unix SMB/CIFS implementation.
+# Copyright (C) 2008 Kai Blin <kai@samba.org>
+#
+#
+# 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/>.
+#
+
+"""Convenience functions for using the idmap database."""
+
+import samba
+import ldb
+
+class IDmapDB(samba.Ldb):
+    """The IDmap database."""
+
+    # Mappings for ID_TYPE_UID, ID_TYPE_GID and ID_TYPE_BOTH
+    TYPE_UID = 1
+    TYPE_GID = 2
+    TYPE_BOTH = 3
+
+    def __init__(self, url=None, session_info=None, credentials=None,
+                 modules_dir=None, lp=None):
+        """Open the IDmap Database.
+
+        :param url: URL of the database.
+        """
+        super(IDmapDB, self).__init__(session_info=session_info, credentials=credentials,
+                                    modules_dir=modules_dir, lp=lp)
+        if url:
+            self.connect(url)
+
+
+    def setup_name_mapping(self, sid, type, unixid):
+        """Setup a mapping between a sam name and a unix name.
+
+        :param sid: SID of the NT-side of the mapping.
+        :param unixname: Unix name to map to.
+        """
+        type_string = ""
+        if type == self.TYPE_UID:
+            type_string = "ID_TYPE_UID"
+        elif type == self.TYPE_GID:
+            type_string = "ID_TYPE_GID"
+        elif type == self.TYPE_BOTH:
+            type_string = "ID_TYPE_BOTH"
+        else:
+            return
+
+        mod = """
+dn: CN=%s
+xidNumber: %s
+objectSid: %s
+objectClass: sidMap
+type: %s
+cn: %s
+
+""" % (sid, unixid, sid, type_string, sid)
+        self.add(self.parse_ldif(mod).next()[1])
+
+
diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index dfeb61e52b..a8ced61c4b 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -35,6 +35,7 @@ import samba
 from auth import system_session
 from samba import Ldb, substitute_var, valid_netbios_name, check_all_substituted
 from samba.samdb import SamDB
+from samba.idmap import IDmapDB
 import security
 import urllib
 from ldb import SCOPE_SUBTREE, SCOPE_ONELEVEL, SCOPE_BASE, LdbError, \
@@ -397,45 +398,32 @@ def load_or_make_smbconf(smbconf, setup_path, hostname, domain, realm, serverrol
 
     return lp
 
-def setup_name_mappings(ldb, sid, domaindn, root, nobody, nogroup, users, 
-                        wheel, backup):
+def setup_name_mappings(samdb, idmap, sid, domaindn, root_uid, nobody_uid,
+                        users_gid, wheel_gid, backup_gid):
     """setup reasonable name mappings for sam names to unix names.
-    
-    :param ldb: SamDB object.
+
+    :param samdb: SamDB object.
+    :param idmap: IDmap db object.
     :param sid: The domain sid.
     :param domaindn: The domain DN.
-    :param root: Name of the UNIX root user.
-    :param nobody: Name of the UNIX nobody user.
-    :param nogroup: Name of the unix nobody group.
-    :param users: Name of the unix users group.
-    :param wheel: Name of the wheel group (users that can become root).
-    :param backup: Name of the backup group."""
+    :param root_uid: uid of the UNIX root user.
+    :param nobody_uid: uid of the UNIX nobody user.
+    :param users_gid: gid of the UNIX users group.
+    :param wheel_gid: gid of the UNIX wheel group.
+    :param backup_gid: gid of the UNIX backup group."""
     # add some foreign sids if they are not present already
-    ldb.add_foreign(domaindn, "S-1-5-7", "Anonymous")
-    ldb.add_foreign(domaindn, "S-1-1-0", "World")
-    ldb.add_foreign(domaindn, "S-1-5-2", "Network")
-    ldb.add_foreign(domaindn, "S-1-5-18", "System")
-    ldb.add_foreign(domaindn, "S-1-5-11", "Authenticated Users")
-
-    # some well known sids
-    ldb.setup_name_mapping(domaindn, "S-1-5-7", nobody)
-    ldb.setup_name_mapping(domaindn, "S-1-1-0", nogroup)
-    ldb.setup_name_mapping(domaindn, "S-1-5-2", nogroup)
-    ldb.setup_name_mapping(domaindn, "S-1-5-18", root)
-    ldb.setup_name_mapping(domaindn, "S-1-5-11", users)
-    ldb.setup_name_mapping(domaindn, "S-1-5-32-544", wheel)
-    ldb.setup_name_mapping(domaindn, "S-1-5-32-545", users)
-    ldb.setup_name_mapping(domaindn, "S-1-5-32-546", nogroup)
-    ldb.setup_name_mapping(domaindn, "S-1-5-32-551", backup)
-
-    # and some well known domain rids
-    ldb.setup_name_mapping(domaindn, sid + "-500", root)
-    ldb.setup_name_mapping(domaindn, sid + "-518", wheel)
-    ldb.setup_name_mapping(domaindn, sid + "-519", wheel)
-    ldb.setup_name_mapping(domaindn, sid + "-512", wheel)
-    ldb.setup_name_mapping(domaindn, sid + "-513", users)
-    ldb.setup_name_mapping(domaindn, sid + "-520", wheel)
+    samdb.add_foreign(domaindn, "S-1-5-7", "Anonymous")
+    samdb.add_foreign(domaindn, "S-1-1-0", "World")
+    samdb.add_foreign(domaindn, "S-1-5-2", "Network")
+    samdb.add_foreign(domaindn, "S-1-5-18", "System")
+    samdb.add_foreign(domaindn, "S-1-5-11", "Authenticated Users")
 
+    idmap.setup_name_mapping("S-1-5-7", idmap.TYPE_UID, nobody_uid)
+    idmap.setup_name_mapping("S-1-5-32-544", idmap.TYPE_GID, wheel_gid)
+    idmap.setup_name_mapping("S-1-5-32-551", idmap.TYPE_GID, backup_gid)
+
+    idmap.setup_name_mapping(sid + "-500", idmap.TYPE_UID, root_uid)
+    idmap.setup_name_mapping(sid + "-513", idmap.TYPE_GID, users_gid)
 
 def setup_samdb_partitions(samdb_path, setup_path, message, lp, session_info, 
                            credentials, names,
@@ -663,8 +651,8 @@ def setup_idmapdb(path, setup_path, session_info, credentials, lp):
     if os.path.exists(path):
         os.unlink(path)
 
-    idmap_ldb = Ldb(path, session_info=session_info, credentials=credentials,
-                    lp=lp)
+    idmap_ldb = IDmapDB(path, session_info=session_info,
+                        credentials=credentials, lp=lp)
 
     idmap_ldb.erase()
     idmap_ldb.load_ldif_file_add(setup_path("idmap_init.ldif"))
@@ -924,18 +912,25 @@ def provision(setup_dir, message, session_info,
     if dnspass is None:
         dnspass = misc.random_password(12)
     if root is None:
-        root = findnss(pwd.getpwnam, ["root"])[0]
+        root_uid = findnss(pwd.getpwnam, ["root"])[2]
+    else:
+        root_uid = findnss(pwd.getpwnam, [root])[2]
     if nobody is None:
-        nobody = findnss(pwd.getpwnam, ["nobody"])[0]
-    if nogroup is None:
-        nogroup = findnss(grp.getgrnam, ["nogroup", "nobody"])[0]
+        nobody_uid = findnss(pwd.getpwnam, ["nobody"])[2]
+    else:
+        nobody_uid = findnss(pwd.getpwnam, [nobody])[2]
     if users is None:
-        users = findnss(grp.getgrnam, ["users", "guest", "other", "unknown", 
-                        "usr"])[0]
+        users_gid = findnss(grp.getgrnam, ["users"])[2]
+    else:
+        users_gid = findnss(grp.getgrnam, [users])[2]
     if wheel is None:
-        wheel = findnss(grp.getgrnam, ["wheel", "root", "staff", "adm"])[0]
+        wheel_gid = findnss(grp.getgrnam, ["wheel", "adm"])[2]
+    else:
+        wheel_gid = findnss(grp.getgrnam, [wheel])[2]
     if backup is None:
-        backup = findnss(grp.getgrnam, ["backup", "wheel", "root", "staff"])[0]
+        backup_gid = findnss(grp.getgrnam, ["backup", "staff"])[2]
+    else:
+        backup_gid = findnss(grp.getgrnam, [backup])[2]
     if aci is None:
         aci = "# no aci for local ldb"
 
@@ -994,8 +989,8 @@ def provision(setup_dir, message, session_info,
                       credentials=credentials, lp=lp)
 
     message("Setting up idmap db")
-    setup_idmapdb(paths.idmapdb, setup_path, session_info=session_info,
-                  credentials=credentials, lp=lp)
+    idmap = setup_idmapdb(paths.idmapdb, setup_path, session_info=session_info,
+                          credentials=credentials, lp=lp)
 
     samdb = setup_samdb(paths.samdb, setup_path, session_info=session_info, 
                         credentials=credentials, lp=lp, names=names,
@@ -1026,11 +1021,12 @@ def provision(setup_dir, message, session_info,
                            machinepass=machinepass, dnsdomain=names.dnsdomain)
 
     if samdb_fill == FILL_FULL:
-        setup_name_mappings(samdb, str(domainsid), names.domaindn, root=root, 
-                            nobody=nobody, nogroup=nogroup, wheel=wheel, 
-                            users=users, backup=backup)
-   
-        message("Compleating sam.ldb setup by marking as synchronized")
+        setup_name_mappings(samdb, idmap, str(domainsid), names.domaindn,
+                            root_uid=root_uid, nobody_uid=nobody_uid,
+                            users_gid=users_gid, wheel_gid=wheel_gid,
+                            backup_gid=backup_gid)
+
+        message("Setting up sam.ldb rootDSE marking as synchronized")
         setup_modify_ldif(samdb, setup_path("provision_rootdse_modify.ldif"))
 
         # Only make a zone file on the first DC, it should be replicated with DNS replication
diff --git a/source4/scripting/python/samba/samdb.py b/source4/scripting/python/samba/samdb.py
index de0fd4ba04..bc3eef7879 100644
--- a/source4/scripting/python/samba/samdb.py
+++ b/source4/scripting/python/samba/samdb.py
@@ -53,25 +53,6 @@ description: %s
         for msg in self.parse_ldif(add):
             self.add(msg[1])
 
-    def setup_name_mapping(self, domaindn, sid, unixname):
-        """Setup a mapping between a sam name and a unix name.
-        
-        :param domaindn: DN of the domain.
-        :param sid: SID of the NT-side of the mapping.
-        :param unixname: Unix name to map to.
-        """
-        res = self.search(domaindn, ldb.SCOPE_SUBTREE, 
-                         "objectSid=%s" % sid, ["dn"])
-        assert len(res) == 1, "Failed to find record for objectSid %s" % sid
-
-        mod = """
-dn: %s
-changetype: modify
-replace: unixName
-unixName: %s
-""" % (res[0].dn, unixname)
-        self.modify(self.parse_ldif(mod).next()[1])
-
     def enable_account(self, user_dn):
         """Enable an account.
         
-- 
cgit 


From c26387a473fd26ac51c74c001b520d7fd7d353ec Mon Sep 17 00:00:00 2001
From: Kai Blin <kai@samba.org>
Date: Thu, 3 Apr 2008 00:01:34 +0200
Subject: provision: Remove backup group mapping

Some distros seem to neither have a backup nor a staff group.
(This used to be commit 21fcf7c419658b3ae296428ca7a4ccf2288c17fe)
---
 source4/scripting/python/samba/provision.py | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index a8ced61c4b..6917aa1a54 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -399,7 +399,7 @@ def load_or_make_smbconf(smbconf, setup_path, hostname, domain, realm, serverrol
     return lp
 
 def setup_name_mappings(samdb, idmap, sid, domaindn, root_uid, nobody_uid,
-                        users_gid, wheel_gid, backup_gid):
+                        users_gid, wheel_gid):
     """setup reasonable name mappings for sam names to unix names.
 
     :param samdb: SamDB object.
@@ -409,8 +409,7 @@ def setup_name_mappings(samdb, idmap, sid, domaindn, root_uid, nobody_uid,
     :param root_uid: uid of the UNIX root user.
     :param nobody_uid: uid of the UNIX nobody user.
     :param users_gid: gid of the UNIX users group.
-    :param wheel_gid: gid of the UNIX wheel group.
-    :param backup_gid: gid of the UNIX backup group."""
+    :param wheel_gid: gid of the UNIX wheel group."""
     # add some foreign sids if they are not present already
     samdb.add_foreign(domaindn, "S-1-5-7", "Anonymous")
     samdb.add_foreign(domaindn, "S-1-1-0", "World")
@@ -420,7 +419,6 @@ def setup_name_mappings(samdb, idmap, sid, domaindn, root_uid, nobody_uid,
 
     idmap.setup_name_mapping("S-1-5-7", idmap.TYPE_UID, nobody_uid)
     idmap.setup_name_mapping("S-1-5-32-544", idmap.TYPE_GID, wheel_gid)
-    idmap.setup_name_mapping("S-1-5-32-551", idmap.TYPE_GID, backup_gid)
 
     idmap.setup_name_mapping(sid + "-500", idmap.TYPE_UID, root_uid)
     idmap.setup_name_mapping(sid + "-513", idmap.TYPE_GID, users_gid)
@@ -927,10 +925,6 @@ def provision(setup_dir, message, session_info,
         wheel_gid = findnss(grp.getgrnam, ["wheel", "adm"])[2]
     else:
         wheel_gid = findnss(grp.getgrnam, [wheel])[2]
-    if backup is None:
-        backup_gid = findnss(grp.getgrnam, ["backup", "staff"])[2]
-    else:
-        backup_gid = findnss(grp.getgrnam, [backup])[2]
     if aci is None:
         aci = "# no aci for local ldb"
 
@@ -1023,8 +1017,7 @@ def provision(setup_dir, message, session_info,
     if samdb_fill == FILL_FULL:
         setup_name_mappings(samdb, idmap, str(domainsid), names.domaindn,
                             root_uid=root_uid, nobody_uid=nobody_uid,
-                            users_gid=users_gid, wheel_gid=wheel_gid,
-                            backup_gid=backup_gid)
+                            users_gid=users_gid, wheel_gid=wheel_gid)
 
         message("Setting up sam.ldb rootDSE marking as synchronized")
         setup_modify_ldif(samdb, setup_path("provision_rootdse_modify.ldif"))
-- 
cgit 


From c764791100079ed447c07ca6b99d33f9695255c3 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Fri, 4 Apr 2008 12:25:19 +1100
Subject: Clean up provision and rootdse module to hard-code less stuff.

In particular, allow for the server DN to be in a different site
(possible outcome of a DRS replication).

Andrew Bartlett
(This used to be commit 9ee4e39fe178317f42fd9a0adceea24b55dfe0f1)
---
 source4/scripting/python/samba/provision.py | 42 ++++++++++++++---------------
 1 file changed, 21 insertions(+), 21 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index 6917aa1a54..02460070b4 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -265,7 +265,8 @@ def provision_paths_from_lp(lp, dnsdomain):
     return paths
 
 def guess_names(lp=None, hostname=None, domain=None, dnsdomain=None, serverrole=None,
-              rootdn=None, domaindn=None, configdn=None, schemadn=None, sitename=None):
+                rootdn=None, domaindn=None, configdn=None, schemadn=None, serverdn=None, 
+                sitename=None):
 
     if hostname is None:
         hostname = socket.gethostname().split(".")[0].lower()
@@ -332,6 +333,7 @@ def guess_names(lp=None, hostname=None, domain=None, dnsdomain=None, serverrole=
     names.netbiosname = netbiosname
     names.hostname = hostname
     names.sitename = sitename
+    names.serverdn = "CN=%s,CN=Servers,CN=%s,CN=Sites,%s" % (netbiosname, sitename, configdn)
     
     return names
     
@@ -543,9 +545,7 @@ def setup_samdb_partitions(samdb_path, setup_path, message, lp, session_info,
         samdb.load_ldif_file_add(setup_path("provision_init.ldif"))
 
         message("Setting up sam.ldb rootDSE")
-        setup_samdb_rootdse(samdb, setup_path, names.schemadn, names.domaindn, names.hostname, 
-                            names.dnsdomain, names.realm, names.rootdn, names.configdn, names.netbiosname,
-                            names.sitename)
+        setup_samdb_rootdse(samdb, setup_path, names)
 
         if erase:
             message("Erasing data from partitions")
@@ -656,25 +656,22 @@ def setup_idmapdb(path, setup_path, session_info, credentials, lp):
     idmap_ldb.load_ldif_file_add(setup_path("idmap_init.ldif"))
     return idmap_ldb
 
-def setup_samdb_rootdse(samdb, setup_path, schemadn, domaindn, hostname, 
-                        dnsdomain, realm, rootdn, configdn, netbiosname,
-                        sitename):
+def setup_samdb_rootdse(samdb, setup_path, names):
     """Setup the SamDB rootdse.
 
     :param samdb: Sam Database handle
     :param setup_path: Obtain setup path
     """
     setup_add_ldif(samdb, setup_path("provision_rootdse_add.ldif"), {
-        "SCHEMADN": schemadn, 
-        "NETBIOSNAME": netbiosname,
-        "DNSDOMAIN": dnsdomain,
-        "DEFAULTSITE": sitename,
-        "REALM": realm,
-        "DNSNAME": "%s.%s" % (hostname, dnsdomain),
-        "DOMAINDN": domaindn,
-        "ROOTDN": rootdn,
-        "CONFIGDN": configdn,
-        "VERSION": samba.version(),
+        "SCHEMADN": names.schemadn, 
+        "NETBIOSNAME": names.netbiosname,
+        "DNSDOMAIN": names.dnsdomain,
+        "REALM": names.realm,
+        "DNSNAME": "%s.%s" % (names.hostname, names.dnsdomain),
+        "DOMAINDN": names.domaindn,
+        "ROOTDN": names.rootdn,
+        "CONFIGDN": names.configdn,
+        "SERVERDN": names.serverdn,
         })
         
 
@@ -879,7 +876,8 @@ FILL_DRS = "DRS"
 
 def provision(setup_dir, message, session_info, 
               credentials, smbconf=None, targetdir=None, samdb_fill=FILL_FULL, realm=None, 
-              rootdn=None, domaindn=None, schemadn=None, configdn=None,
+              rootdn=None, domaindn=None, schemadn=None, configdn=None, 
+              serverdn=None,
               domain=None, hostname=None, hostip=None, hostip6=None, 
               domainsid=None, adminpass=None, krbtgtpass=None, domainguid=None, 
               policyguid=None, invocationid=None, machinepass=None, 
@@ -932,7 +930,8 @@ def provision(setup_dir, message, session_info,
 
     names = guess_names(lp=lp, hostname=hostname, domain=domain, 
                         dnsdomain=realm, serverrole=serverrole, sitename=sitename,
-                        rootdn=rootdn, domaindn=domaindn, configdn=configdn, schemadn=schemadn)
+                        rootdn=rootdn, domaindn=domaindn, configdn=configdn, schemadn=schemadn,
+                        serverdn=serverdn)
 
     paths = provision_paths_from_lp(lp, names.dnsdomain)
 
@@ -1064,12 +1063,13 @@ def provision(setup_dir, message, session_info,
 def provision_become_dc(setup_dir=None,
                         smbconf=None, targetdir=None, realm=None, 
                         rootdn=None, domaindn=None, schemadn=None, configdn=None,
+                        serverdn=None,
                         domain=None, hostname=None, domainsid=None, 
                         adminpass=None, krbtgtpass=None, domainguid=None, 
                         policyguid=None, invocationid=None, machinepass=None, 
                         dnspass=None, root=None, nobody=None, nogroup=None, users=None, 
                         wheel=None, backup=None, aci=None, serverrole=None, 
-                        ldap_backend=None, ldap_backend_type=None, sitename=DEFAULTSITE):
+                        ldap_backend=None, ldap_backend_type=None, sitename=None):
 
     def message(text):
 	"""print a message if quiet is not set."""
@@ -1077,7 +1077,7 @@ def provision_become_dc(setup_dir=None,
 
     provision(setup_dir, message, system_session(), None,
               smbconf=smbconf, targetdir=targetdir, samdb_fill=FILL_DRS, realm=realm, 
-              rootdn=rootdn, domaindn=domaindn, schemadn=schemadn, configdn=configdn, 
+              rootdn=rootdn, domaindn=domaindn, schemadn=schemadn, configdn=configdn, serverdn=serverdn,
               domain=domain, hostname=hostname, hostip="127.0.0.1", domainsid=domainsid, machinepass=machinepass, serverrole="domain controller", sitename=sitename);
     
 
-- 
cgit 


From 14e443b868f56db0b29c3221c175f1a2cd2a8d1d Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sat, 5 Apr 2008 16:13:42 +0200
Subject: Improve PEP8 (Python code style) compliancy a bit. (This used to be
 commit c7d388a6e2153234fe67daf1af094fc346e1da61)

---
 source4/scripting/python/samba/provision.py | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index 6917aa1a54..9151f29603 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -264,8 +264,10 @@ def provision_paths_from_lp(lp, dnsdomain):
 
     return paths
 
-def guess_names(lp=None, hostname=None, domain=None, dnsdomain=None, serverrole=None,
-              rootdn=None, domaindn=None, configdn=None, schemadn=None, sitename=None):
+
+def guess_names(lp=None, hostname=None, domain=None, dnsdomain=None, 
+                serverrole=None, rootdn=None, domaindn=None, configdn=None, 
+                schemadn=None, sitename=None):
 
     if hostname is None:
         hostname = socket.gethostname().split(".")[0].lower()
@@ -336,7 +338,8 @@ def guess_names(lp=None, hostname=None, domain=None, dnsdomain=None, serverrole=
     return names
     
 
-def load_or_make_smbconf(smbconf, setup_path, hostname, domain, realm, serverrole, targetdir):
+def load_or_make_smbconf(smbconf, setup_path, hostname, domain, realm, 
+                         serverrole, targetdir):
     if targetdir is not None:
         if not os.path.exists(targetdir):
             os.mkdir(targetdir)
@@ -423,6 +426,7 @@ def setup_name_mappings(samdb, idmap, sid, domaindn, root_uid, nobody_uid,
     idmap.setup_name_mapping(sid + "-500", idmap.TYPE_UID, root_uid)
     idmap.setup_name_mapping(sid + "-513", idmap.TYPE_GID, users_gid)
 
+
 def setup_samdb_partitions(samdb_path, setup_path, message, lp, session_info, 
                            credentials, names,
                            serverrole, ldap_backend=None, 
@@ -543,8 +547,9 @@ def setup_samdb_partitions(samdb_path, setup_path, message, lp, session_info,
         samdb.load_ldif_file_add(setup_path("provision_init.ldif"))
 
         message("Setting up sam.ldb rootDSE")
-        setup_samdb_rootdse(samdb, setup_path, names.schemadn, names.domaindn, names.hostname, 
-                            names.dnsdomain, names.realm, names.rootdn, names.configdn, names.netbiosname,
+        setup_samdb_rootdse(samdb, setup_path, names.schemadn, names.domaindn, 
+                            names.hostname, names.dnsdomain, names.realm, 
+                            names.rootdn, names.configdn, names.netbiosname,
                             names.sitename)
 
         if erase:
@@ -637,6 +642,7 @@ def setup_registry(path, setup_path, session_info, credentials, lp):
     assert os.path.exists(provision_reg)
     reg.diff_apply(provision_reg)
 
+
 def setup_idmapdb(path, setup_path, session_info, credentials, lp):
     """Setup the idmap database.
 
@@ -656,6 +662,7 @@ def setup_idmapdb(path, setup_path, session_info, credentials, lp):
     idmap_ldb.load_ldif_file_add(setup_path("idmap_init.ldif"))
     return idmap_ldb
 
+
 def setup_samdb_rootdse(samdb, setup_path, schemadn, domaindn, hostname, 
                         dnsdomain, realm, rootdn, configdn, netbiosname,
                         sitename):
@@ -740,7 +747,8 @@ def setup_samdb(path, setup_path, session_info, credentials, lp,
     if serverrole == "domain controller":
         samdb.set_invocation_id(invocationid)
 
-    load_schema(setup_path, samdb, names.schemadn, names.netbiosname, names.configdn, names.sitename)
+    load_schema(setup_path, samdb, names.schemadn, names.netbiosname, 
+                names.configdn, names.sitename)
 
     samdb.transaction_start()
         
-- 
cgit 


From 3e97aa73c22ea036afb586b16a1d130ee46e5697 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sat, 5 Apr 2008 16:32:28 +0200
Subject: Simplify some code, fix style. (This used to be commit
 1c983e4e4dfb93387791c36dc96696c4fffcfeb7)

---
 source4/scripting/python/samba/provision.py | 201 ++++++++++++++--------------
 1 file changed, 99 insertions(+), 102 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index 9151f29603..f81cedc729 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -103,7 +103,7 @@ def check_install(lp, session_info, credentials):
     :param credentials: Credentials
     """
     if lp.get("realm") == "":
-        raise Error("Realm empty")
+        raise Exception("Realm empty")
     ldb = Ldb(lp.get("sam database"), session_info=session_info, 
             credentials=credentials, lp=lp)
     if len(ldb.search("(cn=Administrator)")) != 1:
@@ -288,8 +288,8 @@ def guess_names(lp=None, hostname=None, domain=None, dnsdomain=None,
     realm = dnsdomain.upper()
 
     if lp.get("realm").upper() != realm:
-        raise Exception("realm '%s' in %s must match chosen realm '%s'" %
-                        (lp.get("realm"), smbconf, realm))
+        raise Exception("realm '%s' must match chosen realm '%s'" %
+                        (lp.get("realm"), realm))
     
     dnsdomain = dnsdomain.lower()
 
@@ -299,7 +299,7 @@ def guess_names(lp=None, hostname=None, domain=None, dnsdomain=None,
         if domaindn is None:
             domaindn = "DC=" + dnsdomain.replace(".", ",DC=")
         if lp.get("workgroup").upper() != domain.upper():
-            raise Error("workgroup '%s' in smb.conf must match chosen domain '%s'",
+            raise Exception("workgroup '%s' in smb.conf must match chosen domain '%s'",
                         lp.get("workgroup"), domain)
     else:
         domain = netbiosname
@@ -338,68 +338,52 @@ def guess_names(lp=None, hostname=None, domain=None, dnsdomain=None,
     return names
     
 
-def load_or_make_smbconf(smbconf, setup_path, hostname, domain, realm, 
-                         serverrole, targetdir):
-    if targetdir is not None:
-        if not os.path.exists(targetdir):
-            os.mkdir(targetdir)
-        if not os.path.exists(os.path.join(targetdir, "etc")):
-           os.mkdir(os.path.join(targetdir, "etc"))
-
-        smbconf = os.path.join(targetdir, "etc", "smb.conf")
+def make_smbconf(smbconf, setup_path, hostname, domain, realm, serverrole, 
+                 targetdir):
+    if hostname is None:
+        hostname = socket.gethostname().split(".")[0].lower()
 
-    # only install a new smb.conf if there isn't one there already
+    if serverrole is None:
+        serverrole = "standalone"
 
-    if not os.path.exists(smbconf):
-        if hostname is None:
-            hostname = socket.gethostname().split(".")[0].lower()
+    assert serverrole in ("domain controller", "member server", "standalone")
+    if serverrole == "domain controller":
+        smbconfsuffix = "dc"
+    elif serverrole == "member server":
+        smbconfsuffix = "member"
+    elif serverrole == "standalone":
+        smbconfsuffix = "standalone"
 
-        if serverrole is None:
-            serverrole = "standalone"
+    assert domain is not None
+    assert realm is not None
 
-        assert serverrole in ("domain controller", "member server", "standalone")
-        if serverrole == "domain controller":
-            smbconfsuffix = "dc"
-        elif serverrole == "member server":
-            smbconfsuffix = "member"
-        elif serverrole == "standalone":
-            smbconfsuffix = "standalone"
-
-        assert domain is not None
-        assert realm is not None
-
-        default_lp = param.LoadParm()
-        #Load non-existant file
-        default_lp.load(smbconf)
-        
-        if targetdir is not None:
-            privatedir_line = "private dir = " + os.path.abspath(os.path.join(targetdir, "private"))
-            lockdir_line = "lock dir = " + os.path.abspath(targetdir)
+    default_lp = param.LoadParm()
+    #Load non-existant file
+    default_lp.load(smbconf)
+    
+    if targetdir is not None:
+        privatedir_line = "private dir = " + os.path.abspath(os.path.join(targetdir, "private"))
+        lockdir_line = "lock dir = " + os.path.abspath(targetdir)
 
-            default_lp.set("lock dir", os.path.abspath(targetdir))
-        else:
-	    privatedir_line = ""
-	    lockdir_line = ""
-
-        sysvol = os.path.join(default_lp.get("lock dir"), "sysvol")
-        netlogon = os.path.join(sysvol, realm.lower(), "scripts")
-
-        setup_file(setup_path("provision.smb.conf.%s" % smbconfsuffix), 
-                   smbconf, {
-                "HOSTNAME": hostname,
-                "DOMAIN": domain,
-                "REALM": realm,
-                "SERVERROLE": serverrole,
-                "NETLOGONPATH": netlogon,
-                "SYSVOLPATH": sysvol,
-                "PRIVATEDIR_LINE": privatedir_line,
-                "LOCKDIR_LINE": lockdir_line
-                })
+        default_lp.set("lock dir", os.path.abspath(targetdir))
+    else:
+        privatedir_line = ""
+        lockdir_line = ""
 
-    lp = param.LoadParm()
-    lp.load(smbconf)
+    sysvol = os.path.join(default_lp.get("lock dir"), "sysvol")
+    netlogon = os.path.join(sysvol, realm.lower(), "scripts")
 
-    return lp
+    setup_file(setup_path("provision.smb.conf.%s" % smbconfsuffix), 
+               smbconf, {
+            "HOSTNAME": hostname,
+            "DOMAIN": domain,
+            "REALM": realm,
+            "SERVERROLE": serverrole,
+            "NETLOGONPATH": netlogon,
+            "SYSVOLPATH": sysvol,
+            "PRIVATEDIR_LINE": privatedir_line,
+            "LOCKDIR_LINE": lockdir_line
+            })
 
 def setup_name_mappings(samdb, idmap, sid, domaindn, root_uid, nobody_uid,
                         users_gid, wheel_gid):
@@ -493,8 +477,8 @@ def setup_samdb_partitions(samdb_path, setup_path, message, lp, session_info,
     schemadn_ldb = "schema.ldb"
     if ldap_backend is not None:
         schema_ldb = ldap_backend
-    	schemadn_ldb = ldap_backend
-    	
+        schemadn_ldb = ldap_backend
+        
     if ldap_backend_type == "fedora-ds":
         backend_modules = ["nsuniqueid", "paged_searches"]
         # We can handle linked attributes here, as we don't have directory-side subtree operations
@@ -886,14 +870,15 @@ FILL_NT4SYNC = "NT4SYNC"
 FILL_DRS = "DRS"
 
 def provision(setup_dir, message, session_info, 
-              credentials, smbconf=None, targetdir=None, samdb_fill=FILL_FULL, realm=None, 
-              rootdn=None, domaindn=None, schemadn=None, configdn=None,
-              domain=None, hostname=None, hostip=None, hostip6=None, 
-              domainsid=None, adminpass=None, krbtgtpass=None, domainguid=None, 
-              policyguid=None, invocationid=None, machinepass=None, 
-              dnspass=None, root=None, nobody=None, nogroup=None, users=None, 
-              wheel=None, backup=None, aci=None, serverrole=None, 
-              ldap_backend=None, ldap_backend_type=None, sitename=None):
+              credentials, smbconf=None, targetdir=None, samdb_fill=FILL_FULL, 
+              realm=None, rootdn=None, domaindn=None, schemadn=None, 
+              configdn=None, domain=None, hostname=None, hostip=None, 
+              hostip6=None, domainsid=None, adminpass=None, krbtgtpass=None, 
+              domainguid=None, policyguid=None, invocationid=None, 
+              machinepass=None, dnspass=None, root=None, nobody=None, 
+              nogroup=None, users=None, wheel=None, backup=None, aci=None, 
+              serverrole=None, ldap_backend=None, ldap_backend_type=None, 
+              sitename=None):
     """Provision samba4
     
     :note: caution, this wipes all existing data!
@@ -917,18 +902,9 @@ def provision(setup_dir, message, session_info,
         machinepass  = misc.random_password(12)
     if dnspass is None:
         dnspass = misc.random_password(12)
-    if root is None:
-        root_uid = findnss(pwd.getpwnam, ["root"])[2]
-    else:
-        root_uid = findnss(pwd.getpwnam, [root])[2]
-    if nobody is None:
-        nobody_uid = findnss(pwd.getpwnam, ["nobody"])[2]
-    else:
-        nobody_uid = findnss(pwd.getpwnam, [nobody])[2]
-    if users is None:
-        users_gid = findnss(grp.getgrnam, ["users"])[2]
-    else:
-        users_gid = findnss(grp.getgrnam, [users])[2]
+    root_uid = findnss(pwd.getpwnam, [root or "root"])[2]
+    nobody_uid = findnss(pwd.getpwnam, [nobody or "nobody"])[2]
+    users_gid = findnss(grp.getgrnam, [users or "users"])[2]
     if wheel is None:
         wheel_gid = findnss(grp.getgrnam, ["wheel", "adm"])[2]
     else:
@@ -936,7 +912,17 @@ def provision(setup_dir, message, session_info,
     if aci is None:
         aci = "# no aci for local ldb"
 
-    lp = load_or_make_smbconf(smbconf, setup_path, hostname, domain, realm, serverrole, targetdir)
+    if smbconf is None:
+        os.makedirs(os.path.join(targetdir, "etc"))
+        smbconf = os.path.join(targetdir, "etc", "smb.conf")
+
+    # only install a new smb.conf if there isn't one there already
+    if not os.path.exists(smbconf):
+        make_smbconf(smbconf, setup_path, hostname, domain, realm, serverrole, 
+                     targetdir)
+
+    lp = param.LoadParm()
+    lp.load(smbconf)
 
     names = guess_names(lp=lp, hostname=hostname, domain=domain, 
                         dnsdomain=realm, serverrole=serverrole, sitename=sitename,
@@ -1080,7 +1066,7 @@ def provision_become_dc(setup_dir=None,
                         ldap_backend=None, ldap_backend_type=None, sitename=DEFAULTSITE):
 
     def message(text):
-	"""print a message if quiet is not set."""
+        """print a message if quiet is not set."""
         print text
 
     provision(setup_dir, message, system_session(), None,
@@ -1115,11 +1101,22 @@ def provision_backend(setup_dir=None, message=None,
     if root is None:
         root = findnss(pwd.getpwnam, ["root"])[0]
 
-    lp = load_or_make_smbconf(smbconf, setup_path, hostname, domain, realm, serverrole, targetdir)
+    if smbconf is None:
+        os.makedirs(os.path.join(targetdir, "etc"))
+        smbconf = os.path.join(targetdir, "etc", "smb.conf")
+
+    # only install a new smb.conf if there isn't one there already
+    if not os.path.exists(smbconf):
+        make_smbconf(smbconf, setup_path, hostname, domain, realm, 
+                              serverrole, targetdir)
+
+    lp = param.LoadParm()
+    lp.load(smbconf)
 
     names = guess_names(lp=lp, hostname=hostname, domain=domain, 
                         dnsdomain=realm, serverrole=serverrole, 
-                        rootdn=rootdn, domaindn=domaindn, configdn=configdn, schemadn=schemadn)
+                        rootdn=rootdn, domaindn=domaindn, configdn=configdn, 
+                        schemadn=schemadn)
 
     paths = provision_paths_from_lp(lp, names.dnsdomain)
 
@@ -1175,11 +1172,11 @@ def provision_backend(setup_dir=None, message=None,
         backend_schema = "99_ad.ldif"
     elif ldap_backend_type == "openldap":
         attrs = ["linkID", "lDAPDisplayName"]
-	res = schemadb.search(expression="(&(&(linkID=*)(!(linkID:1.2.840.113556.1.4.803:=1)))(objectclass=attributeSchema))", base=names.schemadn, scope=SCOPE_SUBTREE, attrs=attrs);
+    res = schemadb.search(expression="(&(&(linkID=*)(!(linkID:1.2.840.113556.1.4.803:=1)))(objectclass=attributeSchema))", base=names.schemadn, scope=SCOPE_SUBTREE, attrs=attrs);
 
- 	memberof_config = "# Generated from schema in " + schemadb_path + "\n";
-	refint_attributes = "";
-	for i in range (0, len(res)):
+    memberof_config = "# Generated from schema in " + schemadb_path + "\n";
+    refint_attributes = "";
+    for i in range (0, len(res)):
             linkid = res[i]["linkID"][0]
             linkid = str(int(linkid) + 1)
             expression = "(&(objectclass=attributeSchema)(linkID=" + (linkid) + "))"
@@ -1199,11 +1196,11 @@ memberof-dangling-error 32
 
 """;
 
-	memberof_config = memberof_config + """
+    memberof_config = memberof_config + """
 overlay refint
 refint_attributes""" + refint_attributes + "\n";
-	
-        setup_file(setup_path("slapd.conf"), paths.slapdconf,
+    
+    setup_file(setup_path("slapd.conf"), paths.slapdconf,
                    {"DNSDOMAIN": names.dnsdomain,
                     "LDAPDIR": paths.ldapdir,
                     "DOMAINDN": names.domaindn,
@@ -1212,18 +1209,18 @@ refint_attributes""" + refint_attributes + "\n";
                     "LDAPMANAGERDN": names.ldapmanagerdn,
                     "LDAPMANAGERPASS": adminpass,
                     "MEMBEROF_CONFIG": memberof_config})
-        setup_file(setup_path("modules.conf"), paths.modulesconf,
+    setup_file(setup_path("modules.conf"), paths.modulesconf,
                    {"REALM": names.realm})
         
-        setup_db_config(setup_path, file, os.path.join(paths.ldapdir, "db", "user"))
-        setup_db_config(setup_path, file, os.path.join(paths.ldapdir, "db", "config"))
-        setup_db_config(setup_path, file, os.path.join(paths.ldapdir, "db", "schema"))
-        mapping = "schema-map-openldap-2.3"
-        backend_schema = "backend-schema.schema"
+    setup_db_config(setup_path, file, os.path.join(paths.ldapdir, "db", "user"))
+    setup_db_config(setup_path, file, os.path.join(paths.ldapdir, "db", "config"))
+    setup_db_config(setup_path, file, os.path.join(paths.ldapdir, "db", "schema"))
+    mapping = "schema-map-openldap-2.3"
+    backend_schema = "backend-schema.schema"
         
 
-        ldapi_uri = "ldapi://" + urllib.quote(os.path.join(paths.private_dir, "ldap", "ldapi"), safe="")
-        message("Start slapd with: slapd -f " + paths.ldapdir + "/slapd.conf -h " + ldapi_uri)
+    ldapi_uri = "ldapi://" + urllib.quote(os.path.join(paths.private_dir, "ldap", "ldapi"), safe="")
+    message("Start slapd with: slapd -f " + paths.ldapdir + "/slapd.conf -h " + ldapi_uri)
                 
 
     schema_command = "bin/ad2oLschema --option=convert:target=" + ldap_backend_type + " -I " + setup_path(mapping) + " -H tdb://" + schemadb_path + " -O " + os.path.join(paths.ldapdir, backend_schema);
@@ -1265,8 +1262,8 @@ def create_zone_file(path, setup_path, samdb, dnsdomain, domaindn,
     hostip6_host_line = ""
 
     if hostip6 is not None:
-        hostip6_base_line = "			IN AAAA	" + hostip6
-        hostip6_host_line = hostname + "		IN AAAA	" + hostip6
+        hostip6_base_line = "            IN AAAA    " + hostip6
+        hostip6_host_line = hostname + "        IN AAAA    " + hostip6
 
     setup_file(setup_path("provision.zone"), path, {
             "DNSPASS_B64": b64encode(dnspass),
-- 
cgit 


From 7c7880695b02df4cbe0faab959846c63d0cc0536 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sun, 6 Apr 2008 00:40:01 +0200
Subject: More PEP8 compliancy. (This used to be commit
 d16b30d005933c9cc73f9196a3b77829d23687a0)

---
 source4/scripting/python/samba/provision.py | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index f81cedc729..4d5a9cb1f1 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -125,6 +125,10 @@ def findnss(nssfn, names):
     raise KeyError("Unable to find user/group %r" % names)
 
 
+findnss_uid = lambda names: findnss(pwd.getpwnam, names)[2]
+findnss_gid = lambda names: findnss(grp.getgrnam, names)[2]
+
+
 def open_ldb(session_info, credentials, lp, dbname):
     """Open a LDB, thrashing it if it is corrupt.
 
@@ -293,7 +297,7 @@ def guess_names(lp=None, hostname=None, domain=None, dnsdomain=None,
     
     dnsdomain = dnsdomain.lower()
 
-    if (serverrole == "domain controller"):
+    if serverrole == "domain controller":
         if domain is None:
             domain = lp.get("workgroup")
         if domaindn is None:
@@ -385,6 +389,7 @@ def make_smbconf(smbconf, setup_path, hostname, domain, realm, serverrole,
             "LOCKDIR_LINE": lockdir_line
             })
 
+
 def setup_name_mappings(samdb, idmap, sid, domaindn, root_uid, nobody_uid,
                         users_gid, wheel_gid):
     """setup reasonable name mappings for sam names to unix names.
@@ -902,13 +907,13 @@ def provision(setup_dir, message, session_info,
         machinepass  = misc.random_password(12)
     if dnspass is None:
         dnspass = misc.random_password(12)
-    root_uid = findnss(pwd.getpwnam, [root or "root"])[2]
-    nobody_uid = findnss(pwd.getpwnam, [nobody or "nobody"])[2]
-    users_gid = findnss(grp.getgrnam, [users or "users"])[2]
+    root_uid = findnss_uid([root or "root"])
+    nobody_uid = findnss_uid([nobody or "nobody"])
+    users_gid = findnss_gid([users or "users"])
     if wheel is None:
-        wheel_gid = findnss(grp.getgrnam, ["wheel", "adm"])[2]
+        wheel_gid = findnss_gid(["wheel", "adm"])
     else:
-        wheel_gid = findnss(grp.getgrnam, [wheel])[2]
+        wheel_gid = findnss_gid([wheel])
     if aci is None:
         aci = "# no aci for local ldb"
 
@@ -925,8 +930,9 @@ def provision(setup_dir, message, session_info,
     lp.load(smbconf)
 
     names = guess_names(lp=lp, hostname=hostname, domain=domain, 
-                        dnsdomain=realm, serverrole=serverrole, sitename=sitename,
-                        rootdn=rootdn, domaindn=domaindn, configdn=configdn, schemadn=schemadn)
+                        dnsdomain=realm, serverrole=serverrole, 
+                        sitename=sitename, rootdn=rootdn, domaindn=domaindn, 
+                        configdn=configdn, schemadn=schemadn)
 
     paths = provision_paths_from_lp(lp, names.dnsdomain)
 
@@ -936,7 +942,8 @@ def provision(setup_dir, message, session_info,
     if hostip6 is None:
         try:
             hostip6 = socket.getaddrinfo(names.hostname, None, socket.AF_INET6, socket.AI_CANONNAME, socket.IPPROTO_IP)[0][-1][0]
-        except socket.gaierror: pass
+        except socket.gaierror: 
+            pass
 
     if serverrole is None:
         serverrole = lp.get("server role")
-- 
cgit 


From 57bf8d2e33c69c8a642070c4c4ba8c00681e42cc Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 8 Apr 2008 02:48:54 +0200
Subject: Add Python bindings for DFS. (This used to be commit
 4319971ccb42618a3298a5f26f63fa4c9b255849)

---
 source4/scripting/python/modules.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/modules.c b/source4/scripting/python/modules.c
index 2ecad20b8e..eccf556ab1 100644
--- a/source4/scripting/python/modules.c
+++ b/source4/scripting/python/modules.c
@@ -35,6 +35,7 @@ extern void init_events(void);
 extern void inituuid(void);
 extern void init_net(void);
 extern void initecho(void);
+extern void initdfs(void);
 extern void initwinreg(void);
 extern void initepmapper(void);
 extern void initinitshutdown(void);
-- 
cgit 


From f253c3ad91d66aeb594e8088c462257277748263 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 8 Apr 2008 03:18:43 +0200
Subject: Add python bindings for unixinfo. (This used to be commit
 068c2f858a0c7e325cb8a1f2ca36e32b31fe1f77)

---
 source4/scripting/python/modules.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/modules.c b/source4/scripting/python/modules.c
index eccf556ab1..603c1df21c 100644
--- a/source4/scripting/python/modules.c
+++ b/source4/scripting/python/modules.c
@@ -47,6 +47,7 @@ static void initdcerpc_security(void) {}
 extern void initlsa(void);
 extern void initsvcctl(void);
 extern void initwkssvc(void);
+extern void initunixinfo(void);
 extern void init_libcli_nbt(void);
 extern void init_libcli_smb(void);
 
-- 
cgit 


From 5cf6c42658755f0a126a5bd6cdd9f215779b75a8 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 8 Apr 2008 03:23:53 +0200
Subject: Add python bindings for drsuapi. (This used to be commit
 ba3f0312f0dda47fb16ed9b8eee3750b209e0dad)

---
 source4/scripting/python/modules.c | 1 +
 source4/scripting/python/pyrpc.h   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/modules.c b/source4/scripting/python/modules.c
index 603c1df21c..ba85994636 100644
--- a/source4/scripting/python/modules.c
+++ b/source4/scripting/python/modules.c
@@ -36,6 +36,7 @@ extern void inituuid(void);
 extern void init_net(void);
 extern void initecho(void);
 extern void initdfs(void);
+extern void initdrsuapi(void);
 extern void initwinreg(void);
 extern void initepmapper(void);
 extern void initinitshutdown(void);
diff --git a/source4/scripting/python/pyrpc.h b/source4/scripting/python/pyrpc.h
index 3a5d235cfc..f4d0f37c39 100644
--- a/source4/scripting/python/pyrpc.h
+++ b/source4/scripting/python/pyrpc.h
@@ -26,7 +26,7 @@
 #define dom_sid2_Type dom_sid_Type
 #define dom_sid28_Type dom_sid_Type
 #define dom_sid2_Check dom_sid_Check
-#define dom_sid28_Check dom_sid28_Check
+#define dom_sid28_Check dom_sid_Check
 
 /* This macro is only provided by Python >= 2.3 */
 #ifndef PyAPI_DATA
-- 
cgit 


From 1f474f4a545752f7ac0ad402d01d1e768b973dbe Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 8 Apr 2008 03:29:12 +0200
Subject: Add trivial test for unixinfo interface. (This used to be commit
 b6b7171f70114bd27ca8db09964c65cacb9cea92)

---
 .../scripting/python/samba/tests/dcerpc/unix.py    | 30 ++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 source4/scripting/python/samba/tests/dcerpc/unix.py

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/tests/dcerpc/unix.py b/source4/scripting/python/samba/tests/dcerpc/unix.py
new file mode 100644
index 0000000000..99c84c08da
--- /dev/null
+++ b/source4/scripting/python/samba/tests/dcerpc/unix.py
@@ -0,0 +1,30 @@
+#!/usr/bin/python
+
+# Unix SMB/CIFS implementation.
+# Copyright (C) Jelmer Vernooij <jelmer@samba.org> 2008
+#   
+# 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/>.
+#
+
+import unixinfo
+import unittest
+from samba.tests import get_loadparm
+
+class UnixinfoTests(unittest.TestCase):
+    def setUp(self):
+        self.conn = unixinfo.unixinfo("ncalrpc:", get_loadparm())
+
+    def test_getpwuid(self):
+        (count, infos) = self.conn.GetPWUid(1, [0])
+        self.assertEquals(1, len(infos))
-- 
cgit 


From 8db14bf26b96f47b8f937f6016d18d947b68467e Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 8 Apr 2008 05:16:07 +0200
Subject: Add manually written Python binding for libnet_Join. (This used to be
 commit 374654b43d9f9e8381991cedc433ce410a914f7a)

---
 source4/scripting/python/modules.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/modules.c b/source4/scripting/python/modules.c
index ba85994636..6cd975c1a9 100644
--- a/source4/scripting/python/modules.c
+++ b/source4/scripting/python/modules.c
@@ -42,6 +42,7 @@ extern void initepmapper(void);
 extern void initinitshutdown(void);
 static void initdcerpc_misc(void) {} 
 extern void initmgmt(void);
+extern void initnet(void);
 extern void initatsvc(void);
 extern void initsamr(void);
 static void initdcerpc_security(void) {}
-- 
cgit 


From b2805c50eecddfa4cbd0945e713567eddce05895 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Tue, 8 Apr 2008 17:28:25 +1000
Subject: Re-add support for the --ldap-backend-port option to
 provision-backend

This option allows Fedora DS multi-master replication to work.  I've
tried to update the wiki and scripts to the largely consistant with
each other.

Andrew Bartlett
(This used to be commit 42393c830733b2cc99ebccdafe944fcf3d82734f)
---
 source4/scripting/python/samba/provision.py | 42 ++++++++++++++++++++---------
 1 file changed, 29 insertions(+), 13 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index 02460070b4..80dcd522df 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -288,7 +288,7 @@ def guess_names(lp=None, hostname=None, domain=None, dnsdomain=None, serverrole=
 
     if lp.get("realm").upper() != realm:
         raise Exception("realm '%s' in %s must match chosen realm '%s'" %
-                        (lp.get("realm"), smbconf, realm))
+                        (lp.get("realm"), lp.configfile(), realm))
     
     dnsdomain = dnsdomain.lower()
 
@@ -1045,8 +1045,8 @@ def provision(setup_dir, message, session_info,
 
     message("Please install the phpLDAPadmin configuration located at %s into /etc/phpldapadmin/config.php" % paths.phpldapadminconfig)
 
-    message("Once the above files are installed, your server will be ready to use")
-    message("Server Type:    %s" % serverrole)
+    message("Once the above files are installed, your Samba4 server will be ready to use")
+    message("Server Role:    %s" % serverrole)
     message("Hostname:       %s" % names.hostname)
     message("NetBIOS Domain: %s" % names.domain)
     message("DNS Domain:     %s" % names.dnsdomain)
@@ -1096,7 +1096,7 @@ def provision_backend(setup_dir=None, message=None,
                       smbconf=None, targetdir=None, realm=None, 
                       rootdn=None, domaindn=None, schemadn=None, configdn=None,
                       domain=None, hostname=None, adminpass=None, root=None, serverrole=None, 
-                      ldap_backend_type=None):
+                      ldap_backend_type=None, ldap_backend_port=None):
 
     def setup_path(file):
         return os.path.join(setup_dir, file)
@@ -1144,7 +1144,12 @@ def provision_backend(setup_dir=None, message=None,
                    {"SCHEMADN": names.schemadn})
 
     if ldap_backend_type == "fedora-ds":
-        setup_file(setup_path("fedora-ds.inf"), paths.fedoradsinf, 
+        if ldap_backend_port is not None:
+            serverport = "ServerPort=%d" % ldap_backend_port
+        else:
+            serverport = ""
+
+        setup_file(setup_path("fedorads.inf"), paths.fedoradsinf, 
                    {"ROOT": root,
                     "HOSTNAME": hostname,
                     "DNSDOMAIN": names.dnsdomain,
@@ -1152,19 +1157,18 @@ def provision_backend(setup_dir=None, message=None,
                     "DOMAINDN": names.domaindn,
                     "LDAPMANAGERDN": names.ldapmanagerdn,
                     "LDAPMANAGERPASS": adminpass, 
-                    "SERVERPORT": ""})
+                    "SERVERPORT": serverport})
         
-        setup_file(setup_path("fedora-partitions.ldif"), paths.fedoradspartitions, 
+        setup_file(setup_path("fedorads-partitions.ldif"), paths.fedoradspartitions, 
                    {"CONFIGDN": names.configdn,
                     "SCHEMADN": names.schemadn,
                     })
         
-        setup_file(setup_path("fedora-partitions.ldif"), paths.fedoradspartitions, 
-                   {"CONFIGDN": names.configdn,
-                    "SCHEMADN": names.schemadn,
-                    })
         mapping = "schema-map-fedora-ds-1.0"
         backend_schema = "99_ad.ldif"
+        
+        slapdcommand="Initailise Fedora DS with: setup-ds.pl --file=%s" % paths.fedoradsinf
+       
     elif ldap_backend_type == "openldap":
         attrs = ["linkID", "lDAPDisplayName"]
 	res = schemadb.search(expression="(&(&(linkID=*)(!(linkID:1.2.840.113556.1.4.803:=1)))(objectclass=attributeSchema))", base=names.schemadn, scope=SCOPE_SUBTREE, attrs=attrs);
@@ -1215,14 +1219,26 @@ refint_attributes""" + refint_attributes + "\n";
         
 
         ldapi_uri = "ldapi://" + urllib.quote(os.path.join(paths.private_dir, "ldap", "ldapi"), safe="")
-        message("Start slapd with: slapd -f " + paths.ldapdir + "/slapd.conf -h " + ldapi_uri)
-                
+        if ldap_backend_port is not None:
+            server_port_string = " -h ldap://0.0.0.0:%d" % ldap_backend_port
+        else:
+            server_port_string = ""
+        slapdcommand="Start slapd with:    slapd -f " + paths.ldapdir + "/slapd.conf -h " + ldapi_uri + server_port_string
 
     schema_command = "bin/ad2oLschema --option=convert:target=" + ldap_backend_type + " -I " + setup_path(mapping) + " -H tdb://" + schemadb_path + " -O " + os.path.join(paths.ldapdir, backend_schema);
 
     os.system(schema_command)
 
 
+    message("Your %s Backend for Samba4 is now configured, and is ready to be started" % ( ldap_backend_type) )
+    message("Server Role:         %s" % serverrole)
+    message("Hostname:            %s" % names.hostname)
+    message("DNS Domain:          %s" % names.dnsdomain)
+    message("Base DN:             %s" % names.domaindn)
+    message("LDAP admin DN:       %s" % names.ldapmanagerdn)
+    message("LDAP admin password: %s" % adminpass)
+    message(slapdcommand)
+
 
 def create_phpldapadmin_config(path, setup_path, ldapi_uri):
     """Create a PHP LDAP admin configuration file.
-- 
cgit 


From ad823b04dab468379c7b42a8b849bb8a310cfb69 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 8 Apr 2008 14:58:38 +0200
Subject: Remove length arguments, add tests for unixinfo.GidToSid and
 unixinfo.UidToSid. (This used to be commit
 cae61e32e5b61a02c2986b74bd1d7e58460b1e80)

---
 source4/scripting/python/samba/tests/dcerpc/rpcecho.py |  2 +-
 source4/scripting/python/samba/tests/dcerpc/unix.py    | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/tests/dcerpc/rpcecho.py b/source4/scripting/python/samba/tests/dcerpc/rpcecho.py
index 8c1a8bec71..484af9490c 100644
--- a/source4/scripting/python/samba/tests/dcerpc/rpcecho.py
+++ b/source4/scripting/python/samba/tests/dcerpc/rpcecho.py
@@ -30,7 +30,7 @@ class RpcEchoTests(unittest.TestCase):
         self.assertEquals(2, self.conn.AddOne(1))
 
     def test_echodata(self):
-        self.assertEquals([1,2,3], self.conn.EchoData(3, [1, 2, 3]))
+        self.assertEquals([1,2,3], self.conn.EchoData([1, 2, 3]))
 
     def test_call(self):
         self.assertEquals(u"foobar", self.conn.TestCall(u"foobar"))
diff --git a/source4/scripting/python/samba/tests/dcerpc/unix.py b/source4/scripting/python/samba/tests/dcerpc/unix.py
index 99c84c08da..b2577ec898 100644
--- a/source4/scripting/python/samba/tests/dcerpc/unix.py
+++ b/source4/scripting/python/samba/tests/dcerpc/unix.py
@@ -26,5 +26,11 @@ class UnixinfoTests(unittest.TestCase):
         self.conn = unixinfo.unixinfo("ncalrpc:", get_loadparm())
 
     def test_getpwuid(self):
-        (count, infos) = self.conn.GetPWUid(1, [0])
-        self.assertEquals(1, len(infos))
+        infos = self.conn.GetPWUid(range(512))
+        self.assertEquals(512, len(infos))
+
+    def test_gidtosid(self):
+        self.conn.GidToSid(1000)
+
+    def test_uidtosid(self):
+        self.conn.UidToSid(1000)
-- 
cgit 


From ac10ac62c1e9b64280f3566425af08210d57bb04 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Wed, 9 Apr 2008 03:51:41 +0200
Subject: Add docstring, PEP8. (This used to be commit
 f8cac3735c9a19baa313c4b61abee144da303ce1)

---
 source4/scripting/python/samba/provision.py | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index 80dcd522df..c9cdcdb768 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -264,9 +264,11 @@ def provision_paths_from_lp(lp, dnsdomain):
 
     return paths
 
+
 def guess_names(lp=None, hostname=None, domain=None, dnsdomain=None, serverrole=None,
                 rootdn=None, domaindn=None, configdn=None, schemadn=None, serverdn=None, 
                 sitename=None):
+    """Guess configuration settings to use."""
 
     if hostname is None:
         hostname = socket.gethostname().split(".")[0].lower()
@@ -400,6 +402,7 @@ def load_or_make_smbconf(smbconf, setup_path, hostname, domain, realm, serverrol
 
     return lp
 
+
 def setup_name_mappings(samdb, idmap, sid, domaindn, root_uid, nobody_uid,
                         users_gid, wheel_gid):
     """setup reasonable name mappings for sam names to unix names.
@@ -425,6 +428,7 @@ def setup_name_mappings(samdb, idmap, sid, domaindn, root_uid, nobody_uid,
     idmap.setup_name_mapping(sid + "-500", idmap.TYPE_UID, root_uid)
     idmap.setup_name_mapping(sid + "-513", idmap.TYPE_GID, users_gid)
 
+
 def setup_samdb_partitions(samdb_path, setup_path, message, lp, session_info, 
                            credentials, names,
                            serverrole, ldap_backend=None, 
@@ -637,6 +641,7 @@ def setup_registry(path, setup_path, session_info, credentials, lp):
     assert os.path.exists(provision_reg)
     reg.diff_apply(provision_reg)
 
+
 def setup_idmapdb(path, setup_path, session_info, credentials, lp):
     """Setup the idmap database.
 
@@ -656,6 +661,7 @@ def setup_idmapdb(path, setup_path, session_info, credentials, lp):
     idmap_ldb.load_ldif_file_add(setup_path("idmap_init.ldif"))
     return idmap_ldb
 
+
 def setup_samdb_rootdse(samdb, setup_path, names):
     """Setup the SamDB rootdse.
 
@@ -1060,6 +1066,7 @@ def provision(setup_dir, message, session_info,
     result.samdb = samdb
     return result
 
+
 def provision_become_dc(setup_dir=None,
                         smbconf=None, targetdir=None, realm=None, 
                         rootdn=None, domaindn=None, schemadn=None, configdn=None,
@@ -1081,7 +1088,11 @@ def provision_become_dc(setup_dir=None,
               domain=domain, hostname=hostname, hostip="127.0.0.1", domainsid=domainsid, machinepass=machinepass, serverrole="domain controller", sitename=sitename);
     
 
-def setup_db_config(setup_path, file, dbdir):
+def setup_db_config(setup_path, dbdir):
+    """Setup a Berkeley database.
+    
+    :param setup_path: Setup path function.
+    :param dbdir: Database directory."""
     if not os.path.isdir(os.path.join(dbdir, "bdb-logs")):
         os.makedirs(os.path.join(dbdir, "bdb-logs"), 0700);
     if not os.path.isdir(os.path.join(dbdir, "tmp")):
@@ -1211,12 +1222,11 @@ refint_attributes""" + refint_attributes + "\n";
         setup_file(setup_path("modules.conf"), paths.modulesconf,
                    {"REALM": names.realm})
         
-        setup_db_config(setup_path, file, os.path.join(paths.ldapdir, "db", "user"))
-        setup_db_config(setup_path, file, os.path.join(paths.ldapdir, "db", "config"))
-        setup_db_config(setup_path, file, os.path.join(paths.ldapdir, "db", "schema"))
+        setup_db_config(setup_path, file, os.path.join(paths.ldapdir, "user"))
+        setup_db_config(setup_path, file, os.path.join(paths.ldapdir, "config"))
+        setup_db_config(setup_path, file, os.path.join(paths.ldapdir, "schema"))
         mapping = "schema-map-openldap-2.3"
         backend_schema = "backend-schema.schema"
-        
 
         ldapi_uri = "ldapi://" + urllib.quote(os.path.join(paths.private_dir, "ldap", "ldapi"), safe="")
         if ldap_backend_port is not None:
-- 
cgit 


From 9d2948f4bd5f196904d27c67bf4f0baf7eaefcb0 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Wed, 9 Apr 2008 14:57:57 +1000
Subject: Don't fill in the secrets DB unless we make the entries.

Leave filling in (we still initialise it) the secrets DB for the join
or vampire code.

Andrew Bartlett
(This used to be commit c93208c13ce91b334eadf0ea02fa41354e761e97)
---
 source4/scripting/python/samba/provision.py | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index c9cdcdb768..7b4fdb772c 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -1011,13 +1011,6 @@ def provision(setup_dir, message, session_info,
        os.makedirs(os.path.join(policy_path, "User"), 0755)
        if not os.path.isdir(paths.netlogon):
             os.makedirs(paths.netlogon, 0755)
-       secrets_ldb = Ldb(paths.secrets, session_info=session_info, 
-                         credentials=credentials, lp=lp)
-       secretsdb_become_dc(secrets_ldb, setup_path, domain=domain, realm=names.realm,
-                           netbiosname=names.netbiosname, domainsid=domainsid, 
-                           keytab_path=paths.keytab, samdb_url=paths.samdb, 
-                           dns_keytab_path=paths.dns_keytab, dnspass=dnspass, 
-                           machinepass=machinepass, dnsdomain=names.dnsdomain)
 
     if samdb_fill == FILL_FULL:
         setup_name_mappings(samdb, idmap, str(domainsid), names.domaindn,
@@ -1029,6 +1022,14 @@ def provision(setup_dir, message, session_info,
 
         # Only make a zone file on the first DC, it should be replicated with DNS replication
         if serverrole == "domain controller":
+            secrets_ldb = Ldb(paths.secrets, session_info=session_info, 
+                              credentials=credentials, lp=lp)
+            secretsdb_become_dc(secrets_ldb, setup_path, domain=domain, realm=names.realm,
+                                netbiosname=names.netbiosname, domainsid=domainsid, 
+                                keytab_path=paths.keytab, samdb_url=paths.samdb, 
+                                dns_keytab_path=paths.dns_keytab, dnspass=dnspass, 
+                                machinepass=machinepass, dnsdomain=names.dnsdomain)
+
             samdb = SamDB(paths.samdb, session_info=session_info, 
                       credentials=credentials, lp=lp)
 
-- 
cgit 


From b202b6e7d45cebd9b34c8d319e75f423291b30a0 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Wed, 9 Apr 2008 15:32:49 +1000
Subject: Fix up provision to specify SERVERDN in more places.

Andrew Bartlett
(This used to be commit d01d542502f25d6c731204ecb3d33720a1706581)
---
 source4/scripting/python/samba/provision.py | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index 7b4fdb772c..ff76681c13 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -690,6 +690,7 @@ def setup_self_join(samdb, names,
               "CONFIGDN": names.configdn, 
               "SCHEMADN": names.schemadn,
               "DOMAINDN": names.domaindn,
+              "SERVERDN": names.serverdn,
               "INVOCATIONID": invocationid,
               "NETBIOSNAME": names.netbiosname,
               "DEFAULTSITE": names.sitename,
@@ -773,6 +774,7 @@ def setup_samdb(path, setup_path, session_info, credentials, lp,
             "NETBIOSNAME": names.netbiosname,
             "DEFAULTSITE": names.sitename,
             "CONFIGDN": names.configdn,
+            "SERVERDN": names.serverdn,
             "POLICYGUID": policyguid,
             "DOMAINDN": names.domaindn,
             "DOMAINGUID_MOD": domainguid_mod,
@@ -803,6 +805,7 @@ def setup_samdb(path, setup_path, session_info, credentials, lp,
             "NETBIOSNAME": names.netbiosname,
             "DEFAULTSITE": names.sitename,
             "CONFIGDN": names.configdn,
+            "SERVERDN": names.serverdn
             })
 
         message("Setting up sam.ldb Samba4 schema")
@@ -821,6 +824,7 @@ def setup_samdb(path, setup_path, session_info, credentials, lp,
             "DOMAIN": names.domain,
             "SCHEMADN": names.schemadn,
             "DOMAINDN": names.domaindn,
+            "SERVERDN": names.serverdn
             })
 
         message("Setting up display specifiers")
@@ -845,6 +849,7 @@ def setup_samdb(path, setup_path, session_info, credentials, lp,
             "NETBIOSNAME": names.netbiosname,
             "DEFAULTSITE": names.sitename,
             "CONFIGDN": names.configdn,
+            "SERVERDN": names.serverdn
             })
 
         if fill == FILL_FULL:
-- 
cgit 


From 12840597c856a6521ee088a5c96e8ffdd1716252 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Wed, 9 Apr 2008 17:43:37 +0200
Subject: No longer install unused smbscript binary. (This used to be commit
 ca0e373e57eb225a1f5d96813e9ea9ccee971b96)

---
 source4/scripting/ejs/config.mk | 1 -
 1 file changed, 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/config.mk b/source4/scripting/ejs/config.mk
index 33a4ac915f..ea64d24eea 100644
--- a/source4/scripting/ejs/config.mk
+++ b/source4/scripting/ejs/config.mk
@@ -90,7 +90,6 @@ PRIVATE_DEPENDENCIES = \
 #######################
 # Start BINARY SMBSCRIPT
 [BINARY::smbscript]
-INSTALLDIR = BINDIR
 OBJ_FILES = \
 		smbscript.o
 PRIVATE_DEPENDENCIES = EJS LIBSAMBA-UTIL smbcalls LIBSAMBA-HOSTCONFIG
-- 
cgit 


From ad8e3e41923e20d401294eccd4da028e0f40c904 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Thu, 10 Apr 2008 05:23:17 +0200
Subject: Add infrastructure for returning ProvisionResult in C provision code.
 (This used to be commit 98c3d34eb233be284e8c8994cca337be25c72968)

---
 source4/scripting/python/samba/provision.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index c9cdcdb768..ccf67a0b4a 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -1082,7 +1082,7 @@ def provision_become_dc(setup_dir=None,
 	"""print a message if quiet is not set."""
         print text
 
-    provision(setup_dir, message, system_session(), None,
+    return provision(setup_dir, message, system_session(), None,
               smbconf=smbconf, targetdir=targetdir, samdb_fill=FILL_DRS, realm=realm, 
               rootdn=rootdn, domaindn=domaindn, schemadn=schemadn, configdn=configdn, serverdn=serverdn,
               domain=domain, hostname=hostname, hostip="127.0.0.1", domainsid=domainsid, machinepass=machinepass, serverrole="domain controller", sitename=sitename);
-- 
cgit 


From 393007315d56d72cd4ebccc204da703b27eb968b Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Fri, 11 Apr 2008 19:04:43 +1000
Subject: Far less cryptic traceback when you have an existing smb.conf

When the user has an existing smb.conf, but no [netlogon] or [sysvol]
share, the provision script would trigger a traceback.  While we still
need to abort in this situation, we do so now with a useful error.

Andrew Bartlett
(This used to be commit 10a8b7ea487f9725f69b02c4dd9cf5e1f67a23ab)
---
 source4/scripting/python/samba/provision.py | 27 +++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index 16b1eb2156..4f264b6fc9 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -87,6 +87,7 @@ class ProvisionNames:
         self.domain = None
         self.hostname = None
         self.sitename = None
+        self.smbconf = None
     
 class ProvisionResult:
     def __init__(self):
@@ -262,6 +263,8 @@ def provision_paths_from_lp(lp, dnsdomain):
 
     paths.netlogon = lp.get("path", "netlogon")
 
+    paths.smbconf = lp.configfile()
+
     return paths
 
 
@@ -1009,12 +1012,24 @@ def provision(setup_dir, message, session_info,
                         ldap_backend_type=ldap_backend_type)
 
     if lp.get("server role") == "domain controller":
-       policy_path = os.path.join(paths.sysvol, names.dnsdomain, "Policies", 
-                                  "{" + policyguid + "}")
-       os.makedirs(policy_path, 0755)
-       os.makedirs(os.path.join(policy_path, "Machine"), 0755)
-       os.makedirs(os.path.join(policy_path, "User"), 0755)
-       if not os.path.isdir(paths.netlogon):
+        if paths.netlogon is None:
+            message("Existing smb.conf does not have a [netlogon] share, but you are configuring a DC.")
+            message("Please either remove %s or see the template at %s" % 
+                    ( paths.smbconf, setup_path("provision.smb.conf.dc")))
+            assert(paths.netlogon is not None)
+
+        if paths.sysvol is None:
+            message("Existing smb.conf does not have a [sysvol] share, but you are configuring a DC.")
+            message("Please either remove %s or see the template at %s" % 
+                    (paths.smbconf, setup_path("provision.smb.conf.dc")))
+            assert(paths.sysvol is not None)            
+            
+        policy_path = os.path.join(paths.sysvol, names.dnsdomain, "Policies", 
+                                   "{" + policyguid + "}")
+        os.makedirs(policy_path, 0755)
+        os.makedirs(os.path.join(policy_path, "Machine"), 0755)
+        os.makedirs(os.path.join(policy_path, "User"), 0755)
+        if not os.path.isdir(paths.netlogon):
             os.makedirs(paths.netlogon, 0755)
 
     if samdb_fill == FILL_FULL:
-- 
cgit 


From e44f0e7b75a15e61427a6520999d0d79b78e9d2a Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Fri, 11 Apr 2008 19:33:52 +1000
Subject: Don't reopen the sam.ldb again

Andrew Bartlett
(This used to be commit b51b8a2d846284de4dff736fc18cf747c188de96)
---
 source4/scripting/python/samba/provision.py | 2 --
 1 file changed, 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index 4f264b6fc9..a8d188e7a3 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -741,8 +741,6 @@ def setup_samdb(path, setup_path, session_info, credentials, lp,
         return samdb
 
     message("Pre-loading the Samba 4 and AD schema")
-    samdb = SamDB(path, session_info=session_info, 
-                  credentials=credentials, lp=lp)
     samdb.set_domain_sid(domainsid)
     if serverrole == "domain controller":
         samdb.set_invocation_id(invocationid)
-- 
cgit 


From 434e625e45a03889596999eb4301bb54128c31a9 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Mon, 14 Apr 2008 11:48:43 +0200
Subject: Add in a way to get at the private_path() function from python

Andrew Bartlett
(This used to be commit 416d2e3a5233f0c243e45857cfda5126c34ac265)
---
 source4/scripting/python/misc.i | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/misc.i b/source4/scripting/python/misc.i
index e04e6a6906..6fa3bc93e3 100644
--- a/source4/scripting/python/misc.i
+++ b/source4/scripting/python/misc.i
@@ -78,3 +78,8 @@ bool dsdb_set_ntds_invocation_id(struct ldb_context *ldb, const char *guid)
     return samdb_set_ntds_invocation_id(ldb, &invocation_id_in);
 }
 %}
+
+char *private_path(TALLOC_CTX* mem_ctx, 
+     		   struct loadparm_context *lp_ctx,
+	           const char *name);
+
-- 
cgit 


From 5a37b3fc5d42beffaf4bdca70b1f0c5f80f92280 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Mon, 14 Apr 2008 11:51:02 +0200
Subject: Fix newuser and setpassword scripts, and port to idmap.

The new idmap world does not use the unixUser any more, so we need to
set up the entry (if wanted) in the idmap database.  Users without a
backing unix user will get an allocated uid by idmap later.

Andrew Bartlett
(This used to be commit 8bd8bc1475ddf22d4702dcd17028a9043a5e629f)
---
 source4/scripting/python/samba/idmap.py |  7 +++++++
 source4/scripting/python/samba/samdb.py | 28 +++++++++++++++++++++++++++-
 2 files changed, 34 insertions(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/idmap.py b/source4/scripting/python/samba/idmap.py
index 355565968a..16efcd0470 100644
--- a/source4/scripting/python/samba/idmap.py
+++ b/source4/scripting/python/samba/idmap.py
@@ -21,6 +21,7 @@
 """Convenience functions for using the idmap database."""
 
 import samba
+import misc
 import ldb
 
 class IDmapDB(samba.Ldb):
@@ -37,11 +38,17 @@ class IDmapDB(samba.Ldb):
 
         :param url: URL of the database.
         """
+        self.lp = lp
+
         super(IDmapDB, self).__init__(session_info=session_info, credentials=credentials,
                                     modules_dir=modules_dir, lp=lp)
         if url:
             self.connect(url)
+        else:
+            self.connect(lp.get("idmap database"))
 
+    def connect(self, url):
+        super(IDmapDB, self).connect(misc.private_path(self.lp, url))
 
     def setup_name_mapping(self, sid, type, unixid):
         """Setup a mapping between a sam name and a unix name.
diff --git a/source4/scripting/python/samba/samdb.py b/source4/scripting/python/samba/samdb.py
index bc3eef7879..198d1e9f5c 100644
--- a/source4/scripting/python/samba/samdb.py
+++ b/source4/scripting/python/samba/samdb.py
@@ -25,20 +25,29 @@
 import samba
 import misc
 import ldb
+from samba.idmap import IDmapDB
+import pwd
 
 class SamDB(samba.Ldb):
     """The SAM database."""
+
     def __init__(self, url=None, session_info=None, credentials=None, 
                  modules_dir=None, lp=None):
         """Open the Sam Database.
 
         :param url: URL of the database.
         """
+        self.lp = lp
         super(SamDB, self).__init__(session_info=session_info, credentials=credentials,
                                     modules_dir=modules_dir, lp=lp)
         assert misc.dsdb_set_global_schema(self) == 0
         if url:
             self.connect(url)
+        else:
+            self.connect(lp.get("sam database"))
+
+    def connect(self, url):
+        super(SamDB, self).connect(misc.private_path(self.lp, url))
 
     def add_foreign(self, domaindn, sid, desc):
         """Add a foreign security principle."""
@@ -101,10 +110,27 @@ userAccountControl: %u
         #  now the real work
         self.add({"dn": user_dn, 
             "sAMAccountName": username,
-            "unixName": unixname,
             "sambaPassword": password,
             "objectClass": "user"})
 
+        res = self.search(user_dn, scope=ldb.SCOPE_BASE,
+                          expression="objectclass=*",
+                          attrs=["objectSid"])
+        assert(len(res) == 1)
+        user_sid = self.schema_format_value("objectSid", res[0]["objectSid"][0])
+        
+        
+        try:
+            idmap = IDmapDB(lp=self.lp)
+
+            user = pwd.getpwnam(unixname)
+            # setup ID mapping for this UID
+            
+            idmap.setup_name_mapping(user_sid, idmap.TYPE_UID, user[2])
+
+        except KeyError:
+            pass
+
         #  modify the userAccountControl to remove the disabled bit
         self.enable_account(user_dn)
         self.transaction_commit()
-- 
cgit 


From ca78fa8cae96099055a6ae7a0963c2b2789f2b87 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Mon, 14 Apr 2008 11:53:28 +0200
Subject: Re-run SWIG (This used to be commit
 2f8010582607ad7389cac3de4945ea0ee46941b3)

---
 source4/scripting/python/misc.py     |  1 +
 source4/scripting/python/misc_wrap.c | 45 ++++++++++++++++++++++++++++++++++++
 2 files changed, 46 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/misc.py b/source4/scripting/python/misc.py
index 2fc7fe37e7..f1da4c687a 100644
--- a/source4/scripting/python/misc.py
+++ b/source4/scripting/python/misc.py
@@ -71,5 +71,6 @@ version = _misc.version
 dsdb_set_global_schema = _misc.dsdb_set_global_schema
 ldb_register_samba_handlers = _misc.ldb_register_samba_handlers
 dsdb_set_ntds_invocation_id = _misc.dsdb_set_ntds_invocation_id
+private_path = _misc.private_path
 
 
diff --git a/source4/scripting/python/misc_wrap.c b/source4/scripting/python/misc_wrap.c
index 579d1f379f..4944515d15 100644
--- a/source4/scripting/python/misc_wrap.c
+++ b/source4/scripting/python/misc_wrap.c
@@ -3153,6 +3153,50 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_private_path(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  TALLOC_CTX *arg1 = (TALLOC_CTX *) 0 ;
+  struct loadparm_context *arg2 = (struct loadparm_context *) 0 ;
+  char *arg3 = (char *) 0 ;
+  char *result = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  int res3 ;
+  char *buf3 = 0 ;
+  int alloc3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "lp_ctx",(char *) "name", NULL 
+  };
+  
+  arg2 = loadparm_init(NULL);
+  arg1 = NULL;
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:private_path",kwnames,&obj0,&obj1)) SWIG_fail;
+  if (obj0) {
+    res2 = SWIG_ConvertPtr(obj0, &argp2,SWIGTYPE_p_loadparm_context, 0 |  0 );
+    if (!SWIG_IsOK(res2)) {
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "private_path" "', argument " "2"" of type '" "struct loadparm_context *""'"); 
+    }
+    arg2 = (struct loadparm_context *)(argp2);
+  }
+  if (obj1) {
+    res3 = SWIG_AsCharPtrAndSize(obj1, &buf3, NULL, &alloc3);
+    if (!SWIG_IsOK(res3)) {
+      SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "private_path" "', argument " "3"" of type '" "char const *""'");
+    }
+    arg3 = (char *)(buf3);
+  }
+  result = (char *)private_path(arg1,arg2,(char const *)arg3);
+  resultobj = SWIG_FromCharPtr((const char *)result);
+  if (alloc3 == SWIG_NEWOBJ) free((char*)buf3);
+  return resultobj;
+fail:
+  if (alloc3 == SWIG_NEWOBJ) free((char*)buf3);
+  return NULL;
+}
+
+
 static PyMethodDef SwigMethods[] = {
 	 { (char *)"random_password", (PyCFunction) _wrap_random_password, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"ldb_set_credentials", (PyCFunction) _wrap_ldb_set_credentials, METH_VARARGS | METH_KEYWORDS, NULL},
@@ -3164,6 +3208,7 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"dsdb_set_global_schema", (PyCFunction) _wrap_dsdb_set_global_schema, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"ldb_register_samba_handlers", (PyCFunction) _wrap_ldb_register_samba_handlers, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"dsdb_set_ntds_invocation_id", (PyCFunction) _wrap_dsdb_set_ntds_invocation_id, METH_VARARGS | METH_KEYWORDS, NULL},
+	 { (char *)"private_path", (PyCFunction) _wrap_private_path, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { NULL, NULL, 0, NULL }
 };
 
-- 
cgit 


From f78bc8c489b02b521e9ecbdbdc72d160c6911b6b Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 14 Apr 2008 11:54:50 +0200
Subject: Remove prototypes from build.h in preparation of removing build.h
 altogether. (This used to be commit dbeab2a9cdee4e5f69afeb2603ba29cbed56debd)

---
 source4/scripting/ejs/smbcalls.c | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls.c b/source4/scripting/ejs/smbcalls.c
index 63a80e17db..b1a2f6a37b 100644
--- a/source4/scripting/ejs/smbcalls.c
+++ b/source4/scripting/ejs/smbcalls.c
@@ -173,6 +173,32 @@ _PUBLIC_ void ejs_exception(const char *reason)
 */
 void smb_setup_ejs_functions(void (*exception_handler)(const char *))
 {
+	extern NTSTATUS ejs_init_security(void);
+	extern NTSTATUS ejs_init_initshutdown(void);
+	extern NTSTATUS smb_setup_ejs_reg(void);
+	extern NTSTATUS smb_setup_ejs_string(void);
+	extern NTSTATUS ejs_init_lsarpc(void);
+	extern NTSTATUS ejs_init_rpcecho(void);
+	extern NTSTATUS ejs_init_winreg(void);
+	extern NTSTATUS smb_setup_ejs_random(void);
+	extern NTSTATUS smb_setup_ejs_config(void);
+	extern NTSTATUS ejs_init_misc(void);
+	extern NTSTATUS ejs_init_netdfs(void);
+	extern NTSTATUS smb_setup_ejs_datablob(void);
+	extern NTSTATUS smb_setup_ejs_auth(void);
+	extern NTSTATUS smb_setup_ejs_nss(void);
+	extern NTSTATUS ejs_init_samr(void);
+	extern NTSTATUS ejs_init_wkssvc(void);
+	extern NTSTATUS smb_setup_ejs_system(void);
+	extern NTSTATUS smb_setup_ejs_ldb(void);
+	extern NTSTATUS ejs_init_svcctl(void);
+	extern NTSTATUS smb_setup_ejs_nbt(void);
+	extern NTSTATUS smb_setup_ejs_net(void);
+	extern NTSTATUS ejs_init_srvsvc(void);
+	extern NTSTATUS ejs_init_netlogon(void);
+	extern NTSTATUS ejs_init_drsuapi(void);
+	extern NTSTATUS ejs_init_irpc(void);
+	extern NTSTATUS ejs_init_eventlog(void);
 	init_module_fn static_init[] = { STATIC_smbcalls_MODULES };
 	init_module_fn *shared_init;
 
-- 
cgit 


From f800cf250f079ab1e1bc1051c34d1d1061187447 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 14 Apr 2008 14:51:57 +0200
Subject: Move standard make compilation rules to build/make. (This used to be
 commit ceda3312a98b069d0711f3cb33de3ae71e91ebaa)

---
 source4/scripting/python/config.mk | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/config.mk b/source4/scripting/python/config.mk
index 09c77813ca..22e9a2ff7b 100644
--- a/source4/scripting/python/config.mk
+++ b/source4/scripting/python/config.mk
@@ -15,24 +15,9 @@ OBJ_FILES = uuidmodule.o
 PRIVATE_DEPENDENCIES = LIBNDR LIBLDB SAMDB CREDENTIALS
 SWIG_FILE = misc.i
 
-# Swig extensions
-swig:: pythonmods
-
-.SUFFIXES: _wrap.c .i
-
-.i_wrap.c:
-	[ "$(SWIG)" = "no" ] || $(SWIG) -O -Wall -I$(srcdir)/scripting/swig -python -keyword $<
-
-realdistclean::
-	@echo "Removing SWIG output files"
-	# FIXME: Remove _wrap.c files
-
-pythonmods:: $(PYTHON_DSOS) $(PYTHON_PYS)
-
 PYDOCTOR_MODULES=bin/python/ldb.py bin/python/auth.py bin/python/credentials.py bin/python/registry.py bin/python/tdb.py bin/python/security.py bin/python/events.py bin/python/net.py
 
-pydoctor:: pythonmods
-	LD_LIBRARY_PATH=bin/shared PYTHONPATH=bin/python pydoctor --project-name=Samba --make-html --docformat=restructuredtext --add-package scripting/python/samba/ $(addprefix --add-module , $(PYDOCTOR_MODULES))
+pythonmods:: $(PYTHON_PYS) $(PYTHON_MODS)
 
 bin/python/%.py: 
 	mkdir -p $(@D)
-- 
cgit 


From e9017ba418202b4b191c5a9ad4a96857558ce606 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 14 Apr 2008 17:22:58 +0200
Subject: Use _OBJ_FILES variables in a couple more places. (This used to be
 commit 92856d5054106894b65cd1a1b5119c0facfc4cff)

---
 source4/scripting/ejs/config.mk        | 59 ++++++++++++++++++++--------------
 source4/scripting/ejs/ejsnet/config.mk | 14 ++++----
 source4/scripting/python/config.mk     |  9 ++++--
 3 files changed, 49 insertions(+), 33 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/config.mk b/source4/scripting/ejs/config.mk
index ea64d24eea..a3ed5239bf 100644
--- a/source4/scripting/ejs/config.mk
+++ b/source4/scripting/ejs/config.mk
@@ -1,84 +1,85 @@
 [SUBSYSTEM::EJSRPC]
-OBJ_FILES = \
-		ejsrpc.o
+
+EJSRPC_OBJ_FILES = scripting/ejs/ejsrpc.o
 
 [MODULE::smbcalls_config]
-OBJ_FILES = smbcalls_config.o
 OUTPUT_TYPE = MERGED_OBJ
 SUBSYSTEM = smbcalls
 INIT_FUNCTION = smb_setup_ejs_config
 
+smbcalls_config_OBJ_FILES = scripting/ejs/smbcalls_config.o
+
 [MODULE::smbcalls_ldb]
-OBJ_FILES = smbcalls_ldb.o
 OUTPUT_TYPE = MERGED_OBJ
 SUBSYSTEM = smbcalls
 INIT_FUNCTION = smb_setup_ejs_ldb
 PRIVATE_DEPENDENCIES = LIBLDB SAMDB LIBNDR
 
+smbcalls_ldb_OBJ_FILES = scripting/ejs/smbcalls_ldb.o
+
 [MODULE::smbcalls_reg]
-OBJ_FILES = smbcalls_reg.o
 SUBSYSTEM = smbcalls
 OUTPUT_TYPE = MERGED_OBJ
 INIT_FUNCTION = smb_setup_ejs_reg
 PRIVATE_DEPENDENCIES = registry SAMDB LIBNDR
 
+smbcalls_reg_OBJ_FILES = scripting/ejs/smbcalls_reg.o
+
 [MODULE::smbcalls_nbt]
-OBJ_FILES = smbcalls_nbt.o
 SUBSYSTEM = smbcalls
 OUTPUT_TYPE = MERGED_OBJ
 INIT_FUNCTION = smb_setup_ejs_nbt
 
+smbcalls_nbt_OBJ_FILES = scripting/ejs/smbcalls_nbt.o
+
 [MODULE::smbcalls_rand]
-OBJ_FILES = smbcalls_rand.o
 SUBSYSTEM = smbcalls
 OUTPUT_TYPE = MERGED_OBJ
 INIT_FUNCTION = smb_setup_ejs_random
 
+smbcalls_rand_OBJ_FILES = scripting/ejs/smbcalls_rand.o
+
 [MODULE::smbcalls_nss]
-OBJ_FILES = smbcalls_nss.o
 SUBSYSTEM = smbcalls
 OUTPUT_TYPE = MERGED_OBJ
 INIT_FUNCTION = smb_setup_ejs_nss
 PRIVATE_DEPENDENCIES = NSS_WRAPPER
 
+smbcalls_nss_OBJ_FILES = scripting/ejs/smbcalls_nss.o
+
 [MODULE::smbcalls_data]
-OBJ_FILES = smbcalls_data.o
 SUBSYSTEM = smbcalls
 OUTPUT_TYPE = MERGED_OBJ
 INIT_FUNCTION = smb_setup_ejs_datablob
 
+smbcalls_data_OBJ_FILES = scripting/ejs/smbcalls_data.o
+
 [MODULE::smbcalls_auth]
-OBJ_FILES = smbcalls_auth.o
 OUTPUT_TYPE = MERGED_OBJ
 SUBSYSTEM = smbcalls
 INIT_FUNCTION = smb_setup_ejs_auth
-PRIVATE_DEPENDENCIES = auth
+PRIVATE_DEPENDENCIES = service_auth
+
+smbcalls_auth_OBJ_FILES = scripting/ejs/smbcalls_auth.o
 
 [MODULE::smbcalls_string]
-OBJ_FILES = smbcalls_string.o
 SUBSYSTEM = smbcalls
 OUTPUT_TYPE = MERGED_OBJ
 INIT_FUNCTION = smb_setup_ejs_string
 
+smbcalls_string_OBJ_FILES = scripting/ejs/smbcalls_string.o
+
 [MODULE::smbcalls_sys]
-OBJ_FILES = smbcalls_sys.o
 SUBSYSTEM = smbcalls
 OUTPUT_TYPE = MERGED_OBJ
 INIT_FUNCTION = smb_setup_ejs_system
 
+smbcalls_sys_OBJ_FILES = scripting/ejs/smbcalls_sys.o
+
 mkinclude ejsnet/config.mk
 
 [SUBSYSTEM::smbcalls]
 PRIVATE_PROTO_HEADER = proto.h
-OBJ_FILES = \
-		smbcalls.o \
-		smbcalls_cli.o \
-		smbcalls_rpc.o \
-		smbcalls_options.o \
-		smbcalls_creds.o \
-		smbcalls_param.o \
-		mprutil.o \
-		literal.o
 PRIVATE_DEPENDENCIES = \
 		EJS LIBSAMBA-UTIL \
 		EJSRPC MESSAGING \
@@ -87,11 +88,21 @@ PRIVATE_DEPENDENCIES = \
 		dcerpc \
 		NDR_TABLE
 
+smbcalls_OBJ_FILES = $(addprefix scripting/ejs/, \
+		smbcalls.o \
+		smbcalls_cli.o \
+		smbcalls_rpc.o \
+		smbcalls_options.o \
+		smbcalls_creds.o \
+		smbcalls_param.o \
+		mprutil.o \
+		literal.o)
+
 #######################
 # Start BINARY SMBSCRIPT
 [BINARY::smbscript]
-OBJ_FILES = \
-		smbscript.o
 PRIVATE_DEPENDENCIES = EJS LIBSAMBA-UTIL smbcalls LIBSAMBA-HOSTCONFIG
 # End BINARY SMBSCRIPT
 #######################
+
+smbscript_OBJ_FILES = scripting/ejs/smbscript.o
diff --git a/source4/scripting/ejs/ejsnet/config.mk b/source4/scripting/ejs/ejsnet/config.mk
index 249a33121d..85a5b2bf09 100644
--- a/source4/scripting/ejs/ejsnet/config.mk
+++ b/source4/scripting/ejs/ejsnet/config.mk
@@ -1,11 +1,13 @@
 [MODULE::smbcalls_net]
-OBJ_FILES = \
-		net_ctx.o \
-		net_user.o \
-		mpr_user.o \
-		net_host.o \
-		mpr_host.o
 SUBSYSTEM = smbcalls
 INIT_FUNCTION = smb_setup_ejs_net
 PRIVATE_PROTO_HEADER = proto.h
 PRIVATE_DEPENDENCIES = LIBSAMBA-NET LIBCLI_SMB CREDENTIALS
+
+smbcalls_net_OBJ_FILES = $(addprefix scripting/ejs/ejsnet/,  \
+		net_ctx.o \
+		net_user.o \
+		mpr_user.o \
+		net_host.o \
+		mpr_host.o)
+
diff --git a/source4/scripting/python/config.mk b/source4/scripting/python/config.mk
index 22e9a2ff7b..cb03bfaeea 100644
--- a/source4/scripting/python/config.mk
+++ b/source4/scripting/python/config.mk
@@ -1,15 +1,18 @@
 [BINARY::smbpython]
 PRIVATE_DEPENDENCIES = LIBPYTHON
-OBJ_FILES = smbpython.o
+
+smbpython_OBJ_FILES = smbpython.o
 
 [SUBSYSTEM::LIBPYTHON]
 PUBLIC_DEPENDENCIES = EXT_LIB_PYTHON
 INIT_FUNCTION_SENTINEL = { NULL, NULL }
-OBJ_FILES = modules.o pytalloc.o
+
+LIBPYTHON_OBJ_FILES = modules.o pytalloc.o
 
 [PYTHON::python_uuid]
 PRIVATE_DEPENDENCIES = LIBNDR 
-OBJ_FILES = uuidmodule.o
+
+python_uuid_OBJ_FILES = uuidmodule.o
 
 [PYTHON::python_misc]
 PRIVATE_DEPENDENCIES = LIBNDR LIBLDB SAMDB CREDENTIALS
-- 
cgit 


From 02f3695897dddb013fc1268a4f1a852cd4a3465e Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 14 Apr 2008 18:30:07 +0200
Subject: Add convenience TestCase class for testing RPC interfaces. (This used
 to be commit 2f19f981449bf6f4d29f231259817c8b66104a9b)

---
 source4/scripting/python/samba/tests/__init__.py        | 7 +++++++
 source4/scripting/python/samba/tests/dcerpc/registry.py | 9 ++++-----
 2 files changed, 11 insertions(+), 5 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/tests/__init__.py b/source4/scripting/python/samba/tests/__init__.py
index c8673d3fae..ceb7dd23f3 100644
--- a/source4/scripting/python/samba/tests/__init__.py
+++ b/source4/scripting/python/samba/tests/__init__.py
@@ -90,3 +90,10 @@ def get_loadparm():
     lp = param.LoadParm()
     lp.load(os.getenv("SMB_CONF_PATH"))
     return lp
+
+class RpcInterfaceTestCase(unittest.TestCase):
+    def get_loadparm(self):
+        return get_loadparm()
+
+    def get_credentials(self):
+        return None
diff --git a/source4/scripting/python/samba/tests/dcerpc/registry.py b/source4/scripting/python/samba/tests/dcerpc/registry.py
index 147acc5098..1afdc582a7 100644
--- a/source4/scripting/python/samba/tests/dcerpc/registry.py
+++ b/source4/scripting/python/samba/tests/dcerpc/registry.py
@@ -18,14 +18,13 @@
 #
 
 import winreg
-from param import LoadParm
 import unittest
-from samba.tests import get_loadparm
+from samba.tests import RpcInterfaceTestCase
 
-class WinregTests(unittest.TestCase):
+class WinregTests(RpcInterfaceTestCase):
     def setUp(self):
-        lp_ctx = get_loadparm()
-        self.conn = winreg.winreg("ncalrpc:", lp_ctx)
+        self.conn = winreg.winreg("ncalrpc:", self.get_loadparm(), 
+                                  self.get_credentials())
 
     def get_hklm(self):
         return self.conn.OpenHKLM(None, 
-- 
cgit 


From c1d9167fbcc5df9da4f603084ad732915c68c0c0 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 14 Apr 2008 19:01:32 +0200
Subject: Also look in the environment for smb.conf path. (This used to be
 commit 8be7d93735a357a3b73a1c4413d6fd9ec09b7555)

---
 source4/scripting/python/samba/getopt.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/getopt.py b/source4/scripting/python/samba/getopt.py
index 82cb004b62..7ec684a9d6 100644
--- a/source4/scripting/python/samba/getopt.py
+++ b/source4/scripting/python/samba/getopt.py
@@ -35,12 +35,14 @@ class SambaOptions(optparse.OptionGroup):
         self._configfile = arg
 
     def get_loadparm(self):
-        import param
+        import os, param
         lp = param.LoadParm()
-        if self._configfile is None:
-            lp.load_default()
-        else:
+        if self._configfile is not None:
             lp.load(self._configfile)
+        elif os.getenv("SMB_CONF_PATH") is not None:
+            lp.load(os.getenv("SMB_CONF_PATH"))
+        else:
+            lp.load_default()
         return lp
 
 class VersionOptions(optparse.OptionGroup):
-- 
cgit 


From 1bcbc4afcf2f9984081652c1fbe50d329c86b3b5 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 14 Apr 2008 19:13:41 +0200
Subject: Allow command line options in the subunitrun script. (This used to be
 commit 524ec0796efebd48e7b5b2eb5fcc92ecc13c0071)

---
 source4/scripting/bin/subunitrun                 | 22 +++++++++++++++++++++-
 source4/scripting/python/samba/tests/__init__.py | 12 +++++-------
 2 files changed, 26 insertions(+), 8 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/bin/subunitrun b/source4/scripting/bin/subunitrun
index 11ac426589..3730a15e1b 100755
--- a/source4/scripting/bin/subunitrun
+++ b/source4/scripting/bin/subunitrun
@@ -20,6 +20,26 @@
 from subunit import SubunitTestRunner
 import sys
 from unittest import TestProgram
+import optparse
+import os
+import param
+import samba.getopt as options
+import samba.tests
+
+parser = optparse.OptionParser("subunitrun [options] <tests>")
+credopts = options.CredentialsOptions(parser)
+parser.add_option_group(credopts)
+sambaopts = options.SambaOptions(parser)
+parser.add_option_group(sambaopts)
+parser.add_option_group(options.VersionOptions(parser))
+
+args = parser.parse_args()[1]
+
+samba.tests.cmdline_loadparm = sambaopts.get_loadparm()
+samba.tests.cmdline_credentials = credopts.get_credentials(samba.tests.cmdline_loadparm)
+
+import pdb
+pdb.set_trace()
 
 runner = SubunitTestRunner()
-TestProgram(module=None, argv=sys.argv, testRunner=runner)
+program = TestProgram(module=None, argv=[sys.argv[0]] + args, testRunner=runner)
diff --git a/source4/scripting/python/samba/tests/__init__.py b/source4/scripting/python/samba/tests/__init__.py
index ceb7dd23f3..e29b4a87d5 100644
--- a/source4/scripting/python/samba/tests/__init__.py
+++ b/source4/scripting/python/samba/tests/__init__.py
@@ -85,15 +85,13 @@ class LdbExtensionTests(TestCaseInTempDir):
             os.unlink(path)
 
 
-def get_loadparm():
-    import param
-    lp = param.LoadParm()
-    lp.load(os.getenv("SMB_CONF_PATH"))
-    return lp
+cmdline_loadparm = None
+cmdline_credentials = None
 
 class RpcInterfaceTestCase(unittest.TestCase):
     def get_loadparm(self):
-        return get_loadparm()
+        assert cmdline_loadparm is not None
+        return cmdline_loadparm
 
     def get_credentials(self):
-        return None
+        return cmdline_credentials
-- 
cgit 


From 2cdfaedee203a726bddfb46fb10d9604de32a05f Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 14 Apr 2008 19:20:43 +0200
Subject: Make sure credentials are specified when running the Python winreg
 RPC tests. (This used to be commit 280339e3d126f5c72dc271051b72839fde0c5c9f)

---
 source4/scripting/bin/subunitrun                        | 3 +--
 source4/scripting/python/samba/tests/dcerpc/registry.py | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/bin/subunitrun b/source4/scripting/bin/subunitrun
index 3730a15e1b..fbbffde42c 100755
--- a/source4/scripting/bin/subunitrun
+++ b/source4/scripting/bin/subunitrun
@@ -38,8 +38,7 @@ args = parser.parse_args()[1]
 samba.tests.cmdline_loadparm = sambaopts.get_loadparm()
 samba.tests.cmdline_credentials = credopts.get_credentials(samba.tests.cmdline_loadparm)
 
-import pdb
-pdb.set_trace()
+param.cvar.default_config = samba.tests.cmdline_loadparm
 
 runner = SubunitTestRunner()
 program = TestProgram(module=None, argv=[sys.argv[0]] + args, testRunner=runner)
diff --git a/source4/scripting/python/samba/tests/dcerpc/registry.py b/source4/scripting/python/samba/tests/dcerpc/registry.py
index 1afdc582a7..05ac7c66ee 100644
--- a/source4/scripting/python/samba/tests/dcerpc/registry.py
+++ b/source4/scripting/python/samba/tests/dcerpc/registry.py
@@ -23,8 +23,8 @@ from samba.tests import RpcInterfaceTestCase
 
 class WinregTests(RpcInterfaceTestCase):
     def setUp(self):
-        self.conn = winreg.winreg("ncalrpc:", self.get_loadparm(), 
-                                  self.get_credentials())
+        lp = self.get_loadparm()
+        self.conn = winreg.winreg("ncalrpc:", lp, self.get_credentials())
 
     def get_hklm(self):
         return self.conn.OpenHKLM(None, 
-- 
cgit 


From a15b6f1606e1c761c2c4037b734137e97f00489f Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 14 Apr 2008 20:00:04 +0200
Subject: Fix unresolved symbols. (This used to be commit
 8573e828d1b68c47b3c1754e9be230b2e78d9d52)

---
 source4/scripting/ejs/config.mk    | 2 +-
 source4/scripting/python/config.mk | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/config.mk b/source4/scripting/ejs/config.mk
index a3ed5239bf..cadd71673c 100644
--- a/source4/scripting/ejs/config.mk
+++ b/source4/scripting/ejs/config.mk
@@ -58,7 +58,7 @@ smbcalls_data_OBJ_FILES = scripting/ejs/smbcalls_data.o
 OUTPUT_TYPE = MERGED_OBJ
 SUBSYSTEM = smbcalls
 INIT_FUNCTION = smb_setup_ejs_auth
-PRIVATE_DEPENDENCIES = service_auth
+PRIVATE_DEPENDENCIES = auth
 
 smbcalls_auth_OBJ_FILES = scripting/ejs/smbcalls_auth.o
 
diff --git a/source4/scripting/python/config.mk b/source4/scripting/python/config.mk
index cb03bfaeea..2f010644b1 100644
--- a/source4/scripting/python/config.mk
+++ b/source4/scripting/python/config.mk
@@ -1,23 +1,25 @@
 [BINARY::smbpython]
 PRIVATE_DEPENDENCIES = LIBPYTHON
 
-smbpython_OBJ_FILES = smbpython.o
+smbpython_OBJ_FILES = scripting/python/smbpython.o
 
 [SUBSYSTEM::LIBPYTHON]
 PUBLIC_DEPENDENCIES = EXT_LIB_PYTHON
 INIT_FUNCTION_SENTINEL = { NULL, NULL }
 
-LIBPYTHON_OBJ_FILES = modules.o pytalloc.o
+LIBPYTHON_OBJ_FILES = $(addprefix scripting/python/, modules.o pytalloc.o)
 
 [PYTHON::python_uuid]
 PRIVATE_DEPENDENCIES = LIBNDR 
 
-python_uuid_OBJ_FILES = uuidmodule.o
+python_uuid_OBJ_FILES = scripting/python/uuidmodule.o
 
 [PYTHON::python_misc]
 PRIVATE_DEPENDENCIES = LIBNDR LIBLDB SAMDB CREDENTIALS
 SWIG_FILE = misc.i
 
+python_misc_OBJ_FILES = scripting/python/misc_wrap.o
+
 PYDOCTOR_MODULES=bin/python/ldb.py bin/python/auth.py bin/python/credentials.py bin/python/registry.py bin/python/tdb.py bin/python/security.py bin/python/events.py bin/python/net.py
 
 pythonmods:: $(PYTHON_PYS) $(PYTHON_MODS)
-- 
cgit 


From 1b5f32128d1867829647a4e1f20b6e8363444f66 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 14 Apr 2008 23:28:14 +0200
Subject: Use RpcInterfaceTestCase everywhere. (This used to be commit
 799095b4e567f4495adf7d1d7bcb81dda6782959)

---
 source4/scripting/python/samba/tests/dcerpc/registry.py | 4 ++--
 source4/scripting/python/samba/tests/dcerpc/rpcecho.py  | 7 +++----
 source4/scripting/python/samba/tests/dcerpc/sam.py      | 7 +++----
 source4/scripting/python/samba/tests/dcerpc/unix.py     | 7 +++----
 source4/scripting/python/samba/tests/provision.py       | 2 +-
 source4/scripting/python/samba/tests/samdb.py           | 4 ++--
 6 files changed, 14 insertions(+), 17 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/tests/dcerpc/registry.py b/source4/scripting/python/samba/tests/dcerpc/registry.py
index 05ac7c66ee..1afdc582a7 100644
--- a/source4/scripting/python/samba/tests/dcerpc/registry.py
+++ b/source4/scripting/python/samba/tests/dcerpc/registry.py
@@ -23,8 +23,8 @@ from samba.tests import RpcInterfaceTestCase
 
 class WinregTests(RpcInterfaceTestCase):
     def setUp(self):
-        lp = self.get_loadparm()
-        self.conn = winreg.winreg("ncalrpc:", lp, self.get_credentials())
+        self.conn = winreg.winreg("ncalrpc:", self.get_loadparm(), 
+                                  self.get_credentials())
 
     def get_hklm(self):
         return self.conn.OpenHKLM(None, 
diff --git a/source4/scripting/python/samba/tests/dcerpc/rpcecho.py b/source4/scripting/python/samba/tests/dcerpc/rpcecho.py
index 484af9490c..6c43632d97 100644
--- a/source4/scripting/python/samba/tests/dcerpc/rpcecho.py
+++ b/source4/scripting/python/samba/tests/dcerpc/rpcecho.py
@@ -19,12 +19,11 @@
 
 import echo
 import unittest
-from samba.tests import get_loadparm
+from samba.tests import RpcInterfaceTestCase
 
-class RpcEchoTests(unittest.TestCase):
+class RpcEchoTests(RpcInterfaceTestCase):
     def setUp(self):
-        lp_ctx = get_loadparm()
-        self.conn = echo.rpcecho("ncalrpc:", lp_ctx)
+        self.conn = echo.rpcecho("ncalrpc:", self.get_loadparm())
 
     def test_addone(self):
         self.assertEquals(2, self.conn.AddOne(1))
diff --git a/source4/scripting/python/samba/tests/dcerpc/sam.py b/source4/scripting/python/samba/tests/dcerpc/sam.py
index 96348f2f69..8ef12dad86 100644
--- a/source4/scripting/python/samba/tests/dcerpc/sam.py
+++ b/source4/scripting/python/samba/tests/dcerpc/sam.py
@@ -18,12 +18,11 @@
 #
 
 import samr
-import unittest
-from samba.tests import get_loadparm
+from samba.tests import RpcInterfaceTestCase
 
-class SamrTests(unittest.TestCase):
+class SamrTests(RpcInterfaceTestCase):
     def setUp(self):
-        self.conn = samr.samr("ncalrpc:", get_loadparm())
+        self.conn = samr.samr("ncalrpc:", self.get_loadparm())
 
     def test_connect5(self):
         (level, info, handle) = self.conn.Connect5(None, 0, 1, samr.ConnectInfo1())
diff --git a/source4/scripting/python/samba/tests/dcerpc/unix.py b/source4/scripting/python/samba/tests/dcerpc/unix.py
index b2577ec898..bfddfdc7ec 100644
--- a/source4/scripting/python/samba/tests/dcerpc/unix.py
+++ b/source4/scripting/python/samba/tests/dcerpc/unix.py
@@ -18,12 +18,11 @@
 #
 
 import unixinfo
-import unittest
-from samba.tests import get_loadparm
+from samba.tests import RpcInterfaceTestCase
 
-class UnixinfoTests(unittest.TestCase):
+class UnixinfoTests(RpcInterfaceTestCase):
     def setUp(self):
-        self.conn = unixinfo.unixinfo("ncalrpc:", get_loadparm())
+        self.conn = unixinfo.unixinfo("ncalrpc:", self.get_loadparm())
 
     def test_getpwuid(self):
         infos = self.conn.GetPWUid(range(512))
diff --git a/source4/scripting/python/samba/tests/provision.py b/source4/scripting/python/samba/tests/provision.py
index 514582cbe4..b9e0e16d3c 100644
--- a/source4/scripting/python/samba/tests/provision.py
+++ b/source4/scripting/python/samba/tests/provision.py
@@ -24,7 +24,7 @@ from ldb import Dn
 import param
 import unittest
 
-lp = samba.tests.get_loadparm()
+lp = samba.tests.cmdline_loadparm
 
 setup_dir = "setup"
 def setup_path(file):
diff --git a/source4/scripting/python/samba/tests/samdb.py b/source4/scripting/python/samba/tests/samdb.py
index 3745dba6fc..0e175bf936 100644
--- a/source4/scripting/python/samba/tests/samdb.py
+++ b/source4/scripting/python/samba/tests/samdb.py
@@ -21,7 +21,7 @@ from credentials import Credentials
 import os
 from samba.provision import setup_samdb
 from samba.samdb import SamDB
-from samba.tests import get_loadparm, TestCaseInTempDir
+from samba.tests import cmdline_loadparm, TestCaseInTempDir
 import security
 from unittest import TestCase
 import uuid
@@ -43,7 +43,7 @@ class SamDBTestCase(TestCaseInTempDir):
         hostguid = uuid.random()
         path = os.path.join(self.tempdir, "samdb.ldb")
         self.samdb = setup_samdb(path, setup_path, system_session(), creds, 
-                                 get_loadparm(), schemadn, configdn, 
+                                 cmdline_loadparm, schemadn, configdn, 
                                  self.domaindn, "example.com", "EXAMPLE.COM", 
                                  "FOO", lambda x: None, "foo", domaindn, 
                                  False, domainsid, "# no aci", domainguid, 
-- 
cgit 


From d04926914ad0d9ecd7dee3e156198d6baf788598 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 15 Apr 2008 01:40:32 +0200
Subject: Fix the build. (This used to be commit
 ecaa5bb83b5cf319718d15aff96152d70fa19f7f)

---
 source4/scripting/python/config.mk | 10 ----------
 1 file changed, 10 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/config.mk b/source4/scripting/python/config.mk
index 2f010644b1..59f628fe18 100644
--- a/source4/scripting/python/config.mk
+++ b/source4/scripting/python/config.mk
@@ -22,18 +22,8 @@ python_misc_OBJ_FILES = scripting/python/misc_wrap.o
 
 PYDOCTOR_MODULES=bin/python/ldb.py bin/python/auth.py bin/python/credentials.py bin/python/registry.py bin/python/tdb.py bin/python/security.py bin/python/events.py bin/python/net.py
 
-pythonmods:: $(PYTHON_PYS) $(PYTHON_MODS)
-
-bin/python/%.py: 
-	mkdir -p $(@D)
-	cp $< $@
-
 installpython:: pythonmods
 	@$(SHELL) $(srcdir)/script/installpython.sh \
 		$(INSTALLPERMS) \
 		$(DESTDIR)$(PYTHONDIR) \
 		scripting/python bin/python
-
-clean::
-	@echo "Removing python modules"
-	@rm -rf bin/python/*
-- 
cgit 


From 1a8bfba5452f7b72d9f0b2a178f7e8a66557c463 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 15 Apr 2008 12:15:43 +0200
Subject: Fix warnings. (This used to be commit
 88013ca9775a6ff5e5a393f9d8238dbcd197f26f)

---
 source4/scripting/python/uuidmodule.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/uuidmodule.c b/source4/scripting/python/uuidmodule.c
index cd9a1cb4d5..18cfb6ce32 100644
--- a/source4/scripting/python/uuidmodule.c
+++ b/source4/scripting/python/uuidmodule.c
@@ -27,7 +27,7 @@ static PyObject *uuid_random(PyObject *self, PyObject *args)
 	PyObject *pyobj;
 	char *str;
 
-	if (!PyArg_ParseTuple(args, (char *)""))
+	if (!PyArg_ParseTuple(args, ""))
 	        return NULL;
 
 	guid = GUID_random();
@@ -52,7 +52,7 @@ static PyMethodDef methods[] = {
 
 void inituuid(void)
 {
-	PyObject *mod = Py_InitModule3((char *)"uuid", methods, "UUID helper routines");
+	PyObject *mod = Py_InitModule3("uuid", methods, "UUID helper routines");
 	if (mod == NULL)
 		return;
 }
-- 
cgit 


From 983b66b8f16ba4e06a8b239e5c4191e3f0245481 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 15 Apr 2008 12:51:31 +0200
Subject: Saner names for Python objects. (This used to be commit
 f4de8d2c1c956bc85b91dc7aab20e5e7671f51bc)

---
 source4/scripting/python/pytalloc.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/pytalloc.c b/source4/scripting/python/pytalloc.c
index d8d3efe69c..aa0ae9bf90 100644
--- a/source4/scripting/python/pytalloc.c
+++ b/source4/scripting/python/pytalloc.c
@@ -39,7 +39,7 @@ PyObject *py_talloc_import_ex(PyTypeObject *py_type, TALLOC_CTX *mem_ctx,
 PyObject *py_talloc_default_repr(PyObject *py_obj)
 {
 	py_talloc_Object *obj = (py_talloc_Object *)py_obj;
+	PyTypeObject *type = (PyTypeObject*)PyObject_Type((PyObject *)obj);
 
-	return PyString_FromFormat("<talloc: %s>", 
-							   talloc_get_name(obj->talloc_ctx));
+	return PyString_FromFormat("<%s>", type->tp_name);
 }
-- 
cgit 


From fd52fe86169ddc0adda2d1cd97215c58d06f93c4 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 15 Apr 2008 14:32:13 +0200
Subject: Fix pointers when pushing strings to python during pidl generation.
 (This used to be commit ca72187b3e71a037780d42a57e46b60e75f724f6)

---
 source4/scripting/python/samba/tests/dcerpc/unix.py | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/tests/dcerpc/unix.py b/source4/scripting/python/samba/tests/dcerpc/unix.py
index bfddfdc7ec..43978ac9dc 100644
--- a/source4/scripting/python/samba/tests/dcerpc/unix.py
+++ b/source4/scripting/python/samba/tests/dcerpc/unix.py
@@ -27,6 +27,8 @@ class UnixinfoTests(RpcInterfaceTestCase):
     def test_getpwuid(self):
         infos = self.conn.GetPWUid(range(512))
         self.assertEquals(512, len(infos))
+        self.assertEquals("", infos[0].shell)
+        self.assertEquals("", infos[0].homedir)
 
     def test_gidtosid(self):
         self.conn.GidToSid(1000)
-- 
cgit 


From f8f4856ab7330db865d1a35abff3ccaf2ac277ba Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Tue, 15 Apr 2008 15:52:52 +0200
Subject: Fix provision-backend script

Andrew Bartlett
(This used to be commit ee6e4f8da229ddeca856a6db94236367aae06f63)
---
 source4/scripting/python/samba/provision.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index a8d188e7a3..45965a2429 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -1166,6 +1166,7 @@ def provision_backend(setup_dir=None, message=None,
                            "NETBIOSNAME": names.netbiosname,
                            "DEFAULTSITE": DEFAULTSITE,
                            "CONFIGDN": names.configdn,
+                           "SERVERDN": names.serverdn
                            })
     
     setup_add_ldif(schemadb, setup_path("schema_samba4.ldif"), 
@@ -1241,9 +1242,9 @@ refint_attributes""" + refint_attributes + "\n";
         setup_file(setup_path("modules.conf"), paths.modulesconf,
                    {"REALM": names.realm})
         
-        setup_db_config(setup_path, file, os.path.join(paths.ldapdir, "user"))
-        setup_db_config(setup_path, file, os.path.join(paths.ldapdir, "config"))
-        setup_db_config(setup_path, file, os.path.join(paths.ldapdir, "schema"))
+        setup_db_config(setup_path, os.path.join(paths.ldapdir, "user"))
+        setup_db_config(setup_path, os.path.join(paths.ldapdir, "config"))
+        setup_db_config(setup_path, os.path.join(paths.ldapdir, "schema"))
         mapping = "schema-map-openldap-2.3"
         backend_schema = "backend-schema.schema"
 
-- 
cgit 


From 2ddd23a8754258b7322f37a0e0b97587b23f338b Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Tue, 15 Apr 2008 17:10:47 +0200
Subject: Re-add 'db' subdirectory for LDAP backend provision

Andrew Bartlett
(This used to be commit 19890c0d15adf4f099365f276a4bfdd3f4de52b6)
---
 source4/scripting/python/samba/provision.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index 45965a2429..0e8840646c 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -1242,9 +1242,9 @@ refint_attributes""" + refint_attributes + "\n";
         setup_file(setup_path("modules.conf"), paths.modulesconf,
                    {"REALM": names.realm})
         
-        setup_db_config(setup_path, os.path.join(paths.ldapdir, "user"))
-        setup_db_config(setup_path, os.path.join(paths.ldapdir, "config"))
-        setup_db_config(setup_path, os.path.join(paths.ldapdir, "schema"))
+        setup_db_config(setup_path, os.path.join(paths.ldapdir, os.path.join("db", "user")))
+        setup_db_config(setup_path, os.path.join(paths.ldapdir, os.path.join("db", "config")))
+        setup_db_config(setup_path, os.path.join(paths.ldapdir, os.path.join("db", "schema")))
         mapping = "schema-map-openldap-2.3"
         backend_schema = "backend-schema.schema"
 
-- 
cgit 


From 7c4a45de26010996192912694e5a0a5a3d990fdc Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Wed, 16 Apr 2008 11:43:37 +0200
Subject: make sure header can be included more than once. (This used to be
 commit 38ed501ac8993e84ea7f02d4633bc83b490dfe61)

---
 source4/scripting/python/pyrpc.h | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/pyrpc.h b/source4/scripting/python/pyrpc.h
index f4d0f37c39..93d583c10a 100644
--- a/source4/scripting/python/pyrpc.h
+++ b/source4/scripting/python/pyrpc.h
@@ -17,6 +17,9 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#ifndef _PYRPC_H_
+#define _PYRPC_H_
+
 #define PY_CHECK_TYPE(type, var, fail) \
 	if (!type ## _Check(var)) {\
 		PyErr_Format(PyExc_TypeError, "Expected type %s", type ## _Type.tp_name); \
@@ -32,3 +35,5 @@
 #ifndef PyAPI_DATA
 #   define PyAPI_DATA(RTYPE) extern RTYPE
 #endif
+
+#endif /* _PYRPC_H_ */
-- 
cgit 


From bbb826bdac54e3fec3426fe6d8e23790abbbc44f Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Thu, 17 Apr 2008 01:37:42 +0200
Subject: Add convenience function for getting at event context from ejs code.
 (This used to be commit b659e83cd6b627dd0ae04064bccff7220a5bd1ce)

---
 source4/scripting/ejs/ejsnet/net_ctx.c | 2 +-
 source4/scripting/ejs/smbcalls_auth.c  | 2 +-
 source4/scripting/ejs/smbcalls_nbt.c   | 2 +-
 source4/scripting/ejs/smbcalls_rpc.c   | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/ejsnet/net_ctx.c b/source4/scripting/ejs/ejsnet/net_ctx.c
index 99be1c4ef8..cbe163552e 100644
--- a/source4/scripting/ejs/ejsnet/net_ctx.c
+++ b/source4/scripting/ejs/ejsnet/net_ctx.c
@@ -50,7 +50,7 @@ static int ejs_net_context(MprVarHandle eid, int argc, struct MprVar **argv)
 		ejsSetErrorMsg(eid, "talloc_new() failed");
 		return -1;
 	}
-	ev = event_context_find(event_mem_ctx);
+	ev = mprEventCtx();
 
 	ctx = libnet_context_init(ev, mprLpCtx());
 	/* IF we generated a new event context, it will be under here,
diff --git a/source4/scripting/ejs/smbcalls_auth.c b/source4/scripting/ejs/smbcalls_auth.c
index 908a009159..8e464a5021 100644
--- a/source4/scripting/ejs/smbcalls_auth.c
+++ b/source4/scripting/ejs/smbcalls_auth.c
@@ -55,7 +55,7 @@ static int ejs_doauth(MprVarHandle eid,
 		msg = c->msg_ctx;
 	} else {
 		/* Hope we can find the event context somewhere up there... */
-		ev = event_context_find(tmp_ctx);
+		ev = mprEventCtx();
 		msg = messaging_client_init(tmp_ctx, lp_messaging_path(tmp_ctx, mprLpCtx()), 
 					    lp_iconv_convenience(mprLpCtx()), ev);
 	}
diff --git a/source4/scripting/ejs/smbcalls_nbt.c b/source4/scripting/ejs/smbcalls_nbt.c
index 67a85414ca..8c555bf821 100644
--- a/source4/scripting/ejs/smbcalls_nbt.c
+++ b/source4/scripting/ejs/smbcalls_nbt.c
@@ -70,7 +70,7 @@ static int ejs_resolve_name(MprVarHandle eid, int argc, struct MprVar **argv)
 
 	result = 0;
 
-	nt_status = resolve_name(lp_resolve_context(mprLpCtx()), &name, tmp_ctx, &reply_addr, event_context_find(tmp_ctx));
+	nt_status = resolve_name(lp_resolve_context(mprLpCtx()), &name, tmp_ctx, &reply_addr, mprEventCtx());
 
 	if (NT_STATUS_IS_OK(nt_status)) {
 		mprSetPropertyValue(argv[0], "value", mprString(reply_addr));
diff --git a/source4/scripting/ejs/smbcalls_rpc.c b/source4/scripting/ejs/smbcalls_rpc.c
index d1e49b4348..94774d708b 100644
--- a/source4/scripting/ejs/smbcalls_rpc.c
+++ b/source4/scripting/ejs/smbcalls_rpc.c
@@ -73,7 +73,7 @@ static int ejs_irpc_connect(MprVarHandle eid, int argc, char **argv)
 
 	p->server_name = argv[0];
 
-	ev = event_context_find(p);
+	ev = mprEventCtx();
 
 	/* create a messaging context, looping as we have no way to
 	   allocate temporary server ids automatically */
@@ -158,7 +158,7 @@ static int ejs_rpc_connect(MprVarHandle eid, int argc, char **argv)
 		cli_credentials_set_anonymous(creds);
 	}
 
-	ev = event_context_find(mprMemCtx());
+	ev = mprEventCtx();
 
 	status = dcerpc_pipe_connect(this, &p, binding, iface, creds, ev,
 				     mprLpCtx());
-- 
cgit 


From 4d8f3f190215edcdbeb1725cccdc962dc68cc1a0 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Thu, 17 Apr 2008 12:03:49 +0200
Subject: Fix the expectations on the unixinfo test.

Andrew Bartlett
(This used to be commit 0df2b3e0b56007850cf83cfdcdb45ca29e162d34)
---
 source4/scripting/python/samba/tests/dcerpc/unix.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/tests/dcerpc/unix.py b/source4/scripting/python/samba/tests/dcerpc/unix.py
index 43978ac9dc..78a987cedd 100644
--- a/source4/scripting/python/samba/tests/dcerpc/unix.py
+++ b/source4/scripting/python/samba/tests/dcerpc/unix.py
@@ -27,8 +27,8 @@ class UnixinfoTests(RpcInterfaceTestCase):
     def test_getpwuid(self):
         infos = self.conn.GetPWUid(range(512))
         self.assertEquals(512, len(infos))
-        self.assertEquals("", infos[0].shell)
-        self.assertEquals("", infos[0].homedir)
+        self.assertEquals("/bin/false", infos[0].shell)
+        self.assertTrue(isinstance(infos[0].homedir, unicode))
 
     def test_gidtosid(self):
         self.conn.GidToSid(1000)
-- 
cgit 


From 21fc7673780aa1d7c0caab7b17ff9171238913ba Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Thu, 17 Apr 2008 12:23:44 +0200
Subject: Specify event_context to ldb_wrap_connect explicitly. (This used to
 be commit b4e1ae07a284c044704322446c94351c2decff91)

---
 source4/scripting/ejs/smbcalls_auth.c | 2 +-
 source4/scripting/ejs/smbcalls_ldb.c  | 2 +-
 source4/scripting/ejs/smbcalls_reg.c  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbcalls_auth.c b/source4/scripting/ejs/smbcalls_auth.c
index 8e464a5021..b67bb7ed5b 100644
--- a/source4/scripting/ejs/smbcalls_auth.c
+++ b/source4/scripting/ejs/smbcalls_auth.c
@@ -109,7 +109,7 @@ static int ejs_doauth(MprVarHandle eid,
 		goto done;
 	}
 
-	nt_status = auth_generate_session_info(tmp_ctx, mprLpCtx(), server_info, &session_info);
+	nt_status = auth_generate_session_info(tmp_ctx, mprEventCtx(), mprLpCtx(), server_info, &session_info);
 	if (!NT_STATUS_IS_OK(nt_status)) {
 		mprSetPropertyValue(auth, "report", mprString("Session Info generation failed"));
 		mprSetPropertyValue(auth, "result", mprCreateBoolVar(false));
diff --git a/source4/scripting/ejs/smbcalls_ldb.c b/source4/scripting/ejs/smbcalls_ldb.c
index f47920b9bb..4a157945af 100644
--- a/source4/scripting/ejs/smbcalls_ldb.c
+++ b/source4/scripting/ejs/smbcalls_ldb.c
@@ -453,7 +453,7 @@ static int ejs_ldbConnect(MprVarHandle eid, int argc, char **argv)
 
 	dbfile = argv[0];
 
-	ldb = ldb_wrap_connect(mprMemCtx(), mprLpCtx(), dbfile, 
+	ldb = ldb_wrap_connect(mprMemCtx(), mprEventCtx(), mprLpCtx(), dbfile, 
 			       session_info, creds,
 			       0, (const char **)(argv+1));
 	if (ldb == NULL) {
diff --git a/source4/scripting/ejs/smbcalls_reg.c b/source4/scripting/ejs/smbcalls_reg.c
index e20d91ad2e..ed8653d3a7 100644
--- a/source4/scripting/ejs/smbcalls_reg.c
+++ b/source4/scripting/ejs/smbcalls_reg.c
@@ -70,7 +70,7 @@ static int ejs_reg_open(MprVarHandle eid, int argc, struct MprVar **argv)
 	struct registry_context *rctx;
 	WERROR error;
 
-	error = reg_open_samba(mprMemCtx(), &rctx, mprLpCtx(), NULL, NULL);
+	error = reg_open_samba(mprMemCtx(), &rctx, mprEventCtx(), mprLpCtx(), NULL, NULL);
 	SMB_ASSERT(W_ERROR_IS_OK(error));
 
 	mprSetPtrChild(reg, "registry", rctx);
-- 
cgit 


From 240d959005f5fd80a38b3734b39dd5d6e425a566 Mon Sep 17 00:00:00 2001
From: Kai Blin <kai@samba.org>
Date: Sat, 19 Apr 2008 14:09:18 +0200
Subject: libnet: Make UserInfo accept a SID as input as well, fix
 wb_cmd_getpwuid (This used to be commit
 5f3a70f285ad8a412105c0e498e486f93fc279bc)

---
 source4/scripting/ejs/ejsnet/net_user.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/ejsnet/net_user.c b/source4/scripting/ejs/ejsnet/net_user.c
index 57e538d3b4..0c32035c6c 100644
--- a/source4/scripting/ejs/ejsnet/net_user.c
+++ b/source4/scripting/ejs/ejsnet/net_user.c
@@ -268,8 +268,9 @@ static int ejs_net_userinfo(MprVarHandle eid, int argc, char **argv)
 
 	/* call the libnet function */
 	req.in.domain_name = userman_domain;
-	req.in.user_name   = username;
-	
+	req.in.data.user_name   = username;
+	req.in.level = USER_INFO_BY_NAME;
+
 	status = libnet_UserInfo(ctx, mem_ctx, &req);
 	if (!NT_STATUS_IS_OK(status)) {
 		ejsSetErrorMsg(eid, "%s", req.out.error_string);
-- 
cgit 


From 6267dd78539863a5ec75b6cadba39184a2efc9b5 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sat, 10 May 2008 20:59:17 +0200
Subject: Clean up some git merges gone wrong. (This used to be commit
 42eb6b33462228467e65a51bbf624c481802b090)

---
 source4/scripting/python/modules.c | 2 --
 1 file changed, 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/modules.c b/source4/scripting/python/modules.c
index cbff14c708..0fe15b2fda 100644
--- a/source4/scripting/python/modules.c
+++ b/source4/scripting/python/modules.c
@@ -39,12 +39,10 @@ extern void initdrsuapi(void);
 extern void initwinreg(void);
 extern void initepmapper(void);
 extern void initinitshutdown(void);
-static void initdcerpc_misc(void) {} 
 extern void initmgmt(void);
 extern void initnet(void);
 extern void initatsvc(void);
 extern void initsamr(void);
-static void initdcerpc_security(void) {}
 extern void initlsa(void);
 extern void initsvcctl(void);
 extern void initwkssvc(void);
-- 
cgit 


From 97fbad6480b992421862eab3b347ff6a9bd33e8f Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sat, 10 May 2008 23:25:50 +0200
Subject: Install standalone python modules (so we can use stock python rather
 than smbpython). (This used to be commit
 bb5c9fc64b6ad275abdd98a19f018953c9d79cbd)

---
 source4/scripting/python/config.m4 | 5 +++++
 source4/scripting/python/config.mk | 6 ------
 2 files changed, 5 insertions(+), 6 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/config.m4 b/source4/scripting/python/config.m4
index 3790071ba8..a61d541049 100644
--- a/source4/scripting/python/config.m4
+++ b/source4/scripting/python/config.m4
@@ -71,3 +71,8 @@ else
 	AC_MSG_ERROR([Python not found. Please install Python 2.x and its development headers/libraries.])
 fi
 
+AC_MSG_CHECKING(python library directory)
+pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1, 0, '\\${prefix}')"`
+AC_MSG_RESULT($pythondir)
+
+AC_SUBST(pythondir)
diff --git a/source4/scripting/python/config.mk b/source4/scripting/python/config.mk
index 15be4ca309..a0f5caad3b 100644
--- a/source4/scripting/python/config.mk
+++ b/source4/scripting/python/config.mk
@@ -23,9 +23,3 @@ python_misc_OBJ_FILES = scripting/python/misc_wrap.o
 _PY_FILES = $(shell find scripting/python -name "*.py")
 
 $(foreach pyfile, $(_PY_FILES),$(eval $(call python_py_module_template,$(patsubst scripting/python/%,%,$(pyfile)),$(pyfile))))
-
-installpython:: pythonmods
-	@$(SHELL) $(srcdir)/script/installpython.sh \
-		$(INSTALLPERMS) \
-		$(DESTDIR)$(PYTHONDIR) \
-		scripting/python bin/python
-- 
cgit 


From 5319d9620b9ef68b3687d76aeaba5fa5d5c57a18 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sun, 11 May 2008 03:31:26 +0200
Subject: Use consistent function names with the standard Python uuid module
 that is available in >= 2.4. (This used to be commit
 60d458e3195eef6baf655fee0da7c3f68517e8e6)

---
 source4/scripting/python/samba/provision.py   | 4 ++--
 source4/scripting/python/samba/tests/samdb.py | 8 ++++----
 source4/scripting/python/uuidmodule.c         | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index 0e8840646c..60fa22e6c4 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -910,7 +910,7 @@ def provision(setup_dir, message, session_info,
         domainsid = security.Sid(domainsid)
 
     if policyguid is None:
-        policyguid = uuid.random()
+        policyguid = uuid.uuid4()
     if adminpass is None:
         adminpass = misc.random_password(12)
     if krbtgtpass is None:
@@ -960,7 +960,7 @@ def provision(setup_dir, message, session_info,
 
     assert serverrole in ("domain controller", "member server", "standalone")
     if invocationid is None and serverrole == "domain controller":
-        invocationid = uuid.random()
+        invocationid = uuid.uuid4()
 
     if not os.path.exists(paths.private_dir):
         os.mkdir(paths.private_dir)
diff --git a/source4/scripting/python/samba/tests/samdb.py b/source4/scripting/python/samba/tests/samdb.py
index 0e175bf936..9da3358527 100644
--- a/source4/scripting/python/samba/tests/samdb.py
+++ b/source4/scripting/python/samba/tests/samdb.py
@@ -29,18 +29,18 @@ import uuid
 class SamDBTestCase(TestCaseInTempDir):
     def setUp(self):
         super(SamDBTestCase, self).setUp()
-        invocationid = uuid.random()
+        invocationid = uuid.uuid4()
         domaindn = "DC=COM,DC=EXAMPLE"
         self.domaindn = domaindn
         configdn = "CN=Configuration," + domaindn
         schemadn = "CN=Schema," + configdn
-        domainguid = uuid.random()
-        policyguid = uuid.random()
+        domainguid = uuid.uuid4()
+        policyguid = uuid.uuid4()
         setup_path = lambda x: os.path.join("setup", x)
         creds = Credentials()
         creds.set_anonymous()
         domainsid = security.random_sid()
-        hostguid = uuid.random()
+        hostguid = uuid.uuid4()
         path = os.path.join(self.tempdir, "samdb.ldb")
         self.samdb = setup_samdb(path, setup_path, system_session(), creds, 
                                  cmdline_loadparm, schemadn, configdn, 
diff --git a/source4/scripting/python/uuidmodule.c b/source4/scripting/python/uuidmodule.c
index 18cfb6ce32..98ef9adaa9 100644
--- a/source4/scripting/python/uuidmodule.c
+++ b/source4/scripting/python/uuidmodule.c
@@ -46,7 +46,7 @@ static PyObject *uuid_random(PyObject *self, PyObject *args)
 }
 
 static PyMethodDef methods[] = {
-	{ "random", (PyCFunction)uuid_random, METH_VARARGS, NULL},
+	{ "uuid4", (PyCFunction)uuid_random, METH_VARARGS, NULL},
 	{ NULL, NULL }
 };
 
-- 
cgit 


From 8c926a34c8a74e446aa3c07536c1289704c6bc7a Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sun, 11 May 2008 04:36:05 +0200
Subject: Complete dependencies for python modules (actually matters when built
 standalone). (This used to be commit
 a89b6d8ad71d71271f30d156de20129866ef6aeb)

---
 source4/scripting/python/config.mk | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/config.mk b/source4/scripting/python/config.mk
index a0f5caad3b..e57ff1d1ac 100644
--- a/source4/scripting/python/config.mk
+++ b/source4/scripting/python/config.mk
@@ -5,9 +5,15 @@ smbpython_OBJ_FILES = scripting/python/smbpython.o
 
 [SUBSYSTEM::LIBPYTHON]
 PUBLIC_DEPENDENCIES = EXT_LIB_PYTHON
+PRIVATE_DEPENDENCIES = PYTALLOC
 INIT_FUNCTION_SENTINEL = { NULL, NULL }
 
-LIBPYTHON_OBJ_FILES = $(addprefix scripting/python/, modules.o pytalloc.o)
+LIBPYTHON_OBJ_FILES = $(addprefix scripting/python/, modules.o)
+
+[SUBSYSTEM::PYTALLOC]
+PUBLIC_DEPENDENCIES = EXT_LIB_PYTHON
+
+PYTALLOC_OBJ_FILES = $(addprefix scripting/python/, pytalloc.o)
 
 [PYTHON::python_uuid]
 PRIVATE_DEPENDENCIES = LIBNDR 
-- 
cgit 


From 251f6bd99159337b24b8aa8298a5c98de153bce0 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sun, 11 May 2008 04:36:37 +0200
Subject: make sure to always use string version of uuid rather than object.
 (This used to be commit bcd5fc7dc9899deb9fa84fdeeb21ed2ddb921308)

---
 source4/scripting/python/samba/provision.py   | 5 +++--
 source4/scripting/python/samba/tests/samdb.py | 8 ++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index 60fa22e6c4..ad8eb8bffd 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -689,6 +689,7 @@ def setup_self_join(samdb, names,
                     domainsid, invocationid, setup_path,
                     policyguid):
     """Join a host to its own domain."""
+    assert isinstance(invocationid, str)
     setup_add_ldif(samdb, setup_path("provision_self_join.ldif"), { 
               "CONFIGDN": names.configdn, 
               "SCHEMADN": names.schemadn,
@@ -910,7 +911,7 @@ def provision(setup_dir, message, session_info,
         domainsid = security.Sid(domainsid)
 
     if policyguid is None:
-        policyguid = uuid.uuid4()
+        policyguid = str(uuid.uuid4())
     if adminpass is None:
         adminpass = misc.random_password(12)
     if krbtgtpass is None:
@@ -960,7 +961,7 @@ def provision(setup_dir, message, session_info,
 
     assert serverrole in ("domain controller", "member server", "standalone")
     if invocationid is None and serverrole == "domain controller":
-        invocationid = uuid.uuid4()
+        invocationid = str(uuid.uuid4())
 
     if not os.path.exists(paths.private_dir):
         os.mkdir(paths.private_dir)
diff --git a/source4/scripting/python/samba/tests/samdb.py b/source4/scripting/python/samba/tests/samdb.py
index 9da3358527..0d4f7bde0e 100644
--- a/source4/scripting/python/samba/tests/samdb.py
+++ b/source4/scripting/python/samba/tests/samdb.py
@@ -29,18 +29,18 @@ import uuid
 class SamDBTestCase(TestCaseInTempDir):
     def setUp(self):
         super(SamDBTestCase, self).setUp()
-        invocationid = uuid.uuid4()
+        invocationid = str(uuid.uuid4())
         domaindn = "DC=COM,DC=EXAMPLE"
         self.domaindn = domaindn
         configdn = "CN=Configuration," + domaindn
         schemadn = "CN=Schema," + configdn
-        domainguid = uuid.uuid4()
-        policyguid = uuid.uuid4()
+        domainguid = str(uuid.uuid4())
+        policyguid = str(uuid.uuid4())
         setup_path = lambda x: os.path.join("setup", x)
         creds = Credentials()
         creds.set_anonymous()
         domainsid = security.random_sid()
-        hostguid = uuid.uuid4()
+        hostguid = str(uuid.uuid4())
         path = os.path.join(self.tempdir, "samdb.ldb")
         self.samdb = setup_samdb(path, setup_path, system_session(), creds, 
                                  cmdline_loadparm, schemadn, configdn, 
-- 
cgit 


From babdcc6135e6d3a91a9ddeae0555652026f09344 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sun, 11 May 2008 05:29:20 +0200
Subject: Use system python rather than smbpython. (This used to be commit
 d3df51cd01e53383dcc05923d248db03bc6f62e9)

---
 source4/scripting/bin/subunitrun | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/bin/subunitrun b/source4/scripting/bin/subunitrun
index fbbffde42c..719a58d9e5 100755
--- a/source4/scripting/bin/subunitrun
+++ b/source4/scripting/bin/subunitrun
@@ -17,8 +17,10 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-from subunit import SubunitTestRunner
 import sys
+sys.path.append("bin/python")
+
+from subunit import SubunitTestRunner
 from unittest import TestProgram
 import optparse
 import os
-- 
cgit 


From 47d22189227c0dd6f2f370ade2cfb878eef0f240 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sun, 11 May 2008 05:45:49 +0200
Subject: Set sys.path for running inside source tree. (This used to be commit
 b507109bb676715f7d9616e13b0e19305e9c2559)

---
 source4/scripting/bin/minschema.py | 4 ++++
 source4/scripting/bin/rpcclient    | 4 ++++
 source4/scripting/bin/samba3dump   | 5 ++++-
 source4/scripting/bin/subunitrun   | 4 +++-
 source4/scripting/bin/winreg.py    | 4 ++++
 5 files changed, 19 insertions(+), 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/bin/minschema.py b/source4/scripting/bin/minschema.py
index fb9d7b05aa..6dd5b42aff 100755
--- a/source4/scripting/bin/minschema.py
+++ b/source4/scripting/bin/minschema.py
@@ -4,6 +4,10 @@
 #
 
 import optparse
+
+# Find right directory when running from source tree
+sys.path.insert(0, "bin/python")
+
 import samba
 from samba import getopt as options
 import sys
diff --git a/source4/scripting/bin/rpcclient b/source4/scripting/bin/rpcclient
index 34efafdf73..aba4f9ddb3 100755
--- a/source4/scripting/bin/rpcclient
+++ b/source4/scripting/bin/rpcclient
@@ -1,6 +1,10 @@
 #!/usr/bin/python
 
 import sys, os, string
+
+# Find right directory when running from source tree
+sys.path.insert(0, "bin/python")
+
 from cmd import Cmd
 from optparse import OptionParser
 from pprint import pprint
diff --git a/source4/scripting/bin/samba3dump b/source4/scripting/bin/samba3dump
index 8f56d423d8..d89667233f 100755
--- a/source4/scripting/bin/samba3dump
+++ b/source4/scripting/bin/samba3dump
@@ -7,7 +7,10 @@
 
 import optparse
 import os, sys
-sys.path.append(os.path.join(os.path.dirname(__file__), "../python"))
+
+# Find right directory when running from source tree
+sys.path.insert(0, "bin/python")
+
 import samba
 import samba.samba3
 
diff --git a/source4/scripting/bin/subunitrun b/source4/scripting/bin/subunitrun
index 719a58d9e5..de11aba3cc 100755
--- a/source4/scripting/bin/subunitrun
+++ b/source4/scripting/bin/subunitrun
@@ -18,7 +18,9 @@
 #
 
 import sys
-sys.path.append("bin/python")
+
+# Find right directory when running from source tree
+sys.path.insert(0, "bin/python")
 
 from subunit import SubunitTestRunner
 from unittest import TestProgram
diff --git a/source4/scripting/bin/winreg.py b/source4/scripting/bin/winreg.py
index 1e39ee8f78..19d39e56ab 100755
--- a/source4/scripting/bin/winreg.py
+++ b/source4/scripting/bin/winreg.py
@@ -7,6 +7,10 @@
 #
 
 import sys
+
+# Find right directory when running from source tree
+sys.path.insert(0, "bin/python")
+
 import winreg
 import optparse
 import samba.getopt as options
-- 
cgit 


From 826dadf4f24765cdd437c29c035496ae6793761c Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sun, 11 May 2008 05:46:40 +0200
Subject: Remove smbpython. (This used to be commit
 e83f7b11963f2996e3ced0251087a09eb55c347c)

---
 source4/scripting/python/config.m4   |  1 -
 source4/scripting/python/config.mk   |  5 -----
 source4/scripting/python/smbpython.c | 34 ----------------------------------
 3 files changed, 40 deletions(-)
 delete mode 100644 source4/scripting/python/smbpython.c

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/config.m4 b/source4/scripting/python/config.m4
index a61d541049..1a86951bfb 100644
--- a/source4/scripting/python/config.m4
+++ b/source4/scripting/python/config.m4
@@ -64,7 +64,6 @@ SMB_EXT_LIB(EXT_LIB_PYTHON, [$PYTHON_LDFLAGS], [$PYTHON_CFLAGS])
 AC_MSG_CHECKING(working python module support)
 if test $working_python = yes; then
 	SMB_ENABLE(EXT_LIB_PYTHON,YES)
-	SMB_ENABLE(smbpython,YES)
 	SMB_ENABLE(LIBPYTHON,YES)
 	AC_MSG_RESULT([yes])
 else
diff --git a/source4/scripting/python/config.mk b/source4/scripting/python/config.mk
index e57ff1d1ac..a0ae256d9b 100644
--- a/source4/scripting/python/config.mk
+++ b/source4/scripting/python/config.mk
@@ -1,8 +1,3 @@
-[BINARY::smbpython]
-PRIVATE_DEPENDENCIES = LIBPYTHON
-
-smbpython_OBJ_FILES = scripting/python/smbpython.o
-
 [SUBSYSTEM::LIBPYTHON]
 PUBLIC_DEPENDENCIES = EXT_LIB_PYTHON
 PRIVATE_DEPENDENCIES = PYTALLOC
diff --git a/source4/scripting/python/smbpython.c b/source4/scripting/python/smbpython.c
deleted file mode 100644
index c5de53fd60..0000000000
--- a/source4/scripting/python/smbpython.c
+++ /dev/null
@@ -1,34 +0,0 @@
-/* 
-   Unix SMB/CIFS implementation.
-   Samba utility functions
-   Copyright (C) Jelmer Vernooij <jelmer@samba.org> 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 <http://www.gnu.org/licenses/>.
-*/
-
-#include "includes.h"
-#include <Python.h>
-#include "scripting/python/modules.h"
-
-int main(int argc, char **argv) 
-{
-	py_load_samba_modules();
-	Py_Initialize();
-	if (strchr(argv[0], '/') != NULL) {
-		char *bindir = strndup(argv[0], strrchr(argv[0], '/')-argv[0]);
-		py_update_path(bindir);
-		free(bindir);
-	}
-	return Py_Main(argc,argv);
-}
-- 
cgit 


From af683666d6d46169aadef4ea3bf7b430de3021f8 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sun, 11 May 2008 15:15:27 +0200
Subject: Remove obsolete provisioning library. (This used to be commit
 f123190fb49302968a231639848023a72dfdf2bc)

---
 source4/scripting/libjs/provision.js | 1254 ----------------------------------
 1 file changed, 1254 deletions(-)
 delete mode 100644 source4/scripting/libjs/provision.js

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
deleted file mode 100644
index 51e2785762..0000000000
--- a/source4/scripting/libjs/provision.js
+++ /dev/null
@@ -1,1254 +0,0 @@
-/*
-	backend code for provisioning a Samba4 server
-	Copyright Andrew Tridgell 2005
-	Released under the GNU GPL version 3 or later
-*/
-
-sys = sys_init();
-
-/*
-  return true if the current install seems to be OK
-*/
-function install_ok(session_info, credentials)
-{
-	var lp = loadparm_init();
-	var ldb = ldb_init();
-	ldb.session_info = session_info;
-	ldb.credentials = credentials;
-	if (lp.get("realm") == "") {
-		return false;
-	}
-	var ok = ldb.connect(lp.get("sam database"));
-	if (!ok) {
-		return false;
-	}
-	var res = ldb.search("(cn=Administrator)");
-	if (res.error != 0 || res.msgs.length != 1) {
-		return false;
-	}
-	return true;
-}
-
-/*
-  find a user or group from a list of possibilities
-*/
-function findnss()
-{
-	var i;
-	assert(arguments.length >= 2);
-	var nssfn = arguments[0];
-	for (i=1;i<arguments.length;i++) {
-		if (nssfn(arguments[i]) != undefined) {
-			return arguments[i];
-		}
-	}
-	printf("Unable to find user/group for %s\n", arguments[1]);
-	assert(i<arguments.length);
-}
-
-/*
-   add a foreign security principle
- */
-function add_foreign(ldb, subobj, sid, desc)
-{
-	var add = sprintf("
-dn: CN=%s,CN=ForeignSecurityPrincipals,%s
-objectClass: top
-objectClass: foreignSecurityPrincipal
-description: %s
-",
-			  sid, subobj.DOMAINDN, desc);
-	/* deliberately ignore errors from this, as the records may
-	   already exist */
-	ldb.add(add);
-}
-
-
-/*
-  setup a mapping between a sam name and a unix name
- */
-function setup_name_mapping(info, ldb, sid, unixname)
-{
-	var attrs = new Array("dn");
-	var res = ldb.search(sprintf("objectSid=%s", sid), 
-			     info.subobj.DOMAINDN, ldb.SCOPE_SUBTREE, attrs);
-	if (res.error != 0 || res.msgs.length != 1) {
-		info.message("Failed to find record for objectSid %s\n", sid);
-		return false;
-	}
-	var mod = sprintf("
-dn: %s
-changetype: modify
-replace: unixName
-unixName: %s
-",
-			  res.msgs[0].dn, unixname);
-	var ok = ldb.modify(mod);
-	if (ok.error != 0) {
-		info.message("name mapping for %s failed - %s\n",
-			     sid, ldb.errstring());
-		return false;
-	}
-	return true;
-}
-
-/*
-  return current time as a nt time string
-*/
-function nttime()
-{
-	return "" + sys.nttime();
-}
-
-/*
-  return current time as a ldap time string
-*/
-function ldaptime()
-{
-	return sys.ldaptime(sys.nttime());
-}
-
-/*
-  return a date string suitable for a dns zone serial number
-*/
-function datestring()
-{
-	var t = sys.ntgmtime(sys.nttime());
-	return sprintf("%04u%02u%02u%02u",
-		       t.tm_year+1900, t.tm_mon+1, t.tm_mday, t.tm_hour);
-}
-
-/*
-  return first host IP
-*/
-function hostip()
-{
-	var list = sys.interfaces();
-	return list[0];
-}
-
-
-/*
-  return first part of hostname
-*/
-function hostname()
-{
-	var s = split(".", sys.hostname());
-	return s[0];
-}
-
-/* the ldb is in bad shape, possibly due to being built from an
-   incompatible previous version of the code, so delete it
-   completely */
-function ldb_delete(info, ldb)
-{
-	info.message("Deleting " + ldb.filename + "\n");
-	var lp = loadparm_init();
-	sys.unlink(sprintf("%s/%s", lp.get("private dir"), ldb.filename));
-	ldb.transaction_cancel();
-	ldb.close();
-	var ok = ldb.connect(ldb.filename);
-	ldb.transaction_start();
-	assert(ok);
-}
-
-/*
-  erase an ldb, removing all records
-*/
-function ldb_erase(info, ldb)
-{
-	var res;
-
-	/* delete the specials */
-	ldb.del("@INDEXLIST");
-	ldb.del("@ATTRIBUTES");
-	ldb.del("@OPTIONS");
-	ldb.del("@MODULES");
-	ldb.del("@PARTITION");
-	ldb.del("@KLUDGEACL");
-
-	/* and the rest */
-	attrs = new Array("dn");
-     	var basedn = "";
-     	var res = ldb.search("(&(|(objectclass=*)(distinguishedName=*))(!(distinguishedName=@BASEINFO)))", basedn, ldb.SCOPE_SUBTREE, attrs);
-	var i;
-	if (res.error != 0) {
-		ldb_delete(info, ldb);
-		return;
-	}
-	for (i=0;i<res.msgs.length;i++) {
-		ldb.del(res.msgs[i].dn);
-	}
-
-     	var res = ldb.search("(&(|(objectclass=*)(distinguishedName=*))(!(distinguishedName=@BASEINFO)))", basedn, ldb.SCOPE_SUBTREE, attrs);
-	if (res.error != 0 || res.msgs.length != 0) {
-		ldb_delete(info, ldb);
-		return;
-	}
-	assert(res.msgs.length == 0);
-}
-
-/*
-  erase an ldb, removing all records
-*/
-function ldb_erase_partitions(info, ldb, ldapbackend)
-{
-	var rootDSE_attrs = new Array("namingContexts");
-	var lp = loadparm_init();
-	var j;
-
-	var res = ldb.search("(objectClass=*)", "", ldb.SCOPE_BASE, rootDSE_attrs);
-	if (res.error != 0) {
-		info.message("rootdse search failed: " + res.errstr + "\n");
-		assert(res.error == 0);
-	}
-	assert(res.msgs.length == 1);
-	if (typeof(res.msgs[0].namingContexts) == "undefined") {
-		return;
-	}	
-	for (j=0; j<res.msgs[0].namingContexts.length; j++) {
-		var anything = "(|(objectclass=*)(distinguishedName=*))";
-		var attrs = new Array("distinguishedName");
-		var basedn = res.msgs[0].namingContexts[j];
-		var k;
-		var previous_remaining = 1;
-		var current_remaining = 0;
-
-		if (ldapbackend && (basedn == info.subobj.DOMAINDN)) {
-			/* Only delete objects that were created by provision */
-			anything = "(objectcategory=*)";
-		}
-
-		for (k=0; k < 10 && (previous_remaining != current_remaining); k++) {
-			/* and the rest */
-			var res2 = ldb.search(anything, basedn, ldb.SCOPE_SUBTREE, attrs);
-			var i;
-			if (res2.error != 0) {
-				if (res2.error == 32) {
-					break;
-				} else {
-					info.message("ldb search(2) failed: " + res2.errstr + "\n");
-					continue;
-				}
-			}
-			previous_remaining = current_remaining;
-			current_remaining = res2.msgs.length;
-			for (i=0;i<res2.msgs.length;i++) {
-				ldb.del(res2.msgs[i].dn);
-			}
-			
-			var res3 = ldb.search(anything, basedn, ldb.SCOPE_SUBTREE, attrs);
-			if (res3.error != 0) {
-				info.message("ldb search(3) failed: " + res3.errstr + "\n");
-				continue;
-			}
-			if (res3.msgs.length != 0) {
-				info.message("Failed to delete all records under " + basedn + ", " + res3.msgs.length + " records remaining\n");
-			}
-		}
-	}
-}
-
-function open_ldb(info, dbname, erase)
-{
-	var ldb = ldb_init();
-	ldb.session_info = info.session_info;
-	ldb.credentials = info.credentials;
-	ldb.filename = dbname;
-
-	var connect_ok = ldb.connect(dbname);
-	if (!connect_ok) {
-		var lp = loadparm_init();
-		sys.unlink(sprintf("%s/%s", lp.get("private dir"), dbname));
-		connect_ok = ldb.connect(dbname);
-		assert(connect_ok);
-	}
-
-	ldb.transaction_start();
-
-	if (erase) {
-		ldb_erase(info, ldb);	
-	}
-	return ldb;
-}
-
-
-/*
-  setup a ldb in the private dir
- */
-function setup_add_ldif(ldif, info, ldb, failok)
-{
-	var lp = loadparm_init();
-	var src = lp.get("setup directory") + "/" + ldif;
-
-	var data = sys.file_load(src);
-	data = substitute_var(data, info.subobj);
-
-	var add_res = ldb.add(data);
-	if (add_res.error != 0) {
-		info.message("ldb load failed: " + add_res.errstr + "\n");
-		if (!failok) {
-			assert(add_res.error == 0);
-	        }
-	}
-	return (add_res.error == 0);
-}
-
-function setup_modify_ldif(ldif, info, ldb, failok)
-{
-	var lp = loadparm_init();
-	var src = lp.get("setup directory") + "/" + ldif;
-
-	var data = sys.file_load(src);
-	data = substitute_var(data, info.subobj);
-
-	var mod_res = ldb.modify(data);
-	if (mod_res.error != 0) {
-		info.message("ldb load failed: " + mod_res.errstr + "\n");
-		if (!failok) {
-			assert(mod_res.error == 0);
-	        }
-	}
-	return (mod_res.error == 0);
-}
-
-
-function setup_ldb(ldif, info, dbname) 
-{
-	var erase = true;
-	var failok = false;
-
-	if (arguments.length >= 4) {
-	        erase = arguments[3];
-        }
-	if (arguments.length == 5) {
-	        failok = arguments[4];
-        }
-	var ldb = open_ldb(info, dbname, erase);
-	if (setup_add_ldif(ldif, info, ldb, failok)) {
-		var commit_ok = ldb.transaction_commit();
-		if (!commit_ok) {
-			info.message("ldb commit failed: " + ldb.errstring() + "\n");
-			assert(commit_ok);
-		}
-	}
-}
-
-/*
-  setup a ldb in the private dir
- */
-function setup_ldb_modify(ldif, info, ldb)
-{
-	var lp = loadparm_init();
-
-	var src = lp.get("setup directory") + "/" + ldif;
-
-	var data = sys.file_load(src);
-	data = substitute_var(data, info.subobj);
-
-	var mod_res = ldb.modify(data);
-	if (mod_res.error != 0) {
-		info.message("ldb load failed: " + mod_res.errstr + "\n");
-		return (mod_res.error == 0);
-	}
-	return (mod_res.error == 0);
-}
-
-/*
-  setup a file in the private dir
- */
-function setup_file(template, message, fname, subobj)
-{
-	var lp = loadparm_init();
-	var f = fname;
-	var src = lp.get("setup directory") + "/" + template;
-
-	if (! sys.stat(src)) {
-		message("Template file not found: %s\n",src);
-		assert(0);
-	}
-
-	sys.unlink(f);
-
-	var data = sys.file_load(src);
-	data = substitute_var(data, subobj);
-
-	ok = sys.file_save(f, data);
-	if (!ok) {
-		message("failed to create file: " + f + "\n");
-		assert(ok);
-	}
-}
-
-function provision_default_paths(subobj)
-{
-	/* subobj.DNSDOMAIN isn't available at this point */
-	var dnsdomain = strlower(subobj.REALM);
-	var lp = loadparm_init();
-	var paths = new Object();
-	paths.smbconf = lp.filename()
-	paths.shareconf = lp.get("private dir") + "/" + "share.ldb";
-	paths.samdb = lp.get("sam database");
-	paths.idmapdb = lp.get("idmap database");
-	paths.secrets = lp.get("secrets database");
-	paths.templates = lp.get("private dir") + "/" + "templates.ldb";
-	paths.keytab = "secrets.keytab";
-	paths.dns_keytab = "dns.keytab";
-	paths.dns_keytab_abs = lp.get("private dir") + "/" + paths.dns_keytab;
-	paths.dns = lp.get("private dir") + "/" + dnsdomain + ".zone";
-	paths.named_conf = lp.get("private dir") + "/named.conf";
-	paths.winsdb = "wins.ldb";
-	paths.ldapdir = lp.get("private dir") + "/ldap";
-
-	paths.s4_ldapi_socket = lp.get("private dir") + "/ldapi";
-	paths.phpldapadminconfig = lp.get("private dir") + "/phpldapadmin-config.php";
-
-	paths.sysvol = lp.get("sysvol", "path");
-
-	if (paths.sysvol == undefined) {
-		paths.sysvol = lp.get("lock dir") + "/sysvol";
-	}
-	
-	paths.netlogon = lp.get("netlogon", "path");
-	
-	if (paths.netlogon == undefined) {
-		paths.netlogon = paths.sysvol + "/" + dnsdomain + "/scripts";
-	}
-
-	return paths;
-}
-
-
-/*
-  setup reasonable name mappings for sam names to unix names
-*/
-function setup_name_mappings(info, ldb)
-{
-	var lp = loadparm_init();
-	var attrs = new Array("objectSid");
-	var subobj = info.subobj;
-
-	res = ldb.search("objectSid=*", subobj.DOMAINDN, ldb.SCOPE_BASE, attrs);
-	assert(res.error == 0);
-	assert(res.msgs.length == 1 && res.msgs[0].objectSid != undefined);
-	var sid = res.msgs[0].objectSid;
-
-	/* add some foreign sids if they are not present already */
-	add_foreign(ldb, subobj, "S-1-5-7",  "Anonymous");
-	add_foreign(ldb, subobj, "S-1-1-0",  "World");
-	add_foreign(ldb, subobj, "S-1-5-2",  "Network");
-	add_foreign(ldb, subobj, "S-1-5-18", "System");
-	add_foreign(ldb, subobj, "S-1-5-11", "Authenticated Users");
-
-	/* some well known sids */
-	setup_name_mapping(info, ldb, "S-1-5-7",  subobj.NOBODY);
-	setup_name_mapping(info, ldb, "S-1-1-0",  subobj.NOGROUP);
-	setup_name_mapping(info, ldb, "S-1-5-2",  subobj.NOGROUP);
-	setup_name_mapping(info, ldb, "S-1-5-18", subobj.ROOT);
-	setup_name_mapping(info, ldb, "S-1-5-11", subobj.USERS);
-	setup_name_mapping(info, ldb, "S-1-5-32-544", subobj.WHEEL);
-	setup_name_mapping(info, ldb, "S-1-5-32-545", subobj.USERS);
-	setup_name_mapping(info, ldb, "S-1-5-32-546", subobj.NOGROUP);
-	setup_name_mapping(info, ldb, "S-1-5-32-551", subobj.BACKUP);
-
-	/* and some well known domain rids */
-	setup_name_mapping(info, ldb, sid + "-500", subobj.ROOT);
-	setup_name_mapping(info, ldb, sid + "-518", subobj.WHEEL);
-	setup_name_mapping(info, ldb, sid + "-519", subobj.WHEEL);
-	setup_name_mapping(info, ldb, sid + "-512", subobj.WHEEL);
-	setup_name_mapping(info, ldb, sid + "-513", subobj.USERS);
-	setup_name_mapping(info, ldb, sid + "-520", subobj.WHEEL);
-
-	return true;
-}
-
-function provision_fix_subobj(subobj, paths)
-{
-	var ldb = ldb_init();
-	
-	subobj.REALM       = strupper(subobj.REALM);
-	subobj.HOSTNAME    = strlower(subobj.HOSTNAME);
-	subobj.DOMAIN      = strupper(subobj.DOMAIN);
-	subobj.NETBIOSNAME = strupper(subobj.HOSTNAME);
-	subobj.DNSDOMAIN    = strlower(subobj.REALM);
-	subobj.DNSNAME      = sprintf("%s.%s", 
-				      strlower(subobj.HOSTNAME), 
-				      subobj.DNSDOMAIN);
-	var rdn_list = split(".", subobj.DNSDOMAIN);
-	subobj.DOMAINDN     = "DC=" + join(",DC=", rdn_list);
-	subobj.ROOTDN       = subobj.DOMAINDN;
-	subobj.CONFIGDN     = "CN=Configuration," + subobj.ROOTDN;
-	subobj.SCHEMADN     = "CN=Schema," + subobj.CONFIGDN;
-
-	subobj.MACHINEPASS_B64 = ldb.encode(subobj.MACHINEPASS);
-	subobj.KRBTGTPASS_B64  = ldb.encode(subobj.KRBTGTPASS);
-	subobj.ADMINPASS_B64   = ldb.encode(subobj.ADMINPASS);
-	subobj.DNSPASS_B64     = ldb.encode(subobj.DNSPASS);
-
-	subobj.SAM_LDB		= "tdb://" + paths.samdb;
-	subobj.SECRETS_KEYTAB	= paths.keytab;
-	subobj.DNS_KEYTAB	= paths.dns_keytab;
-	subobj.DNS_KEYTAB_ABS	= paths.dns_keytab_abs;
-
-	subobj.LDAPDIR = paths.ldapdir;
-	var ldap_path_list = split("/", paths.ldapdir);
-	subobj.LDAPI_URI = "ldapi://" + join("%2F", ldap_path_list) + "%2Fldapi";
-
-	var s4ldap_path_list = split("/", paths.s4_ldapi_socket);
-	subobj.S4_LDAPI_URI = "ldapi://" + join("%2F", s4ldap_path_list);
-
-	subobj.LDAPMANAGERDN = "cn=Manager," + subobj.DOMAINDN;
-
-	subobj.NETLOGONPATH = paths.netlogon;
-	subobj.SYSVOLPATH = paths.sysvol;
-
-	if (subobj.DOMAIN_CONF == undefined) {
-		subobj.DOMAIN_CONF = subobj.DOMAIN;
-	}
-	if (subobj.REALM_CONF == undefined) {
-		subobj.REALM_CONF = subobj.REALM;
-	}
-	if (strlower(subobj.SERVERROLE) != strlower("domain controller")) {
-		subobj.REALM = subobj.HOSTNAME;
-		subobj.DOMAIN = subobj.HOSTNAME;
-	}
-
-	return true;
-}
-
-function provision_become_dc(subobj, message, erase, paths, session_info)
-{
-	var lp = loadparm_init();
-	var sys = sys_init();
-	var info = new Object();
-
-	var ok = provision_fix_subobj(subobj, paths);
-	assert(ok);
-
-	if (subobj.BACKEND_MOD == undefined) {
-		subobj.BACKEND_MOD = "repl_meta_data";
-	}
-
-	info.subobj = subobj;
-	info.message = message;
-	info.session_info = session_info;
-
-	message("Setting up templates into " + paths.templates + "\n");
-	setup_ldb("provision_templates.ldif", info, paths.templates);
-
-	/* Also wipes the database */
-	message("Setting up " + paths.samdb + " partitions\n");
-	setup_ldb("provision_partitions.ldif", info, paths.samdb);
-
-	var samdb = open_ldb(info, paths.samdb, false);
-
-	message("Setting up " + paths.samdb + " attributes\n");
-	setup_add_ldif("provision_init.ldif", info, samdb, false);
-
-	message("Setting up " + paths.samdb + " rootDSE\n");
-	setup_add_ldif("provision_rootdse_add.ldif", info, samdb, false);
-
-	if (erase) {
-		message("Erasing data from partitions\n");
-		ldb_erase_partitions(info, samdb, undefined);
-	}
-
-	message("Setting up " + paths.samdb + " indexes\n");
-	setup_add_ldif("provision_index.ldif", info, samdb, false);
-
-	ok = samdb.transaction_commit();
-	assert(ok);
-
-	message("Setting up " + paths.secrets + "\n");
-	setup_ldb("secrets_init.ldif", info, paths.secrets);
-
-	setup_ldb("secrets.ldif", info, paths.secrets, false);
-
-	setup_ldb("secrets_dc.ldif", info, paths.secrets, false);
-
-	return true;
-}
-
-function load_schema(subobj, message, samdb)
-{
-	var lp = loadparm_init();
-	var src = lp.get("setup directory") + "/" + "schema.ldif";
-
-	if (! sys.stat(src)) {
-		message("Template file not found: %s\n",src);
-		assert(0);
-	}
-
-	var schema_data = sys.file_load(src);
-
-	src = lp.get("setup directory") + "/" + "schema_samba4.ldif";
-
-	if (! sys.stat(src)) {
-		message("Template file not found: %s\n",src);
-		assert(0);
-	}
-
-	schema_data = schema_data + sys.file_load(src);
-
-	schema_data = substitute_var(schema_data, subobj);
-
-	src = lp.get("setup directory") + "/" + "provision_schema_basedn_modify.ldif";
-
-	if (! sys.stat(src)) {
-		message("Template file not found: %s\n",src);
-		assert(0);
-	}
-
-	var head_data = sys.file_load(src);
-	head_data = substitute_var(head_data, subobj);
-
-	var ok = samdb.attach_dsdb_schema_from_ldif(head_data, schema_data);
-	return ok;
-}
-
-
-/*
-  provision samba4 - caution, this wipes all existing data!
-*/
-function provision(subobj, message, blank, paths, session_info, credentials, ldapbackend)
-{
-	var lp = loadparm_init();
-	var sys = sys_init();
-	var info = new Object();
-	random_init(local);
-
-	var ok = provision_fix_subobj(subobj, paths);
-	assert(ok);
-
-	if (strlower(subobj.SERVERROLE) == strlower("domain controller")) {
-		if (subobj.BACKEND_MOD == undefined) {
-			subobj.BACKEND_MOD = "repl_meta_data";
-		}
-	} else {
-		if (subobj.BACKEND_MOD == undefined) {
-			subobj.BACKEND_MOD = "objectguid";
-		}
-	}
-
-	if (subobj.DOMAINGUID != undefined) {
-		subobj.DOMAINGUID_MOD = sprintf("replace: objectGUID\nobjectGUID: %s\n-", subobj.DOMAINGUID);
-	} else {
-		subobj.DOMAINGUID_MOD = "";
-	}
-
-	if (subobj.HOSTGUID != undefined) {
-		subobj.HOSTGUID_ADD = sprintf("objectGUID: %s", subobj.HOSTGUID);
-	} else {
-		subobj.HOSTGUID_ADD = "";
-	}
-
-	info.subobj = subobj;
-	info.message = message;
-	info.credentials = credentials;
-	info.session_info = session_info;
-
-	/* only install a new smb.conf if there isn't one there already */
-	var st = sys.stat(paths.smbconf);
-	if (st == undefined) {
-		var smbconfsuffix;
-		if (strlower(subobj.SERVERROLE) == strlower("domain controller")) {
-			smbconfsuffix = "dc";
-		} else if (strlower(subobj.SERVERROLE) == strlower("member server")) {
-			smbconfsuffix = "member";
-		} else {
-			smbconfsuffix = subobj.SERVERROLE;
-		}
-		message("Setting up " + paths.smbconf +"\n");
-		setup_file("provision.smb.conf." + smbconfsuffix, info.message, paths.smbconf, subobj);
-		lp.reload();
-	}
-	/* only install a new shares config db if there is none */
-	st = sys.stat(paths.shareconf);
-	if (st == undefined) {
-		message("Setting up share.ldb\n");
-		setup_ldb("share.ldif", info, paths.shareconf);
-	}
-
-	message("Setting up " + paths.secrets + "\n");
-	setup_ldb("secrets_init.ldif", info, paths.secrets);
-	setup_ldb("secrets.ldif", info, paths.secrets, false);
-
-	message("Setting up the registry\n");
-	var reg = reg_open();
-	reg.apply_patchfile(lp.get("setup directory") + "/provision.reg")
-
-	message("Setting up templates into " + paths.templates + "\n");
-	setup_ldb("provision_templates.ldif", info, paths.templates);
-
-	message("Setting up " + paths.idmapdb +"\n");
-	setup_ldb("idmap_init.ldif", info, paths.idmapdb);
-
-	message("Setting up sam.ldb partitions\n");
-	/* Also wipes the database */
-	setup_ldb("provision_partitions.ldif", info, paths.samdb);
-
-	var samdb = open_ldb(info, paths.samdb, false);
-
-	message("Setting up sam.ldb attributes\n");
-	setup_add_ldif("provision_init.ldif", info, samdb, false);
-
-	message("Setting up sam.ldb rootDSE\n");
-	setup_add_ldif("provision_rootdse_add.ldif", info, samdb, false);
-
-	message("Erasing data from partitions\n");
-	ldb_erase_partitions(info, samdb, ldapbackend);
-	
-	// (hack) Reload, now we have the partitions and rootdse loaded.  
-	var commit_ok = samdb.transaction_commit();
-	if (!commit_ok) {
-		info.message("samdb commit failed: " + samdb.errstring() + "\n");
-		assert(commit_ok);
-	}
-	samdb.close();
-
-	message("Pre-loading the Samba4 and AD schema\n");
-	
-	samdb = open_ldb(info, paths.samdb, false);
-
-	samdb.set_domain_sid(subobj.DOMAINSID);
-
-	if (strlower(subobj.SERVERROLE) == strlower("domain controller")) {
-		if (subobj.INVOCATIONID == undefined) {
-			subobj.INVOCATIONID = randguid();
-		}
-		samdb.set_ntds_invocationId(subobj.INVOCATIONID);
-		if (subobj.BACKEND_MOD == undefined) {
-			subobj.BACKEND_MOD = "repl_meta_data";
-		}
-	} else {
-		if (subobj.BACKEND_MOD == undefined) {
-			subobj.BACKEND_MOD = "objectguid";
-		}
-	}
-
-	var load_schema_ok = load_schema(subobj, message, samdb);
-	assert(load_schema_ok.is_ok);
-
-	message("Adding DomainDN: " + subobj.DOMAINDN + " (permitted to fail)\n");
-	var add_ok = setup_add_ldif("provision_basedn.ldif", info, samdb, true);
-	message("Modifying DomainDN: " + subobj.DOMAINDN + "\n");
-	var modify_basedn_ok = setup_ldb_modify("provision_basedn_modify.ldif", info, samdb);
-	if (!modify_basedn_ok) {
-		if (!add_ok) {
-			message("%s", "Failed to both add and modify " + subobj.DOMAINDN + " in target " + subobj.DOMAINDN_LDB + ": " + samdb.errstring() + "\n");
-			message("Perhaps you need to run the provision script with the --ldap-base-dn option, and add this record to the backend manually\n"); 
-		};
-		assert(modify_basedn_ok);
-	};
-
-	message("Adding configuration container (permitted to fail)\n");
-	var add_config_ok = setup_add_ldif("provision_configuration_basedn.ldif", info, samdb, true);
-	message("Modifying configuration container\n");
-	var modify_config_ok = setup_ldb_modify("provision_configuration_basedn_modify.ldif", info, samdb);
-	if (!modify_config_ok) {
-		if (!add_config_ok) {
-			message("%s", "Failed to both add and modify " + subobj.CONFIGDN + " in target " + subobj.CONFIGDN_LDB + ": " + samdb.errstring() + "\n");
-			message("Perhaps you need to run the provision script with the --ldap-base-dn option, and add this record to the backend manually\n"); 
-		}
-		assert(modify_config_ok);
-	}
-
-	message("Adding schema container (permitted to fail)\n");
-	var add_schema_ok = setup_add_ldif("provision_schema_basedn.ldif", info, samdb, true);
-	message("Modifying schema container\n");
-	var modify_schema_ok = setup_ldb_modify("provision_schema_basedn_modify.ldif", info, samdb);
-	if (!modify_schema_ok) {
-		if (!add_schema_ok) {
-			message("%s", "Failed to both add and modify " + subobj.SCHEMADN + " in target " + subobj.SCHEMADN_LDB + ": " + samdb.errstring() + "\n");
-			message("Perhaps you need to run the provision script with the --ldap-base-dn option, and add this record to the backend manually\n"); 
-		}
-		message("Failed to modify the schema container: " + samdb.errstring() + "\n");
-		assert(modify_schema_ok);
-	}
-
-	message("Setting up sam.ldb Samba4 schema\n");
-	setup_add_ldif("schema_samba4.ldif", info, samdb, false);
-	message("Setting up sam.ldb AD schema\n");
-	setup_add_ldif("schema.ldif", info, samdb, false);
-
-	message("Setting up sam.ldb configuration data\n");
-	setup_add_ldif("provision_configuration.ldif", info, samdb, false);
-
-	message("Setting up display specifiers\n");
-	setup_add_ldif("display_specifiers.ldif", info, samdb, false);
-
-	message("Adding users container (permitted to fail)\n");
-	var add_users_ok = setup_add_ldif("provision_users_add.ldif", info, samdb, true);
-	message("Modifying users container\n");
-	var modify_users_ok = setup_ldb_modify("provision_users_modify.ldif", info, samdb);
-	if (!modify_users_ok) {
-		if (!add_users_ok) {
-			message("Failed to both add and modify the users container\n");
-		}
-		assert(modify_users_ok);
-	}
-	message("Adding computers container (permitted to fail)\n");
-	var add_computers_ok = setup_add_ldif("provision_computers_add.ldif", info, samdb, true);
-	message("Modifying computers container\n");
-	var modify_computers_ok = setup_ldb_modify("provision_computers_modify.ldif", info, samdb);
-	if (!modify_computers_ok) {
-		if (!add_computers_ok) {
-			message("Failed to both add and modify the computers container\n");
-		}
-		assert(modify_computers_ok);
-	}
-
-	message("Setting up sam.ldb data\n");
-	setup_add_ldif("provision.ldif", info, samdb, false);
-
-	if (blank != false) {
-		message("Setting up sam.ldb index\n");
-		setup_add_ldif("provision_index.ldif", info, samdb, false);
-
-		message("Setting up sam.ldb rootDSE marking as syncronized\n");
-		setup_modify_ldif("provision_rootdse_modify.ldif", info, samdb, false);
-
-		var commit_ok = samdb.transaction_commit();
-		if (!commit_ok) {
-			info.message("ldb commit failed: " + samdb.errstring() + "\n");
-			assert(commit_ok);
-		}
-		return true;
-	}
-
-//	message("Activate schema module");
-//	setup_modify_ldif("schema_activation.ldif", info, samdb, false);
-//
-//	// (hack) Reload, now we have the schema loaded.  
-//	var commit_ok = samdb.transaction_commit();
-//	if (!commit_ok) {
-//		info.message("samdb commit failed: " + samdb.errstring() + "\n");
-//		assert(commit_ok);
-//	}
-//	samdb.close();
-//
-//	samdb = open_ldb(info, paths.samdb, false);
-//
-	message("Setting up sam.ldb users and groups\n");
-	setup_add_ldif("provision_users.ldif", info, samdb, false);
-
-	if (strlower(subobj.SERVERROLE) == strlower("domain controller")) {
-		message("Setting up self join\n");
-		setup_add_ldif("provision_self_join.ldif", info, samdb, false);
-		setup_add_ldif("provision_group_policy.ldif", info, samdb, false);
-
-		sys.mkdir(paths.sysvol, 0755);
-		sys.mkdir(paths.sysvol + "/"+ subobj.DNSDOMAIN, 0755);
-		sys.mkdir(paths.sysvol + "/"+ subobj.DNSDOMAIN + "/Policies", 0755);
-		sys.mkdir(paths.sysvol + "/"+ subobj.DNSDOMAIN + "/Policies/{" + subobj.POLICYGUID + "}", 0755);
-		sys.mkdir(paths.sysvol + "/"+ subobj.DNSDOMAIN + "/Policies/{" + subobj.POLICYGUID + "}/Machine", 0755);
-		sys.mkdir(paths.sysvol + "/"+ subobj.DNSDOMAIN + "/Policies/{" + subobj.POLICYGUID + "}/User", 0755);
-
-		sys.mkdir(paths.netlogon, 0755);
-
-		setup_ldb("secrets_dc.ldif", info, paths.secrets, false);
-
-	}
-
-	if (setup_name_mappings(info, samdb) == false) {
-		return false;
-	}
-
-	message("Setting up sam.ldb index\n");
-	setup_add_ldif("provision_index.ldif", info, samdb, false);
-
-	message("Setting up sam.ldb rootDSE marking as syncronized\n");
-	setup_modify_ldif("provision_rootdse_modify.ldif", info, samdb, false);
-
-	var commit_ok = samdb.transaction_commit();
-	if (!commit_ok) {
-		info.message("samdb commit failed: " + samdb.errstring() + "\n");
-		assert(commit_ok);
-	}
-
-	message("Setting up phpLDAPadmin configuration\n");
-	setup_file("phpldapadmin-config.php", info.message, paths.phpldapadminconfig, subobj);
-	message("Please install the phpLDAPadmin configuration located at " + paths.phpldapadminconfig + " into /etc/phpldapadmin/config.php\n");
-
-	return true;
-}
-
-/*
-  provision just the schema into a temporary ldb, so we can run ad2oLschema on it
-*/
-function provision_schema(subobj, message, tmp_schema_path, paths)
-{
-	var lp = loadparm_init();
-	var sys = sys_init();
-	var info = new Object();
-
-	var ok = provision_fix_subobj(subobj, paths);
-	assert(ok);
-
-	info.subobj = subobj;
-	info.message = message;
-
-	message("Setting up sam.ldb partitions\n");
-
-	/* This will erase anything in the tmp db */
-	var samdb = open_ldb(info, tmp_schema_path, true);
-
-	message("Setting up sam.ldb attributes\n");
-	setup_add_ldif("provision_init.ldif", info, samdb, false);
-
-	message("Setting up sam.ldb rootDSE\n");
-	setup_add_ldif("provision_rootdse_add.ldif", info, samdb, false);
-
-	message("Adding schema container (permitted to fail)\n");
-	var add_ok = setup_add_ldif("provision_schema_basedn.ldif", info, samdb, true);
-	message("Modifying schema container\n");
-	var modify_ok = setup_ldb_modify("provision_schema_basedn_modify.ldif", info, samdb);
-	if (!modify_ok) {
-		if (!add_ok) {
-			message("Failed to both add and modify schema dn: " + samdb.errstring() + "\n");
-			message("Perhaps you need to run the provision script with the --ldap-base-dn option, and add this record to the backend manually\n"); 
-			assert(modify_ok);
-		}
-		message("Failed to modify the schema container: " + samdb.errstring() + "\n");
-		assert(modify_ok);
-	}
-
-	message("Setting up sam.ldb Samba4 schema\n");
-	setup_add_ldif("schema_samba4.ldif", info, samdb, false);
-	message("Setting up sam.ldb AD schema\n");
-	setup_add_ldif("schema.ldif", info, samdb, false);
-
-	var commit_ok = samdb.transaction_commit();
-	if (!commit_ok) {
-		info.message("samdb commit failed: " + samdb.errstring() + "\n");
-		assert(commit_ok);
-	}
-	samdb.close();
-}
-
-/* Write out a DNS zone file, from the info in the current database */
-function provision_dns(subobj, message, paths, session_info, credentials)
-{
-	var lp = loadparm_init();
-	if (strlower(subobj.SERVERROLE) != strlower("domain controller")) {
-		message("No DNS zone required for role %s\n", subobj.SERVERROLE);
-		return;
-	}
-	message("Setting up DNS zone: " + subobj.DNSDOMAIN + " \n");
-	var ldb = ldb_init();
-	ldb.session_info = session_info;
-	ldb.credentials = credentials;
-
-	/* connect to the sam */
-	var ok = ldb.connect(paths.samdb);
-	assert(ok);
-
-	/* These values may have changed, due to an incoming SamSync,
-           or may not have been specified, so fetch them from the database */
-
-	var attrs = new Array("objectGUID");
-	res = ldb.search("objectGUID=*", subobj.DOMAINDN, ldb.SCOPE_BASE, attrs);
-	assert(res.error == 0);
-	assert(res.msgs.length == 1);
-	assert(res.msgs[0].objectGUID != undefined);
-	subobj.DOMAINGUID = res.msgs[0].objectGUID;
-
-	subobj.HOSTGUID = searchone(ldb, subobj.DOMAINDN, "(&(objectClass=computer)(cn=" + subobj.NETBIOSNAME + "))", "objectGUID");
-	assert(subobj.HOSTGUID != undefined);
-
-	setup_file("provision.zone", 
-		   message, paths.dns, 
-		   subobj);
-
-	setup_file("named.conf", 
-		   message, paths.named_conf, 
-		   subobj);
-
-	message("Please install the zone located in " + paths.dns + " into your DNS server.  A sample BIND configuration snippit is at " + paths.named_conf + "\n");
-}
-
-
-/*
-  guess reasonably default options for provisioning
-*/
-function provision_guess()
-{
-	var subobj = new Object();
-	var nss = nss_init();
-	var lp = loadparm_init();
-	var rdn_list;
-	random_init(local);
-
-	subobj.SERVERROLE   = strlower(lp.get("server role"));
-	subobj.REALM        = strupper(lp.get("realm"));
-	subobj.DOMAIN       = lp.get("workgroup");
-	subobj.HOSTNAME     = hostname();
-
-	assert(subobj.REALM);
-	assert(subobj.DOMAIN);
-	assert(subobj.HOSTNAME);
-	
-	subobj.VERSION      = version();
-	subobj.HOSTIP       = hostip();
-	subobj.DOMAINSID    = randsid();
-	subobj.POLICYGUID   = randguid();
-	subobj.KRBTGTPASS   = randpass(12);
-	subobj.MACHINEPASS  = randpass(12);
-	subobj.DNSPASS  = randpass(12);
-	subobj.ADMINPASS    = randpass(12);
-	subobj.LDAPMANAGERPASS     = randpass(12);
-	subobj.DEFAULTSITE  = "Default-First-Site-Name";
-	subobj.DATESTRING   = datestring;
-	subobj.ROOT         = findnss(nss.getpwnam, "root");
-	subobj.NOBODY       = findnss(nss.getpwnam, "nobody");
-	subobj.NOGROUP      = findnss(nss.getgrnam, "nogroup", "nobody");
-	subobj.WHEEL        = findnss(nss.getgrnam, "wheel", "root", "staff", "adm");
-	subobj.BACKUP       = findnss(nss.getgrnam, "backup", "wheel", "root", "staff");
-	subobj.USERS        = findnss(nss.getgrnam, "users", "guest", "other", "unknown", "usr");
-
-	//Add modules to the list to activate them by default
-	//beware often order is important
-	//
-	// Some Known ordering constraints:
-	// - rootdse must be first, as it makes redirects from "" -> cn=rootdse
-	// - objectclass must be before password_hash, because password_hash checks
-	//   that the objectclass is of type person (filled in by the objectclass 
-	//   module when expanding the objectclass list)
-	// - partition must be last
-	// - each partition has its own module list then
-	var modules_list     = new Array("rootdse",
-					 "paged_results",
-					 "ranged_results",
-					 "anr",
-					 "server_sort",
-					 "extended_dn",
-					 "asq",
-					 "samldb",
-					 "rdn_name",
-					 "objectclass",
-					 "kludge_acl",
-					 "operational");
-	var tdb_modules_list = new Array("subtree_rename",
-					 "subtree_delete",
-					 "linked_attributes");
-	var modules_list2    = new Array("show_deleted",
-					 "partition");
-	subobj.MODULES_LIST = join(",", modules_list);
-	subobj.TDB_MODULES_LIST = "," + join(",", tdb_modules_list);
-	subobj.MODULES_LIST2 = join(",", modules_list2);
-	subobj.DOMAINDN_LDB = "users.ldb";
-	subobj.CONFIGDN_LDB = "configuration.ldb";
-	subobj.SCHEMADN_LDB = "schema.ldb";
-	subobj.DOMAINDN_MOD = "pdc_fsmo,password_hash,instancetype";
-	subobj.CONFIGDN_MOD = "naming_fsmo,instancetype";
-	subobj.SCHEMADN_MOD = "schema_fsmo,instancetype";
-
-	subobj.ACI		= "# no aci for local ldb";
-
-	return subobj;
-}
-
-/*
-  search for one attribute as a string
- */
-function searchone(ldb, basedn, expression, attribute)
-{
-	var attrs = new Array(attribute);
-	res = ldb.search(expression, basedn, ldb.SCOPE_SUBTREE, attrs);
-	if (res.error != 0 ||
-	    res.msgs.length != 1 ||
-	    res.msgs[0][attribute] == undefined) {
-		return undefined;
-	}
-	return res.msgs[0][attribute];
-}
-
-/*
-  modify an account to remove the 
-*/
-function enable_account(ldb, user_dn)
-{
-	var attrs = new Array("userAccountControl");
-	var res = ldb.search(NULL, user_dn, ldb.SCOPE_ONELEVEL, attrs);
-	assert(res.error == 0);
-	assert(res.msgs.length == 1);
-	var userAccountControl = res.msgs[0].userAccountControl;
-	userAccountControl = userAccountControl - 2; /* remove disabled bit */
-	var mod = sprintf("
-dn: %s
-changetype: modify
-replace: userAccountControl
-userAccountControl: %u
-", 
-			  user_dn, userAccountControl);
-	var ok = ldb.modify(mod);
-	return (ok.error == 0);	
-}
-
-
-/*
-  add a new user record
-*/
-function newuser(username, unixname, password, message, session_info, credentials)
-{
-	var lp = loadparm_init();
-	var samdb = lp.get("sam database");
-	var ldb = ldb_init();
-	random_init(local);
-	ldb.session_info = session_info;
-	ldb.credentials = credentials;
-
-	/* connect to the sam */
-	var ok = ldb.connect(samdb);
-	assert(ok);
-
-	ldb.transaction_start();
-
-	/* find the DNs for the domain and the domain users group */
-	var attrs = new Array("defaultNamingContext");
-	res = ldb.search("defaultNamingContext=*", "", ldb.SCOPE_BASE, attrs);
-	assert(res.error == 0);
-	assert(res.msgs.length == 1 && res.msgs[0].defaultNamingContext != undefined);
-	var domain_dn = res.msgs[0].defaultNamingContext;
-	assert(domain_dn != undefined);
-	var dom_users = searchone(ldb, domain_dn, "name=Domain Users", "dn");
-	assert(dom_users != undefined);
-
-	var user_dn = sprintf("CN=%s,CN=Users,%s", username, domain_dn);
-
-
-	/*
-	  the new user record. note the reliance on the samdb module to fill
-	  in a sid, guid etc
-	*/
-	var ldif = sprintf("
-dn: %s
-sAMAccountName: %s
-unixName: %s
-sambaPassword: %s
-objectClass: user
-",
-			   user_dn, username,
-			   unixname, password);
-	/*
-	  add the user to the users group as well
-	*/
-	var modgroup = sprintf("
-dn: %s
-changetype: modify
-add: member
-member: %s
-",
-			       dom_users, user_dn);
-
-
-	/*
-	  now the real work
-	*/
-	message("Adding user %s\n", user_dn);
-	ok = ldb.add(ldif);
-	if (ok.error != 0) {
-		message("Failed to add %s - %s\n", user_dn, ok.errstr);
-		return false;
-	}
-
-	message("Modifying group %s\n", dom_users);
-	ok = ldb.modify(modgroup);
-	if (ok.error != 0) {
-		message("Failed to modify %s - %s\n", dom_users, ok.errstr);
-		return false;
-	}
-
-	/*
-	  modify the userAccountControl to remove the disabled bit
-	*/
-	ok = enable_account(ldb, user_dn);
-	if (ok) {
-		ldb.transaction_commit();
-	}
-	return ok;
-}
-
-// Check whether a name is valid as a NetBIOS name. 
-// FIXME: There are probably more constraints here. 
-// crh has a paragraph on this in his book (1.4.1.1)
-function valid_netbios_name(name)
-{
-	if (strlen(name) > 15) return false;
-	return true;
-}
-
-function provision_validate(subobj, message)
-{
-	var lp = loadparm_init();
-
-	if (!valid_netbios_name(subobj.DOMAIN)) {
-		message("Invalid NetBIOS name for domain\n");
-		return false;
-	}
-
-	if (!valid_netbios_name(subobj.NETBIOSNAME)) {
-		message("Invalid NetBIOS name for host\n");
-		return false;
-	}
-
-
-	if (strupper(lp.get("workgroup")) != strupper(subobj.DOMAIN_CONF)) {
-		message("workgroup '%s' in smb.conf must match chosen domain '%s'\n",
-			lp.get("workgroup"), subobj.DOMAIN_CONF);
-		return false;
-	}
-
-	if (strupper(lp.get("realm")) != strupper(subobj.REALM_CONF)) {
-		message("realm '%s' in smb.conf must match chosen realm '%s'\n",
-			lp.get("realm"), subobj.REALM_CONF);
-		return false;
-	}
-
-	if (strlower(lp.get("server role")) != strlower(subobj.SERVERROLE)) {
-		message("server role '%s' in smb.conf must match chosen role '%s'\n",
-			lp.get("server role"), subobj.SERVERROLE);
-		return false;
-	}
-
-	return true;
-}
-
-function join_domain(domain, netbios_name, join_type, creds, message) 
-{
-	var ctx = NetContext(creds);
-	var joindom = new Object();
-	joindom.domain = domain;
-	joindom.join_type = join_type;
-	joindom.netbios_name = netbios_name;
-	if (!ctx.JoinDomain(joindom)) {
-		message("Domain Join failed: " + joindom.error_string);
-		return false;
-	}
-	return true;
-}
-
-/* Vampire a remote domain.  Session info and credentials are required for for
- * access to our local database (might be remote ldap)
- */ 
-
-function vampire(domain, session_info, credentials, message) {
-	var ctx = NetContext(credentials);
-	var vampire_ctx = new Object();
-	var machine_creds = credentials_init();
-	machine_creds.set_domain(form.DOMAIN);
-	if (!machine_creds.set_machine_account()) {
-		message("Failed to access domain join information!");
-		return false;
-	}
-	vampire_ctx.machine_creds = machine_creds;
-	vampire_ctx.session_info = session_info;
-	if (!ctx.SamSyncLdb(vampire_ctx)) {
-		message("Migration of remote domain to Samba failed: " + vampire_ctx.error_string);
-		return false;
-	}
-
-	return true;
-}
-
-return 0;
-- 
cgit 


From d648c5849fba34b5691dcf1867ecd8f80fe35a6d Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Fri, 16 May 2008 16:30:22 +0200
Subject: Install python modules by default. (This used to be commit
 4c098e4c9f071592e134c979388891f5bf16452d)

---
 source4/scripting/python/config.mk | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/config.mk b/source4/scripting/python/config.mk
index a0ae256d9b..83b1b1eefb 100644
--- a/source4/scripting/python/config.mk
+++ b/source4/scripting/python/config.mk
@@ -24,3 +24,5 @@ python_misc_OBJ_FILES = scripting/python/misc_wrap.o
 _PY_FILES = $(shell find scripting/python -name "*.py")
 
 $(foreach pyfile, $(_PY_FILES),$(eval $(call python_py_module_template,$(patsubst scripting/python/%,%,$(pyfile)),$(pyfile))))
+
+install:: installpython
-- 
cgit 


From 25ea110c3814abcb824adb3619a44622ba8d2936 Mon Sep 17 00:00:00 2001
From: Andrew Kroeger <andrew@sprocks.gotdns.com>
Date: Sat, 17 May 2008 23:24:48 -0500
Subject: provision: Create instructions for enabling DNS GSS-TSIG updates.

Added code to the python provisioning to create the named.conf file that was
previously generated by the EJS provisioning.

Updated the named.conf template to provide the additional details necessary
to get things working.
(This used to be commit 0b7a6bfcba1b906dc4d461882b4c3fe3c91c44e0)
---
 source4/scripting/python/samba/provision.py | 32 ++++++++++++++++++++++-------
 1 file changed, 25 insertions(+), 7 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index ad8eb8bffd..4818a79f00 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -236,6 +236,7 @@ def provision_paths_from_lp(lp, dnsdomain):
     paths.secrets = os.path.join(paths.private_dir, lp.get("secrets database") or "secrets.ldb")
     paths.templates = os.path.join(paths.private_dir, "templates.ldb")
     paths.dns = os.path.join(paths.private_dir, dnsdomain + ".zone")
+    paths.namedconf = os.path.join(paths.private_dir, "named.conf")
     paths.winsdb = os.path.join(paths.private_dir, "wins.ldb")
     paths.s4_ldapi_path = os.path.join(paths.private_dir, "ldapi")
     paths.phpldapadminconfig = os.path.join(paths.private_dir, 
@@ -1059,12 +1060,14 @@ def provision(setup_dir, message, session_info,
                                        scope=SCOPE_SUBTREE)
             assert isinstance(hostguid, str)
             
-            create_zone_file(paths.dns, setup_path, samdb, 
+            create_zone_file(paths.dns, paths.namedconf, setup_path, samdb, 
                              hostname=names.hostname, hostip=hostip,
                              hostip6=hostip6, dnsdomain=names.dnsdomain,
                              domaindn=names.domaindn, dnspass=dnspass, realm=names.realm, 
-                             domainguid=domainguid, hostguid=hostguid)
+                             domainguid=domainguid, hostguid=hostguid,
+                             private_dir=paths.private_dir, keytab_name=paths.dns_keytab)
             message("Please install the zone located in %s into your DNS server" % paths.dns)
+            message("See %s if you want to use secure GSS-TSIG updates" % paths.namedconf)
             
     create_phpldapadmin_config(paths.phpldapadminconfig, setup_path, 
                                ldapi_url)
@@ -1281,12 +1284,18 @@ def create_phpldapadmin_config(path, setup_path, ldapi_uri):
             {"S4_LDAPI_URI": ldapi_uri})
 
 
-def create_zone_file(path, setup_path, samdb, dnsdomain, domaindn, 
-                  hostip, hostip6, hostname, dnspass, realm, domainguid, hostguid):
+def create_zone_file(path_zone, path_conf, setup_path, samdb, dnsdomain, domaindn, 
+                  hostip, hostip6, hostname, dnspass, realm, domainguid, hostguid,
+                  private_dir, keytab_name):
     """Write out a DNS zone file, from the info in the current database.
+
+    Also writes a file with stubs appropriate for a DNS configuration file
+    (including GSS-TSIG configuration), and details as to some of the other
+    configuration changes that may be necessary.
     
-    :param path: Path of the new file.
-    :param setup_path": Setup path function.
+    :param path_zone: Path of the new zone file.
+    :param path_conf: Path of the config stubs file.
+    :param setup_path: Setup path function.
     :param samdb: SamDB object
     :param dnsdomain: DNS Domain name
     :param domaindn: DN of the Domain
@@ -1307,7 +1316,7 @@ def create_zone_file(path, setup_path, samdb, dnsdomain, domaindn,
         hostip6_base_line = "			IN AAAA	" + hostip6
         hostip6_host_line = hostname + "		IN AAAA	" + hostip6
 
-    setup_file(setup_path("provision.zone"), path, {
+    setup_file(setup_path("provision.zone"), path_zone, {
             "DNSPASS_B64": b64encode(dnspass),
             "HOSTNAME": hostname,
             "DNSDOMAIN": dnsdomain,
@@ -1321,6 +1330,15 @@ def create_zone_file(path, setup_path, samdb, dnsdomain, domaindn,
             "HOSTIP6_HOST_LINE": hostip6_host_line,
         })
 
+    setup_file(setup_path("named.conf"), path_conf, {
+            "DNSDOMAIN": dnsdomain,
+            "REALM": realm,
+            "REALM_WC": "*." + ".".join(realm.split(".")[1:]),
+            "HOSTNAME": hostname,
+            "DNS_KEYTAB": keytab_name,
+            "DNS_KEYTAB_ABS": os.path.join(private_dir, keytab_name),
+        })
+
 def load_schema(setup_path, samdb, schemadn, netbiosname, configdn, sitename):
     """Load schema for the SamDB.
     
-- 
cgit 


From 4d2f44163e07995949fcf915019e0a6eb7c00b24 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sun, 18 May 2008 19:07:07 +0200
Subject: Use variables for source path in libnet/ and scripting/python. (This
 used to be commit fb10a81b9484642099ecbe896eabe00a4417bc42)

---
 source4/scripting/python/config.mk | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/config.mk b/source4/scripting/python/config.mk
index 83b1b1eefb..b5b1895793 100644
--- a/source4/scripting/python/config.mk
+++ b/source4/scripting/python/config.mk
@@ -3,26 +3,26 @@ PUBLIC_DEPENDENCIES = EXT_LIB_PYTHON
 PRIVATE_DEPENDENCIES = PYTALLOC
 INIT_FUNCTION_SENTINEL = { NULL, NULL }
 
-LIBPYTHON_OBJ_FILES = $(addprefix scripting/python/, modules.o)
+LIBPYTHON_OBJ_FILES = $(addprefix $(pyscriptdir)/, modules.o)
 
 [SUBSYSTEM::PYTALLOC]
 PUBLIC_DEPENDENCIES = EXT_LIB_PYTHON
 
-PYTALLOC_OBJ_FILES = $(addprefix scripting/python/, pytalloc.o)
+PYTALLOC_OBJ_FILES = $(addprefix $(pyscriptdir)/, pytalloc.o)
 
 [PYTHON::python_uuid]
 PRIVATE_DEPENDENCIES = LIBNDR 
 
-python_uuid_OBJ_FILES = scripting/python/uuidmodule.o
+python_uuid_OBJ_FILES = $(pyscriptdir)/uuidmodule.o
 
 [PYTHON::python_misc]
 PRIVATE_DEPENDENCIES = LIBNDR LIBLDB SAMDB CREDENTIALS
 SWIG_FILE = misc.i
 
-python_misc_OBJ_FILES = scripting/python/misc_wrap.o
+python_misc_OBJ_FILES = $(pyscriptdir)/misc_wrap.o
 
-_PY_FILES = $(shell find scripting/python -name "*.py")
+_PY_FILES = $(shell find $(pyscriptdir) -name "*.py")
 
-$(foreach pyfile, $(_PY_FILES),$(eval $(call python_py_module_template,$(patsubst scripting/python/%,%,$(pyfile)),$(pyfile))))
+$(foreach pyfile, $(_PY_FILES),$(eval $(call python_py_module_template,$(patsubst $(pyscriptdir)/%,%,$(pyfile)),$(pyfile))))
 
 install:: installpython
-- 
cgit 


From 100d3967d3e522027f72bf5071f0b385eea32e74 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sun, 18 May 2008 19:10:37 +0200
Subject: Use src dir. (This used to be commit
 63f2b66f0e1120a516d3dfcd03b38db2e4aaddd0)

---
 source4/scripting/python/config.mk | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/config.mk b/source4/scripting/python/config.mk
index b5b1895793..1fa273e99d 100644
--- a/source4/scripting/python/config.mk
+++ b/source4/scripting/python/config.mk
@@ -3,26 +3,26 @@ PUBLIC_DEPENDENCIES = EXT_LIB_PYTHON
 PRIVATE_DEPENDENCIES = PYTALLOC
 INIT_FUNCTION_SENTINEL = { NULL, NULL }
 
-LIBPYTHON_OBJ_FILES = $(addprefix $(pyscriptdir)/, modules.o)
+LIBPYTHON_OBJ_FILES = $(addprefix $(pyscriptsrcdir)/, modules.o)
 
 [SUBSYSTEM::PYTALLOC]
 PUBLIC_DEPENDENCIES = EXT_LIB_PYTHON
 
-PYTALLOC_OBJ_FILES = $(addprefix $(pyscriptdir)/, pytalloc.o)
+PYTALLOC_OBJ_FILES = $(addprefix $(pyscriptsrcdir)/, pytalloc.o)
 
 [PYTHON::python_uuid]
 PRIVATE_DEPENDENCIES = LIBNDR 
 
-python_uuid_OBJ_FILES = $(pyscriptdir)/uuidmodule.o
+python_uuid_OBJ_FILES = $(pyscriptsrcdir)/uuidmodule.o
 
 [PYTHON::python_misc]
 PRIVATE_DEPENDENCIES = LIBNDR LIBLDB SAMDB CREDENTIALS
 SWIG_FILE = misc.i
 
-python_misc_OBJ_FILES = $(pyscriptdir)/misc_wrap.o
+python_misc_OBJ_FILES = $(pyscriptsrcdir)/misc_wrap.o
 
-_PY_FILES = $(shell find $(pyscriptdir) -name "*.py")
+_PY_FILES = $(shell find $(pyscriptsrcdir) -name "*.py")
 
-$(foreach pyfile, $(_PY_FILES),$(eval $(call python_py_module_template,$(patsubst $(pyscriptdir)/%,%,$(pyfile)),$(pyfile))))
+$(foreach pyfile, $(_PY_FILES),$(eval $(call python_py_module_template,$(patsubst $(pyscriptsrcdir)/%,%,$(pyfile)),$(pyfile))))
 
 install:: installpython
-- 
cgit 


From 6a319288697c9fd6fba10d7363797f9076f993ce Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sun, 18 May 2008 19:56:17 +0200
Subject: Use variables for source directory in a couple more places. (This
 used to be commit 28f4a8bc2c9b4158e74e1284ff9df068388c3b3d)

---
 source4/scripting/ejs/config.mk        | 28 ++++++++++++++--------------
 source4/scripting/ejs/ejsnet/config.mk |  2 +-
 2 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/config.mk b/source4/scripting/ejs/config.mk
index 896b292e23..f4af4ba811 100644
--- a/source4/scripting/ejs/config.mk
+++ b/source4/scripting/ejs/config.mk
@@ -1,13 +1,13 @@
 [SUBSYSTEM::EJSRPC]
 
-EJSRPC_OBJ_FILES = scripting/ejs/ejsrpc.o
+EJSRPC_OBJ_FILES = $(ejsscriptsrcdir)/ejsrpc.o
 
 [MODULE::smbcalls_config]
 OUTPUT_TYPE = MERGED_OBJ
 SUBSYSTEM = smbcalls
 INIT_FUNCTION = smb_setup_ejs_config
 
-smbcalls_config_OBJ_FILES = scripting/ejs/smbcalls_config.o
+smbcalls_config_OBJ_FILES = $(ejsscriptsrcdir)/smbcalls_config.o
 
 [MODULE::smbcalls_ldb]
 OUTPUT_TYPE = MERGED_OBJ
@@ -15,7 +15,7 @@ SUBSYSTEM = smbcalls
 INIT_FUNCTION = smb_setup_ejs_ldb
 PRIVATE_DEPENDENCIES = LIBLDB SAMDB LIBNDR
 
-smbcalls_ldb_OBJ_FILES = scripting/ejs/smbcalls_ldb.o
+smbcalls_ldb_OBJ_FILES = $(ejsscriptsrcdir)/smbcalls_ldb.o
 
 [MODULE::smbcalls_reg]
 SUBSYSTEM = smbcalls
@@ -23,21 +23,21 @@ OUTPUT_TYPE = MERGED_OBJ
 INIT_FUNCTION = smb_setup_ejs_reg
 PRIVATE_DEPENDENCIES = registry SAMDB LIBNDR
 
-smbcalls_reg_OBJ_FILES = scripting/ejs/smbcalls_reg.o
+smbcalls_reg_OBJ_FILES = $(ejsscriptsrcdir)/smbcalls_reg.o
 
 [MODULE::smbcalls_nbt]
 SUBSYSTEM = smbcalls
 OUTPUT_TYPE = MERGED_OBJ
 INIT_FUNCTION = smb_setup_ejs_nbt
 
-smbcalls_nbt_OBJ_FILES = scripting/ejs/smbcalls_nbt.o
+smbcalls_nbt_OBJ_FILES = $(ejsscriptsrcdir)/smbcalls_nbt.o
 
 [MODULE::smbcalls_rand]
 SUBSYSTEM = smbcalls
 OUTPUT_TYPE = MERGED_OBJ
 INIT_FUNCTION = smb_setup_ejs_random
 
-smbcalls_rand_OBJ_FILES = scripting/ejs/smbcalls_rand.o
+smbcalls_rand_OBJ_FILES = $(ejsscriptsrcdir)/smbcalls_rand.o
 
 [MODULE::smbcalls_nss]
 SUBSYSTEM = smbcalls
@@ -45,14 +45,14 @@ OUTPUT_TYPE = MERGED_OBJ
 INIT_FUNCTION = smb_setup_ejs_nss
 PRIVATE_DEPENDENCIES = NSS_WRAPPER
 
-smbcalls_nss_OBJ_FILES = scripting/ejs/smbcalls_nss.o
+smbcalls_nss_OBJ_FILES = $(ejsscriptsrcdir)/smbcalls_nss.o
 
 [MODULE::smbcalls_data]
 SUBSYSTEM = smbcalls
 OUTPUT_TYPE = MERGED_OBJ
 INIT_FUNCTION = smb_setup_ejs_datablob
 
-smbcalls_data_OBJ_FILES = scripting/ejs/smbcalls_data.o
+smbcalls_data_OBJ_FILES = $(ejsscriptsrcdir)/smbcalls_data.o
 
 [MODULE::smbcalls_auth]
 OUTPUT_TYPE = MERGED_OBJ
@@ -60,23 +60,23 @@ SUBSYSTEM = smbcalls
 INIT_FUNCTION = smb_setup_ejs_auth
 PRIVATE_DEPENDENCIES = service_auth
 
-smbcalls_auth_OBJ_FILES = scripting/ejs/smbcalls_auth.o
+smbcalls_auth_OBJ_FILES = $(ejsscriptsrcdir)/smbcalls_auth.o
 
-smbcalls_auth_OBJ_FILES = scripting/ejs/smbcalls_auth.o
+smbcalls_auth_OBJ_FILES = $(ejsscriptsrcdir)/smbcalls_auth.o
 
 [MODULE::smbcalls_string]
 SUBSYSTEM = smbcalls
 OUTPUT_TYPE = MERGED_OBJ
 INIT_FUNCTION = smb_setup_ejs_string
 
-smbcalls_string_OBJ_FILES = scripting/ejs/smbcalls_string.o
+smbcalls_string_OBJ_FILES = $(ejsscriptsrcdir)/smbcalls_string.o
 
 [MODULE::smbcalls_sys]
 SUBSYSTEM = smbcalls
 OUTPUT_TYPE = MERGED_OBJ
 INIT_FUNCTION = smb_setup_ejs_system
 
-smbcalls_sys_OBJ_FILES = scripting/ejs/smbcalls_sys.o
+smbcalls_sys_OBJ_FILES = $(ejsscriptsrcdir)/smbcalls_sys.o
 
 mkinclude ejsnet/config.mk
 
@@ -90,7 +90,7 @@ PRIVATE_DEPENDENCIES = \
 		dcerpc \
 		NDR_TABLE
 
-smbcalls_OBJ_FILES = $(addprefix scripting/ejs/, \
+smbcalls_OBJ_FILES = $(addprefix $(ejsscriptsrcdir)/, \
 		smbcalls.o \
 		smbcalls_cli.o \
 		smbcalls_rpc.o \
@@ -107,4 +107,4 @@ PRIVATE_DEPENDENCIES = EJS LIBSAMBA-UTIL smbcalls LIBSAMBA-HOSTCONFIG
 # End BINARY SMBSCRIPT
 #######################
 
-smbscript_OBJ_FILES = scripting/ejs/smbscript.o
+smbscript_OBJ_FILES = $(ejsscriptsrcdir)/smbscript.o
diff --git a/source4/scripting/ejs/ejsnet/config.mk b/source4/scripting/ejs/ejsnet/config.mk
index 85a5b2bf09..cf52de056e 100644
--- a/source4/scripting/ejs/ejsnet/config.mk
+++ b/source4/scripting/ejs/ejsnet/config.mk
@@ -4,7 +4,7 @@ INIT_FUNCTION = smb_setup_ejs_net
 PRIVATE_PROTO_HEADER = proto.h
 PRIVATE_DEPENDENCIES = LIBSAMBA-NET LIBCLI_SMB CREDENTIALS
 
-smbcalls_net_OBJ_FILES = $(addprefix scripting/ejs/ejsnet/,  \
+smbcalls_net_OBJ_FILES = $(addprefix $(ejsscriptsrcdir)/ejsnet/,  \
 		net_ctx.o \
 		net_user.o \
 		mpr_user.o \
-- 
cgit 


From 4c8756f147f8b9a2806fd76e4cb06bb99d391516 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sun, 18 May 2008 22:30:08 +0200
Subject: Create prototype headers from Makefile directory, without smb_build
 in the middle. (This used to be commit
 f4a77b96f9c17d853348b70794026e5b9e384942)

---
 source4/scripting/ejs/config.mk        | 3 ++-
 source4/scripting/ejs/ejsnet/config.mk | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/config.mk b/source4/scripting/ejs/config.mk
index f4af4ba811..578eca391d 100644
--- a/source4/scripting/ejs/config.mk
+++ b/source4/scripting/ejs/config.mk
@@ -81,7 +81,6 @@ smbcalls_sys_OBJ_FILES = $(ejsscriptsrcdir)/smbcalls_sys.o
 mkinclude ejsnet/config.mk
 
 [SUBSYSTEM::smbcalls]
-PRIVATE_PROTO_HEADER = proto.h
 PRIVATE_DEPENDENCIES = \
 		EJS LIBSAMBA-UTIL \
 		EJSRPC MESSAGING \
@@ -100,6 +99,8 @@ smbcalls_OBJ_FILES = $(addprefix $(ejsscriptsrcdir)/, \
 		mprutil.o \
 		literal.o)
 
+$(call proto_header_template,$(ejsscriptsrcdir)/proto.h,$(smbcalls_OBJ_FILES:.o=.c))
+
 #######################
 # Start BINARY SMBSCRIPT
 [BINARY::smbscript]
diff --git a/source4/scripting/ejs/ejsnet/config.mk b/source4/scripting/ejs/ejsnet/config.mk
index cf52de056e..0614e48e0d 100644
--- a/source4/scripting/ejs/ejsnet/config.mk
+++ b/source4/scripting/ejs/ejsnet/config.mk
@@ -1,7 +1,6 @@
 [MODULE::smbcalls_net]
 SUBSYSTEM = smbcalls
 INIT_FUNCTION = smb_setup_ejs_net
-PRIVATE_PROTO_HEADER = proto.h
 PRIVATE_DEPENDENCIES = LIBSAMBA-NET LIBCLI_SMB CREDENTIALS
 
 smbcalls_net_OBJ_FILES = $(addprefix $(ejsscriptsrcdir)/ejsnet/,  \
@@ -11,3 +10,4 @@ smbcalls_net_OBJ_FILES = $(addprefix $(ejsscriptsrcdir)/ejsnet/,  \
 		net_host.o \
 		mpr_host.o)
 
+$(call proto_header_template,$(ejsscriptsrcdir)/ejsnet/proto.h,$(smbcalls_net_OBJ_FILES:.o=.c))
-- 
cgit 


From 4c70cda986c86fe536327321d04c29eca81b6409 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sun, 18 May 2008 23:02:47 +0200
Subject: Fix a couple (well, little more than that..) of typos. (This used to
 be commit a6b52119940a900fb0de3864b8bca94e2965cc24)

---
 source4/scripting/ejs/config.mk        | 2 +-
 source4/scripting/ejs/ejsnet/config.mk | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/config.mk b/source4/scripting/ejs/config.mk
index 578eca391d..c1a1ca1f0f 100644
--- a/source4/scripting/ejs/config.mk
+++ b/source4/scripting/ejs/config.mk
@@ -99,7 +99,7 @@ smbcalls_OBJ_FILES = $(addprefix $(ejsscriptsrcdir)/, \
 		mprutil.o \
 		literal.o)
 
-$(call proto_header_template,$(ejsscriptsrcdir)/proto.h,$(smbcalls_OBJ_FILES:.o=.c))
+$(eval $(call proto_header_template,$(ejsscriptsrcdir)/proto.h,$(smbcalls_OBJ_FILES:.o=.c)))
 
 #######################
 # Start BINARY SMBSCRIPT
diff --git a/source4/scripting/ejs/ejsnet/config.mk b/source4/scripting/ejs/ejsnet/config.mk
index 0614e48e0d..710221e37d 100644
--- a/source4/scripting/ejs/ejsnet/config.mk
+++ b/source4/scripting/ejs/ejsnet/config.mk
@@ -10,4 +10,4 @@ smbcalls_net_OBJ_FILES = $(addprefix $(ejsscriptsrcdir)/ejsnet/,  \
 		net_host.o \
 		mpr_host.o)
 
-$(call proto_header_template,$(ejsscriptsrcdir)/ejsnet/proto.h,$(smbcalls_net_OBJ_FILES:.o=.c))
+$(eval $(call proto_header_template,$(ejsscriptsrcdir)/ejsnet/proto.h,$(smbcalls_net_OBJ_FILES:.o=.c)))
-- 
cgit 


From 82bcf967b79321706cd19c759ea54c4465fe0d96 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Wed, 21 May 2008 21:32:53 +0200
Subject: Move CFLAGS overrides for SWIG modules to Makefile. (This used to be
 commit 58665a8a8e4b10435aebbf2c95b6a8e50db232d6)

---
 source4/scripting/python/config.mk | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/config.mk b/source4/scripting/python/config.mk
index 1fa273e99d..cc94abb702 100644
--- a/source4/scripting/python/config.mk
+++ b/source4/scripting/python/config.mk
@@ -21,6 +21,8 @@ SWIG_FILE = misc.i
 
 python_misc_OBJ_FILES = $(pyscriptsrcdir)/misc_wrap.o
 
+$(python_misc_OBJ_FILES): CFLAGS+="$(CFLAG_NO_UNUSED_MACROS) $(CFLAG_NO_CAST_QUAL)"
+
 _PY_FILES = $(shell find $(pyscriptsrcdir) -name "*.py")
 
 $(foreach pyfile, $(_PY_FILES),$(eval $(call python_py_module_template,$(patsubst $(pyscriptsrcdir)/%,%,$(pyfile)),$(pyfile))))
-- 
cgit 


From 49706ab19bd3ffd6125639e6a7753b2350cf54e1 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Wed, 21 May 2008 23:59:34 +0200
Subject: Move more modules inside of the samba package. (This used to be
 commit 9b39e99f48266a54ed0b8890c2efde218b4b118a)

---
 source4/scripting/bin/subunitrun                       | 2 +-
 source4/scripting/python/config.mk                     | 9 +++++++--
 source4/scripting/python/samba/tests/dcerpc/rpcecho.py | 2 +-
 source4/scripting/python/samba/tests/dcerpc/unix.py    | 2 +-
 4 files changed, 10 insertions(+), 5 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/bin/subunitrun b/source4/scripting/bin/subunitrun
index de11aba3cc..6f1086ad37 100755
--- a/source4/scripting/bin/subunitrun
+++ b/source4/scripting/bin/subunitrun
@@ -26,7 +26,7 @@ from subunit import SubunitTestRunner
 from unittest import TestProgram
 import optparse
 import os
-import param
+from samba import param
 import samba.getopt as options
 import samba.tests
 
diff --git a/source4/scripting/python/config.mk b/source4/scripting/python/config.mk
index cc94abb702..37e346a73a 100644
--- a/source4/scripting/python/config.mk
+++ b/source4/scripting/python/config.mk
@@ -16,15 +16,20 @@ PRIVATE_DEPENDENCIES = LIBNDR
 python_uuid_OBJ_FILES = $(pyscriptsrcdir)/uuidmodule.o
 
 [PYTHON::python_misc]
+LIBRARY_REALNAME = samba/_misc.$(SHLIBEXT)
 PRIVATE_DEPENDENCIES = LIBNDR LIBLDB SAMDB CREDENTIALS
-SWIG_FILE = misc.i
 
 python_misc_OBJ_FILES = $(pyscriptsrcdir)/misc_wrap.o
 
 $(python_misc_OBJ_FILES): CFLAGS+="$(CFLAG_NO_UNUSED_MACROS) $(CFLAG_NO_CAST_QUAL)"
 
-_PY_FILES = $(shell find $(pyscriptsrcdir) -name "*.py")
+_PY_FILES = $(shell find $(pyscriptsrcdir)/samba $(pyscriptsrcdir)/subunit -name "*.py")
 
 $(foreach pyfile, $(_PY_FILES),$(eval $(call python_py_module_template,$(patsubst $(pyscriptsrcdir)/%,%,$(pyfile)),$(pyfile))))
 
+$(eval $(call python_py_module_template,samba/misc.py,$(pyscriptsrcdir)/misc.py))
+
+epydoc:: pythonmods
+	PYTHONPATH=$(pythonbuilddir) epydoc samba dcerpc
+
 install:: installpython
diff --git a/source4/scripting/python/samba/tests/dcerpc/rpcecho.py b/source4/scripting/python/samba/tests/dcerpc/rpcecho.py
index 6c43632d97..281d5b4cdb 100644
--- a/source4/scripting/python/samba/tests/dcerpc/rpcecho.py
+++ b/source4/scripting/python/samba/tests/dcerpc/rpcecho.py
@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-import echo
+from dcerpc import echo
 import unittest
 from samba.tests import RpcInterfaceTestCase
 
diff --git a/source4/scripting/python/samba/tests/dcerpc/unix.py b/source4/scripting/python/samba/tests/dcerpc/unix.py
index 78a987cedd..b4b2e0aeda 100644
--- a/source4/scripting/python/samba/tests/dcerpc/unix.py
+++ b/source4/scripting/python/samba/tests/dcerpc/unix.py
@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-import unixinfo
+from dcerpc import unixinfo
 from samba.tests import RpcInterfaceTestCase
 
 class UnixinfoTests(RpcInterfaceTestCase):
-- 
cgit 


From 059c012656e6369f417c11f9984ddb1925782394 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Thu, 22 May 2008 00:56:36 +0200
Subject: Fix dependencies and imports. (This used to be commit
 37ef86f8de9039b8226b190254d842e92b5faad7)

---
 source4/scripting/python/config.mk                      | 4 ++--
 source4/scripting/python/samba/tests/dcerpc/registry.py | 2 +-
 source4/scripting/python/samba/tests/dcerpc/sam.py      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/config.mk b/source4/scripting/python/config.mk
index 37e346a73a..ddbc5674f2 100644
--- a/source4/scripting/python/config.mk
+++ b/source4/scripting/python/config.mk
@@ -6,7 +6,7 @@ INIT_FUNCTION_SENTINEL = { NULL, NULL }
 LIBPYTHON_OBJ_FILES = $(addprefix $(pyscriptsrcdir)/, modules.o)
 
 [SUBSYSTEM::PYTALLOC]
-PUBLIC_DEPENDENCIES = EXT_LIB_PYTHON
+PUBLIC_DEPENDENCIES = EXT_LIB_PYTHON LIBTALLOC
 
 PYTALLOC_OBJ_FILES = $(addprefix $(pyscriptsrcdir)/, pytalloc.o)
 
@@ -30,6 +30,6 @@ $(foreach pyfile, $(_PY_FILES),$(eval $(call python_py_module_template,$(patsubs
 $(eval $(call python_py_module_template,samba/misc.py,$(pyscriptsrcdir)/misc.py))
 
 epydoc:: pythonmods
-	PYTHONPATH=$(pythonbuilddir) epydoc samba dcerpc
+	PYTHONPATH=$(pythonbuilddir) epydoc --no-private samba dcerpc tdb ldb subunit
 
 install:: installpython
diff --git a/source4/scripting/python/samba/tests/dcerpc/registry.py b/source4/scripting/python/samba/tests/dcerpc/registry.py
index 1afdc582a7..0a1b5ecd10 100644
--- a/source4/scripting/python/samba/tests/dcerpc/registry.py
+++ b/source4/scripting/python/samba/tests/dcerpc/registry.py
@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-import winreg
+from dcerpc import winreg
 import unittest
 from samba.tests import RpcInterfaceTestCase
 
diff --git a/source4/scripting/python/samba/tests/dcerpc/sam.py b/source4/scripting/python/samba/tests/dcerpc/sam.py
index 8ef12dad86..50871114c0 100644
--- a/source4/scripting/python/samba/tests/dcerpc/sam.py
+++ b/source4/scripting/python/samba/tests/dcerpc/sam.py
@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-import samr
+from dcerpc import samr
 from samba.tests import RpcInterfaceTestCase
 
 class SamrTests(RpcInterfaceTestCase):
-- 
cgit 


From 6e14d44d27d208bb22e6345fff8785c74a435a59 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Thu, 22 May 2008 01:50:38 +0200
Subject: Make sure the default ldb modules dir gets initialized. (This used to
 be commit 937456c69d23ece85bdb7415f52d722c2aa6b6b5)

---
 source4/scripting/python/samba/__init__.py | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/__init__.py b/source4/scripting/python/samba/__init__.py
index b9d81c6c3c..29afdb931d 100644
--- a/source4/scripting/python/samba/__init__.py
+++ b/source4/scripting/python/samba/__init__.py
@@ -33,6 +33,8 @@ if _in_source_tree():
     srcdir = "%s/../../.." % os.path.dirname(__file__)
     sys.path.append("%s/bin/python" % srcdir)
     default_ldb_modules_dir = "%s/bin/modules/ldb" % srcdir
+else:
+    default_ldb_modules_dir = None
 
 
 import ldb
-- 
cgit 


From 5ce59419a07c8e147daf51b77ffe2117f3d6a505 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Thu, 22 May 2008 02:13:26 +0200
Subject: Fix CFLAGS for SWIG files. (This used to be commit
 8ee4f075046e0b181ec8a4ac1eaf3ea5621a56bf)

---
 source4/scripting/python/config.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/config.mk b/source4/scripting/python/config.mk
index ddbc5674f2..73607eb76c 100644
--- a/source4/scripting/python/config.mk
+++ b/source4/scripting/python/config.mk
@@ -21,7 +21,7 @@ PRIVATE_DEPENDENCIES = LIBNDR LIBLDB SAMDB CREDENTIALS
 
 python_misc_OBJ_FILES = $(pyscriptsrcdir)/misc_wrap.o
 
-$(python_misc_OBJ_FILES): CFLAGS+="$(CFLAG_NO_UNUSED_MACROS) $(CFLAG_NO_CAST_QUAL)"
+$(python_misc_OBJ_FILES): CFLAGS+=$(CFLAG_NO_UNUSED_MACROS) $(CFLAG_NO_CAST_QUAL)
 
 _PY_FILES = $(shell find $(pyscriptsrcdir)/samba $(pyscriptsrcdir)/subunit -name "*.py")
 
-- 
cgit 


From d77745e6920038f3b6c7c25fa6cd6549e1c24d17 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Thu, 22 May 2008 02:21:25 +0200
Subject: Move DCE/RPC python bindings into samba package. (This used to be
 commit 8dafd4ce40b7348fd5f2b1f2f5d2106ef4cc0dd1)

---
 source4/scripting/python/samba/tests/dcerpc/registry.py | 2 +-
 source4/scripting/python/samba/tests/dcerpc/rpcecho.py  | 2 +-
 source4/scripting/python/samba/tests/dcerpc/sam.py      | 2 +-
 source4/scripting/python/samba/tests/dcerpc/unix.py     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/tests/dcerpc/registry.py b/source4/scripting/python/samba/tests/dcerpc/registry.py
index 0a1b5ecd10..81133ff641 100644
--- a/source4/scripting/python/samba/tests/dcerpc/registry.py
+++ b/source4/scripting/python/samba/tests/dcerpc/registry.py
@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-from dcerpc import winreg
+from samba.dcerpc import winreg
 import unittest
 from samba.tests import RpcInterfaceTestCase
 
diff --git a/source4/scripting/python/samba/tests/dcerpc/rpcecho.py b/source4/scripting/python/samba/tests/dcerpc/rpcecho.py
index 281d5b4cdb..3b37f8a9bc 100644
--- a/source4/scripting/python/samba/tests/dcerpc/rpcecho.py
+++ b/source4/scripting/python/samba/tests/dcerpc/rpcecho.py
@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-from dcerpc import echo
+from samba.dcerpc import echo
 import unittest
 from samba.tests import RpcInterfaceTestCase
 
diff --git a/source4/scripting/python/samba/tests/dcerpc/sam.py b/source4/scripting/python/samba/tests/dcerpc/sam.py
index 50871114c0..a6816153c0 100644
--- a/source4/scripting/python/samba/tests/dcerpc/sam.py
+++ b/source4/scripting/python/samba/tests/dcerpc/sam.py
@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-from dcerpc import samr
+from samba.dcerpc import samr
 from samba.tests import RpcInterfaceTestCase
 
 class SamrTests(RpcInterfaceTestCase):
diff --git a/source4/scripting/python/samba/tests/dcerpc/unix.py b/source4/scripting/python/samba/tests/dcerpc/unix.py
index b4b2e0aeda..aa47b71b16 100644
--- a/source4/scripting/python/samba/tests/dcerpc/unix.py
+++ b/source4/scripting/python/samba/tests/dcerpc/unix.py
@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-from dcerpc import unixinfo
+from samba.dcerpc import unixinfo
 from samba.tests import RpcInterfaceTestCase
 
 class UnixinfoTests(RpcInterfaceTestCase):
-- 
cgit 


From d8459e3e1c87577768a2a250f701f14a64c22541 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Thu, 22 May 2008 03:09:40 +0200
Subject: Fix import in provision test. (This used to be commit
 96501be38da947f02ad57217e0bc23f7a66d36f9)

---
 source4/scripting/python/samba/tests/provision.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/tests/provision.py b/source4/scripting/python/samba/tests/provision.py
index b9e0e16d3c..76c10145f0 100644
--- a/source4/scripting/python/samba/tests/provision.py
+++ b/source4/scripting/python/samba/tests/provision.py
@@ -21,7 +21,7 @@ import os
 from samba.provision import setup_secretsdb, secretsdb_become_dc, findnss
 import samba.tests
 from ldb import Dn
-import param
+from samba import param
 import unittest
 
 lp = samba.tests.cmdline_loadparm
-- 
cgit 


From bf3f3af92677bce8f03b0dd2be552d6c8c730ca1 Mon Sep 17 00:00:00 2001
From: Andrew Kroeger <andrew@sprocks.gotdns.com>
Date: Wed, 21 May 2008 18:12:36 -0500
Subject: provision: Generate krb5.conf template separate from named.conf
 template. (This used to be commit ebf130e9e57b640129cf0d05dbd7d210b71ea371)

---
 source4/scripting/python/samba/provision.py | 74 ++++++++++++++++++++---------
 1 file changed, 52 insertions(+), 22 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index 4818a79f00..69c7e8846d 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -237,6 +237,7 @@ def provision_paths_from_lp(lp, dnsdomain):
     paths.templates = os.path.join(paths.private_dir, "templates.ldb")
     paths.dns = os.path.join(paths.private_dir, dnsdomain + ".zone")
     paths.namedconf = os.path.join(paths.private_dir, "named.conf")
+    paths.krb5conf = os.path.join(paths.private_dir, "krb5.conf")
     paths.winsdb = os.path.join(paths.private_dir, "wins.ldb")
     paths.s4_ldapi_path = os.path.join(paths.private_dir, "ldapi")
     paths.phpldapadminconfig = os.path.join(paths.private_dir, 
@@ -1059,16 +1060,23 @@ def provision(setup_dir, message, session_info,
                                        expression="(&(objectClass=computer)(cn=%s))" % names.hostname,
                                        scope=SCOPE_SUBTREE)
             assert isinstance(hostguid, str)
-            
-            create_zone_file(paths.dns, paths.namedconf, setup_path, samdb, 
-                             hostname=names.hostname, hostip=hostip,
-                             hostip6=hostip6, dnsdomain=names.dnsdomain,
-                             domaindn=names.domaindn, dnspass=dnspass, realm=names.realm, 
-                             domainguid=domainguid, hostguid=hostguid,
-                             private_dir=paths.private_dir, keytab_name=paths.dns_keytab)
+
+            create_zone_file(paths.dns, setup_path, dnsdomain=names.dnsdomain,
+                             domaindn=names.domaindn, hostip=hostip,
+                             hostip6=hostip6, hostname=names.hostname,
+                             dnspass=dnspass, realm=names.realm,
+                             domainguid=domainguid, hostguid=hostguid)
             message("Please install the zone located in %s into your DNS server" % paths.dns)
-            message("See %s if you want to use secure GSS-TSIG updates" % paths.namedconf)
-            
+
+            create_named_conf(paths.namedconf, setup_path, realm=names.realm,
+                              dnsdomain=names.dnsdomain, private_dir=paths.private_dir,
+                              keytab_name=paths.dns_keytab)
+            message("See %s for example configuration statements for secure GSS-TSIG updates" % paths.namedconf)
+
+            create_krb5_conf(paths.krb5conf, setup_path, dnsdomain=names.dnsdomain,
+                             hostname=names.hostname, realm=names.realm)
+            message("A Kerberos configuration suitable for Samba 4 has been generated at %s" % paths.krb5conf)
+
     create_phpldapadmin_config(paths.phpldapadminconfig, setup_path, 
                                ldapi_url)
 
@@ -1284,19 +1292,12 @@ def create_phpldapadmin_config(path, setup_path, ldapi_uri):
             {"S4_LDAPI_URI": ldapi_uri})
 
 
-def create_zone_file(path_zone, path_conf, setup_path, samdb, dnsdomain, domaindn, 
-                  hostip, hostip6, hostname, dnspass, realm, domainguid, hostguid,
-                  private_dir, keytab_name):
+def create_zone_file(path, setup_path, dnsdomain, domaindn, 
+                     hostip, hostip6, hostname, dnspass, realm, domainguid, hostguid):
     """Write out a DNS zone file, from the info in the current database.
 
-    Also writes a file with stubs appropriate for a DNS configuration file
-    (including GSS-TSIG configuration), and details as to some of the other
-    configuration changes that may be necessary.
-    
-    :param path_zone: Path of the new zone file.
-    :param path_conf: Path of the config stubs file.
+    :param path: Path of the new zone file.
     :param setup_path: Setup path function.
-    :param samdb: SamDB object
     :param dnsdomain: DNS Domain name
     :param domaindn: DN of the Domain
     :param hostip: Local IPv4 IP
@@ -1316,7 +1317,7 @@ def create_zone_file(path_zone, path_conf, setup_path, samdb, dnsdomain, domaind
         hostip6_base_line = "			IN AAAA	" + hostip6
         hostip6_host_line = hostname + "		IN AAAA	" + hostip6
 
-    setup_file(setup_path("provision.zone"), path_zone, {
+    setup_file(setup_path("provision.zone"), path, {
             "DNSPASS_B64": b64encode(dnspass),
             "HOSTNAME": hostname,
             "DNSDOMAIN": dnsdomain,
@@ -1330,15 +1331,44 @@ def create_zone_file(path_zone, path_conf, setup_path, samdb, dnsdomain, domaind
             "HOSTIP6_HOST_LINE": hostip6_host_line,
         })
 
-    setup_file(setup_path("named.conf"), path_conf, {
+def create_named_conf(path, setup_path, realm, dnsdomain,
+                      private_dir, keytab_name):
+    """Write out a file containing zone statements suitable for inclusion in a
+    named.conf file (including GSS-TSIG configuration).
+    
+    :param path: Path of the new named.conf file.
+    :param setup_path: Setup path function.
+    :param realm: Realm name
+    :param dnsdomain: DNS Domain name
+    :param private_dir: Path to private directory
+    :param keytab_name: File name of DNS keytab file
+    """
+
+    setup_file(setup_path("named.conf"), path, {
             "DNSDOMAIN": dnsdomain,
             "REALM": realm,
             "REALM_WC": "*." + ".".join(realm.split(".")[1:]),
-            "HOSTNAME": hostname,
             "DNS_KEYTAB": keytab_name,
             "DNS_KEYTAB_ABS": os.path.join(private_dir, keytab_name),
         })
 
+def create_krb5_conf(path, setup_path, dnsdomain, hostname, realm):
+    """Write out a file containing zone statements suitable for inclusion in a
+    named.conf file (including GSS-TSIG configuration).
+    
+    :param path: Path of the new named.conf file.
+    :param setup_path: Setup path function.
+    :param dnsdomain: DNS Domain name
+    :param hostname: Local hostname
+    :param realm: Realm name
+    """
+
+    setup_file(setup_path("krb5.conf"), path, {
+            "DNSDOMAIN": dnsdomain,
+            "HOSTNAME": hostname,
+            "REALM": realm,
+        })
+
 def load_schema(setup_path, samdb, schemadn, netbiosname, configdn, sitename):
     """Load schema for the SamDB.
     
-- 
cgit 


From 73e2fc95901afbc71000461e7613515ca906bcff Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Thu, 22 May 2008 17:33:23 +0200
Subject: Add docstrings in misc python module. (This used to be commit
 5bf15122e6bb6dcbc2abd325db9522b2084d975f)

---
 source4/scripting/python/misc.i      | 15 ++++++
 source4/scripting/python/misc.py     | 50 ++++++++++++++++---
 source4/scripting/python/misc_wrap.c | 97 ++++++++++++++++++++++++++----------
 3 files changed, 129 insertions(+), 33 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/misc.i b/source4/scripting/python/misc.i
index 6fa3bc93e3..9a4c124121 100644
--- a/source4/scripting/python/misc.i
+++ b/source4/scripting/python/misc.i
@@ -40,6 +40,15 @@
 %rename(random_password) generate_random_str;
 char *generate_random_str(TALLOC_CTX *mem_ctx, size_t len);
 
+%feature("docstring") ldb_set_credentials "S.set_credentials(credentials)\n"
+                                          "Set credentials to use when connecting.";
+
+%feature("docstring") ldb_set_session_info "S.set_session_info(session_info)\n"
+                                          "Set session info to use when connecting.";
+
+%feature("docstring") ldb_set_loadparm "S.set_loadparm(session_info)\n"
+                                          "Set loadparm context to use when connecting.";
+
 %inline %{
 void ldb_set_credentials(struct ldb_context *ldb, struct cli_credentials *creds)
 {
@@ -58,14 +67,20 @@ void ldb_set_loadparm(struct ldb_context *ldb, struct loadparm_context *lp_ctx)
 
 %}
 
+%feature("docstring") samdb_set_domain_sid "S.set_domain_sid(sid)\n"
+                                          "Set SID of domain to use.";
 bool samdb_set_domain_sid(struct ldb_context *ldb, 
                           const struct dom_sid *dom_sid_in);
 
 WERROR dsdb_attach_schema_from_ldif_file(struct ldb_context *ldb, const char *pf, const char *df);
 
+%feature("docstring") samba_version_string "version()\n"
+                                          "Obtain the Samba version.";
 %rename(version) samba_version_string;
 const char *samba_version_string(void);
 int dsdb_set_global_schema(struct ldb_context *ldb);
+%feature("docstring") ldb_register_samba_handlers "register_samba_handlers()\n"
+                                          "Register Samba-specific LDB modules and schemas.";
 int ldb_register_samba_handlers(struct ldb_context *ldb);
 
 %inline %{
diff --git a/source4/scripting/python/misc.py b/source4/scripting/python/misc.py
index f1da4c687a..25e8d2de8c 100644
--- a/source4/scripting/python/misc.py
+++ b/source4/scripting/python/misc.py
@@ -1,5 +1,5 @@
 # This file was automatically generated by SWIG (http://www.swig.org).
-# Version 1.3.33
+# Version 1.3.35
 #
 # Don't modify this file, modify the SWIG interface instead.
 
@@ -62,14 +62,50 @@ import credentials
 import param
 import security
 random_password = _misc.random_password
-ldb_set_credentials = _misc.ldb_set_credentials
-ldb_set_session_info = _misc.ldb_set_session_info
-ldb_set_loadparm = _misc.ldb_set_loadparm
-samdb_set_domain_sid = _misc.samdb_set_domain_sid
+
+def ldb_set_credentials(*args, **kwargs):
+  """
+    S.set_credentials(credentials)
+    Set credentials to use when connecting.
+    """
+  return _misc.ldb_set_credentials(*args, **kwargs)
+
+def ldb_set_session_info(*args, **kwargs):
+  """
+    S.set_session_info(session_info)
+    Set session info to use when connecting.
+    """
+  return _misc.ldb_set_session_info(*args, **kwargs)
+
+def ldb_set_loadparm(*args, **kwargs):
+  """
+    S.set_loadparm(session_info)
+    Set loadparm context to use when connecting.
+    """
+  return _misc.ldb_set_loadparm(*args, **kwargs)
+
+def samdb_set_domain_sid(*args, **kwargs):
+  """
+    S.set_domain_sid(sid)
+    Set SID of domain to use.
+    """
+  return _misc.samdb_set_domain_sid(*args, **kwargs)
 dsdb_attach_schema_from_ldif_file = _misc.dsdb_attach_schema_from_ldif_file
-version = _misc.version
+
+def version(*args):
+  """
+    version()
+    Obtain the Samba version.
+    """
+  return _misc.version(*args)
 dsdb_set_global_schema = _misc.dsdb_set_global_schema
-ldb_register_samba_handlers = _misc.ldb_register_samba_handlers
+
+def ldb_register_samba_handlers(*args, **kwargs):
+  """
+    register_samba_handlers()
+    Register Samba-specific LDB modules and schemas.
+    """
+  return _misc.ldb_register_samba_handlers(*args, **kwargs)
 dsdb_set_ntds_invocation_id = _misc.dsdb_set_ntds_invocation_id
 private_path = _misc.private_path
 
diff --git a/source4/scripting/python/misc_wrap.c b/source4/scripting/python/misc_wrap.c
index 4944515d15..22a072fc6f 100644
--- a/source4/scripting/python/misc_wrap.c
+++ b/source4/scripting/python/misc_wrap.c
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.33
+ * Version 1.3.35
  * 
  * This file is not intended to be easily readable and contains a number of 
  * coding conventions designed to improve portability and efficiency. Do not make
@@ -126,7 +126,7 @@
 
 /* This should only be incremented when either the layout of swig_type_info changes,
    or for whatever reason, the runtime changes incompatibly */
-#define SWIG_RUNTIME_VERSION "3"
+#define SWIG_RUNTIME_VERSION "4"
 
 /* define SWIG_TYPE_TABLE_NAME as "SWIG_TYPE_TABLE" */
 #ifdef SWIG_TYPE_TABLE
@@ -161,6 +161,7 @@
 
 /* Flags for pointer conversions */
 #define SWIG_POINTER_DISOWN        0x1
+#define SWIG_CAST_NEW_MEMORY       0x2
 
 /* Flags for new pointer objects */
 #define SWIG_POINTER_OWN           0x1
@@ -301,10 +302,10 @@ SWIGINTERNINLINE int SWIG_CheckState(int r) {
 extern "C" {
 #endif
 
-typedef void *(*swig_converter_func)(void *);
+typedef void *(*swig_converter_func)(void *, int *);
 typedef struct swig_type_info *(*swig_dycast_func)(void **);
 
-/* Structure to store inforomation on one type */
+/* Structure to store information on one type */
 typedef struct swig_type_info {
   const char             *name;			/* mangled name of this type */
   const char             *str;			/* human readable name of this type */
@@ -431,8 +432,8 @@ SWIG_TypeCheckStruct(swig_type_info *from, swig_type_info *into) {
   Cast a pointer up an inheritance hierarchy
 */
 SWIGRUNTIMEINLINE void *
-SWIG_TypeCast(swig_cast_info *ty, void *ptr) {
-  return ((!ty) || (!ty->converter)) ? ptr : (*ty->converter)(ptr);
+SWIG_TypeCast(swig_cast_info *ty, void *ptr, int *newmemory) {
+  return ((!ty) || (!ty->converter)) ? ptr : (*ty->converter)(ptr, newmemory);
 }
 
 /* 
@@ -856,7 +857,7 @@ SWIG_Python_AddErrorMsg(const char* mesg)
     Py_DECREF(old_str);
     Py_DECREF(value);
   } else {
-    PyErr_Format(PyExc_RuntimeError, mesg);
+    PyErr_SetString(PyExc_RuntimeError, mesg);
   }
 }
 
@@ -1416,7 +1417,7 @@ PySwigObject_dealloc(PyObject *v)
 {
   PySwigObject *sobj = (PySwigObject *) v;
   PyObject *next = sobj->next;
-  if (sobj->own) {
+  if (sobj->own == SWIG_POINTER_OWN) {
     swig_type_info *ty = sobj->ty;
     PySwigClientData *data = ty ? (PySwigClientData *) ty->clientdata : 0;
     PyObject *destroy = data ? data->destroy : 0;
@@ -1434,12 +1435,13 @@ PySwigObject_dealloc(PyObject *v)
 	res = ((*meth)(mself, v));
       }
       Py_XDECREF(res);
-    } else {
-      const char *name = SWIG_TypePrettyName(ty);
+    } 
 #if !defined(SWIG_PYTHON_SILENT_MEMLEAK)
-      printf("swig/python detected a memory leak of type '%s', no destructor found.\n", name);
-#endif
+    else {
+      const char *name = SWIG_TypePrettyName(ty);
+      printf("swig/python detected a memory leak of type '%s', no destructor found.\n", (name ? name : "unknown"));
     }
+#endif
   } 
   Py_XDECREF(next);
   PyObject_DEL(v);
@@ -1944,7 +1946,7 @@ SWIG_Python_GetSwigThis(PyObject *pyobj)
 
 SWIGRUNTIME int
 SWIG_Python_AcquirePtr(PyObject *obj, int own) {
-  if (own) {
+  if (own == SWIG_POINTER_OWN) {
     PySwigObject *sobj = SWIG_Python_GetSwigThis(obj);
     if (sobj) {
       int oldown = sobj->own;
@@ -1965,6 +1967,8 @@ SWIG_Python_ConvertPtrAndOwn(PyObject *obj, void **ptr, swig_type_info *ty, int
     return SWIG_OK;
   } else {
     PySwigObject *sobj = SWIG_Python_GetSwigThis(obj);
+    if (own)
+      *own = 0;
     while (sobj) {
       void *vptr = sobj->ptr;
       if (ty) {
@@ -1978,7 +1982,15 @@ SWIG_Python_ConvertPtrAndOwn(PyObject *obj, void **ptr, swig_type_info *ty, int
 	  if (!tc) {
 	    sobj = (PySwigObject *)sobj->next;
 	  } else {
-	    if (ptr) *ptr = SWIG_TypeCast(tc,vptr);
+	    if (ptr) {
+              int newmemory = 0;
+              *ptr = SWIG_TypeCast(tc,vptr,&newmemory);
+              if (newmemory == SWIG_CAST_NEW_MEMORY) {
+                assert(own);
+                if (own)
+                  *own = *own | SWIG_CAST_NEW_MEMORY;
+              }
+            }
 	    break;
 	  }
 	}
@@ -1988,7 +2000,8 @@ SWIG_Python_ConvertPtrAndOwn(PyObject *obj, void **ptr, swig_type_info *ty, int
       }
     }
     if (sobj) {
-      if (own) *own = sobj->own;
+      if (own)
+        *own = *own | sobj->own;
       if (flags & SWIG_POINTER_DISOWN) {
 	sobj->own = 0;
       }
@@ -2053,8 +2066,13 @@ SWIG_Python_ConvertFunctionPtr(PyObject *obj, void **ptr, swig_type_info *ty) {
     }
     if (ty) {
       swig_cast_info *tc = SWIG_TypeCheck(desc,ty);
-      if (!tc) return SWIG_ERROR;
-      *ptr = SWIG_TypeCast(tc,vptr);
+      if (tc) {
+        int newmemory = 0;
+        *ptr = SWIG_TypeCast(tc,vptr,&newmemory);
+        assert(!newmemory); /* newmemory handling not yet implemented */
+      } else {
+        return SWIG_ERROR;
+      }
     } else {
       *ptr = vptr;
     }
@@ -2519,7 +2537,7 @@ static swig_module_info swig_module = {swig_types, 27, 0, 0, 0, 0};
 
 #define SWIG_name    "_misc"
 
-#define SWIGVERSION 0x010333 
+#define SWIGVERSION 0x010335 
 #define SWIG_VERSION SWIGVERSION
 
 
@@ -3199,14 +3217,32 @@ fail:
 
 static PyMethodDef SwigMethods[] = {
 	 { (char *)"random_password", (PyCFunction) _wrap_random_password, METH_VARARGS | METH_KEYWORDS, NULL},
-	 { (char *)"ldb_set_credentials", (PyCFunction) _wrap_ldb_set_credentials, METH_VARARGS | METH_KEYWORDS, NULL},
-	 { (char *)"ldb_set_session_info", (PyCFunction) _wrap_ldb_set_session_info, METH_VARARGS | METH_KEYWORDS, NULL},
-	 { (char *)"ldb_set_loadparm", (PyCFunction) _wrap_ldb_set_loadparm, METH_VARARGS | METH_KEYWORDS, NULL},
-	 { (char *)"samdb_set_domain_sid", (PyCFunction) _wrap_samdb_set_domain_sid, METH_VARARGS | METH_KEYWORDS, NULL},
+	 { (char *)"ldb_set_credentials", (PyCFunction) _wrap_ldb_set_credentials, METH_VARARGS | METH_KEYWORDS, (char *)"\n"
+		"S.set_credentials(credentials)\n"
+		"Set credentials to use when connecting.\n"
+		""},
+	 { (char *)"ldb_set_session_info", (PyCFunction) _wrap_ldb_set_session_info, METH_VARARGS | METH_KEYWORDS, (char *)"\n"
+		"S.set_session_info(session_info)\n"
+		"Set session info to use when connecting.\n"
+		""},
+	 { (char *)"ldb_set_loadparm", (PyCFunction) _wrap_ldb_set_loadparm, METH_VARARGS | METH_KEYWORDS, (char *)"\n"
+		"S.set_loadparm(session_info)\n"
+		"Set loadparm context to use when connecting.\n"
+		""},
+	 { (char *)"samdb_set_domain_sid", (PyCFunction) _wrap_samdb_set_domain_sid, METH_VARARGS | METH_KEYWORDS, (char *)"\n"
+		"S.set_domain_sid(sid)\n"
+		"Set SID of domain to use.\n"
+		""},
 	 { (char *)"dsdb_attach_schema_from_ldif_file", (PyCFunction) _wrap_dsdb_attach_schema_from_ldif_file, METH_VARARGS | METH_KEYWORDS, NULL},
-	 { (char *)"version", (PyCFunction)_wrap_version, METH_NOARGS, NULL},
+	 { (char *)"version", (PyCFunction)_wrap_version, METH_NOARGS, (char *)"\n"
+		"version()\n"
+		"Obtain the Samba version.\n"
+		""},
 	 { (char *)"dsdb_set_global_schema", (PyCFunction) _wrap_dsdb_set_global_schema, METH_VARARGS | METH_KEYWORDS, NULL},
-	 { (char *)"ldb_register_samba_handlers", (PyCFunction) _wrap_ldb_register_samba_handlers, METH_VARARGS | METH_KEYWORDS, NULL},
+	 { (char *)"ldb_register_samba_handlers", (PyCFunction) _wrap_ldb_register_samba_handlers, METH_VARARGS | METH_KEYWORDS, (char *)"\n"
+		"register_samba_handlers()\n"
+		"Register Samba-specific LDB modules and schemas.\n"
+		""},
 	 { (char *)"dsdb_set_ntds_invocation_id", (PyCFunction) _wrap_dsdb_set_ntds_invocation_id, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"private_path", (PyCFunction) _wrap_private_path, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { NULL, NULL, 0, NULL }
@@ -3225,7 +3261,7 @@ static swig_type_info _swigt__p_ldb_context = {"_p_ldb_context", "struct ldb_con
 static swig_type_info _swigt__p_ldb_dn = {"_p_ldb_dn", "struct ldb_dn *|ldb_dn *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_ldb_ldif = {"_p_ldb_ldif", "struct ldb_ldif *|ldb_ldif *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_ldb_message = {"_p_ldb_message", "ldb_msg *|struct ldb_message *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_ldb_message_element = {"_p_ldb_message_element", "struct ldb_message_element *|ldb_msg_element *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_ldb_message_element = {"_p_ldb_message_element", "struct ldb_message_element *|ldb_message_element *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_ldb_result = {"_p_ldb_result", "struct ldb_result *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_loadparm_context = {"_p_loadparm_context", "struct loadparm_context *|loadparm_context *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_loadparm_service = {"_p_loadparm_service", "struct loadparm_service *|loadparm_service *", 0, 0, (void*)0, 0};
@@ -3397,7 +3433,7 @@ SWIGRUNTIME void
 SWIG_InitializeModule(void *clientdata) {
   size_t i;
   swig_module_info *module_head, *iter;
-  int found;
+  int found, init;
   
   clientdata = clientdata;
   
@@ -3407,6 +3443,9 @@ SWIG_InitializeModule(void *clientdata) {
     swig_module.type_initial = swig_type_initial;
     swig_module.cast_initial = swig_cast_initial;
     swig_module.next = &swig_module;
+    init = 1;
+  } else {
+    init = 0;
   }
   
   /* Try and load any already created modules */
@@ -3435,6 +3474,12 @@ SWIG_InitializeModule(void *clientdata) {
     module_head->next = &swig_module;
   }
   
+  /* When multiple interpeters are used, a module could have already been initialized in
+       a different interpreter, but not yet have a pointer in this interpreter.
+       In this case, we do not want to continue adding types... everything should be
+       set up already */
+  if (init == 0) return;
+  
   /* Now work on filling in swig_module.types */
 #ifdef SWIGRUNTIME_DEBUG
   printf("SWIG_InitializeModule: size %d\n", swig_module.size);
-- 
cgit 


From c401aa93573460f10256218a6a1902839b17b884 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Thu, 22 May 2008 17:42:18 +0200
Subject: Use restructuredText formatting for docstrings. (This used to be
 commit 0cc58decd74d20f3d7dff93ddef1c8bce4d49ad0)

---
 source4/scripting/python/samba/__init__.py  | 2 ++
 source4/scripting/python/samba/idmap.py     | 2 ++
 source4/scripting/python/samba/provision.py | 2 ++
 source4/scripting/python/samba/samba3.py    | 2 ++
 source4/scripting/python/samba/samdb.py     | 2 ++
 source4/scripting/python/samba/upgrade.py   | 2 ++
 6 files changed, 12 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/__init__.py b/source4/scripting/python/samba/__init__.py
index 29afdb931d..c7d71d3747 100644
--- a/source4/scripting/python/samba/__init__.py
+++ b/source4/scripting/python/samba/__init__.py
@@ -20,6 +20,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
+__docformat__ = "restructuredText"
+
 import os
 
 def _in_source_tree():
diff --git a/source4/scripting/python/samba/idmap.py b/source4/scripting/python/samba/idmap.py
index 16efcd0470..755ec52c7b 100644
--- a/source4/scripting/python/samba/idmap.py
+++ b/source4/scripting/python/samba/idmap.py
@@ -20,6 +20,8 @@
 
 """Convenience functions for using the idmap database."""
 
+__docformat__ = "restructuredText"
+
 import samba
 import misc
 import ldb
diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index 69c7e8846d..68b43eff40 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -43,6 +43,8 @@ from ldb import SCOPE_SUBTREE, SCOPE_ONELEVEL, SCOPE_BASE, LdbError, \
 
 """Functions for setting up a Samba configuration."""
 
+__docformat__ = "restructuredText"
+
 DEFAULTSITE = "Default-First-Site-Name"
 
 class InvalidNetbiosName(Exception):
diff --git a/source4/scripting/python/samba/samba3.py b/source4/scripting/python/samba/samba3.py
index cffedb54af..9e802fa093 100644
--- a/source4/scripting/python/samba/samba3.py
+++ b/source4/scripting/python/samba/samba3.py
@@ -19,6 +19,8 @@
 
 """Support for reading Samba 3 data files."""
 
+__docformat__ = "restructuredText"
+
 REGISTRY_VALUE_PREFIX = "SAMBA_REGVAL"
 REGISTRY_DB_VERSION = 1
 
diff --git a/source4/scripting/python/samba/samdb.py b/source4/scripting/python/samba/samdb.py
index 198d1e9f5c..6465f49519 100644
--- a/source4/scripting/python/samba/samdb.py
+++ b/source4/scripting/python/samba/samdb.py
@@ -28,6 +28,8 @@ import ldb
 from samba.idmap import IDmapDB
 import pwd
 
+__docformat__ = "restructuredText"
+
 class SamDB(samba.Ldb):
     """The SAM database."""
 
diff --git a/source4/scripting/python/samba/upgrade.py b/source4/scripting/python/samba/upgrade.py
index f40f2cffe7..0c83604e82 100644
--- a/source4/scripting/python/samba/upgrade.py
+++ b/source4/scripting/python/samba/upgrade.py
@@ -7,6 +7,8 @@
 
 """Support code for upgrading from Samba 3 to Samba 4."""
 
+__docformat__ = "restructuredText"
+
 from provision import findnss, provision, FILL_DRS
 import grp
 import ldb
-- 
cgit 


From c159d1221bddec5c855fda9236913c18fc7a49fa Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Thu, 22 May 2008 18:47:32 +0200
Subject: Add docstrings to samba3 and getopt modules. (This used to be commit
 bdf1c039db6c184a9f275a6e4bf3786570cc924a)

---
 source4/scripting/python/samba/getopt.py | 15 +++++++++++++++
 source4/scripting/python/samba/samba3.py |  3 +++
 2 files changed, 18 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/getopt.py b/source4/scripting/python/samba/getopt.py
index 7ec684a9d6..9ecb66e21c 100644
--- a/source4/scripting/python/samba/getopt.py
+++ b/source4/scripting/python/samba/getopt.py
@@ -17,10 +17,15 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
+"""Support for parsing Samba-related command-line options."""
+
 import optparse
 from credentials import Credentials, AUTO_USE_KERBEROS, DONT_USE_KERBEROS, MUST_USE_KERBEROS
 
+__docformat__ = "restructuredText"
+
 class SambaOptions(optparse.OptionGroup):
+    """General Samba-related command line options."""
     def __init__(self, parser):
         optparse.OptionGroup.__init__(self, parser, "Samba Common Options")
         self.add_option("-s", "--configfile", action="callback",
@@ -29,12 +34,14 @@ class SambaOptions(optparse.OptionGroup):
         self._configfile = None
 
     def get_loadparm_path(self):
+        """Return the path to the smb.conf file specified on the command line.  """
         return self._configfile
 
     def _load_configfile(self, option, opt_str, arg, parser):
         self._configfile = arg
 
     def get_loadparm(self):
+        """Return a loadparm object with data specified on the command line.  """
         import os, param
         lp = param.LoadParm()
         if self._configfile is not None:
@@ -45,12 +52,15 @@ class SambaOptions(optparse.OptionGroup):
             lp.load_default()
         return lp
 
+
 class VersionOptions(optparse.OptionGroup):
+    """Command line option for printing Samba version."""
     def __init__(self, parser):
         optparse.OptionGroup.__init__(self, parser, "Version Options")
 
 
 class CredentialsOptions(optparse.OptionGroup):
+    """Command line options for specifying credentials."""
     def __init__(self, parser):
         self.no_pass = False
         optparse.OptionGroup.__init__(self, parser, "Credentials Options")
@@ -91,6 +101,11 @@ class CredentialsOptions(optparse.OptionGroup):
         self.creds.set_bind_dn(arg)
 
     def get_credentials(self, lp):
+        """Obtain the credentials set on the command-line.
+
+        :param lp: Loadparm object to use.
+        :return: Credentials object
+        """
         self.creds.guess(lp)
         if not self.no_pass:
             self.creds.set_cmdline_callbacks()
diff --git a/source4/scripting/python/samba/samba3.py b/source4/scripting/python/samba/samba3.py
index 9e802fa093..c1340b7760 100644
--- a/source4/scripting/python/samba/samba3.py
+++ b/source4/scripting/python/samba/samba3.py
@@ -309,6 +309,7 @@ class ShareInfoDatabase(TdbDatabase):
 
 
 class Shares:
+    """Container for share objects."""
     def __init__(self, lp, shareinfo):
         self.lp = lp
         self.shareinfo = shareinfo
@@ -494,6 +495,7 @@ class TdbSam(TdbDatabase):
         assert self.version in (0, 1, 2)
 
     def usernames(self):
+        """Iterate over the usernames in this Tdb database."""
         for k in self.tdb.keys():
             if k.startswith(TDBSAM_USER_PREFIX):
                 yield k[len(TDBSAM_USER_PREFIX):].rstrip("\0")
@@ -635,6 +637,7 @@ class WinsDatabase:
         return iter(self.entries)
 
     def items(self):
+        """Return the entries in this WINS database."""
         return self.entries.items()
 
     def close(self): # for consistency
-- 
cgit 


From 1a42178166e07add705da42ed1f936f95a7a4382 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Fri, 23 May 2008 00:45:50 +0200
Subject: dcerpc is now samba.dcerpc, avoid including source code in API
 documentation. (This used to be commit
 a28a8ed53557451749007a119e979f561c6b0f59)

---
 source4/scripting/python/config.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/config.mk b/source4/scripting/python/config.mk
index 73607eb76c..b494ee6e8d 100644
--- a/source4/scripting/python/config.mk
+++ b/source4/scripting/python/config.mk
@@ -29,7 +29,9 @@ $(foreach pyfile, $(_PY_FILES),$(eval $(call python_py_module_template,$(patsubs
 
 $(eval $(call python_py_module_template,samba/misc.py,$(pyscriptsrcdir)/misc.py))
 
+EPYDOC_OPTIONS = --no-private --url http://www.samba.org/ --no-sourcecode
+
 epydoc:: pythonmods
-	PYTHONPATH=$(pythonbuilddir) epydoc --no-private samba dcerpc tdb ldb subunit
+	PYTHONPATH=$(pythonbuilddir) epydoc $(EPYDOC_OPTIONS) samba tdb ldb subunit
 
 install:: installpython
-- 
cgit 


From 7cfcec2e9d8ea5ad9619848f60c846e805fb15a2 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Fri, 23 May 2008 02:44:42 +0200
Subject: Fix imports for minschema. (This used to be commit
 bda223a49e6bdeda68518cba27bc92df33784939)

---
 source4/scripting/bin/minschema.py | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/bin/minschema.py b/source4/scripting/bin/minschema.py
index 6dd5b42aff..111557126d 100755
--- a/source4/scripting/bin/minschema.py
+++ b/source4/scripting/bin/minschema.py
@@ -5,6 +5,8 @@
 
 import optparse
 
+import os, sys
+
 # Find right directory when running from source tree
 sys.path.insert(0, "bin/python")
 
-- 
cgit 


From 166105b0b6b4c23eeb563562c75abcd6fa8e01e2 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Fri, 23 May 2008 03:20:37 +0200
Subject: Fix bug after reprocessing swig files with newer version of SWIG.
 (This used to be commit 2155d76646f4235c8857460f562a9cc4cafe3ab1)

---
 source4/scripting/python/config.m4         | 2 +-
 source4/scripting/python/samba/__init__.py | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/config.m4 b/source4/scripting/python/config.m4
index 1a86951bfb..b599aaefb0 100644
--- a/source4/scripting/python/config.m4
+++ b/source4/scripting/python/config.m4
@@ -5,7 +5,7 @@ AC_ARG_VAR([PYTHON_VERSION],[The installed Python
 	will be appended to the Python interpreter
 	canonical name.])
 
-AC_PROG_SWIG(1.3.31)
+AC_PROG_SWIG(1.3.35)
 
 AC_PATH_PROG([PYTHON],[python[$PYTHON_VERSION]])
 if test -z "$PYTHON"; then
diff --git a/source4/scripting/python/samba/__init__.py b/source4/scripting/python/samba/__init__.py
index c7d71d3747..94f9e4d005 100644
--- a/source4/scripting/python/samba/__init__.py
+++ b/source4/scripting/python/samba/__init__.py
@@ -73,15 +73,15 @@ class Ldb(ldb.Ldb):
             self.set_modules_dir(default_ldb_modules_dir)
 
         if credentials is not None:
-            self.set_credentials(self, credentials)
+            self.set_credentials(credentials)
 
         if session_info is not None:
-            self.set_session_info(self, session_info)
+            self.set_session_info(session_info)
 
         assert misc.ldb_register_samba_handlers(self) == 0
 
         if lp is not None:
-            self.set_loadparm(self, lp)
+            self.set_loadparm(lp)
 
         def msg(l,text):
             print text
-- 
cgit 


From 27005cb7a2182c50c8bf9e683de1bea2613a3078 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Thu, 22 May 2008 05:13:31 +0200
Subject: Convert samr test to python. (This used to be commit
 88d473b202e82b462ef82ffdeb4f1710918ffda5)

---
 source4/scripting/bin/samr.py                      | 114 +++++++++++++++++++++
 source4/scripting/python/samba/tests/dcerpc/sam.py |   2 +
 2 files changed, 116 insertions(+)
 create mode 100755 source4/scripting/bin/samr.py

(limited to 'source4/scripting')

diff --git a/source4/scripting/bin/samr.py b/source4/scripting/bin/samr.py
new file mode 100755
index 0000000000..118cf759fe
--- /dev/null
+++ b/source4/scripting/bin/samr.py
@@ -0,0 +1,114 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+
+# Unix SMB/CIFS implementation.
+# Copyright © Jelmer Vernooij <jelmer@samba.org> 2008
+#
+# Based on samr.js © Andrew Tridgell <tridge@samba.org>
+#   
+# 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/>.
+#
+
+import sys
+
+sys.path.insert(0, "bin/python")
+
+from samba.dcerpc import samr, security
+
+def FillUserInfo(samr, dom_handle, users, level):
+    """fill a user array with user information from samrQueryUserInfo"""
+    for i in range(len(users)):
+        user_handle = samr.OpenUser(handle, security.SEC_FLAG_MAXIMUM_ALLOWED, users[i].idx)
+        info = samr.QueryUserInfo(user_handle, level)
+        info.name = users[i].name
+        info.idx  = users[i].idx
+        users[i] = info
+        samr.Close(user_handle)
+
+def toArray((handle, array, num_entries)):
+    ret = []
+    for x in range(num_entries):
+        ret.append((array.entries[x].idx, array.entries[x].name))
+    return ret
+    
+
+def test_Connect(samr):
+    """test the samr_Connect interface"""
+    print "Testing samr_Connect"
+    return samr.Connect2(None, security.SEC_FLAG_MAXIMUM_ALLOWED)
+
+def test_LookupDomain(samr, handle, domain):
+    """test the samr_LookupDomain interface"""
+    print "Testing samr_LookupDomain"
+    return samr.LookupDomain(handle, domain)
+
+def test_OpenDomain(samr, handle, sid):
+    """test the samr_OpenDomain interface"""
+    print "Testing samr_OpenDomain"
+    return samr.OpenDomain(handle, security.SEC_FLAG_MAXIMUM_ALLOWED, sid)
+
+def test_EnumDomainUsers(samr, dom_handle):
+    """test the samr_EnumDomainUsers interface"""
+    print "Testing samr_EnumDomainUsers"
+    users = toArray(samr.EnumDomainUsers(dom_handle, 0, 0, -1))
+    print "Found %d users" % len(users)
+    for idx, user in users:
+        print "\t%s\t(%d)" % (user, idx)
+
+def test_EnumDomainGroups(samr, dom_handle):
+    """test the samr_EnumDomainGroups interface"""
+    print "Testing samr_EnumDomainGroups"
+    groups = toArray(samr.EnumDomainGroups(dom_handle, 0, 0, -1))
+    print "Found %d groups" % len(groups)
+    for idx, group in groups:
+        print "\t" + group + "\t(" + idx + ")"
+
+def test_domain_ops(samr, dom_handle):
+    """test domain specific ops"""
+    test_EnumDomainUsers(samr, dom_handle)
+    test_EnumDomainGroups(samr, dom_handle)
+
+def test_EnumDomains(samr, handle):
+    """test the samr_EnumDomains interface"""
+    print "Testing samr_EnumDomains"
+
+    domains = toArray(samr.EnumDomains(handle, 0, -1))
+    print "Found %d domains" % len(domains)
+    for idx, domain in domains:
+        print "\t%s (%d)" % (domain, idx)
+    for idx, domain in domains:
+        print "Testing domain %s" % domain
+        sid = samr.LookupDomain(handle, domain)
+        dom_handle = test_OpenDomain(samr, handle, sid)
+        test_domain_ops(samr, dom_handle)
+        samr.Close(dom_handle)
+
+if len(sys.argv) != 2:
+   print "Usage: samr.js <BINDING>"
+   sys.exit(1)
+
+binding = sys.argv[1]
+
+print "Connecting to " + binding
+try:
+    samr = samr.samr(binding)
+except Exception, e:
+    print "Failed to connect to %s: %s" % (binding, e.message)
+    sys.exit(1)
+
+handle = test_Connect(samr)
+test_EnumDomains(samr, handle)
+samr.Close(handle)
+
+print "All OK"
diff --git a/source4/scripting/python/samba/tests/dcerpc/sam.py b/source4/scripting/python/samba/tests/dcerpc/sam.py
index a6816153c0..81300c9e81 100644
--- a/source4/scripting/python/samba/tests/dcerpc/sam.py
+++ b/source4/scripting/python/samba/tests/dcerpc/sam.py
@@ -26,3 +26,5 @@ class SamrTests(RpcInterfaceTestCase):
 
     def test_connect5(self):
         (level, info, handle) = self.conn.Connect5(None, 0, 1, samr.ConnectInfo1())
+
+
-- 
cgit 


From 5a5605afcdf94975d9acb9435034e91162a7d23e Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Thu, 22 May 2008 05:24:59 +0200
Subject: Remove unused ejs library functions. (This used to be commit
 57eec87b19428fd763033988d0ba671524d90c69)

---
 source4/scripting/libjs/samr.js   | 170 ----------------------
 source4/scripting/libjs/winreg.js | 291 --------------------------------------
 2 files changed, 461 deletions(-)
 delete mode 100644 source4/scripting/libjs/samr.js
 delete mode 100644 source4/scripting/libjs/winreg.js

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/samr.js b/source4/scripting/libjs/samr.js
deleted file mode 100644
index 6e8c70af3c..0000000000
--- a/source4/scripting/libjs/samr.js
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
-	samr rpc utility functions 
-	Copyright Andrew Tridgell 2005
-	released under the GNU GPL version 3 or later
-*/	
-
-if (global["HAVE_SAMR_JS"] != undefined) {
-   return;
-}
-HAVE_SAMR_JS=1
-
-/*
-  return a list of names and indexes from a samArray
-*/
-function samArray(output)
-{
-	var list = new Array(output.num_entries);
-	if (output.sam == NULL) {
-		return list;
-	}
-	var i, entries = output.sam.entries;
-	for (i=0;i<output.num_entries;i++) {
-		list[i] = new Object();
-                list[i].name = entries[i].name;
-                list[i].idx  = entries[i].idx;
-	}
-	return list;
-}
-
-/*
-	connect to the sam database
-*/
-function samrConnect(conn)
-{
-	security_init(conn);
-	var io = irpcObj();
-	io.input.system_name = NULL;
-	io.input.access_mask = conn.SEC_FLAG_MAXIMUM_ALLOWED;
-	var status = conn.samr_Connect2(io);
-	check_status_ok(status);
-	return io.output.connect_handle;
-}
-
-/*
-	close a handle
-*/
-function samrClose(conn, handle)
-{
-	var io = irpcObj();
-	io.input.handle = handle;
-	var status = conn.samr_Close(io);
-	check_status_ok(status);
-}
-
-/*
-   get the sid for a domain
-*/
-function samrLookupDomain(conn, handle, domain)
-{
-	var io = irpcObj();
-	io.input.connect_handle = handle;
-	io.input.domain_name = domain;
-	var status = conn.samr_LookupDomain(io);
-	check_status_ok(status);
-	return io.output.sid;
-}
-
-/*
-  open a domain by sid
-*/
-function samrOpenDomain(conn, handle, sid)
-{
-	var io = irpcObj();
-	io.input.connect_handle = handle;
-	io.input.access_mask = conn.SEC_FLAG_MAXIMUM_ALLOWED;
-	io.input.sid = sid;
-	var status = conn.samr_OpenDomain(io);
-	check_status_ok(status);
-	return io.output.domain_handle;
-}
-
-/*
-  open a user by rid
-*/
-function samrOpenUser(conn, handle, rid)
-{
-	var io = irpcObj();
-	io.input.domain_handle = handle;
-	io.input.access_mask = conn.SEC_FLAG_MAXIMUM_ALLOWED;
-	io.input.rid = rid;
-	var status = conn.samr_OpenUser(io);
-	check_status_ok(status);
-	return io.output.user_handle;
-}
-
-/*
-  return a list of all users
-*/
-function samrEnumDomainUsers(conn, dom_handle)
-{
-	var io = irpcObj();
-	io.input.domain_handle = dom_handle;
-	io.input.resume_handle = 0;
-	io.input.acct_flags = 0;
-	io.input.max_size = -1;
-	var status = conn.samr_EnumDomainUsers(io);
-	check_status_ok(status);
-	return samArray(io.output);
-}
-
-/*
-  return a list of all groups
-*/
-function samrEnumDomainGroups(conn, dom_handle)
-{
-	var io = irpcObj();
-	io.input.domain_handle = dom_handle;
-	io.input.resume_handle = 0;
-	io.input.acct_flags = 0;
-	io.input.max_size = -1;
-	var status = conn.samr_EnumDomainGroups(io);
-	check_status_ok(status);
-	return samArray(io.output);
-}
-
-/*
-  return a list of domains
-*/
-function samrEnumDomains(conn, handle)
-{
-	var io = irpcObj();
-	io.input.connect_handle = handle;
-	io.input.resume_handle = 0;
-	io.input.buf_size = -1;
-	var status = conn.samr_EnumDomains(io);
-	check_status_ok(status);
-	return samArray(io.output);
-}
-
-/*
-  return information about a user
-*/
-function samrQueryUserInfo(conn, user_handle, level)
-{
-	var r, io = irpcObj();
-	io.input.user_handle = user_handle;
-	io.input.level = level;
-	var status = conn.samr_QueryUserInfo(io);
-	check_status_ok(status);
-	return io.output.info.info3;
-}
-
-
-/*
-  fill a user array with user information from samrQueryUserInfo
-*/
-function samrFillUserInfo(conn, dom_handle, users, level)
-{
-	var i;
-	for (i=0;i<users.length;i++) {
-		var r, user_handle, info;
-		user_handle = samrOpenUser(conn, dom_handle, users[i].idx);
-		info = samrQueryUserInfo(conn, user_handle, level);
-		info.name = users[i].name;
-		info.idx  = users[i].idx;
-		users[i] = info;
-		samrClose(conn, user_handle);
-	}
-}
-
diff --git a/source4/scripting/libjs/winreg.js b/source4/scripting/libjs/winreg.js
deleted file mode 100644
index 9db415694d..0000000000
--- a/source4/scripting/libjs/winreg.js
+++ /dev/null
@@ -1,291 +0,0 @@
-/*
-	winreg rpc utility functions 
-	Copyright Andrew Tridgell 2005
-	released under the GNU GPL version 3 or later
-*/	
-
-libinclude("base.js");
-
-/*
-  close a handle
-*/
-function __winreg_close(handle)
-{
-	var io = irpcObj();
-	io.input.handle = handle;
-	this.winreg_CloseKey(io);
-}
-
-
-/*
-  open a hive
-*/
-function __winreg_open_hive(hive)
-{
-	var io = irpcObj();
-	io.input.system_name = NULL;
-	io.input.access_mask = this.SEC_FLAG_MAXIMUM_ALLOWED;
-	var status;
-	if (hive == "HKLM") {
-		status = this.winreg_OpenHKLM(io);
-	} else if (hive == "HKCR") {
-		status = this.winreg_OpenHKCR(io);
-	} else if (hive == "HKPD") {
-		status = this.winreg_OpenHKPD(io);
-	} else if (hive == "HKU") {
-		status = this.winreg_OpenHKU(io);
-	} else {
-		this._last_error = "Unknown hive " + hive;
-		return undefined;
-	}
-	if (!status.is_ok) {
-		return undefined;
-	}
-	return io.output.handle;
-}
-
-/*
-  open a handle to a path
-*/
-function __winreg_open_path(path)
-{
-	var s = string_init();
-	var i, components = s.split('\\', path);
-
-	/* cope with a leading slash */
-	if (components[0] == '') {
-		for (i=0;i<(components.length-1);i++) {
-			components[i] = components[i+1];
-		}
-		delete(components[i]);
-	}
-	
-	if (components.length == 0) {
-		return undefined;
-	}
-
-	var handle = this.open_hive(components[0]);
-	if (handle == undefined) {
-		return undefined;
-	}
-
-	if (components.length == 1) {
-		return handle;
-	}
-
-	var hpath = components[1];
-
-	for (i=2;i<components.length;i++) {
-		hpath = hpath + "\\" + components[i];
-	}
-
-	io = irpcObj();
-	io.input.parent_handle  = handle;
-	io.input.keyname = hpath;
-	io.input.unknown = 0;
-	io.input.access_mask = this.SEC_FLAG_MAXIMUM_ALLOWED;
-	var status = this.winreg_OpenKey(io);
-
-	this.close(handle);
-
-	if (!status.is_ok) {
-		return undefined;
-	}
-	if (io.output.result != "WERR_OK") {
-		return undefined;
-	}
-	
-	return io.output.handle;
-}
-
-/*
-	return a list of keys for a winreg server given a path
-	usage:
-	   list = reg.enum_path(path);
-*/
-function __winreg_enum_path(path)
-{
-	var list = new Array(0);
-
-	if (path == null || path == "\\" || path == "") {
-		return new Array("HKLM", "HKU");
-	}
-	
-	var handle = this.open_path(path);
-	if (handle == undefined) {
-		return undefined;
-	}
-
-	var io = irpcObj();
-	io.input.handle            = handle;
-	io.input.name = new Object();
-	io.input.name.length = 0;
-	io.input.name.size   = 32;
-	io.input.name.name   = NULL;
-	io.input.keyclass = new Object();
-	io.input.keyclass.length = 0;
-	io.input.keyclass.size   = 1024;
-	io.input.keyclass.name   = NULL;
-	io.input.last_changed_time = 0;
-
-	var idx = 0;
-	for (idx=0;idx >= 0;idx++) {
-		io.input.enum_index = idx;
-		var status = this.winreg_EnumKey(io);
-		if (!status.is_ok) {
-			this.close(handle);
-			return list;
-		}
-		var out = io.output;
-		if (out.result == "WERR_MORE_DATA") {
-			io.input.name.size = io.input.name.size * 2;
-			idx--;
-			if (io.input.name.size > 32000) {
-				this.close(handle);
-				return list;
-			}
-			continue;
-		}
-		if (out.result != "WERR_OK") {
-			this.close(handle);
-			return list;
-		}
-		list[list.length] = out.name.name;
-	}
-
-	this.close(handle);
-	return list;
-}
-
-
-/*
-	return a list of values for a winreg server given a path
-	usage:
-	   list = reg.enum_values(path);
-
-	each returned list element is an object containing a name, a
-	type and a value
-*/
-function __winreg_enum_values(path)
-{
-	var data = datablob_init();
-	var list = new Array(0);
-
-	var handle = this.open_path(path);
-	if (handle == undefined) {
-		return undefined;
-	}
-
-	var io = irpcObj();
-	io.input.handle      = handle;
-	io.input.name        = new Object();
-	io.input.name.length = 0;
-	io.input.name.size   = 128;
-	io.input.name.name   = "";
-	io.input.type        = 0;
-	io.input.value       = new Array(0);
-	io.input.size        = 1024;
-	io.input.length      = 0;
-
-	var idx;
-	for (idx=0;idx >= 0;idx++) {
-		io.input.enum_index = idx;
-		var status = this.winreg_EnumValue(io);
-		if (!status.is_ok) {
-			this.close(handle);
-			return list;
-		}
-		var out = io.output;
-		if (out.result == "WERR_MORE_DATA") {
-			io.input.size = io.input.size * 2;
-			io.input.name.size = io.input.name.size * 2;
-			idx--;
-			/* limit blobs to 1M */
-			if (io.input.size > 1000000) {
-				this.close(handle);
-				return list;
-			}
-			continue;
-		}
-		if (out.result != "WERR_OK") {
-			this.close(handle);
-			return list;
-		}
-		var el   = new Object();
-		el.name  = out.name.name;
-		el.type  = out.type;
-		el.rawvalue = out.value;
-		el.value = data.regToVar(el.rawvalue, el.type);
-		el.size  = out.size;
-		list[list.length] = el;
-	}
-
-	this.close(handle);
-	return list;
-}
-
-
-/*
-  create a new key
-    ok = reg.create_key(path, key);
-*/
-function __winreg_create_key(path, key)
-{
-	var handle = this.open_path(path);
-	if (handle == undefined) {
-		return undefined;
-	}
-
-	var io = irpcObj();
-	io.input.handle = handle;
-	io.input.name = key;
-	io.input.keyclass = NULL;
-	io.input.options = 0;
-	io.input.access_mask = this.SEC_FLAG_MAXIMUM_ALLOWED;
-	io.input.secdesc = NULL;
-	io.input.action_taken = 0;	
-
-	var status = this.winreg_CreateKey(io);
-	this.close(handle);
-	if (!status.is_ok) {
-		return false;
-	}
-	if (io.output.result != "WERR_OK") {
-		return false;
-	}
-	this.close(io.output.new_handle);
-	return true;
-}
-
-
-/*
-  return a string for a winreg type
-*/
-function __winreg_typestring(type)
-{
-	return this.typenames[type];
-}
-
-/*
-  initialise the winreg lib, returning an object
-*/
-function winregObj()
-{
-	var reg = winreg_init();
-	security_init(reg);
-
-	reg.typenames = new Array("REG_NONE", "REG_SZ", "REG_EXPAND_SZ", "REG_BINARY", 
-				  "REG_DWORD", "REG_DWORD_BIG_ENDIAN", "REG_LINK", "REG_MULTI_SZ",
-				  "REG_RESOURCE_LIST", "REG_FULL_RESOURCE_DESCRIPTOR", 
-				  "REG_RESOURCE_REQUIREMENTS_LIST", "REG_QWORD");
-
-	reg.close       = __winreg_close;
-	reg.open_hive   = __winreg_open_hive;
-	reg.open_path   = __winreg_open_path;
-	reg.enum_path   = __winreg_enum_path;
-	reg.enum_values = __winreg_enum_values;
-	reg.create_key  = __winreg_create_key;
-	reg.typestring  = __winreg_typestring;
-
-	return reg;
-}
-- 
cgit 


From 6ccb9785e7e1b2374a0121b5c70a2969b120a926 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Thu, 22 May 2008 12:21:26 +0200
Subject: Add another test toe the python samr testsuite. (This used to be
 commit 480884c696c676bb978e9197271b99cc03bb66e6)

---
 source4/scripting/python/samba/tests/dcerpc/sam.py | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/tests/dcerpc/sam.py b/source4/scripting/python/samba/tests/dcerpc/sam.py
index 81300c9e81..e685f9b4f4 100644
--- a/source4/scripting/python/samba/tests/dcerpc/sam.py
+++ b/source4/scripting/python/samba/tests/dcerpc/sam.py
@@ -1,7 +1,8 @@
 #!/usr/bin/python
+# -*- coding: utf-8 -*-
 
 # Unix SMB/CIFS implementation.
-# Copyright (C) Jelmer Vernooij <jelmer@samba.org> 2008
+# Copyright © Jelmer Vernooij <jelmer@samba.org> 2008
 #   
 # 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
@@ -17,9 +18,17 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-from samba.dcerpc import samr
+from samba.dcerpc import samr, security
 from samba.tests import RpcInterfaceTestCase
 
+# FIXME: Pidl should be doing this for us
+def toArray((handle, array, num_entries)):
+    ret = []
+    for x in range(num_entries):
+        ret.append((array.entries[x].idx, array.entries[x].name))
+    return ret
+
+
 class SamrTests(RpcInterfaceTestCase):
     def setUp(self):
         self.conn = samr.samr("ncalrpc:", self.get_loadparm())
@@ -27,4 +36,11 @@ class SamrTests(RpcInterfaceTestCase):
     def test_connect5(self):
         (level, info, handle) = self.conn.Connect5(None, 0, 1, samr.ConnectInfo1())
 
+    def test_connect2(self):
+        (level, info, handle) = self.conn.Connect2(None, security.SEC_FLAG_MAXIMUM_ALLOWED)
+
+    def test_EnumDomains(self):
+        handle = self.conn.Connect2(None, security.SEC_FLAG_MAXIMUM_ALLOWED)
+        domains = toArray(self.conn.EnumDomains(handle, 0, -1))
+        self.conn.Close(handle)
 
-- 
cgit 


From 9adcd8c25e7e51ac7e4767763750c67e334bcdbb Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Fri, 23 May 2008 13:13:36 +0200
Subject: UFollow conventions for __repr__ contents for talloc python wrapper.
 (This used to be commit f2d437d646d0694498c14bc951f9745c4ecd902d)

---
 source4/scripting/python/pytalloc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/pytalloc.c b/source4/scripting/python/pytalloc.c
index aa0ae9bf90..d669eb0f24 100644
--- a/source4/scripting/python/pytalloc.c
+++ b/source4/scripting/python/pytalloc.c
@@ -41,5 +41,5 @@ PyObject *py_talloc_default_repr(PyObject *py_obj)
 	py_talloc_Object *obj = (py_talloc_Object *)py_obj;
 	PyTypeObject *type = (PyTypeObject*)PyObject_Type((PyObject *)obj);
 
-	return PyString_FromFormat("<%s>", type->tp_name);
+	return PyString_FromFormat("<%s talloc object at 0x%x>", type->tp_name, (intptr_t)py_obj);
 }
-- 
cgit 


From dff31b1dc0ec1aea8cec9d5764f4f3a4c109a848 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Fri, 23 May 2008 15:09:51 +0200
Subject: Create new context in pytalloc to avoid problems with talloc_free()
 freeing the wrong parent of a pointer. (This used to be commit
 3f628f4dc9a57326442ebe2d2eaac9d279043aa6)

---
 source4/scripting/python/pytalloc.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/pytalloc.c b/source4/scripting/python/pytalloc.c
index d669eb0f24..ca476e9604 100644
--- a/source4/scripting/python/pytalloc.c
+++ b/source4/scripting/python/pytalloc.c
@@ -24,6 +24,7 @@ void py_talloc_dealloc(PyObject* self)
 {
 	py_talloc_Object *obj = (py_talloc_Object *)self;
 	talloc_free(obj->talloc_ctx);
+	obj->talloc_ctx = NULL;
 	PyObject_Del(self);
 }
 
@@ -31,7 +32,13 @@ PyObject *py_talloc_import_ex(PyTypeObject *py_type, TALLOC_CTX *mem_ctx,
 						   void *ptr)
 {
 	py_talloc_Object *ret = PyObject_New(py_talloc_Object, py_type);
-	ret->talloc_ctx = talloc_reference(NULL, mem_ctx); 
+	ret->talloc_ctx = talloc_new(NULL);
+	if (ret->talloc_ctx == NULL) {
+		return NULL;
+	}
+	if (talloc_reference(ret->talloc_ctx, mem_ctx) == NULL) {
+		return NULL;
+	}
 	ret->ptr = ptr;
 	return (PyObject *)ret;
 }
-- 
cgit 


From 5eed56d0ad5245a346ea564bc34e882828394611 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Fri, 23 May 2008 15:10:35 +0200
Subject: Fix bugs in samr python tests. (This used to be commit
 09c6b106ac144820b8c072bda4dad3d8e2145ff0)

---
 source4/scripting/bin/samr.py                      | 6 +++---
 source4/scripting/python/samba/tests/dcerpc/sam.py | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/bin/samr.py b/source4/scripting/bin/samr.py
index 118cf759fe..e91b5bc312 100755
--- a/source4/scripting/bin/samr.py
+++ b/source4/scripting/bin/samr.py
@@ -24,7 +24,7 @@ import sys
 
 sys.path.insert(0, "bin/python")
 
-from samba.dcerpc import samr, security
+from samba.dcerpc import samr, security, lsa
 
 def FillUserInfo(samr, dom_handle, users, level):
     """fill a user array with user information from samrQueryUserInfo"""
@@ -69,10 +69,10 @@ def test_EnumDomainUsers(samr, dom_handle):
 def test_EnumDomainGroups(samr, dom_handle):
     """test the samr_EnumDomainGroups interface"""
     print "Testing samr_EnumDomainGroups"
-    groups = toArray(samr.EnumDomainGroups(dom_handle, 0, 0, -1))
+    groups = toArray(samr.EnumDomainGroups(dom_handle, 0, 0))
     print "Found %d groups" % len(groups)
     for idx, group in groups:
-        print "\t" + group + "\t(" + idx + ")"
+        print "\t%s\t(%d)" % (group, idx)
 
 def test_domain_ops(samr, dom_handle):
     """test domain specific ops"""
diff --git a/source4/scripting/python/samba/tests/dcerpc/sam.py b/source4/scripting/python/samba/tests/dcerpc/sam.py
index e685f9b4f4..50e00a3f9e 100644
--- a/source4/scripting/python/samba/tests/dcerpc/sam.py
+++ b/source4/scripting/python/samba/tests/dcerpc/sam.py
@@ -37,7 +37,7 @@ class SamrTests(RpcInterfaceTestCase):
         (level, info, handle) = self.conn.Connect5(None, 0, 1, samr.ConnectInfo1())
 
     def test_connect2(self):
-        (level, info, handle) = self.conn.Connect2(None, security.SEC_FLAG_MAXIMUM_ALLOWED)
+        handle = self.conn.Connect2(None, security.SEC_FLAG_MAXIMUM_ALLOWED)
 
     def test_EnumDomains(self):
         handle = self.conn.Connect2(None, security.SEC_FLAG_MAXIMUM_ALLOWED)
-- 
cgit 


From e3d000f3bfad4126ab781f15848fff3bbd8abcc5 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Fri, 23 May 2008 16:29:08 +0200
Subject: Some more PEP improvements. (This used to be commit
 015ca850df9b4c8112b033130023909b1d0b78b7)

---
 source4/scripting/python/samba/provision.py | 35 +++++++++++++++--------------
 1 file changed, 18 insertions(+), 17 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index fe9b582d56..fdcc3dad77 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -1111,7 +1111,7 @@ def provision_become_dc(setup_dir=None,
     return provision(setup_dir, message, system_session(), None,
               smbconf=smbconf, targetdir=targetdir, samdb_fill=FILL_DRS, realm=realm, 
               rootdn=rootdn, domaindn=domaindn, schemadn=schemadn, configdn=configdn, serverdn=serverdn,
-              domain=domain, hostname=hostname, hostip="127.0.0.1", domainsid=domainsid, machinepass=machinepass, serverrole="domain controller", sitename=sitename);
+              domain=domain, hostname=hostname, hostip="127.0.0.1", domainsid=domainsid, machinepass=machinepass, serverrole="domain controller", sitename=sitename)
     
 
 def setup_db_config(setup_path, dbdir):
@@ -1120,9 +1120,9 @@ def setup_db_config(setup_path, dbdir):
     :param setup_path: Setup path function.
     :param dbdir: Database directory."""
     if not os.path.isdir(os.path.join(dbdir, "bdb-logs")):
-        os.makedirs(os.path.join(dbdir, "bdb-logs"), 0700);
+        os.makedirs(os.path.join(dbdir, "bdb-logs"), 0700)
     if not os.path.isdir(os.path.join(dbdir, "tmp")):
-        os.makedirs(os.path.join(dbdir, "tmp"), 0700);
+        os.makedirs(os.path.join(dbdir, "tmp"), 0700)
     
     setup_file(setup_path("DB_CONFIG"), os.path.join(dbdir, "DB_CONFIG"),
                {"LDAPDBDIR": dbdir})
@@ -1145,8 +1145,9 @@ def provision_backend(setup_dir=None, message=None,
         root = findnss(pwd.getpwnam, ["root"])[0]
 
     if smbconf is None:
-        os.makedirs(os.path.join(targetdir, "etc"))
-        smbconf = os.path.join(targetdir, "etc", "smb.conf")
+        etcdir = os.path.join(targetdir, "etc")
+        os.makedirs(etcdir)
+        smbconf = os.path.join(etcdir, "smb.conf")
 
     # only install a new smb.conf if there isn't one there already
     if not os.path.exists(smbconf):
@@ -1220,20 +1221,18 @@ def provision_backend(setup_dir=None, message=None,
        
     elif ldap_backend_type == "openldap":
         attrs = ["linkID", "lDAPDisplayName"]
-    res = schemadb.search(expression="(&(&(linkID=*)(!(linkID:1.2.840.113556.1.4.803:=1)))(objectclass=attributeSchema))", base=names.schemadn, scope=SCOPE_SUBTREE, attrs=attrs);
+    res = schemadb.search(expression="(&(&(linkID=*)(!(linkID:1.2.840.113556.1.4.803:=1)))(objectclass=attributeSchema))", base=names.schemadn, scope=SCOPE_SUBTREE, attrs=attrs)
 
-    memberof_config = "# Generated from schema in " + schemadb_path + "\n";
-    refint_attributes = "";
+    memberof_config = "# Generated from schema in %s\n" % schemadb_path
+    refint_attributes = ""
     for i in range (0, len(res)):
-            linkid = res[i]["linkID"][0]
-            linkid = str(int(linkid) + 1)
-            expression = "(&(objectclass=attributeSchema)(linkID=" + (linkid) + "))"
+            expression = "(&(objectclass=attributeSchema)(linkID=%d))" % (int(res[i]["linkID"][0])+1)
             target = schemadb.searchone(basedn=names.schemadn, 
                                         expression=expression, 
                                         attribute="lDAPDisplayName", 
-                                        scope=SCOPE_SUBTREE);
+                                        scope=SCOPE_SUBTREE)
             if target is not None:
-                refint_attributes = refint_attributes + " " + target + " " + res[i]["lDAPDisplayName"][0];
+                refint_attributes = refint_attributes + " " + target + " " + res[i]["lDAPDisplayName"][0]
                 memberof_config = memberof_config + """overlay memberof
 memberof-dangling error
 memberof-refint TRUE
@@ -1242,11 +1241,11 @@ memberof-member-ad """ + res[i]["lDAPDisplayName"][0] + """
 memberof-memberof-ad """ + target + """
 memberof-dangling-error 32
 
-""";
+"""
 
     memberof_config = memberof_config + """
 overlay refint
-refint_attributes""" + refint_attributes + "\n";
+refint_attributes""" + refint_attributes + "\n"
     
     setup_file(setup_path("slapd.conf"), paths.slapdconf,
                    {"DNSDOMAIN": names.dnsdomain,
@@ -1273,12 +1272,12 @@ refint_attributes""" + refint_attributes + "\n";
             server_port_string = ""
         slapdcommand="Start slapd with:    slapd -f " + paths.ldapdir + "/slapd.conf -h " + ldapi_uri + server_port_string
 
-    schema_command = "bin/ad2oLschema --option=convert:target=" + ldap_backend_type + " -I " + setup_path(mapping) + " -H tdb://" + schemadb_path + " -O " + os.path.join(paths.ldapdir, backend_schema);
+    schema_command = "bin/ad2oLschema --option=convert:target=" + ldap_backend_type + " -I " + setup_path(mapping) + " -H tdb://" + schemadb_path + " -O " + os.path.join(paths.ldapdir, backend_schema)
 
     os.system(schema_command)
 
 
-    message("Your %s Backend for Samba4 is now configured, and is ready to be started" % ( ldap_backend_type) )
+    message("Your %s Backend for Samba4 is now configured, and is ready to be started" % ldap_backend_type)
     message("Server Role:         %s" % serverrole)
     message("Hostname:            %s" % names.hostname)
     message("DNS Domain:          %s" % names.dnsdomain)
@@ -1337,6 +1336,7 @@ def create_zone_file(path, setup_path, dnsdomain, domaindn,
             "HOSTIP6_HOST_LINE": hostip6_host_line,
         })
 
+
 def create_named_conf(path, setup_path, realm, dnsdomain,
                       private_dir, keytab_name):
     """Write out a file containing zone statements suitable for inclusion in a
@@ -1375,6 +1375,7 @@ def create_krb5_conf(path, setup_path, dnsdomain, hostname, realm):
             "REALM": realm,
         })
 
+
 def load_schema(setup_path, samdb, schemadn, netbiosname, configdn, sitename):
     """Load schema for the SamDB.
     
-- 
cgit 


From a203ee1ab18ea68c6df436f8bb9fc0772611d5d1 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Fri, 23 May 2008 16:43:26 +0200
Subject: Fix indentation, add docstring in provisioning script. (This used to
 be commit 86a8a085496c292b390c0d6362e3e4d9980df83f)

---
 source4/scripting/python/samba/provision.py | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index fdcc3dad77..a4730d8a07 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -48,6 +48,7 @@ __docformat__ = "restructuredText"
 DEFAULTSITE = "Default-First-Site-Name"
 
 class InvalidNetbiosName(Exception):
+    """A specified name was not a valid NetBIOS name."""
     def __init__(self, name):
         super(InvalidNetbiosName, self).__init__("The name '%r' is not a valid NetBIOS name" % name)
 
@@ -1233,7 +1234,7 @@ def provision_backend(setup_dir=None, message=None,
                                         scope=SCOPE_SUBTREE)
             if target is not None:
                 refint_attributes = refint_attributes + " " + target + " " + res[i]["lDAPDisplayName"][0]
-                memberof_config = memberof_config + """overlay memberof
+                memberof_config += """overlay memberof
 memberof-dangling error
 memberof-refint TRUE
 memberof-group-oc top
@@ -1243,7 +1244,7 @@ memberof-dangling-error 32
 
 """
 
-    memberof_config = memberof_config + """
+    memberof_config += """
 overlay refint
 refint_attributes""" + refint_attributes + "\n"
     
@@ -1259,18 +1260,18 @@ refint_attributes""" + refint_attributes + "\n"
     setup_file(setup_path("modules.conf"), paths.modulesconf,
                    {"REALM": names.realm})
         
-        setup_db_config(setup_path, os.path.join(paths.ldapdir, os.path.join("db", "user")))
-        setup_db_config(setup_path, os.path.join(paths.ldapdir, os.path.join("db", "config")))
-        setup_db_config(setup_path, os.path.join(paths.ldapdir, os.path.join("db", "schema")))
-        mapping = "schema-map-openldap-2.3"
-        backend_schema = "backend-schema.schema"
-
-        ldapi_uri = "ldapi://" + urllib.quote(os.path.join(paths.private_dir, "ldap", "ldapi"), safe="")
-        if ldap_backend_port is not None:
-            server_port_string = " -h ldap://0.0.0.0:%d" % ldap_backend_port
-        else:
-            server_port_string = ""
-        slapdcommand="Start slapd with:    slapd -f " + paths.ldapdir + "/slapd.conf -h " + ldapi_uri + server_port_string
+    setup_db_config(setup_path, os.path.join(paths.ldapdir, os.path.join("db", "user")))
+    setup_db_config(setup_path, os.path.join(paths.ldapdir, os.path.join("db", "config")))
+    setup_db_config(setup_path, os.path.join(paths.ldapdir, os.path.join("db", "schema")))
+    mapping = "schema-map-openldap-2.3"
+    backend_schema = "backend-schema.schema"
+
+    ldapi_uri = "ldapi://" + urllib.quote(os.path.join(paths.private_dir, "ldap", "ldapi"), safe="")
+    if ldap_backend_port is not None:
+        server_port_string = " -h ldap://0.0.0.0:%d" % ldap_backend_port
+    else:
+        server_port_string = ""
+    slapdcommand="Start slapd with:    slapd -f " + paths.ldapdir + "/slapd.conf -h " + ldapi_uri + server_port_string
 
     schema_command = "bin/ad2oLschema --option=convert:target=" + ldap_backend_type + " -I " + setup_path(mapping) + " -H tdb://" + schemadb_path + " -O " + os.path.join(paths.ldapdir, backend_schema)
 
-- 
cgit 


From 73b789b6d25698dba15c867c71d0cdd8c264f352 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sat, 24 May 2008 04:01:57 +0200
Subject: Add docstrings to a couple more python modules. (This used to be
 commit b4560c90e5e8d3a35367d3a21d361dc4c9c0de23)

---
 source4/scripting/python/misc.i             |  5 ++++-
 source4/scripting/python/misc.py            | 12 +++++++++++-
 source4/scripting/python/misc_wrap.c        |  5 ++++-
 source4/scripting/python/samba/__init__.py  |  2 ++
 source4/scripting/python/samba/provision.py |  4 ++--
 5 files changed, 23 insertions(+), 5 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/misc.i b/source4/scripting/python/misc.i
index 9a4c124121..56b862552a 100644
--- a/source4/scripting/python/misc.i
+++ b/source4/scripting/python/misc.i
@@ -16,7 +16,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-%module(package="samba.misc") misc
+%module(docstring="Python bindings for miscellaneous Samba functions.",package="samba.misc") misc
 
 %{
 #include "includes.h"
@@ -37,6 +37,9 @@
 %import "../../libcli/security/security.i"
 %import "../../libcli/util/errors.i"
 
+%feature("docstring") generate_random_str "S.random_password(len) -> string\n" \
+                                          "Generate random password with specified length.";
+
 %rename(random_password) generate_random_str;
 char *generate_random_str(TALLOC_CTX *mem_ctx, size_t len);
 
diff --git a/source4/scripting/python/misc.py b/source4/scripting/python/misc.py
index 25e8d2de8c..0c14944001 100644
--- a/source4/scripting/python/misc.py
+++ b/source4/scripting/python/misc.py
@@ -3,6 +3,10 @@
 #
 # Don't modify this file, modify the SWIG interface instead.
 
+"""
+Python bindings for miscellaneous Samba functions.
+"""
+
 import _misc
 import new
 new_instancemethod = new.instancemethod
@@ -61,7 +65,13 @@ import ldb
 import credentials
 import param
 import security
-random_password = _misc.random_password
+
+def random_password(*args, **kwargs):
+  """
+    S.random_password(len) -> string
+    Generate random password with specified length.
+    """
+  return _misc.random_password(*args, **kwargs)
 
 def ldb_set_credentials(*args, **kwargs):
   """
diff --git a/source4/scripting/python/misc_wrap.c b/source4/scripting/python/misc_wrap.c
index 22a072fc6f..8c57237e5b 100644
--- a/source4/scripting/python/misc_wrap.c
+++ b/source4/scripting/python/misc_wrap.c
@@ -3216,7 +3216,10 @@ fail:
 
 
 static PyMethodDef SwigMethods[] = {
-	 { (char *)"random_password", (PyCFunction) _wrap_random_password, METH_VARARGS | METH_KEYWORDS, NULL},
+	 { (char *)"random_password", (PyCFunction) _wrap_random_password, METH_VARARGS | METH_KEYWORDS, (char *)"\n"
+		"S.random_password(len) -> string\n"
+		"Generate random password with specified length.\n"
+		""},
 	 { (char *)"ldb_set_credentials", (PyCFunction) _wrap_ldb_set_credentials, METH_VARARGS | METH_KEYWORDS, (char *)"\n"
 		"S.set_credentials(credentials)\n"
 		"Set credentials to use when connecting.\n"
diff --git a/source4/scripting/python/samba/__init__.py b/source4/scripting/python/samba/__init__.py
index 94f9e4d005..e191227108 100644
--- a/source4/scripting/python/samba/__init__.py
+++ b/source4/scripting/python/samba/__init__.py
@@ -20,6 +20,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
+"""Samba 4."""
+
 __docformat__ = "restructuredText"
 
 import os
diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index a4730d8a07..3914fa8376 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -22,6 +22,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
+"""Functions for setting up a Samba configuration."""
+
 from base64 import b64encode
 import os
 import pwd
@@ -41,8 +43,6 @@ import urllib
 from ldb import SCOPE_SUBTREE, SCOPE_ONELEVEL, SCOPE_BASE, LdbError, \
         LDB_ERR_NO_SUCH_OBJECT, timestring, CHANGETYPE_MODIFY, CHANGETYPE_NONE
 
-"""Functions for setting up a Samba configuration."""
-
 __docformat__ = "restructuredText"
 
 DEFAULTSITE = "Default-First-Site-Name"
-- 
cgit 


From 6f6234c79f062edf05f82aec5bdca6bc35aa1cf4 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sat, 24 May 2008 18:19:41 +0200
Subject: Remove remaining EJS RPC code, was unused. (This used to be commit
 c994fa427fdd1e9682a5ad506aafc77f942122d1)

---
 source4/scripting/ejs/config.mk       |   8 +-
 source4/scripting/ejs/ejsrpc.c        | 424 ----------------------------------
 source4/scripting/ejs/ejsrpc.h        | 172 --------------
 source4/scripting/ejs/smbcalls_rpc.c  | 385 ------------------------------
 source4/scripting/libjs/management.js | 157 -------------
 5 files changed, 1 insertion(+), 1145 deletions(-)
 delete mode 100644 source4/scripting/ejs/ejsrpc.c
 delete mode 100644 source4/scripting/ejs/ejsrpc.h
 delete mode 100644 source4/scripting/ejs/smbcalls_rpc.c
 delete mode 100644 source4/scripting/libjs/management.js

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/config.mk b/source4/scripting/ejs/config.mk
index c1a1ca1f0f..873dd09248 100644
--- a/source4/scripting/ejs/config.mk
+++ b/source4/scripting/ejs/config.mk
@@ -1,7 +1,3 @@
-[SUBSYSTEM::EJSRPC]
-
-EJSRPC_OBJ_FILES = $(ejsscriptsrcdir)/ejsrpc.o
-
 [MODULE::smbcalls_config]
 OUTPUT_TYPE = MERGED_OBJ
 SUBSYSTEM = smbcalls
@@ -83,16 +79,14 @@ mkinclude ejsnet/config.mk
 [SUBSYSTEM::smbcalls]
 PRIVATE_DEPENDENCIES = \
 		EJS LIBSAMBA-UTIL \
-		EJSRPC MESSAGING \
+		MESSAGING \
 		LIBSAMBA-NET LIBCLI_SMB LIBPOPT \
 		CREDENTIALS POPT_CREDENTIALS POPT_SAMBA \
-		dcerpc \
 		NDR_TABLE
 
 smbcalls_OBJ_FILES = $(addprefix $(ejsscriptsrcdir)/, \
 		smbcalls.o \
 		smbcalls_cli.o \
-		smbcalls_rpc.o \
 		smbcalls_options.o \
 		smbcalls_creds.o \
 		smbcalls_param.o \
diff --git a/source4/scripting/ejs/ejsrpc.c b/source4/scripting/ejs/ejsrpc.c
deleted file mode 100644
index c7c02dbd64..0000000000
--- a/source4/scripting/ejs/ejsrpc.c
+++ /dev/null
@@ -1,424 +0,0 @@
-/* 
-   Unix SMB/CIFS implementation.
-
-   provide interfaces to rpc calls from ejs scripts
-
-   Copyright (C) Andrew Tridgell 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/>.
-*/
-
-#include "includes.h"
-#include "lib/appweb/ejs/ejs.h"
-#include "scripting/ejs/smbcalls.h"
-#include "librpc/gen_ndr/lsa.h"
-#include "librpc/gen_ndr/winreg.h"
-#include "scripting/ejs/ejsrpc.h"
-#include "libcli/security/security.h"
-
-/*
-  set the switch var to be used by the next union switch
-*/
-void ejs_set_switch(struct ejs_rpc *ejs, uint32_t switch_var)
-{
-	ejs->switch_var = switch_var;
-}
-
-/*
-  panic in the ejs wrapper code
- */
-NTSTATUS ejs_panic(struct ejs_rpc *ejs, const char *why)
-{
-	ejsSetErrorMsg(ejs->eid, "rpc_call '%s' failed - %s", ejs->callname, why);
-	return NT_STATUS_INTERNAL_ERROR;
-}
-
-/*
-  start the ejs pull process for a structure
-*/
-NTSTATUS ejs_pull_struct_start(struct ejs_rpc *ejs, struct MprVar **v, const char *name)
-{
-	return mprGetVar(v, name);
-}
-
-
-/*
-  start the ejs push process for a structure
-*/
-NTSTATUS ejs_push_struct_start(struct ejs_rpc *ejs, struct MprVar **v, const char *name)
-{
-	EJS_CHECK(mprSetVar(*v, name, mprObject(name)));
-	return mprGetVar(v, name);
-}
-
-/*
-  pull a uint8 from a mpr variable to a C element
-*/
-NTSTATUS ejs_pull_uint8(struct ejs_rpc *ejs, 
-			struct MprVar *v, const char *name, uint8_t *r)
-{
-	EJS_CHECK(mprGetVar(&v, name));
-	*r = mprVarToInteger(v);
-	return NT_STATUS_OK;
-	
-}
-
-NTSTATUS ejs_push_uint8(struct ejs_rpc *ejs, 
-			struct MprVar *v, const char *name, const uint8_t *r)
-{
-	return mprSetVar(v, name, mprCreateIntegerVar(*r));
-}
-
-/*
-  pull a uint16 from a mpr variable to a C element
-*/
-NTSTATUS ejs_pull_uint16(struct ejs_rpc *ejs, 
-			 struct MprVar *v, const char *name, uint16_t *r)
-{
-	EJS_CHECK(mprGetVar(&v, name));
-	*r = mprVarToInteger(v);
-	return NT_STATUS_OK;
-	
-}
-
-NTSTATUS ejs_push_uint16(struct ejs_rpc *ejs, 
-			 struct MprVar *v, const char *name, const uint16_t *r)
-{
-	return mprSetVar(v, name, mprCreateIntegerVar(*r));
-}
-
-/*
-  pull a uint32 from a mpr variable to a C element
-*/
-NTSTATUS ejs_pull_uint32(struct ejs_rpc *ejs, 
-			 struct MprVar *v, const char *name, uint32_t *r)
-{
-	EJS_CHECK(mprGetVar(&v, name));
-	*r = mprVarToInteger(v);
-	return NT_STATUS_OK;
-}
-
-NTSTATUS ejs_push_uint32(struct ejs_rpc *ejs, 
-			 struct MprVar *v, const char *name, const uint32_t *r)
-{
-	return mprSetVar(v, name, mprCreateIntegerVar(*r));
-}
-
-/*
-  pull a int32 from a mpr variable to a C element
-*/
-NTSTATUS ejs_pull_int32(struct ejs_rpc *ejs, 
-			 struct MprVar *v, const char *name, int32_t *r)
-{
-	EJS_CHECK(mprGetVar(&v, name));
-	*r = mprVarToInteger(v);
-	return NT_STATUS_OK;
-}
-
-NTSTATUS ejs_push_int32(struct ejs_rpc *ejs, 
-			 struct MprVar *v, const char *name, const int32_t *r)
-{
-	return mprSetVar(v, name, mprCreateIntegerVar(*r));
-}
-
-/*
-  pull a uint32 from a mpr variable to a C element
-*/
-NTSTATUS ejs_pull_time_t(struct ejs_rpc *ejs, 
-			 struct MprVar *v, const char *name, time_t *r)
-{
-	EJS_CHECK(mprGetVar(&v, name));
-	*r = mprVarToInteger(v);
-	return NT_STATUS_OK;
-}
-
-NTSTATUS ejs_push_time_t(struct ejs_rpc *ejs, 
-			 struct MprVar *v, const char *name, const time_t *r)
-{
-	return mprSetVar(v, name, mprCreateIntegerVar(*r));
-}
-
-NTSTATUS ejs_pull_hyper(struct ejs_rpc *ejs, 
-			struct MprVar *v, const char *name, uint64_t *r)
-{
-	EJS_CHECK(mprGetVar(&v, name));
-	*r = mprVarToNumber(v);
-	return NT_STATUS_OK;
-}
-
-NTSTATUS ejs_push_hyper(struct ejs_rpc *ejs, 
-			struct MprVar *v, const char *name, const uint64_t *r)
-{
-	return mprSetVar(v, name, mprCreateNumberVar(*r));
-}
-
-NTSTATUS ejs_pull_dlong(struct ejs_rpc *ejs, 
-			struct MprVar *v, const char *name, int64_t *r)
-{
-	return ejs_pull_hyper(ejs, v, name, (uint64_t *)r);
-}
-
-NTSTATUS ejs_push_dlong(struct ejs_rpc *ejs, 
-			struct MprVar *v, const char *name, const int64_t *r)
-{
-	return ejs_push_hyper(ejs, v, name, (const uint64_t *)r);
-}
-
-NTSTATUS ejs_pull_udlong(struct ejs_rpc *ejs, 
-			struct MprVar *v, const char *name, uint64_t *r)
-{
-	return ejs_pull_hyper(ejs, v, name, r);
-}
-
-NTSTATUS ejs_push_udlong(struct ejs_rpc *ejs, 
-			struct MprVar *v, const char *name, const uint64_t *r)
-{
-	return ejs_push_hyper(ejs, v, name, r);
-}
-
-NTSTATUS ejs_pull_NTTIME(struct ejs_rpc *ejs, 
-			struct MprVar *v, const char *name, uint64_t *r)
-{
-	return ejs_pull_hyper(ejs, v, name, r);
-}
-
-NTSTATUS ejs_push_NTTIME(struct ejs_rpc *ejs, 
-			struct MprVar *v, const char *name, const uint64_t *r)
-{
-	return ejs_push_hyper(ejs, v, name, r);
-}
-
-NTSTATUS ejs_push_WERROR(struct ejs_rpc *ejs, 
-			struct MprVar *v, const char *name, const WERROR *r)
-{
-	return ejs_push_string(ejs, v, name, win_errstr(*r));
-}
-
-NTSTATUS ejs_push_NTSTATUS(struct ejs_rpc *ejs, 
-			   struct MprVar *v, const char *name, const NTSTATUS *r)
-{
-	return ejs_push_string(ejs, v, name, nt_errstr(*r));
-}
-
-
-/*
-  pull a enum from a mpr variable to a C element
-  a enum is just treating as an unsigned integer at this level
-*/
-NTSTATUS ejs_pull_enum(struct ejs_rpc *ejs, 
-		       struct MprVar *v, const char *name, unsigned *r)
-{
-	EJS_CHECK(mprGetVar(&v, name));
-	*r = mprVarToInteger(v);
-	return NT_STATUS_OK;
-	
-}
-
-NTSTATUS ejs_push_enum(struct ejs_rpc *ejs, 
-		       struct MprVar *v, const char *name, const unsigned *r)
-{
-	return mprSetVar(v, name, mprCreateIntegerVar(*r));
-}
-
-
-/*
-  pull a string
-*/
-NTSTATUS ejs_pull_string(struct ejs_rpc *ejs, 
-			 struct MprVar *v, const char *name, const char **s)
-{
-	EJS_CHECK(mprGetVar(&v, name));
-	*s = mprToString(v);
-	return NT_STATUS_OK;
-}
-
-/*
-  push a string
-*/
-NTSTATUS ejs_push_string(struct ejs_rpc *ejs, 
-			 struct MprVar *v, const char *name, const char *s)
-{
-	return mprSetVar(v, name, mprString(s));
-}
-
-
-/*
-  pull a ipv4address (internally a string)
-*/
-NTSTATUS ejs_pull_ipv4address(struct ejs_rpc *ejs, 
-			      struct MprVar *v, const char *name, const char **s)
-{
-	return ejs_pull_string(ejs, v, name, s);
-}
-
-/*
-  push a ipv4address (internally a string)
-*/
-NTSTATUS ejs_push_ipv4address(struct ejs_rpc *ejs, 
-			 struct MprVar *v, const char *name, const char *s)
-{
-	return ejs_push_string(ejs, v, name, s);
-}
-
-
-NTSTATUS ejs_pull_dom_sid(struct ejs_rpc *ejs, 
-			  struct MprVar *v, const char *name, struct dom_sid *r)
-{
-	struct dom_sid *sid;
-	EJS_CHECK(mprGetVar(&v, name));
-	sid = dom_sid_parse_talloc(ejs, mprToString(v));
-	NT_STATUS_HAVE_NO_MEMORY(sid);
-	*r = *sid;
-	return NT_STATUS_OK;
-}
-
-NTSTATUS ejs_push_dom_sid(struct ejs_rpc *ejs, 
-			  struct MprVar *v, const char *name, const struct dom_sid *r)
-{
-	char *sidstr = dom_sid_string(ejs, r);
-	NT_STATUS_HAVE_NO_MEMORY(sidstr);
-	return mprSetVar(v, name, mprString(sidstr));
-}
-
-NTSTATUS ejs_pull_GUID(struct ejs_rpc *ejs, 
-		       struct MprVar *v, const char *name, struct GUID *r)
-{
-	EJS_CHECK(mprGetVar(&v, name));
-	return GUID_from_string(mprToString(v), r);
-}
-
-NTSTATUS ejs_push_GUID(struct ejs_rpc *ejs, 
-		       struct MprVar *v, const char *name, const struct GUID *r)
-{
-	char *guid = GUID_string(ejs, r);
-	NT_STATUS_HAVE_NO_MEMORY(guid);
-	return mprSetVar(v, name, mprString(guid));
-}
-
-NTSTATUS ejs_push_null(struct ejs_rpc *ejs, struct MprVar *v, const char *name)
-{
-	return mprSetVar(v, name, mprCreatePtrVar(NULL));
-}
-
-bool ejs_pull_null(struct ejs_rpc *ejs, struct MprVar *v, const char *name)
-{
-	NTSTATUS status = mprGetVar(&v, name);
-	if (!NT_STATUS_IS_OK(status)) {
-		return false;
-	}
-	if (v->type == MPR_TYPE_PTR && v->ptr == NULL) {
-		return true;
-	}
-	return false;
-}
-
-/*
-  pull a lsa_String
-*/
-NTSTATUS ejs_pull_lsa_String(struct ejs_rpc *ejs, 
-			     struct MprVar *v, const char *name, struct lsa_String *r)
-{
-	return ejs_pull_string(ejs, v, name, &r->string);
-}
-
-/*
-  push a lsa_String
-*/
-NTSTATUS ejs_push_lsa_String(struct ejs_rpc *ejs, 
-			     struct MprVar *v, const char *name, const struct lsa_String *r)
-{
-	return ejs_push_string(ejs, v, name, r->string);
-}
-
-/*
-  pull a winreg_String
-*/
-NTSTATUS ejs_pull_winreg_String(struct ejs_rpc *ejs, 
-			     struct MprVar *v, const char *name, struct winreg_String *r)
-{
-	return ejs_pull_string(ejs, v, name, &r->name);
-}
-
-/*
-  push a winreg_String
-*/
-NTSTATUS ejs_push_winreg_String(struct ejs_rpc *ejs, 
-			     struct MprVar *v, const char *name, const struct winreg_String *r)
-{
-	return ejs_push_string(ejs, v, name, r->name);
-}
-
-NTSTATUS ejs_pull_DATA_BLOB(struct ejs_rpc *ejs, 
-			    struct MprVar *v, const char *name, DATA_BLOB *r)
-{
-	return NT_STATUS_NOT_IMPLEMENTED;
-}
-
-NTSTATUS ejs_push_DATA_BLOB(struct ejs_rpc *ejs, 
-			    struct MprVar *v, const char *name, 
-			    const DATA_BLOB *r)
-{
-	return NT_STATUS_NOT_IMPLEMENTED;
-}
-
-NTSTATUS ejs_pull_bool(struct ejs_rpc *ejs, 
-		       struct MprVar *v, const char *name, bool *r)
-{
-	EJS_CHECK(mprGetVar(&v, name));
-	*r = mprVarToBool(v);
-	return NT_STATUS_OK;
-}
-
-NTSTATUS ejs_push_bool(struct ejs_rpc *ejs, 
-		       struct MprVar *v, const char *name, const bool *r)
-{
-	return mprSetVar(v, name, mprCreateBoolVar(*r));
-}
-
-
-/*
-  pull a uint8 array from a mpr variable to a C element - treating as a data blob
-*/
-NTSTATUS ejs_pull_array_uint8(struct ejs_rpc *ejs, 
-			      struct MprVar *v, const char *name, 
-			      uint8_t *r, uint32_t length)
-{
-	NTSTATUS status;
-	DATA_BLOB *blob;
-
-	status = mprGetVar(&v, name);
-	NT_STATUS_NOT_OK_RETURN(status);
-
-	blob = mprToDataBlob(v);
-	if (blob == NULL) {
-		return NT_STATUS_OBJECT_NAME_INVALID;
-	}
-	if (blob->length != length) {
-		return NT_STATUS_INFO_LENGTH_MISMATCH;
-	}
-	memcpy(r, blob->data, length);
-	return NT_STATUS_OK;
-	
-}
-
-NTSTATUS ejs_push_array_uint8(struct ejs_rpc *ejs, 
-			      struct MprVar *v, const char *name, 
-			      const uint8_t *r, uint32_t length)
-{
-	DATA_BLOB blob;
-	blob.data = (uint8_t *)discard_const(r);
-	blob.length = length;
-	mprSetVar(v, name, mprDataBlob(blob));
-	return NT_STATUS_OK;
-}
diff --git a/source4/scripting/ejs/ejsrpc.h b/source4/scripting/ejs/ejsrpc.h
deleted file mode 100644
index cc22a26700..0000000000
--- a/source4/scripting/ejs/ejsrpc.h
+++ /dev/null
@@ -1,172 +0,0 @@
-/* 
-   Unix SMB/CIFS implementation.
-
-   ejs <-> rpc interface definitions
-
-   Copyright (C) Andrew Tridgell 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/>.
-*/
-
-#include "librpc/gen_ndr/security.h"
-#include "librpc/rpc/dcerpc.h"
-
-struct ejs_rpc {
-	int eid;
-	const char *callname;
-	/* as ejs does only one pass, we can use a single var for switch 
-	   handling */
-	uint32_t switch_var;
-};
-
-typedef NTSTATUS (*ejs_pull_t)(struct ejs_rpc *, struct MprVar *, const char *, void *);
-typedef NTSTATUS (*ejs_push_t)(struct ejs_rpc *, struct MprVar *, const char *, const void *);
-typedef NTSTATUS (*ejs_pull_function_t)(struct ejs_rpc *, struct MprVar *, void *);
-typedef NTSTATUS (*ejs_push_function_t)(struct ejs_rpc *, struct MprVar *, const void *);
-
-NTSTATUS ejs_panic(struct ejs_rpc *ejs, const char *why);
-void ejs_set_switch(struct ejs_rpc *ejs, uint32_t switch_var);
-
-NTSTATUS smbcalls_register_ejs(const char *name, MprCFunction fn);
-
-
-int ejs_rpc_call(int eid, int argc, struct MprVar **argv,
-		 const struct ndr_interface_table *iface, int callnum,
-		 ejs_pull_function_t ejs_pull, ejs_push_function_t ejs_push);
-
-NTSTATUS ejs_pull_struct_start(struct ejs_rpc *ejs, struct MprVar **v, const char *name);
-NTSTATUS ejs_push_struct_start(struct ejs_rpc *ejs, struct MprVar **v, const char *name);
-
-NTSTATUS ejs_pull_uint8(struct ejs_rpc *ejs, 
-			struct MprVar *v, const char *name, uint8_t *r);
-NTSTATUS ejs_push_uint8(struct ejs_rpc *ejs, 
-			struct MprVar *v, const char *name, const uint8_t *r);
-NTSTATUS ejs_pull_uint16(struct ejs_rpc *ejs, 
-			 struct MprVar *v, const char *name, uint16_t *r);
-NTSTATUS ejs_push_uint16(struct ejs_rpc *ejs, 
-			 struct MprVar *v, const char *name, const uint16_t *r);
-NTSTATUS ejs_pull_uint32(struct ejs_rpc *ejs, 
-			 struct MprVar *v, const char *name, uint32_t *r);
-NTSTATUS ejs_push_int32(struct ejs_rpc *ejs, 
-			 struct MprVar *v, const char *name, const int32_t *r);
-NTSTATUS ejs_pull_int32(struct ejs_rpc *ejs, 
-			 struct MprVar *v, const char *name, int32_t *r);
-NTSTATUS ejs_push_uint32(struct ejs_rpc *ejs, 
-			 struct MprVar *v, const char *name, const uint32_t *r);
-NTSTATUS ejs_pull_hyper(struct ejs_rpc *ejs, 
-			struct MprVar *v, const char *name, uint64_t *r);
-NTSTATUS ejs_push_hyper(struct ejs_rpc *ejs, 
-			struct MprVar *v, const char *name, const uint64_t *r);
-NTSTATUS ejs_pull_dlong(struct ejs_rpc *ejs, 
-			struct MprVar *v, const char *name, int64_t *r);
-NTSTATUS ejs_push_dlong(struct ejs_rpc *ejs, 
-			struct MprVar *v, const char *name, const int64_t *r);
-NTSTATUS ejs_pull_udlong(struct ejs_rpc *ejs, 
-			struct MprVar *v, const char *name, uint64_t *r);
-NTSTATUS ejs_push_udlong(struct ejs_rpc *ejs, 
-			struct MprVar *v, const char *name, const uint64_t *r);
-NTSTATUS ejs_pull_NTTIME(struct ejs_rpc *ejs, 
-			struct MprVar *v, const char *name, uint64_t *r);
-NTSTATUS ejs_push_NTTIME(struct ejs_rpc *ejs, 
-			struct MprVar *v, const char *name, const uint64_t *r);
-NTSTATUS ejs_pull_time_t(struct ejs_rpc *ejs, 
-			 struct MprVar *v, const char *name, time_t *r);
-NTSTATUS ejs_push_time_t(struct ejs_rpc *ejs, 
-			struct MprVar *v, const char *name, const time_t *r);
-NTSTATUS ejs_pull_enum(struct ejs_rpc *ejs, 
-		       struct MprVar *v, const char *name, unsigned *r);
-NTSTATUS ejs_push_enum(struct ejs_rpc *ejs, 
-		       struct MprVar *v, const char *name, const unsigned *r);
-NTSTATUS ejs_pull_string(struct ejs_rpc *ejs, 
-			 struct MprVar *v, const char *name, const char **s);
-NTSTATUS ejs_push_string(struct ejs_rpc *ejs, 
-			 struct MprVar *v, const char *name, const char *s);
-NTSTATUS ejs_pull_ipv4address(struct ejs_rpc *ejs, 
-			 struct MprVar *v, const char *name, const char **s);
-NTSTATUS ejs_push_ipv4address(struct ejs_rpc *ejs, 
-			 struct MprVar *v, const char *name, const char *s);
-void ejs_set_constant_int(int eid, const char *name, int value);
-void ejs_set_constant_string(int eid, const char *name, const char *value);
-
-NTSTATUS ejs_pull_dom_sid(struct ejs_rpc *ejs, 
-			  struct MprVar *v, const char *name, struct dom_sid *r);
-NTSTATUS ejs_push_dom_sid(struct ejs_rpc *ejs, 
-			  struct MprVar *v, const char *name, const struct dom_sid *r);
-NTSTATUS ejs_push_null(struct ejs_rpc *ejs, struct MprVar *v, const char *name);
-bool ejs_pull_null(struct ejs_rpc *ejs, struct MprVar *v, const char *name);
-NTSTATUS ejs_push_WERROR(struct ejs_rpc *ejs, 
-			 struct MprVar *v, const char *name, const WERROR *r);
-NTSTATUS ejs_push_NTSTATUS(struct ejs_rpc *ejs, 
-			 struct MprVar *v, const char *name, const NTSTATUS *r);
-NTSTATUS ejs_pull_DATA_BLOB(struct ejs_rpc *ejs, 
-			    struct MprVar *v, const char *name, DATA_BLOB *r);
-NTSTATUS ejs_push_DATA_BLOB(struct ejs_rpc *ejs, 
-			    struct MprVar *v, const char *name, const DATA_BLOB *r);
-NTSTATUS ejs_pull_bool(struct ejs_rpc *ejs, 
-		       struct MprVar *v, const char *name, bool *r);
-NTSTATUS ejs_push_bool(struct ejs_rpc *ejs, 
-		       struct MprVar *v, const char *name, const bool *r);
-
-NTSTATUS ejs_pull_array_uint8(struct ejs_rpc *ejs, 
-			      struct MprVar *v, const char *name, 
-			      uint8_t *r, uint32_t length);
-NTSTATUS ejs_push_array_uint8(struct ejs_rpc *ejs, 
-			      struct MprVar *v, const char *name, 
-			      const uint8_t *r, uint32_t length);
-
-NTSTATUS ejs_pull_GUID(struct ejs_rpc *ejs, 
-		       struct MprVar *v, const char *name, struct GUID *r);
-NTSTATUS ejs_push_GUID(struct ejs_rpc *ejs, 
-		       struct MprVar *v, const char *name, const struct GUID *r);
-
-struct lsa_String;
-NTSTATUS ejs_pull_lsa_String(struct ejs_rpc *ejs, 
-			    struct MprVar *v, const char *name, struct lsa_String *r);
-NTSTATUS ejs_push_lsa_String(struct ejs_rpc *ejs, 
-			    struct MprVar *v, const char *name, const struct lsa_String *r);
-
-struct winreg_String;
-NTSTATUS ejs_pull_winreg_String(struct ejs_rpc *ejs, 
-			     struct MprVar *v, const char *name, struct winreg_String *r);
-NTSTATUS ejs_push_winreg_String(struct ejs_rpc *ejs, 
-			     struct MprVar *v, const char *name, const struct winreg_String *r);
-
-#define EJS_ALLOC(ejs, s) do { \
-  (s) = talloc_ptrtype(ejs, (s)); \
-  if (!(s)) return ejs_panic(ejs, "out of memory"); \
-} while (0)
-
-#define EJS_ALLOC_N(ejs, s, n) do { \
-	(s) = talloc_array_ptrtype(ejs, (s), n); \
-	if (!(s)) return ejs_panic(ejs, "out of memory"); \
-} while (0)
-
-#define EJS_CHECK(cmd) do { \
-	NTSTATUS _status; \
-	_status = cmd; \
-	if (!NT_STATUS_IS_OK(_status)) { \
-		return _status; \
-	} \
-} while (0)
-
-/* some types are equivalent for ejs */
-#define ejs_pull_dom_sid2 ejs_pull_dom_sid
-#define ejs_push_dom_sid2 ejs_push_dom_sid
-#define ejs_pull_dom_sid28 ejs_pull_dom_sid
-#define ejs_push_dom_sid28 ejs_push_dom_sid
-#define ejs_pull_NTTIME_hyper ejs_pull_NTTIME
-#define ejs_push_NTTIME_hyper ejs_push_NTTIME
-#define ejs_pull_NTTIME_1sec ejs_pull_NTTIME
-#define ejs_push_NTTIME_1sec ejs_push_NTTIME
-
diff --git a/source4/scripting/ejs/smbcalls_rpc.c b/source4/scripting/ejs/smbcalls_rpc.c
deleted file mode 100644
index 94774d708b..0000000000
--- a/source4/scripting/ejs/smbcalls_rpc.c
+++ /dev/null
@@ -1,385 +0,0 @@
-/* 
-   Unix SMB/CIFS implementation.
-
-   provide interfaces to rpc calls from ejs scripts
-
-   Copyright (C) Andrew Tridgell 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/>.
-*/
-
-#include "includes.h"
-#include "scripting/ejs/smbcalls.h"
-#include "lib/appweb/ejs/ejs.h"
-#include "librpc/gen_ndr/echo.h"
-#include "lib/cmdline/popt_common.h"
-#include "lib/messaging/irpc.h"
-#include "scripting/ejs/ejsrpc.h"
-#include "lib/util/dlinklist.h"
-#include "lib/events/events.h"
-#include "librpc/ndr/ndr_table.h"
-#include "auth/credentials/credentials.h"
-#include "librpc/rpc/dcerpc.h"
-#include "cluster/cluster.h"
-
-/*
-  state of a irpc 'connection'
-*/
-struct ejs_irpc_connection {
-	const char *server_name;
-	struct server_id *dest_ids;
-	struct messaging_context *msg_ctx;
-};
-
-/*
-  messaging clients need server IDs as well ...
- */
-#define EJS_ID_BASE 0x30000000
-
-/*
-  setup a context for talking to a irpc server
-     example: 
-        status = irpc.connect("smb_server");
-*/
-static int ejs_irpc_connect(MprVarHandle eid, int argc, char **argv)
-{
-	NTSTATUS status;
-	int i;
-	struct event_context *ev;
-	struct ejs_irpc_connection *p;
-	struct MprVar *this = mprGetProperty(ejsGetLocalObject(eid), "this", 0);
-
-	/* validate arguments */
-	if (argc != 1) {
-		ejsSetErrorMsg(eid, "rpc_connect invalid arguments");
-		return -1;
-	}
-
-	p = talloc(this, struct ejs_irpc_connection);
-	if (p == NULL) {
-		return -1;
-	}
-
-	p->server_name = argv[0];
-
-	ev = mprEventCtx();
-
-	/* create a messaging context, looping as we have no way to
-	   allocate temporary server ids automatically */
-	for (i=0;i<10000;i++) {
-		p->msg_ctx = messaging_init(p, 
-					    lp_messaging_path(p, mprLpCtx()),
-					    cluster_id(EJS_ID_BASE, i), 
-				            lp_iconv_convenience(mprLpCtx()),
-					    ev);
-		if (p->msg_ctx) break;
-	}
-	if (p->msg_ctx == NULL) {
-		ejsSetErrorMsg(eid, "irpc_connect unable to create a messaging context");
-		talloc_free(p);
-		return -1;
-	}
-
-	p->dest_ids = irpc_servers_byname(p->msg_ctx, p, p->server_name);
-	if (p->dest_ids == NULL || p->dest_ids[0].id == 0) {
-		talloc_free(p);
-		status = NT_STATUS_OBJECT_NAME_NOT_FOUND;
-	} else {
-		mprSetPtrChild(this, "irpc", p);
-		status = NT_STATUS_OK;
-	}
-
-	mpr_Return(eid, mprNTSTATUS(status));
-	return 0;
-}
-
-
-/*
-  connect to an rpc server
-     examples: 
-        status = rpc.connect("ncacn_ip_tcp:localhost");
-        status = rpc.connect("ncacn_ip_tcp:localhost", "pipe_name");
-*/
-static int ejs_rpc_connect(MprVarHandle eid, int argc, char **argv)
-{
-	const char *binding, *pipe_name;
-	const struct ndr_interface_table *iface;
-	NTSTATUS status;
-	struct dcerpc_pipe *p;
-	struct cli_credentials *creds;
-	struct event_context *ev;
-	struct MprVar *this = mprGetProperty(ejsGetLocalObject(eid), "this", 0);
-	struct MprVar *credentials;
-
-	/* validate arguments */
-	if (argc < 1) {
-		ejsSetErrorMsg(eid, "rpc_connect invalid arguments");
-		return -1;
-	}
-
-	binding    = argv[0];
-	if (strchr(binding, ':') == NULL) {
-		/* its an irpc connect */
-		return ejs_irpc_connect(eid, argc, argv);
-	}
-
-	if (argc > 1) {
-		pipe_name = argv[1];
-	} else {
-		pipe_name = mprToString(mprGetProperty(this, "pipe_name", NULL));
-	}
-
-	iface = ndr_table_by_name(pipe_name);
-	if (iface == NULL) {
-		status = NT_STATUS_OBJECT_NAME_INVALID;
-		goto done;
-	}
-
-	credentials = mprGetProperty(this, "credentials", NULL);
-	if (credentials) {
-		creds = (struct cli_credentials *)
-				mprGetPtr(credentials, "creds");
-	} else {
-		creds = cmdline_credentials;
-	}
-	if (creds == NULL) {
-		creds = cli_credentials_init(mprMemCtx());
-		cli_credentials_set_anonymous(creds);
-	}
-
-	ev = mprEventCtx();
-
-	status = dcerpc_pipe_connect(this, &p, binding, iface, creds, ev,
-				     mprLpCtx());
-	if (!NT_STATUS_IS_OK(status)) goto done;
-
-	/* callers don't allocate ref vars in the ejs interface */
-	p->conn->flags |= DCERPC_NDR_REF_ALLOC;
-
-	/* by making the pipe a child of the connection variable, it will
-	   auto close when it goes out of scope in the script */
-	mprSetPtrChild(this, "pipe", p);
-
-done:
-	mpr_Return(eid, mprNTSTATUS(status));
-	return 0;
-}
-
-
-/*
-  make an irpc call - called via the same interface as rpc
-*/
-static int ejs_irpc_call(int eid, struct MprVar *io, 
-			 const struct ndr_interface_table *iface, int callnum,
-			 ejs_pull_function_t ejs_pull, ejs_push_function_t ejs_push)
-{
-	NTSTATUS status;
-	void *ptr;
-	struct ejs_rpc *ejs;
-	const struct ndr_interface_call *call;
-	struct ejs_irpc_connection *p;
-	struct irpc_request **reqs;
-	int i, count;
-	struct MprVar *results;
-
-	p = (struct ejs_irpc_connection *)mprGetThisPtr(eid, "irpc");
-
-	ejs = talloc(mprMemCtx(), struct ejs_rpc);
-	if (ejs == NULL) {
-		status = NT_STATUS_NO_MEMORY;
-		goto done;
-	}
-
-	call = &iface->calls[callnum];
-
-	ejs->eid = eid;
-	ejs->callname = call->name;
-
-	/* allocate the C structure */
-	ptr = talloc_zero_size(ejs, call->struct_size);
-	if (ptr == NULL) {
-		status = NT_STATUS_NO_MEMORY;
-		goto done;
-	}
-
-	/* convert the mpr object into a C structure */
-	status = ejs_pull(ejs, io, ptr);
-	if (!NT_STATUS_IS_OK(status)) {
-		goto done;
-	}
-
-	for (count=0;p->dest_ids[count].id;count++) /* noop */ ;
-
-	/* we need to make a call per server */
-	reqs = talloc_array(ejs, struct irpc_request *, count);
-	if (reqs == NULL) {
-		status = NT_STATUS_NO_MEMORY;
-		goto done;
-	}
-
-	/* make the actual calls */
-	for (i=0;i<count;i++) {
-		reqs[i] = irpc_call_send(p->msg_ctx, p->dest_ids[i], 
-					 iface, callnum, ptr, ptr);
-		if (reqs[i] == NULL) {
-			status = NT_STATUS_NO_MEMORY;
-			goto done;
-		}
-		talloc_steal(reqs, reqs[i]);
-	}
-	
-	mprSetVar(io, "results", mprObject("results"));
-	results = mprGetProperty(io, "results", NULL);
-
-	/* and receive the results, placing them in io.results[i] */
-	for (i=0;i<count;i++) {
-		struct MprVar *output;
-
-		status = irpc_call_recv(reqs[i]);
-		if (!NT_STATUS_IS_OK(status)) {
-			goto done;
-		}
-		status = ejs_push(ejs, io, ptr);
-		if (!NT_STATUS_IS_OK(status)) {
-			goto done;
-		}
-
-		/* add to the results array */
-		output = mprGetProperty(io, "output", NULL);
-		if (output) {
-			char idx[16];
-			mprItoa(i, idx, sizeof(idx));
-			mprSetProperty(results, idx, output);
-			mprDeleteProperty(io, "output");
-		}
-	}
-	mprSetVar(results, "length", mprCreateIntegerVar(i));
-
-done:
-	talloc_free(ejs);
-	mpr_Return(eid, mprNTSTATUS(status));
-	if (NT_STATUS_EQUAL(status, NT_STATUS_INTERNAL_ERROR)) {
-		return -1;
-	}
-	return 0;
-}
-
-
-/*
-  backend code for making an rpc call - this is called from the pidl generated ejs
-  code
-*/
- int ejs_rpc_call(int eid, int argc, struct MprVar **argv,
-		  const struct ndr_interface_table *iface, int callnum,
-		  ejs_pull_function_t ejs_pull, ejs_push_function_t ejs_push)
-{
-	struct MprVar *io;
-	struct dcerpc_pipe *p;
-	NTSTATUS status;
-	void *ptr;
-	struct rpc_request *req;
-	struct ejs_rpc *ejs;
-	const struct ndr_interface_call *call;
-
-	if (argc != 1 || argv[0]->type != MPR_TYPE_OBJECT) {
-		ejsSetErrorMsg(eid, "rpc_call invalid arguments");
-		return -1;
-	}
-	    
-	io       = argv[0];
-
-	if (mprGetThisPtr(eid, "irpc")) {
-		/* its an irpc call */
-		return ejs_irpc_call(eid, io, iface, callnum, ejs_pull, ejs_push);
-	}
-
-	/* get the pipe info */
-	p = mprGetThisPtr(eid, "pipe");
-	if (p == NULL) {
-		ejsSetErrorMsg(eid, "rpc_call invalid pipe");
-		return -1;
-	}
-
-	ejs = talloc(mprMemCtx(), struct ejs_rpc);
-	if (ejs == NULL) {
-		status = NT_STATUS_NO_MEMORY;
-		goto done;
-	}
-
-	call = &iface->calls[callnum];
-
-	ejs->eid = eid;
-	ejs->callname = call->name;
-
-	/* allocate the C structure */
-	ptr = talloc_zero_size(ejs, call->struct_size);
-	if (ptr == NULL) {
-		status = NT_STATUS_NO_MEMORY;
-		goto done;
-	}
-
-	/* convert the mpr object into a C structure */
-	status = ejs_pull(ejs, io, ptr);
-	if (!NT_STATUS_IS_OK(status)) {
-		goto done;
-	}
-
-	/* make the actual call */
-	req = dcerpc_ndr_request_send(p, NULL, iface, callnum, ptr, ptr);
-
-	/* if requested, print the structure */
-	if (p->conn->flags & DCERPC_DEBUG_PRINT_IN) {
-		ndr_print_function_debug(call->ndr_print, call->name, NDR_IN, ptr);
-	}
-
-	if (req == NULL) {
-		status = NT_STATUS_NO_MEMORY;
-		goto done;
-	}
-
-	status = dcerpc_ndr_request_recv(req);
-	if (!NT_STATUS_IS_OK(status)) {
-		goto done;
-	}
-
-	/* print the 'out' structure, if needed */
-	if (p->conn->flags & DCERPC_DEBUG_PRINT_OUT) {
-		ndr_print_function_debug(call->ndr_print, call->name, NDR_OUT, ptr);
-	}
-
-	status = ejs_push(ejs, io, ptr);
-
-done:
-	talloc_free(ejs);
-	mpr_Return(eid, mprNTSTATUS(status));
-	if (NT_STATUS_EQUAL(status, NT_STATUS_INTERNAL_ERROR)) {
-		return -1;
-	}
-	return 0;
-}
-
-/*
-  hook called by generated RPC interfaces at the end of their init routines
-  used to add generic operations on the pipe
-*/
-int ejs_rpc_init(struct MprVar *obj, const char *name)
-{
-	ndr_table_init();
-
-	mprSetStringCFunction(obj, "connect", ejs_rpc_connect);
-	if (mprGetProperty(obj, "pipe_name", NULL) == NULL) {
-		mprSetVar(obj, "pipe_name", mprString(name));
-	}
-	return 0;
-}
diff --git a/source4/scripting/libjs/management.js b/source4/scripting/libjs/management.js
deleted file mode 100644
index 4a43275156..0000000000
--- a/source4/scripting/libjs/management.js
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
-	backend code for Samba4 management
-	Copyright Andrew Tridgell 2005
-	Released under the GNU GPL version 3 or later
-*/
-
-
-/*
-  return a list of current sessions 
-*/
-function smbsrv_sessions()
-{
-	var irpc = irpc_init();
-	status = irpc.connect("smb_server");
-	if (status.is_ok != true) {
-		return undefined;
-	}
-
-	var io = irpcObj();
-	io.input.level = irpc.SMBSRV_INFO_SESSIONS;
-	status = irpc.smbsrv_information(io);
-	if (status.is_ok != true) {
-		return undefined;
-	}
-
-	/* gather the results into a single array */
-	var i, count=0, ret = new Array(0);
-	for (i=0;i<io.results.length;i++) {
-		var sessions = io.results[i].info.sessions.sessions;
-		var j;
-		for (j=0;j<sessions.length;j++) {
-			ret[count] = sessions[j];
-			count++;
-		}
-	}
-	return ret;
-}
-
-/*
-  return a list of current tree connects
-*/
-function smbsrv_tcons()
-{
-	var irpc = irpc_init();
-	status = irpc.connect("smb_server");
-	if (status.is_ok != true) {
-		return undefined;
-	}
-
-	var io = irpcObj();
-	io.input.level = irpc.SMBSRV_INFO_TCONS;
-	status = irpc.smbsrv_information(io);
-	if (status.is_ok != true) {
-		return undefined;
-	}
-
-	/* gather the results into a single array */
-	var i, count=0, ret = new Object();
-	for (i=0;i<io.results.length;i++) {
-		var tcons = io.results[i].info.tcons.tcons;
-		var j;
-		for (j=0;j<tcons.length;j++) {
-			ret[count] = tcons[j];
-			count++;
-		}
-	}
-	ret.length = count;
-	return ret;
-}
-
-/*
-  return nbtd statistics
-*/
-function nbtd_statistics()
-{
-	var irpc = irpc_init();
-	status = irpc.connect("nbt_server");
-	if (status.is_ok != true) {
-		return undefined;
-	}
-
-	var io = irpcObj();
-	io.input.level = irpc.NBTD_INFO_STATISTICS;
-	status = irpc.nbtd_information(io);
-	if (status.is_ok != true) {
-		return undefined;
-	}
-	return io.results[0].info.stats;
-}
-
-/*
-  see if a service is enabled
-*/
-function service_enabled(name)
-{
-	var lp = loadparm_init();
-	var services = lp.get("server services");
-	var i;
-	for (i=0;i<services.length;i++) {
-		if (services[i] == name) {
-			return true;
-		}
-	}
-	return false;
-}
-
-/*
-  show status of a server
-*/
-function server_status(name)
-{
-	var i;
-	var io;
-	var irpc = irpc_init();
-
-	if (!service_enabled(name)) {
-		return "DISABLED";
-	}
-	
-	status = irpc.connect(name + "_server");
-	if (status.is_ok != true) {
-		return "DOWN";
-	}
-
-	var io = irpcObj();
-	status = irpc.irpc_uptime(io);
-	if (status.is_ok != true) {
-		return "NOT RESPONDING";
-	}
-
-	return "RUNNING";
-}
-
-/*
-  show status of a stream server
-*/
-function stream_server_status(name)
-{
-	var irpc = irpc_init();
-
-	if (!service_enabled(name)) {
-		return "DISABLED";
-	}
-	status = irpc.connect(name + "_server");
-	if (status.is_ok != true) {
-		return "0 connections";
-	}
-
-	var io = irpcObj();
-	status = irpc.irpc_uptime(io);
-	if (status.is_ok != true) {
-		return "NOT RESPONDING";
-	}
-
-	var n = io.results.length;
-	return sprintf("%u connection%s", n, plural(n));
-}
-- 
cgit 


From f76697ce89606aa4e5ba1bb13f1fda6e33998695 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sat, 24 May 2008 18:57:15 +0200
Subject: Add convenience functions for packing/unpacking structs in python.
 (This used to be commit c5d7d48b32bcebf8a0495cbd4556e30587fa589f)

---
 source4/scripting/python/samba/ndr.py | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 source4/scripting/python/samba/ndr.py

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/ndr.py b/source4/scripting/python/samba/ndr.py
new file mode 100644
index 0000000000..e93fbc3c2e
--- /dev/null
+++ b/source4/scripting/python/samba/ndr.py
@@ -0,0 +1,27 @@
+#!/usr/bin/python
+
+# Unix SMB/CIFS implementation.
+# Copyright © Jelmer Vernooij <jelmer@samba.org> 2008
+#   
+# 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/>.
+#
+
+def ndr_pack(object):
+    return object.__ndr_pack__()
+
+
+def ndr_unpack(cls, data):
+    object = cls()
+    object.__ndr_unpack__(data)
+    return object
-- 
cgit 


From 05194ccdf875ee70cb9ee3f7c27147503d585a6d Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sat, 24 May 2008 19:50:09 +0200
Subject: Add tests for new NDR pack/unpack functionality in Python DCE/RPC
 bindings. (This used to be commit 468d35827fd055c82c6d43d6ce6d3d561abed54d)

---
 source4/scripting/python/samba/ndr.py                  |  1 +
 source4/scripting/python/samba/tests/dcerpc/rpcecho.py | 12 ++++++++++++
 2 files changed, 13 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/ndr.py b/source4/scripting/python/samba/ndr.py
index e93fbc3c2e..e718ff3422 100644
--- a/source4/scripting/python/samba/ndr.py
+++ b/source4/scripting/python/samba/ndr.py
@@ -1,4 +1,5 @@
 #!/usr/bin/python
+# -*- coding: utf-8 -*-
 
 # Unix SMB/CIFS implementation.
 # Copyright © Jelmer Vernooij <jelmer@samba.org> 2008
diff --git a/source4/scripting/python/samba/tests/dcerpc/rpcecho.py b/source4/scripting/python/samba/tests/dcerpc/rpcecho.py
index 3b37f8a9bc..9157f83fc9 100644
--- a/source4/scripting/python/samba/tests/dcerpc/rpcecho.py
+++ b/source4/scripting/python/samba/tests/dcerpc/rpcecho.py
@@ -18,6 +18,7 @@
 #
 
 from samba.dcerpc import echo
+from samba.ndr import ndr_pack, ndr_unpack
 import unittest
 from samba.tests import RpcInterfaceTestCase
 
@@ -40,3 +41,14 @@ class RpcEchoTests(RpcInterfaceTestCase):
         surrounding_struct.surrounding = [1,2,3,4]
         y = self.conn.TestSurrounding(surrounding_struct)
         self.assertEquals(8 * [0], y.surrounding)
+
+
+class NdrEchoTests(unittest.TestCase):
+    def test_info1_push(self):
+        x = echo.info1()
+        x.v = 42
+        self.assertEquals("\x2a", ndr_pack(x))
+
+    def test_info1_pull(self):
+        x = ndr_unpack(echo.info1, "\x42")
+        self.assertEquals(x.v, 66)
-- 
cgit 


From 515b6ed5867bba8180bd0eeadbeab1c52bffc0ab Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sat, 24 May 2008 20:00:37 +0200
Subject: Share struct used for interfaces in Python code. (This used to be
 commit 8501a3fc31e688dba696667a187821480e8cb714)

---
 source4/scripting/python/pyrpc.h | 39 ---------------------------------------
 1 file changed, 39 deletions(-)
 delete mode 100644 source4/scripting/python/pyrpc.h

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/pyrpc.h b/source4/scripting/python/pyrpc.h
deleted file mode 100644
index 93d583c10a..0000000000
--- a/source4/scripting/python/pyrpc.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* 
-   Unix SMB/CIFS implementation.
-   Samba utility functions
-   Copyright (C) Jelmer Vernooij <jelmer@samba.org> 2008
-   
-   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/>.
-*/
-
-#ifndef _PYRPC_H_
-#define _PYRPC_H_
-
-#define PY_CHECK_TYPE(type, var, fail) \
-	if (!type ## _Check(var)) {\
-		PyErr_Format(PyExc_TypeError, "Expected type %s", type ## _Type.tp_name); \
-		fail; \
-	}
-
-#define dom_sid2_Type dom_sid_Type
-#define dom_sid28_Type dom_sid_Type
-#define dom_sid2_Check dom_sid_Check
-#define dom_sid28_Check dom_sid_Check
-
-/* This macro is only provided by Python >= 2.3 */
-#ifndef PyAPI_DATA
-#   define PyAPI_DATA(RTYPE) extern RTYPE
-#endif
-
-#endif /* _PYRPC_H_ */
-- 
cgit 


From f9c36fae757d197ee4de06f0ecf94ae13faad0de Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sat, 24 May 2008 21:38:33 +0200
Subject: Export functions for setting NTSTATUS and WERRORs in python. (This
 used to be commit 4bcb92d2d49d90863b1e64b15d055517fbfd263c)

---
 source4/scripting/python/misc.i      | 7 +++----
 source4/scripting/python/misc_wrap.c | 6 ++++--
 2 files changed, 7 insertions(+), 6 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/misc.i b/source4/scripting/python/misc.i
index 56b862552a..1d331215b5 100644
--- a/source4/scripting/python/misc.i
+++ b/source4/scripting/python/misc.i
@@ -35,7 +35,7 @@
 %import "../../auth/credentials/credentials.i"
 %import "../../param/param.i"
 %import "../../libcli/security/security.i"
-%import "../../libcli/util/errors.i"
+%include "../../libcli/util/errors.i"
 
 %feature("docstring") generate_random_str "S.random_password(len) -> string\n" \
                                           "Generate random password with specified length.";
@@ -97,7 +97,6 @@ bool dsdb_set_ntds_invocation_id(struct ldb_context *ldb, const char *guid)
 }
 %}
 
-char *private_path(TALLOC_CTX* mem_ctx, 
-     		   struct loadparm_context *lp_ctx,
-	           const char *name);
+char *private_path(TALLOC_CTX* mem_ctx, struct loadparm_context *lp_ctx,
+               const char *name);
 
diff --git a/source4/scripting/python/misc_wrap.c b/source4/scripting/python/misc_wrap.c
index 8c57237e5b..888918ef53 100644
--- a/source4/scripting/python/misc_wrap.c
+++ b/source4/scripting/python/misc_wrap.c
@@ -2554,6 +2554,9 @@ static swig_module_info swig_module = {swig_types, 27, 0, 0, 0, 0};
 #include "librpc/ndr/libndr.h"
 
 
+#include "libcli/util/pyerrors.h"
+
+
 SWIGINTERN int
 SWIG_AsVal_double (PyObject *obj, double *val)
 {
@@ -3046,8 +3049,7 @@ SWIGINTERN PyObject *_wrap_dsdb_attach_schema_from_ldif_file(PyObject *SWIGUNUSE
     "ldb context must be non-NULL");
   result = dsdb_attach_schema_from_ldif_file(arg1,(char const *)arg2,(char const *)arg3);
   if (!W_ERROR_IS_OK(result)) {
-    PyObject *obj = Py_BuildValue((char *)"(i,s)", W_ERROR_V(result), win_errstr(result));
-    PyErr_SetObject(PyExc_RuntimeError, obj);
+    PyErr_SetWERROR(result);
     SWIG_fail;
   } else if (resultobj == NULL) {
     resultobj = Py_None;
-- 
cgit 


From 75e7962d2efb1aa6e45ca999b1a93829406de540 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sat, 24 May 2008 22:13:32 +0200
Subject: Add convenience functions for setting Python objects from errors.
 (This used to be commit f1de723b89251cbc8140b838941f304a34871bf3)

---
 source4/scripting/python/samba/tests/dcerpc/rpcecho.py | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/tests/dcerpc/rpcecho.py b/source4/scripting/python/samba/tests/dcerpc/rpcecho.py
index 9157f83fc9..83279a0b30 100644
--- a/source4/scripting/python/samba/tests/dcerpc/rpcecho.py
+++ b/source4/scripting/python/samba/tests/dcerpc/rpcecho.py
@@ -42,6 +42,11 @@ class RpcEchoTests(RpcInterfaceTestCase):
         y = self.conn.TestSurrounding(surrounding_struct)
         self.assertEquals(8 * [0], y.surrounding)
 
+    def test_manual_request(self):
+        self.assertEquals("\x01\x00\x00\x00", self.conn.request(0, chr(0) * 4))
+
+    def test_server_name(self):
+        self.assertEquals(None, self.conn.server_name)
 
 class NdrEchoTests(unittest.TestCase):
     def test_info1_push(self):
-- 
cgit 


From 21ce0ff00688c560e60efd6c392c71f85229c9d4 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sat, 24 May 2008 22:56:49 +0200
Subject: Allow connecting to a DCE/RPC interface with Python for which we
 don't have IDL. (This used to be commit
 e3178d522c95871f1db35d7e058906502387a553)

---
 .../scripting/python/samba/tests/dcerpc/bare.py    | 30 ++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 source4/scripting/python/samba/tests/dcerpc/bare.py

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/tests/dcerpc/bare.py b/source4/scripting/python/samba/tests/dcerpc/bare.py
new file mode 100644
index 0000000000..dae1dedeb3
--- /dev/null
+++ b/source4/scripting/python/samba/tests/dcerpc/bare.py
@@ -0,0 +1,30 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+
+# Unix SMB/CIFS implementation.
+# Copyright © Jelmer Vernooij <jelmer@samba.org> 2008
+#   
+# 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/>.
+#
+
+from samba.dcerpc import ClientConnection
+from unittest import TestCase
+
+class BareTestCase(TestCase):
+    def test_bare(self):
+        # Connect to the echo pipe
+        x = ClientConnection("ncalrpc:localhost[DEFAULT]", 
+                ("60a15ec5-4de8-11d7-a637-005056a20182", 1))
+        self.assertEquals("\x01\x00\x00\x00", x.request(0, chr(0) * 4))
+
-- 
cgit 


From a2446e5f8550582c0d4353bb85874dea17cf1d98 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sun, 25 May 2008 02:32:21 +0200
Subject: Add initial work for script that uses probing to figure out IDL.
 (This used to be commit 4e5687e813e50d0bc8d6314e389d1d7a0be2f8c1)

---
 source4/scripting/bin/autoidl.py | 161 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 161 insertions(+)
 create mode 100755 source4/scripting/bin/autoidl.py

(limited to 'source4/scripting')

diff --git a/source4/scripting/bin/autoidl.py b/source4/scripting/bin/autoidl.py
new file mode 100755
index 0000000000..eed4ba3a80
--- /dev/null
+++ b/source4/scripting/bin/autoidl.py
@@ -0,0 +1,161 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+
+# Unix SMB/CIFS implementation.
+# Copyright © Jelmer Vernooij <jelmer@samba.org> 2008
+#   
+# 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/>.
+#
+
+import sys
+
+MAX_OPNUM = 1000
+MAX_BASE_SIZE = 0x1000
+MAX_IFACE_VERSION = 1000
+
+DCERPC_FAULT_OP_RNG_ERROR = 0x1c010002
+DCERPC_FAULT_NDR = 0x6f7
+NT_STATUS_NET_WRITE_FAULT = -1073741614
+
+
+sys.path.insert(0, "bin/python")
+
+from samba.dcerpc import ClientConnection
+
+def find_num_funcs(conn):
+    for i in xrange(MAX_OPNUM):
+        try:
+            conn.request(i, "")
+        except RuntimeError, (num, msg):
+            if num == DCERPC_FAULT_OP_RNG_ERROR:
+                return i
+    raise Exception("More than %d functions" % MAX_OPNUM)
+
+class Function:
+    def __init__(self, conn, opnum):
+        self.conn = conn
+        self.opnum = opnum
+
+    def request(self, data):
+        assert isinstance(data, str)
+        self.conn.request(self.opnum, data)
+
+    def valid_ndr(self, data):
+        try:
+            self.request(data)
+        except RuntimeError, (num, msg):
+            if num == DCERPC_FAULT_NDR:
+                return False
+        return True
+
+    def find_base_request(self, start=""):
+        """Find the smallest possible request that we can do that is 
+        valid. 
+        
+        This generally means sending all zeroes so we get NULL pointers where 
+        possible."""
+        # TODO: Don't try with just 0's as there may be switch_is() variables
+        # for which 0 is not a valid value or variables with range() set
+        # See how much input bytes we need
+        for i in range(MAX_BASE_SIZE):
+            data = start + chr(0) * i
+            if self.valid_ndr(data):
+                return data
+        return None
+
+    def check_decision_byte(self, base_request, i):
+        """Check whether the specified byte is a possible "decision" byte, 
+        e.g. a byte that is part of a pointer, array size variable or 
+        discriminant.
+        
+        Note that this function only checks if a byte is definitely a decision 
+        byte. It may return False in some cases while the byte is actually 
+        a decision byte."""
+        data = list(base_request)
+        data[i] = chr(1)
+        return not self.valid_ndr("".join(data))
+
+    def find_deferrant_data(self, base_request, idx):
+        data = list(base_request)
+        data[idx*4] = chr(1)
+        # Just check that this is a pointer to something non-empty:
+        assert not self.valid_ndr("".join(data))
+
+        newdata = self.find_base_request("".join(data))
+
+        if newdata is None:
+            return None
+        
+        assert newdata.startswith(data)
+
+        return newdata[len(data):]
+
+    def find_idl(self):
+        base_request = self.find_base_request()
+
+        if base_request is None:
+            raise Exception("Unable to determine base size for opnum %d" % self.opnum)
+
+        print "\tBase request is %r" % base_request
+
+        decision_byte_map = map(lambda x: self.check_decision_byte(base_request, x), range(len(base_request)))
+
+        print decision_byte_map
+        
+        # find pointers
+        possible_pointers = map(all, 
+            [decision_byte_map[i*4:(i+1)*4] for i in range(int(len(base_request)/4))])
+        print possible_pointers
+
+        pointer_deferrant_bases = map(
+            lambda x: self.find_deferrant_data(base_request, x) if possible_pointers[x] else None, range(len(possible_pointers)))
+
+        print pointer_deferrant_bases
+
+
+if len(sys.argv) < 3:
+    print "Usage: autoidl <binding> <UUID> [<version>]"
+    sys.exit(1)
+
+(binding, uuid) = sys.argv[1:3]
+if len(sys.argv) == 4:
+    version = sys.argv[3]
+else:
+    version = None
+
+if version is None:
+    for i in range(MAX_IFACE_VERSION):
+        try:
+            conn = ClientConnection(binding, (uuid, i))
+        except RuntimeError, (num, msg):
+            if num == NT_STATUS_NET_WRITE_FAULT:
+                continue
+            raise
+        else:
+            break
+else:
+    conn = ClientConnection(binding, (uuid, version))
+
+print "Figuring out number of connections...",
+num_funcs = find_num_funcs(conn)
+print "%d" % num_funcs
+
+# Figure out the syntax for each one
+for i in range(num_funcs):
+    print "Function %d" % i
+    data = Function(conn, i)
+    try:
+        data.find_idl()
+    except Exception, e:
+        print "Error: %r" % e
-- 
cgit 


From 928ecbaebbde00515d08fd530db7c99169c905ef Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sun, 25 May 2008 04:23:03 +0200
Subject: Add support for secondary contexts from Python. (This used to be
 commit 16d1ad050546ae6500153438db8d3c857e6f3ad5)

---
 source4/scripting/python/samba/tests/dcerpc/bare.py    | 13 +++++++++++++
 source4/scripting/python/samba/tests/dcerpc/rpcecho.py |  4 ++++
 2 files changed, 17 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/tests/dcerpc/bare.py b/source4/scripting/python/samba/tests/dcerpc/bare.py
index dae1dedeb3..eea6744e42 100644
--- a/source4/scripting/python/samba/tests/dcerpc/bare.py
+++ b/source4/scripting/python/samba/tests/dcerpc/bare.py
@@ -28,3 +28,16 @@ class BareTestCase(TestCase):
                 ("60a15ec5-4de8-11d7-a637-005056a20182", 1))
         self.assertEquals("\x01\x00\x00\x00", x.request(0, chr(0) * 4))
 
+    #def test_alter_context(self):
+    #    x = ClientConnection("ncalrpc:localhost[DEFAULT]", 
+    #            ("12345778-1234-abcd-ef00-0123456789ac", 1))
+    #    x.alter_context(("60a15ec5-4de8-11d7-a637-005056a20182", 1))
+    #    self.assertEquals("\x01\x00\x00\x00", x.request(0, chr(0) * 4))
+
+    def test_two_connections(self):
+        x = ClientConnection("ncalrpc:localhost[DEFAULT]", 
+                ("60a15ec5-4de8-11d7-a637-005056a20182", 1))
+        y = ClientConnection("ncalrpc:localhost", 
+                ("60a15ec5-4de8-11d7-a637-005056a20182", 1),
+                basis_connection=x)
+        self.assertEquals("\x01\x00\x00\x00", y.request(0, chr(0) * 4))
diff --git a/source4/scripting/python/samba/tests/dcerpc/rpcecho.py b/source4/scripting/python/samba/tests/dcerpc/rpcecho.py
index 83279a0b30..7fd1bcc5b8 100644
--- a/source4/scripting/python/samba/tests/dcerpc/rpcecho.py
+++ b/source4/scripting/python/samba/tests/dcerpc/rpcecho.py
@@ -26,6 +26,10 @@ class RpcEchoTests(RpcInterfaceTestCase):
     def setUp(self):
         self.conn = echo.rpcecho("ncalrpc:", self.get_loadparm())
 
+    def test_two_contexts(self):
+        self.conn2 = echo.rpcecho("ncalrpc", basis_connection=self.conn)
+        self.assertEquals(3, self.conn2.AddOne(2))
+
     def test_addone(self):
         self.assertEquals(2, self.conn.AddOne(1))
 
-- 
cgit 


From 74126bc6d0211a7674156dfda8ab13054b403a1d Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sun, 25 May 2008 04:54:38 +0200
Subject: Expose transfer and abstract syntax. (This used to be commit
 a875e07a37568b7e51c290074d5e3834c2caa4d6)

---
 source4/scripting/python/samba/tests/dcerpc/bare.py    | 13 ++++++++-----
 source4/scripting/python/samba/tests/dcerpc/rpcecho.py |  4 ++++
 2 files changed, 12 insertions(+), 5 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/tests/dcerpc/bare.py b/source4/scripting/python/samba/tests/dcerpc/bare.py
index eea6744e42..d75ffc381e 100644
--- a/source4/scripting/python/samba/tests/dcerpc/bare.py
+++ b/source4/scripting/python/samba/tests/dcerpc/bare.py
@@ -28,11 +28,14 @@ class BareTestCase(TestCase):
                 ("60a15ec5-4de8-11d7-a637-005056a20182", 1))
         self.assertEquals("\x01\x00\x00\x00", x.request(0, chr(0) * 4))
 
-    #def test_alter_context(self):
-    #    x = ClientConnection("ncalrpc:localhost[DEFAULT]", 
-    #            ("12345778-1234-abcd-ef00-0123456789ac", 1))
-    #    x.alter_context(("60a15ec5-4de8-11d7-a637-005056a20182", 1))
-    #    self.assertEquals("\x01\x00\x00\x00", x.request(0, chr(0) * 4))
+    def test_alter_context(self):
+        x = ClientConnection("ncalrpc:localhost[DEFAULT]", 
+                ("12345778-1234-abcd-ef00-0123456789ac", 1))
+        y = ClientConnection("ncalrpc:localhost", 
+                ("60a15ec5-4de8-11d7-a637-005056a20182", 1),
+                basis_connection=x)
+        x.alter_context(("60a15ec5-4de8-11d7-a637-005056a20182", 1))
+        # FIXME: self.assertEquals("\x01\x00\x00\x00", x.request(0, chr(0) * 4))
 
     def test_two_connections(self):
         x = ClientConnection("ncalrpc:localhost[DEFAULT]", 
diff --git a/source4/scripting/python/samba/tests/dcerpc/rpcecho.py b/source4/scripting/python/samba/tests/dcerpc/rpcecho.py
index 7fd1bcc5b8..68b7a42d52 100644
--- a/source4/scripting/python/samba/tests/dcerpc/rpcecho.py
+++ b/source4/scripting/python/samba/tests/dcerpc/rpcecho.py
@@ -30,6 +30,10 @@ class RpcEchoTests(RpcInterfaceTestCase):
         self.conn2 = echo.rpcecho("ncalrpc", basis_connection=self.conn)
         self.assertEquals(3, self.conn2.AddOne(2))
 
+    def test_abstract_syntax(self):
+        self.assertEquals(("60a15ec5-4de8-11d7-a637-005056a20182", 1), 
+                          self.conn.abstract_syntax)
+
     def test_addone(self):
         self.assertEquals(2, self.conn.AddOne(1))
 
-- 
cgit 


From 5df9e0576ebd8ad737bb2580b52788601b6cf854 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sun, 25 May 2008 14:41:54 +0200
Subject: Fix missing colon. (This used to be commit
 6b1576f544e2ea2b5ea0b234b724c4989dd49cca)

---
 source4/scripting/python/samba/tests/dcerpc/rpcecho.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/tests/dcerpc/rpcecho.py b/source4/scripting/python/samba/tests/dcerpc/rpcecho.py
index 68b7a42d52..bbbd0d76ec 100644
--- a/source4/scripting/python/samba/tests/dcerpc/rpcecho.py
+++ b/source4/scripting/python/samba/tests/dcerpc/rpcecho.py
@@ -27,7 +27,7 @@ class RpcEchoTests(RpcInterfaceTestCase):
         self.conn = echo.rpcecho("ncalrpc:", self.get_loadparm())
 
     def test_two_contexts(self):
-        self.conn2 = echo.rpcecho("ncalrpc", basis_connection=self.conn)
+        self.conn2 = echo.rpcecho("ncalrpc:", basis_connection=self.conn)
         self.assertEquals(3, self.conn2.AddOne(2))
 
     def test_abstract_syntax(self):
-- 
cgit 


From c17166fb3d9260d0c02e3f9f559413acde5ce048 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 26 May 2008 02:04:00 +0200
Subject: Convert smbstatus to Python. (This used to be commit
 f14ad6cd92227c7ed5c570b581e5db82b7d42e25)

---
 source4/scripting/bin/smbstatus | 159 ++++++++++++++++------------------------
 1 file changed, 63 insertions(+), 96 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/bin/smbstatus b/source4/scripting/bin/smbstatus
index 4dfc3365a1..782e83e4cf 100755
--- a/source4/scripting/bin/smbstatus
+++ b/source4/scripting/bin/smbstatus
@@ -1,96 +1,63 @@
-#!/bin/sh
-exec smbscript "$0" ${1+"$@"}
-/*
-  provide information on connected users and open files
-  Copyright Andrew Tridgell 2005
-  Released under the GNU GPL version 3 or later
-*/	
-
-libinclude("base.js");
-libinclude("management.js");
-
-var options = new Object();
-
-options = GetOptions(ARGV,
-		"POPT_AUTOHELP",
-		"POPT_COMMON_SAMBA",
-		"POPT_COMMON_VERSION",
-		"nbt");
-if (options == undefined) {
-	println("Failed to parse options: " + options.ERROR);
-	return -1;
-}
-
-/*
-  show open sessions
-*/
-function show_sessions()
-{
-	var sessions = smbsrv_sessions();
-	var i;
-	var sys = sys_init();
-	if (sessions == undefined) {
-		println("No sessions open");
-		return;
-	}
-	printf("User                                  Client      Connected at\n");
-	printf("-------------------------------------------------------------------------------\n");
-	for (i=0;i<sessions.length;i++) {
-		var info = sessions[i];
-		var fulluser = sprintf("%s/%s", info.account_name, info.domain_name);
-		printf("%-30s %16s   %s\n", 
-		       fulluser, info.client_ip, sys.httptime(info.connect_time));
-	}
-	printf("\n");
-}
-
-/*
-  show open tree connects
-*/
-function show_tcons()
-{
-	var tcons = smbsrv_tcons();
-	var sys = sys_init();
-	if (tcons == undefined) {
-		println("No tree connects");
-		return;
-	}
-	printf("Share                                 Client      Connected at\n");
-	printf("-------------------------------------------------------------------------------\n");
-	for (i=0;i<tcons.length;i++) {
-		var info = tcons[i];
-		printf("%-30s %16s   %s\n", 
-		       info.share_name, info.client_ip, sys.httptime(info.connect_time));
-	}
-}
-
-/*
-  show nbtd information
-*/
-function show_nbt()
-{
-	var stats = nbtd_statistics();
-	if (stats == undefined) {
-		println("nbt server not running");
-		return;
-	}
-	var r;
-	println("NBT server statistics:");
-	for (r in stats) {
-		print("\t" + r + ":\t" + stats[r] + "\n");
-	}
-	println("");
-}
-
-var lp = loadparm_init();
-
-printf("%s\n\n", lp.get("server string"));
-
-if (options['nbt'] != undefined) {
-	show_nbt();
-} else {
-	show_sessions();
-	show_tcons();
-}
-
-return 0;
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+#
+#  provide information on connected users and open files
+#  Copyright ǒ Jelmer Vernooij 2008
+#
+#  Based on the original in EJS:
+#  Copyright Andrew Tridgell 2005
+#  Released under the GNU GPL version 3 or later
+#
+
+import sys
+
+sys.path.insert(0, "bin/python")
+
+import optparse
+import samba.getopt as options
+import samba.irpc
+
+def show_sessions():
+	"""show open sessions"""
+	sessions = smbsrv_sessions()
+	print "User                                  Client      Connected at"
+	print "-------------------------------------------------------------------------------"
+	for session in sessions:
+		fulluser = "%s/%s" % (session.account_name, session.domain_name)
+		print "%-30s %16s   %s" % (fulluser, session.client_ip, sys.httptime(session.connect_time))
+	print ""
+
+def show_tcons():
+	"""show open tree connects"""
+	tcons = smbsrv_tcons()
+	print "Share                                 Client      Connected at"
+	print "-------------------------------------------------------------------------------"
+	for tcon in tcons:
+		print "%-30s %16s   %s\n" % (tcon.share_name, tcon.client_ip, sys.httptime(tcon.connect_time))
+
+
+def show_nbt():
+	"""show nbtd information"""
+	stats = nbtd_statistics()
+	print "NBT server statistics:",
+	for r in stats:
+		print "\t" + r + ":\t" + stats[r] + "\n"
+	print ""
+
+parser = optparse.OptionParser("%s [options]" % sys.argv[0])
+sambaopts = options.SambaOptions(parser)
+parser.add_option_group(sambaopts)
+parser.add_option("--nbt", type="string", metavar="NBT", 
+        help="show NetBIOS status")
+
+lp = sambaopts.get_loadparm()
+
+print "%s\n\n" % lp.get("server string")
+
+if opts.nbt:
+	show_nbt()
+else:
+	show_sessions()
+	show_tcons()
+
+return 0
-- 
cgit 


From 1aeb4cc04f9dae45b2029739c5f855ae4e1ffbab Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 26 May 2008 02:05:11 +0200
Subject: Remove unused EJS code. (This used to be commit
 3b70a3de4aa63bd6c325fd620c71bd6111d3d2b8)

---
 source4/scripting/ejs/config.mk      |  8 ----
 source4/scripting/ejs/smbcalls_reg.c | 90 ------------------------------------
 source4/scripting/libjs/auth.js      | 18 --------
 3 files changed, 116 deletions(-)
 delete mode 100644 source4/scripting/ejs/smbcalls_reg.c
 delete mode 100644 source4/scripting/libjs/auth.js

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/config.mk b/source4/scripting/ejs/config.mk
index 873dd09248..7ebf22ea32 100644
--- a/source4/scripting/ejs/config.mk
+++ b/source4/scripting/ejs/config.mk
@@ -13,14 +13,6 @@ PRIVATE_DEPENDENCIES = LIBLDB SAMDB LIBNDR
 
 smbcalls_ldb_OBJ_FILES = $(ejsscriptsrcdir)/smbcalls_ldb.o
 
-[MODULE::smbcalls_reg]
-SUBSYSTEM = smbcalls
-OUTPUT_TYPE = MERGED_OBJ
-INIT_FUNCTION = smb_setup_ejs_reg
-PRIVATE_DEPENDENCIES = registry SAMDB LIBNDR
-
-smbcalls_reg_OBJ_FILES = $(ejsscriptsrcdir)/smbcalls_reg.o
-
 [MODULE::smbcalls_nbt]
 SUBSYSTEM = smbcalls
 OUTPUT_TYPE = MERGED_OBJ
diff --git a/source4/scripting/ejs/smbcalls_reg.c b/source4/scripting/ejs/smbcalls_reg.c
deleted file mode 100644
index ed8653d3a7..0000000000
--- a/source4/scripting/ejs/smbcalls_reg.c
+++ /dev/null
@@ -1,90 +0,0 @@
-/* 
-   Unix SMB/CIFS implementation.
-
-   provide hooks into smbd C calls from ejs scripts
-
-   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 <http://www.gnu.org/licenses/>.
-*/
-
-#include "includes.h"
-#include "scripting/ejs/smbcalls.h"
-#include "lib/appweb/ejs/ejs.h"
-#include "dsdb/samdb/samdb.h"
-#include "librpc/ndr/libndr.h"
-#include "lib/registry/registry.h"
-
-/*
-  get the connected db
- */
-static struct registry_context *ejs_get_reg_context(int eid)
-{
-	struct registry_context *rctx = (struct registry_context *)mprGetThisPtr(eid, "registry");
-	if (rctx == NULL) {
-		ejsSetErrorMsg(eid, "unable to find registry");
-	}
-	return rctx;
-}
-
-static int ejs_apply_patchfile(MprVarHandle eid, int argc, struct MprVar **argv)
-{
-	struct registry_context *rctx;
-	WERROR error;
-
-	/* validate arguments */
-	if (argc != 1) {
-		ejsSetErrorMsg(eid, "reg.apply_patchfile invalid number of arguments");
-		return -1;
-	}
-
-	rctx = ejs_get_reg_context(eid);
-	if (rctx == NULL) {
-		return -1;
-	}
-	
-	error = reg_diff_apply(rctx, mprToString(argv[0]));
-
-	mpr_Return(eid, mprWERROR(error));
-
-	return 0;
-}
-
-/*
-  initialise registry ejs subsystem
-*/
-static int ejs_reg_open(MprVarHandle eid, int argc, struct MprVar **argv)
-{
-	struct MprVar *reg = mprInitObject(eid, "registry", argc, argv);
-	struct registry_context *rctx;
-	WERROR error;
-
-	error = reg_open_samba(mprMemCtx(), &rctx, mprEventCtx(), mprLpCtx(), NULL, NULL);
-	SMB_ASSERT(W_ERROR_IS_OK(error));
-
-	mprSetPtrChild(reg, "registry", rctx);
-	mprSetCFunction(reg, "apply_patchfile", ejs_apply_patchfile);
-
-	return 0;
-}
-
-
-/*
-  setup C functions that be called from ejs
-*/
-NTSTATUS smb_setup_ejs_reg(void)
-{
-	ejsDefineCFunction(-1, "reg_open", ejs_reg_open, NULL, MPR_VAR_SCRIPT_HANDLE);
-	return NT_STATUS_OK;
-}
diff --git a/source4/scripting/libjs/auth.js b/source4/scripting/libjs/auth.js
deleted file mode 100644
index 3fe81d0ea7..0000000000
--- a/source4/scripting/libjs/auth.js
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-	auth js library functions
-	Copyright Andrew Tridgell 2005
-	released under the GNU GPL version 3 or later
-*/
-
-
-/*
-  get a list of domains for SWAT authentication
-*/
-function getDomainList()
-{
-	var ret = new Array(2);
-	var lp = loadparm_init();
-	ret[0] = "System User";
-	ret[1] = lp.get("workgroup");
-	return ret;
-}
-- 
cgit 


From 5c89184c42a51045f8c3810c25ce22d7be9e1750 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 26 May 2008 02:07:47 +0200
Subject: Remove unused nss module. (This used to be commit
 5f75a4f0c0343fe459f5c231f4b5ac89cea43b42)

---
 source4/scripting/ejs/config.mk      |   8 --
 source4/scripting/ejs/smbcalls_nss.c | 160 -----------------------------------
 2 files changed, 168 deletions(-)
 delete mode 100644 source4/scripting/ejs/smbcalls_nss.c

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/config.mk b/source4/scripting/ejs/config.mk
index 7ebf22ea32..a3cc28a0b2 100644
--- a/source4/scripting/ejs/config.mk
+++ b/source4/scripting/ejs/config.mk
@@ -27,14 +27,6 @@ INIT_FUNCTION = smb_setup_ejs_random
 
 smbcalls_rand_OBJ_FILES = $(ejsscriptsrcdir)/smbcalls_rand.o
 
-[MODULE::smbcalls_nss]
-SUBSYSTEM = smbcalls
-OUTPUT_TYPE = MERGED_OBJ
-INIT_FUNCTION = smb_setup_ejs_nss
-PRIVATE_DEPENDENCIES = NSS_WRAPPER
-
-smbcalls_nss_OBJ_FILES = $(ejsscriptsrcdir)/smbcalls_nss.o
-
 [MODULE::smbcalls_data]
 SUBSYSTEM = smbcalls
 OUTPUT_TYPE = MERGED_OBJ
diff --git a/source4/scripting/ejs/smbcalls_nss.c b/source4/scripting/ejs/smbcalls_nss.c
deleted file mode 100644
index 58f86d3b6c..0000000000
--- a/source4/scripting/ejs/smbcalls_nss.c
+++ /dev/null
@@ -1,160 +0,0 @@
-/* 
-   Unix SMB/CIFS implementation.
-
-   provide access to getpwnam() and related calls
-
-   Copyright (C) Andrew Tridgell 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/>.
-*/
-
-#include "includes.h"
-#include "scripting/ejs/smbcalls.h"
-#include "lib/appweb/ejs/ejs.h"
-#include "system/passwd.h"
-
-
-/*
-  return a struct passwd as an object
-*/
-static struct MprVar mpr_passwd(struct passwd *pwd)
-{
-	struct MprVar ret;
-	if (pwd == NULL) {
-		return mprCreateUndefinedVar();
-	}
-	ret = mprObject("passwd");
-
-	mprSetVar(&ret, "pw_name",   mprString(pwd->pw_name));
-	mprSetVar(&ret, "pw_passwd", mprString(pwd->pw_passwd));
-	mprSetVar(&ret, "pw_uid",    mprCreateIntegerVar(pwd->pw_uid));
-	mprSetVar(&ret, "pw_gid",    mprCreateIntegerVar(pwd->pw_gid));
-	mprSetVar(&ret, "pw_gecos",  mprString(pwd->pw_gecos));
-	mprSetVar(&ret, "pw_dir",    mprString(pwd->pw_dir));
-	mprSetVar(&ret, "pw_shell",  mprString(pwd->pw_shell));
-	return ret;
-}
-
-/*
-  return a struct passwd as an object
-*/
-static struct MprVar mpr_group(struct group *grp)
-{
-	struct MprVar ret;
-	if (grp == NULL) {
-		return mprCreateUndefinedVar();
-	}
-	ret = mprObject("group");
-
-	mprSetVar(&ret, "gr_name",   mprString(grp->gr_name));
-	mprSetVar(&ret, "gr_passwd", mprString(grp->gr_passwd));
-	mprSetVar(&ret, "gr_gid",    mprCreateIntegerVar(grp->gr_gid));
-	mprSetVar(&ret, "gr_mem",    mprList("gr_mem", (const char **)grp->gr_mem));
-	return ret;
-}
-
-
-/*
-  usage:
-      var pw = nss.getpwnam("root");
-
-  returns an object containing struct passwd entries
-*/
-static int ejs_getpwnam(MprVarHandle eid, int argc, struct MprVar **argv)
-{
-	/* validate arguments */
-	if (argc != 1 || argv[0]->type != MPR_TYPE_STRING) {
-		ejsSetErrorMsg(eid, "getpwnam invalid arguments");
-		return -1;
-	}
-
-	mpr_Return(eid, mpr_passwd(getpwnam(mprToString(argv[0]))));
-	return 0;
-}
-
-/*
-  usage:
-      var pw = nss.getpwuid(0);
-
-  returns an object containing struct passwd entries
-*/
-static int ejs_getpwuid(MprVarHandle eid, int argc, struct MprVar **argv)
-{
-	/* validate arguments */
-	if (argc != 1 || !mprVarIsNumber(argv[0]->type)) {
-		ejsSetErrorMsg(eid, "getpwuid invalid arguments");
-		return -1;
-	}
-	mpr_Return(eid, mpr_passwd(getpwuid(mprToInt(argv[0]))));
-	return 0;
-}
-
-/*
-  usage:
-      var pw = nss.getgrnam("users");
-
-  returns an object containing struct group entries
-*/
-static int ejs_getgrnam(MprVarHandle eid, int argc, struct MprVar **argv)
-{
-	/* validate arguments */
-	if (argc != 1 || argv[0]->type != MPR_TYPE_STRING) {
-		ejsSetErrorMsg(eid, "getgrnam invalid arguments");
-		return -1;
-	}
-	mpr_Return(eid, mpr_group(getgrnam(mprToString(argv[0]))));
-	return 0;
-}
-
-/*
-  usage:
-      var pw = nss.getgrgid(0);
-
-  returns an object containing struct group entries
-*/
-static int ejs_getgrgid(MprVarHandle eid, int argc, struct MprVar **argv)
-{
-	/* validate arguments */
-	if (argc != 1 || argv[0]->type != MPR_TYPE_STRING) {
-		ejsSetErrorMsg(eid, "getgrgid invalid arguments");
-		return -1;
-	}
-	mpr_Return(eid, mpr_group(getgrgid(mprToInt(argv[0]))));
-	return 0;
-}
-
-
-/*
-  initialise nss ejs subsystem
-*/
-static int ejs_nss_init(MprVarHandle eid, int argc, struct MprVar **argv)
-{
-	struct MprVar *nss = mprInitObject(eid, "nss", argc, argv);
-
-	mprSetCFunction(nss, "getpwnam", ejs_getpwnam);
-	mprSetCFunction(nss, "getpwuid", ejs_getpwuid);
-	mprSetCFunction(nss, "getgrnam", ejs_getgrnam);
-	mprSetCFunction(nss, "getgrgid", ejs_getgrgid);
-
-	return 0;
-}
-
-/*
-  setup C functions that be called from ejs
-*/
-NTSTATUS smb_setup_ejs_nss(void)
-{
-	ejsDefineCFunction(-1, "nss_init", ejs_nss_init, NULL, MPR_VAR_SCRIPT_HANDLE);
-	return NT_STATUS_OK;
-}
-- 
cgit 


From fd712bb878dcfbe8a50e48361c96cc04a3ddacf5 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 26 May 2008 02:11:32 +0200
Subject: Remove unused cli ejs module. (This used to be commit
 170d5aef80f37c26171a40e818cc8b557828d04b)

---
 source4/scripting/ejs/config.mk      |   1 -
 source4/scripting/ejs/smbcalls.c     |   1 -
 source4/scripting/ejs/smbcalls_cli.c | 722 -----------------------------------
 3 files changed, 724 deletions(-)
 delete mode 100644 source4/scripting/ejs/smbcalls_cli.c

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/config.mk b/source4/scripting/ejs/config.mk
index a3cc28a0b2..c5199669d5 100644
--- a/source4/scripting/ejs/config.mk
+++ b/source4/scripting/ejs/config.mk
@@ -70,7 +70,6 @@ PRIVATE_DEPENDENCIES = \
 
 smbcalls_OBJ_FILES = $(addprefix $(ejsscriptsrcdir)/, \
 		smbcalls.o \
-		smbcalls_cli.o \
 		smbcalls_options.o \
 		smbcalls_creds.o \
 		smbcalls_param.o \
diff --git a/source4/scripting/ejs/smbcalls.c b/source4/scripting/ejs/smbcalls.c
index 98d6be07bf..bdf70ca831 100644
--- a/source4/scripting/ejs/smbcalls.c
+++ b/source4/scripting/ejs/smbcalls.c
@@ -203,7 +203,6 @@ void smb_setup_ejs_functions(void (*exception_handler)(const char *))
 
 	ejs_exception_handler = exception_handler;
 
-	smb_setup_ejs_cli();
 	smb_setup_ejs_options();
 	smb_setup_ejs_credentials();
 	smb_setup_ejs_param();
diff --git a/source4/scripting/ejs/smbcalls_cli.c b/source4/scripting/ejs/smbcalls_cli.c
deleted file mode 100644
index dbb36312da..0000000000
--- a/source4/scripting/ejs/smbcalls_cli.c
+++ /dev/null
@@ -1,722 +0,0 @@
-/* 
-   Unix SMB/CIFS implementation.
-
-   provide hooks into smbd C calls from ejs scripts
-
-   Copyright (C) Tim Potter 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/>.
-*/
-
-#include "includes.h"
-#include "scripting/ejs/smbcalls.h"
-#include "lib/appweb/ejs/ejs.h"
-#include "libcli/raw/libcliraw.h"
-#include "libcli/composite/composite.h"
-#include "libcli/smb_composite/smb_composite.h"
-#include "libcli/libcli.h"
-#include "libcli/resolve/resolve.h"
-#include "auth/credentials/credentials.h"
-#include "param/param.h"
-
-#if 0
-
-#include "librpc/gen_ndr/ndr_nbt.h"
-
-/* Connect to a server */
-
-static int ejs_cli_connect(MprVarHandle eid, int argc, char **argv)
-{
-	struct smbcli_socket *sock;
-	struct smbcli_transport *transport;
-	struct nbt_name calling, called;
-	NTSTATUS result;
-
-	if (argc != 1) {
-		ejsSetErrorMsg(eid, "connect invalid arguments");
-		return -1;
-	}
-
-	/* Socket connect */
-
-	sock = smbcli_sock_init(NULL, NULL);
-
-	if (!sock) {
-		ejsSetErrorMsg(eid, "socket initialisation failed");
-		return -1;
-	}
-
-	if (!smbcli_sock_connect_byname(sock, argv[0], 0)) {
-		ejsSetErrorMsg(eid, "socket connect failed");
-		return -1;
-	}
-
-	transport = smbcli_transport_init(sock, sock, false);
-
-	if (!transport) {
-		ejsSetErrorMsg(eid, "transport init failed");
-		return -1;
-	}
-
-	/* Send a netbios session request */
-
-	make_nbt_name_client(&calling, lp_netbios_name());
-
-	nbt_choose_called_name(NULL, &called, argv[0], NBT_NAME_SERVER);
-		
-	if (!smbcli_transport_connect(transport, &calling, &called)) {
-		ejsSetErrorMsg(eid, "transport establishment failed");
-		return -1;
-	}
-
-	result = smb_raw_negotiate(transport, lp_maxprotocol());
-
-	if (!NT_STATUS_IS_OK(result)) {
-		mpr_Return(eid, mprNTSTATUS(result));
-		return 0;
-	}
-
-	/* Return a socket object */
-
-	mpr_Return(eid, mprCreatePtrVar(transport));
-
-	return 0;
-}
-
-/* Perform a session setup:
-   
-     session_setup(conn, "DOMAIN\\USERNAME%PASSWORD");
-     session_setup(conn, USERNAME, PASSWORD);
-     session_setup(conn, DOMAIN, USERNAME, PASSWORD);
-     session_setup(conn);  // anonymous
-
- */
-
-static int ejs_cli_ssetup(MprVarHandle eid, int argc, MprVar **argv)
-{
-	struct smbcli_transport *transport;
-	struct smbcli_session *session;
-	struct smb_composite_sesssetup setup;
-	struct cli_credentials *creds;
-	NTSTATUS status;
-	int result = -1;
-
-	/* Argument parsing */
-
-	if (argc < 1 || argc > 4) {
-		ejsSetErrorMsg(eid, "session_setup invalid arguments");
-		return -1;
-	}
-
-	if (!mprVarIsPtr(argv[0]->type)) {
-		ejsSetErrorMsg(eid, "first arg is not a connect handle");
-		return -1;
-	}
-
-	transport = argv[0]->ptr;
-	creds = cli_credentials_init(transport);
-	cli_credentials_set_conf(creds);
-
-	if (argc == 4) {
-
-		/* DOMAIN, USERNAME, PASSWORD form */
-
-		if (!mprVarIsString(argv[1]->type)) {
-			ejsSetErrorMsg(eid, "arg 1 must be a string");
-			goto done;
-		}
-
-		cli_credentials_set_domain(creds, argv[1]->string, 
-					   CRED_SPECIFIED);
-
-		if (!mprVarIsString(argv[2]->type)) {
-			ejsSetErrorMsg(eid, "arg 2 must be a string");
-			goto done;
-		}
-
-		cli_credentials_set_username(creds, argv[2]->string, 
-					     CRED_SPECIFIED);
-
-		if (!mprVarIsString(argv[3]->type)) {
-			ejsSetErrorMsg(eid, "arg 3 must be a string");
-			goto done;
-		}
-
-		cli_credentials_set_password(creds, argv[3]->string,
-					     CRED_SPECIFIED);
-
-	} else if (argc == 3) {
-
-		/* USERNAME, PASSWORD form */
-
-		if (!mprVarIsString(argv[1]->type)) {
-			ejsSetErrorMsg(eid, "arg1 must be a string");
-			goto done;
-		}
-
-		cli_credentials_set_username(creds, argv[1]->string,
-					     CRED_SPECIFIED);
-
-		if (!mprVarIsString(argv[2]->type)) {
-
-			ejsSetErrorMsg(eid, "arg2 must be a string");
-			goto done;
-		}
-
-		cli_credentials_set_password(creds, argv[2]->string,
-					     CRED_SPECIFIED);
-
-	} else if (argc == 2) {
-
-		/* DOMAIN/USERNAME%PASSWORD form */
-
-		cli_credentials_parse_string(creds, argv[1]->string,
-					     CRED_SPECIFIED);
-
-	} else {
-
-		/* Anonymous connection */
-
-		cli_credentials_set_anonymous(creds);
-	}
-
-	/* Do session setup */
-
-	session = smbcli_session_init(transport, transport, false);
-
-	if (!session) {
-		ejsSetErrorMsg(eid, "session init failed");
-		return -1;
-	}
-
-	setup.in.sesskey = transport->negotiate.sesskey;
-	setup.in.capabilities = transport->negotiate.capabilities;
-	setup.in.credentials = creds;
-	setup.in.workgroup = lp_workgroup();
-
-	status = smb_composite_sesssetup(session, &setup);
-
-	if (!NT_STATUS_IS_OK(status)) {
-		ejsSetErrorMsg(eid, "session_setup: %s", nt_errstr(status));
-		return -1;
-	}
-
-	session->vuid = setup.out.vuid;	
-
-	/* Return a session object */
-
-	mpr_Return(eid, mprCreatePtrVar(session));
-
-	result = 0;
-
- done:
-	talloc_free(creds);
-	return result;
-}
-
-/* Perform a tree connect
-   
-     tree_connect(session, SHARE);
-
- */
-
-static int ejs_cli_tree_connect(MprVarHandle eid, int argc, MprVar **argv)
-{
-	struct smbcli_session *session;
-	struct smbcli_tree *tree;
-	union smb_tcon tcon;
-	TALLOC_CTX *mem_ctx;
-	NTSTATUS status;
-	const char *password = "";
-
-	/* Argument parsing */
-
-	if (argc != 2) {
-		ejsSetErrorMsg(eid, "tree_connect invalid arguments");
-		return -1;
-	}
-
-	if (!mprVarIsPtr(argv[0]->type)) {
-		ejsSetErrorMsg(eid, "first arg is not a session handle");
-		return -1;
-	}
-
-	session = argv[0]->ptr;
-	tree = smbcli_tree_init(session, session, false);
-
-	if (!tree) {
-		ejsSetErrorMsg(eid, "tree init failed");
-		return -1;
-	}
-
-	mem_ctx = talloc_init("tcon");
-	if (!mem_ctx) {
-		ejsSetErrorMsg(eid, "talloc_init failed");
-		return -1;
-	}
-
-	/* Do tree connect */
-
-	tcon.generic.level = RAW_TCON_TCONX;
-	tcon.tconx.in.flags = 0;
-
-	if (session->transport->negotiate.sec_mode & NEGOTIATE_SECURITY_USER_LEVEL) {
-		tcon.tconx.in.password = data_blob(NULL, 0);
-	} else if (session->transport->negotiate.sec_mode & NEGOTIATE_SECURITY_CHALLENGE_RESPONSE) {
-		tcon.tconx.in.password = data_blob_talloc(mem_ctx, NULL, 24);
-		if (session->transport->negotiate.secblob.length < 8) {
-			ejsSetErrorMsg(eid, "invalid security blob");
-			return -1;
-		}
-		SMBencrypt(password, session->transport->negotiate.secblob.data, tcon.tconx.in.password.data);
-	} else {
-		tcon.tconx.in.password = data_blob_talloc(mem_ctx, password, strlen(password)+1);
-	}
-
-	tcon.tconx.in.path = argv[1]->string;
-	tcon.tconx.in.device = "?????";
-	
-	status = smb_tree_connect(tree, mem_ctx, &tcon);
-
-	if (!NT_STATUS_IS_OK(status)) {
-		ejsSetErrorMsg(eid, "tree_connect: %s", nt_errstr(status));
-		return -1;
-	}
-
-	tree->tid = tcon.tconx.out.tid;
-
-	talloc_free(mem_ctx);	
-
-	mpr_Return(eid, mprCreatePtrVar(tree));
-
-	return 0;
-}
-
-/* Perform a tree disconnect
-   
-     tree_disconnect(tree);
-
- */
-static int ejs_cli_tree_disconnect(MprVarHandle eid, int argc, MprVar **argv)
-{
-	struct smbcli_tree *tree;
-	NTSTATUS status;
-
-	/* Argument parsing */
-
-	if (argc != 1) {
-		ejsSetErrorMsg(eid, "tree_disconnect invalid arguments");
-		return -1;
-	}
-
-	if (!mprVarIsPtr(argv[0]->type)) {
-		ejsSetErrorMsg(eid, "first arg is not a tree handle");
-		return -1;
-	}	
-
-	tree = argv[0]->ptr;
-
-	status = smb_tree_disconnect(tree);
-
-	if (!NT_STATUS_IS_OK(status)) {
-		ejsSetErrorMsg(eid, "tree_disconnect: %s", nt_errstr(status));
-		return -1;
-	}
-
-	talloc_free(tree);
-
-	return 0;
-}
-
-/* Perform a ulogoff
-   
-     session_logoff(session);
-
- */
-static int ejs_cli_session_logoff(MprVarHandle eid, int argc, MprVar **argv)
-{
-	struct smbcli_session *session;
-	NTSTATUS status;
-
-	/* Argument parsing */
-
-	if (argc != 1) {
-		ejsSetErrorMsg(eid, "session_logoff invalid arguments");
-		return -1;
-	}
-
-	if (!mprVarIsPtr(argv[0]->type)) {
-		ejsSetErrorMsg(eid, "first arg is not a session handle");
-		return -1;
-	}	
-
-	session = argv[0]->ptr;
-
-	status = smb_raw_ulogoff(session);
-
-	if (!NT_STATUS_IS_OK(status)) {
-		ejsSetErrorMsg(eid, "session_logoff: %s", nt_errstr(status));
-		return -1;
-	}
-
-	talloc_free(session);
-
-	return 0;
-}
-
-/* Perform a connection close
-   
-     disconnect(conn);
-
- */
-static int ejs_cli_disconnect(MprVarHandle eid, int argc, MprVar **argv)
-{
-	struct smbcli_sock *sock;
-
-	/* Argument parsing */
-
-	if (argc != 1) {
-		ejsSetErrorMsg(eid, "disconnect invalid arguments");
-		return -1;
-	}
-
-	if (!mprVarIsPtr(argv[0]->type)) {
-		ejsSetErrorMsg(eid, "first arg is not a connect handle");
-		return -1;
-	}	
-
-	sock = argv[0]->ptr;
-
-	talloc_free(sock);
-
-	return 0;
-}
-
-#endif
-
-/* Perform a tree connect:
-
-     tree_handle = tree_connect("\\\\frogurt\\homes", "user%pass");
- */
-
-static int ejs_tree_connect(MprVarHandle eid, int argc, char **argv)
-{
-	struct cli_credentials *creds;
-	struct smb_composite_connect io;
-	struct smbcli_tree *tree;
-	char *hostname, *sharename;
-	NTSTATUS result;
-	TALLOC_CTX *mem_ctx;
-
-	if (argc != 2) {
-		ejsSetErrorMsg(eid, "tree_connect(): invalid number of args");
-		return -1;
-	}
-
-	/* Set up host, share destination */
-
-	mem_ctx = talloc_new(mprMemCtx());
-	smbcli_parse_unc(argv[0], mem_ctx, &hostname, &sharename);
-
-	/* Set up credentials */
-
-	creds = cli_credentials_init(NULL);
-	cli_credentials_set_conf(creds, mprLpCtx());
-	cli_credentials_parse_string(creds, argv[1], CRED_SPECIFIED);
-
-	/* Do connect */
-
-	io.in.dest_host              = hostname;
-	io.in.dest_ports             = lp_smb_ports(mprLpCtx());
-	io.in.called_name            = strupper_talloc(mem_ctx, hostname);
-	io.in.service                = sharename;
-	io.in.service_type           = "?????";
-	io.in.credentials            = creds;
-	io.in.fallback_to_anonymous  = false;
-	io.in.workgroup              = lp_workgroup(mprLpCtx());
-	lp_smbcli_options(mprLpCtx(), &io.in.options);
-
-	result = smb_composite_connect(&io, mem_ctx, 
-				       lp_resolve_context(mprLpCtx()), 
-				       NULL);
-	tree = io.out.tree;
-
-	talloc_free(mem_ctx);
-
-	if (!NT_STATUS_IS_OK(result)) {
-		mpr_Return(eid, mprNTSTATUS(result));
-		return 0;
-	}
-
-	mpr_Return(eid, mprCreatePtrVar(tree));
-
-	return 0;
-}
-
-#define IS_TREE_HANDLE(x) (mprVarIsPtr((x)->type) && \
-                           talloc_check_name((x)->ptr, "struct smbcli_tree"))
-
-/* Perform a tree disconnect:
-
-     tree_disconnect(tree_handle);
- */
-
-static int ejs_tree_disconnect(MprVarHandle eid, int argc, MprVar **argv)
-{
-	struct smbcli_tree *tree;
-	NTSTATUS result;
-
-	if (argc != 1) {
-		ejsSetErrorMsg(eid, 
-			       "tree_disconnect(): invalid number of args");
-		return -1;
-	}
-
-	if (!IS_TREE_HANDLE(argv[0])) {
-		ejsSetErrorMsg(eid, "first arg is not a tree handle");
-		return -1;
-	}
-
-	tree = talloc_get_type(argv[0]->ptr, struct smbcli_tree);
-
-	result = smb_tree_disconnect(tree);
-
-	mpr_Return(eid, mprNTSTATUS(result));
-
-	return 0;
-}
-
-/* Create a directory:
-
-     result = mkdir(tree_handle, DIRNAME);
- */
-
-static int ejs_mkdir(MprVarHandle eid, int argc, MprVar **argv)
-{
-	struct smbcli_tree *tree;
-	NTSTATUS result;
-
-	if (argc != 2) {
-		ejsSetErrorMsg(eid, "mkdir(): invalid number of args");
-		return -1;
-	}
-
-	if (!IS_TREE_HANDLE(argv[0])) {
-		ejsSetErrorMsg(eid, "first arg is not a tree handle");
-		return -1;
-	}
-
-	tree = (struct smbcli_tree *)argv[0]->ptr;
-
-	if (!mprVarIsString(argv[1]->type)) {
-		ejsSetErrorMsg(eid, "arg 2 must be a string");
-		return -1;
-	}
-
-	result = smbcli_mkdir(tree, argv[1]->string);
-
-	mpr_Return(eid, mprNTSTATUS(result));
-
-	return 0;
-}
-
-/* Remove a directory:
-
-     result = rmdir(tree_handle, DIRNAME);
- */
-
-static int ejs_rmdir(MprVarHandle eid, int argc, MprVar **argv)
-{
-	struct smbcli_tree *tree;
-	NTSTATUS result;
-
-	if (argc != 2) {
-		ejsSetErrorMsg(eid, "rmdir(): invalid number of args");
-		return -1;
-	}
-
-	if (!IS_TREE_HANDLE(argv[0])) {
-		ejsSetErrorMsg(eid, "first arg is not a tree handle");
-		return -1;
-	}
-
-	tree = (struct smbcli_tree *)argv[0]->ptr;
-
-	if (!mprVarIsString(argv[1]->type)) {
-		ejsSetErrorMsg(eid, "arg 2 must be a string");
-		return -1;
-	}
-	
-	result = smbcli_rmdir(tree, argv[1]->string);
-
-	mpr_Return(eid, mprNTSTATUS(result));
-
-	return 0;
-}
-
-/* Rename a file or directory:
-
-     result = rename(tree_handle, SRCFILE, DESTFILE);
- */
-
-static int ejs_rename(MprVarHandle eid, int argc, MprVar **argv)
-{
-	struct smbcli_tree *tree;
-	NTSTATUS result;
-
-	if (argc != 3) {
-		ejsSetErrorMsg(eid, "rename(): invalid number of args");
-		return -1;
-	}
-
-	if (!IS_TREE_HANDLE(argv[0])) {
-		ejsSetErrorMsg(eid, "first arg is not a tree handle");
-		return -1;
-	}
-
-	tree = (struct smbcli_tree *)argv[0]->ptr;
-
-	if (!mprVarIsString(argv[1]->type)) {
-		ejsSetErrorMsg(eid, "arg 2 must be a string");
-		return -1;
-	}
-	
-	if (!mprVarIsString(argv[2]->type)) {
-		ejsSetErrorMsg(eid, "arg 3 must be a string");
-		return -1;
-	}
-	
-	result = smbcli_rename(tree, argv[1]->string, argv[2]->string);
-
-	mpr_Return(eid, mprNTSTATUS(result));
-
-	return 0;
-}
-
-/* Unlink a file or directory:
-
-     result = unlink(tree_handle, FILENAME);
- */
-
-static int ejs_unlink(MprVarHandle eid, int argc, MprVar **argv)
-{
-	struct smbcli_tree *tree;
-	NTSTATUS result;
-
-	if (argc != 2) {
-		ejsSetErrorMsg(eid, "unlink(): invalid number of args");
-		return -1;
-	}
-
-	if (!IS_TREE_HANDLE(argv[0])) {
-		ejsSetErrorMsg(eid, "first arg is not a tree handle");
-		return -1;
-	}
-
-	tree = (struct smbcli_tree *)argv[0]->ptr;
-
-	if (!mprVarIsString(argv[1]->type)) {
-		ejsSetErrorMsg(eid, "arg 2 must be a string");
-		return -1;
-	}
-	
-	result = smbcli_unlink(tree, argv[1]->string);
-
-	mpr_Return(eid, mprNTSTATUS(result));
-
-	return 0;
-}
-
-/* List directory contents
-
-     result = list(tree_handle, ARG1, ...);
- */
-
-static void ejs_list_helper(struct clilist_file_info *info, const char *mask, 
-			    void *state)
-
-{
-	MprVar *result = (MprVar *)state;
-	char idx[16];
-
-	mprItoa(result->properties->numDataItems, idx, sizeof(idx));
-	mprSetVar(result, idx, mprString(info->name));
-}
-
-static int ejs_list(MprVarHandle eid, int argc, MprVar **argv)
-{
-	struct smbcli_tree *tree;
-	char *mask;
-	uint16_t attribute;
-	MprVar result;
-
-	if (argc != 3) {
-		ejsSetErrorMsg(eid, "list(): invalid number of args");
-		return -1;
-	}
-
-	if (!IS_TREE_HANDLE(argv[0])) {
-		ejsSetErrorMsg(eid, "first arg is not a tree handle");
-		return -1;
-	}
-
-	tree = (struct smbcli_tree *)argv[0]->ptr;
-
-	if (!mprVarIsString(argv[1]->type)) {
-		ejsSetErrorMsg(eid, "arg 2 must be a string");
-		return -1;
-	}
-	
-	mask = argv[1]->string;
-
-	if (!mprVarIsNumber(argv[2]->type)) {
-		ejsSetErrorMsg(eid, "arg 3 must be a number");
-		return -1;
-	}
-
-	attribute = mprVarToInteger(argv[2]);
-
-	result = mprObject("list");
-
-	smbcli_list(tree, mask, attribute, ejs_list_helper, &result);
-
-	mpr_Return(eid, result);
-
-	return 0;
-}
-
-/*
-  setup C functions that be called from ejs
-*/
-void smb_setup_ejs_cli(void)
-{
-	ejsDefineStringCFunction(-1, "tree_connect", ejs_tree_connect, NULL, MPR_VAR_SCRIPT_HANDLE);
-	ejsDefineCFunction(-1, "tree_disconnect", ejs_tree_disconnect, NULL, MPR_VAR_SCRIPT_HANDLE);
-
-	ejsDefineCFunction(-1, "mkdir", ejs_mkdir, NULL, MPR_VAR_SCRIPT_HANDLE);
-	ejsDefineCFunction(-1, "rmdir", ejs_rmdir, NULL, MPR_VAR_SCRIPT_HANDLE);
-	ejsDefineCFunction(-1, "rename", ejs_rename, NULL, MPR_VAR_SCRIPT_HANDLE);
-	ejsDefineCFunction(-1, "unlink", ejs_unlink, NULL, MPR_VAR_SCRIPT_HANDLE);
-	ejsDefineCFunction(-1, "list", ejs_list, NULL, MPR_VAR_SCRIPT_HANDLE);
-	
-
-#if 0
-	ejsDefineStringCFunction(-1, "connect", ejs_cli_connect, NULL, MPR_VAR_SCRIPT_HANDLE);
-	ejsDefineCFunction(-1, "session_setup", ejs_cli_ssetup, NULL, MPR_VAR_SCRIPT_HANDLE);
-	ejsDefineCFunction(-1, "tree_connect", ejs_cli_tree_connect, NULL, MPR_VAR_SCRIPT_HANDLE);
-	ejsDefineCFunction(-1, "tree_disconnect", ejs_cli_tree_disconnect, NULL, MPR_VAR_SCRIPT_HANDLE);
-	ejsDefineCFunction(-1, "session_logoff", ejs_cli_session_logoff, NULL, MPR_VAR_SCRIPT_HANDLE);
-	ejsDefineCFunction(-1, "disconnect", ejs_cli_disconnect, NULL, MPR_VAR_SCRIPT_HANDLE);	
-#endif
-}
-- 
cgit 


From d5434f0b4bcf744e5a5f0e933bdcf629d42a6478 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 26 May 2008 04:14:28 +0200
Subject: Allow using IRPC functions on the messaging bus from Python. (This
 used to be commit 6ecf81ae13dffa05356c1177c617206c120fb7d7)

---
 source4/scripting/bin/smbstatus | 39 +++++++++++++++++++++++----------------
 1 file changed, 23 insertions(+), 16 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/bin/smbstatus b/source4/scripting/bin/smbstatus
index 782e83e4cf..6d852c279c 100755
--- a/source4/scripting/bin/smbstatus
+++ b/source4/scripting/bin/smbstatus
@@ -15,11 +15,12 @@ sys.path.insert(0, "bin/python")
 
 import optparse
 import samba.getopt as options
-import samba.irpc
+from samba import messaging, irpc
 
-def show_sessions():
+def show_sessions(conn):
 	"""show open sessions"""
-	sessions = smbsrv_sessions()
+	conn = open_connection("smb_server")
+	sessions = conn.smbsrv_information(irpc.SMBSRV_INFO_SESSIONS).next()
 	print "User                                  Client      Connected at"
 	print "-------------------------------------------------------------------------------"
 	for session in sessions:
@@ -27,37 +28,43 @@ def show_sessions():
 		print "%-30s %16s   %s" % (fulluser, session.client_ip, sys.httptime(session.connect_time))
 	print ""
 
-def show_tcons():
+def show_tcons(open_connection):
 	"""show open tree connects"""
-	tcons = smbsrv_tcons()
+	conn = open_connection("smb_server")
+	tcons = conn.smbsrv_information(irpc.SMBSRV_INFO_TCONS).next()
 	print "Share                                 Client      Connected at"
 	print "-------------------------------------------------------------------------------"
 	for tcon in tcons:
 		print "%-30s %16s   %s\n" % (tcon.share_name, tcon.client_ip, sys.httptime(tcon.connect_time))
 
 
-def show_nbt():
+def show_nbt(open_connection):
 	"""show nbtd information"""
-	stats = nbtd_statistics()
-	print "NBT server statistics:",
+	conn = open_connection("nbt_server")
+	stats = conn.nbtd_information(irpc.NBTD_INFO_STATISTICS).next()
+	print "NBT server statistics:"
 	for r in stats:
-		print "\t" + r + ":\t" + stats[r] + "\n"
+		print "\t" + r + ":\t" + getattr(stats, r) + "\n"
 	print ""
 
 parser = optparse.OptionParser("%s [options]" % sys.argv[0])
 sambaopts = options.SambaOptions(parser)
 parser.add_option_group(sambaopts)
-parser.add_option("--nbt", type="string", metavar="NBT", 
-        help="show NetBIOS status")
+parser.add_option("--messaging-path", type="string", metavar="PATH",
+		          help="messaging path")
+parser.add_option("--nbt", help="show NetBIOS status", action="store_true")
+
+opts, args = parser.parse_args()
 
 lp = sambaopts.get_loadparm()
 
 print "%s\n\n" % lp.get("server string")
 
+def open_connection(name):
+	return messaging.ClientConnection(name, messaging_path=opts.messaging_path)
+
 if opts.nbt:
-	show_nbt()
+	show_nbt(open_connection)
 else:
-	show_sessions()
-	show_tcons()
-
-return 0
+	show_sessions(open_connection)
+	show_tcons(open_connection)
-- 
cgit 


From 4b3641695ba42d0348e8eceadb02430342c1513c Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 26 May 2008 05:00:45 +0200
Subject: Finish smbstatus in Python. (This used to be commit
 988508c2d3269cc88ed38df2fc207a1c0aaccc6b)

---
 source4/scripting/bin/smbstatus | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/bin/smbstatus b/source4/scripting/bin/smbstatus
index 6d852c279c..7e58ee1269 100755
--- a/source4/scripting/bin/smbstatus
+++ b/source4/scripting/bin/smbstatus
@@ -9,13 +9,13 @@
 #  Released under the GNU GPL version 3 or later
 #
 
-import sys
+import os, sys
 
 sys.path.insert(0, "bin/python")
 
 import optparse
 import samba.getopt as options
-from samba import messaging, irpc
+from samba import irpc, messaging
 
 def show_sessions(conn):
 	"""show open sessions"""
@@ -35,7 +35,7 @@ def show_tcons(open_connection):
 	print "Share                                 Client      Connected at"
 	print "-------------------------------------------------------------------------------"
 	for tcon in tcons:
-		print "%-30s %16s   %s\n" % (tcon.share_name, tcon.client_ip, sys.httptime(tcon.connect_time))
+		print "%-30s %16s   %s" % (tcon.share_name, tcon.client_ip, sys.httptime(tcon.connect_time))
 
 
 def show_nbt(open_connection):
@@ -43,9 +43,14 @@ def show_nbt(open_connection):
 	conn = open_connection("nbt_server")
 	stats = conn.nbtd_information(irpc.NBTD_INFO_STATISTICS).next()
 	print "NBT server statistics:"
-	for r in stats:
-		print "\t" + r + ":\t" + getattr(stats, r) + "\n"
-	print ""
+	fields = [("total_received", "Total received"),
+			  ("total_sent", "Total sent"),
+			  ("query_count", "Query count"),
+			  ("register_count", "Register count"),
+			  ("release_count", "Release count")]
+	for (field, description) in fields:
+		print "\t%s:\t%s" % (description, getattr(stats, field))
+	print
 
 parser = optparse.OptionParser("%s [options]" % sys.argv[0])
 sambaopts = options.SambaOptions(parser)
@@ -58,10 +63,12 @@ opts, args = parser.parse_args()
 
 lp = sambaopts.get_loadparm()
 
-print "%s\n\n" % lp.get("server string")
+print "%s" % lp.get("server string")
+
+messaging_path = (opts.messaging_path or os.path.join(lp.get("private dir"), "smbd.tmp", "messaging"))
 
 def open_connection(name):
-	return messaging.ClientConnection(name, messaging_path=opts.messaging_path)
+	return messaging.ClientConnection(name, messaging_path=messaging_path)
 
 if opts.nbt:
 	show_nbt(open_connection)
-- 
cgit 


From 575f1243856f52f87ccb09f1235f1263b7c54b9b Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 26 May 2008 05:12:31 +0200
Subject: Cope with no server being active. (This used to be commit
 893119bb4c9c297966d43d37fe73faa747b7c86e)

---
 source4/scripting/bin/smbstatus | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/bin/smbstatus b/source4/scripting/bin/smbstatus
index 7e58ee1269..bbd0e84826 100755
--- a/source4/scripting/bin/smbstatus
+++ b/source4/scripting/bin/smbstatus
@@ -19,7 +19,7 @@ from samba import irpc, messaging
 
 def show_sessions(conn):
 	"""show open sessions"""
-	conn = open_connection("smb_server")
+
 	sessions = conn.smbsrv_information(irpc.SMBSRV_INFO_SESSIONS).next()
 	print "User                                  Client      Connected at"
 	print "-------------------------------------------------------------------------------"
@@ -73,5 +73,11 @@ def open_connection(name):
 if opts.nbt:
 	show_nbt(open_connection)
 else:
-	show_sessions(open_connection)
-	show_tcons(open_connection)
+	try:
+		conn = open_connection("smb_server")
+	except RuntimeError, (num, msg):
+		if msg ==  'NT_STATUS_OBJECT_NAME_NOT_FOUND':
+			print "No active connections"
+	else:
+		show_sessions(conn)
+		show_tcons(conn)
-- 
cgit 


From 976eca077d2ea9b44b4b62ae851ca9cc470e3729 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sat, 24 May 2008 17:56:49 +0200
Subject: Move some scripts to examples directory since they're not really
 generically useful. (This used to be commit
 4026493e91f8096e5d602cd42f9a83d2d75042db)

---
 source4/scripting/bin/samba3dump            |   4 +-
 source4/scripting/bin/samr.py               | 114 ----------------------------
 source4/scripting/bin/winreg.py             |  87 ---------------------
 source4/scripting/python/examples/samr.py   | 114 ++++++++++++++++++++++++++++
 source4/scripting/python/examples/winreg.py |  87 +++++++++++++++++++++
 5 files changed, 203 insertions(+), 203 deletions(-)
 delete mode 100755 source4/scripting/bin/samr.py
 delete mode 100755 source4/scripting/bin/winreg.py
 create mode 100755 source4/scripting/python/examples/samr.py
 create mode 100755 source4/scripting/python/examples/winreg.py

(limited to 'source4/scripting')

diff --git a/source4/scripting/bin/samba3dump b/source4/scripting/bin/samba3dump
index d89667233f..c11f8dbd0d 100755
--- a/source4/scripting/bin/samba3dump
+++ b/source4/scripting/bin/samba3dump
@@ -14,7 +14,7 @@ sys.path.insert(0, "bin/python")
 import samba
 import samba.samba3
 
-parser = optparse.OptionParser("provision <libdir> [<smb.conf>]")
+parser = optparse.OptionParser("samba3dump <libdir> [<smb.conf>]")
 parser.add_option("--format", type="choice", metavar="FORMAT",
                   choices=["full", "summary"])
 
@@ -96,7 +96,7 @@ def print_samba3_secrets(secrets):
 
 def print_samba3_regdb(regdb):
     print_header("Registry")
-    from registry import str_regtype
+    from samba.registry import str_regtype
 
     for k in regdb.keys():
         print "[%s]" % k
diff --git a/source4/scripting/bin/samr.py b/source4/scripting/bin/samr.py
deleted file mode 100755
index e91b5bc312..0000000000
--- a/source4/scripting/bin/samr.py
+++ /dev/null
@@ -1,114 +0,0 @@
-#!/usr/bin/python
-# -*- coding: utf-8 -*-
-
-# Unix SMB/CIFS implementation.
-# Copyright © Jelmer Vernooij <jelmer@samba.org> 2008
-#
-# Based on samr.js © Andrew Tridgell <tridge@samba.org>
-#   
-# 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/>.
-#
-
-import sys
-
-sys.path.insert(0, "bin/python")
-
-from samba.dcerpc import samr, security, lsa
-
-def FillUserInfo(samr, dom_handle, users, level):
-    """fill a user array with user information from samrQueryUserInfo"""
-    for i in range(len(users)):
-        user_handle = samr.OpenUser(handle, security.SEC_FLAG_MAXIMUM_ALLOWED, users[i].idx)
-        info = samr.QueryUserInfo(user_handle, level)
-        info.name = users[i].name
-        info.idx  = users[i].idx
-        users[i] = info
-        samr.Close(user_handle)
-
-def toArray((handle, array, num_entries)):
-    ret = []
-    for x in range(num_entries):
-        ret.append((array.entries[x].idx, array.entries[x].name))
-    return ret
-    
-
-def test_Connect(samr):
-    """test the samr_Connect interface"""
-    print "Testing samr_Connect"
-    return samr.Connect2(None, security.SEC_FLAG_MAXIMUM_ALLOWED)
-
-def test_LookupDomain(samr, handle, domain):
-    """test the samr_LookupDomain interface"""
-    print "Testing samr_LookupDomain"
-    return samr.LookupDomain(handle, domain)
-
-def test_OpenDomain(samr, handle, sid):
-    """test the samr_OpenDomain interface"""
-    print "Testing samr_OpenDomain"
-    return samr.OpenDomain(handle, security.SEC_FLAG_MAXIMUM_ALLOWED, sid)
-
-def test_EnumDomainUsers(samr, dom_handle):
-    """test the samr_EnumDomainUsers interface"""
-    print "Testing samr_EnumDomainUsers"
-    users = toArray(samr.EnumDomainUsers(dom_handle, 0, 0, -1))
-    print "Found %d users" % len(users)
-    for idx, user in users:
-        print "\t%s\t(%d)" % (user, idx)
-
-def test_EnumDomainGroups(samr, dom_handle):
-    """test the samr_EnumDomainGroups interface"""
-    print "Testing samr_EnumDomainGroups"
-    groups = toArray(samr.EnumDomainGroups(dom_handle, 0, 0))
-    print "Found %d groups" % len(groups)
-    for idx, group in groups:
-        print "\t%s\t(%d)" % (group, idx)
-
-def test_domain_ops(samr, dom_handle):
-    """test domain specific ops"""
-    test_EnumDomainUsers(samr, dom_handle)
-    test_EnumDomainGroups(samr, dom_handle)
-
-def test_EnumDomains(samr, handle):
-    """test the samr_EnumDomains interface"""
-    print "Testing samr_EnumDomains"
-
-    domains = toArray(samr.EnumDomains(handle, 0, -1))
-    print "Found %d domains" % len(domains)
-    for idx, domain in domains:
-        print "\t%s (%d)" % (domain, idx)
-    for idx, domain in domains:
-        print "Testing domain %s" % domain
-        sid = samr.LookupDomain(handle, domain)
-        dom_handle = test_OpenDomain(samr, handle, sid)
-        test_domain_ops(samr, dom_handle)
-        samr.Close(dom_handle)
-
-if len(sys.argv) != 2:
-   print "Usage: samr.js <BINDING>"
-   sys.exit(1)
-
-binding = sys.argv[1]
-
-print "Connecting to " + binding
-try:
-    samr = samr.samr(binding)
-except Exception, e:
-    print "Failed to connect to %s: %s" % (binding, e.message)
-    sys.exit(1)
-
-handle = test_Connect(samr)
-test_EnumDomains(samr, handle)
-samr.Close(handle)
-
-print "All OK"
diff --git a/source4/scripting/bin/winreg.py b/source4/scripting/bin/winreg.py
deleted file mode 100755
index 19d39e56ab..0000000000
--- a/source4/scripting/bin/winreg.py
+++ /dev/null
@@ -1,87 +0,0 @@
-#!/usr/bin/python
-#
-#  tool to manipulate a remote registry
-#  Copyright Andrew Tridgell 2005
-#  Copyright Jelmer Vernooij 2007
-#  Released under the GNU GPL v3 or later
-#
-
-import sys
-
-# Find right directory when running from source tree
-sys.path.insert(0, "bin/python")
-
-import winreg
-import optparse
-import samba.getopt as options
-
-parser = optparse.OptionParser("%s <BINDING> [path]" % sys.argv[0])
-sambaopts = options.SambaOptions(parser)
-parser.add_option_group(sambaopts)
-parser.add_option("--createkey", type="string", metavar="KEYNAME", 
-        help="create a key")
-
-opts, args = parser.parse_args()
-
-if len(args) < 1:
-    parser.print_usage()
-    sys.exit(-1)
-
-binding = args[0]
-
-print "Connecting to " + binding
-conn = winreg.winreg(binding, sambaopts.get_loadparm())
-
-def list_values(key):
-    (num_values, max_valnamelen, max_valbufsize) = conn.QueryInfoKey(key, winreg.String())[4:8]
-    for i in range(num_values):
-        name = winreg.StringBuf()
-        name.size = max_valnamelen
-        (name, type, data, _, data_len) = conn.EnumValue(key, i, name, 0, "", max_valbufsize, 0)
-        print "\ttype=%-30s size=%4d  '%s'" % type, len, name
-        if type in (winreg.REG_SZ, winreg.REG_EXPAND_SZ):
-            print "\t\t'%s'" % data
-#        if (v.type == reg.REG_MULTI_SZ) {
-#            for (j in v.value) {
-#                printf("\t\t'%s'\n", v.value[j])
-#            }
-#        }
-#        if (v.type == reg.REG_DWORD || v.type == reg.REG_DWORD_BIG_ENDIAN) {
-#            printf("\t\t0x%08x (%d)\n", v.value, v.value)
-#        }
-#        if (v.type == reg.REG_QWORD) {
-#            printf("\t\t0x%llx (%lld)\n", v.value, v.value)
-#        }
-
-def list_path(key, path):
-    count = 0
-    (num_subkeys, max_subkeylen, max_subkeysize) = conn.QueryInfoKey(key, winreg.String())[1:4]
-    for i in range(num_subkeys):
-        name = winreg.StringBuf()
-        name.size = max_subkeysize
-        keyclass = winreg.StringBuf()
-        keyclass.size = max_subkeysize
-        (name, _, _) = conn.EnumKey(key, i, name, keyclass=keyclass, last_changed_time=None)[0]
-        subkey = conn.OpenKey(key, name, 0, winreg.KEY_QUERY_VALUE | winreg.KEY_ENUMERATE_SUB_KEYS)
-        count += list_path(subkey, "%s\\%s" % (path, name))
-        list_values(subkey)
-    return count
-
-if len(args) > 1:
-    root = args[1]
-else:
-    root = "HKLM"
-
-if opts.createkey:
-    reg.create_key("HKLM\\SOFTWARE", opt.createkey)
-else:
-    print "Listing registry tree '%s'" % root
-    try:
-        root_key = getattr(conn, "Open%s" % root)(None, winreg.KEY_QUERY_VALUE | winreg.KEY_ENUMERATE_SUB_KEYS)
-    except AttributeError:
-        print "Unknown root key name %s" % root
-        sys.exit(1)
-    count = list_path(root_key, root)
-    if count == 0:
-        print "No entries found"
-        sys.exit(1)
diff --git a/source4/scripting/python/examples/samr.py b/source4/scripting/python/examples/samr.py
new file mode 100755
index 0000000000..1f2afbe688
--- /dev/null
+++ b/source4/scripting/python/examples/samr.py
@@ -0,0 +1,114 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+
+# Unix SMB/CIFS implementation.
+# Copyright © Jelmer Vernooij <jelmer@samba.org> 2008
+#
+# Based on samr.js © Andrew Tridgell <tridge@samba.org>
+#   
+# 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/>.
+#
+
+import sys
+
+sys.path.insert(0, "bin/python")
+
+from samba.dcerpc import samr, security, lsa
+
+def FillUserInfo(samr, dom_handle, users, level):
+    """fill a user array with user information from samrQueryUserInfo"""
+    for i in range(len(users)):
+        user_handle = samr.OpenUser(handle, security.SEC_FLAG_MAXIMUM_ALLOWED, users[i].idx)
+        info = samr.QueryUserInfo(user_handle, level)
+        info.name = users[i].name
+        info.idx  = users[i].idx
+        users[i] = info
+        samr.Close(user_handle)
+
+def toArray((handle, array, num_entries)):
+    ret = []
+    for x in range(num_entries):
+        ret.append((array.entries[x].idx, array.entries[x].name))
+    return ret
+    
+
+def test_Connect(samr):
+    """test the samr_Connect interface"""
+    print "Testing samr_Connect"
+    return samr.Connect2(None, security.SEC_FLAG_MAXIMUM_ALLOWED)
+
+def test_LookupDomain(samr, handle, domain):
+    """test the samr_LookupDomain interface"""
+    print "Testing samr_LookupDomain"
+    return samr.LookupDomain(handle, domain)
+
+def test_OpenDomain(samr, handle, sid):
+    """test the samr_OpenDomain interface"""
+    print "Testing samr_OpenDomain"
+    return samr.OpenDomain(handle, security.SEC_FLAG_MAXIMUM_ALLOWED, sid)
+
+def test_EnumDomainUsers(samr, dom_handle):
+    """test the samr_EnumDomainUsers interface"""
+    print "Testing samr_EnumDomainUsers"
+    users = toArray(samr.EnumDomainUsers(dom_handle, 0, 0, -1))
+    print "Found %d users" % len(users)
+    for idx, user in users:
+        print "\t%s\t(%d)" % (user, idx)
+
+def test_EnumDomainGroups(samr, dom_handle):
+    """test the samr_EnumDomainGroups interface"""
+    print "Testing samr_EnumDomainGroups"
+    groups = toArray(samr.EnumDomainGroups(dom_handle, 0, 0))
+    print "Found %d groups" % len(groups)
+    for idx, group in groups:
+        print "\t%s\t(%d)" % (group, idx)
+
+def test_domain_ops(samr, dom_handle):
+    """test domain specific ops"""
+    test_EnumDomainUsers(samr, dom_handle)
+    test_EnumDomainGroups(samr, dom_handle)
+
+def test_EnumDomains(samr, handle):
+    """test the samr_EnumDomains interface"""
+    print "Testing samr_EnumDomains"
+
+    domains = toArray(samr.EnumDomains(handle, 0, -1))
+    print "Found %d domains" % len(domains)
+    for idx, domain in domains:
+        print "\t%s (%d)" % (domain, idx)
+    for idx, domain in domains:
+        print "Testing domain %s" % domain
+        sid = samr.LookupDomain(handle, domain)
+        dom_handle = test_OpenDomain(samr, handle, sid)
+        test_domain_ops(samr, dom_handle)
+        samr.Close(dom_handle)
+
+if len(sys.argv) != 2:
+   print "Usage: samr.js <BINDING>"
+   sys.exit(1)
+
+binding = sys.argv[1]
+
+print "Connecting to %s" % binding
+try:
+    samr = samr.samr(binding)
+except Exception, e:
+    print "Failed to connect to %s: %s" % (binding, e.message)
+    sys.exit(1)
+
+handle = test_Connect(samr)
+test_EnumDomains(samr, handle)
+samr.Close(handle)
+
+print "All OK"
diff --git a/source4/scripting/python/examples/winreg.py b/source4/scripting/python/examples/winreg.py
new file mode 100755
index 0000000000..19d39e56ab
--- /dev/null
+++ b/source4/scripting/python/examples/winreg.py
@@ -0,0 +1,87 @@
+#!/usr/bin/python
+#
+#  tool to manipulate a remote registry
+#  Copyright Andrew Tridgell 2005
+#  Copyright Jelmer Vernooij 2007
+#  Released under the GNU GPL v3 or later
+#
+
+import sys
+
+# Find right directory when running from source tree
+sys.path.insert(0, "bin/python")
+
+import winreg
+import optparse
+import samba.getopt as options
+
+parser = optparse.OptionParser("%s <BINDING> [path]" % sys.argv[0])
+sambaopts = options.SambaOptions(parser)
+parser.add_option_group(sambaopts)
+parser.add_option("--createkey", type="string", metavar="KEYNAME", 
+        help="create a key")
+
+opts, args = parser.parse_args()
+
+if len(args) < 1:
+    parser.print_usage()
+    sys.exit(-1)
+
+binding = args[0]
+
+print "Connecting to " + binding
+conn = winreg.winreg(binding, sambaopts.get_loadparm())
+
+def list_values(key):
+    (num_values, max_valnamelen, max_valbufsize) = conn.QueryInfoKey(key, winreg.String())[4:8]
+    for i in range(num_values):
+        name = winreg.StringBuf()
+        name.size = max_valnamelen
+        (name, type, data, _, data_len) = conn.EnumValue(key, i, name, 0, "", max_valbufsize, 0)
+        print "\ttype=%-30s size=%4d  '%s'" % type, len, name
+        if type in (winreg.REG_SZ, winreg.REG_EXPAND_SZ):
+            print "\t\t'%s'" % data
+#        if (v.type == reg.REG_MULTI_SZ) {
+#            for (j in v.value) {
+#                printf("\t\t'%s'\n", v.value[j])
+#            }
+#        }
+#        if (v.type == reg.REG_DWORD || v.type == reg.REG_DWORD_BIG_ENDIAN) {
+#            printf("\t\t0x%08x (%d)\n", v.value, v.value)
+#        }
+#        if (v.type == reg.REG_QWORD) {
+#            printf("\t\t0x%llx (%lld)\n", v.value, v.value)
+#        }
+
+def list_path(key, path):
+    count = 0
+    (num_subkeys, max_subkeylen, max_subkeysize) = conn.QueryInfoKey(key, winreg.String())[1:4]
+    for i in range(num_subkeys):
+        name = winreg.StringBuf()
+        name.size = max_subkeysize
+        keyclass = winreg.StringBuf()
+        keyclass.size = max_subkeysize
+        (name, _, _) = conn.EnumKey(key, i, name, keyclass=keyclass, last_changed_time=None)[0]
+        subkey = conn.OpenKey(key, name, 0, winreg.KEY_QUERY_VALUE | winreg.KEY_ENUMERATE_SUB_KEYS)
+        count += list_path(subkey, "%s\\%s" % (path, name))
+        list_values(subkey)
+    return count
+
+if len(args) > 1:
+    root = args[1]
+else:
+    root = "HKLM"
+
+if opts.createkey:
+    reg.create_key("HKLM\\SOFTWARE", opt.createkey)
+else:
+    print "Listing registry tree '%s'" % root
+    try:
+        root_key = getattr(conn, "Open%s" % root)(None, winreg.KEY_QUERY_VALUE | winreg.KEY_ENUMERATE_SUB_KEYS)
+    except AttributeError:
+        print "Unknown root key name %s" % root
+        sys.exit(1)
+    count = list_path(root_key, root)
+    if count == 0:
+        print "No entries found"
+        sys.exit(1)
-- 
cgit 


From 57f6663f3a029945fe7e799d4371131d9a20d306 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sat, 24 May 2008 17:52:58 +0200
Subject: Remove obsolete ejs winreg example. (This used to be commit
 f1a2d2bc00dac56080b2bd560074ec66d12a3129)

---
 source4/scripting/bin/winreg | 107 -------------------------------------------
 1 file changed, 107 deletions(-)
 delete mode 100755 source4/scripting/bin/winreg

(limited to 'source4/scripting')

diff --git a/source4/scripting/bin/winreg b/source4/scripting/bin/winreg
deleted file mode 100755
index 883c6d7ee3..0000000000
--- a/source4/scripting/bin/winreg
+++ /dev/null
@@ -1,107 +0,0 @@
-#!/bin/sh
-exec smbscript "$0" ${1+"$@"}
-/*
-  tool to manipulate a remote registry
-  Copyright Andrew Tridgell 2005
-  Released under the GNU GPL version 3 or later
-*/	
-
-var options = GetOptions(ARGV,
-			 "POPT_AUTOHELP",
-			 "POPT_COMMON_SAMBA",
-			 "POPT_COMMON_CREDENTIALS",
-			 "createkey=s");
-if (options == undefined) {
-	println("Failed to parse options");
-	return -1;
-}
-
-libinclude("base.js");
-libinclude("winreg.js");
-
-if (options.ARGV.length < 1) {
-	println("Usage: winreg.js <BINDING> [path]");
-	return -1;
-}
-var binding = options.ARGV[0];
-reg = winregObj();
-
-print("Connecting to " + binding + "\n");
-status = reg.connect(binding);
-if (status.is_ok != true) {
-	print("Failed to connect to " + binding + " - " + status.errstr + "\n");
-	return -1;
-}
-
-function list_values(path) {
-	var list = reg.enum_values(path);
-	var i;
-	if (list == undefined) {
-		return;
-	}
-	for (i=0;i<list.length;i++) {
-		var v = list[i];
-		printf("\ttype=%-30s size=%4d  '%s'\n", reg.typestring(v.type), v.size, v.name);
-		if (v.type == reg.REG_SZ || v.type == reg.REG_EXPAND_SZ) {
-			printf("\t\t'%s'\n", v.value);
-		}
-		if (v.type == reg.REG_MULTI_SZ) {
-			var j;
-			for (j in v.value) {
-				printf("\t\t'%s'\n", v.value[j]);
-			}
-		}
-		if (v.type == reg.REG_DWORD || v.type == reg.REG_DWORD_BIG_ENDIAN) {
-			printf("\t\t0x%08x (%d)\n", v.value, v.value);
-		}
-		if (v.type == reg.REG_QWORD) {
-			printf("\t\t0x%llx (%lld)\n", v.value, v.value);
-		}
-	}
-}
-
-function list_path(path) {
-	var count = 0;
-	var list = reg.enum_path(path);
-	if (list == undefined) {
-		println("Unable to list " + path);
-		return 0;
-	}
-	var i;
-	list_values(path);
-	count = count + list.length;
-	for (i=0;i<list.length;i++) {
-		var npath;
-		if (path) {
-			npath = path + "\\" + list[i];
-		} else {
-			npath = list[i];
-		}
-		println(npath);
-		count = count + list_path(npath);
-	}
-	return count;
-}
-
-var root;
-
-if (options.ARGV.length > 1) {
-	root = options.ARGV[1];
-} else {
-	root = '';
-}
-
-if (options.createkey) {
-	var ok = reg.create_key("HKLM\\SOFTWARE", options.createkey);
-	if (!ok) {
-		println("Failed to create key");
-	}
-} else {
-	printf("Listing registry tree '%s'\n", root);
-	var count = list_path(root);
-	if (count == 0) {
-		println("No entries found");
-		return 1;
-	}
-}
-return 0;
-- 
cgit 


From 58b1ab92a117cfcb311bdcb41fe563077ad39500 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sat, 24 May 2008 17:52:44 +0200
Subject: Fix import. (This used to be commit
 17231443a0e3b0ebc4b75db3d721fe0b4e1170c6)

---
 source4/scripting/python/examples/winreg.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/examples/winreg.py b/source4/scripting/python/examples/winreg.py
index 19d39e56ab..80b48ecfd7 100755
--- a/source4/scripting/python/examples/winreg.py
+++ b/source4/scripting/python/examples/winreg.py
@@ -11,7 +11,7 @@ import sys
 # Find right directory when running from source tree
 sys.path.insert(0, "bin/python")
 
-import winreg
+from samba.dcerpc import winreg
 import optparse
 import samba.getopt as options
 
-- 
cgit 


From cbe439383a8f9322c3b0b51aca863cecd77cafcb Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 26 May 2008 13:36:05 +0200
Subject: remove unused credentials ejs module. (This used to be commit
 9861cae1aebdef41f098df71be4e5a33f6af9bf1)

---
 source4/scripting/ejs/config.mk        |   1 -
 source4/scripting/ejs/smbcalls.c       |   1 -
 source4/scripting/ejs/smbcalls_creds.c | 275 ---------------------------------
 3 files changed, 277 deletions(-)
 delete mode 100644 source4/scripting/ejs/smbcalls_creds.c

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/config.mk b/source4/scripting/ejs/config.mk
index c5199669d5..5022aba34d 100644
--- a/source4/scripting/ejs/config.mk
+++ b/source4/scripting/ejs/config.mk
@@ -71,7 +71,6 @@ PRIVATE_DEPENDENCIES = \
 smbcalls_OBJ_FILES = $(addprefix $(ejsscriptsrcdir)/, \
 		smbcalls.o \
 		smbcalls_options.o \
-		smbcalls_creds.o \
 		smbcalls_param.o \
 		mprutil.o \
 		literal.o)
diff --git a/source4/scripting/ejs/smbcalls.c b/source4/scripting/ejs/smbcalls.c
index bdf70ca831..a90e1e62c8 100644
--- a/source4/scripting/ejs/smbcalls.c
+++ b/source4/scripting/ejs/smbcalls.c
@@ -204,7 +204,6 @@ void smb_setup_ejs_functions(void (*exception_handler)(const char *))
 	ejs_exception_handler = exception_handler;
 
 	smb_setup_ejs_options();
-	smb_setup_ejs_credentials();
 	smb_setup_ejs_param();
         smb_setup_ejs_literal();
 	
diff --git a/source4/scripting/ejs/smbcalls_creds.c b/source4/scripting/ejs/smbcalls_creds.c
deleted file mode 100644
index fd73f0751f..0000000000
--- a/source4/scripting/ejs/smbcalls_creds.c
+++ /dev/null
@@ -1,275 +0,0 @@
-/* 
-   Unix SMB/CIFS implementation.
-
-   provide hooks credentials calls
-
-   Copyright (C) Andrew Tridgell 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/>.
-*/
-
-#include "includes.h"
-#include "scripting/ejs/smbcalls.h"
-#include "lib/appweb/ejs/ejs.h"
-#include "lib/cmdline/popt_common.h"
-#include "auth/credentials/credentials.h"
-
-/*
-  helper function to get the local objects credentials ptr
-*/
-static struct cli_credentials *ejs_creds_get_credentials(int eid)
-{
-	struct cli_credentials *creds = (struct cli_credentials *)mprGetThisPtr(eid, "creds");
-	if (creds == NULL) {
-		ejsSetErrorMsg(eid, "NULL ejs credentials");
-	}
-	return creds;
-}
-
-/*
-  get a domain
-*/
-static int ejs_creds_get_domain(MprVarHandle eid, int argc, struct MprVar **argv)
-{
-	struct cli_credentials *creds = ejs_creds_get_credentials(eid);
-
-	mpr_Return(eid, mprString(cli_credentials_get_domain(creds)));
-	return 0;
-}
-
-
-/*
-  set a domain
-*/
-static int ejs_creds_set_domain(MprVarHandle eid, int argc, char **argv)
-{
-	struct cli_credentials *creds = ejs_creds_get_credentials(eid);
-	if (argc != 1) {
-		ejsSetErrorMsg(eid, "bad arguments to set_domain");
-		return -1;
-	}
-
-	cli_credentials_set_domain(creds, argv[0], CRED_SPECIFIED);
-	mpr_Return(eid, mprCreateBoolVar(true));
-	return 0;
-}
-
-
-/*
-  get a username
-*/
-static int ejs_creds_get_username(MprVarHandle eid, int argc, struct MprVar **argv)
-{
-	struct cli_credentials *creds = ejs_creds_get_credentials(eid);
-
-	mpr_Return(eid, mprString(cli_credentials_get_username(creds)));
-	return 0;
-}
-
-
-/*
-  set a username
-*/
-static int ejs_creds_set_username(MprVarHandle eid, int argc, char **argv)
-{
-	struct cli_credentials *creds = ejs_creds_get_credentials(eid);
-	if (argc != 1) {
-		ejsSetErrorMsg(eid, "bad arguments to set_username");
-		return -1;
-	}
-
-	cli_credentials_set_username(creds, argv[0], CRED_SPECIFIED);
-	mpr_Return(eid, mprCreateBoolVar(true));
-	return 0;
-}
-
-
-/*
-  get user password
-*/
-static int ejs_creds_get_password(MprVarHandle eid, int argc, struct MprVar **argv)
-{
-	struct cli_credentials *creds = ejs_creds_get_credentials(eid);
-	
-	mpr_Return(eid, mprString(cli_credentials_get_password(creds)));
-	return 0;
-}
-
-
-/*
-  set user password
-*/
-static int ejs_creds_set_password(MprVarHandle eid, int argc, char **argv)
-{
-	struct cli_credentials *creds = ejs_creds_get_credentials(eid);
-	if (argc != 1) {
-		ejsSetErrorMsg(eid, "bad arguments to set_password");
-		return -1;
-	}
-
-	cli_credentials_set_password(creds, argv[0], CRED_SPECIFIED);
-	mpr_Return(eid, mprCreateBoolVar(true));
-	return 0;
-}
-
-
-/*
-  set realm
-*/
-static int ejs_creds_set_realm(MprVarHandle eid, int argc, char **argv)
-{
-	struct cli_credentials *creds = ejs_creds_get_credentials(eid);
-	if (argc != 1) {
-		ejsSetErrorMsg(eid, "bad arguments to set_realm");
-		return -1;
-	}
-
-	cli_credentials_set_realm(creds, argv[0], CRED_SPECIFIED);
-	mpr_Return(eid, mprCreateBoolVar(true));
-	return 0;
-}
-
-
-/*
-  get realm
-*/
-static int ejs_creds_get_realm(MprVarHandle eid, int argc, struct MprVar **argv)
-{
-	struct cli_credentials *creds = ejs_creds_get_credentials(eid);
-	
-	mpr_Return(eid, mprString(cli_credentials_get_realm(creds)));
-	return 0;
-}
-
-
-/*
-  set workstation
-*/
-static int ejs_creds_set_workstation(MprVarHandle eid, int argc, char **argv)
-{
-	struct cli_credentials *creds = ejs_creds_get_credentials(eid);
-	if (argc != 1) {
-		ejsSetErrorMsg(eid, "bad arguments to set_workstation");
-		return -1;
-	}
-	
-	cli_credentials_set_workstation(creds, argv[0], CRED_SPECIFIED);
-	mpr_Return(eid, mprCreateBoolVar(true));
-	return 0;
-}
-
-
-/*
-  get workstation
-*/
-static int ejs_creds_get_workstation(MprVarHandle eid, int argc, struct MprVar **argv)
-{
-	struct cli_credentials *creds = ejs_creds_get_credentials(eid);
-	
-	mpr_Return(eid, mprString(cli_credentials_get_workstation(creds)));
-	return 0;
-}
-
-/*
-  set machine account 
-*/
-static int ejs_creds_set_machine_account(MprVarHandle eid, int argc, struct MprVar **argv)
-{
-	struct cli_credentials *creds = ejs_creds_get_credentials(eid);
-	if (argc != 0) {
-		ejsSetErrorMsg(eid, "bad arguments to set_machine_account");
-		return -1;
-	}
-	
-	if (NT_STATUS_IS_OK(cli_credentials_set_machine_account(creds, mprLpCtx()))) {
-		mpr_Return(eid, mprCreateBoolVar(true));
-	} else {
-		mpr_Return(eid, mprCreateBoolVar(false));
-	}
-	return 0;
-}
-
-
-/*
-  initialise credentials ejs object
-*/
-static int ejs_credentials_obj(struct MprVar *obj, struct cli_credentials *creds)
-{
-	mprSetPtrChild(obj, "creds", creds);
-
-	/* setup our object methods */
-	mprSetCFunction(obj, "get_domain", ejs_creds_get_domain);
-	mprSetStringCFunction(obj, "set_domain", ejs_creds_set_domain);
-	mprSetCFunction(obj, "get_username", ejs_creds_get_username);
-	mprSetStringCFunction(obj, "set_username", ejs_creds_set_username);
-	mprSetCFunction(obj, "get_password", ejs_creds_get_password);
-	mprSetStringCFunction(obj, "set_password", ejs_creds_set_password);
-	mprSetCFunction(obj, "get_realm", ejs_creds_get_realm);
-	mprSetStringCFunction(obj, "set_realm", ejs_creds_set_realm);
-	mprSetCFunction(obj, "get_workstation", ejs_creds_get_workstation);
-	mprSetStringCFunction(obj, "set_workstation", ejs_creds_set_workstation);
-	mprSetCFunction(obj, "set_machine_account", ejs_creds_set_machine_account);
-
-	return 0;
-}
-
-
-struct MprVar mprCredentials(struct cli_credentials *creds)
-{
-	struct MprVar mpv = mprObject("credentials");
-
-	ejs_credentials_obj(&mpv, creds);
-	
-	return mpv;
-}
-
-
-/*
-  initialise credentials ejs object
-*/
-static int ejs_credentials_init(MprVarHandle eid, int argc, struct MprVar **argv)
-{
-	struct cli_credentials *creds;
-	struct MprVar *obj = mprInitObject(eid, "credentials", argc, argv);
-
-	creds = cli_credentials_init(mprMemCtx());
-	if (creds == NULL) {
-		return -1;
-	}
-
-	cli_credentials_set_conf(creds, mprLpCtx());
-
-	return ejs_credentials_obj(obj, creds);
-}
-
-/*
-  initialise cmdline credentials ejs object
-*/
-int ejs_credentials_cmdline(int eid, int argc, struct MprVar **argv)
-{
-	struct MprVar *obj = mprInitObject(eid, "credentials", argc, argv);
-	if (talloc_reference(mprMemCtx(), cmdline_credentials) == NULL) {
-		return -1;
-	}
-	return ejs_credentials_obj(obj, cmdline_credentials);
-}
-
-/*
-  setup C functions that be called from ejs
-*/
-void smb_setup_ejs_credentials(void)
-{
-	ejsDefineCFunction(-1, "credentials_init", ejs_credentials_init, NULL, MPR_VAR_SCRIPT_HANDLE);
-}
-
-- 
cgit 


From ec362bdbc06a83d4b4656e5c3dde90c49adb2a64 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 26 May 2008 13:40:17 +0200
Subject: Remove unused datablob and nbt ejs bindings. (This used to be commit
 f758553ac50d374f64a8763055dc4f12ab9b0c68)

---
 source4/scripting/ejs/config.mk       |  14 --
 source4/scripting/ejs/smbcalls.c      |   1 -
 source4/scripting/ejs/smbcalls_data.c | 284 ----------------------------------
 source4/scripting/ejs/smbcalls_nbt.c  |  93 -----------
 4 files changed, 392 deletions(-)
 delete mode 100644 source4/scripting/ejs/smbcalls_data.c
 delete mode 100644 source4/scripting/ejs/smbcalls_nbt.c

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/config.mk b/source4/scripting/ejs/config.mk
index 5022aba34d..d8068bebdd 100644
--- a/source4/scripting/ejs/config.mk
+++ b/source4/scripting/ejs/config.mk
@@ -13,13 +13,6 @@ PRIVATE_DEPENDENCIES = LIBLDB SAMDB LIBNDR
 
 smbcalls_ldb_OBJ_FILES = $(ejsscriptsrcdir)/smbcalls_ldb.o
 
-[MODULE::smbcalls_nbt]
-SUBSYSTEM = smbcalls
-OUTPUT_TYPE = MERGED_OBJ
-INIT_FUNCTION = smb_setup_ejs_nbt
-
-smbcalls_nbt_OBJ_FILES = $(ejsscriptsrcdir)/smbcalls_nbt.o
-
 [MODULE::smbcalls_rand]
 SUBSYSTEM = smbcalls
 OUTPUT_TYPE = MERGED_OBJ
@@ -27,13 +20,6 @@ INIT_FUNCTION = smb_setup_ejs_random
 
 smbcalls_rand_OBJ_FILES = $(ejsscriptsrcdir)/smbcalls_rand.o
 
-[MODULE::smbcalls_data]
-SUBSYSTEM = smbcalls
-OUTPUT_TYPE = MERGED_OBJ
-INIT_FUNCTION = smb_setup_ejs_datablob
-
-smbcalls_data_OBJ_FILES = $(ejsscriptsrcdir)/smbcalls_data.o
-
 [MODULE::smbcalls_auth]
 OUTPUT_TYPE = MERGED_OBJ
 SUBSYSTEM = smbcalls
diff --git a/source4/scripting/ejs/smbcalls.c b/source4/scripting/ejs/smbcalls.c
index a90e1e62c8..d17f048887 100644
--- a/source4/scripting/ejs/smbcalls.c
+++ b/source4/scripting/ejs/smbcalls.c
@@ -191,7 +191,6 @@ void smb_setup_ejs_functions(void (*exception_handler)(const char *))
 	extern NTSTATUS smb_setup_ejs_system(void);
 	extern NTSTATUS smb_setup_ejs_ldb(void);
 	extern NTSTATUS ejs_init_svcctl(void);
-	extern NTSTATUS smb_setup_ejs_nbt(void);
 	extern NTSTATUS smb_setup_ejs_net(void);
 	extern NTSTATUS ejs_init_srvsvc(void);
 	extern NTSTATUS ejs_init_netlogon(void);
diff --git a/source4/scripting/ejs/smbcalls_data.c b/source4/scripting/ejs/smbcalls_data.c
deleted file mode 100644
index 19e1e173d6..0000000000
--- a/source4/scripting/ejs/smbcalls_data.c
+++ /dev/null
@@ -1,284 +0,0 @@
-/* 
-   Unix SMB/CIFS implementation.
-
-   provide access to data blobs
-
-   Copyright (C) Andrew Tridgell 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/>.
-*/
-
-#include "includes.h"
-#include "scripting/ejs/smbcalls.h"
-#include "lib/appweb/ejs/ejs.h"
-#include "librpc/gen_ndr/winreg.h"
-
-/*
-  create a data blob object from a ejs array of integers
-*/
-static int ejs_blobFromArray(MprVarHandle eid, int argc, struct MprVar **argv)
-{
-	struct MprVar *array, *v;
-	unsigned length, i;
-	DATA_BLOB blob;
-
-	if (argc != 1) {
-		ejsSetErrorMsg(eid, "blobFromArray invalid arguments");
-		return -1;		
-	}
-	array = argv[0];
-
-	v = mprGetProperty(array, "length", NULL);
-	if (v == NULL) {
-		goto failed;
-	}
-	length = mprToInt(v);
-
-	blob = data_blob_talloc(mprMemCtx(), NULL, length);
-	if (length != 0 && blob.data == NULL) {
-		goto failed;
-	}
-
-	for (i=0;i<length;i++) {
-		struct MprVar *vs;
-		char idx[16];
-		mprItoa(i, idx, sizeof(idx));		
-		vs = mprGetProperty(array, idx, NULL);
-		if (vs == NULL) {
-			goto failed;
-		}
-		blob.data[i] = mprVarToNumber(vs);
-	}
-
-	mpr_Return(eid, mprDataBlob(blob));
-	return 0;
-
-failed:
-	mpr_Return(eid, mprCreateUndefinedVar());
-	return 0;
-}
-
-/*
-  create a ejs array of integers from a data blob
-*/
-static int ejs_blobToArray(MprVarHandle eid, int argc, struct MprVar **argv)
-{
-	DATA_BLOB *blob;
-	struct MprVar array;
-	int i;
-
-	if (argc != 1) {
-		ejsSetErrorMsg(eid, "blobToArray invalid arguments");
-		return -1;		
-	}
-	blob = mprToDataBlob(argv[0]);
-	if (blob == NULL) {
-		goto failed;
-	}
-
-	array = mprArray("array");
-	
-	for (i=0;i<blob->length;i++) {
-		mprAddArray(&array, i, mprCreateNumberVar(blob->data[i]));
-	}
-	mpr_Return(eid, array);
-	return 0;
-
-failed:
-	mpr_Return(eid, mprCreateUndefinedVar());
-	return 0;
-}
-
-
-/*
-  compare two data blobs
-*/
-static int ejs_blobCompare(MprVarHandle eid, int argc, struct MprVar **argv)
-{
-	DATA_BLOB *blob1, *blob2;
-	bool ret = false;
-
-	if (argc != 2) {
-		ejsSetErrorMsg(eid, "blobCompare invalid arguments");
-		return -1;		
-	}
-	
-	blob1 = mprToDataBlob(argv[0]);
-	blob2 = mprToDataBlob(argv[1]);
-
-	if (blob1 == blob2) {
-		ret = true;
-		goto done;
-	}
-	if (blob1 == NULL || blob2 == NULL) {
-		ret = false;
-		goto done;
-	}
-
-	if (blob1->length != blob2->length) {
-		ret = false;
-		goto done;
-	}
-
-	if (memcmp(blob1->data, blob2->data, blob1->length) != 0) {
-		ret = false;
-		goto done;
-	}
-	ret = true;
-
-done:
-	mpr_Return(eid, mprCreateBoolVar(ret));
-	return 0;
-}
-
-
-/*
-  convert a blob in winreg format to a mpr variable
-  
-  usage:
-     v = data.regToVar(blob, type);
-*/
-static int ejs_regToVar(MprVarHandle eid, int argc, struct MprVar **argv)
-{
-	DATA_BLOB *blob;
-	enum winreg_Type type;
-	struct MprVar v;
-
-	if (argc != 2) {
-		ejsSetErrorMsg(eid, "regToVar invalid arguments");
-		return -1;		
-	}
-	
-	blob = mprToDataBlob(argv[0]);
-	type = mprToInt(argv[1]);
-
-	if (blob == NULL) {
-		ejsSetErrorMsg(eid, "regToVar null data");
-		return -1;
-	}
-
-	switch (type) {
-	case REG_NONE:
-		v = mprCreateUndefinedVar();
-		break;
-
-	case REG_SZ:
-	case REG_EXPAND_SZ: {
-		char *s;
-		ssize_t len;
-		len = convert_string_talloc(mprMemCtx(), lp_iconv_convenience(mprLpCtx()), CH_UTF16, CH_UNIX, 
-					    blob->data, blob->length, (void **)&s);
-		if (len == -1) {
-			ejsSetErrorMsg(eid, "regToVar invalid REG_SZ string");
-			return -1;
-		}
-		v = mprString(s);
-		talloc_free(s);
-		break;
-	}
-
-	case REG_DWORD: {
-		if (blob->length != 4) {
-			ejsSetErrorMsg(eid, "regToVar invalid REG_DWORD length %ld", (long)blob->length);
-			return -1;
-		}
-		v = mprCreateNumberVar(IVAL(blob->data, 0));
-		break;
-	}
-
-	case REG_DWORD_BIG_ENDIAN: {
-		if (blob->length != 4) {
-			ejsSetErrorMsg(eid, "regToVar invalid REG_DWORD_BIG_ENDIAN length %ld", (long)blob->length);
-			return -1;
-		}
-		v = mprCreateNumberVar(RIVAL(blob->data, 0));
-		break;
-	}
-
-	case REG_QWORD: {
-		if (blob->length != 8) {
-			ejsSetErrorMsg(eid, "regToVar invalid REG_QWORD length %ld", (long)blob->length);
-			return -1;
-		}
-		v = mprCreateNumberVar(BVAL(blob->data, 0));
-		break;
-	}
-
-	case REG_MULTI_SZ: {
-		DATA_BLOB b = *blob;
-		const char **list = NULL;
-		while (b.length > 0) {
-			char *s;
-			ssize_t len;
-			size_t slen = utf16_len_n(b.data, b.length);
-			if (slen == 2 && b.length == 2 && SVAL(b.data, 0) == 0) {
-				break;
-			}
-			len = convert_string_talloc(mprMemCtx(), lp_iconv_convenience(mprLpCtx()), CH_UTF16, CH_UNIX, 
-						    b.data, slen, (void **)&s);
-			if (len == -1) {
-				ejsSetErrorMsg(eid, "regToVar invalid REG_MULTI_SZ string");
-				return -1;
-			}
-			list = str_list_add(list, s);
-			talloc_free(s);
-			talloc_steal(mprMemCtx(), list);
-			b.data += slen;
-			b.length -= slen;
-		}
-		v = mprList("REG_MULTI_SZ", list);
-		talloc_free(list);
-		break;
-	}
-		
-
-	case REG_FULL_RESOURCE_DESCRIPTOR:
-	case REG_RESOURCE_LIST:
-	case REG_BINARY:
-	case REG_RESOURCE_REQUIREMENTS_LIST:
-	case REG_LINK:
-		return ejs_blobToArray(eid, 1, argv);
-
-	default:
-		ejsSetErrorMsg(eid, "regToVar invalid type %d", type);
-		return -1;		
-	}
-	
-	mpr_Return(eid, v);
-	return 0;
-}
-
-/*
-  initialise datablob ejs subsystem
-*/
-static int ejs_datablob_init(MprVarHandle eid, int argc, struct MprVar **argv)
-{
-	struct MprVar *obj = mprInitObject(eid, "datablob", argc, argv);
-
-	mprSetCFunction(obj, "blobFromArray", ejs_blobFromArray);
-	mprSetCFunction(obj, "blobToArray", ejs_blobToArray);
-	mprSetCFunction(obj, "blobCompare", ejs_blobCompare);
-	mprSetCFunction(obj, "regToVar", ejs_regToVar);
-
-	return 0;
-}
-
-/*
-  setup C functions that be called from ejs
-*/
-NTSTATUS smb_setup_ejs_datablob(void)
-{
-	ejsDefineCFunction(-1, "datablob_init", ejs_datablob_init, NULL, MPR_VAR_SCRIPT_HANDLE);
-	return NT_STATUS_OK;
-}
diff --git a/source4/scripting/ejs/smbcalls_nbt.c b/source4/scripting/ejs/smbcalls_nbt.c
deleted file mode 100644
index 8c555bf821..0000000000
--- a/source4/scripting/ejs/smbcalls_nbt.c
+++ /dev/null
@@ -1,93 +0,0 @@
-/* 
-   Unix SMB/CIFS implementation.
-
-   provide hooks into smbd C calls from ejs scripts
-
-   Copyright (C) Tim Potter 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/>.
-*/
-
-#include "includes.h"
-#include "scripting/ejs/smbcalls.h"
-#include "lib/appweb/ejs/ejs.h"
-#include "librpc/gen_ndr/nbt.h"
-#include "lib/events/events.h"
-#include "libcli/resolve/resolve.h"
-
-/*
-  look up a netbios name
-
-  syntax:
-    resolveName(result, "frogurt");
-    resolveName(result, "frogurt", 0x1c);
-*/
-
-static int ejs_resolve_name(MprVarHandle eid, int argc, struct MprVar **argv)
-{
-	int result = -1;
-	struct nbt_name name;
-	TALLOC_CTX *tmp_ctx = talloc_new(mprMemCtx());	
-	NTSTATUS nt_status;
-	const char *reply_addr;
-
-	/* validate arguments */
-	if (argc < 2 || argc > 3) {
-		ejsSetErrorMsg(eid, "resolveName invalid arguments");
-		goto done;
-	}
-
-	if (argv[0]->type != MPR_TYPE_OBJECT) {
-		ejsSetErrorMsg(eid, "resolvename invalid arguments");
-		goto done;
-	}
-
-	if (argv[1]->type != MPR_TYPE_STRING) {
-		ejsSetErrorMsg(eid, "resolveName invalid arguments");
-		goto done;
-	}
-	
-	if (argc == 2) {
-		make_nbt_name_client(&name, mprToString(argv[1]));
-	} else {
-		if (!mprVarIsNumber(argv[1]->type)) {
-			ejsSetErrorMsg(eid, "resolveName invalid arguments");
-			goto done;
-		}
-		make_nbt_name(&name, mprToString(argv[1]), mprToInt(argv[2]));
-	}
-
-	result = 0;
-
-	nt_status = resolve_name(lp_resolve_context(mprLpCtx()), &name, tmp_ctx, &reply_addr, mprEventCtx());
-
-	if (NT_STATUS_IS_OK(nt_status)) {
-		mprSetPropertyValue(argv[0], "value", mprString(reply_addr));
-	}
-
-	mpr_Return(eid, mprNTSTATUS(nt_status));
-
- done:
-	talloc_free(tmp_ctx);
-	return result;
-}
-
-/*
-  setup C functions that be called from ejs
-*/
-NTSTATUS smb_setup_ejs_nbt(void)
-{
-	ejsDefineCFunction(-1, "resolveName", ejs_resolve_name, NULL, MPR_VAR_SCRIPT_HANDLE);
-	return NT_STATUS_OK;
-}
-- 
cgit 


From 335688f640ed3f2b8a26dcf949b6175e2a95e802 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 26 May 2008 13:43:54 +0200
Subject: Revert "remove unused credentials ejs module."

This reverts commit 9861cae1aebdef41f098df71be4e5a33f6af9bf1.
(This used to be commit a429dc730f97388f0b4478b44522b1fe53f8569a)
---
 source4/scripting/ejs/config.mk        |   1 +
 source4/scripting/ejs/smbcalls.c       |   1 +
 source4/scripting/ejs/smbcalls_creds.c | 275 +++++++++++++++++++++++++++++++++
 3 files changed, 277 insertions(+)
 create mode 100644 source4/scripting/ejs/smbcalls_creds.c

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/config.mk b/source4/scripting/ejs/config.mk
index d8068bebdd..540e55edb4 100644
--- a/source4/scripting/ejs/config.mk
+++ b/source4/scripting/ejs/config.mk
@@ -57,6 +57,7 @@ PRIVATE_DEPENDENCIES = \
 smbcalls_OBJ_FILES = $(addprefix $(ejsscriptsrcdir)/, \
 		smbcalls.o \
 		smbcalls_options.o \
+		smbcalls_creds.o \
 		smbcalls_param.o \
 		mprutil.o \
 		literal.o)
diff --git a/source4/scripting/ejs/smbcalls.c b/source4/scripting/ejs/smbcalls.c
index d17f048887..880605bf10 100644
--- a/source4/scripting/ejs/smbcalls.c
+++ b/source4/scripting/ejs/smbcalls.c
@@ -203,6 +203,7 @@ void smb_setup_ejs_functions(void (*exception_handler)(const char *))
 	ejs_exception_handler = exception_handler;
 
 	smb_setup_ejs_options();
+	smb_setup_ejs_credentials();
 	smb_setup_ejs_param();
         smb_setup_ejs_literal();
 	
diff --git a/source4/scripting/ejs/smbcalls_creds.c b/source4/scripting/ejs/smbcalls_creds.c
new file mode 100644
index 0000000000..fd73f0751f
--- /dev/null
+++ b/source4/scripting/ejs/smbcalls_creds.c
@@ -0,0 +1,275 @@
+/* 
+   Unix SMB/CIFS implementation.
+
+   provide hooks credentials calls
+
+   Copyright (C) Andrew Tridgell 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/>.
+*/
+
+#include "includes.h"
+#include "scripting/ejs/smbcalls.h"
+#include "lib/appweb/ejs/ejs.h"
+#include "lib/cmdline/popt_common.h"
+#include "auth/credentials/credentials.h"
+
+/*
+  helper function to get the local objects credentials ptr
+*/
+static struct cli_credentials *ejs_creds_get_credentials(int eid)
+{
+	struct cli_credentials *creds = (struct cli_credentials *)mprGetThisPtr(eid, "creds");
+	if (creds == NULL) {
+		ejsSetErrorMsg(eid, "NULL ejs credentials");
+	}
+	return creds;
+}
+
+/*
+  get a domain
+*/
+static int ejs_creds_get_domain(MprVarHandle eid, int argc, struct MprVar **argv)
+{
+	struct cli_credentials *creds = ejs_creds_get_credentials(eid);
+
+	mpr_Return(eid, mprString(cli_credentials_get_domain(creds)));
+	return 0;
+}
+
+
+/*
+  set a domain
+*/
+static int ejs_creds_set_domain(MprVarHandle eid, int argc, char **argv)
+{
+	struct cli_credentials *creds = ejs_creds_get_credentials(eid);
+	if (argc != 1) {
+		ejsSetErrorMsg(eid, "bad arguments to set_domain");
+		return -1;
+	}
+
+	cli_credentials_set_domain(creds, argv[0], CRED_SPECIFIED);
+	mpr_Return(eid, mprCreateBoolVar(true));
+	return 0;
+}
+
+
+/*
+  get a username
+*/
+static int ejs_creds_get_username(MprVarHandle eid, int argc, struct MprVar **argv)
+{
+	struct cli_credentials *creds = ejs_creds_get_credentials(eid);
+
+	mpr_Return(eid, mprString(cli_credentials_get_username(creds)));
+	return 0;
+}
+
+
+/*
+  set a username
+*/
+static int ejs_creds_set_username(MprVarHandle eid, int argc, char **argv)
+{
+	struct cli_credentials *creds = ejs_creds_get_credentials(eid);
+	if (argc != 1) {
+		ejsSetErrorMsg(eid, "bad arguments to set_username");
+		return -1;
+	}
+
+	cli_credentials_set_username(creds, argv[0], CRED_SPECIFIED);
+	mpr_Return(eid, mprCreateBoolVar(true));
+	return 0;
+}
+
+
+/*
+  get user password
+*/
+static int ejs_creds_get_password(MprVarHandle eid, int argc, struct MprVar **argv)
+{
+	struct cli_credentials *creds = ejs_creds_get_credentials(eid);
+	
+	mpr_Return(eid, mprString(cli_credentials_get_password(creds)));
+	return 0;
+}
+
+
+/*
+  set user password
+*/
+static int ejs_creds_set_password(MprVarHandle eid, int argc, char **argv)
+{
+	struct cli_credentials *creds = ejs_creds_get_credentials(eid);
+	if (argc != 1) {
+		ejsSetErrorMsg(eid, "bad arguments to set_password");
+		return -1;
+	}
+
+	cli_credentials_set_password(creds, argv[0], CRED_SPECIFIED);
+	mpr_Return(eid, mprCreateBoolVar(true));
+	return 0;
+}
+
+
+/*
+  set realm
+*/
+static int ejs_creds_set_realm(MprVarHandle eid, int argc, char **argv)
+{
+	struct cli_credentials *creds = ejs_creds_get_credentials(eid);
+	if (argc != 1) {
+		ejsSetErrorMsg(eid, "bad arguments to set_realm");
+		return -1;
+	}
+
+	cli_credentials_set_realm(creds, argv[0], CRED_SPECIFIED);
+	mpr_Return(eid, mprCreateBoolVar(true));
+	return 0;
+}
+
+
+/*
+  get realm
+*/
+static int ejs_creds_get_realm(MprVarHandle eid, int argc, struct MprVar **argv)
+{
+	struct cli_credentials *creds = ejs_creds_get_credentials(eid);
+	
+	mpr_Return(eid, mprString(cli_credentials_get_realm(creds)));
+	return 0;
+}
+
+
+/*
+  set workstation
+*/
+static int ejs_creds_set_workstation(MprVarHandle eid, int argc, char **argv)
+{
+	struct cli_credentials *creds = ejs_creds_get_credentials(eid);
+	if (argc != 1) {
+		ejsSetErrorMsg(eid, "bad arguments to set_workstation");
+		return -1;
+	}
+	
+	cli_credentials_set_workstation(creds, argv[0], CRED_SPECIFIED);
+	mpr_Return(eid, mprCreateBoolVar(true));
+	return 0;
+}
+
+
+/*
+  get workstation
+*/
+static int ejs_creds_get_workstation(MprVarHandle eid, int argc, struct MprVar **argv)
+{
+	struct cli_credentials *creds = ejs_creds_get_credentials(eid);
+	
+	mpr_Return(eid, mprString(cli_credentials_get_workstation(creds)));
+	return 0;
+}
+
+/*
+  set machine account 
+*/
+static int ejs_creds_set_machine_account(MprVarHandle eid, int argc, struct MprVar **argv)
+{
+	struct cli_credentials *creds = ejs_creds_get_credentials(eid);
+	if (argc != 0) {
+		ejsSetErrorMsg(eid, "bad arguments to set_machine_account");
+		return -1;
+	}
+	
+	if (NT_STATUS_IS_OK(cli_credentials_set_machine_account(creds, mprLpCtx()))) {
+		mpr_Return(eid, mprCreateBoolVar(true));
+	} else {
+		mpr_Return(eid, mprCreateBoolVar(false));
+	}
+	return 0;
+}
+
+
+/*
+  initialise credentials ejs object
+*/
+static int ejs_credentials_obj(struct MprVar *obj, struct cli_credentials *creds)
+{
+	mprSetPtrChild(obj, "creds", creds);
+
+	/* setup our object methods */
+	mprSetCFunction(obj, "get_domain", ejs_creds_get_domain);
+	mprSetStringCFunction(obj, "set_domain", ejs_creds_set_domain);
+	mprSetCFunction(obj, "get_username", ejs_creds_get_username);
+	mprSetStringCFunction(obj, "set_username", ejs_creds_set_username);
+	mprSetCFunction(obj, "get_password", ejs_creds_get_password);
+	mprSetStringCFunction(obj, "set_password", ejs_creds_set_password);
+	mprSetCFunction(obj, "get_realm", ejs_creds_get_realm);
+	mprSetStringCFunction(obj, "set_realm", ejs_creds_set_realm);
+	mprSetCFunction(obj, "get_workstation", ejs_creds_get_workstation);
+	mprSetStringCFunction(obj, "set_workstation", ejs_creds_set_workstation);
+	mprSetCFunction(obj, "set_machine_account", ejs_creds_set_machine_account);
+
+	return 0;
+}
+
+
+struct MprVar mprCredentials(struct cli_credentials *creds)
+{
+	struct MprVar mpv = mprObject("credentials");
+
+	ejs_credentials_obj(&mpv, creds);
+	
+	return mpv;
+}
+
+
+/*
+  initialise credentials ejs object
+*/
+static int ejs_credentials_init(MprVarHandle eid, int argc, struct MprVar **argv)
+{
+	struct cli_credentials *creds;
+	struct MprVar *obj = mprInitObject(eid, "credentials", argc, argv);
+
+	creds = cli_credentials_init(mprMemCtx());
+	if (creds == NULL) {
+		return -1;
+	}
+
+	cli_credentials_set_conf(creds, mprLpCtx());
+
+	return ejs_credentials_obj(obj, creds);
+}
+
+/*
+  initialise cmdline credentials ejs object
+*/
+int ejs_credentials_cmdline(int eid, int argc, struct MprVar **argv)
+{
+	struct MprVar *obj = mprInitObject(eid, "credentials", argc, argv);
+	if (talloc_reference(mprMemCtx(), cmdline_credentials) == NULL) {
+		return -1;
+	}
+	return ejs_credentials_obj(obj, cmdline_credentials);
+}
+
+/*
+  setup C functions that be called from ejs
+*/
+void smb_setup_ejs_credentials(void)
+{
+	ejsDefineCFunction(-1, "credentials_init", ejs_credentials_init, NULL, MPR_VAR_SCRIPT_HANDLE);
+}
+
-- 
cgit 


From 4e9ca6caf913016292a3f7555bd91768d6f90efd Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 26 May 2008 14:00:28 +0200
Subject: Remove unused EJS net bindings. (This used to be commit
 3923414849c5a3b14379e2cd3e61d862150800a6)

---
 source4/scripting/ejs/config.mk         |   2 -
 source4/scripting/ejs/ejsnet/config.mk  |  13 --
 source4/scripting/ejs/ejsnet/mpr_host.c |  74 -------
 source4/scripting/ejs/ejsnet/mpr_user.c | 173 ---------------
 source4/scripting/ejs/ejsnet/net_ctx.c  | 230 --------------------
 source4/scripting/ejs/ejsnet/net_host.c | 124 -----------
 source4/scripting/ejs/ejsnet/net_user.c | 359 --------------------------------
 7 files changed, 975 deletions(-)
 delete mode 100644 source4/scripting/ejs/ejsnet/config.mk
 delete mode 100644 source4/scripting/ejs/ejsnet/mpr_host.c
 delete mode 100644 source4/scripting/ejs/ejsnet/mpr_user.c
 delete mode 100644 source4/scripting/ejs/ejsnet/net_ctx.c
 delete mode 100644 source4/scripting/ejs/ejsnet/net_host.c
 delete mode 100644 source4/scripting/ejs/ejsnet/net_user.c

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/config.mk b/source4/scripting/ejs/config.mk
index 540e55edb4..9aad9c1566 100644
--- a/source4/scripting/ejs/config.mk
+++ b/source4/scripting/ejs/config.mk
@@ -44,8 +44,6 @@ INIT_FUNCTION = smb_setup_ejs_system
 
 smbcalls_sys_OBJ_FILES = $(ejsscriptsrcdir)/smbcalls_sys.o
 
-mkinclude ejsnet/config.mk
-
 [SUBSYSTEM::smbcalls]
 PRIVATE_DEPENDENCIES = \
 		EJS LIBSAMBA-UTIL \
diff --git a/source4/scripting/ejs/ejsnet/config.mk b/source4/scripting/ejs/ejsnet/config.mk
deleted file mode 100644
index 710221e37d..0000000000
--- a/source4/scripting/ejs/ejsnet/config.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-[MODULE::smbcalls_net]
-SUBSYSTEM = smbcalls
-INIT_FUNCTION = smb_setup_ejs_net
-PRIVATE_DEPENDENCIES = LIBSAMBA-NET LIBCLI_SMB CREDENTIALS
-
-smbcalls_net_OBJ_FILES = $(addprefix $(ejsscriptsrcdir)/ejsnet/,  \
-		net_ctx.o \
-		net_user.o \
-		mpr_user.o \
-		net_host.o \
-		mpr_host.o)
-
-$(eval $(call proto_header_template,$(ejsscriptsrcdir)/ejsnet/proto.h,$(smbcalls_net_OBJ_FILES:.o=.c)))
diff --git a/source4/scripting/ejs/ejsnet/mpr_host.c b/source4/scripting/ejs/ejsnet/mpr_host.c
deleted file mode 100644
index 8258ea5256..0000000000
--- a/source4/scripting/ejs/ejsnet/mpr_host.c
+++ /dev/null
@@ -1,74 +0,0 @@
-/* 
-   Unix SMB/CIFS implementation.
-
-   provides interfaces to libnet calls from ejs scripts
-
-   Copyright (C) Rafal Szczesniak  2005-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 <http://www.gnu.org/licenses/>.
-*/
-
-
-#include "includes.h"
-#include "lib/appweb/ejs/ejs.h"
-#include "libnet/libnet.h"
-#include "scripting/ejs/smbcalls.h"
-#include "events/events.h"
-#include "auth/credentials/credentials.h"
-
-
-/*
-  Properties:
-  DomainsList.Domains[0]
-  DomainsList.Status
-*/
-struct MprVar mprDomainsList(TALLOC_CTX *mem_ctx, struct libnet_DomainList *list, NTSTATUS result)
-{
-	const char *name = "DomainsList";
-	NTSTATUS status;
-	struct MprVar mprDomainList, mprDomains;
-	struct MprVar mprSid, mprDomainName;
-	struct MprVar mprDomain;
-	int i;
-
-	if (list == NULL || mem_ctx == NULL) {
-		mprDomainList = mprCreateNullVar();
-		goto done;
-	}
-
-	mprDomains = mprArray("Domains");
-	for (i = 0; i < list->out.count; i++) {
-		struct domainlist d = list->out.domains[i];
-
-		/* get domainlist fields */
-		mprSid        = mprString(d.sid);
-		mprDomainName = mprString(d.name);
-
-		mprDomain = mprObject("Domain");
-		mprSetVar(&mprDomain, "Name", mprDomainName);
-		mprSetVar(&mprDomain, "SID", mprSid);
-
-		mprAddArray(&mprDomains, i, mprDomain);
-	}
-
-	mprDomainList = mprObject(name);
-	status = mprSetVar(&mprDomainList, "Domains", mprDomains);
-	if (!NT_STATUS_IS_OK(status)) goto done;
-	status = mprSetVar(&mprDomainList, "Count", mprCreateIntegerVar(list->out.count));
-	if (!NT_STATUS_IS_OK(status)) goto done;
-	status = mprSetVar(&mprDomainList, "Status", mprNTSTATUS(result));
-
-done:
-	return mprDomainList;
-}
diff --git a/source4/scripting/ejs/ejsnet/mpr_user.c b/source4/scripting/ejs/ejsnet/mpr_user.c
deleted file mode 100644
index 6691a0f955..0000000000
--- a/source4/scripting/ejs/ejsnet/mpr_user.c
+++ /dev/null
@@ -1,173 +0,0 @@
-/* 
-   Unix SMB/CIFS implementation.
-
-   provides interfaces to libnet calls from ejs scripts
-
-   Copyright (C) Rafal Szczesniak  2005-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 <http://www.gnu.org/licenses/>.
-*/
-
-#include "includes.h"
-#include "lib/appweb/ejs/ejs.h"
-#include "libnet/libnet.h"
-#include "scripting/ejs/smbcalls.h"
-#include "events/events.h"
-#include "auth/credentials/credentials.h"
-
-
-/*
-  Properties:
-  UserInfo.AccountName
-  UserInfo.FullName
-  UserInfo.Description
-  UserInfo.HomeDirectory
-  UserInfo.HomeDrive
-  UserInfo.Comment
-  UserInfo.LogonScript
-  UserInfo.AcctExpiry
-  UserInfo.AllowPasswordChange
-  UserInfo.ForcePasswordChange
- */
-struct MprVar mprCreateUserInfo(TALLOC_CTX *mem_ctx, struct libnet_UserInfo *info)
-{
-	const char *name = "UserInfo";
-	NTSTATUS status;
-	struct MprVar mprUserInfo;
-	struct MprVar mprAccountName, mprFullName, mprDescription;
-	struct MprVar mprHomeDir, mprHomeDrive, mprComment;
-	struct MprVar mprLogonScript;
-	struct MprVar mprAcctExpiry, mprAllowPassChange, mprForcePassChange;
-
-	if (info == NULL || mem_ctx == NULL) {
-		mprUserInfo = mprCreateNullVar();
-		goto done;
-	}
-
-	mprUserInfo = mprObject(name);
-
-	mprAccountName = mprString(info->out.account_name);
-	mprFullName = mprString(info->out.full_name);
-	mprDescription = mprString(info->out.description);
-	mprHomeDir = mprString(info->out.home_directory);
-	mprHomeDrive = mprString(info->out.home_drive);
-	mprComment = mprString(info->out.comment);
-	mprLogonScript = mprString(info->out.logon_script);
-	mprAcctExpiry = mprString(timestring(mem_ctx, info->out.acct_expiry->tv_sec));
-	mprAllowPassChange = mprString(timestring(mem_ctx, info->out.allow_password_change->tv_sec));
-	mprForcePassChange = mprString(timestring(mem_ctx, info->out.force_password_change->tv_sec));
-
-	status = mprSetVar(&mprUserInfo, "AccountName", mprAccountName);
-	if (!NT_STATUS_IS_OK(status)) goto done;
-	status = mprSetVar(&mprUserInfo, "FullName", mprFullName);
-	if (!NT_STATUS_IS_OK(status)) goto done;
-	status = mprSetVar(&mprUserInfo, "Description", mprDescription);
-	if (!NT_STATUS_IS_OK(status)) goto done;
-	status = mprSetVar(&mprUserInfo, "HomeDirectory", mprHomeDir);
-	if (!NT_STATUS_IS_OK(status)) goto done;
-	status = mprSetVar(&mprUserInfo, "HomeDrive", mprHomeDrive);
-	if (!NT_STATUS_IS_OK(status)) goto done;
-	status = mprSetVar(&mprUserInfo, "Comment", mprComment);
-	if (!NT_STATUS_IS_OK(status)) goto done;
-	status = mprSetVar(&mprUserInfo, "LogonScript", mprLogonScript);
-	if (!NT_STATUS_IS_OK(status)) goto done;
-	status = mprSetVar(&mprUserInfo, "AcctExpiry", mprAcctExpiry);
-	if (!NT_STATUS_IS_OK(status)) goto done;
-	status = mprSetVar(&mprUserInfo, "AllowPasswordChange", mprAllowPassChange);
-	if (!NT_STATUS_IS_OK(status)) goto done;
-	status = mprSetVar(&mprUserInfo, "ForcePasswordChange", mprForcePassChange);
-	if (!NT_STATUS_IS_OK(status)) goto done;
-
-done:
-	return mprUserInfo;
-}
-
-
-/*
-  Properties:
-  UserListCtx.Users[]
-  UserListCtx.ResumeIndex
-  UserListCtx.Count
-  UserListCtx.EndOfList
-  UserListCtx.Status
- */
-struct MprVar mprUserListCtx(TALLOC_CTX *mem_ctx, struct libnet_UserList *list, NTSTATUS result)
-{
-	const char *name = "UserListCtx";
-	NTSTATUS status;
-	bool endOfList;
-	struct MprVar mprListCtx, mprUserList;
-	struct MprVar mprUser, mprSid, mprUsername;
-	int i;
-
-	if (list == NULL || mem_ctx == NULL) {
-		mprListCtx = mprCreateNullVar();
-		goto done;
-	}
-
-	endOfList = (NT_STATUS_EQUAL(result, NT_STATUS_NO_MORE_ENTRIES) ||
-		     NT_STATUS_IS_OK(result));
-
-	mprUserList = mprArray("Users");
-	for (i = 0; i < list->out.count; i++) {
-		struct userlist u = list->out.users[i];
-		
-		/* get userlist fields */
-		mprSid      = mprString(u.sid);
-		mprUsername = mprString(u.username);
-		
-		/* create userlist object */
-		mprUser = mprObject("User");
-		mprSetVar(&mprUser, "Username", mprUsername);
-		mprSetVar(&mprUser, "SID", mprSid);
-		
-		/* add the object to the array being constructed */
-		mprAddArray(&mprUserList, i, mprUser);
-	}
-
-	mprListCtx = mprObject(name);
-	status = mprSetVar(&mprListCtx, "Users", mprUserList);
-	if (!NT_STATUS_IS_OK(status)) goto done;
-	status = mprSetVar(&mprListCtx, "Count", mprCreateIntegerVar(list->out.count));
-	if (!NT_STATUS_IS_OK(status)) goto done;
-	status = mprSetVar(&mprListCtx, "ResumeIndex", mprCreateIntegerVar((int)list->out.resume_index));
-	if (!NT_STATUS_IS_OK(status)) goto done;
-	status = mprSetVar(&mprListCtx, "EndOfList", mprCreateBoolVar(endOfList));
-	if (!NT_STATUS_IS_OK(status)) goto done;
-	status = mprSetVar(&mprListCtx, "Status", mprNTSTATUS(result));
-
-done:
-	return mprListCtx;
-}
-
-
-/*
-  Returns UserListCtx.ResumeIndex out of passed UserListCtx
- */
-unsigned int mprListGetResumeIndex(struct MprVar *listCtx)
-{
-	NTSTATUS status;
-	unsigned int resume = 0;
-	struct MprVar *mprResumeIndex;
-	if (listCtx == NULL) return 0;
-	
-	mprResumeIndex = listCtx;
-	status = mprGetVar(&mprResumeIndex, "ResumeIndex");
-	if (!NT_STATUS_IS_OK(status)) goto done;
-
-	resume = (unsigned int) mprVarToInteger(mprResumeIndex);
-
-done:
-	return resume;
-}
diff --git a/source4/scripting/ejs/ejsnet/net_ctx.c b/source4/scripting/ejs/ejsnet/net_ctx.c
deleted file mode 100644
index cbe163552e..0000000000
--- a/source4/scripting/ejs/ejsnet/net_ctx.c
+++ /dev/null
@@ -1,230 +0,0 @@
-/* 
-   Unix SMB/CIFS implementation.
-
-   provides interfaces to libnet calls from ejs scripts
-
-   Copyright (C) Rafal Szczesniak  2005-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 <http://www.gnu.org/licenses/>.
-*/
-
-#include "includes.h"
-#include "lib/appweb/ejs/ejs.h"
-#include "scripting/ejs/smbcalls.h"
-#include "libnet/libnet.h"
-#include "events/events.h"
-#include "auth/credentials/credentials.h"
-
-
-int ejs_net_userman(MprVarHandle eid, int argc, struct MprVar** argv);
-int ejs_net_hostman(MprVarHandle eid, int argc, struct MprVar** argv);
-
-static int ejs_net_join_domain(MprVarHandle eid, int argc, struct MprVar **argv);
-static int ejs_net_samsync_ldb(MprVarHandle eid, int argc, struct MprVar **argv);
-
-/*
-  Usage:
-  net = NetContext(credentials);
-*/
-
-static int ejs_net_context(MprVarHandle eid, int argc, struct MprVar **argv)
-{
-	TALLOC_CTX *event_mem_ctx = talloc_new(mprMemCtx());
-	struct cli_credentials *creds;
-	struct libnet_context *ctx;
-	struct MprVar obj, mprCreds;
-	struct event_context *ev;
-
-	if (!event_mem_ctx) {
-		ejsSetErrorMsg(eid, "talloc_new() failed");
-		return -1;
-	}
-	ev = mprEventCtx();
-
-	ctx = libnet_context_init(ev, mprLpCtx());
-	/* IF we generated a new event context, it will be under here,
-	 * and we need it to last as long as the libnet context, so
-	 * make it a child */
-	talloc_steal(ctx, event_mem_ctx);
-
-	if (argc == 0 || (argc == 1 && argv[0]->type == MPR_TYPE_NULL)) {
-		/* 
-		   create the default credentials
-		*/
-		creds = cli_credentials_init(ctx);
-		if (creds == NULL) {
-			ejsSetErrorMsg(eid, "cli_credential_init() failed");
-			talloc_free(ctx);
-			return -1;
-		}
-		cli_credentials_set_conf(creds, mprLpCtx());
-		cli_credentials_set_anonymous(creds);
-
-		mprCreds = mprCredentials(creds);
-
-	} else if (argc == 1 && argv[0]->type == MPR_TYPE_OBJECT) {
-		/*
-		  get credential values from credentials object
-		*/
-		mprCreds = *(argv[0]);
-		creds = (struct cli_credentials *)mprGetPtr(&mprCreds, "creds");
-		if (creds == NULL) {
-			ejsSetErrorMsg(eid, "invalid credentials parameter");
-			talloc_free(ctx);
-			return -1;
-		}
-
-	} else {
-		ejsSetErrorMsg(eid, "NetContext invalid arguments, this function requires an object.");
-		talloc_free(ctx);
-		return -1;
-	}
-	
-	/* setup libnet_context credentials */
-	ctx->cred = creds;
-
-	/* create the NetContext object */
-	obj = mprObject("NetContext");
-
-	/* add internal libnet_context pointer to the NetContext object */
-	mprSetPtrChild(&obj, "ctx", ctx);
-
-	/* add properties publicly available from js code */
-	mprCreateProperty(&obj, "credentials", &mprCreds);
-	
-	/* add methods to the object */
-	mprSetCFunction(&obj, "UserMgr", ejs_net_userman);
-	mprSetCFunction(&obj, "HostMgr", ejs_net_hostman);
-	mprSetCFunction(&obj, "JoinDomain", ejs_net_join_domain);
-	mprSetCFunction(&obj, "SamSyncLdb", ejs_net_samsync_ldb);
-
-	/* return the object */
-	mpr_Return(eid, obj);
-
-	return 0;
-}
-
-
-static int ejs_net_join_domain(MprVarHandle eid, int argc, struct MprVar **argv)
-{
-	TALLOC_CTX *mem_ctx;
-	struct libnet_context *ctx;
-	struct libnet_Join *join;
-	NTSTATUS status;
-	ctx = (struct libnet_context *)mprGetThisPtr(eid, "ctx");
-	mem_ctx = talloc_new(mprMemCtx());
-
-	join = talloc(mem_ctx, struct libnet_Join);
-	if (!join) {
-		talloc_free(mem_ctx);
-		return -1;
-	}
-
-	/* prepare parameters for the join */
-	join->in.netbios_name  = NULL;
-	join->in.join_type     = SEC_CHAN_WKSTA;
-	join->in.domain_name   = cli_credentials_get_domain(ctx->cred);
-	join->in.level         = LIBNET_JOIN_AUTOMATIC;
-	join->out.error_string = NULL;
-
-	if (argc == 1 && argv[0]->type == MPR_TYPE_OBJECT) {
-		MprVar *netbios_name = mprGetProperty(argv[0], "netbios_name", NULL);
-		MprVar *domain_name = mprGetProperty(argv[0], "domain_name", NULL);
-		MprVar *join_type = mprGetProperty(argv[0], "join_type", NULL);
-		if (netbios_name) {
-			join->in.netbios_name = mprToString(netbios_name);
-		}
-		if (domain_name) {
-			join->in.domain_name = mprToString(domain_name);
-		}
-		if (join_type) {
-			join->in.join_type = mprToInt(join_type);
-		}
-	}
-
-	if (!join->in.domain_name) {
-		ejsSetErrorMsg(eid, "a domain must be specified for to join");
-		talloc_free(mem_ctx);
-		return -1;
-	}
-
-	/* do the domain join */
-	status = libnet_Join(ctx, join, join);
-	
-	if (!NT_STATUS_IS_OK(status)) {
-		MprVar error_string = mprString(join->out.error_string);
-		
-		mprSetPropertyValue(argv[0], "error_string", error_string);
-		mpr_Return(eid, mprCreateBoolVar(false));
-	} else {
-		mpr_Return(eid, mprCreateBoolVar(true));
-	}
-	talloc_free(mem_ctx);
-	return 0;
-}
-
-
-static int ejs_net_samsync_ldb(MprVarHandle eid, int argc, struct MprVar **argv)
-{
-	TALLOC_CTX *mem_ctx;
-	struct libnet_context *ctx;
-	struct libnet_samsync_ldb *samsync;
-	NTSTATUS status;
-	ctx = (struct libnet_context *)mprGetThisPtr(eid, "ctx");
-	mem_ctx = talloc_new(mprMemCtx());
-
-	samsync = talloc(mem_ctx, struct libnet_samsync_ldb);
-	if (!samsync) {
-		talloc_free(mem_ctx);
-		return -1;
-	}
-
-	/* prepare parameters for the samsync */
-	samsync->in.machine_account = NULL;
-	samsync->in.session_info = NULL;
-	samsync->in.binding_string = NULL;
-	samsync->out.error_string = NULL;
-
-	if (argc == 1 && argv[0]->type == MPR_TYPE_OBJECT) {
-		MprVar *credentials = mprGetProperty(argv[0], "machine_account", NULL);
-		MprVar *session_info = mprGetProperty(argv[0], "session_info", NULL);
-		if (credentials) {
-			samsync->in.machine_account = talloc_get_type(mprGetPtr(credentials, "creds"), struct cli_credentials);
-		}
-		if (session_info) {
-			samsync->in.session_info = talloc_get_type(mprGetPtr(session_info, "session_info"), struct auth_session_info);
-		}
-	}
-
-	/* do the domain samsync */
-	status = libnet_samsync_ldb(ctx, samsync, samsync);
-	
-	if (!NT_STATUS_IS_OK(status)) {
-		MprVar error_string = mprString(samsync->out.error_string);
-		
-		mprSetPropertyValue(argv[0], "error_string", error_string);
-		mpr_Return(eid, mprCreateBoolVar(false));
-	} else {
-		mpr_Return(eid, mprCreateBoolVar(true));
-	}
-	talloc_free(mem_ctx);
-	return 0;
-}
-
-
-NTSTATUS smb_setup_ejs_net(void)
-{
-	ejsDefineCFunction(-1, "NetContext", ejs_net_context, NULL, MPR_VAR_SCRIPT_HANDLE);
-	return NT_STATUS_OK;
-}
diff --git a/source4/scripting/ejs/ejsnet/net_host.c b/source4/scripting/ejs/ejsnet/net_host.c
deleted file mode 100644
index 478da19db3..0000000000
--- a/source4/scripting/ejs/ejsnet/net_host.c
+++ /dev/null
@@ -1,124 +0,0 @@
-/* 
-   Unix SMB/CIFS implementation.
-
-   provides interfaces to libnet calls from ejs scripts
-
-   Copyright (C) Rafal Szczesniak  2005-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 <http://www.gnu.org/licenses/>.
-*/
-
-
-#include "includes.h"
-#include "lib/appweb/ejs/ejs.h"
-#include "libnet/libnet.h"
-#include "scripting/ejs/ejsnet/proto.h"
-#include "scripting/ejs/smbcalls.h"
-#include "events/events.h"
-#include "auth/credentials/credentials.h"
-
-
-static int ejs_net_domainlist(MprVarHandle eid, int argc, char **argv);
-
-
-/*
-  Usage:
-  hostCtx = net.HostMgr(hostname = <default from credentials>)
-*/
-int ejs_net_hostman(MprVarHandle eid, int argc, struct MprVar** argv)
-{
-	struct libnet_context *ctx;
-	const char *hostname;
-	struct MprVar obj;
-
-	/* libnet context */
-	ctx = mprGetThisPtr(eid, "ctx");
-	if (ctx == NULL) {
-		ejsSetErrorMsg(eid, "ctx property returns null pointer");
-		return 0;
-	}
-
-	/* fetch the arguments: host name */
-	if (argc == 0) {
-		/* default host (machine) name is supplied in credentials */
-		hostname = cli_credentials_get_workstation(ctx->cred);
-
-	} else if (argc == 1 && mprVarIsString(argv[0]->type)) {
-		/* host name has been specified */
-		hostname = mprToString(argv[0]);
-
-	} else {
-		ejsSetErrorMsg(eid, "too many arguments");
-		return 0;
-	}
-
-	/* create the NetHostCtx object */
-	obj = mprObject("NetHostCtx");
-	
-	/* create a copy of the string for the object */
-	hostname = talloc_strdup(ctx, hostname);
-
-	/* add internal libnet_context pointer to the NetHostCtx object */
-	mprSetPtrChild(&obj, "ctx", ctx);
-	mprSetPtrChild(&obj, "hostname", hostname);
-	
-	/* add methods to the object */
-	mprSetStringCFunction(&obj, "DomainList", ejs_net_domainlist);
-
-	/* set the object returned by this function */
-	mpr_Return(eid, obj);
-
-	return 0;
-}
-
-
-static int ejs_net_domainlist(MprVarHandle eid, int argc, char **argv)
-{
-	NTSTATUS status;
-	TALLOC_CTX *mem_ctx;
-	const char* hostname;
-	struct libnet_context *ctx;
-	struct libnet_DomainList req;
-	struct MprVar mprDomains;
-
-	mem_ctx = talloc_new(mprMemCtx());
-	if (mem_ctx == NULL) {
-		ejsSetErrorMsg(eid, "could not create memory context - out of memory");
-		goto done;
-	}
-
-	/* libnet context */
-	ctx = mprGetThisPtr(eid, "ctx");
-	if (ctx == NULL) {
-		ejsSetErrorMsg(eid, "ctx property returns null pointer");
-		goto done;
-	}
-
-	hostname = mprGetThisPtr(eid, "hostname");
-	if (hostname == NULL) {
-		ejsSetErrorMsg(eid, "hostname property returns null pointer");
-		goto done;
-	}
-
-	/* call the libnet function */
-	req.in.hostname = hostname;
-	
-	status = libnet_DomainList(ctx, mem_ctx, &req);
-	mprDomains = mprDomainsList(mem_ctx, &req, status);
-
-done:
-	talloc_free(mem_ctx);
-	mpr_Return(eid, mprDomains);
-	return 0;
-}
diff --git a/source4/scripting/ejs/ejsnet/net_user.c b/source4/scripting/ejs/ejsnet/net_user.c
deleted file mode 100644
index 0c32035c6c..0000000000
--- a/source4/scripting/ejs/ejsnet/net_user.c
+++ /dev/null
@@ -1,359 +0,0 @@
-/* 
-   Unix SMB/CIFS implementation.
-
-   provides interfaces to libnet calls from ejs scripts
-
-   Copyright (C) Rafal Szczesniak  2005-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 <http://www.gnu.org/licenses/>.
-*/
-
-#include "includes.h"
-#include "lib/appweb/ejs/ejs.h"
-#include "libnet/libnet.h"
-#include "scripting/ejs/ejsnet/proto.h"
-#include "scripting/ejs/smbcalls.h"
-#include "events/events.h"
-#include "auth/credentials/credentials.h"
-
-
-static int ejs_net_createuser(MprVarHandle eid, int argc, char **argv);
-static int ejs_net_deleteuser(MprVarHandle eid, int argc, char **argv);
-static int ejs_net_userinfo(MprVarHandle eid, int argc, char **argv);
-static int ejs_net_userlist(MprVarHandle eid, int argc, struct MprVar **argv);
-
-
-/*
-  Usage:
-  usrCtx = net.UserMgr(domain = <default from credentials>);
-*/
-int ejs_net_userman(MprVarHandle eid, int argc, struct MprVar **argv)
-{
-	struct libnet_context *ctx;
-	const char *userman_domain = NULL;
-	struct MprVar obj;
-
-	/* libnet context */
-	ctx = (struct libnet_context *)mprGetThisPtr(eid, "ctx");
-	if (ctx == NULL) {
-		ejsSetErrorMsg(eid, "ctx property returns null pointer");
-		return 0;
-	}
-
-	/* fetch the arguments: domain name */
-	if (argc == 0) {
-		/* default domain name is supplied in credentials */
-		userman_domain = cli_credentials_get_domain(ctx->cred);
-
-	} else if (argc == 1 && mprVarIsString(argv[0]->type)) {
-		/* domain name can also be specified explicitly 
-		   (e.g. to connect BUILTIN domain) */
-		userman_domain = mprToString(argv[0]);
-
-	} else {
-		ejsSetErrorMsg(eid, "too many arguments");
-		return 0;
-	}
-
-	/* any domain name must be specified anyway */
-	if (userman_domain == NULL) {
-		ejsSetErrorMsg(eid, "a domain must be specified for user management");
-		return 0;
-	}
-
-	/* create 'net user' subcontext */
-	obj = mprObject("NetUsrCtx");
-
-	/* we need to make a copy of the string for this object */
-	userman_domain = talloc_strdup(ctx, userman_domain);
-
-	/* add properties */
-	mprSetPtrChild(&obj, "ctx", ctx);
-	mprSetPtrChild(&obj, "domain", userman_domain);
-
-	/* add methods */
-	mprSetStringCFunction(&obj, "Create", ejs_net_createuser);
-	mprSetStringCFunction(&obj, "Delete", ejs_net_deleteuser);
-	mprSetStringCFunction(&obj, "Info", ejs_net_userinfo);
-	mprSetCFunction(&obj, "List", ejs_net_userlist);
-
-	/* set the object returned by this function */
-	mpr_Return(eid, obj);
-
-	return 0;
-}
-
-
-/*
-  Usage:
-  NTSTATUS = NetUsrCtx.Create(Username)
-*/
-static int ejs_net_createuser(MprVarHandle eid, int argc, char **argv)
-{
-	NTSTATUS status = NT_STATUS_UNSUCCESSFUL;
-	TALLOC_CTX *mem_ctx;
-	struct libnet_context *ctx;
-	const char *userman_domain = NULL;
-	const char *username = NULL;
-	struct libnet_CreateUser req;
-
-	mem_ctx = talloc_new(mprMemCtx());
-	if (mem_ctx == NULL) {
-		ejsSetErrorMsg(eid, "could not create memory context - out of memory");
-		goto done;
-	}
-
-	/* fetch the arguments: username */
-	if (argc == 0) {
-		ejsSetErrorMsg(eid, "too little arguments");
-		goto done;
-
-	} else if (argc == 1) {
-		username = argv[0];
-
-	} else {
-		ejsSetErrorMsg(eid, "too many arguments");
-		goto done;
-	}
-	
-	/* libnet context */
-	ctx = (struct libnet_context *)mprGetThisPtr(eid, "ctx");
-	if (ctx == NULL) {
-		ejsSetErrorMsg(eid, "ctx property returns null pointer");
-		goto done;
-	}
-
-	/* domain where the account is to be created */
-	userman_domain = (const char *)mprGetThisPtr(eid, "domain");
-	if (userman_domain == NULL) {
-		ejsSetErrorMsg(eid, "domain property returns null pointer");
-		goto done;
-	}
-	
-	/* call the libnet function */
-    	req.in.domain_name = userman_domain;
-	req.in.user_name   = argv[0];
-
-	status = libnet_CreateUser(ctx, mem_ctx, &req);
-	if (!NT_STATUS_IS_OK(status)) {
-		ejsSetErrorMsg(eid, "%s", req.out.error_string);
-	}
-
-done:
-	talloc_free(mem_ctx);
-	mpr_Return(eid, mprNTSTATUS(status));
-	return 0;
-}
-
-
-/*
-  Usage:
-  NTSTATUS = NetUsrCtx.Delete(Username)
-*/
-static int ejs_net_deleteuser(MprVarHandle eid, int argc, char **argv)
-{
-	NTSTATUS status = NT_STATUS_UNSUCCESSFUL;
-	TALLOC_CTX *mem_ctx;
-	struct libnet_context *ctx;
-	const char *userman_domain = NULL;
-	const char *username = NULL;
-	struct libnet_DeleteUser req;
-
-	mem_ctx = talloc_new(mprMemCtx());
-	if (mem_ctx == NULL) {
-		ejsSetErrorMsg(eid, "could not create memory context - out of memory");
-		goto done;
-	}
-
-	/* fetch the arguments: username */
-	if (argc == 0) {
-		ejsSetErrorMsg(eid, "too little arguments");
-		goto done;
-
-	} else if (argc == 1) {
-		username = argv[0];
-
-	} else {
-		ejsSetErrorMsg(eid, "too many arguments");
-		goto done;
-	}
-
-	/* libnet context */
-	ctx = mprGetThisPtr(eid, "ctx");
-	if (ctx == NULL) {
-		ejsSetErrorMsg(eid, "ctx property returns null pointer");
-		goto done;
-	}
-
-	/* domain where the account is to be deleted */
-	userman_domain = mprGetThisPtr(eid, "domain");
-	if (!userman_domain) {
-		ejsSetErrorMsg(eid, "domain property returns null pointer");
-		goto done;
-	}
-	
-	/* call the libnet function */
-    	req.in.domain_name = userman_domain;
-	req.in.user_name   = username;
-
-	status = libnet_DeleteUser(ctx, mem_ctx, &req);
-	if (!NT_STATUS_IS_OK(status)) {
-		ejsSetErrorMsg(eid, "%s", req.out.error_string);
-	}
-
-done:
-	talloc_free(mem_ctx);
-	mpr_Return(eid, mprNTSTATUS(status));
-	return 0;
-}
-
-
-/*
-  Usage:
-  UserInfo = NetUsrCtx.Info(Username)
-*/
-static int ejs_net_userinfo(MprVarHandle eid, int argc, char **argv)
-{
-	NTSTATUS status = NT_STATUS_UNSUCCESSFUL;
-	TALLOC_CTX *mem_ctx;
-	struct libnet_context *ctx;
-	const char *userman_domain = NULL;
-	const char *username = NULL;
-	struct libnet_UserInfo req;
-	struct MprVar mprUserInfo;
-
-	mem_ctx = talloc_new(mprMemCtx());
-	if (mem_ctx == NULL) {
-		ejsSetErrorMsg(eid, "could not create memory context - out of memory");
-		goto done;
-	}
-	
-	/* fetch the arguments: username */
-	if (argc == 0) {
-		ejsSetErrorMsg(eid, "too little arguments");
-		goto done;
-
-	} else if (argc == 1) {
-		username = argv[0];
-
-	} else {
-		ejsSetErrorMsg(eid, "too many arguments");
-		goto done;
-	}
-
-	/* libnet context */
-	ctx = (struct libnet_context *)mprGetThisPtr(eid, "ctx");
-	if (ctx == NULL) {
-		ejsSetErrorMsg(eid, "ctx property returns null pointer");
-		goto done;
-	}
-
-	/* domain where the user account is to be queried */
-	userman_domain = mprGetThisPtr(eid, "domain");
-	if (userman_domain == NULL) {
-		ejsSetErrorMsg(eid, "domain property returns null pointer");
-		return -1;
-	}
-
-	/* call the libnet function */
-	req.in.domain_name = userman_domain;
-	req.in.data.user_name   = username;
-	req.in.level = USER_INFO_BY_NAME;
-
-	status = libnet_UserInfo(ctx, mem_ctx, &req);
-	if (!NT_STATUS_IS_OK(status)) {
-		ejsSetErrorMsg(eid, "%s", req.out.error_string);
-		
-		/* create null object to return */
-		mprUserInfo = mprCreateNullVar();
-		goto done;
-	}
-
-	/* create UserInfo object */
-	mprUserInfo = mprCreateUserInfo(ctx, &req);
-
-done:
-	talloc_free(mem_ctx);
-	mpr_Return(eid, mprUserInfo);
-	return 0;
-}
-
-
-/*
-  Usage:
-  UserListCtx = NetUsrCtx.List(UserListCtx)
-*/
-static int ejs_net_userlist(MprVarHandle eid, int argc, struct MprVar **argv)
-{
-	TALLOC_CTX *mem_ctx;
-	NTSTATUS status;
-	struct libnet_context *ctx;
-	const char *userlist_domain;
-	int page_size = 512;         /* TODO: this should be specified in a nicer way */
-	struct libnet_UserList req;
-	struct MprVar mprListCtx, *mprInListCtx;
-	
-	mem_ctx = talloc_new(mprMemCtx());
-	if (mem_ctx == NULL) {
-		ejsSetErrorMsg(eid, "could not create memory context - out of memory");
-		goto done;
-	}
-	
-	/* fetch the arguments */
-	if (argc == 0) {
-		ejsSetErrorMsg(eid, "too little arguments");
-		goto done;
-
-	} else if (argc == 1) {
-		if (mprVarIsObject(argv[0]->type)) {
-			/* this is a continuation call */
-			mprInListCtx = argv[0];
-			req.in.resume_index = mprListGetResumeIndex(mprInListCtx);
-
-		} else {
-			/* this is a first call */
-			req.in.resume_index = 0;
-		}
-
-	} else {
-		ejsSetErrorMsg(eid, "too many arguments");
-		goto done;
-	}
-
-	/* libnet context */
-	ctx = (struct libnet_context *)mprGetThisPtr(eid, "ctx");
-	if (ctx == NULL) {
-		ejsSetErrorMsg(eid, "ctx property returns null pointer");
-		goto done;
-	}
-	
-	/* domain where user accounts are to be enumerated */
-	userlist_domain = mprGetThisPtr(eid, "domain");
-	if (userlist_domain == NULL) {
-		ejsSetErrorMsg(eid, "domain property returns null pointer");
-		goto done;
-	}
-
-	/* call the libnet function */
-	req.in.domain_name   = userlist_domain;
-	req.in.page_size     = page_size;
-	
-	status = libnet_UserList(ctx, mem_ctx, &req);
-	mprListCtx = mprUserListCtx(mem_ctx, &req, status);
-
-done:
-	talloc_free(mem_ctx);
-	mpr_Return(eid, mprListCtx);
-	return 0;
-}
-- 
cgit 


From 75e2e1061ede31aacd0660fb99d4749d4518cb67 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 26 May 2008 14:02:37 +0200
Subject: Remove unused rand EJS bindings. (This used to be commit
 4016427b77b2bc202a8dc4064ddc7e13f36db06d)

---
 source4/scripting/ejs/config.mk       |   7 ---
 source4/scripting/ejs/smbcalls_rand.c | 104 ----------------------------------
 2 files changed, 111 deletions(-)
 delete mode 100644 source4/scripting/ejs/smbcalls_rand.c

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/config.mk b/source4/scripting/ejs/config.mk
index 9aad9c1566..f94348278b 100644
--- a/source4/scripting/ejs/config.mk
+++ b/source4/scripting/ejs/config.mk
@@ -13,13 +13,6 @@ PRIVATE_DEPENDENCIES = LIBLDB SAMDB LIBNDR
 
 smbcalls_ldb_OBJ_FILES = $(ejsscriptsrcdir)/smbcalls_ldb.o
 
-[MODULE::smbcalls_rand]
-SUBSYSTEM = smbcalls
-OUTPUT_TYPE = MERGED_OBJ
-INIT_FUNCTION = smb_setup_ejs_random
-
-smbcalls_rand_OBJ_FILES = $(ejsscriptsrcdir)/smbcalls_rand.o
-
 [MODULE::smbcalls_auth]
 OUTPUT_TYPE = MERGED_OBJ
 SUBSYSTEM = smbcalls
diff --git a/source4/scripting/ejs/smbcalls_rand.c b/source4/scripting/ejs/smbcalls_rand.c
deleted file mode 100644
index 58e0fa1fd1..0000000000
--- a/source4/scripting/ejs/smbcalls_rand.c
+++ /dev/null
@@ -1,104 +0,0 @@
-/* 
-   Unix SMB/CIFS implementation.
-
-   provide access to randomisation functions
-
-   Copyright (C) Andrew Tridgell 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/>.
-*/
-
-#include "includes.h"
-#include "scripting/ejs/smbcalls.h"
-#include "lib/appweb/ejs/ejs.h"
-#include "librpc/gen_ndr/ndr_misc.h"
-#include "librpc/ndr/libndr.h"
-
-/*
-  usage:
-      var i = random();
-*/
-static int ejs_random(MprVarHandle eid, int argc, struct MprVar **argv)
-{
-	mpr_Return(eid, mprCreateIntegerVar(generate_random()));
-	return 0;
-}
-
-/*
-  usage:
-      var s = randpass(len);
-*/
-static int ejs_randpass(MprVarHandle eid, int argc, struct MprVar **argv)
-{
-	char *s;
-	if (argc != 1 || !mprVarIsNumber(argv[0]->type)) {
-		ejsSetErrorMsg(eid, "randpass invalid arguments");
-		return -1;
-	}
-	s = generate_random_str(mprMemCtx(), mprToInt(argv[0]));
-	mpr_Return(eid, mprString(s));
-	talloc_free(s);
-	return 0;
-}
-
-/*
-  usage:
-      var guid = randguid();
-*/
-static int ejs_randguid(MprVarHandle eid, int argc, struct MprVar **argv)
-{
-	struct GUID guid = GUID_random();
-	char *s = GUID_string(mprMemCtx(), &guid);
-	mpr_Return(eid, mprString(s));
-	talloc_free(s);
-	return 0;
-}
-
-/*
-  usage:
-      var sid = randsid();
-*/
-static int ejs_randsid(MprVarHandle eid, int argc, struct MprVar **argv)
-{
-	char *s = talloc_asprintf(mprMemCtx(), "S-1-5-21-%u-%u-%u", 
-				  (unsigned)generate_random(), 
-				  (unsigned)generate_random(), 
-				  (unsigned)generate_random());
-	mpr_Return(eid, mprString(s));
-	talloc_free(s);
-	return 0;
-}
-
-/*
-  initialise random ejs subsystem
-*/
-static int ejs_random_init(MprVarHandle eid, int argc, struct MprVar **argv)
-{
-	struct MprVar *obj = mprInitObject(eid, "random", argc, argv);
-
-	mprSetCFunction(obj, "random", ejs_random);
-	mprSetCFunction(obj, "randpass", ejs_randpass);
-	mprSetCFunction(obj, "randguid", ejs_randguid);
-	mprSetCFunction(obj, "randsid", ejs_randsid);
-	return 0;
-}
-
-/*
-  setup C functions that be called from ejs
-*/
-NTSTATUS smb_setup_ejs_random(void)
-{
-	ejsDefineCFunction(-1, "random_init", ejs_random_init, NULL, MPR_VAR_SCRIPT_HANDLE);
-	return NT_STATUS_OK;
-}
-- 
cgit 


From 1b6396f114f29cabe6b640118f3258e54ceeab32 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 26 May 2008 14:03:55 +0200
Subject: Remove unused param ejs bindings. (This used to be commit
 4dd0d46e27696b6d29d4b6a63c56667ce5e03db6)

---
 source4/scripting/ejs/config.mk        |   1 -
 source4/scripting/ejs/smbcalls.c       |   1 -
 source4/scripting/ejs/smbcalls_param.c | 259 ---------------------------------
 3 files changed, 261 deletions(-)
 delete mode 100644 source4/scripting/ejs/smbcalls_param.c

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/config.mk b/source4/scripting/ejs/config.mk
index f94348278b..dc4ab776ec 100644
--- a/source4/scripting/ejs/config.mk
+++ b/source4/scripting/ejs/config.mk
@@ -49,7 +49,6 @@ smbcalls_OBJ_FILES = $(addprefix $(ejsscriptsrcdir)/, \
 		smbcalls.o \
 		smbcalls_options.o \
 		smbcalls_creds.o \
-		smbcalls_param.o \
 		mprutil.o \
 		literal.o)
 
diff --git a/source4/scripting/ejs/smbcalls.c b/source4/scripting/ejs/smbcalls.c
index 880605bf10..8b1fe06c77 100644
--- a/source4/scripting/ejs/smbcalls.c
+++ b/source4/scripting/ejs/smbcalls.c
@@ -204,7 +204,6 @@ void smb_setup_ejs_functions(void (*exception_handler)(const char *))
 
 	smb_setup_ejs_options();
 	smb_setup_ejs_credentials();
-	smb_setup_ejs_param();
         smb_setup_ejs_literal();
 	
 	shared_init = load_samba_modules(NULL, mprLpCtx(), "smbcalls");
diff --git a/source4/scripting/ejs/smbcalls_param.c b/source4/scripting/ejs/smbcalls_param.c
deleted file mode 100644
index 5fbb0bb017..0000000000
--- a/source4/scripting/ejs/smbcalls_param.c
+++ /dev/null
@@ -1,259 +0,0 @@
-/* 
-   Unix SMB/CIFS implementation.
-
-   provide hooks into smbd C calls from ejs scripts
-
-   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/>.
-*/
-
-#include "includes.h"
-#include "param/param.h"
-#include "scripting/ejs/smbcalls.h"
-#include "lib/appweb/ejs/ejs.h"
-
-/*
-  get parameter
-
-  value = param.get("name");
-  value = param.get("section", "name");
-*/
-static int ejs_param_get(MprVarHandle eid, int argc, char **argv)
-{
-	struct param_context *ctx;
-	const char *ret;
-	if (argc != 1 && argc != 2) {
-		ejsSetErrorMsg(eid, "param.get invalid argument count");
-		return -1;
-	}
-
-	ctx = (struct param_context *)mprGetThisPtr(eid, "param");
-	mprAssert(ctx);
-	
-	if (argc == 2) {
-		ret = param_get_string(ctx, argv[0], argv[1]);
-	} else {
-		ret = param_get_string(ctx, argv[0], NULL);
-	}
-
-	if (ret) {
-		mpr_Return(eid, mprString(ret));
-	} else {
-		mpr_Return(eid, mprCreateUndefinedVar());
-	}
-	return 0;
-}
-
-/*
-  get list parameter
-
-  ok = param.get_list("name");
-  ok = param.get_list("section", "name");
-*/
-static int ejs_param_get_list(MprVarHandle eid, int argc, char **argv)
-{
-	struct param_context *ctx;
-	const char **ret;
-
-	if (argc != 1 && argc != 2) {
-		ejsSetErrorMsg(eid, "param.get_list invalid argument count");
-		return -1;
-	}
-
-	ctx = (struct param_context *)mprGetThisPtr(eid, "param");
-	mprAssert(ctx);
-	
-	if (argc == 2) {
-		ret = param_get_string_list(ctx, argv[0], argv[1], NULL);
-	} else {
-		ret = param_get_string_list(ctx, argv[0], NULL, NULL);
-	}
-
-	if (ret != NULL) {
-		mpr_Return(eid, mprList("array", ret));
-	} else {
-		mpr_Return(eid, mprCreateUndefinedVar());
-	}
-	return 0;
-}
-
-/*
-  set parameter
-
-  ok = param.set("name", "value");
-  ok = param.set("section", "name", "value");
-*/
-static int ejs_param_set(MprVarHandle eid, int argc, struct MprVar **argv)
-{
-	struct param_context *ctx;
-	const char **list;
-	const char *section, *paramname;
-	struct MprVar *value;
-	bool ret;
-	if (argc != 2 && argc != 3) {
-		ejsSetErrorMsg(eid, "param.set invalid argument count");
-		return -1;
-	}
-
-	ctx = (struct param_context *)mprGetThisPtr(eid, "param");
-	mprAssert(ctx);
-
-	
-	if (argc == 3) {
-		section = mprToString(argv[0]);
-		paramname = mprToString(argv[1]);
-		value = argv[2];
-	} else {
-		section = NULL;
-		paramname = mprToString(argv[0]);
-		value = argv[1];
-	}
-	
-	list = mprToList(mprMemCtx(), value);
-	if (list) {
-		ret = param_set_string_list(ctx, paramname, list, section);
-	} else {
-		ret = param_set_string(ctx, paramname, mprToString(value), section);
-	}
-
-	mpr_Return(eid, mprCreateBoolVar(ret));
-	return 0;
-}
-
-/* 
-  param data as a two-level array
-
-  data = param.data;
-  */
-static int ejs_param_data(MprVarHandle eid, int argc, char **argv)
-{
-	struct param_context *ctx;
-	struct MprVar ret;
-	struct param_section *sec;
-
-	if (argc != 0) {
-		ejsSetErrorMsg(eid, "param.data does not take arguments");
-		return -1;
-	}
-
-	ctx = (struct param_context *)mprGetThisPtr(eid, "param");
-	mprAssert(ctx);
-
-	ret = mprObject("array");
-
-	for (sec = ctx->sections; sec; sec = sec->next) {
-		struct MprVar ps = mprObject("array");
-		struct param_opt *p;
-
-		for (p = sec->parameters; p; p = p->next) {
-			mprSetVar(&ps, p->key, mprString(p->value));
-		}
-		
-		mprSetVar(&ret, sec->name, ps);
-	}
-
-	mpr_Return(eid, ret);
-	
-	return 0;
-}
-
-/*
-  load file
-  
-  ok = param.load(file);
-*/
-static int ejs_param_load(MprVarHandle eid, int argc, char **argv)
-{
-	struct param_context *ctx;
-	bool ret;
-
-	if (argc != 1) {
-		ejsSetErrorMsg(eid, "param.load invalid argument count");
-		return -1;
-	}
-
-	ctx = (struct param_context *)mprGetThisPtr(eid, "param");
-	mprAssert(ctx);
-
-	ret = param_read(ctx, argv[0]);
-	
-	mpr_Return(eid, mprCreateBoolVar(ret));
-	return 0;
-}
-
-
-/*
-  save file
-  
-  ok = param.save(file);
-*/
-static int ejs_param_save(MprVarHandle eid, int argc, char **argv)
-{
-	struct param_context *ctx;
-	bool ret;
-
-	if (argc != 1) {
-		ejsSetErrorMsg(eid, "param.save invalid argument count");
-		return -1;
-	}
-
-	ctx = (struct param_context *)mprGetThisPtr(eid, "param");
-	mprAssert(ctx);
-
-	ret = param_write(ctx, argv[0]);
-	
-	mpr_Return(eid, mprCreateBoolVar(ret));
-	return 0;
-}
-
-static void param_add_members(struct MprVar *obj)
-{
-	mprSetStringCFunction(obj, "get", ejs_param_get);
-	mprSetStringCFunction(obj, "get_list", ejs_param_get_list);
-	mprSetCFunction(obj, "set", ejs_param_set);
-	mprSetStringCFunction(obj, "load", ejs_param_load);
-	mprSetStringCFunction(obj, "save", ejs_param_save);
-	mprSetStringCFunction(obj, "data", ejs_param_data);
-}
-
-/*
-  initialise param ejs subsystem
-*/
-static int ejs_param_init(MprVarHandle eid, int argc, struct MprVar **argv)
-{
-	struct MprVar *obj = mprInitObject(eid, "param", argc, argv);
-
-	mprSetPtrChild(obj, "param", param_init(mprMemCtx()));
-
-	param_add_members(obj);
-
-	return 0;
-}
-
-struct MprVar mprParam(struct param_context *ctx)
-{
-	struct MprVar mpv = mprObject("param");
-	mprSetPtrChild(&mpv, "param", ctx);
-	param_add_members(&mpv);
-	return mpv;
-}
-
-/*
-  setup C functions that be called from ejs
-*/
-void smb_setup_ejs_param(void)
-{
-	ejsDefineCFunction(-1, "param_init", ejs_param_init, NULL, MPR_VAR_SCRIPT_HANDLE);
-}
-- 
cgit 


From 3a76da248d2c3b8cf90ade4a441dd99c4583183f Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 26 May 2008 14:08:17 +0200
Subject: Remove unused libjs functions. (This used to be commit
 657a87fecc2e79e3c3f66c551e392cc341bca8cf)

---
 source4/scripting/libjs/base.js        |  53 ---------------
 source4/scripting/libjs/encoder.js     | 116 ---------------------------------
 source4/scripting/libjs/server_call.js |  83 -----------------------
 3 files changed, 252 deletions(-)
 delete mode 100644 source4/scripting/libjs/encoder.js
 delete mode 100644 source4/scripting/libjs/server_call.js

(limited to 'source4/scripting')

diff --git a/source4/scripting/libjs/base.js b/source4/scripting/libjs/base.js
index d861073a07..790dfeb3e0 100644
--- a/source4/scripting/libjs/base.js
+++ b/source4/scripting/libjs/base.js
@@ -20,48 +20,6 @@ function printf()
 	print(vsprintf(arguments));
 }
 
-/*
-  helper function to setup a rpc io object, ready for input
-*/
-function irpcObj()
-{
-	var o = new Object();
-	o.input = new Object();
-	return o;
-}
-
-/*
-  check that a status result is OK
-*/
-function check_status_ok(status)
-{
-	if (status.is_ok != true) {
-		printVars(status);
-	}
-	assert(status.is_ok == true);
-}
-
-/*
-  check that two arrays are equal
-*/
-function check_array_equal(a1, a2)
-{
-	assert(a1.length == a2.length);
-	for (i=0; i<a1.length; i++) {
-		assert(a1[i] == a2[i]);
-	}
-}
-
-/*
-  check that an array is all zeros
-*/
-function check_array_zero(a)
-{
-	for (i=0; i<a.length; i++) {
-		assert(a[i] == 0);
-	}
-}
-
 /*
   substitute strings of the form ${NAME} in str, replacing
   with substitutions from subobj
@@ -90,14 +48,3 @@ function substitute_var(str, subobj)
 	}
 	return join("", list);
 }
-
-/*
-  return "s" if a number should be shown as plural
-*/
-function plural(n)
-{
-	if (n == 1) {
-		return "";
-	}
-	return "s";
-}
diff --git a/source4/scripting/libjs/encoder.js b/source4/scripting/libjs/encoder.js
deleted file mode 100644
index 6cb780c00d..0000000000
--- a/source4/scripting/libjs/encoder.js
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
-	server side js functions for encoding/decoding objects into linear strings
-
-	Copyright Andrew Tridgell 2005
-	released under the GNU GPL Version 3 or later
-*/
-/*
-	usage:
-
-	  enc = encodeObject(obj);
-	  obj = decodeObject(enc);
-
-       The encoded format of the object is a string that is safe to
-       use in URLs
-
-       Note that only data elements are encoded, not functions
-*/
-
-function __count_members(o) {
-	var i, count = 0;
-	for (i in o) { 
-		count++;  
-	}
-	if (o.length != undefined) {
-		count++;
-	}
-	return count;
-}
-
-function __replace(str, old, rep) {
-	var s = string_init();
-	var a = s.split(old, str);
-	var j = s.join(rep, a);
-	return s.join(rep, a);
-}
-
-function encodeElement(e, name) {
-	var t = typeof(e);
-	var r;
-	var s = string_init();
-	if (t == 'object' && e == null) {
-		t = 'null';
-	}
-	if (t == 'object') {
-		r = s.sprintf("%s:%s:%s", name, t, encodeObject(e));
-	} else if (t == "string") {
-		var enc = s.encodeURIComponent(e);
-		var rep = __replace(enc, '%', '#');
-		r = s.sprintf("%s:%s:%s:", 
-			      name, t, __replace(s.encodeURIComponent(e),'%','#'));
-	} else if (t == "boolean" || t == "number") {
-		r = s.sprintf("%s:%s:%s:", name, t, "" + e);
-	} else if (t == "undefined" || t == "null") {
-		r = s.sprintf("%s:%s:", name, t);
-	} else if (t == "pointer") {
-		r = s.sprintf("%s:string:(POINTER):", name);
-	} else {
-		println("Unable to linearise type " + t);
-		r = "";
-	}
-	return r;
-}
-
-function encodeObject(o) {
-	var s = string_init();
-	var i, r = s.sprintf("%u:", __count_members(o));
-	for (i in o) {
-		r = r + encodeElement(o[i], i);
-	}
-	if (o.length != undefined) {
-		r = r + encodeElement(o.length, 'length');
-	}
-	return r;
-}
-
-function decodeObjectArray(a) {
-	var s = string_init();
-	var o = new Object();
-	var i, count = a[a.i]; a.i++;
-	for (i=0;i<count;i++) {
-		var name  = a[a.i]; a.i++;
-		var type  = a[a.i]; a.i++;
-		var value;
-		if (type == 'object') {
-			o[name] = decodeObjectArray(a);
-		} else if (type == "string") {
-			value = s.decodeURIComponent(__replace(a[a.i],'#','%')); a.i++;
-			o[name] = value;
-		} else if (type == "boolean") {
-			value = a[a.i]; a.i++;
-			if (value == 'true') {
-				o[name] = true;
-			} else {
-				o[name] = false;
-			}
-		} else if (type == "undefined") {
-			o[name] = undefined;
-		} else if (type == "null") {
-			o[name] = null;
-		} else if (type == "number") {
-			value = a[a.i]; a.i++;
-			o[name] = value + 0;
-		} else {
-			println("Unable to delinearise type " + t);
-			assert(t == "supported type");
-		}
-	}
-	return o;
-}
-
-function decodeObject(str) {
-	var s = string_init();
-	var a = s.split(':', str);
-	a.i = 0;
-	return decodeObjectArray(a);
-}
diff --git a/source4/scripting/libjs/server_call.js b/source4/scripting/libjs/server_call.js
deleted file mode 100644
index 46414a90dd..0000000000
--- a/source4/scripting/libjs/server_call.js
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
-	server side js functions for handling async calls from js clients
-
-	Copyright Andrew Tridgell 2005
-	released under the GNU GPL Version 3 or later
-*/
-
-libinclude("encoder.js");
-
-/*
-  register a new call
-*/
-function __register_call(name, func)
-{
-	var c = this;
-	c.calls[name] = func;
-}
-
-/*
-  run a call sent from the client, and output the returned object (if any)
-*/
-function __run_call() {
-	var c = this;
-	var name = form['ajaj_func'];
-	if (name == undefined) {
-		/* no function to run */
-		return;
-	}
-	var args = form['ajaj_args'];
-	if (args == undefined) {
-		println("no function arguments given in run_call");
-		exit(0);
-	}
-	args = decodeObject(args);
-	if (c.calls[name] == undefined) {
-		println("undefined remote call " + name);
-		exit(0);
-	}
-	var f = c.calls[name];
-	var res;
-	/* oh what a hack - should write a varargs ejs helper */
-	if (args.length == 0) {
-		res = f();
-	} else if (args.length == 1) {
-		res = f(args[0]);
-	} else if (args.length == 2) {
-		res = f(args[0], args[1]);
-	} else if (args.length == 3) {
-		res = f(args[0], args[1], args[2]);
-	} else if (args.length == 4) {
-		res = f(args[0], args[1], args[2], args[3]);
-	} else if (args.length == 5) {
-		res = f(args[0], args[1], args[2], args[3], args[4]);
-	} else if (args.length == 6) {
-		res = f(args[0], args[1], args[2], args[3], args[4], args[5]);
-	} else if (args.length == 7) {
-		res = f(args[0], args[1], args[2], args[3], args[4], args[5], args[6]);
-	} else if (args.length == 8) {
-		res = f(args[0], args[1], args[2], args[3], args[4], args[5], args[6], args[7]);
-	} else {
-		println("too many arguments for remote call: " + name);
-		exit(0);
-	}
-	var repobj = new Object();
-	repobj.res = res;
-	write(encodeObject(repobj));
-	exit(0);
-}
-
-
-
-/*
-  initialise a server call object
-*/
-function servCallObj()
-{
-	var c = new Object();
-	c.add = __register_call;
-	c.run = __run_call;
-	c.calls = new Object();
-	return c;
-}
-
-- 
cgit 


From 8f25f40a2efe9986e76e71d128bb29e2fb4cfd86 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 26 May 2008 14:10:34 +0200
Subject: Remove unused literal EJS bindings. (This used to be commit
 da3094d1ba86a8f4967ca1993383b0767439f79f)

---
 source4/scripting/ejs/config.mk  |   3 +-
 source4/scripting/ejs/literal.c  | 797 ---------------------------------------
 source4/scripting/ejs/smbcalls.c |   1 -
 3 files changed, 1 insertion(+), 800 deletions(-)
 delete mode 100644 source4/scripting/ejs/literal.c

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/config.mk b/source4/scripting/ejs/config.mk
index dc4ab776ec..34c0a9678e 100644
--- a/source4/scripting/ejs/config.mk
+++ b/source4/scripting/ejs/config.mk
@@ -49,8 +49,7 @@ smbcalls_OBJ_FILES = $(addprefix $(ejsscriptsrcdir)/, \
 		smbcalls.o \
 		smbcalls_options.o \
 		smbcalls_creds.o \
-		mprutil.o \
-		literal.o)
+		mprutil.o)
 
 $(eval $(call proto_header_template,$(ejsscriptsrcdir)/proto.h,$(smbcalls_OBJ_FILES:.o=.c)))
 
diff --git a/source4/scripting/ejs/literal.c b/source4/scripting/ejs/literal.c
deleted file mode 100644
index 8307c211d3..0000000000
--- a/source4/scripting/ejs/literal.c
+++ /dev/null
@@ -1,797 +0,0 @@
-/*
- * Copyright (c) 2004, 2005 Metaparadigm Pte. Ltd.
- * Michael Clark <michael@metaparadigm.com>
- * Copyright (c) 2006 Derrell Lipman
- *
- * This library is free software; you can redistribute it and/or modify
- * it under the terms of the MIT license. See COPYING for details.
- *
- * Derrell Lipman:
- * This version is modified from the original.  It has been modified to
- * natively use EJS variables rather than the original C object interface, and
- * to use the talloc() family of functions for memory allocation.
- */
-
-#include "includes.h"
-#include "scripting/ejs/smbcalls.h"
-
-enum json_tokener_error {
-        json_tokener_success,
-        json_tokener_error_oom, /* out of memory */
-        json_tokener_error_parse_unexpected,
-        json_tokener_error_parse_null,
-        json_tokener_error_parse_date,
-        json_tokener_error_parse_boolean,
-        json_tokener_error_parse_number,
-        json_tokener_error_parse_array,
-        json_tokener_error_parse_object,
-        json_tokener_error_parse_string,
-        json_tokener_error_parse_comment,
-        json_tokener_error_parse_eof
-};
-
-enum json_tokener_state {
-        json_tokener_state_eatws,
-        json_tokener_state_start,
-        json_tokener_state_finish,
-        json_tokener_state_null,
-        json_tokener_state_date,
-        json_tokener_state_comment_start,
-        json_tokener_state_comment,
-        json_tokener_state_comment_eol,
-        json_tokener_state_comment_end,
-        json_tokener_state_string,
-        json_tokener_state_string_escape,
-        json_tokener_state_escape_unicode,
-        json_tokener_state_boolean,
-        json_tokener_state_number,
-        json_tokener_state_array,
-        json_tokener_state_datelist,
-        json_tokener_state_array_sep,
-        json_tokener_state_datelist_sep,
-        json_tokener_state_object,
-        json_tokener_state_object_field_start,
-        json_tokener_state_object_field,
-        json_tokener_state_object_field_end,
-        json_tokener_state_object_value,
-        json_tokener_state_object_sep
-};
-
-enum date_field {
-        date_field_year,
-        date_field_month,
-        date_field_day,
-        date_field_hour,
-        date_field_minute,
-        date_field_second,
-        date_field_millisecond
-};
-
-struct json_tokener
-{
-        char *source;
-        int pos;
-        void *ctx;
-        void *pb;
-};
-
-static const char *json_number_chars = "0123456789.+-e";
-static const char *json_hex_chars = "0123456789abcdef";
-
-#define hexdigit(x) (((x) <= '9') ? (x) - '0' : ((x) & 7) + 9)
-
-extern struct MprVar json_tokener_parse(char *s);
-static struct MprVar json_tokener_do_parse(struct json_tokener *this,
-                                           enum json_tokener_error *err_p);
-
-/*
- * literal_to_var() parses a string into an ejs variable.  The ejs
- * variable is returned.  Upon error, the javascript variable will be
- * `undefined`.  This was created for parsing JSON, but is generally useful
- * for parsing the literal forms of objects and arrays, since ejs doesn't
- * procide that functionality.
- */
-int literal_to_var(int eid, int argc, char **argv)
-{
-        struct json_tokener tok;
-        struct MprVar obj;
-        enum json_tokener_error err = json_tokener_success;
-        
-        if (argc != 1) {
-		ejsSetErrorMsg(eid,
-                               "literal_to_var() requires one parameter: "
-                               "the string to be parsed.");
-		return -1;
-        }
-
-        tok.source = argv[0];
-        tok.pos = 0;
-        tok.ctx = talloc_new(mprMemCtx());
-        if (tok.ctx == NULL) {
-                mpr_Return(eid, mprCreateUndefinedVar());
-                return 0;
-        }
-        tok.pb = talloc_zero_size(tok.ctx, 1);
-        if (tok.pb == NULL) {
-                mpr_Return(eid, mprCreateUndefinedVar());
-                return 0;
-        }
-        obj = json_tokener_do_parse(&tok, &err);
-        talloc_free(tok.pb);
-        if (err != json_tokener_success) {
-                mprDestroyVar(&obj);
-                mpr_Return(eid, mprCreateUndefinedVar());
-                return 0;
-        }
-        mpr_Return(eid, obj);
-        return 0;
-}
-
-static void *append_string(void *ctx,
-                           char *orig,
-                           char *append,
-                           int size)
-{
-	if (!orig) {
-		return talloc_strndup(ctx, append, size);
-	}
-
-	return talloc_strndup_append(orig, append, size);
-}
-
-
-static struct MprVar json_tokener_do_parse(struct json_tokener *this,
-                                           enum json_tokener_error *err_p)
-{
-        enum json_tokener_state state;
-        enum json_tokener_state saved_state;
-        enum date_field date_field;
-        struct MprVar current = mprCreateUndefinedVar();
-        struct MprVar tempObj;
-        struct MprVar obj;
-        enum json_tokener_error err = json_tokener_success;
-        char date_script[] = "JSON_Date.create(0);";
-        char *obj_field_name = NULL;
-        char *emsg = NULL;
-        char quote_char;
-        int deemed_double;
-        int start_offset;
-        char c;
-        
-        state = json_tokener_state_eatws;
-        saved_state = json_tokener_state_start;
-
-        
-        do {
-                c = this->source[this->pos];
-                switch(state) {
-                        
-                case json_tokener_state_eatws:
-                        if(isspace(c)) {
-                                this->pos++;
-                        } else if(c == '/') {
-                                state = json_tokener_state_comment_start;
-                                start_offset = this->pos++;
-                        } else {
-                                state = saved_state;
-                        }
-                        break;
-                        
-                case json_tokener_state_start:
-                        switch(c) {
-                        case '{':
-                                state = json_tokener_state_eatws;
-                                saved_state = json_tokener_state_object;
-                                current = mprObject(NULL);
-                                this->pos++;
-                                break;
-                        case '[':
-                                state = json_tokener_state_eatws;
-                                saved_state = json_tokener_state_array;
-                                current = mprArray(NULL);
-                                this->pos++;
-                                break;
-                        case 'N':
-                        case 'n':
-                                start_offset = this->pos++;
-                                if (this->source[this->pos] == 'e') {
-                                    state = json_tokener_state_date;
-                                } else {
-                                    state = json_tokener_state_null;
-                                }
-                                break;
-                        case '"':
-                        case '\'':
-                                quote_char = c;
-                                talloc_free(this->pb);
-                                this->pb = talloc_zero_size(this->ctx, 1);
-                                if (this->pb == NULL) {
-                                        *err_p = json_tokener_error_oom;
-                                        goto out;
-                                }
-                                state = json_tokener_state_string;
-                                start_offset = ++this->pos;
-                                break;
-                        case 'T':
-                        case 't':
-                        case 'F':
-                        case 'f':
-                                state = json_tokener_state_boolean;
-                                start_offset = this->pos++;
-                                break;
-#if defined(__GNUC__)
-                        case '0' ... '9':
-#else
-                        case '0':
-                        case '1':
-                        case '2':
-                        case '3':
-                        case '4':
-                        case '5':
-                        case '6':
-                        case '7':
-                        case '8':
-                        case '9':
-#endif
-                        case '-':
-                                deemed_double = 0;
-                                state = json_tokener_state_number;
-                                start_offset = this->pos++;
-                                break;
-                        default:
-                                err = json_tokener_error_parse_unexpected;
-                                goto out;
-                        }
-                        break;
-                        
-                case json_tokener_state_finish:
-                        goto out;
-                        
-                case json_tokener_state_null:
-                        if(strncasecmp("null",
-                                       this->source + start_offset,
-                                       this->pos - start_offset)) {
-                                *err_p = json_tokener_error_parse_null;
-                                mprDestroyVar(&current);
-                                return mprCreateUndefinedVar();
-                        }
-                        
-                        if(this->pos - start_offset == 4) {
-                                mprDestroyVar(&current);
-                                current = mprCreateNullVar();
-                                saved_state = json_tokener_state_finish;
-                                state = json_tokener_state_eatws;
-                        } else {
-                                this->pos++;
-                        }
-                        break;
-                        
-                case json_tokener_state_date:
-                        if (this->pos - start_offset <= 18) {
-                                if (strncasecmp("new Date(Date.UTC(",
-                                                this->source + start_offset,
-                                                this->pos - start_offset)) {
-                                        *err_p = json_tokener_error_parse_date;
-                                        mprDestroyVar(&current);
-                                        return mprCreateUndefinedVar();
-                                } else {
-                                        this->pos++;
-                                        break;
-                                }
-                        }
-                        
-                        this->pos--;            /* we went one too far */
-                        state = json_tokener_state_eatws;
-                        saved_state = json_tokener_state_datelist;
-
-                        /* Create a JsonDate object */
-                        if (ejsEvalScript(0,
-                                          date_script,
-                                          &tempObj,
-                                          &emsg) != 0) {
-                                *err_p = json_tokener_error_parse_date;
-                                mprDestroyVar(&current);
-                                return mprCreateUndefinedVar();
-                        }
-                        mprDestroyVar(&current);
-                        mprCopyVar(&current, &tempObj, MPR_DEEP_COPY);
-                        date_field = date_field_year;
-                        break;
-                        
-                case json_tokener_state_comment_start:
-                        if(c == '*') {
-                                state = json_tokener_state_comment;
-                        } else if(c == '/') {
-                                state = json_tokener_state_comment_eol;
-                        } else {
-                                err = json_tokener_error_parse_comment;
-                                goto out;
-                        }
-                        this->pos++;
-                        break;
-                        
-                case json_tokener_state_comment:
-                        if(c == '*') state = json_tokener_state_comment_end;
-                        this->pos++;
-                        break;
-                        
-                case json_tokener_state_comment_eol:
-                        if(c == '\n') {
-                                state = json_tokener_state_eatws;
-                        }
-                        this->pos++;
-                        break;
-                        
-                case json_tokener_state_comment_end:
-                        if(c == '/') {
-                                state = json_tokener_state_eatws;
-                        } else {
-                                state = json_tokener_state_comment;
-                        }
-                        this->pos++;
-                        break;
-                        
-                case json_tokener_state_string:
-                        if(c == quote_char) {
-                                this->pb = append_string(
-                                        this->ctx,
-                                        this->pb,
-                                        this->source + start_offset,
-                                        this->pos - start_offset);
-                                if (this->pb == NULL) {
-                                        err = json_tokener_error_oom;
-                                        goto out;
-                                }
-                                current = mprString(this->pb);
-                                saved_state = json_tokener_state_finish;
-                                state = json_tokener_state_eatws;
-                        } else if(c == '\\') {
-                                saved_state = json_tokener_state_string;
-                                state = json_tokener_state_string_escape;
-                        }
-                        this->pos++;
-                        break;
-                        
-                case json_tokener_state_string_escape:
-                        switch(c) {
-                        case '"':
-                        case '\\':
-                                this->pb = append_string(
-                                        this->ctx,
-                                        this->pb,
-                                        this->source + start_offset,
-                                        this->pos - start_offset - 1);
-                                if (this->pb == NULL) {
-                                        err = json_tokener_error_oom;
-                                        goto out;
-                                }
-                                start_offset = this->pos++;
-                                state = saved_state;
-                                break;
-                        case 'b':
-                        case 'n':
-                        case 'r':
-                        case 't':
-                                this->pb = append_string(
-                                        this->ctx,
-                                        this->pb,
-                                        this->source + start_offset,
-                                        this->pos - start_offset - 1);
-                                if (this->pb == NULL) {
-                                        err = json_tokener_error_oom;
-                                        goto out;
-                                }
-                                if (c == 'b') {
-                                        /*
-                                         * second param to append_string()
-                                         * gets temporarily modified; can't
-                                         * pass string constant.
-                                         */
-                                        char buf[] = "\b";
-                                        this->pb = append_string(this->ctx,
-                                                                 this->pb,
-                                                                 buf,
-                                                                 1);
-                                        if (this->pb == NULL) {
-                                                err = json_tokener_error_oom;
-                                                goto out;
-                                        }
-                                } else if (c == 'n') {
-                                        char buf[] = "\n";
-                                        this->pb = append_string(this->ctx,
-                                                                 this->pb,
-                                                                 buf,
-                                                                 1);
-                                        if (this->pb == NULL) {
-                                                err = json_tokener_error_oom;
-                                                goto out;
-                                        }
-                                } else if (c == 'r') {
-                                        char buf[] = "\r";
-                                        this->pb = append_string(this->ctx,
-                                                                 this->pb,
-                                                                 buf,
-                                                                 1);
-                                        if (this->pb == NULL) {
-                                                err = json_tokener_error_oom;
-                                                goto out;
-                                        }
-                                } else if (c == 't') {
-                                        char buf[] = "\t";
-                                        this->pb = append_string(this->ctx,
-                                                                 this->pb,
-                                                                 buf,
-                                                                 1);
-                                        if (this->pb == NULL) {
-                                                err = json_tokener_error_oom;
-                                                goto out;
-                                        }
-                                }
-                                start_offset = ++this->pos;
-                                state = saved_state;
-                                break;
-                        case 'u':
-                                this->pb = append_string(
-                                        this->ctx,
-                                        this->pb,
-                                        this->source + start_offset,
-                                        this->pos - start_offset - 1);
-                                if (this->pb == NULL) {
-                                        err = json_tokener_error_oom;
-                                        goto out;
-                                }
-                                start_offset = ++this->pos;
-                                state = json_tokener_state_escape_unicode;
-                                break;
-                        default:
-                                err = json_tokener_error_parse_string;
-                                goto out;
-                        }
-                        break;
-                        
-                case json_tokener_state_escape_unicode:
-                        if(strchr(json_hex_chars, c)) {
-                                this->pos++;
-                                if(this->pos - start_offset == 4) {
-                                        unsigned char utf_out[3];
-                                        unsigned int ucs_char =
-                                                (hexdigit(*(this->source + start_offset)) << 12) +
-                                                (hexdigit(*(this->source + start_offset + 1)) << 8) +
-                                                (hexdigit(*(this->source + start_offset + 2)) << 4) +
-                                                hexdigit(*(this->source + start_offset + 3));
-                                        if (ucs_char < 0x80) {
-                                                utf_out[0] = ucs_char;
-                                                this->pb = append_string(
-                                                        this->ctx,
-                                                        this->pb,
-                                                        (char *) utf_out,
-                                                        1);
-                                                if (this->pb == NULL) {
-                                                        err = json_tokener_error_oom;
-                                                        goto out;
-                                                }
-                                        } else if (ucs_char < 0x800) {
-                                                utf_out[0] = 0xc0 | (ucs_char >> 6);
-                                                utf_out[1] = 0x80 | (ucs_char & 0x3f);
-                                                this->pb = append_string(
-                                                        this->ctx,
-                                                        this->pb,
-                                                        (char *) utf_out,
-                                                        2);
-                                                if (this->pb == NULL) {
-                                                        err = json_tokener_error_oom;
-                                                        goto out;
-                                                }
-                                        } else {
-                                                utf_out[0] = 0xe0 | (ucs_char >> 12);
-                                                utf_out[1] = 0x80 | ((ucs_char >> 6) & 0x3f);
-                                                utf_out[2] = 0x80 | (ucs_char & 0x3f);
-                                                this->pb = append_string(
-                                                        this->ctx,
-                                                        this->pb,
-                                                        (char *) utf_out,
-                                                        3);
-                                                if (this->pb == NULL) {
-                                                        err = json_tokener_error_oom;
-                                                        goto out;
-                                                }
-                                        }
-                                        start_offset = this->pos;
-                                        state = saved_state;
-                                }
-                        } else {
-                                err = json_tokener_error_parse_string;
-                                goto out;
-                        }
-                        break;
-                        
-                case json_tokener_state_boolean:
-                        if(strncasecmp("true", this->source + start_offset,
-                                       this->pos - start_offset) == 0) {
-                                if(this->pos - start_offset == 4) {
-                                        current = mprCreateBoolVar(1);
-                                        saved_state = json_tokener_state_finish;
-                                        state = json_tokener_state_eatws;
-                                } else {
-                                        this->pos++;
-                                }
-                        } else if(strncasecmp("false", this->source + start_offset,
-                                              this->pos - start_offset) == 0) {
-                                if(this->pos - start_offset == 5) {
-                                        current = mprCreateBoolVar(0);
-                                        saved_state = json_tokener_state_finish;
-                                        state = json_tokener_state_eatws;
-                                } else {
-                                        this->pos++;
-                                }
-                        } else {
-                                err = json_tokener_error_parse_boolean;
-                                goto out;
-                        }
-                        break;
-                        
-                case json_tokener_state_number:
-                        if(!c || !strchr(json_number_chars, c)) {
-                                int numi;
-                                double numd;
-                                char *tmp = talloc_strndup(
-                                        this->ctx,
-                                        this->source + start_offset,
-                                        this->pos - start_offset);
-                                if (tmp == NULL) {
-                                        err = json_tokener_error_oom;
-                                        goto out;
-                                }
-                                if(!deemed_double && sscanf(tmp, "%d", &numi) == 1) {
-                                        current = mprCreateIntegerVar(numi);
-                                } else if(deemed_double && sscanf(tmp, "%lf", &numd) == 1) {
-                                        current = mprCreateFloatVar(numd);
-                                } else {
-                                        talloc_free(tmp);
-                                        err = json_tokener_error_parse_number;
-                                        goto out;
-                                }
-                                talloc_free(tmp);
-                                saved_state = json_tokener_state_finish;
-                                state = json_tokener_state_eatws;
-                        } else {
-                                if(c == '.' || c == 'e') deemed_double = 1;
-                                this->pos++;
-                        }
-                        break;
-                        
-                case json_tokener_state_array:
-                        if(c == ']') {
-                                this->pos++;
-                                saved_state = json_tokener_state_finish;
-                                state = json_tokener_state_eatws;
-                        } else {
-                                int oldlen;
-                                char idx[16];
-                                
-                                obj = json_tokener_do_parse(this, &err);
-                                if (err != json_tokener_success) {
-                                        goto out;
-                                }
-                                oldlen = mprToInt(mprGetProperty(&current,
-                                                                 "length",
-                                                                 NULL));
-                                mprItoa(oldlen, idx, sizeof(idx));
-                                mprSetVar(&current, idx, obj);
-                                saved_state = json_tokener_state_array_sep;
-                                state = json_tokener_state_eatws;
-                        }
-                        break;
-                        
-                case json_tokener_state_datelist:
-                        if(c == ')') {
-                                if (this->source[this->pos+1] == ')') {
-                                        this->pos += 2;
-                                        saved_state = json_tokener_state_finish;
-                                        state = json_tokener_state_eatws;
-                                } else {
-                                        err = json_tokener_error_parse_date;
-                                        goto out;
-                                }
-                        } else {
-                                obj = json_tokener_do_parse(this, &err);
-                                if (err != json_tokener_success) {
-                                        goto out;
-                                }
-
-                                /* date list items must be integers */
-                                if (obj.type != MPR_TYPE_INT) {
-                                        err = json_tokener_error_parse_date;
-                                        goto out;
-                                }
-                                
-                                switch(date_field) {
-                                case date_field_year:
-                                        mprSetVar(&current, "year", obj);
-                                        break;
-                                case date_field_month:
-                                        mprSetVar(&current, "month", obj);
-                                        break;
-                                case date_field_day:
-                                        mprSetVar(&current, "day", obj);
-                                        break;
-                                case date_field_hour:
-                                        mprSetVar(&current, "hour", obj);
-                                        break;
-                                case date_field_minute:
-                                        mprSetVar(&current, "minute", obj);
-                                        break;
-                                case date_field_second:
-                                        mprSetVar(&current, "second", obj);
-                                        break;
-                                case date_field_millisecond:
-                                        mprSetVar(&current, "millisecond", obj);
-                                        break;
-                                default:
-                                        err = json_tokener_error_parse_date;
-                                        goto out;
-                                }
-
-                                /* advance to the next date field */
-                                date_field++;
-
-                                saved_state = json_tokener_state_datelist_sep;
-                                state = json_tokener_state_eatws;
-                        }
-                        break;
-                        
-                case json_tokener_state_array_sep:
-                        if(c == ']') {
-                                this->pos++;
-                                saved_state = json_tokener_state_finish;
-                                state = json_tokener_state_eatws;
-                        } else if(c == ',') {
-                                this->pos++;
-                                saved_state = json_tokener_state_array;
-                                state = json_tokener_state_eatws;
-                        } else {
-                                *err_p = json_tokener_error_parse_array;
-                                mprDestroyVar(&current);
-                                return mprCreateUndefinedVar();
-                        }
-                        break;
-                        
-                case json_tokener_state_datelist_sep:
-                        if(c == ')') {
-                                if (this->source[this->pos+1] == ')') {
-                                        this->pos += 2;
-                                        saved_state = json_tokener_state_finish;
-                                        state = json_tokener_state_eatws;
-                                } else {
-                                        err = json_tokener_error_parse_date;
-                                        goto out;
-                                }
-                        } else if(c == ',') {
-                                this->pos++;
-                                saved_state = json_tokener_state_datelist;
-                                state = json_tokener_state_eatws;
-                        } else {
-                                *err_p = json_tokener_error_parse_date;
-                                mprDestroyVar(&current);
-                                return mprCreateUndefinedVar();
-                        }
-                        break;
-                        
-                case json_tokener_state_object:
-                        state = json_tokener_state_object_field_start;
-                        start_offset = this->pos;
-                        break;
-                        
-                case json_tokener_state_object_field_start:
-                        if(c == '}') {
-                                this->pos++;
-                                saved_state = json_tokener_state_finish;
-                                state = json_tokener_state_eatws;
-                        } else if (c == '"' || c == '\'') {
-                                quote_char = c;
-                                talloc_free(this->pb);
-                                this->pb = talloc_zero_size(this->ctx, 1);
-                                if (this->pb == NULL) {
-                                        *err_p = json_tokener_error_oom;
-                                        goto out;
-                                }
-                                state = json_tokener_state_object_field;
-                                start_offset = ++this->pos;
-                        } else {
-                                err = json_tokener_error_parse_object;
-                                goto out;
-                        }
-                        break;
-                        
-                case json_tokener_state_object_field:
-                        if(c == quote_char) {
-                                this->pb = append_string(
-                                        this->ctx,
-                                        this->pb,
-                                        this->source + start_offset,
-                                        this->pos - start_offset);
-                                if (this->pb == NULL) {
-                                        err = json_tokener_error_oom;
-                                        goto out;
-                                }
-                                obj_field_name = talloc_strdup(this->ctx,
-                                                               this->pb);
-                                if (obj_field_name == NULL) {
-                                        err = json_tokener_error_oom;
-                                        goto out;
-                                }
-                                saved_state = json_tokener_state_object_field_end;
-                                state = json_tokener_state_eatws;
-                        } else if(c == '\\') {
-                                saved_state = json_tokener_state_object_field;
-                                state = json_tokener_state_string_escape;
-                        }
-                        this->pos++;
-                        break;
-                        
-                case json_tokener_state_object_field_end:
-                        if(c == ':') {
-                                this->pos++;
-                                saved_state = json_tokener_state_object_value;
-                                state = json_tokener_state_eatws;
-                        } else {
-                                *err_p = json_tokener_error_parse_object;
-                                mprDestroyVar(&current);
-                                return mprCreateUndefinedVar();
-                        }
-                        break;
-                        
-                case json_tokener_state_object_value:
-                        obj = json_tokener_do_parse(this, &err);
-                        if (err != json_tokener_success) {
-                                goto out;
-                        }
-                        mprSetVar(&current, obj_field_name, obj);
-                        talloc_free(obj_field_name);
-                        obj_field_name = NULL;
-                        saved_state = json_tokener_state_object_sep;
-                        state = json_tokener_state_eatws;
-                        break;
-                        
-                case json_tokener_state_object_sep:
-                        if(c == '}') {
-                                this->pos++;
-                                saved_state = json_tokener_state_finish;
-                                state = json_tokener_state_eatws;
-                        } else if(c == ',') {
-                                this->pos++;
-                                saved_state = json_tokener_state_object;
-                                state = json_tokener_state_eatws;
-                        } else {
-                                err = json_tokener_error_parse_object;
-                                goto out;
-                        }
-                        break;
-                        
-                }
-        } while(c);
-        
-        if(state != json_tokener_state_finish &&
-           saved_state != json_tokener_state_finish)
-                err = json_tokener_error_parse_eof;
-        
-out:
-        talloc_free(obj_field_name);
-        if(err == json_tokener_success) {
-                return current;
-        } else {
-                mprDestroyVar(&current);
-                *err_p = err;
-                return mprCreateUndefinedVar();
-        }
-}
-
-
-void smb_setup_ejs_literal(void)
-{
-	ejsDefineStringCFunction(-1,
-                                 "literal_to_var",
-                                 literal_to_var,
-                                 NULL,
-                                 MPR_VAR_SCRIPT_HANDLE);
-}
diff --git a/source4/scripting/ejs/smbcalls.c b/source4/scripting/ejs/smbcalls.c
index 8b1fe06c77..4314b51455 100644
--- a/source4/scripting/ejs/smbcalls.c
+++ b/source4/scripting/ejs/smbcalls.c
@@ -204,7 +204,6 @@ void smb_setup_ejs_functions(void (*exception_handler)(const char *))
 
 	smb_setup_ejs_options();
 	smb_setup_ejs_credentials();
-        smb_setup_ejs_literal();
 	
 	shared_init = load_samba_modules(NULL, mprLpCtx(), "smbcalls");
 	
-- 
cgit 


From 936b973acbc756cc3b6cb0d9df85ebc28ba76ae7 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 27 May 2008 14:36:28 +0200
Subject: Use new dynconfig.h location. (This used to be commit
 c3f556915f09d078253e4c5539910a1cf420eeca)

---
 source4/scripting/ejs/smbscript.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/smbscript.c b/source4/scripting/ejs/smbscript.c
index 9ed4aa490f..db9fc9affa 100644
--- a/source4/scripting/ejs/smbscript.c
+++ b/source4/scripting/ejs/smbscript.c
@@ -26,7 +26,7 @@
 #include "scripting/ejs/smbcalls.h"
 #include "auth/gensec/gensec.h"
 #include "ldb/include/ldb.h"
-#include "dynconfig.h"
+#include "dynconfig/dynconfig.h"
 
 static EjsId eid;
 
-- 
cgit 


From 815c0ef2ed3bafe44c687dffe97b309b00df7a8c Mon Sep 17 00:00:00 2001
From: Andrew Kroeger <andrew@sprocks.gotdns.com>
Date: Fri, 23 May 2008 02:20:35 -0500
Subject: provision: Add missing string parameter token when assigning
 ldap_backend. (This used to be commit
 7d26145a7fba22b2e1c7c57053aab3180a22089d)

---
 source4/scripting/python/samba/provision.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index 3914fa8376..4a9def8aa9 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -969,7 +969,7 @@ def provision(setup_dir, message, session_info,
     if ldap_backend is not None:
         if ldap_backend == "ldapi":
             # provision-backend will set this path suggested slapd command line / fedorads.inf
-            ldap_backend = "ldapi://" % urllib.quote(os.path.join(paths.private_dir, "ldap", "ldapi"), safe="")
+            ldap_backend = "ldapi://%s" % urllib.quote(os.path.join(paths.private_dir, "ldap", "ldapi"), safe="")
              
     # only install a new shares config db if there is none
     if not os.path.exists(paths.shareconf):
-- 
cgit 


From b7c8e020a6f7221d6d10f2dd7610a232edeedf83 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Thu, 29 May 2008 18:38:17 +1000
Subject: Print prefixMap in a human-readable format.

This should allow the prefixMap to be edited, until we find the right
way to autogenerate it.

Andrew Bartlett
(This used to be commit 24ae9a55ec326807afd8d5bfa0a422a6668bd7c3)
---
 source4/scripting/python/samba/provision.py | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index 4a9def8aa9..71c1ac3187 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -797,13 +797,17 @@ def setup_samdb(path, setup_path, session_info, credentials, lp,
             "EXTENSIBLEOBJECT": "# no objectClass: extensibleObject for local ldb"
             })
         message("Modifying schema container")
+
+        prefixmap = open(setup_path("prefixMap.txt"), 'r').read()
+
         setup_modify_ldif(samdb, 
             setup_path("provision_schema_basedn_modify.ldif"), {
             "SCHEMADN": names.schemadn,
             "NETBIOSNAME": names.netbiosname,
             "DEFAULTSITE": names.sitename,
             "CONFIGDN": names.configdn,
-            "SERVERDN": names.serverdn
+            "SERVERDN": names.serverdn,
+            "PREFIXMAP_B64": b64encode(prefixmap)
             })
 
         message("Setting up sam.ldb Samba4 schema")
@@ -1389,12 +1393,16 @@ def load_schema(setup_path, samdb, schemadn, netbiosname, configdn, sitename):
     schema_data = open(setup_path("schema.ldif"), 'r').read()
     schema_data += open(setup_path("schema_samba4.ldif"), 'r').read()
     schema_data = substitute_var(schema_data, {"SCHEMADN": schemadn})
+    prefixmap = open(setup_path("prefixMap.txt"), 'r').read()
+    prefixmap = b64encode(prefixmap)
+
     head_data = open(setup_path("provision_schema_basedn_modify.ldif"), 'r').read()
     head_data = substitute_var(head_data, {
                     "SCHEMADN": schemadn,
                     "NETBIOSNAME": netbiosname,
                     "CONFIGDN": configdn,
-                    "DEFAULTSITE":sitename 
+                    "DEFAULTSITE":sitename,
+                    "PREFIXMAP_B64":prefixmap
     })
     samdb.attach_schema_from_ldif(head_data, schema_data)
 
-- 
cgit 


From 90aeca8ebdd74250038a11d4c523c01072711092 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Thu, 29 May 2008 17:29:56 +0200
Subject: Check test directory is cleaned up by Python tests. (This used to be
 commit c338269b4b9f2bf4d3386880c1d733a8e47e2c8d)

---
 source4/scripting/python/samba/tests/__init__.py | 1 +
 1 file changed, 1 insertion(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/tests/__init__.py b/source4/scripting/python/samba/tests/__init__.py
index e29b4a87d5..d827bfa004 100644
--- a/source4/scripting/python/samba/tests/__init__.py
+++ b/source4/scripting/python/samba/tests/__init__.py
@@ -47,6 +47,7 @@ class TestCaseInTempDir(unittest.TestCase):
 
     def tearDown(self):
         super(TestCaseInTempDir, self).tearDown()
+        self.assertEquals([], os.listdir(self.tempdir))
         os.rmdir(self.tempdir)
 
 
-- 
cgit 


From e16f0e15b40229e7a42311dddfb391cf6142462e Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Thu, 29 May 2008 17:31:16 +0200
Subject: Update after changes to the provision API, make sure temp dir gets
 cleaned up. (This used to be commit 064e9ddb3786bd7df8785b39754b1e6674496b66)

---
 source4/scripting/python/samba/tests/samdb.py | 29 ++++++++++++++++++---------
 1 file changed, 19 insertions(+), 10 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/tests/samdb.py b/source4/scripting/python/samba/tests/samdb.py
index 0d4f7bde0e..a022d7bb51 100644
--- a/source4/scripting/python/samba/tests/samdb.py
+++ b/source4/scripting/python/samba/tests/samdb.py
@@ -16,13 +16,13 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-from auth import system_session
-from credentials import Credentials
+from samba.auth import system_session
+from samba.credentials import Credentials
 import os
-from samba.provision import setup_samdb
+from samba.provision import setup_samdb, guess_names
 from samba.samdb import SamDB
 from samba.tests import cmdline_loadparm, TestCaseInTempDir
-import security
+from samba import security
 from unittest import TestCase
 import uuid
 
@@ -42,14 +42,23 @@ class SamDBTestCase(TestCaseInTempDir):
         domainsid = security.random_sid()
         hostguid = str(uuid.uuid4())
         path = os.path.join(self.tempdir, "samdb.ldb")
+        names = guess_names(lp=cmdline_loadparm, hostname="foo", 
+                            domain="EXAMPLE.COM", dnsdomain="example.com", 
+                            serverrole="domain controller", 
+                            domaindn=self.domaindn, configdn=configdn, 
+                            schemadn=schemadn)
         self.samdb = setup_samdb(path, setup_path, system_session(), creds, 
-                                 cmdline_loadparm, schemadn, configdn, 
-                                 self.domaindn, "example.com", "EXAMPLE.COM", 
-                                 "FOO", lambda x: None, "foo", domaindn, 
-                                 False, domainsid, "# no aci", domainguid, 
-                                 policyguid, "EXAMPLE", True, "secret", 
-                                 "secret", "secret", hostguid, invocationid, 
+                                 cmdline_loadparm, names, 
+                                 lambda x: None, domainsid, 
+                                 "# no aci", domainguid, 
+                                 policyguid, False, "secret", 
+                                 "secret", "secret", invocationid, 
                                  "secret", "domain controller")
+    def tearDown(self):
+        for f in ['templates.ldb', 'schema.ldb', 'configuration.ldb', 
+                  'users.ldb', 'samdb.ldb']:
+            os.remove(os.path.join(self.tempdir, f))
+        super(SamDBTestCase, self).tearDown()
 
     def test_add_foreign(self):
         self.samdb.add_foreign(self.domaindn, "S-1-5-7", "Somedescription")
-- 
cgit 


From 6f7b2b69333230016a9538b024faec0d97095c69 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Thu, 29 May 2008 17:38:12 +0200
Subject: Fix samdb test and enable it. (This used to be commit
 6b202d3780f8ff50e0bdfa4a749c43b5639e4880)

---
 source4/scripting/python/samba/tests/samdb.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/tests/samdb.py b/source4/scripting/python/samba/tests/samdb.py
index a022d7bb51..7e8ba053d4 100644
--- a/source4/scripting/python/samba/tests/samdb.py
+++ b/source4/scripting/python/samba/tests/samdb.py
@@ -19,7 +19,7 @@
 from samba.auth import system_session
 from samba.credentials import Credentials
 import os
-from samba.provision import setup_samdb, guess_names
+from samba.provision import setup_samdb, guess_names, setup_templatesdb
 from samba.samdb import SamDB
 from samba.tests import cmdline_loadparm, TestCaseInTempDir
 from samba import security
@@ -42,12 +42,16 @@ class SamDBTestCase(TestCaseInTempDir):
         domainsid = security.random_sid()
         hostguid = str(uuid.uuid4())
         path = os.path.join(self.tempdir, "samdb.ldb")
+        session_info = system_session()
         names = guess_names(lp=cmdline_loadparm, hostname="foo", 
                             domain="EXAMPLE.COM", dnsdomain="example.com", 
                             serverrole="domain controller", 
                             domaindn=self.domaindn, configdn=configdn, 
                             schemadn=schemadn)
-        self.samdb = setup_samdb(path, setup_path, system_session(), creds, 
+        setup_templatesdb(os.path.join(self.tempdir, "templates.ldb"), 
+                          setup_path, session_info=session_info, 
+                          credentials=creds, lp=cmdline_loadparm)
+        self.samdb = setup_samdb(path, setup_path, session_info, creds, 
                                  cmdline_loadparm, names, 
                                  lambda x: None, domainsid, 
                                  "# no aci", domainguid, 
-- 
cgit 


From 39f50afc579f208300c3c1fcc612ca9b69bb76e3 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Fri, 30 May 2008 02:07:28 +0200
Subject: Move CFLAGS handling out of smb_build. (This used to be commit
 e2b71a0ecbf10a78a59a8ec6371bdee57b1bfa6c)

---
 source4/scripting/python/config.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/config.mk b/source4/scripting/python/config.mk
index b494ee6e8d..af014a8c9e 100644
--- a/source4/scripting/python/config.mk
+++ b/source4/scripting/python/config.mk
@@ -21,7 +21,7 @@ PRIVATE_DEPENDENCIES = LIBNDR LIBLDB SAMDB CREDENTIALS
 
 python_misc_OBJ_FILES = $(pyscriptsrcdir)/misc_wrap.o
 
-$(python_misc_OBJ_FILES): CFLAGS+=$(CFLAG_NO_UNUSED_MACROS) $(CFLAG_NO_CAST_QUAL)
+$(python_misc_OBJ_FILES): CFLAGS+=$(CFLAG_NO_UNUSED_MACROS) $(CFLAG_NO_CAST_QUAL) $(LDB_CFLAGS)
 
 _PY_FILES = $(shell find $(pyscriptsrcdir)/samba $(pyscriptsrcdir)/subunit -name "*.py")
 
-- 
cgit 


From b9babfe4cc70b96f4f1df037244cd27eae580c94 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Fri, 30 May 2008 14:26:47 +1000
Subject: Fix up provision and samdb tests.

This fixes up the provision to operate with a target directory - it
must override the smb.conf in this case.

Andrew Bartlett
(This used to be commit 89fc39f7edb214065aff461bc225f41443eae3c7)
---
 source4/scripting/python/samba/provision.py   |  5 +++--
 source4/scripting/python/samba/tests/samdb.py | 25 ++++++++++++++++++++-----
 2 files changed, 23 insertions(+), 7 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index 71c1ac3187..b7112e16c3 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -930,8 +930,9 @@ def provision(setup_dir, message, session_info,
     if aci is None:
         aci = "# no aci for local ldb"
 
-    if smbconf is None:
-        os.makedirs(os.path.join(targetdir, "etc"))
+    if targetdir is not None:
+        if (not os.path.exists(os.path.join(targetdir, "etc"))):
+            os.makedirs(os.path.join(targetdir, "etc"))
         smbconf = os.path.join(targetdir, "etc", "smb.conf")
 
     # only install a new smb.conf if there isn't one there already
diff --git a/source4/scripting/python/samba/tests/samdb.py b/source4/scripting/python/samba/tests/samdb.py
index 7e8ba053d4..fcf93a3fc6 100644
--- a/source4/scripting/python/samba/tests/samdb.py
+++ b/source4/scripting/python/samba/tests/samdb.py
@@ -19,12 +19,13 @@
 from samba.auth import system_session
 from samba.credentials import Credentials
 import os
-from samba.provision import setup_samdb, guess_names, setup_templatesdb
+from samba.provision import setup_samdb, guess_names, setup_templatesdb, make_smbconf
 from samba.samdb import SamDB
 from samba.tests import cmdline_loadparm, TestCaseInTempDir
 from samba import security
 from unittest import TestCase
 import uuid
+import param
 
 class SamDBTestCase(TestCaseInTempDir):
     def setUp(self):
@@ -43,9 +44,22 @@ class SamDBTestCase(TestCaseInTempDir):
         hostguid = str(uuid.uuid4())
         path = os.path.join(self.tempdir, "samdb.ldb")
         session_info = system_session()
-        names = guess_names(lp=cmdline_loadparm, hostname="foo", 
-                            domain="EXAMPLE.COM", dnsdomain="example.com", 
-                            serverrole="domain controller", 
+        
+        hostname="foo"
+        domain="EXAMPLE"
+        dnsdomain="example.com" 
+        serverrole="domain controller"
+
+        smbconf = os.path.join(self.tempdir, "smb.conf")
+        make_smbconf(smbconf, setup_path, hostname, domain, dnsdomain, serverrole, 
+                     self.tempdir)
+
+        lp = param.LoadParm()
+        lp.load(smbconf)
+
+        names = guess_names(lp=lp, hostname=hostname, 
+                            domain=domain, dnsdomain=dnsdomain, 
+                            serverrole=severrole, 
                             domaindn=self.domaindn, configdn=configdn, 
                             schemadn=schemadn)
         setup_templatesdb(os.path.join(self.tempdir, "templates.ldb"), 
@@ -58,9 +72,10 @@ class SamDBTestCase(TestCaseInTempDir):
                                  policyguid, False, "secret", 
                                  "secret", "secret", invocationid, 
                                  "secret", "domain controller")
+
     def tearDown(self):
         for f in ['templates.ldb', 'schema.ldb', 'configuration.ldb', 
-                  'users.ldb', 'samdb.ldb']:
+                  'users.ldb', 'samdb.ldb', 'smb.conf']:
             os.remove(os.path.join(self.tempdir, f))
         super(SamDBTestCase, self).tearDown()
 
-- 
cgit 


From d579540085133d3a3b273a653cea7f8da10ed5db Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Fri, 30 May 2008 15:09:59 +1000
Subject: Fix rpcecho test. (This used to be commit
 df8399ba9dee9d1c706a3e56451c9f2cade96dae)

---
 source4/scripting/python/samba/tests/dcerpc/rpcecho.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/tests/dcerpc/rpcecho.py b/source4/scripting/python/samba/tests/dcerpc/rpcecho.py
index bbbd0d76ec..96bb3923a6 100644
--- a/source4/scripting/python/samba/tests/dcerpc/rpcecho.py
+++ b/source4/scripting/python/samba/tests/dcerpc/rpcecho.py
@@ -27,7 +27,7 @@ class RpcEchoTests(RpcInterfaceTestCase):
         self.conn = echo.rpcecho("ncalrpc:", self.get_loadparm())
 
     def test_two_contexts(self):
-        self.conn2 = echo.rpcecho("ncalrpc:", basis_connection=self.conn)
+        self.conn2 = echo.rpcecho("ncalrpc:", self.get_loadparm(), basis_connection=self.conn)
         self.assertEquals(3, self.conn2.AddOne(2))
 
     def test_abstract_syntax(self):
-- 
cgit 


From 21377a7ea9800636a8bc96b3863f97062d7bf9d1 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Fri, 30 May 2008 15:26:10 +1000
Subject: Fix the samba4.dcerpc.bare.python test.

The loadparm context isn't really optional, as otherwise we can't find
the right server to connect to.

Andrew Bartlett
(This used to be commit 2b5acb5e95b46dd39c6f54b5bb7e15ddb180f7ec)
---
 source4/scripting/python/samba/tests/dcerpc/bare.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/tests/dcerpc/bare.py b/source4/scripting/python/samba/tests/dcerpc/bare.py
index d75ffc381e..fae699a249 100644
--- a/source4/scripting/python/samba/tests/dcerpc/bare.py
+++ b/source4/scripting/python/samba/tests/dcerpc/bare.py
@@ -20,27 +20,28 @@
 
 from samba.dcerpc import ClientConnection
 from unittest import TestCase
+from samba.tests import cmdline_loadparm
 
 class BareTestCase(TestCase):
     def test_bare(self):
         # Connect to the echo pipe
         x = ClientConnection("ncalrpc:localhost[DEFAULT]", 
-                ("60a15ec5-4de8-11d7-a637-005056a20182", 1))
+                ("60a15ec5-4de8-11d7-a637-005056a20182", 1), lp_ctx=cmdline_loadparm)
         self.assertEquals("\x01\x00\x00\x00", x.request(0, chr(0) * 4))
 
     def test_alter_context(self):
         x = ClientConnection("ncalrpc:localhost[DEFAULT]", 
-                ("12345778-1234-abcd-ef00-0123456789ac", 1))
+                ("12345778-1234-abcd-ef00-0123456789ac", 1), lp_ctx=cmdline_loadparm)
         y = ClientConnection("ncalrpc:localhost", 
                 ("60a15ec5-4de8-11d7-a637-005056a20182", 1),
-                basis_connection=x)
+                basis_connection=x, lp_ctx=cmdline_loadparm)
         x.alter_context(("60a15ec5-4de8-11d7-a637-005056a20182", 1))
         # FIXME: self.assertEquals("\x01\x00\x00\x00", x.request(0, chr(0) * 4))
 
     def test_two_connections(self):
         x = ClientConnection("ncalrpc:localhost[DEFAULT]", 
-                ("60a15ec5-4de8-11d7-a637-005056a20182", 1))
+                ("60a15ec5-4de8-11d7-a637-005056a20182", 1), lp_ctx=cmdline_loadparm)
         y = ClientConnection("ncalrpc:localhost", 
                 ("60a15ec5-4de8-11d7-a637-005056a20182", 1),
-                basis_connection=x)
+                basis_connection=x, lp_ctx=cmdline_loadparm)
         self.assertEquals("\x01\x00\x00\x00", y.request(0, chr(0) * 4))
-- 
cgit 


From 277287114679addc2ef26fbe6a82963f9cf1b196 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Fri, 30 May 2008 14:15:40 +0200
Subject: Fix samdb python test. (This used to be commit
 0e3d488cc108174ca0f875aab16b9771c2933f19)

---
 source4/scripting/python/samba/provision.py   | 6 +++---
 source4/scripting/python/samba/tests/samdb.py | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index b7112e16c3..3f936c3301 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -1321,12 +1321,12 @@ def create_zone_file(path, setup_path, dnsdomain, domaindn,
     """
     assert isinstance(domainguid, str)
 
-    hostip6_base_line = ""
-    hostip6_host_line = ""
-
     if hostip6 is not None:
         hostip6_base_line = "            IN AAAA    " + hostip6
         hostip6_host_line = hostname + "        IN AAAA    " + hostip6
+    else:
+        hostip6_base_line = ""
+        hostip6_host_line = ""
 
     setup_file(setup_path("provision.zone"), path, {
             "DNSPASS_B64": b64encode(dnspass),
diff --git a/source4/scripting/python/samba/tests/samdb.py b/source4/scripting/python/samba/tests/samdb.py
index fcf93a3fc6..97be5672ce 100644
--- a/source4/scripting/python/samba/tests/samdb.py
+++ b/source4/scripting/python/samba/tests/samdb.py
@@ -25,7 +25,7 @@ from samba.tests import cmdline_loadparm, TestCaseInTempDir
 from samba import security
 from unittest import TestCase
 import uuid
-import param
+from samba import param
 
 class SamDBTestCase(TestCaseInTempDir):
     def setUp(self):
@@ -59,7 +59,7 @@ class SamDBTestCase(TestCaseInTempDir):
 
         names = guess_names(lp=lp, hostname=hostname, 
                             domain=domain, dnsdomain=dnsdomain, 
-                            serverrole=severrole, 
+                            serverrole=serverrole, 
                             domaindn=self.domaindn, configdn=configdn, 
                             schemadn=schemadn)
         setup_templatesdb(os.path.join(self.tempdir, "templates.ldb"), 
-- 
cgit 


From be14efbdf9de964d36b1fdbc8dec909ad1d2601f Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Sat, 31 May 2008 08:35:55 +1000
Subject: Revert Jelmer's CFLAGS commit
 e2b71a0ecbf10a78a59a8ec6371bdee57b1bfa6c

This commit broke the build, because not all files (libreplace, popt)
were updated.

Andrew Bartlett
(This used to be commit 3faacf4351d68a10aea78b53768571d2059772ae)
---
 source4/scripting/python/config.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/config.mk b/source4/scripting/python/config.mk
index af014a8c9e..b494ee6e8d 100644
--- a/source4/scripting/python/config.mk
+++ b/source4/scripting/python/config.mk
@@ -21,7 +21,7 @@ PRIVATE_DEPENDENCIES = LIBNDR LIBLDB SAMDB CREDENTIALS
 
 python_misc_OBJ_FILES = $(pyscriptsrcdir)/misc_wrap.o
 
-$(python_misc_OBJ_FILES): CFLAGS+=$(CFLAG_NO_UNUSED_MACROS) $(CFLAG_NO_CAST_QUAL) $(LDB_CFLAGS)
+$(python_misc_OBJ_FILES): CFLAGS+=$(CFLAG_NO_UNUSED_MACROS) $(CFLAG_NO_CAST_QUAL)
 
 _PY_FILES = $(shell find $(pyscriptsrcdir)/samba $(pyscriptsrcdir)/subunit -name "*.py")
 
-- 
cgit 


From 230503ad847f9514e95b57c48eeacbd619a1c9f5 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Wed, 11 Jun 2008 00:05:58 +0200
Subject: Add working Python bindings for NBT. (This used to be commit
 9c88f5e1de9db34751f16c2247fa91ae2445c5f7)

---
 source4/scripting/python/examples/netbios.py | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 source4/scripting/python/examples/netbios.py

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/examples/netbios.py b/source4/scripting/python/examples/netbios.py
new file mode 100644
index 0000000000..3671076a59
--- /dev/null
+++ b/source4/scripting/python/examples/netbios.py
@@ -0,0 +1,28 @@
+#!/usr/bin/python
+
+# Unix SMB/CIFS implementation.
+# Copyright (C) Jelmer Vernooij <jelmer@samba.org> 2008
+#   
+# 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/>.
+#
+
+from samba.netbios import Node
+
+n = Node()
+(reply_from, names, addresses) = n.query_name("GANIEDA", "192.168.4.0",
+                                              timeout=4)
+
+print "Received reply from %s:" % (reply_from, )
+print "Names: %r" % (names, )
+print "Addresses: %r" % (addresses, )
-- 
cgit 


From 4c144bbc9ede305616a2f2fb91695f94d589c85e Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Wed, 11 Jun 2008 00:11:11 +0200
Subject: Clarify error when SWIG can't be found - it's not required unless you
 intend to do development. (This used to be commit
 0f57fcaa2e8af3e2b03ba401f4fda812fe55745b)

---
 source4/scripting/python/ac_pkg_swig.m4 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/ac_pkg_swig.m4 b/source4/scripting/python/ac_pkg_swig.m4
index 013743c1a0..8d3561a0a7 100644
--- a/source4/scripting/python/ac_pkg_swig.m4
+++ b/source4/scripting/python/ac_pkg_swig.m4
@@ -109,7 +109,7 @@ AC_DEFUN([AC_PROG_SWIG],[
                         if test $available_major -ne $required_major \
                                 -o $available_minor -ne $required_minor \
                                 -o $available_patch -lt $required_patch ; then
-                                AC_MSG_WARN([SWIG version >= $1 is required.  You have $swig_version.  You should look at http://www.swig.org])
+                                AC_MSG_WARN([SWIG version >= $1 is required if you would like to work on the SWIG bindings.  You have $swig_version. ])
                                 SWIG='no'
                         else
                                 AC_MSG_NOTICE([SWIG executable is '$SWIG'])
-- 
cgit 


From 370f95acfc197759f9140876b31ac127d3a0e10c Mon Sep 17 00:00:00 2001
From: Simo Sorce <idra@samba.org>
Date: Mon, 16 Jun 2008 17:51:42 -0400
Subject: Try to get a bit further with provisioning (This used to be commit
 649f6c0c1084828dda7d50bd2904208192de77da)

---
 source4/scripting/python/samba/provision.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index 3f936c3301..93a4c8f502 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -1180,6 +1180,8 @@ def provision_backend(setup_dir=None, message=None,
 
     schemadb = Ldb(schemadb_path, lp=lp)
  
+    prefixmap = open(setup_path("prefixMap.txt"), 'r').read()
+
     setup_add_ldif(schemadb, setup_path("provision_schema_basedn.ldif"), 
                    {"SCHEMADN": names.schemadn,
                     "ACI": "#",
@@ -1191,7 +1193,8 @@ def provision_backend(setup_dir=None, message=None,
                            "NETBIOSNAME": names.netbiosname,
                            "DEFAULTSITE": DEFAULTSITE,
                            "CONFIGDN": names.configdn,
-                           "SERVERDN": names.serverdn
+                           "SERVERDN": names.serverdn,
+                           "PREFIXMAP_B64": b64encode(prefixmap)
                            })
     
     setup_add_ldif(schemadb, setup_path("schema_samba4.ldif"), 
-- 
cgit 


From 9ea25cacf1c564a485897432b73beebf2e634f55 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Thu, 19 Jun 2008 11:05:20 +1000
Subject: Add a blackbox test for the provision-backend script.

This test (as most tests do :-) found a few bugs, also fixed in this
commit.

Andrew Bartlett
(This used to be commit d96a6482dad54d1d27a87107865e833a9c32cf53)
---
 source4/scripting/python/samba/provision.py | 57 +++++++++++++++--------------
 1 file changed, 30 insertions(+), 27 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index 93a4c8f502..504044253e 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -1150,15 +1150,18 @@ def provision_backend(setup_dir=None, message=None,
     if root is None:
         root = findnss(pwd.getpwnam, ["root"])[0]
 
-    if smbconf is None:
-        etcdir = os.path.join(targetdir, "etc")
-        os.makedirs(etcdir)
-        smbconf = os.path.join(etcdir, "smb.conf")
+    if adminpass is None:
+        adminpass = misc.random_password(12)
+
+    if targetdir is not None:
+        if (not os.path.exists(os.path.join(targetdir, "etc"))):
+            os.makedirs(os.path.join(targetdir, "etc"))
+        smbconf = os.path.join(targetdir, "etc", "smb.conf")
 
     # only install a new smb.conf if there isn't one there already
     if not os.path.exists(smbconf):
-        make_smbconf(smbconf, setup_path, hostname, domain, realm, 
-                              serverrole, targetdir)
+        make_smbconf(smbconf, setup_path, hostname, domain, realm, serverrole, 
+                     targetdir)
 
     lp = param.LoadParm()
     lp.load(smbconf)
@@ -1230,11 +1233,11 @@ def provision_backend(setup_dir=None, message=None,
        
     elif ldap_backend_type == "openldap":
         attrs = ["linkID", "lDAPDisplayName"]
-    res = schemadb.search(expression="(&(&(linkID=*)(!(linkID:1.2.840.113556.1.4.803:=1)))(objectclass=attributeSchema))", base=names.schemadn, scope=SCOPE_SUBTREE, attrs=attrs)
+        res = schemadb.search(expression="(&(&(linkID=*)(!(linkID:1.2.840.113556.1.4.803:=1)))(objectclass=attributeSchema))", base=names.schemadn, scope=SCOPE_SUBTREE, attrs=attrs)
 
-    memberof_config = "# Generated from schema in %s\n" % schemadb_path
-    refint_attributes = ""
-    for i in range (0, len(res)):
+        memberof_config = "# Generated from schema in %s\n" % schemadb_path
+        refint_attributes = ""
+        for i in range (0, len(res)):
             expression = "(&(objectclass=attributeSchema)(linkID=%d))" % (int(res[i]["linkID"][0])+1)
             target = schemadb.searchone(basedn=names.schemadn, 
                                         expression=expression, 
@@ -1252,11 +1255,11 @@ memberof-dangling-error 32
 
 """
 
-    memberof_config += """
+                memberof_config += """
 overlay refint
 refint_attributes""" + refint_attributes + "\n"
     
-    setup_file(setup_path("slapd.conf"), paths.slapdconf,
+        setup_file(setup_path("slapd.conf"), paths.slapdconf,
                    {"DNSDOMAIN": names.dnsdomain,
                     "LDAPDIR": paths.ldapdir,
                     "DOMAINDN": names.domaindn,
@@ -1265,27 +1268,27 @@ refint_attributes""" + refint_attributes + "\n"
                     "LDAPMANAGERDN": names.ldapmanagerdn,
                     "LDAPMANAGERPASS": adminpass,
                     "MEMBEROF_CONFIG": memberof_config})
-    setup_file(setup_path("modules.conf"), paths.modulesconf,
+        setup_file(setup_path("modules.conf"), paths.modulesconf,
                    {"REALM": names.realm})
         
-    setup_db_config(setup_path, os.path.join(paths.ldapdir, os.path.join("db", "user")))
-    setup_db_config(setup_path, os.path.join(paths.ldapdir, os.path.join("db", "config")))
-    setup_db_config(setup_path, os.path.join(paths.ldapdir, os.path.join("db", "schema")))
-    mapping = "schema-map-openldap-2.3"
-    backend_schema = "backend-schema.schema"
-
-    ldapi_uri = "ldapi://" + urllib.quote(os.path.join(paths.private_dir, "ldap", "ldapi"), safe="")
-    if ldap_backend_port is not None:
-        server_port_string = " -h ldap://0.0.0.0:%d" % ldap_backend_port
-    else:
-        server_port_string = ""
-    slapdcommand="Start slapd with:    slapd -f " + paths.ldapdir + "/slapd.conf -h " + ldapi_uri + server_port_string
+        setup_db_config(setup_path, os.path.join(paths.ldapdir, os.path.join("db", "user")))
+        setup_db_config(setup_path, os.path.join(paths.ldapdir, os.path.join("db", "config")))
+        setup_db_config(setup_path, os.path.join(paths.ldapdir, os.path.join("db", "schema")))
+        mapping = "schema-map-openldap-2.3"
+        backend_schema = "backend-schema.schema"
 
-    schema_command = "bin/ad2oLschema --option=convert:target=" + ldap_backend_type + " -I " + setup_path(mapping) + " -H tdb://" + schemadb_path + " -O " + os.path.join(paths.ldapdir, backend_schema)
+        ldapi_uri = "ldapi://" + urllib.quote(os.path.join(paths.private_dir, "ldap", "ldapi"), safe="")
+        if ldap_backend_port is not None:
+            server_port_string = " -h ldap://0.0.0.0:%d" % ldap_backend_port
+        else:
+            server_port_string = ""
+            slapdcommand="Start slapd with:    slapd -f " + paths.ldapdir + "/slapd.conf -h " + ldapi_uri + server_port_string
 
+            
+    schema_command = "bin/ad2oLschema --option=convert:target=" + ldap_backend_type + " -I " + setup_path(mapping) + " -H tdb://" + schemadb_path + " -O " + os.path.join(paths.ldapdir, backend_schema)
+            
     os.system(schema_command)
 
-
     message("Your %s Backend for Samba4 is now configured, and is ready to be started" % ldap_backend_type)
     message("Server Role:         %s" % serverrole)
     message("Hostname:            %s" % names.hostname)
-- 
cgit 


From 44ea6a26fd088f0f8c86817510ebe5a6cddf9158 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Sat, 12 Jul 2008 15:26:42 +1000
Subject: rename sambaPassword -> userPassword.

This attribute is used in a very similar way (virtual attribute
updating the password) in AD on Win2003, so eliminate the difference.

This should not cause a problem for on-disk passwords, as by default
we do not store the plaintext at all.

Andrew Bartlett
(This used to be commit 1cf0d751493b709ef6b2234ec8847a7499f48ab3)
---
 source4/scripting/python/samba/samdb.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/samdb.py b/source4/scripting/python/samba/samdb.py
index 6465f49519..c47cf4a0dc 100644
--- a/source4/scripting/python/samba/samdb.py
+++ b/source4/scripting/python/samba/samdb.py
@@ -112,7 +112,7 @@ userAccountControl: %u
         #  now the real work
         self.add({"dn": user_dn, 
             "sAMAccountName": username,
-            "sambaPassword": password,
+            "userPassword": password,
             "objectClass": "user"})
 
         res = self.search(user_dn, scope=ldb.SCOPE_BASE,
@@ -163,8 +163,8 @@ userAccountControl: %u
         setpw = """
 dn: %s
 changetype: modify
-replace: sambaPassword
-sambaPassword: %s
+replace: userPassword
+userPassword: %s
 """ % (user_dn, password)
 
         self.modify_ldif(setpw)
-- 
cgit 


From a6b842f9634cbeb4075c2bbaf7e49c19104602be Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Tue, 15 Jul 2008 15:15:12 +1000
Subject: Connect to the LDAP backend with SASL credentials.

This reworks our LDAP backend code to move from anonymous access to a
shared-secret SASL-protected connection.  (SASL selects NTLM or
DIGEST-MD5 on my system).

To get this working, we must pre-populate the LDAP backend with a DN
to store ths SASL secret on, and we use back-ldif for this.

This gives us a reasonable basis to deploy a replicated OpenLDAP
backend solution.

Andrew Bartlett
(This used to be commit cd0745253c4a9ec59a035e830e54d74a05b71aaa)
---
 source4/scripting/python/samba/provision.py | 47 +++++++++++++++++++++++------
 1 file changed, 38 insertions(+), 9 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index 504044253e..d0f612c7a8 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -604,6 +604,20 @@ def setup_secretsdb(path, setup_path, session_info, credentials, lp):
     secrets_ldb = Ldb(path, session_info=session_info, credentials=credentials,
                       lp=lp)
     secrets_ldb.load_ldif_file_add(setup_path("secrets.ldif"))
+
+    if credentials.authentication_requested:
+        if credentials.get_bind_dn() is not None:
+            setup_add_ldif(secrets_ldb, setup_path("secrets_simple_ldap.ldif"), {
+                    "LDAPMANAGERDN": credentials.get_bind_dn(),
+                    "LDAPMANAGERPASS_B64": b64encode(credentials.get_password())
+                    })
+        else:
+            setup_add_ldif(secrets_ldb, setup_path("secrets_sasl_ldap.ldif"), {
+                    "LDAPADMINUSER": credentials.get_username(),
+                    "LDAPADMINREALM": credentials.get_realm(),
+                    "LDAPADMINPASS_B64": b64encode(credentials.get_password())
+                    })
+
     return secrets_ldb
 
 
@@ -754,10 +768,10 @@ def setup_samdb(path, setup_path, session_info, credentials, lp,
             domain_oc = "samba4LocalDomain"
 
         setup_add_ldif(samdb, setup_path("provision_basedn.ldif"), {
-            "DOMAINDN": names.domaindn,
-            "ACI": aci,
-            "DOMAIN_OC": domain_oc
-            })
+                "DOMAINDN": names.domaindn,
+                "ACI": aci,
+                "DOMAIN_OC": domain_oc
+                })
 
         message("Modifying DomainDN: " + names.domaindn + "")
         if domainguid is not None:
@@ -1265,15 +1279,30 @@ refint_attributes""" + refint_attributes + "\n"
                     "DOMAINDN": names.domaindn,
                     "CONFIGDN": names.configdn,
                     "SCHEMADN": names.schemadn,
-                    "LDAPMANAGERDN": names.ldapmanagerdn,
-                    "LDAPMANAGERPASS": adminpass,
                     "MEMBEROF_CONFIG": memberof_config})
         setup_file(setup_path("modules.conf"), paths.modulesconf,
                    {"REALM": names.realm})
         
-        setup_db_config(setup_path, os.path.join(paths.ldapdir, os.path.join("db", "user")))
-        setup_db_config(setup_path, os.path.join(paths.ldapdir, os.path.join("db", "config")))
-        setup_db_config(setup_path, os.path.join(paths.ldapdir, os.path.join("db", "schema")))
+        setup_db_config(setup_path, os.path.join(paths.ldapdir, "db", "user"))
+        setup_db_config(setup_path, os.path.join(paths.ldapdir, "db", "config"))
+        setup_db_config(setup_path, os.path.join(paths.ldapdir, "db", "schema"))
+
+        if not os.path.exists(os.path.join(paths.ldapdir, "db", "samba",  "cn=samba")):
+            os.makedirs(os.path.join(paths.ldapdir, "db", "samba",  "cn=samba"))
+
+        setup_file(setup_path("cn=samba.ldif"), 
+                   os.path.join(paths.ldapdir, "db", "samba",  "cn=samba.ldif"),
+                   { "UUID": str(uuid.uuid4()), 
+                     "LDAPTIME": timestring(int(time.time()))} )
+        setup_file(setup_path("cn=samba-admin.ldif"), 
+                              os.path.join(paths.ldapdir, "db", "samba",  "cn=samba", "cn=samba-admin.ldif"),
+                              {"LDAPADMINPASS_B64": b64encode(adminpass),
+                               "UUID": str(uuid.uuid4()), 
+                               "LDAPTIME": timestring(int(time.time()))} )
+
+#"LDAPMANAGERDN": names.ldapmanagerdn,
+                               
+
         mapping = "schema-map-openldap-2.3"
         backend_schema = "backend-schema.schema"
 
-- 
cgit 


From 0f1eea267257eff0d75a702ee0793a86834fb76a Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Tue, 15 Jul 2008 15:46:32 +1000
Subject: Rework provision to handle both simple and SASL binds.

Fedora DS is still setup for simple binds only, at this point.
(it also fails on other issues).

Andrew Bartlett
(This used to be commit b24c572d5a38c1f6906751c2ad2f809e1995b510)
---
 source4/scripting/python/samba/provision.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index d0f612c7a8..f27cc17290 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -1300,9 +1300,6 @@ refint_attributes""" + refint_attributes + "\n"
                                "UUID": str(uuid.uuid4()), 
                                "LDAPTIME": timestring(int(time.time()))} )
 
-#"LDAPMANAGERDN": names.ldapmanagerdn,
-                               
-
         mapping = "schema-map-openldap-2.3"
         backend_schema = "backend-schema.schema"
 
@@ -1323,7 +1320,12 @@ refint_attributes""" + refint_attributes + "\n"
     message("Hostname:            %s" % names.hostname)
     message("DNS Domain:          %s" % names.dnsdomain)
     message("Base DN:             %s" % names.domaindn)
-    message("LDAP admin DN:       %s" % names.ldapmanagerdn)
+
+    if ldap_backend_type == "openldap":
+        message("LDAP admin user:     samba-admin")
+    else:
+        message("LDAP admin DN:       %s" % names.ldapmanagerdn)
+
     message("LDAP admin password: %s" % adminpass)
     message(slapdcommand)
 
-- 
cgit 


From e400b3ec4e7f32406ed8803ed22612033511d99a Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Tue, 15 Jul 2008 18:44:58 +1000
Subject: Fix asking for credentials for non-LDAP provisions. (This used to be
 commit 78416f4840df4f8d1f9cc5e46a48b19c86888050)

---
 source4/scripting/python/samba/provision.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index f27cc17290..6102dc77ff 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -605,7 +605,7 @@ def setup_secretsdb(path, setup_path, session_info, credentials, lp):
                       lp=lp)
     secrets_ldb.load_ldif_file_add(setup_path("secrets.ldif"))
 
-    if credentials.authentication_requested:
+    if credentials is not None and credentials.authentication_requested():
         if credentials.get_bind_dn() is not None:
             setup_add_ldif(secrets_ldb, setup_path("secrets_simple_ldap.ldif"), {
                     "LDAPMANAGERDN": credentials.get_bind_dn(),
-- 
cgit 


From fe9fa62a0529f8c8ebdbfee9b994e3787d4db58f Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Wed, 16 Jul 2008 14:04:24 +1000
Subject: Reorder whitespace in generated slapd.conf

This helps us see the real groupings in the generated memberOf
handling.

Andrew Bartlett
(This used to be commit ec70ebb8310e563324233662f8e779c55fb87514)
---
 source4/scripting/python/samba/provision.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index 6102dc77ff..17e7e0fed0 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -1266,12 +1266,12 @@ memberof-group-oc top
 memberof-member-ad """ + res[i]["lDAPDisplayName"][0] + """
 memberof-memberof-ad """ + target + """
 memberof-dangling-error 32
-
 """
 
-                memberof_config += """
-overlay refint
-refint_attributes""" + refint_attributes + "\n"
+                memberof_config += """overlay refint
+refint_attributes""" + refint_attributes + """
+
+"""
     
         setup_file(setup_path("slapd.conf"), paths.slapdconf,
                    {"DNSDOMAIN": names.dnsdomain,
-- 
cgit 


From cfc2063f230491865edb8f73174e0b12ab4dc158 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Fri, 18 Jul 2008 18:44:07 +1000
Subject: Put the memberof template into a seperate setup/ file.

Set a memberof-dn in a fruitless attempt to fix the ACL problem I'm
having with OpenLDAP

Andrew Bartlett
(This used to be commit 6d6e03834a1a77a8ceba41fbe8c9d49680065ba3)
---
 source4/scripting/python/samba/provision.py | 60 +++++++++++++----------------
 1 file changed, 27 insertions(+), 33 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index 17e7e0fed0..301c6ef728 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -153,6 +153,19 @@ def open_ldb(session_info, credentials, lp, dbname):
                    lp=lp)
 
 
+def read_and_sub_file(file, subst_vars):
+    """Read a file and sub in variables found in it
+    
+    :param file: File to be read (typically from setup directory)
+     param subst_vars: Optional variables to subsitute in the file.
+    """
+    data = open(file, 'r').read()
+    if subst_vars is not None:
+        data = substitute_var(data, subst_vars)
+    check_all_substituted(data)
+    return data
+
+
 def setup_add_ldif(ldb, ldif_path, subst_vars=None):
     """Setup a ldb in the private dir.
     
@@ -162,27 +175,18 @@ def setup_add_ldif(ldb, ldif_path, subst_vars=None):
     """
     assert isinstance(ldif_path, str)
 
-    data = open(ldif_path, 'r').read()
-    if subst_vars is not None:
-        data = substitute_var(data, subst_vars)
-
-    check_all_substituted(data)
-
+    data = read_and_sub_file(ldif_path, subst_vars)
     ldb.add_ldif(data)
 
 
-def setup_modify_ldif(ldb, ldif_path, substvars=None):
+def setup_modify_ldif(ldb, ldif_path, subst_vars=None):
     """Modify a ldb in the private dir.
     
     :param ldb: LDB object.
     :param ldif_path: LDIF file path.
-    :param substvars: Optional dictionary with substitution variables.
+    :param subst_vars: Optional dictionary with substitution variables.
     """
-    data = open(ldif_path, 'r').read()
-    if substvars is not None:
-        data = substitute_var(data, substvars)
-
-    check_all_substituted(data)
+    data = read_and_sub_file(ldif_path, subst_vars)
 
     ldb.modify_ldif(data)
 
@@ -206,23 +210,19 @@ def setup_ldb(ldb, ldif_path, subst_vars):
     ldb.transaction_commit()
 
 
-def setup_file(template, fname, substvars):
+def setup_file(template, fname, subst_vars):
     """Setup a file in the private dir.
 
     :param template: Path of the template file.
     :param fname: Path of the file to create.
-    :param substvars: Substitution variables.
+    :param subst_vars: Substitution variables.
     """
     f = fname
 
     if os.path.exists(f):
         os.unlink(f)
 
-    data = open(template, 'r').read()
-    if substvars:
-        data = substitute_var(data, substvars)
-    check_all_substituted(data)
-
+    data = read_and_sub_file(template, subst_vars)
     open(f, 'w').write(data)
 
 
@@ -1259,19 +1259,13 @@ def provision_backend(setup_dir=None, message=None,
                                         scope=SCOPE_SUBTREE)
             if target is not None:
                 refint_attributes = refint_attributes + " " + target + " " + res[i]["lDAPDisplayName"][0]
-                memberof_config += """overlay memberof
-memberof-dangling error
-memberof-refint TRUE
-memberof-group-oc top
-memberof-member-ad """ + res[i]["lDAPDisplayName"][0] + """
-memberof-memberof-ad """ + target + """
-memberof-dangling-error 32
-"""
-
-                memberof_config += """overlay refint
-refint_attributes""" + refint_attributes + """
-
-"""
+            
+                memberof_config += read_and_sub_file(setup_path("memberof.conf"),
+                                                     { "MEMBER_ATTR" : str(res[i]["lDAPDisplayName"][0]),
+                                                       "MEMBEROF_ATTR" : str(target) })
+
+        memberof_config += """overlay refint
+refint_attributes""" + refint_attributes
     
         setup_file(setup_path("slapd.conf"), paths.slapdconf,
                    {"DNSDOMAIN": names.dnsdomain,
-- 
cgit 


From 3408a2d18fa61e2a7e3b3e05cc3c454e5e15f2ce Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Fri, 18 Jul 2008 18:58:56 +1000
Subject: Make a seperate template for the refint configuration too (This used
 to be commit d2a527acc5ee6fe9b943657dc9c3ace920b2d619)

---
 source4/scripting/python/samba/provision.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index 301c6ef728..6eb47c8595 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -1264,8 +1264,8 @@ def provision_backend(setup_dir=None, message=None,
                                                      { "MEMBER_ATTR" : str(res[i]["lDAPDisplayName"][0]),
                                                        "MEMBEROF_ATTR" : str(target) })
 
-        memberof_config += """overlay refint
-refint_attributes""" + refint_attributes
+        refint_config = read_and_sub_file(setup_path("refint.conf"),
+                                            { "LINK_ATTRS" : refint_attributes})
     
         setup_file(setup_path("slapd.conf"), paths.slapdconf,
                    {"DNSDOMAIN": names.dnsdomain,
@@ -1273,7 +1273,8 @@ refint_attributes""" + refint_attributes
                     "DOMAINDN": names.domaindn,
                     "CONFIGDN": names.configdn,
                     "SCHEMADN": names.schemadn,
-                    "MEMBEROF_CONFIG": memberof_config})
+                    "MEMBEROF_CONFIG": memberof_config,
+                    "REFINT_CONFIG": refint_config})
         setup_file(setup_path("modules.conf"), paths.modulesconf,
                    {"REALM": names.realm})
         
-- 
cgit 


From fb3e663678be412df4668b05e76480908da2c080 Mon Sep 17 00:00:00 2001
From: Matthias Dieter Wallnöfer <mwallnoefer@yahoo.de>
Date: Tue, 22 Jul 2008 11:06:47 +1000
Subject: Improve DNS and Group poicy configurations.

 - fixes bug #4813 (simplify DNS setup)
  - This reworks the named.conf to be a fully fledged include
  - This also moves the documentation into named.txt
 - improves bug #4900 (Group policy support in Samba)
   - by creating an empty GPT.INI
 - fixes bug #5582 (DNS: Enhanced zone file)
   - This is now closer to the zone file AD creates

committed by Andrew Bartlett
(This used to be commit 74d684f6b329d7dd573cdc55e16bb8e629474b02)
---
 source4/scripting/python/samba/provision.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index 6eb47c8595..40b61a0ac4 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -1043,6 +1043,7 @@ def provision(setup_dir, message, session_info,
         policy_path = os.path.join(paths.sysvol, names.dnsdomain, "Policies", 
                                    "{" + policyguid + "}")
         os.makedirs(policy_path, 0755)
+        open(os.path.join(policy_path, "GPT.INI"), 'w').write("")
         os.makedirs(os.path.join(policy_path, "Machine"), 0755)
         os.makedirs(os.path.join(policy_path, "User"), 0755)
         if not os.path.isdir(paths.netlogon):
@@ -1081,12 +1082,11 @@ def provision(setup_dir, message, session_info,
                              hostip6=hostip6, hostname=names.hostname,
                              dnspass=dnspass, realm=names.realm,
                              domainguid=domainguid, hostguid=hostguid)
-            message("Please install the zone located in %s into your DNS server" % paths.dns)
 
             create_named_conf(paths.namedconf, setup_path, realm=names.realm,
                               dnsdomain=names.dnsdomain, private_dir=paths.private_dir,
                               keytab_name=paths.dns_keytab)
-            message("See %s for example configuration statements for secure GSS-TSIG updates" % paths.namedconf)
+            message("See %s for an example configuration include file for BIND" % paths.namedconf)
 
             create_krb5_conf(paths.krb5conf, setup_path, dnsdomain=names.dnsdomain,
                              hostname=names.hostname, realm=names.realm)
@@ -1394,6 +1394,7 @@ def create_named_conf(path, setup_path, realm, dnsdomain,
             "REALM_WC": "*." + ".".join(realm.split(".")[1:]),
             "DNS_KEYTAB": keytab_name,
             "DNS_KEYTAB_ABS": os.path.join(private_dir, keytab_name),
+            "PRIVATE_DIR": private_dir,
         })
 
 def create_krb5_conf(path, setup_path, dnsdomain, hostname, realm):
-- 
cgit 


From c9c296b6bbe178502e8aded8fa5e38a0f338ee18 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Tue, 22 Jul 2008 11:09:18 +1000
Subject: Install'named.txt' to private/ as documentation.

This document is much more use when subbed with all the right things.

Andrew Bartlett
(This used to be commit 136a85599815670c807f212d7d4003ec53a13729)
---
 source4/scripting/python/samba/provision.py | 28 ++++++++++++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index 40b61a0ac4..4b310381ef 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -244,6 +244,7 @@ def provision_paths_from_lp(lp, dnsdomain):
     paths.templates = os.path.join(paths.private_dir, "templates.ldb")
     paths.dns = os.path.join(paths.private_dir, dnsdomain + ".zone")
     paths.namedconf = os.path.join(paths.private_dir, "named.conf")
+    paths.namedtxt = os.path.join(paths.private_dir, "named.txt")
     paths.krb5conf = os.path.join(paths.private_dir, "krb5.conf")
     paths.winsdb = os.path.join(paths.private_dir, "wins.ldb")
     paths.s4_ldapi_path = os.path.join(paths.private_dir, "ldapi")
@@ -1084,9 +1085,13 @@ def provision(setup_dir, message, session_info,
                              domainguid=domainguid, hostguid=hostguid)
 
             create_named_conf(paths.namedconf, setup_path, realm=names.realm,
+                              dnsdomain=names.dnsdomain, private_dir=paths.private_dir)
+
+            create_named_txt(paths.namedtxt, setup_path, realm=names.realm,
                               dnsdomain=names.dnsdomain, private_dir=paths.private_dir,
                               keytab_name=paths.dns_keytab)
             message("See %s for an example configuration include file for BIND" % paths.namedconf)
+            message("and %s for further documentation required for secure DNS updates" % paths.namedtxt)
 
             create_krb5_conf(paths.krb5conf, setup_path, dnsdomain=names.dnsdomain,
                              hostname=names.hostname, realm=names.realm)
@@ -1376,7 +1381,7 @@ def create_zone_file(path, setup_path, dnsdomain, domaindn,
 
 
 def create_named_conf(path, setup_path, realm, dnsdomain,
-                      private_dir, keytab_name):
+                      private_dir):
     """Write out a file containing zone statements suitable for inclusion in a
     named.conf file (including GSS-TSIG configuration).
     
@@ -1392,9 +1397,28 @@ def create_named_conf(path, setup_path, realm, dnsdomain,
             "DNSDOMAIN": dnsdomain,
             "REALM": realm,
             "REALM_WC": "*." + ".".join(realm.split(".")[1:]),
+            "PRIVATE_DIR": private_dir
+            })
+
+def create_named_txt(path, setup_path, realm, dnsdomain,
+                      private_dir, keytab_name):
+    """Write out a file containing zone statements suitable for inclusion in a
+    named.conf file (including GSS-TSIG configuration).
+    
+    :param path: Path of the new named.conf file.
+    :param setup_path: Setup path function.
+    :param realm: Realm name
+    :param dnsdomain: DNS Domain name
+    :param private_dir: Path to private directory
+    :param keytab_name: File name of DNS keytab file
+    """
+
+    setup_file(setup_path("named.txt"), path, {
+            "DNSDOMAIN": dnsdomain,
+            "REALM": realm,
             "DNS_KEYTAB": keytab_name,
             "DNS_KEYTAB_ABS": os.path.join(private_dir, keytab_name),
-            "PRIVATE_DIR": private_dir,
+            "PRIVATE_DIR": private_dir
         })
 
 def create_krb5_conf(path, setup_path, dnsdomain, hostname, realm):
-- 
cgit 


From 11798902dc51cd9eea3b7e8a0c94d0c0c08ed828 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Fri, 25 Jul 2008 08:45:16 +1000
Subject: Complain if we are told to use an ldap backend, without the type
 (This used to be commit e9c3c9ad8289ee48efa998ab6b486250dcd40b52)

---
 source4/scripting/python/samba/provision.py | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index 6eb47c8595..67f8cf7cc2 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -503,6 +503,8 @@ def setup_samdb_partitions(samdb_path, setup_path, message, lp, session_info,
         backend_modules = ["normalise", "entryuuid", "paged_searches"]
         # OpenLDAP handles subtree renames, so we don't want to do any of these things
         tdb_modules_list = None
+    elif ldap_backend is not None:
+        raise "LDAP Backend specified, but LDAP Backend Type not specified"
     elif serverrole == "domain controller":
         backend_modules = ["repl_meta_data"]
     else:
-- 
cgit 


From 998b0fef1199b3c24939878d202f5e4b71e5b742 Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vl@samba.org>
Date: Mon, 19 May 2008 23:06:42 +0200
Subject: Add "mymachinepw" to fetch our machine password out of secrets.ldb
 (This used to be commit 4fbe16deb0e06e145f643568a699b80b431d4f42)

---
 source4/scripting/bin/mymachinepw | 45 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100755 source4/scripting/bin/mymachinepw

(limited to 'source4/scripting')

diff --git a/source4/scripting/bin/mymachinepw b/source4/scripting/bin/mymachinepw
new file mode 100755
index 0000000000..d489dc4693
--- /dev/null
+++ b/source4/scripting/bin/mymachinepw
@@ -0,0 +1,45 @@
+#!/usr/bin/env python
+
+# Unix SMB/CIFS implementation.
+# Copyright (C) Volker Lendecke 2008
+#
+# Extract our own machine pw from secrets.ldb
+#
+# 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/>.
+#
+
+import samba.param as param, ldb, sys, getopt
+
+optlist, args = getopt.getopt(sys.argv[1:], "s:")
+
+conf = param.LoadParm()
+loaded = False
+
+for o, v in optlist:
+    if o == "-s":
+        if not conf.load(v):
+            raise(v + " not found")
+        loaded = True
+
+if not loaded:
+    conf.load_default()
+
+secrets = ldb.Ldb()
+secrets.connect(conf.get("private dir") + "/secrets.ldb")
+
+search = "(&(objectclass=primaryDomain)(samaccountname=" + \
+	conf.get("netbios name") + "$))"
+
+msg = secrets.search(expression=search, attrs=['secret'])
+print(msg[0]['secret'][0])
-- 
cgit 


From 934cfb98809ff0200170ab1fc206af1312226cb0 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Sat, 26 Jul 2008 20:38:20 +0200
Subject: mamachinepw: add better error handling

metze
(This used to be commit 7ac424137f62ceacf44e477f4e3805267013005b)
---
 source4/scripting/bin/mymachinepw | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/bin/mymachinepw b/source4/scripting/bin/mymachinepw
index d489dc4693..49a4245a3a 100755
--- a/source4/scripting/bin/mymachinepw
+++ b/source4/scripting/bin/mymachinepw
@@ -2,6 +2,7 @@
 
 # Unix SMB/CIFS implementation.
 # Copyright (C) Volker Lendecke 2008
+# Copyright (C) Stefan Metzmacher 2008
 #
 # Extract our own machine pw from secrets.ldb
 #
@@ -29,17 +30,32 @@ loaded = False
 for o, v in optlist:
     if o == "-s":
         if not conf.load(v):
-            raise(v + " not found")
+            print(v + " not found")
+            exit(1)
         loaded = True
 
 if not loaded:
     conf.load_default()
 
+path=conf.get("private dir") + "/secrets.ldb"
+netbios=conf.get("netbios name")
+
 secrets = ldb.Ldb()
-secrets.connect(conf.get("private dir") + "/secrets.ldb")
+secrets.connect(path)
 
 search = "(&(objectclass=primaryDomain)(samaccountname=" + \
-	conf.get("netbios name") + "$))"
+	  netbios + "$))"
 
 msg = secrets.search(expression=search, attrs=['secret'])
-print(msg[0]['secret'][0])
+
+if not msg:
+    error =  "Error:\n"
+    error += "Password for host[" + netbios + "] not found in path[" + path + "].\n"
+    error += "You may want to pass the smb.conf location via the -s option."
+    print error
+    exit(1)
+
+password=msg[0]['secret'][0];
+
+print(password)
+exit(0)
-- 
cgit 


From cff30c6da666abcb4ad8c587defa63883ce86c23 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Mon, 28 Jul 2008 08:04:15 +1000
Subject: Remove unused function and make sensitive directories private. (This
 used to be commit e23333d16397606d38e90684d2d916b5b967cde4)

---
 source4/scripting/python/samba/provision.py | 24 ++----------------------
 1 file changed, 2 insertions(+), 22 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index 0119f40c7f..068fe5ad9b 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -133,26 +133,6 @@ findnss_uid = lambda names: findnss(pwd.getpwnam, names)[2]
 findnss_gid = lambda names: findnss(grp.getgrnam, names)[2]
 
 
-def open_ldb(session_info, credentials, lp, dbname):
-    """Open a LDB, thrashing it if it is corrupt.
-
-    :param session_info: auth session information
-    :param credentials: credentials
-    :param lp: Loadparm context
-    :param dbname: Path of the database to open.
-    :return: a Ldb object
-    """
-    assert session_info is not None
-    try:
-        return Ldb(dbname, session_info=session_info, credentials=credentials, 
-                   lp=lp)
-    except LdbError, e:
-        print e
-        os.unlink(dbname)
-        return Ldb(dbname, session_info=session_info, credentials=credentials,
-                   lp=lp)
-
-
 def read_and_sub_file(file, subst_vars):
     """Read a file and sub in variables found in it
     
@@ -1195,7 +1175,7 @@ def provision_backend(setup_dir=None, message=None,
     paths = provision_paths_from_lp(lp, names.dnsdomain)
 
     if not os.path.isdir(paths.ldapdir):
-        os.makedirs(paths.ldapdir)
+        os.makedirs(paths.ldapdir, 0700)
     schemadb_path = os.path.join(paths.ldapdir, "schema-tmp.ldb")
     try:
         os.unlink(schemadb_path)
@@ -1290,7 +1270,7 @@ def provision_backend(setup_dir=None, message=None,
         setup_db_config(setup_path, os.path.join(paths.ldapdir, "db", "schema"))
 
         if not os.path.exists(os.path.join(paths.ldapdir, "db", "samba",  "cn=samba")):
-            os.makedirs(os.path.join(paths.ldapdir, "db", "samba",  "cn=samba"))
+            os.makedirs(os.path.join(paths.ldapdir, "db", "samba",  "cn=samba"), 0700)
 
         setup_file(setup_path("cn=samba.ldif"), 
                    os.path.join(paths.ldapdir, "db", "samba",  "cn=samba.ldif"),
-- 
cgit 


From 45d60f5bd9be53ae4d4399664500709f1b2801a5 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Mon, 28 Jul 2008 20:18:17 +1000
Subject: Always print the slapd startup command (This used to be commit
 b1d05e7d14c65133e8ab0ff9d41a26fa7e3d41d3)

---
 source4/scripting/python/samba/provision.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index 068fe5ad9b..8437909da1 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -1290,7 +1290,8 @@ def provision_backend(setup_dir=None, message=None,
             server_port_string = " -h ldap://0.0.0.0:%d" % ldap_backend_port
         else:
             server_port_string = ""
-            slapdcommand="Start slapd with:    slapd -f " + paths.ldapdir + "/slapd.conf -h " + ldapi_uri + server_port_string
+
+        slapdcommand="Start slapd with:    slapd -f " + paths.ldapdir + "/slapd.conf -h " + ldapi_uri + server_port_string
 
             
     schema_command = "bin/ad2oLschema --option=convert:target=" + ldap_backend_type + " -I " + setup_path(mapping) + " -H tdb://" + schemadb_path + " -O " + os.path.join(paths.ldapdir, backend_schema)
-- 
cgit 


From 08795db6d6af69442dfbfa7d39532e898d4c0ea6 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Mon, 28 Jul 2008 20:26:14 +1000
Subject: Make it even clearer what to do next in the LDAP backend setup (This
 used to be commit bace931ad674b5071d53bf9c99c383f1d8957e1b)

---
 source4/scripting/python/samba/provision.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index 8437909da1..13329e8b10 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -1232,6 +1232,8 @@ def provision_backend(setup_dir=None, message=None,
         
         slapdcommand="Initailise Fedora DS with: setup-ds.pl --file=%s" % paths.fedoradsinf
        
+        ldapuser = "--simple-bind-dn=" + names.ldapmanagerdn
+
     elif ldap_backend_type == "openldap":
         attrs = ["linkID", "lDAPDisplayName"]
         res = schemadb.search(expression="(&(&(linkID=*)(!(linkID:1.2.840.113556.1.4.803:=1)))(objectclass=attributeSchema))", base=names.schemadn, scope=SCOPE_SUBTREE, attrs=attrs)
@@ -1293,6 +1295,8 @@ def provision_backend(setup_dir=None, message=None,
 
         slapdcommand="Start slapd with:    slapd -f " + paths.ldapdir + "/slapd.conf -h " + ldapi_uri + server_port_string
 
+        ldapuser = "--username=samba-admin"
+
             
     schema_command = "bin/ad2oLschema --option=convert:target=" + ldap_backend_type + " -I " + setup_path(mapping) + " -H tdb://" + schemadb_path + " -O " + os.path.join(paths.ldapdir, backend_schema)
             
@@ -1311,7 +1315,7 @@ def provision_backend(setup_dir=None, message=None,
 
     message("LDAP admin password: %s" % adminpass)
     message(slapdcommand)
-
+    message("Run provision with:  --ldap-backend=ldapi --ldap-backend-type=" + ldap_backend_type + " --password=" + adminpass + " " + ldapuser)
 
 def create_phpldapadmin_config(path, setup_path, ldapi_uri):
     """Create a PHP LDAP admin configuration file.
-- 
cgit 


From e80115deb9f57d827f915b57b52961f1e2df682e Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Mon, 28 Jul 2008 20:51:02 +1000
Subject: We don't use EXTENSIBLEOBJECT any more. (This used to be commit
 4b137085c8b89773d4639372bbffd516a41dfc8f)

---
 source4/scripting/python/samba/provision.py | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index 13329e8b10..441d662b23 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -779,7 +779,6 @@ def setup_samdb(path, setup_path, session_info, credentials, lp,
         setup_add_ldif(samdb, setup_path("provision_configuration_basedn.ldif"), {
             "CONFIGDN": names.configdn, 
             "ACI": aci,
-            "EXTENSIBLEOBJECT": "# no objectClass: extensibleObject for local ldb",
             })
         message("Modifying configuration container")
         setup_modify_ldif(samdb, setup_path("provision_configuration_basedn_modify.ldif"), {
@@ -791,7 +790,6 @@ def setup_samdb(path, setup_path, session_info, credentials, lp,
         setup_add_ldif(samdb, setup_path("provision_schema_basedn.ldif"), {
             "SCHEMADN": names.schemadn,
             "ACI": aci,
-            "EXTENSIBLEOBJECT": "# no objectClass: extensibleObject for local ldb"
             })
         message("Modifying schema container")
 
@@ -1189,7 +1187,6 @@ def provision_backend(setup_dir=None, message=None,
     setup_add_ldif(schemadb, setup_path("provision_schema_basedn.ldif"), 
                    {"SCHEMADN": names.schemadn,
                     "ACI": "#",
-                    "EXTENSIBLEOBJECT": "# no objectClass: extensibleObject for local ldb"
                     })
     setup_modify_ldif(schemadb, 
                       setup_path("provision_schema_basedn_modify.ldif"), \
-- 
cgit 


From ee505f36dddfe04a10fdc8fd8a8bd40d5fbfa218 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Wed, 30 Jul 2008 13:29:29 +0200
Subject: Be more pythonic. (This used to be commit
 20d40e31942f96ca9d077e57c6dd4c1d38f79b4b)

---
 source4/scripting/bin/mymachinepw | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/bin/mymachinepw b/source4/scripting/bin/mymachinepw
index 49a4245a3a..3a843b5947 100755
--- a/source4/scripting/bin/mymachinepw
+++ b/source4/scripting/bin/mymachinepw
@@ -40,8 +40,7 @@ if not loaded:
 path=conf.get("private dir") + "/secrets.ldb"
 netbios=conf.get("netbios name")
 
-secrets = ldb.Ldb()
-secrets.connect(path)
+secrets = ldb.Ldb(path)
 
 search = "(&(objectclass=primaryDomain)(samaccountname=" + \
 	  netbios + "$))"
@@ -49,13 +48,12 @@ search = "(&(objectclass=primaryDomain)(samaccountname=" + \
 msg = secrets.search(expression=search, attrs=['secret'])
 
 if not msg:
-    error =  "Error:\n"
-    error += "Password for host[" + netbios + "] not found in path[" + path + "].\n"
-    error += "You may want to pass the smb.conf location via the -s option."
-    print error
+    print "Error:"
+    print "Password for host[%s] not found in path[%s]." % (netbios, path)
+    print "You may want to pass the smb.conf location via the -s option."
     exit(1)
 
-password=msg[0]['secret'][0];
+password=msg[0]['secret'][0]
 
 print(password)
 exit(0)
-- 
cgit 


From 3573420d7d108d796e0b424c131061dc74c23033 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Fri, 1 Aug 2008 20:17:29 +0200
Subject: Fix some forgotten substitute variables in provision, add check to
 prevent this sort of regression in the future. (This used to be commit
 a461118f3b668779f907c4d77cebe1e76fa4e39f)

---
 source4/scripting/python/samba/provision.py | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index 0119f40c7f..33aeff2008 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -1453,6 +1453,7 @@ def load_schema(setup_path, samdb, schemadn, netbiosname, configdn, sitename):
     schema_data = open(setup_path("schema.ldif"), 'r').read()
     schema_data += open(setup_path("schema_samba4.ldif"), 'r').read()
     schema_data = substitute_var(schema_data, {"SCHEMADN": schemadn})
+    check_all_substituted(schema_data)
     prefixmap = open(setup_path("prefixMap.txt"), 'r').read()
     prefixmap = b64encode(prefixmap)
 
@@ -1464,5 +1465,6 @@ def load_schema(setup_path, samdb, schemadn, netbiosname, configdn, sitename):
                     "DEFAULTSITE":sitename,
                     "PREFIXMAP_B64":prefixmap
     })
+    check_all_substituted(head_data)
     samdb.attach_schema_from_ldif(head_data, schema_data)
 
-- 
cgit 


From 3b4ff07ded89703b2a58ae2c9ca6f0ea82bb5a52 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Fri, 1 Aug 2008 20:47:03 +0200
Subject: Actually fix missing substitution variables. (This used to be commit
 783412ecb27d646b171993da0ac2f11a821901d3)

---
 source4/scripting/python/samba/provision.py | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index 6b1fd33b9f..6dd9f3b8bd 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -739,7 +739,8 @@ def setup_samdb(path, setup_path, session_info, credentials, lp,
         samdb.set_invocation_id(invocationid)
 
     load_schema(setup_path, samdb, names.schemadn, names.netbiosname, 
-                names.configdn, names.sitename)
+                names.configdn, names.sitename, names.serverdn,
+                names.hostname)
 
     samdb.transaction_start()
         
@@ -1423,7 +1424,8 @@ def create_krb5_conf(path, setup_path, dnsdomain, hostname, realm):
         })
 
 
-def load_schema(setup_path, samdb, schemadn, netbiosname, configdn, sitename):
+def load_schema(setup_path, samdb, schemadn, netbiosname, configdn, sitename,
+                serverdn, servername):
     """Load schema for the SamDB.
     
     :param samdb: Load a schema into a SamDB.
@@ -1431,6 +1433,8 @@ def load_schema(setup_path, samdb, schemadn, netbiosname, configdn, sitename):
     :param schemadn: DN of the schema
     :param netbiosname: NetBIOS name of the host.
     :param configdn: DN of the configuration
+    :param serverdn: DN of the server
+    :param servername: Host name of the server
     """
     schema_data = open(setup_path("schema.ldif"), 'r').read()
     schema_data += open(setup_path("schema_samba4.ldif"), 'r').read()
@@ -1444,8 +1448,10 @@ def load_schema(setup_path, samdb, schemadn, netbiosname, configdn, sitename):
                     "SCHEMADN": schemadn,
                     "NETBIOSNAME": netbiosname,
                     "CONFIGDN": configdn,
-                    "DEFAULTSITE":sitename,
-                    "PREFIXMAP_B64":prefixmap
+                    "DEFAULTSITE": sitename,
+                    "PREFIXMAP_B64": prefixmap,
+                    "SERVERDN": serverdn,
+                    "SERVERNAME": servername,
     })
     check_all_substituted(head_data)
     samdb.attach_schema_from_ldif(head_data, schema_data)
-- 
cgit 


From fff006bd84fc3fd1d9fdd22e3c20110285b2c144 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Fri, 1 Aug 2008 20:47:22 +0200
Subject: Move domain DN determination out of newuser function. (This used to
 be commit cbac27e6faa99ebaa3e6d653017c968db836560a)

---
 source4/scripting/python/samba/samdb.py | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/samdb.py b/source4/scripting/python/samba/samdb.py
index c47cf4a0dc..c7d93d6aff 100644
--- a/source4/scripting/python/samba/samdb.py
+++ b/source4/scripting/python/samba/samdb.py
@@ -86,6 +86,14 @@ userAccountControl: %u
 """ % (user_dn, userAccountControl)
         self.modify_ldif(mod)
 
+    def domain_dn(self):
+        # find the DNs for the domain and the domain users group
+        res = self.search("", scope=ldb.SCOPE_BASE, 
+                          expression="(defaultNamingContext=*)", 
+                          attrs=["defaultNamingContext"])
+        assert(len(res) == 1 and res[0]["defaultNamingContext"] is not None)
+        return res[0]["defaultNamingContext"][0]
+
     def newuser(self, username, unixname, password):
         """add a new user record.
         
@@ -96,12 +104,7 @@ userAccountControl: %u
         # connect to the sam 
         self.transaction_start()
 
-        # find the DNs for the domain and the domain users group
-        res = self.search("", scope=ldb.SCOPE_BASE, 
-                          expression="(defaultNamingContext=*)", 
-                          attrs=["defaultNamingContext"])
-        assert(len(res) == 1 and res[0]["defaultNamingContext"] is not None)
-        domain_dn = res[0]["defaultNamingContext"][0]
+        domain_dn = self.domain_dn()
         assert(domain_dn is not None)
         user_dn = "CN=%s,CN=Users,%s" % (username, domain_dn)
 
-- 
cgit 


From 1c94f3e95da5b520ee631670a30f96e487f12ac8 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Fri, 1 Aug 2008 21:00:09 +0200
Subject: Use new style python classes. (This used to be commit
 2a39aae0cef310a79427feb1b85f6794ea36849a)

---
 source4/scripting/python/samba/provision.py             |  8 +++++---
 source4/scripting/python/samba/samba3.py                | 14 ++++++++------
 source4/scripting/python/samba/samr.py                  |  8 +++++++-
 source4/scripting/python/samba/tests/dcerpc/bare.py     |  1 +
 source4/scripting/python/samba/tests/dcerpc/registry.py |  1 +
 source4/scripting/python/samba/tests/dcerpc/rpcecho.py  |  2 ++
 source4/scripting/python/samba/tests/provision.py       |  2 +-
 source4/scripting/python/samba/tests/samba3.py          |  1 +
 source4/scripting/python/subunit/__init__.py            |  2 +-
 9 files changed, 27 insertions(+), 12 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index 6dd9f3b8bd..4f7fbfc6e6 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -53,7 +53,7 @@ class InvalidNetbiosName(Exception):
         super(InvalidNetbiosName, self).__init__("The name '%r' is not a valid NetBIOS name" % name)
 
 
-class ProvisionPaths:
+class ProvisionPaths(object):
     def __init__(self):
         self.shareconf = None
         self.hklm = None
@@ -77,7 +77,8 @@ class ProvisionPaths:
         self.fedoradsinf = None
         self.fedoradspartitions = None
  
-class ProvisionNames:
+
+class ProvisionNames(object):
     def __init__(self):
         self.rootdn = None
         self.domaindn = None
@@ -92,7 +93,8 @@ class ProvisionNames:
         self.sitename = None
         self.smbconf = None
     
-class ProvisionResult:
+
+class ProvisionResult(object):
     def __init__(self):
         self.paths = None
         self.domaindn = None
diff --git a/source4/scripting/python/samba/samba3.py b/source4/scripting/python/samba/samba3.py
index c1340b7760..0e0c29dac8 100644
--- a/source4/scripting/python/samba/samba3.py
+++ b/source4/scripting/python/samba/samba3.py
@@ -308,7 +308,7 @@ class ShareInfoDatabase(TdbDatabase):
         return secdesc
 
 
-class Shares:
+class Shares(object):
     """Container for share objects."""
     def __init__(self, lp, shareinfo):
         self.lp = lp
@@ -371,7 +371,7 @@ def decode_acb(text):
     return ret
 
 
-class SAMUser:
+class SAMUser(object):
     """Samba 3 SAM User.
     
     :note: Unknown or unset fields are set to None.
@@ -421,7 +421,8 @@ class SAMUser:
             return False
         return self.__dict__ == other.__dict__
 
-class SmbpasswdFile:
+
+class SmbpasswdFile(object):
     """Samba 3 smbpasswd file reader."""
     def __init__(self, file):
         self.users = {}
@@ -482,7 +483,7 @@ TDBSAM_FORMAT_STRING_V2 = "dddddddBBBBBBBBBBBBddBBBwwdBwwd"
 TDBSAM_USER_PREFIX = "USER_"
 
 
-class LdapSam:
+class LdapSam(object):
     """Samba 3 LDAP passdb backend reader."""
     def __init__(self, url):
         self.ldap_url = ldap_url
@@ -605,7 +606,7 @@ def shellsplit(text):
     return ret
 
 
-class WinsDatabase:
+class WinsDatabase(object):
     """Samba 3 WINS database reader."""
     def __init__(self, file):
         self.entries = {}
@@ -643,7 +644,8 @@ class WinsDatabase:
     def close(self): # for consistency
         pass
 
-class Samba3:
+
+class Samba3(object):
     """Samba 3 configuration and state data reader."""
     def __init__(self, libdir, smbconfpath):
         """Open the configuration and data for a Samba 3 installation.
diff --git a/source4/scripting/python/samba/samr.py b/source4/scripting/python/samba/samr.py
index 314f78b8ad..62a7c6eb3d 100644
--- a/source4/scripting/python/samba/samr.py
+++ b/source4/scripting/python/samba/samr.py
@@ -97,7 +97,8 @@ def call_fn(fn, pipe, args):
 
     return result;
    
-class SamrHandle:
+
+class SamrHandle(object):
 
     def __init__(self, pipe, handle):
 
@@ -137,6 +138,7 @@ class SamrHandle:
 
         call_fn(dcerpc.dcerpc_samr_SetSecurity, self.pipe, r)
         
+
 class ConnectHandle(SamrHandle):
 
     def EnumDomains(self):
@@ -212,6 +214,7 @@ class ConnectHandle(SamrHandle):
 
         call_fn(dcerpc.dcerpc_samr_SetBootKeyInformation, self.pipe, r)
 
+
 class DomainHandle(SamrHandle):
 
     def QueryDomainInfo(self, level = 2):
@@ -517,6 +520,7 @@ class DomainHandle(SamrHandle):
 
         call_fn(dcerpc.dcerpc_samr_TestPrivateFunctionsDomain, self.pipe, r)
 
+
 class UserHandle(SamrHandle):
 
     def DeleteUser(self):
@@ -576,6 +580,7 @@ class UserHandle(SamrHandle):
 
         call_fn(dcerpc.dcerpc_samr_TestPrivateFunctionsUser, self.pipe, r)
             
+
 class GroupHandle(SamrHandle):
 
     def QueryGroupInfo(self, level):
@@ -608,6 +613,7 @@ class GroupHandle(SamrHandle):
                  dcerpc.uint32_array_getitem(r.data_out.rids.unknown, x))
                 for x in range(r.data_out.rids.count)]
     
+
 class AliasHandle(SamrHandle):
 
     def DeleteDomAlias(self):
diff --git a/source4/scripting/python/samba/tests/dcerpc/bare.py b/source4/scripting/python/samba/tests/dcerpc/bare.py
index fae699a249..cd939b8098 100644
--- a/source4/scripting/python/samba/tests/dcerpc/bare.py
+++ b/source4/scripting/python/samba/tests/dcerpc/bare.py
@@ -22,6 +22,7 @@ from samba.dcerpc import ClientConnection
 from unittest import TestCase
 from samba.tests import cmdline_loadparm
 
+
 class BareTestCase(TestCase):
     def test_bare(self):
         # Connect to the echo pipe
diff --git a/source4/scripting/python/samba/tests/dcerpc/registry.py b/source4/scripting/python/samba/tests/dcerpc/registry.py
index 81133ff641..526b2340cc 100644
--- a/source4/scripting/python/samba/tests/dcerpc/registry.py
+++ b/source4/scripting/python/samba/tests/dcerpc/registry.py
@@ -21,6 +21,7 @@ from samba.dcerpc import winreg
 import unittest
 from samba.tests import RpcInterfaceTestCase
 
+
 class WinregTests(RpcInterfaceTestCase):
     def setUp(self):
         self.conn = winreg.winreg("ncalrpc:", self.get_loadparm(), 
diff --git a/source4/scripting/python/samba/tests/dcerpc/rpcecho.py b/source4/scripting/python/samba/tests/dcerpc/rpcecho.py
index 96bb3923a6..12638e2397 100644
--- a/source4/scripting/python/samba/tests/dcerpc/rpcecho.py
+++ b/source4/scripting/python/samba/tests/dcerpc/rpcecho.py
@@ -22,6 +22,7 @@ from samba.ndr import ndr_pack, ndr_unpack
 import unittest
 from samba.tests import RpcInterfaceTestCase
 
+
 class RpcEchoTests(RpcInterfaceTestCase):
     def setUp(self):
         self.conn = echo.rpcecho("ncalrpc:", self.get_loadparm())
@@ -56,6 +57,7 @@ class RpcEchoTests(RpcInterfaceTestCase):
     def test_server_name(self):
         self.assertEquals(None, self.conn.server_name)
 
+
 class NdrEchoTests(unittest.TestCase):
     def test_info1_push(self):
         x = echo.info1()
diff --git a/source4/scripting/python/samba/tests/provision.py b/source4/scripting/python/samba/tests/provision.py
index 76c10145f0..352357f694 100644
--- a/source4/scripting/python/samba/tests/provision.py
+++ b/source4/scripting/python/samba/tests/provision.py
@@ -87,7 +87,7 @@ class FindNssTests(unittest.TestCase):
         self.assertEquals("ha", findnss(x, ["bloe", "bla"]))
 
 
-class Disabled:
+class Disabled(object):
     def test_setup_templatesdb(self):
         raise NotImplementedError(self.test_setup_templatesdb)
 
diff --git a/source4/scripting/python/samba/tests/samba3.py b/source4/scripting/python/samba/tests/samba3.py
index 175aa90497..1755cbdcf0 100644
--- a/source4/scripting/python/samba/tests/samba3.py
+++ b/source4/scripting/python/samba/tests/samba3.py
@@ -153,6 +153,7 @@ class WinsDatabaseTestCase(unittest.TestCase):
     def tearDown(self):
         self.winsdb.close()
 
+
 class SmbpasswdTestCase(unittest.TestCase):
     def setUp(self):
         self.samdb = SmbpasswdFile(os.path.join(DATADIR, "smbpasswd"))
diff --git a/source4/scripting/python/subunit/__init__.py b/source4/scripting/python/subunit/__init__.py
index ac3d0c3a40..406cd8765b 100644
--- a/source4/scripting/python/subunit/__init__.py
+++ b/source4/scripting/python/subunit/__init__.py
@@ -376,7 +376,7 @@ def run_isolated(klass, self, result):
     return result
 
 
-class SubunitTestRunner:
+class SubunitTestRunner(object):
     def __init__(self, stream=sys.stdout):
         self.stream = stream
 
-- 
cgit 


From 47124efe420f4f4f08494cbb2255eacdc9625c8d Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Fri, 1 Aug 2008 21:12:37 +0200
Subject: Add helper object Hostconfig to make it easier to get to e.g. the SAM
 database. (This used to be commit be75b2a36ee49f66ada3ec3ababa82d74085d559)

---
 source4/scripting/python/samba/getopt.py     |  4 ++++
 source4/scripting/python/samba/hostconfig.py | 33 ++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+)
 create mode 100644 source4/scripting/python/samba/hostconfig.py

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/getopt.py b/source4/scripting/python/samba/getopt.py
index 9ecb66e21c..c12245f6c5 100644
--- a/source4/scripting/python/samba/getopt.py
+++ b/source4/scripting/python/samba/getopt.py
@@ -21,6 +21,7 @@
 
 import optparse
 from credentials import Credentials, AUTO_USE_KERBEROS, DONT_USE_KERBEROS, MUST_USE_KERBEROS
+from hostconfig import Hostconfig
 
 __docformat__ = "restructuredText"
 
@@ -52,6 +53,9 @@ class SambaOptions(optparse.OptionGroup):
             lp.load_default()
         return lp
 
+    def get_hostconfig(self):
+        return Hostconfig(self.get_loadparm())
+
 
 class VersionOptions(optparse.OptionGroup):
     """Command line option for printing Samba version."""
diff --git a/source4/scripting/python/samba/hostconfig.py b/source4/scripting/python/samba/hostconfig.py
new file mode 100644
index 0000000000..313e3420b0
--- /dev/null
+++ b/source4/scripting/python/samba/hostconfig.py
@@ -0,0 +1,33 @@
+#!/usr/bin/python
+
+# Unix SMB/CIFS implementation.
+# Copyright (C) Jelmer Vernooij <jelmer@samba.org> 2008
+#   
+# 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/>.
+#
+
+from samdb import SamDB
+
+class Hostconfig(object):
+    """Aggregate object that contains all information about the configuration 
+    of a Samba host."""
+
+    def __init__(self, lp):       
+        self.lp = lp
+
+    def get_samdb(self, session_info, credentials):
+        return SamDB(url=self.lp.get("sam database"), 
+                     session_info=session_info, credentials=credentials, 
+                     lp=self.lp)
+
-- 
cgit 


From 47d80366bef5e62b6727a574b2300cc94a2e18f7 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Tue, 19 Aug 2008 11:43:41 +1000
Subject: Fix templates.ldb reprovision handling.

This sets the attributes in a seperate transaction, and allows a
forced delete of the whole file.

Andrew Bartlett
(This used to be commit 423db2468ba3dac89cebc59c8498c0b08c5f3d7b)
---
 source4/scripting/python/samba/provision.py | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index 4f7fbfc6e6..836509a620 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -617,7 +617,17 @@ def setup_templatesdb(path, setup_path, session_info, credentials, lp):
     """
     templates_ldb = SamDB(path, session_info=session_info,
                           credentials=credentials, lp=lp)
-    templates_ldb.erase()
+    # Wipes the database
+    try:
+        templates_ldb.erase()
+    except:
+        os.unlink(path)
+
+    templates_ldb.load_ldif_file_add(setup_path("provision_templates_init.ldif"))
+
+    templates_ldb = SamDB(path, session_info=session_info,
+                          credentials=credentials, lp=lp)
+
     templates_ldb.load_ldif_file_add(setup_path("provision_templates.ldif"))
 
 
-- 
cgit 


From 805dd85291fa55695ee7ae2b8f6d3c168d9186e8 Mon Sep 17 00:00:00 2001
From: Oliver Liebel <oliver@itc.li>
Date: Tue, 19 Aug 2008 12:03:04 +1000
Subject: Generate Multi-Master Replication configuration for OpenLDAP

This patches provision-backend and the related scripts to generate the
correct configuration blobs for N-way multi-master replication using
OpenLDAP.

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
(This used to be commit 6ed0b3f2475022288f636605492ca27fde97cd52)
---
 source4/scripting/python/samba/provision.py | 86 ++++++++++++++++++++++++++---
 1 file changed, 79 insertions(+), 7 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index 4f7fbfc6e6..8abcc2f2e3 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -76,7 +76,9 @@ class ProvisionPaths(object):
         self.memberofconf = None
         self.fedoradsinf = None
         self.fedoradspartitions = None
- 
+	self.olmmron = None
+	self.olmmrserveridsconf = None
+	self.olmmrsyncreplconf = None
 
 class ProvisionNames(object):
     def __init__(self):
@@ -242,8 +244,12 @@ def provision_paths_from_lp(lp, dnsdomain):
                                       "memberof.conf")
     paths.fedoradsinf = os.path.join(paths.ldapdir, 
                                    "fedorads.inf")
-    paths.fedoradspartitions = os.path.join(paths.ldapdir, 
-                                            "fedorads-partitions.ldif")
+    paths.olmmrserveridsconf = os.path.join(paths.ldapdir, 
+                                      "mmr_serverids.conf")
+    paths.olmmrsyncreplconf = os.path.join(paths.ldapdir, 
+                                      "mmr_syncrepl.conf")
+    paths.olmmron = os.path.join(paths.ldapdir, 
+                                      "mmr_on.conf")
     paths.hklm = "hklm.ldb"
     paths.hkcr = "hkcr.ldb"
     paths.hkcu = "hkcu.ldb"
@@ -331,7 +337,7 @@ def guess_names(lp=None, hostname=None, domain=None, dnsdomain=None, serverrole=
     names.hostname = hostname
     names.sitename = sitename
     names.serverdn = "CN=%s,CN=Servers,CN=%s,CN=Sites,%s" % (netbiosname, sitename, configdn)
-    
+ 
     return names
     
 
@@ -1141,7 +1147,11 @@ def provision_backend(setup_dir=None, message=None,
                       smbconf=None, targetdir=None, realm=None, 
                       rootdn=None, domaindn=None, schemadn=None, configdn=None,
                       domain=None, hostname=None, adminpass=None, root=None, serverrole=None, 
-                      ldap_backend_type=None, ldap_backend_port=None):
+                      ldap_backend_type=None, ldap_backend_port=None,
+		      ol_mmr_urls=None, mmr_serverids_config=None, mmr_on_config=None, 
+		      mmr_syncrepl_schema_config=None,
+		      mmr_syncrepl_config_config=None,
+		      mmr_syncrepl_user_config=None ):
 
     def setup_path(file):
         return os.path.join(setup_dir, file)
@@ -1255,7 +1265,64 @@ def provision_backend(setup_dir=None, message=None,
 
         refint_config = read_and_sub_file(setup_path("refint.conf"),
                                             { "LINK_ATTRS" : refint_attributes})
-    
+
+########################################################
+### generate serverids and ldap-urls for mmr hosts   ###
+########################################################
+
+	mmr_on_config = " "
+	mmr_serverids_config = " "
+
+	if ol_mmr_urls is not None:
+		mmr_hosts=ol_mmr_urls
+		mmr_hosts=filter(None,mmr_hosts.split(' ')) 
+ 		
+		mmr_serverids_config = "# Generated from template mmr_serverids.conf\n" 
+		z=0
+		for i in mmr_hosts:
+			z=z+1
+			mmr_serverids_config += read_and_sub_file(setup_path("mmr_serverids.conf"),
+								     { "SERVERID" : str(z),
+        		                                               "LDAPSERVER" : i })
+		mmr_on_config = "MirrorMode On"
+
+########################################################
+### generate syncrepl-blocks for mmr hosts           ###
+########################################################
+
+	mmr_syncrepl_schema_config = " " 
+	mmr_syncrepl_config_config = " " 
+	mmr_syncrepl_user_config = " " 
+	
+	if ol_mmr_urls is not None:
+		mmr_hosts=ol_mmr_urls
+		mmr_hosts=filter(None,mmr_hosts.split(' ')) 
+		mmr_syncrepl_schema_config = "# Generated from template mmr_syncrepl.conf\n" 
+		mmr_syncrepl_config_config = "# Generated from template mmr_syncrepl.conf\n" 
+		mmr_syncrepl_user_config = "# Generated from template mmr_syncrepl.conf\n" 
+		z=0
+		for i in mmr_hosts:
+			z=z+1
+			mmr_syncrepl_schema_config += read_and_sub_file(setup_path("mmr_syncrepl.conf"),
+								     { 	"RID" : str(z),
+                    							"MMRDN": names.schemadn,
+        		                                               	"LDAPSERVER" : i })
+
+		for i in mmr_hosts:
+			z=z+1
+			mmr_syncrepl_config_config += read_and_sub_file(setup_path("mmr_syncrepl.conf"),
+								     { 	"RID" : str(z),
+                    							"MMRDN": names.configdn,
+        		                                               	"LDAPSERVER" : i })
+
+		for i in mmr_hosts:
+			z=z+1
+			mmr_syncrepl_user_config += read_and_sub_file(setup_path("mmr_syncrepl.conf"),
+								     { 	"RID" : str(z),
+                    							"MMRDN": names.domaindn,
+        		                                               	"LDAPSERVER" : i })
+
+
         setup_file(setup_path("slapd.conf"), paths.slapdconf,
                    {"DNSDOMAIN": names.dnsdomain,
                     "LDAPDIR": paths.ldapdir,
@@ -1263,8 +1330,13 @@ def provision_backend(setup_dir=None, message=None,
                     "CONFIGDN": names.configdn,
                     "SCHEMADN": names.schemadn,
                     "MEMBEROF_CONFIG": memberof_config,
+                    "MIRRORMODE": mmr_on_config,
+                    "MMR_SERVERIDS_CONFIG": mmr_serverids_config,
+                    "MMR_SYNCREPL_SCHEMA_CONFIG": mmr_syncrepl_schema_config,
+                    "MMR_SYNCREPL_CONFIG_CONFIG": mmr_syncrepl_config_config,
+                    "MMR_SYNCREPL_USER_CONFIG": mmr_syncrepl_user_config,
                     "REFINT_CONFIG": refint_config})
-        setup_file(setup_path("modules.conf"), paths.modulesconf,
+	setup_file(setup_path("modules.conf"), paths.modulesconf,
                    {"REALM": names.realm})
         
         setup_db_config(setup_path, os.path.join(paths.ldapdir, "db", "user"))
-- 
cgit 


From 7ef21658fbb519859aa7d23a614e1fdbcae95693 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Tue, 19 Aug 2008 14:10:14 +1000
Subject: Fix up new OpenLDAP MMR code.

This changes the MMR password from hard-coded value of 'linux',
adds tests and fixes the Fedora DS backend.

Currently the MMR password matches the admin password, but we can
change this to be another random value if required.

Also require the port to be specified on the command line, so we don't
hard-code a port of 9000.

Andrew Bartlett
(This used to be commit 08257c6d6ce809fcd53f9b2b4d558fef616b74ce)
---
 source4/scripting/python/samba/provision.py | 67 +++++++++++------------------
 1 file changed, 26 insertions(+), 41 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index 8abcc2f2e3..f48a49dcfa 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -243,13 +243,13 @@ def provision_paths_from_lp(lp, dnsdomain):
     paths.memberofconf = os.path.join(paths.ldapdir, 
                                       "memberof.conf")
     paths.fedoradsinf = os.path.join(paths.ldapdir, 
-                                   "fedorads.inf")
+                                     "fedorads.inf")
+    paths.fedoradspartitions = os.path.join(paths.ldapdir, 
+                                            "fedorads-partitions.ldif")
     paths.olmmrserveridsconf = os.path.join(paths.ldapdir, 
-                                      "mmr_serverids.conf")
+                                            "mmr_serverids.conf")
     paths.olmmrsyncreplconf = os.path.join(paths.ldapdir, 
-                                      "mmr_syncrepl.conf")
-    paths.olmmron = os.path.join(paths.ldapdir, 
-                                      "mmr_on.conf")
+                                           "mmr_syncrepl.conf")
     paths.hklm = "hklm.ldb"
     paths.hkcr = "hkcr.ldb"
     paths.hkcu = "hkcu.ldb"
@@ -1148,10 +1148,7 @@ def provision_backend(setup_dir=None, message=None,
                       rootdn=None, domaindn=None, schemadn=None, configdn=None,
                       domain=None, hostname=None, adminpass=None, root=None, serverrole=None, 
                       ldap_backend_type=None, ldap_backend_port=None,
-		      ol_mmr_urls=None, mmr_serverids_config=None, mmr_on_config=None, 
-		      mmr_syncrepl_schema_config=None,
-		      mmr_syncrepl_config_config=None,
-		      mmr_syncrepl_user_config=None ):
+		      ol_mmr_urls=None):
 
     def setup_path(file):
         return os.path.join(setup_dir, file)
@@ -1266,61 +1263,48 @@ def provision_backend(setup_dir=None, message=None,
         refint_config = read_and_sub_file(setup_path("refint.conf"),
                                             { "LINK_ATTRS" : refint_attributes})
 
-########################################################
-### generate serverids and ldap-urls for mmr hosts   ###
-########################################################
-
-	mmr_on_config = " "
-	mmr_serverids_config = " "
-
+# generate serverids, ldap-urls and syncrepl-blocks for mmr hosts
+	mmr_on_config = ""
+	mmr_serverids_config = ""
+        mmr_syncrepl_schema_config = "" 
+	mmr_syncrepl_config_config = "" 
+	mmr_syncrepl_user_config = "" 
+	
 	if ol_mmr_urls is not None:
-		mmr_hosts=ol_mmr_urls
-		mmr_hosts=filter(None,mmr_hosts.split(' ')) 
+		mmr_hosts=filter(None,ol_mmr_urls.split(' ')) 
+                if (len(mmr_hosts) == 1):
+                    mmr_hosts=filter(None,ol_mmr_urls.split(',')) 
+                     
+
+		mmr_on_config = "MirrorMode On"
  		
-		mmr_serverids_config = "# Generated from template mmr_serverids.conf\n" 
 		z=0
 		for i in mmr_hosts:
 			z=z+1
 			mmr_serverids_config += read_and_sub_file(setup_path("mmr_serverids.conf"),
 								     { "SERVERID" : str(z),
         		                                               "LDAPSERVER" : i })
-		mmr_on_config = "MirrorMode On"
-
-########################################################
-### generate syncrepl-blocks for mmr hosts           ###
-########################################################
 
-	mmr_syncrepl_schema_config = " " 
-	mmr_syncrepl_config_config = " " 
-	mmr_syncrepl_user_config = " " 
-	
-	if ol_mmr_urls is not None:
-		mmr_hosts=ol_mmr_urls
-		mmr_hosts=filter(None,mmr_hosts.split(' ')) 
-		mmr_syncrepl_schema_config = "# Generated from template mmr_syncrepl.conf\n" 
-		mmr_syncrepl_config_config = "# Generated from template mmr_syncrepl.conf\n" 
-		mmr_syncrepl_user_config = "# Generated from template mmr_syncrepl.conf\n" 
-		z=0
-		for i in mmr_hosts:
 			z=z+1
 			mmr_syncrepl_schema_config += read_and_sub_file(setup_path("mmr_syncrepl.conf"),
 								     { 	"RID" : str(z),
                     							"MMRDN": names.schemadn,
-        		                                               	"LDAPSERVER" : i })
+        		                                               	"LDAPSERVER" : i,
+                                                                        "MMR_PASSWORD": adminpass})
 
-		for i in mmr_hosts:
 			z=z+1
 			mmr_syncrepl_config_config += read_and_sub_file(setup_path("mmr_syncrepl.conf"),
 								     { 	"RID" : str(z),
                     							"MMRDN": names.configdn,
-        		                                               	"LDAPSERVER" : i })
+        		                                               	"LDAPSERVER" : i,
+                                                                        "MMR_PASSWORD": adminpass})
 
-		for i in mmr_hosts:
 			z=z+1
 			mmr_syncrepl_user_config += read_and_sub_file(setup_path("mmr_syncrepl.conf"),
 								     { 	"RID" : str(z),
                     							"MMRDN": names.domaindn,
-        		                                               	"LDAPSERVER" : i })
+        		                                               	"LDAPSERVER" : i,
+                                                                        "MMR_PASSWORD": adminpass })
 
 
         setup_file(setup_path("slapd.conf"), paths.slapdconf,
@@ -1335,6 +1319,7 @@ def provision_backend(setup_dir=None, message=None,
                     "MMR_SYNCREPL_SCHEMA_CONFIG": mmr_syncrepl_schema_config,
                     "MMR_SYNCREPL_CONFIG_CONFIG": mmr_syncrepl_config_config,
                     "MMR_SYNCREPL_USER_CONFIG": mmr_syncrepl_user_config,
+                    "MMR_PASSWORD": adminpass,
                     "REFINT_CONFIG": refint_config})
 	setup_file(setup_path("modules.conf"), paths.modulesconf,
                    {"REALM": names.realm})
-- 
cgit 


From 41493cbe680e0b8dff3b84937b3005c72c39dec6 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Wed, 20 Aug 2008 12:21:36 +1000
Subject: Update OpenLDAP MMR configuration per comments by Oliver Liebel
 <oliver@itc.li>

This changes the RIDs to be <serverID><DBID>, to ease later debugging.

The need to specify the port on the MMR URLs is now included in the
help.

Andrew Bartlett
(This used to be commit a5cbe8c09c6f14f95ff9ba9b8782e2100fc55695)
---
 source4/scripting/python/samba/provision.py | 37 ++++++++++++++---------------
 1 file changed, 18 insertions(+), 19 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index 0855efe3bb..d14ce58f04 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -1281,39 +1281,38 @@ def provision_backend(setup_dir=None, message=None,
 	mmr_syncrepl_user_config = "" 
 	
 	if ol_mmr_urls is not None:
-		mmr_hosts=filter(None,ol_mmr_urls.split(' ')) 
-                if (len(mmr_hosts) == 1):
-                    mmr_hosts=filter(None,ol_mmr_urls.split(',')) 
+		url_list=filter(None,ol_mmr_urls.split(' ')) 
+                if (len(url_list) == 1):
+                    url_list=filter(None,ol_mmr_urls.split(',')) 
                      
 
 		mmr_on_config = "MirrorMode On"
- 		
-		z=0
-		for i in mmr_hosts:
-			z=z+1
+ 		serverid=0
+		for url in url_list:
+			serverid=serverid+1
 			mmr_serverids_config += read_and_sub_file(setup_path("mmr_serverids.conf"),
-								     { "SERVERID" : str(z),
-        		                                               "LDAPSERVER" : i })
-
-			z=z+1
+								     { "SERVERID" : str(serverid),
+        		                                               "LDAPSERVER" : url })
+                        rid=serverid*10
+			rid=rid+1
 			mmr_syncrepl_schema_config += read_and_sub_file(setup_path("mmr_syncrepl.conf"),
-								     { 	"RID" : str(z),
+								     { 	"RID" : str(rid),
                     							"MMRDN": names.schemadn,
-        		                                               	"LDAPSERVER" : i,
+        		                                               	"LDAPSERVER" : url,
                                                                         "MMR_PASSWORD": adminpass})
 
-			z=z+1
+			rid=rid+1
 			mmr_syncrepl_config_config += read_and_sub_file(setup_path("mmr_syncrepl.conf"),
-								     { 	"RID" : str(z),
+								     { 	"RID" : str(rid),
                     							"MMRDN": names.configdn,
-        		                                               	"LDAPSERVER" : i,
+        		                                               	"LDAPSERVER" : url,
                                                                         "MMR_PASSWORD": adminpass})
 
-			z=z+1
+			rid=rid+1
 			mmr_syncrepl_user_config += read_and_sub_file(setup_path("mmr_syncrepl.conf"),
-								     { 	"RID" : str(z),
+								     { 	"RID" : str(rid),
                     							"MMRDN": names.domaindn,
-        		                                               	"LDAPSERVER" : i,
+        		                                               	"LDAPSERVER" : url,
                                                                         "MMR_PASSWORD": adminpass })
 
 
-- 
cgit 


From 8237c0ba83e2b47bb7879ba68d3a50da887397b6 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Thu, 21 Aug 2008 12:59:16 +1000
Subject: The index handling is now configured from the schema load, not by a
 template.

Andrew Bartlett
(This used to be commit b36c6a21ad12fdc1b53efdc3f29cde7614b4fa9e)
---
 source4/scripting/python/samba/provision.py | 9 ---------
 1 file changed, 9 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index d14ce58f04..9c2a208460 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -745,12 +745,6 @@ def setup_samdb(path, setup_path, session_info, credentials, lp,
     samdb = SamDB(path, session_info=session_info, 
                   credentials=credentials, lp=lp)
 
-    if fill == FILL_DRS:
-       # We want to finish here, but setup the index before we do so
-        message("Setting up sam.ldb index")
-        samdb.load_ldif_file_add(setup_path("provision_index.ldif"))
-        return samdb
-
     message("Pre-loading the Samba 4 and AD schema")
     samdb.set_domain_sid(domainsid)
     if serverrole == "domain controller":
@@ -886,9 +880,6 @@ def setup_samdb(path, setup_path, session_info, credentials, lp,
                                 domainsid=domainsid, policyguid=policyguid,
                                 setup_path=setup_path)
 
-    #We want to setup the index last, as adds are faster unindexed
-        message("Setting up sam.ldb index")
-        samdb.load_ldif_file_add(setup_path("provision_index.ldif"))
     except:
         samdb.transaction_cancel()
         raise
-- 
cgit 


From 9817f3d785ceb67819a9def0e8030272e4ba9e14 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Sat, 30 Aug 2008 07:32:44 +1000
Subject: Add a setexpiry operation in samdb.py

This makes it easy to set the expiry (or no expiry) for a samdb user
(This used to be commit 25171f18a4b242b5a731f4ac1eefc51cc82efd74)
---
 source4/scripting/python/misc.i         | 13 +++++
 source4/scripting/python/misc.py        |  3 +-
 source4/scripting/python/misc_wrap.c    | 84 +++++++++++++++++++++++++++++----
 source4/scripting/python/samba/samdb.py | 33 +++++++++++++
 4 files changed, 123 insertions(+), 10 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/misc.i b/source4/scripting/python/misc.i
index 1d331215b5..f0bc156abd 100644
--- a/source4/scripting/python/misc.i
+++ b/source4/scripting/python/misc.i
@@ -100,3 +100,16 @@ bool dsdb_set_ntds_invocation_id(struct ldb_context *ldb, const char *guid)
 char *private_path(TALLOC_CTX* mem_ctx, struct loadparm_context *lp_ctx,
                const char *name);
 
+typedef unsigned long time_t;
+
+/*
+  convert from unix time to NT time
+*/
+%inline %{
+uint64_t unix2nttime(time_t t)
+{
+	NTTIME nt;
+	unix_to_nt_time(&nt, t);
+	return (uint64_t)nt;
+}
+%}
diff --git a/source4/scripting/python/misc.py b/source4/scripting/python/misc.py
index 0c14944001..e52d7df11d 100644
--- a/source4/scripting/python/misc.py
+++ b/source4/scripting/python/misc.py
@@ -1,5 +1,5 @@
 # This file was automatically generated by SWIG (http://www.swig.org).
-# Version 1.3.35
+# Version 1.3.36
 #
 # Don't modify this file, modify the SWIG interface instead.
 
@@ -118,5 +118,6 @@ def ldb_register_samba_handlers(*args, **kwargs):
   return _misc.ldb_register_samba_handlers(*args, **kwargs)
 dsdb_set_ntds_invocation_id = _misc.dsdb_set_ntds_invocation_id
 private_path = _misc.private_path
+unix2nttime = _misc.unix2nttime
 
 
diff --git a/source4/scripting/python/misc_wrap.c b/source4/scripting/python/misc_wrap.c
index 888918ef53..4b5bfb0174 100644
--- a/source4/scripting/python/misc_wrap.c
+++ b/source4/scripting/python/misc_wrap.c
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 1.3.36
  * 
  * This file is not intended to be easily readable and contains a number of 
  * coding conventions designed to improve portability and efficiency. Do not make
@@ -52,6 +52,12 @@
 # endif
 #endif
 
+#ifndef SWIG_MSC_UNSUPPRESS_4505
+# if defined(_MSC_VER)
+#   pragma warning(disable : 4505) /* unreferenced local function has been removed */
+# endif 
+#endif
+
 #ifndef SWIGUNUSEDPARM
 # ifdef __cplusplus
 #   define SWIGUNUSEDPARM(p)
@@ -2537,7 +2543,7 @@ static swig_module_info swig_module = {swig_types, 27, 0, 0, 0, 0};
 
 #define SWIG_name    "_misc"
 
-#define SWIGVERSION 0x010335 
+#define SWIGVERSION 0x010336 
 #define SWIG_VERSION SWIGVERSION
 
 
@@ -2826,6 +2832,40 @@ bool dsdb_set_ntds_invocation_id(struct ldb_context *ldb, const char *guid)
     return samdb_set_ntds_invocation_id(ldb, &invocation_id_in);
 }
 
+
+uint64_t unix2nttime(time_t t)
+{
+	NTTIME nt;
+	unix_to_nt_time(&nt, t);
+	return (uint64_t)nt;
+}
+
+
+#include <limits.h>
+#if !defined(SWIG_NO_LLONG_MAX)
+# if !defined(LLONG_MAX) && defined(__GNUC__) && defined (__LONG_LONG_MAX__)
+#   define LLONG_MAX __LONG_LONG_MAX__
+#   define LLONG_MIN (-LLONG_MAX - 1LL)
+#   define ULLONG_MAX (LLONG_MAX * 2ULL + 1ULL)
+# endif
+#endif
+
+
+SWIGINTERNINLINE PyObject* 
+SWIG_From_long_SS_long  (long long value)
+{
+  return ((value < LONG_MIN) || (value > LONG_MAX)) ?
+    PyLong_FromLongLong(value) : PyInt_FromLong((long)(value)); 
+}
+
+
+SWIGINTERNINLINE PyObject* 
+SWIG_From_unsigned_SS_long_SS_long  (unsigned long long value)
+{
+  return (value > LONG_MAX) ?
+    PyLong_FromUnsignedLongLong(value) : PyInt_FromLong((long)(value)); 
+}
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -2833,13 +2873,13 @@ SWIGINTERN PyObject *_wrap_random_password(PyObject *SWIGUNUSEDPARM(self), PyObj
   PyObject *resultobj = 0;
   TALLOC_CTX *arg1 = (TALLOC_CTX *) 0 ;
   size_t arg2 ;
-  char *result = 0 ;
   size_t val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   char *  kwnames[] = {
     (char *) "len", NULL 
   };
+  char *result = 0 ;
   
   arg1 = NULL;
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:random_password",kwnames,&obj0)) SWIG_fail;
@@ -2974,7 +3014,6 @@ SWIGINTERN PyObject *_wrap_samdb_set_domain_sid(PyObject *SWIGUNUSEDPARM(self),
   PyObject *resultobj = 0;
   struct ldb_context *arg1 = (struct ldb_context *) 0 ;
   struct dom_sid *arg2 = (struct dom_sid *) 0 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -2984,6 +3023,7 @@ SWIGINTERN PyObject *_wrap_samdb_set_domain_sid(PyObject *SWIGUNUSEDPARM(self),
   char *  kwnames[] = {
     (char *) "ldb",(char *) "dom_sid_in", NULL 
   };
+  bool result;
   
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:samdb_set_domain_sid",kwnames,&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ldb_context, 0 |  0 );
@@ -3012,7 +3052,6 @@ SWIGINTERN PyObject *_wrap_dsdb_attach_schema_from_ldif_file(PyObject *SWIGUNUSE
   struct ldb_context *arg1 = (struct ldb_context *) 0 ;
   char *arg2 = (char *) 0 ;
   char *arg3 = (char *) 0 ;
-  WERROR result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res2 ;
@@ -3027,6 +3066,7 @@ SWIGINTERN PyObject *_wrap_dsdb_attach_schema_from_ldif_file(PyObject *SWIGUNUSE
   char *  kwnames[] = {
     (char *) "ldb",(char *) "pf",(char *) "df", NULL 
   };
+  WERROR result;
   
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:dsdb_attach_schema_from_ldif_file",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ldb_context, 0 |  0 );
@@ -3080,13 +3120,13 @@ fail:
 SWIGINTERN PyObject *_wrap_dsdb_set_global_schema(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   struct ldb_context *arg1 = (struct ldb_context *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   char *  kwnames[] = {
     (char *) "ldb", NULL 
   };
+  int result;
   
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:dsdb_set_global_schema",kwnames,&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ldb_context, 0 |  0 );
@@ -3108,13 +3148,13 @@ fail:
 SWIGINTERN PyObject *_wrap_ldb_register_samba_handlers(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   struct ldb_context *arg1 = (struct ldb_context *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   char *  kwnames[] = {
     (char *) "ldb", NULL 
   };
+  int result;
   
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ldb_register_samba_handlers",kwnames,&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ldb_context, 0 |  0 );
@@ -3137,7 +3177,6 @@ SWIGINTERN PyObject *_wrap_dsdb_set_ntds_invocation_id(PyObject *SWIGUNUSEDPARM(
   PyObject *resultobj = 0;
   struct ldb_context *arg1 = (struct ldb_context *) 0 ;
   char *arg2 = (char *) 0 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res2 ;
@@ -3148,6 +3187,7 @@ SWIGINTERN PyObject *_wrap_dsdb_set_ntds_invocation_id(PyObject *SWIGUNUSEDPARM(
   char *  kwnames[] = {
     (char *) "ldb",(char *) "guid", NULL 
   };
+  bool result;
   
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:dsdb_set_ntds_invocation_id",kwnames,&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ldb_context, 0 |  0 );
@@ -3178,7 +3218,6 @@ SWIGINTERN PyObject *_wrap_private_path(PyObject *SWIGUNUSEDPARM(self), PyObject
   TALLOC_CTX *arg1 = (TALLOC_CTX *) 0 ;
   struct loadparm_context *arg2 = (struct loadparm_context *) 0 ;
   char *arg3 = (char *) 0 ;
-  char *result = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
   int res3 ;
@@ -3189,6 +3228,7 @@ SWIGINTERN PyObject *_wrap_private_path(PyObject *SWIGUNUSEDPARM(self), PyObject
   char *  kwnames[] = {
     (char *) "lp_ctx",(char *) "name", NULL 
   };
+  char *result = 0 ;
   
   arg2 = loadparm_init(NULL);
   arg1 = NULL;
@@ -3217,6 +3257,31 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_unix2nttime(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  time_t arg1 ;
+  unsigned long val1 ;
+  int ecode1 = 0 ;
+  PyObject * obj0 = 0 ;
+  char *  kwnames[] = {
+    (char *) "t", NULL 
+  };
+  uint64_t result;
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:unix2nttime",kwnames,&obj0)) SWIG_fail;
+  ecode1 = SWIG_AsVal_unsigned_SS_long(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "unix2nttime" "', argument " "1"" of type '" "time_t""'");
+  } 
+  arg1 = (time_t)(val1);
+  result = (uint64_t)unix2nttime(arg1);
+  resultobj = SWIG_From_unsigned_SS_long_SS_long((unsigned long long)(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
 static PyMethodDef SwigMethods[] = {
 	 { (char *)"random_password", (PyCFunction) _wrap_random_password, METH_VARARGS | METH_KEYWORDS, (char *)"\n"
 		"S.random_password(len) -> string\n"
@@ -3250,6 +3315,7 @@ static PyMethodDef SwigMethods[] = {
 		""},
 	 { (char *)"dsdb_set_ntds_invocation_id", (PyCFunction) _wrap_dsdb_set_ntds_invocation_id, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"private_path", (PyCFunction) _wrap_private_path, METH_VARARGS | METH_KEYWORDS, NULL},
+	 { (char *)"unix2nttime", (PyCFunction) _wrap_unix2nttime, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { NULL, NULL, 0, NULL }
 };
 
diff --git a/source4/scripting/python/samba/samdb.py b/source4/scripting/python/samba/samdb.py
index c7d93d6aff..4a64c2f76d 100644
--- a/source4/scripting/python/samba/samdb.py
+++ b/source4/scripting/python/samba/samdb.py
@@ -27,6 +27,7 @@ import misc
 import ldb
 from samba.idmap import IDmapDB
 import pwd
+import time
 
 __docformat__ = "restructuredText"
 
@@ -192,3 +193,35 @@ userPassword: %s
     	:param invocation_id: GUID of the invocation id.
     	"""
     	misc.dsdb_set_ntds_invocation_id(self, invocation_id)
+
+    def setexpiry(self, user, expiry_seconds, noexpiry):
+        """Set the password expiry for a user
+        
+        :param expiry_seconds: expiry time from now in seconds
+        :param noexpiry: if set, then don't expire password
+        """
+        self.transaction_start();
+        res = self.search(base=self.domain_dn(), scope=ldb.SCOPE_SUBTREE,
+                          expression=("(samAccountName=%s)" % user),
+                          attrs=["userAccountControl", "accountExpires"])
+        assert len(res) == 1
+        userAccountControl = int(res[0]["userAccountControl"][0])
+        accountExpires     = int(res[0]["accountExpires"][0])
+        if noexpiry:
+            userAccountControl = userAccountControl | 0x10000
+            accountExpires = 0
+        else:
+            userAccountControl = userAccountControl & ~0x10000
+            accountExpires = misc.unix2nttime(expiry_seconds + int(time.time()))
+
+        mod = """
+dn: %s
+changetype: modify
+replace: userAccountControl
+userAccountControl: %u
+replace: accountExpires
+accountExpires: %u
+""" % (res[0].dn, userAccountControl, accountExpires)
+        # now change the database
+        self.modify_ldif(mod)
+        self.transaction_commit();
-- 
cgit 


From 24a9181f25a64937ec0c81ed40e9744de0f164e9 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Wed, 3 Sep 2008 22:29:53 +0200
Subject: Avoid using version call for version string. (This used to be commit
 1897cef508c8bea817c510bd9023d794cb983864)

---
 source4/scripting/python/misc.i | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/misc.i b/source4/scripting/python/misc.i
index 1d331215b5..437f02a1ee 100644
--- a/source4/scripting/python/misc.i
+++ b/source4/scripting/python/misc.i
@@ -77,10 +77,9 @@ bool samdb_set_domain_sid(struct ldb_context *ldb,
 
 WERROR dsdb_attach_schema_from_ldif_file(struct ldb_context *ldb, const char *pf, const char *df);
 
-%feature("docstring") samba_version_string "version()\n"
-                                          "Obtain the Samba version.";
-%rename(version) samba_version_string;
-const char *samba_version_string(void);
+%feature("docstring") version "version()\n"
+                              "Obtain the Samba version.";
+const char *version(void) { return SAMBA_VERSION_STRING; }
 int dsdb_set_global_schema(struct ldb_context *ldb);
 %feature("docstring") ldb_register_samba_handlers "register_samba_handlers()\n"
                                           "Register Samba-specific LDB modules and schemas.";
-- 
cgit 


From fbbe799e4e68d79846614c6648307cc6b3f76906 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Wed, 3 Sep 2008 22:55:24 +0200
Subject: Regenerate SWIG file. (This used to be commit
 e8ba65c4db986fcedf7008d05d8f8846f78a98f1)

---
 source4/scripting/python/misc.i      |  9 ++++++++-
 source4/scripting/python/misc.py     |  2 +-
 source4/scripting/python/misc_wrap.c | 33 +++++++++++++++++++++++----------
 3 files changed, 32 insertions(+), 12 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/misc.i b/source4/scripting/python/misc.i
index 437f02a1ee..19318cdb17 100644
--- a/source4/scripting/python/misc.i
+++ b/source4/scripting/python/misc.i
@@ -26,6 +26,7 @@
 #include "dsdb/samdb/samdb.h"
 #include "lib/ldb-samba/ldif_handlers.h"
 #include "librpc/ndr/libndr.h"
+#include "version.h"
 %}
 
 %import "stdint.i"
@@ -79,7 +80,13 @@ WERROR dsdb_attach_schema_from_ldif_file(struct ldb_context *ldb, const char *pf
 
 %feature("docstring") version "version()\n"
                               "Obtain the Samba version.";
-const char *version(void) { return SAMBA_VERSION_STRING; }
+
+%inline {
+const char *version(void) 
+{ 
+    return SAMBA_VERSION_STRING; 
+}
+}
 int dsdb_set_global_schema(struct ldb_context *ldb);
 %feature("docstring") ldb_register_samba_handlers "register_samba_handlers()\n"
                                           "Register Samba-specific LDB modules and schemas.";
diff --git a/source4/scripting/python/misc.py b/source4/scripting/python/misc.py
index 0c14944001..933ceef35f 100644
--- a/source4/scripting/python/misc.py
+++ b/source4/scripting/python/misc.py
@@ -1,5 +1,5 @@
 # This file was automatically generated by SWIG (http://www.swig.org).
-# Version 1.3.35
+# Version 1.3.36
 #
 # Don't modify this file, modify the SWIG interface instead.
 
diff --git a/source4/scripting/python/misc_wrap.c b/source4/scripting/python/misc_wrap.c
index 888918ef53..c7cdb86c35 100644
--- a/source4/scripting/python/misc_wrap.c
+++ b/source4/scripting/python/misc_wrap.c
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 1.3.36
  * 
  * This file is not intended to be easily readable and contains a number of 
  * coding conventions designed to improve portability and efficiency. Do not make
@@ -52,6 +52,12 @@
 # endif
 #endif
 
+#ifndef SWIG_MSC_UNSUPPRESS_4505
+# if defined(_MSC_VER)
+#   pragma warning(disable : 4505) /* unreferenced local function has been removed */
+# endif 
+#endif
+
 #ifndef SWIGUNUSEDPARM
 # ifdef __cplusplus
 #   define SWIGUNUSEDPARM(p)
@@ -2537,7 +2543,7 @@ static swig_module_info swig_module = {swig_types, 27, 0, 0, 0, 0};
 
 #define SWIG_name    "_misc"
 
-#define SWIGVERSION 0x010335 
+#define SWIGVERSION 0x010336 
 #define SWIG_VERSION SWIGVERSION
 
 
@@ -2552,6 +2558,7 @@ static swig_module_info swig_module = {swig_types, 27, 0, 0, 0, 0};
 #include "dsdb/samdb/samdb.h"
 #include "lib/ldb-samba/ldif_handlers.h"
 #include "librpc/ndr/libndr.h"
+#include "version.h"
 
 
 #include "libcli/util/pyerrors.h"
@@ -2807,6 +2814,12 @@ SWIG_AsCharPtrAndSize(PyObject *obj, char** cptr, size_t* psize, int *alloc)
 
 
 
+const char *version(void) 
+{ 
+    return SAMBA_VERSION_STRING; 
+}
+
+
   #define SWIG_From_long   PyInt_FromLong 
 
 
@@ -2833,13 +2846,13 @@ SWIGINTERN PyObject *_wrap_random_password(PyObject *SWIGUNUSEDPARM(self), PyObj
   PyObject *resultobj = 0;
   TALLOC_CTX *arg1 = (TALLOC_CTX *) 0 ;
   size_t arg2 ;
-  char *result = 0 ;
   size_t val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   char *  kwnames[] = {
     (char *) "len", NULL 
   };
+  char *result = 0 ;
   
   arg1 = NULL;
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:random_password",kwnames,&obj0)) SWIG_fail;
@@ -2974,7 +2987,6 @@ SWIGINTERN PyObject *_wrap_samdb_set_domain_sid(PyObject *SWIGUNUSEDPARM(self),
   PyObject *resultobj = 0;
   struct ldb_context *arg1 = (struct ldb_context *) 0 ;
   struct dom_sid *arg2 = (struct dom_sid *) 0 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -2984,6 +2996,7 @@ SWIGINTERN PyObject *_wrap_samdb_set_domain_sid(PyObject *SWIGUNUSEDPARM(self),
   char *  kwnames[] = {
     (char *) "ldb",(char *) "dom_sid_in", NULL 
   };
+  bool result;
   
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:samdb_set_domain_sid",kwnames,&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ldb_context, 0 |  0 );
@@ -3012,7 +3025,6 @@ SWIGINTERN PyObject *_wrap_dsdb_attach_schema_from_ldif_file(PyObject *SWIGUNUSE
   struct ldb_context *arg1 = (struct ldb_context *) 0 ;
   char *arg2 = (char *) 0 ;
   char *arg3 = (char *) 0 ;
-  WERROR result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res2 ;
@@ -3027,6 +3039,7 @@ SWIGINTERN PyObject *_wrap_dsdb_attach_schema_from_ldif_file(PyObject *SWIGUNUSE
   char *  kwnames[] = {
     (char *) "ldb",(char *) "pf",(char *) "df", NULL 
   };
+  WERROR result;
   
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:dsdb_attach_schema_from_ldif_file",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ldb_context, 0 |  0 );
@@ -3069,7 +3082,7 @@ SWIGINTERN PyObject *_wrap_version(PyObject *SWIGUNUSEDPARM(self), PyObject *arg
   char *result = 0 ;
   
   if (!SWIG_Python_UnpackTuple(args,"version",0,0,0)) SWIG_fail;
-  result = (char *)samba_version_string();
+  result = (char *)version();
   resultobj = SWIG_FromCharPtr((const char *)result);
   return resultobj;
 fail:
@@ -3080,13 +3093,13 @@ fail:
 SWIGINTERN PyObject *_wrap_dsdb_set_global_schema(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   struct ldb_context *arg1 = (struct ldb_context *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   char *  kwnames[] = {
     (char *) "ldb", NULL 
   };
+  int result;
   
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:dsdb_set_global_schema",kwnames,&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ldb_context, 0 |  0 );
@@ -3108,13 +3121,13 @@ fail:
 SWIGINTERN PyObject *_wrap_ldb_register_samba_handlers(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   struct ldb_context *arg1 = (struct ldb_context *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   char *  kwnames[] = {
     (char *) "ldb", NULL 
   };
+  int result;
   
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ldb_register_samba_handlers",kwnames,&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ldb_context, 0 |  0 );
@@ -3137,7 +3150,6 @@ SWIGINTERN PyObject *_wrap_dsdb_set_ntds_invocation_id(PyObject *SWIGUNUSEDPARM(
   PyObject *resultobj = 0;
   struct ldb_context *arg1 = (struct ldb_context *) 0 ;
   char *arg2 = (char *) 0 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res2 ;
@@ -3148,6 +3160,7 @@ SWIGINTERN PyObject *_wrap_dsdb_set_ntds_invocation_id(PyObject *SWIGUNUSEDPARM(
   char *  kwnames[] = {
     (char *) "ldb",(char *) "guid", NULL 
   };
+  bool result;
   
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:dsdb_set_ntds_invocation_id",kwnames,&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ldb_context, 0 |  0 );
@@ -3178,7 +3191,6 @@ SWIGINTERN PyObject *_wrap_private_path(PyObject *SWIGUNUSEDPARM(self), PyObject
   TALLOC_CTX *arg1 = (TALLOC_CTX *) 0 ;
   struct loadparm_context *arg2 = (struct loadparm_context *) 0 ;
   char *arg3 = (char *) 0 ;
-  char *result = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
   int res3 ;
@@ -3189,6 +3201,7 @@ SWIGINTERN PyObject *_wrap_private_path(PyObject *SWIGUNUSEDPARM(self), PyObject
   char *  kwnames[] = {
     (char *) "lp_ctx",(char *) "name", NULL 
   };
+  char *result = 0 ;
   
   arg2 = loadparm_init(NULL);
   arg1 = NULL;
-- 
cgit 


From b76f383eefe961e8a2f42ac782031e3e09ff7192 Mon Sep 17 00:00:00 2001
From: Oliver Liebel <oliver@itc.li>
Date: Mon, 8 Sep 2008 14:39:54 +1000
Subject: Use DIGEST-MD5 authentication for OpenLDAP replication

This avoids passing rootdn passwords or replicated data in cleartext
across the network.

Signed-of-by: Andrew Bartlett <abartlet@samba.org>
(This used to be commit 67373c143a1d8a9f310fd116dbf81c1dd123b75f)
---
 source4/scripting/python/samba/provision.py | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index 9c2a208460..f37d09d5e0 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -1266,6 +1266,7 @@ def provision_backend(setup_dir=None, message=None,
 
 # generate serverids, ldap-urls and syncrepl-blocks for mmr hosts
 	mmr_on_config = ""
+	mmr_replicator_acl = ""
 	mmr_serverids_config = ""
         mmr_syncrepl_schema_config = "" 
 	mmr_syncrepl_config_config = "" 
@@ -1278,6 +1279,7 @@ def provision_backend(setup_dir=None, message=None,
                      
 
 		mmr_on_config = "MirrorMode On"
+		mmr_replicator_acl = "  by dn=cn=replicator,cn=samba read"
  		serverid=0
 		for url in url_list:
 			serverid=serverid+1
@@ -1315,6 +1317,7 @@ def provision_backend(setup_dir=None, message=None,
                     "SCHEMADN": names.schemadn,
                     "MEMBEROF_CONFIG": memberof_config,
                     "MIRRORMODE": mmr_on_config,
+                    "REPLICATOR_ACL": mmr_replicator_acl,
                     "MMR_SERVERIDS_CONFIG": mmr_serverids_config,
                     "MMR_SYNCREPL_SCHEMA_CONFIG": mmr_syncrepl_schema_config,
                     "MMR_SYNCREPL_CONFIG_CONFIG": mmr_syncrepl_config_config,
@@ -1340,6 +1343,15 @@ def provision_backend(setup_dir=None, message=None,
                               {"LDAPADMINPASS_B64": b64encode(adminpass),
                                "UUID": str(uuid.uuid4()), 
                                "LDAPTIME": timestring(int(time.time()))} )
+	
+	if ol_mmr_urls is not None:
+ 	   setup_file(setup_path("cn=replicator.ldif"),
+                              os.path.join(paths.ldapdir, "db", "samba",  "cn=samba", "cn=replicator.ldif"),
+                              {"LDAPADMINPASS_B64": b64encode(adminpass),
+                               "UUID": str(uuid.uuid4()),
+                               "LDAPTIME": timestring(int(time.time()))} )
+
+
 
         mapping = "schema-map-openldap-2.3"
         backend_schema = "backend-schema.schema"
-- 
cgit 


From ef9169bfa6fcaa682ff5baf729301dd63f6bb029 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Mon, 8 Sep 2008 15:09:06 +1000
Subject: Make it clear that the MMR password can differ from the admin
 passsword

In the future, we might simply randomly generate this, or allow the
admin to specify it seperate to the admin password.  However, both are
highly sensitive, as they imply read access to the krbtgt.

Andrew Bartlett
(This used to be commit 57d19ad002c523fb9a09694e6710ab7f588d44ec)
---
 source4/scripting/python/samba/provision.py | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index f37d09d5e0..68f61532ad 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -1273,7 +1273,10 @@ def provision_backend(setup_dir=None, message=None,
 	mmr_syncrepl_user_config = "" 
 	
 	if ol_mmr_urls is not None:
-		url_list=filter(None,ol_mmr_urls.split(' ')) 
+                # For now, make these equal
+                mmr_pass = adminpass
+
+ 		url_list=filter(None,ol_mmr_urls.split(' ')) 
                 if (len(url_list) == 1):
                     url_list=filter(None,ol_mmr_urls.split(',')) 
                      
@@ -1292,21 +1295,21 @@ def provision_backend(setup_dir=None, message=None,
 								     { 	"RID" : str(rid),
                     							"MMRDN": names.schemadn,
         		                                               	"LDAPSERVER" : url,
-                                                                        "MMR_PASSWORD": adminpass})
+                                                                        "MMR_PASSWORD": mmr_pass})
 
 			rid=rid+1
 			mmr_syncrepl_config_config += read_and_sub_file(setup_path("mmr_syncrepl.conf"),
 								     { 	"RID" : str(rid),
                     							"MMRDN": names.configdn,
         		                                               	"LDAPSERVER" : url,
-                                                                        "MMR_PASSWORD": adminpass})
+                                                                        "MMR_PASSWORD": mmr_pass})
 
 			rid=rid+1
 			mmr_syncrepl_user_config += read_and_sub_file(setup_path("mmr_syncrepl.conf"),
 								     { 	"RID" : str(rid),
                     							"MMRDN": names.domaindn,
         		                                               	"LDAPSERVER" : url,
-                                                                        "MMR_PASSWORD": adminpass })
+                                                                        "MMR_PASSWORD": mmr_pass })
 
 
         setup_file(setup_path("slapd.conf"), paths.slapdconf,
@@ -1322,7 +1325,6 @@ def provision_backend(setup_dir=None, message=None,
                     "MMR_SYNCREPL_SCHEMA_CONFIG": mmr_syncrepl_schema_config,
                     "MMR_SYNCREPL_CONFIG_CONFIG": mmr_syncrepl_config_config,
                     "MMR_SYNCREPL_USER_CONFIG": mmr_syncrepl_user_config,
-                    "MMR_PASSWORD": adminpass,
                     "REFINT_CONFIG": refint_config})
 	setup_file(setup_path("modules.conf"), paths.modulesconf,
                    {"REALM": names.realm})
@@ -1347,7 +1349,7 @@ def provision_backend(setup_dir=None, message=None,
 	if ol_mmr_urls is not None:
  	   setup_file(setup_path("cn=replicator.ldif"),
                               os.path.join(paths.ldapdir, "db", "samba",  "cn=samba", "cn=replicator.ldif"),
-                              {"LDAPADMINPASS_B64": b64encode(adminpass),
+                              {"MMR_PASSWORD_B64": b64encode(mmr_pass),
                                "UUID": str(uuid.uuid4()),
                                "LDAPTIME": timestring(int(time.time()))} )
 
-- 
cgit 


From faf83916ee62638e3eff60e68b4b7b36be2ddc05 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 9 Sep 2008 15:55:10 +0200
Subject: Add option for generating coverage data from python tests. (This used
 to be commit 43c0fdfff02021caef2d8f73d6bfdc4b051a65ef)

---
 source4/scripting/bin/subunitrun | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'source4/scripting')

diff --git a/source4/scripting/bin/subunitrun b/source4/scripting/bin/subunitrun
index 6f1086ad37..ee2d1e11da 100755
--- a/source4/scripting/bin/subunitrun
+++ b/source4/scripting/bin/subunitrun
@@ -36,6 +36,8 @@ parser.add_option_group(credopts)
 sambaopts = options.SambaOptions(parser)
 parser.add_option_group(sambaopts)
 parser.add_option_group(options.VersionOptions(parser))
+parser.add_option("--coverage", metavar="CACHE", type=str, 
+		          help="Store coverage data in CACHE")
 
 args = parser.parse_args()[1]
 
@@ -45,4 +47,10 @@ samba.tests.cmdline_credentials = credopts.get_credentials(samba.tests.cmdline_l
 param.cvar.default_config = samba.tests.cmdline_loadparm
 
 runner = SubunitTestRunner()
+if opts.coverage is not None:
+	import coverage
+	coverage.use_cache(True, opts.coverage)
+	coverage.start()
 program = TestProgram(module=None, argv=[sys.argv[0]] + args, testRunner=runner)
+if opts.coverage:
+	coverage.stop()
-- 
cgit 


From 1d8973a82eda362d19dbfe79529d10baf6f97d9d Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vl@samba.org>
Date: Tue, 9 Sep 2008 23:35:17 +0200
Subject: Attempt to correctly find python on host sunx (This used to be commit
 59b62280d27a9e0a72241e4b60022be07e4cbce2)

---
 source4/scripting/python/config.m4 | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/config.m4 b/source4/scripting/python/config.m4
index b599aaefb0..5607accb7c 100644
--- a/source4/scripting/python/config.m4
+++ b/source4/scripting/python/config.m4
@@ -48,8 +48,9 @@ fi
 if test -z "$PYTHON_CONFIG"; then
 	AC_MSG_WARN([No python-config found])
 else
-	TRY_LINK_PYTHON([`$PYTHON_CONFIG --ldflags`], [`$PYTHON_CONFIG --includes`])
-	TRY_LINK_PYTHON([`$PYTHON_CONFIG --ldflags`], [`$PYTHON_CONFIG --cflags`])
+       base=`$PYTHON_CONFIG --prefix`
+       TRY_LINK_PYTHON([`echo -n -L${base}/lib " "; $PYTHON_CONFIG --ldflags`], [`$PYTHON_CONFIG --includes`])
+       TRY_LINK_PYTHON([`echo -n -L${base}/lib " "; $PYTHON_CONFIG --ldflags`], [`$PYTHON_CONFIG --cflags`])
 fi
 
 if test x$PYTHON != x
-- 
cgit 


From 4f266dff13d2937b1800954a9ddb536df4d14a5f Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 9 Sep 2008 23:49:07 +0200
Subject: Only try with -LPYTHONDIR/lib when python-config output didn't work.
 (This used to be commit 62d76356c10b4223236425c4db32c2fc5105d155)

---
 source4/scripting/python/config.m4 | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/python/config.m4 b/source4/scripting/python/config.m4
index 5607accb7c..af13b6ae69 100644
--- a/source4/scripting/python/config.m4
+++ b/source4/scripting/python/config.m4
@@ -48,9 +48,14 @@ fi
 if test -z "$PYTHON_CONFIG"; then
 	AC_MSG_WARN([No python-config found])
 else
-       base=`$PYTHON_CONFIG --prefix`
-       TRY_LINK_PYTHON([`echo -n -L${base}/lib " "; $PYTHON_CONFIG --ldflags`], [`$PYTHON_CONFIG --includes`])
-       TRY_LINK_PYTHON([`echo -n -L${base}/lib " "; $PYTHON_CONFIG --ldflags`], [`$PYTHON_CONFIG --cflags`])
+	TRY_LINK_PYTHON([`$PYTHON_CONFIG --ldflags`], [`$PYTHON_CONFIG --includes`])
+	TRY_LINK_PYTHON([`$PYTHON_CONFIG --ldflags`], [`$PYTHON_CONFIG --cflags`])
+	if x$working_python = xno; then
+		# It seems the library path isn't included on some systems
+		base=`$PYTHON_CONFIG --prefix`
+       	TRY_LINK_PYTHON([`echo -n -L${base}/lib " "; $PYTHON_CONFIG --ldflags`], [`$PYTHON_CONFIG --includes`])
+       	TRY_LINK_PYTHON([`echo -n -L${base}/lib " "; $PYTHON_CONFIG --ldflags`], [`$PYTHON_CONFIG --cflags`])
+	fi
 fi
 
 if test x$PYTHON != x
-- 
cgit 


From fc23663f4b830709b65e03185a78ed917970b2b5 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Fri, 12 Sep 2008 21:28:48 +0200
Subject: Revert "Add option for generating coverage data from python tests."

This reverts commit 43c0fdfff02021caef2d8f73d6bfdc4b051a65ef.
(This used to be commit 696f30fff249656409f2efcc81b86a421d0c6880)
---
 source4/scripting/bin/subunitrun | 8 --------
 1 file changed, 8 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/bin/subunitrun b/source4/scripting/bin/subunitrun
index ee2d1e11da..6f1086ad37 100755
--- a/source4/scripting/bin/subunitrun
+++ b/source4/scripting/bin/subunitrun
@@ -36,8 +36,6 @@ parser.add_option_group(credopts)
 sambaopts = options.SambaOptions(parser)
 parser.add_option_group(sambaopts)
 parser.add_option_group(options.VersionOptions(parser))
-parser.add_option("--coverage", metavar="CACHE", type=str, 
-		          help="Store coverage data in CACHE")
 
 args = parser.parse_args()[1]
 
@@ -47,10 +45,4 @@ samba.tests.cmdline_credentials = credopts.get_credentials(samba.tests.cmdline_l
 param.cvar.default_config = samba.tests.cmdline_loadparm
 
 runner = SubunitTestRunner()
-if opts.coverage is not None:
-	import coverage
-	coverage.use_cache(True, opts.coverage)
-	coverage.start()
 program = TestProgram(module=None, argv=[sys.argv[0]] + args, testRunner=runner)
-if opts.coverage:
-	coverage.stop()
-- 
cgit