1
0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00

Fix valgrind memory leak in bug #6814 - Fixes for problems reported by valgrind

Jeremy.
This commit is contained in:
Jeremy Allison 2009-10-15 16:55:40 -07:00
parent a6e4cb500b
commit 5cc895983d
3 changed files with 9 additions and 1 deletions

View File

@ -1054,12 +1054,18 @@ static int smbldap_connect_system(struct smbldap_state *ldap_state, LDAP * ldap_
int version;
if (!ldap_state->anonymous && !ldap_state->bind_dn) {
char *bind_dn = NULL;
char *bind_secret = NULL;
/* get the default dn and password only if they are not set already */
if (!fetch_ldap_pw(&ldap_state->bind_dn, &ldap_state->bind_secret)) {
if (!fetch_ldap_pw(&bind_dn, &bind_secret)) {
DEBUG(0, ("ldap_connect_system: Failed to retrieve password from secrets.tdb\n"));
return LDAP_INVALID_CREDENTIALS;
}
smbldap_set_creds(ldap_state, false, bind_dn, bind_secret);
SAFE_FREE(bind_dn);
memset(bind_secret, '\0', strlen(bind_secret));
SAFE_FREE(bind_secret);
}
/* removed the sasl_bind_s "EXTERNAL" stuff, as my testsuite

View File

@ -891,6 +891,7 @@ bool fetch_ldap_pw(char **dn, char** pw)
if (asprintf(&key, "%s/%s", SECRETS_LDAP_BIND_PW, *dn) < 0) {
SAFE_FREE(*dn);
DEBUG(0, ("fetch_ldap_pw: asprintf failed!\n"));
return false;
}
*pw=(char *)secrets_fetch(key, &size);

View File

@ -131,6 +131,7 @@ static NTSTATUS get_credentials( TALLOC_CTX *mem_ctx,
DEBUG(2, ("get_credentials: Failed to lookup ldap "
"bind creds. Using anonymous connection.\n"));
anon = True;
*dn = NULL;
} else {
*dn = talloc_strdup(mem_ctx, user_dn);
SAFE_FREE( user_dn );