commit 57c1030: [Minor] Try to fix passwords case in the controller

Vsevolod Stakhov vsevolod at rspamd.com
Tue May 31 16:49:03 UTC 2022


Author: Vsevolod Stakhov
Date: 2022-05-31 17:39:44 +0100
URL: https://github.com/rspamd/rspamd/commit/57c1030d1f46c830e019f63eaedc982c6d1589c3 (HEAD -> master)

[Minor] Try to fix passwords case in the controller
Issue: #4186

---
 src/controller.c | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/src/controller.c b/src/controller.c
index 43378ec30..b72858f0f 100644
--- a/src/controller.c
+++ b/src/controller.c
@@ -653,7 +653,7 @@ rspamd_controller_check_password (struct rspamd_http_connection_entry *entry,
 				check_normal = FALSE;
 			}
 
-			if (ctx->enable_password != NULL) {
+			if (!check_normal && ctx->enable_password != NULL) {
 				check = ctx->enable_password;
 
 				if (!rspamd_is_encrypted_password (check, &pbkdf)) {
@@ -670,21 +670,9 @@ rspamd_controller_check_password (struct rspamd_http_connection_entry *entry,
 							password,
 							check, pbkdf, TRUE);
 				}
-
-				if (check_enable) {
-					session->is_enable = TRUE;
-				}
 			}
 			else {
 				check_enable = FALSE;
-
-				if (check_normal) {
-					/*
-					 * If no enable password is specified use normal password as
-					 * enable password
-					 */
-					session->is_enable = TRUE;
-				}
 			}
 		}
 	}


More information about the Commits mailing list