svn commit: samba r20791 - in branches/SAMBA_4_0/source: . scripting/ejs scripting/ejs/ejsnet

metze at samba.org metze at samba.org
Mon Jan 15 07:34:04 GMT 2007


Author: metze
Date: 2007-01-15 07:34:04 +0000 (Mon, 15 Jan 2007)
New Revision: 20791

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=20791

Log:
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
Modified:
   branches/SAMBA_4_0/source/main.mk
   branches/SAMBA_4_0/source/scripting/ejs/config.mk
   branches/SAMBA_4_0/source/scripting/ejs/ejsnet/config.mk
   branches/SAMBA_4_0/source/scripting/ejs/ejsnet/net_ctx.c
   branches/SAMBA_4_0/source/scripting/ejs/smbcalls.c


Changeset:
Modified: branches/SAMBA_4_0/source/main.mk
===================================================================
--- branches/SAMBA_4_0/source/main.mk	2007-01-15 07:17:33 UTC (rev 20790)
+++ branches/SAMBA_4_0/source/main.mk	2007-01-15 07:34:04 UTC (rev 20791)
@@ -30,7 +30,6 @@
 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

Modified: branches/SAMBA_4_0/source/scripting/ejs/config.mk
===================================================================
--- branches/SAMBA_4_0/source/scripting/ejs/config.mk	2007-01-15 07:17:33 UTC (rev 20790)
+++ branches/SAMBA_4_0/source/scripting/ejs/config.mk	2007-01-15 07:34:04 UTC (rev 20791)
@@ -58,6 +58,8 @@
 SUBSYSTEM = smbcalls
 INIT_FUNCTION = smb_setup_ejs_system
 
+include ejsnet/config.mk
+
 #######################
 # Start LIBRARY smbcalls
 [LIBRARY::smbcalls]

Modified: branches/SAMBA_4_0/source/scripting/ejs/ejsnet/config.mk
===================================================================
--- branches/SAMBA_4_0/source/scripting/ejs/ejsnet/config.mk	2007-01-15 07:17:33 UTC (rev 20790)
+++ branches/SAMBA_4_0/source/scripting/ejs/ejsnet/config.mk	2007-01-15 07:34:04 UTC (rev 20791)
@@ -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

Modified: branches/SAMBA_4_0/source/scripting/ejs/ejsnet/net_ctx.c
===================================================================
--- branches/SAMBA_4_0/source/scripting/ejs/ejsnet/net_ctx.c	2007-01-15 07:17:33 UTC (rev 20790)
+++ branches/SAMBA_4_0/source/scripting/ejs/ejsnet/net_ctx.c	2007-01-15 07:34:04 UTC (rev 20791)
@@ -203,7 +203,7 @@
 }
 
 
-void ejsnet_setup(void)
+void smb_set_ejs_net(void)
 {
 	ejsDefineCFunction(-1, "NetContext", ejs_net_context, NULL, MPR_VAR_SCRIPT_HANDLE);
 }

Modified: branches/SAMBA_4_0/source/scripting/ejs/smbcalls.c
===================================================================
--- branches/SAMBA_4_0/source/scripting/ejs/smbcalls.c	2007-01-15 07:17:33 UTC (rev 20790)
+++ branches/SAMBA_4_0/source/scripting/ejs/smbcalls.c	2007-01-15 07:34:04 UTC (rev 20791)
@@ -230,8 +230,6 @@
 	smb_setup_ejs_param();
         smb_setup_ejs_literal();
 	
-	ejsnet_setup();
-
 	shared_init = load_samba_modules(NULL, "smbcalls");
 	
 	run_init_functions(static_init);



More information about the samba-cvs mailing list