Index: passdb/pdb_ldap.c
===================================================================
--- passdb/pdb_ldap.c	(revision 5852)
+++ passdb/pdb_ldap.c	(working copy)
@@ -462,7 +462,7 @@
 	uint8 		hours[MAX_HOURS_LEN];
 	pstring temp;
 	LOGIN_CACHE	*cache_entry = NULL;
-	int pwHistLen;
+	unsigned int pwHistLen;
 	pstring		tmpstring;
 
 	/*
@@ -1086,14 +1086,14 @@
 		}
 
 		if (need_update(sampass, PDB_PWHISTORY)) {
-			int pwHistLen = 0;
+			unsigned int pwHistLen = 0;
 			account_policy_get(AP_PASSWORD_HISTORY, &pwHistLen);
 			if (pwHistLen == 0) {
 				/* Remove any password history from the LDAP store. */
 				memset(temp, '0', 64); /* NOTE !!!! '0' *NOT '\0' */
 				temp[64] = '\0';
 			} else {
-				int i, currHistLen = 0;
+				int i; unsigned int currHistLen = 0;
 				const uint8 *pwhist = pdb_get_pw_history(sampass, &currHistLen);
 				if (pwhist != NULL) {
 					/* We can only store (sizeof(pstring)-1)/64 password history entries. */
@@ -1122,7 +1122,7 @@
 	}
 
 	if (need_update(sampass, PDB_HOURS)) {
-		const char *hours = pdb_get_hours(sampass);
+		const unsigned char *hours = pdb_get_hours(sampass);
 		if (hours) {
 			pdb_sethexhours(temp, hours);
 			smbldap_make_mod(ldap_state->smbldap_state->ldap_struct,