From 5e695dec2af347dd9211a1dec45f10f751bbafb5 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Wed, 21 Apr 2010 13:35:52 +1000
Subject: s4-upgradeprovision: fixed --realm option duplicate in
 upgrade_from_s3

---
 source4/scripting/bin/upgradeprovision | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/bin/upgradeprovision b/source4/scripting/bin/upgradeprovision
index c33ef6fcb9..066fbe469c 100755
--- a/source4/scripting/bin/upgradeprovision
+++ b/source4/scripting/bin/upgradeprovision
@@ -862,7 +862,7 @@ def update_machine_account_password(paths, creds, session, names):
         kvno = int(str(res[0]["msDs-keyVersionNumber"]))
 
         secretsdb_self_join(secrets_ldb, domain=names.domain,
-                    realm=names.realm,
+                    realm=names.realm or sambaopts._lp.get('realm'),
                     domainsid=names.domainsid,
                     dnsdomain=names.dnsdomain,
                     netbiosname=names.netbiosname,
-- 
cgit