Просмотр исходного кода

"uselogin" does not work on Solaris and prevents the use of X11 Forwarding on other platforms like FreeBSD. So get rid of this stuff and stick with OpenSSH's internal login procedure (which OTOH already supports esoteric things like FreeBSD's login.conf).

Ralf S. Engelschall 24 лет назад
Родитель
Сommit
ed001c8c8d
2 измененных файлов с 2 добавлено и 9 удалено
  1. 0 7
      openssh/openssh.spec
  2. 2 2
      openssh/sshd_config

+ 0 - 7
openssh/openssh.spec

@@ -186,15 +186,8 @@ AutoReqProv:  no
         %{SOURCE rc.openssh} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
 
     #   install reasonable ssh server and client configuration files
-    case "%{l_target}" in
-        *-freebsd* ) uselogin=yes; printmotd=no  ;;
-        *-linux*   ) uselogin=yes; printmotd=no  ;;
-        *-solaris* ) uselogin=no;  printmotd=yes ;; # "uselogin" does not work on Solaris!
-    esac
     %{l_shtool} install -c -m 644 \
         -e 's;@l_prefix@;%{l_prefix};g' \
-        -e "s;@uselogin@;$uselogin;" \
-        -e "s;@printmotd@;$printmotd;" \
         %{SOURCE sshd_config} $RPM_BUILD_ROOT%{l_prefix}/etc/openssh/
     %{l_shtool} install -c -m 644 -e 's;@l_prefix@;%{l_prefix};g' \
         %{SOURCE ssh_config} $RPM_BUILD_ROOT%{l_prefix}/etc/openssh/

+ 2 - 2
openssh/sshd_config

@@ -33,6 +33,6 @@ LoginGraceTime           600
 MaxStartups              10:30:60
 PermitRootLogin          yes
 PermitEmptyPasswords     no
-UseLogin                 @uselogin@
-PrintMotd                @printmotd@
+UseLogin                 no
+PrintMotd                yes