Better initialisation of LdapPasswordHandler objects, and show an error message,...

diff --git a/lib/pp_admintools/app/check_ldap_pwd_schemes.py b/lib/pp_admintools/app/check_ldap_pwd_schemes.py
index 166f326ce3e6555f9b31a7f7834419d7d8be5ea6..12b4007571622d227ad58816aa0c1502197dd117 100644 (file)
--- a/lib/pp_admintools/app/check_ldap_pwd_schemes.py
+++ b/lib/pp_admintools/app/check_ldap_pwd_schemes.py
@@ -32,7 +32,7 @@ from ..config.ldap import LdapConfiguration
 from ..handler.ldap_password import LdapPasswordHandler
 from ..xlate import XLATOR
 
-__version__ = '0.2.2'
+__version__ = '0.2.3'
 LOG = logging.getLogger(__name__)
 
 _ = XLATOR.gettext
@@ -77,8 +77,7 @@ class CheckLdapPwdSchemesApplication(BaseLdapApplication):
         self.get_attributes.add('uid')
         self.get_attributes.add('userPassword')
 
-        self.pwd_handler = LdapPasswordHandler(
-            appname=appname, base_dir=base_dir, initialized=False)
+        self.pwd_handler = None
 
         desc = _(
             'Reports the password hashing schemes of {attr} attributes in LDAP. '
@@ -90,7 +89,8 @@ class CheckLdapPwdSchemesApplication(BaseLdapApplication):
             appname=appname, description=desc, base_dir=base_dir,
             cfg_class=LdapConfiguration, initialized=False)
 
-        self.pwd_handler.verbose = self.verbose
+        self.pwd_handler = LdapPasswordHandler(
+            appname=appname, base_dir=base_dir, verbose=self.verbose, initialized=True)
 
         self.initialized = True
 
@@ -222,6 +222,13 @@ class CheckLdapPwdSchemesApplication(BaseLdapApplication):
                     msg = _('Found entry {!r} with data:').format(dn) + '\n' + pp(pwdata)
                     LOG.debug(msg)
 
+        if not len(self.found_entries):
+            msg = _(
+                'Did not found any entries with a {attr} attribute and the given '
+                'filters.').format(attr='userPassword')
+            LOG.info(msg)
+            self.exit(0)
+
         if self.verbose > 3:
             msg = _('Found entry DNs:') + '\n' + pp(self.found_entries.as_dict())
             LOG.debug(msg)

diff --git a/lib/pp_admintools/app/mk_ldap_passwd.py b/lib/pp_admintools/app/mk_ldap_passwd.py
index c98a59d7a31d33df65b11c4cfa44c563f49e5c9f..f3e221fb60d1cd672c57736daf3a5fdea6d3f085 100644 (file)
--- a/lib/pp_admintools/app/mk_ldap_passwd.py
+++ b/lib/pp_admintools/app/mk_ldap_passwd.py
@@ -24,7 +24,7 @@ from ..handler.ldap_password import WrongRoundsError
 from ..handler.ldap_password import WrongSaltError
 from ..xlate import XLATOR
 
-__version__ = '0.1.4'
+__version__ = '0.1.5'
 LOG = logging.getLogger(__name__)
 
 _ = XLATOR.gettext
@@ -50,14 +50,16 @@ class MkLdapPasswdApplication(BaseApplication):
         self.password = None
         self.no_cracklib = False
 
-        self.pwd_handler = LdapPasswordHandler(
-            appname=appname, base_dir=base_dir, initialized=False)
+        self.pwd_handler = None
 
         desc = _('Encrypting the password with a defined password schema.')
 
         super(MkLdapPasswdApplication, self).__init__(
             appname=appname, description=desc, base_dir=base_dir, initialized=False)
 
+        self.pwd_handler = LdapPasswordHandler(
+            appname=appname, base_dir=base_dir, verbose=self.verbose, initialized=True)
+
         self.initialized = True
 
     # -------------------------------------------------------------------------

diff --git a/lib/pp_admintools/app/set_ldap_password.py b/lib/pp_admintools/app/set_ldap_password.py
index 6a9c5b4c38c37d1200b488d63c1a4aa294116ff9..f50b3704a746e754cdf790b6721fbfc3a5d3989d 100644 (file)
--- a/lib/pp_admintools/app/set_ldap_password.py
+++ b/lib/pp_admintools/app/set_ldap_password.py
@@ -35,7 +35,7 @@ from ..handler.ldap_password import WrongRoundsError
 from ..handler.ldap_password import WrongSaltError
 from ..xlate import XLATOR
 
-__version__ = '0.8.3'
+__version__ = '0.8.4'
 LOG = logging.getLogger(__name__)
 
 _ = XLATOR.gettext
@@ -82,8 +82,7 @@ class SetLdapPasswordApplication(BaseLdapApplication):
 
         self.user_connection = None
 
-        self.pwd_handler = LdapPasswordHandler(
-            appname=appname, base_dir=base_dir, initialized=False)
+        self.pwd_handler = None
 
         my_appname = self.get_generic_appname(appname)
 
@@ -95,6 +94,9 @@ class SetLdapPasswordApplication(BaseLdapApplication):
         super(SetLdapPasswordApplication, self).__init__(
             appname=appname, description=desc, base_dir=base_dir, initialized=False)
 
+        self.pwd_handler = LdapPasswordHandler(
+            appname=appname, base_dir=base_dir, verbose=self.verbose, initialized=True)
+
         self.initialized = True
 
     # -------------------------------------------------------------------------

diff --git a/locale/de_DE/LC_MESSAGES/pp_admintools.po b/locale/de_DE/LC_MESSAGES/pp_admintools.po
index c99f0aa8002110da9f013dd968221eac98bb329a..ae4f5209df09fb572dcc5d2ef8f18b6e2fe62cfc 100644 (file)
--- a/locale/de_DE/LC_MESSAGES/pp_admintools.po
+++ b/locale/de_DE/LC_MESSAGES/pp_admintools.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pp_admintools 0.10.0\n"
 "Report-Msgid-Bugs-To: frank.brehm@pixelpark.com\n"
-"POT-Creation-Date: 2023-08-22 13:39+0200\n"
-"PO-Revision-Date: 2023-08-22 13:40+0200\n"
+"POT-Creation-Date: 2023-08-22 14:15+0200\n"
+"PO-Revision-Date: 2023-08-22 14:20+0200\n"
 "Last-Translator: Frank Brehm <frank.brehm@pixelpark.com>\n"
 "Language: de_DE\n"
 "Language-Team: de_DE <solution@pixelpark.com>\n"
@@ -377,7 +377,7 @@ msgstr ""
 "DN-Syntax der Attribute überprüft, und ob sie existierende Einträge im LDAP referenzieren."
 
 #: lib/pp_admintools/app/check_ldap_dn_attributes.py:97
-#: lib/pp_admintools/app/check_ldap_pwd_schemes.py:106
+#: lib/pp_admintools/app/check_ldap_pwd_schemes.py:105
 msgid "Script options"
 msgstr "Skript-Optionen"
 
@@ -434,12 +434,12 @@ msgid "Checking DN-like attributes of entry {!r} ..."
 msgstr "Überprüfe Attribute mit DN-Syntax von Eintrag {!r} …"
 
 #: lib/pp_admintools/app/check_ldap_dn_attributes.py:219
-#: lib/pp_admintools/app/check_ldap_pwd_schemes.py:190
+#: lib/pp_admintools/app/check_ldap_pwd_schemes.py:189
 #: lib/pp_admintools/app/clean_empty_ldap_groups.py:233
 msgid "Got attributes:"
 msgstr "Gefundene Attribute:"
 
-#: lib/pp_admintools/app/check_ldap_pwd_schemes.py:84
+#: lib/pp_admintools/app/check_ldap_pwd_schemes.py:82
 msgid ""
 "Reports the password hashing schemes of {attr} attributes in LDAP. Without a filter or a more "
 "special Base-DN the hashing schemes of all {attr} attributes in the LDAP tree are shown. One can"
@@ -450,11 +450,11 @@ msgstr ""
 "angezeigt. Man kann die Ausgabe durch einen regulären LDAP-Filter bzw. durch die Angabe von "
 "einem oder mehreren Hashing-Schemen filtern."
 
-#: lib/pp_admintools/app/check_ldap_pwd_schemes.py:109
+#: lib/pp_admintools/app/check_ldap_pwd_schemes.py:108
 msgid "FILTER"
 msgstr "FILTER"
 
-#: lib/pp_admintools/app/check_ldap_pwd_schemes.py:110
+#: lib/pp_admintools/app/check_ldap_pwd_schemes.py:109
 msgid ""
 "An additional LDAP filter to limit the entries to print out their password hashing schema. "
 "Please note, that this filter will be wrapped by parantheses to combine it with the default "
@@ -464,7 +464,7 @@ msgstr ""
 "angezeigt werden soll. Bitte beachten, dass dieser Filter mit Klammern umgeben wird, um ihn mit "
 "dem Vorgabe-Filter {!r} zu verbinden."
 
-#: lib/pp_admintools/app/check_ldap_pwd_schemes.py:124
+#: lib/pp_admintools/app/check_ldap_pwd_schemes.py:123
 msgid ""
 "One or more schemes (hashing methods) for filtering the {attr} attributes. It is possible to "
 "give here the value {val_list!r}, then all possible schemes are shown and exit."
@@ -473,15 +473,15 @@ msgstr ""
 "den Wert {val_list!r} anzugeben, dann werden alle verfügbaren Hashing-Methoden ausgegeben und "
 "beendet."
 
-#: lib/pp_admintools/app/check_ldap_pwd_schemes.py:130 lib/pp_admintools/app/set_ldap_password.py:183
+#: lib/pp_admintools/app/check_ldap_pwd_schemes.py:129 lib/pp_admintools/app/set_ldap_password.py:181
 msgid "SCHEMA"
 msgstr "SCHEMA"
 
-#: lib/pp_admintools/app/check_ldap_pwd_schemes.py:136
+#: lib/pp_admintools/app/check_ldap_pwd_schemes.py:135
 msgid "Show more details in output, e.g. the entry DN."
 msgstr "Zeigt mehr Details in der Ausgabe an, die DNs der Einträge."
 
