drop filterconfdir, use lstat instead to filter out non-files

Author: kaniini

doas.c

@@ -198,12 +198,6 @@ isconfdir(const char *dirpath)
 	return 0;
 }
 
-static int
-filterconfdir(const struct dirent *dirent)
-{
-	return dirent->d_type == DT_REG;
-}
-
 static void
 parseconfdir(const char *dirpath, int checkperms)
 {
@@ -215,13 +209,21 @@ parseconfdir(const char *dirpath, int checkperms)
 		err(1, checkperms ? "doas is not enabled, %s" :
 		    "could not open config directory %s", dirpath);
 
-	dirent_count = scandir(dirpath, &dirent_table, filterconfdir, alphasort);
+	dirent_count = scandir(dirpath, &dirent_table, NULL, alphasort);
 
 	for (i = 0; i < dirent_count; i++)
 	{
+		struct stat sb;
+
 		snprintf(pathbuf, sizeof pathbuf, "%s/%s", dirpath, dirent_table[i]->d_name);
 		free(dirent_table[i]);
 
+		if (lstat(pathbuf, &sb) != 0)
+			err(1, "lstat(\"%s\")", pathbuf);
+
+		if ((sb.st_mode & (S_IFMT)) != S_IFREG)
+			continue;
+
 		parseconfig(pathbuf, checkperms);
 	}