diff options
| author | Bernhard Schmidt <berni@debian.org> | 2019-02-20 14:11:51 +0100 |
|---|---|---|
| committer | Bernhard Schmidt <berni@debian.org> | 2019-02-20 14:11:51 +0100 |
| commit | 39ddb9cc8281bd239b94a3023da6329edb6718c1 (patch) | |
| tree | dc6a8e7f1018f59f088c5b06b48eb24efe17f22d /src/openvpn/misc.c | |
| parent | d5078cc44b8919a25cb7507e9e6da1d66f25bb5b (diff) | |
| parent | 87356242baf10c8b2a94d9013e436ed2a0dada53 (diff) | |
Update upstream source from tag 'upstream/2.4.7'
Update to upstream version '2.4.7'
with Debian dir d01da6ef78dc8ce91265e8f319468f6c34d23af8
Diffstat (limited to 'src/openvpn/misc.c')
| -rw-r--r-- | src/openvpn/misc.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/openvpn/misc.c b/src/openvpn/misc.c index 77bb671..581a890 100644 --- a/src/openvpn/misc.c +++ b/src/openvpn/misc.c @@ -1261,7 +1261,7 @@ purge_user_pass(struct user_pass *up, const bool force) * don't show warning if the pass has been replaced by a token: this is an * artificial "auth-nocache" */ - else if (!warn_shown && (!up->tokenized)) + else if (!warn_shown) { msg(M_WARN, "WARNING: this configuration may cache passwords in memory -- use the auth-nocache option to prevent this"); warn_shown = true; @@ -1269,14 +1269,18 @@ purge_user_pass(struct user_pass *up, const bool force) } void -set_auth_token(struct user_pass *up, const char *token) +set_auth_token(struct user_pass *up, struct user_pass *tk, const char *token) { - if (token && strlen(token) && up && up->defined && !up->nocache) + + if (token && strlen(token) && up && up->defined) { - CLEAR(up->password); - strncpynt(up->password, token, USER_PASS_LEN); - up->tokenized = true; + strncpynt(tk->password, token, USER_PASS_LEN); + strncpynt(tk->username, up->username, USER_PASS_LEN); + tk->defined = true; } + + /* Cleans user/pass for nocache */ + purge_user_pass(up, false); } /* |