diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2006-01-15 09:03:28 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:51:12 -0500 |
| commit | ba07f94438560830f9b4470ecd9577b8333475bf (patch) | |
| tree | ed313d0169b2b2cfcf21844c1cbfdc29b1f317e9 /source4/setup | |
| parent | d59667fd2192920c8dd33cde8ff25fd5af0e00c3 (diff) | |
| download | samba-ba07f94438560830f9b4470ecd9577b8333475bf.tar.gz samba-ba07f94438560830f9b4470ecd9577b8333475bf.tar.bz2 samba-ba07f94438560830f9b4470ecd9577b8333475bf.zip | |
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)
Diffstat (limited to 'source4/setup')
| -rwxr-xr-x | source4/setup/upgrade | 5 |
1 files changed, 3 insertions, 2 deletions
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"); } |