From 6d6fe4993876d3374ae7ffeaf55d660ffa6b450b Mon Sep 17 00:00:00 2001 From: Gary Lockyer Date: Thu, 18 Jul 2019 13:39:20 +1200 Subject: [PATCH] traffic replay: Store the instance id in the replay context Store the traffic runner instance id in the replay context. Will be used in subsequent commits. Signed-off-by: Gary Lockyer Reviewed-by: Andrew Bartlett --- python/samba/emulate/traffic.py | 4 +++- script/traffic_replay | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/python/samba/emulate/traffic.py b/python/samba/emulate/traffic.py index c511fef6557..b2175d3e4bf 100644 --- a/python/samba/emulate/traffic.py +++ b/python/samba/emulate/traffic.py @@ -363,7 +363,8 @@ class ReplayContext(object): ou=None, base_dn=None, domain=os.environ.get("DOMAIN"), - domain_sid=None): + domain_sid=None, + instance_id=None): self.server = server self.netlogon_connection = None self.creds = creds @@ -379,6 +380,7 @@ class ReplayContext(object): self.global_tempdir = tempdir self.domain_sid = domain_sid self.realm = lp.get('realm') + self.instance_id = instance_id # Bad password attempt controls self.badpassword_frequency = badpassword_frequency diff --git a/script/traffic_replay b/script/traffic_replay index 0d74c876d12..d29f0a9839c 100755 --- a/script/traffic_replay +++ b/script/traffic_replay @@ -416,7 +416,8 @@ def main(): ou=traffic.ou_name(ldb, opts.instance_id), tempdir=tempdir, stop_on_any_error=opts.stop_on_any_error, - domain_sid=ldb.get_domain_sid()) + domain_sid=ldb.get_domain_sid(), + instance_id=opts.instance_id) if opts.timing_data == '-': timing_dest = sys.stdout -- 2.47.3