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
5 static cmech_list_t *cmechlist; /* global var which holds the list */
7 -static sasl_global_callbacks_t global_callbacks;
8 +sasl_global_callbacks_t global_callbacks;
10 static int _sasl_client_active = 0;
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
17 if test "$gssapi" != no; then
18 - if test "$gss_impl" = "heimdal"; then
19 - AC_DEFINE(KRB5_HEIMDAL,[],[Using Heimdal])
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])
25 AC_DEFINE(HAVE_GSSAPI,[],[Include GSSAPI/Kerberos 5 Support])
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
33 table_stats = shm_base + 64;
34 - (char *)table = (char *)table_stats + 128;
35 + table = (struct bucket*)((char *)table_stats + 128);
37 if (dump_stat_info == 0 && dump_user_info == 0)