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

switch to krb5_clear_error_message

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@23913 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2008-10-14 02:56:07 +00:00
parent 8cf907f08a
commit cdc2b37670
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/hdb/db.c
View File

@@ -112,7 +112,7 @@ DB_seq(krb5_context context, HDB *db,
return code; return code;
} }
if(code == 1) { if(code == 1) {
krb5_clear_error_string(context); krb5_clear_error_message(context);
return HDB_ERR_NOENTRY; return HDB_ERR_NOENTRY;
} }
@@ -195,7 +195,7 @@ DB__get(krb5_context context, HDB *db, krb5_data key, krb5_data *reply)
return code; return code;
} }
if(code == 1) { if(code == 1) {
krb5_clear_error_string(context); krb5_clear_error_message(context);
return HDB_ERR_NOENTRY; return HDB_ERR_NOENTRY;
} }
@@ -227,7 +227,7 @@ DB__put(krb5_context context, HDB *db, int replace,
return code; return code;
} }
if(code == 1) { if(code == 1) {
krb5_clear_error_string(context); krb5_clear_error_message(context);
return HDB_ERR_EXISTS; return HDB_ERR_EXISTS;
} }
return 0; return 0;
@@ -284,7 +284,7 @@ DB_open(krb5_context context, HDB *db, int flags, mode_t mode)
else else
ret = hdb_init_db(context, db); ret = hdb_init_db(context, db);
if(ret == HDB_ERR_NOENTRY) { if(ret == HDB_ERR_NOENTRY) {
krb5_clear_error_string(context); krb5_clear_error_message(context);
return 0; return 0;
} }
if (ret) { if (ret) {

4
lib/hdb/ext.c
View File

@@ -298,7 +298,7 @@ hdb_entry_get_password(krb5_context context, HDB *db,
ret = der_copy_octet_string(&ext->data.u.password.password, &pw); ret = der_copy_octet_string(&ext->data.u.password.password, &pw);
} }
if (ret) { if (ret) {
krb5_clear_error_string(context); krb5_clear_error_message(context);
return ret; return ret;
} }
@@ -323,7 +323,7 @@ hdb_entry_get_password(krb5_context context, HDB *db,
krb5_set_error_message(context, ENOENT, "no password attributefor %s", str); krb5_set_error_message(context, ENOENT, "no password attributefor %s", str);
free(str); free(str);
} else } else
krb5_clear_error_string(context); krb5_clear_error_message(context);
return ENOENT; return ENOENT;
} }

4
lib/hdb/hdb.c
View File

@@ -167,7 +167,7 @@ hdb_foreach(krb5_context context,
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) if (ret == 0)
krb5_clear_error_string(context); krb5_clear_error_message(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);
@@ -234,7 +234,7 @@ hdb_init_db(krb5_context context, HDB *db)
ret2 = db->hdb_unlock(context, db); ret2 = db->hdb_unlock(context, db);
if (ret) { if (ret) {
if (ret2) if (ret2)
krb5_clear_error_string(context); krb5_clear_error_message(context);
return ret; return ret;
} }
return ret2; return ret2;

2
lib/hdb/mkey.c
View File

@@ -584,7 +584,7 @@ hdb_set_master_keyfile (krb5_context context,
if (ret) { if (ret) {
if (ret != ENOENT) if (ret != ENOENT)
return ret; return ret;
krb5_clear_error_string(context); krb5_clear_error_message(context);
return 0; return 0;
} }
db->hdb_master_key = key; db->hdb_master_key = key;

2
lib/hdb/print.c
View File

@@ -215,7 +215,7 @@ entry2string_int (krb5_context context, krb5_storage *sp, hdb_entry *ent)
ASN1_MALLOC_ENCODE(HDB_extension, d, size, ASN1_MALLOC_ENCODE(HDB_extension, d, size,
&ent->extensions->val[i], &sz, ret); &ent->extensions->val[i], &sz, ret);
if (ret) { if (ret) {
krb5_clear_error_string(context); krb5_clear_error_message(context);
return ret; return ret;
} }
if(size != sz) if(size != sz)