fall back to /etc/doas.conf if /etc/doas.d is not present

Author: kaniini

doas.c

@@ -183,6 +183,21 @@ parseconfig(const char *filename, int checkperms)
 }
 
 #ifdef DOAS_CONFDIR
+static int
+isconfdir(const char *dirpath)
+{
+	struct stat sb;
+
+	if (lstat(dirpath, &sb) != 0)
+		err(1, "lstat(\"%s\")", dirpath);
+
+	if ((sb.st_mode & (S_IFMT)) == S_IFDIR)
+		return 1;
+
+	errno = ENOTDIR;
+	return 0;
+}
+
 static int
 filterconfdir(const struct dirent *dirent)
 {
@@ -194,10 +209,9 @@ parseconfdir(const char *dirpath, int checkperms)
 {
 	struct dirent **dirent_table;
 	size_t i, dirent_count;
-
 	char pathbuf[PATH_MAX];
 
-	if (access(dirpath, F_OK))
+	if (!isconfdir(dirpath))
 		err(1, checkperms ? "doas is not enabled, %s" :
 		    "could not open config directory %s", dirpath);
 
@@ -225,7 +239,9 @@ checkconfig(const char *confpath, int argc, char **argv,
 		err(1, "setresuid");
 
 #ifdef DOAS_CONFDIR
-	parseconfdir(confpath, 0);
+	if (isconfdir(confpath))
+		parseconfdir(confpath, 0);
+	else
 #else
 	parseconfig(confpath, 0);
 #endif
@@ -371,7 +387,9 @@ main(int argc, char **argv)
 		errx(1, "not installed setuid");
 
 #ifdef DOAS_CONFDIR
-	parseconfdir(DOAS_CONFDIR, 1);
+	if (isconfdir(DOAS_CONFDIR))
+		parseconfdir(DOAS_CONFDIR, 1);
+	else
 #else
 	parseconfig(DOAS_CONF, 1);
 #endif