|
 |
c5477d |
From 1d9bfd13145273c14aac475fccc6b50b9957bc4b Mon Sep 17 00:00:00 2001
|
|
|
c5477d |
From: Vratislav Podzimek <vpodzime@redhat.com>
|
|
|
c5477d |
Date: Tue, 23 Aug 2016 12:40:42 +0200
|
|
|
c5477d |
Subject: [PATCH 1/3] Properly set the seen property for root passwords
|
|
|
c5477d |
|
|
|
c5477d |
It is the property of the whole kickstart command object not the password
|
|
|
c5477d |
string.
|
|
|
c5477d |
|
|
|
c5477d |
Resolves: rhbz#1357603
|
|
|
c5477d |
Signed-off-by: Vratislav Podzimek <vpodzime@redhat.com>
|
|
|
c5477d |
---
|
|
|
c5477d |
org_fedora_oscap/gui/spokes/oscap.py | 6 +++---
|
|
|
c5477d |
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
c5477d |
|
|
|
c5477d |
diff --git a/org_fedora_oscap/gui/spokes/oscap.py b/org_fedora_oscap/gui/spokes/oscap.py
|
|
|
c5477d |
index 0539d5c..8f94601 100644
|
|
|
c5477d |
--- a/org_fedora_oscap/gui/spokes/oscap.py
|
|
|
c5477d |
+++ b/org_fedora_oscap/gui/spokes/oscap.py
|
|
|
c5477d |
@@ -620,13 +620,13 @@ class OSCAPSpoke(NormalSpoke):
|
|
|
c5477d |
if not report_only:
|
|
|
c5477d |
self.__old_root_pw = self.data.rootpw.password
|
|
|
c5477d |
self.data.rootpw.password = None
|
|
|
c5477d |
- self.__old_root_pw_seen = self.data.rootpw.password.seen
|
|
|
c5477d |
- self.data.rootpw.password.seen = False
|
|
|
c5477d |
+ self.__old_root_pw_seen = self.data.rootpw.seen
|
|
|
c5477d |
+ self.data.rootpw.seen = False
|
|
|
c5477d |
|
|
|
c5477d |
def _revert_rootpw_changes(self):
|
|
|
c5477d |
if self.__old_root_pw is not None:
|
|
|
c5477d |
self.data.rootpw.password = self.__old_root_pw
|
|
|
c5477d |
- self.data.rootpw.password.seen = self.__old_root_pw_seen
|
|
|
c5477d |
+ self.data.rootpw.seen = self.__old_root_pw_seen
|
|
|
c5477d |
self.__old_root_pw = None
|
|
|
c5477d |
self.__old_root_pw_seen = None
|
|
|
c5477d |
|
|
|
c5477d |
--
|
|
|
c5477d |
2.7.4
|
|
|
c5477d |
|