summaryrefslogtreecommitdiffstats
path: root/python/samba/join.py
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2014-08-11 11:46:51 +1200
committerAndrew Bartlett <abartlet@samba.org>2014-09-01 00:36:42 +0200
commit0edc1476b7c492cfda877bc2ac36df9d13e0abad (patch)
tree5527dd7ad296cb033fc1c081469809327e2c9b3a /python/samba/join.py
parent964e412ead6af1ef2ccfba351161e9a865a251ac (diff)
downloadsamba-0edc1476b7c492cfda877bc2ac36df9d13e0abad.tar.gz
samba-0edc1476b7c492cfda877bc2ac36df9d13e0abad.tar.xz
samba-0edc1476b7c492cfda877bc2ac36df9d13e0abad.zip
join.py: Ensure we set the SID of the parent domain on the trust record
Change-Id: Ifaf3f2d1240d983a48ee1874fdc9c266354f6754 Signed-off-by: Andrew Bartlett <abartlet@samba.org> Reviewed-by: Stefan Metzmacher <metze@samba.org> Reviewed-By: Jelmer Vernooij <jelmer@samba.org>
Diffstat (limited to 'python/samba/join.py')
-rw-r--r--python/samba/join.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/python/samba/join.py b/python/samba/join.py
index 59e4d5c1a5..4b9fed066e 100644
--- a/python/samba/join.py
+++ b/python/samba/join.py
@@ -1037,7 +1037,8 @@ class dc_join(object):
"flatname" : ctx.forest_domain_name,
"trustPartner" : ctx.dnsforest,
"trustAuthIncoming" : ndr_pack(outgoing),
- "trustAuthOutgoing" : ndr_pack(outgoing)
+ "trustAuthOutgoing" : ndr_pack(outgoing),
+ "securityIdentifier" : ndr_pack(ctx.forestsid)
}
ctx.local_samdb.add(rec)