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

bin/replication.c

@@ -106,7 +106,7 @@ struct stat bufS;
    ret = system(str_exec);
    if (ret!=0)
      {
-       printf("The file %s is executed with an error\n",str_exec);
+       printf("The program '%s' is executed with an error\n",str_exec);
        exit(EXIT_FAILURE);
      };
 //  printf ("file mode: %o\n",bufS.st_mode & file_mode_err);

pym/cl_ldap.py

@@ -7285,7 +7285,7 @@ class servRepl(shareLdap):
             return False
 
     @adminConnectLdap
-    def deleteLogoutFile(userName, logoutFile):
+    def deleteLogoutFile(self, userName, logoutFile):
         """Удаляет .logout файл"""
         if os.path.exists(logoutFile):
             try:
@@ -7473,18 +7473,21 @@ class servRepl(shareLdap):
         if not errorFlag and self.clVars.Get("ld_repl_set") != "on":
             errorFlag = True
             errMessage = _("Replication off")
+        flagLogOut = False
+        retStr = ""
         if not errorFlag:
             if self.servSambaObj.searchSambaUser(login):
                 if self.isLoginUser(login):
-                    if not createUserDirs(login):
+                    if not self.createUserDirs(login):
                         errorFlag = True
                         errMessage = \
                             _("Can not create user %s directories")%str(login)
                 else:
+                    flagLogOut = True
                     # Удаляем файл .logout
                     logoutFile =\
                           os.path.join(self.clVars.Get("sr_samba_linprof_path"),
-                                       userName,self.logOutFile)
+                                       login,self.logOutFile)
                     retStr = self.deleteLogoutFile(login, logoutFile)
                     if not retStr:
                         errorFlag = True
@@ -7506,7 +7509,11 @@ class servRepl(shareLdap):
                 if logObj:
                     logObj.writeError(errMessage)
             return False
-        messages = _("User %s is added in LDAP branch 'Replication'")%login
+        messages = ""
+        if flagLogOut:
+            messages += _("User %s logout %s")%(login, retStr)
+        else:
+            messages += _("User %s login")%login
         if verboseMode:
             self.printSUCCESS(messages)
         if logObj: