functions.inc.php:

-  fixed some remarks in pacrypt

git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@562 a1433add-5e2c-0410-b055-b7f2511e0802

functions.inc.php

@@ -1163,7 +1163,7 @@ function pacrypt ($pw, $pw_db="")
     
     if ($CONF['encrypt'] == 'authlib') {
     	$flavor = $CONF['authlib_default_flavor'];
-       $salt = '  ';
+    	$salt = substr(create_salt(), 0, 2);
     	if(ereg('^{.*}', $pw_db)) {
     		// we have a flavor in the db -> use it instead of default flavor
     		$result = split('{|}', $pw_db, 3);
@@ -1177,6 +1177,8 @@ function pacrypt ($pw, $pw_db="")
       		$password = '{' . $flavor . '}' . base64_encode(md5($pw, TRUE));
       	} else if(stripos($flavor, 'crypt') === 0) {
       		$password = '{' . $flavor . '}' . crypt($pw, $salt);
+      	} else {
+      		die("authlib_default_flavor '" . $flavor . "' unknown. Valid flavors are 'md5raw', 'md5' and 'crypt'");
       	}
    	}