diff options
| author | Christopher Smith <chris@jalakai.co.uk> | 2013-07-30 10:50:52 +0200 |
|---|---|---|
| committer | Christopher Smith <chris@jalakai.co.uk> | 2013-07-30 10:50:52 +0200 |
| commit | af07997c5ff7cc096965159d90158e3710d2d019 (patch) | |
| tree | defaf770e77a679436eb56291185905b547640d0 /lib/plugins/authad/conf | |
| parent | bdac741579f8c6f00248d5d3ec635d4c2e08fb1e (diff) | |
| parent | 7d8a6abbb21979fd77dca10275ebb8e01a04b6e4 (diff) | |
| download | rpg-af07997c5ff7cc096965159d90158e3710d2d019.tar.gz rpg-af07997c5ff7cc096965159d90158e3710d2d019.tar.bz2 | |
Merge branch 'master' into configmgr_improvements
Conflicts:
inc/auth.php
inc/template.php
lib/plugins/authad/lang/zh/settings.php
lib/plugins/authldap/lang/en/settings.php
lib/plugins/authldap/lang/zh/settings.php
lib/plugins/authmysql/lang/zh/settings.php
lib/plugins/config/settings/config.class.php
lib/plugins/usermanager/admin.php
Diffstat (limited to 'lib/plugins/authad/conf')
| -rw-r--r-- | lib/plugins/authad/conf/default.php | 6 | ||||
| -rw-r--r-- | lib/plugins/authad/conf/metadata.php | 6 |
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..f71202cfc 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'); |