Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Aleksandr Konstantinov
arc
Commits
737b3ba9
Commit
737b3ba9
authored
Jun 05, 2018
by
Aleksandr Konstantinov
Browse files
Fix for bug #3715. Properly process configuration sections separator in griftpd.
parent
4079eeaf
Pipeline
#1762
failed with stage
in 83 minutes and 58 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/services/gridftpd/fileroot_config.cpp
View file @
737b3ba9
...
...
@@ -265,7 +265,9 @@ int FileRoot::config(Arc::ConfigIni &cf,std::string &pluginpath) {
case
conf_state_none
:
// not our sub-section
break
;
case
conf_state_single
:
{
// ordinary section
if
(
cf
.
SectionNum
()
==
cfgsec_gridftpd_n
)
{
// [gridftpd]
if
((
command
==
"."
)
&&
(
rest
.
empty
()))
{
// separator
}
else
if
(
cf
.
SectionNum
()
==
cfgsec_gridftpd_n
)
{
// [gridftpd]
if
(
command
==
"encryption"
)
{
/* is encryption allowed ? */
std
::
string
value
=
Arc
::
ConfigIni
::
NextArg
(
rest
);
if
(
value
==
"yes"
)
{
...
...
@@ -343,7 +345,9 @@ int FileRoot::config(Arc::ConfigIni &cf,std::string &pluginpath) {
};
break
;
case
conf_state_group
:
{
/* definition of authorization group */
if
(
command
==
"name"
)
{
if
((
command
==
"."
)
&&
(
rest
.
empty
()))
{
// separator
}
else
if
(
command
==
"name"
)
{
group_name
=
rest
;
}
else
{
if
(
group_decision
==
AAA_NO_MATCH
)
{
// not decided yet
...
...
@@ -359,7 +363,9 @@ int FileRoot::config(Arc::ConfigIni &cf,std::string &pluginpath) {
};
break
;
case
conf_state_plugin
:
{
// plugin configuration processing
if
(
command
==
"allowaccess"
)
{
if
((
command
==
"."
)
&&
(
rest
.
empty
()))
{
// separator
}
else
if
(
command
==
"allowaccess"
)
{
user
.
user
.
select_group
(
NULL
);
if
(
rest
.
find_first_not_of
(
"
\t
"
)
==
std
::
string
::
npos
)
{
logger
.
msg
(
Arc
::
ERROR
,
"Missing authgroup name in allowaccess"
);
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment