summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEndi S. Dewata <edewata@redhat.com>2009-11-03 19:45:22 -0600
committerAndrew Bartlett <abartlet@samba.org>2009-11-04 14:58:25 +1100
commitc9571f7277b1cf68e034ec3482c5474885d9381f (patch)
treeb68a829ca523319e1515b627bee70920128a6b0f
parentb5ce97511aa33aa439a371f114ba7bb0cf822a16 (diff)
downloadsamba-c9571f7277b1cf68e034ec3482c5474885d9381f.tar.gz
samba-c9571f7277b1cf68e034ec3482c5474885d9381f.tar.bz2
samba-c9571f7277b1cf68e034ec3482c5474885d9381f.zip
s4:provisioning - Fixed minor bugs in provisioning tool and partition module.
-rw-r--r--source4/dsdb/samdb/ldb_modules/partition_init.c4
-rw-r--r--source4/scripting/python/samba/provisionbackend.py3
2 files changed, 4 insertions, 3 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/partition_init.c b/source4/dsdb/samdb/ldb_modules/partition_init.c
index f98b1d8c3f..db99b75817 100644
--- a/source4/dsdb/samdb/ldb_modules/partition_init.c
+++ b/source4/dsdb/samdb/ldb_modules/partition_init.c
@@ -132,7 +132,7 @@ static int partition_reload_metadata(struct ldb_module *module, struct partition
struct ldb_message *msg;
struct ldb_result *res;
struct ldb_context *ldb = ldb_module_get_ctx(module);
- const char *attrs[] = { "partition", "replicateEntries", "modules", NULL };
+ const char *attrs[] = { "partition", "replicateEntries", "modules", "ldapBackend", NULL };
/* perform search for @PARTITION, looking for module, replicateEntries and ldapBackend */
ret = dsdb_module_search_dn(module, mem_ctx, &res,
ldb_dn_new(mem_ctx, ldb, DSDB_PARTITION_DN),
@@ -239,7 +239,7 @@ static int new_partition_from_dn(struct ldb_context *ldb, struct partition_priva
ctrl->version = DSDB_CONTROL_CURRENT_PARTITION_VERSION;
ctrl->dn = talloc_steal(ctrl, dn);
- ret = ldb_connect_backend(ldb, backend_url, NULL, &backend_module);
+ ret = ldb_connect_backend(ldb, (*partition)->backend_url, NULL, &backend_module);
if (ret != LDB_SUCCESS) {
return ret;
}
diff --git a/source4/scripting/python/samba/provisionbackend.py b/source4/scripting/python/samba/provisionbackend.py
index 8f1b94f1bd..f809202568 100644
--- a/source4/scripting/python/samba/provisionbackend.py
+++ b/source4/scripting/python/samba/provisionbackend.py
@@ -31,6 +31,7 @@ import sys
import uuid
import time
import shutil
+import subprocess
from samba import read_and_sub_file
from samba import Ldb
@@ -203,7 +204,7 @@ class ProvisionBackend(object):
self.slapd_command_escaped = "\'" + "\' \'".join(self.slapd_command) + "\'"
setup_file(setup_path("ldap_backend_startup.sh"), paths.ldapdir + "/ldap_backend_startup.sh", {
- "SLAPD_COMMAND" : slapd_command})
+ "SLAPD_COMMAND" : self.slapd_command_escaped})
# Now start the slapd, so we can provision onto it. We keep the
# subprocess context around, to kill this off at the successful