-#: lib/pp_admintools/app/check_ldap_pwd_schemes.py:168
+#: lib/pp_admintools/app/check_ldap_pwd_schemes.py:167
 msgid ""
 "Start reporting password hashing schemes of {attr} attributes in in LDAP instance {inst!r} "
 "({url}) ..."
@@ -489,15 +489,19 @@ msgstr ""
 "Beginne mit der Ausgabe der Passwort-Hashing-Mechanismen der {attr}-Attribute in der LDAP-"
 "Instanz {inst!r} ({url}) …"
 
-#: lib/pp_admintools/app/check_ldap_pwd_schemes.py:181
+#: lib/pp_admintools/app/check_ldap_pwd_schemes.py:180
 msgid "Used LDAP filter: {!r}."
 msgstr "Verwendeter LDAP-Filter: {!r}."
 
-#: lib/pp_admintools/app/check_ldap_pwd_schemes.py:223
+#: lib/pp_admintools/app/check_ldap_pwd_schemes.py:222
 msgid "Found entry {!r} with data:"
 msgstr "Fand Eintrag {!r} mit folgenden Daten:"
 
-#: lib/pp_admintools/app/check_ldap_pwd_schemes.py:227
+#: lib/pp_admintools/app/check_ldap_pwd_schemes.py:226
+msgid "Did not found any entries with a {attr} attribute and the given filters."
+msgstr "Keine Einträge mit einem {attr}-Attribut und dem gegebenen Filter gefunden."
+
+#: lib/pp_admintools/app/check_ldap_pwd_schemes.py:233
 msgid "Found entry DNs:"
 msgstr "Gefundener Eintrag-DNs:"
 
@@ -575,12 +579,12 @@ msgstr "[{yes}/{no}]?"
 
 #: lib/pp_admintools/app/clean_empty_ldap_groups.py:261 lib/pp_admintools/app/ldap.py:337
 #: lib/pp_admintools/app/mirror_ldap.py:238 lib/pp_admintools/app/remove_ldap_user.py:308
-#: lib/pp_admintools/app/set_ldap_password.py:489
+#: lib/pp_admintools/app/set_ldap_password.py:487
 msgid "No"
 msgstr "Nein"
 
 #: lib/pp_admintools/app/clean_empty_ldap_groups.py:261 lib/pp_admintools/app/mirror_ldap.py:238
-#: lib/pp_admintools/app/remove_ldap_user.py:308 lib/pp_admintools/app/set_ldap_password.py:489
+#: lib/pp_admintools/app/remove_ldap_user.py:308 lib/pp_admintools/app/set_ldap_password.py:487
 msgid "yes"
 msgstr "ja"
 
@@ -588,8 +592,8 @@ msgstr "ja"
 msgid "Generation of the BIND9 configuration file for slave zones."
 msgstr "Generierung der BIND9-Konfigurationsdatei für Slave-Zonen."
 
-#: lib/pp_admintools/app/dns_deploy_zones.py:250 lib/pp_admintools/app/mk_ldap_passwd.py:86
-#: lib/pp_admintools/app/set_ldap_password.py:125
+#: lib/pp_admintools/app/dns_deploy_zones.py:250 lib/pp_admintools/app/mk_ldap_passwd.py:84
+#: lib/pp_admintools/app/set_ldap_password.py:123
 msgid "Options for {}"
 msgstr "Optionen für {}"
 
@@ -977,9 +981,9 @@ msgstr "Die Basis-DN, die als Ausgangspunkt bei LDAP-Suchen verwendet werden sol
 msgid "The Bind DN to use to connect to the LDAP server. Default: {!r}"
 msgstr "Die Bind-DN, die zur Verbindung mit dem LDAP-Server verwendet werden soll. Vorgabe: {!r}"
 
-#: lib/pp_admintools/app/ldap.py:381 lib/pp_admintools/app/mk_ldap_passwd.py:131
-#: lib/pp_admintools/app/set_ldap_password.py:131 lib/pp_admintools/app/set_ldap_password.py:132
-#: lib/pp_admintools/app/set_ldap_password.py:149 lib/pp_admintools/app/set_ldap_password.py:152
+#: lib/pp_admintools/app/ldap.py:381 lib/pp_admintools/app/mk_ldap_passwd.py:129
+#: lib/pp_admintools/app/set_ldap_password.py:129 lib/pp_admintools/app/set_ldap_password.py:130
+#: lib/pp_admintools/app/set_ldap_password.py:147 lib/pp_admintools/app/set_ldap_password.py:150
 msgid "PASSWORD"
 msgstr "PASSWORT"
 
@@ -995,8 +999,8 @@ msgstr ""
 "Nachfrage nach dem Passwort für eine einfache LDAP-Authentifizierung. Dies wird anstelle der "
 "Angabe des Passwortes an der Kommandozeile verwendet."
 
-#: lib/pp_admintools/app/ldap.py:393 lib/pp_admintools/app/set_ldap_password.py:143
-#: lib/pp_admintools/app/set_ldap_password.py:145
+#: lib/pp_admintools/app/ldap.py:393 lib/pp_admintools/app/set_ldap_password.py:141
+#: lib/pp_admintools/app/set_ldap_password.py:143
 msgid "PASSWORD_FILE"
 msgstr "PASSWORT_DATEI"
 
@@ -1239,7 +1243,7 @@ msgstr "Ergebnis der Suche nach CN {cn!r}:"
 msgid "User with cn {cn!r} not found in {uri}/{bdn}."
 msgstr "Ein Nutzer mit dem CN {cn!r} wurde nicht in {uri}/{bdn} gefunden."
 
-#: lib/pp_admintools/app/ldap.py:1218 lib/pp_admintools/app/set_ldap_password.py:409
+#: lib/pp_admintools/app/ldap.py:1218 lib/pp_admintools/app/set_ldap_password.py:407
 msgid "User with DN {dn!r} not found in {uri}."
 msgstr "Ein Nutzer mit dem DN {dn!r} wurde nicht in {uri} gefunden."
 
@@ -1307,7 +1311,7 @@ msgstr "Die Änderung von {dn!r} war NICHT erfolgreich - {c}: {e}"
 #: lib/pp_admintools/app/remove_ldap_user.py:449 lib/pp_admintools/app/remove_ldap_user.py:476
 #: lib/pp_admintools/app/remove_ldap_user.py:503 lib/pp_admintools/app/remove_ldap_user.py:534
 #: lib/pp_admintools/app/remove_ldap_user.py:565 lib/pp_admintools/app/remove_ldap_user.py:681
-#: lib/pp_admintools/app/set_ldap_password.py:518
+#: lib/pp_admintools/app/set_ldap_password.py:516
 msgid "Changes:"
 msgstr "Änderungen:"
 
@@ -1498,7 +1502,7 @@ msgstr ""
 "angegeben, und wenn sie auf Null gesetzt werden, erfolgt kein Warten nach dem Schreiben. "
 "(Vorgabe: {:.1f})"
 
-#: lib/pp_admintools/app/mirror_ldap.py:127 lib/pp_admintools/app/mk_ldap_passwd.py:121
+#: lib/pp_admintools/app/mirror_ldap.py:127 lib/pp_admintools/app/mk_ldap_passwd.py:119
 msgid "NUMBER"
 msgstr "ANZAHL"
 
@@ -1779,25 +1783,25 @@ msgstr[1] "Es wurden {no} Gruppeneinträge in die Ziel-LDAP-Instanz gespiegelt."
 msgid "Mirrored no group entries to target LDAP instance."
 msgstr "Es wurden keine Gruppeneinträge in die Ziel-LDAP-Instanz gespiegelt."
 
-#: lib/pp_admintools/app/mk_ldap_passwd.py:58
+#: lib/pp_admintools/app/mk_ldap_passwd.py:56
 msgid "Encrypting the password with a defined password schema."
 msgstr "Verschlüsseln eines Passwortes mit einem definierten Passwort-Schema."
 
-#: lib/pp_admintools/app/mk_ldap_passwd.py:99
+#: lib/pp_admintools/app/mk_ldap_passwd.py:97
 msgid "The schema (hashing method) to use to hash the new password. Default: {default!r}."
 msgstr ""
 "Das Schema (die Hashing-Methode), das zum Hashen des neuen Passwortes verwendet wird.  Vorgabe: "
 "{default!r}."
 
-#: lib/pp_admintools/app/mk_ldap_passwd.py:104
+#: lib/pp_admintools/app/mk_ldap_passwd.py:102
 msgid "TYPE"
 msgstr "TYP"
 
-#: lib/pp_admintools/app/mk_ldap_passwd.py:110
+#: lib/pp_admintools/app/mk_ldap_passwd.py:108
 msgid "Like {}"
 msgstr "Wie {}"
 
-#: lib/pp_admintools/app/mk_ldap_passwd.py:115 lib/pp_admintools/app/set_ldap_password.py:208
+#: lib/pp_admintools/app/mk_ldap_passwd.py:113 lib/pp_admintools/app/set_ldap_password.py:206
 msgid ""
 "A possible salt to use on hashing the password. Caution: not all hashing schemes are supporting "
 "a salt."
@@ -1805,7 +1809,7 @@ msgstr ""
 "Ein optionaler Salt, der zum Hashen des Passwortes verwendet werden kann. Achtung: nicht alle "
 "Hashing-Schemen unterstützen einen Salt."
 
-#: lib/pp_admintools/app/mk_ldap_passwd.py:122 lib/pp_admintools/app/set_ldap_password.py:215
+#: lib/pp_admintools/app/mk_ldap_passwd.py:120 lib/pp_admintools/app/set_ldap_password.py:213
 msgid ""
 "The number of calculation rounds to use on hashing the password. Caution: not all hashing "
 "schemes are supporting calculation rounds."
@@ -1813,7 +1817,7 @@ msgstr ""
 "Die Anzahl der Berechnungsrunden, die zum Hashen des Passwortes verwendet werden können. "
 "Achtung: nicht alle Hashing-Schemen unterstützen Berechnungsrunden."
 
