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

use krb5_set_error_message

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@23290 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2008-06-23 03:27:51 +00:00
parent 58bb9b742e
commit 34344451a6
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/krb5/keytab_file.c
View File

@@ -62,7 +62,7 @@ krb5_kt_ret_data(krb5_context context,
data->length = size; data->length = size;
data->data = malloc(size); data->data = malloc(size);
if (data->data == NULL) { if (data->data == NULL) {
krb5_set_error_string (context, "malloc: out of memory"); krb5_set_error_message(context, ENOMEM, "malloc: out of memory");
return ENOMEM; return ENOMEM;
} }
ret = krb5_storage_read(sp, data->data, size); ret = krb5_storage_read(sp, data->data, size);
@@ -83,7 +83,7 @@ krb5_kt_ret_string(krb5_context context,
return ret; return ret;
*data = malloc(size + 1); *data = malloc(size + 1);
if (*data == NULL) { if (*data == NULL) {
krb5_set_error_string (context, "malloc: out of memory"); krb5_set_error_message(context, ENOMEM, "malloc: out of memory");
return ENOMEM; return ENOMEM;
} }
ret = krb5_storage_read(sp, *data, size); ret = krb5_storage_read(sp, *data, size);
@@ -168,7 +168,7 @@ krb5_kt_ret_principal(krb5_context context,
ALLOC(p, 1); ALLOC(p, 1);
if(p == NULL) { if(p == NULL) {
krb5_set_error_string (context, "malloc: out of memory"); krb5_set_error_message(context, ENOMEM, "malloc: out of memory");
return ENOMEM; return ENOMEM;
} }
@@ -191,8 +191,8 @@ krb5_kt_ret_principal(krb5_context context,
goto out; goto out;
p->name.name_string.val = calloc(len, sizeof(*p->name.name_string.val)); p->name.name_string.val = calloc(len, sizeof(*p->name.name_string.val));
if(p->name.name_string.val == NULL) { if(p->name.name_string.val == NULL) {
krb5_set_error_string (context, "malloc: out of memory");
ret = ENOMEM; ret = ENOMEM;
krb5_set_error_message(context, ret, "malloc: out of memory");
goto out; goto out;
} }
p->name.name_string.len = len; p->name.name_string.len = len;
@@ -253,13 +253,13 @@ fkt_resolve(krb5_context context, const char *name, krb5_keytab id)
d = malloc(sizeof(*d)); d = malloc(sizeof(*d));
if(d == NULL) { if(d == NULL) {
krb5_set_error_string (context, "malloc: out of memory"); krb5_set_error_message(context, ENOMEM, "malloc: out of memory");
return ENOMEM; return ENOMEM;
} }
d->filename = strdup(name); d->filename = strdup(name);
if(d->filename == NULL) { if(d->filename == NULL) {
free(d); free(d);
krb5_set_error_string (context, "malloc: out of memory"); krb5_set_error_message(context, ENOMEM, "malloc: out of memory");
return ENOMEM; return ENOMEM;
} }
d->flags = 0; d->flags = 0;
@@ -347,7 +347,7 @@ fkt_start_seq_get_int(krb5_context context,
if (c->sp == NULL) { if (c->sp == NULL) {
_krb5_xunlock(context, c->fd); _krb5_xunlock(context, c->fd);
close(c->fd); close(c->fd);
krb5_set_error_string (context, "malloc: out of memory"); krb5_set_error_message(context, ENOMEM, "malloc: out of memory");
return ENOMEM; return ENOMEM;
} }
krb5_storage_set_eof_code(c->sp, KRB5_KT_END); krb5_storage_set_eof_code(c->sp, KRB5_KT_END);
@@ -551,7 +551,7 @@ fkt_add_entry(krb5_context context,
emem = krb5_storage_emem(); emem = krb5_storage_emem();
if(emem == NULL) { if(emem == NULL) {
ret = ENOMEM; ret = ENOMEM;
krb5_set_error_string (context, "malloc: out of memory"); krb5_set_error_message(context, ret, "malloc: out of memory");
goto out; goto out;
} }
ret = krb5_kt_store_principal(context, emem, entry->principal); ret = krb5_kt_store_principal(context, emem, entry->principal);