sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-09-04 09:44:20 +03:00
Code Activity

provision: Properly cancel transactions on the secrets ldb.

Browse Source
This commit is contained in:
Jelmer Vernooij
2010-06-20 14:24:54 +02:00
parent 237ab66f6c
commit 5f3d5a3ad8
1 changed files with 123 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
source4/scripting/python/samba/provision.py
View File

@@ -749,7 +749,8 @@ def secretsdb_setup_dns(secretsdb, setup_path, private_dir,
def setup_secretsdb(path, setup_path, session_info, backend_credentials, lp): def setup_secretsdb(path, setup_path, session_info, backend_credentials, lp):
"""Setup the secrets database. """Setup the secrets database.
This function does not handle exceptions and transaction on purpose,
:note: This function does not handle exceptions and transaction on purpose,
it's up to the caller to do this job. it's up to the caller to do this job.
:param path: Path to the secrets database. :param path: Path to the secrets database.
@@ -768,6 +769,7 @@ def setup_secretsdb(path, setup_path, session_info, backend_credentials, lp):
secrets_ldb = Ldb(path, session_info=session_info, secrets_ldb = Ldb(path, session_info=session_info,
lp=lp) lp=lp)
secrets_ldb.transaction_start() secrets_ldb.transaction_start()
try:
secrets_ldb.load_ldif_file_add(setup_path("secrets.ldif")) secrets_ldb.load_ldif_file_add(setup_path("secrets.ldif"))
if backend_credentials is not None and backend_credentials.authentication_requested(): if backend_credentials is not None and backend_credentials.authentication_requested():
@@ -784,6 +786,9 @@ def setup_secretsdb(path, setup_path, session_info, backend_credentials, lp):
}) })
return secrets_ldb return secrets_ldb
except:
secrets_ldb.transaction_cancel()
raise
def setup_privileges(path, setup_path, session_info, lp): def setup_privileges(path, setup_path, session_info, lp):
"""Setup the privileges database. """Setup the privileges database.
@@ -1398,6 +1403,7 @@ def provision(setup_dir, logger, session_info,
session_info=session_info, session_info=session_info,
backend_credentials=provision_backend.secrets_credentials, lp=lp) backend_credentials=provision_backend.secrets_credentials, lp=lp)
try:
logger.info("Setting up the registry") logger.info("Setting up the registry")
setup_registry(paths.hklm, setup_path, session_info, setup_registry(paths.hklm, setup_path, session_info,
lp=lp) lp=lp)
@@ -1510,6 +1516,9 @@ def provision(setup_dir, logger, session_info,
create_phpldapadmin_config(paths.phpldapadminconfig, setup_path, create_phpldapadmin_config(paths.phpldapadminconfig, setup_path,
ldapi_url) ldapi_url)
except:
secrets_ldb.transaction_cancel()
raise
#Now commit the secrets.ldb to disk #Now commit the secrets.ldb to disk
secrets_ldb.transaction_commit() secrets_ldb.transaction_commit()