From 911d42912ef64cafb53b2b3ea6deb4b7bb57795c Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Mon, 17 Oct 2022 08:56:10 +0200 Subject: [PATCH] Minor changes --- lib/pp_admintools/app/dns_deploy_zones.py | 4 +++- lib/pp_admintools/app/remove_ldap_user.py | 4 +++- lib/pp_admintools/app/set_ldap_password.py | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/lib/pp_admintools/app/dns_deploy_zones.py b/lib/pp_admintools/app/dns_deploy_zones.py index c2cbcdf..380b6b0 100644 --- a/lib/pp_admintools/app/dns_deploy_zones.py +++ b/lib/pp_admintools/app/dns_deploy_zones.py @@ -44,7 +44,7 @@ from ..config.dns_deploy_zones import DnsDeployZonesConfig from ..xlate import XLATOR -__version__ = '0.8.3' +__version__ = '0.8.4' LOG = logging.getLogger(__name__) _ = XLATOR.gettext @@ -62,6 +62,8 @@ class PpDeployZonesApp(PpPDNSApplication): of the BIND named daemon. """ + show_simulate_option = True + re_ipv4_zone = re.compile(r'^((?:\d+\.)+)in-addr\.arpa\.$') re_ipv6_zone = re.compile(r'^((?:[\da-f]\.)+)ip6\.arpa\.$') diff --git a/lib/pp_admintools/app/remove_ldap_user.py b/lib/pp_admintools/app/remove_ldap_user.py index 9c75561..28921c8 100644 --- a/lib/pp_admintools/app/remove_ldap_user.py +++ b/lib/pp_admintools/app/remove_ldap_user.py @@ -25,7 +25,7 @@ from . import AbortAppError, TimeoutOnPromptError from .ldap import LdapAppError, FatalLDAPError from .ldap import BaseLdapApplication -__version__ = '0.5.3' +__version__ = '0.5.4' LOG = logging.getLogger(__name__) _ = XLATOR.gettext @@ -43,6 +43,8 @@ class RemoveLdapUserError(LdapAppError): class RemoveLdapUserApplication(BaseLdapApplication): """Application class for disabling or removing a user from LDAP.""" + show_simulate_option = True + default_nologin_shell = "/usr/sbin/nologin" value_inactive = 'inactive' raw_empty_passwd = 'none' diff --git a/lib/pp_admintools/app/set_ldap_password.py b/lib/pp_admintools/app/set_ldap_password.py index 050c009..06db877 100644 --- a/lib/pp_admintools/app/set_ldap_password.py +++ b/lib/pp_admintools/app/set_ldap_password.py @@ -36,7 +36,7 @@ from .ldap import LdapAppError, FatalLDAPError from .ldap import BaseLdapApplication from .ldap import PasswordFileOptionAction -__version__ = '0.6.1' +__version__ = '0.6.2' LOG = logging.getLogger(__name__) _ = XLATOR.gettext @@ -54,6 +54,8 @@ class SetLdapPasswordError(LdapAppError): class SetLdapPasswordApplication(BaseLdapApplication): """Application class for setting a LDAP password.""" + show_simulate_option = True + current_userid = os.getuid() current_user = None try: -- 2.39.5