diff options
| author | Andrew Tridgell <tridge@samba.org> | 2011-09-02 15:12:11 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-09-13 15:38:34 +1000 |
| commit | eb0060766f2eced27fb0ac747af5bb4728df4448 (patch) | |
| tree | b578fd95f877865a5565bbf40bdc1af657abb6af /source4/scripting/python/samba/provision | |
| parent | 8c33036a374b6f61677965dbb357d6ae7216cbfb (diff) | |
| download | samba-eb0060766f2eced27fb0ac747af5bb4728df4448.tar.gz samba-eb0060766f2eced27fb0ac747af5bb4728df4448.tar.xz samba-eb0060766f2eced27fb0ac747af5bb4728df4448.zip | |
s4-subdomain: fixed invocationID and hostIPs in subdomain join
Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'source4/scripting/python/samba/provision')
| -rw-r--r-- | source4/scripting/python/samba/provision/__init__.py | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/source4/scripting/python/samba/provision/__init__.py b/source4/scripting/python/samba/provision/__init__.py index 827d72b5e4..0b39167df4 100644 --- a/source4/scripting/python/samba/provision/__init__.py +++ b/source4/scripting/python/samba/provision/__init__.py @@ -1345,15 +1345,6 @@ def fill_samdb(samdb, lp, names, else: samdb.transaction_commit() - samdb = SamDB(session_info=admin_session_info, auto_connect=False, - credentials=provision_backend.credentials, lp=lp, - global_schema=False, am_rodc=am_rodc) - - # Set the NTDS settings DN manually - in order to have it already around - # before the provisioned tree exists and we connect - samdb.set_ntds_settings_dn("CN=NTDS Settings,%s" % names.serverdn) - samdb.connect(path) - samdb.transaction_start() try: samdb.invocation_id = invocationid @@ -1802,6 +1793,9 @@ def provision(logger, session_info, credentials, smbconf=None, if hostip6 is None: logger.warning("No IPv6 address will be assigned") + names.hostip = hostip + names.hostip6 = hostip6 + if serverrole is None: serverrole = lp.get("server role") |