mirror of
http://git.haproxy.org/git/haproxy.git/
synced 2024-12-25 06:02:08 +00:00
[MINOR] optionnal '-s' command line argument could clobber '-st' and '-sf'
This commit is contained in:
parent
91b76215c2
commit
2c51373bfa
12
haproxy.c
12
haproxy.c
@ -8122,12 +8122,6 @@ void init(int argc, char **argv) {
|
||||
arg_mode |= MODE_DAEMON | MODE_QUIET;
|
||||
else if (*flag == 'q')
|
||||
arg_mode |= MODE_QUIET;
|
||||
#if STATTIME > 0
|
||||
else if (*flag == 's')
|
||||
arg_mode |= MODE_STATS;
|
||||
else if (*flag == 'l')
|
||||
arg_mode |= MODE_LOG;
|
||||
#endif
|
||||
else if (*flag == 's' && (flag[1] == 'f' || flag[1] == 't')) {
|
||||
/* list of pids to finish ('f') or terminate ('t') */
|
||||
|
||||
@ -8148,6 +8142,12 @@ void init(int argc, char **argv) {
|
||||
}
|
||||
}
|
||||
}
|
||||
#if STATTIME > 0
|
||||
else if (*flag == 's')
|
||||
arg_mode |= MODE_STATS;
|
||||
else if (*flag == 'l')
|
||||
arg_mode |= MODE_LOG;
|
||||
#endif
|
||||
else { /* >=2 args */
|
||||
argv++; argc--;
|
||||
if (argc == 0)
|
||||
|
Loading…
Reference in New Issue
Block a user