diff options
author | David Sommerseth <dazo@users.sourceforge.net> | 2010-06-04 23:18:03 +0200 |
---|---|---|
committer | David Sommerseth <dazo@users.sourceforge.net> | 2010-06-04 23:18:03 +0200 |
commit | e0ca5fdf8f54c3c264fcb1ddaf0adbde212d858a (patch) | |
tree | 202c201b860f996ccf754d3bfc256658c3694dc4 /misc.c | |
parent | OCSP_check.sh: new check logic (diff) | |
parent | Merge branch 'svn-BETA21' (diff) | |
download | openvpn-e0ca5fdf8f54c3c264fcb1ddaf0adbde212d858a.tar.xz |
Merge branch 'master' into bugfix2.1
Diffstat (limited to 'misc.c')
-rw-r--r-- | misc.c | 6 |
1 files changed, 6 insertions, 0 deletions
@@ -1406,6 +1406,9 @@ get_user_pass (struct user_pass *up, { const bool from_stdin = (!auth_file || !strcmp (auth_file, "stdin")); + if (flags & GET_USER_PASS_PREVIOUS_CREDS_FAILED) + msg (M_WARN, "Note: previous '%s' credentials failed", prefix); + #ifdef ENABLE_MANAGEMENT /* * Get username/password from standard input? @@ -1414,6 +1417,9 @@ get_user_pass (struct user_pass *up, && ((auth_file && streq (auth_file, "management")) || (from_stdin && (flags & GET_USER_PASS_MANAGEMENT))) && management_query_user_pass_enabled (management)) { + if (flags & GET_USER_PASS_PREVIOUS_CREDS_FAILED) + management_auth_failure (management, prefix, "previous auth credentials failed"); + if (!management_query_user_pass (management, up, prefix, flags)) { if ((flags & GET_USER_PASS_NOFATAL) != 0) |