-#: lib/pp_admintools/app/mk_ldap_passwd.py:127
+#: lib/pp_admintools/app/mk_ldap_passwd.py:125
 msgid ""
 "The password to hash. If not given and no file desriptor was given, then the password will be "
 "requested on TTY."
@@ -1821,24 +1825,24 @@ msgstr ""
 "Das Passort, das verschlüsselt werden soll. Wenn nicht angegeben, dann wird das Passwort über "
 "die Konsole abgefragt."
 
-#: lib/pp_admintools/app/mk_ldap_passwd.py:175
+#: lib/pp_admintools/app/mk_ldap_passwd.py:173
 msgid "Got no password by {}."
 msgstr "Kein Passwort üver {} erhalten."
 
-#: lib/pp_admintools/app/mk_ldap_passwd.py:178
+#: lib/pp_admintools/app/mk_ldap_passwd.py:176
 msgid "Password:"
 msgstr "Passwort:"
 
-#: lib/pp_admintools/app/mk_ldap_passwd.py:179 lib/pp_admintools/app/set_ldap_password.py:305
-#: lib/pp_admintools/app/set_ldap_password.py:325
+#: lib/pp_admintools/app/mk_ldap_passwd.py:177 lib/pp_admintools/app/set_ldap_password.py:303
+#: lib/pp_admintools/app/set_ldap_password.py:323
 msgid "Repeat password:"
 msgstr "Passwort-Wiederholung:"
 
-#: lib/pp_admintools/app/mk_ldap_passwd.py:193
+#: lib/pp_admintools/app/mk_ldap_passwd.py:191
 msgid "Encrypting password with hashing schema '{schema}' ..."
 msgstr "Verschlüsseln des Passwortes mit dem Hashing-Schema '{schema}' …"
 
-#: lib/pp_admintools/app/mk_ldap_passwd.py:200 lib/pp_admintools/app/set_ldap_password.py:478
+#: lib/pp_admintools/app/mk_ldap_passwd.py:198 lib/pp_admintools/app/set_ldap_password.py:476
 msgid "Used schema: {!r}."
 msgstr "Verwendetes Schama : {!r}."
 
@@ -1986,8 +1990,8 @@ msgstr "Löschen der übergebenen Nutzer im LDAP."
 msgid "Don't remove all mail addresses of the users to remove from all mailing lists."
 msgstr "Kein Löschen aller Mailadressen der zu löschenden Nutzer aus allen Mailing-Listen."
 
-#: lib/pp_admintools/app/remove_ldap_user.py:162 lib/pp_admintools/app/set_ldap_password.py:201
-#: lib/pp_admintools/app/set_ldap_password.py:204
+#: lib/pp_admintools/app/remove_ldap_user.py:162 lib/pp_admintools/app/set_ldap_password.py:199
+#: lib/pp_admintools/app/set_ldap_password.py:202
 msgid "USER"
 msgstr "NUTZER"
 
@@ -2050,15 +2054,15 @@ msgstr "Löschen [{yes}/{no}]?"
 msgid "Evaluating DNs of the user {!r} to remove ..."
 msgstr "Ermitteln der DNs des Nutzers {!r} zum Löschen …"
 
-#: lib/pp_admintools/app/remove_ldap_user.py:328 lib/pp_admintools/app/set_ldap_password.py:431
+#: lib/pp_admintools/app/remove_ldap_user.py:328 lib/pp_admintools/app/set_ldap_password.py:429
 msgid "Got DN {dn!r} for user {user!r} in LDAP instance {inst}."
 msgstr "Habe DN {dn!r} für den Nutzer {user!r} in der LDAP-Instanz {inst} ermittelt."
 
-#: lib/pp_admintools/app/remove_ldap_user.py:335 lib/pp_admintools/app/set_ldap_password.py:436
+#: lib/pp_admintools/app/remove_ldap_user.py:335 lib/pp_admintools/app/set_ldap_password.py:434
 msgid "Found {nr} entries for user {u!r} in LDAP instance {i}."
 msgstr "Fand {nr} Einträge für den Nutzer {u!r} in der LDAP-Instanz {i}."
 
-#: lib/pp_admintools/app/remove_ldap_user.py:347 lib/pp_admintools/app/set_ldap_password.py:450
+#: lib/pp_admintools/app/remove_ldap_user.py:347 lib/pp_admintools/app/set_ldap_password.py:448
 msgid "Did not found user {user!r} in LDAP instance {inst}."
 msgstr "Der Nutzer {user!r} wurde nicht in der LDAP-Instanz {inst} gefunden."
 
@@ -2168,7 +2172,7 @@ msgstr "Es gibt keine Änderungen für die Mailadresse {mail!r} in {dn!r}?!?"
 msgid "{c} on removing mail {mail!r} from {dn!r}: {e}"
 msgstr "{c} beim Löschen des der Mailadresse {mail!r} von {dn!r}: {e}"
 
-#: lib/pp_admintools/app/set_ldap_password.py:92
+#: lib/pp_admintools/app/set_ldap_password.py:90
 msgid ""
 "Changing the password of the given user. If no user was given, then {app} tries to use the name "
 "of the user logged in on the controlling terminal."
@@ -2176,11 +2180,11 @@ msgstr ""
 "Ändern des Passwortes des angegebenen Nutzers. Wenn kein Nutzer angegeben wird, versucht {app} "
 "den Namen des am Terminal angemeldeten Nutzers zu verwenden."
 
-#: lib/pp_admintools/app/set_ldap_password.py:132
+#: lib/pp_admintools/app/set_ldap_password.py:130
 msgid "Use {} as the current user password."
 msgstr "Verwende {} als das aktuelle Nutzerpasswort."
 
-#: lib/pp_admintools/app/set_ldap_password.py:137
+#: lib/pp_admintools/app/set_ldap_password.py:135
 msgid ""
 "Prompt for current user password. This is used instead of specifying the password on the command"
 " line."
@@ -2188,19 +2192,19 @@ msgstr ""
 "Nachfrage nach dem aktuellen Passwort des Nutzers. Das wird anstelle der Angabe des Passortes in"
 " der Kommandozeile verwendet."
 
-#: lib/pp_admintools/app/set_ldap_password.py:145
+#: lib/pp_admintools/app/set_ldap_password.py:143
 msgid "Use contents of {} as the current user password."
 msgstr "Verwende den Inhalt von {} als das aktuelle Nutzerpasswort."
 
-#: lib/pp_admintools/app/set_ldap_password.py:150
+#: lib/pp_admintools/app/set_ldap_password.py:148
 msgid "Use {} as the new user password. If not given, it will be asked for it."
 msgstr "Verwende {} als das neue Nutzerpasswort. Wenn nicht angegeben, wird danach gefragt."
 
-#: lib/pp_admintools/app/set_ldap_password.py:158
+#: lib/pp_admintools/app/set_ldap_password.py:156
 msgid "Do not check the quality of the new password with the {} library."
 msgstr "Keine Überprüfung der Qualität des neuen Passwortes mit der {}-Bibliothek."
 
-#: lib/pp_admintools/app/set_ldap_password.py:173
+#: lib/pp_admintools/app/set_ldap_password.py:171
 msgid ""
 "The schema (hashing method) to use to hash the new password. It is possible to give here the "
 "value {val_list!r}, then all possible schemes are shown and exit. Default: {default!r}."
@@ -2209,13 +2213,13 @@ msgstr ""
 "möglich, hier den Wert {val_list!r} anzugeben, dann werden alle verfügbaren Schemen aufgelistet."
 " Vorgabe: {default!r}."
 
-#: lib/pp_admintools/app/set_ldap_password.py:178
+#: lib/pp_admintools/app/set_ldap_password.py:176
 msgid "If you are not using an admin account, then the password will hashed only by the default schema."
 msgstr ""
 "Wenn kein Admin-Account verwendet wird, dann wird das Passwort ausschließlich mit dem Vorgabe-"
 "Schema gehasht."
 
-#: lib/pp_admintools/app/set_ldap_password.py:187
+#: lib/pp_admintools/app/set_ldap_password.py:185
 msgid ""
 "The user, which password in the given LDAP instance should be changed. It may be given by its "
 "Uid (the alphanumeric POSIX name), its mail address or its LDAP DN."
@@ -2224,11 +2228,11 @@ msgstr ""
 "seine Uid (der alphanumerische POSIX-Nutzername), als seine Mailadresse oder als seine LDAP-DN "
 "angegeben werden."
 
-#: lib/pp_admintools/app/set_ldap_password.py:192
+#: lib/pp_admintools/app/set_ldap_password.py:190
 msgid "If not given, then your current user name {!r} will be used."
 msgstr "Wenn nicht angegeben, dann wird der aktuelle Nutzername {!r} verwendet."
 
-#: lib/pp_admintools/app/set_ldap_password.py:195
+#: lib/pp_admintools/app/set_ldap_password.py:193
 msgid ""
 "If you are using a readonly LDAP instance or an instance w/o admin access, then you must provide"
 " somehow the current password of the user to change."
@@ -2236,55 +2240,55 @@ msgstr ""
 "Wenn eine LDAP-Instanz verwendet wird, die nur Leserechte oder keinen Admin-Zugriff hat, dann "
 "muss irgendwie das neue Passwort des Nutzer zum Ändern angegeben werden."
 
-#: lib/pp_admintools/app/set_ldap_password.py:261
+#: lib/pp_admintools/app/set_ldap_password.py:259
 msgid "Could not detect your current login name."
 msgstr "Konnte den aktuellen Anmeldenamen nicht ermitteln."
 
-#: lib/pp_admintools/app/set_ldap_password.py:266
+#: lib/pp_admintools/app/set_ldap_password.py:264
 msgid "The user {!r} will never be managed by LDAP."
 msgstr "Der Nutzer {!r} wird niemals nimmer nicht von LDAP gemanagt."
 
-#: lib/pp_admintools/app/set_ldap_password.py:300
+#: lib/pp_admintools/app/set_ldap_password.py:298
 msgid "Using LDAP instance {inst!r} - {url}."
 msgstr "Verwende LDAP-Instanz {inst!r} - {url}."
 
-#: lib/pp_admintools/app/set_ldap_password.py:304
+#: lib/pp_admintools/app/set_ldap_password.py:302
 msgid "Current password of user {!r}:"
 msgstr "Aktuelles Passwort des Nutzers {!r}:"
 
