summaryrefslogtreecommitdiff
path: root/source4/web_server
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2015-08-31 10:59:58 +1200
committerAndrew Bartlett <abartlet@samba.org>2015-08-31 01:10:22 +0200
commit615d9b734ef67f56ec77db05023b9244841ac1b8 (patch)
tree81c493fc586ce956b3e2f0b4da5dbe528413010b /source4/web_server
parentac25a8ac4fc314795f9a8a15a10d731e648deea7 (diff)
downloadsamba-615d9b734ef67f56ec77db05023b9244841ac1b8.tar.gz
web_server: Use talloc_get_type_abort()
Signed-off-by: Andrew Bartlett <abartlet@samba.org> Pair-programmed-with: Garming Sam <garming@catalyst.net.nz>
Diffstat (limited to 'source4/web_server')
-rw-r--r--source4/web_server/web_server.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/source4/web_server/web_server.c b/source4/web_server/web_server.c
index 0339b556618..79a3f30bd57 100644
--- a/source4/web_server/web_server.c
+++ b/source4/web_server/web_server.c
@@ -49,7 +49,7 @@ static void websrv_timeout(struct tevent_context *event_context,
struct tevent_timer *te,
struct timeval t, void *private_data)
{
- struct websrv_context *web = talloc_get_type(private_data, struct websrv_context);
+ struct websrv_context *web = talloc_get_type_abort(private_data, struct websrv_context);
struct stream_connection *conn = web->conn;
web->conn = NULL;
/* TODO: send a message to any running esp context on this connection
@@ -142,8 +142,8 @@ NTSTATUS http_parse_header(struct websrv_context *web, const char *line)
static void websrv_recv(struct stream_connection *conn, uint16_t flags)
{
struct web_server_data *wdata;
- struct websrv_context *web = talloc_get_type(conn->private_data,
- struct websrv_context);
+ struct websrv_context *web = talloc_get_type_abort(conn->private_data,
+ struct websrv_context);
NTSTATUS status;
uint8_t buf[1024];
size_t nread;
@@ -199,7 +199,7 @@ static void websrv_recv(struct stream_connection *conn, uint16_t flags)
destroy the stack variables being used by that
rendering process when we handle the timeout. */
if (!talloc_reference(web->task, web)) goto failed;
- wdata = talloc_get_type(web->task->private_data, struct web_server_data);
+ wdata = talloc_get_type_abort(web->task->private_data, struct web_server_data);
if (wdata == NULL) goto failed;
wdata->http_process_input(wdata, web);
talloc_unlink(web->task, web);
@@ -217,8 +217,8 @@ failed:
*/
static void websrv_send(struct stream_connection *conn, uint16_t flags)
{
- struct websrv_context *web = talloc_get_type(conn->private_data,
- struct websrv_context);
+ struct websrv_context *web = talloc_get_type_abort(conn->private_data,
+ struct websrv_context);
NTSTATUS status;
size_t nsent;
DATA_BLOB b;
@@ -248,7 +248,7 @@ static void websrv_send(struct stream_connection *conn, uint16_t flags)
*/
static void websrv_accept(struct stream_connection *conn)
{
- struct web_server_data *wdata = talloc_get_type(conn->private_data, struct web_server_data);
+ struct web_server_data *wdata = talloc_get_type_abort(conn->private_data, struct web_server_data);
struct websrv_context *web;
struct socket_context *tls_socket;