From fb6cd4ce862af9d227458c1524014387dd4b91cc Mon Sep 17 00:00:00 2001 From: Guenter Knauf Date: Sun, 1 Nov 2009 06:33:22 +0000 Subject: [PATCH] tab and trailing space police. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@831644 13f79535-47bb-0310-9956-ffa450edef68 --- support/dbmmanage.in | 46 ++++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/support/dbmmanage.in b/support/dbmmanage.in index df78f503cb..2dd8c8679b 100644 --- a/support/dbmmanage.in +++ b/support/dbmmanage.in @@ -53,9 +53,9 @@ sub need_sha1_crypt { print STDERR </dev/null`; + for (qw(-xlwwa -le)) { + `ps $_ 2>/dev/null`; $psf = $_, last unless $?; } srand (time ^ $$ ^ unpack("%L*", `ps $psf | gzip -f`)); @@ -177,14 +177,14 @@ sub genseed { $x = int scalar @range; } -sub randchar { +sub randchar { join '', map $range[rand $x], 1..shift||1; } sub saltpw_crypt { - genseed() unless @range; - return $newstyle_salt ? - join '', "_", randchar, "a..", randchar(4) : + genseed() unless @range; + return $newstyle_salt ? + join '', "_", randchar, "a..", randchar(4) : randchar(2); } @@ -195,7 +195,7 @@ sub cryptpw_crypt { } sub saltpw_md5 { - genseed() unless @range; + genseed() unless @range; randchar(8); } @@ -224,15 +224,15 @@ sub cryptpw { sub getpass { my $prompt = shift || "Enter password:"; - unless($not_unix) { - open STDIN, "/dev/tty" or warn "couldn't open /dev/tty $!\n"; - system "stty -echo;"; + unless($not_unix) { + open STDIN, "/dev/tty" or warn "couldn't open /dev/tty $!\n"; + system "stty -echo;"; } my($c,$pwd); print STDERR $prompt; while (($c = getc(STDIN)) ne '' and $c ne "\n" and $c ne "\r") { - $pwd .= $c; + $pwd .= $c; } system "stty echo" unless $not_unix; @@ -257,7 +257,7 @@ sub dbmc::update { sub dbmc::add { die "Can't use empty password!\n" unless $crypted_pwd; unless($is_update) { - die "Sorry, user `$key' already exists!\n" if $DB{$key}; + die "Sorry, user `$key' already exists!\n" if $DB{$key}; } $groups = '' if $groups eq '-'; $comment = '' if $comment eq '-'; @@ -299,14 +299,14 @@ sub dbmc::check { } else { $crypt_method = "plain"; } - print $crypt_method . (cryptpw($testpass, $chkpass) eq $chkpass + print $crypt_method . (cryptpw($testpass, $chkpass) eq $chkpass ? " password ok\n" : " password mismatch\n"); } sub dbmc::import { while(defined($_ = ) and chomp) { - ($key,$crypted_pwd,$groups,$comment) = split /:/, $_, 4; - dbmc->add; + ($key,$crypted_pwd,$groups,$comment) = split /:/, $_, 4; + dbmc->add; } } -- 2.40.0