From 8431410a5c2d62fde8c62afe489c414998dea677 Mon Sep 17 00:00:00 2001
From: Jittapan Pluemsumran <secret@jittapan.app>
Date: Wed, 14 Aug 2019 20:57:45 +0700
Subject: [PATCH] Reduce list field length in ipbanlist table from 255 to 15
 (#4300)

* Update main.sql

* ipban_cleanup no longer uses hardcoded table name

* Create upgrade_20190814.sql
---
 sql-files/main.sql                      | 2 +-
 sql-files/upgrades/upgrade_20190814.sql | 2 ++
 src/login/ipban.cpp                     | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)
 create mode 100644 sql-files/upgrades/upgrade_20190814.sql

diff --git a/sql-files/main.sql b/sql-files/main.sql
index fbbff0cf99..65457e7ff7 100644
--- a/sql-files/main.sql
+++ b/sql-files/main.sql
@@ -731,7 +731,7 @@ CREATE TABLE IF NOT EXISTS `inventory` (
 --
 
 CREATE TABLE IF NOT EXISTS `ipbanlist` (
-  `list` varchar(255) NOT NULL default '',
+  `list` varchar(15) NOT NULL default '',
   `btime` datetime NOT NULL,
   `rtime` datetime NOT NULL,
   `reason` varchar(255) NOT NULL default '',
diff --git a/sql-files/upgrades/upgrade_20190814.sql b/sql-files/upgrades/upgrade_20190814.sql
new file mode 100644
index 0000000000..3b8e17af88
--- /dev/null
+++ b/sql-files/upgrades/upgrade_20190814.sql
@@ -0,0 +1,2 @@
+ALTER TABLE `ipbanlist`
+	CHANGE COLUMN `list` `list` VARCHAR(15) NOT NULL DEFAULT '' FIRST;
diff --git a/src/login/ipban.cpp b/src/login/ipban.cpp
index 58ef012407..e7790923f8 100644
--- a/src/login/ipban.cpp
+++ b/src/login/ipban.cpp
@@ -100,7 +100,7 @@ TIMER_FUNC(ipban_cleanup){
 	if( !login_config.ipban )
 		return 0;// ipban disabled
 
-	if( SQL_ERROR == Sql_Query(sql_handle, "DELETE FROM `ipbanlist` WHERE `rtime` <= NOW()") )
+	if( SQL_ERROR == Sql_Query(sql_handle, "DELETE FROM `%s` WHERE `rtime` <= NOW()", ipban_table) )
 		Sql_ShowDebug(sql_handle);
 
 	return 0;