GitLab/ocserv
1
0
Fork 0
mirror of https://gitlab.com/openconnect/ocserv.git synced 2026-02-10 16:57:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

ocserv: print the correct message when only selecting a group.

Browse Source
This commit is contained in:
Nikos Mavrogiannopoulos
2014-06-26 13:44:43 +02:00
parent 3de707b0fe
commit 309ad41475
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/worker-auth.c
View File

@@ -184,7 +184,7 @@ int get_auth_handler2(worker_st * ws, unsigned http_ver, const char *pmsg)
if (ws->auth_state == S_AUTH_REQ) {
/* only ask password */
if (pmsg == NULL)
pmsg = "Please enter your password.";
pmsg = "Please enter your password";
ret = str_append_printf(&str, login_msg_start, pmsg);
if (ret < 0) {
@@ -205,8 +205,11 @@ int get_auth_handler2(worker_st * ws, unsigned http_ver, const char *pmsg)
}
} else {
if (pmsg == NULL)
pmsg = "Please enter your username";
/* ask for username and groups */
ret = str_append_printf(&str, login_msg_start, "Please enter your username");
ret = str_append_printf(&str, login_msg_start, pmsg);
if (ret < 0) {
ret = -1;
goto cleanup;
@@ -1108,7 +1111,7 @@ int post_auth_handler(worker_st * ws, unsigned http_ver)
if (ws->cert_groups_size > 0 && ws->groupname[0] == 0) {
oclog(ws, LOG_DEBUG, "user haven't selected group");
goto ask_auth;
return get_auth_handler2(ws, http_ver, "Please select your group");
}
ireq.tls_auth_ok = 1;