From f924724e462577d2fb6a5077a5ef7b5254cdec53 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bj=C3=B6rn=20Baumbach?= Date: Wed, 20 Nov 2024 17:24:10 +0100 Subject: [PATCH] samba-tool user disable: make sure that filter matches only one user MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit toggle_userAccountFlags() can only handle one user. Signed-off-by: Björn Baumbach Reviewed-by: Jule Anger --- python/samba/netcmd/user/disable.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/python/samba/netcmd/user/disable.py b/python/samba/netcmd/user/disable.py index 158961633d9..37310e08880 100644 --- a/python/samba/netcmd/user/disable.py +++ b/python/samba/netcmd/user/disable.py @@ -62,6 +62,17 @@ class cmd_user_disable(Command): samdb = SamDB(url=H, session_info=system_session(), credentials=creds, lp=lp) + + res = samdb.search(base=samdb.domain_dn(), + expression=search_filter, + scope=ldb.SCOPE_SUBTREE) + if len(res) < 1: + raise CommandError("Unable to find user for '%s'" % ( + username or search_filter)) + if len(res) > 1: + raise CommandError("Found more than one user '%s'" % ( + username or search_filter)) + try: samdb.disable_account(search_filter) except Exception as msg: -- 2.47.3