diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2006-02-04 00:35:57 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2006-02-04 00:35:57 +0000 |
| commit | 6293a26f38f1c1a235a762877a3493499ca61ea7 (patch) | |
| tree | be0d6d742bf5d4008982c33642e191235a203c32 /net-misc/openssh/openssh-4.2_p1-r1.ebuild | |
| parent | Mark 1.25 stable on ia64 (diff) | |
| download | historical-6293a26f38f1c1a235a762877a3493499ca61ea7.tar.gz historical-6293a26f38f1c1a235a762877a3493499ca61ea7.tar.bz2 historical-6293a26f38f1c1a235a762877a3493499ca61ea7.zip | |
only warn about sftplogging/ldap issues when user has USE="ldap sftplogging" #121436 by MAL
Package-Manager: portage-2.1_pre4-r1
Diffstat (limited to 'net-misc/openssh/openssh-4.2_p1-r1.ebuild')
| -rw-r--r-- | net-misc/openssh/openssh-4.2_p1-r1.ebuild | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/net-misc/openssh/openssh-4.2_p1-r1.ebuild b/net-misc/openssh/openssh-4.2_p1-r1.ebuild index 858d744a6add..e3a38dc5a122 100644 --- a/net-misc/openssh/openssh-4.2_p1-r1.ebuild +++ b/net-misc/openssh/openssh-4.2_p1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-4.2_p1-r1.ebuild,v 1.10 2006/02/03 21:33:11 dertobi123 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-4.2_p1-r1.ebuild,v 1.11 2006/02/04 00:35:57 vapier Exp $ inherit eutils flag-o-matic ccc pam @@ -65,10 +65,10 @@ src_unpack() { epatch "${DISTDIR}"/${SECURID_PATCH} use ldap && epatch "${FILESDIR}"/openssh-4.0_p1-smartcard-ldap-happy.patch fi - if use sftplogging ; then - ewarn "Sorry, sftplogging and ldap don't get along" - else - use ldap && epatch "${DISTDIR}"/${LDAP_PATCH} + if use ldap ; then + use sftplogging \ + && ewarn "Sorry, sftplogging and ldap don't get along, disabling ldap" \ + || epatch "${DISTDIR}"/${LDAP_PATCH} fi elif [[ -n ${SECURID_PATCH} ]] && use smartcard || use ldap ; then ewarn "Sorry, x509 and smartcard/ldap don't get along" |