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

Be better att clearing error string.

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@20214 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2007-02-09 21:51:10 +00:00
parent 873b9b8aae
commit 24e5f936df
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/hdb/hdb.c
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1997 - 2004 Kungliga Tekniska H<>gskolan * Copyright (c) 1997 - 2007 Kungliga Tekniska H<>gskolan
* (Royal Institute of Technology, Stockholm, Sweden). * (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved. * All rights reserved.
* *
@@ -78,11 +78,15 @@ hdb_next_enctype2key(krb5_context context,
for (k = *key ? (*key) + 1 : e->keys.val; for (k = *key ? (*key) + 1 : e->keys.val;
k < e->keys.val + e->keys.len; k < e->keys.val + e->keys.len;
k++) k++)
{
if(k->key.keytype == enctype){ if(k->key.keytype == enctype){
*key = k; *key = k;
return 0; return 0;
} }
}
krb5_set_error_string(context, "No next enctype %d for hdb-entry",
(int)enctype);
return KRB5_PROG_ETYPE_NOSUPP; /* XXX */ return KRB5_PROG_ETYPE_NOSUPP; /* XXX */
} }
@@ -161,6 +165,8 @@ hdb_foreach(krb5_context context,
krb5_error_code ret; krb5_error_code ret;
hdb_entry_ex entry; hdb_entry_ex entry;
ret = db->hdb_firstkey(context, db, flags, &entry); ret = db->hdb_firstkey(context, db, flags, &entry);
if (ret == 0)
krb5_clear_error_string(context);
while(ret == 0){ while(ret == 0){
ret = (*func)(context, db, &entry, data); ret = (*func)(context, db, &entry, data);
hdb_free_entry(context, &entry); hdb_free_entry(context, &entry);
@@ -225,8 +231,11 @@ hdb_init_db(krb5_context context, HDB *db)
version.length = strlen(version.data) + 1; /* zero terminated */ version.length = strlen(version.data) + 1; /* zero terminated */
ret = (*db->hdb__put)(context, db, 0, tag, version); ret = (*db->hdb__put)(context, db, 0, tag, version);
ret2 = db->hdb_unlock(context, db); ret2 = db->hdb_unlock(context, db);
if (ret) if (ret) {
if (ret2)
krb5_clear_error_string(context);
return ret; return ret;
}
return ret2; return ret2;
} }