From 4bdded24ec69ed08336fbba041b9a449ce5b01be Mon Sep 17 00:00:00 2001 From: Andrew Deason Date: Mon, 19 Sep 2011 11:05:59 -0400 Subject: [PATCH] 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). Reviewed-on: http://gerrit.openafs.org/5466 Reviewed-by: Derrick Brashear Tested-by: BuildBot (cherry picked from commit e69714739f64475d71633fd4cb3523bc1ae143bb) Change-Id: Id4f677cddcedba3008d349bcf9740168129f8496 Reviewed-on: http://gerrit.openafs.org/6314 Reviewed-by: Derrick Brashear Tested-by: Derrick Brashear --- src/kauth/rebuild.c | 2 +- src/ptserver/db_verify.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/kauth/rebuild.c b/src/kauth/rebuild.c index 9c1d0db76e..d6dad28c7a 100644 --- a/src/kauth/rebuild.c +++ b/src/kauth/rebuild.c @@ -69,7 +69,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 5966549d20..e99863902b 100644 --- a/src/ptserver/db_verify.c +++ b/src/ptserver/db_verify.c @@ -217,7 +217,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);