r26566: Fix member provision when using python.
authorJelmer Vernooij <jelmer@samba.org>
Sat, 22 Dec 2007 05:11:21 +0000 (23:11 -0600)
committerStefan Metzmacher <metze@samba.org>
Sat, 22 Dec 2007 05:18:01 +0000 (23:18 -0600)
source/scripting/python/samba/provision.py

index b5fe3eba9eacf403925a963af572a491ca709ade..dcf567954a677e70ab4a5d08696bb5421d42c0f4 100644 (file)
@@ -729,17 +729,17 @@ def provision(lp, setup_dir, message, blank, paths, session_info,
 
     message("Please install the phpLDAPadmin configuration located at %s into /etc/phpldapadmin/config.php" % paths.phpldapadminconfig)
 
-    samdb = SamDB(paths.samdb, session_info=session_info, 
-                  credentials=credentials, lp=lp)
+    if lp.get("server role") == "domain controller":
+        samdb = SamDB(paths.samdb, session_info=session_info, 
+                      credentials=credentials, lp=lp)
 
-    domainguid = samdb.searchone(Dn(samdb, domaindn), "objectGUID")
-    assert isinstance(domainguid, str)
-    hostguid = samdb.searchone(Dn(samdb, domaindn), "objectGUID",
-            expression="(&(objectClass=computer)(cn=%s))" % hostname,
-            scope=SCOPE_SUBTREE)
-    assert isinstance(hostguid, str)
+        domainguid = samdb.searchone(Dn(samdb, domaindn), "objectGUID")
+        assert isinstance(domainguid, str)
+        hostguid = samdb.searchone(Dn(samdb, domaindn), "objectGUID",
+                expression="(&(objectClass=computer)(cn=%s))" % hostname,
+                scope=SCOPE_SUBTREE)
+        assert isinstance(hostguid, str)
 
-    if lp.get("server role") == "domain controller":
         message("Setting up DNS zone: %s" % dnsdomain)
         create_zone_file(paths.dns, setup_path, samdb, 
                       hostname=hostname, hostip=hostip, dnsdomain=dnsdomain,