63 lines
2.6 KiB
Diff
63 lines
2.6 KiB
Diff
|
diff -up cyrus-sasl-2.1.25/lib/server.c.warnings cyrus-sasl-2.1.25/lib/server.c
|
||
|
|
--- cyrus-sasl-2.1.25/lib/server.c.warnings 2011-09-02 14:58:01.000000000 +0200
|
||
|
|
+++ cyrus-sasl-2.1.25/lib/server.c 2012-12-06 16:21:07.705102996 +0100
|
||
|
|
@@ -646,7 +646,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.25/plugins/gssapi.c.warnings cyrus-sasl-2.1.25/plugins/gssapi.c
|
||
|
|
--- cyrus-sasl-2.1.25/plugins/gssapi.c.warnings 2011-05-11 21:25:55.000000000 +0200
|
||
|
|
+++ cyrus-sasl-2.1.25/plugins/gssapi.c 2012-12-06 16:24:30.223307272 +0100
|
||
|
|
@@ -196,7 +196,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.25/plugins/ldapdb.c.warnings cyrus-sasl-2.1.25/plugins/ldapdb.c
|
||
|
|
--- cyrus-sasl-2.1.25/plugins/ldapdb.c.warnings 2011-05-11 21:25:55.000000000 +0200
|
||
|
|
+++ cyrus-sasl-2.1.25/plugins/ldapdb.c 2012-12-06 16:21:07.706102988 +0100
|
||
|
|
@@ -22,6 +22,7 @@
|
||
|
|
|
||
|
|
#include "plugin_common.h"
|
||
|
|
|
||
|
|
+#define LDAP_DEPRECATED 1
|
||
|
|
#include <ldap.h>
|
||
|
|
|
||
|
|
static char ldapdb[] = "ldapdb";
|
||
|
|
diff -up cyrus-sasl-2.1.25/saslauthd/auth_httpform.c.warnings cyrus-sasl-2.1.25/saslauthd/auth_httpform.c
|
||
|
|
--- cyrus-sasl-2.1.25/saslauthd/auth_httpform.c.warnings 2006-04-20 16:30:14.000000000 +0200
|
||
|
|
+++ cyrus-sasl-2.1.25/saslauthd/auth_httpform.c 2012-12-06 16:21:10.520091567 +0100
|
||
|
|
@@ -552,7 +552,7 @@ auth_httpform (
|
||
|
|
"Content-Type: application/x-www-form-urlencoded" CRLF
|
||
|
|
"Content-Length: %d" TWO_CRLF
|
||
|
|
"%s",
|
||
|
|
- r_uri, r_host, r_port, strlen(escreq), escreq);
|
||
|
|
+ r_uri, r_host, r_port, (int)strlen(escreq), escreq);
|
||
|
|
|
||
|
|
if (flags & VERBOSE) {
|
||
|
|
syslog(LOG_DEBUG, "auth_httpform: sending %s %s %s",
|
||
|
|
diff -up cyrus-sasl-2.1.25/saslauthd/auth_shadow.c.warnings cyrus-sasl-2.1.25/saslauthd/auth_shadow.c
|
||
|
|
--- cyrus-sasl-2.1.25/saslauthd/auth_shadow.c.warnings 2009-12-03 20:07:03.000000000 +0100
|
||
|
|
+++ cyrus-sasl-2.1.25/saslauthd/auth_shadow.c 2012-12-06 16:21:10.521091564 +0100
|
||
|
|
@@ -68,6 +68,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 */
|