-#: lib/pp_admintools/app/set_ldap_password.py:318
+#: lib/pp_admintools/app/set_ldap_password.py:316
 msgid "Non admin users must use the default schema {!r} for hashing their password."
 msgstr "Nicht-Admin-Nutzer müssen das Vorgabeschema {!r} für das Hashen des Passwortes verwenden."
 
-#: lib/pp_admintools/app/set_ldap_password.py:324
+#: lib/pp_admintools/app/set_ldap_password.py:322
 msgid "New password of user {!r}:"
 msgstr "Neues Passwort für Nutzer {!r}:"
 
-#: lib/pp_admintools/app/set_ldap_password.py:330
+#: lib/pp_admintools/app/set_ldap_password.py:328
 msgid "Checking the quality of the new password was disabled."
 msgstr "Die Überprüfung der Qualität des neuen Passwortes wurde deaktiviert."
 
-#: lib/pp_admintools/app/set_ldap_password.py:360
+#: lib/pp_admintools/app/set_ldap_password.py:358
 msgid "Unbinding user connection from LDAP server {} ..."
 msgstr "Trenne Verbindung des Nutzers zu LDAP-Server {} …"
 
-#: lib/pp_admintools/app/set_ldap_password.py:371
+#: lib/pp_admintools/app/set_ldap_password.py:369
 msgid "Testing connect to LDAP-Server {url} with current user {dn!r} and password ..."
 msgstr "Teste eine Anmeldung am LDAP-Server {url} als aktueller Nutzer {dn!r} mit Passwort …"
 
-#: lib/pp_admintools/app/set_ldap_password.py:383
+#: lib/pp_admintools/app/set_ldap_password.py:381
 msgid "Successful connected as {dn!r} to {url}."
 msgstr "Erfolgreich als {dn!r} an {url} angemeldet."
 
-#: lib/pp_admintools/app/set_ldap_password.py:389
+#: lib/pp_admintools/app/set_ldap_password.py:387
 msgid "Could not connect to {url} as {dn!r}: {e}"
 msgstr "Nutzer {dn!r} konnte nicht an {url} angemeldet werden: {e}"
 
-#: lib/pp_admintools/app/set_ldap_password.py:400
+#: lib/pp_admintools/app/set_ldap_password.py:398
 msgid "Trying to get current password hash of user {!r} ..."
 msgstr "Versuche den aktuellen Passwort-Hash des Nutzers {!r} zu holen …"
 
-#: lib/pp_admintools/app/set_ldap_password.py:438
+#: lib/pp_admintools/app/set_ldap_password.py:436
 msgid ""
 "Please use another username, or use the correct DN from the following list as a parameter for "
 "this script instead of the username:"
@@ -2292,39 +2296,39 @@ msgstr ""
 "Bitte einen anderen Nutzernamen oder den richtigen DN aus der folgenden Liste als Parameter für "
 "dieses Skript als Nutzername angeben:"
 
-#: lib/pp_admintools/app/set_ldap_password.py:455
+#: lib/pp_admintools/app/set_ldap_password.py:453
 msgid "Changing the password of user {dn!r} in LDAP instance {inst}."
 msgstr "Ändern des Passwortes des Nutzers {dn!r} in der LDAP-Instanz {inst}."
 
-#: lib/pp_admintools/app/set_ldap_password.py:462
+#: lib/pp_admintools/app/set_ldap_password.py:460
 msgid "Setting password of '{dn}' with hashing schema '{schema}' ..."
 msgstr "Setze das Passwort von '{dn}' mit dem Hashing-Schema '{schema}'."
 
-#: lib/pp_admintools/app/set_ldap_password.py:468
+#: lib/pp_admintools/app/set_ldap_password.py:466
 msgid "Current password hash: '{}'."
 msgstr "Aktueller Passwort-Hash: '{}'"
 
-#: lib/pp_admintools/app/set_ldap_password.py:471
+#: lib/pp_admintools/app/set_ldap_password.py:469
 msgid "The user '{}' has currently no password."
 msgstr "Der Nutzer '{}' hat aktuell kein Passwort."
 
-#: lib/pp_admintools/app/set_ldap_password.py:484
+#: lib/pp_admintools/app/set_ldap_password.py:482
 msgid "New password hash: '{}'."
 msgstr "Neuer Passwort-Hash: '{}'."
 
-#: lib/pp_admintools/app/set_ldap_password.py:488
+#: lib/pp_admintools/app/set_ldap_password.py:486
 msgid "Apply new password? [{yes}/{no}]?"
 msgstr "Neues Passwort setzen [{yes}/{no}]?"
 
-#: lib/pp_admintools/app/set_ldap_password.py:494
+#: lib/pp_admintools/app/set_ldap_password.py:492
 msgid "Do not setting password for {!r}."
 msgstr "Passwort für {!r} wird nicht gesetzt."
 
-#: lib/pp_admintools/app/set_ldap_password.py:510
+#: lib/pp_admintools/app/set_ldap_password.py:508
 msgid "Setting password ..."
 msgstr "Setze Passwort …"
 
-#: lib/pp_admintools/app/set_ldap_password.py:516
+#: lib/pp_admintools/app/set_ldap_password.py:514
 msgid "{c} on setting password of user {dn!r}: {e}"
 msgstr "{c} beim Setzen des Passwortes des Nutzers {dn!r}: {e}"
 

diff --git a/locale/en_US/LC_MESSAGES/pp_admintools.po b/locale/en_US/LC_MESSAGES/pp_admintools.po
index 9c7b51a92a58dc5157e9fd4ac44603a6f565d8a0..acd64125da317593fdbb8309b131a240c2fdcffa 100644 (file)
--- a/locale/en_US/LC_MESSAGES/pp_admintools.po
+++ b/locale/en_US/LC_MESSAGES/pp_admintools.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pp_admintools 0.10.0\n"
 "Report-Msgid-Bugs-To: frank.brehm@pixelpark.com\n"
-"POT-Creation-Date: 2023-08-22 13:39+0200\n"
+"POT-Creation-Date: 2023-08-22 14:15+0200\n"
 "PO-Revision-Date: 2023-08-22 14:45+0200\n"
 "Last-Translator: Frank Brehm <frank.brehm@pixelpark.com>\n"
 "Language: en_US\n"
@@ -365,7 +365,7 @@ msgid ""
 msgstr ""
 
 #: lib/pp_admintools/app/check_ldap_dn_attributes.py:97
-#: lib/pp_admintools/app/check_ldap_pwd_schemes.py:106
+#: lib/pp_admintools/app/check_ldap_pwd_schemes.py:105
 msgid "Script options"
 msgstr ""
 
@@ -420,58 +420,64 @@ msgid "Checking DN-like attributes of entry {!r} ..."
 msgstr "Checking DN-like attributes of entry {!r} …"
 
 #: lib/pp_admintools/app/check_ldap_dn_attributes.py:219
-#: lib/pp_admintools/app/check_ldap_pwd_schemes.py:190
+#: lib/pp_admintools/app/check_ldap_pwd_schemes.py:189
 #: lib/pp_admintools/app/clean_empty_ldap_groups.py:233
 msgid "Got attributes:"
 msgstr ""
 
-#: lib/pp_admintools/app/check_ldap_pwd_schemes.py:84
+#: lib/pp_admintools/app/check_ldap_pwd_schemes.py:82
 msgid ""
 "Reports the password hashing schemes of {attr} attributes in LDAP. Without a filter or a more "
 "special Base-DN the hashing schemes of all {attr} attributes in the LDAP tree are shown. One can"
 " filter the output by a regular LDAP-filter rule of by one or more hashing schemes."
 msgstr ""
 
-#: lib/pp_admintools/app/check_ldap_pwd_schemes.py:109
+#: lib/pp_admintools/app/check_ldap_pwd_schemes.py:108
 msgid "FILTER"
 msgstr ""
 
-#: lib/pp_admintools/app/check_ldap_pwd_schemes.py:110
+#: lib/pp_admintools/app/check_ldap_pwd_schemes.py:109
 msgid ""
 "An additional LDAP filter to limit the entries to print out their password hashing schema. "
 "Please note, that this filter will be wrapped by parantheses to combine it with the default "
 "filter {!r}."
 msgstr ""
 
-#: lib/pp_admintools/app/check_ldap_pwd_schemes.py:124
+#: lib/pp_admintools/app/check_ldap_pwd_schemes.py:123
 msgid ""
 "One or more schemes (hashing methods) for filtering the {attr} attributes. It is possible to "
 "give here the value {val_list!r}, then all possible schemes are shown and exit."
 msgstr ""
 
-#: lib/pp_admintools/app/check_ldap_pwd_schemes.py:130 lib/pp_admintools/app/set_ldap_password.py:183
+#: lib/pp_admintools/app/check_ldap_pwd_schemes.py:129 lib/pp_admintools/app/set_ldap_password.py:181
 msgid "SCHEMA"
 msgstr ""
 
-#: lib/pp_admintools/app/check_ldap_pwd_schemes.py:136
+#: lib/pp_admintools/app/check_ldap_pwd_schemes.py:135
 msgid "Show more details in output, e.g. the entry DN."
 msgstr ""
 
-#: lib/pp_admintools/app/check_ldap_pwd_schemes.py:168
+#: lib/pp_admintools/app/check_ldap_pwd_schemes.py:167
 msgid ""
 "Start reporting password hashing schemes of {attr} attributes in in LDAP instance {inst!r} "
 "({url}) ..."
-msgstr "Start reporting password hashing schemes of {attr} attributes in in LDAP instance {inst!r} ({url})  …"
+msgstr ""
+"Start reporting password hashing schemes of {attr} attributes in in LDAP instance {inst!r} "
+"({url})  …"
 
-#: lib/pp_admintools/app/check_ldap_pwd_schemes.py:181
+#: lib/pp_admintools/app/check_ldap_pwd_schemes.py:180
 msgid "Used LDAP filter: {!r}."
 msgstr ""
 
-#: lib/pp_admintools/app/check_ldap_pwd_schemes.py:223
+#: lib/pp_admintools/app/check_ldap_pwd_schemes.py:222
 msgid "Found entry {!r} with data:"
 msgstr ""
 
