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

strings should be i18n

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@23769 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2008-09-07 21:21:18 +00:00
parent 3d5dfddd91
commit 29047d38f3
1 changed files with 53 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

93
lib/krb5/fcache.c
View File

@@ -93,11 +93,14 @@ _krb5_xlock(krb5_context context, int fd, krb5_boolean exclusive,
ret = 0; ret = 0;
break; break;
case EAGAIN: case EAGAIN:
krb5_set_error_message(context, ret, "timed out locking cache file %s", krb5_set_error_message(context, ret,
N_("timed out locking cache file %s", "file"),
filename); filename);
break; break;
default: default:
krb5_set_error_message(context, ret, "error locking cache file %s: %s", krb5_set_error_message(context, ret,
N_("error locking cache file %s: %s",
"file, error"),
filename, strerror(ret)); filename, strerror(ret));
break; break;
} }
@@ -128,7 +131,7 @@ _krb5_xunlock(krb5_context context, int fd)
break; break;
default: default:
krb5_set_error_message(context, ret, krb5_set_error_message(context, ret,
"Failed to unlock file: %s", N_("Failed to unlock file: %s", ""),
strerror(ret)); strerror(ret));
break; break;
} }
@@ -144,7 +147,7 @@ write_storage(krb5_context context, krb5_storage *sp, int fd)
ret = krb5_storage_to_data(sp, &data); ret = krb5_storage_to_data(sp, &data);
if (ret) { if (ret) {
krb5_set_error_message(context, ret, "malloc: out of memory"); krb5_set_error_message(context, ret, N_("malloc: out of memory", ""));
return ret; return ret;
} }
sret = write(fd, data.data, data.length); sret = write(fd, data.data, data.length);
@@ -153,7 +156,7 @@ write_storage(krb5_context context, krb5_storage *sp, int fd)
if (ret) { if (ret) {
ret = errno; ret = errno;
krb5_set_error_message(context, ret, krb5_set_error_message(context, ret,
"Failed to write FILE credential data"); N_("Failed to write FILE credential data", ""));
return ret; return ret;
} }
return 0; return 0;
@@ -180,14 +183,14 @@ fcc_resolve(krb5_context context, krb5_ccache *id, const char *res)
f = malloc(sizeof(*f)); f = malloc(sizeof(*f));
if(f == NULL) { if(f == NULL) {
krb5_set_error_message(context, KRB5_CC_NOMEM, krb5_set_error_message(context, KRB5_CC_NOMEM,
"malloc: out of memory"); N_("malloc: out of memory", ""));
return KRB5_CC_NOMEM; return KRB5_CC_NOMEM;
} }
f->filename = strdup(res); f->filename = strdup(res);
if(f->filename == NULL){ if(f->filename == NULL){
free(f); free(f);
krb5_set_error_message(context, KRB5_CC_NOMEM, krb5_set_error_message(context, KRB5_CC_NOMEM,
"malloc: out of memory"); N_("malloc: out of memory", ""));
return KRB5_CC_NOMEM; return KRB5_CC_NOMEM;
} }
f->version = 0; f->version = 0;
@@ -303,20 +306,20 @@ fcc_gen_new(krb5_context context, krb5_ccache *id)
f = malloc(sizeof(*f)); f = malloc(sizeof(*f));
if(f == NULL) { if(f == NULL) {
krb5_set_error_message(context, KRB5_CC_NOMEM, krb5_set_error_message(context, KRB5_CC_NOMEM,
"malloc: out of memory"); N_("malloc: out of memory", ""));
return KRB5_CC_NOMEM; return KRB5_CC_NOMEM;
} }
asprintf (&file, "%sXXXXXX", KRB5_DEFAULT_CCFILE_ROOT); asprintf (&file, "%sXXXXXX", KRB5_DEFAULT_CCFILE_ROOT);
if(file == NULL) { if(file == NULL) {
free(f); free(f);
krb5_set_error_message(context, KRB5_CC_NOMEM, krb5_set_error_message(context, KRB5_CC_NOMEM,
"malloc: out of memory"); N_("malloc: out of memory", ""));
return KRB5_CC_NOMEM; return KRB5_CC_NOMEM;
} }
fd = mkstemp(file); fd = mkstemp(file);
if(fd < 0) { if(fd < 0) {
int ret = errno; int ret = errno;
krb5_set_error_message(context, ret, "mkstemp %s", file); krb5_set_error_message(context, ret, N_("mkstemp %s failed", ""), file);
free(f); free(f);
free(file); free(file);
return ret; return ret;
@@ -369,8 +372,8 @@ fcc_open(krb5_context context,
fd = open(filename, flags, mode); fd = open(filename, flags, mode);
if(fd < 0) { if(fd < 0) {
ret = errno; ret = errno;
krb5_set_error_message(context, ret, "open(%s): %s", filename, krb5_set_error_message(context, ret, N_("open(%s): %s", "file, error"),
strerror(ret)); filename, strerror(ret));
return ret; return ret;
} }
rk_cloexec(fd); rk_cloexec(fd);
@@ -431,7 +434,7 @@ fcc_initialize(krb5_context context,
if (close(fd) < 0) if (close(fd) < 0)
if (ret == 0) { if (ret == 0) {
ret = errno; ret = errno;
krb5_set_error_message (context, ret, "close %s: %s", krb5_set_error_message (context, ret, N_("close %s: %s", ""),
FILENAME(id), strerror(ret)); FILENAME(id), strerror(ret));
} }
return ret; return ret;
@@ -485,7 +488,7 @@ fcc_store_cred(krb5_context context,
if (close(fd) < 0) { if (close(fd) < 0) {
if (ret == 0) { if (ret == 0) {
ret = errno; ret = errno;
krb5_set_error_message (context, ret, "close %s: %s", krb5_set_error_message (context, ret, N_("close %s: %s", ""),
FILENAME(id), strerror(ret)); FILENAME(id), strerror(ret));
} }
} }
@@ -519,17 +522,18 @@ init_fcc (krb5_context context,
if(ret == KRB5_CC_END) { if(ret == KRB5_CC_END) {
ret = ENOENT; ret = ENOENT;
krb5_set_error_message(context, ret, krb5_set_error_message(context, ret,
"Empty credential cache file: %s", N_("Empty credential cache file: %s", ""),
FILENAME(id)); FILENAME(id));
} else } else
krb5_set_error_message(context, ret, "Error reading pvno in " krb5_set_error_message(context, ret, N_("Error reading pvno "
"cache file: %s", FILENAME(id)); "in cache file: %s", ""),
FILENAME(id));
goto out; goto out;
} }
if(pvno != 5) { if(pvno != 5) {
ret = KRB5_CCACHE_BADVNO; ret = KRB5_CCACHE_BADVNO;
krb5_set_error_message(context, ret, "Bad version number in " krb5_set_error_message(context, ret, N_("Bad version number in credential "
"credential cache file: %s", "cache file: %s", ""),
FILENAME(id)); FILENAME(id));
goto out; goto out;
} }
@@ -550,8 +554,8 @@ init_fcc (krb5_context context,
if(ret) { if(ret) {
ret = KRB5_CC_FORMAT; ret = KRB5_CC_FORMAT;
krb5_set_error_message(context, ret, krb5_set_error_message(context, ret,
"Error reading tag length in " N_("Error reading tag length in "
"cache file: %s", FILENAME(id)); "cache file: %s", ""), FILENAME(id));
goto out; goto out;
} }
while(length > 0) { while(length > 0) {
@@ -562,15 +566,18 @@ init_fcc (krb5_context context,
ret = krb5_ret_int16 (sp, &dtag); ret = krb5_ret_int16 (sp, &dtag);
if(ret) { if(ret) {
ret = KRB5_CC_FORMAT; ret = KRB5_CC_FORMAT;
krb5_set_error_message(context, ret, "Error reading dtag in " krb5_set_error_message(context, ret, N_("Error reading dtag in "
"cache file: %s", FILENAME(id)); "cache file: %s", ""),
FILENAME(id));
goto out; goto out;
} }
ret = krb5_ret_int16 (sp, &data_len); ret = krb5_ret_int16 (sp, &data_len);
if(ret) { if(ret) {
ret = KRB5_CC_FORMAT; ret = KRB5_CC_FORMAT;
krb5_set_error_message(context, ret, "Error reading dlength in " krb5_set_error_message(context, ret,
"cache file: %s", FILENAME(id)); N_("Error reading dlength "
"in cache file: %s",""),
FILENAME(id));
goto out; goto out;
} }
switch (dtag) { switch (dtag) {
@@ -578,15 +585,19 @@ init_fcc (krb5_context context,
ret = krb5_ret_int32 (sp, &context->kdc_sec_offset); ret = krb5_ret_int32 (sp, &context->kdc_sec_offset);
if(ret) { if(ret) {
ret = KRB5_CC_FORMAT; ret = KRB5_CC_FORMAT;
krb5_set_error_message(context, ret, "Error reading kdc_sec in " krb5_set_error_message(context, ret,
"cache file: %s", FILENAME(id)); N_("Error reading kdc_sec in "
"cache file: %s", ""),
FILENAME(id));
goto out; goto out;
} }
ret = krb5_ret_int32 (sp, &context->kdc_usec_offset); ret = krb5_ret_int32 (sp, &context->kdc_usec_offset);
if(ret) { if(ret) {
ret = KRB5_CC_FORMAT; ret = KRB5_CC_FORMAT;
krb5_set_error_message(context, ret, "Error reading kdc_usec in " krb5_set_error_message(context, ret,
"cache file: %s", FILENAME(id)); N_("Error reading kdc_usec in "
"cache file: %s", ""),
FILENAME(id));
goto out; goto out;
} }
break; break;
@@ -596,8 +607,8 @@ init_fcc (krb5_context context,
if(ret) { if(ret) {
ret = KRB5_CC_FORMAT; ret = KRB5_CC_FORMAT;
krb5_set_error_message(context, ret, krb5_set_error_message(context, ret,
"Error reading unknown " N_("Error reading unknown "
"tag in cache file: %s", "tag in cache file: %s", ""),
FILENAME(id)); FILENAME(id));
goto out; goto out;
} }
@@ -614,8 +625,9 @@ init_fcc (krb5_context context,
break; break;
default : default :
ret = KRB5_CCACHE_BADVNO; ret = KRB5_CCACHE_BADVNO;
krb5_set_error_message(context, ret, "Unknown version number (%d) in " krb5_set_error_message(context, ret,
"credential cache file: %s", N_("Unknown version number (%d) in "
"credential cache file: %s", ""),
(int)tag, FILENAME(id)); (int)tag, FILENAME(id));
goto out; goto out;
} }
@@ -667,7 +679,7 @@ fcc_get_first (krb5_context context,
*cursor = malloc(sizeof(struct fcc_cursor)); *cursor = malloc(sizeof(struct fcc_cursor));
if (*cursor == NULL) { if (*cursor == 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;
} }
memset(*cursor, 0, sizeof(struct fcc_cursor)); memset(*cursor, 0, sizeof(struct fcc_cursor));
@@ -787,7 +799,7 @@ fcc_get_cache_first(krb5_context context, krb5_cc_cursor *cursor)
iter = calloc(1, sizeof(*iter)); iter = calloc(1, sizeof(*iter));
if (iter == NULL) { if (iter == 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;
} }
iter->first = 1; iter->first = 1;
@@ -841,7 +853,8 @@ fcc_move(krb5_context context, krb5_ccache from, krb5_ccache to)
if (ret && errno != EXDEV) { if (ret && errno != EXDEV) {
ret = errno; ret = errno;
krb5_set_error_message(context, ret, krb5_set_error_message(context, ret,
"Rename of file from %s to %s failed: %s", N_("Rename of file from %s "
"to %s failed: %s", ""),
FILENAME(from), FILENAME(to), FILENAME(from), FILENAME(to),
strerror(ret)); strerror(ret));
return ret; return ret;
@@ -867,16 +880,16 @@ fcc_move(krb5_context context, krb5_ccache from, krb5_ccache to)
if (sz1 != sz2) { if (sz1 != sz2) {
ret = EIO; ret = EIO;
krb5_set_error_message(context, ret, krb5_set_error_message(context, ret,
"Failed to write data from one file " N_("Failed to write data from one file "
"credential cache to the other"); "credential cache to the other", ""));
goto out2; goto out2;
} }
} }
if (sz1 < 0) { if (sz1 < 0) {
ret = EIO; ret = EIO;
krb5_set_error_message(context, ret, krb5_set_error_message(context, ret,
"Failed to read data from one file " N_("Failed to read data from one file "
"credential cache to the other"); "credential cache to the other", ""));
goto out2; goto out2;
} }
out2: out2: