svn commit: samba r25658 - in branches/4.0-python: . source
source/scripting/python/samba
jelmer at samba.org
jelmer at samba.org
Mon Oct 15 20:19:13 GMT 2007
Author: jelmer
Date: 2007-10-15 20:19:13 +0000 (Mon, 15 Oct 2007)
New Revision: 25658
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=25658
Log:
Remove spurious newlines.
Modified:
branches/4.0-python/
branches/4.0-python/source/BRANCH.TODO
branches/4.0-python/source/scripting/python/samba/provision.py
branches/4.0-python/source/scripting/python/samba/upgrade.py
Changeset:
Property changes on: branches/4.0-python
___________________________________________________________________
Name: bzr:revision-info
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...
Modified: branches/4.0-python/source/BRANCH.TODO
===================================================================
--- branches/4.0-python/source/BRANCH.TODO 2007-10-15 20:19:06 UTC (rev 25657)
+++ branches/4.0-python/source/BRANCH.TODO 2007-10-15 20:19:13 UTC (rev 25658)
@@ -1,3 +1,5 @@
- support kwargs (especially for constructors with a lot of arguments)
- make sure exceptions are properly thrown everywhere
- hook setup.py into the build system
+- fix provisioning of registry
+- fix web server
Modified: branches/4.0-python/source/scripting/python/samba/provision.py
===================================================================
--- branches/4.0-python/source/scripting/python/samba/provision.py 2007-10-15 20:19:06 UTC (rev 25657)
+++ branches/4.0-python/source/scripting/python/samba/provision.py 2007-10-15 20:19:13 UTC (rev 25658)
@@ -234,7 +234,7 @@
try:
res2 = ldb.search(anything, basedn, SCOPE_SUBTREE, ["dn"])
except LdbError, e:
- message("ldb search failed: %s\n" % e)
+ message("ldb search failed: %s" % e)
continue
previous_remaining = current_remaining
current_remaining = len(res2)
@@ -244,11 +244,11 @@
try:
res3 = ldb.search(anything, basedn, SCOPE_SUBTREE, ["dn"])
except LdbError, e:
- message("ldb search failed: %s\n" % e)
+ message("ldb search failed: %s" % e)
continue
if len(res3) != 0:
- message("Failed to delete all records under %s, %d records remaining\n" % (basedn, len(res3)))
+ message("Failed to delete all records under %s, %d records remaining" % (basedn, len(res3)))
def open_ldb(session_info, credentials, dbname):
try:
@@ -379,26 +379,26 @@
subobj.fix(paths)
# Also wipes the database
- message("Setting up %s partitions\n" % paths.samdb)
+ message("Setting up %s partitions" % paths.samdb)
setup_ldb(setup_dir, "provision_partitions.ldif", session_info,
credentials, subobj, paths.samdb)
samdb = open_ldb(session_info, credentials, paths.samdb)
ldb.transaction_start()
try:
- message("Setting up %s attributes\n" % paths.samdb)
+ message("Setting up %s attributes" % paths.samdb)
setup_add_ldif(setup_dir, "provision_init.ldif", subobj, samdb)
- message("Setting up %s rootDSE\n" % paths.samdb)
+ message("Setting up %s rootDSE" % paths.samdb)
setup_add_ldif(setup_dir, "provision_rootdse_add.ldif", subobj, samdb)
- message("Erasing data from partitions\n")
+ message("Erasing data from partitions")
ldb_erase_partitions(subobj, message, samdb, undefined)
- message("Setting up %s indexes\n" % paths.samdb)
+ message("Setting up %s indexes" % paths.samdb)
setup_add_ldif(setup_dir, "provision_index.ldif", subobj, samdb)
- message("Setting up %s templates\n" % paths.samdb)
+ message("Setting up %s templates" % paths.samdb)
setup_add_ldif(setup_dir, "provision_templates.ldif", subobj, samdb)
except:
samdb.transaction_cancel()
@@ -406,7 +406,7 @@
samdb.transaction_commit()
- message("Setting up %s\n" % paths.secrets)
+ message("Setting up %s" % paths.secrets)
setup_ldb(setup_dir, "secrets_init.ldif", session_info, credentials, subobj, paths.secrets)
setup_ldb(setup_dir, "secrets.ldif", session_info, credentials, subobj, paths.secrets, False)
@@ -414,8 +414,7 @@
#
# provision samba4 - caution, this wipes all existing data!
#
-def provision(lp, setup_dir, subobj, message, blank, paths, session_info, credentials,
- ldapbackend):
+def provision(lp, setup_dir, subobj, message, blank, paths, session_info, credentials, ldapbackend):
subobj.fix(paths)
if subobj.domain_guid is not None:
@@ -432,23 +431,23 @@
# only install a new smb.conf if there isn't one there already
if not os.path.exists(paths.smbconf):
- message("Setting up smb.conf\n")
+ message("Setting up smb.conf")
setup_file(setup_dir, "provision.smb.conf", message, paths.smbconf, subobj)
lp.reload()
# only install a new shares config db if there is none
if not os.path.exists(paths.shareconf):
- message("Setting up share.ldb\n")
+ message("Setting up share.ldb")
setup_ldb(setup_dir, "share.ldif", session_info, credentials, subobj, paths.shareconf)
- message("Setting up %s\n" % paths.secrets)
+ message("Setting up %s" % paths.secrets)
setup_ldb(setup_dir, "secrets_init.ldif", session_info, credentials, subobj, paths.secrets)
setup_ldb(setup_dir, "secrets.ldif", session_info, credentials, subobj, paths.secrets, False)
- message("Setting up registry\n")
- message("# FIXME\n")
+ message("Setting up registry")
+ message("# FIXME")
- message("Setting up sam.ldb partitions\n")
+ message("Setting up sam.ldb partitions")
# Also wipes the database
setup_ldb(setup_dir, "provision_partitions.ldif", session_info,
credentials, subobj, paths.samdb)
@@ -456,38 +455,38 @@
samdb = open_ldb(session_info, credentials, paths.samdb)
samdb.transaction_start()
try:
- message("Setting up sam.ldb attributes\n")
+ message("Setting up sam.ldb attributes")
setup_add_ldif(setup_dir, "provision_init.ldif", subobj, samdb)
- message("Setting up sam.ldb rootDSE\n")
+ message("Setting up sam.ldb rootDSE")
setup_add_ldif(setup_dir, "provision_rootdse_add.ldif", subobj, samdb)
- message("Erasing data from partitions\n")
+ message("Erasing data from partitions")
ldb_erase_partitions(subobj, message, samdb, ldapbackend)
- message("Adding DomainDN: %s (permitted to fail)\n" % subobj.domaindn)
+ message("Adding DomainDN: %s (permitted to fail)" % subobj.domaindn)
try:
setup_add_ldif(setup_dir, "provision_basedn.ldif", subobj, samdb)
except LdbError:
pass
- message("Modifying DomainDN: " + subobj.domaindn + "\n")
+ message("Modifying DomainDN: " + subobj.domaindn + "")
setup_ldb_modify(setup_dir, "provision_basedn_modify.ldif", subobj, samdb)
- message("Adding configuration container (permitted to fail)\n")
+ message("Adding configuration container (permitted to fail)")
try:
setup_add_ldif(setup_dir, "provision_configuration_basedn.ldif", subobj, samdb)
except LdbError:
pass
- message("Modifying configuration container\n")
+ message("Modifying configuration container")
setup_ldb_modify(setup_dir, "provision_configuration_basedn_modify.ldif", subobj, samdb)
- message("Adding schema container (permitted to fail)\n")
+ message("Adding schema container (permitted to fail)")
setup_add_ldif(setup_dir, "provision_schema_basedn.ldif", subobj, samdb)
- message("Modifying schema container\n")
+ message("Modifying schema container")
setup_ldb_modify(setup_dir, "provision_schema_basedn_modify.ldif", subobj, samdb)
- message("Setting up sam.ldb Samba4 schema\n")
+ message("Setting up sam.ldb Samba4 schema")
setup_add_ldif(setup_dir, "schema_samba4.ldif", subobj, samdb)
- message("Setting up sam.ldb AD schema\n")
+ message("Setting up sam.ldb AD schema")
setup_add_ldif(setup_dir, "schema.ldif", subobj, samdb)
except:
samdb.transaction_cancel()
@@ -500,36 +499,36 @@
samdb = open_ldb(session_info, credentials, paths.samdb)
samdb.transaction_start()
try:
- message("Setting up sam.ldb configuration data\n")
+ message("Setting up sam.ldb configuration data")
setup_add_ldif(setup_dir, "provision_configuration.ldif", subobj, samdb)
- message("Setting up display specifiers\n")
+ message("Setting up display specifiers")
setup_add_ldif(setup_dir, "display_specifiers.ldif", subobj, samdb)
- message("Setting up sam.ldb templates\n")
+ message("Setting up sam.ldb templates")
setup_add_ldif(setup_dir, "provision_templates.ldif", subobj, samdb)
- message("Adding users container (permitted to fail)\n")
+ message("Adding users container (permitted to fail)")
try:
setup_add_ldif(setup_dir, "provision_users_add.ldif", subobj, samdb)
except LdbError:
pass
- message("Modifying users container\n")
+ message("Modifying users container")
setup_ldb_modify(setup_dir, "provision_users_modify.ldif", subobj, samdb)
- message("Adding computers container (permitted to fail)\n")
+ message("Adding computers container (permitted to fail)")
try:
setup_add_ldif(setup_dir, "provision_computers_add.ldif", subobj, samdb)
except LdbError:
pass
- message("Modifying computers container\n")
+ message("Modifying computers container")
setup_ldb_modify(setup_dir, "provision_computers_modify.ldif", subobj, samdb)
- message("Setting up sam.ldb data\n")
+ message("Setting up sam.ldb data")
setup_add_ldif(setup_dir, "provision.ldif", subobj, samdb)
if blank:
- message("Setting up sam.ldb index\n")
+ message("Setting up sam.ldb index")
setup_add_ldif(setup_dir, "provision_index.ldif", subobj, samdb)
- message("Setting up sam.ldb rootDSE marking as syncronized\n")
+ message("Setting up sam.ldb rootDSE marking as syncronized")
setup_modify_ldif(setup_dir, "provision_rootdse_modify.ldif", subobj, samdb)
samdb.transaction_commit()
@@ -548,15 +547,15 @@
#
# samdb = open_ldb(info, paths.samdb, False)
#
- message("Setting up sam.ldb users and groups\n")
+ message("Setting up sam.ldb users and groups")
setup_add_ldif(setup_dir, "provision_users.ldif", subobj, samdb)
setup_name_mappings(subobj, samdb)
- message("Setting up sam.ldb index\n")
+ message("Setting up sam.ldb index")
setup_add_ldif(setup_dir, "provision_index.ldif", info, samdb)
- message("Setting up sam.ldb rootDSE marking as syncronized\n")
+ message("Setting up sam.ldb rootDSE marking as syncronized")
setup_modify_ldif(setup_dir, "provision_rootdse_modify.ldif", subobj, samdb)
except:
samdb.transaction_cancel()
@@ -566,7 +565,7 @@
# Write out a DNS zone file, from the info in the current database
def provision_dns(setup_dir, subobj, message, paths, session_info, credentials):
- message("Setting up DNS zone: %s\n" % subobj.dnsdomain)
+ message("Setting up DNS zone: %s" % subobj.dnsdomain)
# connect to the sam
ldb = Ldb(paths.samdb, session_info=session_info, credentials=credentials)
@@ -584,11 +583,11 @@
setup_file(setup_dir, "provision.zone", message, paths.dns, subobj)
- message("Please install the zone located in " + paths.dns + " into your DNS server\n")
+ message("Please install the zone located in %s into your DNS server" % paths.dns)
# Write out a DNS zone file, from the info in the current database
def provision_ldapbase(setup_dir, subobj, message, paths):
- message("Setting up LDAP base entry: " + subobj.domaindn + " \n")
+ message("Setting up LDAP base entry: %s" % subobj.domaindn)
rdns = subobj.domaindn.split(",")
subobj.extensibleobject = "objectClass: extensibleObject"
@@ -606,7 +605,7 @@
message, paths.ldap_schema_basedn_ldif,
subobj)
- message("Please install the LDIF located in " + paths.ldap_basedn_ldif + ", " + paths.ldap_config_basedn_ldif + " and " + paths.ldap_schema_basedn_ldif + " into your LDAP server, and re-run with --ldap-backend=ldap://my.ldap.server\n")
+ message("Please install the LDIF located in " + paths.ldap_basedn_ldif + ", " + paths.ldap_config_basedn_ldif + " and " + paths.ldap_schema_basedn_ldif + " into your LDAP server, and re-run with --ldap-backend=ldap://my.ldap.server")
def ldaptime(timestamp=None):
@@ -749,10 +748,10 @@
#
# now the real work
#
- message("Adding user %s\n", user_dn)
+ message("Adding user %s" % user_dn)
ldb.add(ldif)
- message("Modifying group %s\n" % dom_users)
+ message("Modifying group %s" % dom_users)
ldb.modify(modgroup)
#
Modified: branches/4.0-python/source/scripting/python/samba/upgrade.py
===================================================================
--- branches/4.0-python/source/scripting/python/samba/upgrade.py 2007-10-15 20:19:06 UTC (rev 25657)
+++ branches/4.0-python/source/scripting/python/samba/upgrade.py 2007-10-15 20:19:13 UTC (rev 25658)
@@ -451,11 +451,11 @@
lp = loadparm_init()
samdb = Ldb(paths.samdb, session_info=session_info, credentials=credentials)
- message("Writing configuration\n")
+ message("Writing configuration")
newconf = upgrade_smbconf(samba3.configuration,True)
newconf.save(paths.smbconf)
- message("Importing account policies\n")
+ message("Importing account policies")
ldif = upgrade_sam_policy(samba3,subobj.BASEDN)
samdb.modify(ldif)
regdb = Ldb(paths.hklm)
@@ -468,7 +468,7 @@
data: %d
" % samba3.policy.refuse_machine_password_change)
- message("Importing users\n")
+ message("Importing users")
for account in samba3.samaccounts:
msg = "... " + account.username
ldif = upgrade_sam_account(samdb, accounts,subobj.BASEDN,subobj.DOMAINSID)
@@ -478,9 +478,9 @@
# FIXME: Ignore 'Record exists' errors
msg += "... error: " + str(e)
ret += 1;
- message(msg + "\n")
+ message(msg)
- message("Importing groups\n")
+ message("Importing groups")
for mapping in samba3.groupmappings:
msg = "... " + mapping.nt_name
ldif = upgrade_sam_group(mapping, subobj.BASEDN)
@@ -491,11 +491,11 @@
# FIXME: Ignore 'Record exists' errors
msg += "... error: " + str(e)
ret += 1
- message(msg + "\n")
+ message(msg)
- message("Importing registry data\n")
+ message("Importing registry data")
for hive in ["hkcr","hkcu","hklm","hkpd","hku","hkpt"]:
- message("... " + hive + "\n")
+ message("... " + hive)
regdb = Ldb(paths[hive])
ldif = upgrade_registry(samba3.registry, hive, regdb)
for (var j in ldif) {
@@ -506,9 +506,9 @@
# FIXME: Ignore 'Record exists' errors
msg += "... error: " + str(e)
ret += 1
- message(msg + "\n")
+ message(msg)
- message("Importing WINS data\n")
+ message("Importing WINS data")
winsdb = Ldb(paths.winsdb)
ldb_erase(winsdb)
@@ -529,7 +529,7 @@
# Enable samba3sam module if original passdb backend was ldap
if ldapurl is not None:
- message("Enabling Samba3 LDAP mappings for SAM database\n")
+ message("Enabling Samba3 LDAP mappings for SAM database")
samdb.modify("""
dn: @MODULES
@@ -545,7 +545,7 @@
return ret
def upgrade_verify(subobj, samba3, paths, message):
- message("Verifying account policies\n")
+ message("Verifying account policies")
samldb = Ldb(paths.samdb)
More information about the samba-cvs
mailing list