-#: lib/pp_admintools/app/check_ldap_pwd_schemes.py:227
+#: lib/pp_admintools/app/check_ldap_pwd_schemes.py:226
+msgid "Did not found any entries with a {attr} attribute and the given filters."
+msgstr ""
+
+#: lib/pp_admintools/app/check_ldap_pwd_schemes.py:233
 msgid "Found entry DNs:"
 msgstr ""
 
@@ -547,12 +553,12 @@ msgstr ""
 
 #: lib/pp_admintools/app/clean_empty_ldap_groups.py:261 lib/pp_admintools/app/ldap.py:337
 #: lib/pp_admintools/app/mirror_ldap.py:238 lib/pp_admintools/app/remove_ldap_user.py:308
-#: lib/pp_admintools/app/set_ldap_password.py:489
+#: lib/pp_admintools/app/set_ldap_password.py:487
 msgid "No"
 msgstr ""
 
 #: lib/pp_admintools/app/clean_empty_ldap_groups.py:261 lib/pp_admintools/app/mirror_ldap.py:238
-#: lib/pp_admintools/app/remove_ldap_user.py:308 lib/pp_admintools/app/set_ldap_password.py:489
+#: lib/pp_admintools/app/remove_ldap_user.py:308 lib/pp_admintools/app/set_ldap_password.py:487
 msgid "yes"
 msgstr ""
 
@@ -560,8 +566,8 @@ msgstr ""
 msgid "Generation of the BIND9 configuration file for slave zones."
 msgstr ""
 
-#: lib/pp_admintools/app/dns_deploy_zones.py:250 lib/pp_admintools/app/mk_ldap_passwd.py:86
-#: lib/pp_admintools/app/set_ldap_password.py:125
+#: lib/pp_admintools/app/dns_deploy_zones.py:250 lib/pp_admintools/app/mk_ldap_passwd.py:84
+#: lib/pp_admintools/app/set_ldap_password.py:123
 msgid "Options for {}"
 msgstr ""
 
@@ -937,9 +943,9 @@ msgstr ""
 msgid "The Bind DN to use to connect to the LDAP server. Default: {!r}"
 msgstr ""
 
-#: lib/pp_admintools/app/ldap.py:381 lib/pp_admintools/app/mk_ldap_passwd.py:131
-#: lib/pp_admintools/app/set_ldap_password.py:131 lib/pp_admintools/app/set_ldap_password.py:132
-#: lib/pp_admintools/app/set_ldap_password.py:149 lib/pp_admintools/app/set_ldap_password.py:152
+#: lib/pp_admintools/app/ldap.py:381 lib/pp_admintools/app/mk_ldap_passwd.py:129
+#: lib/pp_admintools/app/set_ldap_password.py:129 lib/pp_admintools/app/set_ldap_password.py:130
+#: lib/pp_admintools/app/set_ldap_password.py:147 lib/pp_admintools/app/set_ldap_password.py:150
 msgid "PASSWORD"
 msgstr ""
 
@@ -953,8 +959,8 @@ msgid ""
 "command line."
 msgstr ""
 
-#: lib/pp_admintools/app/ldap.py:393 lib/pp_admintools/app/set_ldap_password.py:143
-#: lib/pp_admintools/app/set_ldap_password.py:145
+#: lib/pp_admintools/app/ldap.py:393 lib/pp_admintools/app/set_ldap_password.py:141
+#: lib/pp_admintools/app/set_ldap_password.py:143
 msgid "PASSWORD_FILE"
 msgstr ""
 
@@ -1187,7 +1193,7 @@ msgstr ""
 msgid "User with cn {cn!r} not found in {uri}/{bdn}."
 msgstr ""
 
-#: lib/pp_admintools/app/ldap.py:1218 lib/pp_admintools/app/set_ldap_password.py:409
+#: lib/pp_admintools/app/ldap.py:1218 lib/pp_admintools/app/set_ldap_password.py:407
 msgid "User with DN {dn!r} not found in {uri}."
 msgstr ""
 
@@ -1255,7 +1261,7 @@ msgstr ""
 #: lib/pp_admintools/app/remove_ldap_user.py:449 lib/pp_admintools/app/remove_ldap_user.py:476
 #: lib/pp_admintools/app/remove_ldap_user.py:503 lib/pp_admintools/app/remove_ldap_user.py:534
 #: lib/pp_admintools/app/remove_ldap_user.py:565 lib/pp_admintools/app/remove_ldap_user.py:681
-#: lib/pp_admintools/app/set_ldap_password.py:518
+#: lib/pp_admintools/app/set_ldap_password.py:516
 msgid "Changes:"
 msgstr ""
 
@@ -1432,7 +1438,7 @@ msgid ""
 "zero, there is no waiting after a write. (default: {:.1f})"
 msgstr ""
 
-#: lib/pp_admintools/app/mirror_ldap.py:127 lib/pp_admintools/app/mk_ldap_passwd.py:121
+#: lib/pp_admintools/app/mirror_ldap.py:127 lib/pp_admintools/app/mk_ldap_passwd.py:119
 msgid "NUMBER"
 msgstr ""
 
@@ -1705,58 +1711,58 @@ msgstr[1] ""
 msgid "Mirrored no group entries to target LDAP instance."
 msgstr ""
 
-#: lib/pp_admintools/app/mk_ldap_passwd.py:58
+#: lib/pp_admintools/app/mk_ldap_passwd.py:56
 msgid "Encrypting the password with a defined password schema."
 msgstr ""
 
-#: lib/pp_admintools/app/mk_ldap_passwd.py:99
+#: lib/pp_admintools/app/mk_ldap_passwd.py:97
 msgid "The schema (hashing method) to use to hash the new password. Default: {default!r}."
 msgstr ""
 
-#: lib/pp_admintools/app/mk_ldap_passwd.py:104
+#: lib/pp_admintools/app/mk_ldap_passwd.py:102
 msgid "TYPE"
 msgstr ""
 
-#: lib/pp_admintools/app/mk_ldap_passwd.py:110
+#: lib/pp_admintools/app/mk_ldap_passwd.py:108
 msgid "Like {}"
 msgstr ""
 
-#: lib/pp_admintools/app/mk_ldap_passwd.py:115 lib/pp_admintools/app/set_ldap_password.py:208
+#: lib/pp_admintools/app/mk_ldap_passwd.py:113 lib/pp_admintools/app/set_ldap_password.py:206
 msgid ""
 "A possible salt to use on hashing the password. Caution: not all hashing schemes are supporting "
 "a salt."
 msgstr ""
 
-#: lib/pp_admintools/app/mk_ldap_passwd.py:122 lib/pp_admintools/app/set_ldap_password.py:215
+#: lib/pp_admintools/app/mk_ldap_passwd.py:120 lib/pp_admintools/app/set_ldap_password.py:213
 msgid ""
 "The number of calculation rounds to use on hashing the password. Caution: not all hashing "
 "schemes are supporting calculation rounds."
 msgstr ""
 
-#: lib/pp_admintools/app/mk_ldap_passwd.py:127
+#: lib/pp_admintools/app/mk_ldap_passwd.py:125
 msgid ""
 "The password to hash. If not given and no file desriptor was given, then the password will be "
 "requested on TTY."
 msgstr ""
 
-#: lib/pp_admintools/app/mk_ldap_passwd.py:175
+#: lib/pp_admintools/app/mk_ldap_passwd.py:173
 msgid "Got no password by {}."
 msgstr "Got no password by {}."
 
-#: lib/pp_admintools/app/mk_ldap_passwd.py:178
+#: lib/pp_admintools/app/mk_ldap_passwd.py:176
 msgid "Password:"
 msgstr ""
 
-#: lib/pp_admintools/app/mk_ldap_passwd.py:179 lib/pp_admintools/app/set_ldap_password.py:305
-#: lib/pp_admintools/app/set_ldap_password.py:325
+#: lib/pp_admintools/app/mk_ldap_passwd.py:177 lib/pp_admintools/app/set_ldap_password.py:303
+#: lib/pp_admintools/app/set_ldap_password.py:323
 msgid "Repeat password:"
 msgstr ""
 
-#: lib/pp_admintools/app/mk_ldap_passwd.py:193
+#: lib/pp_admintools/app/mk_ldap_passwd.py:191
 msgid "Encrypting password with hashing schema '{schema}' ..."
 msgstr "Encrypting password with hashing schema '{schema}' …"
 
-#: lib/pp_admintools/app/mk_ldap_passwd.py:200 lib/pp_admintools/app/set_ldap_password.py:478
+#: lib/pp_admintools/app/mk_ldap_passwd.py:198 lib/pp_admintools/app/set_ldap_password.py:476
 msgid "Used schema: {!r}."
 msgstr ""
 
@@ -1900,8 +1906,8 @@ msgstr "Removing the user from LDAP."
 msgid "Don't remove all mail addresses of the users to remove from all mailing lists."
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:162 lib/pp_admintools/app/set_ldap_password.py:201
-#: lib/pp_admintools/app/set_ldap_password.py:204
+#: lib/pp_admintools/app/remove_ldap_user.py:162 lib/pp_admintools/app/set_ldap_password.py:199
+#: lib/pp_admintools/app/set_ldap_password.py:202
 msgid "USER"
 msgstr ""
 
@@ -1960,15 +1966,15 @@ msgstr ""
 msgid "Evaluating DNs of the user {!r} to remove ..."
 msgstr "Evaluating DNs of the user {!r} to remove …"
 
-#: lib/pp_admintools/app/remove_ldap_user.py:328 lib/pp_admintools/app/set_ldap_password.py:431
+#: lib/pp_admintools/app/remove_ldap_user.py:328 lib/pp_admintools/app/set_ldap_password.py:429
 msgid "Got DN {dn!r} for user {user!r} in LDAP instance {inst}."
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:335 lib/pp_admintools/app/set_ldap_password.py:436
+#: lib/pp_admintools/app/remove_ldap_user.py:335 lib/pp_admintools/app/set_ldap_password.py:434
 msgid "Found {nr} entries for user {u!r} in LDAP instance {i}."
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:347 lib/pp_admintools/app/set_ldap_password.py:450
+#: lib/pp_admintools/app/remove_ldap_user.py:347 lib/pp_admintools/app/set_ldap_password.py:448
 msgid "Did not found user {user!r} in LDAP instance {inst}."
 msgstr ""
 
