Index: drupal/modules/user.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/user.module,v
retrieving revision 1.479
diff -u -Ff -r1.479 user.module
--- drupal/modules/user.module	7 Jun 2005 18:54:37 -0000	1.479
+++ drupal/modules/user.module	17 Jun 2005 06:34:31 -0000
@@ -790,6 +790,13 @@       $links[] = l(module_invoke($module
 
 /*** User features *********************************************************/
 
+function user_blocked($name) {
+  $allow = db_fetch_object(db_query("SELECT * FROM {users} WHERE status = 1 AND name = LOWER('%s')", $name));
+  $deny = db_fetch_object(db_query("SELECT * FROM {users} WHERE status = 0 AND name = LOWER('%s')", $name));
+
+  return $deny && !$allow;
+}
+
 function user_login($edit = array(), $msg = '') {
   global $user, $base_url;
 
@@ -798,7 +805,9 @@   if ($user->uid) {
     drupal_goto('user');
   }
 
-  if (drupal_deny('user', $edit['name'])) {
+  if(user_blocked($edit['name'])) {
+    $error = t('The name %s has been blocked.', array('%s' => theme('placeholder', $edit['name'])));    
+  } else if (drupal_deny('user', $edit['name'])) {
     $error = t('The name %s has been denied access.', array('%s' => theme('placeholder', $edit['name'])));
   }
   else if ($edit['name'] && $edit['pass']) {