Compare commits

..

No commits in common. "307d38f6afda4240da65363ef242ff072e9411e4" and "af89d03118e2c14e2121b73961871af89f65d86d" have entirely different histories.

5 changed files with 5 additions and 7 deletions

View File

@ -453,7 +453,7 @@ nfqws,tpws: hostlist/ipset track not only file mod time but also file size
nfqws,tpws,ipset: return lists reload on HUP nfqws,tpws,ipset: return lists reload on HUP
nfqws,blockcheck: --dpi-desync-fake-tls-mod nfqws,blockcheck: --dpi-desync-fake-tls-mod
v70.3 v70.1
nfqws: --dpi-desync-fake-tls-mod=dupsid nfqws: --dpi-desync-fake-tls-mod=dupsid
nfqws,tpws: test accessibility of list files after privs drop nfqws,tpws: test accessibility of list files after privs drop

View File

@ -1,4 +1,4 @@
# zapret v70.3 # zapret v70.1
# SCAMMER WARNING # SCAMMER WARNING

View File

@ -1,4 +1,4 @@
# zapret v70.3 # zapret v70.1
# ВНИМАНИЕ, остерегайтесь мошенников # ВНИМАНИЕ, остерегайтесь мошенников

View File

@ -133,7 +133,7 @@ static bool test_list_files()
return false; return false;
} }
LIST_FOREACH(ifile, &params.ipsets, next) LIST_FOREACH(ifile, &params.ipsets, next)
if (ifile->filename && !file_open_test(ifile->filename, O_RDONLY)) if (hfile->filename && !file_open_test(ifile->filename, O_RDONLY))
{ {
DLOG_PERROR("file_open_test"); DLOG_PERROR("file_open_test");
DLOG_ERR("cannot access ipset file '%s'\n",ifile->filename); DLOG_ERR("cannot access ipset file '%s'\n",ifile->filename);

View File

@ -121,7 +121,6 @@ static bool test_list_files()
struct hostlist_file *hfile; struct hostlist_file *hfile;
struct ipset_file *ifile; struct ipset_file *ifile;
printf("1\n");
LIST_FOREACH(hfile, &params.hostlists, next) LIST_FOREACH(hfile, &params.hostlists, next)
if (hfile->filename && !file_open_test(hfile->filename, O_RDONLY)) if (hfile->filename && !file_open_test(hfile->filename, O_RDONLY))
{ {
@ -130,13 +129,12 @@ printf("1\n");
return false; return false;
} }
LIST_FOREACH(ifile, &params.ipsets, next) LIST_FOREACH(ifile, &params.ipsets, next)
if (ifile->filename && !file_open_test(ifile->filename, O_RDONLY)) if (hfile->filename && !file_open_test(ifile->filename, O_RDONLY))
{ {
DLOG_PERROR("file_open_test"); DLOG_PERROR("file_open_test");
DLOG_ERR("cannot access ipset file '%s'\n",ifile->filename); DLOG_ERR("cannot access ipset file '%s'\n",ifile->filename);
return false; return false;
} }
printf("2\n");
return true; return true;
} }