cyrus-sasl-gcc4.patch

   1 --- cyrus-sasl-2.1.20/lib/client.c~     2003-11-11 16:26:06.000000000 +0000
   2 +++ cyrus-sasl-2.1.20/lib/client.c      2005-04-24 15:57:59.000000000 +0000
   3 @@ -61,7 +61,7 @@
   4
   5  static cmech_list_t *cmechlist; /* global var which holds the list */
   6
   7 -static sasl_global_callbacks_t global_callbacks;
   8 +sasl_global_callbacks_t global_callbacks;
   9
  10  static int _sasl_client_active = 0;
  11
  12 --- cyrus-sasl-2.1.20/saslauthd/configure.in.orig       2005-04-24 16:39:30.088004312 +0000
  13 +++ cyrus-sasl-2.1.20/saslauthd/configure.in    2005-04-24 16:40:31.172718024 +0000
  14 @@ -44,9 +44,10 @@
  15  SASL_GSSAPI_CHK
  16
  17  if test "$gssapi" != no; then
  18 -       if test "$gss_impl" = "heimdal"; then
  19 -           AC_DEFINE(KRB5_HEIMDAL,[],[Using Heimdal])
  20 -       fi
  21 +dnl This is taken care of by -DKRB5_HEIMDAL in CPPFLAGS in ../Makefile
  22 +dnl    if test "$gss_impl" = "heimdal"; then
  23 +dnl        AC_DEFINE(KRB5_HEIMDAL,[],[Using Heimdal])
  24 +dnl    fi
  25         AC_DEFINE(HAVE_GSSAPI,[],[Include GSSAPI/Kerberos 5 Support])
  26  fi
  27
  28 --- cyrus-sasl-2.1.20/saslauthd/saslcache.c.orig        2005-04-24 16:47:45.989615808 +0000
  29 +++ cyrus-sasl-2.1.20/saslauthd/saslcache.c     2005-04-24 16:50:27.482065224 +0000
  30 @@ -137,7 +137,7 @@
  31         }
  32
  33         table_stats = shm_base + 64;
  34 -       (char *)table = (char *)table_stats + 128;
  35 +       table = (struct bucket*)((char *)table_stats + 128);
  36
  37         if (dump_stat_info == 0 && dump_user_info == 0)
  38                 dump_stat_info = 1;