diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2010-04-08 21:01:17 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2010-04-08 23:20:36 +0200 |
| commit | dd4ef4e106d372cfadf7b47db8bf9dc25728b3bc (patch) | |
| tree | b8c6633312ee59748fe11e665516c63969e15680 /source4/scripting/bin | |
| parent | a35d876537eb301d75a254d9da97268d041da8d6 (diff) | |
| download | samba-dd4ef4e106d372cfadf7b47db8bf9dc25728b3bc.tar.gz samba-dd4ef4e106d372cfadf7b47db8bf9dc25728b3bc.tar.bz2 samba-dd4ef4e106d372cfadf7b47db8bf9dc25728b3bc.zip | |
s4-python: More cleanups.
Diffstat (limited to 'source4/scripting/bin')
| -rwxr-xr-x | source4/scripting/bin/samba_dnsupdate | 9 | ||||
| -rwxr-xr-x | source4/scripting/bin/upgradeprovision | 1 |
2 files changed, 3 insertions, 7 deletions
diff --git a/source4/scripting/bin/samba_dnsupdate b/source4/scripting/bin/samba_dnsupdate index 73611c8901..cebfae2871 100755 --- a/source4/scripting/bin/samba_dnsupdate +++ b/source4/scripting/bin/samba_dnsupdate @@ -86,12 +86,7 @@ def get_credentials(lp): return creds = Credentials() creds.guess(lp) - try: - creds.set_machine_account(lp) - except: - print "Failed to set machine account" - raise - + creds.set_machine_account(lp) (tmp_fd, ccachename) = tempfile.mkstemp() creds.get_named_ccache(lp, ccachename) @@ -200,7 +195,7 @@ def get_subst_vars(): vars = {} samdb = SamDB(url=lp.get("sam database"), session_info=system_session(), - lp=lp) + lp=lp) vars['DNSDOMAIN'] = lp.get('realm').lower() vars['HOSTNAME'] = lp.get('netbios name').lower() + "." + vars['DNSDOMAIN'] diff --git a/source4/scripting/bin/upgradeprovision b/source4/scripting/bin/upgradeprovision index a900728ed4..c33ef6fcb9 100755 --- a/source4/scripting/bin/upgradeprovision +++ b/source4/scripting/bin/upgradeprovision @@ -668,6 +668,7 @@ def check_diff_name(newpaths, paths, creds, session, basedn, names, ischema): try: dump_denied_change(dn,att,messageEltFlagToString(msgElt.flags()),current[0][att],reference[0][att]) except: + # FIXME: Should catch an explicit exception here dump_denied_change(dn,att,messageEltFlagToString(msgElt.flags()),current[0][att],None) delta.remove(att) delta.dn = dn |