From cb57f04cb26553c23feb9874da15b4386f68a98f Mon Sep 17 00:00:00 2001
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Mon, 29 Oct 2012 17:19:43 +0000
Subject: make pw_init and gr_init fail if the specified master password or
 group file is a directory.

MFC after:	1 month
---
 libutil/gr_util.c | 11 +++++++++++
 libutil/pw_util.c |  9 +++++++++
 2 files changed, 20 insertions(+)

(limited to 'libutil')

diff --git a/libutil/gr_util.c b/libutil/gr_util.c
index 0173595..323d3ff 100644
--- a/libutil/gr_util.c
+++ b/libutil/gr_util.c
@@ -63,6 +63,8 @@ static const char group_line_format[] = "%s:%s:%ju:";
 int
 gr_init(const char *dir, const char *group)
 {
+	struct stat st;
+
 	if (dir == NULL) {
 		strcpy(group_dir, _PATH_ETC);
 	} else {
@@ -88,6 +90,15 @@ gr_init(const char *dir, const char *group)
 		}
 		strcpy(group_file, group);
 	}
+
+	if (stat(group_file, &st) == -1)
+		return (-1);
+
+	if (S_ISDIR(st.st_mode)) {
+		errno = EISDIR;
+		return (-1);
+	}
+
 	initialized = 1;
 	return (0);
 }
diff --git a/libutil/pw_util.c b/libutil/pw_util.c
index 4bf3001..6013e6d 100644
--- a/libutil/pw_util.c
+++ b/libutil/pw_util.c
@@ -96,6 +96,7 @@ pw_init(const char *dir, const char *master)
 #if 0
 	struct rlimit rlim;
 #endif
+	struct stat st;
 
 	if (dir == NULL) {
 		strcpy(passwd_dir, _PATH_ETC);
@@ -123,6 +124,14 @@ pw_init(const char *dir, const char *master)
 		strcpy(masterpasswd, master);
 	}
 
+	if (stat(masterpasswd, &st) == -1)
+		return (-1);
+
+	if (S_ISDIR(st.st_mode)) {
+		errno = EISDIR;
+		return (-1);
+	}
+
 	/*
 	 * The code that follows is extremely disruptive to the calling
 	 * process, and is therefore disabled until someone can conceive
-- 
cgit v1.2.3-56-ge451