oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

Free some memory. Close DB.

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@2244 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Johan Danielsson
1997-07-13 03:11:58 +00:00
parent 86d922a0fc
commit 98dd9c4f85
3 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
admin/ank.c
View File

@@ -25,7 +25,7 @@ doit(char *principal, int mod)
case KRB5_HDB_NOENTRY: case KRB5_HDB_NOENTRY:
if(mod){ if(mod){
fprintf(stderr, "Entry not found in database\n"); fprintf(stderr, "Entry not found in database\n");
return; goto out;
}else{ }else{
krb5_realm *realm; krb5_realm *realm;
@@ -46,10 +46,12 @@ doit(char *principal, int mod)
if(db->fetch(context, db, &def)){ if(db->fetch(context, db, &def)){
/* XXX */ /* XXX */
} }
ent.flags.i = 0;
ent.kvno = 0; ent.kvno = 0;
ent.max_life = def.max_life; ent.max_life = def.max_life;
ent.max_renew = def.max_renew; ent.max_renew = def.max_renew;
ent.expires = def.expires; ent.expires = def.expires;
hdb_free_entry(context, &def);
if(ent.expires) if(ent.expires)
ent.expires += time(NULL); ent.expires += time(NULL);
break; break;
@@ -57,7 +59,7 @@ doit(char *principal, int mod)
case 0: case 0:
if(!mod){ if(!mod){
warnx("Principal exists"); warnx("Principal exists");
return; goto out;
} }
break; break;
default: default:
@@ -93,6 +95,7 @@ doit(char *principal, int mod)
krb5_get_salt(ent.principal, &salt); krb5_get_salt(ent.principal, &salt);
memset(&ent.keyblock, 0, sizeof(ent.keyblock)); memset(&ent.keyblock, 0, sizeof(ent.keyblock));
krb5_string_to_key(buf, &salt, &ent.keyblock); krb5_string_to_key(buf, &salt, &ent.keyblock);
krb5_data_free(&salt);
} }
ent.kvno++; ent.kvno++;
} }
@@ -120,6 +123,7 @@ doit(char *principal, int mod)
exit(1); exit(1);
} }
hdb_free_entry(context, &ent); hdb_free_entry(context, &ent);
out:
db->close(context, db); db->close(context, db);
} }

4
admin/dump.c
View File

@@ -65,10 +65,12 @@ dump(int argc, char **argv)
fprintf(f, " %s %s %d\n", fprintf(f, " %s %s %d\n",
p, p,
time2str(ent.expires), time2str(ent.expires),
ent.u.flags); ent.flags.i);
free(p); free(p);
hdb_free_entry(context, &ent);
err = db->nextkey(context, db, &ent); err = db->nextkey(context, db, &ent);
} }
if(f != stdout) if(f != stdout)
fclose(f); fclose(f);
db->close(context, db);
} }

4
kadmin/dump.c
View File

@@ -65,10 +65,12 @@ dump(int argc, char **argv)
fprintf(f, " %s %s %d\n", fprintf(f, " %s %s %d\n",
p, p,
time2str(ent.expires), time2str(ent.expires),
ent.u.flags); ent.flags.i);
free(p); free(p);
hdb_free_entry(context, &ent);
err = db->nextkey(context, db, &ent); err = db->nextkey(context, db, &ent);
} }
if(f != stdout) if(f != stdout)
fclose(f); fclose(f);
db->close(context, db);
} }