Changeset 4512 for n4d-server-plugins/trunk/fuentes/server-install-files/usr/share/n4d/python-plugins/Golem.py

Timestamp:

May 2, 2017, 2:25:38 PM (4 years ago)

Author:

hectorgh

Message:

added uidNumber support when importing/exporting users

File:

• n4d-server-plugins/trunk/fuentes/server-install-files/usr/share/n4d/python-plugins/Golem.py (modified) (8 diffs)

n4d-server-plugins/trunk/fuentes/server-install-files/usr/share/n4d/python-plugins/Golem.py

@@ -118 +118 @@
         def add_user(self,plantille,properties,generic_mode=False):
                 
-                
                 generated_user=None
                 properties["uid"]=properties["uid"].encode("utf8")
@@ -124 +123 @@
                 properties["sn"]=properties["sn"].encode("utf8")
                 
-                
                 if properties.has_key("userPassword"):
                         properties["userPassword"]=properties["userPassword"].encode("utf8")
                 
-                if type(generic_mode)==type(True):
-                        #es un booleano
+                if type(generic_mode)==type(True) and generic_mode:
                         generated_user=self.ldap.add_user(generic_mode,plantille,properties)
                 else:
@@ -146 +143 @@
                         return generated_user
                 
-        
         #def add_user
         
@@ -172 +168 @@
                         self.peter_pan.execute_python_dir('/usr/share/n4d/hooks/openmeetings','add_user',[properties])
                 return generated_list
+                
                 
         #def add_generic_users
@@ -1001 +998 @@
                                 exported_users[item["uid"]]["groups"]=item["groups"]
                                 exported_users[item["uid"]]["is_admin"]=item["is_admin"]
+                                exported_users[item["uid"]]["uidNumber"]=item["uidNumber"]
                         
 
@@ -1033 +1031 @@
                                 self.add_group(properties)
                                 
-                        for user in exported_info["users"]:
+                        for user in sorted(exported_info["users"]):
+                                
+                                uids={}
+                                for key in self.ldap.xid_counters:
+                                        uids[key]=int(self.ldap.xid_counters[key])
+
                                 
                                 properties={}
@@ -1042 +1045 @@
                                 properties["sambaLMPassword"]=exported_info["users"][user]["sambaLMPassword"]
                                 properties["sambaNTPassword"]=exported_info["users"][user]["sambaNTPassword"]
+                                
+                                if "uidNumber" in exported_info["users"][user]:
+                                        properties["uidNumber"]=exported_info["users"][user]["uidNumber"]
                                 profile=exported_info["users"][user]["profile"]
                                 
-                                self.add_user(profile,properties)
-                                
+                                
+                                ret=self.add_user(profile,properties)
+                                
+                                if "true" in str(ret):
+                                        if "uidNumber" in properties:
+                                                if uids[profile] < int(properties["uidNumber"]):
+                                                        uids[profile]=int(properties["uidNumber"])
                                 
                         for group in exported_info["groups"]:
@@ -1056 +1067 @@
                                 if exported_info["users"][user]["is_admin"]:
                                         self.add_teacher_to_admins(user)
+                                        
+                                        
+                        for profile in uids:
+                                if uids[profile] != int(self.ldap.xid_counters[profile]):
+                                        self.ldap.set_xid(profile,uids[profile])
+                                        self.ldap.xid_counters[profile]=str(uids[profile])
+                                
                         
                         return[True,]