diff options
| author |   Cory Visi <merlin@gentoo.org> | 2004-07-08 02:12:57 +0000 |
|---|---|---|
| committer | Cory Visi <merlin@gentoo.org> | 2004-07-08 02:12:57 +0000 |
| commit | 3188a2bb5d2db6cece2c09ebbb2148a08dfa0feb (patch) | |
| tree | dc23209ee57b3e18fc3a961839207f051490b847 /dev-libs/cyrus-sasl/files | |
| parent | fix use invocation (diff) | |
| download | gentoo-2-3188a2bb5d2db6cece2c09ebbb2148a08dfa0feb.tar.gz gentoo-2-3188a2bb5d2db6cece2c09ebbb2148a08dfa0feb.tar.bz2 gentoo-2-3188a2bb5d2db6cece2c09ebbb2148a08dfa0feb.zip | |
Fixed patch to close Bug 56389, revision bump to make sure everyone get's the fix.
Diffstat (limited to 'dev-libs/cyrus-sasl/files')
| -rw-r--r-- | dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.18-sasl-path-fix.patch | 17 | ||||
| -rw-r--r-- | dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.18-r2 (renamed from dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.18-r1) | 0 |
2 files changed, 7 insertions, 10 deletions
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 156d4a5da66f..060e87807137 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,18 +1,15 @@ 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-07 12:15:19.570798953 -0400 -@@ -1794,9 +1794,11 @@ ++++ cyrus-sasl-2.1.18/lib/common.c 2004-07-07 21:20:21.953011443 -0400 +@@ -1794,7 +1794,10 @@ if (! path) return SASL_BADPARAM; - *path = getenv(SASL_PATH_ENV_VAR); -- if (! *path) -- *path = PLUGINDIR; -+ if (getuid() == geteuid() && getgid() == getegid()) { ++ /* Honor external variable only in a safe environment */ ++ if (getuid() == geteuid() && getgid() == getegid()) + *path = getenv(SASL_PATH_ENV_VAR); -+ if (! *path) -+ *path = PLUGINDIR; -+ } ++ + if (! *path) + *path = PLUGINDIR; - return SASL_OK; - } diff --git a/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.18-r1 b/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.18-r2 index 2993b6dbb3ed..2993b6dbb3ed 100644 --- a/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.18-r1 +++ b/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.18-r2 |