summaryrefslogtreecommitdiff
path: root/source4/web_server/http.c
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2005-05-29 11:35:56 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:17:12 -0500
commit8754c793bfe79e87febb026e5915e054c23cfede (patch)
treeb33d2c9d621fca12e5e46095896e493a910773fc /source4/web_server/http.c
parent973ea5feb1952a6be443b66d5b49ca6c908a2c92 (diff)
downloadsamba-8754c793bfe79e87febb026e5915e054c23cfede.tar.gz
samba-8754c793bfe79e87febb026e5915e054c23cfede.tar.bz2
samba-8754c793bfe79e87febb026e5915e054c23cfede.zip
r7072: moved the esp hooks calls to the ejs level, so we can call them from
both esp scripts and ejs scripts. This allows the smbscript program to call all the existing extension calls like lpGet() and ldbSearch() Also fixed smbscript to load smb.conf, and setup logging for DEBUG() I left the unixAuth() routine in web_server/calls.c at the moment, as that is really only useful for esp scripts. I imagine that as we extend esp/ejs, we will put some functions in scripting/ejs/ for use in both ejs and esp, and some functions in web_server/ where they will only be accessed by esp web scripts (This used to be commit e59ae64f60d388a5634559e4e0887e4676b70871)
Diffstat (limited to 'source4/web_server/http.c')
-rw-r--r--source4/web_server/http.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/web_server/http.c b/source4/web_server/http.c
index df53eee4e9..4a82477160 100644
--- a/source4/web_server/http.c
+++ b/source4/web_server/http.c
@@ -749,7 +749,7 @@ void http_process_input(struct websrv_context *web)
talloc_set_destructor(esp, esp_destructor);
- http_setup_ejs_functions();
+ smb_setup_ejs_functions();
esp->req = espCreateRequest(web, web->input.url, esp->variables);
if (esp->req == NULL) goto internal_error;