Merge branch master into stable

2 files changed, 6 insertions, 6 deletions

diff --git a/lib/plugins/authad/conf/default.php b/lib/plugins/authad/conf/default.php
index 05d6c328e..9274db209 100644
--- a/lib/plugins/authad/conf/default.php
+++ b/lib/plugins/authad/conf/default.php
@@ -4,11 +4,11 @@ $conf['account_suffix']     = '';
 $conf['base_dn']            = '';
 $conf['domain_controllers'] = '';
 $conf['sso']                = 0;
-$conf['ad_username']        = '';
-$conf['ad_password']        = '';
+$conf['admin_username']        = '';
+$conf['admin_password']        = '';
 $conf['real_primarygroup']  = 0;
 $conf['use_ssl']            = 0;
 $conf['use_tls']            = 0;
 $conf['debug']              = 0;
 $conf['expirywarn']         = 0;
-$conf['additional']         = '';
\ No newline at end of file
+$conf['additional']         = '';
diff --git a/lib/plugins/authad/conf/metadata.php b/lib/plugins/authad/conf/metadata.php
index dc251a108..fbc3f163c 100644
--- a/lib/plugins/authad/conf/metadata.php
+++ b/lib/plugins/authad/conf/metadata.php
@@ -4,11 +4,11 @@ $meta['account_suffix']     = array('string');
 $meta['base_dn']            = array('string');
 $meta['domain_controllers'] = array('string');
 $meta['sso']                = array('onoff');
-$meta['ad_username']        = array('string');
-$meta['ad_password']        = array('password');
+$meta['admin_username']        = array('string');
+$meta['admin_password']        = array('password');
 $meta['real_primarygroup']  = array('onoff');
 $meta['use_ssl']            = array('onoff');
 $meta['use_tls']            = array('onoff');
 $meta['debug']              = array('onoff');
 $meta['expirywarn']         = array('numeric', '_min'=>0);
-$meta['additional']         = array('string');
\ No newline at end of file
+$meta['additional']         = array('string');