- BR heimdal-devel >= 0.7

[packages/cyrus-sasl.git] / cyrus-sasl-configdir.patch

diff --git a/cyrus-sasl-configdir.patch b/cyrus-sasl-configdir.patch
index 94fac04fa6302d5259fba3d9b9f1222fdde88bf0..fab712ea91a66c62387ab44fc43a16ff4ff996f6 100644 (file)
--- a/cyrus-sasl-configdir.patch
+++ b/cyrus-sasl-configdir.patch
@@ -1,41 +1,27 @@
-diff -durN cyrus-sasl-2.1.10.orig/acconfig.h cyrus-sasl-2.1.10/acconfig.h
---- cyrus-sasl-2.1.10.orig/acconfig.h  Tue Sep 10 19:17:32 2002
-+++ cyrus-sasl-2.1.10/acconfig.h       Thu Jan  9 11:42:29 2003
-@@ -78,6 +78,9 @@
- /* This is where plugins will live at runtime */
- #undef PLUGINDIR
- 
-+/* This is where config files will live at runtime */
-+#undef CONFIGDIR
-+
- /* Make autoheader happy */
- #undef WITH_SYMBOL_UNDERSCORE
- 
-@@ -247,6 +250,7 @@
- #endif
- 
- #define SASL_PATH_ENV_VAR "SASL_PATH"
-+#define SASL_CONF_PATH_ENV_VAR "SASL_CONF_PATH"
- 
- #include <stdlib.h>
- #include <sys/types.h>
-diff -durN cyrus-sasl-2.1.10.orig/configure.in cyrus-sasl-2.1.10/configure.in
---- cyrus-sasl-2.1.10.orig/configure.in        Fri Dec  6 17:23:56 2002
-+++ cyrus-sasl-2.1.10/configure.in     Thu Jan  9 11:42:29 2003
-@@ -664,6 +664,13 @@
- AC_DEFINE_UNQUOTED(PLUGINDIR, "$plugindir")
+--- cyrus-sasl-2.1.17/configure.in.orig        2003-11-28 19:37:10.000000000 +0100
++++ cyrus-sasl-2.1.17/configure.in     2003-12-03 22:45:24.790632560 +0100
+@@ -710,6 +710,13 @@
+ AC_DEFINE_UNQUOTED(PLUGINDIR, "$plugindir", [Runtime plugin location])
  AC_SUBST(plugindir)
  
 +AC_ARG_WITH(configdir, [   --with-configdir=DIR    set the directory where config files will
 +                          be found [/etc/sasl] ],
 +  configdir=$withval,
 +  configdir=/etc/sasl)
-+AC_DEFINE_UNQUOTED(CONFIGDIR, "$configdir")
++AC_DEFINE_UNQUOTED(CONFIGDIR, "$configdir", [Runtime config files location])
 +AC_SUBST(configdir)
 +
  dnl look for rc4 libraries. we accept the CMU one or one from openSSL
  AC_ARG_WITH(rc4, [  --with-rc4              use internal rc4 routines [yes] ],
        with_rc4=$withval,
+@@ -1006,6 +1013,7 @@
+ #endif
+ 
+ #define SASL_PATH_ENV_VAR "SASL_PATH"
++#define SASL_CONF_PATH_ENV_VAR "SASL_CONF_PATH"
+ 
+ #include <stdlib.h>
+ #include <sys/types.h>
 diff -durN cyrus-sasl-2.1.10.orig/include/sasl.h cyrus-sasl-2.1.10/include/sasl.h
 --- cyrus-sasl-2.1.10.orig/include/sasl.h      Fri Dec  6 17:23:59 2002
 +++ cyrus-sasl-2.1.10/include/sasl.h   Thu Jan  9 11:44:00 2003
@@ -67,18 +53,20 @@ diff -durN cyrus-sasl-2.1.10.orig/include/sasl.h cyrus-sasl-2.1.10/include/sasl.
 diff -durN cyrus-sasl-2.1.10.orig/lib/common.c cyrus-sasl-2.1.10/lib/common.c
 --- cyrus-sasl-2.1.10.orig/lib/common.c        Thu Dec  5 15:00:38 2002
 +++ cyrus-sasl-2.1.10/lib/common.c     Thu Jan  9 11:42:29 2003
-@@ -1040,6 +1040,20 @@
+@@ -1040,6 +1040,22 @@
  }
  
  static int
 +_sasl_getconfpath(void *context __attribute__((unused)),
 +            char ** path_dest)
 +{
-+  char *path;
++  char *path = NULL;
 +
 +  if (! path_dest)
 +    return SASL_BADPARAM;
-+  path = getenv(SASL_CONF_PATH_ENV_VAR);
++  /* Honor external variable only in a safe environment */
++  if (getuid() == geteuid() && getgid() == getegid())
++    path = getenv(SASL_CONF_PATH_ENV_VAR);
 +  if (! path)
 +    path = CONFIGDIR;
 +  return _sasl_strdup(path, path_dest, NULL);
@@ -88,7 +76,7 @@ diff -durN cyrus-sasl-2.1.10.orig/lib/common.c cyrus-sasl-2.1.10/lib/common.c
  _sasl_verifyfile(void *context __attribute__((unused)),
                 char *file  __attribute__((unused)),
                 int type  __attribute__((unused)))
-@@ -1147,6 +1161,10 @@
+@@ -1147,6 +1163,10 @@
      *pproc = (int (*)()) &_sasl_getpath;
      *pcontext = NULL;
      return SASL_OK;
@@ -99,7 +87,7 @@ diff -durN cyrus-sasl-2.1.10.orig/lib/common.c cyrus-sasl-2.1.10/lib/common.c
    case SASL_CB_AUTHNAME:
      *pproc = (int (*)()) &_sasl_getsimple;
      *pcontext = conn;
-@@ -1475,6 +1493,30 @@
+@@ -1475,6 +1495,30 @@
  }
  
  const sasl_callback_t *
