leak a little bit less memory
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@2562 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
11
admin/ank.c
11
admin/ank.c
@@ -40,7 +40,6 @@
|
|||||||
|
|
||||||
RCSID("$Id$");
|
RCSID("$Id$");
|
||||||
|
|
||||||
|
|
||||||
static void
|
static void
|
||||||
doit2(HDB *db, hdb_entry *ent, int mod)
|
doit2(HDB *db, hdb_entry *ent, int mod)
|
||||||
{
|
{
|
||||||
@@ -48,6 +47,7 @@ doit2(HDB *db, hdb_entry *ent, int mod)
|
|||||||
hdb_entry def;
|
hdb_entry def;
|
||||||
int32_t tmp;
|
int32_t tmp;
|
||||||
char buf[1024];
|
char buf[1024];
|
||||||
|
int i;
|
||||||
|
|
||||||
ret = db->fetch(context, db, ent);
|
ret = db->fetch(context, db, ent);
|
||||||
|
|
||||||
@@ -58,15 +58,19 @@ doit2(HDB *db, hdb_entry *ent, int mod)
|
|||||||
return;
|
return;
|
||||||
}else{
|
}else{
|
||||||
krb5_realm *realm;
|
krb5_realm *realm;
|
||||||
|
krb5_principal def_principal;
|
||||||
|
|
||||||
realm = krb5_princ_realm(context, ent->principal);
|
realm = krb5_princ_realm(context, ent->principal);
|
||||||
krb5_build_principal(context, &def.principal,
|
krb5_build_principal(context, &def_principal,
|
||||||
strlen(*realm),
|
strlen(*realm),
|
||||||
*realm,
|
*realm,
|
||||||
"default",
|
"default",
|
||||||
NULL);
|
NULL);
|
||||||
|
def.principal = def_principal;
|
||||||
if(db->fetch(context, db, &def)){
|
if(db->fetch(context, db, &def)){
|
||||||
/* XXX */
|
/* XXX */
|
||||||
}
|
}
|
||||||
|
krb5_free_principal (context, def_principal);
|
||||||
memset(&ent->flags, 0, sizeof(ent->flags));
|
memset(&ent->flags, 0, sizeof(ent->flags));
|
||||||
ent->flags.client = 1;
|
ent->flags.client = 1;
|
||||||
ent->flags.server = 1;
|
ent->flags.server = 1;
|
||||||
@@ -135,6 +139,9 @@ doit2(HDB *db, hdb_entry *ent, int mod)
|
|||||||
if(mod == 0 || buf[0] == 'y'){
|
if(mod == 0 || buf[0] == 'y'){
|
||||||
krb5_data salt;
|
krb5_data salt;
|
||||||
des_read_pw_string(buf, sizeof(buf), "Password:", 1);
|
des_read_pw_string(buf, sizeof(buf), "Password:", 1);
|
||||||
|
for (i = 0; i < ent->keys.len; ++i)
|
||||||
|
free_Key (&ent->keys.val[i]);
|
||||||
|
free (ent->keys.val);
|
||||||
if(strcasecmp(buf, "random") == 0) {
|
if(strcasecmp(buf, "random") == 0) {
|
||||||
ent->keys.len = 0;
|
ent->keys.len = 0;
|
||||||
ent->keys.val = NULL;
|
ent->keys.val = NULL;
|
||||||
|
@@ -54,7 +54,7 @@ db_fetch(krb5_context context, krb5_principal principal)
|
|||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
ALLOC(ent);
|
ALLOC(ent);
|
||||||
krb5_copy_principal(context, principal, &ent->principal);
|
ent->principal = principal;
|
||||||
ret = db->fetch(context, db, ent);
|
ret = db->fetch(context, db, ent);
|
||||||
db->close(context, db);
|
db->close(context, db);
|
||||||
if(ret){
|
if(ret){
|
||||||
|
Reference in New Issue
Block a user