diff options
| author | Stefan Metzmacher <metze@samba.org> | 2010-06-25 14:01:21 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2010-06-26 09:50:55 +0200 |
| commit | c6b21931c6574322c8740f1a67f9125437c42c0d (patch) | |
| tree | c686e00e70b04182439809ae85f25e9456db562a /source4/scripting | |
| parent | 7905901bc018ec91c69368dedd906c1cf89103f3 (diff) | |
| download | samba-c6b21931c6574322c8740f1a67f9125437c42c0d.tar.gz samba-c6b21931c6574322c8740f1a67f9125437c42c0d.tar.bz2 samba-c6b21931c6574322c8740f1a67f9125437c42c0d.zip | |
s4:provision: add --next-rid option
Make it possible to provision a domain with a given next rid counter.
This will be useful for upgrades, where we want to import users
with already given SIDs.
metze
Diffstat (limited to 'source4/scripting')
| -rw-r--r-- | source4/scripting/python/samba/provision.py | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py index 808a39db1f..bb8b93e268 100644 --- a/source4/scripting/python/samba/provision.py +++ b/source4/scripting/python/samba/provision.py @@ -957,6 +957,15 @@ def setup_samdb(path, setup_path, session_info, provision_backend, lp, names, :note: This will wipe the main SAM database file! """ + + # Provision does not make much sense values larger than 1000000000 + # as the upper range of the rIDAvailablePool is 1073741823 and + # we don't want to create a domain that cannot allocate rids. + if next_rid < 1000 or next_rid > 1000000000: + error = "You want to run SAMBA 4 with a next_rid of %u, " % (next_rid) + error += "the valid range is %u-%u. The default is %u." % (1000, 1000000000, 1000) + raise ProvisioningError(error) + # ATTENTION: Do NOT change these default values without discussion with the # team and/or release manager. They have a big impact on the whole program! domainControllerFunctionality = DS_DOMAIN_FUNCTION_2008_R2 @@ -1216,7 +1225,8 @@ def provision(setup_dir, logger, session_info, rootdn=None, domaindn=None, schemadn=None, configdn=None, serverdn=None, domain=None, hostname=None, hostip=None, hostip6=None, - domainsid=None, adminpass=None, ldapadminpass=None, + domainsid=None, next_rid=1000, + adminpass=None, ldapadminpass=None, krbtgtpass=None, domainguid=None, policyguid=None, policyguid_dc=None, invocationid=None, machinepass=None, ntdsguid=None, @@ -1436,7 +1446,8 @@ def provision(setup_dir, logger, session_info, invocationid=invocationid, machinepass=machinepass, dnspass=dnspass, ntdsguid=ntdsguid, serverrole=serverrole, - dom_for_fun_level=dom_for_fun_level, am_rodc=am_rodc) + dom_for_fun_level=dom_for_fun_level, + am_rodc=am_rodc, next_rid=next_rid) if serverrole == "domain controller": if paths.netlogon is None: |