summaryrefslogtreecommitdiffstats
path: root/lib/private
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2017-11-08 00:42:34 +0100
committerGitHub <noreply@github.com>2017-11-08 00:42:34 +0100
commite97a58793d673604a141464505bedf6ef940f553 (patch)
tree85a9b4b490236559e72f85174904200d6c7fbfd5 /lib/private
parent4d117a5e23afe71a06ff69bbf0458532d34afcab (diff)
downloadnextcloud-server-e97a58793d673604a141464505bedf6ef940f553.tar.gz
nextcloud-server-e97a58793d673604a141464505bedf6ef940f553.zip
Revert "[stable12] Only allow colons in db host for IPv6 addresses"
Diffstat (limited to 'lib/private')
-rw-r--r--lib/private/Setup.php16
1 files changed, 0 insertions, 16 deletions
diff --git a/lib/private/Setup.php b/lib/private/Setup.php
index 2876ad524f9..b8a861fd296 100644
--- a/lib/private/Setup.php
+++ b/lib/private/Setup.php
@@ -294,10 +294,6 @@ class Setup {
$error[] = $l->t("Can't create or write into the data directory %s", array($dataDir));
}
- if (!$this->validateDatabaseHost($options['dbhost'])) {
- $error[] = $l->t('Given database host is invalid and must not contain the port: %s', [$options['dbhost']]);
- }
-
if(count($error) != 0) {
return $error;
}
@@ -413,18 +409,6 @@ class Setup {
return $error;
}
- /**
- * @param string $host
- * @return bool
- */
- protected function validateDatabaseHost($host) {
- if (strpos($host, ':') === false) {
- return true;
- }
-
- return filter_var($host, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6) !== false;
- }
-
public static function installBackgroundJobs() {
\OC::$server->getJobList()->add('\OC\Authentication\Token\DefaultTokenCleanupJob');
}