]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
BUILD: Compile clean when debug options defined
authorCJ Ess <zxcvbn4038@gmail.com>
Sat, 2 May 2015 20:35:24 +0000 (16:35 -0400)
committerWilly Tarreau <w@1wt.eu>
Sun, 3 May 2015 07:17:43 +0000 (09:17 +0200)
Here you go!

src/auth.c
src/stream.c

index 42c08083e3f0f9f4d0a72b7ef89fd5d681e22aa1..8b7d268a5281a02589b84d387825c65f4e3fe336 100644 (file)
@@ -218,11 +218,14 @@ check_user(struct userlist *ul, const char *user, const char *pass)
 {
 
        struct auth_users *u;
+#ifdef DEBUG_AUTH
+       struct auth_groups_list *agl;
+#endif
        const char *ep;
 
 #ifdef DEBUG_AUTH
-       fprintf(stderr, "req: userlist=%s, user=%s, pass=%s, group=%s\n",
-               ul->name, user, pass, group);
+       fprintf(stderr, "req: userlist=%s, user=%s, pass=%s\n",
+               ul->name, user, pass);
 #endif
 
        for (u = ul->users; u; u = u->next)
index 263a45f18fec013256f4a1a0652d1b2dac993c94..5b5494bfab2e4fe868748ed6a98e23a1415d7e6a 100644 (file)
@@ -737,10 +737,10 @@ static void sess_update_stream_int(struct stream *s)
        DPRINTF(stderr,"[%u] %s: sess=%p rq=%p, rp=%p, exp(r,w)=%u,%u rqf=%08x rpf=%08x rqh=%d rqt=%d rph=%d rpt=%d cs=%d ss=%d\n",
                now_ms, __FUNCTION__,
                s,
-               req, s->rep,
+               req, &s->res,
                req->rex, s->res.wex,
                req->flags, s->res.flags,
-               req->buf->i, req->buf->o, s->res.buf->i, s->res.buf->o, s->si[0].state, req->cons->state);
+               req->buf->i, req->buf->o, s->res.buf->i, s->res.buf->o, s->si[0].state, s->si[1].state);
 
        if (si->state == SI_ST_ASS) {
                /* Server assigned to connection request, we have to try to connect now */
@@ -931,10 +931,10 @@ static void sess_prepare_conn_req(struct stream *s)
        DPRINTF(stderr,"[%u] %s: sess=%p rq=%p, rp=%p, exp(r,w)=%u,%u rqf=%08x rpf=%08x rqh=%d rqt=%d rph=%d rpt=%d cs=%d ss=%d\n",
                now_ms, __FUNCTION__,
                s,
-               s->req, s->rep,
+               &s->req, &s->res,
                s->req.rex, s->res.wex,
                s->req.flags, s->res.flags,
-               s->req.buf->i, s->req.buf->o, s->res.buf->i, s->res.buf->o, s->si[0].state, s->req.cons->state);
+               s->req.buf->i, s->req.buf->o, s->res.buf->i, s->res.buf->o, s->si[0].state, s->si[1].state);
 
        if (si->state != SI_ST_REQ)
                return;