diff options
| -rw-r--r-- | bin/pax/extern.h | 4 | ||||
| -rw-r--r-- | bin/pax/file_subs.c | 12 |
2 files changed, 9 insertions, 7 deletions
diff --git a/bin/pax/extern.h b/bin/pax/extern.h index 2d04bdcfc01..67a21d86611 100644 --- a/bin/pax/extern.h +++ b/bin/pax/extern.h @@ -1,4 +1,4 @@ -/* $OpenBSD: extern.h,v 1.59 2018/09/13 12:33:43 millert Exp $ */ +/* $OpenBSD: extern.h,v 1.60 2020/03/23 20:04:19 espie Exp $ */ /* $NetBSD: extern.h,v 1.5 1996/03/26 23:54:16 mrg Exp $ */ /*- @@ -128,7 +128,7 @@ int cross_lnk(ARCHD *); int chk_same(ARCHD *); int node_creat(ARCHD *); int unlnk_exist(char *, int); -int chk_path(char *, uid_t, gid_t); +int chk_path(char *, uid_t, gid_t, int); void set_ftime(const char *, const struct timespec *, const struct timespec *, int); void fset_ftime(const char *, int, const struct timespec *, diff --git a/bin/pax/file_subs.c b/bin/pax/file_subs.c index be8d0659590..34c59d22d69 100644 --- a/bin/pax/file_subs.c +++ b/bin/pax/file_subs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: file_subs.c,v 1.54 2019/06/28 13:34:59 deraadt Exp $ */ +/* $OpenBSD: file_subs.c,v 1.55 2020/03/23 20:04:19 espie Exp $ */ /* $NetBSD: file_subs.c,v 1.4 1995/03/21 09:07:18 cgd Exp $ */ /*- @@ -102,7 +102,7 @@ file_creat(ARCHD *arcn) file_mode)) >= 0) break; oerrno = errno; - if (nodirs || chk_path(arcn->name,arcn->sb.st_uid,arcn->sb.st_gid) < 0) { + if (nodirs || chk_path(arcn->name,arcn->sb.st_uid,arcn->sb.st_gid, 0) < 0) { syswarn(1, oerrno, "Unable to create %s", arcn->name); return(-1); } @@ -316,7 +316,7 @@ mk_link(char *to, struct stat *to_sb, char *from, int ign) if (linkat(AT_FDCWD, to, AT_FDCWD, from, 0) == 0) break; oerrno = errno; - if (!nodirs && chk_path(from, to_sb->st_uid, to_sb->st_gid) == 0) + if (!nodirs && chk_path(from, to_sb->st_uid, to_sb->st_gid, ign) == 0) continue; if (!ign) { syswarn(1, oerrno, "Could not link to %s from %s", to, @@ -458,7 +458,7 @@ badlink: if (++pass <= 1) continue; - if (nodirs || chk_path(nm,arcn->sb.st_uid,arcn->sb.st_gid) < 0) { + if (nodirs || chk_path(nm,arcn->sb.st_uid,arcn->sb.st_gid, 0) < 0) { syswarn(1, oerrno, "Could not create: %s", nm); return(-1); } @@ -590,7 +590,7 @@ unlnk_exist(char *name, int type) */ int -chk_path(char *name, uid_t st_uid, gid_t st_gid) +chk_path(char *name, uid_t st_uid, gid_t st_gid, int ign) { char *spt = name; char *next; @@ -643,6 +643,8 @@ chk_path(char *name, uid_t st_uid, gid_t st_gid) * needed directory and continue on */ if (mkdir(name, S_IRWXU | S_IRWXG | S_IRWXO) == -1) { + if (!ign) + syswarn(1, errno, "Unable to mkdir %s", name); *spt = '/'; retval = -1; break; |