@@ -2078,147 +2084,147 @@ msgstr ""
 msgid "{c} on removing mail {mail!r} from {dn!r}: {e}"
 msgstr ""
 
-#: lib/pp_admintools/app/set_ldap_password.py:92
+#: lib/pp_admintools/app/set_ldap_password.py:90
 msgid ""
 "Changing the password of the given user. If no user was given, then {app} tries to use the name "
 "of the user logged in on the controlling terminal."
 msgstr ""
 
-#: lib/pp_admintools/app/set_ldap_password.py:132
+#: lib/pp_admintools/app/set_ldap_password.py:130
 msgid "Use {} as the current user password."
 msgstr ""
 
-#: lib/pp_admintools/app/set_ldap_password.py:137
+#: lib/pp_admintools/app/set_ldap_password.py:135
 msgid ""
 "Prompt for current user password. This is used instead of specifying the password on the command"
 " line."
 msgstr ""
 
-#: lib/pp_admintools/app/set_ldap_password.py:145
+#: lib/pp_admintools/app/set_ldap_password.py:143
 msgid "Use contents of {} as the current user password."
 msgstr ""
 
-#: lib/pp_admintools/app/set_ldap_password.py:150
+#: lib/pp_admintools/app/set_ldap_password.py:148
 msgid "Use {} as the new user password. If not given, it will be asked for it."
 msgstr ""
 
-#: lib/pp_admintools/app/set_ldap_password.py:158
+#: lib/pp_admintools/app/set_ldap_password.py:156
 msgid "Do not check the quality of the new password with the {} library."
 msgstr ""
 
-#: lib/pp_admintools/app/set_ldap_password.py:173
+#: lib/pp_admintools/app/set_ldap_password.py:171
 msgid ""
 "The schema (hashing method) to use to hash the new password. It is possible to give here the "
 "value {val_list!r}, then all possible schemes are shown and exit. Default: {default!r}."
 msgstr ""
 
-#: lib/pp_admintools/app/set_ldap_password.py:178
+#: lib/pp_admintools/app/set_ldap_password.py:176
 msgid "If you are not using an admin account, then the password will hashed only by the default schema."
 msgstr ""
 
-#: lib/pp_admintools/app/set_ldap_password.py:187
+#: lib/pp_admintools/app/set_ldap_password.py:185
 msgid ""
 "The user, which password in the given LDAP instance should be changed. It may be given by its "
 "Uid (the alphanumeric POSIX name), its mail address or its LDAP DN."
 msgstr ""
 
-#: lib/pp_admintools/app/set_ldap_password.py:192
+#: lib/pp_admintools/app/set_ldap_password.py:190
 msgid "If not given, then your current user name {!r} will be used."
 msgstr ""
 
-#: lib/pp_admintools/app/set_ldap_password.py:195
+#: lib/pp_admintools/app/set_ldap_password.py:193
 msgid ""
 "If you are using a readonly LDAP instance or an instance w/o admin access, then you must provide"
 " somehow the current password of the user to change."
 msgstr ""
 
-#: lib/pp_admintools/app/set_ldap_password.py:261
+#: lib/pp_admintools/app/set_ldap_password.py:259
 msgid "Could not detect your current login name."
 msgstr ""
 
-#: lib/pp_admintools/app/set_ldap_password.py:266
+#: lib/pp_admintools/app/set_ldap_password.py:264
 msgid "The user {!r} will never be managed by LDAP."
 msgstr ""
 
-#: lib/pp_admintools/app/set_ldap_password.py:300
+#: lib/pp_admintools/app/set_ldap_password.py:298
 msgid "Using LDAP instance {inst!r} - {url}."
 msgstr "Using LDAP instance {inst!r} - {url}."
 
-#: lib/pp_admintools/app/set_ldap_password.py:304
+#: lib/pp_admintools/app/set_ldap_password.py:302
 msgid "Current password of user {!r}:"
 msgstr ""
 
-#: lib/pp_admintools/app/set_ldap_password.py:318
+#: lib/pp_admintools/app/set_ldap_password.py:316
 msgid "Non admin users must use the default schema {!r} for hashing their password."
 msgstr ""
 
-#: lib/pp_admintools/app/set_ldap_password.py:324
+#: lib/pp_admintools/app/set_ldap_password.py:322
 msgid "New password of user {!r}:"
 msgstr ""
 
-#: lib/pp_admintools/app/set_ldap_password.py:330
+#: lib/pp_admintools/app/set_ldap_password.py:328
 msgid "Checking the quality of the new password was disabled."
 msgstr ""
 
-#: lib/pp_admintools/app/set_ldap_password.py:360
+#: lib/pp_admintools/app/set_ldap_password.py:358
 msgid "Unbinding user connection from LDAP server {} ..."
 msgstr "Unbinding user connection from LDAP server {} …"
 
-#: lib/pp_admintools/app/set_ldap_password.py:371
+#: lib/pp_admintools/app/set_ldap_password.py:369
 msgid "Testing connect to LDAP-Server {url} with current user {dn!r} and password ..."
 msgstr "Testing connect to LDAP-Server {url} with current user {dn!r} and password …"
 
-#: lib/pp_admintools/app/set_ldap_password.py:383
+#: lib/pp_admintools/app/set_ldap_password.py:381
 msgid "Successful connected as {dn!r} to {url}."
 msgstr ""
 
-#: lib/pp_admintools/app/set_ldap_password.py:389
+#: lib/pp_admintools/app/set_ldap_password.py:387
 msgid "Could not connect to {url} as {dn!r}: {e}"
 msgstr ""
 
-#: lib/pp_admintools/app/set_ldap_password.py:400
+#: lib/pp_admintools/app/set_ldap_password.py:398
 msgid "Trying to get current password hash of user {!r} ..."
 msgstr "Trying to get current password hash of user {!r} …"
 
-#: lib/pp_admintools/app/set_ldap_password.py:438
+#: lib/pp_admintools/app/set_ldap_password.py:436
 msgid ""
 "Please use another username, or use the correct DN from the following list as a parameter for "
 "this script instead of the username:"
 msgstr ""
 
-#: lib/pp_admintools/app/set_ldap_password.py:455
+#: lib/pp_admintools/app/set_ldap_password.py:453
 msgid "Changing the password of user {dn!r} in LDAP instance {inst}."
 msgstr "Changing the password of user {dn!r} in LDAP instance {inst}."
 
-#: lib/pp_admintools/app/set_ldap_password.py:462
+#: lib/pp_admintools/app/set_ldap_password.py:460
 msgid "Setting password of '{dn}' with hashing schema '{schema}' ..."
 msgstr "Setting password of '{dn}' with hashing schema '{schema}' …"
 
-#: lib/pp_admintools/app/set_ldap_password.py:468
+#: lib/pp_admintools/app/set_ldap_password.py:466
 msgid "Current password hash: '{}'."
 msgstr ""
 
-#: lib/pp_admintools/app/set_ldap_password.py:471
+#: lib/pp_admintools/app/set_ldap_password.py:469
 msgid "The user '{}' has currently no password."
 msgstr ""
 
-#: lib/pp_admintools/app/set_ldap_password.py:484
+#: lib/pp_admintools/app/set_ldap_password.py:482
 msgid "New password hash: '{}'."
 msgstr ""
 
-#: lib/pp_admintools/app/set_ldap_password.py:488
+#: lib/pp_admintools/app/set_ldap_password.py:486
 msgid "Apply new password? [{yes}/{no}]?"
 msgstr ""
 
-#: lib/pp_admintools/app/set_ldap_password.py:494
+#: lib/pp_admintools/app/set_ldap_password.py:492
 msgid "Do not setting password for {!r}."
 msgstr ""
 
-#: lib/pp_admintools/app/set_ldap_password.py:510
+#: lib/pp_admintools/app/set_ldap_password.py:508
 msgid "Setting password ..."
 msgstr "Setting password …"
 
-#: lib/pp_admintools/app/set_ldap_password.py:516
+#: lib/pp_admintools/app/set_ldap_password.py:514
 msgid "{c} on setting password of user {dn!r}: {e}"
 msgstr ""
 

diff --git a/locale/pp_admintools.pot b/locale/pp_admintools.pot
index 0c8230b01fbf1875c0c5dfd756d81d33e8334252..683fbebcbab00c99d15fbc5c2458423e0f81355a 100644 (file)
--- a/locale/pp_admintools.pot
+++ b/locale/pp_admintools.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pp_admintools 0.10.0\n"
 "Report-Msgid-Bugs-To: frank.brehm@pixelpark.com\n"
-"POT-Creation-Date: 2023-08-22 13:39+0200\n"
+"POT-Creation-Date: 2023-08-22 14:15+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <frank.brehm@pixelpark.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -364,7 +364,7 @@ msgid ""
 msgstr ""
 
 #: lib/pp_admintools/app/check_ldap_dn_attributes.py:97
-#: lib/pp_admintools/app/check_ldap_pwd_schemes.py:106
+#: lib/pp_admintools/app/check_ldap_pwd_schemes.py:105
 msgid "Script options"
 msgstr ""
 
@@ -419,58 +419,62 @@ msgid "Checking DN-like attributes of entry {!r} ..."
 msgstr ""
 
 #: lib/pp_admintools/app/check_ldap_dn_attributes.py:219
-#: lib/pp_admintools/app/check_ldap_pwd_schemes.py:190
+#: lib/pp_admintools/app/check_ldap_pwd_schemes.py:189
 #: lib/pp_admintools/app/clean_empty_ldap_groups.py:233
 msgid "Got attributes:"
 msgstr ""
 
-#: lib/pp_admintools/app/check_ldap_pwd_schemes.py:84
+#: lib/pp_admintools/app/check_ldap_pwd_schemes.py:82
 msgid ""
 "Reports the password hashing schemes of {attr} attributes in LDAP. Without a filter or a more "
 "special Base-DN the hashing schemes of all {attr} attributes in the LDAP tree are shown. One can"
 " filter the output by a regular LDAP-filter rule of by one or more hashing schemes."
 msgstr ""
 
