git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@23780 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2008-09-07 21:25:14 +00:00
parent 1250b3b63d
commit 3fd232eb32

View File

@@ -73,7 +73,7 @@ any_resolve(krb5_context context, const char *name, krb5_keytab id)
a->name = strdup(buf); a->name = strdup(buf);
if (a->name == NULL) { if (a->name == NULL) {
ret = ENOMEM; ret = ENOMEM;
krb5_set_error_message(context, ret, "malloc: out of memory"); krb5_set_error_message(context, ret, N_("malloc: out of memory", ""));
goto fail; goto fail;
} }
} else } else
@@ -87,7 +87,7 @@ any_resolve(krb5_context context, const char *name, krb5_keytab id)
prev = a; prev = a;
} }
if (a0 == NULL) { if (a0 == NULL) {
krb5_set_error_message(context, ENOENT, "empty ANY: keytab"); krb5_set_error_message(context, ENOENT, N_("empty ANY: keytab", ""));
return ENOENT; return ENOENT;
} }
id->data = a0; id->data = a0;
@@ -134,7 +134,7 @@ any_start_seq_get(krb5_context context,
c->data = malloc (sizeof(struct any_cursor_extra_data)); c->data = malloc (sizeof(struct any_cursor_extra_data));
if(c->data == NULL){ if(c->data == NULL){
krb5_set_error_message(context, ENOMEM, "malloc: out of memory"); krb5_set_error_message(context, ENOMEM, N_("malloc: out of memory", ""));
return ENOMEM; return ENOMEM;
} }
ed = (struct any_cursor_extra_data *)c->data; ed = (struct any_cursor_extra_data *)c->data;
@@ -206,7 +206,8 @@ any_add_entry(krb5_context context,
while(a != NULL) { while(a != NULL) {
ret = krb5_kt_add_entry(context, a->kt, entry); ret = krb5_kt_add_entry(context, a->kt, entry);
if(ret != 0 && ret != KRB5_KT_NOWRITE) { if(ret != 0 && ret != KRB5_KT_NOWRITE) {
krb5_set_error_message(context, ret, "failed to add entry to %s", krb5_set_error_message(context, ret,
N_("failed to add entry to %s", ""),
a->name); a->name);
return ret; return ret;
} }
@@ -230,7 +231,8 @@ any_remove_entry(krb5_context context,
else { else {
if(ret != KRB5_KT_NOWRITE && ret != KRB5_KT_NOTFOUND) { if(ret != KRB5_KT_NOWRITE && ret != KRB5_KT_NOTFOUND) {
krb5_set_error_message(context, ret, krb5_set_error_message(context, ret,
"Failed to remove keytab entry from %s", N_("Failed to remove keytab "
"entry from %s", "keytab name"),
a->name); a->name);
return ret; return ret;
} }