From: Andrew Tridgell <tridge@samba.org>
Date: Tue, 19 Jul 2005 11:54:33 +0000 (+0000)
Subject: r8602: allow options in ldb connect calls
X-Git-Tag: samba-4.0.0alpha6~801^3~9782
X-Git-Url: http://git.samba.org/samba.git/?p=bbaumbach%2Fsamba-autobuild%2F.git;a=commitdiff_plain;h=da88ef65e0f625e8baab07251839171d0ae5aa1b

r8602: allow options in ldb connect calls
(This used to be commit 4c1d6a97c0c9df2848a16afb1b4eed4b20963bef)
---

diff --git a/source4/scripting/ejs/smbcalls_ldb.c b/source4/scripting/ejs/smbcalls_ldb.c
index 30d0d354b46..0795db9018a 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);
 	}