From 0ec7ff5b6b8c7d498037bb68fc9cfead9e44dfc0 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Mon, 15 Jan 2007 07:34:04 +0000
Subject: r20791: the ejsnet stuff can be a normal smbcalls module...

mimir: when you want to register more functions
       please do that in the smb_setup_ejs_net() function

metze
(This used to be commit 5828632931376c3982bf0b6d110d217a8e05d60e)
---
 source4/scripting/ejs/config.mk        |  2 ++
 source4/scripting/ejs/ejsnet/config.mk | 11 +++--------
 source4/scripting/ejs/ejsnet/net_ctx.c |  2 +-
 source4/scripting/ejs/smbcalls.c       |  2 --
 4 files changed, 6 insertions(+), 11 deletions(-)

(limited to 'source4/scripting')

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);
-- 
cgit