| 1 |
robbat2 13/05/30 23:59:11 |
| 2 |
|
| 3 |
Added: qmailadmin-1.2.15-quota-security.patch |
| 4 |
Log: |
| 5 |
Add fix for security issue from bug #269129, and fix compile with vpopmail-5.4.33. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha177/cvs/Linux x86_64, RepoMan options: --force, unsigned Manifest commit) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 net-mail/qmailadmin/files/qmailadmin-1.2.15-quota-security.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-mail/qmailadmin/files/qmailadmin-1.2.15-quota-security.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-mail/qmailadmin/files/qmailadmin-1.2.15-quota-security.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: qmailadmin-1.2.15-quota-security.patch |
| 16 |
=================================================================== |
| 17 |
Previous patch did not fix the 32-bit overflow properly. |
| 18 |
This goes with the vpopmail 5.4.33 matching quota fix (in upstream). |
| 19 |
|
| 20 |
X-Gentoo-Bug: 269129 |
| 21 |
Signed-off-by: Robin H. Johnson <robbat2@g.o> |
| 22 |
|
| 23 |
diff -Nuar qmailadmin-1.2.15.orig/qmailadmin.h qmailadmin-1.2.15/qmailadmin.h |
| 24 |
--- qmailadmin-1.2.15.orig/qmailadmin.h 2013-05-30 23:42:27.689759997 +0000 |
| 25 |
+++ qmailadmin-1.2.15/qmailadmin.h 2013-05-30 23:44:33.870866242 +0000 |
| 26 |
@@ -63,4 +63,4 @@ |
| 27 |
/* copied from maildirquota.c in vpopmail |
| 28 |
* it really needs to get into vpopmail.h somehow |
| 29 |
*/ |
| 30 |
-int readuserquota(const char* dir, long *sizep, int *cntp); |
| 31 |
+//int readuserquota(const char* dir, storage_t *sizep, storage_t *cntp); |
| 32 |
diff -Nuar qmailadmin-1.2.15.orig/template.c qmailadmin-1.2.15/template.c |
| 33 |
--- qmailadmin-1.2.15.orig/template.c 2009-02-06 05:30:05.000000000 +0000 |
| 34 |
+++ qmailadmin-1.2.15/template.c 2013-05-30 23:45:47.319571080 +0000 |
| 35 |
@@ -426,7 +426,7 @@ |
| 36 |
case 'Q': |
| 37 |
vpw = vauth_getpw(ActionUser, Domain); |
| 38 |
if (strncmp(vpw->pw_shell, "NOQUOTA", 2) != 0) { |
| 39 |
- long diskquota = 0; |
| 40 |
- int maxmsg = 0; |
| 41 |
+ uint64_t diskquota = 0; |
| 42 |
+ uint64_t maxmsg = 0; |
| 43 |
char path[256]; |
| 44 |
|
| 45 |
diff -Nuar qmailadmin-1.2.15.orig/user.c qmailadmin-1.2.15/user.c |
| 46 |
--- qmailadmin-1.2.15.orig/user.c 2009-05-02 19:13:29.000000000 +0000 |
| 47 |
+++ qmailadmin-1.2.15/user.c 2013-05-30 23:45:26.039946212 +0000 |
| 48 |
@@ -170,7 +170,7 @@ |
| 49 |
(AdminType==USER_ADMIN && strcmp(pw->pw_name,Username)==0)))) { |
| 50 |
if (AdminType==DOMAIN_ADMIN || |
| 51 |
(AdminType==USER_ADMIN && strcmp(pw->pw_name,Username)==0)) { |
| 52 |
- long diskquota = 0; |
| 53 |
- int maxmsg = 0; |
| 54 |
+ uint64_t diskquota = 0; |
| 55 |
+ uint64_t maxmsg = 0; |
| 56 |
|
| 57 |
/* display account name and user name */ |
Archives