SunSSH sshd ignores UsePrivilegeSeparation option

diff --git a/tests/sshserver.pl b/tests/sshserver.pl
index 9af868c0ec9f645de1d33dd2ca16e90c3e1238a8..564e615503d42e21ca36a6cda65e9a9ee076fb25 100644 (file)
--- a/tests/sshserver.pl
+++ b/tests/sshserver.pl
@@ -606,12 +606,11 @@ if(sshd_supports_opt('UsePAM','no')) {
     push @cfgarr, 'UsePAM no';
 }
 
-if($sshdid =~ /SunSSH/) {
+if($sshdid =~ /OpenSSH/) {
     # http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6492415
-    push @cfgarr, '# UsePrivilegeSeparation yes';
-}
-elsif(sshd_supports_opt('UsePrivilegeSeparation','no')) {
-    push @cfgarr, 'UsePrivilegeSeparation no';
+    if(sshd_supports_opt('UsePrivilegeSeparation','no')) {
+        push @cfgarr, 'UsePrivilegeSeparation no';
+    }
 }
 
 if(sshd_supports_opt('VerifyReverseMapping','no')) {