← Back to branch summary

~azzar1/unity/add-show-desktop-key

« back to all changes in this revision

Viewing changes to ivle/auth/authenticate.py

  • Committer: me at id
  • Date: 2009-01-15 03:02:36 UTC
  • mto: This revision was merged to the branch mainline in revision 1090.
  • Revision ID: svn-v3-trunk0:2b9c9e99-6f39-0410-b283-7f802c844ae2:branches%2Fstorm:1150
ivle.makeuser.make_jail: Just take an ivle.database.User, rather than some
    attributes.

services/usrmgt-server: Give make_jail a User.

bin/ivle-remakeuser: Rewrite to use ivle.database.User.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ivle/auth/authenticate.py
91
91
                # We just got ourselves some user details from an external
92
92
                # source. Put them in the DB.
93
93
                store.add(auth_result)
94
 
 
95
 
            # Don't allow login if it is expired or disabled.
96
 
            if auth_result.state == 'disabled' or auth_result.account_expired:
97
 
                raise AuthError("Account is not valid.")
98
 
 
 
94
                pass
99
95
            return auth_result
100
96
        else:
101
97
            raise AuthError("Internal error: "