forked from pool/cyrus-sasl
a45425e35e
Update to 2.1.25 OBS-URL: https://build.opensuse.org/request/show/92407 OBS-URL: https://build.opensuse.org/package/show/network/cyrus-sasl?expand=0&rev=22
79 lines
2.6 KiB
Plaintext
79 lines
2.6 KiB
Plaintext
Index: cmulocal/cyrus.m4
|
|
===================================================================
|
|
--- cmulocal/cyrus.m4.orig
|
|
+++ cmulocal/cyrus.m4
|
|
@@ -37,7 +37,7 @@ AC_DEFUN([CMU_GUESS_RUNPATH_SWITCH], [
|
|
SAVE_LDFLAGS="${LDFLAGS}"
|
|
LDFLAGS="-R /usr/lib"
|
|
AC_TRY_LINK([],[],[andrew_cv_runpath_switch="-R"], [
|
|
- LDFLAGS="-Wl,-rpath,/usr/lib"
|
|
+# LDFLAGS="-Wl,-rpath,/usr/lib"
|
|
AC_TRY_LINK([],[],[andrew_cv_runpath_switch="-Wl,-rpath,"],
|
|
[andrew_cv_runpath_switch="none"])
|
|
])
|
|
Index: Makefile.am
|
|
===================================================================
|
|
--- Makefile.am.orig
|
|
+++ Makefile.am
|
|
@@ -43,6 +43,7 @@ AUTOMAKE_OPTIONS = 1.7
|
|
#
|
|
################################################################
|
|
|
|
+ACLOCAL_AMFLAGS=-I config -I cmulocal
|
|
if SASLAUTHD
|
|
SAD = saslauthd
|
|
else
|
|
Index: sasldb/Makefile.am
|
|
===================================================================
|
|
--- sasldb/Makefile.am.orig
|
|
+++ sasldb/Makefile.am
|
|
@@ -48,6 +48,7 @@ INCLUDES=-I$(top_srcdir)/include -I$(top
|
|
|
|
extra_common_sources = db_none.c db_ndbm.c db_gdbm.c db_berkeley.c
|
|
|
|
+AM_CFLAGS = "-fPIC"
|
|
EXTRA_DIST = NTMakefile
|
|
|
|
noinst_LTLIBRARIES = libsasldb.la
|
|
@@ -66,3 +67,8 @@ libsasldb.a: libsasldb.la $(SASL_DB_BACK
|
|
$(AR) cru .libs/$@ $(SASL_DB_BACKEND_STATIC)
|
|
|
|
|
|
+# avoid these two files created at the same time, they use both the same
|
|
+# dep file
|
|
+db_berkeley.lo: db_berkeley.o
|
|
+allockey.lo: allockey.o
|
|
+
|
|
Index: saslauthd/Makefile.am
|
|
===================================================================
|
|
--- saslauthd/Makefile.am.orig
|
|
+++ saslauthd/Makefile.am
|
|
@@ -1,4 +1,5 @@
|
|
AUTOMAKE_OPTIONS = 1.7
|
|
+ACLOCAL_AMFLAGS=-I ../config -I ../cmulocal
|
|
sbin_PROGRAMS = saslauthd testsaslauthd
|
|
EXTRA_PROGRAMS = saslcache
|
|
|
|
Index: plugins/gs2.c
|
|
===================================================================
|
|
--- plugins/gs2.c.orig
|
|
+++ plugins/gs2.c
|
|
@@ -374,6 +374,7 @@ gs2_server_mech_step(void *conn_context,
|
|
mechs.elements = (gss_OID)text->mechanism;
|
|
|
|
if (params->gss_creds == GSS_C_NO_CREDENTIAL) {
|
|
+fprintf(stderr,"calling gss_acquire_cred\n");
|
|
maj_stat = gss_acquire_cred(&min_stat,
|
|
text->server_name,
|
|
GSS_C_INDEFINITE,
|
|
@@ -382,7 +383,9 @@ gs2_server_mech_step(void *conn_context,
|
|
&text->server_creds,
|
|
NULL,
|
|
&text->lifetime);
|
|
+fprintf(stderr,"gss_acquire_cred returned: %d\n", maj_stat);
|
|
if (GSS_ERROR(maj_stat))
|
|
+fprintf(stderr,"gss_acquire_cred over and out: %d\n", maj_stat);
|
|
goto cleanup;
|
|
}
|
|
|