-#: lib/pp_admintools/app/check_ldap_pwd_schemes.py:109
+#: lib/pp_admintools/app/check_ldap_pwd_schemes.py:108
 msgid "FILTER"
 msgstr ""
 
-#: lib/pp_admintools/app/check_ldap_pwd_schemes.py:110
+#: lib/pp_admintools/app/check_ldap_pwd_schemes.py:109
 msgid ""
 "An additional LDAP filter to limit the entries to print out their password hashing schema. "
 "Please note, that this filter will be wrapped by parantheses to combine it with the default "
 "filter {!r}."
 msgstr ""
 
-#: lib/pp_admintools/app/check_ldap_pwd_schemes.py:124
+#: lib/pp_admintools/app/check_ldap_pwd_schemes.py:123
 msgid ""
 "One or more schemes (hashing methods) for filtering the {attr} attributes. It is possible to "
 "give here the value {val_list!r}, then all possible schemes are shown and exit."
 msgstr ""
 
-#: lib/pp_admintools/app/check_ldap_pwd_schemes.py:130 lib/pp_admintools/app/set_ldap_password.py:183
+#: lib/pp_admintools/app/check_ldap_pwd_schemes.py:129 lib/pp_admintools/app/set_ldap_password.py:181
 msgid "SCHEMA"
 msgstr ""
 
-#: lib/pp_admintools/app/check_ldap_pwd_schemes.py:136
+#: lib/pp_admintools/app/check_ldap_pwd_schemes.py:135
 msgid "Show more details in output, e.g. the entry DN."
 msgstr ""
 
-#: lib/pp_admintools/app/check_ldap_pwd_schemes.py:168
+#: lib/pp_admintools/app/check_ldap_pwd_schemes.py:167
 msgid ""
 "Start reporting password hashing schemes of {attr} attributes in in LDAP instance {inst!r} "
 "({url}) ..."
 msgstr ""
 
-#: lib/pp_admintools/app/check_ldap_pwd_schemes.py:181
+#: lib/pp_admintools/app/check_ldap_pwd_schemes.py:180
 msgid "Used LDAP filter: {!r}."
 msgstr ""
 
-#: lib/pp_admintools/app/check_ldap_pwd_schemes.py:223
+#: lib/pp_admintools/app/check_ldap_pwd_schemes.py:222
 msgid "Found entry {!r} with data:"
 msgstr ""
 
-#: lib/pp_admintools/app/check_ldap_pwd_schemes.py:227
+#: lib/pp_admintools/app/check_ldap_pwd_schemes.py:226
+msgid "Did not found any entries with a {attr} attribute and the given filters."
+msgstr ""
+
+#: lib/pp_admintools/app/check_ldap_pwd_schemes.py:233
 msgid "Found entry DNs:"
 msgstr ""
 
@@ -546,12 +550,12 @@ msgstr ""
 
 #: lib/pp_admintools/app/clean_empty_ldap_groups.py:261 lib/pp_admintools/app/ldap.py:337
 #: lib/pp_admintools/app/mirror_ldap.py:238 lib/pp_admintools/app/remove_ldap_user.py:308
-#: lib/pp_admintools/app/set_ldap_password.py:489
+#: lib/pp_admintools/app/set_ldap_password.py:487
 msgid "No"
 msgstr ""
 
 #: lib/pp_admintools/app/clean_empty_ldap_groups.py:261 lib/pp_admintools/app/mirror_ldap.py:238
-#: lib/pp_admintools/app/remove_ldap_user.py:308 lib/pp_admintools/app/set_ldap_password.py:489
+#: lib/pp_admintools/app/remove_ldap_user.py:308 lib/pp_admintools/app/set_ldap_password.py:487
 msgid "yes"
 msgstr ""
 
@@ -559,8 +563,8 @@ msgstr ""
 msgid "Generation of the BIND9 configuration file for slave zones."
 msgstr ""
 
-#: lib/pp_admintools/app/dns_deploy_zones.py:250 lib/pp_admintools/app/mk_ldap_passwd.py:86
-#: lib/pp_admintools/app/set_ldap_password.py:125
+#: lib/pp_admintools/app/dns_deploy_zones.py:250 lib/pp_admintools/app/mk_ldap_passwd.py:84
+#: lib/pp_admintools/app/set_ldap_password.py:123
 msgid "Options for {}"
 msgstr ""
 
@@ -936,9 +940,9 @@ msgstr ""
 msgid "The Bind DN to use to connect to the LDAP server. Default: {!r}"
 msgstr ""
 
-#: lib/pp_admintools/app/ldap.py:381 lib/pp_admintools/app/mk_ldap_passwd.py:131
-#: lib/pp_admintools/app/set_ldap_password.py:131 lib/pp_admintools/app/set_ldap_password.py:132
-#: lib/pp_admintools/app/set_ldap_password.py:149 lib/pp_admintools/app/set_ldap_password.py:152
+#: lib/pp_admintools/app/ldap.py:381 lib/pp_admintools/app/mk_ldap_passwd.py:129
+#: lib/pp_admintools/app/set_ldap_password.py:129 lib/pp_admintools/app/set_ldap_password.py:130
+#: lib/pp_admintools/app/set_ldap_password.py:147 lib/pp_admintools/app/set_ldap_password.py:150
 msgid "PASSWORD"
 msgstr ""
 
@@ -952,8 +956,8 @@ msgid ""
 "command line."
 msgstr ""
 
-#: lib/pp_admintools/app/ldap.py:393 lib/pp_admintools/app/set_ldap_password.py:143
-#: lib/pp_admintools/app/set_ldap_password.py:145
+#: lib/pp_admintools/app/ldap.py:393 lib/pp_admintools/app/set_ldap_password.py:141
+#: lib/pp_admintools/app/set_ldap_password.py:143
 msgid "PASSWORD_FILE"
 msgstr ""
 
@@ -1186,7 +1190,7 @@ msgstr ""
 msgid "User with cn {cn!r} not found in {uri}/{bdn}."
 msgstr ""
 
-#: lib/pp_admintools/app/ldap.py:1218 lib/pp_admintools/app/set_ldap_password.py:409
+#: lib/pp_admintools/app/ldap.py:1218 lib/pp_admintools/app/set_ldap_password.py:407
 msgid "User with DN {dn!r} not found in {uri}."
 msgstr ""
 
@@ -1254,7 +1258,7 @@ msgstr ""
 #: lib/pp_admintools/app/remove_ldap_user.py:449 lib/pp_admintools/app/remove_ldap_user.py:476
 #: lib/pp_admintools/app/remove_ldap_user.py:503 lib/pp_admintools/app/remove_ldap_user.py:534
 #: lib/pp_admintools/app/remove_ldap_user.py:565 lib/pp_admintools/app/remove_ldap_user.py:681
-#: lib/pp_admintools/app/set_ldap_password.py:518
+#: lib/pp_admintools/app/set_ldap_password.py:516
 msgid "Changes:"
 msgstr ""
 
@@ -1431,7 +1435,7 @@ msgid ""
 "zero, there is no waiting after a write. (default: {:.1f})"
 msgstr ""
 
-#: lib/pp_admintools/app/mirror_ldap.py:127 lib/pp_admintools/app/mk_ldap_passwd.py:121
+#: lib/pp_admintools/app/mirror_ldap.py:127 lib/pp_admintools/app/mk_ldap_passwd.py:119
 msgid "NUMBER"
 msgstr ""
 
@@ -1704,58 +1708,58 @@ msgstr[1] ""
 msgid "Mirrored no group entries to target LDAP instance."
 msgstr ""
 
-#: lib/pp_admintools/app/mk_ldap_passwd.py:58
+#: lib/pp_admintools/app/mk_ldap_passwd.py:56
 msgid "Encrypting the password with a defined password schema."
 msgstr ""
 
-#: lib/pp_admintools/app/mk_ldap_passwd.py:99
+#: lib/pp_admintools/app/mk_ldap_passwd.py:97
 msgid "The schema (hashing method) to use to hash the new password. Default: {default!r}."
 msgstr ""
 
-#: lib/pp_admintools/app/mk_ldap_passwd.py:104
+#: lib/pp_admintools/app/mk_ldap_passwd.py:102
 msgid "TYPE"
 msgstr ""
 
-#: lib/pp_admintools/app/mk_ldap_passwd.py:110
+#: lib/pp_admintools/app/mk_ldap_passwd.py:108
 msgid "Like {}"
 msgstr ""
 
-#: lib/pp_admintools/app/mk_ldap_passwd.py:115 lib/pp_admintools/app/set_ldap_password.py:208
+#: lib/pp_admintools/app/mk_ldap_passwd.py:113 lib/pp_admintools/app/set_ldap_password.py:206
 msgid ""
 "A possible salt to use on hashing the password. Caution: not all hashing schemes are supporting "
 "a salt."
 msgstr ""
 
-#: lib/pp_admintools/app/mk_ldap_passwd.py:122 lib/pp_admintools/app/set_ldap_password.py:215
+#: lib/pp_admintools/app/mk_ldap_passwd.py:120 lib/pp_admintools/app/set_ldap_password.py:213
 msgid ""
 "The number of calculation rounds to use on hashing the password. Caution: not all hashing "
 "schemes are supporting calculation rounds."
 msgstr ""
 
-#: lib/pp_admintools/app/mk_ldap_passwd.py:127
+#: lib/pp_admintools/app/mk_ldap_passwd.py:125
 msgid ""
 "The password to hash. If not given and no file desriptor was given, then the password will be "
 "requested on TTY."
 msgstr ""
 
-#: lib/pp_admintools/app/mk_ldap_passwd.py:175
+#: lib/pp_admintools/app/mk_ldap_passwd.py:173
 msgid "Got no password by {}."
 msgstr ""
 
-#: lib/pp_admintools/app/mk_ldap_passwd.py:178
+#: lib/pp_admintools/app/mk_ldap_passwd.py:176
 msgid "Password:"
 msgstr ""
 
