From 570c245298aa72b89c99176c5709e8c0afc296a2 Mon Sep 17 00:00:00 2001
From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Thu, 5 Apr 2007 05:46:07 +0000
Subject: [PATCH] Fixed post capture for noprimarygroup. Removed 'gosa.conf
 exists' check from step2.

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@5985 594d385d-05f5-0310-b6e9-bd551577e9d8
---
 setup/class_setupStep2.inc  | 20 ++++++++++----------
 setup/class_setupStep6a.inc |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/setup/class_setupStep2.inc b/setup/class_setupStep2.inc
index fb8780145..9a06f0ef9 100644
--- a/setup/class_setupStep2.inc
+++ b/setup/class_setupStep2.inc
@@ -259,16 +259,16 @@ class setup_step_2 extends setup_step
     $this->is_writeable[] = array("NAME" => $N , "DESC" => $D , "RESULT" => $R , "SOLUTION" => $S , "MUST" => $M );
 
     /* If we have writeaccess to the config dir, check if there is already a config file */
-    if($R){
-
-      /* check if there is already a config file. */
-      $N = _("No old configuration file.");
-      $D = "";//_("");
-      $S = _("If there is already a configuration file, this file will be overwritten when GOsa setup finishes. Please move your old config file away.");
-      $R =  !file_exists("/etc/gosa/gosa.conf");
-      $M = FALSE;
-      $this->is_writeable[] = array("NAME" => $N , "DESC" => $D , "RESULT" => $R , "SOLUTION" => $S , "MUST" => $M );
-    }
+#    if($R){
+#
+#      /* check if there is already a config file. */
+#      $N = _("No old configuration file.");
+#      $D = "";//_("");
+#      $S = _("If there is already a configuration file, this file will be overwritten when GOsa setup finishes. Please move your old config file away.");
+#      $R =  !file_exists("/etc/gosa/gosa.conf");
+#      $M = FALSE;
+#      $this->is_writeable[] = array("NAME" => $N , "DESC" => $D , "RESULT" => $R , "SOLUTION" => $S , "MUST" => $M );
+#    }
   }
  
 
diff --git a/setup/class_setupStep6a.inc b/setup/class_setupStep6a.inc
index 9b1fd99b7..ca875c418 100644
--- a/setup/class_setupStep6a.inc
+++ b/setup/class_setupStep6a.inc
@@ -102,7 +102,7 @@ class setup_step_6a extends setup_step
         }
       }
       
-      foreach(array("enableCopyPaste","forceglobals","forcessl","warnssl","compile","debuglevel","session_lifetime","smbhash") as $name){
+      foreach(array("noprimarygroup","enableCopyPaste","forceglobals","forcessl","warnssl","compile","debuglevel","session_lifetime","smbhash") as $name){
         if(isset($_POST[$name])){
           $this->optional[$name] = stripslashes($_POST[$name]);
         }
-- 
2.30.2