diff options
| author | Andrew Tridgell <tridge@samba.org> | 2008-02-13 15:06:05 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2008-02-13 15:06:05 +1100 |
| commit | 3cb87189f93956075979685d1454e4a514cb71a8 (patch) | |
| tree | d99bfbc0d5b0f9271d9ef6973814048f2223f50b /source4/scripting/python/samba/provision.py | |
| parent | 88d2e0522737fb8856fb0f52c2af8a2f56130f19 (diff) | |
| parent | d4006e799ac1305092c2d292c9237f58938268a2 (diff) | |
| download | samba-3cb87189f93956075979685d1454e4a514cb71a8.tar.gz samba-3cb87189f93956075979685d1454e4a514cb71a8.tar.xz samba-3cb87189f93956075979685d1454e4a514cb71a8.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
(This used to be commit b3793c6562b1a1e8711561f65594ba0676f9282d)
Diffstat (limited to 'source4/scripting/python/samba/provision.py')
| -rw-r--r-- | source4/scripting/python/samba/provision.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py index 4f52d36167..97021fceb2 100644 --- a/source4/scripting/python/samba/provision.py +++ b/source4/scripting/python/samba/provision.py @@ -332,7 +332,6 @@ def setup_samdb_partitions(samdb_path, setup_path, message, lp, session_info, schemadn_ldb = "schema.ldb" if ldap_backend is not None: schema_ldb = ldap_backend - schemadn_ldb = ldap_backend if ldap_backend_type == "fedora-ds": @@ -536,6 +535,8 @@ def setup_samdb(path, setup_path, session_info, credentials, lp, :note: This will wipe the main SAM database file! """ + assert serverrole in ("domain controller", "member server") + # Also wipes the database setup_samdb_partitions(path, setup_path, schemadn=schemadn, configdn=configdn, domaindn=domaindn, message=message, lp=lp, |