summaryrefslogtreecommitdiffstats
path: root/source4/web_server
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2006-03-21 07:08:08 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:58:59 -0500
commitdab516d3e72360a10962d37a06df6aee33b1a63f (patch)
tree9161fd6fbe309b1c0a723d6d7a4591250ddbd8f8 /source4/web_server
parentd64ccc01769ce274c74d8458f9ef81cdcc8986f6 (diff)
downloadsamba-dab516d3e72360a10962d37a06df6aee33b1a63f.tar.gz
samba-dab516d3e72360a10962d37a06df6aee33b1a63f.tar.xz
samba-dab516d3e72360a10962d37a06df6aee33b1a63f.zip
r14603: Fix building of ejs modules as shared libs
Fix calling of ejs_exception() without requiring --export-dynamic (This used to be commit 8575e9a4903450aae1f29f55aae516085a9528bb)
Diffstat (limited to 'source4/web_server')
-rw-r--r--source4/web_server/http.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source4/web_server/http.c b/source4/web_server/http.c
index 3df9fcb25a2..93d81ef1d0b 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;
-_PUBLIC_ void ejs_exception(const char *reason)
+static void web_server_ejs_exception(const char *reason)
{
Ejs *ep = ejsPtr(0);
if (ep) {
@@ -480,7 +480,7 @@ _PUBLIC_ void ejs_exception(const char *reason)
longjmp(ejs_exception_buf, -1);
}
#else
-void ejs_exception(const char *reason)
+static void web_server_ejs_exception(const char *reason)
{
DEBUG(0,("%s", reason));
smb_panic(reason);
@@ -804,7 +804,7 @@ void http_process_input(struct websrv_context *web)
edata->application_data, MPR_DEEP_COPY);
}
- smb_setup_ejs_functions();
+ smb_setup_ejs_functions(web_server_ejs_exception);
if (web->input.url == NULL) {
http_error(web, 400, "You must specify a GET or POST request");