From: Rob van der Linde Date: Tue, 1 Aug 2023 01:09:06 +0000 (+1200) Subject: netcmd: user: readpasswords: move show command to readpasswords X-Git-Tag: tevent-0.16.0~1254 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6319df10b7bcc810d83491ced9a11e0fdbe7db0b;p=thirdparty%2Fsamba.git netcmd: user: readpasswords: move show command to readpasswords Signed-off-by: Rob van der Linde Reviewed-by: Douglas Bagnall Reviewed-by: Andrew Bartlett --- diff --git a/python/samba/netcmd/user/__init__.py b/python/samba/netcmd/user/__init__.py index 63e5dc55748..7d4dfea7ed2 100644 --- a/python/samba/netcmd/user/__init__.py +++ b/python/samba/netcmd/user/__init__.py @@ -38,13 +38,13 @@ from .getgroups import cmd_user_getgroups from .list import cmd_user_list from .move import cmd_user_move from .password import cmd_user_password -from .readpasswords import cmd_user_getpassword, cmd_user_syncpasswords +from .readpasswords import (cmd_user_getpassword, cmd_user_show, + cmd_user_syncpasswords) from .rename import cmd_user_rename from .sensitive import cmd_user_sensitive from .setexpiry import cmd_user_setexpiry from .setpassword import cmd_user_setpassword from .setprimarygroup import cmd_user_setprimarygroup -from .show import cmd_user_show from .unlock import cmd_user_unlock diff --git a/python/samba/netcmd/user/readpasswords/__init__.py b/python/samba/netcmd/user/readpasswords/__init__.py index f79454b27d0..75098415ba3 100644 --- a/python/samba/netcmd/user/readpasswords/__init__.py +++ b/python/samba/netcmd/user/readpasswords/__init__.py @@ -41,6 +41,7 @@ from ..common import ( decrypt_samba_gpg_help, virtual_attributes_help ) +from .show import cmd_user_show class cmd_user_getpassword(GetPasswordCommand): diff --git a/python/samba/netcmd/user/show.py b/python/samba/netcmd/user/readpasswords/show.py similarity index 99% rename from python/samba/netcmd/user/show.py rename to python/samba/netcmd/user/readpasswords/show.py index 1cdec890faf..ca5de06effb 100644 --- a/python/samba/netcmd/user/show.py +++ b/python/samba/netcmd/user/readpasswords/show.py @@ -25,7 +25,7 @@ from samba.auth import system_session from samba.netcmd import Option, common from samba.samdb import SamDB -from .common import GetPasswordCommand +from ..common import GetPasswordCommand class cmd_user_show(GetPasswordCommand):