sbonazzo / rpms / cyrus-sasl

Forked from rpms/cyrus-sasl 2 years ago
Clone

Blame SOURCES/cyrus-sasl-2.1.26-warnings.patch

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