From 9250508601f6c0923a9469f1e7200f87c754b29b Mon Sep 17 00:00:00 2001 From: Rob van der Linde Date: Wed, 1 Nov 2023 16:46:44 +1300 Subject: [PATCH] netcmd: silo member: make use of User.find function Signed-off-by: Rob van der Linde Reviewed-by: Douglas Bagnall Reviewed-by: Andrew Bartlett --- python/samba/netcmd/domain/auth/silo_member.py | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/python/samba/netcmd/domain/auth/silo_member.py b/python/samba/netcmd/domain/auth/silo_member.py index 294519255d0..638ad59b8ca 100644 --- a/python/samba/netcmd/domain/auth/silo_member.py +++ b/python/samba/netcmd/domain/auth/silo_member.py @@ -21,7 +21,6 @@ # import samba.getopt as options -from ldb import Dn from samba.netcmd import Command, CommandError, Option, SuperCommand from samba.netcmd.domain.models import AuthenticationSilo, User from samba.netcmd.domain.models.exceptions import ModelError @@ -61,14 +60,8 @@ class cmd_domain_auth_silo_member_add(Command): if silo is None: raise CommandError(f"Authentication silo {name} not found.") - # Try a Dn first, then sAMAccountName. try: - user_query = {"dn": Dn(ldb, member)} - except ValueError: - user_query = {"username": member} - - try: - user = User.get(ldb, **user_query) + user = User.find(ldb, member) except ModelError as e: raise CommandError(e) @@ -170,14 +163,8 @@ class cmd_domain_auth_silo_member_remove(Command): if silo is None: raise CommandError(f"Authentication silo {name} not found.") - # Try a Dn first, then sAMAccountName. - try: - user_query = {"dn": Dn(ldb, member)} - except ValueError: - user_query = {"username": member} - try: - user = User.get(ldb, **user_query) + user = User.find(ldb, member) except ModelError as e: raise CommandError(e) -- 2.47.3