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/ejs/mprutil.c | 159 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 159 insertions(+)
 create mode 100644 source4/scripting/ejs/mprutil.c

(limited to 'source4/scripting/ejs/mprutil.c')

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;
+}
+
-- 
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/ejs/mprutil.c')

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 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/ejs/mprutil.c')

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 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/ejs/mprutil.c')

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 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/ejs/mprutil.c | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

(limited to 'source4/scripting/ejs/mprutil.c')

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;
+}
-- 
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/mprutil.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source4/scripting/ejs/mprutil.c')

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);
 }
 
-- 
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/mprutil.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'source4/scripting/ejs/mprutil.c')

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;	
 }
 
-- 
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/mprutil.c | 126 ++++++++++++++++++++++++++++++----------
 1 file changed, 95 insertions(+), 31 deletions(-)

(limited to 'source4/scripting/ejs/mprutil.c')

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));
+}
+
+
-- 
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/mprutil.c | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'source4/scripting/ejs/mprutil.c')

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
 */
-- 
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 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'source4/scripting/ejs/mprutil.c')

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;
 }
 
 
-- 
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/mprutil.c | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'source4/scripting/ejs/mprutil.c')

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;
 }
 
-- 
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/mprutil.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'source4/scripting/ejs/mprutil.c')

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
 */
-- 
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/mprutil.c | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

(limited to 'source4/scripting/ejs/mprutil.c')

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)));
-- 
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/mprutil.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'source4/scripting/ejs/mprutil.c')

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);
 }
 
-- 
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/mprutil.c | 38 +++++++++++++++++++++++++++++++++++---
 1 file changed, 35 insertions(+), 3 deletions(-)

(limited to 'source4/scripting/ejs/mprutil.c')

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
 */
-- 
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/mprutil.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'source4/scripting/ejs/mprutil.c')

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));
 }
 
 
-- 
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/mprutil.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting/ejs/mprutil.c')

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"
 
 /*
-- 
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 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'source4/scripting/ejs/mprutil.c')

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));
+}
-- 
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 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'source4/scripting/ejs/mprutil.c')

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));
 }
-- 
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 ++++++++++++++++++
 1 file changed, 18 insertions(+)

(limited to 'source4/scripting/ejs/mprutil.c')

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);
+}
-- 
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 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'source4/scripting/ejs/mprutil.c')

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);
+}
-- 
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 +++++++++++++++++++++++-------
 1 file changed, 23 insertions(+), 7 deletions(-)

(limited to 'source4/scripting/ejs/mprutil.c')

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));
-- 
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/ejs/mprutil.c')

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 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/ejs/mprutil.c')

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 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 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'source4/scripting/ejs/mprutil.c')

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;
 }
 
 /*
-- 
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 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'source4/scripting/ejs/mprutil.c')

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;
 }
 
 /*
-- 
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/mprutil.c | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

(limited to 'source4/scripting/ejs/mprutil.c')

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 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 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source4/scripting/ejs/mprutil.c')

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;		
-- 
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/ejs/mprutil.c')

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 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/ejs/mprutil.c')

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/ejs/mprutil.c')

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 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/ejs/mprutil.c | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

(limited to 'source4/scripting/ejs/mprutil.c')

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);
 }
-- 
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 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'source4/scripting/ejs/mprutil.c')

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);
-- 
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/mprutil.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'source4/scripting/ejs/mprutil.c')

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
-- 
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/ejs/mprutil.c')

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 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/ejs/mprutil.c')

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 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/ejs/mprutil.c')

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 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 ++++++++++++++++++++++---------
 1 file changed, 22 insertions(+), 9 deletions(-)

(limited to 'source4/scripting/ejs/mprutil.c')

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;
 }
 
 
-- 
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/mprutil.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'source4/scripting/ejs/mprutil.c')

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"
-- 
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/mprutil.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting/ejs/mprutil.c')

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);
 }
 
 /*
-- 
cgit