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

switch to strtok_r() and other small fixes.

Browse Source
This commit is contained in:
Nikos Mavrogiannopoulos
2014-02-14 12:42:20 +01:00
parent af6714605b
commit ea39d512dc
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/plain.c
View File

@@ -45,7 +45,7 @@ FILE* fp;
char * line = NULL;
size_t len;
ssize_t ll;
char* p;
char* p, *sp;
int ret;
fp = fopen(pctx->passwd, "r");
@@ -55,25 +55,29 @@ int ret;
}
while((ll=getline(&line, &len, fp)) > 0) {
if (ll <= 2)
if (ll <= 4)
continue;
if (line[ll-1] == '\n')
line[ll-1] = 0;
if (line[ll-2] == '\n')
line[ll-2] = 0;
if (line[ll-1] == '\n') {
ll--;
line[ll] = 0;
}
if (line[ll-1] == '\r') {
ll--;
line[ll] = 0;
}
p = strtok(line, ":");
p = strtok_r(line, ":", &sp);
if (p != NULL && strcmp(pctx->username, p) == 0) {
p = strtok(NULL, ":");
p = strtok_r(NULL, ":", &sp);
if (p != NULL) {
groupname_size = sizeof(pctx->groupname);
groupname_size = snprintf(pctx->groupname, groupname_size, "%s", p);
if (groupname_size == 1) /* values like '*' or 'x' indicate empty group */
pctx->groupname[0] = 0;
p = strtok(NULL, ":");
p = strtok_r(NULL, ":", &sp);
if (p != NULL) {
snprintf(pctx->cpass, sizeof(pctx->cpass), "%s", p);
ret = 0;