Author: jelmer Date: 2007-12-22 05:11:21 +0000 (Sat, 22 Dec 2007) New Revision: 26566
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=26566 Log: Fix member provision when using python. Modified: branches/SAMBA_4_0/ branches/SAMBA_4_0/source/scripting/python/samba/provision.py Changeset: Property changes on: branches/SAMBA_4_0 ___________________________________________________________________ Name: bzr:revision-info ...skipped... Name: bzr:revision-id:v3-trunk0 ...skipped... Modified: branches/SAMBA_4_0/source/scripting/python/samba/provision.py =================================================================== --- branches/SAMBA_4_0/source/scripting/python/samba/provision.py 2007-12-22 05:03:02 UTC (rev 26565) +++ branches/SAMBA_4_0/source/scripting/python/samba/provision.py 2007-12-22 05:11:21 UTC (rev 26566) @@ -729,17 +729,17 @@ 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,
