3 files changed, 8 insertions, 7 deletions

diff --git a/source4/ldap_server/ldap_backend.c b/source4/ldap_server/ldap_backend.c
index 1c5a2b2a042..3e802a7b97e 100644
--- a/source4/ldap_server/ldap_backend.c
+++ b/source4/ldap_server/ldap_backend.c
@@ -237,7 +237,7 @@ NTSTATUS ldapsrv_backend_Init(struct ldapsrv_connection *conn)
 		struct gensec_security_ops **backends = gensec_security_all();
 		struct gensec_security_ops **ops
 			= gensec_use_kerberos_mechs(conn, backends, conn->server_credentials);
-		int i, j = 0;
+		unsigned int i, j = 0;
 		for (i = 0; ops && ops[i]; i++) {
 			if (!lp_parm_bool(conn->lp_ctx,  NULL, "gensec", ops[i]->name, ops[i]->enabled))
 				continue;
@@ -336,7 +336,7 @@ static NTSTATUS ldapsrv_SearchRequest(struct ldapsrv_call *call)
 	int success_limit = 1;
 	int result = -1;
 	int ldb_ret = -1;
-	int i, j;
+	unsigned int i, j;
 	int extended_type = 1;
 
 	DEBUG(10, ("SearchRequest"));
@@ -544,7 +544,7 @@ static NTSTATUS ldapsrv_ModifyRequest(struct ldapsrv_call *call)
 	const char *errstr = NULL;
 	int result = LDAP_SUCCESS;
 	int ldb_ret;
-	int i,j;
+	unsigned int i,j;
 
 	DEBUG(10, ("ModifyRequest"));
 	DEBUGADD(10, (" dn: %s", req->dn));
@@ -641,7 +641,7 @@ static NTSTATUS ldapsrv_AddRequest(struct ldapsrv_call *call)
 	const char *errstr = NULL;
 	int result = LDAP_SUCCESS;
 	int ldb_ret;
-	int i,j;
+	unsigned int i,j;
 
 	DEBUG(10, ("AddRequest"));
 	DEBUGADD(10, (" dn: %s", req->dn));
@@ -924,7 +924,7 @@ static NTSTATUS ldapsrv_AbandonRequest(struct ldapsrv_call *call)
 
 NTSTATUS ldapsrv_do_call(struct ldapsrv_call *call)
 {
-	int i;
+	unsigned int i;
 	struct ldap_message *msg = call->request;
 	/* Check for undecoded critical extensions */
 	for (i=0; msg->controls && msg->controls[i]; i++) {
diff --git a/source4/ldap_server/ldap_extended.c b/source4/ldap_server/ldap_extended.c
index 6d630b49224..ac8f6c14968 100644
--- a/source4/ldap_server/ldap_extended.c
+++ b/source4/ldap_server/ldap_extended.c
@@ -104,7 +104,7 @@ NTSTATUS ldapsrv_ExtendedRequest(struct ldapsrv_call *call)
 	int result = LDAP_PROTOCOL_ERROR;
 	const char *error_str = NULL;
 	NTSTATUS status = NT_STATUS_OK;
-	uint32_t i;
+	unsigned int i;
 
 	DEBUG(10, ("Extended\n"));
 
diff --git a/source4/ldap_server/ldap_server.c b/source4/ldap_server/ldap_server.c
index 63bfc70b2a7..28e6f21f3d9 100644
--- a/source4/ldap_server/ldap_server.c
+++ b/source4/ldap_server/ldap_server.c
@@ -237,7 +237,8 @@ static int ldapsrv_load_limits(struct ldapsrv_connection *conn)
 	struct ldb_dn *basedn;
 	struct ldb_dn *conf_dn;
 	struct ldb_dn *policy_dn;
-	int i,ret;
+	unsigned int i;
+	int ret;
 
 	/* set defaults limits in case of failure */
 	conn->limits.initial_timeout = 120;