From: Andrew Deason <adeason@sinenomine.net>
Date: Mon, 21 Jun 2010 22:28:10 +0000 (-0500)
Subject: vldb_check: ntohs ubik header size
X-Git-Tag: openafs-devel-1_5_75~102
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=591f9b6de9ab3dc5c17ad41af0241527f7f04b31;p=packages%2Fo%2Fopenafs.git

vldb_check: ntohs ubik header size

The 'size' field in the ubik header is only 16-bits wide. So, we must
use ntohs to convert it, not ntohl. Without this, vldb_check would
emit false-positive "Ubik header size is 0" warnings.

Change-Id: Iaa06b6dc58b7812b359d6096c112e1f3897c60e2
Reviewed-on: http://gerrit.openafs.org/2226
Tested-by: Andrew Deason <adeason@sinenomine.net>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: Derrick Brashear <shadow@dementia.org>
---

diff --git a/src/vlserver/vldb_check.c b/src/vlserver/vldb_check.c
index fa9c8d89e..b6ab212ea 100644
--- a/src/vlserver/vldb_check.c
+++ b/src/vlserver/vldb_check.c
@@ -143,7 +143,7 @@ readUbikHeader(void)
     }
 
     uheader.magic = ntohl(uheader.magic);
-    uheader.size = ntohl(uheader.size);
+    uheader.size = ntohs(uheader.size);
     uheader.version.epoch = ntohl(uheader.version.epoch);
     uheader.version.counter = ntohl(uheader.version.counter);