diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2004-11-16 05:11:12 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2004-11-16 05:11:12 +0000 |
| commit | 1d62903503930a872908b1c0e65da13d2cab34d3 (patch) | |
| tree | 944a7ddece10843d6a2ec746b3ab2d5292289481 /net-misc/openssh | |
| parent | Fix the buildcsr demo target to use the correct linking flags #71194. (Manife... (diff) | |
| download | gentoo-2-1d62903503930a872908b1c0e65da13d2cab34d3.tar.gz gentoo-2-1d62903503930a872908b1c0e65da13d2cab34d3.tar.bz2 gentoo-2-1d62903503930a872908b1c0e65da13d2cab34d3.zip | |
If USE=pam, then disable PasswordAuthentication since PAM overrides it #71233.
Diffstat (limited to 'net-misc/openssh')
| -rw-r--r-- | net-misc/openssh/ChangeLog | 5 | ||||
| -rw-r--r-- | net-misc/openssh/openssh-3.9_p1.ebuild | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/net-misc/openssh/ChangeLog b/net-misc/openssh/ChangeLog index 8d8a0361f88b..4e4f7ab9f5b3 100644 --- a/net-misc/openssh/ChangeLog +++ b/net-misc/openssh/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for net-misc/openssh # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.102 2004/09/18 15:18:24 aliz Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.103 2004/11/16 05:11:12 vapier Exp $ + + 16 Nov 2004; Mike Frysinger <vapier@gentoo.org> openssh-3.9_p1.ebuild: + If USE=pam, then disable PasswordAuthentication since PAM overrides it #71233. 14 Sep 2004; Daniel Ahlberg <aliz@gentoo.org> openssh-3.9_p1.ebuild, files/openssh-3.9_p1-fix_suid.patch.bz2: diff --git a/net-misc/openssh/openssh-3.9_p1.ebuild b/net-misc/openssh/openssh-3.9_p1.ebuild index 1b5c8f8dadb2..d05da329d65d 100644 --- a/net-misc/openssh/openssh-3.9_p1.ebuild +++ b/net-misc/openssh/openssh-3.9_p1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-3.9_p1.ebuild,v 1.7 2004/11/04 02:49:52 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-3.9_p1.ebuild,v 1.8 2004/11/16 05:11:12 vapier Exp $ inherit eutils flag-o-matic ccc gnuconfig @@ -115,7 +115,9 @@ src_install() { exeinto /etc/init.d ; newexe ${FILESDIR}/sshd.rc6 sshd keepdir /var/empty dosed "/^#Protocol /s:.*:Protocol 2:" /etc/ssh/sshd_config - use pam && dosed "/^#UsePAM /s:.*:UsePAM yes:" /etc/ssh/sshd_config + use pam \ + && dosed "/^#UsePAM /s:.*:UsePAM yes:" /etc/ssh/sshd_config \ + && dosed "/^#PasswordAuthentication /s:.*:PasswordAuthentication no:" /etc/ssh/sshd_config } pkg_postinst() { |