diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2009-08-17 11:33:25 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2009-08-17 11:47:14 +1000 |
| commit | 5f917d5f177401edbe0c11fd98f2e9203136de32 (patch) | |
| tree | af57e19026148b46c0a891bf5946860c2c87b780 /source4/scripting/python/samba/provision.py | |
| parent | 148290a8099153cfb8572c2ce3acec614f3fbf25 (diff) | |
| download | samba-5f917d5f177401edbe0c11fd98f2e9203136de32.tar.gz samba-5f917d5f177401edbe0c11fd98f2e9203136de32.tar.xz samba-5f917d5f177401edbe0c11fd98f2e9203136de32.zip | |
s4:provision Avoid one more call to ltdb_reindex
The Samba4 schema code (called via
samdb.set_schema_from_ldb(schema.ldb)) manages the @ATTRIBUTES and
@INDEXLIST records, so don't wipe them early. The chances are that we
will not change them anyway.
Andrew Bartlett
Diffstat (limited to 'source4/scripting/python/samba/provision.py')
| -rw-r--r-- | source4/scripting/python/samba/provision.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py index da1625f35d..34af462ebf 100644 --- a/source4/scripting/python/samba/provision.py +++ b/source4/scripting/python/samba/provision.py @@ -3,7 +3,7 @@ # backend code for provisioning a Samba4 server # Copyright (C) Jelmer Vernooij <jelmer@samba.org> 2007-2008 -# Copyright (C) Andrew Bartlett <abartlet@samba.org> 2008 +# Copyright (C) Andrew Bartlett <abartlet@samba.org> 2008-2009 # Copyright (C) Oliver Liebel <oliver@itc.li> 2008-2009 # # Based on the original in EJS: @@ -525,13 +525,13 @@ def setup_samdb_partitions(samdb_path, setup_path, message, lp, session_info, samdb = Ldb(url=samdb_path, session_info=session_info, credentials=credentials, lp=lp, options=["modules:"]) # Wipes the database - samdb.erase() + samdb.erase_except_schema_controlled() except LdbError: os.unlink(samdb_path) samdb = Ldb(url=samdb_path, session_info=session_info, credentials=credentials, lp=lp, options=["modules:"]) # Wipes the database - samdb.erase() + samdb.erase_except_schema_controlled() #Add modules to the list to activate them by default |