2013-01-15 14:32:58 +00:00
|
|
|
diff -up cyrus-sasl-2.1.26/lib/server.c.warnings cyrus-sasl-2.1.26/lib/server.c
|
|
|
|
|
--- cyrus-sasl-2.1.26/lib/server.c.warnings 2012-10-12 16:05:48.000000000 +0200
|
|
|
|
|
+++ cyrus-sasl-2.1.26/lib/server.c 2012-12-20 17:49:39.620254792 +0100
|
|
|
|
|
@@ -650,7 +650,7 @@ static int load_config(const sasl_callba
|
|
|
|
|
goto done;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
- snprintf(config_filename, len, "%.*s%c%s.conf", path_len, path_to_config,
|
|
|
|
|
+ snprintf(config_filename, len, "%.*s%c%s.conf", (int)path_len, path_to_config,
|
|
|
|
|
HIER_DELIMITER, global_callbacks.appname);
|
|
|
|
|
|
|
|
|
|
/* Ask the application if it's safe to use this file */
|
|
|
|
|
diff -up cyrus-sasl-2.1.26/plugins/gssapi.c.warnings cyrus-sasl-2.1.26/plugins/gssapi.c
|
|
|
|
|
--- cyrus-sasl-2.1.26/plugins/gssapi.c.warnings 2012-01-28 00:31:36.000000000 +0100
|
|
|
|
|
+++ cyrus-sasl-2.1.26/plugins/gssapi.c 2012-12-20 17:49:39.620254792 +0100
|
|
|
|
|
@@ -202,7 +202,8 @@ sasl_gss_seterror_(const sasl_utils_t *u
|
|
|
|
|
OM_uint32 msg_ctx;
|
|
|
|
|
int ret;
|
|
|
|
|
char *out = NULL;
|
|
|
|
|
- size_t len, curlen = 0;
|
|
|
|
|
+ size_t len;
|
|
|
|
|
+ unsigned curlen = 0;
|
|
|
|
|
const char prefix[] = "GSSAPI Error: ";
|
|
|
|
|
|
|
|
|
|
if (!utils) return SASL_OK;
|
|
|
|
|
diff -up cyrus-sasl-2.1.26/plugins/ldapdb.c.warnings cyrus-sasl-2.1.26/plugins/ldapdb.c
|
|
|
|
|
--- cyrus-sasl-2.1.26/plugins/ldapdb.c.warnings 2012-01-28 00:31:36.000000000 +0100
|
|
|
|
|
+++ cyrus-sasl-2.1.26/plugins/ldapdb.c 2012-12-20 17:49:39.621254788 +0100
|
|
|
|
|
@@ -22,6 +22,7 @@
|
|
|
|
|
|
|
|
|
|
#include "plugin_common.h"
|
|
|
|
|
|
|
|
|
|
+#define LDAP_DEPRECATED 1
|
|
|
|
|
#include <ldap.h>
|
|
|
|
|
|
|
|
|
|
static char ldapdb[] = "ldapdb";
|
2013-09-03 12:42:32 +00:00
|
|
|
diff -up cyrus-sasl-2.1.26/plugins/plugin_common.c.warnings cyrus-sasl-2.1.26/plugins/plugin_common.c
|
|
|
|
|
--- cyrus-sasl-2.1.26/plugins/plugin_common.c.warnings 2013-09-03 14:40:35.181455452 +0200
|
|
|
|
|
+++ cyrus-sasl-2.1.26/plugins/plugin_common.c 2013-09-03 14:40:38.320441024 +0200
|
|
|
|
|
@@ -94,7 +94,7 @@ static void sockaddr_unmapped(
|
|
|
|
|
if (!IN6_IS_ADDR_V4MAPPED((&sin6->sin6_addr)))
|
|
|
|
|
return;
|
|
|
|
|
sin4 = (struct sockaddr_in *)sa;
|
|
|
|
|
- addr = *(uint32_t *)&sin6->sin6_addr.s6_addr[12];
|
|
|
|
|
+ addr = *(uint32_t *)&sin6->sin6_addr.s6_addr32[3];
|
|
|
|
|
port = sin6->sin6_port;
|
|
|
|
|
memset(sin4, 0, sizeof(struct sockaddr_in));
|
|
|
|
|
sin4->sin_addr.s_addr = addr;
|
2013-01-15 14:32:58 +00:00
|
|
|
diff -up cyrus-sasl-2.1.26/saslauthd/auth_httpform.c.warnings cyrus-sasl-2.1.26/saslauthd/auth_httpform.c
|
|
|
|
|
--- cyrus-sasl-2.1.26/saslauthd/auth_httpform.c.warnings 2012-10-12 16:05:48.000000000 +0200
|
2013-09-03 12:42:32 +00:00
|
|
|
+++ cyrus-sasl-2.1.26/saslauthd/auth_httpform.c 2013-09-03 14:39:25.411776109 +0200
|
2013-01-15 14:32:58 +00:00
|
|
|
@@ -574,7 +574,7 @@ auth_httpform (
|
|
|
|
|
"Content-Type: application/x-www-form-urlencoded" CRLF
|
|
|
|
|
"Content-Length: %d" TWO_CRLF
|
|
|
|
|
"%s",
|
|
|
|
|
- r_uri, r_host, r_port, strlen(req), req);
|
|
|
|
|
+ r_uri, r_host, r_port, (int)strlen(req), req);
|
|
|
|
|
|
|
|
|
|
if (flags & VERBOSE) {
|
|
|
|
|
syslog(LOG_DEBUG, "auth_httpform: sending %s %s %s",
|
|
|
|
|
diff -up cyrus-sasl-2.1.26/saslauthd/auth_shadow.c.warnings cyrus-sasl-2.1.26/saslauthd/auth_shadow.c
|
|
|
|
|
--- cyrus-sasl-2.1.26/saslauthd/auth_shadow.c.warnings 2012-10-12 16:05:48.000000000 +0200
|
|
|
|
|
+++ cyrus-sasl-2.1.26/saslauthd/auth_shadow.c 2012-12-20 17:49:39.621254788 +0100
|
|
|
|
|
@@ -70,6 +70,10 @@
|
|
|
|
|
# include <shadow.h>
|
|
|
|
|
# endif /* ! HAVE_GETUSERPW */
|
|
|
|
|
|
|
|
|
|
+# ifdef HAVE_CRYPT_H
|
|
|
|
|
+# include <crypt.h>
|
|
|
|
|
+# endif
|
|
|
|
|
+
|
|
|
|
|
# include "auth_shadow.h"
|
|
|
|
|
# include "globals.h"
|
|
|
|
|
/* END PUBLIC DEPENDENCIES */
|
