summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Hudson <ghudson@mit.edu>2013-03-28 15:21:10 -0400
committerGreg Hudson <ghudson@mit.edu>2013-03-28 15:21:10 -0400
commit57dbbf1a57887975362862688ed7f48904dce6fe (patch)
tree607468c8f9eedd29064eeab3b702dc6cc83b793d
parentb5212739e7cf800b03f4e072f6446f6d7271176f (diff)
downloadkrb5-57dbbf1a57887975362862688ed7f48904dce6fe.tar.gz
krb5-57dbbf1a57887975362862688ed7f48904dce6fe.tar.xz
krb5-57dbbf1a57887975362862688ed7f48904dce6fe.zip
Fix krb5_ldap_put_password_policy cleanup
Initialize policy_dn since we clean it up. Also free it unconditionally.
-rw-r--r--src/plugins/kdb/ldap/libkdb_ldap/ldap_pwd_policy.c5
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 433fb75b9b..c6fdbb4941 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);