summaryrefslogtreecommitdiffstats
path: root/source4/lib
diff options
context:
space:
mode:
Diffstat (limited to 'source4/lib')
-rw-r--r--source4/lib/appweb/mpr/var.c2
-rw-r--r--source4/lib/ldb/modules/ldb_map_outbound.c4
-rw-r--r--source4/lib/ldb/modules/operational.c2
-rw-r--r--source4/lib/tdb/common/io.c2
-rw-r--r--source4/lib/tdb/common/lock.c2
-rw-r--r--source4/lib/tls/tls.c6
6 files changed, 10 insertions, 8 deletions
diff --git a/source4/lib/appweb/mpr/var.c b/source4/lib/appweb/mpr/var.c
index 011d668460d..11ac7120651 100644
--- a/source4/lib/appweb/mpr/var.c
+++ b/source4/lib/appweb/mpr/var.c
@@ -1672,7 +1672,7 @@ void mprVarToString(char** out, int size, char *fmt, MprVar *obj)
#if BLD_GOAHEAD_WEBSERVER
mprAllocSprintf(out, size, "%d", (int) obj->integer64);
#else
- mprAllocSprintf(out, size, "%lld", obj->integer64);
+ mprAllocSprintf(out, size, "%lld", (long long)obj->integer64);
#endif
} else {
mprAllocSprintf(out, size, fmt, obj->integer64);
diff --git a/source4/lib/ldb/modules/ldb_map_outbound.c b/source4/lib/ldb/modules/ldb_map_outbound.c
index 229299288ca..7d1649c6f5c 100644
--- a/source4/lib/ldb/modules/ldb_map_outbound.c
+++ b/source4/lib/ldb/modules/ldb_map_outbound.c
@@ -79,7 +79,7 @@ static const char **map_attrs_collect_remote(struct ldb_module *module, void *me
const struct ldb_map_context *data = map_get_context(module);
const char **result;
const struct ldb_map_attribute *map;
- const char *name;
+ const char *name=NULL;
int i, j, last;
if (attrs == NULL)
@@ -277,7 +277,7 @@ static int ldb_msg_el_merge(struct ldb_module *module, struct ldb_message *local
{
const struct ldb_map_context *data = map_get_context(module);
const struct ldb_map_attribute *map = map_attr_find_remote(data, attr_name);
- struct ldb_message_element *el;
+ struct ldb_message_element *el=NULL;
/* Unknown attribute in remote message:
* skip, attribute was probably auto-generated */
diff --git a/source4/lib/ldb/modules/operational.c b/source4/lib/ldb/modules/operational.c
index b14d552e836..1e405355c4a 100644
--- a/source4/lib/ldb/modules/operational.c
+++ b/source4/lib/ldb/modules/operational.c
@@ -180,7 +180,7 @@ static int add_uint64_element(struct ldb_message *msg, const char *attr, uint64_
return 0;
}
- if (ldb_msg_add_fmt(msg, attr, "%llu", v) != 0) {
+ if (ldb_msg_add_fmt(msg, attr, "%llu", (unsigned long long)v) != 0) {
return -1;
}
diff --git a/source4/lib/tdb/common/io.c b/source4/lib/tdb/common/io.c
index d0ef94831d7..383023e88a4 100644
--- a/source4/lib/tdb/common/io.c
+++ b/source4/lib/tdb/common/io.c
@@ -125,7 +125,7 @@ static int tdb_read(struct tdb_context *tdb, tdb_off_t off, void *buf,
/* Ensure ecode is set for log fn. */
tdb->ecode = TDB_ERR_IO;
TDB_LOG((tdb, TDB_DEBUG_FATAL,"tdb_read failed at %d len=%d ret=%d (%s) map_size=%d\n",
- off, len, ret, strerror(errno), tdb->map_size));
+ off, len, ret, strerror(errno), (int)tdb->map_size));
return TDB_ERRCODE(TDB_ERR_IO, -1);
}
}
diff --git a/source4/lib/tdb/common/lock.c b/source4/lib/tdb/common/lock.c
index 821fd351861..7594aedfcda 100644
--- a/source4/lib/tdb/common/lock.c
+++ b/source4/lib/tdb/common/lock.c
@@ -69,7 +69,7 @@ int tdb_brlock_len(struct tdb_context *tdb, tdb_off_t offset,
/* Ensure error code is set for log fun to examine. */
tdb->ecode = TDB_ERR_LOCK;
TDB_LOG((tdb, TDB_DEBUG_TRACE,"tdb_brlock failed (fd=%d) at offset %d rw_type=%d lck_type=%d len=%d\n",
- tdb->fd, offset, rw_type, lck_type, len));
+ tdb->fd, offset, rw_type, lck_type, (int)len));
}
return TDB_ERRCODE(TDB_ERR_LOCK, -1);
}
diff --git a/source4/lib/tls/tls.c b/source4/lib/tls/tls.c
index cd65e22bcbe..8c885543ee6 100644
--- a/source4/lib/tls/tls.c
+++ b/source4/lib/tls/tls.c
@@ -339,7 +339,7 @@ static NTSTATUS tls_socket_send(struct socket_context *sock,
return STATUS_MORE_ENTRIES;
}
if (ret < 0) {
- DEBUG(0,("gnutls_record_send of %d failed - %s\n", blob->length, gnutls_strerror(ret)));
+ DEBUG(0,("gnutls_record_send of %d failed - %s\n", (int)blob->length, gnutls_strerror(ret)));
return NT_STATUS_UNEXPECTED_NETWORK_ERROR;
}
*sendlen = ret;
@@ -419,11 +419,13 @@ struct tls_params *tls_initialise(TALLOC_CTX *mem_ctx)
if (dhpfile) {
gnutls_datum_t dhparms;
- dhparms.data = (uint8_t *)file_load(dhpfile, &dhparms.size, mem_ctx);
+ size_t size;
+ dhparms.data = (uint8_t *)file_load(dhpfile, &size, mem_ctx);
if (!dhparms.data) {
goto init_failed;
}
+ dhparms.size = size;
ret = gnutls_dh_params_import_pkcs3(params->dh_params, &dhparms, GNUTLS_X509_FMT_PEM);
if (ret < 0) goto init_failed;