summaryrefslogtreecommitdiffstats
path: root/src/lib
diff options
context:
space:
mode:
authorGreg Hudson <ghudson@mit.edu>2011-06-10 18:17:37 +0000
committerGreg Hudson <ghudson@mit.edu>2011-06-10 18:17:37 +0000
commit16277050f158f062337d1d08258f9499dbc1cdc7 (patch)
tree713b2deadd3696c359e9b0051db9fa3de1d5a518 /src/lib
parentcb8b1138d6e349a77507f3c561fc7ee2dde5cd7c (diff)
Mark up strings for translation
ticket: 6918 git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@24961 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/apputils/net-server.c139
-rw-r--r--src/lib/crypto/krb/cf2.c2
-rw-r--r--src/lib/gssapi/generic/disp_major_status.c66
-rw-r--r--src/lib/gssapi/krb5/acquire_cred.c5
-rw-r--r--src/lib/gssapi/mechglue/g_dsp_status.c93
-rw-r--r--src/lib/gssapi/spnego/spnego_mech.c15
-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
-rw-r--r--src/lib/kdb/kdb5.c36
-rw-r--r--src/lib/kdb/kdb_default.c30
-rw-r--r--src/lib/kdb/kdb_log.c2
-rw-r--r--src/lib/krb5/ccache/cc_file.c6
-rw-r--r--src/lib/krb5/keytab/kt_file.c13
-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
-rw-r--r--src/lib/krb5/os/locate_kdc.c4
-rw-r--r--src/lib/krb5/os/sendto_kdc.c4
-rw-r--r--src/lib/krb5/rcache/rc_io.c36
36 files changed, 355 insertions, 323 deletions
diff --git a/src/lib/apputils/net-server.c b/src/lib/apputils/net-server.c
index abb94dd91..a1bbaa559 100644
--- a/src/lib/apputils/net-server.c
+++ b/src/lib/apputils/net-server.c
@@ -365,7 +365,7 @@ add_fd(struct socksetup *data, int sock, enum conn_type conntype,
if (sock >= FD_SETSIZE) {
data->retval = EMFILE; /* XXX */
com_err(data->prog, 0,
- "file descriptor number %d too high", sock);
+ _("file descriptor number %d too high"), sock);
return 0;
}
#endif
@@ -373,12 +373,12 @@ add_fd(struct socksetup *data, int sock, enum conn_type conntype,
if (newconn == NULL) {
data->retval = ENOMEM;
com_err(data->prog, ENOMEM,
- "cannot allocate storage for connection info");
+ _("cannot allocate storage for connection info"));
return 0;
}
if (!ADD(connections, newconn, tmp)) {
data->retval = ENOMEM;
- com_err(data->prog, ENOMEM, "cannot save socket info");
+ com_err(data->prog, ENOMEM, _("cannot save socket info"));
free(newconn);
return 0;
}
@@ -447,7 +447,7 @@ create_server_socket(struct socksetup *data, struct sockaddr *addr, int type)
sock = socket(addr->sa_family, type, 0);
if (sock == -1) {
data->retval = errno;
- com_err(data->prog, errno, "Cannot create TCP server socket on %s",
+ com_err(data->prog, errno, _("Cannot create TCP server socket on %s"),
paddr(addr));
return -1;
}
@@ -456,7 +456,7 @@ create_server_socket(struct socksetup *data, struct sockaddr *addr, int type)
#ifndef _WIN32 /* Windows FD_SETSIZE is a count. */
if (sock >= FD_SETSIZE) {
close(sock);
- com_err(data->prog, 0, "TCP socket fd number %d (for %s) too high",
+ com_err(data->prog, 0, _("TCP socket fd number %d (for %s) too high"),
sock, paddr(addr));
return -1;
}
@@ -464,27 +464,27 @@ create_server_socket(struct socksetup *data, struct sockaddr *addr, int type)
if (setreuseaddr(sock, 1) < 0) {
com_err(data->prog, errno,
- "Cannot enable SO_REUSEADDR on fd %d", sock);
+ _("Cannot enable SO_REUSEADDR on fd %d"), sock);
}
#ifdef KRB5_USE_INET6
if (addr->sa_family == AF_INET6) {
#ifdef IPV6_V6ONLY
if (setv6only(sock, 1))
- com_err(data->prog, errno, "setsockopt(%d,IPV6_V6ONLY,1) failed",
- sock);
+ com_err(data->prog, errno,
+ _("setsockopt(%d,IPV6_V6ONLY,1) failed"), sock);
else
- com_err(data->prog, 0, "setsockopt(%d,IPV6_V6ONLY,1) worked",
+ com_err(data->prog, 0, _("setsockopt(%d,IPV6_V6ONLY,1) worked"),
sock);
#else
- krb5_klog_syslog(LOG_INFO, "no IPV6_V6ONLY socket option support");
+ krb5_klog_syslog(LOG_INFO, _("no IPV6_V6ONLY socket option support"));
#endif /* IPV6_V6ONLY */
}
#endif /* KRB5_USE_INET6 */
if (bind(sock, addr, socklen(addr)) == -1) {
data->retval = errno;
- com_err(data->prog, errno, "Cannot bind server socket on %s",
+ com_err(data->prog, errno, _("Cannot bind server socket on %s"),
paddr(addr));
close(sock);
return -1;
@@ -504,7 +504,8 @@ add_rpc_listener_fd(struct socksetup *data, struct rpc_svc_data *svc, int sock)
conn->u.rpc.transp = svctcp_create(sock, 0, 0);
if (conn->u.rpc.transp == NULL) {
- krb5_klog_syslog(LOG_ERR, "Cannot create RPC service: %s; continuing",
+ krb5_klog_syslog(LOG_ERR,
+ _("Cannot create RPC service: %s; continuing"),
strerror(errno));
delete_fd(conn);
return NULL;
@@ -512,7 +513,8 @@ add_rpc_listener_fd(struct socksetup *data, struct rpc_svc_data *svc, int sock)
if (!svc_register(conn->u.rpc.transp, svc->prognum, svc->versnum,
svc->dispatch, 0)) {
- krb5_klog_syslog(LOG_ERR, "Cannot register RPC service: %s; continuing",
+ krb5_klog_syslog(LOG_ERR,
+ _("Cannot register RPC service: %s; continuing"),
strerror(errno));
delete_fd(conn);
return NULL;
@@ -558,21 +560,21 @@ setup_a_tcp_listener(struct socksetup *data, struct sockaddr *addr)
if (sock == -1)
return -1;
if (listen(sock, 5) < 0) {
- com_err(data->prog, errno, "Cannot listen on TCP server socket on %s",
- paddr(addr));
+ com_err(data->prog, errno,
+ _("Cannot listen on TCP server socket on %s"), paddr(addr));
close(sock);
return -1;
}
if (setnbio(sock)) {
com_err(data->prog, errno,
- "cannot set listening tcp socket on %s non-blocking",
+ _("cannot set listening tcp socket on %s non-blocking"),
paddr(addr));
close(sock);
return -1;
}
if (setnolinger(sock)) {
- com_err(data->prog, errno, "disabling SO_LINGER on TCP socket on %s",
- paddr(addr));
+ com_err(data->prog, errno,
+ _("disabling SO_LINGER on TCP socket on %s"), paddr(addr));
close(sock);
return -1;
}
@@ -637,7 +639,7 @@ setup_tcp_listener_ports(struct socksetup *data)
FD_SET(s4, &sstate.rfds);
if (s4 >= sstate.max)
sstate.max = s4 + 1;
- krb5_klog_syslog(LOG_INFO, "listening on fd %d: tcp %s",
+ krb5_klog_syslog(LOG_INFO, _("listening on fd %d: tcp %s"),
s4, paddr((struct sockaddr *)&sin4));
}
}
@@ -650,12 +652,12 @@ setup_tcp_listener_ports(struct socksetup *data)
FD_SET(s6, &sstate.rfds);
if (s6 >= sstate.max)
sstate.max = s6 + 1;
- krb5_klog_syslog(LOG_INFO, "listening on fd %d: tcp %s",
+ krb5_klog_syslog(LOG_INFO, _("listening on fd %d: tcp %s"),
s6, paddr((struct sockaddr *)&sin6));
}
if (s4 < 0)
krb5_klog_syslog(LOG_INFO,
- "assuming IPv6 socket accepts IPv4");
+ _("assuming IPv6 socket accepts IPv4"));
}
#endif
}
@@ -705,7 +707,7 @@ setup_rpc_listener_ports(struct socksetup *data)
FD_SET(s4, &sstate.rfds);
if (s4 >= sstate.max)
sstate.max = s4 + 1;
- krb5_klog_syslog(LOG_INFO, "listening on fd %d: rpc %s",
+ krb5_klog_syslog(LOG_INFO, _("listening on fd %d: rpc %s"),
s4, paddr((struct sockaddr *)&sin4));
}
@@ -723,7 +725,7 @@ setup_rpc_listener_ports(struct socksetup *data)
FD_SET(s6, &sstate.rfds);
if (s6 >= sstate.max)
sstate.max = s6 + 1;
- krb5_klog_syslog(LOG_INFO, "listening on fd %d: rpc %s",
+ krb5_klog_syslog(LOG_INFO, _("listening on fd %d: rpc %s"),
s6, paddr((struct sockaddr *)&sin6));
}
}
@@ -812,15 +814,16 @@ setup_udp_port_1(struct socksetup *data, struct sockaddr *addr,
if (pktinfo) {
r = set_pktinfo(sock, addr->sa_family);
if (r) {
- com_err(data->prog, r, "Cannot request packet info for "
- "udp socket address %s port %d", haddrbuf, port);
+ com_err(data->prog, r,
+ _("Cannot request packet info for udp socket address "
+ "%s port %d"), haddrbuf, port);
close(sock);
return 1;
}
}
- krb5_klog_syslog (LOG_INFO, "listening on fd %d: udp %s%s", sock,
- paddr((struct sockaddr *)addr),
- pktinfo ? " (pktinfo)" : "");
+ krb5_klog_syslog(LOG_INFO, _("listening on fd %d: udp %s%s"), sock,
+ paddr((struct sockaddr *)addr),
+ pktinfo ? " (pktinfo)" : "");
if (add_udp_fd (data, sock, pktinfo) == 0) {
close(sock);
return 1;
@@ -861,7 +864,7 @@ setup_udp_port(void *P_data, struct sockaddr *addr)
{
static int first = 1;
if (first) {
- krb5_klog_syslog (LOG_INFO, "skipping local ipv6 addresses");
+ krb5_klog_syslog(LOG_INFO, _("skipping local ipv6 addresses"));
first = 0;
}
return 0;
@@ -881,9 +884,9 @@ setup_udp_port(void *P_data, struct sockaddr *addr)
return 0;
#endif
default:
- krb5_klog_syslog (LOG_INFO,
- "skipping unrecognized local address family %d",
- addr->sa_family);
+ krb5_klog_syslog(LOG_INFO,
+ _("skipping unrecognized local address family %d"),
+ addr->sa_family);
return 0;
}
return setup_udp_port_1(data, addr, haddrbuf, 0);
@@ -984,14 +987,14 @@ process_routing_update(void *handle, struct connection *conn, const char *prog,
n_read < RS(rtm_version) ||
n_read < RS(rtm_msglen)) {
krb5_klog_syslog(LOG_ERR,
- "short read (%d/%d) from routing socket",
+ _("short read (%d/%d) from routing socket"),
n_read, (int) sizeof(rtm));
return;
}
}
#if 0
krb5_klog_syslog(LOG_INFO,
- "got routing msg type %d(%s) v%d",
+ _("got routing msg type %d(%s) v%d"),
rtm.rtm_type, rtm_type_name(rtm.rtm_type),
rtm.rtm_version);
#endif
@@ -1000,7 +1003,7 @@ process_routing_update(void *handle, struct connection *conn, const char *prog,
thrown away? */
} else if (rtm.rtm_msglen != n_read) {
krb5_klog_syslog(LOG_ERR,
- "read %d from routing socket but msglen is %d",
+ _("read %d from routing socket but msglen is %d"),
n_read, rtm.rtm_msglen);
}
switch (rtm.rtm_type) {
@@ -1057,8 +1060,9 @@ process_routing_update(void *handle, struct connection *conn, const char *prog,
#endif
break;
default:
- krb5_klog_syslog(LOG_INFO, "unhandled routing message type %d, "
- "will reconfigure just for the fun of it",
+ krb5_klog_syslog(LOG_INFO,
+ _("unhandled routing message type %d, "
+ "will reconfigure just for the fun of it"),
rtm.rtm_type);
network_reconfiguration_needed = 1;
break;
@@ -1072,10 +1076,10 @@ setup_routing_socket(struct socksetup *data)
int sock = socket(PF_ROUTE, SOCK_RAW, 0);
if (sock < 0) {
int e = errno;
- krb5_klog_syslog(LOG_INFO, "couldn't set up routing socket: %s",
+ krb5_klog_syslog(LOG_INFO, _("couldn't set up routing socket: %s"),
strerror(e));
} else {
- krb5_klog_syslog(LOG_INFO, "routing socket is fd %d", sock);
+ krb5_klog_syslog(LOG_INFO, _("routing socket is fd %d"), sock);
add_fd(data, sock, CONN_ROUTING, process_routing_update);
setnbio(sock);
FD_SET(sock, &sstate.rfds);
@@ -1102,7 +1106,7 @@ setup_network(void *handle, const char *prog, int no_reconfig)
setup_data.prog = prog;
setup_data.retval = 0;
- krb5_klog_syslog (LOG_INFO, "setting up network...");
+ krb5_klog_syslog(LOG_INFO, _("setting up network..."));
#ifdef HAVE_STRUCT_RT_MSGHDR
if (!no_reconfig)
setup_routing_socket(&setup_data);
@@ -1122,9 +1126,9 @@ setup_network(void *handle, const char *prog, int no_reconfig)
}
setup_tcp_listener_ports(&setup_data);
setup_rpc_listener_ports(&setup_data);
- krb5_klog_syslog (LOG_INFO, "set up %d sockets", (int)n_sockets);
+ krb5_klog_syslog (LOG_INFO, _("set up %d sockets"), (int)n_sockets);
if (n_sockets == 0) {
- com_err(prog, 0, "no sockets set up?");
+ com_err(prog, 0, _("no sockets set up?"));
exit (1);
}
@@ -1386,7 +1390,7 @@ process_packet(void *handle, struct connection *conn, const char *prog,
*/
&& errno != ECONNREFUSED
)
- com_err(prog, errno, "while receiving from network");
+ com_err(prog, errno, _("while receiving from network"));
return;
}
if (!cc)
@@ -1421,7 +1425,7 @@ process_packet(void *handle, struct connection *conn, const char *prog,
/* This address is in net order. */
retval = dispatch(handle, ss2sa(&daddr), &faddr, &request, &response, 0);
if (retval) {
- com_err(prog, retval, "while dispatching (udp)");
+ com_err(prog, retval, _("while dispatching (udp)"));
return;
}
if (response == NULL)
@@ -1448,12 +1452,12 @@ process_packet(void *handle, struct connection *conn, const char *prog,
strlcpy(saddrbuf, "?", sizeof(saddrbuf));
strlcpy(sportbuf, "?", sizeof(sportbuf));
}
- com_err(prog, e, "while sending reply to %s/%s from %s",
+ com_err(prog, e, _("while sending reply to %s/%s from %s"),
saddrbuf, sportbuf, daddrbuf);
return;
}
if ((size_t)cc != response->length) {
- com_err(prog, 0, "short reply write %d vs %d\n",
+ com_err(prog, 0, _("short reply write %d vs %d\n"),
response->length, cc);
}
krb5_free_data(get_context(handle), response);
@@ -1473,7 +1477,7 @@ kill_lru_tcp_or_rpc_connection(void *handle, struct connection *newconn)
struct connection *c;
int i, fd = -1;
- krb5_klog_syslog(LOG_INFO, "too many connections");
+ krb5_klog_syslog(LOG_INFO, _("too many connections"));
FOREACH_ELT (connections, i, c) {
if (c->type != CONN_TCP && c->type != CONN_RPC)
@@ -1489,7 +1493,7 @@ kill_lru_tcp_or_rpc_connection(void *handle, struct connection *newconn)
oldest_tcp = c;
}
if (oldest_tcp != NULL) {
- krb5_klog_syslog(LOG_INFO, "dropping %s fd %d from %s",
+ krb5_klog_syslog(LOG_INFO, _("dropping %s fd %d from %s"),
c->type == CONN_RPC ? "rpc" : "tcp",
oldest_tcp->fd, oldest_tcp->u.tcp.addrbuf);
fd = oldest_tcp->fd;
@@ -1559,7 +1563,8 @@ accept_tcp_connection(void *handle, struct connection *conn, const char *prog,
kill_lru_tcp_or_rpc_connection(handle, newconn);
if (newconn->u.tcp.buffer == 0) {
- com_err(prog, errno, "allocating buffer for new TCP session from %s",
+ com_err(prog, errno,
+ _("allocating buffer for new TCP session from %s"),
newconn->u.tcp.addrbuf);
delete_fd(newconn);
close(s);
@@ -1616,7 +1621,7 @@ kill_tcp_or_rpc_connection(void *handle, struct connection *conn,
if (FD_ISSET(conn->fd, &svc_fdset)) {
krb5_klog_syslog(LOG_ERR,
- "descriptor %d closed but still in svc_fdset",
+ _("descriptor %d closed but still in svc_fdset"),
conn->fd);
}
}
@@ -1707,15 +1712,17 @@ process_tcp_connection(void *handle, struct connection *conn, const char *prog,
if (conn->u.tcp.msglen > conn->u.tcp.bufsiz - 4) {
krb5_error_code err;
/* Message too big. */
- krb5_klog_syslog(LOG_ERR, "TCP client %s wants %lu bytes, "
- "cap is %lu", conn->u.tcp.addrbuf,
+ krb5_klog_syslog(LOG_ERR,
+ _("TCP client %s wants %lu bytes, "
+ "cap is %lu"), conn->u.tcp.addrbuf,
(unsigned long) conn->u.tcp.msglen,
(unsigned long) conn->u.tcp.bufsiz - 4);
/* XXX Should return an error. */
err = make_toolong_error (handle, &conn->u.tcp.response);
if (err) {
- krb5_klog_syslog(LOG_ERR, "error constructing "
- "KRB_ERR_FIELD_TOOLONG error! %s",
+ krb5_klog_syslog(LOG_ERR,
+ _("error constructing "
+ "KRB_ERR_FIELD_TOOLONG error! %s"),
error_message(err));
goto kill_tcp_connection;
}
@@ -1751,7 +1758,7 @@ process_tcp_connection(void *handle, struct connection *conn, const char *prog,
err = dispatch(handle, local_saddrp, &conn->u.tcp.faddr,
&request, &conn->u.tcp.response, 1);
if (err) {
- com_err(prog, err, "while dispatching (tcp)");
+ com_err(prog, err, _("while dispatching (tcp)"));
goto kill_tcp_connection;
}
if (conn->u.tcp.response == NULL)
@@ -1814,13 +1821,15 @@ listen_and_process(void *handle, const char *prog, void (*reset)(void))
if (network_reconfiguration_needed) {
/* No point in re-logging what we've just logged. */
- if (netchanged == 0)
- krb5_klog_syslog(LOG_INFO, "network reconfiguration needed");
+ if (netchanged == 0) {
+ krb5_klog_syslog(LOG_INFO,
+ _("network reconfiguration needed"));
+ }
/* It might be tidier to add a timer-callback interface to the
* control loop, but for this one use, it's not a big deal. */
err = getcurtime(&sstate.end_time);
if (err) {
- com_err(prog, err, "while getting the time");
+ com_err(prog, err, _("while getting the time"));
continue;
}
sstate.end_time.tv_sec += 3;
@@ -1831,7 +1840,7 @@ listen_and_process(void *handle, const char *prog, void (*reset)(void))
err = krb5int_cm_call_select(&sstate, &sout, &sret);
if (err) {
if (err != EINTR)
- com_err(prog, err, "while selecting for network input(1)");
+ com_err(prog, err, _("while selecting for network input(1)"));
continue;
}
if (sret == 0 && netchanged) {
@@ -1839,14 +1848,16 @@ listen_and_process(void *handle, const char *prog, void (*reset)(void))
closedown_network_sockets();
err = setup_network(handle, prog, 0);
if (err) {
- com_err(prog, err, "while reinitializing network");
+ com_err(prog, err, _("while reinitializing network"));
return err;
}
netchanged = 0;
}
if (sret == -1) {
- if (errno != EINTR)
- com_err(prog, errno, "while selecting for network input(2)");
+ if (errno != EINTR) {
+ com_err(prog, errno,
+ _("while selecting for network input(2)"));
+ }
continue;
}
nfound = sret;
@@ -1862,7 +1873,7 @@ listen_and_process(void *handle, const char *prog, void (*reset)(void))
service_conn(handle, conns[i], prog, sflags);
}
}
- krb5_klog_syslog(LOG_INFO, "shutdown signal received");
+ krb5_klog_syslog(LOG_INFO, _("shutdown signal received"));
return 0;
}
@@ -1877,7 +1888,7 @@ closedown_network_sockets()
FOREACH_ELT (connections, i, conn) {
if (conn->fd >= 0) {
- krb5_klog_syslog(LOG_INFO, "closing down fd %d", conn->fd);
+ krb5_klog_syslog(LOG_INFO, _("closing down fd %d"), conn->fd);
(void) close(conn->fd);
if (conn->type == CONN_RPC) {
fd_set fds;
diff --git a/src/lib/crypto/krb/cf2.c b/src/lib/crypto/krb/cf2.c
index 7c2e96512..5f82d62af 100644
--- a/src/lib/crypto/krb/cf2.c
+++ b/src/lib/crypto/krb/cf2.c
@@ -111,7 +111,7 @@ krb5_c_fx_cf2_simple(krb5_context context,
if (out_enctype->prf == NULL) {
if (context)
krb5int_set_error(&(context->err), KRB5_CRYPTO_INTERNAL,
- "Enctype %d has no PRF", out_enctype_num);
+ _("Enctype %d has no PRF"), out_enctype_num);
return KRB5_CRYPTO_INTERNAL;
}
keybytes = out_enctype->enc->keybytes;
diff --git a/src/lib/gssapi/generic/disp_major_status.c b/src/lib/gssapi/generic/disp_major_status.c
index 5098e3abd..e4ff722c9 100644
--- a/src/lib/gssapi/generic/disp_major_status.c
+++ b/src/lib/gssapi/generic/disp_major_status.c
@@ -34,18 +34,18 @@
#define GSS_ERROR_STR(value, array, select, min, max, num) \
(((select(value) < (min)) || (select(value) > (max))) ? NULL : \
- (array)[num(value)])
+ _((array)[num(value)]))
/**/
static const char * const calling_error_string[] = {
NULL,
- "A required input parameter could not be read",
- "A required input parameter could not be written",
- "A parameter was malformed",
+ N_("A required input parameter could not be read"),
+ N_("A required input parameter could not be written"),
+ N_("A parameter was malformed"),
};
-static const char * const calling_error = "calling error";
+static const char * const calling_error = N_("calling error");
#define GSS_CALLING_ERROR_STR(x) \
GSS_ERROR_STR((x), calling_error_string, GSS_CALLING_ERROR, \
@@ -56,25 +56,25 @@ static const char * const calling_error = "calling error";
static const char * const routine_error_string[] = {
NULL,
- "An unsupported mechanism was requested",
- "An invalid name was supplied",
- "A supplied name was of an unsupported type",
- "Incorrect channel bindings were supplied",
- "An invalid status code was supplied",
- "A token had an invalid signature",
- "No credentials were supplied",
- "No context has been established",
- "A token was invalid",
- "A credential was invalid",
- "The referenced credentials have expired",
- "The context has expired",
- "Miscellaneous failure",
- "The quality-of-protection requested could not be provided",
- "The operation is forbidden by the local security policy",
- "The operation or option is not available",
+ N_("An unsupported mechanism was requested"),
+ N_("An invalid name was supplied"),
+ N_("A supplied name was of an unsupported type"),
+ N_("Incorrect channel bindings were supplied"),
+ N_("An invalid status code was supplied"),
+ N_("A token had an invalid signature"),
+ N_("No credentials were supplied"),
+ N_("No context has been established"),
+ N_("A token was invalid"),
+ N_("A credential was invalid"),
+ N_("The referenced credentials have expired"),
+ N_("The context has expired"),
+ N_("Miscellaneous failure"),
+ N_("The quality-of-protection requested could not be provided"),
+ N_("The operation is forbidden by the local security policy"),
+ N_("The operation or option is not available"),
};
-static const char * const routine_error = "routine error";
+static const char * const routine_error = N_("routine error");
#define GSS_ROUTINE_ERROR_STR(x) \
GSS_ERROR_STR((x), routine_error_string, GSS_ROUTINE_ERROR, \
@@ -86,13 +86,13 @@ static const char * const routine_error = "routine error";
/* this becomes overly gross after about 4 strings */
static const char * const sinfo_string[] = {
- "The routine must be called again to complete its function",
- "The token was a duplicate of an earlier token",
- "The token's validity period has expired",
- "A later token has already been processed",
+ N_("The routine must be called again to complete its function"),
+ N_("The token was a duplicate of an earlier token"),
+ N_("The token's validity period has expired"),
+ N_("A later token has already been processed"),
};
-static const char * const sinfo_code = "supplementary info code";
+static const char * const sinfo_code = N_("supplementary info code");
#define LSBGET(x) ((((x)^((x)-1))+1)>>1)
#define LSBMASK(n) ((1<<(n))^((1<<(n))-1))
@@ -103,8 +103,8 @@ static const char * const sinfo_code = "supplementary info code";
/**/
-static const char * const no_error = "No error";
-static const char * const unknown_error = "Unknown %s (field = %d)";
+static const char * const no_error = N_("No error");
+static const char * const unknown_error = N_("Unknown %s (field = %d)");
/**/
@@ -116,7 +116,7 @@ display_unknown(kind, value, buffer)
{
char *str;
- if (asprintf(&str, unknown_error, kind, value) < 0)
+ if (asprintf(&str, _(unknown_error), kind, value) < 0)
return(0);
buffer->length = strlen(str);
@@ -140,7 +140,7 @@ static OM_uint32 display_calling(minor_status, code, status_string)
return(GSS_S_FAILURE);
}
} else {
- if (! display_unknown(calling_error, GSS_CALLING_ERROR_FIELD(code),
+ if (! display_unknown(_(calling_error), GSS_CALLING_ERROR_FIELD(code),
status_string)) {
*minor_status = ENOMEM;
return(GSS_S_FAILURE);
@@ -165,7 +165,7 @@ static OM_uint32 display_routine(minor_status, code, status_string)
return(GSS_S_FAILURE);
}
} else {
- if (! display_unknown(routine_error, GSS_ROUTINE_ERROR_FIELD(code),
+ if (! display_unknown(_(routine_error), GSS_ROUTINE_ERROR_FIELD(code),
status_string)) {
*minor_status = ENOMEM;
return(GSS_S_FAILURE);
@@ -190,7 +190,7 @@ static OM_uint32 display_bit(minor_status, code, status_string)
return(GSS_S_FAILURE);
}
} else {
- if (! display_unknown(sinfo_code, 1<<code, status_string)) {
+ if (! display_unknown(_(sinfo_code), 1<<code, status_string)) {
*minor_status = ENOMEM;
return(GSS_S_FAILURE);
}
diff --git a/src/lib/gssapi/krb5/acquire_cred.c b/src/lib/gssapi/krb5/acquire_cred.c
index 664f07bf6..ca5438bc1 100644
--- a/src/lib/gssapi/krb5/acquire_cred.c
+++ b/src/lib/gssapi/krb5/acquire_cred.c
@@ -169,8 +169,9 @@ check_keytab(krb5_context context, krb5_keytab kt, krb5_gss_name_t name)
if (code == KRB5_KT_END) {
code = KRB5_KT_NOTFOUND;
if (krb5_unparse_name(context, accprinc, &princname) == 0) {
- krb5_set_error_message(context, code, "No key table entry "
- "found matching %s", princname);
+ krb5_set_error_message(context, code,
+ _("No key table entry found matching %s"),
+ princname);
free(princname);
}
}
diff --git a/src/lib/gssapi/mechglue/g_dsp_status.c b/src/lib/gssapi/mechglue/g_dsp_status.c
index 435726609..13f104bea 100644
--- a/src/lib/gssapi/mechglue/g_dsp_status.c
+++ b/src/lib/gssapi/mechglue/g_dsp_status.c
@@ -158,25 +158,25 @@ gss_buffer_t outStr;
/* take care of the success value first */
if (status == GSS_S_COMPLETE)
- errStr = "The routine completed successfully";
+ errStr = _("The routine completed successfully");
else if (*msgCtxt == 0 && (oneVal = GSS_CALLING_ERROR(status))) {
switch (oneVal) {
case GSS_S_CALL_INACCESSIBLE_READ:
- errStr = "A required input parameter"
- " could not be read";
+ errStr = _("A required input parameter could not be "
+ "read");
break;
case GSS_S_CALL_INACCESSIBLE_WRITE:
- errStr = "A required output parameter"
- " could not be written";
+ errStr = _("A required output parameter could not be "
+ "written");
break;
case GSS_S_CALL_BAD_STRUCTURE:
- errStr = "A parameter was malformed";
+ errStr = _("A parameter was malformed");
break;
default:
- errStr = "An invalid status code was supplied";
+ errStr = _("An invalid status code was supplied");
break;
}
@@ -192,89 +192,86 @@ gss_buffer_t outStr;
(oneVal = GSS_ROUTINE_ERROR(status))) {
switch (oneVal) {
case GSS_S_BAD_MECH:
- errStr = "An unsupported mechanism"
- " was requested";
+ errStr = _("An unsupported mechanism was requested");
break;
case GSS_S_BAD_NAME:
- errStr = "An invalid name was supplied";
+ errStr = _("An invalid name was supplied");
break;
case GSS_S_BAD_NAMETYPE:
- errStr = "A supplied name was of an"
- " unsupported type";
+ errStr = _("A supplied name was of an unsupported "
+ "type");
break;
case GSS_S_BAD_BINDINGS:
- errStr = "Incorrect channel bindings"
- " were supplied";
+ errStr = _("Incorrect channel bindings were supplied");
break;
case GSS_S_BAD_SIG: /* same as GSS_S_BAD_MIC: */
- errStr = "A token had an invalid Message"
- " Integrity Check (MIC)";
+ errStr = _("A token had an invalid Message Integrity "
+ "Check (MIC)");
break;
case GSS_S_NO_CRED:
- errStr = "No credentials were supplied, or the"
- " credentials were unavailable or"
- " inaccessible";
+ errStr = _("No credentials were supplied, or the "
+ "credentials were unavailable or "
+ "inaccessible");
break;
case GSS_S_NO_CONTEXT:
- errStr = "No context has been established";
+ errStr = _("No context has been established");
break;
case GSS_S_DEFECTIVE_TOKEN:
- errStr = "Invalid token was supplied";
+ errStr = _("Invalid token was supplied");
break;
case GSS_S_DEFECTIVE_CREDENTIAL:
- errStr = "Invalid credential was supplied";
+ errStr = _("Invalid credential was supplied");
break;
case GSS_S_CREDENTIALS_EXPIRED:
- errStr = "The referenced credential has"
- " expired";
+ errStr = _("The referenced credential has expired");
break;
case GSS_S_CONTEXT_EXPIRED:
- errStr = "The referenced context has expired";
+ errStr = _("The referenced context has expired");
break;
case GSS_S_FAILURE:
- errStr = "Unspecified GSS failure. Minor code"
- " may provide more information";
+ errStr = _("Unspecified GSS failure. Minor code "
+ "may provide more information");
break;
case GSS_S_BAD_QOP:
- errStr = "The quality-of-protection (QOP) "
- "requested could not be provided";
+ errStr = _("The quality-of-protection (QOP) "
+ "requested could not be provided");
break;
case GSS_S_UNAUTHORIZED:
- errStr = "The operation is forbidden by local"
- " security policy";
+ errStr = _("The operation is forbidden by local "
+ " security policy");
break;
case GSS_S_UNAVAILABLE:
- errStr = "The operation or option is not"
- " available or unsupported";
+ errStr = _("The operation or option is not "
+ "available or unsupported");
break;
case GSS_S_DUPLICATE_ELEMENT:
- errStr = "The requested credential element"
- " already exists";
+ errStr = _("The requested credential element "
+ "already exists");
break;
case GSS_S_NAME_NOT_MN:
- errStr = "The provided name was not mechanism"
- " specific (MN)";
+ errStr = _("The provided name was not mechanism "
+ "specific (MN)");
break;
case GSS_S_BAD_STATUS:
default:
- errStr = "An invalid status code was supplied";
+ errStr = _("An invalid status code was supplied");
}
/* we must determine if the caller should call us again */
@@ -311,32 +308,30 @@ gss_buffer_t outStr;
switch (currErr) {
case GSS_S_CONTINUE_NEEDED:
- errStr = "The routine must be called again to"
- " complete its function";
+ errStr = _("The routine must be called again to "
+ "complete its function");
break;
case GSS_S_DUPLICATE_TOKEN:
- errStr = "The token was a duplicate of an"
- " earlier token";
+ errStr = _("The token was a duplicate of an earlier "
+ "token");
break;
case GSS_S_OLD_TOKEN:
- errStr = "The token's validity period"
- " has expired";
+ errStr = _("The token's validity period has expired");
break;
case GSS_S_UNSEQ_TOKEN:
- errStr = "A later token has already been"
- " processed";
+ errStr = _("A later token has already been processed");
break;
case GSS_S_GAP_TOKEN:
- errStr = "An expected per-message token was"
- " not received";
+ errStr = _("An expected per-message token was not "
+ "received");
break;
default:
- errStr = "An invalid status code was supplied";
+ errStr = _("An invalid status code was supplied");
}
/*
diff --git a/src/lib/gssapi/spnego/spnego_mech.c b/src/lib/gssapi/spnego/spnego_mech.c
index 3467ee0d7..3beb93ec4 100644
--- a/src/lib/gssapi/spnego/spnego_mech.c
+++ b/src/lib/gssapi/spnego/spnego_mech.c
@@ -1792,23 +1792,28 @@ spnego_gss_display_status(
switch (status_value) {
case ERR_SPNEGO_NO_MECHS_AVAILABLE:
/* CSTYLED */
- *status_string = make_err_msg("SPNEGO cannot find mechanisms to negotiate");
+ *status_string = make_err_msg(_("SPNEGO cannot find "
+ "mechanisms to negotiate"));
break;
case ERR_SPNEGO_NO_CREDS_ACQUIRED:
/* CSTYLED */
- *status_string = make_err_msg("SPNEGO failed to acquire creds");
+ *status_string = make_err_msg(_("SPNEGO failed to acquire "
+ "creds"));
break;
case ERR_SPNEGO_NO_MECH_FROM_ACCEPTOR:
/* CSTYLED */
- *status_string = make_err_msg("SPNEGO acceptor did not select a mechanism");
+ *status_string = make_err_msg(_("SPNEGO acceptor did not "
+ "select a mechanism"));
break;
case ERR_SPNEGO_NEGOTIATION_FAILED:
/* CSTYLED */
- *status_string = make_err_msg("SPNEGO failed to negotiate a mechanism");
+ *status_string = make_err_msg(_("SPNEGO failed to negotiate a "
+ "mechanism"));
break;
case ERR_SPNEGO_NO_TOKEN_FROM_ACCEPTOR:
/* CSTYLED */
- *status_string = make_err_msg("SPNEGO acceptor did not return a valid token");
+ *status_string = make_err_msg(_("SPNEGO acceptor did not "
+ "return a valid token"));
break;
default:
status_string->length = 0;
diff --git a/src/lib/kadm5/alt_prof.c b/src/lib/kadm5/alt_prof.c
index f6ee1c2f8..98231ab33 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 e45f6b155..9b99635fa 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 c9a630ea9..68a6b5eb4 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 778b177b5..f736eacf4 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 8c26a13c3..67118db01 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 43f4f84b8..28959d76e 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 ff16ccf75..f733a393f 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 0ca30f44d..17d499270 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 deb718149..e8a78103c 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 907a3c5c9..30a0b5abd 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 5151d1819..b36af1e24 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;
}
diff --git a/src/lib/kdb/kdb5.c b/src/lib/kdb/kdb5.c
index b37a5c110..e18b99e8b 100644
--- a/src/lib/kdb/kdb5.c
+++ b/src/lib/kdb/kdb5.c
@@ -180,7 +180,8 @@ get_conf_section(krb5_context context, char **section)
if (context->default_realm == NULL) {
krb5_set_error_message(context, KRB5_KDB_SERVER_INTERNAL_ERR,
- "No default realm set; cannot initialize KDB");
+ _("No default realm set; cannot initialize "
+ "KDB"));
return KRB5_KDB_SERVER_INTERNAL_ERR;
}
status = profile_get_string(context->profile,
@@ -282,7 +283,7 @@ kdb_load_library(krb5_context kcontext, char *lib_name, db_library *libptr)
#endif
if (!vftabl_addr) {
krb5_set_error_message(kcontext, KRB5_KDB_DBTYPE_NOTFOUND,
- "Unable to find requested database type: %s",
+ _("Unable to find requested database type: %s"),
lib_name);
return KRB5_PLUGIN_OP_NOTSUPP;
}
@@ -364,9 +365,10 @@ kdb_load_library(krb5_context kcontext, char *lib_name, db_library *lib)
&(*lib)->dl_dir_handle, &kcontext->err))) {
const char *err_str = krb5_get_error_message(kcontext, status);
status = KRB5_KDB_DBTYPE_NOTFOUND;
- krb5_set_error_message (kcontext, status,
- "Unable to find requested database type: %s", err_str);
- krb5_free_error_message (kcontext, err_str);
+ krb5_set_error_message(kcontext, status,
+ _("Unable to find requested database type: %s"),
+ err_str);
+ krb5_free_error_message(kcontext, err_str);
goto clean_n_exit;
}
@@ -374,18 +376,20 @@ kdb_load_library(krb5_context kcontext, char *lib_name, db_library *lib)
&vftabl_addrs, &kcontext->err))) {
const char *err_str = krb5_get_error_message(kcontext, status);
status = KRB5_KDB_DBTYPE_INIT;
- krb5_set_error_message (kcontext, status,
- "plugin symbol 'kdb_function_table' lookup failed: %s", err_str);
- krb5_free_error_message (kcontext, err_str);
+ krb5_set_error_message(kcontext, status,
+ _("plugin symbol 'kdb_function_table' lookup "
+ "failed: %s"), err_str);
+ krb5_free_error_message(kcontext, err_str);
goto clean_n_exit;
}
if (vftabl_addrs[0] == NULL) {
/* No plugins! */
status = KRB5_KDB_DBTYPE_NOTFOUND;
- krb5_set_error_message (kcontext, status,
- _("Unable to load requested database module '%s': plugin symbol 'kdb_function_table' not found"),
- lib_name);
+ krb5_set_error_message(kcontext, status,
+ _("Unable to load requested database module "
+ "'%s': plugin symbol 'kdb_function_table' "
+ "not found"), lib_name);
goto clean_n_exit;
}
@@ -1709,8 +1713,8 @@ krb5_dbe_lookup_mkey_aux(krb5_context context, krb5_db_entry *entry,
}
} else {
krb5_set_error_message(context, KRB5_KDB_BAD_VERSION,
- "Illegal version number for KRB5_TL_MKEY_AUX %d\n",
- version);
+ _("Illegal version number for "
+ "KRB5_TL_MKEY_AUX %d\n"), version);
return (KRB5_KDB_BAD_VERSION);
}
}
@@ -1860,9 +1864,9 @@ krb5_dbe_lookup_actkvno(krb5_context context, krb5_db_entry *entry,
next_tuple += ACTKVNO_TUPLE_SIZE;
}
} else {
- krb5_set_error_message (context, KRB5_KDB_BAD_VERSION,
- "Illegal version number for KRB5_TL_ACTKVNO %d\n",
- version);
+ krb5_set_error_message(context, KRB5_KDB_BAD_VERSION,
+ _("Illegal version number for "
+ "KRB5_TL_ACTKVNO %d\n"), version);
return (KRB5_KDB_BAD_VERSION);
}
}
diff --git a/src/lib/kdb/kdb_default.c b/src/lib/kdb/kdb_default.c
index 9763d6e80..d8dd4266e 100644
--- a/src/lib/kdb/kdb_default.c
+++ b/src/lib/kdb/kdb_default.c
@@ -160,9 +160,9 @@ krb5_def_store_mkey_list(krb5_context context,
/* if keyfile exists it better be a regular file */
if (!S_ISREG(stb.st_mode)) {
retval = EINVAL;
- krb5_set_error_message (context, retval,
- "keyfile (%s) is not a regular file: %s",
- keyfile, error_message(retval));
+ krb5_set_error_message(context, retval,
+ _("keyfile (%s) is not a regular file: %s"),
+ keyfile, error_message(retval));
goto out;
}
}
@@ -171,8 +171,8 @@ krb5_def_store_mkey_list(krb5_context context,
/* create temp file template for use by mktemp() */
if ((retval = asprintf(&tmp_ktname, "WRFILE:%s_XXXXXX", keyfile)) < 0) {
- krb5_set_error_message (context, retval,
- "Could not create temp keytab file name.");
+ krb5_set_error_message(context, retval,
+ _("Could not create temp keytab file name."));
goto out;
}
@@ -185,9 +185,9 @@ krb5_def_store_mkey_list(krb5_context context,
if (mktemp(tmp_ktpath) == NULL) {
retval = errno;
- krb5_set_error_message (context, retval,
- "Could not create temp stash file: %s",
- error_message(errno));
+ krb5_set_error_message(context, retval,
+ _("Could not create temp stash file: %s"),
+ error_message(errno));
goto out;
}
@@ -215,9 +215,10 @@ krb5_def_store_mkey_list(krb5_context context,
/* rename original keyfile to original filename */
if (rename(tmp_ktpath, keyfile) < 0) {
retval = errno;
- krb5_set_error_message (context, retval,
- "rename of temporary keyfile (%s) to (%s) failed: %s",
- tmp_ktpath, keyfile, error_message(errno));
+ krb5_set_error_message(context, retval,
+ _("rename of temporary keyfile (%s) to "
+ "(%s) failed: %s"), tmp_ktpath, keyfile,
+ error_message(errno));
}
}
@@ -405,7 +406,7 @@ krb5_db_def_fetch_mkey(krb5_context context,
*/
if (retval != 0) {
krb5_set_error_message(context, KRB5_KDB_CANTREAD_STORED,
- "Can not fetch master key (error: %s).",
+ _("Can not fetch master key (error: %s)."),
error_message(retval));
return KRB5_KDB_CANTREAD_STORED;
} else
@@ -468,8 +469,9 @@ krb5_def_fetch_mkey_list(krb5_context context,
}
}
if (found_key != TRUE) {
- krb5_set_error_message (context, KRB5_KDB_BADMASTERKEY,
- "Unable to decrypt latest master key with the provided master key\n");
+ krb5_set_error_message(context, KRB5_KDB_BADMASTERKEY,
+ _("Unable to decrypt latest master key "
+ "with the provided master key\n"));
retval = KRB5_KDB_BADMASTERKEY;
goto clean_n_exit;
}
diff --git a/src/lib/kdb/kdb_log.c b/src/lib/kdb/kdb_log.c
index c254ab27d..625c71a3e 100644
--- a/src/lib/kdb/kdb_log.c
+++ b/src/lib/kdb/kdb_log.c
@@ -100,7 +100,7 @@ ulog_sync_header(kdb_hlog_t *ulog)
/*
* Couldn't sync to disk, let's panic
*/
- syslog(LOG_ERR, "ulog_sync_header: could not sync to disk");
+ syslog(LOG_ERR, _("ulog_sync_header: could not sync to disk"));
abort();
}
}
diff --git a/src/lib/krb5/ccache/cc_file.c b/src/lib/krb5/ccache/cc_file.c
index 117cdd546..131ccb533 100644
--- a/src/lib/krb5/ccache/cc_file.c
+++ b/src/lib/krb5/ccache/cc_file.c
@@ -1240,7 +1240,7 @@ krb5_fcc_open_file (krb5_context context, krb5_ccache id, int mode)
case ENOENT:
retval = KRB5_FCC_NOFILE;
krb5_set_error_message(context, retval,
- "Credentials cache file '%s' not found",
+ _("Credentials cache file '%s' not found"),
data->filename);
return retval;
default:
@@ -2517,8 +2517,8 @@ krb5_fcc_interpret(krb5_context context, int errnum)
default:
retval = KRB5_CC_IO; /* XXX */
krb5_set_error_message(context, retval,
- "Credentials cache I/O operation failed (%s)",
- strerror(errnum));
+ _("Credentials cache I/O operation failed "
+ "(%s)"), strerror(errnum));
}
return retval;
}
diff --git a/src/lib/krb5/keytab/kt_file.c b/src/lib/krb5/keytab/kt_file.c
index f2e26db8b..d2aa88bee 100644
--- a/src/lib/krb5/keytab/kt_file.c
+++ b/src/lib/krb5/keytab/kt_file.c
@@ -395,8 +395,9 @@ krb5_ktfile_get_entry(krb5_context context, krb5_keytab id,
else {
kerror = KRB5_KT_NOTFOUND;
if (krb5_unparse_name(context, principal, &princname) == 0) {
- krb5_set_error_message(context, kerror, "No key table entry "
- "found for %s", princname);
+ krb5_set_error_message(context, kerror,
+ _("No key table entry found for %s"),
+ princname);
free(princname);
}
}
@@ -822,7 +823,8 @@ krb5_ktfile_add(krb5_context context, krb5_keytab id, krb5_keytab_entry *entry)
/* Iterator(s) active -- no changes. */
KTUNLOCK(id);
krb5_set_error_message(context, KRB5_KT_IOERR,
- "Cannot change keytab with keytab iterators active");
+ _("Cannot change keytab with keytab iterators "
+ "active"));
return KRB5_KT_IOERR; /* XXX */
}
if ((retval = krb5_ktfileint_openw(context, id))) {
@@ -857,7 +859,8 @@ krb5_ktfile_remove(krb5_context context, krb5_keytab id, krb5_keytab_entry *entr
/* Iterator(s) active -- no changes. */
KTUNLOCK(id);
krb5_set_error_message(context, KRB5_KT_IOERR,
- "Cannot change keytab with keytab iterators active");
+ _("Cannot change keytab with keytab iterators "
+ "active"));
return KRB5_KT_IOERR; /* XXX */
}
@@ -1056,7 +1059,7 @@ krb5_ktfileint_open(krb5_context context, krb5_keytab id, int mode)
return EMFILE;
case ENOENT:
krb5_set_error_message(context, ENOENT,
- "Key table file '%s' not found",
+ _("Key table file '%s' not found"),
KTFILENAME(id));
return ENOENT;
default:
diff --git a/src/lib/krb5/krb/chpw.c b/src/lib/krb5/krb/chpw.c
index 305808bd6..7e43dcf1a 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 3939f0e4a..0d04cc2b0 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 525de0c09..e25860cb6 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 b87eb07b7..fc00e21d7 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 062659b9b..acb6f126d 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 ff4cbf62f..a60cc3b2f 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 f76f5be00..519196e22 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 14ac02d4b..9e1f6ee62 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 be909f144..446d4f22e 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 f4896eb96..82b422eac 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 83c4ef714..8696a155b 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;
}
diff --git a/src/lib/krb5/os/locate_kdc.c b/src/lib/krb5/os/locate_kdc.c
index 4c5977ab0..c2ae0fadb 100644
--- a/src/lib/krb5/os/locate_kdc.c
+++ b/src/lib/krb5/os/locate_kdc.c
@@ -622,8 +622,8 @@ k5_locate_server(krb5_context context, const krb5_data *realm,
if (al.nservers == 0) { /* No good servers */
k5_free_serverlist(&al);
krb5_set_error_message(context, KRB5_REALM_CANT_RESOLVE,
- "Cannot resolve servers for KDC in "
- "realm \"%.*s\"", realm->length, realm->data);
+ _("Cannot resolve servers for KDC in realm "
+ "\"%.*s\""), realm->length, realm->data);
return KRB5_REALM_CANT_RESOLVE;
}
*serverlist = al;
diff --git a/src/lib/krb5/os/sendto_kdc.c b/src/lib/krb5/os/sendto_kdc.c
index b2e9fdacb..a3eb32234 100644
--- a/src/lib/krb5/os/sendto_kdc.c
+++ b/src/lib/krb5/os/sendto_kdc.c
@@ -344,8 +344,8 @@ krb5_sendto_kdc(krb5_context context, const krb5_data *message,
retval = KRB5KDC_ERR_SVC_UNAVAILABLE;
} else {
krb5_set_error_message(context, retval,
- "Cannot contact any KDC for realm '%.*s'",
- realm->length, realm->data);
+ _("Cannot contact any KDC for realm "
+ "'%.*s'"), realm->length, realm->data);
}
}
if (retval)
diff --git a/src/lib/krb5/rcache/rc_io.c b/src/lib/krb5/rcache/rc_io.c
index 7df5848c8..ef7ce0b9d 100644
--- a/src/lib/krb5/rcache/rc_io.c
+++ b/src/lib/krb5/rcache/rc_io.c
@@ -103,16 +103,15 @@ krb5_rc_io_mkstemp(krb5_context context, krb5_rc_iostuff *d, char *dir)
retval = fstat(d->fd, &stbuf);
if (retval) {
krb5_set_error_message(context, retval,
- "Cannot fstat replay cache file %s: %s",
+ _("Cannot fstat replay cache file %s: %s"),
d->fn, strerror(errno));
return KRB5_RC_IO_UNKNOWN;
}
if (stbuf.st_mode & 077) {
krb5_set_error_message(context, retval,
- "Insecure mkstemp() file mode "
- "for replay cache file %s; "
- "try running this program "
- "with umask 077 ", d->fn);
+ _("Insecure mkstemp() file mode for replay "
+ "cache file %s; try running this program "
+ "with umask 077 "), d->fn);
return KRB5_RC_IO_UNKNOWN;
}
#endif
@@ -143,13 +142,13 @@ rc_map_errno (krb5_context context, int e, const char *fn,
case EROFS:
case EEXIST:
krb5_set_error_message(context, KRB5_RC_IO_PERM,
- "Cannot %s replay cache file %s: %s",
+ _("Cannot %s replay cache file %s: %s"),
operation, fn, strerror(e));
return KRB5_RC_IO_PERM;
default:
krb5_set_error_message(context, KRB5_RC_IO_UNKNOWN,
- "Cannot %s replay cache: %s",
+ _("Cannot %s replay cache: %s"),
operation, strerror(e));
return KRB5_RC_IO_UNKNOWN;
}
@@ -269,14 +268,15 @@ krb5_rc_io_open_internal(krb5_context context, krb5_rc_iostuff *d, char *fn,
}
/* check that non other can read/write/execute the file */
if (sb1.st_mode & 077) {
- krb5_set_error_message(context, retval, "Insecure file mode "
- "for replay cache file %s", d->fn);
+ krb5_set_error_message(context, retval,
+ _("Insecure file mode for replay cache file "
+ "%s"), d->fn);
return KRB5_RC_IO_UNKNOWN;
}
/* owned by me */
if (sb1.st_uid != geteuid()) {
retval = KRB5_RC_IO_PERM;
- krb5_set_error_message(context, retval, "rcache not owned by %d",
+ krb5_set_error_message(context, retval, _("rcache not owned by %d"),
(int)geteuid());
goto cleanup;
}
@@ -400,18 +400,18 @@ krb5_rc_io_write(krb5_context context, krb5_rc_iostuff *d, krb5_pointer buf,
case EFBIG:
case ENOSPC:
krb5_set_error_message (context, KRB5_RC_IO_SPACE,
- "Can't write to replay cache: %s",
+ _("Can't write to replay cache: %s"),
strerror(errno));
return KRB5_RC_IO_SPACE;
case EIO:
krb5_set_error_message (context, KRB5_RC_IO_IO,
- "Can't write to replay cache: %s",
+ _("Can't write to replay cache: %s"),
strerror(errno));
return KRB5_RC_IO_IO;
case EBADF:
default:
krb5_set_error_message (context, KRB5_RC_IO_UNKNOWN,
- "Can't write to replay cache: %s",
+ _("Can't write to replay cache: %s"),
strerror(errno));
return KRB5_RC_IO_UNKNOWN;
}
@@ -433,7 +433,7 @@ krb5_rc_io_sync(krb5_context context, krb5_rc_iostuff *d)
case EIO: return KRB5_RC_IO_IO;
default:
krb5_set_error_message(context, KRB5_RC_IO_UNKNOWN,
- "Cannot sync replay cache file: %s",
+ _("Cannot sync replay cache file: %s"),
strerror(errno));
return KRB5_RC_IO_UNKNOWN;
}
@@ -453,7 +453,7 @@ krb5_rc_io_read(krb5_context context, krb5_rc_iostuff *d, krb5_pointer buf,
case EBADF:
default:
krb5_set_error_message(context, KRB5_RC_IO_UNKNOWN,
- "Can't read from replay cache: %s",
+ _("Can't read from replay cache: %s"),
strerror(errno));
return KRB5_RC_IO_UNKNOWN;
}
@@ -485,20 +485,20 @@ krb5_rc_io_destroy(krb5_context context, krb5_rc_iostuff *d)
{
case EIO:
krb5_set_error_message(context, KRB5_RC_IO_IO,
- "Can't destroy replay cache: %s",
+ _("Can't destroy replay cache: %s"),
strerror(errno));
return KRB5_RC_IO_IO;
case EPERM:
case EBUSY:
case EROFS:
krb5_set_error_message(context, KRB5_RC_IO_PERM,
- "Can't destroy replay cache: %s",
+ _("Can't destroy replay cache: %s"),
strerror(errno));
return KRB5_RC_IO_PERM;
case EBADF:
default:
krb5_set_error_message(context, KRB5_RC_IO_UNKNOWN,
- "Can't destroy replay cache: %s",
+ _("Can't destroy replay cache: %s"),
strerror(errno));
return KRB5_RC_IO_UNKNOWN;
}
generated by cgit (git 2.34.1) at 2026-03-06 14:03:38 +0000