Добавлена поддержка openrc при определении запущен или нет демон.

git-svn-id: http://svn.calculate.ru/calculate2/calculate-server/trunk@1298 c91db197-33c1-4113-bf15-f8a5c547ca64

pym/cl_ldap.py

@@ -859,11 +859,19 @@ class shareLdap(imp_cl_err, imp_cl_xml, imp_cl_help, imp_cl_smcon):
                     runDaemons['postfix'] = False
                 continue
             addDirDict = {"slapd":("openldap","slapd.pid"),
-                          "samba":("/var/lib/init.d/daemons","samba"),
                           "dovecot":("dovecot","master.pid"),
-                          "ejabberd":("/var/lib/init.d/daemons","ejabberd"),
-                          "proftpd":("","proftpd.pid")
-                          }
+                          "proftpd":("","proftpd.pid")}
+            baselayoutDir = "/var/lib/init.d/daemons"
+            if os.path.exists(baselayoutDir):
+                addDirDict["ejabberd"] = (baselayoutDir,"ejabberd")
+                addDirDict["samba"] = (baselayoutDir,"samba")
+            elif daemon in ["jabber", "samba"]:
+                if not os.system("/lib/rc/bin/service_started %s" %daemon):
+                    runDaemons[daemon] = True
+                else:
+                    runDaemons[daemon] = False
+                continue
+                
             if addDirDict[daemon][0][:1] == "/":
                 pidDir = addDirDict[daemon][0]
             else: