Merge pull request #204 from senorandy/master

Correctly identify AD account

3 files changed, 9 insertions, 9 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');
diff --git a/lib/plugins/authad/lang/en/settings.php b/lib/plugins/authad/lang/en/settings.php
index 41176847a..7728d5ac4 100644
--- a/lib/plugins/authad/lang/en/settings.php
+++ b/lib/plugins/authad/lang/en/settings.php
@@ -3,12 +3,12 @@
 $lang['account_suffix']     = 'Your account suffix. Eg. <code>@my.domain.org</code>';
 $lang['base_dn']            = 'Your base DN. Eg. <code>DC=my,DC=domain,DC=org</code>';
 $lang['domain_controllers'] = 'A comma separated list of Domain controllers. Eg. <code>srv1.domain.org,srv2.domain.org</code>';
-$lang['ad_username']        = 'A privileged Active Directory user with access to all other user\'s data. Optional, but needed for certain actions like sending subscription mails.';
-$lang['ad_password']        = 'The password of the above user.';
+$lang['admin_username']        = 'A privileged Active Directory user with access to all other user\'s data. Optional, but needed for certain actions like sending subscription mails.';
+$lang['admin_password']        = 'The password of the above user.';
 $lang['sso']                = 'Should Single-Sign-On via Kerberos or NTLM be used?';
 $lang['real_primarygroup']  = 'Should the real primary group be resolved instead of assuming "Domain Users" (slower)';
 $lang['use_ssl']            = 'Use SSL connection? If used, do not enable TLS below.';
 $lang['use_tls']            = 'Use TLS connection? If used, do not enable SSL above.';
 $lang['debug']              = 'Display additional debugging output on errors?';
 $lang['expirywarn']         = 'Days in advance to warn user about expiring password. 0 to disable.';
-$lang['additional']         = 'A comma separated list of additional AD attributes to fetch from user data. Used by some plugins.';
\ No newline at end of file
+$lang['additional']         = 'A comma separated list of additional AD attributes to fetch from user data. Used by some plugins.';