From: Rob van der Linde Date: Tue, 1 Aug 2023 01:05:28 +0000 (+1200) Subject: netcmd: user: readpasswords: turn getpassword.py into readpasswords module X-Git-Tag: tevent-0.16.0~1255 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fab69e47ef899a86d5cb65fb4a8578fcc4f63c3e;p=thirdparty%2Fsamba.git netcmd: user: readpasswords: turn getpassword.py into readpasswords module 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 204dd45f0e6..63e5dc55748 100644 --- a/python/samba/netcmd/user/__init__.py +++ b/python/samba/netcmd/user/__init__.py @@ -35,10 +35,10 @@ from .disable import cmd_user_disable from .edit import cmd_user_edit from .enable import cmd_user_enable from .getgroups import cmd_user_getgroups -from .getpassword import cmd_user_getpassword, cmd_user_syncpasswords 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 .rename import cmd_user_rename from .sensitive import cmd_user_sensitive from .setexpiry import cmd_user_setexpiry diff --git a/python/samba/netcmd/user/getpassword.py b/python/samba/netcmd/user/readpasswords/__init__.py similarity index 99% rename from python/samba/netcmd/user/getpassword.py rename to python/samba/netcmd/user/readpasswords/__init__.py index 07b1a8e545f..f79454b27d0 100644 --- a/python/samba/netcmd/user/getpassword.py +++ b/python/samba/netcmd/user/readpasswords/__init__.py @@ -1,6 +1,6 @@ # user management # -# user syncpasswords command +# user readpasswords commands # # Copyright Jelmer Vernooij 2010 # Copyright Theresa Halloran 2011 @@ -35,7 +35,7 @@ from samba.ndr import ndr_unpack from samba.common import get_bytes from samba.netcmd import CommandError, Option -from .common import ( +from ..common import ( GetPasswordCommand, gpg_decrypt, decrypt_samba_gpg_help,