diff options
| author | Antonio Quartulli | 2017-07-07 22:01:08 +0800 |
|---|---|---|
| committer | David Sommerseth | 2017-07-24 15:20:18 +0200 |
| commit | 3322c558fa742cb823fa919f682486973abc4f8e (patch) | |
| tree | ba6266d1a83a0e3cbe5dc791af0380a076c10c73 /src/openvpn/manage.c | |
| parent | 20d98427ef37e3b748dbcca2174cd243dcc963dc (diff) | |
| download | openvpn-3322c558fa742cb823fa919f682486973abc4f8e.zip openvpn-3322c558fa742cb823fa919f682486973abc4f8e.tar.gz | |
management: preserve wait_for_push field when asking for user/pass
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 <netwiz@crc.id.au>
Signed-off-by: Antonio Quartulli <a@unstable.cc>
Tested-by: Steven Haigh <netwiz@crc.id.au>
Acked-by: David Sommerseth <davids@openvpn.net>
Message-Id: <20170707140108.31612-1-a@unstable.cc>
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg15015.html
Signed-off-by: David Sommerseth <davids@openvpn.net>
Diffstat (limited to 'src/openvpn/manage.c')
| -rw-r--r-- | src/openvpn/manage.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/openvpn/manage.c b/src/openvpn/manage.c index 13be6f6..ff94824 100644 --- a/src/openvpn/manage.c +++ b/src/openvpn/manage.c @@ -3501,7 +3501,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)); |