diff options
| author | Anika Henke <anika@selfthinker.org> | 2014-01-05 16:25:21 +0000 |
|---|---|---|
| committer | Anika Henke <anika@selfthinker.org> | 2014-01-05 16:25:21 +0000 |
| commit | 8491e52805a9aaef90168f1417c6e0806fb7c5d7 (patch) | |
| tree | 536ad50878f0ac6f6815db91f8bcb4819bc092ae /lib/plugins/authad/conf | |
| parent | 6fdd11e032b654dd27de346f7e54231ee043d7ef (diff) | |
| parent | dfaf5f6c54597f81b1a8b777f55b89c93f87a345 (diff) | |
| download | rpg-8491e52805a9aaef90168f1417c6e0806fb7c5d7.tar.gz rpg-8491e52805a9aaef90168f1417c6e0806fb7c5d7.tar.bz2 | |
Merge remote-tracking branch 'origin/master' into extension_manager
Diffstat (limited to 'lib/plugins/authad/conf')
| -rw-r--r-- | lib/plugins/authad/conf/default.php | 1 | ||||
| -rw-r--r-- | lib/plugins/authad/conf/metadata.php | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/lib/plugins/authad/conf/default.php b/lib/plugins/authad/conf/default.php index f71202cfc..6fb4c9145 100644 --- a/lib/plugins/authad/conf/default.php +++ b/lib/plugins/authad/conf/default.php @@ -4,6 +4,7 @@ $conf['account_suffix'] = ''; $conf['base_dn'] = ''; $conf['domain_controllers'] = ''; $conf['sso'] = 0; +$conf['sso_charset'] = ''; $conf['admin_username'] = ''; $conf['admin_password'] = ''; $conf['real_primarygroup'] = 0; diff --git a/lib/plugins/authad/conf/metadata.php b/lib/plugins/authad/conf/metadata.php index 7b4f895d0..560d25315 100644 --- a/lib/plugins/authad/conf/metadata.php +++ b/lib/plugins/authad/conf/metadata.php @@ -4,6 +4,7 @@ $meta['account_suffix'] = array('string','_caution' => 'danger'); $meta['base_dn'] = array('string','_caution' => 'danger'); $meta['domain_controllers'] = array('string','_caution' => 'danger'); $meta['sso'] = array('onoff','_caution' => 'danger'); +$meta['sso_charset'] = array('string','_caution' => 'danger'); $meta['admin_username'] = array('string','_caution' => 'danger'); $meta['admin_password'] = array('password','_caution' => 'danger'); $meta['real_primarygroup'] = array('onoff','_caution' => 'danger'); |