diff options
| author |   Cory Visi <merlin@gentoo.org> | 2004-07-07 16:59:28 +0000 |
|---|---|---|
| committer | Cory Visi <merlin@gentoo.org> | 2004-07-07 16:59:28 +0000 |
| commit | a9e9aa0257814d7562ba6a169ded0ac14e17704e (patch) | |
| tree | b562e377b732ce62d9f6184c581b555e508a8470 /dev-libs | |
| parent | stable on amd64 (Manifest recommit) (diff) | |
| download | gentoo-2-a9e9aa0257814d7562ba6a169ded0ac14e17704e.tar.gz gentoo-2-a9e9aa0257814d7562ba6a169ded0ac14e17704e.tar.bz2 gentoo-2-a9e9aa0257814d7562ba6a169ded0ac14e17704e.zip | |
Fix mistake in boolean logic
Diffstat (limited to 'dev-libs')
| -rw-r--r-- | dev-libs/cyrus-sasl/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.18-sasl-path-fix.patch | 10 |
2 files changed, 10 insertions, 6 deletions
diff --git a/dev-libs/cyrus-sasl/ChangeLog b/dev-libs/cyrus-sasl/ChangeLog index 3f386f5632f6..d11077a34293 100644 --- a/dev-libs/cyrus-sasl/ChangeLog +++ b/dev-libs/cyrus-sasl/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-libs/cyrus-sasl # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/ChangeLog,v 1.80 2004/07/07 16:23:14 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/ChangeLog,v 1.81 2004/07/07 16:59:28 merlin Exp $ + + 07 Jul 2004; Cory Visi <merlin@gentoo.org> + files/cyrus-sasl-2.1.18-sasl-path-fix.patch: + Fix mistake in boolean logic 07 Jul 2004; Aron Griffis <agriffis@gentoo.org> cyrus-sasl-2.1.18-r1.ebuild: stable on alpha and ia64 #56016 diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.18-sasl-path-fix.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.18-sasl-path-fix.patch index 125068083f57..156d4a5da66f 100644 --- a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.18-sasl-path-fix.patch +++ b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.18-sasl-path-fix.patch @@ -1,6 +1,6 @@ diff -Naur cyrus-sasl-2.1.18-orig/lib/common.c cyrus-sasl-2.1.18/lib/common.c --- cyrus-sasl-2.1.18-orig/lib/common.c 2004-03-10 10:51:35.000000000 -0500 -+++ cyrus-sasl-2.1.18/lib/common.c 2004-07-06 22:34:22.335040502 -0400 ++++ cyrus-sasl-2.1.18/lib/common.c 2004-07-07 12:15:19.570798953 -0400 @@ -1794,9 +1794,11 @@ if (! path) return SASL_BADPARAM; @@ -8,10 +8,10 @@ diff -Naur cyrus-sasl-2.1.18-orig/lib/common.c cyrus-sasl-2.1.18/lib/common.c - *path = getenv(SASL_PATH_ENV_VAR); - if (! *path) - *path = PLUGINDIR; -+ if (getuid() != geteuid() || getgid() != getegid()) { -+ *path = getenv(SASL_PATH_ENV_VAR); -+ if (! *path) -+ *path = PLUGINDIR; ++ if (getuid() == geteuid() && getgid() == getegid()) { ++ *path = getenv(SASL_PATH_ENV_VAR); ++ if (! *path) ++ *path = PLUGINDIR; + } return SASL_OK; |