? .DS_Store
? sites/all/modules/devel
? sites/default/files
? sites/default/settings.php
Index: modules/user/user.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.admin.inc,v
retrieving revision 1.117
diff -u -p -r1.117 user.admin.inc
--- modules/user/user.admin.inc	1 Sep 2010 20:08:17 -0000	1.117
+++ modules/user/user.admin.inc	8 Sep 2010 12:08:50 -0000
@@ -639,6 +639,15 @@ function user_admin_settings() {
 }
 
 /**
+ * A FAPI validate handler.
+ */
+function user_admin_settings_validate($form, &$form_state) {
+  if ((bool) db_select('users')->fields('users', array('uid'))->condition('name', db_like($form_state['values']['anonymous']), 'LIKE')->range(0, 1)->execute()->fetchField()) {
+        form_set_error('anonymous', t('There is a registered user with the name %anon. You must choose a unique name for anonymous users.', array('%anon' => $form_state['values']['anonymous'])));
+      }
+}
+
+/**
  * Menu callback: administer permissions.
  *
  * @ingroup forms
Index: modules/user/user.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.module,v
retrieving revision 1.1199
diff -u -p -r1.1199 user.module
--- modules/user/user.module	7 Sep 2010 22:38:30 -0000	1.1199
+++ modules/user/user.module	8 Sep 2010 12:08:50 -0000
@@ -607,6 +607,9 @@ function user_validate_name($name) {
   if (drupal_strlen($name) > USERNAME_MAX_LENGTH) {
     return t('The username %name is too long: it must be %max characters or less.', array('%name' => $name, '%max' => USERNAME_MAX_LENGTH));
   }
+  if (strtolower($name) == strtolower(variable_get('anonymous', t('Anonymous')))) {
+    return t("The username '%anon' is reserved. Please choose a different username.", array('%anon' => $name));
+  }
 }
 
 /**