Changeset 6604

Timestamp:

Jan 17, 2018, 10:07:02 AM (2 years ago)

Author:

hectorgh

Message:

server is the default option, ip will be used afterwards only if it can be calculated

File:

• client-mount/trunk/fuentes/install-files/usr/share/n4d/python-plugins/ClientPamMount.py (modified) (4 diffs)

client-mount/trunk/fuentes/install-files/usr/share/n4d/python-plugins/ClientPamMount.py

@@ -30 +30 @@
                 
                 try:
-                        if os.path.exists(self.pam_skel):
-                                self.configure_xml()
+                        # revert to server first thing, instead of waiting for a 10times timeout
+                        self.set_address("server")
+                        # Then try to get server ip
+                        self.configure_xml()
+                        
                 except Exception as e:
                         print(str(e))
@@ -46 +49 @@
         #def uchmod
 
+        def set_address(self,address):
+                
+                if os.path.exists(self.pam_skel):
+                        
+                        f=open(self.pam_skel)
+                        tmp,filename=tempfile.mkstemp()
+                        tmp_file = open(filename,'w')
+                        for line in f.readlines():
+                                tmp_file.write(line.replace(self.key,address))
+                                
+                        f.close()
+                        tmp_file.close()
+                        self.uchmod(filename,0644)
+                                
+                        shutil.copy(filename,self.pam_file)
+                        os.remove(filename)
+                        
+                        return True
+                        
+                return False
+                
+        #def set_address
+
         
         def configure_xml(self):
@@ -57 +83 @@
                         ip=objects["VariablesManager"].get_variable("SRV_IP")
                         if ip != None:
-                                f=open(self.pam_skel)
-                                tmp,filename=tempfile.mkstemp()
-                                tmp_file = open(filename,'w')
-                        
-                                for line in f.readlines():
-                                        tmp_file.write(line.replace(self.key,ip))
                                 
-                                f.close()
-                                tmp_file.close()
-                                self.uchmod(filename,0644)                              
-
-                                shutil.copy(filename,self.pam_file)
-                                os.remove(filename)
-                                
-                                configured=True
+                                if self.set_address(ip):
+                                        configured=True
                                 break
                                 
@@ -82 +96 @@
                 else:
                         # fallback to 'server'
-                        f=open(self.pam_skel)
-                        tmp,filename=tempfile.mkstemp()
-                        tmp_file = open(filename,'w')
-                        for line in f.readlines():
-                                tmp_file.write(line.replace(self.key,"server"))
-                                
-                        f.close()
-                        tmp_file.close()
-                        self.uchmod(filename,0644)
-                                
-                        shutil.copy(filename,self.pam_file)
-                        os.remove(filename)
-                        
                         return {"status":False,"msg":"Fallen back to 'server'"}