X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2FAuthCookieHandler.pm;h=93d8ea6a56288f8dd4eff82c6ab7e1a66868258d;hp=b571e4705ca4a9100c6a73e728a30f73623d395f;hb=HEAD;hpb=56f9dffcd409d2a10e7a2cbe4c15b397f6f3abe1

diff --git a/FS/FS/AuthCookieHandler.pm b/FS/FS/AuthCookieHandler.pm
index b571e4705..b7d0dbf5b 100644
--- a/FS/FS/AuthCookieHandler.pm
+++ b/FS/FS/AuthCookieHandler.pm
@@ -6,19 +6,25 @@ use FS::UID qw( adminsuidsetup preuser_setup );
 use FS::CurrentUser;
 use FS::Auth;
 
+#Apache 2.2 and below
+sub useragent_ip {
+  my( $self, $r ) = @_;
+  $r->connection->remote_ip;
+}
+
 sub authen_cred {
-  my( $self, $r, $username, $password ) = @_;
+  my( $self, $r, $username, $password, $totp_code ) = @_;
 
   preuser_setup();
 
   my $info = {};
 
-  unless ( FS::Auth->authenticate($username, $password, $info) ) {
-    warn "failed auth $username from ". $r->connection->remote_ip. "\n";
+  unless ( FS::Auth->authenticate($username, $password, $totp_code, $info) ) {
+    warn "failed auth $username from ". $self->useragent_ip($r). "\n";
     return undef;
   }
 
-  warn "authenticated $username from ". $r->connection->remote_ip. "\n";
+  warn "authenticated $username from ". $self->useragent_ip($r). "\n";
 
   FS::CurrentUser->load_user( $username,
                               'autocreate' => FS::Auth->auth_class->autocreate,
@@ -36,7 +42,7 @@ sub authen_ses_key {
   my $curuser = FS::CurrentUser->load_user_session( $sessionkey );
 
   unless ( $curuser ) {
-    warn "bad session $sessionkey from ". $r->connection->remote_ip. "\n";
+    warn "bad session $sessionkey from ". $self->useragent_ip($r). "\n";
     return undef;
   }