diff --git a/README b/README index 75a908a..02fc472 100644 --- a/README +++ b/README @@ -7,7 +7,7 @@ calculate-server needs the following library version installed, in order to run: python >= 2.5 python-ldap >= 2.0.0 pyxml >= 0.8 - calculate-lib >= 2.1.6 + calculate-lib >= 2.1.8 To install calculate-server , just execute the install script 'setup.py'. Example: diff --git a/profile/samba/etc/samba/smb.conf b/profile/samba/etc/samba/smb.conf index 4a52b05..abfde3a 100644 --- a/profile/samba/etc/samba/smb.conf +++ b/profile/samba/etc/samba/smb.conf @@ -139,8 +139,8 @@ chown=root:root path = #-sr_samba_winlogon_path-#/%u browseable = No read only = yes - root preexec = /usr/lib/calculate/calculate-server/bin/execserv -s --login %U - root postexec = /usr/lib/calculate/calculate-server/bin/execserv -s --logout %U + root preexec = /usr/lib/calculate/calculate-server/bin/execserv -s --makedir %U + !root postexec = [share] diff --git a/pym/cl_ldap.py b/pym/cl_ldap.py index 46a95e5..9245121 100644 --- a/pym/cl_ldap.py +++ b/pym/cl_ldap.py @@ -45,7 +45,7 @@ from xml import xpath # Для 32 битного целого (генерация серийного номера DNS зоны) import ctypes -Version = "calculate-server 2.1.10" +Version = "calculate-server 2.1.11" tr = cl_base.lang() tr.setLanguage(sys.modules[__name__]) diff --git a/pym/cl_vars_server.py b/pym/cl_vars_server.py index 62faadd..cf8c709 100644 --- a/pym/cl_vars_server.py +++ b/pym/cl_vars_server.py @@ -364,7 +364,7 @@ class Data: cl_name = {'value':'calculate-server'} # версия программы - cl_ver = {'value':'2.1.10'} + cl_ver = {'value':'2.1.11'} #DN LDAP ветки, в котором будут находится служебные ветки ld_ldap_dn = {} diff --git a/setup.py b/setup.py index 484b4bf..95cd339 100755 --- a/setup.py +++ b/setup.py @@ -136,7 +136,7 @@ class cl_install_scripts(install_scripts): setup( name = 'calculate-server', - version = "2.1.10", + version = "2.1.11", description = "The program for configuring server-data linux", author = "Calculate Pack", author_email = "support@calculate.ru",