[Also sending to the list] (Matt, the way you sent these patches was... odd.)
Robert Spier wrote: > > > Applied to my tree, manually, because something is mangling your > patches. > > e4f5b86b4126b0fb2cf5f91ba2deaaebaec46af5 > > Matt Simerson wrote: > > > > --- > > plugins/auth/auth_flat_file | 4 ++-- > > t/plugin_tests/auth/auth_flat_file | 6 +++--- > > 2 files changed, 5 insertions(+), 5 deletions(-) > > > > diff --git a/plugins/auth/auth_flat_file b/plugins/auth/auth_flat_file > > index c6f1756..690957f 100644 > > --- a/plugins/auth/auth_flat_file > > +++ b/plugins/auth/auth_flat_file > > @@ -35,10 +35,10 @@ use Digest::HMAC_MD5 qw(hmac_md5_hex); > > sub register { > > my ($self, $qp) = @_; > > > > - $self->register_hook("auth-cram-md5", "authsql"); > > + $self->register_hook("auth-cram-md5", "auth_flat_file"); > > } > > > > -sub authsql { > > +sub auth_flat_file { > > my ($self, $transaction, $method, $user, $passClear, $passHash, > > $ticket) = > > @_; > > > > diff --git a/t/plugin_tests/auth/auth_flat_file b/t/plugin_tests/auth/ > > auth_flat_file > > index 7f36f23..c4218bd 100644 > > --- a/t/plugin_tests/auth/auth_flat_file > > +++ b/t/plugin_tests/auth/auth_flat_file > > @@ -2,7 +2,7 @@ > > > > sub register_tests { > > my $self = shift; > > - $self->register_test("test_authsql", 3); > > + $self->register_test("test_auth_flat_file", 3); > > } > > > > my @u_list = qw ( good bad none ); > > @@ -12,13 +12,13 @@ my %u_data = ( > > none => [ 'n...@example.com', DECLINED, '' ], > > ); > > > > -sub test_authsql { > > +sub test_auth_flat_file { > > my $self = shift; > > my ($tran, $ret, $note, $u, $r, $p, $a ); > > $tran = $self->qp->transaction; > > for $u ( @u_list ) { > > ( $a,$r,$p ) = @{$u_data{$u}}; > > - ($ret, $note) = $self->authsql($tran,'CRAMMD5',$a,$p); > > + ($ret, $note) = $self->auth_flat_file($tran,'CRAMMD5',$a,$p); > > defined $note or $note='No-Message'; > > is ($ret, $r, $note); > > # - for debugging. > > -- > > 1.7.0.6 > >