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

N_()ify

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@23783 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2008-09-07 21:26:29 +00:00
parent 862f4dfd46
commit 2f980ebc54
1 changed files with 105 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

133
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_message(context, ENOMEM, "malloc: out of memory"); krb5_set_error_message(context, ENOMEM, N_("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_message(context, ENOMEM, "malloc: out of memory"); krb5_set_error_message(context, ENOMEM, N_("malloc: out of memory", ""));
return ENOMEM; return ENOMEM;
} }
ret = krb5_storage_read(sp, *data, size); ret = krb5_storage_read(sp, *data, size);
@@ -130,34 +130,57 @@ krb5_kt_store_string(krb5_storage *sp,
} }
static krb5_error_code static krb5_error_code
krb5_kt_ret_keyblock(krb5_context context, krb5_storage *sp, krb5_keyblock *p) krb5_kt_ret_keyblock(krb5_context context,
struct fkt_data *fkt,
krb5_storage *sp,
krb5_keyblock *p)
{ {
int ret; int ret;
int16_t tmp; int16_t tmp;
ret = krb5_ret_int16(sp, &tmp); /* keytype + etype */ ret = krb5_ret_int16(sp, &tmp); /* keytype + etype */
if(ret) return ret; if(ret) {
krb5_set_error_message(context, ret,
N_("Cant read keyblock from file %s", ""),
fkt->filename);
return ret;
}
p->keytype = tmp; p->keytype = tmp;
ret = krb5_kt_ret_data(context, sp, &p->keyvalue); ret = krb5_kt_ret_data(context, sp, &p->keyvalue);
if (ret)
krb5_set_error_message(context, ret,
N_("Cant read keyblock from file %s", ""),
fkt->filename);
return ret; return ret;
} }
static krb5_error_code static krb5_error_code
krb5_kt_store_keyblock(krb5_context context, krb5_kt_store_keyblock(krb5_context context,
struct fkt_data *fkt,
krb5_storage *sp, krb5_storage *sp,
krb5_keyblock *p) krb5_keyblock *p)
{ {
int ret; int ret;
ret = krb5_store_int16(sp, p->keytype); /* keytype + etype */ ret = krb5_store_int16(sp, p->keytype); /* keytype + etype */
if(ret) return ret; if(ret) {
krb5_set_error_message(context, ret,
N_("Cant store keyblock to file %s", ""),
fkt->filename);
return ret;
}
ret = krb5_kt_store_data(context, sp, p->keyvalue); ret = krb5_kt_store_data(context, sp, p->keyvalue);
if (ret)
krb5_set_error_message(context, ret,
N_("Cant store keyblock to file %s", ""),
fkt->filename);
return ret; return ret;
} }
static krb5_error_code static krb5_error_code
krb5_kt_ret_principal(krb5_context context, krb5_kt_ret_principal(krb5_context context,
struct fkt_data *fkt,
krb5_storage *sp, krb5_storage *sp,
krb5_principal *princ) krb5_principal *princ)
{ {
@@ -168,14 +191,17 @@ krb5_kt_ret_principal(krb5_context context,
ALLOC(p, 1); ALLOC(p, 1);
if(p == NULL) { if(p == 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;
} }
ret = krb5_ret_int16(sp, &len); ret = krb5_ret_int16(sp, &len);
if(ret) { if(ret) {
krb5_set_error_message(context, ret, krb5_set_error_message(context, ret,
"Failed decoding length of keytab principal"); N_("Failed decoding length of "
"keytab principal in keytab file %s", ""),
fkt->filename);
goto out; goto out;
} }
if(krb5_storage_is_flags(sp, KRB5_STORAGE_PRINCIPAL_WRONG_NUM_COMPONENTS)) if(krb5_storage_is_flags(sp, KRB5_STORAGE_PRINCIPAL_WRONG_NUM_COMPONENTS))
@@ -183,23 +209,34 @@ krb5_kt_ret_principal(krb5_context context,
if (len < 0) { if (len < 0) {
ret = KRB5_KT_END; ret = KRB5_KT_END;
krb5_set_error_message(context, ret, krb5_set_error_message(context, ret,
"Keytab principal contains invalid length"); N_("Keytab principal contains "
"invalid length in keytab %s", ""),
fkt->filename);
goto out; goto out;
} }
ret = krb5_kt_ret_string(context, sp, &p->realm); ret = krb5_kt_ret_string(context, sp, &p->realm);
if(ret) if(ret) {
krb5_set_error_message(context, ret,
N_("Can't read realm from keytab: %s", ""),
fkt->filename);
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) {
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 out; goto out;
} }
p->name.name_string.len = len; p->name.name_string.len = len;
for(i = 0; i < p->name.name_string.len; i++){ for(i = 0; i < p->name.name_string.len; i++){
ret = krb5_kt_ret_string(context, sp, p->name.name_string.val + i); ret = krb5_kt_ret_string(context, sp, p->name.name_string.val + i);
if(ret) if(ret) {
krb5_set_error_message(context, ret,
N_("Can't read principal from "
"keytab: %s", ""),
fkt->filename);
goto out; goto out;
}
} }
if (krb5_storage_is_flags(sp, KRB5_STORAGE_PRINCIPAL_NO_NAME_TYPE)) if (krb5_storage_is_flags(sp, KRB5_STORAGE_PRINCIPAL_NO_NAME_TYPE))
p->name.name_type = KRB5_NT_UNKNOWN; p->name.name_type = KRB5_NT_UNKNOWN;
@@ -207,8 +244,13 @@ krb5_kt_ret_principal(krb5_context context,
int32_t tmp32; int32_t tmp32;
ret = krb5_ret_int32(sp, &tmp32); ret = krb5_ret_int32(sp, &tmp32);
p->name.name_type = tmp32; p->name.name_type = tmp32;
if (ret) if (ret) {
krb5_set_error_message(context, ret,
N_("Can't read name-type from "
"keytab: %s", ""),
fkt->filename);
goto out; goto out;
}
} }
*princ = p; *princ = p;
return 0; return 0;
@@ -253,13 +295,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_message(context, ENOMEM, "malloc: out of memory"); krb5_set_error_message(context, ENOMEM, N_("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_message(context, ENOMEM, "malloc: out of memory"); krb5_set_error_message(context, ENOMEM, N_("malloc: out of memory", ""));
return ENOMEM; return ENOMEM;
} }
d->flags = 0; d->flags = 0;
@@ -334,7 +376,8 @@ fkt_start_seq_get_int(krb5_context context,
c->fd = open (d->filename, flags); c->fd = open (d->filename, flags);
if (c->fd < 0) { if (c->fd < 0) {
ret = errno; ret = errno;
krb5_set_error_message(context, ret, "keytab %s open failed: %s", krb5_set_error_message(context, ret,
N_("keytab %s open failed: %s", ""),
d->filename, strerror(ret)); d->filename, strerror(ret));
return ret; return ret;
} }
@@ -348,7 +391,8 @@ 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_message(context, ENOMEM, "malloc: out of memory"); krb5_set_error_message(context, ENOMEM,
N_("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);
@@ -396,6 +440,7 @@ fkt_next_entry_int(krb5_context context,
off_t *start, off_t *start,
off_t *end) off_t *end)
{ {
struct fkt_data *d = id->data;
int32_t len; int32_t len;
int ret; int ret;
int8_t tmp8; int8_t tmp8;
@@ -411,7 +456,7 @@ loop:
pos = krb5_storage_seek(cursor->sp, -len, SEEK_CUR); pos = krb5_storage_seek(cursor->sp, -len, SEEK_CUR);
goto loop; goto loop;
} }
ret = krb5_kt_ret_principal (context, cursor->sp, &entry->principal); ret = krb5_kt_ret_principal (context, d, cursor->sp, &entry->principal);
if (ret) if (ret)
goto out; goto out;
ret = krb5_ret_int32(cursor->sp, &tmp32); ret = krb5_ret_int32(cursor->sp, &tmp32);
@@ -422,7 +467,7 @@ loop:
if (ret) if (ret)
goto out; goto out;
entry->vno = tmp8; entry->vno = tmp8;
ret = krb5_kt_ret_keyblock (context, cursor->sp, &entry->keyblock); ret = krb5_kt_ret_keyblock (context, d, cursor->sp, &entry->keyblock);
if (ret) if (ret)
goto out; goto out;
/* there might be a 32 bit kvno here /* there might be a 32 bit kvno here
@@ -493,7 +538,8 @@ fkt_add_entry(krb5_context context,
fd = open (d->filename, O_RDWR | O_CREAT | O_EXCL | O_BINARY | O_CLOEXEC, 0600); fd = open (d->filename, O_RDWR | O_CREAT | O_EXCL | O_BINARY | O_CLOEXEC, 0600);
if (fd < 0) { if (fd < 0) {
ret = errno; ret = errno;
krb5_set_error_message(context, ret, "open(%s): %s", d->filename, krb5_set_error_message(context, ret,
N_("open(%s): %s", ""), d->filename,
strerror(ret)); strerror(ret));
return ret; return ret;
} }
@@ -529,7 +575,8 @@ fkt_add_entry(krb5_context context,
properly */ properly */
ret = fkt_setup_keytab(context, id, sp); ret = fkt_setup_keytab(context, id, sp);
if(ret) { if(ret) {
krb5_set_error_message(context, ret, "%s: keytab is corrupted: %s", krb5_set_error_message(context, ret,
N_("%s: keytab is corrupted: %s", ""),
d->filename, strerror(ret)); d->filename, strerror(ret));
goto out; goto out;
} }
@@ -537,14 +584,17 @@ fkt_add_entry(krb5_context context,
} else { } else {
if(pvno != 5) { if(pvno != 5) {
ret = KRB5_KEYTAB_BADVNO; ret = KRB5_KEYTAB_BADVNO;
krb5_set_error_message(context, ret, "%s: %s", krb5_set_error_message(context, ret,
d->filename, strerror(ret)); N_("Bad version in keytab %s", ""),
d->filename);
goto out; goto out;
} }
ret = krb5_ret_int8 (sp, &tag); ret = krb5_ret_int8 (sp, &tag);
if (ret) { if (ret) {
krb5_set_error_message(context, ret, "%s: reading tag: %s", krb5_set_error_message(context, ret,
d->filename, strerror(ret)); N_("failed reading tag from "
"keytab %s", ""),
d->filename);
goto out; goto out;
} }
id->version = tag; id->version = tag;
@@ -557,25 +607,38 @@ 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_message(context, ret, "malloc: out of memory"); krb5_set_error_message(context, ret,
N_("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);
if(ret) { if(ret) {
krb5_set_error_message(context, ret,
N_("Failed storing principal "
"in keytab %s", ""),
d->filename);
krb5_storage_free(emem); krb5_storage_free(emem);
goto out; goto out;
} }
ret = krb5_store_int32 (emem, entry->timestamp); ret = krb5_store_int32 (emem, entry->timestamp);
if(ret) { if(ret) {
krb5_set_error_message(context, ret,
N_("Failed storing timpstamp "
"in keytab %s", ""),
d->filename);
krb5_storage_free(emem); krb5_storage_free(emem);
goto out; goto out;
} }
ret = krb5_store_int8 (emem, entry->vno % 256); ret = krb5_store_int8 (emem, entry->vno % 256);
if(ret) { if(ret) {
krb5_set_error_message(context, ret,
N_("Failed storing kvno "
"in keytab %s", ""),
d->filename);
krb5_storage_free(emem); krb5_storage_free(emem);
goto out; goto out;
} }
ret = krb5_kt_store_keyblock (context, emem, &entry->keyblock); ret = krb5_kt_store_keyblock (context, d, emem, &entry->keyblock);
if(ret) { if(ret) {
krb5_storage_free(emem); krb5_storage_free(emem);
goto out; goto out;
@@ -583,6 +646,10 @@ fkt_add_entry(krb5_context context,
if ((d->flags & KRB5_KT_FL_JAVA) == 0) { if ((d->flags & KRB5_KT_FL_JAVA) == 0) {
ret = krb5_store_int32 (emem, entry->vno); ret = krb5_store_int32 (emem, entry->vno);
if (ret) { if (ret) {
krb5_set_error_message(context, ret,
N_("Failed storing extended kvno "
"in keytab %s", ""),
d->filename);
krb5_storage_free(emem); krb5_storage_free(emem);
goto out; goto out;
} }
@@ -590,8 +657,13 @@ fkt_add_entry(krb5_context context,
ret = krb5_storage_to_data(emem, &keytab); ret = krb5_storage_to_data(emem, &keytab);
krb5_storage_free(emem); krb5_storage_free(emem);
if(ret) if(ret) {
krb5_set_error_message(context, ret,
N_("Failed converting keytab entry "
"to memory block for keytab %s", ""),
d->filename);
goto out; goto out;
}
} }
while(1) { while(1) {
@@ -610,8 +682,13 @@ fkt_add_entry(krb5_context context,
krb5_storage_seek(sp, len, SEEK_CUR); krb5_storage_seek(sp, len, SEEK_CUR);
} }
ret = krb5_store_int32(sp, len); ret = krb5_store_int32(sp, len);
if(krb5_storage_write(sp, keytab.data, keytab.length) < 0) if(krb5_storage_write(sp, keytab.data, keytab.length) < 0) {
ret = errno; ret = errno;
krb5_set_error_message(context, ret,
N_("Failed writing keytab block "
"in keytab %s: %s", ""),
d->filename, strerror(ret));
}
memset(keytab.data, 0, keytab.length); memset(keytab.data, 0, keytab.length);
krb5_data_free(&keytab); krb5_data_free(&keytab);
out: out: