From: Willy Tarreau <w@1wt.eu>
Date: Thu, 10 May 2012 21:25:35 +0000 (+0200)
Subject: CLEANUP: auth: make the code build again with DEBUG_AUTH
X-Git-Tag: v1.5-dev10~17
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b95095979c3dbe89b687bd2b4dec2f8b885e0929;p=thirdparty%2Fhaproxy.git

CLEANUP: auth: make the code build again with DEBUG_AUTH

Reported by Cyril Bonté, minor issue caused by recent ACL rework.
---

diff --git a/src/auth.c b/src/auth.c
index f737fceb31..c9f7e04472 100644
--- a/src/auth.c
+++ b/src/auth.c
@@ -137,7 +137,7 @@ check_user(struct userlist *ul, unsigned int group_mask, const char *user, const
 
 #ifdef DEBUG_AUTH
 	fprintf(stderr, "cfg: user=%s, pass=%s, group_mask=%u, flags=%X",
-		u->user, u->pass, u->group_mask, u->flags);
+		u->user, u->pass, u->u.group_mask, u->flags);
 #endif
 
 	/*
diff --git a/src/cfgparse.c b/src/cfgparse.c
index 5222652e1c..ec15fbad21 100644
--- a/src/cfgparse.c
+++ b/src/cfgparse.c
@@ -6685,7 +6685,7 @@ out_uri_auth_compat:
 			fprintf(stderr, "group %s, id %d, mask %08X, users:", curuserlist->groups[g], g , 1 << g);
 
 			for (curuser = curuserlist->users; curuser; curuser = curuser->next) {
-				if (curuser->group_mask & (1 << g))
+				if (curuser->u.group_mask & (1 << g))
 					fprintf(stderr, " %s", curuser->user);
 			}