From 4e7767c7b906269153f940907e53eb6c797db296 Mon Sep 17 00:00:00 2001
From: Bruce Evans <bde@FreeBSD.org>
Date: Fri, 1 Jan 1999 13:15:02 +0000
Subject: [PATCH] Fixed overflow in 1K-blocks to disk-blocks conversions.  Use
 quad arithmetic instead of the special macros in PR 8163 or the magic 2's in
 PR 381.  (Rev.1.3 unfortunately fixed only half of the problems reported in
 PR 381.)

PR:		381, 8163
---
 usr.sbin/edquota/edquota.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/usr.sbin/edquota/edquota.c b/usr.sbin/edquota/edquota.c
index 011037175ce5..0d983a9a3ec6 100644
--- a/usr.sbin/edquota/edquota.c
+++ b/usr.sbin/edquota/edquota.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)edquota.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+	"$Id: edquota.c,v 1.7 1997/09/17 06:29:23 charnier Exp $";
 #endif /* not lint */
 
 /*
@@ -469,9 +469,11 @@ readprivs(quplist, inname)
 			warnx("%s:%s: bad format", fsp, cp);
 			return (0);
 		}
-		dqblk.dqb_curblocks = btodb(dqblk.dqb_curblocks * 1024);
-		dqblk.dqb_bsoftlimit = btodb(dqblk.dqb_bsoftlimit * 1024);
-		dqblk.dqb_bhardlimit = btodb(dqblk.dqb_bhardlimit * 1024);
+		dqblk.dqb_curblocks = btodb((off_t)dqblk.dqb_curblocks * 1024);
+		dqblk.dqb_bsoftlimit = btodb((off_t)dqblk.dqb_bsoftlimit
+		    * 1024);
+		dqblk.dqb_bhardlimit = btodb((off_t)dqblk.dqb_bhardlimit
+		    * 1024);
 		if ((cp = strtok(line2, "\n")) == NULL) {
 			warnx("%s: %s: bad format", fsp, line2);
 			return (0);