diff --git a/src/ipc.proto b/src/ipc.proto index 582af828..90eafddb 100644 --- a/src/ipc.proto +++ b/src/ipc.proto @@ -1,22 +1,22 @@ /* === Authentication === - main sec-mod worker - | | | - | | <--AUTH_INIT--- | - | | ---AUTH_REP---> | - | | <--AUTH_CONT--- | - | | . | - | | . | - | | . | - | | ----AUTH_REP--> | - | | | - | <----------AUTH_COOKIE_REQ------------- | - | | | - | ---SESSION_OPEN----> | | - | <--SESSION_REPLY---- | | - | | | - | -----------------AUTH_REP-------------> | - | | | + main sec-mod worker + | | | + | | <--SEC_AUTH_INIT--- | + | | ---SEC_AUTH_REP---> | + | | <--SEC_AUTH_CONT--- | + | | . | + | | . | + | | . | + | | ----SEC_AUTH_REP--> | + | | | + | <----------AUTH_COOKIE_REQ----------------- | + | | | + | ---SESSION_OPEN----> | | + | <--SESSION_REPLY---- | | + | | | + | -----------------AUTH_REP-----------------> | + | | | | | | | (disconnect) | ---SESSION_CLOSE---> | diff --git a/src/worker-auth.c b/src/worker-auth.c index cac0945a..126b49a2 100644 --- a/src/worker-auth.c +++ b/src/worker-auth.c @@ -755,7 +755,6 @@ static int recv_auth_reply(worker_st * ws, int sd, char **txt) } strlcpy(ws->username, msg->user_name, sizeof(ws->username)); - if (msg->has_sid && msg->sid.len == sizeof(ws->sid)) { /* update our sid */ memcpy(ws->sid, msg->sid.data, sizeof(ws->sid)); @@ -1107,10 +1106,10 @@ int basic_auth_handler(worker_st * ws, unsigned http_ver, const char *msg) return -1; if (msg == NULL) { - oclog(ws, LOG_HTTP_DEBUG, "WWW-Authenticate: Negotiate"); + oclog(ws, LOG_HTTP_DEBUG, "HTTP sending: WWW-Authenticate: Negotiate"); ret = cstp_puts(ws, "WWW-Authenticate: Negotiate\r\n"); } else { - oclog(ws, LOG_HTTP_DEBUG, "WWW-Authenticate: Negotiate %s", msg); + oclog(ws, LOG_HTTP_DEBUG, "HTTP sending: WWW-Authenticate: Negotiate %s", msg); ret = cstp_printf(ws, "WWW-Authenticate: Negotiate %s\r\n", msg); } if (ret < 0) diff --git a/src/worker-http.c b/src/worker-http.c index abd58c7e..65648d1f 100644 --- a/src/worker-http.c +++ b/src/worker-http.c @@ -166,7 +166,7 @@ void header_value_check(struct worker_st *ws, struct http_req_st *req) if (req->value.length <= 0) return; - oclog(ws, LOG_HTTP_DEBUG, "HTTP: %.*s: %.*s", (int)req->header.length, + oclog(ws, LOG_HTTP_DEBUG, "HTTP processing: %.*s: %.*s", (int)req->header.length, req->header.data, (int)req->value.length, req->value.data); value = talloc_size(ws, req->value.length + 1);