summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2005-03-22 17:08:09 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 10:56:12 -0500
commitec139622c51075012dce3ce124e051975b5bdd62 (patch)
treed9f32f6889d2d2151af5e166cb631ac7baadcec9
parent73d1950c010777605b1294397002cc7aa011add0 (diff)
downloadsamba-ec139622c51075012dce3ce124e051975b5bdd62.tar.gz
samba-ec139622c51075012dce3ce124e051975b5bdd62.tar.bz2
samba-ec139622c51075012dce3ce124e051975b5bdd62.zip
r5957: BUGS 2478, 2093: compiler warning patches from Jason Mader
(This used to be commit b0f43460822eb5175c854959181de05307d73415)
-rw-r--r--source3/passdb/pdb_ldap.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/source3/passdb/pdb_ldap.c b/source3/passdb/pdb_ldap.c
index 3dab919cb4..afbd488b85 100644
--- a/source3/passdb/pdb_ldap.c
+++ b/source3/passdb/pdb_ldap.c
@@ -462,7 +462,7 @@ static BOOL init_sam_from_ldap(struct ldapsam_privates *ldap_state,
uint8 hours[MAX_HOURS_LEN];
pstring temp;
LOGIN_CACHE *cache_entry = NULL;
- int pwHistLen;
+ uint32 pwHistLen;
pstring tmpstring;
/*
@@ -694,8 +694,8 @@ static BOOL init_sam_from_ldap(struct ldapsam_privates *ldap_state,
if (ldap_state->is_nds_ldap) {
char *user_dn;
- size_t pwd_len;
- uchar clear_text_pw[512];
+ int pwd_len;
+ char clear_text_pw[512];
/* Make call to Novell eDirectory ldap extension to get clear text password.
NOTE: This will only work if we have an SSL connection to eDirectory. */
@@ -1086,14 +1086,15 @@ static BOOL init_ldap_from_sam (struct ldapsam_privates *ldap_state,
}
if (need_update(sampass, PDB_PWHISTORY)) {
- int pwHistLen = 0;
+ uint32 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;
+ uint32 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 +1123,7 @@ static BOOL init_ldap_from_sam (struct ldapsam_privates *ldap_state,
}
if (need_update(sampass, PDB_HOURS)) {
- const char *hours = pdb_get_hours(sampass);
+ const uint8 *hours = pdb_get_hours(sampass);
if (hours) {
pdb_sethexhours(temp, hours);
smbldap_make_mod(ldap_state->smbldap_state->ldap_struct,