From ba07f94438560830f9b4470ecd9577b8333475bf Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Sun, 15 Jan 2006 09:03:28 +0000 Subject: r12945: Try to move closer to getting Samba3 import working again. There still a few things to work out Andrew Bartlett (This used to be commit 701558b5fe917555416eb0d100ef756f8ef7cf65) --- source4/setup/upgrade | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'source4/setup') diff --git a/source4/setup/upgrade b/source4/setup/upgrade index 4c1c011b29..bfeba716e4 100755 --- a/source4/setup/upgrade +++ b/source4/setup/upgrade @@ -90,12 +90,13 @@ var creds = options.get_credentials(); var system_session = system_session(); var paths = provision_default_paths(subobj); provision(subobj, message, options.blank, paths, system_session, creds); -provision_dns(subobj, message, paths, system_session, creds); -var ret = upgrade(subobj,samba3,message,paths); +var ret = upgrade(subobj,samba3,message,paths, system_session, creds); if (ret > 0) { message("Failed to import %d entries\n", ret); } else { + provision_dns(subobj, message, paths, system_session, creds); + message("All OK\n"); } -- cgit