d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Re-enable reading byte swapped NFS_MAGIC dumps.

Browse Source 
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 <kwhite@site.uottawa.ca>
PR:		200059
MFC after:	1 month
Sponsored by:	Essen Hackathon
This commit is contained in:
Alexander Leidinger 2018-08-11 16:12:23 +00:00
parent edb1df35b0
commit bce2f1d7b9
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sbin/restore/tape.c
View File

@ -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,