summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
Diffstat (limited to 'source4')
-rw-r--r--source4/config.list1
-rw-r--r--source4/scripting/config.mk24
-rw-r--r--source4/scripting/ejs/config.mk23
-rw-r--r--source4/scripting/ejs/mprutil.c26
-rw-r--r--source4/scripting/ejs/smbcalls.c1
-rw-r--r--source4/scripting/ejs/smbcalls_rpc.c116
-rw-r--r--source4/scripting/ejs/smbscript.c43
7 files changed, 195 insertions, 39 deletions
diff --git a/source4/config.list b/source4/config.list
index d52b892ab7..b372334fee 100644
--- a/source4/config.list
+++ b/source4/config.list
@@ -49,3 +49,4 @@ lib/com/config.mk
scripting/config.mk
kdc/config.mk
lib/replace/config.mk
+scripting/ejs/config.mk
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,28 +1,4 @@
#######################
-# 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]
REQUIRED_SUBSYSTEMS = LIBTDB
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;
generated by cgit (git 2.34.1) at 2024-11-01 02:42:56 +0000