diff options
| author | Andrew Tridgell <tridge@samba.org> | 2005-06-19 04:21:45 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:18:30 -0500 |
| commit | 822498b7f536e4c4e552c524b14d6cb691ec5b62 (patch) | |
| tree | 35b8a7423c7e2454e744e9283d9fa3cbccac6706 /source4/web_server/http.c | |
| parent | e485e80b512f17aba0b6b1dd5acc3f738f4189c1 (diff) | |
| download | samba-822498b7f536e4c4e552c524b14d6cb691ec5b62.tar.gz samba-822498b7f536e4c4e552c524b14d6cb691ec5b62.tar.bz2 samba-822498b7f536e4c4e552c524b14d6cb691ec5b62.zip | |
r7744: converted the web server to use the lib/tls/ generic tls code
(This used to be commit 023fc567badba38b87895ea73515b2ce0b703a8c)
Diffstat (limited to 'source4/web_server/http.c')
| -rw-r--r-- | source4/web_server/http.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/source4/web_server/http.c b/source4/web_server/http.c index b0001068c4..314d919357 100644 --- a/source4/web_server/http.c +++ b/source4/web_server/http.c @@ -30,6 +30,7 @@ #include "system/time.h" #include "web_server/esp/esp.h" #include "dlinklist.h" +#include "lib/tls/tls.h" #define SWAT_SESSION_KEY "SwatSessionId" #define HTTP_PREAUTH_URI "/scripting/preauth.esp" @@ -245,12 +246,12 @@ static void http_redirect(EspHandle handle, int code, char *url) char *p = strrchr(web->input.url, '/'); if (p == web->input.url) { url = talloc_asprintf(web, "http%s://%s/%s", - web->tls_session?"s":"", + tls_enabled(web->tls)?"s":"", host, url); } else { int dirlen = p - web->input.url; url = talloc_asprintf(web, "http%s://%s%*.*s/%s", - web->tls_session?"s":"", + tls_enabled(web->tls)?"s":"", host, dirlen, dirlen, web->input.url, url); @@ -450,10 +451,10 @@ static void http_setup_arrays(struct esp_state *esp) SETVAR(ESP_SERVER_OBJ, "DOCUMENT_ROOT", lp_swat_directory()); SETVAR(ESP_SERVER_OBJ, "SERVER_PORT", talloc_asprintf(esp, "%u", socket_get_my_port(web->conn->socket))); - SETVAR(ESP_SERVER_OBJ, "SERVER_PROTOCOL", web->tls_session?"https":"http"); + SETVAR(ESP_SERVER_OBJ, "SERVER_PROTOCOL", tls_enabled(web->tls)?"https":"http"); SETVAR(ESP_SERVER_OBJ, "SERVER_SOFTWARE", "SWAT"); SETVAR(ESP_SERVER_OBJ, "GATEWAY_INTERFACE", "CGI/1.1"); - SETVAR(ESP_SERVER_OBJ, "TLS_SUPPORT", edata->tls_data?"True":"False"); + SETVAR(ESP_SERVER_OBJ, "TLS_SUPPORT", tls_support(edata->tls_params)?"True":"False"); } #if HAVE_SETJMP_H @@ -948,5 +949,8 @@ NTSTATUS http_setup_esp(struct task_server *task) task->private = edata; + edata->tls_params = tls_initialise(edata); + NT_STATUS_HAVE_NO_MEMORY(edata->tls_params); + return NT_STATUS_OK; } |