From e201b6d5376939eaeec36417f09d9fe6b6dcfe5d Mon Sep 17 00:00:00 2001 From: Stefan Schantl Date: Mon, 21 Jan 2013 21:15:50 +0100 Subject: [PATCH] proxy.cgi: Also allow to use a hostname for the LDAP server. Fixes #10265. --- html/cgi-bin/proxy.cgi | 7 +++++-- langs/de/cgi-bin/de.pl | 2 +- langs/en/cgi-bin/en.pl | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi index b217de361c..52b68aec91 100644 --- 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 a2a9e1e76e..f2353be412 100644 --- 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 23df6bd6a8..c739b1a48d 100644 --- 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', -- 2.39.2