Merge remote-tracking branch 'kc/new/bug_5995' into kcmaster

diff --cc C4/Auth.pm
index 54fb74c,0765732..36a6472
--- 1/C4/Auth.pm
--- 2/C4/Auth.pm
+++ b/C4/Auth.pm
@@@ -1431,11 -1389,11 +1431,11 @@@ sub checkpw 
      my ( $dbh, $userid, $password, $query ) = @_;
      if ($ldap) {
          $debug and print "## checkpw - checking LDAP\n";
-         my ($retval,$retcard) = checkpw_ldap(@_);    # EXTERNAL AUTH
-         ($retval) and return ($retval,$retcard);
+         my ($retval,$retcard,$retuserid) = checkpw_ldap(@_);    # EXTERNAL AUTH
+         ($retval) and return ($retval,$retcard,$retuserid);
      }
  
 -    if ($cas && $query->param('ticket')) {
 +    if ($cas && $query && $query->param('ticket')) {
          $debug and print STDERR "## checkpw - checking CAS\n";
        # In case of a CAS authentication, we use the ticket instead of the password
        my $ticket = $query->param('ticket');

diff --cc C4/Auth_with_ldap.pm
Simple merge