--- config.php.sample	2005-11-12 06:04:34.000000000 +0000
+++ config.php.sample.new	2011-05-22 21:32:27.000000000 +0000
@@ -154,9 +154,25 @@
    // csp_salt_query
    // csp_salt_static
    //
-   // Encryption types that need a salt need to know where to get
-   // that salt.  If you have a constant, known salt value, you
-   // should define it in $csp_salt_static.  Otherwise, leave that
+   // Some encryption algorithms use a salt (a random value
+   // added to the password to ensure that the same password
+   // will result in different encrypted value). This salt
+   // has to be known to check the original password.
+   //
+   // Where to find the salt depends on the algorithm used:
+   //
+   //  - NONE does not use a salt ^^
+   //  - MYSQLPWD does not use a salt.
+   //  - MYSQLENCRYPT keeps the salt as the first 2 characters of
+   //    the encrypted password.
+   //  - PHPCRYT keeps the salt as the first 2 characters of
+   //    the encrypted password.
+   //  - MD5 does not use a salt.
+   //  - MD5CRYPT use the format "$1$salt$crypt_password". The
+   //    salt can be given with or without the "$1$" prefix.
+   //
+   // If you have a constant, known salt value, you should
+   // define it in $csp_salt_static.  Otherwise, leave that
    // value empty and define a value for the $csp_salt_query.
    //
    // Leave both values empty if you do not need (or use) salts
@@ -173,14 +189,12 @@
    //   %3 in this query will be replaced with the domain name,
    //      such as "example.com"
    //
-   //$csp_salt_static = 'LEFT(crypt_password, 2)';
-   //$csp_salt_static = '"a4"';  // use this format with MYSQLENCRYPT
-   //$csp_salt_static = '$2$blowsomefish$';  // use this format with PHPCRYPT
-   $csp_salt_static = '';
+   $csp_salt_static = ''; // No salt (NONE, MYSQLPWD, MD5)
 
-   //$csp_salt_query = 'SELECT SUBSTRING_INDEX(crypt_password, '$', 1) FROM users WHERE username = "%1"';
-   //$csp_salt_query = 'SELECT SUBSTRING(crypt_password, (LENGTH(SUBSTRING_INDEX(crypt_password, '$', 2)) + 2)) FROM users WHERE username = "%1"';
-   $csp_salt_query = 'SELECT salt FROM users WHERE username = "%1"';
+   //$csp_salt_query = 'SELECT SUBSTRING(crypt_password, 1, 2 ) FROM users WHERE username = "%1"'; // MySQL with MYSQLENCRYPT or PHPCRYT
+   //$csp_salt_query = 'SELECT SUBSTRING_INDEX(crypt_password, '$', 3) FROM users WHERE username = "%1"'; // MySQL with MD5CRYPT
+   //$csp_salt_query = "SELECT substr(crypt_password, 1, 2 ) FROM users WHERE nom = '%1'";     // PostgreSQL with PHPCRYPT
+   //$csp_salt_query = "SELECT split_part(crypt_password, '$', 3 ) FROM users WHERE nom = '%1' // PostgreSQL with MD5CRYPT
    //$csp_salt_query = '';