head	1.1;
access;
symbols
	pkgsrc-2026Q1:1.1.0.86
	pkgsrc-2026Q1-base:1.1
	pkgsrc-2025Q4:1.1.0.84
	pkgsrc-2025Q4-base:1.1
	pkgsrc-2025Q3:1.1.0.82
	pkgsrc-2025Q3-base:1.1
	pkgsrc-2025Q2:1.1.0.80
	pkgsrc-2025Q2-base:1.1
	pkgsrc-2025Q1:1.1.0.78
	pkgsrc-2025Q1-base:1.1
	pkgsrc-2024Q4:1.1.0.76
	pkgsrc-2024Q4-base:1.1
	pkgsrc-2024Q3:1.1.0.74
	pkgsrc-2024Q3-base:1.1
	pkgsrc-2024Q2:1.1.0.72
	pkgsrc-2024Q2-base:1.1
	pkgsrc-2024Q1:1.1.0.70
	pkgsrc-2024Q1-base:1.1
	pkgsrc-2023Q4:1.1.0.68
	pkgsrc-2023Q4-base:1.1
	pkgsrc-2023Q3:1.1.0.66
	pkgsrc-2023Q3-base:1.1
	pkgsrc-2023Q2:1.1.0.64
	pkgsrc-2023Q2-base:1.1
	pkgsrc-2023Q1:1.1.0.62
	pkgsrc-2023Q1-base:1.1
	pkgsrc-2022Q4:1.1.0.60
	pkgsrc-2022Q4-base:1.1
	pkgsrc-2022Q3:1.1.0.58
	pkgsrc-2022Q3-base:1.1
	pkgsrc-2022Q2:1.1.0.56
	pkgsrc-2022Q2-base:1.1
	pkgsrc-2022Q1:1.1.0.54
	pkgsrc-2022Q1-base:1.1
	pkgsrc-2021Q4:1.1.0.52
	pkgsrc-2021Q4-base:1.1
	pkgsrc-2021Q3:1.1.0.50
	pkgsrc-2021Q3-base:1.1
	pkgsrc-2021Q2:1.1.0.48
	pkgsrc-2021Q2-base:1.1
	pkgsrc-2021Q1:1.1.0.46
	pkgsrc-2021Q1-base:1.1
	pkgsrc-2020Q4:1.1.0.44
	pkgsrc-2020Q4-base:1.1
	pkgsrc-2020Q3:1.1.0.42
	pkgsrc-2020Q3-base:1.1
	pkgsrc-2020Q2:1.1.0.38
	pkgsrc-2020Q2-base:1.1
	pkgsrc-2020Q1:1.1.0.18
	pkgsrc-2020Q1-base:1.1
	pkgsrc-2019Q4:1.1.0.40
	pkgsrc-2019Q4-base:1.1
	pkgsrc-2019Q3:1.1.0.36
	pkgsrc-2019Q3-base:1.1
	pkgsrc-2019Q2:1.1.0.34
	pkgsrc-2019Q2-base:1.1
	pkgsrc-2019Q1:1.1.0.32
	pkgsrc-2019Q1-base:1.1
	pkgsrc-2018Q4:1.1.0.30
	pkgsrc-2018Q4-base:1.1
	pkgsrc-2018Q3:1.1.0.28
	pkgsrc-2018Q3-base:1.1
	pkgsrc-2018Q2:1.1.0.26
	pkgsrc-2018Q2-base:1.1
	pkgsrc-2018Q1:1.1.0.24
	pkgsrc-2018Q1-base:1.1
	pkgsrc-2017Q4:1.1.0.22
	pkgsrc-2017Q4-base:1.1
	pkgsrc-2017Q3:1.1.0.20
	pkgsrc-2017Q3-base:1.1
	pkgsrc-2017Q2:1.1.0.16
	pkgsrc-2017Q2-base:1.1
	pkgsrc-2017Q1:1.1.0.14
	pkgsrc-2017Q1-base:1.1
	pkgsrc-2016Q4:1.1.0.12
	pkgsrc-2016Q4-base:1.1
	pkgsrc-2016Q3:1.1.0.10
	pkgsrc-2016Q3-base:1.1
	pkgsrc-2016Q2:1.1.0.8
	pkgsrc-2016Q2-base:1.1
	pkgsrc-2016Q1:1.1.0.6
	pkgsrc-2016Q1-base:1.1
	pkgsrc-2015Q4:1.1.0.4
	pkgsrc-2015Q4-base:1.1
	pkgsrc-2015Q3:1.1.0.2
	pkgsrc-2015Q3-base:1.1;
locks; strict;
comment	@// @;


1.1
date	2015.09.03.11.55.40;	author sborrill;	state Exp;
branches;
next	;
commitid	5CScCic19GwqLNzy;


desc
@@


1.1
log
@Fix some bugs related to maxuploadsize. Without these patches, all file
uploads are blocked irrespective of what is set in the configuration files.
Remove MESSAGE as licence has changed, it is now entirely GPL.
Bump PKGREVISION.
@
text
@$NetBSD$

maxuploadsize is NOT dependent upon SMTP

--- src/FOptionContainer.cpp.orig	2015-09-03 12:08:34.000000000 +0100
+++ src/FOptionContainer.cpp	2015-09-03 12:09:05.000000000 +0100
@@@@ -304,14 +304,6 @@@@
 		violationbody="";
 
 		threshold = findoptionI("threshold");
-                // TODO: Implement a "findoptionO" and a version of
-                // reality check which uses off_t, for large file support?
-                max_upload_size = findoptionI("maxuploadsize");
-                if (!realitycheck(max_upload_size, -1, 0, "maxuploadsize")) {
-                        return false;
-                }               // check its a reasonable value
-                max_upload_size *= 1024;
-
 		avadmin = findoptionS("avadmin");
 		if (avadmin.length()==0) {
 			if (notifyav==1) {
@@@@ -358,6 +350,14 @@@@
 		}
 #endif
 	   
+                // TODO: Implement a "findoptionO" and a version of
+                // reality check which uses off_t, for large file support?
+                max_upload_size = findoptionI("maxuploadsize");
+                if (!realitycheck(max_upload_size, -1, 0, "maxuploadsize")) {
+                        return false;
+                }               // check its a reasonable value
+                max_upload_size *= 1024;
+
 		// override default reporting level
 		String temp_reporting_level(findoptionS("reportinglevel"));
 		if (temp_reporting_level != "") {
@