? 366950-split-user-permissions-rev2.patch
? 366950-split-user-permissions-rev3.patch
? 366950-split-user-permissions.patch
? 470306-email-column-too-short.patch
? 486278-make-xml-server-user-drupal-set-header-rev2.patch
? 486278-make-xml-server-user-drupal-set-header.patch
Index: modules/user/user.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.module,v
retrieving revision 1.1000
diff -u -p -r1.1000 user.module
--- modules/user/user.module	8 Jun 2009 05:00:11 -0000	1.1000
+++ modules/user/user.module	12 Jun 2009 19:07:13 -0000
@@ -796,6 +796,10 @@ function user_perm() {
       'title' => t('Administer users'),
       'description' => t('Manage or block users, and manage their role assignments.'),
     ),
+    'administer user settings' => array(
+      'title' => t('Administer user settings'),
+      'description' => t('Manage settings that apply to all user accounts.'),
+    ),
     'access user profiles' => array(
       'title' => t('Access user profiles'),
       'description' => t('View profiles of users on the site, which may contain personal information.'),
@@ -1365,7 +1369,7 @@ function user_menu() {
     'description' => 'Configure default behavior of users, including registration requirements, e-mails, and user pictures.',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('user_admin_settings'),
-    'access arguments' => array('administer users'),
+    'access arguments' => array('administer user settings'),
   );
 
   // Permission administration pages.
Index: modules/user/user.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.test,v
retrieving revision 1.42
diff -u -p -r1.42 user.test
--- modules/user/user.test	11 Jun 2009 07:51:30 -0000	1.42
+++ modules/user/user.test	12 Jun 2009 19:07:16 -0000
@@ -732,7 +732,7 @@ class UserPermissionsTestCase extends Dr
   function setUp() {
     parent::setUp();
 
-    $this->admin_user = $this->drupalCreateUser(array('administer permissions', 'access user profiles', 'administer site configuration', 'administer users'));
+    $this->admin_user = $this->drupalCreateUser(array('administer permissions', 'access user profiles', 'administer site configuration', 'administer users', 'administer user settings'));
 
     // Find the new role ID - it must be the maximum.
     $all_rids = array_keys($this->admin_user->roles);