mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-27 11:55:06 +00:00
Code Issues Releases Activity

pw: set the user's home directory mode if it existed

Browse Source 
The adduser(8) prompt allows one to set the mode of a new home
directory, but pw(8) doesn't honor the -M mode if the home directory
already exists at creation time.  It doesn't seem to make sense to
ignore the mode (which may lead to a security issue on the system being
configured) when we'll happily chown an existing directory, so fix the
inconsistency.

PR:		280099
Reviewed by:	des, jlduran (previous version)
Differential Revision:	https://reviews.freebsd.org/D46443
This commit is contained in:
Kyle Evans 2024-12-01 13:05:57 -06:00
parent 59677aecb6
commit 6a7238fd7c
2 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
usr.sbin/adduser/adduser.8
View File

@ -27,7 +27,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE. .\" SUCH DAMAGE.
.\" .\"
.Dd April 11, 2024 .Dd December 1, 2024
.Dt ADDUSER 8 .Dt ADDUSER 8
.Os .Os
.Sh NAME .Sh NAME
@ -246,7 +246,9 @@ file can reference the internal variables of the
script. script.
.It Fl M Ar mode .It Fl M Ar mode
Create the home directory with permissions set to Create the home directory with permissions set to
.Ar mode . .Ar mode ,
modified by the current
.Xr umask 2 .
.It Fl N .It Fl N
Do not read the default configuration file. Do not read the default configuration file.
.It Fl q .It Fl q

23
usr.sbin/pw/cpdir.c
View File

@ -49,13 +49,28 @@ copymkdir(int rootfd, char const * dir, int skelfd, mode_t mode, uid_t uid,
if (*dir == '/') if (*dir == '/')
dir++; dir++;
if (mkdirat(rootfd, dir, mode) != 0 && errno != EEXIST) { if (mkdirat(rootfd, dir, mode) != 0) {
mode_t pumask;
if (errno != EEXIST) {
warn("mkdir(%s)", dir); warn("mkdir(%s)", dir);
return; return;
} }
fchownat(rootfd, dir, uid, gid, AT_SYMLINK_NOFOLLOW);
if (flags > 0) pumask = umask(0);
chflagsat(rootfd, dir, flags, AT_SYMLINK_NOFOLLOW); umask(pumask);
if (fchmodat(rootfd, dir, mode & ~pumask,
AT_SYMLINK_NOFOLLOW) == -1)
warn("chmod(%s)", dir);
}
if (fchownat(rootfd, dir, uid, gid, AT_SYMLINK_NOFOLLOW) == -1)
warn("chown(%s)", dir);
if (flags > 0 && chflagsat(rootfd, dir, flags,
AT_SYMLINK_NOFOLLOW) == -1)
warn("chflags(%s)", dir);
if (skelfd == -1) if (skelfd == -1)
return; return;