diff options
| author | Baptiste Daroussin <bapt@FreeBSD.org> | 2016-09-30 23:38:26 +0000 |
|---|---|---|
| committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2016-09-30 23:38:26 +0000 |
| commit | b72aa2905228af88a6fa868a6afefa013d077f44 (patch) | |
| tree | c899386e196e3b936e9993c46f2b3f898f5826e4 /contrib/dma | |
| parent | 6a21906beaa79cc3fcbd24d777c833a15ea6b03c (diff) | |
| parent | bf3a47a7ab4802326f33d469e02f6632c12946e9 (diff) | |
| download | src-b72aa2905228af88a6fa868a6afefa013d077f44.tar.gz src-b72aa2905228af88a6fa868a6afefa013d077f44.zip | |
Import dma 20160929
MFC after: 1 week
Notes
Notes:
svn path=/head/; revision=306541
Diffstat (limited to 'contrib/dma')
| -rw-r--r-- | contrib/dma/dma-mbox-create.c | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/contrib/dma/dma-mbox-create.c b/contrib/dma/dma-mbox-create.c index 45a4792a3f6f..80088601f2d7 100644 --- a/contrib/dma/dma-mbox-create.c +++ b/contrib/dma/dma-mbox-create.c @@ -89,9 +89,7 @@ main(int argc, char **argv) struct group *gr; uid_t user_uid; gid_t mail_gid; - int error; - char fn[PATH_MAX+1]; - int f; + int f, maildirfd; openlog("dma-mbox-create", 0, LOG_MAIL); @@ -131,26 +129,22 @@ main(int argc, char **argv) if (!pw) logfail(EX_NOUSER, "cannot find user `%s'", user); - user_uid = pw->pw_uid; + maildirfd = open(_PATH_MAILDIR, O_RDONLY); + if (maildirfd < 0) + logfail(EX_NOINPUT, "cannot open maildir %s", _PATH_MAILDIR); - error = snprintf(fn, sizeof(fn), "%s/%s", _PATH_MAILDIR, user); - if (error < 0 || (size_t)error >= sizeof(fn)) { - if (error >= 0) { - errno = 0; - logfail(EX_USAGE, "mbox path too long"); - } - logfail(EX_CANTCREAT, "cannot build mbox path for `%s/%s'", _PATH_MAILDIR, user); - } + user_uid = pw->pw_uid; - f = open(fn, O_RDONLY|O_CREAT|O_NOFOLLOW, 0600); + f = openat(maildirfd, user, O_RDONLY|O_CREAT|O_NOFOLLOW, 0600); if (f < 0) - logfail(EX_NOINPUT, "cannt open mbox `%s'", fn); + logfail(EX_NOINPUT, "cannot open mbox `%s'", user); if (fchown(f, user_uid, mail_gid)) - logfail(EX_OSERR, "cannot change owner of mbox `%s'", fn); + logfail(EX_OSERR, "cannot change owner of mbox `%s'", user); if (fchmod(f, 0620)) - logfail(EX_OSERR, "cannot change permissions of mbox `%s'", fn); + logfail(EX_OSERR, "cannot change permissions of mbox `%s'", + user); /* file should be present with the right owner and permissions */ |