From bce2f1d7b9067b8db97942e6ae26fd681b698e9b Mon Sep 17 00:00:00 2001 From: Alexander Leidinger Date: Sat, 11 Aug 2018 16:12:23 +0000 Subject: [PATCH] Re-enable reading byte swapped NFS_MAGIC dumps. Fix bug introduced in r98542: previously to this revision the byte-swapped value was compared at this place. The current check is in a conditional section where the non-byte-swapped value was already checked to be not the value which is checked again. As byte-swapping is activated afterwards, it only makes sense if the byte-swapped value is checked. Submitted by: Keith White PR: 200059 MFC after: 1 month Sponsored by: Essen Hackathon --- sbin/restore/tape.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sbin/restore/tape.c b/sbin/restore/tape.c index 04cda7ebd636..16dba12e673c 100644 --- a/sbin/restore/tape.c +++ b/sbin/restore/tape.c @@ -1314,8 +1314,8 @@ gethead(struct s_spcl *buf) return (FAIL); } if (swabl(buf->c_magic) != FS_UFS2_MAGIC && - buf->c_magic != NFS_MAGIC) { - if (buf->c_magic == OFS_MAGIC) { + swabl(buf->c_magic) != NFS_MAGIC) { + if (swabl(buf->c_magic) == OFS_MAGIC) { fprintf(stderr, "Format of dump tape is too old. Must use\n"); fprintf(stderr,