From 16437edf487f3159d74fea7caebe84d1c8cc07fe Mon Sep 17 00:00:00 2001 From: Giampaolo Lauria Date: Fri, 21 Oct 2011 12:05:07 -0400 Subject: samba-tool: Improve "delegation" command error handling Change samdb toggle_userAccountFlags fcn to display more meaningful error messages Add flags string param to toggle_userAccountFlags Change call to toggle_userAccountFlags in delegation command to pass the flag name to be displayed in case of errors --- source4/scripting/python/samba/netcmd/delegation.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'source4/scripting/python/samba/netcmd') diff --git a/source4/scripting/python/samba/netcmd/delegation.py b/source4/scripting/python/samba/netcmd/delegation.py index 49849870ddc..469579e58c9 100644 --- a/source4/scripting/python/samba/netcmd/delegation.py +++ b/source4/scripting/python/samba/netcmd/delegation.py @@ -104,7 +104,9 @@ class cmd_delegation_for_any_service(Command): search_filter = "sAMAccountName=%s" % ldb.binary_encode(cleanedaccount) flag = dsdb.UF_TRUSTED_FOR_DELEGATION try: - sam.toggle_userAccountFlags(search_filter, flag, on=on, strict=True) + sam.toggle_userAccountFlags(search_filter, flag, + flags_str="Trusted-for-Delegation", + on=on, strict=True) except Exception, err: raise CommandError(err) @@ -138,7 +140,9 @@ class cmd_delegation_for_any_protocol(Command): search_filter = "sAMAccountName=%s" % ldb.binary_encode(cleanedaccount) flag = dsdb.UF_TRUSTED_TO_AUTHENTICATE_FOR_DELEGATION try: - sam.toggle_userAccountFlags(search_filter, flag, on=on, strict=True) + sam.toggle_userAccountFlags(search_filter, flag, + flags_str="Trusted-to-Authenticate-for-Delegation", + on=on, strict=True) except Exception, err: raise CommandError(err) -- cgit