r12945: Try to move closer to getting Samba3 import working again.

[sfrench/samba-autobuild/.git] / source4 / setup / upgrade

diff --git a/source4/setup/upgrade b/source4/setup/upgrade
index 4c1c011b29f5bab681410aae1e9a1fb592b58a45..bfeba716e4f5a1a527e414d0f5a9b3d5af4912a2 100755 (executable)
--- 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");
 }