[SCM] Samba Shared Repository - branch master updated
Jelmer Vernooij
jelmer at samba.org
Sat Feb 25 09:30:03 MST 2012
The branch, master has been updated
via 66f13ea Partially revert 1f0298dd1b1a939cb215e7b474178b217f8347f4
via f5d706b provision: Remove unused imports.
from 341bd82 s3: Fix a typo
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 66f13ea1e9ad8d66f6dec7e6a4716bcdb1dfbfa0
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sat Feb 25 15:56:25 2012 +0100
Partially revert 1f0298dd1b1a939cb215e7b474178b217f8347f4
It's fine to catch keyboard interrupts and other kinds of errors when it's done just for resource management, where the error is reraised later.
Autobuild-User: Jelmer Vernooij <jelmer at samba.org>
Autobuild-Date: Sat Feb 25 17:29:34 CET 2012 on sn-devel-104
commit f5d706b0ee8486f94853db8e38538c3a74b2e0bb
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sat Feb 25 15:15:51 2012 +0100
provision: Remove unused imports.
-----------------------------------------------------------------------
Summary of changes:
source4/scripting/python/samba/join.py | 4 +-
source4/scripting/python/samba/netcmd/dbcheck.py | 2 +-
.../scripting/python/samba/provision/__init__.py | 49 ++++++++++----------
source4/scripting/python/samba/provision/common.py | 2 +-
.../scripting/python/samba/provision/sambadns.py | 4 +-
source4/scripting/python/samba/samdb.py | 14 +++---
source4/scripting/python/samba/schema.py | 2 +-
7 files changed, 38 insertions(+), 39 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/scripting/python/samba/join.py b/source4/scripting/python/samba/join.py
index b695277..10f8ad7 100644
--- a/source4/scripting/python/samba/join.py
+++ b/source4/scripting/python/samba/join.py
@@ -701,7 +701,7 @@ class dc_join(object):
ctx.destination_dsa_guid = destination_dsa_guid
print "Committing SAM database"
- except Exception:
+ except:
ctx.local_samdb.transaction_cancel()
raise
else:
@@ -877,7 +877,7 @@ class dc_join(object):
ctx.join_provision_own_domain()
ctx.join_setup_trusts()
ctx.join_finalise()
- except Exception:
+ except:
print "Join failed - cleaning up"
ctx.cleanup_old_join()
raise
diff --git a/source4/scripting/python/samba/netcmd/dbcheck.py b/source4/scripting/python/samba/netcmd/dbcheck.py
index 72b2f91..db02c6a 100644
--- a/source4/scripting/python/samba/netcmd/dbcheck.py
+++ b/source4/scripting/python/samba/netcmd/dbcheck.py
@@ -117,7 +117,7 @@ class cmd_dbcheck(Command):
else:
error_count = chk.check_database(DN=DN, scope=search_scope,
controls=controls, attrs=attrs)
- except Exception:
+ except:
if started_transaction:
samdb.transaction_cancel()
raise
diff --git a/source4/scripting/python/samba/provision/__init__.py b/source4/scripting/python/samba/provision/__init__.py
index 25a4551..aa8736b 100644
--- a/source4/scripting/python/samba/provision/__init__.py
+++ b/source4/scripting/python/samba/provision/__init__.py
@@ -37,7 +37,6 @@ import time
import uuid
import socket
import urllib
-import shutil
import string
import ldb
@@ -81,7 +80,6 @@ from samba.provision.common import (
setup_path,
setup_add_ldif,
setup_modify_ldif,
- setup_ldb
)
from samba.provision.sambadns import (
setup_ad_dns,
@@ -243,6 +241,7 @@ def find_provision_key_parameters(samdb, secretsdb, idmapdb, paths, smbconf, lp)
raise ProvisioningError("Unable to find uid/gid for Domain Admins rid")
return names
+
def update_provision_usn(samdb, low, high, id, replace=False):
"""Update the field provisionUSN in sam.ldb
@@ -653,7 +652,6 @@ def make_smbconf(smbconf, hostname, domain, realm, serverrole,
f.close()
-
def setup_name_mappings(idmap, sid, root_uid, nobody_uid,
users_gid, wheel_gid):
"""setup reasonable name mappings for sam names to unix names.
@@ -720,7 +718,7 @@ def setup_samdb_partitions(samdb_path, logger, lp, session_info,
logger.info("Setting up sam.ldb rootDSE")
setup_samdb_rootdse(samdb, names)
- except Exception:
+ except:
samdb.transaction_cancel()
raise
else:
@@ -839,12 +837,10 @@ def setup_secretsdb(paths, session_info, backend_credentials, lp):
path = paths.secrets
- secrets_ldb = Ldb(path, session_info=session_info,
- lp=lp)
+ secrets_ldb = Ldb(path, session_info=session_info, lp=lp)
secrets_ldb.erase()
secrets_ldb.load_ldif_file_add(setup_path("secrets_init.ldif"))
- secrets_ldb = Ldb(path, session_info=session_info,
- lp=lp)
+ secrets_ldb = Ldb(path, session_info=session_info, lp=lp)
secrets_ldb.transaction_start()
try:
secrets_ldb.load_ldif_file_add(setup_path("secrets.ldif"))
@@ -864,7 +860,7 @@ def setup_secretsdb(paths, session_info, backend_credentials, lp):
"LDAPADMINREALM": backend_credentials.get_realm(),
"LDAPADMINPASS_B64": b64encode(backend_credentials.get_password())
})
- except Exception:
+ except:
secrets_ldb.transaction_cancel()
raise
return secrets_ldb
@@ -1204,7 +1200,7 @@ def fill_samdb(samdb, lp, names,
msg["subRefs"] = ldb.MessageElement(names.configdn , ldb.FLAG_MOD_ADD,
"subRefs")
- except Exception:
+ except:
samdb.transaction_cancel()
raise
else:
@@ -1289,22 +1285,23 @@ def fill_samdb(samdb, lp, names,
})
logger.info("Setting up self join")
- setup_self_join(samdb, admin_session_info, names=names, fill=fill, invocationid=invocationid,
- dnspass=dnspass,
- machinepass=machinepass,
- domainsid=domainsid,
- next_rid=next_rid,
- dc_rid=dc_rid,
- policyguid=policyguid,
- policyguid_dc=policyguid_dc,
- domainControllerFunctionality=domainControllerFunctionality,
- ntdsguid=ntdsguid)
+ setup_self_join(samdb, admin_session_info, names=names, fill=fill,
+ invocationid=invocationid,
+ dnspass=dnspass,
+ machinepass=machinepass,
+ domainsid=domainsid,
+ next_rid=next_rid,
+ dc_rid=dc_rid,
+ policyguid=policyguid,
+ policyguid_dc=policyguid_dc,
+ domainControllerFunctionality=domainControllerFunctionality,
+ ntdsguid=ntdsguid)
ntds_dn = "CN=NTDS Settings,%s" % names.serverdn
names.ntdsguid = samdb.searchone(basedn=ntds_dn,
attribute="objectGUID", expression="", scope=ldb.SCOPE_BASE)
assert isinstance(names.ntdsguid, str)
- except Exception:
+ except:
samdb.transaction_cancel()
raise
else:
@@ -1521,6 +1518,7 @@ def provision_fill(samdb, secrets_ldb, logger, names, paths,
'ipsecNFAReference'])
samdb.transaction_commit()
+
def provision(logger, session_info, credentials, smbconf=None,
targetdir=None, samdb_fill=FILL_FULL, realm=None, rootdn=None,
domaindn=None, schemadn=None, configdn=None, serverdn=None,
@@ -1774,7 +1772,7 @@ def provision(logger, session_info, credentials, smbconf=None,
create_phpldapadmin_config(paths.phpldapadminconfig,
ldapi_url)
- except Exception:
+ except:
secrets_ldb.transaction_cancel()
raise
@@ -1835,9 +1833,9 @@ def provision_become_dc(smbconf=None, targetdir=None,
serverdn=None, domain=None, hostname=None, domainsid=None,
adminpass=None, krbtgtpass=None, domainguid=None, policyguid=None,
policyguid_dc=None, invocationid=None, machinepass=None, dnspass=None,
- dns_backend=None, root=None, nobody=None, users=None, wheel=None, backup=None,
- serverrole=None, ldap_backend=None, ldap_backend_type=None,
- sitename=None, debuglevel=1):
+ dns_backend=None, root=None, nobody=None, users=None, wheel=None,
+ backup=None, serverrole=None, ldap_backend=None,
+ ldap_backend_type=None, sitename=None, debuglevel=1):
logger = logging.getLogger("provision")
samba.set_debug_level(debuglevel)
@@ -1890,6 +1888,7 @@ class ProvisioningError(Exception):
class InvalidNetbiosName(Exception):
"""A specified name was not a valid NetBIOS name."""
+
def __init__(self, name):
super(InvalidNetbiosName, self).__init__(
"The name '%r' is not a valid NetBIOS name" % name)
diff --git a/source4/scripting/python/samba/provision/common.py b/source4/scripting/python/samba/provision/common.py
index 04bdb0f..e9bcdf5 100644
--- a/source4/scripting/python/samba/provision/common.py
+++ b/source4/scripting/python/samba/provision/common.py
@@ -77,7 +77,7 @@ def setup_ldb(ldb, ldif_path, subst_vars):
ldb.transaction_start()
try:
setup_add_ldif(ldb, ldif_path, subst_vars)
- except Exception:
+ except:
ldb.transaction_cancel()
raise
else:
diff --git a/source4/scripting/python/samba/provision/sambadns.py b/source4/scripting/python/samba/provision/sambadns.py
index 2aefe4d..ae85156 100644
--- a/source4/scripting/python/samba/provision/sambadns.py
+++ b/source4/scripting/python/samba/provision/sambadns.py
@@ -715,7 +715,7 @@ def create_samdb_copy(samdb, logger, paths, names, domainsid, domainguid):
"DOMAINSID" : str(domainsid),
"DESCRIPTOR" : descr})
setup_add_ldif(dom_ldb, setup_path("provision_basedn_options.ldif"), None)
- except Exception:
+ except:
logger.error("Failed to setup database for BIND, AD based DNS cannot be used")
raise
del partfile[domaindn]
@@ -750,7 +750,7 @@ def create_samdb_copy(samdb, logger, paths, names, domainsid, domainguid):
tdb_copy(logger,
os.path.join(private_dir, pfile),
os.path.join(dns_dir, pfile))
- except Exception:
+ except:
logger.error("Failed to setup database for BIND, AD based DNS cannot be used")
raise
diff --git a/source4/scripting/python/samba/samdb.py b/source4/scripting/python/samba/samdb.py
index 98c36bf..4c24989 100644
--- a/source4/scripting/python/samba/samdb.py
+++ b/source4/scripting/python/samba/samdb.py
@@ -222,7 +222,7 @@ pwdLastSet: 0
raise Exception('Unable to find group "%s"' % groupname)
assert(len(targetgroup) == 1)
self.delete(targetgroup[0].dn)
- except Exception:
+ except:
self.transaction_cancel()
raise
else:
@@ -280,7 +280,7 @@ member: %s
if modified is True:
self.modify_ldif(addtargettogroup)
- except Exception:
+ except:
self.transaction_cancel()
raise
else:
@@ -406,7 +406,7 @@ member: %s
if setpassword:
self.setpassword("(samAccountName=%s)" % ldb.binary_encode(username), password,
force_password_change_at_next_login_req)
- except Exception:
+ except:
self.transaction_cancel()
raise
else:
@@ -428,7 +428,7 @@ member: %s
raise Exception('Unable to find user "%s"' % username)
assert(len(target) == 1)
self.delete(target[0].dn)
- except Exception:
+ except:
self.transaction_cancel()
raise
else:
@@ -468,7 +468,7 @@ unicodePwd:: %s
# modify the userAccountControl to remove the disabled bit
self.enable_account(search_filter)
- except Exception:
+ except:
self.transaction_cancel()
raise
else:
@@ -511,7 +511,7 @@ accountExpires: %u
""" % (user_dn, userAccountControl, accountExpires)
self.modify_ldif(setexp)
- except Exception:
+ except:
self.transaction_cancel()
raise
else:
@@ -841,7 +841,7 @@ accountExpires: %u
self.transaction_start()
try:
seq = super(SamDB, self).sequence_number(seq_type)
- except Exception:
+ except:
self.transaction_cancel()
raise
else:
diff --git a/source4/scripting/python/samba/schema.py b/source4/scripting/python/samba/schema.py
index 9cbfa3a..25ffa31 100644
--- a/source4/scripting/python/samba/schema.py
+++ b/source4/scripting/python/samba/schema.py
@@ -137,7 +137,7 @@ dn: @INDEXLIST
self.ldb.add_ldif(self.schema_dn_add)
self.ldb.modify_ldif(self.schema_dn_modify)
self.ldb.add_ldif(self.schema_data)
- except Exception:
+ except:
self.ldb.transaction_cancel()
raise
else:
--
Samba Shared Repository
More information about the samba-cvs
mailing list