diff options
| author | Renato Botelho <renato.botelho@bluepex.com> | 2010-11-03 12:53:40 -0200 |
|---|---|---|
| committer | Renato Botelho <renato.botelho@bluepex.com> | 2010-11-03 12:53:40 -0200 |
| commit | 4816e5caa29b542c57659de8eff53ba51e355b24 (patch) | |
| tree | 7482c94367d6a7929f9e249dd71d4da5b8906953 /etc/inc/auth.inc | |
| parent | f5fe66cd96ed7903244b83564d4a74f16ca6369f (diff) | |
| parent | b039f099e66c9dbd0c33470bc4613e0cfdc9a1a0 (diff) | |
| download | pfsense-4816e5caa29b542c57659de8eff53ba51e355b24.zip pfsense-4816e5caa29b542c57659de8eff53ba51e355b24.tar.gz | |
Merge remote branch 'mainline/master' into inc
Conflicts:
etc/inc/auth.inc
etc/inc/config.lib.inc
etc/inc/priv.defs.inc
etc/inc/system.inc
etc/inc/upgrade_config.inc
etc/inc/vpn.inc
Diffstat (limited to 'etc/inc/auth.inc')
| -rw-r--r-- | etc/inc/auth.inc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/etc/inc/auth.inc b/etc/inc/auth.inc index 0d01e50..132570f 100644 --- a/etc/inc/auth.inc +++ b/etc/inc/auth.inc @@ -81,7 +81,7 @@ if (function_exists("display_error_form") && !isset($config['system']['webgui'][ $found_host = true; if($found_host == false) { - display_error_form("501", gettext("Potential DNS Rebind attack detected, see http://en.wikipedia.org/wiki/DNS_rebinding")); + display_error_form("501", gettext("Potential DNS Rebind attack detected, see http://en.wikipedia.org/wiki/DNS_rebinding<br/>Try accessing the router by IP address instead of by hostname.")); exit; } } @@ -333,7 +333,7 @@ function local_user_set(& $user) { /* add or mod pw db */ $cmd = "/usr/sbin/pw {$user_op} -q -u {$user_uid} -n {$user_name}". " -g {$user_group} -s {$user_shell} -d {$user_home}". - " -c ".escapeshellarg($user['fullname'])." -H 0 2>&1"; + " -c ".escapeshellarg($user['descr'])." -H 0 2>&1"; if($debug) log_error(sprintf(gettext("Running: %s"), $cmd)); @@ -936,7 +936,7 @@ function ldap_backed($username, $passwd, $authcfg) { else $ldapfunc = "ldap_search"; /* Support legacy auth container specification. */ - if (stristr($ldac_split, "DC=")) + if (stristr($ldac_split, "DC=") || empty($ldapbasedn)) $search = @$ldapfunc($ldap,$ldac_split,$ldapfilter); else $search = @$ldapfunc($ldap,"{$ldac_split},{$ldapbasedn}",$ldapfilter); |
