? 6-validate.patch
? 6-x-conf-ignore.patch
? 624296-query-d6.patch
? 624360-redirect.patch
Index: domain.admin.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/domain/domain.admin.inc,v
retrieving revision 1.41
diff -u -p -r1.41 domain.admin.inc
--- domain.admin.inc	1 Nov 2009 18:20:19 -0000	1.41
+++ domain.admin.inc	5 Nov 2009 19:41:13 -0000
@@ -799,7 +799,9 @@ function domain_batch_form($form_state, 
     '#title' => $batch['#form']['#title'],
     '#description' => $batch['#meta_description']
   );
-
+  if ($batch['#domain_action'] == 'domain_conf' && $batch['#form']['#type'] == 'select') {
+    $batch['#form']['#options'] = array('domain-conf-ignore' => t('Use primary domain settings')) + $batch['#form']['#options'];
+  }
   foreach ($domains as $domain) {
     // Set the current value according to the stored values.
     if (isset($domain[$action])) {
Index: domain_conf/domain_conf.admin.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/domain/domain_conf/domain_conf.admin.inc,v
retrieving revision 1.14
diff -u -p -r1.14 domain_conf.admin.inc
--- domain_conf/domain_conf.admin.inc	23 Oct 2009 16:33:21 -0000	1.14
+++ domain_conf/domain_conf.admin.inc	5 Nov 2009 19:41:17 -0000
@@ -56,7 +56,7 @@ function domain_conf_form($form_state, $
       continue;
     }
     if ($action['#form']['#type'] == 'select') {
-      $action['#form']['#options'] = array(NULL => t('Use primary domain settings')) + $action['#form']['#options'];
+      $action['#form']['#options'] = array('domain-conf-ignore' => t('Use primary domain settings')) + $action['#form']['#options'];
     }
     $group = isset($action['#group']) ? $action['#group'] : $default_group;
     if (!isset($form[$group])) {
Index: domain_conf/domain_conf.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/domain/domain_conf/domain_conf.module,v
retrieving revision 1.53
diff -u -p -r1.53 domain_conf.module
--- domain_conf/domain_conf.module	1 Nov 2009 18:20:19 -0000	1.53
+++ domain_conf/domain_conf.module	5 Nov 2009 19:41:17 -0000
@@ -36,6 +36,9 @@ function domain_conf_domain_bootstrap_fu
     $settings = unserialize($data['settings']);
     // Overwrite the $conf variables.
     foreach ($settings as $key => $value) {
+      if ($value == 'domain-conf-ignore') {
+        continue;
+      }
       // Language handling is a special case.
       if ($key == 'language_default') {
         $table = domain_get_primary_table('system');