From 7b7749042134e31490e21b3e001451eb0f8c410e Mon Sep 17 00:00:00 2001 From: Kai Blin Date: Wed, 26 Dec 2007 09:54:21 +0100 Subject: ejs: Remove cast to incompatible pointer. (This used to be commit 89d5b91d3c4dae754178c82cb7a24e7c5af09fcd) --- source4/scripting/ejs/ejsnet/net_user.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'source4/scripting/ejs') diff --git a/source4/scripting/ejs/ejsnet/net_user.c b/source4/scripting/ejs/ejsnet/net_user.c index 34524cc0fa..57e538d3b4 100644 --- a/source4/scripting/ejs/ejsnet/net_user.c +++ b/source4/scripting/ejs/ejsnet/net_user.c @@ -195,9 +195,9 @@ static int ejs_net_deleteuser(MprVarHandle eid, int argc, char **argv) ejsSetErrorMsg(eid, "ctx property returns null pointer"); goto done; } - + /* domain where the account is to be deleted */ - userman_domain = (struct libnet_context *)mprGetThisPtr(eid, "domain"); + userman_domain = mprGetThisPtr(eid, "domain"); if (!userman_domain) { ejsSetErrorMsg(eid, "domain property returns null pointer"); goto done; @@ -258,9 +258,9 @@ static int ejs_net_userinfo(MprVarHandle eid, int argc, char **argv) ejsSetErrorMsg(eid, "ctx property returns null pointer"); goto done; } - + /* domain where the user account is to be queried */ - userman_domain = (struct libnet_context *)mprGetThisPtr(eid, "domain"); + userman_domain = mprGetThisPtr(eid, "domain"); if (userman_domain == NULL) { ejsSetErrorMsg(eid, "domain property returns null pointer"); return -1; -- cgit From 03023c4f7d8c7bc6716982db86e8167f1ac6331b Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sun, 20 Jan 2008 16:28:43 +0100 Subject: build: Demote a bunch of libraries to subsystems. This makes packaging easier and should also make it easier to migrate to a new build system. (This used to be commit 77b400764e3dadfa05407343af649ad9298cc085) --- source4/scripting/ejs/config.mk | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'source4/scripting/ejs') diff --git a/source4/scripting/ejs/config.mk b/source4/scripting/ejs/config.mk index 8b680ba973..656ecdae16 100644 --- a/source4/scripting/ejs/config.mk +++ b/source4/scripting/ejs/config.mk @@ -1,10 +1,6 @@ -####################### -# Start LIBRARY EJSRPC [SUBSYSTEM::EJSRPC] OBJ_FILES = \ ejsrpc.o -# End SUBSYSTEM EJSRPC -####################### [MODULE::smbcalls_config] OBJ_FILES = smbcalls_config.o @@ -79,11 +75,7 @@ INIT_FUNCTION = smb_setup_ejs_system include ejsnet/config.mk -####################### -# Start LIBRARY smbcalls -[LIBRARY::smbcalls] -SO_VERSION = 0 -VERSION = 0.0.1 +[SUBSYSTEM::smbcalls] PRIVATE_PROTO_HEADER = proto.h OBJ_FILES = \ smbcalls.o \ @@ -101,8 +93,6 @@ PRIVATE_DEPENDENCIES = \ CREDENTIALS POPT_CREDENTIALS POPT_SAMBA \ dcerpc \ NDR_TABLE -# End SUBSYSTEM smbcalls -####################### ####################### # Start BINARY SMBSCRIPT -- cgit