From 33e770e25ae2ef4cb5d4a0bbf58990ce83440ef9 Mon Sep 17 00:00:00 2001
From: Jamie Cameron <jcameron@webmin.com>
Date: Tue, 29 Apr 2008 06:59:10 +0000
Subject: [PATCH] Locking password shouldn't count as a change

---
 acl/acl-lib.pl | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/acl/acl-lib.pl b/acl/acl-lib.pl
index e3065f9e9..02cb0cc9e 100644
--- a/acl/acl-lib.pl
+++ b/acl/acl-lib.pl
@@ -219,8 +219,12 @@ close(PWFILE);
 &open_tempfile(PWFILE, ">$miniserv{'userfile'}");
 foreach (@pwfile) {
 	if (/^([^:]+):([^:]*):/ && $1 eq $_[0]) {
-		if ($2 ne $user{'pass'} && $user{'pass'} ne 'x' &&
-		    $user{'pass'} ne 'e' && $user{'pass'} ne '*LK*') {
+		if ($2 ne $user{'pass'} &&
+		    "!".$2 ne $user{'pass'} &&
+		    $2 ne "!".$user{'pass'} &&
+		    && $user{'pass'} ne 'x' &&
+		    $user{'pass'} ne 'e' &&
+		    $user{'pass'} ne '*LK*') {
 			# Password change detected .. update change time, and
 			# save the old one
 			unshift(@{$user{'olds'}}, $2);