diff --git a/cyrus-sasl-2.1.26-user-specified-logging.patch b/cyrus-sasl-2.1.26-user-specified-logging.patch new file mode 100644 index 0000000..cd48742 --- /dev/null +++ b/cyrus-sasl-2.1.26-user-specified-logging.patch @@ -0,0 +1,40 @@ +diff --git a/plugins/gssapi.c b/plugins/gssapi.c +index 70a4157..7eb88d2 100644 +--- a/plugins/gssapi.c ++++ b/plugins/gssapi.c +@@ -1267,7 +1267,7 @@ gssapi_server_mech_step(void *conn_context, + + if (text == NULL) return SASL_BADPROT; + +- params->utils->log(NULL, SASL_LOG_DEBUG, ++ params->utils->log(params->utils->conn, SASL_LOG_DEBUG, + "GSSAPI server step %d\n", text->state); + + switch (text->state) { +@@ -1293,7 +1293,7 @@ gssapi_server_mech_step(void *conn_context, + break; + + default: +- params->utils->log(NULL, SASL_LOG_ERR, ++ params->utils->log(params->utils->conn, SASL_LOG_ERR, + "Invalid GSSAPI server step %d\n", text->state); + return SASL_FAIL; + } +@@ -1499,7 +1499,7 @@ static int gssapi_client_mech_step(void *conn_context, + *clientout = NULL; + *clientoutlen = 0; + +- params->utils->log(NULL, SASL_LOG_DEBUG, ++ params->utils->log(params->utils->conn, SASL_LOG_DEBUG, + "GSSAPI client step %d", text->state); + + switch (text->state) { +@@ -1992,7 +1992,7 @@ static int gssapi_client_mech_step(void *conn_context, + } + + default: +- params->utils->log(NULL, SASL_LOG_ERR, ++ params->utils->log(params->utils->conn, SASL_LOG_ERR, + "Invalid GSSAPI client step %d\n", text->state); + return SASL_FAIL; + } diff --git a/cyrus-sasl.spec b/cyrus-sasl.spec index 1a17da3..f777988 100644 --- a/cyrus-sasl.spec +++ b/cyrus-sasl.spec @@ -58,6 +58,8 @@ Patch53: cyrus-sasl-2.1.26-prefer-SCRAM-SHA-1-over-PLAIN.patch Patch54: cyrus-sasl-2.1.26-sample-leak.patch # Document ability to run saslauthd unprivileged (#1189203) Patch55: cyrus-sasl-2.1.26-saslauthd-user.patch +# Too much loogging in GSSAPI resolved (#1187097) +Patch56: cyrus-sasl-2.1.26-user-specified-logging.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: autoconf, automake, libtool, gdbm-devel, groff @@ -204,6 +206,7 @@ chmod -x include/*.h %patch53 -p1 -b .sha1vsplain %patch54 -p1 -b .leak %patch55 -p1 -b .man-unprivileged +%patch56 -p1 -b .too-much-logging %build