From 1b362d18b213edf18641a6c7d4732b09a448e57f Mon Sep 17 00:00:00 2001 From: Jamie Cameron Date: Thu, 28 Jun 2012 15:45:38 -0700 Subject: [PATCH] Add option for human-readable regexp description --- useradmin/config.info | 1 + useradmin/user-lib.pl | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/useradmin/config.info b/useradmin/config.info index 5df444bc0..5d3976799 100644 --- a/useradmin/config.info +++ b/useradmin/config.info @@ -51,6 +51,7 @@ line5=Password restrictions,11 passwd_min=Minimum password length,3,No minimum passwd_dict=Prevent dictionary word passwords?,1,1-Yes,0-No passwd_re=Perl regexp to check password against,3,None +passwd_redesc=Human-readable description of regexp,3,Just use regexp passwd_same=Prevent passwords containing username?,1,1-Yes,0-No passwd_prog=External password-checking program,3,None passwd_progmode=Pass username and password to program,1,1-As input,0-As parameters diff --git a/useradmin/user-lib.pl b/useradmin/user-lib.pl index 61d4f9435..358703091 100755 --- a/useradmin/user-lib.pl +++ b/useradmin/user-lib.pl @@ -1531,8 +1531,9 @@ local ($pass, $username, $uinfo) = @_; return &text('usave_epasswd_min', $config{'passwd_min'}) if (length($pass) < $config{'passwd_min'}); local $re = $config{'passwd_re'}; -return &text('usave_epasswd_re', $re) - if ($re && !eval { $pass =~ /^$re$/ }); +if ($re && !eval { $pass =~ /^$re$/ }) { + return $config{'passwd_redesc'} || &text('usave_epasswd_re', $re); + } if ($config{'passwd_same'}) { return &text('usave_epasswd_same') if ($pass =~ /\Q$username\E/i); }