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

when the default group is selected, don't treat it as no selection

Browse Source
This commit is contained in:
Nikos Mavrogiannopoulos
2014-08-28 10:08:42 +02:00
parent b52c49f133
commit abe6d2d190
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/worker-auth.c
View File

@@ -1062,6 +1062,7 @@ int post_auth_handler(worker_st * ws, unsigned http_ver)
char *groupname = NULL;
char ipbuf[128];
char msg[MAX_MSG_SIZE];
unsigned def_group = 0;
oclog(ws, LOG_HTTP_DEBUG, "POST body: '%.*s'", (int)req->body_length,
req->body);
@@ -1085,11 +1086,15 @@ int post_auth_handler(worker_st * ws, unsigned http_ver)
if (ret < 0) {
oclog(ws, LOG_DEBUG, "failed reading groupname");
} else if (ws->config->default_select_group == NULL ||
strcmp(groupname, ws->config->default_select_group) != 0) {
snprintf(ws->groupname, sizeof(ws->groupname), "%s",
groupname);
ireq.group_name = ws->groupname;
} else {
if (ws->config->default_select_group != NULL &&
strcmp(groupname, ws->config->default_select_group) == 0) {
def_group = 1;
} else {
snprintf(ws->groupname, sizeof(ws->groupname), "%s",
groupname);
ireq.group_name = ws->groupname;
}
}
talloc_free(groupname);
@@ -1126,7 +1131,7 @@ int post_auth_handler(worker_st * ws, unsigned http_ver)
goto auth_fail;
}
if (ws->cert_groups_size > 0 && ws->groupname[0] == 0) {
if (def_group == 0 && ws->cert_groups_size > 0 && ws->groupname[0] == 0) {
oclog(ws, LOG_DEBUG, "user has not selected a group");
return get_auth_handler2(ws, http_ver, "Please select your group");
}