From 5f1b0e37f6647ef88bef0485617cb384c2b6db13 Mon Sep 17 00:00:00 2001
From: Dmitry Degtyarev <kevl@altlinux.org>
Date: Tue, 29 Mar 2022 10:39:55 +0400
Subject: [PATCH] disallow empty passwords

remove previous handling of empty passwords, where value
\ was left unmodified
---
 src/admc/attribute_edits/password_edit.cpp | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/admc/attribute_edits/password_edit.cpp b/src/admc/attribute_edits/password_edit.cpp
index 3153f227..e89509bf 100644
--- a/src/admc/attribute_edits/password_edit.cpp
+++ b/src/admc/attribute_edits/password_edit.cpp
@@ -61,6 +61,14 @@ bool PasswordEdit::verify(AdInterface &ad, const QString &) const {
 
     const QString pass = edit->text();
     const QString confirm_pass = confirm_edit->text();
+
+    if (pass.isEmpty()) {
+        const QString error_text = QString(tr("Password cannot be empty."));
+        message_box_warning(edit, tr("Error"), error_text);
+
+        return false;
+    }
+
     if (pass != confirm_pass) {
         const QString error_text = QString(tr("Passwords don't match!"));
         message_box_warning(edit, tr("Error"), error_text);
@@ -82,17 +90,10 @@ bool PasswordEdit::verify(AdInterface &ad, const QString &) const {
 
 bool PasswordEdit::apply(AdInterface &ad, const QString &dn) const {
     const QString new_value = edit->text();
-    const bool input_is_not_empty = !new_value.isEmpty();
 
-    if (input_is_not_empty) {
-        const bool success = ad.user_set_pass(dn, new_value);
-        
-        return success;
-    } else {
-        // If no password was entered, don't change
-        // password at all
-        return true;
-    }
+    const bool success = ad.user_set_pass(dn, new_value);
+    
+    return success;
 }
 
 QLineEdit *PasswordEdit::get_edit() const {