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

pym/cl_ldap.py

@@ -5578,7 +5578,7 @@ class cl_ldap(shareLdap):
          'longOption':"ftp-dir",
          'optVal':_("FTP_DIR"),
          'helpChapter':_("FTP service options"),
-         'help':_("ftp directory for the new user account")
+         'help':_("ftp relative directory for the new user account")
         },
         {'progAccess':(3,),
          'shortOption':"g",
@@ -6779,6 +6779,7 @@ class servFtp(shareLdap):
         # FTP директория пользователя
         if options.has_key('d') and options.has_key('m'):
             ftpUserDir = options['d']
+            ftpUserDir = os.path.join(ftpDir,ftpUserDir)
             self.clVars.Set("ur_home_path", ftpUserDir)
         else:
             self.clVars.Set("ur_home_path", ftpDir)