From 9013fd63d7c9addd5bf6a4b91850d642673a4667 Mon Sep 17 00:00:00 2001 From: Michael Kaufmann Date: Thu, 22 Dec 2022 19:16:26 +0100 Subject: [PATCH] correct pure-ftpd quota-query Signed-off-by: Michael Kaufmann --- lib/configfiles/bionic.xml | 2 +- lib/configfiles/bookworm.xml | 2 +- lib/configfiles/bullseye.xml | 2 +- lib/configfiles/buster.xml | 2 +- lib/configfiles/focal.xml | 2 +- lib/configfiles/gentoo.xml | 2 +- lib/configfiles/jammy.xml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/configfiles/bionic.xml b/lib/configfiles/bionic.xml index 971cac50..9f5ce5cf 100644 --- a/lib/configfiles/bionic.xml +++ b/lib/configfiles/bionic.xml @@ -4503,7 +4503,7 @@ MYSQLGetDir SELECT homedir FROM ftp_users WHERE username="\L" AND login_enab # The number should be in Megabytes. # Pure-FTPd must have been compiled with virtual quotas support. -MySQLGetQTASZ SELECT panel_customers.diskspace/1024 AS QuotaSize FROM panel_customers, ftp_users WHERE username = "\L" AND panel_customers.loginname = SUBSTRING_INDEX('\L', 'ftp', 1) +MySQLGetQTASZ SELECT CASE WHEN panel_customers.diskspace = 0 THEN -1 WHEN panel_customers.diskspace <= -1 THEN 0 ELSE panel_customers.diskspace/1024 END AS QuotaSize FROM panel_customers, ftp_users WHERE username = "\L" AND panel_customers.loginname = SUBSTRING_INDEX('\L', 'ftp', 1) # Optional : ratios. The server has to be compiled with ratio support. diff --git a/lib/configfiles/bookworm.xml b/lib/configfiles/bookworm.xml index 84c6fce2..8fab28cc 100644 --- a/lib/configfiles/bookworm.xml +++ b/lib/configfiles/bookworm.xml @@ -3141,7 +3141,7 @@ MYSQLGetDir SELECT homedir FROM ftp_users WHERE username="\L" AND login_enab # The number should be in Megabytes. # Pure-FTPd must have been compiled with virtual quotas support. -MySQLGetQTASZ SELECT panel_customers.diskspace/1024 AS QuotaSize FROM panel_customers, ftp_users WHERE username = "\L" AND panel_customers.loginname = SUBSTRING_INDEX('\L', 'ftp', 1) +MySQLGetQTASZ SELECT CASE WHEN panel_customers.diskspace = 0 THEN -1 WHEN panel_customers.diskspace <= -1 THEN 0 ELSE panel_customers.diskspace/1024 END AS QuotaSize FROM panel_customers, ftp_users WHERE username = "\L" AND panel_customers.loginname = SUBSTRING_INDEX('\L', 'ftp', 1) # Optional : ratios. The server has to be compiled with ratio support. diff --git a/lib/configfiles/bullseye.xml b/lib/configfiles/bullseye.xml index 5d2c9f7d..7dc7a0b4 100644 --- a/lib/configfiles/bullseye.xml +++ b/lib/configfiles/bullseye.xml @@ -4711,7 +4711,7 @@ MYSQLGetDir SELECT homedir FROM ftp_users WHERE username="\L" AND login_enab # The number should be in Megabytes. # Pure-FTPd must have been compiled with virtual quotas support. -MySQLGetQTASZ SELECT panel_customers.diskspace/1024 AS QuotaSize FROM panel_customers, ftp_users WHERE username = "\L" AND panel_customers.loginname = SUBSTRING_INDEX('\L', 'ftp', 1) +MySQLGetQTASZ SELECT CASE WHEN panel_customers.diskspace = 0 THEN -1 WHEN panel_customers.diskspace <= -1 THEN 0 ELSE panel_customers.diskspace/1024 END AS QuotaSize FROM panel_customers, ftp_users WHERE username = "\L" AND panel_customers.loginname = SUBSTRING_INDEX('\L', 'ftp', 1) # Optional : ratios. The server has to be compiled with ratio support. diff --git a/lib/configfiles/buster.xml b/lib/configfiles/buster.xml index d5a58791..fcca81c3 100644 --- a/lib/configfiles/buster.xml +++ b/lib/configfiles/buster.xml @@ -4702,7 +4702,7 @@ MYSQLGetDir SELECT homedir FROM ftp_users WHERE username="\L" AND login_enab # The number should be in Megabytes. # Pure-FTPd must have been compiled with virtual quotas support. -MySQLGetQTASZ SELECT panel_customers.diskspace/1024 AS QuotaSize FROM panel_customers, ftp_users WHERE username = "\L" AND panel_customers.loginname = SUBSTRING_INDEX('\L', 'ftp', 1) +MySQLGetQTASZ SELECT CASE WHEN panel_customers.diskspace = 0 THEN -1 WHEN panel_customers.diskspace <= -1 THEN 0 ELSE panel_customers.diskspace/1024 END AS QuotaSize FROM panel_customers, ftp_users WHERE username = "\L" AND panel_customers.loginname = SUBSTRING_INDEX('\L', 'ftp', 1) # Optional : ratios. The server has to be compiled with ratio support. diff --git a/lib/configfiles/focal.xml b/lib/configfiles/focal.xml index fd6f4e64..633b3f0f 100644 --- a/lib/configfiles/focal.xml +++ b/lib/configfiles/focal.xml @@ -3930,7 +3930,7 @@ MYSQLGetDir SELECT homedir FROM ftp_users WHERE username="\L" AND login_enab # The number should be in Megabytes. # Pure-FTPd must have been compiled with virtual quotas support. -MySQLGetQTASZ SELECT panel_customers.diskspace/1024 AS QuotaSize FROM panel_customers, ftp_users WHERE username = "\L" AND panel_customers.loginname = SUBSTRING_INDEX('\L', 'ftp', 1) +MySQLGetQTASZ SELECT CASE WHEN panel_customers.diskspace = 0 THEN -1 WHEN panel_customers.diskspace <= -1 THEN 0 ELSE panel_customers.diskspace/1024 END AS QuotaSize FROM panel_customers, ftp_users WHERE username = "\L" AND panel_customers.loginname = SUBSTRING_INDEX('\L', 'ftp', 1) # Optional : ratios. The server has to be compiled with ratio support. diff --git a/lib/configfiles/gentoo.xml b/lib/configfiles/gentoo.xml index 3ceaf204..46b681bc 100644 --- a/lib/configfiles/gentoo.xml +++ b/lib/configfiles/gentoo.xml @@ -3581,7 +3581,7 @@ MYSQLGetPW SELECT password FROM ftp_users WHERE username="\L" AND login_ena MYSQLGetUID SELECT uid FROM ftp_users WHERE username="\L" AND login_enabled="y" MYSQLGetGID SELECT gid FROM ftp_users WHERE username="\L" AND login_enabled="y" MYSQLGetDir SELECT homedir FROM ftp_users WHERE username="\L" AND login_enabled="y" -MySQLGetQTASZ SELECT panel_customers.diskspace/1024 AS QuotaSize FROM panel_customers, ftp_users WHERE username = "\L" AND panel_customers.loginname = SUBSTRING_INDEX('\L', 'ftp', 1) +MySQLGetQTASZ SELECT CASE WHEN panel_customers.diskspace = 0 THEN -1 WHEN panel_customers.diskspace <= -1 THEN 0 ELSE panel_customers.diskspace/1024 END AS QuotaSize FROM panel_customers, ftp_users WHERE username = "\L" AND panel_customers.loginname = SUBSTRING_INDEX('\L', 'ftp', 1) ]]> diff --git a/lib/configfiles/jammy.xml b/lib/configfiles/jammy.xml index 339e88eb..9a99f0f7 100644 --- a/lib/configfiles/jammy.xml +++ b/lib/configfiles/jammy.xml @@ -3920,7 +3920,7 @@ MYSQLGetDir SELECT homedir FROM ftp_users WHERE username="\L" AND login_enab # The number should be in Megabytes. # Pure-FTPd must have been compiled with virtual quotas support. -MySQLGetQTASZ SELECT panel_customers.diskspace/1024 AS QuotaSize FROM panel_customers, ftp_users WHERE username = "\L" AND panel_customers.loginname = SUBSTRING_INDEX('\L', 'ftp', 1) +MySQLGetQTASZ SELECT CASE WHEN panel_customers.diskspace = 0 THEN -1 WHEN panel_customers.diskspace <= -1 THEN 0 ELSE panel_customers.diskspace/1024 END AS QuotaSize FROM panel_customers, ftp_users WHERE username = "\L" AND panel_customers.loginname = SUBSTRING_INDEX('\L', 'ftp', 1) # Optional : ratios. The server has to be compiled with ratio support.