allow \"@\" in passwords (1477878)
This commit is contained in:
parent
1da86f28b2
commit
856f2ebcd8
|
@ -40,6 +40,7 @@ include_once("createntlm.inc");
|
||||||
* @return array list of shell names
|
* @return array list of shell names
|
||||||
*/
|
*/
|
||||||
function getshells() {
|
function getshells() {
|
||||||
|
if (!isset($_SESSION['lampath'])) return array();
|
||||||
// Load shells from file
|
// Load shells from file
|
||||||
if (file_exists($_SESSION['lampath'] . 'config/shells')) {
|
if (file_exists($_SESSION['lampath'] . 'config/shells')) {
|
||||||
$shells = file($_SESSION['lampath'] . 'config/shells');
|
$shells = file($_SESSION['lampath'] . 'config/shells');
|
||||||
|
@ -449,7 +450,7 @@ function get_preg($argument, $regexp) {
|
||||||
$pregexpr = '';
|
$pregexpr = '';
|
||||||
switch ($regexp) {
|
switch ($regexp) {
|
||||||
case 'password':
|
case 'password':
|
||||||
$pregexpr = '/^([[:alnum:]\\^\\ \\|\\#\\*\\,\\.\\;\\:\\_\\+\\!\\%\\&\\/\\?\\{\\(\\)\\}\\[\\]=-])*$/u';
|
$pregexpr = '/^([[:alnum:]\\^\\ \\|\\#\\*\\,\\.\\;\\:\\_\\+\\!\\%\\&\\/\\?\\{\\(\\)\\}\\[\\]\\$@=-])*$/u';
|
||||||
break;
|
break;
|
||||||
case 'groupname': // first character must be a letter. All letters, numbers, space and ._- are allowed characters
|
case 'groupname': // first character must be a letter. All letters, numbers, space and ._- are allowed characters
|
||||||
case 'username': // first character must be a letter. All letters, numbers, space and ._- are allowed characters
|
case 'username': // first character must be a letter. All letters, numbers, space and ._- are allowed characters
|
||||||
|
|
Loading…
Reference in New Issue