[27639] in CVS-changelog-for-Kerberos-V5
krb5 commit: Fix krb5_ldap_put_password_policy cleanup
daemon@ATHENA.MIT.EDU (Greg Hudson)
Thu Mar 28 15:53:04 2013
Date: Thu, 28 Mar 2013 15:53:00 -0400
From: Greg Hudson <ghudson@mit.edu>
Message-Id: <201303281953.r2SJr04v021515@drugstore.mit.edu>
To: cvs-krb5@mit.edu
Reply-To: krbdev@mit.edu
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: cvs-krb5-bounces@mit.edu
https://github.com/krb5/krb5/commit/57dbbf1a57887975362862688ed7f48904dce6fe
commit 57dbbf1a57887975362862688ed7f48904dce6fe
Author: Greg Hudson <ghudson@mit.edu>
Date: Thu Mar 28 15:21:10 2013 -0400
Fix krb5_ldap_put_password_policy cleanup
Initialize policy_dn since we clean it up. Also free it
unconditionally.
src/plugins/kdb/ldap/libkdb_ldap/ldap_pwd_policy.c | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/plugins/kdb/ldap/libkdb_ldap/ldap_pwd_policy.c b/src/plugins/kdb/ldap/libkdb_ldap/ldap_pwd_policy.c
index 433fb75..c6fdbb4 100644
--- a/src/plugins/kdb/ldap/libkdb_ldap/ldap_pwd_policy.c
+++ b/src/plugins/kdb/ldap/libkdb_ldap/ldap_pwd_policy.c
@@ -189,7 +189,7 @@ cleanup:
krb5_error_code
krb5_ldap_put_password_policy(krb5_context context, osa_policy_ent_t policy)
{
- char *policy_dn;
+ char *policy_dn=NULL;
krb5_error_code st=0;
LDAP *ld=NULL;
LDAPMod **mods=NULL;
@@ -227,8 +227,7 @@ krb5_ldap_put_password_policy(krb5_context context, osa_policy_ent_t policy)
}
cleanup:
- if (policy_dn != NULL)
- free (policy_dn);
+ free(policy_dn);
ldap_mods_free(mods, 1);
krb5_ldap_put_handle_to_pool(ldap_context, ldap_server_handle);
return(st);
_______________________________________________
cvs-krb5 mailing list
cvs-krb5@mit.edu
https://mailman.mit.edu/mailman/listinfo/cvs-krb5
