PenTest/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2025-12-18 13:39:02 +00:00
Code Issues Projects Releases Wiki Activity

Don't register the nselib-bin directory any longer in init_setpath in

Browse Source 
nse_init.cc. Because that directory isn't created on installation any longer it
was causing an NSE error: "SCRIPT ENGINE: error while initializing Lua State:
'nselib-bin/' not a directory"
This commit is contained in:
david
2008-09-05 05:12:23 +00:00
parent f49082d2bf
commit 12f272d4d6
2 changed files with 1 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
nse_init.cc
View File

@@ -192,29 +192,17 @@ static int loaddir (lua_State *L)
* *
* Sets the search path of require function to include: * Sets the search path of require function to include:
* ./nselib/ For Lua Path (.lua files) * ./nselib/ For Lua Path (.lua files)
* ./nselib-bin/ For C Path (.so files)
*/ */
static int init_setpath (lua_State *L) static int init_setpath (lua_State *L)
{ {
char path[MAX_FILENAME_LEN], cpath[MAX_FILENAME_LEN]; char path[MAX_FILENAME_LEN];
/* set the path lua searches for modules*/ /* set the path lua searches for modules*/
if (nmap_fetchfile(path, MAX_FILENAME_LEN, SCRIPT_ENGINE_LIB_DIR) != 2) if (nmap_fetchfile(path, MAX_FILENAME_LEN, SCRIPT_ENGINE_LIB_DIR) != 2)
luaL_error(L, "'%s' not a directory", SCRIPT_ENGINE_LIB_DIR); luaL_error(L, "'%s' not a directory", SCRIPT_ENGINE_LIB_DIR);
if (nmap_fetchfile(cpath, MAX_FILENAME_LEN, SCRIPT_ENGINE_LIBEXEC_DIR) != 2)
luaL_error(L, "'%s' not a directory", SCRIPT_ENGINE_LIBEXEC_DIR);
lua_getfield(L, LUA_REGISTRYINDEX, "_LOADED"); lua_getfield(L, LUA_REGISTRYINDEX, "_LOADED");
lua_getfield(L, -1, LUA_LOADLIBNAME); /* "package" */ lua_getfield(L, -1, LUA_LOADLIBNAME); /* "package" */
lua_pushstring(L, cpath);
#ifdef WIN32
lua_pushliteral(L, "?.dll;");
#else
lua_pushliteral(L, "?.so;");
#endif
lua_getfield(L, -3, "cpath"); /* package.cpath */
lua_concat(L, 3);
lua_setfield(L, -2, "cpath");
lua_pushstring(L, path); lua_pushstring(L, path);
lua_pushliteral(L, "?.lua;"); lua_pushliteral(L, "?.lua;");

1
nse_macros.h
View File

@@ -36,7 +36,6 @@
#endif #endif
#define SCRIPT_ENGINE_LIB_DIR "nselib/" #define SCRIPT_ENGINE_LIB_DIR "nselib/"
#define SCRIPT_ENGINE_LIBEXEC_DIR "nselib-bin/"
#define SCRIPT_ENGINE_DATABASE "script.db" #define SCRIPT_ENGINE_DATABASE "script.db"
#define SCRIPT_ENGINE_EXTENSION ".nse" #define SCRIPT_ENGINE_EXTENSION ".nse"