- fixed version for 2.1.19 + configdir patch

Changed files:
    cyrus-sasl-unchecked_env.patch -> 1.2

diff --git a/cyrus-sasl-unchecked_env.patch b/cyrus-sasl-unchecked_env.patch
index b6571f08797a9039fb1db58459d4c6f5f4e468b3..4f9664996ad59b4918b9353618551db18001504e 100644 (file)
--- a/cyrus-sasl-unchecked_env.patch
+++ b/cyrus-sasl-unchecked_env.patch
@@ -1,13 +1,31 @@
---- cyrus-sasl-1.5.27/lib/common.c~    Thu Oct 14 19:42:38 2004
-+++ cyrus-sasl-1.5.27/lib/common.c     Thu Oct 14 19:44:57 2004
-@@ -682,7 +682,9 @@
+--- cyrus-sasl-2.1.19/lib/common.c.orig        2004-10-19 13:04:57.000000000 +0200
++++ cyrus-sasl-2.1.19/lib/common.c     2004-10-19 13:10:34.000000000 +0200
+@@ -1114,11 +1114,13 @@
+ _sasl_getconfpath(void *context __attribute__((unused)),
+             char ** path_dest)
+ {
+-  char *path;
++  char *path = NULL;
  
    if (! path_dest)
      return SASL_BADPARAM;
--  path = getenv(SASL_PATH_ENV_VAR);
+-  path = getenv(SASL_CONF_PATH_ENV_VAR);
 +  /* Honor external variable only in a safe environment */
 +  if (getuid() == geteuid() && getgid() == getegid())
-+        *path = getenv(SASL_PATH_ENV_VAR);
++    path = getenv(SASL_CONF_PATH_ENV_VAR);
    if (! path)
-     path = PLUGINDIR;
+     path = CONFIGDIR;
    return _sasl_strdup(path, path_dest, NULL);
+@@ -1880,7 +1882,11 @@
+   if (! path)
+     return SASL_BADPARAM;
+ 
+-  *path = getenv(SASL_PATH_ENV_VAR);
++  /* Honor external variable only in a safe environment */
++  if (getuid() == geteuid() && getgid() == getegid())
++    *path = getenv(SASL_PATH_ENV_VAR);
++  else
++    *path = NULL;
+   if (! *path)
+     *path = PLUGINDIR;
+