Merge branch 'master' into stable

2 files changed, 28 insertions, 0 deletions

diff --git a/lib/plugins/authad/conf/default.php b/lib/plugins/authad/conf/default.php
new file mode 100644
index 000000000..05d6c328e
--- /dev/null
+++ b/lib/plugins/authad/conf/default.php
@@ -0,0 +1,14 @@
+<?php
+
+$conf['account_suffix']     = '';
+$conf['base_dn']            = '';
+$conf['domain_controllers'] = '';
+$conf['sso']                = 0;
+$conf['ad_username']        = '';
+$conf['ad_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
diff --git a/lib/plugins/authad/conf/metadata.php b/lib/plugins/authad/conf/metadata.php
new file mode 100644
index 000000000..dc251a108
--- /dev/null
+++ b/lib/plugins/authad/conf/metadata.php
@@ -0,0 +1,14 @@
+<?php
+
+$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['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