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

ldif/mail_group.ldif

@@ -6,3 +6,4 @@ cn: #-soft_ldap_group_name-#
 mail: #-soft_ldap_group_name-#@#-net_host-#.#-sys_domain-#
 mailAlternateAddress: #-soft_ldap_group_name-#@#-net_host-#.#-sys_domain-#
 mailMessageStore: #-soft_ldap_group_name-#/
+description: #-soft_ldap_group_desc-#

ldif/mail_user.ldif

@@ -6,6 +6,6 @@ uid: #-soft_ldap_user_login-#
 cn: #-soft_ldap_user_full_name-#
 sn: #-soft_ldap_user_full_name-#
 accountStatus: active
-mailMessageStore: #-soft_ldap_user_login-#/
+#mailMessageStore: #-soft_ldap_user_login-#/
 mail: #-soft_ldap_user_login-#@#-net_host-#.#-sys_domain-#
 userPassword: #-soft_ldap_user_pw_hash-#

scripts/cl-groupdel

@@ -38,12 +38,12 @@ if __name__ == "__main__":
             if obj.delGroupUnixServer(optObj.params['group'],
                                               optObj.opt):
                 flagError = False
-        elif optObj.params['service'] == "samba":
-            pass
-            ## Добавляем группу
-            #if ldapObj.delGroupLdapServer(optObj.params['group'],
-                                              #optObj.opt):
-                #flagError = False
+        elif optObj.params['service'] == "mail":
+            obj = cl_ldap.servMail()
+            # Добавляем группу
+            if obj.delGroupMailServer(optObj.params['group'],
+                                              optObj.opt):
+                flagError = False
     if flagError:
         sys.exit(1)
     else:

scripts/cl-groupmod

@@ -37,12 +37,12 @@ if __name__ == "__main__":
             if not obj.modGroupUnixServer(optObj.params['group'],
                                               optObj.opt):
                 flagError = True
-        elif optObj.params['service'] == "samba":
-            pass
-            ## Добавляем группу
-            #if not ldapObj.modGroupLdapServer(optObj.params['group'],
-                                              #optObj.opt):
-                #flagError = True
+        elif optObj.params['service'] == "mail":
+            obj = cl_ldap.servMail()
+            # Добавляем группу
+            if not obj.modGroupMailServer(optObj.params['group'],
+                                              optObj.opt):
+                flagError = True
     if flagError:
         sys.exit(1)
     else:

scripts/cl-userdel

@@ -42,6 +42,11 @@ if __name__ == "__main__":
             # Удаляем  пользователя сервиса Samba
             if obj.delUserSambaServer(optObj.params['user'], optObj.opt):
                 flagError = False
+        elif optObj.params['service'] == "mail":
+            obj = cl_ldap.servMail()
+            # Удаляем  пользователя сервиса Mail
+            if obj.delUserMailServer(optObj.params['user'], optObj.opt):
+                flagError = False
     if flagError:
         sys.exit(1)
     else: