r23065: revert local includes to prevent security problems (at least

temporarily...)

rafal
(This used to be commit 0ecb8fd81ebbd7327aa5c6b9347aa4dcb1ba6421)

diff --git a/source4/scripting/ejs/smbcalls.c b/source4/scripting/ejs/smbcalls.c
index 9a4a9f962400e81921af5b94422bdbda69fe61aa..04c534bdf5b410aaff464a644c2f13729d7d213e 100644 (file)
--- 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);