!2 bugfix: duplicate Current password

Merge pull request !2 from 薄皮小笼包/dqw_test
This commit is contained in:
openeuler-ci-bot 2019-12-30 14:03:53 +08:00 committed by Gitee
commit 1c79273f61
2 changed files with 20 additions and 1 deletions

View File

@ -0,0 +1,12 @@
diff -urpN gnome-control-center-3.30.1.orig/panels/user-accounts/run-passwd.c gnome-control-center-3.30.1/panels/user-accounts/run-passwd.c
--- gnome-control-center-3.30.1.orig/panels/user-accounts/run-passwd.c 2019-12-28 23:02:47.839960163 +0800
+++ gnome-control-center-3.30.1/panels/user-accounts/run-passwd.c 2019-12-28 23:03:41.180636928 +0800
@@ -404,7 +404,7 @@ io_watch_stdout (GIOChannel *source, GIO
if (is_string_complete (str->str, "assword: ", "failure", "wrong", "error", NULL)) {
- if (strstr (str->str, "assword: ") != NULL) {
+ if (strstr (str->str, "assword: ") != NULL && strstr (str->str, "Current") == NULL) {
/* Authentication successful */
passwd_handler->backend_state = PASSWD_STATE_NEW;

View File

@ -1,6 +1,6 @@
Name: gnome-control-center
Version: 3.30.1
Release: 6
Release: 7
Summary: GNOME Settings is GNOME's main interface for configuration of various aspects of your desktop.
License: GPLv2+ and CC-BY-SA
@ -37,6 +37,7 @@ Patch9000: bugfix-gnome-control-center-clickassist-fix.patch
Patch9001: bugfix-gnome-control-center-fix-repetitivewallpapers.patch
Patch9002: bugfix-fix_used_passwd_error_capture.patch
Patch9003: gnome-control-center-change-translation-when-changing-password.patch
Patch9004: bugfix-duplicate-Current-passwd.patch
%description
Gnome-control-center is a graphical user interface to configure
@ -101,6 +102,12 @@ chrpath --delete %{buildroot}%{_bindir}/gnome-control-center
%{_mandir}/man1/*.gz
%changelog
* Mon Dec 30 2019 daiqianwen<daiqianwen@huawei.com> - 3.30.1-7
- Type:bugfix
- ID:NA
- SUG:NA
- DESC:fix old password can not check
* Sat Dec 28 2019 openEuler Buildteam <buildteam@openeuler.org> - 3.30.1-6
- Type:bugfix
- ID:NA