From cc2ea78d4c2ed45d3923501b0ca2b5388f54a61c Mon Sep 17 00:00:00 2001 From: Matt Simerson Date: Fri, 6 Dec 2024 12:38:44 -0800 Subject: [PATCH 1/2] vmysql: expand remote_ip to store IPv6 - expand user to match vpopmail table --- vmysql.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/vmysql.h b/vmysql.h index 0597ad3..a7f559d 100644 --- a/vmysql.h +++ b/vmysql.h @@ -91,9 +91,9 @@ primary key (pw_name ) " timestamp char(12), primary key (ip_addr)" #define LASTAUTH_TABLE_LAYOUT \ -"user char(32) NOT NULL, \ +"user char(64) NOT NULL, \ domain char(96) NOT NULL,\ -remote_ip char(18) not null, \ +remote_ip varchar(39) not null, \ timestamp bigint default 0 NOT NULL, \ primary key (user, domain)" @@ -264,9 +264,9 @@ INDEX (alias, domain)" #ifdef ENABLE_SQL_LOGGING #define VLOG_TABLE_LAYOUT "id BIGINT PRIMARY KEY AUTO_INCREMENT, \ - user char(32), passwd CHAR(32), \ + user char(64), passwd CHAR(32), \ domain CHAR(96), logon VARCHAR(200), \ - remoteip char(18), message VARCHAR(255), \ + remoteip varchar(39), message VARCHAR(255), \ timestamp bigint default 0 NOT NULL, error INT, \ INDEX user_idx (user), \ INDEX domain_idx (domain), INDEX remoteip_idx (remoteip), \ From f4cad7cd9e0b2578eb9a9df12cf77dc162ed1417 Mon Sep 17 00:00:00 2001 From: Matt Simerson Date: Sun, 8 Dec 2024 10:46:04 -0800 Subject: [PATCH 2/2] also update ip_addr fields to 39 bytes --- vmysql.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vmysql.h b/vmysql.h index a7f559d..df85971 100644 --- a/vmysql.h +++ b/vmysql.h @@ -87,7 +87,7 @@ primary key (pw_name ) " #endif #endif -#define RELAY_TABLE_LAYOUT "ip_addr char(18) not null, \ +#define RELAY_TABLE_LAYOUT "ip_addr varchar(39) not null, \ timestamp char(12), primary key (ip_addr)" #define LASTAUTH_TABLE_LAYOUT \ @@ -225,7 +225,7 @@ where pw_name = \"%s\" " #endif #ifdef IP_ALIAS_DOMAINS -#define IP_ALIAS_TABLE_LAYOUT "ip_addr char(18) not null, domain char(96), primary key(ip_addr)" +#define IP_ALIAS_TABLE_LAYOUT "ip_addr varchar(39) not null, domain char(96), primary key(ip_addr)" #endif #define DIR_CONTROL_TABLE_LAYOUT "domain char(96) not null, cur_users int, \