backend/server/handlers/xmlrpc/registration.py | 6 ++++++
backend/server/rhnUser.py | 5 -----
2 files changed, 6 insertions(+), 5 deletions(-)
New commits:
commit c861917c9ed92410a83143d08f8b5f28efe1ec1f
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Wed Dec 16 17:24:31 2009 -0500
528833 - fixing issue where updates would fail when registered using an activation key
of a disabled user
diff --git a/backend/server/handlers/xmlrpc/registration.py
b/backend/server/handlers/xmlrpc/registration.py
index 4910c6a..0e21c82 100644
--- a/backend/server/handlers/xmlrpc/registration.py
+++ b/backend/server/handlers/xmlrpc/registration.py
@@ -184,6 +184,12 @@ class Registration(rhnHandler):
log_error("User password check failed", username)
raise rhnFault(2)
+ if rhnUser.is_user_disabled(username):
+ msg = _("""
+ %s Account has been deactivated on this server.
+ Please contact your Org administrator for more
help.""")
+ raise rhnFault(1, msg % user, explain=0)
+
return user
def create_system(self, user, profile_name, release_version,
diff --git a/backend/server/rhnUser.py b/backend/server/rhnUser.py
index 43c459d..0f4ef05 100644
--- a/backend/server/rhnUser.py
+++ b/backend/server/rhnUser.py
@@ -426,11 +426,6 @@ def search(user):
userid = get_user_id(user)
if not userid: # no user found
return None
- if is_user_disabled(user):
- msg = _("""
- %s Account has been deactivated on this server.
- Please contact your Org administrator for more help.""")
- raise rhnFault(1, msg % user, explain=0)
ret = User(user, "")
if not ret.reload(userid) == 0:
# something horked during reloading entry from database
Show replies by date