From: Antonio Quartulli Date: Fri, 7 Jul 2017 22:01:08 +0800 Message-Id: <20170707140108.31612-1-a@...2181...> Subject: [Openvpn-devel] [PATCH] management: preserve wait_for_push field when asking for user/pass List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit To: openvpn-devel@lists.sourceforge.net Cc: davids@...515..., Antonio Quartulli With the introduction of the wait_for_push field in the auth_user_pass structure, we have to make sure that such field is not accidentally erased when the management asks the user for user/pass. Erasing such field would mess up the logic introduced by ("Ignore auth-nocache for auth-user-pass if auth-token is pushed"). Thanks to David Sommerseth for the preliminary analysis and debugging. Reported-by: Steven Haigh Signed-off-by: Antonio Quartulli Tested-by: Steven Haigh --- src/openvpn/manage.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/openvpn/manage.c b/src/openvpn/manage.c index c2e8dc72..e850e0a4 100644 --- a/src/openvpn/manage.c +++ b/src/openvpn/manage.c @@ -3504,7 +3504,9 @@ management_query_user_pass(struct management *man, */ if (ret) { - man->connection.up_query.nocache = up->nocache; /* preserve caller's nocache setting */ + /* preserve caller's settings */ + man->connection.up_query.nocache = up->nocache; + man->connection.up_query.wait_for_push = up->wait_for_push; *up = man->connection.up_query; } secure_memzero(&man->connection.up_query, sizeof(man->connection.up_query)); -- 2.13.2