From 949d58e5c405ad4b1cb1cef86b7b8ba59abbf439 Mon Sep 17 00:00:00 2001 From: Christian Boltz Date: Thu, 31 Oct 2013 21:58:14 +0000 Subject: [PATCH] config.inc.php: - remove unused $CONF['usercontol'] which leaked in with an unrelated patch in r1374 - fixed some typos in comments git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1551 a1433add-5e2c-0410-b055-b7f2511e0802 --- config.inc.php | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/config.inc.php b/config.inc.php index bba30ae1..0f51ad6a 100644 --- a/config.inc.php +++ b/config.inc.php @@ -135,11 +135,11 @@ $CONF['smtp_port'] = '25'; // (WARNING: do not use a dovecot:* method that includes a salt - you won't be able to login to PostfixAdmin in this case) $CONF['encrypt'] = 'md5crypt'; -// In what flavor should courier-authlib style passwords be enrypted? +// In what flavor should courier-authlib style passwords be encrypted? // md5 = {md5} + base64 encoded md5 hash // md5raw = {md5raw} + plain encoded md5 hash // SHA = {SHA} + base64-encoded sha1 hash -// crypt = {crypt} + Standard UNIX DES-enrypted with 2-character salt +// crypt = {crypt} + Standard UNIX DES-encrypted with 2-character salt $CONF['authlib_default_flavor'] = 'md5raw'; // If you use the dovecot encryption method: where is the dovecotpw binary located? @@ -367,9 +367,6 @@ $CONF['vacation_intervaldelay_default'] = '86400'; // is 1 day = 60 sec * 60 min $CONF['users_domain_controle'] = 'YES'; -$CONF['usercontol'] = 'YES'; - - // Alias Control // Postfix Admin inserts an alias in the alias table for every mailbox it creates. // The reason for this is that when you want catch-all and normal mailboxes