summaryrefslogtreecommitdiffstats
path: root/src/lib/krb5/krb
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/krb5/krb')
-rw-r--r--src/lib/krb5/krb/chpw.c16
-rw-r--r--src/lib/krb5/krb/fast.c22
-rw-r--r--src/lib/krb5/krb/gc_via_tkt.c6
-rw-r--r--src/lib/krb5/krb/get_in_tkt.c10
-rw-r--r--src/lib/krb5/krb/gic_opt.c4
-rw-r--r--src/lib/krb5/krb/gic_opt_set_pa.c6
-rw-r--r--src/lib/krb5/krb/gic_pwd.c24
-rw-r--r--src/lib/krb5/krb/parse.c5
-rw-r--r--src/lib/krb5/krb/plugin.c4
-rw-r--r--src/lib/krb5/krb/preauth2.c18
-rw-r--r--src/lib/krb5/krb/rd_req_dec.c2
11 files changed, 61 insertions, 56 deletions
diff --git a/src/lib/krb5/krb/chpw.c b/src/lib/krb5/krb/chpw.c
index 305808bd61..7e43dcf1a1 100644
--- a/src/lib/krb5/krb/chpw.c
+++ b/src/lib/krb5/krb/chpw.c
@@ -248,28 +248,28 @@ krb5_chpw_result_code_string(krb5_context context, int result_code,
{
switch (result_code) {
case KRB5_KPASSWD_MALFORMED:
- *code_string = "Malformed request error";
+ *code_string = _("Malformed request error");
break;
case KRB5_KPASSWD_HARDERROR:
- *code_string = "Server error";
+ *code_string = _("Server error");
break;
case KRB5_KPASSWD_AUTHERROR:
- *code_string = "Authentication error";
+ *code_string = _("Authentication error");
break;
case KRB5_KPASSWD_SOFTERROR:
- *code_string = "Password change rejected";
+ *code_string = _("Password change rejected");
break;
case KRB5_KPASSWD_ACCESSDENIED:
- *code_string = "Access denied";
+ *code_string = _("Access denied");
break;
case KRB5_KPASSWD_BAD_VERSION:
- *code_string = "Wrong protocol version";
+ *code_string = _("Wrong protocol version");
break;
case KRB5_KPASSWD_INITIAL_FLAG_NEEDED:
- *code_string = "Initial password required";
+ *code_string = _("Initial password required");
break;
default:
- *code_string = "Password change failed";
+ *code_string = _("Password change failed");
break;
}
diff --git a/src/lib/krb5/krb/fast.c b/src/lib/krb5/krb/fast.c
index 3939f0e4ae..0d04cc2b02 100644
--- a/src/lib/krb5/krb/fast.c
+++ b/src/lib/krb5/krb/fast.c
@@ -179,7 +179,7 @@ krb5int_fast_as_armor(krb5_context context,
const char * errmsg;
errmsg = krb5_get_error_message(context, retval);
krb5_set_error_message(context, retval,
- "%s constructing AP-REQ armor", errmsg);
+ _("%s constructing AP-REQ armor"), errmsg);
krb5_free_error_message(context, errmsg);
}
}
@@ -319,7 +319,7 @@ decrypt_fast_reply(krb5_context context,
const char * errmsg;
errmsg = krb5_get_error_message(context, retval);
krb5_set_error_message(context, retval,
- "%s while decrypting FAST reply", errmsg);
+ _("%s while decrypting FAST reply"), errmsg);
krb5_free_error_message(context, errmsg);
}
if (retval == 0)
@@ -327,8 +327,9 @@ decrypt_fast_reply(krb5_context context,
if (retval == 0) {
if (local_resp->nonce != state->nonce) {
retval = KRB5_KDCREP_MODIFIED;
- krb5_set_error_message(context, retval, "nonce modified in FAST "
- "response: KDC response modified");
+ krb5_set_error_message(context, retval,
+ _("nonce modified in FAST response: "
+ "KDC response modified"));
}
}
if (retval == 0) {
@@ -397,8 +398,8 @@ krb5int_fast_process_error(krb5_context context,
KRB5_PADATA_FX_ERROR);
if (fx_error_pa == NULL) {
krb5_set_error_message(context, KRB5KDC_ERR_PREAUTH_FAILED,
- "Expecting FX_ERROR pa-data inside "
- "FAST container");
+ _("Expecting FX_ERROR pa-data inside "
+ "FAST container"));
retval = KRB5KDC_ERR_PREAUTH_FAILED;
}
}
@@ -451,7 +452,7 @@ krb5int_fast_process_error(krb5_context context,
}
krb5_free_pa_data(context, result);
krb5_set_error_message(context, retval,
- "Error decoding padata in error reply");
+ _("Error decoding padata in error reply"));
return retval;
}
}
@@ -479,8 +480,9 @@ krb5int_fast_process_response(krb5_context context,
if (retval == 0) {
if (fast_response->finished == 0) {
retval = KRB5_KDCREP_MODIFIED;
- krb5_set_error_message(context, retval, "FAST response missing "
- "finish message in KDC reply");
+ krb5_set_error_message(context, retval,
+ _("FAST response missing finish message "
+ "in KDC reply"));
}
}
if (retval == 0)
@@ -494,7 +496,7 @@ krb5int_fast_process_response(krb5_context context,
if (retval == 0 && cksum_valid == 0) {
retval = KRB5_KDCREP_MODIFIED;
krb5_set_error_message(context, retval,
- "ticket modified in KDC reply");
+ _("Ticket modified in KDC reply"));
}
if (retval == 0) {
krb5_free_principal(context, resp->client);
diff --git a/src/lib/krb5/krb/gc_via_tkt.c b/src/lib/krb5/krb/gc_via_tkt.c
index 525de0c09b..e25860cb66 100644
--- a/src/lib/krb5/krb/gc_via_tkt.c
+++ b/src/lib/krb5/krb/gc_via_tkt.c
@@ -262,7 +262,7 @@ krb5int_process_tgs_reply(krb5_context context,
switch (err_reply->error) {
case KRB_ERR_GENERIC:
krb5_set_error_message(context, retval,
- "KDC returned error string: %.*s",
+ _("KDC returned error string: %.*s"),
err_reply->text.length,
err_reply->text.data);
break;
@@ -272,8 +272,8 @@ krb5int_process_tgs_reply(krb5_context context,
if (err_reply->server &&
krb5_unparse_name(context, err_reply->server, &s_name) == 0) {
krb5_set_error_message(context, retval,
- "Server %s not found in Kerberos database",
- s_name);
+ _("Server %s not found in Kerberos "
+ "database"), s_name);
krb5_free_unparsed_name(context, s_name);
} else
/* In case there's a stale S_PRINCIPAL_UNKNOWN
diff --git a/src/lib/krb5/krb/get_in_tkt.c b/src/lib/krb5/krb/get_in_tkt.c
index b87eb07b7e..fc00e21d7b 100644
--- a/src/lib/krb5/krb/get_in_tkt.c
+++ b/src/lib/krb5/krb/get_in_tkt.c
@@ -140,8 +140,8 @@ cleanup:
return ret;
verification_error:
ret = KRB5_KDCREP_MODIFIED;
- krb5_set_error_message(context, ret, "Reply has wrong form of session key "
- "for anonymous request");
+ krb5_set_error_message(context, ret, _("Reply has wrong form of session "
+ "key for anonymous request"));
goto cleanup;
}
@@ -1481,7 +1481,7 @@ init_creds_step_reply(krb5_context context,
const char *msg;
msg = krb5_get_error_message(context, code);
krb5_set_error_message(context, code,
- "%s while storing credentials", msg);
+ _("%s while storing credentials"), msg);
krb5_free_error_message(context, msg);
}
}
@@ -1570,8 +1570,8 @@ cleanup:
code2 = krb5_unparse_name(context, ctx->request->client, &client_name);
if (code2 == 0) {
krb5_set_error_message(context, code,
- "Client '%s' not found in Kerberos database",
- client_name);
+ _("Client '%s' not found in Kerberos "
+ "database"), client_name);
krb5_free_unparsed_name(context, client_name);
}
}
diff --git a/src/lib/krb5/krb/gic_opt.c b/src/lib/krb5/krb/gic_opt.c
index 062659b9bf..acb6f126dc 100644
--- a/src/lib/krb5/krb/gic_opt.c
+++ b/src/lib/krb5/krb/gic_opt.c
@@ -288,8 +288,8 @@ krb5int_gic_opt_to_opte(krb5_context context,
return gic_opte_copy(context, opt, opte);
} else {
krb5int_set_error(&context->err, EINVAL,
- "%s: attempt to convert non-extended krb5_get_init_creds_opt",
- where);
+ _("%s: attempt to convert non-extended "
+ "krb5_get_init_creds_opt"), where);
return EINVAL;
}
}
diff --git a/src/lib/krb5/krb/gic_opt_set_pa.c b/src/lib/krb5/krb/gic_opt_set_pa.c
index ff4cbf62f6..a60cc3b2f3 100644
--- a/src/lib/krb5/krb/gic_opt_set_pa.c
+++ b/src/lib/krb5/krb/gic_opt_set_pa.c
@@ -118,8 +118,7 @@ krb5_preauth_supply_preauth_data(krb5_context context,
if (context->preauth_context == NULL) {
retval = EINVAL;
krb5int_set_error(&context->err, retval,
- "krb5_preauth_supply_preauth_data: "
- "Unable to initialize preauth context");
+ _("Unable to initialize preauth context"));
return retval;
}
@@ -136,7 +135,8 @@ krb5_preauth_supply_preauth_data(krb5_context context,
(krb5_get_init_creds_opt *)opte, attr, value);
if (retval) {
emsg = krb5_get_error_message(context, retval);
- krb5int_set_error(&context->err, retval, "Preauth plugin %s: %s",
+ krb5int_set_error(&context->err, retval,
+ _("Preauth plugin %s: %s"),
context->preauth_context->modules[i].name, emsg);
krb5_free_error_message(context, emsg);
break;
diff --git a/src/lib/krb5/krb/gic_pwd.c b/src/lib/krb5/krb/gic_pwd.c
index f76f5be00d..519196e227 100644
--- a/src/lib/krb5/krb/gic_pwd.c
+++ b/src/lib/krb5/krb/gic_pwd.c
@@ -46,7 +46,8 @@ krb5_get_as_key_password(krb5_context context,
if ((ret = krb5_unparse_name(context, client, &clientstr)))
return(ret);
- snprintf(promptstr, sizeof(promptstr), "Password for %s", clientstr);
+ snprintf(promptstr, sizeof(promptstr), _("Password for %s"),
+ clientstr);
free(clientstr);
prompt.prompt = promptstr;
@@ -193,15 +194,15 @@ warn_pw_expiry(krb5_context context, krb5_get_init_creds_opt *options,
delta = pw_exp - now;
if (delta < 3600) {
snprintf(banner, sizeof(banner),
- "Warning: Your password will expire in less than one hour "
- "on %s", ts);
+ _("Warning: Your password will expire in less than one hour "
+ "on %s"), ts);
} else if (delta < 86400*2) {
snprintf(banner, sizeof(banner),
- "Warning: Your password will expire in %d hour%s on %s",
+ _("Warning: Your password will expire in %d hour%s on %s"),
delta / 3600, delta < 7200 ? "" : "s", ts);
} else {
snprintf(banner, sizeof(banner),
- "Warning: Your password will expire in %d days on %s",
+ _("Warning: Your password will expire in %d days on %s"),
delta / 86400, ts);
}
@@ -346,17 +347,17 @@ krb5_get_init_creds_password(krb5_context context,
&use_master, NULL)))
goto cleanup;
- prompt[0].prompt = "Enter new password";
+ prompt[0].prompt = _("Enter new password");
prompt[0].hidden = 1;
prompt[0].reply = &pw0;
prompt_types[0] = KRB5_PROMPT_TYPE_NEW_PASSWORD;
- prompt[1].prompt = "Enter it again";
+ prompt[1].prompt = _("Enter it again");
prompt[1].hidden = 1;
prompt[1].reply = &pw1;
prompt_types[1] = KRB5_PROMPT_TYPE_NEW_PASSWORD_AGAIN;
- strlcpy(banner, "Password expired. You must change it now.",
+ strlcpy(banner, _("Password expired. You must change it now."),
sizeof(banner));
for (tries = 3; tries; tries--) {
@@ -375,11 +376,11 @@ krb5_get_init_creds_password(krb5_context context,
if (strcmp(pw0.data, pw1.data) != 0) {
ret = KRB5_LIBOS_BADPWDMATCH;
snprintf(banner, sizeof(banner),
- "%s. Please try again.", error_message(ret));
+ _("%s. Please try again."), error_message(ret));
} else if (pw0.length == 0) {
ret = KRB5_CHPW_PWDNULL;
snprintf(banner, sizeof(banner),
- "%s. Please try again.", error_message(ret));
+ _("%s. Please try again."), error_message(ret));
} else {
int result_code;
krb5_data code_string;
@@ -414,7 +415,8 @@ krb5_get_init_creds_password(krb5_context context,
if (result_string.length > (sizeof(banner)-100))
result_string.length = sizeof(banner)-100;
- snprintf(banner, sizeof(banner), "%.*s%s%.*s. Please try again.\n",
+ snprintf(banner, sizeof(banner),
+ _("%.*s%s%.*s. Please try again.\n"),
(int) code_string.length, code_string.data,
result_string.length ? ": " : "",
(int) result_string.length,
diff --git a/src/lib/krb5/krb/parse.c b/src/lib/krb5/krb/parse.c
index 14ac02d4b5..9e1f6ee62a 100644
--- a/src/lib/krb5/krb/parse.c
+++ b/src/lib/krb5/krb/parse.c
@@ -162,7 +162,8 @@ k5_parse_name(krb5_context context, const char *name,
if (!parsed_realm) {
if (flags & KRB5_PRINCIPAL_PARSE_REQUIRE_REALM) {
krb5_set_error_message(context, KRB5_PARSE_MALFORMED,
- "Principal %s is missing required realm", name);
+ _("Principal %s is missing required realm"),
+ name);
free(principal->data);
free(principal);
return KRB5_PARSE_MALFORMED;
@@ -179,7 +180,7 @@ k5_parse_name(krb5_context context, const char *name,
realmsize = default_realm_size;
} else if (flags & KRB5_PRINCIPAL_PARSE_NO_REALM) {
krb5_set_error_message(context, KRB5_PARSE_MALFORMED,
- "Principal %s has realm present", name);
+ _("Principal %s has realm present"), name);
free(principal->data);
free(principal);
return KRB5_PARSE_MALFORMED;
diff --git a/src/lib/krb5/krb/plugin.c b/src/lib/krb5/krb/plugin.c
index be909f1443..446d4f22e6 100644
--- a/src/lib/krb5/krb/plugin.c
+++ b/src/lib/krb5/krb/plugin.c
@@ -107,7 +107,7 @@ parse_modstr(krb5_context context, const char *modstr,
sep = strchr(modstr, ':');
if (sep == NULL) {
krb5_set_error_message(context, KRB5_PLUGIN_BAD_MODULE_SPEC,
- "Invalid module specifier %s", modstr);
+ _("Invalid module specifier %s"), modstr);
return KRB5_PLUGIN_BAD_MODULE_SPEC;
}
@@ -318,7 +318,7 @@ k5_plugin_load(krb5_context context, int interface_id, const char *modname,
}
}
krb5_set_error_message(context, KRB5_PLUGIN_NAME_NOTFOUND,
- "Could not find %s plugin module named '%s'",
+ _("Could not find %s plugin module named '%s'"),
interface_names[interface_id], modname);
return KRB5_PLUGIN_NAME_NOTFOUND;
}
diff --git a/src/lib/krb5/krb/preauth2.c b/src/lib/krb5/krb/preauth2.c
index f4896eb96a..82b422eac8 100644
--- a/src/lib/krb5/krb/preauth2.c
+++ b/src/lib/krb5/krb/preauth2.c
@@ -1050,30 +1050,30 @@ sam_challenge_banner(krb5_int32 sam_type)
switch (sam_type) {
case PA_SAM_TYPE_ENIGMA: /* Enigma Logic */
- label = "Challenge for Enigma Logic mechanism";
+ label = _("Challenge for Enigma Logic mechanism");
break;
case PA_SAM_TYPE_DIGI_PATH: /* Digital Pathways */
case PA_SAM_TYPE_DIGI_PATH_HEX: /* Digital Pathways */
- label = "Challenge for Digital Pathways mechanism";
+ label = _("Challenge for Digital Pathways mechanism");
break;
case PA_SAM_TYPE_ACTIVCARD_DEC: /* Digital Pathways */
case PA_SAM_TYPE_ACTIVCARD_HEX: /* Digital Pathways */
- label = "Challenge for Activcard mechanism";
+ label = _("Challenge for Activcard mechanism");
break;
case PA_SAM_TYPE_SKEY_K0: /* S/key where KDC has key 0 */
- label = "Challenge for Enhanced S/Key mechanism";
+ label = _("Challenge for Enhanced S/Key mechanism");
break;
case PA_SAM_TYPE_SKEY: /* Traditional S/Key */
- label = "Challenge for Traditional S/Key mechanism";
+ label = _("Challenge for Traditional S/Key mechanism");
break;
case PA_SAM_TYPE_SECURID: /* Security Dynamics */
- label = "Challenge for Security Dynamics mechanism";
+ label = _("Challenge for Security Dynamics mechanism");
break;
case PA_SAM_TYPE_SECURID_PREDICT: /* predictive Security Dynamics */
- label = "Challenge for Security Dynamics mechanism";
+ label = _("Challenge for Security Dynamics mechanism");
break;
default:
- label = "Challenge from authentication server";
+ label = _("Challenge from authentication server");
break;
}
@@ -1161,7 +1161,7 @@ pa_sam_2(krb5_context context, krb5_kdc_req *request, krb5_pa_data *in_padata,
}
snprintf(name, sizeof(name), "%.*s",
- SAMDATA(sc2b->sam_type_name, "SAM Authentication",
+ SAMDATA(sc2b->sam_type_name, _("SAM Authentication"),
sizeof(name) - 1));
snprintf(banner, sizeof(banner), "%.*s",
diff --git a/src/lib/krb5/krb/rd_req_dec.c b/src/lib/krb5/krb/rd_req_dec.c
index 83c4ef7143..8696a155b9 100644
--- a/src/lib/krb5/krb/rd_req_dec.c
+++ b/src/lib/krb5/krb/rd_req_dec.c
@@ -678,7 +678,7 @@ negotiate_etype(krb5_context context,
enctype_name,
sizeof(enctype_name)) == 0)
krb5_set_error_message(context, KRB5_NOPERM_ETYPE,
- "Encryption type %s not permitted",
+ _("Encryption type %s not permitted"),
enctype_name);
return KRB5_NOPERM_ETYPE;
}
generated by cgit (git 2.34.1) at 2025-03-12 05:17:10 +0000