summaryrefslogtreecommitdiffstats
path: root/frontends/php
diff options
context:
space:
mode:
Diffstat (limited to 'frontends/php')
-rw-r--r--frontends/php/include/perm.inc.php2
-rw-r--r--frontends/php/users.php6
2 files changed, 7 insertions, 1 deletions
diff --git a/frontends/php/include/perm.inc.php b/frontends/php/include/perm.inc.php
index a9f2ba93..3e830fe9 100644
--- a/frontends/php/include/perm.inc.php
+++ b/frontends/php/include/perm.inc.php
@@ -143,7 +143,7 @@ function ldap_authentication($user,$passwd,$cnf=NULL){
}
}
}
-
+
$ldap = new CLdap($cnf);
$ldap->connect();
diff --git a/frontends/php/users.php b/frontends/php/users.php
index 56215f55..7ec6d593 100644
--- a/frontends/php/users.php
+++ b/frontends/php/users.php
@@ -145,11 +145,17 @@ include_once 'include/page_header.php';
}
}
else if(isset($_REQUEST['save'])){
+ $config = select_config();
+
$user_groups = get_request('user_groups', array());
$user_medias = get_request('user_medias', array());
$_REQUEST['password1'] = get_request('password1', null);
$_REQUEST['password2'] = get_request('password2', null);
+
+ if($config['authentication_type'] != ZBX_AUTH_INTERNAL){
+ $_REQUEST['password1'] = $_REQUEST['password2'] = 'zabbix';
+ }
if($_REQUEST['password1']!=$_REQUEST['password2']){
if(isset($_REQUEST['userid']))