sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-08 05:57:51 +03:00
Code

netcmd: Change SMB flags from s4 Py bindings to s3

Browse Source 
BUG: https://bugzilla.samba.org/show_bug.cgi?id=13676

Signed-off-by: Tim Beale <timbeale@catalyst.net.nz>
Reviewed-by: Jeremy Allison <jra@samba.org>
(cherry picked from commit 345746ea5f4cca2620421ac0c8a649a596f5c19d)
This commit is contained in:
Tim Beale 2019-01-08 15:10:46 +13:00 committed by Karolin Seeger
parent 3ed03bd24e
commit b47e42e040
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
python/samba/netcmd/gpo.py
View File

@ -44,6 +44,7 @@ from samba.auth import AUTH_SESSION_INFO_DEFAULT_GROUPS, AUTH_SESSION_INFO_AUTHE
from samba.netcmd.common import netcmd_finddc from samba.netcmd.common import netcmd_finddc
from samba import policy from samba import policy
from samba import smb from samba import smb
from samba.samba3 import libsmb_samba_internal as libsmb
from samba import NTSTATUSError from samba import NTSTATUSError
import uuid import uuid
from samba.ntacls import dsacl2fsacl from samba.ntacls import dsacl2fsacl
@ -280,7 +281,7 @@ def backup_directory_remote_to_local(conn, remotedir, localdir):
r_name = r_dir + '\\' + e['name'] r_name = r_dir + '\\' + e['name']
l_name = os.path.join(l_dir, e['name']) l_name = os.path.join(l_dir, e['name'])
if e['attrib'] & smb.FILE_ATTRIBUTE_DIRECTORY: if e['attrib'] & libsmb.FILE_ATTRIBUTE_DIRECTORY:
r_dirs.append(r_name) r_dirs.append(r_name)
l_dirs.append(l_name) l_dirs.append(l_name)
os.mkdir(l_name) os.mkdir(l_name)
@ -294,10 +295,10 @@ def backup_directory_remote_to_local(conn, remotedir, localdir):
parser.write_xml(l_name + '.xml') parser.write_xml(l_name + '.xml')
attr_flags = smb.FILE_ATTRIBUTE_SYSTEM | \ attr_flags = libsmb.FILE_ATTRIBUTE_SYSTEM | \
smb.FILE_ATTRIBUTE_DIRECTORY | \ libsmb.FILE_ATTRIBUTE_DIRECTORY | \
smb.FILE_ATTRIBUTE_ARCHIVE | \ libsmb.FILE_ATTRIBUTE_ARCHIVE | \
smb.FILE_ATTRIBUTE_HIDDEN libsmb.FILE_ATTRIBUTE_HIDDEN
def copy_directory_remote_to_local(conn, remotedir, localdir): def copy_directory_remote_to_local(conn, remotedir, localdir):
@ -315,7 +316,7 @@ def copy_directory_remote_to_local(conn, remotedir, localdir):
r_name = r_dir + '\\' + e['name'] r_name = r_dir + '\\' + e['name']
l_name = os.path.join(l_dir, e['name']) l_name = os.path.join(l_dir, e['name'])
if e['attrib'] & smb.FILE_ATTRIBUTE_DIRECTORY: if e['attrib'] & libsmb.FILE_ATTRIBUTE_DIRECTORY:
r_dirs.append(r_name) r_dirs.append(r_name)
l_dirs.append(l_name) l_dirs.append(l_name)
os.mkdir(l_name) os.mkdir(l_name)