summaryrefslogtreecommitdiffstats
path: root/usr.bin/cpio/cpio.h
diff options
context:
space:
mode:
authorkientzle <kientzle@FreeBSD.org>2010-08-08 01:25:33 +0000
committerkientzle <kientzle@FreeBSD.org>2010-08-08 01:25:33 +0000
commit53521b51507eb171400e2c3246d016fc637d03e2 (patch)
tree1f09d3a85cae92398260269902fb5dff7722a3d8 /usr.bin/cpio/cpio.h
parent08ccc1c1b2d4b08f092d43dcd5d8135cd00a1582 (diff)
downloadFreeBSD-src-53521b51507eb171400e2c3246d016fc637d03e2.zip
FreeBSD-src-53521b51507eb171400e2c3246d016fc637d03e2.tar.gz
Fix -R when used with -p. Previously, the
uname and gname weren't overwritten, so the disk restore would use those to lookup the original uid/gid again. Clearing the uname and gname prevents this. Reported by: swell.k MFC after: 7 days
Diffstat (limited to 'usr.bin/cpio/cpio.h')
-rw-r--r--usr.bin/cpio/cpio.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/usr.bin/cpio/cpio.h b/usr.bin/cpio/cpio.h
index 36dab55..2afa8f2 100644
--- a/usr.bin/cpio/cpio.h
+++ b/usr.bin/cpio/cpio.h
@@ -68,7 +68,9 @@ struct cpio {
size_t pass_destpath_alloc;
char *pass_destpath;
int uid_override;
+ char *uname_override;
int gid_override;
+ char *gname_override;
int day_first; /* true if locale prefers day/mon */
/* If >= 0, then close this when done. */
OpenPOWER on IntegriCloud