summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
Diffstat (limited to 'source4')
-rw-r--r--source4/librpc/config.mk2
-rw-r--r--source4/main.mk1
-rw-r--r--source4/scripting/ejs/smbscript.c2
-rw-r--r--source4/web_server/http.c2
4 files changed, 4 insertions, 3 deletions
diff --git a/source4/librpc/config.mk b/source4/librpc/config.mk
index 893920da27..c886c81486 100644
--- a/source4/librpc/config.mk
+++ b/source4/librpc/config.mk
@@ -817,7 +817,7 @@ REQUIRED_SUBSYSTEMS = dcerpc NDR_INITSHUTDOWN EJSRPC
INIT_FUNCTION = ejs_init_netlogon
OBJ_FILES = gen_ndr/ndr_netlogon_ejs.o
SUBSYSTEM = smbcalls
-REQUIRED_SUBSYSTEMS = dcerpc NDR_NETLOGON EJSRPC
+REQUIRED_SUBSYSTEMS = dcerpc NDR_NETLOGON EJSRPC RPC_EJS_SAMR
[MODULE::RPC_EJS_SVCCTL]
INIT_FUNCTION = ejs_init_svcctl
diff --git a/source4/main.mk b/source4/main.mk
index 75432ef4a1..60a534ed5c 100644
--- a/source4/main.mk
+++ b/source4/main.mk
@@ -1,5 +1,6 @@
all: basics bin/asn1_compile bin/compile_et binaries libraries modules
+include dynconfig.mk
include heimdal_build/config.mk
include config.mk
include dsdb/config.mk
diff --git a/source4/scripting/ejs/smbscript.c b/source4/scripting/ejs/smbscript.c
index d470d33a22..86947bdf8e 100644
--- a/source4/scripting/ejs/smbscript.c
+++ b/source4/scripting/ejs/smbscript.c
@@ -30,7 +30,7 @@
static EjsId eid;
-void ejs_exception(const char *reason)
+_PUBLIC_ void ejs_exception(const char *reason)
{
Ejs *ep = ejsPtr(eid);
ejsSetErrorMsg(eid, "%s", reason);
diff --git a/source4/web_server/http.c b/source4/web_server/http.c
index 5ff96f671c..3df9fcb25a 100644
--- a/source4/web_server/http.c
+++ b/source4/web_server/http.c
@@ -467,7 +467,7 @@ static void http_setup_arrays(struct esp_state *esp)
static jmp_buf ejs_exception_buf;
static const char *exception_reason;
-void ejs_exception(const char *reason)
+_PUBLIC_ void ejs_exception(const char *reason)
{
Ejs *ep = ejsPtr(0);
if (ep) {