Программе cl-client добавлена опция '-s --save' действует совместно с '-r'. Опция сохраняет адрес и пароль подключения к домену, при выходе компьютера из домена.

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

pym/cl_client.py

@@ -156,7 +156,7 @@ class cl_client(imp_cl_err, imp_cl_xml, imp_cl_help, imp_cl_smcon):
          'longOption':"vars",
          'optVal':_("TYPE_VAR"),
          'helpChapter':_("Common options"),
-         'help':_("print variables (TYPE_VAR - all:full var)")
+         'help':_("print variables (TYPE_VAR=all' - print full var)")
         },
         {'progAccess':(0,1,2),
          'longOption':"color",
@@ -176,6 +176,12 @@ WHEN may be 'never', 'always', or 'auto'")
          'helpChapter':_("Common options"),
          'help':_("mount [remote] resource for Samba (calculate-server)")
         },
+        {'progAccess':(0,),
+         'shortOption':"s",
+         'longOption':"save",
+         'helpChapter':_("Common options"),
+         'help':_("save passwords domain, if you run with option '-r'")
+        },
         {'progAccess':(2,),
          'longOption':"login",
          'helpChapter':_("Common options"),
@@ -618,7 +624,7 @@ cl_remote_pw") + " ...")
                                     " ...")
         return True
 
-    def delDomain(self):
+    def delDomain(self, removePwd=True):
         """выводим из домена"""
         self.createClVars()
         pathRemote = "/var/calculate/remote"
@@ -644,8 +650,12 @@ cl_remote_pw") + " ...")
                                     " ...")
                 return False
         self.execProg("calculate -P install/6intranet")
-        self.clVars.Delete("cl_remote_host","local")
-        self.clVars.Delete("cl_remote_pw","local")
+        if removePwd:
+            self.clVars.Delete("cl_remote_host","local")
+            self.clVars.Delete("cl_remote_pw","local")
+        else:
+            self.printWARNING(_("remote domain address and remote password \
+are not removed"))
         self.printOK(_("Computer removed from domain %s")%domain + " ...")
         return True
 

scripts/cl-client

@@ -55,6 +55,14 @@ if __name__ == "__main__":
                 domain = optObj.params['user']
                 if not ldapObj.addDomain(domain):
                     flagError = True
+        if optObj.opt.has_key('s') and not optObj.opt.has_key('r'):
+            optObj.handlerErrOpt()
+            sys.exit(1)
+        if optObj.opt.has_key('r') and optObj.opt.has_key('r'):
+            if not ldapObj.delDomain(False):
+                flagError = True:
+            if not ldapObj.delDomain():
+                flagError = True
         if optObj.opt.has_key('r'):
             if not ldapObj.delDomain():
                 flagError = True