@@ -143,16 +131,20 @@ diff -durN cyrus-sasl-2.1.10.orig/lib/saslint.h cyrus-sasl-2.1.10/lib/saslint.h
  _sasl_find_verifyfile_callback(const sasl_callback_t *callbacks);
  
  extern int _sasl_common_init(void);
-diff -durN cyrus-sasl-2.1.10.orig/lib/server.c cyrus-sasl-2.1.10/lib/server.c
---- cyrus-sasl-2.1.10.orig/lib/server.c        Thu Dec  5 05:16:59 2002
-+++ cyrus-sasl-2.1.10/lib/server.c     Thu Jan  9 11:42:29 2003
-@@ -379,15 +379,15 @@
-   char *c;
+--- cyrus-sasl-2.1.19/lib/server.c.orig        2004-07-06 15:42:23.000000000 +0200
++++ cyrus-sasl-2.1.19/lib/server.c     2004-07-25 18:46:12.483590936 +0200
+@@ -462,7 +462,7 @@
+   size_t path_len;
    char *config_filename=NULL;
-   int len;
+   size_t len;
 -  const sasl_callback_t *getpath_cb=NULL;
 +  const sasl_callback_t *getconfpath_cb=NULL;
  
+   /* If appname was not provided, behave as if there is no config file 
+      (see also sasl_config_init() */
+@@ -471,12 +471,12 @@
+   }
+ 
    /* get the path to the plugins; for now the config file will reside there */
 -  getpath_cb=_sasl_find_getpath_callback( global_callbacks.callbacks );
 -  if (getpath_cb==NULL) return SASL_BADPARAM;
@@ -218,16 +210,14 @@ diff -durN cyrus-sasl-2.1.10.orig/man/sasl_getconfpath_t.3 cyrus-sasl-2.1.10/man
 +.BR other sasl stuff
 +.BR 
 +.BR 
-\ No newline at end of file
-diff -durN cyrus-sasl-2.1.10.orig/win32/include/config.h cyrus-sasl-2.1.10/win32/include/config.h
---- cyrus-sasl-2.1.10.orig/win32/include/config.h      Fri Dec  6 17:24:48 2002
-+++ cyrus-sasl-2.1.10/win32/include/config.h   Thu Jan  9 11:44:41 2003
-@@ -96,7 +96,9 @@
+--- cyrus-sasl-2.1.17/win32/include/config.h.orig      2003-11-28 19:38:00.000000000 +0100
++++ cyrus-sasl-2.1.17/win32/include/config.h   2003-12-03 22:50:39.916726112 +0100
+@@ -91,7 +91,9 @@
  #define HAVE_MEMCPY 1
  
  #define SASL_PATH_ENV_VAR "SASL_PATH"
 +#define SASL_CONF_PATH_ENV_VAR "SASL_CONF_PATH"
- #define PLUGINDIR "C:\\SASL-PLUGINS"
+ #define PLUGINDIR "C:\\CMU\\bin\\sasl2"
 +#define CONFIGDIR "\\sasl-configs"
  
  /* Windows calls these functions something else