--- _orig/user_import/supported/user.inc	2009-11-16 14:26:07.000000000 -0500
+++ _modified/user_import/supported/user.inc	2009-11-17 19:42:34.000000000 -0500
@@ -14,6 +14,7 @@ function user_user_import_form_field_mat
   $options['user']['email'] = t('Email Address*');
   $options['user']['password'] = t('Password'); 
   $options['user']['roles'] = t('Roles');
+  if(module_exists('subuser')) $options['user']['subuser'] = t('Subuser'); //GMM: support subuser setting on new user creation
   return $options;
 }
 
@@ -37,6 +38,7 @@ function user_user_import_form_update_us
   $form['roles'] = array('title' => t('Roles'), 'description' => t('Affected: roles assigned to user.'));
   $form['password'] = array('title' => t('Password'), 'description' => t('Affected: password.'), 'exclude_add' => TRUE);
   $form['contact'] = array('title' => t('Contact'), 'description' => t('Affected: user contact option.'), 'exclude_add' => TRUE);
+  //if(module_exists('subuser')) $form['subuser'] = array('title' => t('Subuser'), 'description' => t('Affected: user is a subuser.')); // GMM: no subuser change on update
   return $form;
 }
 
@@ -61,6 +63,10 @@ function user_user_import_data($settings
     $value = user_user_import_roles_data($data[$column_id], $settings['roles_new']);
   }
 
+  if ($field_id == 'subuser'){ //GMM:
+    $value = trim($data[$column_id]);
+  }
+
   return $value;
 }
 
@@ -143,7 +149,9 @@ function user_user_import_after_save($se
    */
 
 	user_user_import_after_save_role($account, $settings['roles_new'], $account->roles, $fields['user']['roles']);
-  return;
+        if(module_exists('subuser')) user_user_import_after_save_subuser($account, $fields['user']['subuser']); //GMM:
+
+        return;
 }
 
 function user_user_import_edit_roles_fields(&$form, $import, $collapsed) { 
@@ -326,3 +334,13 @@ function user_user_import_after_save_rol
 
   return;
 }
+//GMM: Apply subuser settings on import
+function user_user_import_after_save_subuser($account, $subuser_email) {
+
+  $parent = _user_import_existing_uid($subuser_email);
+  if($parent > 0) {
+	db_query("INSERT INTO {user_relationship} (parent_id, uid) VALUES (%d, %d)", $parent, $account->uid);
+  } else {
+	  user_import_errors(t('no email'));
+  }
+}