-#: lib/pp_admintools/app/mk_ldap_passwd.py:179 lib/pp_admintools/app/set_ldap_password.py:305
-#: lib/pp_admintools/app/set_ldap_password.py:325
+#: lib/pp_admintools/app/mk_ldap_passwd.py:177 lib/pp_admintools/app/set_ldap_password.py:303
+#: lib/pp_admintools/app/set_ldap_password.py:323
 msgid "Repeat password:"
 msgstr ""
 
-#: lib/pp_admintools/app/mk_ldap_passwd.py:193
+#: lib/pp_admintools/app/mk_ldap_passwd.py:191
 msgid "Encrypting password with hashing schema '{schema}' ..."
 msgstr ""
 
-#: lib/pp_admintools/app/mk_ldap_passwd.py:200 lib/pp_admintools/app/set_ldap_password.py:478
+#: lib/pp_admintools/app/mk_ldap_passwd.py:198 lib/pp_admintools/app/set_ldap_password.py:476
 msgid "Used schema: {!r}."
 msgstr ""
 
@@ -1899,8 +1903,8 @@ msgstr ""
 msgid "Don't remove all mail addresses of the users to remove from all mailing lists."
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:162 lib/pp_admintools/app/set_ldap_password.py:201
-#: lib/pp_admintools/app/set_ldap_password.py:204
+#: lib/pp_admintools/app/remove_ldap_user.py:162 lib/pp_admintools/app/set_ldap_password.py:199
+#: lib/pp_admintools/app/set_ldap_password.py:202
 msgid "USER"
 msgstr ""
 
@@ -1959,15 +1963,15 @@ msgstr ""
 msgid "Evaluating DNs of the user {!r} to remove ..."
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:328 lib/pp_admintools/app/set_ldap_password.py:431
+#: lib/pp_admintools/app/remove_ldap_user.py:328 lib/pp_admintools/app/set_ldap_password.py:429
 msgid "Got DN {dn!r} for user {user!r} in LDAP instance {inst}."
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:335 lib/pp_admintools/app/set_ldap_password.py:436
+#: lib/pp_admintools/app/remove_ldap_user.py:335 lib/pp_admintools/app/set_ldap_password.py:434
 msgid "Found {nr} entries for user {u!r} in LDAP instance {i}."
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:347 lib/pp_admintools/app/set_ldap_password.py:450
+#: lib/pp_admintools/app/remove_ldap_user.py:347 lib/pp_admintools/app/set_ldap_password.py:448
 msgid "Did not found user {user!r} in LDAP instance {inst}."
 msgstr ""
 
@@ -2077,147 +2081,147 @@ msgstr ""
 msgid "{c} on removing mail {mail!r} from {dn!r}: {e}"
 msgstr ""
 
-#: lib/pp_admintools/app/set_ldap_password.py:92
+#: lib/pp_admintools/app/set_ldap_password.py:90
 msgid ""
 "Changing the password of the given user. If no user was given, then {app} tries to use the name "
 "of the user logged in on the controlling terminal."
 msgstr ""
 
-#: lib/pp_admintools/app/set_ldap_password.py:132
+#: lib/pp_admintools/app/set_ldap_password.py:130
 msgid "Use {} as the current user password."
 msgstr ""
 
-#: lib/pp_admintools/app/set_ldap_password.py:137
+#: lib/pp_admintools/app/set_ldap_password.py:135
 msgid ""
 "Prompt for current user password. This is used instead of specifying the password on the command"
 " line."
 msgstr ""
 
-#: lib/pp_admintools/app/set_ldap_password.py:145
+#: lib/pp_admintools/app/set_ldap_password.py:143
 msgid "Use contents of {} as the current user password."
 msgstr ""
 
-#: lib/pp_admintools/app/set_ldap_password.py:150
+#: lib/pp_admintools/app/set_ldap_password.py:148
 msgid "Use {} as the new user password. If not given, it will be asked for it."
 msgstr ""
 
-#: lib/pp_admintools/app/set_ldap_password.py:158
+#: lib/pp_admintools/app/set_ldap_password.py:156
 msgid "Do not check the quality of the new password with the {} library."
 msgstr ""
 
-#: lib/pp_admintools/app/set_ldap_password.py:173
+#: lib/pp_admintools/app/set_ldap_password.py:171
 msgid ""
 "The schema (hashing method) to use to hash the new password. It is possible to give here the "
 "value {val_list!r}, then all possible schemes are shown and exit. Default: {default!r}."
 msgstr ""
 
-#: lib/pp_admintools/app/set_ldap_password.py:178
+#: lib/pp_admintools/app/set_ldap_password.py:176
 msgid "If you are not using an admin account, then the password will hashed only by the default schema."
 msgstr ""
 
-#: lib/pp_admintools/app/set_ldap_password.py:187
+#: lib/pp_admintools/app/set_ldap_password.py:185
 msgid ""
 "The user, which password in the given LDAP instance should be changed. It may be given by its "
 "Uid (the alphanumeric POSIX name), its mail address or its LDAP DN."
 msgstr ""
 
-#: lib/pp_admintools/app/set_ldap_password.py:192
+#: lib/pp_admintools/app/set_ldap_password.py:190
 msgid "If not given, then your current user name {!r} will be used."
 msgstr ""
 
-#: lib/pp_admintools/app/set_ldap_password.py:195
+#: lib/pp_admintools/app/set_ldap_password.py:193
 msgid ""
 "If you are using a readonly LDAP instance or an instance w/o admin access, then you must provide"
 " somehow the current password of the user to change."
 msgstr ""
 
-#: lib/pp_admintools/app/set_ldap_password.py:261
+#: lib/pp_admintools/app/set_ldap_password.py:259
 msgid "Could not detect your current login name."
 msgstr ""
 
-#: lib/pp_admintools/app/set_ldap_password.py:266
+#: lib/pp_admintools/app/set_ldap_password.py:264
 msgid "The user {!r} will never be managed by LDAP."
 msgstr ""
 
-#: lib/pp_admintools/app/set_ldap_password.py:300
+#: lib/pp_admintools/app/set_ldap_password.py:298
 msgid "Using LDAP instance {inst!r} - {url}."
 msgstr ""
 
-#: lib/pp_admintools/app/set_ldap_password.py:304
+#: lib/pp_admintools/app/set_ldap_password.py:302
 msgid "Current password of user {!r}:"
 msgstr ""
 
-#: lib/pp_admintools/app/set_ldap_password.py:318
+#: lib/pp_admintools/app/set_ldap_password.py:316
 msgid "Non admin users must use the default schema {!r} for hashing their password."
 msgstr ""
 
-#: lib/pp_admintools/app/set_ldap_password.py:324
+#: lib/pp_admintools/app/set_ldap_password.py:322
 msgid "New password of user {!r}:"
 msgstr ""
 
-#: lib/pp_admintools/app/set_ldap_password.py:330
+#: lib/pp_admintools/app/set_ldap_password.py:328
 msgid "Checking the quality of the new password was disabled."
 msgstr ""
 
-#: lib/pp_admintools/app/set_ldap_password.py:360
+#: lib/pp_admintools/app/set_ldap_password.py:358
 msgid "Unbinding user connection from LDAP server {} ..."
 msgstr ""
 
-#: lib/pp_admintools/app/set_ldap_password.py:371
+#: lib/pp_admintools/app/set_ldap_password.py:369
 msgid "Testing connect to LDAP-Server {url} with current user {dn!r} and password ..."
 msgstr ""
 
-#: lib/pp_admintools/app/set_ldap_password.py:383
+#: lib/pp_admintools/app/set_ldap_password.py:381
 msgid "Successful connected as {dn!r} to {url}."
 msgstr ""
 
-#: lib/pp_admintools/app/set_ldap_password.py:389
+#: lib/pp_admintools/app/set_ldap_password.py:387
 msgid "Could not connect to {url} as {dn!r}: {e}"
 msgstr ""
 
-#: lib/pp_admintools/app/set_ldap_password.py:400
+#: lib/pp_admintools/app/set_ldap_password.py:398
 msgid "Trying to get current password hash of user {!r} ..."
 msgstr ""
 
-#: lib/pp_admintools/app/set_ldap_password.py:438
+#: lib/pp_admintools/app/set_ldap_password.py:436
 msgid ""
 "Please use another username, or use the correct DN from the following list as a parameter for "
 "this script instead of the username:"
 msgstr ""
 
-#: lib/pp_admintools/app/set_ldap_password.py:455
+#: lib/pp_admintools/app/set_ldap_password.py:453
 msgid "Changing the password of user {dn!r} in LDAP instance {inst}."
 msgstr ""
 
-#: lib/pp_admintools/app/set_ldap_password.py:462
+#: lib/pp_admintools/app/set_ldap_password.py:460
 msgid "Setting password of '{dn}' with hashing schema '{schema}' ..."
 msgstr ""
 
-#: lib/pp_admintools/app/set_ldap_password.py:468
+#: lib/pp_admintools/app/set_ldap_password.py:466
 msgid "Current password hash: '{}'."
 msgstr ""
 
-#: lib/pp_admintools/app/set_ldap_password.py:471
+#: lib/pp_admintools/app/set_ldap_password.py:469
 msgid "The user '{}' has currently no password."
 msgstr ""
 
-#: lib/pp_admintools/app/set_ldap_password.py:484
+#: lib/pp_admintools/app/set_ldap_password.py:482
 msgid "New password hash: '{}'."
 msgstr ""
 
-#: lib/pp_admintools/app/set_ldap_password.py:488
+#: lib/pp_admintools/app/set_ldap_password.py:486
 msgid "Apply new password? [{yes}/{no}]?"
 msgstr ""
 
-#: lib/pp_admintools/app/set_ldap_password.py:494
+#: lib/pp_admintools/app/set_ldap_password.py:492
 msgid "Do not setting password for {!r}."
 msgstr ""
 
-#: lib/pp_admintools/app/set_ldap_password.py:510
+#: lib/pp_admintools/app/set_ldap_password.py:508
 msgid "Setting password ..."
 msgstr ""
 
-#: lib/pp_admintools/app/set_ldap_password.py:516
+#: lib/pp_admintools/app/set_ldap_password.py:514
 msgid "{c} on setting password of user {dn!r}: {e}"
 msgstr ""