proxy.cgi: Also allow to use a hostname for the LDAP server.

Fixes #10265.

diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi
index b217de361cfacc02dcea2d78ee7f23da81930324..52b68aec91508888b440e967eee66d39460dd628 100644 (file)
--- a/html/cgi-bin/proxy.cgi
+++ b/html/cgi-bin/proxy.cgi
@@ -512,8 +512,11 @@ if (($proxysettings{'ACTION'} eq $Lang::tr{'save'}) || ($proxysettings{'ACTION'}
                }
                if (!&General::validip($proxysettings{'LDAP_SERVER'}))
                {
-                       $errormessage = $Lang::tr{'advproxy errmsg ldap server'};
-                       goto ERROR;
+                       if (!&General::validdomainname($proxysettings{'LDAP_SERVER'}))
+                       {
+                               $errormessage = $Lang::tr{'advproxy errmsg ldap server'};
+                               goto ERROR;
+                       }
                }
                if (!&General::validport($proxysettings{'LDAP_PORT'}))
                {

diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index a2a9e1e76e14cfaa2da709273c4b82e573131e4c..f2353be4123c77155431e0d9301d26397d75e703 100644 (file)
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -229,7 +229,7 @@
 'advproxy errmsg ldap base dn' => 'LDAP base DN erforderlich',
 'advproxy errmsg ldap bind dn' => 'LDAP bind DN Benutzername und Passwort erforderlich',
 'advproxy errmsg ldap port' => 'Ungültige LDAP-Portnummer',
-'advproxy errmsg ldap server' => 'Ungültige IP-Adresse für den LDAP-Server',
+'advproxy errmsg ldap server' => 'Ungültige IP-Adresse/Hostname für den LDAP-Server',
 'advproxy errmsg max userip' => 'Ungültige Anzahl von IP-Adressen pro Benutzer',
 'advproxy errmsg mem cache size' => 'Ungültiger Wert für die Größe des RAM-Cachespeichers',
 'advproxy errmsg no browser' => 'Mindestens ein Browser oder Client muss für den Web-Zugriff zugelassen sein',

diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 23df6bd6a87bf7be492b00cf2fadb362d536d0cd..c739b1a48d3dd90e60b69fda1ed2a0e25a5f5c33 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -229,7 +229,7 @@
 'advproxy errmsg ldap base dn' => 'LDAP base DN required',
 'advproxy errmsg ldap bind dn' => 'LDAP bind DN username and password required',
 'advproxy errmsg ldap port' => 'Invalid LDAP port number',
-'advproxy errmsg ldap server' => 'Invalid IP address for LDAP Server',
+'advproxy errmsg ldap server' => 'Invalid IP address/hostname for LDAP Server',
 'advproxy errmsg max userip' => 'Invalid number of IP addresses per user',
 'advproxy errmsg mem cache size' => 'Invalid value for memory cache size',
 'advproxy errmsg no browser' => 'At least one browser or client must be selected for web access',