From f358fa2a98a33bc57575b484cbdf750c3bde02b3 Mon Sep 17 00:00:00 2001
From: Ilia Rostovtsev <ilia@rostovtsev.io>
Date: Fri, 9 Apr 2021 18:58:16 +0300
Subject: [PATCH] Simplify
 https://github.com/webmin/webmin/pull/1470#issuecomment-816270694

---
 mysql/module.overrides    |  1 -
 mysql/module_overrides.pl | 19 +++++++++++++++++++
 mysql/mysql-lib.pl        | 15 ---------------
 web-lib-funcs.pl          | 21 +++++++--------------
 4 files changed, 26 insertions(+), 30 deletions(-)
 delete mode 100644 mysql/module.overrides
 create mode 100644 mysql/module_overrides.pl

diff --git a/mysql/module.overrides b/mysql/module.overrides
deleted file mode 100644
index 4c8c5c7c4..000000000
--- a/mysql/module.overrides
+++ /dev/null
@@ -1 +0,0 @@
-funcs=override_check_variant
\ No newline at end of file
diff --git a/mysql/module_overrides.pl b/mysql/module_overrides.pl
new file mode 100644
index 000000000..8717dcb67
--- /dev/null
+++ b/mysql/module_overrides.pl
@@ -0,0 +1,19 @@
+
+do 'mysql-lib.pl';
+
+# Override function to substitute module's name
+sub module_overrides
+{
+my ($rv) = @_;
+my $mysql_version;
+chop($mysql_version = &read_file_contents(
+        "$module_config_directory/version"));
+$mysql_version ||= &get_mysql_version();
+if ($mysql_version =~ /mariadb/i) {
+	foreach my $t (keys %{$rv}) {
+		$rv->{$t} =~ s/MySQL/MariaDB/g;
+		}
+	}
+}
+
+1;
\ No newline at end of file
diff --git a/mysql/mysql-lib.pl b/mysql/mysql-lib.pl
index 4a52436db..951d4cf58 100755
--- a/mysql/mysql-lib.pl
+++ b/mysql/mysql-lib.pl
@@ -1879,20 +1879,5 @@ if ($err) {
 &error_setup($text{'login_err'});
 }
 
-# Override function to substitute module's name
-sub override_check_variant
-{
-my ($rv) = @_;
-my $mysql_version;
-chop($mysql_version = &read_file_contents(
-        "$module_config_directory/version"));
-$mysql_version ||= &get_mysql_version();
-if ($mysql_version =~ /mariadb/i) {
-	foreach my $t (keys %{$rv}) {
-		$rv->{$t} =~ s/MySQL/MariaDB/g;
-		}
-	}
-}
-
 1;
 
diff --git a/web-lib-funcs.pl b/web-lib-funcs.pl
index 901ccc614..6c3b5fde2 100755
--- a/web-lib-funcs.pl
+++ b/web-lib-funcs.pl
@@ -5639,20 +5639,13 @@ return if (!$mod);
 my $mdir = &module_root_directory($mod);
 
 # Call module specific overrides
-if (-r "$mdir/module.overrides") {
-	my %overrides;
-	&read_file_cached("$mdir/module.overrides", \%overrides);
-	my $funcs = $overrides{'funcs'};
-	if ($funcs) {
-		eval {
-			local $main::error_must_die = 1;
-			my @funcs = split(/\s+/, $funcs);
-			&foreign_require($mod, "$mod-lib.pl");
-			foreach my $func (@funcs) {
-				&foreign_call($mod, $func, \%{$data});
-				}
-			};
-		}
+my $call = 'module_overrides';
+if (-r "$mdir/$call.pl") {
+	eval {
+		local $main::error_must_die = 1;
+		&foreign_require($mod, "$call.pl");
+		&foreign_call($mod, $call, \%{$data});
+		};
 	}
 }