Index: modules/user/user.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.module,v
retrieving revision 1.877
diff -u -p -r1.877 user.module
--- modules/user/user.module	20 Dec 2007 21:59:17 -0000	1.877
+++ modules/user/user.module	21 Dec 2007 21:41:12 -0000
@@ -1275,6 +1275,11 @@ function user_login_final_validate($form
     form_set_error('name', t('Sorry, unrecognized username or password. <a href="@password">Have you forgotten your password?</a>', array('@password' => url('user/password'))));
     watchdog('user', 'Login attempt failed for %user.', array('%user' => $form_state['values']['name']));
   }
+  else if (variable_get('site_offline', 0) && !user_access('administer site configuration')) {
+    form_set_error('login', t('Drupal is currently under maintenance. We should be back shortly. Thank you for your patience.'));
+    session_destroy();
+    $user = user_load(array('uid' => 0));
+  }
 }
 
 /**