From 9fc3e164df198f92134acb2b16c1a3236f680583 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Tue, 2 Jan 2007 11:50:04 +0000 Subject: r20468: Patch from Martin Kuehl to make it easier to load into an exsting LDAP server. (Allow some parts to pre-exist, and try to blow away less data). Andrew Bartlett (This used to be commit 99faff0ad8fa12d596c599064a0125a6b3365134) --- source4/setup/provision | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'source4/setup/provision') diff --git a/source4/setup/provision b/source4/setup/provision index 229deb1622..163cb93274 100755 --- a/source4/setup/provision +++ b/source4/setup/provision @@ -28,9 +28,9 @@ options = GetOptions(ARGV, 'wheel=s', 'users=s', 'quiet', - 'blank', + 'blank', 'ldap-base', - 'ldap-backend=s'); + 'ldap-backend=s'); if (options == undefined) { println("Failed to parse options"); @@ -43,7 +43,7 @@ libinclude("provision.js"); /* print a message if quiet is not set */ -function message() +function message() { if (options["quiet"] == undefined) { print(vsprintf(arguments)); @@ -117,6 +117,7 @@ if (options["ldap-backend"] != undefined) { var blank = (options["blank"] != undefined); var ldapbase = (options["ldap-base"] != undefined); +var ldapbackend = (options["ldap-backend"] != undefined); if (!provision_validate(subobj, message)) { return -1; @@ -130,7 +131,7 @@ message("Using administrator password: %s\n", subobj.ADMINPASS); if (ldapbase) { provision_ldapbase(subobj, message, paths); } else { - provision(subobj, message, blank, paths, system_session, creds); + provision(subobj, message, blank, paths, system_session, creds, ldapbackend); provision_dns(subobj, message, paths, system_session, creds); } message("All OK\n"); -- cgit