Modify method delServicesAutostart()

pym/cl_ldap.py

@@ -712,31 +712,31 @@ in a sambaDomainName',
         Входные данные - список названий сервисов
         """
         flagError = False
-        flagLdap = False
+        services = {"ldap":["slapd"],
+                    "unix":["slapd"],
+                    "samba":["samba"],
+                    "mail":["postfix","dovecot"],
+                    "jabber":["ejabberd"],
+                    "ftp":["proftpd"],
+                    "proxy":["squid"],
+                    "dns":["named"],
+                    "dhcp":["dhcpd"]}
+        delDaemons = []
         for service in servInstalled:
-            if service == "unix" or service == "ldap":
-                if not self.delDaemonAutostart("slapd"):
-                    flagError = True
-                    break
-                continue
-            elif service == "mail":
-                if not self.delDaemonAutostart("postfix"):
-                    flagError = True
-                    break
-                if not self.delDaemonAutostart("dovecot"):
-                    flagError = True
-                    break
-                    continue
-            elif service == "jabber":
-                if not self.delDaemonAutostart("ejabberd"):
-                    flagError = True
-                    break
-                    continue
-            else:
-                if not self.delDaemonAutostart("service"):
-                    flagError = True
-                    break
-                    continue
+            if not service in services.keys():
+                self.printERROR(_("Can not supported service '%s'")%service)
+                self.printERROR(\
+                            _("Can not deleted service from default runlevel"))
+                flagError = True
+                break
+            for daemon in services[service]:
+                if not daemon in delDaemons:
+                    delDaemons.append(daemon)
+                    if not self.delDaemonAutostart(daemon):
+                        flagError = True
+                        break
+            if flagError:
+                break
         if flagError:
             return False
         else: