diff options
| author | James Peach <jpeach@samba.org> | 2005-08-13 12:05:54 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:00:32 -0500 |
| commit | 2c425096732d6693b4388ad0167e566d8378ff79 (patch) | |
| tree | 6638fbe0ebffa3579c195346628a4c2c195b29bb /source3/passdb | |
| parent | 9a6c50f5525c0eba739a4e3f500e91ef407e69b6 (diff) | |
| download | samba-2c425096732d6693b4388ad0167e566d8378ff79.tar.gz samba-2c425096732d6693b4388ad0167e566d8378ff79.tar.bz2 samba-2c425096732d6693b4388ad0167e566d8378ff79.zip | |
r9303: Clobber compiler warnings. Patch from Jason Mader <jason@ncac.gwu.edu> plus
some extra function declarations. Bugzilla bug #2523.
(This used to be commit 98d364459daa48aca3d239926cf40a0655e27e97)
Diffstat (limited to 'source3/passdb')
| -rw-r--r-- | source3/passdb/pdb_nds.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source3/passdb/pdb_nds.c b/source3/passdb/pdb_nds.c index e2f3128fd5..0b1d39a81b 100644 --- a/source3/passdb/pdb_nds.c +++ b/source3/passdb/pdb_nds.c @@ -227,7 +227,7 @@ static int berDecodeLoginData( size_t *retDataLen, void *retData ) { - int rc=0, err = 0; + int err = 0; BerElement *replyBer = NULL; char *retOctStr = NULL; size_t retOctStrLen = 0; @@ -248,7 +248,7 @@ static int berDecodeLoginData( goto Cleanup; } - if( (rc = ber_scanf(replyBer, "{iis}", serverVersion, &err, retOctStr, &retOctStrLen)) != -1) + if(ber_scanf(replyBer, "{iis}", serverVersion, &err, retOctStr, &retOctStrLen) != -1) { if (*retDataLen >= retOctStrLen) { @@ -268,7 +268,7 @@ static int berDecodeLoginData( } else { - if( (rc = ber_scanf(replyBer, "{ii}", serverVersion, &err)) == -1) + if(ber_scanf(replyBer, "{ii}", serverVersion, &err) == -1) { if (!err) { @@ -663,7 +663,7 @@ Cleanup: int pdb_nds_get_password( struct smbldap_state *ldap_state, char *object_dn, - int *pwd_len, + size_t *pwd_len, char *pwd ) { LDAP *ld = ldap_state->ldap_struct; @@ -757,7 +757,7 @@ static NTSTATUS pdb_nds_update_login_attempts(struct pdb_methods *methods, LDAPMessage *entry = NULL; const char **attr_list; size_t pwd_len; - uchar clear_text_pw[512]; + char clear_text_pw[512]; const char *p = NULL; LDAP *ld = NULL; int ldap_port = 0; @@ -800,7 +800,7 @@ static NTSTATUS pdb_nds_update_login_attempts(struct pdb_methods *methods, got_clear_text_pw = True; } } else { - generate_random_buffer(clear_text_pw, 24); + generate_random_buffer((unsigned char *)clear_text_pw, 24); clear_text_pw[24] = '\0'; DEBUG(5,("pdb_nds_update_login_attempts: using random password %s\n", clear_text_pw)); } |