summaryrefslogtreecommitdiff
path: root/python
diff options
context:
space:
mode:
authorJoe Guo <joeg@catalyst.net.nz>2018-05-02 22:22:52 +0000
committerAndrew Bartlett <abartlet@samba.org>2018-05-14 02:53:16 +0200
commit2fc6cbb8cb4931f7f4b130817859d2a283ac541c (patch)
tree660eba82a72e32bef331125adb9912aab88e8aaa /python
parent72f98f9763669887482cf430c7734b0a0d69cc1b (diff)
downloadsamba-2fc6cbb8cb4931f7f4b130817859d2a283ac541c.tar.gz
samba-2fc6cbb8cb4931f7f4b130817859d2a283ac541c.tar.bz2
samba-2fc6cbb8cb4931f7f4b130817859d2a283ac541c.zip
traffic: fix userAccountControl for machine account
change userAccountControl from UF_WORKSTATION_TRUST_ACCOUNT | UF_PASSWD_NOTREQD to UF_TRUSTED_FOR_DELEGATION | UF_SERVER_TRUST_ACCOUNT This will fix NetrServerPasswordSet2 failure in packet_rpc_netlogon_30 while testing against windows. Signed-off-by: Joe Guo <joeg@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org> Reviewed-by: Garming Sam <garming@catalyst.net.nz>
Diffstat (limited to 'python')
-rw-r--r--python/samba/emulate/traffic.py9
1 files changed, 6 insertions, 3 deletions
diff --git a/python/samba/emulate/traffic.py b/python/samba/emulate/traffic.py
index 2dc27d95100..84a9a6ab067 100644
--- a/python/samba/emulate/traffic.py
+++ b/python/samba/emulate/traffic.py
@@ -42,8 +42,11 @@ from samba.drs_utils import drs_DsBind
import traceback
from samba.credentials import Credentials, DONT_USE_KERBEROS, MUST_USE_KERBEROS
from samba.auth import system_session
-from samba.dsdb import UF_WORKSTATION_TRUST_ACCOUNT, UF_PASSWD_NOTREQD
-from samba.dsdb import UF_NORMAL_ACCOUNT
+from samba.dsdb import (
+ UF_NORMAL_ACCOUNT,
+ UF_SERVER_TRUST_ACCOUNT,
+ UF_TRUSTED_FOR_DELEGATION
+)
from samba.dcerpc.misc import SEC_CHAN_BDC
from samba import gensec
from samba import sd_utils
@@ -1657,7 +1660,7 @@ def create_machine_account(ldb, instance_id, netbios_name, machinepass):
"objectclass": "computer",
"sAMAccountName": "%s$" % netbios_name,
"userAccountControl":
- str(UF_WORKSTATION_TRUST_ACCOUNT | UF_PASSWD_NOTREQD),
+ str(UF_TRUSTED_FOR_DELEGATION | UF_SERVER_TRUST_ACCOUNT),
"unicodePwd": utf16pw})
end = time.time()
duration = end - start