Skip to content

Commit

Permalink
fix up the ifndef DOAS_CONFDIR branch
Browse files Browse the repository at this point in the history
  • Loading branch information
kaniini committed Aug 4, 2021
1 parent 35c3e69 commit c9ff0fc
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions doas.c
Original file line number Diff line number Diff line change
Expand Up @@ -267,9 +267,8 @@ checkconfig(const char *confpath, int argc, char **argv,
if (isconfdir(confpath))
parseconfdir(confpath, 0);
else
#else
parseconfig(confpath, 0);
#endif
parseconfig(confpath, 0);
if (!argc)
exit(0);

Expand Down Expand Up @@ -415,9 +414,8 @@ main(int argc, char **argv)
if (isconfdir(DOAS_CONFDIR))
parseconfdir(DOAS_CONFDIR, 1);
else
#else
parseconfig(DOAS_CONF, 1);
#endif
parseconfig(DOAS_CONF, 1);

/* cmdline is used only for logging, no need to abort on truncate */
(void)strlcpy(cmdline, argv[0], sizeof(cmdline));
Expand Down

0 comments on commit c9ff0fc

Please sign in to comment.