diff options
| -rw-r--r-- | source4/main.mk | 1 | ||||
| -rw-r--r-- | source4/scripting/ejs/config.mk | 2 | ||||
| -rw-r--r-- | source4/scripting/ejs/ejsnet/config.mk | 11 | ||||
| -rw-r--r-- | source4/scripting/ejs/ejsnet/net_ctx.c | 2 | ||||
| -rw-r--r-- | source4/scripting/ejs/smbcalls.c | 2 |
5 files changed, 6 insertions, 12 deletions
diff --git a/source4/main.mk b/source4/main.mk index ba2872e556..838b13012d 100644 --- a/source4/main.mk +++ b/source4/main.mk @@ -30,7 +30,6 @@ include torture/config.mk include librpc/config.mk include client/config.mk include libcli/config.mk -include scripting/ejs/ejsnet/config.mk include scripting/ejs/config.mk include scripting/swig/config.mk include kdc/config.mk diff --git a/source4/scripting/ejs/config.mk b/source4/scripting/ejs/config.mk index 38ed6778f7..0439d25d89 100644 --- a/source4/scripting/ejs/config.mk +++ b/source4/scripting/ejs/config.mk @@ -58,6 +58,8 @@ OBJ_FILES = smbcalls_sys.o SUBSYSTEM = smbcalls INIT_FUNCTION = smb_setup_ejs_system +include ejsnet/config.mk + ####################### # Start LIBRARY smbcalls [LIBRARY::smbcalls] diff --git a/source4/scripting/ejs/ejsnet/config.mk b/source4/scripting/ejs/ejsnet/config.mk index 4a3a428e44..6e624886d6 100644 --- a/source4/scripting/ejs/ejsnet/config.mk +++ b/source4/scripting/ejs/ejsnet/config.mk @@ -1,13 +1,8 @@ -####################### -# Start LIBRARY EJSNET -[LIBRARY::EJSNET] -SO_VERSION = 0 -VERSION = 0.0.1 +[MODULE::smbcalls_net] PRIVATE_PROTO_HEADER = proto.h +INIT_FUNCTION = smb_setup_ejs_net OBJ_FILES = \ net_ctx.o \ net_user.o \ mpr_user.o -PUBLIC_DEPENDENCIES = LIBSAMBA-NET LIBCLI_SMB CREDENTIALS -# End SUBSYSTEM ejsnet -####################### +PRIVATE_DEPENDENCIES = LIBSAMBA-NET LIBCLI_SMB CREDENTIALS diff --git a/source4/scripting/ejs/ejsnet/net_ctx.c b/source4/scripting/ejs/ejsnet/net_ctx.c index 42c64540fb..f58a59461a 100644 --- a/source4/scripting/ejs/ejsnet/net_ctx.c +++ b/source4/scripting/ejs/ejsnet/net_ctx.c @@ -203,7 +203,7 @@ static int ejs_net_samsync_ldb(MprVarHandle eid, int argc, struct MprVar **argv) } -void ejsnet_setup(void) +void smb_set_ejs_net(void) { ejsDefineCFunction(-1, "NetContext", ejs_net_context, NULL, MPR_VAR_SCRIPT_HANDLE); } diff --git a/source4/scripting/ejs/smbcalls.c b/source4/scripting/ejs/smbcalls.c index b75024cb4a..40178d3754 100644 --- a/source4/scripting/ejs/smbcalls.c +++ b/source4/scripting/ejs/smbcalls.c @@ -230,8 +230,6 @@ void smb_setup_ejs_functions(void (*exception_handler)(const char *)) smb_setup_ejs_param(); smb_setup_ejs_literal(); - ejsnet_setup(); - shared_init = load_samba_modules(NULL, "smbcalls"); run_init_functions(static_init); |