[freeside-commits] branch FREESIDE_4_BRANCH updated. d708f21c1c33e062abd730031b388aae9e668031

[Ivan]

The branch, FREESIDE_4_BRANCH has been updated
       via  d708f21c1c33e062abd730031b388aae9e668031 (commit)
      from  e29124c4dcf4886bd9a32d0b52c66156d3aa66d3 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit d708f21c1c33e062abd730031b388aae9e668031
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Sun Jun 14 01:05:41 2015 -0700

    when there are duplciate username at domain records, and neither selfservice_server-primary_only or selfservice_server-login-svcpart designate one for login, throw and error rather than picking one arbitrarily

diff --git a/FS/FS/ClientAPI/MyAccount.pm b/FS/FS/ClientAPI/MyAccount.pm
index d0bef87..8acc1a6 100644
--- a/FS/FS/ClientAPI/MyAccount.pm
+++ b/FS/FS/ClientAPI/MyAccount.pm
@@ -284,7 +284,7 @@ sub login {
 
     return { error => 'User not found.' } unless @svc_acct;
 
-    #return { error => 'Multiple users.' } if scalar(@svc_acct) > 1;
+    return { error => 'Multiple users.' } if scalar(@svc_acct) > 1;
 
     my $svc_acct = $svc_acct[0];
 

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/ClientAPI/MyAccount.pm |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)