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

ldif/jabber_user.ldif

@@ -2,7 +2,7 @@
 dn: uid=#-ur_name-#,ou=Users,#-ld_jabber_dn-#
 objectClass: inetOrgPerson
 uid: #-ur_name-#
-cn: #-ur_fio-#
+cn: #-ur_name-#
 sn: #-ur_fio-#
 mail: #-sr_jabber_user_id-#
 initials: Yes

profile/jabber/etc/jabber/ejabberd.cfg

@@ -4,7 +4,7 @@
 %%%
 
 {loglevel, 1}.
-{hosts, ["localhost", "#-sr_jabber_host-#"]}.
+{hosts, ["localhost", #-sr_jabber_hosts_pass-#]}.
 {listen,
  [
   {#-sr_jabber_port-#, ejabberd_c2s, [
@@ -27,7 +27,7 @@
  ]}.
 {auth_method, ldap}.
 {ldap_servers, ["localhost"]}.
-{ldap_uids, [{"mail", "%u@#-sr_jabber_host-#"}]}.
+{ldap_uids, [{"mail", "%u@*"}]}.
 {ldap_base, "#-ld_jabber_dn-#"}.
 {ldap_rootdn, "#-ld_jabber_dn-#"}.
 {ldap_filter, "(initials=Yes)"}.
@@ -86,7 +86,8 @@
   {mod_shared_roster_ldap,
    [{ldap_groupattr, "departmentNumber"},
     {ldap_groupdesc, "departmentNumber"},
-    {ldap_memberattr, "uid"},
+    {ldap_memberattr, "cn"},
+    {ldap_memberattr_format, "%u"},
     {ldap_rfilter, "(objectClass=inetOrgPerson)"},
     {ldap_userdesc, "sn"}
    ]

pym/cl_ldap.py

@@ -2878,7 +2878,7 @@ service"))
                 return False
             if options.has_key('d'):
                 self.printSUCCESS(
-                    _("Deleted password of Unix service for user") +\
+                    _("Deleted password of Unix service for user")+ " " +\
                       str(userName))
             if options.has_key('l'):
                 self.printSUCCESS(_("Locked user") + " " + str(userName) +\
@@ -6855,6 +6855,7 @@ outdated. If the backup is obsolete, use cl-backup."))
 'history=%s' - error, to use 'history on' or 'history off'")\
                             %str(history))
                     return False
+            # Устанавливаем основной хост jabber cервиса
             if options.has_key("host"):
                 newHostName = options['host']
                 if not "." in newHostName:
@@ -6863,6 +6864,13 @@ outdated. If the backup is obsolete, use cl-backup."))
                 if newHostName != previousJabberHost:
                     # Устанавливаем перемемнную
                     self.clVars.Set("sr_jabber_host",newHostName,True)
+                    hosts = self.clVars.Get("sr_jabber_hosts").split(",")
+                    unicHostsList = [self.clVars.Get("sr_jabber_host")]
+                    for host in hosts:
+                        if not host in [newHostName, previousJabberHost]:
+                            unicHostsList.append(host)
+                    jabberHosts = ",".join(unicHostsList)
+                    self.clVars.Set("sr_jabber_hosts",jabberHosts,True)
             # Устанавливаем дополнительные хосты jabber cервиса
             if options.has_key("hosts"):
                 hosts = options['hosts'].split(",")
@@ -8594,7 +8602,7 @@ preferences and data (for users with uid<1000)")
          'longOption':"groups",
          'optVal':"GROUPS",
          'helpChapter':_("Samba service options"),
-         'help':_("new list of supplementary GROUPS (used Unix groups)")
+         'help':_("new list of supplementary GROUPS")
         },
         {'progAccess':(5,),
          'shortOption':"s",
@@ -11631,11 +11639,15 @@ with another option."))
                     # Ищем gidNumber пользователя Samба в Unix сервисе
                     searchResUnix = servObj.servUnixObj.searchUnixUser(userName)
                     if searchResUnix:
+                        #uidNumber = searchResUnix[0][0][1]['uidNumber'][0]
+                        #i[0][1]['uidNumber'] = [uidNumber]
+                        #data.insert(0,(_("ID"),"uidNumber"))
+
                         gidNumber = searchResUnix[0][0][1]['gidNumber'][0]
-                        sambaGroup = servObj.searchSambaGid(gidNumber)
-                        if sambaGroup:
-                            i[0][1]['gidNumber'] = [gidNumber]
-                            data.append((_("Primary group"),"gidNumber"))
+                        #sambaGroup = servObj.searchSambaGid(gidNumber)
+                        #if sambaGroup:
+                        i[0][1]['gidNumber'] = [gidNumber]
+                        data.append((_("Primary group"),"gidNumber"))
                     homePath = os.path.join(\
                                            clVars.Get("sr_samba_home_path"),
                                            i[0][1]['uid'][0])
@@ -11706,7 +11718,11 @@ with another option."))
                                 data.append(("", value))
                 else:
                     data.append((attrName, _("No")))
-        return (headers, data)
+        dataClean = []
+        for name, value in data:
+            if value:
+                dataClean.append((name, value))
+        return (headers, dataClean)
 
     def getAllMachines(self, fields, service):
         """Выдает список компьютеров"""