From 1c739bf2986c2908a8ac674242e5ba32c3d59541 Mon Sep 17 00:00:00 2001
From: Michael Meffie <mmeffie@sinenomine.net>
Date: Tue, 7 Jun 2011 12:37:40 -0400
Subject: [PATCH] volinfo: fix false good magic line

Fix false report of good magic/version numbers in volume
header file.

Reviewed-on: http://gerrit.openafs.org/4817
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Reviewed-by: Jeffrey Altman <jaltman@openafs.org>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
(cherry picked from commit 36f6eed2b458995ab973102acf74375bf0a66931)

Change-Id: Id5972430ae8e2fe374a854c3c33d2837aac48185
Reviewed-on: http://gerrit.openafs.org/11260
Reviewed-by: Chas Williams - CONTRACTOR <chas@cmf.nrl.navy.mil>
Reviewed-by: Andrew Deason <adeason@sinenomine.net>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Stephan Wiesand <stephan.wiesand@desy.de>
---
 src/vol/vol-info.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/vol/vol-info.c b/src/vol/vol-info.c
index 8ee82735d..0723f00da 100644
--- a/src/vol/vol-info.c
+++ b/src/vol/vol-info.c
@@ -324,11 +324,10 @@ ReadHdr1(IHandle_t * ih, char *to, int size, u_int magic, u_int version)
 		    "%s: Write failed for inode %s; header left in damaged state\n",
 		    progname, PrintInode(NULL, ih->ih_ino));
 	}
-    } else {
-	if (DumpInfo) {
-	    printf("Inode %s: Good magic %x and version %x\n",
-		   PrintInode(NULL, ih->ih_ino), magic, version);
-	}
+    }
+    if (!bad && DumpInfo) {
+	printf("Inode %s: Good magic %x and version %x\n",
+	       PrintInode(NULL, ih->ih_ino), magic, version);
     }
     return 0;
 }
-- 
2.39.5