make pw_init and gr_init fail if the specified master password or group file is
a directory. MFC after: 1 month
This commit is contained in:
parent
feb8a1f5f5
commit
29e575503c
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=242319
@ -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);
|
||||
}
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user