From: Andrew Deason Date: Mon, 19 Sep 2011 15:05:59 +0000 (-0400) Subject: ntohs ubik header size X-Git-Tag: upstream/1.8.0_pre1^2~3248 X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=e69714739f64475d71633fd4cb3523bc1ae143bb;p=packages%2Fo%2Fopenafs.git ntohs ubik header size The 'size' field in the ubik header is only 16-bits wide, so we should be using ntohs to read it, not ntohl. The database checking utilities for the prdb and kadb were still using ntohl (vldb was fixed by 591f9b6de9ab3dc5c17ad41af0241527f7f04b31). Change-Id: Ic3894f5ae78ff05279e87b364841c5f6dfdf803c Reviewed-on: http://gerrit.openafs.org/5466 Reviewed-by: Derrick Brashear Tested-by: BuildBot --- diff --git a/src/kauth/rebuild.c b/src/kauth/rebuild.c index 2722b3571..6794d9d42 100644 --- a/src/kauth/rebuild.c +++ b/src/kauth/rebuild.c @@ -55,7 +55,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); diff --git a/src/ptserver/db_verify.c b/src/ptserver/db_verify.c index 1a51a4025..2a95e349c 100644 --- a/src/ptserver/db_verify.c +++ b/src/ptserver/db_verify.c @@ -210,7 +210,7 @@ readUbikHeader(struct misc_data *misc) } 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);