summaryrefslogtreecommitdiffstats
path: root/src/lib/kadm5
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/kadm5')
-rw-r--r--src/lib/kadm5/alt_prof.c6
-rw-r--r--src/lib/kadm5/logger.c26
-rw-r--r--src/lib/kadm5/srv/kadm5_hook.c2
-rw-r--r--src/lib/kadm5/srv/pwqual_dict.c9
-rw-r--r--src/lib/kadm5/srv/pwqual_empty.c2
-rw-r--r--src/lib/kadm5/srv/pwqual_hesiod.c3
-rw-r--r--src/lib/kadm5/srv/pwqual_princ.c2
-rw-r--r--src/lib/kadm5/srv/server_acl.c19
-rw-r--r--src/lib/kadm5/srv/server_kdb.c2
-rw-r--r--src/lib/kadm5/srv/server_misc.c5
-rw-r--r--src/lib/kadm5/str_conv.c34
11 files changed, 58 insertions, 52 deletions
diff --git a/src/lib/kadm5/alt_prof.c b/src/lib/kadm5/alt_prof.c
index f6ee1c2f80..98231ab330 100644
--- a/src/lib/kadm5/alt_prof.c
+++ b/src/lib/kadm5/alt_prof.c
@@ -902,9 +902,9 @@ kadm5_get_admin_service_name(krb5_context ctx,
if (err != 0) {
ret = KADM5_CANT_RESOLVE;
krb5_set_error_message(ctx, ret,
- "Cannot resolve address of admin server \"%s\" "
- "for realm \"%s\"", params_out.admin_server,
- realm_in);
+ _("Cannot resolve address of admin server "
+ "\"%s\" for realm \"%s\""),
+ params_out.admin_server, realm_in);
goto err_params;
}
if (strlen(ai->ai_canonname) + sizeof("kadmin/") > maxlen) {
diff --git a/src/lib/kadm5/logger.c b/src/lib/kadm5/logger.c
index e45f6b1552..9b99635fac 100644
--- a/src/lib/kadm5/logger.c
+++ b/src/lib/kadm5/logger.c
@@ -53,19 +53,19 @@
#define LOG_ERR 0
#endif /* LOG_ERR */
-#define lspec_parse_err_1 "%s: cannot parse <%s>\n"
-#define lspec_parse_err_2 "%s: warning - logging entry syntax error\n"
-#define log_file_err "%s: error writing to %s\n"
-#define log_device_err "%s: error writing to %s device\n"
+#define lspec_parse_err_1 _("%s: cannot parse <%s>\n")
+#define lspec_parse_err_2 _("%s: warning - logging entry syntax error\n")
+#define log_file_err _("%s: error writing to %s\n")
+#define log_device_err _("%s: error writing to %s device\n")
#define log_ufo_string "?\?\?" /* nb: avoid trigraphs */
-#define log_emerg_string "EMERGENCY"
-#define log_alert_string "ALERT"
-#define log_crit_string "CRITICAL"
-#define log_err_string "Error"
-#define log_warning_string "Warning"
-#define log_notice_string "Notice"
-#define log_info_string "info"
-#define log_debug_string "debug"
+#define log_emerg_string _("EMERGENCY")
+#define log_alert_string _("ALERT")
+#define log_crit_string _("CRITICAL")
+#define log_err_string _("Error")
+#define log_warning_string _("Warning")
+#define log_notice_string _("Notice")
+#define log_info_string _("info")
+#define log_debug_string _("debug")
/*
* Output logging.
@@ -964,7 +964,7 @@ krb5_klog_reopen(krb5_context kcontext)
set_cloexec_file(f);
log_control.log_entries[lindex].lfu_filep = f;
} else {
- fprintf(stderr, "Couldn't open log file %s: %s\n",
+ fprintf(stderr, _("Couldn't open log file %s: %s\n"),
log_control.log_entries[lindex].lfu_fname,
error_message(errno));
}
diff --git a/src/lib/kadm5/srv/kadm5_hook.c b/src/lib/kadm5/srv/kadm5_hook.c
index c9a630ea91..68a6b5eb44 100644
--- a/src/lib/kadm5/srv/kadm5_hook.c
+++ b/src/lib/kadm5/srv/kadm5_hook.c
@@ -116,7 +116,7 @@ log_failure(krb5_context context,
{
const char *e = krb5_get_error_message(context, ret);
- krb5_klog_syslog(LOG_ERR, "kadm5_hook %s failed postcommit %s: %s",
+ krb5_klog_syslog(LOG_ERR, _("kadm5_hook %s failed postcommit %s: %s"),
name, function, e);
krb5_free_error_message(context, e);
}
diff --git a/src/lib/kadm5/srv/pwqual_dict.c b/src/lib/kadm5/srv/pwqual_dict.c
index 778b177b5e..f736eacf4a 100644
--- a/src/lib/kadm5/srv/pwqual_dict.c
+++ b/src/lib/kadm5/srv/pwqual_dict.c
@@ -102,15 +102,16 @@ init_dict(dict_moddata dict, const char *dict_file)
struct stat sb;
if (dict_file == NULL) {
- krb5_klog_syslog(LOG_INFO, "No dictionary file specified, continuing "
- "without one.");
+ krb5_klog_syslog(LOG_INFO,
+ _("No dictionary file specified, continuing without "
+ "one."));
return KADM5_OK;
}
if ((fd = open(dict_file, O_RDONLY)) == -1) {
if (errno == ENOENT) {
krb5_klog_syslog(LOG_ERR,
- "WARNING! Cannot find dictionary file %s, "
- "continuing without one.", dict_file);
+ _("WARNING! Cannot find dictionary file %s, "
+ "continuing without one."), dict_file);
return KADM5_OK;
} else
return errno;
diff --git a/src/lib/kadm5/srv/pwqual_empty.c b/src/lib/kadm5/srv/pwqual_empty.c
index 8c26a13c32..67118db019 100644
--- a/src/lib/kadm5/srv/pwqual_empty.c
+++ b/src/lib/kadm5/srv/pwqual_empty.c
@@ -39,7 +39,7 @@ empty_check(krb5_context context, krb5_pwqual_moddata data,
* with no password policy. */
if (*password == '\0') {
krb5_set_error_message(context, KADM5_PASS_Q_TOOSHORT,
- "Empty passwords are not allowed");
+ _("Empty passwords are not allowed"));
return KADM5_PASS_Q_TOOSHORT;
}
return 0;
diff --git a/src/lib/kadm5/srv/pwqual_hesiod.c b/src/lib/kadm5/srv/pwqual_hesiod.c
index 43f4f84b8f..28959d76ed 100644
--- a/src/lib/kadm5/srv/pwqual_hesiod.c
+++ b/src/lib/kadm5/srv/pwqual_hesiod.c
@@ -111,7 +111,8 @@ hesiod_check(krb5_context context, krb5_pwqual_moddata data,
ent = hes_getpwnam(cp);
if (ent && ent->pw_gecos && str_check_gecos(ent->pw_gecos, password)) {
krb5_set_error_message(context, KADM5_PASS_Q_DICT,
- "Password maynot match user information.");
+ _("Password may not match user "
+ "information."));
return KADM5_PASS_Q_DICT;
}
}
diff --git a/src/lib/kadm5/srv/pwqual_princ.c b/src/lib/kadm5/srv/pwqual_princ.c
index ff16ccf758..f733a393f9 100644
--- a/src/lib/kadm5/srv/pwqual_princ.c
+++ b/src/lib/kadm5/srv/pwqual_princ.c
@@ -51,7 +51,7 @@ princ_check(krb5_context context, krb5_pwqual_moddata data,
cp = krb5_princ_component(handle->context, princ, i)->data;
if (strcasecmp(cp, password) == 0) {
krb5_set_error_message(context, KADM5_PASS_Q_DICT,
- "Password may not match principal name");
+ _("Password may not match principal name"));
return KADM5_PASS_Q_DICT;
}
}
diff --git a/src/lib/kadm5/srv/server_acl.c b/src/lib/kadm5/srv/server_acl.c
index 0ca30f44db..17d4992700 100644
--- a/src/lib/kadm5/srv/server_acl.c
+++ b/src/lib/kadm5/srv/server_acl.c
@@ -87,10 +87,12 @@ static int acl_debug_level = 0;
*/
static const char *acl_catchall_entry = NULL;
-static const char *acl_line2long_msg = "%s: line %d too long, truncated";
-static const char *acl_op_bad_msg = "Unrecognized ACL operation '%c' in %s";
-static const char *acl_syn_err_msg = "%s: syntax error at line %d <%10s...>";
-static const char *acl_cantopen_msg = "%s while opening ACL file %s";
+static const char *acl_line2long_msg = N_("%s: line %d too long, truncated");
+static const char *acl_op_bad_msg = N_("Unrecognized ACL operation '%c' in "
+ "%s");
+static const char *acl_syn_err_msg = N_("%s: syntax error at line %d "
+ "<%10s...>");
+static const char *acl_cantopen_msg = N_("%s while opening ACL file %s");
/*
@@ -132,7 +134,8 @@ kadm5int_acl_get_line(fp, lnp)
if (i == sizeof acl_buf && (i--, !feof(fp))) {
int c1 = acl_buf[i], c2;
- krb5_klog_syslog(LOG_ERR, acl_line2long_msg, acl_acl_file, *lnp);
+ krb5_klog_syslog(LOG_ERR, _(acl_line2long_msg), acl_acl_file,
+ *lnp);
while ((c2 = fgetc(fp)) != EOF) {
if (c2 == '\n') {
if (c1 != '\\')
@@ -208,7 +211,7 @@ kadm5int_acl_parse_line(lp)
}
}
if (!found) {
- krb5_klog_syslog(LOG_ERR, acl_op_bad_msg, *op, lp);
+ krb5_klog_syslog(LOG_ERR, _(acl_op_bad_msg), *op, lp);
opok = 0;
}
}
@@ -497,7 +500,7 @@ kadm5int_acl_load_acl_file()
*aentpp = kadm5int_acl_parse_line(alinep);
/* If syntax error, then fall out */
if (!*aentpp) {
- krb5_klog_syslog(LOG_ERR, acl_syn_err_msg,
+ krb5_klog_syslog(LOG_ERR, _(acl_syn_err_msg),
acl_acl_file, alineno, alinep);
retval = 0;
break;
@@ -522,7 +525,7 @@ kadm5int_acl_load_acl_file()
}
}
else {
- krb5_klog_syslog(LOG_ERR, acl_cantopen_msg,
+ krb5_klog_syslog(LOG_ERR, _(acl_cantopen_msg),
error_message(errno), acl_acl_file);
if (acl_catchall_entry &&
(acl_list_head = kadm5int_acl_parse_line(acl_catchall_entry))) {
diff --git a/src/lib/kadm5/srv/server_kdb.c b/src/lib/kadm5/srv/server_kdb.c
index deb718149e..e8a78103cf 100644
--- a/src/lib/kadm5/srv/server_kdb.c
+++ b/src/lib/kadm5/srv/server_kdb.c
@@ -192,7 +192,7 @@ kdb_get_hist_key(kadm5_server_handle_t handle, krb5_keyblock *hist_keyblock,
if (kdb->n_key_data <= 0) {
ret = KRB5_KDB_NO_MATCHING_KEY;
krb5_set_error_message(handle->context, ret,
- "History entry contains no key data");
+ _("History entry contains no key data"));
goto done;
}
diff --git a/src/lib/kadm5/srv/server_misc.c b/src/lib/kadm5/srv/server_misc.c
index 907a3c5c9a..30a0b5abda 100644
--- a/src/lib/kadm5/srv/server_misc.c
+++ b/src/lib/kadm5/srv/server_misc.c
@@ -142,8 +142,9 @@ passwd_check(kadm5_server_handle_t handle, const char *password,
char *princname;
if (krb5_unparse_name(handle->context, princ, &princname) != 0)
princname = NULL;
- krb5_klog_syslog(LOG_ERR, "password quality module %s rejected "
- "password for %s: %s", modname,
+ krb5_klog_syslog(LOG_ERR,
+ _("password quality module %s rejected password "
+ "for %s: %s"), modname,
princname ? princname : "(can't unparse)", e);
krb5_free_error_message(handle->context, e);
free(princname);
diff --git a/src/lib/kadm5/str_conv.c b/src/lib/kadm5/str_conv.c
index 5151d18190..b36af1e246 100644
--- a/src/lib/kadm5/str_conv.c
+++ b/src/lib/kadm5/str_conv.c
@@ -77,22 +77,22 @@ static const char flags_pwsvc_in[] = "pwservice";
static const char flags_md5_in[] = "md5";
static const char flags_ok_to_auth_as_delegate_in[] = "ok-to-auth-as-delegate";
static const char flags_no_auth_data_required_in[] = "no-auth-data-required";
-static const char flags_pdate_out[] = "Not Postdateable";
-static const char flags_fwd_out[] = "Not Forwardable";
-static const char flags_tgtbased_out[] = "No TGT-based requests";
-static const char flags_renew_out[] = "Not renewable";
-static const char flags_proxy_out[] = "Not proxiable";
-static const char flags_dup_skey_out[] = "No DUP_SKEY requests";
-static const char flags_tickets_out[] = "All Tickets Disallowed";
-static const char flags_preauth_out[] = "Preauthentication required";
-static const char flags_hwauth_out[] = "HW authentication required";
-static const char flags_ok_as_delegate_out[] = "OK as Delegate";
-static const char flags_pwchange_out[] = "Password Change required";
-static const char flags_service_out[] = "Service Disabled";
-static const char flags_pwsvc_out[] = "Password Changing Service";
-static const char flags_md5_out[] = "RSA-MD5 supported";
-static const char flags_ok_to_auth_as_delegate_out[] = "Protocol transition with delegation allowed";
-static const char flags_no_auth_data_required_out[] = "No authorization data required";
+static const char flags_pdate_out[] = N_("Not Postdateable");
+static const char flags_fwd_out[] = N_("Not Forwardable");
+static const char flags_tgtbased_out[] = N_("No TGT-based requests");
+static const char flags_renew_out[] = N_("Not renewable");
+static const char flags_proxy_out[] = N_("Not proxiable");
+static const char flags_dup_skey_out[] = N_("No DUP_SKEY requests");
+static const char flags_tickets_out[] = N_("All Tickets Disallowed");
+static const char flags_preauth_out[] = N_("Preauthentication required");
+static const char flags_hwauth_out[] = N_("HW authentication required");
+static const char flags_ok_as_delegate_out[] = N_("OK as Delegate");
+static const char flags_pwchange_out[] = N_("Password Change required");
+static const char flags_service_out[] = N_("Service Disabled");
+static const char flags_pwsvc_out[] = N_("Password Changing Service");
+static const char flags_md5_out[] = N_("RSA-MD5 supported");
+static const char flags_ok_to_auth_as_delegate_out[] = N_("Protocol transition with delegation allowed");
+static const char flags_no_auth_data_required_out[] = N_("No authorization data required");
static const char flags_default_neg[] = "-";
static const char flags_default_sep[] = " ";
@@ -189,7 +189,7 @@ krb5_flags_to_string(flags, sep, buffer, buflen)
if (flags & flags_table[i].fl_flags) {
if (krb5int_buf_len(&buf) > 0)
krb5int_buf_add(&buf, sepstring);
- krb5int_buf_add(&buf, flags_table[i].fl_output);
+ krb5int_buf_add(&buf, _(flags_table[i].fl_output));
/* Keep track of what we matched */
pflags |= flags_table[i].fl_flags;
}
generated by cgit (git 2.34.1) at 2025-03-12 05:46:00 +0000