sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-27 14:04:05 +03:00
Code

samba-tool ntacl: pass system session to get/set-ntacl functions

Browse Source 
The filled session is needed in different vfs modules.

Signed-off-by: Björn Baumbach <bb@sernet.de>
Reviewed-by: Volker Lendecke <vl@samba.org>
This commit is contained in:
Björn Baumbach 2018-09-04 16:20:49 +02:00
parent bc8d0d5160
commit 38fe315bcf
1 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
python/samba/netcmd/ntacl.py
View File

@ -29,7 +29,11 @@ from samba import provision
from ldb import SCOPE_BASE from ldb import SCOPE_BASE
import os import os
from samba.auth import system_session from samba.auth import (
system_session,
session_info_fill_unix,
copy_session_info,
)
from samba.netcmd import ( from samba.netcmd import (
Command, Command,
CommandError, CommandError,
@ -37,6 +41,12 @@ from samba.netcmd import (
Option, Option,
) )
def system_session_unix():
session_info = system_session()
session_info_unix = copy_session_info(session_info)
session_info_fill_unix(session_info_unix, None)
return session_info_unix
class cmd_ntacl_set(Command): class cmd_ntacl_set(Command):
"""Set ACLs on a file.""" """Set ACLs on a file."""
@ -88,7 +98,15 @@ class cmd_ntacl_set(Command):
# ensure we are using the right samba_dsdb passdb backend, no matter what # ensure we are using the right samba_dsdb passdb backend, no matter what
s3conf.set("passdb backend", "samba_dsdb:%s" % samdb.url) s3conf.set("passdb backend", "samba_dsdb:%s" % samdb.url)
setntacl(lp, file, acl, str(domain_sid), xattr_backend, eadb_file, use_ntvfs=use_ntvfs, service=service) setntacl(lp,
file,
acl,
str(domain_sid),
xattr_backend,
eadb_file,
use_ntvfs=use_ntvfs,
service=service,
session_info=system_session_unix())
if use_ntvfs: if use_ntvfs:
logger.warning("Please note that POSIX permissions have NOT been changed, only the stored NT ACL") logger.warning("Please note that POSIX permissions have NOT been changed, only the stored NT ACL")
@ -159,7 +177,13 @@ class cmd_ntacl_get(Command):
# ensure we are using the right samba_dsdb passdb backend, no matter what # ensure we are using the right samba_dsdb passdb backend, no matter what
s3conf.set("passdb backend", "samba_dsdb:%s" % samdb.url) s3conf.set("passdb backend", "samba_dsdb:%s" % samdb.url)
acl = getntacl(lp, file, xattr_backend, eadb_file, direct_db_access=use_ntvfs, service=service) acl = getntacl(lp,
file,
xattr_backend,
eadb_file,
direct_db_access=use_ntvfs,
service=service,
session_info=system_session_unix())
if as_sddl: if as_sddl:
try: try:
domain_sid = security.dom_sid(samdb.domain_sid) domain_sid = security.dom_sid(samdb.domain_sid)