Merge pull request #151 from teclator/merge-SLE-12-SP3

Merge SLE-12-SP3 into master
yast · Nov 29, 2017 · 90104f1 · 90104f1
2 parents 9b274b0 + 20ca608
commit 90104f1
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 1 deletion.
diff --git a/package/yast2-users.changes b/package/yast2-users.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Nov 28 08:14:48 UTC 2017 - knut.anderssen@suse.com
+
+- AutoYaST: Write and export SSH authorized keys also for root user
+  (bsc#1066342).
+- 4.0.1
+
 -------------------------------------------------------------------
 Wed Nov  8 12:16:47 UTC 2017 - jsrain@suse.cz
 

diff --git a/package/yast2-users.spec b/package/yast2-users.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-users
-Version:        4.0.0
+Version:        4.0.1
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

diff --git a/src/modules/Users.pm b/src/modules/Users.pm
@@ -4032,6 +4032,12 @@ sub WriteAuthorizedKeys {
             SSHAuthorizedKeys->write_keys($user{"homeDirectory"});
         }
     }
+
+    # Write root authorized keys(bsc#1066342)
+    my %root_user = %{$modified_users{"system"}{"root"}};
+    if ($root_user{"modified"} eq "imported") {
+        SSHAuthorizedKeys->write_keys($root_user{"homeDirectory"});
+    }
 }
 
 ##------------------------------------

diff --git a/src/modules/UsersPasswd.pm b/src/modules/UsersPasswd.pm
@@ -305,6 +305,10 @@ sub read_authorized_keys {
     foreach my $user (values %{$users{"local"}}) {
       SSHAuthorizedKeys->read_keys($user->{"homeDirectory"});
     }
+
+    # Read authorized keys also from root's home (bsc#1066342)
+    my %root_user = %{$users{"system"}{"root"}};
+    SSHAuthorizedKeys->read_keys($root_user{"homeDirectory"});
 }
 
 # actually read /etc/passwd and save into internal structure