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

Partially revert 1f0298dd1b

Browse Source 
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@samba.org>
Autobuild-Date: Sat Feb 25 17:29:34 CET 2012 on sn-devel-104
This commit is contained in:
Jelmer Vernooij
2012-02-25 15:56:25 +01:00
parent f5d706b0ee
commit 66f13ea1e9
7 changed files with 34 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
source4/scripting/python/samba/samdb.py
View File

@ -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: