diff options
| author | Andreas Gohr <andi@splitbrain.org> | 2011-11-27 11:11:01 +0100 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2011-11-27 11:11:01 +0100 |
| commit | 5c73ae04fa654072dbca15f016f31c68a0c7bcee (patch) | |
| tree | 9bcda24a887f22b83c217810147399afdfc5c993 /lib | |
| parent | 560f6ea3cdac2767863c3be3a9e7933b6e37e88f (diff) | |
| parent | c8ca60df97ff2b24091c7c0d0db72c680200ea1b (diff) | |
| download | rpg-5c73ae04fa654072dbca15f016f31c68a0c7bcee.tar.gz rpg-5c73ae04fa654072dbca15f016f31c68a0c7bcee.tar.bz2 | |
Merge branch 'lmd5' into bcrypt
Conflicts:
lib/plugins/config/settings/config.metadata.php
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/plugins/config/settings/config.metadata.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/plugins/config/settings/config.metadata.php b/lib/plugins/config/settings/config.metadata.php index ba14eb85a..87817b08e 100644 --- a/lib/plugins/config/settings/config.metadata.php +++ b/lib/plugins/config/settings/config.metadata.php @@ -123,7 +123,7 @@ $meta['_authentication'] = array('fieldset'); $meta['useacl'] = array('onoff'); $meta['autopasswd'] = array('onoff'); $meta['authtype'] = array('authtype'); -$meta['passcrypt'] = array('multichoice','_choices' => array('smd5','md5','apr1','sha1','ssha','crypt','mysql','my411','kmd5','pmd5','hmd5','bcrypt')); +$meta['passcrypt'] = array('multichoice','_choices' => array('smd5','md5','apr1','sha1','ssha','lsmd5','crypt','mysql','my411','kmd5','pmd5','hmd5','bcrypt')); $meta['defaultgroup']= array('string'); $meta['superuser'] = array('string'); $meta['manager'] = array('string'); |